From 1104db515e075e007e414b3ff070b7a89c6ebba0 Mon Sep 17 00:00:00 2001
From: Kio-td <kio.thedev@gmail.com>
Date: Sat, 11 Feb 2023 06:13:55 -0500
Subject: [PATCH 001/582] Semi-Kill #9531

---
 packages/backend/src/remote/activitypub/models/note.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index afb3af6cb..e5f3853bd 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -115,6 +115,16 @@ export async function createNote(
 
 	logger.info(`Creating the Note: ${note.id}`);
 
+	// Skip if note is made before 2007 (1yr before Fedi was created)
+	if (note.published) {
+		const DateChecker = new Date(note.published)
+		if (DateChecker.getFullYear() < 2007) {
+			logger.warn('Note somehow made before Activitypub was created; discarding');
+			return null;
+		}
+	}
+
+
 	// Fetch author
 	const actor = (await resolvePerson(
 		getOneApId(note.attributedTo),

From 4ff3b39ba376fc50d0357414ffd208524a5ed209 Mon Sep 17 00:00:00 2001
From: Kio-td <kio.thedev@gmail.com>
Date: Sat, 11 Feb 2023 06:26:05 -0500
Subject: [PATCH 002/582] Discard if 3 days in the future

---
 packages/backend/src/remote/activitypub/models/note.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index e5f3853bd..ee9ccf52a 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -116,12 +116,19 @@ export async function createNote(
 	logger.info(`Creating the Note: ${note.id}`);
 
 	// Skip if note is made before 2007 (1yr before Fedi was created)
+	// OR skip if note is made 3 days in advance
 	if (note.published) {
 		const DateChecker = new Date(note.published)
+		const FutureCheck = new Date()
+		FutureCheck.setDate(FutureCheck.getDate() + 3) // Allow some wiggle room for misconfigured hosts
 		if (DateChecker.getFullYear() < 2007) {
 			logger.warn('Note somehow made before Activitypub was created; discarding');
 			return null;
 		}
+		if (DateChecker < FutureCheck) {
+			logger.warn('Note somehow made after today; discarding')
+			return null;
+		}
 	}
 
 

From 7465e8461df40c5f4024ecf10118a425f8b12049 Mon Sep 17 00:00:00 2001
From: Kio-td <kio.thedev@gmail.com>
Date: Sat, 11 Feb 2023 07:18:56 -0500
Subject: [PATCH 003/582] Fix bad math

---
 packages/backend/src/remote/activitypub/models/note.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index 3c438aa2f..e643e24c9 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -135,7 +135,7 @@ export async function createNote(
 			logger.warn('Note somehow made before Activitypub was created; discarding');
 			return null;
 		}
-		if (DateChecker < FutureCheck) {
+		if (DateChecker > FutureCheck) {
 			logger.warn('Note somehow made after today; discarding')
 			return null;
 		}

From 3265c1ea9de93a8c800db087e4da05489800eaf0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 12 Feb 2023 20:14:05 -0800
Subject: [PATCH 004/582] =?UTF-8?q?feat:=20=E2=9C=A8=20Add=20in=20Misskey?=
 =?UTF-8?q?=20v13's=20reacted=20users=20view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/MkReactedUsersDialog.vue   | 98 +++++++++++++++++++
 packages/client/src/scripts/get-note-menu.ts  | 11 +++
 2 files changed, 109 insertions(+)
 create mode 100644 packages/client/src/components/MkReactedUsersDialog.vue

diff --git a/packages/client/src/components/MkReactedUsersDialog.vue b/packages/client/src/components/MkReactedUsersDialog.vue
new file mode 100644
index 000000000..f1427db7b
--- /dev/null
+++ b/packages/client/src/components/MkReactedUsersDialog.vue
@@ -0,0 +1,98 @@
+<template>
+<MkModalWindow
+	ref="dialog"
+	:width="400"
+	:height="450"
+	@close="dialog.close()"
+	@closed="emit('closed')"
+>
+	<template #header>{{ i18n.ts.reactions }}</template>
+
+	<MkSpacer :margin-min="20" :margin-max="28">
+		<div v-if="note" class="_gaps">
+			<div v-if="reactions.length === 0" class="_fullinfo">
+				<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>
+				<div>{{ i18n.ts.nothing }}</div>
+			</div>
+			<template v-else>
+				<div :class="$style.tabs">
+					<button v-for="reaction in reactions" :key="reaction" :class="[$style.tab, { [$style.tabActive]: tab === reaction }]" class="_button" @click="tab = reaction">
+						<MkReactionIcon :reaction="reaction"/>
+						<span style="margin-left: 4px;">{{ note.reactions[reaction] }}</span>
+					</button>
+				</div>
+				<MkA v-for="user in users" :key="user.id" :to="userPage(user)">
+					<MkUserCardMini :user="user" :with-chart="false"/>
+				</MkA>
+			</template>
+		</div>
+		<div v-else>
+			<MkLoading/>
+		</div>
+	</MkSpacer>
+</MkModalWindow>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, watch } from 'vue';
+import * as misskey from 'calckey-js';
+import MkModalWindow from '@/components/MkModalWindow.vue';
+import MkReactionIcon from '@/components/MkReactionIcon.vue';
+import MkUserCardMini from '@/components/MkUserCardMini.vue';
+import { userPage } from '@/filters/user';
+import { i18n } from '@/i18n';
+import * as os from '@/os';
+
+const emit = defineEmits<{
+	(ev: 'closed'): void,
+}>();
+
+const props = defineProps<{
+	noteId: misskey.entities.Note['id'];
+}>();
+
+const dialog = $shallowRef<InstanceType<typeof MkModalWindow>>();
+
+let note = $ref<misskey.entities.Note>();
+let tab = $ref<string>();
+let reactions = $ref<string[]>();
+let users = $ref();
+
+watch($$(tab), async () => {
+	const res = await os.api('notes/reactions', {
+		noteId: props.noteId,
+		type: tab,
+		limit: 30,
+	});
+
+	users = res.map(x => x.user);
+});
+
+onMounted(() => {
+	os.api('notes/show', {
+		noteId: props.noteId,
+	}).then((res) => {
+		reactions = Object.keys(res.reactions);
+		tab = reactions[0];
+		note = res;
+	});
+});
+</script>
+
+<style lang="scss" module>
+.tabs {
+	display: flex;
+	gap: 8px;
+	flex-wrap: wrap;
+}
+
+.tab {
+	padding: 4px 6px;
+	border: solid 1px var(--divider);
+	border-radius: 6px;
+}
+
+.tabActive {
+	border-color: var(--accent);
+}
+</style>
diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts
index e8e726ab3..8ab714af3 100644
--- a/packages/client/src/scripts/get-note-menu.ts
+++ b/packages/client/src/scripts/get-note-menu.ts
@@ -223,6 +223,12 @@ export function getNoteMenu(props: {
 		});
 	}
 
+	function showReactions(): void {
+		os.popup(defineAsyncComponent(() => import('@/components/MkReactedUsersDialog.vue')), {
+			noteId: appearNote.id,
+		}, {}, 'closed');
+	}
+
 	async function translate(): Promise<void> {
 		if (props.translation.value != null) return;
 		props.translating.value = true;
@@ -252,6 +258,11 @@ export function getNoteMenu(props: {
 						null,
 				  ]
 				: []),
+			{
+				icon: "ph-smiley-bold ph-lg",
+				text: i18n.ts.reaction,
+				action: showReactions,
+			},
 			{
 				icon: "ph-clipboard-text-bold ph-lg",
 				text: i18n.ts.copyContent,

From 72319e8f1fcf44ba15bccce4b977ee95641422ec Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 12 Feb 2023 20:15:33 -0800
Subject: [PATCH 005/582] dev6

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

diff --git a/package.json b/package.json
index e8da6c5a7..bc3c0ffd6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev4",
+	"version": "13.2.0-dev6",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 428dac79c8e144f1869bdfe1b514b4fd231d53f7 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 12 Feb 2023 20:18:45 -0800
Subject: [PATCH 006/582] fix: :bug: first user gets admin

Closes #9620

Co-authored-by: @Johann150
---
 packages/backend/src/server/api/common/signup.ts                 | 1 +
 .../backend/src/server/api/endpoints/admin/accounts/create.ts    | 1 +
 packages/backend/src/server/api/endpoints/meta.ts                | 1 +
 3 files changed, 3 insertions(+)

diff --git a/packages/backend/src/server/api/common/signup.ts b/packages/backend/src/server/api/common/signup.ts
index 7ae9e10fb..bb178506b 100644
--- a/packages/backend/src/server/api/common/signup.ts
+++ b/packages/backend/src/server/api/common/signup.ts
@@ -107,6 +107,7 @@ export async function signup(opts: {
 				isAdmin:
 					(await Users.countBy({
 						host: IsNull(),
+						isAdmin: true,
 					})) === 0,
 			}),
 		);
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
index 11ef2273c..2e035d169 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
@@ -35,6 +35,7 @@ export default define(meta, paramDef, async (ps, _me) => {
 	const noUsers =
 		(await Users.countBy({
 			host: IsNull(),
+			isAdmin: true,
 		})) === 0;
 	if (!(noUsers || me?.isAdmin)) throw new Error("access denied");
 
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 005d0800a..476a0c29f 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -489,6 +489,7 @@ export default define(meta, paramDef, async (ps, me) => {
 					requireSetup:
 						(await Users.countBy({
 							host: IsNull(),
+							isAdmin: true,
 						})) === 0,
 			  }
 			: {}),

From 2bd38a64f0f93127a49e1381efd021b4322c4a84 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 12 Feb 2023 20:25:23 -0800
Subject: [PATCH 007/582] feat: :sparkles: add position, scale , fg, and bg MFM
 from v13

---
 packages/client/src/components/mfm.ts        | 29 ++++++++++++++++++++
 packages/client/src/scripts/get-note-menu.ts | 13 +++++++--
 packages/client/src/scripts/mfm-tags.ts      |  4 +++
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index ddfcc3de1..f2905ec35 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -254,6 +254,35 @@ export default defineComponent({
 									style = `transform: ${rotate}(${degrees}deg); transform-origin: center center;`;
 									break;
 								}
+								case "position": {
+									if (!defaultStore.state.advancedMfm) break;
+									const x = parseFloat(token.props.args.x ?? "0");
+									const y = parseFloat(token.props.args.y ?? "0");
+									style = `transform: translateX(${x}em) translateY(${y}em);`;
+									break;
+								}
+								case "scale": {
+									if (!defaultStore.state.advancedMfm) {
+										style = "";
+										break;
+									}
+									const x = Math.min(parseFloat(token.props.args.x ?? "1"), 5);
+									const y = Math.min(parseFloat(token.props.args.y ?? "1"), 5);
+									style = `transform: scale(${x}, ${y});`;
+									break;
+								}
+								case "fg": {
+									let color = token.props.args.color;
+									if (!/^[0-9a-f]{3,6}$/i.test(color)) color = "f00";
+									style = `color: #${color};`;
+									break;
+								}
+								case "bg": {
+									let color = token.props.args.color;
+									if (!/^[0-9a-f]{3,6}$/i.test(color)) color = "f00";
+									style = `background-color: #${color};`;
+									break;
+								}
 							}
 							if (style == null) {
 								return h("span", {}, [
diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts
index 8ab714af3..eb8006c1c 100644
--- a/packages/client/src/scripts/get-note-menu.ts
+++ b/packages/client/src/scripts/get-note-menu.ts
@@ -224,9 +224,16 @@ export function getNoteMenu(props: {
 	}
 
 	function showReactions(): void {
-		os.popup(defineAsyncComponent(() => import('@/components/MkReactedUsersDialog.vue')), {
-			noteId: appearNote.id,
-		}, {}, 'closed');
+		os.popup(
+			defineAsyncComponent(
+				() => import("@/components/MkReactedUsersDialog.vue"),
+			),
+			{
+				noteId: appearNote.id,
+			},
+			{},
+			"closed",
+		);
 	}
 
 	async function translate(): Promise<void> {
diff --git a/packages/client/src/scripts/mfm-tags.ts b/packages/client/src/scripts/mfm-tags.ts
index 51e1fc4e6..b39c8b37b 100644
--- a/packages/client/src/scripts/mfm-tags.ts
+++ b/packages/client/src/scripts/mfm-tags.ts
@@ -10,6 +10,10 @@ export const MFM_TAGS = [
 	"x2",
 	"x3",
 	"x4",
+	"scale",
+	"position",
+	"fg",
+	"bg",
 	"font",
 	"blur",
 	"rainbow",

From c32128c2da9590dafb8122ddb6bf085b676f7664 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 12 Feb 2023 20:25:45 -0800
Subject: [PATCH 008/582] dev7

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

diff --git a/package.json b/package.json
index bc3c0ffd6..da1e886ac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev6",
+	"version": "13.2.0-dev7",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 8d052f8e0ef71aa5f36b8d7334f2a2e00b908ae1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 12 Feb 2023 20:29:34 -0800
Subject: [PATCH 009/582] remove defaultStore check in MFM

---
 packages/client/src/components/mfm.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index f2905ec35..6a8f81e40 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -255,17 +255,12 @@ export default defineComponent({
 									break;
 								}
 								case "position": {
-									if (!defaultStore.state.advancedMfm) break;
 									const x = parseFloat(token.props.args.x ?? "0");
 									const y = parseFloat(token.props.args.y ?? "0");
 									style = `transform: translateX(${x}em) translateY(${y}em);`;
 									break;
 								}
 								case "scale": {
-									if (!defaultStore.state.advancedMfm) {
-										style = "";
-										break;
-									}
 									const x = Math.min(parseFloat(token.props.args.x ?? "1"), 5);
 									const y = Math.min(parseFloat(token.props.args.y ?? "1"), 5);
 									style = `transform: scale(${x}, ${y});`;

From 51ba8304821700dfc5b497160c0224c5ab1c9ffe Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 12 Feb 2023 20:46:56 -0800
Subject: [PATCH 010/582] fix

---
 packages/client/src/components/MkReactedUsersDialog.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkReactedUsersDialog.vue b/packages/client/src/components/MkReactedUsersDialog.vue
index f1427db7b..5f9dfd7d9 100644
--- a/packages/client/src/components/MkReactedUsersDialog.vue
+++ b/packages/client/src/components/MkReactedUsersDialog.vue
@@ -17,7 +17,11 @@
 			<template v-else>
 				<div :class="$style.tabs">
 					<button v-for="reaction in reactions" :key="reaction" :class="[$style.tab, { [$style.tabActive]: tab === reaction }]" class="_button" @click="tab = reaction">
-						<MkReactionIcon :reaction="reaction"/>
+						<XReactionIcon
+							ref="reactionRef"
+							:reaction="reaction ? reaction.replace(/^:(\w+):$/, ':$1@.:') : reaction"
+							:custom-emojis="reactions"
+						/>
 						<span style="margin-left: 4px;">{{ note.reactions[reaction] }}</span>
 					</button>
 				</div>

From b9c61c6b239b9a9c8d997349aeb9d2638458797d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 12 Feb 2023 20:50:36 -0800
Subject: [PATCH 011/582] fix wrong import

---
 packages/client/src/components/MkReactedUsersDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkReactedUsersDialog.vue b/packages/client/src/components/MkReactedUsersDialog.vue
index 5f9dfd7d9..ce03a648c 100644
--- a/packages/client/src/components/MkReactedUsersDialog.vue
+++ b/packages/client/src/components/MkReactedUsersDialog.vue
@@ -41,7 +41,7 @@
 import { onMounted, watch } from 'vue';
 import * as misskey from 'calckey-js';
 import MkModalWindow from '@/components/MkModalWindow.vue';
-import MkReactionIcon from '@/components/MkReactionIcon.vue';
+import XReactionIcon from '@/components/MkReactionIcon.vue';
 import MkUserCardMini from '@/components/MkUserCardMini.vue';
 import { userPage } from '@/filters/user';
 import { i18n } from '@/i18n';

From d6e40ed77d2e65c0b6b86fe87f8a76e068685b05 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 12 Feb 2023 20:54:46 -0800
Subject: [PATCH 012/582] fix: correctly use note.emojis

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

diff --git a/packages/client/src/components/MkReactedUsersDialog.vue b/packages/client/src/components/MkReactedUsersDialog.vue
index ce03a648c..a41378f2b 100644
--- a/packages/client/src/components/MkReactedUsersDialog.vue
+++ b/packages/client/src/components/MkReactedUsersDialog.vue
@@ -17,10 +17,10 @@
 			<template v-else>
 				<div :class="$style.tabs">
 					<button v-for="reaction in reactions" :key="reaction" :class="[$style.tab, { [$style.tabActive]: tab === reaction }]" class="_button" @click="tab = reaction">
-						<XReactionIcon
+						<MkReactionIcon
 							ref="reactionRef"
 							:reaction="reaction ? reaction.replace(/^:(\w+):$/, ':$1@.:') : reaction"
-							:custom-emojis="reactions"
+							:custom-emojis="note.emojis"
 						/>
 						<span style="margin-left: 4px;">{{ note.reactions[reaction] }}</span>
 					</button>
@@ -41,7 +41,7 @@
 import { onMounted, watch } from 'vue';
 import * as misskey from 'calckey-js';
 import MkModalWindow from '@/components/MkModalWindow.vue';
-import XReactionIcon from '@/components/MkReactionIcon.vue';
+import MkReactionIcon from '@/components/MkReactionIcon.vue';
 import MkUserCardMini from '@/components/MkUserCardMini.vue';
 import { userPage } from '@/filters/user';
 import { i18n } from '@/i18n';

From fa960711ae9b30b0e79fd528377d36a5c7ccf0d7 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 15:12:04 +0100
Subject: [PATCH 013/582] feat: #9614

---
 packages/backend/src/server/api/index.ts | 11 +++++++++++
 packages/backend/src/server/index.ts     | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index 6d02ad0ab..bc1f94a7c 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -68,6 +68,17 @@ mastoRouter.use(
 	}),
 );
 
+mastoRouter.use(async (ctx, next) => {
+	if (ctx.request.query) {
+		if (!ctx.request.body || Object.keys(ctx.request.body).length === 0) {
+			ctx.request.body = ctx.request.query
+		} else {
+			ctx.request.body = {...ctx.request.body, ...ctx.request.query}
+		}
+	}
+	await next();
+});
+
 apiMastodonCompatible(mastoRouter);
 
 /**
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 6ce28bf1a..73cf58ec2 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -78,6 +78,17 @@ mastoRouter.use(
 	}),
 );
 
+mastoRouter.use(async (ctx, next) => {
+	if (ctx.request.query) {
+		if (!ctx.request.body || Object.keys(ctx.request.body).length === 0) {
+			ctx.request.body = ctx.request.query
+		} else {
+			ctx.request.body = {...ctx.request.body, ...ctx.request.query}
+		}
+	}
+	await next();
+});
+
 // Routing
 router.use(activityPub.routes());
 router.use(nodeinfo.routes());

From 5905d7e8c1c3fa46cbb97556c873e9024e2b811c Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 16:12:21 +0100
Subject: [PATCH 014/582] basic account lookup

---
 .../server/api/mastodon/endpoints/account.ts  | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index ebe6dd2dd..5c1a2820f 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -1,4 +1,7 @@
+import { Users } from "@/models/index.js";
+import { resolveUser } from "@/remote/resolve-user.js";
 import Router from "@koa/router";
+import { FindOptionsWhere, IsNull } from "typeorm";
 import { getClient } from "../ApiMastodonCompatibleService.js";
 import { toLimitToInt } from "./timeline.js";
 
@@ -68,9 +71,22 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getAccount(
-				`@${(ctx.query.acct || "").toString()}`,
-			);
+			let userArray = ctx.query.acct?.toString().split("@");
+			let userid;
+			if (userArray === undefined) {
+				ctx.status = 401;
+				ctx.body = { error: "no user specified"};
+				return;
+			}
+			if (userArray.length === 1) {
+				const q: FindOptionsWhere<User> = { usernameLower: userArray[0].toLowerCase(), host: IsNull() };
+
+				const user = await Users.findOneBy(q);
+				userid = user?.id;
+			} else {
+				userid = (await resolveUser(userArray[0], userArray[1])).id;
+			}
+			const data = await client.getAccount(userid ? userid : '');
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);

From 030d890286c28c4d5d8ae50b068085f58a846ee0 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 16:53:56 +0100
Subject: [PATCH 015/582] add debug to error

---
 packages/backend/src/server/api/mastodon/endpoints/account.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 5c1a2820f..2d66e9374 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -299,9 +299,11 @@ export function apiAccountMastodon(router: Router): void {
 		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
+		let users;
 		try {
 			const idsRaw = (ctx.query as any)["id[]"];
 			const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw;
+			users = ids;
 			relationshopModel.id = idsRaw || "1";
 			if (!idsRaw) return [relationshopModel];
 			const data = (await client.getRelationships(ids)) as any;
@@ -310,7 +312,7 @@ export function apiAccountMastodon(router: Router): void {
 			console.error(e);
 			console.error(e.response.data);
 			ctx.status = 401;
-			ctx.body = e.response.data;
+			ctx.body = { ...e.response.data, ...{user: users} };
 		}
 	});
 	router.get("/v1/bookmarks", async (ctx) => {

From d6c9a142ab913d0b42255dae85d08679cf27bb54 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 16:58:18 +0100
Subject: [PATCH 016/582] change types

---
 .../backend/src/server/api/mastodon/endpoints/account.ts    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 2d66e9374..ea90a81d9 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -301,12 +301,12 @@ export function apiAccountMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		let users;
 		try {
-			const idsRaw = (ctx.query as any)["id[]"];
+			const idsRaw = ctx.query["id[]"];
 			const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw;
 			users = ids;
-			relationshopModel.id = idsRaw || "1";
+			relationshopModel.id = idsRaw?.toString() || "1";
 			if (!idsRaw) return [relationshopModel];
-			const data = (await client.getRelationships(ids)) as any;
+			const data = (await client.getRelationships(ids ? ids : [])) as any;
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);

From 5cd23ca88f7dc96d232ff22437408be06a7d5dfe Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 16:58:42 +0100
Subject: [PATCH 017/582] changes typings

---
 packages/backend/src/server/api/mastodon/endpoints/account.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index ea90a81d9..cde9abe3a 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -312,7 +312,7 @@ export function apiAccountMastodon(router: Router): void {
 			console.error(e);
 			console.error(e.response.data);
 			ctx.status = 401;
-			ctx.body = { ...e.response.data, ...{user: users} };
+			ctx.body = { ...e.response.data, ...{user: users?.toString()} };
 		}
 	});
 	router.get("/v1/bookmarks", async (ctx) => {

From adbde2ae942bd283d1a23abec9fcc77424473370 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 17:02:51 +0100
Subject: [PATCH 018/582] meow

---
 packages/backend/src/server/api/mastodon/endpoints/account.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index cde9abe3a..f37a73a5e 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -312,7 +312,7 @@ export function apiAccountMastodon(router: Router): void {
 			console.error(e);
 			console.error(e.response.data);
 			ctx.status = 401;
-			ctx.body = { ...e.response.data, ...{user: users?.toString()} };
+			ctx.body = { ...e.response.data, ...{user: users ? users : 'null'} };
 		}
 	});
 	router.get("/v1/bookmarks", async (ctx) => {

From 03f7ba241aed2da83ddbc92c0ddc7520859ce3c5 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 17:08:48 +0100
Subject: [PATCH 019/582] nya

---
 packages/backend/src/server/api/mastodon/endpoints/account.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index f37a73a5e..34a02a9d2 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -311,8 +311,9 @@ export function apiAccountMastodon(router: Router): void {
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
+			e.response.data.user = users ? users : 'null';
 			ctx.status = 401;
-			ctx.body = { ...e.response.data, ...{user: users ? users : 'null'} };
+			ctx.body = e.response.data;
 		}
 	});
 	router.get("/v1/bookmarks", async (ctx) => {

From 9bec89afe82df508b12580f0c669df441ed5a3f6 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 18:54:38 +0100
Subject: [PATCH 020/582] initial bool parsing in mastodon

---
 .../server/api/mastodon/endpoints/account.ts  |  4 ++--
 .../server/api/mastodon/endpoints/timeline.ts | 23 +++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 34a02a9d2..21bb4a6fb 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -3,7 +3,7 @@ import { resolveUser } from "@/remote/resolve-user.js";
 import Router from "@koa/router";
 import { FindOptionsWhere, IsNull } from "typeorm";
 import { getClient } from "../ApiMastodonCompatibleService.js";
-import { toLimitToInt } from "./timeline.js";
+import { argsToBools, limitToInt } from "./timeline.js";
 
 const relationshopModel = {
 	id: "",
@@ -118,7 +118,7 @@ export function apiAccountMastodon(router: Router): void {
 			try {
 				const data = await client.getAccountStatuses(
 					ctx.params.id,
-					toLimitToInt(ctx.query as any),
+					argsToBools(limitToInt(ctx.query as any)),
 				);
 				ctx.body = data.data;
 			} catch (e: any) {
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index bb91a5604..04a15e65d 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -5,13 +5,22 @@ import { statusModel } from "./status.js";
 import Autolinker from "autolinker";
 import { ParsedUrlQuery } from "querystring";
 
-export function toLimitToInt(q: ParsedUrlQuery) {
+export function limitToInt(q: ParsedUrlQuery) {
 	let object: any = q;
 	if (q.limit)
 		if (typeof q.limit === "string") object.limit = parseInt(q.limit, 10);
 	return q;
 }
 
+export function argsToBools(q: ParsedUrlQuery) {
+	let object: any = q;
+	if (q.only_media)
+		if (typeof q.only_media === "string") object.only_media = q.only_media.toLowerCase() === "true";
+	if (q.exclude_replies)
+		if (typeof q.exclude_replies === "string") object.exclude_replies = q.exclude_replies.toLowerCase() === "true";
+	return q;
+}
+
 export function toTextWithReaction(status: Entity.Status[], host: string) {
 	return status.map((t) => {
 		if (!t) return statusModel(null, null, [], "no content");
@@ -62,8 +71,8 @@ export function apiTimelineMastodon(router: Router): void {
 		try {
 			const query: any = ctx.query;
 			const data = query.local
-				? await client.getLocalTimeline(toLimitToInt(query))
-				: await client.getPublicTimeline(toLimitToInt(query));
+				? await client.getLocalTimeline(limitToInt(query))
+				: await client.getPublicTimeline(limitToInt(query));
 			ctx.body = toTextWithReaction(data.data, ctx.hostname);
 		} catch (e: any) {
 			console.error(e);
@@ -81,7 +90,7 @@ export function apiTimelineMastodon(router: Router): void {
 			try {
 				const data = await client.getTagTimeline(
 					ctx.params.hashtag,
-					toLimitToInt(ctx.query),
+					limitToInt(ctx.query),
 				);
 				ctx.body = toTextWithReaction(data.data, ctx.hostname);
 			} catch (e: any) {
@@ -99,7 +108,7 @@ export function apiTimelineMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.getHomeTimeline(toLimitToInt(ctx.query));
+				const data = await client.getHomeTimeline(limitToInt(ctx.query));
 				ctx.body = toTextWithReaction(data.data, ctx.hostname);
 			} catch (e: any) {
 				console.error(e);
@@ -118,7 +127,7 @@ export function apiTimelineMastodon(router: Router): void {
 			try {
 				const data = await client.getListTimeline(
 					ctx.params.listId,
-					toLimitToInt(ctx.query),
+					limitToInt(ctx.query),
 				);
 				ctx.body = toTextWithReaction(data.data, ctx.hostname);
 			} catch (e: any) {
@@ -135,7 +144,7 @@ export function apiTimelineMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.getConversationTimeline(
-				toLimitToInt(ctx.query),
+				limitToInt(ctx.query),
 			);
 			ctx.body = data.data;
 		} catch (e: any) {

From 75b20908bd49cc83f8fe21fb81814285e02c2432 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 19:34:41 +0100
Subject: [PATCH 021/582] parse query stuff with bools

---
 .../server/api/mastodon/endpoints/account.ts  |  4 +-
 .../server/api/mastodon/endpoints/timeline.ts |  9 ----
 packages/backend/src/server/index.ts          | 51 +++++++++++++++++++
 3 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 21bb4a6fb..b479d5a48 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -3,7 +3,7 @@ import { resolveUser } from "@/remote/resolve-user.js";
 import Router from "@koa/router";
 import { FindOptionsWhere, IsNull } from "typeorm";
 import { getClient } from "../ApiMastodonCompatibleService.js";
-import { argsToBools, limitToInt } from "./timeline.js";
+import { limitToInt } from "./timeline.js";
 
 const relationshopModel = {
 	id: "",
@@ -118,7 +118,7 @@ export function apiAccountMastodon(router: Router): void {
 			try {
 				const data = await client.getAccountStatuses(
 					ctx.params.id,
-					argsToBools(limitToInt(ctx.query as any)),
+					limitToInt(ctx.query as any),
 				);
 				ctx.body = data.data;
 			} catch (e: any) {
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index 04a15e65d..f90c27544 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -12,15 +12,6 @@ export function limitToInt(q: ParsedUrlQuery) {
 	return q;
 }
 
-export function argsToBools(q: ParsedUrlQuery) {
-	let object: any = q;
-	if (q.only_media)
-		if (typeof q.only_media === "string") object.only_media = q.only_media.toLowerCase() === "true";
-	if (q.exclude_replies)
-		if (typeof q.exclude_replies === "string") object.exclude_replies = q.exclude_replies.toLowerCase() === "true";
-	return q;
-}
-
 export function toTextWithReaction(status: Entity.Status[], host: string) {
 	return status.map((t) => {
 		if (!t) return statusModel(null, null, [], "no content");
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 73cf58ec2..aef0d100f 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -30,9 +30,59 @@ import proxyServer from "./proxy/index.js";
 import webServer from "./web/index.js";
 import { initializeStreamingServer } from "./api/streaming.js";
 import { koaBody } from "koa-body";
+import { ParsedUrlQuery } from "node:querystring";
 
 export const serverLogger = new Logger("server", "gray", false);
 
+const stringToBoolean = (stringValue: string) => {
+	switch(stringValue?.toLowerCase()?.trim()){
+			case "true": 
+			case "yes": 
+			case "1": 
+				return true;
+
+			case "false": 
+			case "no": 
+			case "0": 
+			case null: 
+			case undefined:
+				return false;
+
+			default: 
+				return JSON.parse(stringValue);
+	}
+}
+
+const objectParser = (object: Object): Object => {
+	const newObject: any = {};
+
+	for (const key in object) {
+		const value = object[key];
+
+		if (typeof value === "object") {
+			newObject[key] = objectParser(value);
+		} else if (typeof value === "string") {
+			newObject[key] = stringToBoolean(value);
+		}
+	}
+
+	return newObject;
+};
+
+const queryParser = (object: ParsedUrlQuery): ParsedUrlQuery => {
+	const newObject = object;
+
+	for (const key in object) {
+		const value = object[key];
+
+		if (typeof value === "string") {
+			newObject[key] = stringToBoolean(value);
+		}
+	}
+
+	return newObject;
+};
+
 // Init app
 const app = new Koa();
 app.proxy = true;
@@ -80,6 +130,7 @@ mastoRouter.use(
 
 mastoRouter.use(async (ctx, next) => {
 	if (ctx.request.query) {
+		ctx.request.query = queryParser(ctx.request.query)
 		if (!ctx.request.body || Object.keys(ctx.request.body).length === 0) {
 			ctx.request.body = ctx.request.query
 		} else {

From 57e307ae39b4b02b8dd3d11b30bf28c01f92d721 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 19:39:14 +0100
Subject: [PATCH 022/582] Revert "parse query stuff with bools"

This reverts commit 4eb695f3c3acca0510036b13562207d35c7bf7fb.
---
 .../server/api/mastodon/endpoints/account.ts  |  4 +-
 .../server/api/mastodon/endpoints/timeline.ts |  9 ++++
 packages/backend/src/server/index.ts          | 51 -------------------
 3 files changed, 11 insertions(+), 53 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index b479d5a48..21bb4a6fb 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -3,7 +3,7 @@ import { resolveUser } from "@/remote/resolve-user.js";
 import Router from "@koa/router";
 import { FindOptionsWhere, IsNull } from "typeorm";
 import { getClient } from "../ApiMastodonCompatibleService.js";
-import { limitToInt } from "./timeline.js";
+import { argsToBools, limitToInt } from "./timeline.js";
 
 const relationshopModel = {
 	id: "",
@@ -118,7 +118,7 @@ export function apiAccountMastodon(router: Router): void {
 			try {
 				const data = await client.getAccountStatuses(
 					ctx.params.id,
-					limitToInt(ctx.query as any),
+					argsToBools(limitToInt(ctx.query as any)),
 				);
 				ctx.body = data.data;
 			} catch (e: any) {
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index f90c27544..04a15e65d 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -12,6 +12,15 @@ export function limitToInt(q: ParsedUrlQuery) {
 	return q;
 }
 
+export function argsToBools(q: ParsedUrlQuery) {
+	let object: any = q;
+	if (q.only_media)
+		if (typeof q.only_media === "string") object.only_media = q.only_media.toLowerCase() === "true";
+	if (q.exclude_replies)
+		if (typeof q.exclude_replies === "string") object.exclude_replies = q.exclude_replies.toLowerCase() === "true";
+	return q;
+}
+
 export function toTextWithReaction(status: Entity.Status[], host: string) {
 	return status.map((t) => {
 		if (!t) return statusModel(null, null, [], "no content");
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index aef0d100f..73cf58ec2 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -30,59 +30,9 @@ import proxyServer from "./proxy/index.js";
 import webServer from "./web/index.js";
 import { initializeStreamingServer } from "./api/streaming.js";
 import { koaBody } from "koa-body";
-import { ParsedUrlQuery } from "node:querystring";
 
 export const serverLogger = new Logger("server", "gray", false);
 
-const stringToBoolean = (stringValue: string) => {
-	switch(stringValue?.toLowerCase()?.trim()){
-			case "true": 
-			case "yes": 
-			case "1": 
-				return true;
-
-			case "false": 
-			case "no": 
-			case "0": 
-			case null: 
-			case undefined:
-				return false;
-
-			default: 
-				return JSON.parse(stringValue);
-	}
-}
-
-const objectParser = (object: Object): Object => {
-	const newObject: any = {};
-
-	for (const key in object) {
-		const value = object[key];
-
-		if (typeof value === "object") {
-			newObject[key] = objectParser(value);
-		} else if (typeof value === "string") {
-			newObject[key] = stringToBoolean(value);
-		}
-	}
-
-	return newObject;
-};
-
-const queryParser = (object: ParsedUrlQuery): ParsedUrlQuery => {
-	const newObject = object;
-
-	for (const key in object) {
-		const value = object[key];
-
-		if (typeof value === "string") {
-			newObject[key] = stringToBoolean(value);
-		}
-	}
-
-	return newObject;
-};
-
 // Init app
 const app = new Koa();
 app.proxy = true;
@@ -130,7 +80,6 @@ mastoRouter.use(
 
 mastoRouter.use(async (ctx, next) => {
 	if (ctx.request.query) {
-		ctx.request.query = queryParser(ctx.request.query)
 		if (!ctx.request.body || Object.keys(ctx.request.body).length === 0) {
 			ctx.request.body = ctx.request.query
 		} else {

From 88709e110415135c464b2f052c229619be0bb9cb Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Mon, 13 Feb 2023 18:57:33 +0000
Subject: [PATCH 023/582] Hopefully fix performance of topbar nav (#9631)

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9631
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 .../src/components/global/MkPageHeader.vue    | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index f59ebb4b6..3395ff52b 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -144,6 +144,7 @@ onMounted(() => {
 	calcBg();
 	globalEvents.on('themeChanged', calcBg);
 	
+	
 	watch(() => [props.tab, props.tabs], () => {
 		nextTick(() => {
 			const tabEl = tabRefs[props.tab];
@@ -153,10 +154,14 @@ onMounted(() => {
 				setTimeout(() => {
 					const parentRect = tabsEl.getBoundingClientRect();
 					const rect = tabEl.getBoundingClientRect();
+					const tabSizeX = tabEl.scrollWidth;
 					const left = (rect.left - parentRect.left + tabsEl?.scrollLeft);
-					tabHighlightEl.style.width = rect.width + 'px';
-					tabHighlightEl.style.left = left + 'px';
-					tabsEl?.scrollTo({left: left - 60, behavior: "smooth"});
+					tabEl.style = "--width: " + tabSizeX + "px";
+					tabHighlightEl.style.width = tabSizeX + 'px';
+					tabHighlightEl.style.transform = 'translateX(' + left + 'px)';
+					window.requestAnimationFrame(() => {
+						tabsEl?.scrollTo({left: left - 60, behavior: "smooth"});
+					})
 				}, 200);
 			}
 		});
@@ -189,7 +194,6 @@ onUnmounted(() => {
 	-webkit-backdrop-filter: var(--blur, blur(15px));
 	backdrop-filter: var(--blur, blur(15px));
 	border-bottom: solid 0.5px var(--divider);
-	contain: strict;
 	height: var(--height);
 
 	&.thin {
@@ -348,6 +352,7 @@ onUnmounted(() => {
 		font-size: 1em;
 		overflow-x: auto;
 		white-space: nowrap;
+		contain: strict;
 
 		> .tab {
 			display: inline-flex;
@@ -357,7 +362,9 @@ onUnmounted(() => {
 			height: 100%;
 			font-weight: normal;
 			opacity: 0.7;
-			transition: color .2s, opacity .2s;
+			width: 38px;
+			overflow: hidden;
+			transition: color .2s, opacity .2s, width .2s;
 
 			&:hover {
 				opacity: 1;
@@ -367,29 +374,28 @@ onUnmounted(() => {
 				opacity: 1;
 				color: var(--accent);
 				font-weight: 600;
+				width: var(--width);
+			}
+			&:not(.active) > .title {
+				opacity: 0;
 			}
 
 			> .icon + .title {
 				margin-left: 8px;
 			}
 			> .title {
-				transition: font-size .2s, opacity .2s .15s;
-			}
-			&:not(.active) > .title {
-				font-size: 0;
-				opacity: 0;
-				margin-inline: 0;
-				transition: font-size .2s, opacity .1s;
+				transition: font-size .2s, opacity .2s;
 			}
 		}
 
 		> .highlight {
 			position: absolute;
 			bottom: 0;
+			left: 0;
 			height: 3px;
 			background: var(--accent);
 			border-radius: 999px;
-			transition: width .2s, left .2s;
+			transition: width .2s, transform .2s;
 			transition-timing-function: cubic-bezier(0,0,0,1.2);
 			pointer-events: none;
 		}

From 68c65044fd2c49dd5db0d87bbd37d858083571bb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 11:17:07 -0800
Subject: [PATCH 024/582] chore: formatting

---
 packages/backend/src/server/api/index.ts              |  4 ++--
 .../src/server/api/mastodon/endpoints/account.ts      | 11 +++++++----
 .../src/server/api/mastodon/endpoints/timeline.ts     | 10 +++++-----
 packages/backend/src/server/index.ts                  |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index bc1f94a7c..3ea3ff67e 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -71,9 +71,9 @@ mastoRouter.use(
 mastoRouter.use(async (ctx, next) => {
 	if (ctx.request.query) {
 		if (!ctx.request.body || Object.keys(ctx.request.body).length === 0) {
-			ctx.request.body = ctx.request.query
+			ctx.request.body = ctx.request.query;
 		} else {
-			ctx.request.body = {...ctx.request.body, ...ctx.request.query}
+			ctx.request.body = { ...ctx.request.body, ...ctx.request.query };
 		}
 	}
 	await next();
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 21bb4a6fb..7a3df03bd 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -75,18 +75,21 @@ export function apiAccountMastodon(router: Router): void {
 			let userid;
 			if (userArray === undefined) {
 				ctx.status = 401;
-				ctx.body = { error: "no user specified"};
+				ctx.body = { error: "no user specified" };
 				return;
 			}
 			if (userArray.length === 1) {
-				const q: FindOptionsWhere<User> = { usernameLower: userArray[0].toLowerCase(), host: IsNull() };
+				const q: FindOptionsWhere<User> = {
+					usernameLower: userArray[0].toLowerCase(),
+					host: IsNull(),
+				};
 
 				const user = await Users.findOneBy(q);
 				userid = user?.id;
 			} else {
 				userid = (await resolveUser(userArray[0], userArray[1])).id;
 			}
-			const data = await client.getAccount(userid ? userid : '');
+			const data = await client.getAccount(userid ? userid : "");
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);
@@ -311,7 +314,7 @@ export function apiAccountMastodon(router: Router): void {
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
-			e.response.data.user = users ? users : 'null';
+			e.response.data.user = users ? users : "null";
 			ctx.status = 401;
 			ctx.body = e.response.data;
 		}
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index 04a15e65d..7cd9e26cb 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -15,9 +15,11 @@ export function limitToInt(q: ParsedUrlQuery) {
 export function argsToBools(q: ParsedUrlQuery) {
 	let object: any = q;
 	if (q.only_media)
-		if (typeof q.only_media === "string") object.only_media = q.only_media.toLowerCase() === "true";
+		if (typeof q.only_media === "string")
+			object.only_media = q.only_media.toLowerCase() === "true";
 	if (q.exclude_replies)
-		if (typeof q.exclude_replies === "string") object.exclude_replies = q.exclude_replies.toLowerCase() === "true";
+		if (typeof q.exclude_replies === "string")
+			object.exclude_replies = q.exclude_replies.toLowerCase() === "true";
 	return q;
 }
 
@@ -143,9 +145,7 @@ export function apiTimelineMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getConversationTimeline(
-				limitToInt(ctx.query),
-			);
+			const data = await client.getConversationTimeline(limitToInt(ctx.query));
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 73cf58ec2..6dff70665 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -81,9 +81,9 @@ mastoRouter.use(
 mastoRouter.use(async (ctx, next) => {
 	if (ctx.request.query) {
 		if (!ctx.request.body || Object.keys(ctx.request.body).length === 0) {
-			ctx.request.body = ctx.request.query
+			ctx.request.body = ctx.request.query;
 		} else {
-			ctx.request.body = {...ctx.request.body, ...ctx.request.query}
+			ctx.request.body = { ...ctx.request.body, ...ctx.request.query };
 		}
 	}
 	await next();

From d83e2f2c7ab3a2f8963bc5b3c172f302732dd9ca Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 20:26:54 +0100
Subject: [PATCH 025/582] mew

---
 .../backend/src/server/api/mastodon/endpoints/account.ts     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 7a3df03bd..8c0111f99 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -308,13 +308,12 @@ export function apiAccountMastodon(router: Router): void {
 			const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw;
 			users = ids;
 			relationshopModel.id = idsRaw?.toString() || "1";
-			if (!idsRaw) return [relationshopModel];
-			const data = (await client.getRelationships(ids ? ids : [])) as any;
+			if (!ids) return [relationshopModel];
+			const data = await client.getRelationships(ids);
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
-			e.response.data.user = users ? users : "null";
 			ctx.status = 401;
 			ctx.body = e.response.data;
 		}

From b209a9e533af1f7aafc5ebe1ca40027a097cfcca Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 20:36:13 +0100
Subject: [PATCH 026/582] uwu

---
 .../backend/src/server/api/mastodon/endpoints/account.ts     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 8c0111f99..b089f0477 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -308,7 +308,10 @@ export function apiAccountMastodon(router: Router): void {
 			const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw;
 			users = ids;
 			relationshopModel.id = idsRaw?.toString() || "1";
-			if (!ids) return [relationshopModel];
+			if (!ids) {
+				ctx.body = [relationshopModel];
+				return;
+			}
 			const data = await client.getRelationships(ids);
 			ctx.body = data.data;
 		} catch (e: any) {

From c4683c0196dbc9bb9c72f5a1a9cc222b08db8521 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 20:38:11 +0100
Subject: [PATCH 027/582] actually return value

---
 packages/backend/src/server/api/mastodon/endpoints/account.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index b089f0477..295a57909 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -308,7 +308,7 @@ export function apiAccountMastodon(router: Router): void {
 			const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw;
 			users = ids;
 			relationshopModel.id = idsRaw?.toString() || "1";
-			if (!ids) {
+			if (!idsRaw) {
 				ctx.body = [relationshopModel];
 				return;
 			}

From a607673019f7e00450ca39686b7046b8cccaa5cc Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 13 Feb 2023 20:41:42 +0100
Subject: [PATCH 028/582] try again

---
 packages/backend/src/server/api/mastodon/endpoints/account.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 295a57909..abb31bb7f 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -304,11 +304,11 @@ export function apiAccountMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		let users;
 		try {
-			const idsRaw = ctx.query["id[]"];
+			const idsRaw = ctx.request.body?["id[]"] : null;
 			const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw;
 			users = ids;
 			relationshopModel.id = idsRaw?.toString() || "1";
-			if (!idsRaw) {
+			if (!(idsRaw && ids)) {
 				ctx.body = [relationshopModel];
 				return;
 			}

From ef1fa067f9a2cb7eeb19fdb3d1f180a60fd03dca Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Mon, 13 Feb 2023 21:14:06 +0000
Subject: [PATCH 029/582] Top nav fixes (#9634) Co-authored-by: Free
 <freeplay@duck.com> Co-committed-by: Free <freeplay@duck.com>

---
 .../client/src/components/global/MkPageHeader.vue    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 3395ff52b..8fa3edfe1 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -144,21 +144,20 @@ onMounted(() => {
 	calcBg();
 	globalEvents.on('themeChanged', calcBg);
 	
-	
 	watch(() => [props.tab, props.tabs], () => {
 		nextTick(() => {
 			const tabEl = tabRefs[props.tab];
 			if (tabEl && tabHighlightEl) {
 				// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
 				// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
+				const tabSizeX = tabEl.scrollWidth + 20; // + the tab's padding
+				tabEl.style = `--width: ${tabSizeX}px`;
 				setTimeout(() => {
 					const parentRect = tabsEl.getBoundingClientRect();
 					const rect = tabEl.getBoundingClientRect();
-					const tabSizeX = tabEl.scrollWidth;
 					const left = (rect.left - parentRect.left + tabsEl?.scrollLeft);
-					tabEl.style = "--width: " + tabSizeX + "px";
 					tabHighlightEl.style.width = tabSizeX + 'px';
-					tabHighlightEl.style.transform = 'translateX(' + left + 'px)';
+					tabHighlightEl.style.transform = `translateX(${left}px)`;
 					window.requestAnimationFrame(() => {
 						tabsEl?.scrollTo({left: left - 60, behavior: "smooth"});
 					})
@@ -358,11 +357,12 @@ onUnmounted(() => {
 			display: inline-flex;
 			align-items: center;
 			position: relative;
-			padding: 0 10px;
+			border-inline: 10px solid transparent;
 			height: 100%;
 			font-weight: normal;
 			opacity: 0.7;
 			width: 38px;
+			--width: 38px;
 			overflow: hidden;
 			transition: color .2s, opacity .2s, width .2s;
 
@@ -384,7 +384,7 @@ onUnmounted(() => {
 				margin-left: 8px;
 			}
 			> .title {
-				transition: font-size .2s, opacity .2s;
+				transition: opacity .2s;
 			}
 		}
 

From 1355b955894d04b5d6b3aeefe2c4a95fb12ad4ae Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 19:40:31 -0800
Subject: [PATCH 030/582] feat: :sparkles: new admin panel data from Mk v13

---
 package.json                                  |   2 +-
 packages/client/package.json                  |   3 +-
 packages/client/src/components/MkHeatmap.vue  | 218 +++++++++++++
 .../client/src/components/MkInstanceStats.vue |  31 +-
 .../src/pages/admin/overview.active-users.vue | 167 ++++++++++
 .../src/pages/admin/overview.ap-requests.vue  | 287 ++++++++++++++++++
 .../src/pages/admin/overview.federation.vue   | 225 +++++++++-----
 .../src/pages/admin/overview.heatmap.vue      |  25 ++
 .../src/pages/admin/overview.instances.vue    |  50 +++
 .../src/pages/admin/overview.moderators.vue   |  55 ++++
 .../client/src/pages/admin/overview.pie.vue   |  49 +--
 .../src/pages/admin/overview.queue.chart.vue  | 140 +++++++++
 .../client/src/pages/admin/overview.queue.vue | 127 ++++++++
 .../client/src/pages/admin/overview.stats.vue | 173 +++++++++++
 .../client/src/pages/admin/overview.users.vue |  57 ++++
 packages/client/src/pages/admin/overview.vue  |  55 ++++
 packages/client/src/scripts/color.ts          |   7 +
 packages/client/src/scripts/init-chart.ts     |  58 ++++
 .../client/src/scripts/use-chart-tooltip.ts   |  16 +-
 pnpm-lock.yaml                                |  27 +-
 20 files changed, 1649 insertions(+), 123 deletions(-)
 create mode 100644 packages/client/src/components/MkHeatmap.vue
 create mode 100644 packages/client/src/pages/admin/overview.active-users.vue
 create mode 100644 packages/client/src/pages/admin/overview.ap-requests.vue
 create mode 100644 packages/client/src/pages/admin/overview.heatmap.vue
 create mode 100644 packages/client/src/pages/admin/overview.instances.vue
 create mode 100644 packages/client/src/pages/admin/overview.moderators.vue
 create mode 100644 packages/client/src/pages/admin/overview.queue.chart.vue
 create mode 100644 packages/client/src/pages/admin/overview.queue.vue
 create mode 100644 packages/client/src/pages/admin/overview.stats.vue
 create mode 100644 packages/client/src/pages/admin/overview.users.vue
 create mode 100644 packages/client/src/scripts/color.ts
 create mode 100644 packages/client/src/scripts/init-chart.ts

diff --git a/package.json b/package.json
index da1e886ac..3da6e94d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev7",
+	"version": "13.2.0-dev8",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/package.json b/packages/client/package.json
index fb63b52a6..4af4ff8f6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -7,7 +7,8 @@
 		"lint": "pnpm rome check \"src/**/*.{ts,vue}\""
 	},
 	"dependencies": {
-		"@khmyznikov/pwa-install": "^0.2.0"
+		"@khmyznikov/pwa-install": "^0.2.0",
+		"chartjs-chart-matrix": "^2.0.1"
 	},
 	"devDependencies": {
 		"@discordapp/twemoji": "14.0.2",
diff --git a/packages/client/src/components/MkHeatmap.vue b/packages/client/src/components/MkHeatmap.vue
new file mode 100644
index 000000000..036a2eb49
--- /dev/null
+++ b/packages/client/src/components/MkHeatmap.vue
@@ -0,0 +1,218 @@
+<template>
+	<div ref="rootEl">
+		<MkLoading v-if="fetching"/>
+		<div v-else>
+			<canvas ref="chartEl"></canvas>
+		</div>
+	</div>
+	</template>
+
+<script lang="ts" setup>
+import { markRaw, version as vueVersion, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
+import { Chart } from 'chart.js';
+import tinycolor from 'tinycolor2';
+import { MatrixController, MatrixElement } from 'chartjs-chart-matrix';
+import * as os from '@/os';
+import { defaultStore } from '@/store';
+import { useChartTooltip } from '@/scripts/use-chart-tooltip';
+import { chartVLine } from '@/scripts/chart-vline';
+import { alpha } from '@/scripts/color';
+import { initChart } from '@/scripts/init-chart';
+
+initChart();
+
+const props = defineProps<{
+	src: string;
+}>();
+
+const rootEl = $shallowRef<HTMLDivElement>(null);
+const chartEl = $shallowRef<HTMLCanvasElement>(null);
+const now = new Date();
+let chartInstance: Chart = null;
+let fetching = $ref(true);
+
+const { handler: externalTooltipHandler } = useChartTooltip({
+	position: 'middle',
+});
+
+async function renderChart() {
+	if (chartInstance) {
+		chartInstance.destroy();
+	}
+
+	const wide = rootEl.offsetWidth > 700;
+	const narrow = rootEl.offsetWidth < 400;
+
+	const weeks = wide ? 50 : narrow ? 10 : 25;
+	const chartLimit = 7 * weeks;
+
+	const getDate = (ago: number) => {
+		const y = now.getFullYear();
+		const m = now.getMonth();
+		const d = now.getDate();
+
+		return new Date(y, m, d - ago);
+	};
+
+	const format = (arr) => {
+		return arr.map((v, i) => {
+			const dt = getDate(i);
+			const iso = `${dt.getFullYear()}-${(dt.getMonth() + 1).toString().padStart(2, '0')}-${dt.getDate().toString().padStart(2, '0')}`;
+			return {
+				x: iso,
+				y: dt.getDay(),
+				d: iso,
+				v,
+			};
+		});
+	};
+
+	let values;
+
+	if (props.src === 'active-users') {
+		const raw = await os.api('charts/active-users', { limit: chartLimit, span: 'day' });
+		values = raw.readWrite;
+	} else if (props.src === 'notes') {
+		const raw = await os.api('charts/notes', { limit: chartLimit, span: 'day' });
+		values = raw.local.inc;
+	} else if (props.src === 'ap-requests-inbox-received') {
+		const raw = await os.api('charts/ap-request', { limit: chartLimit, span: 'day' });
+		values = raw.inboxReceived;
+	} else if (props.src === 'ap-requests-deliver-succeeded') {
+		const raw = await os.api('charts/ap-request', { limit: chartLimit, span: 'day' });
+		values = raw.deliverSucceeded;
+	} else if (props.src === 'ap-requests-deliver-failed') {
+		const raw = await os.api('charts/ap-request', { limit: chartLimit, span: 'day' });
+		values = raw.deliverFailed;
+	}
+
+	fetching = false;
+
+	await nextTick();
+
+	const color = defaultStore.state.darkMode ? '#b4e900' : '#86b300';
+
+	// 視覚上の分かりやすさのため上から最も大きい3つの値の平均を最大値とする
+	const max = values.slice().sort((a, b) => b - a).slice(0, 3).reduce((a, b) => a + b, 0) / 3;
+
+	const min = Math.max(0, Math.min(...values) - 1);
+
+	const marginEachCell = 4;
+
+	chartInstance = new Chart(chartEl, {
+		type: 'matrix',
+		data: {
+			datasets: [{
+				label: 'Read & Write',
+				data: format(values),
+				pointRadius: 0,
+				borderWidth: 0,
+				borderJoinStyle: 'round',
+				borderRadius: 3,
+				backgroundColor(c) {
+					const value = c.dataset.data[c.dataIndex].v;
+					let a = (value - min) / max;
+					if (value !== 0) { // 0でない限りは完全に不可視にはしない
+						a = Math.max(a, 0.05);
+					}
+					return alpha(color, a);
+				},
+				fill: true,
+				width(c) {
+					const a = c.chart.chartArea ?? {};
+					return (a.right - a.left) / weeks - marginEachCell;
+				},
+				height(c) {
+					const a = c.chart.chartArea ?? {};
+					return (a.bottom - a.top) / 7 - marginEachCell;
+				},
+			}],
+		},
+		options: {
+			aspectRatio: wide ? 6 : narrow ? 1.8 : 3.2,
+			layout: {
+				padding: {
+					left: 8,
+					right: 0,
+					top: 0,
+					bottom: 0,
+				},
+			},
+			scales: {
+				x: {
+					type: 'time',
+					offset: true,
+					position: 'bottom',
+					time: {
+						unit: 'week',
+						round: 'week',
+						isoWeekday: 0,
+						displayFormats: {
+							day: 'M/d',
+							month: 'Y/M',
+							week: 'M/d',
+						},
+					},
+					grid: {
+						display: false,
+					},
+					ticks: {
+						display: true,
+						maxRotation: 0,
+						autoSkipPadding: 8,
+					},
+				},
+				y: {
+					offset: true,
+					reverse: true,
+					position: 'right',
+					grid: {
+						display: false,
+					},
+					ticks: {
+						maxRotation: 0,
+						autoSkip: true,
+						padding: 1,
+						font: {
+							size: 9,
+						},
+						callback: (value, index, values) => ['', 'Mon', '', 'Wed', '', 'Fri', ''][value],
+					},
+				},
+			},
+			plugins: {
+				legend: {
+					display: false,
+				},
+				tooltip: {
+					enabled: false,
+					callbacks: {
+						title(context) {
+							const v = context[0].dataset.data[context[0].dataIndex];
+							return v.d;
+						},
+						label(context) {
+							const v = context.dataset.data[context.dataIndex];
+							return ['Active: ' + v.v];
+						},
+					},
+					//mode: 'index',
+					animation: {
+						duration: 0,
+					},
+					external: externalTooltipHandler,
+				},
+			},
+		},
+	});
+}
+
+watch(() => props.src, () => {
+	fetching = true;
+	renderChart();
+});
+
+onMounted(async () => {
+	renderChart();
+});
+</script>
diff --git a/packages/client/src/components/MkInstanceStats.vue b/packages/client/src/components/MkInstanceStats.vue
index 0437e05fa..2c287e4e9 100644
--- a/packages/client/src/components/MkInstanceStats.vue
+++ b/packages/client/src/components/MkInstanceStats.vue
@@ -32,6 +32,19 @@
 			<div class="chart">
 				<MkChart :src="chartSrc" :span="chartSpan" :limit="chartLimit" :detailed="detailed"></MkChart>
 			</div>
+			<div class="item">
+				<template #header>Active users heatmap</template>
+				<MkSelect v-model="heatmapSrc" style="margin: 0 0 12px 0;">
+					<option value="active-users">Active users</option>
+					<option value="notes">Notes</option>
+					<option value="ap-requests-inbox-received">AP Requests: inboxReceived</option>
+					<option value="ap-requests-deliver-succeeded">AP Requests: deliverSucceeded</option>
+					<option value="ap-requests-deliver-failed">AP Requests: deliverFailed</option>
+				</MkSelect>
+				<div class="_panel heatmap">
+					<MkHeatmap :src="heatmapSrc"/>
+				</div>
+			</div>
 		</div>
 	</div>
 	<div class="subpub">
@@ -69,6 +82,7 @@ import {
 } from 'chart.js';
 import MkSelect from '@/components/form/select.vue';
 import MkChart from '@/components/MkChart.vue';
+import MkHeatmap from '@/components/MkHeatmap.vue';
 import { useChartTooltip } from '@/scripts/use-chart-tooltip';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
@@ -98,13 +112,18 @@ const props = withDefaults(defineProps<{
 	chartLimit: 90,
 });
 
-const chartSpan = $ref<'hour' | 'day'>('hour');
-const chartSrc = $ref('active-users');
+let chartSpan = $ref<'hour' | 'day'>('hour');
+let chartSrc = $ref('active-users');
+let heatmapSrc = $ref('active-users');
 let subDoughnutEl = $ref<HTMLCanvasElement>();
 let pubDoughnutEl = $ref<HTMLCanvasElement>();
 
-const { handler: externalTooltipHandler1 } = useChartTooltip();
-const { handler: externalTooltipHandler2 } = useChartTooltip();
+const { handler: externalTooltipHandler1 } = useChartTooltip({
+	position: 'middle',
+});
+const { handler: externalTooltipHandler2 } = useChartTooltip({
+	position: 'middle',
+});
 
 function createDoughnut(chartEl, tooltip, data) {
 	const chartInstance = new Chart(chartEl, {
@@ -189,6 +208,10 @@ onMounted(() => {
 			> .chart {
 				padding: 8px 0 0 0;
 			}
+			> .heatmap {
+				padding: 12px;
+				margin-bottom: 12px;
+			}
 		}
 	}
 
diff --git a/packages/client/src/pages/admin/overview.active-users.vue b/packages/client/src/pages/admin/overview.active-users.vue
new file mode 100644
index 000000000..3ec7694f2
--- /dev/null
+++ b/packages/client/src/pages/admin/overview.active-users.vue
@@ -0,0 +1,167 @@
+<template>
+<div>
+	<MkLoading v-if="fetching"/>
+	<div v-show="!fetching" :class="$style.root" class="_panel">
+		<canvas ref="chartEl"></canvas>
+	</div>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { markRaw, version as vueVersion, onMounted, onBeforeUnmount, nextTick } from 'vue';
+import { Chart } from 'chart.js';
+import tinycolor from 'tinycolor2';
+import gradient from 'chartjs-plugin-gradient';
+import * as os from '@/os';
+import { defaultStore } from '@/store';
+import { useChartTooltip } from '@/scripts/use-chart-tooltip';
+import { chartVLine } from '@/scripts/chart-vline';
+import { alpha } from '@/scripts/color';
+import { initChart } from '@/scripts/init-chart';
+
+initChart();
+
+const chartEl = $shallowRef<HTMLCanvasElement>(null);
+const now = new Date();
+let chartInstance: Chart = null;
+const chartLimit = 7;
+let fetching = $ref(true);
+
+const { handler: externalTooltipHandler } = useChartTooltip();
+
+async function renderChart() {
+	if (chartInstance) {
+		chartInstance.destroy();
+	}
+
+	const getDate = (ago: number) => {
+		const y = now.getFullYear();
+		const m = now.getMonth();
+		const d = now.getDate();
+
+		return new Date(y, m, d - ago);
+	};
+
+	const format = (arr) => {
+		return arr.map((v, i) => ({
+			x: getDate(i).getTime(),
+			y: v,
+		}));
+	};
+
+	const raw = await os.api('charts/active-users', { limit: chartLimit, span: 'day' });
+
+	const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
+
+	const colorRead = '#3498db';
+	const colorWrite = '#2ecc71';
+
+	const max = Math.max(...raw.read);
+
+	chartInstance = new Chart(chartEl, {
+		type: 'bar',
+		data: {
+			datasets: [{
+				parsing: false,
+				label: 'Read',
+				data: format(raw.read).slice().reverse(),
+				pointRadius: 0,
+				borderWidth: 0,
+				borderJoinStyle: 'round',
+				borderRadius: 4,
+				backgroundColor: colorRead,
+				barPercentage: 0.7,
+				categoryPercentage: 0.5,
+				fill: true,
+			}, {
+				parsing: false,
+				label: 'Write',
+				data: format(raw.write).slice().reverse(),
+				pointRadius: 0,
+				borderWidth: 0,
+				borderJoinStyle: 'round',
+				borderRadius: 4,
+				backgroundColor: colorWrite,
+				barPercentage: 0.7,
+				categoryPercentage: 0.5,
+				fill: true,
+			}],
+		},
+		options: {
+			aspectRatio: 2.5,
+			layout: {
+				padding: {
+					left: 0,
+					right: 8,
+					top: 0,
+					bottom: 0,
+				},
+			},
+			scales: {
+				x: {
+					type: 'time',
+					offset: true,
+					time: {
+						stepSize: 1,
+						unit: 'day',
+						displayFormats: {
+							day: 'M/d',
+							month: 'Y/M',
+						},
+					},
+					grid: {
+						display: false,
+					},
+					ticks: {
+						display: true,
+						maxRotation: 0,
+						autoSkipPadding: 8,
+					},
+				},
+				y: {
+					position: 'left',
+					suggestedMax: 10,
+					grid: {
+						display: true,
+					},
+					ticks: {
+						display: true,
+						//mirror: true,
+					},
+				},
+			},
+			interaction: {
+				intersect: false,
+				mode: 'index',
+			},
+			plugins: {
+				legend: {
+					display: false,
+				},
+				tooltip: {
+					enabled: false,
+					mode: 'index',
+					animation: {
+						duration: 0,
+					},
+					external: externalTooltipHandler,
+				},
+				gradient,
+			},
+		},
+		plugins: [chartVLine(vLineColor)],
+	});
+
+	fetching = false;
+}
+
+onMounted(async () => {
+	renderChart();
+});
+</script>
+
+<style lang="scss" module>
+.root {
+	padding: 20px;
+}
+</style>
diff --git a/packages/client/src/pages/admin/overview.ap-requests.vue b/packages/client/src/pages/admin/overview.ap-requests.vue
new file mode 100644
index 000000000..efb335fff
--- /dev/null
+++ b/packages/client/src/pages/admin/overview.ap-requests.vue
@@ -0,0 +1,287 @@
+<template>
+<div>
+	<MkLoading v-if="fetching"/>
+	<div v-show="!fetching" :class="$style.root">
+		<div class="charts _panel">
+			<div class="chart">
+				<canvas ref="chartEl2"></canvas>
+			</div>
+			<div class="chart">
+				<canvas ref="chartEl"></canvas>
+			</div>
+		</div>
+	</div>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, onUnmounted, ref } from 'vue';
+import { Chart } from 'chart.js';
+import gradient from 'chartjs-plugin-gradient';
+import tinycolor from 'tinycolor2';
+import MkMiniChart from '@/components/MkMiniChart.vue';
+import * as os from '@/os';
+import number from '@/filters/number';
+import MkNumberDiff from '@/components/MkNumberDiff.vue';
+import { i18n } from '@/i18n';
+import { useChartTooltip } from '@/scripts/use-chart-tooltip';
+import { chartVLine } from '@/scripts/chart-vline';
+import { defaultStore } from '@/store';
+import { alpha } from '@/scripts/color';
+import { initChart } from '@/scripts/init-chart';
+
+initChart();
+
+const chartLimit = 50;
+const chartEl = $shallowRef<HTMLCanvasElement>();
+const chartEl2 = $shallowRef<HTMLCanvasElement>();
+let fetching = $ref(true);
+
+const { handler: externalTooltipHandler } = useChartTooltip();
+const { handler: externalTooltipHandler2 } = useChartTooltip();
+
+onMounted(async () => {
+	const now = new Date();
+
+	const getDate = (ago: number) => {
+		const y = now.getFullYear();
+		const m = now.getMonth();
+		const d = now.getDate();
+
+		return new Date(y, m, d - ago);
+	};
+
+	const format = (arr) => {
+		return arr.map((v, i) => ({
+			x: getDate(i).getTime(),
+			y: v,
+		}));
+	};
+
+	const formatMinus = (arr) => {
+		return arr.map((v, i) => ({
+			x: getDate(i).getTime(),
+			y: -v,
+		}));
+	};
+
+	const raw = await os.api('charts/ap-request', { limit: chartLimit, span: 'day' });
+
+	const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
+	const succColor = '#87e000';
+	const failColor = '#ff4400';
+
+	const succMax = Math.max(...raw.deliverSucceeded);
+	const failMax = Math.max(...raw.deliverFailed);
+
+	new Chart(chartEl, {
+		type: 'line',
+		data: {
+			datasets: [{
+				stack: 'a',
+				parsing: false,
+				label: 'Out: Succ',
+				data: format(raw.deliverSucceeded).slice().reverse(),
+				tension: 0.3,
+				pointRadius: 0,
+				borderWidth: 2,
+				borderColor: succColor,
+				borderJoinStyle: 'round',
+				borderRadius: 4,
+				backgroundColor: alpha(succColor, 0.35),
+				fill: true,
+				clip: 8,
+			}, {
+				stack: 'a',
+				parsing: false,
+				label: 'Out: Fail',
+				data: formatMinus(raw.deliverFailed).slice().reverse(),
+				tension: 0.3,
+				pointRadius: 0,
+				borderWidth: 2,
+				borderColor: failColor,
+				borderJoinStyle: 'round',
+				borderRadius: 4,
+				backgroundColor: alpha(failColor, 0.35),
+				fill: true,
+				clip: 8,
+			}],
+		},
+		options: {
+			aspectRatio: 2.5,
+			layout: {
+				padding: {
+					left: 0,
+					right: 8,
+					top: 0,
+					bottom: 0,
+				},
+			},
+			scales: {
+				x: {
+					type: 'time',
+					stacked: true,
+					offset: false,
+					time: {
+						stepSize: 1,
+						unit: 'day',
+					},
+					grid: {
+						display: true,
+					},
+					ticks: {
+						display: true,
+						maxRotation: 0,
+						autoSkipPadding: 16,
+					},
+					min: getDate(chartLimit).getTime(),
+				},
+				y: {
+					stacked: true,
+					position: 'left',
+					suggestedMax: 10,
+					grid: {
+						display: true,
+					},
+					ticks: {
+						display: true,
+						//mirror: true,
+						callback: (value, index, values) => value < 0 ? -value : value,
+					},
+				},
+			},
+			interaction: {
+				intersect: false,
+				mode: 'index',
+			},
+			elements: {
+				point: {
+					hoverRadius: 5,
+					hoverBorderWidth: 2,
+				},
+			},
+			plugins: {
+				legend: {
+					display: false,
+				},
+				tooltip: {
+					enabled: false,
+					mode: 'index',
+					animation: {
+						duration: 0,
+					},
+					external: externalTooltipHandler,
+				},
+				gradient,
+			},
+		},
+		plugins: [chartVLine(vLineColor)],
+	});
+
+	new Chart(chartEl2, {
+		type: 'bar',
+		data: {
+			datasets: [{
+				parsing: false,
+				label: 'In',
+				data: format(raw.inboxReceived).slice().reverse(),
+				tension: 0.3,
+				pointRadius: 0,
+				borderWidth: 0,
+				borderJoinStyle: 'round',
+				borderRadius: 4,
+				backgroundColor: '#0cc2d6',
+				barPercentage: 0.8,
+				categoryPercentage: 0.9,
+				fill: true,
+				clip: 8,
+			}],
+		},
+		options: {
+			aspectRatio: 5,
+			layout: {
+				padding: {
+					left: 0,
+					right: 8,
+					top: 0,
+					bottom: 0,
+				},
+			},
+			scales: {
+				x: {
+					type: 'time',
+					offset: false,
+					time: {
+						stepSize: 1,
+						unit: 'day',
+						displayFormats: {
+							day: 'M/d',
+							month: 'Y/M',
+						},
+					},
+					grid: {
+						display: false,
+					},
+					ticks: {
+						display: false,
+						maxRotation: 0,
+						autoSkipPadding: 16,
+					},
+					min: getDate(chartLimit).getTime(),
+				},
+				y: {
+					position: 'left',
+					suggestedMax: 10,
+					grid: {
+						display: true,
+					},
+				},
+			},
+			interaction: {
+				intersect: false,
+				mode: 'index',
+			},
+			elements: {
+				point: {
+					hoverRadius: 5,
+					hoverBorderWidth: 2,
+				},
+			},
+			plugins: {
+				legend: {
+					display: false,
+				},
+				tooltip: {
+					enabled: false,
+					mode: 'index',
+					animation: {
+						duration: 0,
+					},
+					external: externalTooltipHandler2,
+				},
+				gradient,
+			},
+		},
+		plugins: [chartVLine(vLineColor)],
+	});
+	
+	fetching = false;
+});
+</script>
+
+<style lang="scss" module>
+.root {
+	&:global {
+		> .charts {
+			> .chart {
+				padding: 16px;
+
+				&:first-child {
+					border-bottom: solid 0.5px var(--divider);
+				}
+			}
+		}
+	}
+}
+</style>
+
diff --git a/packages/client/src/pages/admin/overview.federation.vue b/packages/client/src/pages/admin/overview.federation.vue
index e8cb5867a..2789adf64 100644
--- a/packages/client/src/pages/admin/overview.federation.vue
+++ b/packages/client/src/pages/admin/overview.federation.vue
@@ -1,100 +1,185 @@
 <template>
-<div class="wbrkwale">
+<div>
 	<MkLoading v-if="fetching"/>
-	<transition-group v-else tag="div" :name="$store.state.animation ? 'chart' : ''" class="instances">
-		<MkA v-for="(instance, i) in instances" :key="instance.id" :to="`/instance-info/${instance.host}`" class="instance">
-			<img v-if="instance.iconUrl" :src="instance.iconUrl" alt=""/>
-			<div class="body">
-				<div class="name">{{ instance.name ?? instance.host }}</div>
-				<div class="host">{{ instance.host }}</div>
+	<div v-show="!fetching" :class="$style.root">
+		<div v-if="topSubInstancesForPie && topPubInstancesForPie" class="pies">
+			<div class="pie deliver _panel">
+				<div class="title">Sub</div>
+				<XPie :data="topSubInstancesForPie" class="chart"/>
+				<div class="subTitle">Top 10</div>
 			</div>
-			<MkMiniChart class="chart" :src="charts[i].requests.received"/>
-		</MkA>
-	</transition-group>
+			<div class="pie inbox _panel">
+				<div class="title">Pub</div>
+				<XPie :data="topPubInstancesForPie" class="chart"/>
+				<div class="subTitle">Top 10</div>
+			</div>
+		</div>
+		<div v-if="!fetching" class="items">
+			<div class="item _panel sub">
+				<div class="icon"><i class="ti ti-world-download"></i></div>
+				<div class="body">
+					<div class="value">
+						{{ number(federationSubActive) }}
+						<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="federationSubActiveDiff"></MkNumberDiff>
+					</div>
+					<div class="label">Sub</div>
+				</div>
+			</div>
+			<div class="item _panel pub">
+				<div class="icon"><i class="ti ti-world-upload"></i></div>
+				<div class="body">
+					<div class="value">
+						{{ number(federationPubActive) }}
+						<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="federationPubActiveDiff"></MkNumberDiff>
+					</div>
+					<div class="label">Pub</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </div>
 </template>
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref } from 'vue';
+import XPie from './overview.pie.vue';
 import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
+import number from '@/filters/number';
+import MkNumberDiff from '@/components/MkNumberDiff.vue';
+import { i18n } from '@/i18n';
+import { useChartTooltip } from '@/scripts/use-chart-tooltip';
 
-const instances = ref([]);
-const charts = ref([]);
-const fetching = ref(true);
+let topSubInstancesForPie: any = $ref(null);
+let topPubInstancesForPie: any = $ref(null);
+let federationPubActive = $ref<number | null>(null);
+let federationPubActiveDiff = $ref<number | null>(null);
+let federationSubActive = $ref<number | null>(null);
+let federationSubActiveDiff = $ref<number | null>(null);
+let fetching = $ref(true);
 
-const fetch = async () => {
-	const fetchedInstances = await os.api('federation/instances', {
-		sort: '+lastCommunicatedAt',
-		limit: 5,
+const { handler: externalTooltipHandler } = useChartTooltip();
+	
+onMounted(async () => {
+	const chart = await os.apiGet('charts/federation', { limit: 2, span: 'day' });
+	federationPubActive = chart.pubActive[0];
+	federationPubActiveDiff = chart.pubActive[0] - chart.pubActive[1];
+	federationSubActive = chart.subActive[0];
+	federationSubActiveDiff = chart.subActive[0] - chart.subActive[1];
+
+	os.apiGet('federation/stats', { limit: 10 }).then(res => {
+		topSubInstancesForPie = res.topSubInstances.map(x => ({
+			name: x.host,
+			color: x.themeColor,
+			value: x.followersCount,
+			onClick: () => {
+				os.pageWindow(`/instance-info/${x.host}`);
+			},
+		})).concat([{ name: '(other)', color: '#80808080', value: res.otherFollowersCount }]);
+		topPubInstancesForPie = res.topPubInstances.map(x => ({
+			name: x.host,
+			color: x.themeColor,
+			value: x.followingCount,
+			onClick: () => {
+				os.pageWindow(`/instance-info/${x.host}`);
+			},
+		})).concat([{ name: '(other)', color: '#80808080', value: res.otherFollowingCount }]);
 	});
-	const fetchedCharts = await Promise.all(fetchedInstances.map(i => os.apiGet('charts/instance', { host: i.host, limit: 16, span: 'hour' })));
-	instances.value = fetchedInstances;
-	charts.value = fetchedCharts;
-	fetching.value = false;
-};
 
-useInterval(fetch, 1000 * 60, {
-	immediate: true,
-	afterMounted: true,
+	fetching = false;
 });
 </script>
 
-<style lang="scss" scoped>
-.wbrkwale {
-	> .instances {
-		.chart-move {
-			transition: transform 1s ease;
+<style lang="scss" module>
+.root {
+
+	&:global {
+		> .pies {
+			display: grid;
+			grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
+			grid-gap: 12px;
+			margin-bottom: 12px;
+
+			> .pie {
+				position: relative;
+				padding: 12px;
+
+				> .title {
+					position: absolute;
+					top: 20px;
+					left: 20px;
+					font-size: 90%;
+				}
+
+				> .chart {
+					max-height: 150px;
+				}
+
+				> .subTitle {
+					position: absolute;
+					bottom: 20px;
+					right: 20px;
+					font-size: 85%;
+				}
+			}
 		}
 
-		> .instance {
-			display: flex;
-			align-items: center;
-			padding: 16px 20px;
+		> .items {
+			display: grid;
+			grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
+			grid-gap: 12px;
 
-			&:not(:last-child) {
-				border-bottom: solid 0.5px var(--divider);
-			}
+			> .item {
+				display: flex;
+				box-sizing: border-box;
+				padding: 12px;
 
-			> img {
-				display: block;
-				width: 34px;
-				height: 34px;
-				object-fit: cover;
-				border-radius: 4px;
-				margin-right: 12px;
-			}
-
-			> .body {
-				flex: 1;
-				overflow: hidden;
-				font-size: 0.9em;
-				color: var(--fg);
-				padding-right: 8px;
-
-				> .name {
-					display: block;
-					width: 100%;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
+				> .icon {
+					display: grid;
+					place-items: center;
+					height: 100%;
+					aspect-ratio: 1;
+					margin-right: 12px;
+					background: var(--accentedBg);
+					color: var(--accent);
+					border-radius: 10px;
 				}
 
-				> .host {
-					margin: 0;
-					font-size: 75%;
-					opacity: 0.7;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
+				&.sub {
+					> .icon {
+						background: #d5ba0026;
+						color: #dfc300;
+					}
 				}
-			}
 
-			> .chart {
-				height: 30px;
+				&.pub {
+					> .icon {
+						background: #00cf2326;
+						color: #00cd5b;
+					}
+				}
+
+				> .body {
+					padding: 2px 0;
+
+					> .value {
+						font-size: 1.2em;
+						font-weight: bold;
+
+						> .diff {
+							font-size: 0.65em;
+							font-weight: normal;
+						}
+					}
+
+					> .label {
+						font-size: 0.8em;
+						opacity: 0.5;
+					}
+				}
 			}
 		}
 	}
 }
 </style>
+
diff --git a/packages/client/src/pages/admin/overview.heatmap.vue b/packages/client/src/pages/admin/overview.heatmap.vue
new file mode 100644
index 000000000..3fb163893
--- /dev/null
+++ b/packages/client/src/pages/admin/overview.heatmap.vue
@@ -0,0 +1,25 @@
+<template>
+<div class="_panel" :class="$style.root">
+	<MkSelect v-model="src" style="margin: 0 0 12px 0;" small>
+		<option value="active-users">Active users</option>
+		<option value="notes">Notes</option>
+		<option value="ap-requests-inbox-received">AP Requests: inboxReceived</option>
+		<option value="ap-requests-deliver-succeeded">AP Requests: deliverSucceeded</option>
+		<option value="ap-requests-deliver-failed">AP Requests: deliverFailed</option>
+	</MkSelect>
+	<MkHeatmap :src="src"/>
+</div>
+</template>
+
+<script lang="ts" setup>
+import MkHeatmap from '@/components/MkHeatmap.vue';
+import MkSelect from '@/components/MkSelect.vue';
+
+let src = $ref('active-users');
+</script>
+
+<style lang="scss" module>
+.root {
+	padding: 20px;
+}
+</style>
diff --git a/packages/client/src/pages/admin/overview.instances.vue b/packages/client/src/pages/admin/overview.instances.vue
new file mode 100644
index 000000000..15dbdc463
--- /dev/null
+++ b/packages/client/src/pages/admin/overview.instances.vue
@@ -0,0 +1,50 @@
+<template>
+<div class="wbrkwale">
+	<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
+		<MkLoading v-if="fetching"/>
+		<div v-else class="instances">
+			<MkA v-for="(instance, i) in instances" :key="instance.id" v-tooltip.mfm.noDelay="`${instance.name}\n${instance.host}\n${instance.softwareName} ${instance.softwareVersion}`" :to="`/instance-info/${instance.host}`" class="instance">
+				<MkInstanceCardMini :instance="instance"/>
+			</MkA>
+		</div>
+	</Transition>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, onUnmounted, ref } from 'vue';
+import * as os from '@/os';
+import { useInterval } from '@/scripts/use-interval';
+import MkInstanceCardMini from '@/components/MkInstanceCardMini.vue';
+
+const instances = ref([]);
+const fetching = ref(true);
+
+const fetch = async () => {
+	const fetchedInstances = await os.api('federation/instances', {
+		sort: '+latestRequestReceivedAt',
+		limit: 6,
+	});
+	instances.value = fetchedInstances;
+	fetching.value = false;
+};
+
+useInterval(fetch, 1000 * 60, {
+	immediate: true,
+	afterMounted: true,
+});
+</script>
+
+<style lang="scss" scoped>
+.wbrkwale {
+	> .instances {
+		display: grid;
+		grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+		grid-gap: 12px;
+
+		> .instance:hover {
+			text-decoration: none;
+		}
+	}
+}
+</style>
diff --git a/packages/client/src/pages/admin/overview.moderators.vue b/packages/client/src/pages/admin/overview.moderators.vue
new file mode 100644
index 000000000..445217d82
--- /dev/null
+++ b/packages/client/src/pages/admin/overview.moderators.vue
@@ -0,0 +1,55 @@
+<template>
+<div>
+	<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
+		<MkLoading v-if="fetching"/>
+		<div v-else :class="$style.root" class="_panel">
+			<MkA v-for="user in moderators" :key="user.id" class="user" :to="`/user-info/${user.id}`">
+				<MkAvatar :user="user" class="avatar" indicator/>
+			</MkA>
+		</div>
+	</Transition>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, onUnmounted, ref } from 'vue';
+import * as os from '@/os';
+import number from '@/filters/number';
+import { i18n } from '@/i18n';
+
+let moderators: any = $ref(null);
+let fetching = $ref(true);
+
+onMounted(async () => {
+	moderators = await os.api('admin/show-users', {
+		sort: '+lastActiveDate',
+		state: 'adminOrModerator',
+		limit: 30,
+	});
+
+	fetching = false;
+});
+</script>
+
+<style lang="scss" module>
+.root {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(30px, 40px));
+	grid-gap: 12px;
+	place-content: center;
+	padding: 12px;
+
+	&:global {
+		> .user {
+			width: 100%;
+			height: 100%;
+			aspect-ratio: 1;
+
+			> .avatar {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+</style>
diff --git a/packages/client/src/pages/admin/overview.pie.vue b/packages/client/src/pages/admin/overview.pie.vue
index d3b203287..416e96335 100644
--- a/packages/client/src/pages/admin/overview.pie.vue
+++ b/packages/client/src/pages/admin/overview.pie.vue
@@ -3,57 +3,24 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import {
-	Chart,
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	CategoryScale,
-	LinearScale,
-	TimeScale,
-	Legend,
-	Title,
-	Tooltip,
-	SubTitle,
-	Filler,
-	DoughnutController,
-} from 'chart.js';
+import { onMounted, onUnmounted, ref, shallowRef } from 'vue';
+import { Chart } from 'chart.js';
 import number from '@/filters/number';
 import { defaultStore } from '@/store';
 import { useChartTooltip } from '@/scripts/use-chart-tooltip';
+import { initChart } from '@/scripts/init-chart';
 
-Chart.register(
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	DoughnutController,
-	CategoryScale,
-	LinearScale,
-	TimeScale,
-	Legend,
-	Title,
-	Tooltip,
-	SubTitle,
-	Filler,
-);
+initChart();
 
 const props = defineProps<{
 	data: { name: string; value: number; color: string; onClick?: () => void }[];
 }>();
 
-const chartEl = ref<HTMLCanvasElement>(null);
+const chartEl = shallowRef<HTMLCanvasElement>(null);
 
-// フォントカラー
-Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
-
-const { handler: externalTooltipHandler } = useChartTooltip();
+const { handler: externalTooltipHandler } = useChartTooltip({
+	position: 'middle',
+});
 
 let chartInstance: Chart;
 
diff --git a/packages/client/src/pages/admin/overview.queue.chart.vue b/packages/client/src/pages/admin/overview.queue.chart.vue
new file mode 100644
index 000000000..0162d5366
--- /dev/null
+++ b/packages/client/src/pages/admin/overview.queue.chart.vue
@@ -0,0 +1,140 @@
+<template>
+<canvas ref="chartEl"></canvas>
+</template>
+
+<script lang="ts" setup>
+import { watch, onMounted, onUnmounted, ref, shallowRef } from 'vue';
+import { Chart } from 'chart.js';
+import number from '@/filters/number';
+import * as os from '@/os';
+import { defaultStore } from '@/store';
+import { useChartTooltip } from '@/scripts/use-chart-tooltip';
+import { chartVLine } from '@/scripts/chart-vline';
+import { alpha } from '@/scripts/color';
+import { initChart } from '@/scripts/init-chart';
+
+initChart();
+
+const props = defineProps<{
+	type: string;
+}>();
+
+const chartEl = shallowRef<HTMLCanvasElement>(null);
+
+const { handler: externalTooltipHandler } = useChartTooltip();
+
+let chartInstance: Chart;
+
+function setData(values) {
+	if (chartInstance == null) return;
+	for (const value of values) {
+		chartInstance.data.labels.push('');
+		chartInstance.data.datasets[0].data.push(value);
+		if (chartInstance.data.datasets[0].data.length > 100) {
+			chartInstance.data.labels.shift();
+			chartInstance.data.datasets[0].data.shift();
+		}
+	}
+	chartInstance.update();
+}
+
+function pushData(value) {
+	if (chartInstance == null) return;
+	chartInstance.data.labels.push('');
+	chartInstance.data.datasets[0].data.push(value);
+	if (chartInstance.data.datasets[0].data.length > 100) {
+		chartInstance.data.labels.shift();
+		chartInstance.data.datasets[0].data.shift();
+	}
+	chartInstance.update();
+}
+
+const label =
+	props.type === 'process' ? 'Process' :
+	props.type === 'active' ? 'Active' :
+	props.type === 'delayed' ? 'Delayed' :
+	props.type === 'waiting' ? 'Waiting' :
+	'?' as never;
+
+const color =
+	props.type === 'process' ? '#00E396' :
+	props.type === 'active' ? '#00BCD4' :
+	props.type === 'delayed' ? '#E53935' :
+	props.type === 'waiting' ? '#FFB300' :
+	'?' as never;
+
+onMounted(() => {
+	const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
+
+	chartInstance = new Chart(chartEl.value, {
+		type: 'line',
+		data: {
+			labels: [],
+			datasets: [{
+				label: label,
+				pointRadius: 0,
+				tension: 0.3,
+				borderWidth: 2,
+				borderJoinStyle: 'round',
+				borderColor: color,
+				backgroundColor: alpha(color, 0.2),
+				fill: true,
+				data: [],
+			}],
+		},
+		options: {
+			aspectRatio: 2.5,
+			layout: {
+				padding: {
+					left: 0,
+					right: 0,
+					top: 0,
+					bottom: 0,
+				},
+			},
+			scales: {
+				x: {
+					grid: {
+						display: false,
+					},
+					ticks: {
+						display: false,
+						maxTicksLimit: 10,
+					},
+				},
+				y: {
+					min: 0,
+					grid: {
+					},
+				},
+			},
+			interaction: {
+				intersect: false,
+			},
+			plugins: {
+				legend: {
+					display: false,
+				},
+				tooltip: {
+					enabled: false,
+					mode: 'index',
+					animation: {
+						duration: 0,
+					},
+					external: externalTooltipHandler,
+				},
+			},
+		},
+		plugins: [chartVLine(vLineColor)],
+	});
+});
+
+defineExpose({
+	setData,
+	pushData,
+});
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/packages/client/src/pages/admin/overview.queue.vue b/packages/client/src/pages/admin/overview.queue.vue
new file mode 100644
index 000000000..7e5888293
--- /dev/null
+++ b/packages/client/src/pages/admin/overview.queue.vue
@@ -0,0 +1,127 @@
+<template>
+<div :class="$style.root">
+	<div class="_table status">
+		<div class="_row">
+			<div class="_cell" style="text-align: center;"><div class="_label">Process</div>{{ number(activeSincePrevTick) }}</div>
+			<div class="_cell" style="text-align: center;"><div class="_label">Active</div>{{ number(active) }}</div>
+			<div class="_cell" style="text-align: center;"><div class="_label">Waiting</div>{{ number(waiting) }}</div>
+			<div class="_cell" style="text-align: center;"><div class="_label">Delayed</div>{{ number(delayed) }}</div>
+		</div>
+	</div>
+	<div class="charts">
+		<div class="chart">
+			<div class="title">Process</div>
+			<XChart ref="chartProcess" type="process"/>
+		</div>
+		<div class="chart">
+			<div class="title">Active</div>
+			<XChart ref="chartActive" type="active"/>
+		</div>
+		<div class="chart">
+			<div class="title">Delayed</div>
+			<XChart ref="chartDelayed" type="delayed"/>
+		</div>
+		<div class="chart">
+			<div class="title">Waiting</div>
+			<XChart ref="chartWaiting" type="waiting"/>
+		</div>
+	</div>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { markRaw, onMounted, onUnmounted, ref } from 'vue';
+import XChart from './overview.queue.chart.vue';
+import number from '@/filters/number';
+import * as os from '@/os';
+import { stream } from '@/stream';
+import { i18n } from '@/i18n';
+
+const connection = markRaw(stream.useChannel('queueStats'));
+
+const activeSincePrevTick = ref(0);
+const active = ref(0);
+const delayed = ref(0);
+const waiting = ref(0);
+let chartProcess = $shallowRef<InstanceType<typeof XChart>>();
+let chartActive = $shallowRef<InstanceType<typeof XChart>>();
+let chartDelayed = $shallowRef<InstanceType<typeof XChart>>();
+let chartWaiting = $shallowRef<InstanceType<typeof XChart>>();
+
+const props = defineProps<{
+	domain: string;
+}>();
+
+const onStats = (stats) => {
+	activeSincePrevTick.value = stats[props.domain].activeSincePrevTick;
+	active.value = stats[props.domain].active;
+	delayed.value = stats[props.domain].delayed;
+	waiting.value = stats[props.domain].waiting;
+
+	chartProcess.pushData(stats[props.domain].activeSincePrevTick);
+	chartActive.pushData(stats[props.domain].active);
+	chartDelayed.pushData(stats[props.domain].delayed);
+	chartWaiting.pushData(stats[props.domain].waiting);
+};
+
+const onStatsLog = (statsLog) => {
+	const dataProcess = [];
+	const dataActive = [];
+	const dataDelayed = [];
+	const dataWaiting = [];
+
+	for (const stats of [...statsLog].reverse()) {
+		dataProcess.push(stats[props.domain].activeSincePrevTick);
+		dataActive.push(stats[props.domain].active);
+		dataDelayed.push(stats[props.domain].delayed);
+		dataWaiting.push(stats[props.domain].waiting);
+	}
+
+	chartProcess.setData(dataProcess);
+	chartActive.setData(dataActive);
+	chartDelayed.setData(dataDelayed);
+	chartWaiting.setData(dataWaiting);
+};
+
+onMounted(() => {
+	connection.on('stats', onStats);
+	connection.on('statsLog', onStatsLog);
+	connection.send('requestLog', {
+		id: Math.random().toString().substr(2, 8),
+		length: 100,
+	});
+});
+
+onUnmounted(() => {
+	connection.off('stats', onStats);
+	connection.off('statsLog', onStatsLog);
+	connection.dispose();
+});
+</script>
+
+<style lang="scss" module>
+.root {
+	&:global {
+		> .status {
+			padding: 0 0 16px 0;
+		}
+
+		> .charts {
+			display: grid;
+			grid-template-columns: 1fr 1fr;
+			gap: 12px;
+
+			> .chart {
+				min-width: 0;
+				padding: 16px;
+				background: var(--panel);
+				border-radius: var(--radius);
+
+				> .title {
+					font-size: 0.85em;
+				}
+			}
+		}
+	}
+}
+</style>	
diff --git a/packages/client/src/pages/admin/overview.stats.vue b/packages/client/src/pages/admin/overview.stats.vue
new file mode 100644
index 000000000..bd636cc3e
--- /dev/null
+++ b/packages/client/src/pages/admin/overview.stats.vue
@@ -0,0 +1,173 @@
+<template>
+<div>
+	<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
+		<MkLoading v-if="fetching"/>
+		<div v-else :class="$style.root">
+			<div class="item _panel users">
+				<div class="icon"><i class="ti ti-users"></i></div>
+				<div class="body">
+					<div class="value">
+						<MkNumber :value="stats.originalUsersCount" style="margin-right: 0.5em;"/>
+						<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="usersComparedToThePrevDay"></MkNumberDiff>
+					</div>
+					<div class="label">Users</div>
+				</div>
+			</div>
+			<div class="item _panel notes">
+				<div class="icon"><i class="ti ti-pencil"></i></div>
+				<div class="body">
+					<div class="value">
+						<MkNumber :value="stats.originalNotesCount" style="margin-right: 0.5em;"/>
+						<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="notesComparedToThePrevDay"></MkNumberDiff>
+					</div>
+					<div class="label">Notes</div>
+				</div>
+			</div>
+			<div class="item _panel instances">
+				<div class="icon"><i class="ti ti-planet"></i></div>
+				<div class="body">
+					<div class="value">
+						<MkNumber :value="stats.instances" style="margin-right: 0.5em;"/>
+					</div>
+					<div class="label">Instances</div>
+				</div>
+			</div>
+			<div class="item _panel emojis">
+				<div class="icon"><i class="ti ti-icons"></i></div>
+				<div class="body">
+					<div class="value">
+						<MkNumber :value="customEmojis.length" style="margin-right: 0.5em;"/>
+					</div>
+					<div class="label">Custom emojis</div>
+				</div>
+			</div>
+			<div class="item _panel online">
+				<div class="icon"><i class="ti ti-access-point"></i></div>
+				<div class="body">
+					<div class="value">
+						<MkNumber :value="onlineUsersCount" style="margin-right: 0.5em;"/>
+					</div>
+					<div class="label">Online</div>
+				</div>
+			</div>
+		</div>
+	</Transition>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, onUnmounted, ref } from 'vue';
+import MkMiniChart from '@/components/MkMiniChart.vue';
+import * as os from '@/os';
+import number from '@/filters/number';
+import MkNumberDiff from '@/components/MkNumberDiff.vue';
+import MkNumber from '@/components/MkNumber.vue';
+import { i18n } from '@/i18n';
+import { customEmojis } from '@/custom-emojis';
+
+let stats: any = $ref(null);
+let usersComparedToThePrevDay = $ref<number>();
+let notesComparedToThePrevDay = $ref<number>();
+let onlineUsersCount = $ref(0);
+let fetching = $ref(true);
+
+onMounted(async () => {
+	const [_stats, _onlineUsersCount] = await Promise.all([
+		os.api('stats', {}),
+		os.api('get-online-users-count').then(res => res.count),
+	]);
+	stats = _stats;
+	onlineUsersCount = _onlineUsersCount;
+
+	os.apiGet('charts/users', { limit: 2, span: 'day' }).then(chart => {
+		usersComparedToThePrevDay = stats.originalUsersCount - chart.local.total[1];
+	});
+
+	os.apiGet('charts/notes', { limit: 2, span: 'day' }).then(chart => {
+		notesComparedToThePrevDay = stats.originalNotesCount - chart.local.total[1];
+	});
+
+	fetching = false;
+});
+</script>
+
+<style lang="scss" module>
+.root {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
+	grid-gap: 12px;
+
+	&:global {
+		> .item {
+			display: flex;
+			box-sizing: border-box;
+			padding: 12px;
+
+			> .icon {
+				display: grid;
+				place-items: center;
+				height: 100%;
+				aspect-ratio: 1;
+				margin-right: 12px;
+				background: var(--accentedBg);
+				color: var(--accent);
+				border-radius: 10px;
+			}
+
+			&.users {
+				> .icon {
+					background: #0088d726;
+					color: #3d96c1;
+				}
+			}
+
+			&.notes {
+				> .icon {
+					background: #86b30026;
+					color: #86b300;
+				}
+			}
+
+			&.instances {
+				> .icon {
+					background: #e96b0026;
+					color: #d76d00;
+				}
+			}
+
+			&.emojis {
+				> .icon {
+					background: #d5ba0026;
+						color: #dfc300;
+				}
+			}
+
+			&.online {
+				> .icon {
+					background: #8a00d126;
+					color: #c01ac3;
+				}
+			}
+
+			> .body {
+				padding: 2px 0;
+
+				> .value {
+					font-size: 1.2em;
+					font-weight: bold;
+
+					> .diff {
+						font-size: 0.65em;
+						font-weight: normal;
+					}
+				}
+
+				> .label {
+					font-size: 0.8em;
+					opacity: 0.5;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/packages/client/src/pages/admin/overview.users.vue b/packages/client/src/pages/admin/overview.users.vue
new file mode 100644
index 000000000..5390d9d8c
--- /dev/null
+++ b/packages/client/src/pages/admin/overview.users.vue
@@ -0,0 +1,57 @@
+<template>
+<div :class="$style.root">
+	<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
+		<MkLoading v-if="fetching"/>
+		<div v-else class="users">
+			<MkA v-for="(user, i) in newUsers" :key="user.id" :to="`/user-info/${user.id}`" class="user">
+				<MkUserCardMini :user="user"/>
+			</MkA>
+		</div>
+	</Transition>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, onUnmounted, ref } from 'vue';
+import * as os from '@/os';
+import { useInterval } from '@/scripts/use-interval';
+import MkUserCardMini from '@/components/MkUserCardMini.vue';
+
+let newUsers = $ref(null);
+let fetching = $ref(true);
+
+const fetch = async () => {
+	const _newUsers = await os.api('admin/show-users', {
+		limit: 5,
+		sort: '+createdAt',
+		origin: 'local',
+	});
+	newUsers = _newUsers;
+	fetching = false;
+};
+
+useInterval(fetch, 1000 * 60, {
+	immediate: true,
+	afterMounted: true,
+});
+</script>
+
+<style lang="scss" module>
+.root {
+	&:global {
+		> .users {
+			.chart-move {
+				transition: transform 1s ease;
+			}
+
+			display: grid;
+			grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+			grid-gap: 12px;
+
+			> .user:hover {
+				text-decoration: none;
+			}
+		}
+	}
+}
+</style>
diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index 297f5afe9..e18af898b 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -129,6 +129,55 @@
 					</div>
 				</div>
 			</div>
+			<div class="item">
+				<template #header>Stats</template>
+				<XStats/>
+			</div>
+
+			<div class="item">
+				<template #header>Active users</template>
+				<XActiveUsers/>
+			</div>
+
+			<div class="item">
+				<template #header>Heatmap</template>
+				<XHeatmap/>
+			</div>
+
+			<div class="item">
+				<template #header>Moderators</template>
+				<XModerators/>
+			</div>
+
+			<div class="item">
+				<template #header>Federation</template>
+				<XFederation/>
+			</div>
+
+			<div class="item">
+				<template #header>Instances</template>
+				<XInstances/>
+			</div>
+
+			<div class="item">
+				<template #header>Ap requests</template>
+				<XApRequests/>
+			</div>
+
+			<div class="item">
+				<template #header>New users</template>
+				<XUsers/>
+			</div>
+
+			<div class="item">
+				<template #header>Deliver queue</template>
+				<XQueue domain="deliver"/>
+			</div>
+
+			<div class="item">
+				<template #header>Inbox queue</template>
+				<XQueue domain="inbox"/>
+			</div>
 		</div>
 	</div>
 </MkSpacer>
@@ -159,6 +208,12 @@ import MagicGrid from 'magic-grid';
 import XMetrics from './metrics.vue';
 import XFederation from './overview.federation.vue';
 import XQueueChart from './overview.queue-chart.vue';
+import XApRequests from './overview.ap-requests.vue';
+import XUsers from './overview.users.vue';
+import XActiveUsers from './overview.active-users.vue';
+import XStats from './overview.stats.vue';
+import XModerators from './overview.moderators.vue';
+import XHeatmap from './overview.heatmap.vue';
 import XUser from './overview.user.vue';
 import XPie from './overview.pie.vue';
 import MkNumberDiff from '@/components/MkNumberDiff.vue';
diff --git a/packages/client/src/scripts/color.ts b/packages/client/src/scripts/color.ts
new file mode 100644
index 000000000..10a99a5a0
--- /dev/null
+++ b/packages/client/src/scripts/color.ts
@@ -0,0 +1,7 @@
+export const alpha = (hex: string, a: number): string => {
+	const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)!;
+	const r = parseInt(result[1], 16);
+	const g = parseInt(result[2], 16);
+	const b = parseInt(result[3], 16);
+	return `rgba(${r}, ${g}, ${b}, ${a})`;
+};
diff --git a/packages/client/src/scripts/init-chart.ts b/packages/client/src/scripts/init-chart.ts
new file mode 100644
index 000000000..32adf73bb
--- /dev/null
+++ b/packages/client/src/scripts/init-chart.ts
@@ -0,0 +1,58 @@
+import {
+	Chart,
+	ArcElement,
+	LineElement,
+	BarElement,
+	PointElement,
+	BarController,
+	LineController,
+	DoughnutController,
+	CategoryScale,
+	LinearScale,
+	TimeScale,
+	Legend,
+	Title,
+	Tooltip,
+	SubTitle,
+	Filler,
+} from "chart.js";
+import gradient from "chartjs-plugin-gradient";
+import zoomPlugin from "chartjs-plugin-zoom";
+import { MatrixController, MatrixElement } from "chartjs-chart-matrix";
+import { defaultStore } from "@/store";
+import "chartjs-adapter-date-fns";
+
+export function initChart() {
+	Chart.register(
+		ArcElement,
+		LineElement,
+		BarElement,
+		PointElement,
+		BarController,
+		LineController,
+		DoughnutController,
+		CategoryScale,
+		LinearScale,
+		TimeScale,
+		Legend,
+		Title,
+		Tooltip,
+		SubTitle,
+		Filler,
+		MatrixController,
+		MatrixElement,
+		zoomPlugin,
+		gradient,
+	);
+
+	// フォントカラー
+	Chart.defaults.color = getComputedStyle(
+		document.documentElement,
+	).getPropertyValue("--fg");
+
+	Chart.defaults.borderColor = defaultStore.state.darkMode
+		? "rgba(255, 255, 255, 0.1)"
+		: "rgba(0, 0, 0, 0.1)";
+
+	Chart.defaults.animation = false;
+}
diff --git a/packages/client/src/scripts/use-chart-tooltip.ts b/packages/client/src/scripts/use-chart-tooltip.ts
index 5ecb0a34f..13ed0e571 100644
--- a/packages/client/src/scripts/use-chart-tooltip.ts
+++ b/packages/client/src/scripts/use-chart-tooltip.ts
@@ -1,8 +1,10 @@
-import { onUnmounted, ref } from "vue";
+import { onUnmounted, onDeactivated, ref } from "vue";
 import * as os from "@/os";
 import MkChartTooltip from "@/components/MkChartTooltip.vue";
 
-export function useChartTooltip() {
+export function useChartTooltip(
+	opts: { position: "top" | "middle" } = { position: "top" },
+) {
 	const tooltipShowing = ref(false);
 	const tooltipX = ref(0);
 	const tooltipY = ref(0);
@@ -28,6 +30,10 @@ export function useChartTooltip() {
 		if (disposeTooltipComponent) disposeTooltipComponent();
 	});
 
+	onDeactivated(() => {
+		tooltipShowing.value = false;
+	});
+
 	function handler(context) {
 		if (context.tooltip.opacity === 0) {
 			tooltipShowing.value = false;
@@ -45,7 +51,11 @@ export function useChartTooltip() {
 
 		tooltipShowing.value = true;
 		tooltipX.value = rect.left + window.pageXOffset + context.tooltip.caretX;
-		tooltipY.value = rect.top + window.pageYOffset + context.tooltip.caretY;
+		if (opts.position === "top") {
+			tooltipY.value = rect.top + window.pageYOffset;
+		} else if (opts.position === "middle") {
+			tooltipY.value = rect.top + window.pageYOffset + context.tooltip.caretY;
+		}
 	}
 
 	return {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ee8486978..7d1c0150f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -417,6 +417,7 @@ importers:
       calckey-js: ^0.0.22
       chart.js: 4.1.1
       chartjs-adapter-date-fns: 2.0.1
+      chartjs-chart-matrix: ^2.0.1
       chartjs-plugin-gradient: 0.5.1
       chartjs-plugin-zoom: 1.2.1
       compare-versions: 5.0.3
@@ -464,6 +465,7 @@ importers:
       vuedraggable: 4.1.0
     dependencies:
       '@khmyznikov/pwa-install': 0.2.0
+      chartjs-chart-matrix: 2.0.1_chart.js@4.1.1
     devDependencies:
       '@discordapp/twemoji': 14.0.2
       '@rollup/plugin-alias': 3.1.9_rollup@3.9.1
@@ -1266,7 +1268,6 @@ packages:
 
   /@kurkle/color/0.3.2:
     resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==}
-    dev: true
 
   /@lit-labs/ssr-dom-shim/1.0.0:
     resolution: {integrity: sha512-ic93MBXfApIFTrup4a70M/+ddD8xdt2zxxj9sRwHQzhS9ag/syqkD8JPdTXsc1gUy2K8TTirhlCqyTEM/sifNw==}
@@ -3387,7 +3388,7 @@ packages:
   /axios/0.25.0_debug@4.3.4:
     resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2_debug@4.3.4
     transitivePeerDependencies:
       - debug
     dev: true
@@ -4007,7 +4008,6 @@ packages:
     engines: {pnpm: ^7.0.0}
     dependencies:
       '@kurkle/color': 0.3.2
-    dev: true
 
   /chartjs-adapter-date-fns/2.0.1_chart.js@4.1.1:
     resolution: {integrity: sha512-v3WV9rdnQ05ce3A0ZCjzUekJCAbfm6+3HqSoeY2BIkdMYZoYr/4T+ril1tZyDl869lz6xdNVMXejUFT9YKpw4A==}
@@ -4017,6 +4017,14 @@ packages:
       chart.js: 4.1.1
     dev: true
 
+  /chartjs-chart-matrix/2.0.1_chart.js@4.1.1:
+    resolution: {integrity: sha512-BGfeY+/PHnITyDlc7WfnKJ1RyOfgOzIqWp/gxzzl7pUjyoGzHDcw51qd2xJF9gdT9Def7ZwOnOMm8GJUXDxI0w==}
+    peerDependencies:
+      chart.js: '>=3.0.0'
+    dependencies:
+      chart.js: 4.1.1
+    dev: false
+
   /chartjs-plugin-gradient/0.5.1_chart.js@4.1.1:
     resolution: {integrity: sha512-vhwlYGZWan4MGZZ4Wj64Y4aIql1uCPCU1JcggLWn3cgYEv4G7pXp1YgM4XH5ugmyn6BVCgQqAhiJ2h6hppzHmQ==}
     peerDependencies:
@@ -6372,6 +6380,19 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dev: false
+
+  /follow-redirects/1.15.2_debug@4.3.4:
+    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+    dependencies:
+      debug: 4.3.4
+    dev: true
 
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}

From 0e9f9063b4e8ab70275b826e7cd1d4d043eed4bc Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 19:48:57 -0800
Subject: [PATCH 031/582] attempt fix

---
 .../server/api/mastodon/endpoints/account.ts  |   2 +-
 packages/client/src/pages/admin/overview.vue  | 569 +-----------------
 2 files changed, 33 insertions(+), 538 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index abb31bb7f..f395c5a9c 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -304,7 +304,7 @@ export function apiAccountMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		let users;
 		try {
-			const idsRaw = ctx.request.body?["id[]"] : null;
+			const idsRaw = ctx.request.body ? ["id[]"] : null;
 			const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw;
 			users = ids;
 			relationshopModel.id = idsRaw?.toString() || "1";
diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index e18af898b..074f23f31 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -1,260 +1,84 @@
 <template>
-<MkSpacer :content-max="900">
-	<div ref="rootEl" v-size="{ max: [740] }" class="edbbcaef">
-		<div class="left">
-			<div v-if="stats" class="container stats">
-				<div class="title">Stats</div>
-				<div class="body">
-					<div class="number _panel">
-						<div class="label">Users</div>
-						<div class="value _monospace">
-							{{ number(stats.originalUsersCount) }}
-							<MkNumberDiff v-if="usersComparedToThePrevDay != null" v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="usersComparedToThePrevDay"><template #before>(</template><template #after>)</template></MkNumberDiff>
-						</div>
-					</div>
-					<div class="number _panel">
-						<div class="label">Notes</div>
-						<div class="value _monospace">
-							{{ number(stats.originalNotesCount) }}
-							<MkNumberDiff v-if="notesComparedToThePrevDay != null" v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="notesComparedToThePrevDay"><template #before>(</template><template #after>)</template></MkNumberDiff>
-						</div>
-					</div>
-				</div>
-			</div>
-
-			<div class="container queue">
-				<div class="title">Job queue</div>
-				<div class="body">
-					<div class="chart deliver">
-						<div class="title">Deliver</div>
-						<XQueueChart :connection="queueStatsConnection" domain="deliver"/>
-					</div>
-					<div class="chart inbox">
-						<div class="title">Inbox</div>
-						<XQueueChart :connection="queueStatsConnection" domain="inbox"/>
-					</div>
-				</div>
-			</div>
-
-			<div class="container users">
-				<div class="title">New users</div>
-				<div v-if="newUsers" class="body">
-					<XUser v-for="user in newUsers" :key="user.id" class="user" :user="user"/>
-				</div>
-			</div>
-
-			<div class="container files">
-				<div class="title">Recent files</div>
-				<div class="body">
-					<MkFileListForAdmin :pagination="filesPagination" view-mode="grid"/>
-				</div>
-			</div>
-
-			<div class="container env">
-				<div class="title">Enviroment</div>
-				<div class="body">
-					<div class="number _panel">
-						<div class="label">Calckey</div>
-						<div class="value _monospace">{{ version }}</div>
-					</div>
-					<div v-if="serverInfo" class="number _panel">
-						<div class="label">Node.js</div>
-						<div class="value _monospace">{{ serverInfo.node }}</div>
-					</div>
-					<div v-if="serverInfo" class="number _panel">
-						<div class="label">PostgreSQL</div>
-						<div class="value _monospace">{{ serverInfo.psql }}</div>
-					</div>
-					<div v-if="serverInfo" class="number _panel">
-						<div class="label">Redis</div>
-						<div class="value _monospace">{{ serverInfo.redis }}</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="right">
-			<div class="container charts">
-				<div class="title">Active users</div>
-				<div class="body">
-					<canvas ref="chartEl"></canvas>
-				</div>
-			</div>
-			<div class="container federation">
-				<div class="title">Active instances</div>
-				<div class="body">
-					<XFederation/>
-				</div>
-			</div>
-			<div v-if="stats" class="container federationStats">
-				<div class="title">Federation</div>
-				<div class="body">
-					<div class="number _panel">
-						<div class="label">Sub</div>
-						<div class="value _monospace">
-							{{ number(federationSubActive) }}
-							<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="federationSubActiveDiff"><template #before>(</template><template #after>)</template></MkNumberDiff>
-						</div>
-					</div>
-					<div class="number _panel">
-						<div class="label">Pub</div>
-						<div class="value _monospace">
-							{{ number(federationPubActive) }}
-							<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="federationPubActiveDiff"><template #before>(</template><template #after>)</template></MkNumberDiff>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="container tagCloud">
-				<div class="body">
-					<MkTagCloud v-if="activeInstances">
-						<li v-for="instance in activeInstances">
-							<a @click.prevent="onInstanceClick(instance)">
-								<img style="width: 32px;" :src="instance.iconUrl">
-							</a>
-						</li>
-					</MkTagCloud>
-				</div>
-			</div>
-			<div v-if="topSubInstancesForPie && topPubInstancesForPie" class="container federationPies">
-				<div class="body">
-					<div class="chart deliver">
-						<div class="title">Sub</div>
-						<XPie :data="topSubInstancesForPie"/>
-						<div class="subTitle">Top 10</div>
-					</div>
-					<div class="chart inbox">
-						<div class="title">Pub</div>
-						<XPie :data="topPubInstancesForPie"/>
-						<div class="subTitle">Top 10</div>
-					</div>
-				</div>
-			</div>
-			<div class="item">
+	<MkSpacer :content-max="1000">
+		<div ref="rootEl" class="edbbcaef">
+			<MkFoldableSection class="item">
 				<template #header>Stats</template>
 				<XStats/>
-			</div>
+			</MkFoldableSection>
 
-			<div class="item">
+			<MkFoldableSection class="item">
 				<template #header>Active users</template>
 				<XActiveUsers/>
-			</div>
+			</MkFoldableSection>
 
-			<div class="item">
+			<MkFoldableSection class="item">
 				<template #header>Heatmap</template>
 				<XHeatmap/>
-			</div>
+			</MkFoldableSection>
 
-			<div class="item">
+			<MkFoldableSection class="item">
 				<template #header>Moderators</template>
 				<XModerators/>
-			</div>
+			</MkFoldableSection>
 
-			<div class="item">
+			<MkFoldableSection class="item">
 				<template #header>Federation</template>
 				<XFederation/>
-			</div>
+			</MkFoldableSection>
 
-			<div class="item">
+			<MkFoldableSection class="item">
 				<template #header>Instances</template>
 				<XInstances/>
-			</div>
+			</MkFoldableSection>
 
-			<div class="item">
+			<MkFoldableSection class="item">
 				<template #header>Ap requests</template>
 				<XApRequests/>
-			</div>
+			</MkFoldableSection>
 
-			<div class="item">
+			<MkFoldableSection class="item">
 				<template #header>New users</template>
 				<XUsers/>
-			</div>
+			</MkFoldableSection>
 
-			<div class="item">
+			<MkFoldableSection class="item">
 				<template #header>Deliver queue</template>
 				<XQueue domain="deliver"/>
-			</div>
+			</MkFoldableSection>
 
-			<div class="item">
+			<MkFoldableSection class="item">
 				<template #header>Inbox queue</template>
 				<XQueue domain="inbox"/>
-			</div>
+			</MkFoldableSection>
 		</div>
-	</div>
-</MkSpacer>
+	</MkSpacer>
 </template>
 
 <script lang="ts" setup>
 import { markRaw, version as vueVersion, onMounted, onBeforeUnmount, nextTick } from 'vue';
-import {
-	Chart,
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	CategoryScale,
-	LinearScale,
-	TimeScale,
-	Legend,
-	Title,
-	Tooltip,
-	SubTitle,
-	Filler,
-} from 'chart.js';
-import { enUS } from 'date-fns/locale';
-import tinycolor from 'tinycolor2';
-import MagicGrid from 'magic-grid';
-import XMetrics from './metrics.vue';
 import XFederation from './overview.federation.vue';
-import XQueueChart from './overview.queue-chart.vue';
+import XInstances from './overview.instances.vue';
+import XQueue from './overview.queue.vue';
 import XApRequests from './overview.ap-requests.vue';
 import XUsers from './overview.users.vue';
 import XActiveUsers from './overview.active-users.vue';
 import XStats from './overview.stats.vue';
 import XModerators from './overview.moderators.vue';
 import XHeatmap from './overview.heatmap.vue';
-import XUser from './overview.user.vue';
-import XPie from './overview.pie.vue';
-import MkNumberDiff from '@/components/MkNumberDiff.vue';
 import MkTagCloud from '@/components/MkTagCloud.vue';
 import { version, url } from '@/config';
-import number from '@/filters/number';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
-import 'chartjs-adapter-date-fns';
 import { defaultStore } from '@/store';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip';
 import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
+import MkFoldableSection from '@/components/MkFoldableSection.vue';
 
-Chart.register(
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	CategoryScale,
-	LinearScale,
-	TimeScale,
-	Legend,
-	Title,
-	Tooltip,
-	SubTitle,
-	Filler,
-	//gradient,
-);
-
-const rootEl = $ref<HTMLElement>();
-const chartEl = $ref<HTMLCanvasElement>(null);
-let stats: any = $ref(null);
+const rootEl = $shallowRef<HTMLElement>();
 let serverInfo: any = $ref(null);
 let topSubInstancesForPie: any = $ref(null);
 let topPubInstancesForPie: any = $ref(null);
-let usersComparedToThePrevDay: any = $ref(null);
-let notesComparedToThePrevDay: any = $ref(null);
 let federationPubActive = $ref<number | null>(null);
 let federationPubActiveDiff = $ref<number | null>(null);
 let federationSubActive = $ref<number | null>(null);
@@ -263,170 +87,12 @@ let newUsers = $ref(null);
 let activeInstances = $shallowRef(null);
 const queueStatsConnection = markRaw(stream.useChannel('queueStats'));
 const now = new Date();
-let chartInstance: Chart = null;
-const chartLimit = 30;
 const filesPagination = {
 	endpoint: 'admin/drive/files' as const,
 	limit: 9,
 	noPaging: true,
 };
 
-const { handler: externalTooltipHandler } = useChartTooltip();
-
-async function renderChart() {
-	if (chartInstance) {
-		chartInstance.destroy();
-	}
-
-	const getDate = (ago: number) => {
-		const y = now.getFullYear();
-		const m = now.getMonth();
-		const d = now.getDate();
-
-		return new Date(y, m, d - ago);
-	};
-
-	const format = (arr) => {
-		return arr.map((v, i) => ({
-			x: getDate(i).getTime(),
-			y: v,
-		}));
-	};
-
-	const raw = await os.api('charts/active-users', { limit: chartLimit, span: 'day' });
-
-	const gridColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
-	const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
-
-	// フォントカラー
-	Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
-
-	const color = tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--accent'));
-
-	chartInstance = new Chart(chartEl, {
-		type: 'bar',
-		data: {
-			//labels: new Array(props.limit).fill(0).map((_, i) => getDate(i).toLocaleString()).slice().reverse(),
-			datasets: [{
-				parsing: false,
-				label: 'a',
-				data: format(raw.readWrite).slice().reverse(),
-				tension: 0.3,
-				pointRadius: 0,
-				borderWidth: 0,
-				borderJoinStyle: 'round',
-				borderRadius: 3,
-				backgroundColor: color,
-				/*gradient: props.bar ? undefined : {
-					backgroundColor: {
-						axis: 'y',
-						colors: {
-							0: alpha(x.color ? x.color : getColor(i), 0),
-							[maxes[i]]: alpha(x.color ? x.color : getColor(i), 0.2),
-						},
-					},
-				},*/
-				barPercentage: 0.9,
-				categoryPercentage: 0.9,
-				clip: 8,
-			}],
-		},
-		options: {
-			aspectRatio: 2.5,
-			layout: {
-				padding: {
-					left: 0,
-					right: 0,
-					top: 0,
-					bottom: 0,
-				},
-			},
-			scales: {
-				x: {
-					type: 'time',
-					display: false,
-					stacked: true,
-					offset: false,
-					time: {
-						stepSize: 1,
-						unit: 'month',
-					},
-					grid: {
-						display: false,
-					},
-					ticks: {
-						display: false,
-					},
-					adapters: {
-						date: {
-							locale: enUS,
-						},
-					},
-					min: getDate(chartLimit).getTime(),
-				},
-				y: {
-					display: false,
-					position: 'left',
-					stacked: true,
-					grid: {
-						display: false,
-					},
-					ticks: {
-						display: false,
-						//mirror: true,
-					},
-				},
-			},
-			interaction: {
-				intersect: false,
-				mode: 'index',
-			},
-			elements: {
-				point: {
-					hoverRadius: 5,
-					hoverBorderWidth: 2,
-				},
-			},
-			animation: false,
-			plugins: {
-				legend: {
-					display: false,
-				},
-				tooltip: {
-					enabled: false,
-					mode: 'index',
-					animation: {
-						duration: 0,
-					},
-					external: externalTooltipHandler,
-				},
-				//gradient,
-			},
-		},
-		plugins: [{
-			id: 'vLine',
-			beforeDraw(chart, args, options) {
-				if (chart.tooltip?._active?.length) {
-					const activePoint = chart.tooltip._active[0];
-					const ctx = chart.ctx;
-					const x = activePoint.element.x;
-					const topY = chart.scales.y.top;
-					const bottomY = chart.scales.y.bottom;
-
-					ctx.save();
-					ctx.beginPath();
-					ctx.moveTo(x, bottomY);
-					ctx.lineTo(x, topY);
-					ctx.lineWidth = 1;
-					ctx.strokeStyle = vLineColor;
-					ctx.stroke();
-					ctx.restore();
-				}
-			},
-		}],
-	});
-}
-
 function onInstanceClick(i) {
 	os.pageWindow(`/instance-info/${i.host}`);
 }
@@ -442,20 +108,6 @@ onMounted(async () => {
 	magicGrid.listen();
 	*/
 
-	renderChart();
-
-	os.api('stats', {}).then(statsResponse => {
-		stats = statsResponse;
-
-		os.apiGet('charts/users', { limit: 2, span: 'day' }).then(chart => {
-			usersComparedToThePrevDay = stats.originalUsersCount - chart.local.total[1];
-		});
-
-		os.apiGet('charts/notes', { limit: 2, span: 'day' }).then(chart => {
-			notesComparedToThePrevDay = stats.originalNotesCount - chart.local.total[1];
-		});
-	});
-
 	os.apiGet('charts/federation', { limit: 2, span: 'day' }).then(chart => {
 		federationPubActive = chart.pubActive[0];
 		federationPubActiveDiff = chart.pubActive[0] - chart.pubActive[1];
@@ -494,7 +146,7 @@ onMounted(async () => {
 	});
 
 	os.api('federation/instances', {
-		sort: '+lastCommunicatedAt',
+		sort: '+latestRequestReceivedAt',
 		limit: 25,
 	}).then(res => {
 		activeInstances = res;
@@ -518,171 +170,14 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.dashboard,
-	icon: 'ph-gauge-bold ph-lg',
+	icon: 'ti ti-dashboard',
 });
 </script>
 
 <style lang="scss" scoped>
 .edbbcaef {
-	display: flex;
-
-	> .left, > .right {
-		box-sizing: border-box;
-		width: 50%;
-
-		> .container {
-			margin: 32px 0;
-
-			> .title {
-				font-weight: bold;
-				margin-bottom: 16px;
-			}
-
-			&.stats, &.federationStats {
-				> .body {
-					display: grid;
-					grid-gap: 16px;
-					grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
-
-					> .number {
-						padding: 14px 20px;
-
-						> .label {
-							opacity: 0.7;
-							font-size: 0.8em;
-						}
-
-						> .value {
-							font-weight: bold;
-							font-size: 1.5em;
-
-							> .diff {
-								font-size: 0.7em;
-							}
-						}
-					}
-				}
-			}
-
-			&.env {
-				> .body {
-					display: grid;
-					grid-gap: 16px;
-					grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
-
-					> .number {
-						padding: 14px 20px;
-
-						> .label {
-							opacity: 0.7;
-							font-size: 0.8em;
-						}
-
-						> .value {
-							font-size: 1.1em;
-						}
-					}
-				}
-			}
-
-			&.charts {
-				> .body {
-					padding: 32px;
-					background: var(--panel);
-					border-radius: var(--radius);
-				}
-			}
-
-			&.users {
-				> .body {
-					background: var(--panel);
-					border-radius: var(--radius);
-
-					> .user {
-						padding: 16px 20px;
-
-						&:not(:last-child) {
-							border-bottom: solid 0.5px var(--divider);
-						}
-					}
-				}
-			}
-
-			&.federation {
-				> .body {
-					background: var(--panel);
-					border-radius: var(--radius);
-					overflow: clip;
-				}
-			}
-
-			&.queue {
-				> .body {
-					display: grid;
-					grid-gap: 16px;
-					grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
-
-					> .chart {
-						position: relative;
-						padding: 20px;
-						background: var(--panel);
-						border-radius: var(--radius);
-
-						> .title {
-							position: absolute;
-							top: 20px;
-							left: 20px;
-							font-size: 90%;
-						}
-					}
-				}
-			}
-
-			&.federationPies {
-				> .body {
-					display: grid;
-					grid-gap: 16px;
-					grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
-
-					> .chart {
-						position: relative;
-						padding: 20px;
-						background: var(--panel);
-						border-radius: var(--radius);
-
-						> .title {
-							position: absolute;
-							top: 20px;
-							left: 20px;
-							font-size: 90%;
-						}
-
-						> .subTitle {
-							position: absolute;
-							bottom: 20px;
-							right: 20px;
-							font-size: 85%;
-						}
-					}
-				}
-			}
-
-			&.tagCloud {
-				> .body {
-					background: var(--panel);
-					border-radius: var(--radius);
-					overflow: clip;
-				}
-			}
-		}
-	}
-
-	> .left {
-		padding-right: 16px;
-	}
-
-	> .right {
-		padding-left: 16px;
-	}
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(400px, 1fr));
+	grid-gap: 16px;
 }
 </style>

From fccd5d18b149265883d9772480f47e78181c047c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 19:51:56 -0800
Subject: [PATCH 032/582] test

---
 packages/client/src/components/MkInstanceStats.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkInstanceStats.vue b/packages/client/src/components/MkInstanceStats.vue
index 2c287e4e9..ec1729e8d 100644
--- a/packages/client/src/components/MkInstanceStats.vue
+++ b/packages/client/src/components/MkInstanceStats.vue
@@ -34,7 +34,7 @@
 			</div>
 			<div class="item">
 				<template #header>Active users heatmap</template>
-				<MkSelect v-model="heatmapSrc" style="margin: 0 0 12px 0;">
+				<MkSelect v-model="heatmapSrc" style="margin: 0 0 10px 0;">
 					<option value="active-users">Active users</option>
 					<option value="notes">Notes</option>
 					<option value="ap-requests-inbox-received">AP Requests: inboxReceived</option>
@@ -114,7 +114,7 @@ const props = withDefaults(defineProps<{
 
 let chartSpan = $ref<'hour' | 'day'>('hour');
 let chartSrc = $ref('active-users');
-let heatmapSrc = $ref('active-users');
+// let heatmapSrc = $ref('active-users');
 let subDoughnutEl = $ref<HTMLCanvasElement>();
 let pubDoughnutEl = $ref<HTMLCanvasElement>();
 

From 947674a1d0f49a4ed051e02abd9eafc2fb793f52 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 19:53:39 -0800
Subject: [PATCH 033/582] ?

---
 .../client/src/components/MkInstanceStats.vue | 273 +++++++++---------
 1 file changed, 134 insertions(+), 139 deletions(-)

diff --git a/packages/client/src/components/MkInstanceStats.vue b/packages/client/src/components/MkInstanceStats.vue
index ec1729e8d..a79467759 100644
--- a/packages/client/src/components/MkInstanceStats.vue
+++ b/packages/client/src/components/MkInstanceStats.vue
@@ -1,122 +1,101 @@
 <template>
-<div class="zbcjwnqg">
-	<div class="main">
-		<div class="body">
-			<div class="selects" style="display: flex;">
-				<MkSelect v-model="chartSrc" style="margin: 0; flex: 1;">
-					<optgroup :label="i18n.ts.federation">
-						<option value="federation">{{ i18n.ts._charts.federation }}</option>
-						<option value="ap-request">{{ i18n.ts._charts.apRequest }}</option>
-					</optgroup>
-					<optgroup :label="i18n.ts.users">
-						<option value="users">{{ i18n.ts._charts.usersIncDec }}</option>
-						<option value="users-total">{{ i18n.ts._charts.usersTotal }}</option>
-						<option value="active-users">{{ i18n.ts._charts.activeUsers }}</option>
-					</optgroup>
-					<optgroup :label="i18n.ts.notes">
-						<option value="notes">{{ i18n.ts._charts.notesIncDec }}</option>
-						<option value="local-notes">{{ i18n.ts._charts.localNotesIncDec }}</option>
-						<option value="remote-notes">{{ i18n.ts._charts.remoteNotesIncDec }}</option>
-						<option value="notes-total">{{ i18n.ts._charts.notesTotal }}</option>
-					</optgroup>
-					<optgroup :label="i18n.ts.drive">
-						<option value="drive-files">{{ i18n.ts._charts.filesIncDec }}</option>
-						<option value="drive">{{ i18n.ts._charts.storageUsageIncDec }}</option>
-					</optgroup>
-				</MkSelect>
-				<MkSelect v-model="chartSpan" style="margin: 0 0 0 10px;">
-					<option value="hour">{{ i18n.ts.perHour }}</option>
-					<option value="day">{{ i18n.ts.perDay }}</option>
-				</MkSelect>
-			</div>
-			<div class="chart">
-				<MkChart :src="chartSrc" :span="chartSpan" :limit="chartLimit" :detailed="detailed"></MkChart>
-			</div>
-			<div class="item">
-				<template #header>Active users heatmap</template>
-				<MkSelect v-model="heatmapSrc" style="margin: 0 0 10px 0;">
-					<option value="active-users">Active users</option>
-					<option value="notes">Notes</option>
-					<option value="ap-requests-inbox-received">AP Requests: inboxReceived</option>
-					<option value="ap-requests-deliver-succeeded">AP Requests: deliverSucceeded</option>
-					<option value="ap-requests-deliver-failed">AP Requests: deliverFailed</option>
-				</MkSelect>
-				<div class="_panel heatmap">
-					<MkHeatmap :src="heatmapSrc"/>
+	<div :class="$style.root">
+		<MkFoldableSection class="item">
+			<template #header>Chart</template>
+			<div :class="$style.chart">
+				<div class="selects">
+					<MkSelect v-model="chartSrc" style="margin: 0; flex: 1;">
+						<optgroup :label="i18n.ts.federation">
+							<option value="federation">{{ i18n.ts._charts.federation }}</option>
+							<option value="ap-request">{{ i18n.ts._charts.apRequest }}</option>
+						</optgroup>
+						<optgroup :label="i18n.ts.users">
+							<option value="users">{{ i18n.ts._charts.usersIncDec }}</option>
+							<option value="users-total">{{ i18n.ts._charts.usersTotal }}</option>
+							<option value="active-users">{{ i18n.ts._charts.activeUsers }}</option>
+						</optgroup>
+						<optgroup :label="i18n.ts.notes">
+							<option value="notes">{{ i18n.ts._charts.notesIncDec }}</option>
+							<option value="local-notes">{{ i18n.ts._charts.localNotesIncDec }}</option>
+							<option value="remote-notes">{{ i18n.ts._charts.remoteNotesIncDec }}</option>
+							<option value="notes-total">{{ i18n.ts._charts.notesTotal }}</option>
+						</optgroup>
+						<optgroup :label="i18n.ts.drive">
+							<option value="drive-files">{{ i18n.ts._charts.filesIncDec }}</option>
+							<option value="drive">{{ i18n.ts._charts.storageUsageIncDec }}</option>
+						</optgroup>
+					</MkSelect>
+					<MkSelect v-model="chartSpan" style="margin: 0 0 0 10px;">
+						<option value="hour">{{ i18n.ts.perHour }}</option>
+						<option value="day">{{ i18n.ts.perDay }}</option>
+					</MkSelect>
+				</div>
+				<div class="chart _panel">
+					<MkChart :src="chartSrc" :span="chartSpan" :limit="chartLimit" :detailed="true"></MkChart>
 				</div>
 			</div>
-		</div>
+		</MkFoldableSection>
+
+		<MkFoldableSection class="item">
+			<template #header>Active users heatmap</template>
+			<MkSelect v-model="heatmapSrc" style="margin: 0 0 12px 0;">
+				<option value="active-users">Active users</option>
+				<option value="notes">Notes</option>
+				<option value="ap-requests-inbox-received">AP Requests: inboxReceived</option>
+				<option value="ap-requests-deliver-succeeded">AP Requests: deliverSucceeded</option>
+				<option value="ap-requests-deliver-failed">AP Requests: deliverFailed</option>
+			</MkSelect>
+			<div class="_panel" :class="$style.heatmap">
+				<MkHeatmap :src="heatmapSrc"/>
+			</div>
+		</MkFoldableSection>
+
+		<MkFoldableSection class="item">
+			<template #header>Retention rate</template>
+			<div class="_panel" :class="$style.retention">
+				<MkRetentionHeatmap/>
+			</div>
+		</MkFoldableSection>
+
+		<MkFoldableSection class="item">
+			<template #header>Federation</template>
+			<div :class="$style.federation">
+				<div class="pies">
+					<div class="sub">
+						<div class="title">Sub</div>
+						<canvas ref="subDoughnutEl"></canvas>
+					</div>
+					<div class="pub">
+						<div class="title">Pub</div>
+						<canvas ref="pubDoughnutEl"></canvas>
+					</div>
+				</div>
+			</div>
+		</MkFoldableSection>
 	</div>
-	<div class="subpub">
-		<div class="sub">
-			<div class="title">Sub</div>
-			<canvas ref="subDoughnutEl"></canvas>
-		</div>
-		<div class="pub">
-			<div class="title">Pub</div>
-			<canvas ref="pubDoughnutEl"></canvas>
-		</div>
-	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
 import { onMounted } from 'vue';
-import {
-	Chart,
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	CategoryScale,
-	LinearScale,
-	TimeScale,
-	Legend,
-	Title,
-	Tooltip,
-	SubTitle,
-	Filler,
-	DoughnutController,
-} from 'chart.js';
-import MkSelect from '@/components/form/select.vue';
+import { Chart } from 'chart.js';
+import MkSelect from '@/components/MkSelect.vue';
 import MkChart from '@/components/MkChart.vue';
-import MkHeatmap from '@/components/MkHeatmap.vue';
 import { useChartTooltip } from '@/scripts/use-chart-tooltip';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
+import MkHeatmap from '@/components/MkHeatmap.vue';
+import MkFoldableSection from '@/components/MkFoldableSection.vue';
+import MkRetentionHeatmap from '@/components/MkRetentionHeatmap.vue';
+import { initChart } from '@/scripts/init-chart';
 
-Chart.register(
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	DoughnutController,
-	CategoryScale,
-	LinearScale,
-	TimeScale,
-	Legend,
-	Title,
-	Tooltip,
-	SubTitle,
-	Filler,
-);
-
-const props = withDefaults(defineProps<{
-	chartLimit?: number;
-	detailed?: boolean;
-}>(), {
-	chartLimit: 90,
-});
+initChart();
 
+const chartLimit = 500;
 let chartSpan = $ref<'hour' | 'day'>('hour');
 let chartSrc = $ref('active-users');
-// let heatmapSrc = $ref('active-users');
-let subDoughnutEl = $ref<HTMLCanvasElement>();
-let pubDoughnutEl = $ref<HTMLCanvasElement>();
+let heatmapSrc = $ref('active-users');
+let subDoughnutEl = $shallowRef<HTMLCanvasElement>();
+let pubDoughnutEl = $shallowRef<HTMLCanvasElement>();
 
 const { handler: externalTooltipHandler1 } = useChartTooltip({
 	position: 'middle',
@@ -196,47 +175,63 @@ onMounted(() => {
 });
 </script>
 
-<style lang="scss" scoped>
-.zbcjwnqg {
-	> .main {
-		background: var(--panel);
-		border-radius: var(--radius);
-		padding: 24px;
-		margin-bottom: 16px;
-
-		> .body {
-			> .chart {
-				padding: 8px 0 0 0;
-			}
-			> .heatmap {
-				padding: 12px;
-				margin-bottom: 12px;
-			}
+<style lang="scss" module>
+.root {
+	&:global {
+		> .item {
+			margin-bottom: 16px;
 		}
 	}
+}
 
-	> .subpub {
-		display: flex;
-		gap: 16px;
-
-		> .sub, > .pub {
-			flex: 1;
-			min-width: 0;
-			position: relative;
-			background: var(--panel);
-			border-radius: var(--radius);
-			padding: 24px;
-			max-height: 300px;
-
-			> .title {
-				position: absolute;
-				top: 24px;
-				left: 24px;
-			}
+.chart {
+	&:global {
+		> .selects {
+			display: flex;
+			margin-bottom: 12px;
 		}
 
-		@media (max-width: 600px) {
-			flex-direction: column;
+		> .chart {
+			padding: 16px;
+		}
+	}
+}
+
+.heatmap {
+	padding: 16px;
+	margin-bottom: 16px;
+}
+
+.retention {
+	padding: 16px;
+	margin-bottom: 16px;
+}
+
+.federation {
+	&:global {
+		> .pies {
+			display: flex;
+			gap: 16px;
+
+			> .sub, > .pub {
+				flex: 1;
+				min-width: 0;
+				position: relative;
+				background: var(--panel);
+				border-radius: var(--radius);
+				padding: 24px;
+				max-height: 300px;
+
+				> .title {
+					position: absolute;
+					top: 24px;
+					left: 24px;
+				}
+			}
+
+			@media (max-width: 600px) {
+				flex-direction: column;
+			}
 		}
 	}
 }

From f0d15ea6c065b955858e9f26165574dcfb113c96 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 19:54:06 -0800
Subject: [PATCH 034/582] MkFolder

---
 .../client/src/components/MkInstanceStats.vue | 18 ++++----
 packages/client/src/pages/admin/overview.vue  | 42 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/packages/client/src/components/MkInstanceStats.vue b/packages/client/src/components/MkInstanceStats.vue
index a79467759..455f205d7 100644
--- a/packages/client/src/components/MkInstanceStats.vue
+++ b/packages/client/src/components/MkInstanceStats.vue
@@ -1,6 +1,6 @@
 <template>
 	<div :class="$style.root">
-		<MkFoldableSection class="item">
+		<MkFolder class="item">
 			<template #header>Chart</template>
 			<div :class="$style.chart">
 				<div class="selects">
@@ -34,9 +34,9 @@
 					<MkChart :src="chartSrc" :span="chartSpan" :limit="chartLimit" :detailed="true"></MkChart>
 				</div>
 			</div>
-		</MkFoldableSection>
+		</MkFolder>
 
-		<MkFoldableSection class="item">
+		<MkFolder class="item">
 			<template #header>Active users heatmap</template>
 			<MkSelect v-model="heatmapSrc" style="margin: 0 0 12px 0;">
 				<option value="active-users">Active users</option>
@@ -48,16 +48,16 @@
 			<div class="_panel" :class="$style.heatmap">
 				<MkHeatmap :src="heatmapSrc"/>
 			</div>
-		</MkFoldableSection>
+		</MkFolder>
 
-		<MkFoldableSection class="item">
+		<MkFolder class="item">
 			<template #header>Retention rate</template>
 			<div class="_panel" :class="$style.retention">
 				<MkRetentionHeatmap/>
 			</div>
-		</MkFoldableSection>
+		</MkFolder>
 
-		<MkFoldableSection class="item">
+		<MkFolder class="item">
 			<template #header>Federation</template>
 			<div :class="$style.federation">
 				<div class="pies">
@@ -71,7 +71,7 @@
 					</div>
 				</div>
 			</div>
-		</MkFoldableSection>
+		</MkFolder>
 	</div>
 </template>
 
@@ -84,7 +84,7 @@ import { useChartTooltip } from '@/scripts/use-chart-tooltip';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import MkHeatmap from '@/components/MkHeatmap.vue';
-import MkFoldableSection from '@/components/MkFoldableSection.vue';
+import MkFolder from '@/components/MkFolder.vue';
 import MkRetentionHeatmap from '@/components/MkRetentionHeatmap.vue';
 import { initChart } from '@/scripts/init-chart';
 
diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index 074f23f31..f0148ca48 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -1,55 +1,55 @@
 <template>
 	<MkSpacer :content-max="1000">
 		<div ref="rootEl" class="edbbcaef">
-			<MkFoldableSection class="item">
+			<MkFolder class="item">
 				<template #header>Stats</template>
 				<XStats/>
-			</MkFoldableSection>
+			</MkFolder>
 
-			<MkFoldableSection class="item">
+			<MkFolder class="item">
 				<template #header>Active users</template>
 				<XActiveUsers/>
-			</MkFoldableSection>
+			</MkFolder>
 
-			<MkFoldableSection class="item">
+			<MkFolder class="item">
 				<template #header>Heatmap</template>
 				<XHeatmap/>
-			</MkFoldableSection>
+			</MkFolder>
 
-			<MkFoldableSection class="item">
+			<MkFolder class="item">
 				<template #header>Moderators</template>
 				<XModerators/>
-			</MkFoldableSection>
+			</MkFolder>
 
-			<MkFoldableSection class="item">
+			<MkFolder class="item">
 				<template #header>Federation</template>
 				<XFederation/>
-			</MkFoldableSection>
+			</MkFolder>
 
-			<MkFoldableSection class="item">
+			<MkFolder class="item">
 				<template #header>Instances</template>
 				<XInstances/>
-			</MkFoldableSection>
+			</MkFolder>
 
-			<MkFoldableSection class="item">
+			<MkFolder class="item">
 				<template #header>Ap requests</template>
 				<XApRequests/>
-			</MkFoldableSection>
+			</MkFolder>
 
-			<MkFoldableSection class="item">
+			<MkFolder class="item">
 				<template #header>New users</template>
 				<XUsers/>
-			</MkFoldableSection>
+			</MkFolder>
 
-			<MkFoldableSection class="item">
+			<MkFolder class="item">
 				<template #header>Deliver queue</template>
 				<XQueue domain="deliver"/>
-			</MkFoldableSection>
+			</MkFolder>
 
-			<MkFoldableSection class="item">
+			<MkFolder class="item">
 				<template #header>Inbox queue</template>
 				<XQueue domain="inbox"/>
-			</MkFoldableSection>
+			</MkFolder>
 		</div>
 	</MkSpacer>
 </template>
@@ -73,7 +73,7 @@ import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { defaultStore } from '@/store';
 import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
-import MkFoldableSection from '@/components/MkFoldableSection.vue';
+import MkFolder from '@/components/MkFolder.vue';
 
 const rootEl = $shallowRef<HTMLElement>();
 let serverInfo: any = $ref(null);

From 4b10a623e72c34d82afb928a33b88fffb740df3a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 19:55:37 -0800
Subject: [PATCH 035/582] fix import

---
 packages/client/src/components/MkInstanceStats.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkInstanceStats.vue b/packages/client/src/components/MkInstanceStats.vue
index 455f205d7..c9804e6c2 100644
--- a/packages/client/src/components/MkInstanceStats.vue
+++ b/packages/client/src/components/MkInstanceStats.vue
@@ -78,7 +78,7 @@
 <script lang="ts" setup>
 import { onMounted } from 'vue';
 import { Chart } from 'chart.js';
-import MkSelect from '@/components/MkSelect.vue';
+import MkSelect from '@/components/form/select.vue';
 import MkChart from '@/components/MkChart.vue';
 import { useChartTooltip } from '@/scripts/use-chart-tooltip';
 import * as os from '@/os';

From c967ddba2e6c6d1ca5f20ea40a6717aa233b4ca0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 19:58:33 -0800
Subject: [PATCH 036/582] add needed script

---
 packages/client/src/scripts/chart-vline.ts | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 packages/client/src/scripts/chart-vline.ts

diff --git a/packages/client/src/scripts/chart-vline.ts b/packages/client/src/scripts/chart-vline.ts
new file mode 100644
index 000000000..f32144383
--- /dev/null
+++ b/packages/client/src/scripts/chart-vline.ts
@@ -0,0 +1,23 @@
+import { Plugin } from 'chart.js';
+
+export const chartVLine = (vLineColor: string) => ({
+	id: 'vLine',
+	beforeDraw(chart, args, options) {
+		if (chart.tooltip?._active?.length) {
+			const ctx = chart.ctx;
+			const xs = chart.tooltip._active.map(a => a.element.x);
+			const x = xs.reduce((a, b) => a + b, 0) / xs.length;
+			const topY = chart.scales.y.top;
+			const bottomY = chart.scales.y.bottom;
+
+			ctx.save();
+			ctx.beginPath();
+			ctx.moveTo(x, bottomY);
+			ctx.lineTo(x, topY);
+			ctx.lineWidth = 1;
+			ctx.strokeStyle = vLineColor;
+			ctx.stroke();
+			ctx.restore();
+		}
+	},
+}) as Plugin;

From 7d296ae6f994470ab73639006c501916d27ac9de Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 19:59:40 -0800
Subject: [PATCH 037/582] rm retention heatmap

---
 packages/client/src/components/MkInstanceStats.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/client/src/components/MkInstanceStats.vue b/packages/client/src/components/MkInstanceStats.vue
index c9804e6c2..b34ed5fb0 100644
--- a/packages/client/src/components/MkInstanceStats.vue
+++ b/packages/client/src/components/MkInstanceStats.vue
@@ -50,13 +50,6 @@
 			</div>
 		</MkFolder>
 
-		<MkFolder class="item">
-			<template #header>Retention rate</template>
-			<div class="_panel" :class="$style.retention">
-				<MkRetentionHeatmap/>
-			</div>
-		</MkFolder>
-
 		<MkFolder class="item">
 			<template #header>Federation</template>
 			<div :class="$style.federation">
@@ -85,7 +78,6 @@ import * as os from '@/os';
 import { i18n } from '@/i18n';
 import MkHeatmap from '@/components/MkHeatmap.vue';
 import MkFolder from '@/components/MkFolder.vue';
-import MkRetentionHeatmap from '@/components/MkRetentionHeatmap.vue';
 import { initChart } from '@/scripts/init-chart';
 
 initChart();

From ae39d2295b628efb041c922196d43da78c6a7fd7 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 20:02:41 -0800
Subject: [PATCH 038/582] MkNumber

---
 packages/client/package.json                |  3 ++-
 packages/client/src/components/MkNumber.vue | 23 +++++++++++++++++++++
 pnpm-lock.yaml                              |  6 ++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 packages/client/src/components/MkNumber.vue

diff --git a/packages/client/package.json b/packages/client/package.json
index 4af4ff8f6..fe6288406 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -8,7 +8,8 @@
 	},
 	"dependencies": {
 		"@khmyznikov/pwa-install": "^0.2.0",
-		"chartjs-chart-matrix": "^2.0.1"
+		"chartjs-chart-matrix": "^2.0.1",
+		"gsap": "^3.11.4"
 	},
 	"devDependencies": {
 		"@discordapp/twemoji": "14.0.2",
diff --git a/packages/client/src/components/MkNumber.vue b/packages/client/src/components/MkNumber.vue
new file mode 100644
index 000000000..58279be0b
--- /dev/null
+++ b/packages/client/src/components/MkNumber.vue
@@ -0,0 +1,23 @@
+<template>
+<span>{{ number(Math.floor(tweened.number)) }}</span>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, watch } from 'vue';
+import gsap from 'gsap';
+import number from '@/filters/number';
+
+const props = defineProps<{
+	value: number;
+}>();
+
+const tweened = reactive({
+	number: 0,
+});
+
+watch(() => props.value, (n) => {
+	gsap.to(tweened, { duration: 1, number: Number(n) || 0 });
+}, {
+	immediate: true,
+});
+</script>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7d1c0150f..06ec19eca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -427,6 +427,7 @@ importers:
       date-fns: 2.29.3
       escape-regexp: 0.0.1
       eventemitter3: 4.0.7
+      gsap: ^3.11.4
       idb-keyval: 6.2.0
       insert-text-at-cursor: 0.3.0
       json5: 2.2.3
@@ -466,6 +467,7 @@ importers:
     dependencies:
       '@khmyznikov/pwa-install': 0.2.0
       chartjs-chart-matrix: 2.0.1_chart.js@4.1.1
+      gsap: 3.11.4
     devDependencies:
       '@discordapp/twemoji': 14.0.2
       '@rollup/plugin-alias': 3.1.9_rollup@3.9.1
@@ -6914,6 +6916,10 @@ packages:
   /grapheme-splitter/1.0.4:
     resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
 
+  /gsap/3.11.4:
+    resolution: {integrity: sha512-McHhEguHyExMMnjqKA8G+7TvxmlKQGMbjgwAilnFe1e4id7V/tFveRQ2YMZhTYu0oxHGWvbPltdVYQOu3z1SCA==}
+    dev: false
+
   /gulp-cli/2.3.0:
     resolution: {integrity: sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==}
     engines: {node: '>= 0.10'}

From 0ae7e978319c89822057cc4147a4d4ef548a3c16 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 20:04:34 -0800
Subject: [PATCH 039/582] fix

---
 packages/client/src/pages/admin/overview.stats.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/client/src/pages/admin/overview.stats.vue b/packages/client/src/pages/admin/overview.stats.vue
index bd636cc3e..567515c41 100644
--- a/packages/client/src/pages/admin/overview.stats.vue
+++ b/packages/client/src/pages/admin/overview.stats.vue
@@ -32,15 +32,6 @@
 					<div class="label">Instances</div>
 				</div>
 			</div>
-			<div class="item _panel emojis">
-				<div class="icon"><i class="ti ti-icons"></i></div>
-				<div class="body">
-					<div class="value">
-						<MkNumber :value="customEmojis.length" style="margin-right: 0.5em;"/>
-					</div>
-					<div class="label">Custom emojis</div>
-				</div>
-			</div>
 			<div class="item _panel online">
 				<div class="icon"><i class="ti ti-access-point"></i></div>
 				<div class="body">
@@ -63,7 +54,6 @@ import number from '@/filters/number';
 import MkNumberDiff from '@/components/MkNumberDiff.vue';
 import MkNumber from '@/components/MkNumber.vue';
 import { i18n } from '@/i18n';
-import { customEmojis } from '@/custom-emojis';
 
 let stats: any = $ref(null);
 let usersComparedToThePrevDay = $ref<number>();

From c5778e487fb8304000410ecbb1184d4412e98608 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 20:05:49 -0800
Subject: [PATCH 040/582] fix import

---
 packages/client/src/pages/admin/overview.heatmap.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/admin/overview.heatmap.vue b/packages/client/src/pages/admin/overview.heatmap.vue
index 3fb163893..4d56d2a51 100644
--- a/packages/client/src/pages/admin/overview.heatmap.vue
+++ b/packages/client/src/pages/admin/overview.heatmap.vue
@@ -13,7 +13,7 @@
 
 <script lang="ts" setup>
 import MkHeatmap from '@/components/MkHeatmap.vue';
-import MkSelect from '@/components/MkSelect.vue';
+import MkSelect from '@/components/form/select.vue';
 
 let src = $ref('active-users');
 </script>

From fc285bb6457b6fde6cd40854c7b5178255cc1e09 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 20:21:42 -0800
Subject: [PATCH 041/582] fix: :lipstick: admin overview style

---
 package.json                                  |  2 +-
 packages/backend/src/misc/gen-identicon.ts    | 56 ++++++++++++-------
 packages/client/src/components/MkHeatmap.vue  |  2 +-
 .../src/pages/admin/overview.active-users.vue |  4 +-
 .../src/pages/admin/overview.moderators.vue   |  2 +-
 .../src/pages/admin/overview.queue.chart.vue  |  8 +--
 6 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index 3da6e94d6..dbb304cb9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev8",
+	"version": "13.2.0-dev9",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/backend/src/misc/gen-identicon.ts b/packages/backend/src/misc/gen-identicon.ts
index 79297f8f2..fecdb4062 100644
--- a/packages/backend/src/misc/gen-identicon.ts
+++ b/packages/backend/src/misc/gen-identicon.ts
@@ -11,26 +11,42 @@ const size = 128; // px
 const n = 5; // resolution
 const margin = size / 4;
 const colors = [
-	["#FF512F", "#DD2476"],
-	["#FF61D2", "#FE9090"],
-	["#72FFB6", "#10D164"],
-	["#FD8451", "#FFBD6F"],
-	["#305170", "#6DFC6B"],
-	["#00C0FF", "#4218B8"],
-	["#009245", "#FCEE21"],
-	["#0100EC", "#FB36F4"],
-	["#FDABDD", "#374A5A"],
-	["#38A2D7", "#561139"],
-	["#121C84", "#8278DA"],
-	["#5761B2", "#1FC5A8"],
-	["#FFDB01", "#0E197D"],
-	["#FF3E9D", "#0E1F40"],
-	["#766eff", "#00d4ff"],
-	["#9bff6e", "#00d4ff"],
-	["#ff6e94", "#00d4ff"],
-	["#ffa96e", "#00d4ff"],
-	["#ffa96e", "#ff009d"],
-	["#ffdd6e", "#ff009d"],
+	["#eb6f92", "#b4637a"],
+	["#f6c177", "#ea9d34"],
+	["#ebbcba", "#d7827e"],
+	["#31748f", "#286983"],
+	["#9ccfd8", "#56949f"],
+	["#c4a7e7", "#907aa9"],
+	["#eb6f92", "#f6c177"],
+	["#eb6f92", "#ebbcba"],
+	["#eb6f92", "#31748f"],
+	["#eb6f92", "#9ccfd8"],
+	["#eb6f92", "#c4a7e7"],
+	["#f6c177", "#eb6f92"],
+	["#f6c177", "#ebbcba"],
+	["#f6c177", "#31748f"],
+	["#f6c177", "#9ccfd8"],
+	["#f6c177", "#c4a7e7"],
+	["#ebbcba", "#eb6f92"],
+	["#ebbcba", "#f6c177"],
+	["#ebbcba", "#31748f"],
+	["#ebbcba", "#9ccfd8"],
+	["#ebbcba", "#c4a7e7"],
+	["#31748f", "#eb6f92"],
+	["#31748f", "#f6c177"],
+	["#31748f", "#ebbcba"],
+	["#31748f", "#9ccfd8"],
+	["#31748f", "#c4a7e7"],
+	["#9ccfd8", "#eb6f92"],
+	["#9ccfd8", "#f6c177"],
+	["#9ccfd8", "#ebbcba"],
+	["#9ccfd8", "#31748f"],
+	["#9ccfd8", "#c4a7e7"],
+	["#c4a7e7", "#eb6f92"],
+	["#c4a7e7", "#f6c177"],
+	["#c4a7e7", "#ebbcba"],
+	["#c4a7e7", "#31748f"],
+	["#c4a7e7", "#9ccfd8"],
 ];
 
 const actualSize = size - margin * 2;
diff --git a/packages/client/src/components/MkHeatmap.vue b/packages/client/src/components/MkHeatmap.vue
index 036a2eb49..02f5c7aed 100644
--- a/packages/client/src/components/MkHeatmap.vue
+++ b/packages/client/src/components/MkHeatmap.vue
@@ -90,7 +90,7 @@ async function renderChart() {
 
 	await nextTick();
 
-	const color = defaultStore.state.darkMode ? '#b4e900' : '#86b300';
+	const color = defaultStore.state.darkMode ? '#ebbcba' : '#d7827e';
 
 	// 視覚上の分かりやすさのため上から最も大きい3つの値の平均を最大値とする
 	const max = values.slice().sort((a, b) => b - a).slice(0, 3).reduce((a, b) => a + b, 0) / 3;
diff --git a/packages/client/src/pages/admin/overview.active-users.vue b/packages/client/src/pages/admin/overview.active-users.vue
index 3ec7694f2..ee8f42c43 100644
--- a/packages/client/src/pages/admin/overview.active-users.vue
+++ b/packages/client/src/pages/admin/overview.active-users.vue
@@ -53,8 +53,8 @@ async function renderChart() {
 
 	const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
 
-	const colorRead = '#3498db';
-	const colorWrite = '#2ecc71';
+	const colorRead = '#eb6f92';
+	const colorWrite = '#f6c177';
 
 	const max = Math.max(...raw.read);
 
diff --git a/packages/client/src/pages/admin/overview.moderators.vue b/packages/client/src/pages/admin/overview.moderators.vue
index 445217d82..1a5160172 100644
--- a/packages/client/src/pages/admin/overview.moderators.vue
+++ b/packages/client/src/pages/admin/overview.moderators.vue
@@ -22,7 +22,7 @@ let fetching = $ref(true);
 
 onMounted(async () => {
 	moderators = await os.api('admin/show-users', {
-		sort: '+lastActiveDate',
+		sort: '+updatedAt',
 		state: 'adminOrModerator',
 		limit: 30,
 	});
diff --git a/packages/client/src/pages/admin/overview.queue.chart.vue b/packages/client/src/pages/admin/overview.queue.chart.vue
index 0162d5366..46d030687 100644
--- a/packages/client/src/pages/admin/overview.queue.chart.vue
+++ b/packages/client/src/pages/admin/overview.queue.chart.vue
@@ -57,10 +57,10 @@ const label =
 	'?' as never;
 
 const color =
-	props.type === 'process' ? '#00E396' :
-	props.type === 'active' ? '#00BCD4' :
-	props.type === 'delayed' ? '#E53935' :
-	props.type === 'waiting' ? '#FFB300' :
+	props.type === 'process' ? '#c4a7e7' :
+	props.type === 'active' ? '#31748f' :
+	props.type === 'delayed' ? '#eb6f92' :
+	props.type === 'waiting' ? '#f6c177' :
 	'?' as never;
 
 onMounted(() => {

From ec2f062ce5767dbee3d68169141bc01620f5e7ab Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 13 Feb 2023 20:25:31 -0800
Subject: [PATCH 042/582] chore: formatting

---
 .../client/src/components/MkInstanceStats.vue |  6 +--
 .../src/pages/admin/overview.ap-requests.vue  |  8 ++--
 .../src/pages/admin/overview.heatmap.vue      |  6 +--
 packages/client/src/pages/admin/overview.vue  |  2 +-
 packages/client/src/scripts/chart-vline.ts    | 43 ++++++++++---------
 5 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/packages/client/src/components/MkInstanceStats.vue b/packages/client/src/components/MkInstanceStats.vue
index b34ed5fb0..a9cb7977a 100644
--- a/packages/client/src/components/MkInstanceStats.vue
+++ b/packages/client/src/components/MkInstanceStats.vue
@@ -41,9 +41,9 @@
 			<MkSelect v-model="heatmapSrc" style="margin: 0 0 12px 0;">
 				<option value="active-users">Active users</option>
 				<option value="notes">Notes</option>
-				<option value="ap-requests-inbox-received">AP Requests: inboxReceived</option>
-				<option value="ap-requests-deliver-succeeded">AP Requests: deliverSucceeded</option>
-				<option value="ap-requests-deliver-failed">AP Requests: deliverFailed</option>
+				<option value="ap-requests-inbox-received">Fediverse Requests: inboxReceived</option>
+				<option value="ap-requests-deliver-succeeded">Fediverse Requests: deliverSucceeded</option>
+				<option value="ap-requests-deliver-failed">Fediverse Requests: deliverFailed</option>
 			</MkSelect>
 			<div class="_panel" :class="$style.heatmap">
 				<MkHeatmap :src="heatmapSrc"/>
diff --git a/packages/client/src/pages/admin/overview.ap-requests.vue b/packages/client/src/pages/admin/overview.ap-requests.vue
index efb335fff..e481465a1 100644
--- a/packages/client/src/pages/admin/overview.ap-requests.vue
+++ b/packages/client/src/pages/admin/overview.ap-requests.vue
@@ -68,8 +68,8 @@ onMounted(async () => {
 	const raw = await os.api('charts/ap-request', { limit: chartLimit, span: 'day' });
 
 	const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
-	const succColor = '#87e000';
-	const failColor = '#ff4400';
+	const succColor = '#9ccfd8';
+	const failColor = '#f6c177';
 
 	const succMax = Math.max(...raw.deliverSucceeded);
 	const failMax = Math.max(...raw.deliverFailed);
@@ -190,7 +190,7 @@ onMounted(async () => {
 				borderWidth: 0,
 				borderJoinStyle: 'round',
 				borderRadius: 4,
-				backgroundColor: '#0cc2d6',
+				backgroundColor: '#c4a7e7',
 				barPercentage: 0.8,
 				categoryPercentage: 0.9,
 				fill: true,
@@ -264,7 +264,7 @@ onMounted(async () => {
 		},
 		plugins: [chartVLine(vLineColor)],
 	});
-	
+
 	fetching = false;
 });
 </script>
diff --git a/packages/client/src/pages/admin/overview.heatmap.vue b/packages/client/src/pages/admin/overview.heatmap.vue
index 4d56d2a51..6cb64f387 100644
--- a/packages/client/src/pages/admin/overview.heatmap.vue
+++ b/packages/client/src/pages/admin/overview.heatmap.vue
@@ -3,9 +3,9 @@
 	<MkSelect v-model="src" style="margin: 0 0 12px 0;" small>
 		<option value="active-users">Active users</option>
 		<option value="notes">Notes</option>
-		<option value="ap-requests-inbox-received">AP Requests: inboxReceived</option>
-		<option value="ap-requests-deliver-succeeded">AP Requests: deliverSucceeded</option>
-		<option value="ap-requests-deliver-failed">AP Requests: deliverFailed</option>
+		<option value="ap-requests-inbox-received">Fediverse Requests: inboxReceived</option>
+		<option value="ap-requests-deliver-succeeded">Fediverse Requests: deliverSucceeded</option>
+		<option value="ap-requests-deliver-failed">Fediverse Requests: deliverFailed</option>
 	</MkSelect>
 	<MkHeatmap :src="src"/>
 </div>
diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index f0148ca48..fd9044fb9 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -32,7 +32,7 @@
 			</MkFolder>
 
 			<MkFolder class="item">
-				<template #header>Ap requests</template>
+				<template #header>Fediverse Requests</template>
 				<XApRequests/>
 			</MkFolder>
 
diff --git a/packages/client/src/scripts/chart-vline.ts b/packages/client/src/scripts/chart-vline.ts
index f32144383..94ba0abd3 100644
--- a/packages/client/src/scripts/chart-vline.ts
+++ b/packages/client/src/scripts/chart-vline.ts
@@ -1,23 +1,24 @@
-import { Plugin } from 'chart.js';
+import { Plugin } from "chart.js";
 
-export const chartVLine = (vLineColor: string) => ({
-	id: 'vLine',
-	beforeDraw(chart, args, options) {
-		if (chart.tooltip?._active?.length) {
-			const ctx = chart.ctx;
-			const xs = chart.tooltip._active.map(a => a.element.x);
-			const x = xs.reduce((a, b) => a + b, 0) / xs.length;
-			const topY = chart.scales.y.top;
-			const bottomY = chart.scales.y.bottom;
+export const chartVLine = (vLineColor: string) =>
+	({
+		id: "vLine",
+		beforeDraw(chart, args, options) {
+			if (chart.tooltip?._active?.length) {
+				const ctx = chart.ctx;
+				const xs = chart.tooltip._active.map((a) => a.element.x);
+				const x = xs.reduce((a, b) => a + b, 0) / xs.length;
+				const topY = chart.scales.y.top;
+				const bottomY = chart.scales.y.bottom;
 
-			ctx.save();
-			ctx.beginPath();
-			ctx.moveTo(x, bottomY);
-			ctx.lineTo(x, topY);
-			ctx.lineWidth = 1;
-			ctx.strokeStyle = vLineColor;
-			ctx.stroke();
-			ctx.restore();
-		}
-	},
-}) as Plugin;
+				ctx.save();
+				ctx.beginPath();
+				ctx.moveTo(x, bottomY);
+				ctx.lineTo(x, topY);
+				ctx.lineWidth = 1;
+				ctx.strokeStyle = vLineColor;
+				ctx.stroke();
+				ctx.restore();
+			}
+		},
+	}) as Plugin;

From 11de7a1e11e6e6a594b70b79112595196566fb79 Mon Sep 17 00:00:00 2001
From: Cleo John <waterdev@galaxycrow.de>
Date: Tue, 14 Feb 2023 11:03:05 +0100
Subject: [PATCH 043/582] refactor please signin component

---
 packages/client/src/scripts/please-login.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/scripts/please-login.ts b/packages/client/src/scripts/please-login.ts
index 7db92c640..9b660dd6d 100644
--- a/packages/client/src/scripts/please-login.ts
+++ b/packages/client/src/scripts/please-login.ts
@@ -22,5 +22,5 @@ export function pleaseLogin(path?: string) {
 		"closed",
 	);
 
-	if (!path) throw new Error("signin required");
+	if (!path) throw new Error("Sign-in required.");
 }

From ed24e9d6a8f7576cad232501f9dc5812f6a20aa0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 15 Feb 2023 10:27:49 -0800
Subject: [PATCH 044/582] icons for dashboard

---
 .../src/pages/admin/overview.federation.vue   | 14 ++++-----
 .../client/src/pages/admin/overview.stats.vue | 30 +++++++++----------
 packages/client/src/pages/admin/overview.vue  |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/packages/client/src/pages/admin/overview.federation.vue b/packages/client/src/pages/admin/overview.federation.vue
index 2789adf64..63b89a74c 100644
--- a/packages/client/src/pages/admin/overview.federation.vue
+++ b/packages/client/src/pages/admin/overview.federation.vue
@@ -16,7 +16,7 @@
 		</div>
 		<div v-if="!fetching" class="items">
 			<div class="item _panel sub">
-				<div class="icon"><i class="ti ti-world-download"></i></div>
+				<div class="icon"><i class="ph-download-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						{{ number(federationSubActive) }}
@@ -26,7 +26,7 @@
 				</div>
 			</div>
 			<div class="item _panel pub">
-				<div class="icon"><i class="ti ti-world-upload"></i></div>
+				<div class="icon"><i class="ph-upload-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						{{ number(federationPubActive) }}
@@ -59,7 +59,7 @@ let federationSubActiveDiff = $ref<number | null>(null);
 let fetching = $ref(true);
 
 const { handler: externalTooltipHandler } = useChartTooltip();
-	
+
 onMounted(async () => {
 	const chart = await os.apiGet('charts/federation', { limit: 2, span: 'day' });
 	federationPubActive = chart.pubActive[0];
@@ -147,15 +147,15 @@ onMounted(async () => {
 
 				&.sub {
 					> .icon {
-						background: #d5ba0026;
-						color: #dfc300;
+						background: #907aa9;
+						color: #c4a7e7;
 					}
 				}
 
 				&.pub {
 					> .icon {
-						background: #00cf2326;
-						color: #00cd5b;
+						background: #56949f;
+						color: #9ccfd8;
 					}
 				}
 
diff --git a/packages/client/src/pages/admin/overview.stats.vue b/packages/client/src/pages/admin/overview.stats.vue
index 567515c41..36f3076e7 100644
--- a/packages/client/src/pages/admin/overview.stats.vue
+++ b/packages/client/src/pages/admin/overview.stats.vue
@@ -4,7 +4,7 @@
 		<MkLoading v-if="fetching"/>
 		<div v-else :class="$style.root">
 			<div class="item _panel users">
-				<div class="icon"><i class="ti ti-users"></i></div>
+				<div class="icon"><i class="ph-users-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						<MkNumber :value="stats.originalUsersCount" style="margin-right: 0.5em;"/>
@@ -14,17 +14,17 @@
 				</div>
 			</div>
 			<div class="item _panel notes">
-				<div class="icon"><i class="ti ti-pencil"></i></div>
+				<div class="icon"><i class="ph-pencil-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						<MkNumber :value="stats.originalNotesCount" style="margin-right: 0.5em;"/>
 						<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="notesComparedToThePrevDay"></MkNumberDiff>
 					</div>
-					<div class="label">Notes</div>
+					<div class="label">Posts</div>
 				</div>
 			</div>
 			<div class="item _panel instances">
-				<div class="icon"><i class="ti ti-planet"></i></div>
+				<div class="icon"><i class="ph-planet-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						<MkNumber :value="stats.instances" style="margin-right: 0.5em;"/>
@@ -33,7 +33,7 @@
 				</div>
 			</div>
 			<div class="item _panel online">
-				<div class="icon"><i class="ti ti-access-point"></i></div>
+				<div class="icon"><i class="ph-broadcast-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						<MkNumber :value="onlineUsersCount" style="margin-right: 0.5em;"/>
@@ -106,36 +106,36 @@ onMounted(async () => {
 
 			&.users {
 				> .icon {
-					background: #0088d726;
-					color: #3d96c1;
+					background: #56949f;
+					color: #9ccfd8;
 				}
 			}
 
 			&.notes {
 				> .icon {
-					background: #86b30026;
-					color: #86b300;
+					background: #286983;
+					color: #31748f;
 				}
 			}
 
 			&.instances {
 				> .icon {
-					background: #e96b0026;
-					color: #d76d00;
+					background: #d7827e;
+					color: #ebbcba;
 				}
 			}
 
 			&.emojis {
 				> .icon {
-					background: #d5ba0026;
-						color: #dfc300;
+					background: #ea9d34;
+						color: #f6c177;
 				}
 			}
 
 			&.online {
 				> .icon {
-					background: #8a00d126;
-					color: #c01ac3;
+					background: #907aa9;
+					color: #c4a7e7;
 				}
 			}
 
diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index fd9044fb9..dad0f7c10 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -170,7 +170,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.dashboard,
-	icon: 'ti ti-dashboard',
+	icon: 'ph-gauge-bold ph-lg',
 });
 </script>
 

From badc30d7e76201d2e3d5e24365300ed6be7fde1d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 15 Feb 2023 10:29:49 -0800
Subject: [PATCH 045/582] type errors

---
 packages/client/vite.json5.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/client/vite.json5.ts b/packages/client/vite.json5.ts
index e1612d2e8..e4f1c7123 100644
--- a/packages/client/vite.json5.ts
+++ b/packages/client/vite.json5.ts
@@ -5,6 +5,11 @@ import { Plugin } from 'rollup';
 import { createFilter, dataToEsm } from '@rollup/pluginutils';
 import { RollupJsonOptions } from '@rollup/plugin-json';
 
+interface Json5SyntaxError extends SyntaxError {
+	lineNumber: number;
+	columnNumber: number;
+}
+
 export default function json5(options: RollupJsonOptions = {}): Plugin {
 	const filter = createFilter(options.include, options.exclude);
 	const indent = 'indent' in options ? options.indent : '\t';
@@ -27,9 +32,12 @@ export default function json5(options: RollupJsonOptions = {}): Plugin {
 					map: { mappings: '' },
 				};
 			} catch (err) {
-				const message = 'Could not parse JSON file';
-				const position = parseInt(/[\d]/.exec(err.message)[0], 10);
-				this.warn({ message, id, position });
+				if (!(err instanceof SyntaxError)) {
+					throw err;
+				}
+				const message = 'Could not parse JSON5 file';
+				const { lineNumber, columnNumber } = err as Json5SyntaxError;
+				this.warn({ message, id, loc: { line: lineNumber, column: columnNumber } });
 				return null;
 			}
 		},

From 4453e847a45831ac917ae6dde640e91086c32d15 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 15 Feb 2023 10:31:10 -0800
Subject: [PATCH 046/582] fix: :bug: pagination for "/api/channels/followed"

Co-authored-by: takonomura <@takonomura@github.com>
---
 .../server/api/endpoints/channels/followed.ts  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/channels/followed.ts b/packages/backend/src/server/api/endpoints/channels/followed.ts
index 63483a79a..f9e61222f 100644
--- a/packages/backend/src/server/api/endpoints/channels/followed.ts
+++ b/packages/backend/src/server/api/endpoints/channels/followed.ts
@@ -1,6 +1,5 @@
 import define from "../../define.js";
 import { Channels, ChannelFollowings } from "@/models/index.js";
-import { makePaginationQuery } from "../../common/make-pagination-query.js";
 
 export const meta = {
 	tags: ["channels", "account"],
@@ -33,11 +32,18 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async (ps, me) => {
-	const query = makePaginationQuery(
-		ChannelFollowings.createQueryBuilder(),
-		ps.sinceId,
-		ps.untilId,
-	).andWhere({ followerId: me.id });
+	const query = ChannelFollowings.createQueryBuilder('following').andWhere({ followerId: me.id });
+	if (ps.sinceId) {
+		query.andWhere('following."followeeId" > :sinceId', { sinceId: ps.sinceId });
+	}
+	if (ps.untilId) {
+		query.andWhere('following."followeeId" < :untilId', { untilId: ps.untilId });
+	}
+	if (ps.sinceId && !ps.untilId) {
+		query.orderBy('following."followeeId"', 'ASC');
+	} else {
+		query.orderBy('following."followeeId"', 'DESC');
+	}
 
 	const followings = await query.take(ps.limit).getMany();
 

From 30397887cfb05ef6987e946e82c041e1927cf61f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 15 Feb 2023 10:33:00 -0800
Subject: [PATCH 047/582] fix: more readable icon bgs

---
 packages/client/src/pages/admin/overview.federation.vue | 4 ++--
 packages/client/src/pages/admin/overview.stats.vue      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/pages/admin/overview.federation.vue b/packages/client/src/pages/admin/overview.federation.vue
index 63b89a74c..961837b22 100644
--- a/packages/client/src/pages/admin/overview.federation.vue
+++ b/packages/client/src/pages/admin/overview.federation.vue
@@ -147,14 +147,14 @@ onMounted(async () => {
 
 				&.sub {
 					> .icon {
-						background: #907aa9;
+						background: #907aa955;
 						color: #c4a7e7;
 					}
 				}
 
 				&.pub {
 					> .icon {
-						background: #56949f;
+						background: #56949f55;
 						color: #9ccfd8;
 					}
 				}
diff --git a/packages/client/src/pages/admin/overview.stats.vue b/packages/client/src/pages/admin/overview.stats.vue
index 36f3076e7..bb49db9c8 100644
--- a/packages/client/src/pages/admin/overview.stats.vue
+++ b/packages/client/src/pages/admin/overview.stats.vue
@@ -106,28 +106,28 @@ onMounted(async () => {
 
 			&.users {
 				> .icon {
-					background: #56949f;
+					background: #56949f55;
 					color: #9ccfd8;
 				}
 			}
 
 			&.notes {
 				> .icon {
-					background: #286983;
+					background: #28698355;
 					color: #31748f;
 				}
 			}
 
 			&.instances {
 				> .icon {
-					background: #d7827e;
+					background: #d7827e55;
 					color: #ebbcba;
 				}
 			}
 
 			&.emojis {
 				> .icon {
-					background: #ea9d34;
+					background: #ea9d3455;
 						color: #f6c177;
 				}
 			}

From 6b6b18fd1c6ce12d59117cc178b4a248dfc69290 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 15 Feb 2023 10:34:17 -0800
Subject: [PATCH 048/582] adjust MkNumber tween time

---
 packages/client/src/components/MkNumber.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNumber.vue b/packages/client/src/components/MkNumber.vue
index 58279be0b..f24b36237 100644
--- a/packages/client/src/components/MkNumber.vue
+++ b/packages/client/src/components/MkNumber.vue
@@ -16,7 +16,7 @@ const tweened = reactive({
 });
 
 watch(() => props.value, (n) => {
-	gsap.to(tweened, { duration: 1, number: Number(n) || 0 });
+	gsap.to(tweened, { duration: 0.6, number: Number(n) || 0 });
 }, {
 	immediate: true,
 });

From e2853ed0c2ca2e0448bea6b7ac4c07d61b8da18f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 15 Feb 2023 10:37:39 -0800
Subject: [PATCH 049/582] refactor: use MkAvatars for mods

---
 .../src/pages/admin/overview.moderators.vue   | 20 ++-----------------
 packages/client/src/widgets/user-list.vue     |  6 +++---
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/packages/client/src/pages/admin/overview.moderators.vue b/packages/client/src/pages/admin/overview.moderators.vue
index 1a5160172..77251fe4b 100644
--- a/packages/client/src/pages/admin/overview.moderators.vue
+++ b/packages/client/src/pages/admin/overview.moderators.vue
@@ -3,9 +3,7 @@
 	<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
 		<MkLoading v-if="fetching"/>
 		<div v-else :class="$style.root" class="_panel">
-			<MkA v-for="user in moderators" :key="user.id" class="user" :to="`/user-info/${user.id}`">
-				<MkAvatar :user="user" class="avatar" indicator/>
-			</MkA>
+			<MkAvatars :user-ids="moderators.userIds" class="userAvatars"/>
 		</div>
 	</Transition>
 </div>
@@ -14,8 +12,7 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref } from 'vue';
 import * as os from '@/os';
-import number from '@/filters/number';
-import { i18n } from '@/i18n';
+import MkAvatars from '@/components/MkAvatars.vue';
 
 let moderators: any = $ref(null);
 let fetching = $ref(true);
@@ -38,18 +35,5 @@ onMounted(async () => {
 	grid-gap: 12px;
 	place-content: center;
 	padding: 12px;
-
-	&:global {
-		> .user {
-			width: 100%;
-			height: 100%;
-			aspect-ratio: 1;
-
-			> .avatar {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
 }
 </style>
diff --git a/packages/client/src/widgets/user-list.vue b/packages/client/src/widgets/user-list.vue
index 6ee6dc05a..4173f5c36 100644
--- a/packages/client/src/widgets/user-list.vue
+++ b/packages/client/src/widgets/user-list.vue
@@ -2,7 +2,7 @@
 	<MkContainer :show-header="widgetProps.showHeader" class="mkw-userList">
 		<template #header><i class="ph-user-list-bold ph-lg"></i> {{ list ? list.name : i18n.ts._widgets.userList }}</template>
 		<template #func="{ buttonStyleClass }"><button class="_button" :class="buttonStyleClass" @click="configure()"><i class="ph-gear-six-bold ph-lg"></i></button></template>
-	
+
 		<div class="wsdlkfj">
 			<div v-if="widgetProps.listId == null" class="init">
 				<MkButton primary @click="chooseList">{{ i18n.ts._widgets._userList.chooseList }}</MkButton>
@@ -14,7 +14,7 @@
 		</div>
 	</MkContainer>
 </template>
-	
+
 <script lang="ts" setup>
 import { useWidgetPropsManager, Widget, WidgetComponentExpose } from './widget';
 import { GetFormResultType } from '@/scripts/form';
@@ -92,7 +92,7 @@ defineExpose<WidgetComponentExpose>({
 	id: props.widget ? props.widget.id : null,
 });
 </script>
-	
+
 <style lang="scss" module>
 .wsdlkfj {
 	> .init {

From ee9ab38e145ea4f2e189a1bbfd276f00b62ea1fa Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 15 Feb 2023 10:39:30 -0800
Subject: [PATCH 050/582] bg

---
 packages/client/src/pages/admin/overview.stats.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/admin/overview.stats.vue b/packages/client/src/pages/admin/overview.stats.vue
index bb49db9c8..0868cba3d 100644
--- a/packages/client/src/pages/admin/overview.stats.vue
+++ b/packages/client/src/pages/admin/overview.stats.vue
@@ -134,7 +134,7 @@ onMounted(async () => {
 
 			&.online {
 				> .icon {
-					background: #907aa9;
+					background: #907aa955;
 					color: #c4a7e7;
 				}
 			}

From c35aaec591e8c2596d2ab6534b90ab24f721cbe0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 15 Feb 2023 10:45:33 -0800
Subject: [PATCH 051/582] notes for admin heatmap by default

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

diff --git a/packages/client/src/pages/admin/overview.heatmap.vue b/packages/client/src/pages/admin/overview.heatmap.vue
index 6cb64f387..7628209c7 100644
--- a/packages/client/src/pages/admin/overview.heatmap.vue
+++ b/packages/client/src/pages/admin/overview.heatmap.vue
@@ -1,8 +1,8 @@
 <template>
 <div class="_panel" :class="$style.root">
 	<MkSelect v-model="src" style="margin: 0 0 12px 0;" small>
-		<option value="active-users">Active users</option>
 		<option value="notes">Notes</option>
+		<option value="active-users">Active users</option>
 		<option value="ap-requests-inbox-received">Fediverse Requests: inboxReceived</option>
 		<option value="ap-requests-deliver-succeeded">Fediverse Requests: deliverSucceeded</option>
 		<option value="ap-requests-deliver-failed">Fediverse Requests: deliverFailed</option>
@@ -15,7 +15,7 @@
 import MkHeatmap from '@/components/MkHeatmap.vue';
 import MkSelect from '@/components/form/select.vue';
 
-let src = $ref('active-users');
+let src = $ref('notes');
 </script>
 
 <style lang="scss" module>

From 8478a3c48c34f2f263e307efca11be79c0817f56 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 15 Feb 2023 12:45:41 -0800
Subject: [PATCH 052/582] Revert "refactor: use MkAvatars for mods"

This reverts commit dbe74ed098d06efb2e425d5d93d45798abdf350c.
---
 .../src/pages/admin/overview.moderators.vue   | 20 +++++++++++++++++--
 packages/client/src/widgets/user-list.vue     |  6 +++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/pages/admin/overview.moderators.vue b/packages/client/src/pages/admin/overview.moderators.vue
index 77251fe4b..1a5160172 100644
--- a/packages/client/src/pages/admin/overview.moderators.vue
+++ b/packages/client/src/pages/admin/overview.moderators.vue
@@ -3,7 +3,9 @@
 	<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
 		<MkLoading v-if="fetching"/>
 		<div v-else :class="$style.root" class="_panel">
-			<MkAvatars :user-ids="moderators.userIds" class="userAvatars"/>
+			<MkA v-for="user in moderators" :key="user.id" class="user" :to="`/user-info/${user.id}`">
+				<MkAvatar :user="user" class="avatar" indicator/>
+			</MkA>
 		</div>
 	</Transition>
 </div>
@@ -12,7 +14,8 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref } from 'vue';
 import * as os from '@/os';
-import MkAvatars from '@/components/MkAvatars.vue';
+import number from '@/filters/number';
+import { i18n } from '@/i18n';
 
 let moderators: any = $ref(null);
 let fetching = $ref(true);
@@ -35,5 +38,18 @@ onMounted(async () => {
 	grid-gap: 12px;
 	place-content: center;
 	padding: 12px;
+
+	&:global {
+		> .user {
+			width: 100%;
+			height: 100%;
+			aspect-ratio: 1;
+
+			> .avatar {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
 }
 </style>
diff --git a/packages/client/src/widgets/user-list.vue b/packages/client/src/widgets/user-list.vue
index 4173f5c36..6ee6dc05a 100644
--- a/packages/client/src/widgets/user-list.vue
+++ b/packages/client/src/widgets/user-list.vue
@@ -2,7 +2,7 @@
 	<MkContainer :show-header="widgetProps.showHeader" class="mkw-userList">
 		<template #header><i class="ph-user-list-bold ph-lg"></i> {{ list ? list.name : i18n.ts._widgets.userList }}</template>
 		<template #func="{ buttonStyleClass }"><button class="_button" :class="buttonStyleClass" @click="configure()"><i class="ph-gear-six-bold ph-lg"></i></button></template>
-
+	
 		<div class="wsdlkfj">
 			<div v-if="widgetProps.listId == null" class="init">
 				<MkButton primary @click="chooseList">{{ i18n.ts._widgets._userList.chooseList }}</MkButton>
@@ -14,7 +14,7 @@
 		</div>
 	</MkContainer>
 </template>
-
+	
 <script lang="ts" setup>
 import { useWidgetPropsManager, Widget, WidgetComponentExpose } from './widget';
 import { GetFormResultType } from '@/scripts/form';
@@ -92,7 +92,7 @@ defineExpose<WidgetComponentExpose>({
 	id: props.widget ? props.widget.id : null,
 });
 </script>
-
+	
 <style lang="scss" module>
 .wsdlkfj {
 	> .init {

From e0b0470e63b7f5bf7dcb89a9d74bf7a78ef09b16 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 15 Feb 2023 12:46:27 -0800
Subject: [PATCH 053/582] formatting

---
 packages/client/src/widgets/user-list.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/widgets/user-list.vue b/packages/client/src/widgets/user-list.vue
index 6ee6dc05a..4173f5c36 100644
--- a/packages/client/src/widgets/user-list.vue
+++ b/packages/client/src/widgets/user-list.vue
@@ -2,7 +2,7 @@
 	<MkContainer :show-header="widgetProps.showHeader" class="mkw-userList">
 		<template #header><i class="ph-user-list-bold ph-lg"></i> {{ list ? list.name : i18n.ts._widgets.userList }}</template>
 		<template #func="{ buttonStyleClass }"><button class="_button" :class="buttonStyleClass" @click="configure()"><i class="ph-gear-six-bold ph-lg"></i></button></template>
-	
+
 		<div class="wsdlkfj">
 			<div v-if="widgetProps.listId == null" class="init">
 				<MkButton primary @click="chooseList">{{ i18n.ts._widgets._userList.chooseList }}</MkButton>
@@ -14,7 +14,7 @@
 		</div>
 	</MkContainer>
 </template>
-	
+
 <script lang="ts" setup>
 import { useWidgetPropsManager, Widget, WidgetComponentExpose } from './widget';
 import { GetFormResultType } from '@/scripts/form';
@@ -92,7 +92,7 @@ defineExpose<WidgetComponentExpose>({
 	id: props.widget ? props.widget.id : null,
 });
 </script>
-	
+
 <style lang="scss" module>
 .wsdlkfj {
 	> .init {

From 82beae83a9e66ae445632d1466285f9778ad15fd Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 16 Feb 2023 17:06:36 -0500
Subject: [PATCH 054/582] Add URL previews to subnote

---
 packages/client/src/components/MkSubNoteContent.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index b575fcc0a..2139cffb2 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -5,9 +5,9 @@
 		<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left-bold ph-lg"></i></MkA>
 		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 		<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">{{ i18n.ts.quoteAttached }}: ...</MkA>
+		<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
 	</div>
 	<div v-if="note.files.length > 0">
-		<summary>({{ i18n.t('withNFiles', { n: note.files.length }) }})</summary>
 		<XMediaList :media-list="note.files"/>
 	</div>
 	<div v-if="note.poll">
@@ -26,8 +26,11 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as misskey from 'calckey-js';
+import * as mfm from 'mfm-js';
 import XMediaList from '@/components/MkMediaList.vue';
 import XPoll from '@/components/MkPoll.vue';
+import MkUrlPreview from '@/components/MkUrlPreview.vue';
+import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
 import { i18n } from '@/i18n';
 
 const props = defineProps<{
@@ -42,6 +45,9 @@ const isLong = (
 	)
 );
 const collapsed = $ref(props.note.cw == null && isLong);
+const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : null;
+console.log(props.note.text);
+
 </script>
 
 <style lang="scss" scoped>

From 578bd0360b41665c3300c3eb99fef80040872990 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 17 Feb 2023 00:06:49 -0500
Subject: [PATCH 055/582] Add buttons & link previews to subnotes, start of new
 thread design

Should've made them separate commits but eeek I started working on them at the same time D:
---
 packages/client/src/components/MkNote.vue     |  66 +-------
 .../client/src/components/MkNoteDetailed.vue  |   2 +-
 .../client/src/components/MkNoteFooter.vue    | 159 ++++++++++++++++++
 packages/client/src/components/MkNoteSub.vue  |  12 +-
 .../components/MkReactionsViewer.reaction.vue |   1 +
 .../src/components/MkReactionsViewer.vue      |   6 +-
 6 files changed, 177 insertions(+), 69 deletions(-)
 create mode 100644 packages/client/src/components/MkNoteFooter.vue

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index ee6c5770f..20225843a 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -71,26 +71,7 @@
 				</div>
 				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
 			</div>
-			<footer class="footer">
-				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-				<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
-					<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
-					<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
-					<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
-				</button>
-				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
-				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
-				<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
-					<i class="ph-smiley-bold ph-lg"></i>
-				</button>
-				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
-					<i class="ph-minus-bold ph-lg"></i>
-				</button>
-				<XQuoteButton class="button" :note="appearNote"/>
-				<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
-					<i class="ph-dots-three-outline-bold ph-lg"></i>
-				</button>
-			</footer>
+			<MkNoteFooter :note="appearNote"></MkNoteFooter>
 		</div>
 	</article>
 </div>
@@ -113,15 +94,12 @@ import type * as misskey from 'calckey-js';
 import MkNoteSub from '@/components/MkNoteSub.vue';
 import XNoteHeader from '@/components/MkNoteHeader.vue';
 import XNoteSimple from '@/components/MkNoteSimple.vue';
-import XReactionsViewer from '@/components/MkReactionsViewer.vue';
 import XMediaList from '@/components/MkMediaList.vue';
 import XCwButton from '@/components/MkCwButton.vue';
+import MkNoteFooter from '@/components/MkNoteFooter.vue';
 import XPoll from '@/components/MkPoll.vue';
-import XStarButton from '@/components/MkStarButton.vue';
 import XRenoteButton from '@/components/MkRenoteButton.vue';
-import XQuoteButton from '@/components/MkQuoteButton.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
-import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
 import MkVisibility from '@/components/MkVisibility.vue';
 import { pleaseLogin } from '@/scripts/please-login';
 import { focusPrev, focusNext } from '@/scripts/focus';
@@ -170,7 +148,6 @@ const isRenote = (
 
 const el = ref<HTMLElement>();
 const menuButton = ref<HTMLElement>();
-const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
 const renoteTime = ref<HTMLElement>();
 const reactButton = ref<HTMLElement>();
@@ -187,7 +164,6 @@ const muted = ref(checkWordMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)) : null;
-const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance);
 
 const keymap = {
 	'r': () => reply(true),
@@ -229,14 +205,6 @@ function react(viaKeyboard = false): void {
 	});
 }
 
-function undoReact(note): void {
-	const oldReaction = note.myReaction;
-	if (!oldReaction) return;
-	os.api('notes/reactions/delete', {
-		noteId: note.id,
-	});
-}
-
 const currentClipPage = inject<Ref<misskey.entities.Clip> | null>('currentClipPage', null);
 
 function onContextmenu(ev: MouseEvent): void {
@@ -594,36 +562,6 @@ function readPromo() {
 					font-size: 80%;
 				}
 			}
-
-			> .footer {
-				display: flex;
-				flex-wrap: wrap;
-				> .button {
-					margin: 0;
-					padding: 8px;
-					opacity: 0.7;
-					flex-grow: 1;
-					max-width: 3.5em;
-					width: max-content;
-					min-width: max-content;
-					&:first-of-type {
-						margin-left: -.5em;
-					}
-					&:hover {
-						color: var(--fgHighlighted);
-					}
-
-					> .count {
-						display: inline;
-						margin: 0 0 0 8px;
-						opacity: 0.7;
-					}
-
-					&.reacted {
-						color: var(--accent);
-					}
-				}
-			}
 		}
 	}
 
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index fab06f1ab..fa6b0bd89 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -53,7 +53,7 @@
 					<XCwButton v-model="showContent" :note="appearNote"/>
 				</p>
 				<div v-show="appearNote.cw == null || showContent" class="content">
-					<div class="text" @click.self="router.push(notePage(appearNote))">
+					<div class="text">
 						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 						<div v-if="translating || translation" class="translation">
 							<MkLoading v-if="translating" mini/>
diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
new file mode 100644
index 000000000..ff5eb7702
--- /dev/null
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -0,0 +1,159 @@
+<template>
+	<footer ref="el" class="footer" @click.stop.prevent>
+		<XReactionsViewer v-if="!conversation" ref="reactionsViewer" :note="appearNote"/>
+		<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
+			<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
+			<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
+			<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
+		</button>
+		<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
+		<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
+		<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
+			<i class="ph-smiley-bold ph-lg"></i>
+		</button>
+		<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
+			<i class="ph-minus-bold ph-lg"></i>
+		</button>
+		<XQuoteButton class="button" :note="appearNote"/>
+		<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
+			<i class="ph-dots-three-outline-bold ph-lg"></i>
+		</button>
+		<XReactionsViewer v-if="conversation" ref="reactionsViewer" :note="appearNote"/>
+	</footer>
+</template>
+
+<script lang="ts" setup>
+import { inject, ref } from 'vue';
+import type { Ref } from 'vue';
+import type * as misskey from 'calckey-js';
+import XReactionsViewer from '@/components/MkReactionsViewer.vue';
+import XStarButton from '@/components/MkStarButton.vue';
+import XRenoteButton from '@/components/MkRenoteButton.vue';
+import XQuoteButton from '@/components/MkQuoteButton.vue';
+import { pleaseLogin } from '@/scripts/please-login';
+import * as os from '@/os';
+import { reactionPicker } from '@/scripts/reaction-picker';
+import { i18n } from '@/i18n';
+import { getNoteMenu } from '@/scripts/get-note-menu';
+import { deepClone } from '@/scripts/clone';
+import { useNoteCapture } from '@/scripts/use-note-capture';
+
+
+const props = defineProps<{
+	note: misskey.entities.Note;
+	conversation?: misskey.entities.Note[];
+}>();
+
+let note = $ref(deepClone(props.note));
+
+const isRenote = (
+	note.renote != null &&
+	note.text == null &&
+	note.fileIds.length === 0 &&
+	note.poll == null
+);
+
+const el = ref<HTMLElement>();
+const menuButton = ref<HTMLElement>();
+const starButton = ref<InstanceType<typeof XStarButton>>();
+const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
+const reactButton = ref<HTMLElement>();
+let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note : note);
+const isDeleted = ref(false);
+const translation = ref(null);
+const translating = ref(false);
+
+useNoteCapture({
+	rootEl: el,
+	note: $$(appearNote),
+	isDeletedRef: isDeleted,
+});
+
+
+function reply(viaKeyboard = false): void {
+	pleaseLogin();
+	os.post({
+		reply: appearNote,
+		animation: !viaKeyboard,
+	}, () => {
+		focus();
+	});
+}
+
+function react(viaKeyboard = false): void {
+	pleaseLogin();
+	blur();
+	reactionPicker.show(reactButton.value, reaction => {
+		os.api('notes/reactions/create', {
+			noteId: appearNote.id,
+			reaction: reaction,
+		});
+	}, () => {
+		focus();
+	});
+}
+
+function undoReact(note): void {
+	const oldReaction = note.myReaction;
+	if (!oldReaction) return;
+	os.api('notes/reactions/delete', {
+		noteId: note.id,
+	});
+}
+
+const currentClipPage = inject<Ref<misskey.entities.Clip> | null>('currentClipPage', null);
+
+
+function menu(viaKeyboard = false): void {
+	os.popupMenu(getNoteMenu({ note: note, translating, translation, menuButton, isDeleted, currentClipPage }), menuButton.value, {
+		viaKeyboard,
+	}).then(focus);
+}
+
+function focus() {
+	el.value.focus();
+}
+
+function blur() {
+	el.value.blur();
+}
+
+
+</script>
+
+
+<style lang="scss" scoped>
+.footer {
+	display: flex;
+	flex-wrap: wrap;
+	margin-top: .4em;
+	pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
+
+	> .button {
+		margin: 0;
+		padding: 8px;
+		opacity: 0.7;
+		flex-grow: 1;
+		max-width: 3.5em;
+		width: max-content;
+		min-width: max-content;
+		pointer-events: all;
+		&:first-of-type {
+			margin-left: -.5em;
+		}
+		&:hover {
+			color: var(--fgHighlighted);
+		}
+
+		> .count {
+			display: inline;
+			margin: 0 0 0 8px;
+			opacity: 0.7;
+		}
+
+		&.reacted {
+			color: var(--accent);
+		}
+	}
+}
+</style>
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index c0766ec5f..a0277d86e 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -16,10 +16,14 @@
 					<MkSubNoteContent class="text" :note="note"/>
 				</div>
 			</div>
+			<MkNoteFooter :note="note" :conversation="conversation"></MkNoteFooter>
 		</div>
 	</div>
 	<template v-if="conversation">
-		<template v-if="depth < 5">
+		<template v-if="depth < 5 && replies.length == 1">
+			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply single" :conversation="conversation" :depth="depth"/>
+		</template>
+		<template v-else-if="depth < 5">
 			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply" :conversation="conversation" :depth="depth + 1"/>
 		</template>
 		<div v-else-if="replies.length > 0" class="more">
@@ -35,6 +39,7 @@ import * as misskey from 'calckey-js';
 import XNoteHeader from '@/components/MkNoteHeader.vue';
 import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
 import XCwButton from '@/components/MkCwButton.vue';
+import MkNoteFooter from '@/components/MkNoteFooter.vue';
 import { notePage } from '@/filters/note';
 import { useRouter } from '@/router';
 import * as os from '@/os';
@@ -122,8 +127,11 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 	}
 
 	> .reply, > .more {
-		border-left: solid 0.5px var(--divider);
+		// border-left: solid 0.5px var(--divider);
 		margin-top: 10px;
+		&.single {
+			padding: 0 !important;
+		}
 	}
 
 	> .more {
diff --git a/packages/client/src/components/MkReactionsViewer.reaction.vue b/packages/client/src/components/MkReactionsViewer.reaction.vue
index 83606ec66..63d92cabb 100644
--- a/packages/client/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/client/src/components/MkReactionsViewer.reaction.vue
@@ -97,6 +97,7 @@ useTooltip(buttonRef, async (showing) => {
 	margin: 2px;
 	padding: 0 6px;
 	border-radius: 4px;
+	pointer-events: all;
 
 	&.canToggle {
 		background: rgba(0, 0, 0, 0.05);
diff --git a/packages/client/src/components/MkReactionsViewer.vue b/packages/client/src/components/MkReactionsViewer.vue
index 21dc80e21..a9cf9b00c 100644
--- a/packages/client/src/components/MkReactionsViewer.vue
+++ b/packages/client/src/components/MkReactionsViewer.vue
@@ -21,9 +21,11 @@ const isMe = computed(() => $i && $i.id === props.note.userId);
 
 <style lang="scss" scoped>
 .tdflqwzn {
-	margin: 4px -2px 0 -2px;
+	margin: 0px -2px 0 -2px;
 	width: 100%;
-
+	.reply & {
+		width: auto;
+	}
 	&:empty {
 		display: none;
 	}

From 0af841c4808e2c2e4cfdd11856441dfca64e13ec Mon Sep 17 00:00:00 2001
From: RoiArthurB <roiarthurb@noreply.codeberg.org>
Date: Fri, 17 Feb 2023 06:38:47 +0000
Subject: [PATCH 056/582] [DOCKER] Add vips-dev as runtime dependencies - Fix
 #9596

Signed-off-by: RoiArthurB <roiarthurb@noreply.codeberg.org>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 03ede16c7..a0325265f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@ FROM node:19-alpine
 WORKDIR /calckey
 
 # Install runtime dependencies
-RUN apk add --no-cache --no-progress tini ffmpeg
+RUN apk add --no-cache --no-progress tini ffmpeg vips-dev
 
 COPY . ./
 

From 75c53f783a9b2e41c7286141b0f7fd05cfa18bec Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 00:01:22 -0800
Subject: [PATCH 057/582] perf: :zap: emoji lib performance fix

---
 packages/backend/src/misc/reaction-lib.ts | 87 +++++++++++------------
 1 file changed, 41 insertions(+), 46 deletions(-)

diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts
index a61c0a119..7d78904bb 100644
--- a/packages/backend/src/misc/reaction-lib.ts
+++ b/packages/backend/src/misc/reaction-lib.ts
@@ -4,73 +4,68 @@ import { Emojis } from "@/models/index.js";
 import { toPunyNullable } from "./convert-host.js";
 import { IsNull } from "typeorm";
 
-const legacies: Record<string, string> = {
-	like: "👍",
-	love: "❤️", // ここに記述する場合は異体字セレクタを入れない <- not that good because modern browsers just display it as the red heart so just convert it to it to not end up with two seperate reactions of "the same emoji" for the user
-	laugh: "😆",
-	hmm: "🤔",
-	surprise: "😮",
-	congrats: "🎉",
-	angry: "💢",
-	confused: "😥",
-	rip: "😇",
-	pudding: "🍮",
-	star: "⭐",
-};
+const legacies = new Map([
+	['like', '👍'],
+	['love', '❤️'],
+	['laugh', '😆'],
+	['hmm', '🤔'],
+	['surprise', '😮'],
+	['congrats', '🎉'],
+	['angry', '💢'],
+	['confused', '😥'],
+	['rip', '😇'],
+	['pudding', '🍮'],
+	['star', '⭐'],
+]);
 
-export async function getFallbackReaction(): Promise<string> {
+export async function getFallbackReaction() {
 	const meta = await fetchMeta();
 	return meta.defaultReaction;
 }
 
 export function convertLegacyReactions(reactions: Record<string, number>) {
-	const _reactions = {} as Record<string, number>;
+	const _reactions = new Map();
+	const decodedReactions = new Map();
 
-	for (const reaction of Object.keys(reactions)) {
+	for (const reaction in reactions) {
 		if (reactions[reaction] <= 0) continue;
 
-		if (Object.keys(legacies).includes(reaction)) {
-			if (_reactions[legacies[reaction]]) {
-				_reactions[legacies[reaction]] += reactions[reaction];
-			} else {
-				_reactions[legacies[reaction]] = reactions[reaction];
-			}
-		} else if (reaction === "♥️") {
-			if (_reactions["❤️"]) {
-				_reactions["❤️"] += reactions[reaction];
-			} else {
-				_reactions["❤️"] = reactions[reaction];
-			}
+		let decodedReaction;
+		if (decodedReactions.has(reaction)) {
+			decodedReaction = decodedReactions.get(reaction);
 		} else {
-			if (_reactions[reaction]) {
-				_reactions[reaction] += reactions[reaction];
-			} else {
-				_reactions[reaction] = reactions[reaction];
-			}
+			decodedReaction = decodeReaction(reaction);
+			decodedReactions.set(reaction, decodedReaction);
+		}
+
+		let emoji = legacies.get(decodedReaction.reaction);
+		if (emoji) {
+			_reactions.set(emoji, (_reactions.get(emoji) || 0) + reactions[reaction]);
+		} else {
+			_reactions.set(reaction, (_reactions.get(reaction) || 0) + reactions[reaction]);
 		}
 	}
 
-	const _reactions2 = {} as Record<string, number>;
-
-	for (const reaction of Object.keys(_reactions)) {
-		_reactions2[decodeReaction(reaction).reaction] = _reactions[reaction];
+	const _reactions2 = new Map();
+	for (const [reaction, count] of _reactions) {
+		const decodedReaction = decodedReactions.get(reaction);
+		_reactions2.set(decodedReaction.reaction, count);
 	}
 
-	return _reactions2;
+	return Object.fromEntries(_reactions2);
 }
 
 export async function toDbReaction(
 	reaction?: string | null,
 	reacterHost?: string | null,
 ): Promise<string> {
-	if (reaction == null) return await getFallbackReaction();
+	if (!reaction) return await getFallbackReaction();
 
 	reacterHost = toPunyNullable(reacterHost);
 
 	// Convert string-type reactions to unicode
-	if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
-	// Convert old heart to new
-	if (reaction === "♥️") return "❤️";
+	const emoji = legacies.get(reaction) || (reaction === "♥️" ? "❤️" : null);
+	if (emoji) return emoji;
 
 	// Allow unicode reactions
 	const match = emojiRegex.exec(reaction);
@@ -83,7 +78,7 @@ export async function toDbReaction(
 	if (custom) {
 		const name = custom[1];
 		const emoji = await Emojis.findOneBy({
-			host: reacterHost ?? IsNull(),
+			host: reacterHost || IsNull(),
 			name,
 		});
 
@@ -132,7 +127,7 @@ export function decodeReaction(str: string): DecodedReaction {
 }
 
 export function convertLegacyReaction(reaction: string): string {
-	reaction = decodeReaction(reaction).reaction;
-	if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
-	return reaction;
+  const decoded = decodeReaction(reaction).reaction;
+  if (legacies.has(decoded)) return legacies.get(decoded)!;
+  return decoded;
 }

From 301c03e97f87b5f78b35e34b54a3676114b79cfd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 00:16:35 -0800
Subject: [PATCH 058/582] chore: remove hard-to-see gradient

---
 packages/backend/src/misc/gen-identicon.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/backend/src/misc/gen-identicon.ts b/packages/backend/src/misc/gen-identicon.ts
index fecdb4062..1e51dfe2a 100644
--- a/packages/backend/src/misc/gen-identicon.ts
+++ b/packages/backend/src/misc/gen-identicon.ts
@@ -14,7 +14,6 @@ const colors = [
 	["#eb6f92", "#b4637a"],
 	["#f6c177", "#ea9d34"],
 	["#ebbcba", "#d7827e"],
-	["#31748f", "#286983"],
 	["#9ccfd8", "#56949f"],
 	["#c4a7e7", "#907aa9"],
 	["#eb6f92", "#f6c177"],

From 32f55af2ce3862a92f0701adc026720fbded0d70 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 00:19:29 -0800
Subject: [PATCH 059/582] chore: formatting

---
 packages/backend/src/misc/reaction-lib.ts     | 33 +++++-----
 .../server/api/endpoints/channels/followed.ts | 16 +++--
 .../src/components/global/MkPageHeader.vue    | 63 ++++++++++---------
 3 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts
index 7d78904bb..e25b2d661 100644
--- a/packages/backend/src/misc/reaction-lib.ts
+++ b/packages/backend/src/misc/reaction-lib.ts
@@ -5,17 +5,17 @@ import { toPunyNullable } from "./convert-host.js";
 import { IsNull } from "typeorm";
 
 const legacies = new Map([
-	['like', '👍'],
-	['love', '❤️'],
-	['laugh', '😆'],
-	['hmm', '🤔'],
-	['surprise', '😮'],
-	['congrats', '🎉'],
-	['angry', '💢'],
-	['confused', '😥'],
-	['rip', '😇'],
-	['pudding', '🍮'],
-	['star', '⭐'],
+	["like", "👍"],
+	["love", "❤️"],
+	["laugh", "😆"],
+	["hmm", "🤔"],
+	["surprise", "😮"],
+	["congrats", "🎉"],
+	["angry", "💢"],
+	["confused", "😥"],
+	["rip", "😇"],
+	["pudding", "🍮"],
+	["star", "⭐"],
 ]);
 
 export async function getFallbackReaction() {
@@ -42,7 +42,10 @@ export function convertLegacyReactions(reactions: Record<string, number>) {
 		if (emoji) {
 			_reactions.set(emoji, (_reactions.get(emoji) || 0) + reactions[reaction]);
 		} else {
-			_reactions.set(reaction, (_reactions.get(reaction) || 0) + reactions[reaction]);
+			_reactions.set(
+				reaction,
+				(_reactions.get(reaction) || 0) + reactions[reaction],
+			);
 		}
 	}
 
@@ -127,7 +130,7 @@ export function decodeReaction(str: string): DecodedReaction {
 }
 
 export function convertLegacyReaction(reaction: string): string {
-  const decoded = decodeReaction(reaction).reaction;
-  if (legacies.has(decoded)) return legacies.get(decoded)!;
-  return decoded;
+	const decoded = decodeReaction(reaction).reaction;
+	if (legacies.has(decoded)) return legacies.get(decoded)!;
+	return decoded;
 }
diff --git a/packages/backend/src/server/api/endpoints/channels/followed.ts b/packages/backend/src/server/api/endpoints/channels/followed.ts
index f9e61222f..993a211f7 100644
--- a/packages/backend/src/server/api/endpoints/channels/followed.ts
+++ b/packages/backend/src/server/api/endpoints/channels/followed.ts
@@ -32,17 +32,23 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async (ps, me) => {
-	const query = ChannelFollowings.createQueryBuilder('following').andWhere({ followerId: me.id });
+	const query = ChannelFollowings.createQueryBuilder("following").andWhere({
+		followerId: me.id,
+	});
 	if (ps.sinceId) {
-		query.andWhere('following."followeeId" > :sinceId', { sinceId: ps.sinceId });
+		query.andWhere('following."followeeId" > :sinceId', {
+			sinceId: ps.sinceId,
+		});
 	}
 	if (ps.untilId) {
-		query.andWhere('following."followeeId" < :untilId', { untilId: ps.untilId });
+		query.andWhere('following."followeeId" < :untilId', {
+			untilId: ps.untilId,
+		});
 	}
 	if (ps.sinceId && !ps.untilId) {
-		query.orderBy('following."followeeId"', 'ASC');
+		query.orderBy('following."followeeId"', "ASC");
 	} else {
-		query.orderBy('following."followeeId"', 'DESC');
+		query.orderBy('following."followeeId"', "DESC");
 	}
 
 	const followings = await query.take(ps.limit).getMany();
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 8fa3edfe1..3b844bd82 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -1,35 +1,36 @@
 <template>
-	<div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
-		<div v-if="narrow" class="buttons left" @click="openAccountMenu">
-		<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
-	</div>
-	<template v-if="metadata">
-		<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
-			<MkAvatar v-if="metadata.avatar" class="avatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true"/>
-				<i v-else-if="metadata.icon && !narrow" class="icon" :class="metadata.icon"></i>
-
-				<div class="title">
-					<MkUserName v-if="metadata.userName" :user="metadata.userName" :nowrap="true" class="title"/>
-					<div v-else-if="metadata.title && !(tabs != null && tabs.length > 0 && narrow)" class="title">{{ metadata.title }}</div>
-					<div v-if="!narrow && metadata.subtitle" class="subtitle">
-						{{ metadata.subtitle }}
-					</div>
-				</div>
-			</div>
-			<div ref="tabsEl" v-if="hasTabs" class="tabs">
-				<button v-for="tab in tabs" :ref="(el) => tabRefs[tab.key] = el" v-tooltip.noDelay="tab.title" class="tab _button" :class="{ active: tab.key != null && tab.key === props.tab }" @mousedown="(ev) => onTabMousedown(tab, ev)" @click="(ev) => onTabClick(tab, ev)">
-					<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
-					<span class="title">{{ tab.title }}</span>
-				</button>
-				<div ref="tabHighlightEl" class="highlight"></div>
-			</div>
-		</template>
-		<div class="buttons right">
-			<template v-for="action in actions">
-				<button v-tooltip.noDelay="action.text" class="_button button" :class="{ highlighted: action.highlighted }" @click.stop="action.handler" @touchstart="preventDrag"><i :class="action.icon"></i></button>
-			</template>
-		</div>
-	</div>
+  <div ref="el" class="fdidabkb" :class="classes" :style="{ background: bg }" @click="onClick">
+    <div v-show="narrow" class="buttons left" @click="openAccountMenu">
+      <MkAvatar v-if="displayMyAvatar && user" class="avatar" :user="user" :disable-preview="true"/>
+    </div>
+    <template v-if="hasTabs">
+      <div v-show="!hideTitle" class="titleContainer" @click="showTabsPopup">
+        <MkAvatar v-if="metadata.avatar" class="avatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true"/>
+        <i v-else-if="metadata.icon && !narrow" class="icon" :class="metadata.icon"></i>
+        <div class="title">
+          <MkUserName v-if="metadata.userName" :user="metadata.userName" :nowrap="true" class="title"/>
+          <div v-else-if="metadata.title && !hasTabs && !narrow" class="title">{{ metadata.title }}</div>
+          <div v-show="!narrow && metadata.subtitle" class="subtitle">{{ metadata.subtitle }}</div>
+        </div>
+      </div>
+      <div ref="tabsEl" class="tabs" v-show="hasTabs">
+        <button v-for="tab in tabs" :key="tab.key" ref="tabRefs[tab.key]" v-tooltip.noDelay="tab.title"
+          class="tab _button" :class="{ active: isActiveTab(tab) }" @mousedown="onTabMousedown(tab)"
+          @click="onTabClick(tab)">
+          <i v-if="tab.icon && !tab.iconOnly" class="icon" :class="tab.icon"></i>
+          <span class="title">{{ tab.title }}</span>
+        </button>
+        <div ref="tabHighlightEl" class="highlight"></div>
+      </div>
+    </template>
+    <div v-show="hasActions" class="buttons right">
+      <button v-for="(action, index) in actions" :key="index" v-tooltip.noDelay="action.text"
+        class="_button button" :class="{ highlighted: action.highlighted }" @click.stop="action.handler"
+        @touchstart="preventDrag">
+        <i :class="action.icon"></i>
+      </button>
+    </div>
+  </div>
 </template>
 
 <script lang="ts" setup>

From 6333a91577b24905bc912751143aa3844ccbfa22 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 17 Feb 2023 11:31:48 -0500
Subject: [PATCH 060/582] Add more to subnotecontent if detailed

---
 packages/client/src/components/MkNoteSub.vue        |  2 +-
 packages/client/src/components/MkSubNoteContent.vue | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index a0277d86e..bd965f4a3 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -13,7 +13,7 @@
 					<XCwButton v-model="showContent" :note="note"/>
 				</p>
 				<div v-show="note.cw == null || showContent" class="content" @click="router.push(notePage(note))">
-					<MkSubNoteContent class="text" :note="note"/>
+					<MkSubNoteContent class="text" :note="note" :detailed="true"/>
 				</div>
 			</div>
 			<MkNoteFooter :note="note" :conversation="conversation"></MkNoteFooter>
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 2139cffb2..daded56d2 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -5,7 +5,12 @@
 		<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left-bold ph-lg"></i></MkA>
 		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 		<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">{{ i18n.ts.quoteAttached }}: ...</MkA>
-		<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
+		<template v-if="detailed">
+			<!-- <div v-if="note.renoteId" class="renote">
+				<XNoteSimple :note="note.renote"/>
+			</div> -->
+			<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
+		</template>
 	</div>
 	<div v-if="note.files.length > 0">
 		<XMediaList :media-list="note.files"/>
@@ -27,6 +32,7 @@
 import { } from 'vue';
 import * as misskey from 'calckey-js';
 import * as mfm from 'mfm-js';
+import XNoteSimple from '@/components/MkNoteSimple.vue';
 import XMediaList from '@/components/MkMediaList.vue';
 import XPoll from '@/components/MkPoll.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
@@ -35,9 +41,9 @@ import { i18n } from '@/i18n';
 
 const props = defineProps<{
 	note: misskey.entities.Note;
+	detailed?: boolean;
 }>();
 
-
 const isLong = (
 	props.note.cw == null && props.note.text != null && (
 		(props.note.text.split('\n').length > 9) ||
@@ -46,7 +52,6 @@ const isLong = (
 );
 const collapsed = $ref(props.note.cw == null && isLong);
 const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : null;
-console.log(props.note.text);
 
 </script>
 

From 83344d30b12632058b4f6f08992e5964de56daca Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 11:40:12 -0800
Subject: [PATCH 061/582] perf: :zap: MkPageHeader perf

---
 .../src/components/global/MkPageHeader.vue    | 100 +++++++++---------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 3b844bd82..831eca997 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref, inject, watch, shallowReactive, nextTick, reactive } from 'vue';
+import { computed, onMounted, onUnmounted, ref, inject, watch, shallowReactive, nextTick } from 'vue';
 import tinycolor from 'tinycolor2';
 import { popupMenu } from '@/os';
 import { scrollToTop } from '@/scripts/scroll';
@@ -71,17 +71,17 @@ const metadata = injectPageMetadata();
 const hideTitle = inject('shouldOmitHeaderTitle', false);
 const thin_ = props.thin || inject('shouldHeaderThin', false);
 
-const el = $ref<HTMLElement | null>(null);
-const tabRefs = {};
-const tabHighlightEl = $ref<HTMLElement | null>(null);
-const tabsEl = $ref<HTMLElement | null>(null);
-const bg = ref(null);
-let narrow = $ref(false);
+const el = ref<HTMLElement | null>(null);
+const tabRefs: Record<string, HTMLElement> = {};
+const tabHighlightEl = ref<HTMLElement | null>(null);
+const tabsEl = ref<HTMLElement | null>(null);
+const bg = ref<string | null>(null);
+const narrow = ref(false);
 const height = ref(0);
-const hasTabs = $computed(() => props.tabs && props.tabs.length > 0);
-const hasActions = $computed(() => props.actions && props.actions.length > 0);
-const show = $computed(() => {
-	return !hideTitle || hasTabs || hasActions;
+const hasTabs = computed(() => props.tabs && props.tabs.length > 0);
+const hasActions = computed(() => props.actions && props.actions.length > 0);
+const show = computed(() => {
+	return !hideTitle || hasTabs.value || hasActions.value;
 });
 
 const openAccountMenu = (ev: MouseEvent) => {
@@ -91,11 +91,11 @@ const openAccountMenu = (ev: MouseEvent) => {
 };
 
 const showTabsPopup = (ev: MouseEvent) => {
-	if (!hasTabs) return;
-	if (!narrow) return;
+	if (!hasTabs.value) return;
+	if (!narrow.value) return;
 	ev.preventDefault();
 	ev.stopPropagation();
-	const menu = props.tabs.map(tab => ({
+	const menu = props.tabs!.map(tab => ({
 		text: tab.title,
 		icon: tab.icon,
 		active: tab.key != null && tab.key === props.tab,
@@ -111,7 +111,7 @@ const preventDrag = (ev: TouchEvent) => {
 };
 
 const onClick = () => {
-	scrollToTop(el, { behavior: 'smooth' });
+	scrollToTop(el.value!, { behavior: 'smooth' });
 };
 
 function onTabMousedown(tab: Tab, ev: MouseEvent): void {
@@ -142,42 +142,42 @@ const calcBg = () => {
 let ro: ResizeObserver | null;
 
 onMounted(() => {
-	calcBg();
-	globalEvents.on('themeChanged', calcBg);
-	
-	watch(() => [props.tab, props.tabs], () => {
-		nextTick(() => {
-			const tabEl = tabRefs[props.tab];
-			if (tabEl && tabHighlightEl) {
-				// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
-				// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
-				const tabSizeX = tabEl.scrollWidth + 20; // + the tab's padding
-				tabEl.style = `--width: ${tabSizeX}px`;
-				setTimeout(() => {
-					const parentRect = tabsEl.getBoundingClientRect();
-					const rect = tabEl.getBoundingClientRect();
-					const left = (rect.left - parentRect.left + tabsEl?.scrollLeft);
-					tabHighlightEl.style.width = tabSizeX + 'px';
-					tabHighlightEl.style.transform = `translateX(${left}px)`;
-					window.requestAnimationFrame(() => {
-						tabsEl?.scrollTo({left: left - 60, behavior: "smooth"});
-					})
-				}, 200);
-			}
-		});
-	}, {
-		immediate: true,
-	});
+  calcBg();
+  globalEvents.on('themeChanged', calcBg);
 
-	if (el && el.parentElement) {
-		narrow = el.parentElement.offsetWidth < 500;
-		ro = new ResizeObserver((entries, observer) => {
-			if (el.parentElement && document.body.contains(el)) {
-				narrow = el.parentElement.offsetWidth < 500;
-			}
-		});
-		ro.observe(el.parentElement);
-	}
+  const updateTabHighlight = () => {
+    nextTick(() => {
+      const tabEl = tabRefs[props.tab];
+      if (tabEl && tabHighlightEl) {
+        const tabSizeX = tabEl.scrollWidth + 20;
+        tabEl.style.setProperty('--width', `${tabSizeX}px`);
+
+        const parentRect = tabsEl.getBoundingClientRect();
+        const rect = tabEl.getBoundingClientRect();
+        const left = (rect.left - parentRect.left + tabsEl.scrollLeft);
+        tabHighlightEl.style.width = `${tabSizeX}px`;
+        tabHighlightEl.style.transform = `translateX(${left}px)`;
+        tabsEl.scrollTo({left: left - 60, behavior: "smooth"});
+      }
+    });
+  };
+
+  const updateTab = () => {
+    emit('update:tab', props.tab);
+  };
+
+  watch(() => [props.tab, props.tabs], updateTabHighlight, { immediate: true });
+  watch(() => props.tab, updateTab);
+
+  if (el && el.parentElement) {
+    narrow.value = el.parentElement.offsetWidth < 500;
+    ro = new ResizeObserver((entries, observer) => {
+      if (el.parentElement && document.body.contains(el)) {
+        narrow.value = el.parentElement.offsetWidth < 500;
+      }
+    });
+    ro.observe(el.parentElement);
+  }
 });
 
 onUnmounted(() => {

From 279354ed894506565982f0bdd94310d04f9507f6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 11:41:24 -0800
Subject: [PATCH 062/582] dev10

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

diff --git a/package.json b/package.json
index dbb304cb9..476d9afe5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev9",
+	"version": "13.2.0-dev10",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 4b74514250b89905a07e657596aa7d0e1371e3a6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 11:54:33 -0800
Subject: [PATCH 063/582] add isActiveTab method

---
 packages/client/src/components/global/MkPageHeader.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 831eca997..4a6b72a4e 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -132,6 +132,11 @@ function onTabClick(tab: Tab, ev: MouseEvent): void {
 	}
 }
 
+const isActiveTab = (index: number) => {
+  const activeTab = tabRefs[props.tab]?.value ?? 0;
+  return index === activeTab;
+};
+
 const calcBg = () => {
 	const rawBg = metadata?.bg || 'var(--bg)';
 	const tinyBg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);

From c255f9e7f1dd18489fae49a05e7322669d091bfb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 12:36:07 -0800
Subject: [PATCH 064/582] fix

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

diff --git a/package.json b/package.json
index 476d9afe5..d1173a5d4 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
 		"test": "pnpm run mocha",
 		"format": "gulp format",
 		"clean": "pnpm node ./scripts/clean.js",
-		"clean-all": "pnpm node ./scripts/clean-all.js",
+	"clean-all": "pnpm node ./scripts/clean-all.js",
 		"cleanall": "pnpm run clean-all"
 	},
 	"resolutions": {

From 39e22e4a93dc296e9bab551bf4f19a030332f769 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 12:36:16 -0800
Subject: [PATCH 065/582] fix

---
 .../src/components/global/MkPageHeader.vue    | 98 +++++++++----------
 1 file changed, 46 insertions(+), 52 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 4a6b72a4e..c25f90dba 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -1,40 +1,39 @@
 <template>
-  <div ref="el" class="fdidabkb" :class="classes" :style="{ background: bg }" @click="onClick">
-    <div v-show="narrow" class="buttons left" @click="openAccountMenu">
-      <MkAvatar v-if="displayMyAvatar && user" class="avatar" :user="user" :disable-preview="true"/>
-    </div>
-    <template v-if="hasTabs">
-      <div v-show="!hideTitle" class="titleContainer" @click="showTabsPopup">
-        <MkAvatar v-if="metadata.avatar" class="avatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true"/>
-        <i v-else-if="metadata.icon && !narrow" class="icon" :class="metadata.icon"></i>
-        <div class="title">
-          <MkUserName v-if="metadata.userName" :user="metadata.userName" :nowrap="true" class="title"/>
-          <div v-else-if="metadata.title && !hasTabs && !narrow" class="title">{{ metadata.title }}</div>
-          <div v-show="!narrow && metadata.subtitle" class="subtitle">{{ metadata.subtitle }}</div>
-        </div>
-      </div>
-      <div ref="tabsEl" class="tabs" v-show="hasTabs">
-        <button v-for="tab in tabs" :key="tab.key" ref="tabRefs[tab.key]" v-tooltip.noDelay="tab.title"
-          class="tab _button" :class="{ active: isActiveTab(tab) }" @mousedown="onTabMousedown(tab)"
-          @click="onTabClick(tab)">
-          <i v-if="tab.icon && !tab.iconOnly" class="icon" :class="tab.icon"></i>
-          <span class="title">{{ tab.title }}</span>
-        </button>
-        <div ref="tabHighlightEl" class="highlight"></div>
-      </div>
-    </template>
-    <div v-show="hasActions" class="buttons right">
-      <button v-for="(action, index) in actions" :key="index" v-tooltip.noDelay="action.text"
-        class="_button button" :class="{ highlighted: action.highlighted }" @click.stop="action.handler"
-        @touchstart="preventDrag">
-        <i :class="action.icon"></i>
-      </button>
-    </div>
-  </div>
+	<div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
+		<div v-if="narrow" class="buttons left" @click="openAccountMenu">
+		<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
+	</div>
+	<template v-if="metadata">
+		<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
+			<MkAvatar v-if="metadata.avatar" class="avatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true"/>
+				<i v-else-if="metadata.icon && !narrow" class="icon" :class="metadata.icon"></i>
+
+				<div class="title">
+					<MkUserName v-if="metadata.userName" :user="metadata.userName" :nowrap="true" class="title"/>
+					<div v-else-if="metadata.title && !(tabs != null && tabs.length > 0 && narrow)" class="title">{{ metadata.title }}</div>
+					<div v-if="!narrow && metadata.subtitle" class="subtitle">
+						{{ metadata.subtitle }}
+					</div>
+				</div>
+			</div>
+			<div ref="tabsEl" v-if="hasTabs" class="tabs">
+				<button v-for="tab in tabs" :ref="(el) => tabRefs[tab.key] = el" v-tooltip.noDelay="tab.title" class="tab _button" :class="{ active: tab.key != null && tab.key === props.tab }" @mousedown="(ev) => onTabMousedown(tab, ev)" @click="(ev) => onTabClick(tab, ev)">
+					<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
+					<span class="title">{{ tab.title }}</span>
+				</button>
+				<div ref="tabHighlightEl" class="highlight"></div>
+			</div>
+		</template>
+		<div class="buttons right">
+			<template v-for="action in actions">
+				<button v-tooltip.noDelay="action.text" class="_button button" :class="{ highlighted: action.highlighted }" @click.stop="action.handler" @touchstart="preventDrag"><i :class="action.icon"></i></button>
+			</template>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref, inject, watch, shallowReactive, nextTick } from 'vue';
+import { computed, onMounted, onUnmounted, ref, inject, watch, shallowReactive, nextTick, reactive } from 'vue';
 import tinycolor from 'tinycolor2';
 import { popupMenu } from '@/os';
 import { scrollToTop } from '@/scripts/scroll';
@@ -71,17 +70,17 @@ const metadata = injectPageMetadata();
 const hideTitle = inject('shouldOmitHeaderTitle', false);
 const thin_ = props.thin || inject('shouldHeaderThin', false);
 
-const el = ref<HTMLElement | null>(null);
-const tabRefs: Record<string, HTMLElement> = {};
-const tabHighlightEl = ref<HTMLElement | null>(null);
-const tabsEl = ref<HTMLElement | null>(null);
-const bg = ref<string | null>(null);
-const narrow = ref(false);
+const el = $ref<HTMLElement | null>(null);
+const tabRefs = {};
+const tabHighlightEl = $ref<HTMLElement | null>(null);
+const tabsEl = $ref<HTMLElement | null>(null);
+const bg = ref(null);
+let narrow = $ref(false);
 const height = ref(0);
-const hasTabs = computed(() => props.tabs && props.tabs.length > 0);
-const hasActions = computed(() => props.actions && props.actions.length > 0);
-const show = computed(() => {
-	return !hideTitle || hasTabs.value || hasActions.value;
+const hasTabs = $computed(() => props.tabs && props.tabs.length > 0);
+const hasActions = $computed(() => props.actions && props.actions.length > 0);
+const show = $computed(() => {
+	return !hideTitle || hasTabs || hasActions;
 });
 
 const openAccountMenu = (ev: MouseEvent) => {
@@ -91,11 +90,11 @@ const openAccountMenu = (ev: MouseEvent) => {
 };
 
 const showTabsPopup = (ev: MouseEvent) => {
-	if (!hasTabs.value) return;
-	if (!narrow.value) return;
+	if (!hasTabs) return;
+	if (!narrow) return;
 	ev.preventDefault();
 	ev.stopPropagation();
-	const menu = props.tabs!.map(tab => ({
+	const menu = props.tabs.map(tab => ({
 		text: tab.title,
 		icon: tab.icon,
 		active: tab.key != null && tab.key === props.tab,
@@ -111,7 +110,7 @@ const preventDrag = (ev: TouchEvent) => {
 };
 
 const onClick = () => {
-	scrollToTop(el.value!, { behavior: 'smooth' });
+	scrollToTop(el, { behavior: 'smooth' });
 };
 
 function onTabMousedown(tab: Tab, ev: MouseEvent): void {
@@ -132,11 +131,6 @@ function onTabClick(tab: Tab, ev: MouseEvent): void {
 	}
 }
 
-const isActiveTab = (index: number) => {
-  const activeTab = tabRefs[props.tab]?.value ?? 0;
-  return index === activeTab;
-};
-
 const calcBg = () => {
 	const rawBg = metadata?.bg || 'var(--bg)';
 	const tinyBg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);

From 9d2ccab7f50f655220d419e2f2d09c037dfde4d6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 13:01:14 -0800
Subject: [PATCH 066/582] chore: formatting

---
 packages/backend/src/misc/reaction-lib.ts     | 33 ++++++++++---------
 .../server/api/endpoints/channels/followed.ts | 16 ++++++---
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts
index 7d78904bb..e25b2d661 100644
--- a/packages/backend/src/misc/reaction-lib.ts
+++ b/packages/backend/src/misc/reaction-lib.ts
@@ -5,17 +5,17 @@ import { toPunyNullable } from "./convert-host.js";
 import { IsNull } from "typeorm";
 
 const legacies = new Map([
-	['like', '👍'],
-	['love', '❤️'],
-	['laugh', '😆'],
-	['hmm', '🤔'],
-	['surprise', '😮'],
-	['congrats', '🎉'],
-	['angry', '💢'],
-	['confused', '😥'],
-	['rip', '😇'],
-	['pudding', '🍮'],
-	['star', '⭐'],
+	["like", "👍"],
+	["love", "❤️"],
+	["laugh", "😆"],
+	["hmm", "🤔"],
+	["surprise", "😮"],
+	["congrats", "🎉"],
+	["angry", "💢"],
+	["confused", "😥"],
+	["rip", "😇"],
+	["pudding", "🍮"],
+	["star", "⭐"],
 ]);
 
 export async function getFallbackReaction() {
@@ -42,7 +42,10 @@ export function convertLegacyReactions(reactions: Record<string, number>) {
 		if (emoji) {
 			_reactions.set(emoji, (_reactions.get(emoji) || 0) + reactions[reaction]);
 		} else {
-			_reactions.set(reaction, (_reactions.get(reaction) || 0) + reactions[reaction]);
+			_reactions.set(
+				reaction,
+				(_reactions.get(reaction) || 0) + reactions[reaction],
+			);
 		}
 	}
 
@@ -127,7 +130,7 @@ export function decodeReaction(str: string): DecodedReaction {
 }
 
 export function convertLegacyReaction(reaction: string): string {
-  const decoded = decodeReaction(reaction).reaction;
-  if (legacies.has(decoded)) return legacies.get(decoded)!;
-  return decoded;
+	const decoded = decodeReaction(reaction).reaction;
+	if (legacies.has(decoded)) return legacies.get(decoded)!;
+	return decoded;
 }
diff --git a/packages/backend/src/server/api/endpoints/channels/followed.ts b/packages/backend/src/server/api/endpoints/channels/followed.ts
index f9e61222f..993a211f7 100644
--- a/packages/backend/src/server/api/endpoints/channels/followed.ts
+++ b/packages/backend/src/server/api/endpoints/channels/followed.ts
@@ -32,17 +32,23 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async (ps, me) => {
-	const query = ChannelFollowings.createQueryBuilder('following').andWhere({ followerId: me.id });
+	const query = ChannelFollowings.createQueryBuilder("following").andWhere({
+		followerId: me.id,
+	});
 	if (ps.sinceId) {
-		query.andWhere('following."followeeId" > :sinceId', { sinceId: ps.sinceId });
+		query.andWhere('following."followeeId" > :sinceId', {
+			sinceId: ps.sinceId,
+		});
 	}
 	if (ps.untilId) {
-		query.andWhere('following."followeeId" < :untilId', { untilId: ps.untilId });
+		query.andWhere('following."followeeId" < :untilId', {
+			untilId: ps.untilId,
+		});
 	}
 	if (ps.sinceId && !ps.untilId) {
-		query.orderBy('following."followeeId"', 'ASC');
+		query.orderBy('following."followeeId"', "ASC");
 	} else {
-		query.orderBy('following."followeeId"', 'DESC');
+		query.orderBy('following."followeeId"', "DESC");
 	}
 
 	const followings = await query.take(ps.limit).getMany();

From 28a31879f84f21d05be473da7eb3914f2cc4ea39 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Sat, 18 Feb 2023 17:14:16 +0100
Subject: [PATCH 067/582] make relationshiops work

---
 .../backend/src/server/api/mastodon/endpoints/account.ts   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index f395c5a9c..a93b1f596 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -98,7 +98,7 @@ export function apiAccountMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
-	router.get<{ Params: { id: string } }>("/v1/accounts/:id", async (ctx) => {
+	router.get<{ Params: { id: string } }>("/v1/accounts/:id(^.*\\d.*$)", async (ctx) => {
 		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
@@ -304,11 +304,12 @@ export function apiAccountMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		let users;
 		try {
-			const idsRaw = ctx.request.body ? ["id[]"] : null;
+			// TODO: this should be body
+			const idsRaw = ctx.request.query ? ["id[]"] : null;
 			const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw;
 			users = ids;
 			relationshopModel.id = idsRaw?.toString() || "1";
-			if (!(idsRaw && ids)) {
+			if (!idsRaw) {
 				ctx.body = [relationshopModel];
 				return;
 			}

From cedf306f76ac26b3209be4d0c66a4586dc89f155 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Sat, 18 Feb 2023 17:22:43 +0100
Subject: [PATCH 068/582] debug print users

---
 .../backend/src/server/api/mastodon/endpoints/account.ts    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index a93b1f596..25a1abcc0 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -317,9 +317,11 @@ export function apiAccountMastodon(router: Router): void {
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);
-			console.error(e.response.data);
+			let data = e.response.data;
+			data.users = users;
+			console.error(data);
 			ctx.status = 401;
-			ctx.body = e.response.data;
+			ctx.body = data;
 		}
 	});
 	router.get("/v1/bookmarks", async (ctx) => {

From a5633b9368b78aee82056c73e62594957f94c2d6 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Sat, 18 Feb 2023 17:24:58 +0100
Subject: [PATCH 069/582] fix oopsie

---
 packages/backend/src/server/api/mastodon/endpoints/account.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 25a1abcc0..8ff7ba008 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -305,7 +305,7 @@ export function apiAccountMastodon(router: Router): void {
 		let users;
 		try {
 			// TODO: this should be body
-			const idsRaw = ctx.request.query ? ["id[]"] : null;
+			const idsRaw = ctx.request.query ? ctx.request.query["id[]"] : null;
 			const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw;
 			users = ids;
 			relationshopModel.id = idsRaw?.toString() || "1";

From c28e5fcad542aa5f92c9cf297d8f160d05fc21a6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 11:33:25 -0800
Subject: [PATCH 070/582] feat: :sparkles: Show time for users

---
 locales/en-US.yml                             |  1 +
 package.json                                  |  4 +-
 .../server/api/mastodon/endpoints/account.ts  | 31 ++++---
 packages/backend/src/server/web/bios.js       | 78 ++++++++--------
 packages/backend/src/server/web/boot.js       | 92 ++++++++++---------
 packages/backend/src/server/web/cli.js        | 56 +++++------
 packages/client/package.json                  |  9 +-
 .../src/components/global/MkPageHeader.vue    |  2 +-
 .../client/src/pages/settings/profile.vue     |  2 +-
 packages/client/src/pages/user/home.vue       | 19 ++--
 pnpm-lock.yaml                                | 52 +++++------
 11 files changed, 178 insertions(+), 168 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 173404e7c..97f5313c8 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1400,6 +1400,7 @@ _profile:
   metadataContent: "Content"
   changeAvatar: "Change avatar"
   changeBanner: "Change banner"
+  locationDescription: "If entered properly, this will display your local time to other users."
 _exportOrImport:
   allNotes: "All posts"
   followingList: "Followed users"
diff --git a/package.json b/package.json
index dbb304cb9..11a539409 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev9",
+	"version": "13.2.0-dev11",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@7.27.0",
+	"packageManager": "pnpm@7.27.1",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 8ff7ba008..5b7df948e 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -98,20 +98,23 @@ export function apiAccountMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
-	router.get<{ Params: { id: string } }>("/v1/accounts/:id(^.*\\d.*$)", async (ctx) => {
-		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-		const accessTokens = ctx.headers.authorization;
-		const client = getClient(BASE_URL, accessTokens);
-		try {
-			const data = await client.getAccount(ctx.params.id);
-			ctx.body = data.data;
-		} catch (e: any) {
-			console.error(e);
-			console.error(e.response.data);
-			ctx.status = 401;
-			ctx.body = e.response.data;
-		}
-	});
+	router.get<{ Params: { id: string } }>(
+		"/v1/accounts/:id(^.*\\d.*$)",
+		async (ctx) => {
+			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
+			const accessTokens = ctx.headers.authorization;
+			const client = getClient(BASE_URL, accessTokens);
+			try {
+				const data = await client.getAccount(ctx.params.id);
+				ctx.body = data.data;
+			} catch (e: any) {
+				console.error(e);
+				console.error(e.response.data);
+				ctx.status = 401;
+				ctx.body = e.response.data;
+			}
+		},
+	);
 	router.get<{ Params: { id: string } }>(
 		"/v1/accounts/:id/statuses",
 		async (ctx) => {
diff --git a/packages/backend/src/server/web/bios.js b/packages/backend/src/server/web/bios.js
index 1acdafd1d..e715a0106 100644
--- a/packages/backend/src/server/web/bios.js
+++ b/packages/backend/src/server/web/bios.js
@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
 window.onload = async () => {
-	const account = JSON.parse(localStorage.getItem('account'));
+	const account = JSON.parse(localStorage.getItem("account"));
 	const i = account.token;
 
 	const api = (endpoint, data = {}) => {
@@ -10,42 +10,44 @@ window.onload = async () => {
 			if (i) data.i = i;
 
 			// Send request
-			fetch(endpoint.indexOf('://') > -1 ? endpoint : `/api/${endpoint}`, {
-				method: 'POST',
+			fetch(endpoint.indexOf("://") > -1 ? endpoint : `/api/${endpoint}`, {
+				method: "POST",
 				body: JSON.stringify(data),
-				credentials: 'omit',
-				cache: 'no-cache'
-			}).then(async (res) => {
-				const body = res.status === 204 ? null : await res.json();
+				credentials: "omit",
+				cache: "no-cache",
+			})
+				.then(async (res) => {
+					const body = res.status === 204 ? null : await res.json();
 
-				if (res.status === 200) {
-					resolve(body);
-				} else if (res.status === 204) {
-					resolve();
-				} else {
-					reject(body.error);
-				}
-			}).catch(reject);
+					if (res.status === 200) {
+						resolve(body);
+					} else if (res.status === 204) {
+						resolve();
+					} else {
+						reject(body.error);
+					}
+				})
+				.catch(reject);
 		});
 
 		return promise;
 	};
 
-	const content = document.getElementById('content');
+	const content = document.getElementById("content");
 
-	document.getElementById('ls').addEventListener('click', () => {
-		content.innerHTML = '';
+	document.getElementById("ls").addEventListener("click", () => {
+		content.innerHTML = "";
 
-		const lsEditor = document.createElement('div');
-		lsEditor.id = 'lsEditor';
+		const lsEditor = document.createElement("div");
+		lsEditor.id = "lsEditor";
 
-		const adder = document.createElement('div');
-		adder.classList.add('adder');
-		const addKeyInput = document.createElement('input');
-		const addValueTextarea = document.createElement('textarea');
-		const addButton = document.createElement('button');
-		addButton.textContent = 'Add';
-		addButton.addEventListener('click', () => {
+		const adder = document.createElement("div");
+		adder.classList.add("adder");
+		const addKeyInput = document.createElement("input");
+		const addValueTextarea = document.createElement("textarea");
+		const addButton = document.createElement("button");
+		addButton.textContent = "Add";
+		addButton.addEventListener("click", () => {
 			localStorage.setItem(addKeyInput.value, addValueTextarea.value);
 			location.reload();
 		});
@@ -57,21 +59,21 @@ window.onload = async () => {
 
 		for (let i = 0; i < localStorage.length; i++) {
 			const k = localStorage.key(i);
-			const record = document.createElement('div');
-			record.classList.add('record');
-			const header = document.createElement('header');
+			const record = document.createElement("div");
+			record.classList.add("record");
+			const header = document.createElement("header");
 			header.textContent = k;
-			const textarea = document.createElement('textarea');
+			const textarea = document.createElement("textarea");
 			textarea.textContent = localStorage.getItem(k);
-			const saveButton = document.createElement('button');
-			saveButton.textContent = 'Save';
-			saveButton.addEventListener('click', () => {
+			const saveButton = document.createElement("button");
+			saveButton.textContent = "Save";
+			saveButton.addEventListener("click", () => {
 				localStorage.setItem(k, textarea.value);
 				location.reload();
 			});
-			const removeButton = document.createElement('button');
-			removeButton.textContent = 'Remove';
-			removeButton.addEventListener('click', () => {
+			const removeButton = document.createElement("button");
+			removeButton.textContent = "Remove";
+			removeButton.addEventListener("click", () => {
 				localStorage.removeItem(k);
 				location.reload();
 			});
diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index f4e0707a9..e7e859d20 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -9,120 +9,122 @@
  * 注: webpackは介さないため、このファイルではrequireやimportは使えません。
  */
 
-'use strict';
+"use strict";
 
 // ブロックの中に入れないと、定義した変数がブラウザのグローバルスコープに登録されてしまい邪魔なので
 (async () => {
 	window.onerror = (e) => {
 		console.error(e);
-		renderError('SOMETHING_HAPPENED', e);
+		renderError("SOMETHING_HAPPENED", e);
 	};
 	window.onunhandledrejection = (e) => {
 		console.error(e);
-		renderError('SOMETHING_HAPPENED_IN_PROMISE', e);
+		renderError("SOMETHING_HAPPENED_IN_PROMISE", e);
 	};
 
 	//#region Detect language & fetch translations
-	const v = localStorage.getItem('v') || VERSION;
+	const v = localStorage.getItem("v") || VERSION;
 
 	const supportedLangs = LANGS;
-	let lang = localStorage.getItem('lang');
+	let lang = localStorage.getItem("lang");
 	if (lang == null || !supportedLangs.includes(lang)) {
 		if (supportedLangs.includes(navigator.language)) {
 			lang = navigator.language;
 		} else {
-			lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
+			lang = supportedLangs.find((x) => x.split("-")[0] === navigator.language);
 
 			// Fallback
-			if (lang == null) lang = 'en-US';
+			if (lang == null) lang = "en-US";
 		}
 	}
 
 	const res = await fetch(`/assets/locales/${lang}.${v}.json`);
 	if (res.status === 200) {
-		localStorage.setItem('lang', lang);
-		localStorage.setItem('locale', await res.text());
-		localStorage.setItem('localeVersion', v);
+		localStorage.setItem("lang", lang);
+		localStorage.setItem("locale", await res.text());
+		localStorage.setItem("localeVersion", v);
 	} else {
 		await checkUpdate();
-		renderError('LOCALE_FETCH');
+		renderError("LOCALE_FETCH");
 		return;
 	}
 	//#endregion
 
 	//#region Script
 	function importAppScript() {
-		import(`/assets/${CLIENT_ENTRY}`)
-			.catch(async e => {
-				await checkUpdate();
-				console.error(e);
-				renderError('APP_IMPORT', e);
-			});
+		import(`/assets/${CLIENT_ENTRY}`).catch(async (e) => {
+			await checkUpdate();
+			console.error(e);
+			renderError("APP_IMPORT", e);
+		});
 	}
 
 	// タイミングによっては、この時点でDOMの構築が済んでいる場合とそうでない場合とがある
-	if (document.readyState !== 'loading') {
+	if (document.readyState !== "loading") {
 		importAppScript();
 	} else {
-		window.addEventListener('DOMContentLoaded', () => {
+		window.addEventListener("DOMContentLoaded", () => {
 			importAppScript();
 		});
 	}
 	//#endregion
 
 	//#region Theme
-	const theme = localStorage.getItem('theme');
+	const theme = localStorage.getItem("theme");
 	if (theme) {
 		for (const [k, v] of Object.entries(JSON.parse(theme))) {
 			document.documentElement.style.setProperty(`--${k}`, v.toString());
 
 			// HTMLの theme-color 適用
-			if (k === 'htmlThemeColor') {
+			if (k === "htmlThemeColor") {
 				for (const tag of document.head.children) {
-					if (tag.tagName === 'META' && tag.getAttribute('name') === 'theme-color') {
-						tag.setAttribute('content', v);
+					if (
+						tag.tagName === "META" &&
+						tag.getAttribute("name") === "theme-color"
+					) {
+						tag.setAttribute("content", v);
 						break;
 					}
 				}
 			}
 		}
 	}
-	const colorSchema = localStorage.getItem('colorSchema');
+	const colorSchema = localStorage.getItem("colorSchema");
 	if (colorSchema) {
-		document.documentElement.style.setProperty('color-schema', colorSchema);
+		document.documentElement.style.setProperty("color-schema", colorSchema);
 	}
 	//#endregion
 
-	const fontSize = localStorage.getItem('fontSize');
+	const fontSize = localStorage.getItem("fontSize");
 	if (fontSize) {
-		document.documentElement.classList.add('f-' + fontSize);
+		document.documentElement.classList.add("f-" + fontSize);
 	}
 
-	const useSystemFont = localStorage.getItem('useSystemFont');
+	const useSystemFont = localStorage.getItem("useSystemFont");
 	if (useSystemFont) {
-		document.documentElement.classList.add('useSystemFont');
+		document.documentElement.classList.add("useSystemFont");
 	}
 
-	const wallpaper = localStorage.getItem('wallpaper');
+	const wallpaper = localStorage.getItem("wallpaper");
 	if (wallpaper) {
 		document.documentElement.style.backgroundImage = `url(${wallpaper})`;
 	}
 
-	const customCss = localStorage.getItem('customCss');
+	const customCss = localStorage.getItem("customCss");
 	if (customCss && customCss.length > 0) {
-		const style = document.createElement('style');
+		const style = document.createElement("style");
 		style.innerHTML = customCss;
 		document.head.appendChild(style);
 	}
 
 	async function addStyle(styleText) {
-		let css = document.createElement('style');
+		let css = document.createElement("style");
 		css.appendChild(document.createTextNode(styleText));
 		document.head.appendChild(css);
 	}
 
 	function renderError(code, details) {
-		let errorsElement = document.getElementById('errors');
+		let errorsElement = document.getElementById("errors");
 
 		if (!errorsElement) {
 			document.body.innerHTML = `
@@ -158,9 +160,9 @@
 			<br>
 			<div id="errors"></div>
 			`;
-			errorsElement = document.getElementById('errors');
+			errorsElement = document.getElementById("errors");
 		}
-		const detailsElement = document.createElement('details');
+		const detailsElement = document.createElement("details");
 		detailsElement.innerHTML = `
 		<br>
 		<summary>
@@ -278,25 +280,25 @@
 			details {
 				width: 50%;
 			}
-		`)
+		`);
 	}
 
 	async function checkUpdate() {
 		try {
-			const res = await fetch('/api/meta', {
-				method: 'POST',
-				cache: 'no-cache'
+			const res = await fetch("/api/meta", {
+				method: "POST",
+				cache: "no-cache",
 			});
 
 			const meta = await res.json();
 
 			if (meta.version != v) {
-				localStorage.setItem('v', meta.version);
+				localStorage.setItem("v", meta.version);
 				refresh();
 			}
 		} catch (e) {
 			console.error(e);
-			renderError('UPDATE_CHECK', e);
+			renderError("UPDATE_CHECK", e);
 			throw e;
 		}
 	}
@@ -304,9 +306,9 @@
 	function refresh() {
 		// Clear cache (service worker)
 		try {
-			navigator.serviceWorker.controller.postMessage('clear');
-			navigator.serviceWorker.getRegistrations().then(registrations => {
-				registrations.forEach(registration => registration.unregister());
+			navigator.serviceWorker.controller.postMessage("clear");
+			navigator.serviceWorker.getRegistrations().then((registrations) => {
+				registrations.forEach((registration) => registration.unregister());
 			});
 		} catch (e) {
 			console.error(e);
diff --git a/packages/backend/src/server/web/cli.js b/packages/backend/src/server/web/cli.js
index 3dff1d486..290453f7e 100644
--- a/packages/backend/src/server/web/cli.js
+++ b/packages/backend/src/server/web/cli.js
@@ -1,51 +1,53 @@
-'use strict';
+"use strict";
 
 window.onload = async () => {
-	const account = JSON.parse(localStorage.getItem('account'));
+	const account = JSON.parse(localStorage.getItem("account"));
 	const i = account.token;
 
 	const api = (endpoint, data = {}) => {
 		const promise = new Promise((resolve, reject) => {
 			// Append a credential
 			if (i) data.i = i;
-	
+
 			// Send request
-			fetch(endpoint.indexOf('://') > -1 ? endpoint : `/api/${endpoint}`, {
-				method: 'POST',
+			fetch(endpoint.indexOf("://") > -1 ? endpoint : `/api/${endpoint}`, {
+				method: "POST",
 				body: JSON.stringify(data),
-				credentials: 'omit',
-				cache: 'no-cache'
-			}).then(async (res) => {
-				const body = res.status === 204 ? null : await res.json();
-	
-				if (res.status === 200) {
-					resolve(body);
-				} else if (res.status === 204) {
-					resolve();
-				} else {
-					reject(body.error);
-				}
-			}).catch(reject);
+				credentials: "omit",
+				cache: "no-cache",
+			})
+				.then(async (res) => {
+					const body = res.status === 204 ? null : await res.json();
+
+					if (res.status === 200) {
+						resolve(body);
+					} else if (res.status === 204) {
+						resolve();
+					} else {
+						reject(body.error);
+					}
+				})
+				.catch(reject);
 		});
-		
+
 		return promise;
 	};
 
-	document.getElementById('submit').addEventListener('click', () => {
-		api('notes/create', {
-			text: document.getElementById('text').value
+	document.getElementById("submit").addEventListener("click", () => {
+		api("notes/create", {
+			text: document.getElementById("text").value,
 		}).then(() => {
 			location.reload();
 		});
 	});
 
-	api('notes/timeline').then(notes => {
-		const tl = document.getElementById('tl');
+	api("notes/timeline").then((notes) => {
+		const tl = document.getElementById("tl");
 		for (const note of notes) {
-			const el = document.createElement('div');
-			const name = document.createElement('header');
+			const el = document.createElement("div");
+			const name = document.createElement("header");
 			name.textContent = `${note.user.name} @${note.user.username}`;
-			const text = document.createElement('div');
+			const text = document.createElement("div");
 			text.textContent = `${note.text}`;
 			el.appendChild(name);
 			el.appendChild(text);
diff --git a/packages/client/package.json b/packages/client/package.json
index fe6288406..4289d8049 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -6,13 +6,9 @@
 		"build": "pnpm vite build",
 		"lint": "pnpm rome check \"src/**/*.{ts,vue}\""
 	},
-	"dependencies": {
-		"@khmyznikov/pwa-install": "^0.2.0",
-		"chartjs-chart-matrix": "^2.0.1",
-		"gsap": "^3.11.4"
-	},
 	"devDependencies": {
 		"@discordapp/twemoji": "14.0.2",
+		"@khmyznikov/pwa-install": "^0.2.0",
 		"@rollup/plugin-alias": "3.1.9",
 		"@rollup/plugin-json": "4.1.0",
 		"@rollup/pluginutils": "^4.2.1",
@@ -40,6 +36,8 @@
 		"chartjs-adapter-date-fns": "2.0.1",
 		"chartjs-plugin-gradient": "0.5.1",
 		"chartjs-plugin-zoom": "1.2.1",
+		"chartjs-chart-matrix": "^2.0.1",
+		"city-timezones": "^1.2.1",
 		"compare-versions": "5.0.3",
 		"cropperjs": "2.0.0-beta.2",
 		"cross-env": "7.0.3",
@@ -47,6 +45,7 @@
 		"date-fns": "2.29.3",
 		"escape-regexp": "0.0.1",
 		"eventemitter3": "4.0.7",
+		"gsap": "^3.11.4",
 		"idb-keyval": "6.2.0",
 		"insert-text-at-cursor": "0.3.0",
 		"json5": "2.2.3",
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 8fa3edfe1..5eaa5e4fe 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -143,7 +143,7 @@ let ro: ResizeObserver | null;
 onMounted(() => {
 	calcBg();
 	globalEvents.on('themeChanged', calcBg);
-	
+
 	watch(() => [props.tab, props.tabs], () => {
 		nextTick(() => {
 			const tabEl = tabRefs[props.tab];
diff --git a/packages/client/src/pages/settings/profile.vue b/packages/client/src/pages/settings/profile.vue
index 82b95718b..e201ed2d8 100644
--- a/packages/client/src/pages/settings/profile.vue
+++ b/packages/client/src/pages/settings/profile.vue
@@ -24,6 +24,7 @@
 	<FormInput v-model="profile.location" manual-save class="_formBlock">
 		<template #label>{{ i18n.ts.location }}</template>
 		<template #prefix><i class="ph-map-pin-bold ph-lg"></i></template>
+		<template #caption>{{ i18n.ts._profile.locationDescription }}</template>
 	</FormInput>
 
 	<FormInput v-model="profile.birthday" type="date" manual-save class="_formBlock">
@@ -76,7 +77,6 @@ import FormSelect from '@/components/form/select.vue';
 import FormSplit from '@/components/form/split.vue';
 import FormFolder from '@/components/form/folder.vue';
 import FormSlot from '@/components/form/slot.vue';
-import { host } from '@/config';
 import { selectFile } from '@/scripts/select-file';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 23d8aa842..0fe4774bd 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -56,7 +56,7 @@
 					<div class="fields system">
 						<dl v-if="user.location" class="field">
 							<dt class="name"><i class="ph-map-pin-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.location }}</dt>
-							<dd class="value">{{ user.location }}</dd>
+							<dd class="value">{{ user.location }}{{ timeForThem }}</dd>
 						</dl>
 						<dl v-if="user.birthday" class="field">
 							<dt class="name"><i class="ph-cake-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.birthday }}</dt>
@@ -117,27 +117,24 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, computed, inject, onMounted, onUnmounted, watch } from 'vue';
+import { defineAsyncComponent, onMounted, onUnmounted } from 'vue';
 import calcAge from 's-age';
+import cityTimezones from 'city-timezones';
 import XUserTimeline from './index.timeline.vue';
 import type * as misskey from 'calckey-js';
 import XNote from '@/components/MkNote.vue';
 import MkFollowButton from '@/components/MkFollowButton.vue';
-import MkContainer from '@/components/MkContainer.vue';
-import MkFolder from '@/components/MkFolder.vue';
 import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
-import MkTab from '@/components/MkTab.vue';
 import MkInfo from '@/components/MkInfo.vue';
 import MkMoved from '@/components/MkMoved.vue';
 import { getScrollPosition } from '@/scripts/scroll';
 import { getUserMenu } from '@/scripts/get-user-menu';
 import number from '@/filters/number';
-import { userPage, acct as getAcct } from '@/filters/user';
+import { userPage } from '@/filters/user';
 import * as os from '@/os';
 import { useRouter } from '@/router';
 import { i18n } from '@/i18n';
 import { $i } from '@/account';
-import { host } from '@/config';
 
 const XPhotos = defineAsyncComponent(() => import('./index.photos.vue'));
 const XActivity = defineAsyncComponent(() => import('./index.activity.vue'));
@@ -166,6 +163,14 @@ const age = $computed(() => {
 	return calcAge(props.user.birthday);
 });
 
+const timeForThem = $computed(() => {
+	const tzInfo = cityTimezones.lookupViaCity(props.user.location!);
+	if (tzInfo.length == 0) return "";
+	const theirTz = tzInfo[0].timezone;
+	const theirTime = new Date().toLocaleString("en-US", { timeZone: theirTz, hour12: true })
+	return ` (${theirTime.split(",")[1].trim().split(":")[0]} ${theirTime.split(" ")[1].slice(-2)})`
+})
+
 function menu(ev) {
 	os.popupMenu(getUserMenu(props.user, router), ev.currentTarget ?? ev.target);
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 06ec19eca..80df2d79b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -420,6 +420,7 @@ importers:
       chartjs-chart-matrix: ^2.0.1
       chartjs-plugin-gradient: 0.5.1
       chartjs-plugin-zoom: 1.2.1
+      city-timezones: ^1.2.1
       compare-versions: 5.0.3
       cropperjs: 2.0.0-beta.2
       cross-env: 7.0.3
@@ -464,12 +465,9 @@ importers:
       vue-plyr: ^7.0.0
       vue-prism-editor: 2.0.0-alpha.2
       vuedraggable: 4.1.0
-    dependencies:
-      '@khmyznikov/pwa-install': 0.2.0
-      chartjs-chart-matrix: 2.0.1_chart.js@4.1.1
-      gsap: 3.11.4
     devDependencies:
       '@discordapp/twemoji': 14.0.2
+      '@khmyznikov/pwa-install': 0.2.0
       '@rollup/plugin-alias': 3.1.9_rollup@3.9.1
       '@rollup/plugin-json': 4.1.0_rollup@3.9.1
       '@rollup/pluginutils': 4.2.1
@@ -495,8 +493,10 @@ importers:
       calckey-js: 0.0.22
       chart.js: 4.1.1
       chartjs-adapter-date-fns: 2.0.1_chart.js@4.1.1
+      chartjs-chart-matrix: 2.0.1_chart.js@4.1.1
       chartjs-plugin-gradient: 0.5.1_chart.js@4.1.1
       chartjs-plugin-zoom: 1.2.1_chart.js@4.1.1
+      city-timezones: 1.2.1
       compare-versions: 5.0.3
       cropperjs: 2.0.0-beta.2
       cross-env: 7.0.3
@@ -504,6 +504,7 @@ importers:
       date-fns: 2.29.3
       escape-regexp: 0.0.1
       eventemitter3: 4.0.7
+      gsap: 3.11.4
       idb-keyval: 6.2.0
       insert-text-at-cursor: 0.3.0
       json5: 2.2.3
@@ -1237,7 +1238,7 @@ packages:
     dependencies:
       '@lit/localize': 0.11.4
       lit: 2.6.1
-    dev: false
+    dev: true
 
   /@koa/cors/3.4.3:
     resolution: {integrity: sha512-WPXQUaAeAMVaLTEFpoq3T2O1C+FstkjJnDQqy95Ck1UdILajsRhu6mhJ8H2f4NFPRBoCNN+qywTJfq/gGki5mw==}
@@ -1270,23 +1271,24 @@ packages:
 
   /@kurkle/color/0.3.2:
     resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==}
+    dev: true
 
   /@lit-labs/ssr-dom-shim/1.0.0:
     resolution: {integrity: sha512-ic93MBXfApIFTrup4a70M/+ddD8xdt2zxxj9sRwHQzhS9ag/syqkD8JPdTXsc1gUy2K8TTirhlCqyTEM/sifNw==}
-    dev: false
+    dev: true
 
   /@lit/localize/0.11.4:
     resolution: {integrity: sha512-RRIwIX2tAm3+DuEndoXSJrFjGrAK5cb5IXo5K6jcJ6sbgD829B8rSqHC5MaKVUmXTVLIR1bk5IZOZDf9wFereA==}
     dependencies:
       '@lit/reactive-element': 1.6.1
       lit: 2.6.1
-    dev: false
+    dev: true
 
   /@lit/reactive-element/1.6.1:
     resolution: {integrity: sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA==}
     dependencies:
       '@lit-labs/ssr-dom-shim': 1.0.0
-    dev: false
+    dev: true
 
   /@mapbox/node-pre-gyp/1.0.9:
     resolution: {integrity: sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==}
@@ -2540,7 +2542,7 @@ packages:
 
   /@types/trusted-types/2.0.2:
     resolution: {integrity: sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==}
-    dev: false
+    dev: true
 
   /@types/undertaker-registry/1.0.1:
     resolution: {integrity: sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==}
@@ -3390,7 +3392,7 @@ packages:
   /axios/0.25.0_debug@4.3.4:
     resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==}
     dependencies:
-      follow-redirects: 1.15.2_debug@4.3.4
+      follow-redirects: 1.15.2
     transitivePeerDependencies:
       - debug
     dev: true
@@ -4010,6 +4012,7 @@ packages:
     engines: {pnpm: ^7.0.0}
     dependencies:
       '@kurkle/color': 0.3.2
+    dev: true
 
   /chartjs-adapter-date-fns/2.0.1_chart.js@4.1.1:
     resolution: {integrity: sha512-v3WV9rdnQ05ce3A0ZCjzUekJCAbfm6+3HqSoeY2BIkdMYZoYr/4T+ril1tZyDl869lz6xdNVMXejUFT9YKpw4A==}
@@ -4025,7 +4028,7 @@ packages:
       chart.js: '>=3.0.0'
     dependencies:
       chart.js: 4.1.1
-    dev: false
+    dev: true
 
   /chartjs-plugin-gradient/0.5.1_chart.js@4.1.1:
     resolution: {integrity: sha512-vhwlYGZWan4MGZZ4Wj64Y4aIql1uCPCU1JcggLWn3cgYEv4G7pXp1YgM4XH5ugmyn6BVCgQqAhiJ2h6hppzHmQ==}
@@ -4104,6 +4107,12 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /city-timezones/1.2.1:
+    resolution: {integrity: sha512-hruuB611QFoUFMsan7xd9B2VPMrA8XC716O/999WW34kmaJUT1hxKF2W8TSXAWkhSqgvbu70DjcDv7/wpM6vow==}
+    dependencies:
+      lodash: 4.17.21
+    dev: true
+
   /clap/1.2.3:
     resolution: {integrity: sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==}
     engines: {node: '>=0.10.0'}
@@ -6382,19 +6391,6 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
-    dev: false
-
-  /follow-redirects/1.15.2_debug@4.3.4:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dependencies:
-      debug: 4.3.4
-    dev: true
 
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
@@ -6918,7 +6914,7 @@ packages:
 
   /gsap/3.11.4:
     resolution: {integrity: sha512-McHhEguHyExMMnjqKA8G+7TvxmlKQGMbjgwAilnFe1e4id7V/tFveRQ2YMZhTYu0oxHGWvbPltdVYQOu3z1SCA==}
-    dev: false
+    dev: true
 
   /gulp-cli/2.3.0:
     resolution: {integrity: sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==}
@@ -8596,13 +8592,13 @@ packages:
     dependencies:
       '@lit/reactive-element': 1.6.1
       lit-html: 2.6.1
-    dev: false
+    dev: true
 
   /lit-html/2.6.1:
     resolution: {integrity: sha512-Z3iw+E+3KKFn9t2YKNjsXNEu/LRLI98mtH/C6lnFg7kvaqPIzPn124Yd4eT/43lyqrejpc5Wb6BHq3fdv4S8Rw==}
     dependencies:
       '@types/trusted-types': 2.0.2
-    dev: false
+    dev: true
 
   /lit/2.6.1:
     resolution: {integrity: sha512-DT87LD64f8acR7uVp7kZfhLRrHkfC/N4BVzAtnw9Yg8087mbBJ//qedwdwX0kzDbxgPccWRW6mFwGbRQIxy0pw==}
@@ -8610,7 +8606,7 @@ packages:
       '@lit/reactive-element': 1.6.1
       lit-element: 3.2.2
       lit-html: 2.6.1
-    dev: false
+    dev: true
 
   /load-json-file/1.1.0:
     resolution: {integrity: sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==}

From b4713b86e25ed00acea841a94b469fdd9e03116a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 11:42:37 -0800
Subject: [PATCH 071/582] fix: city validation

---
 packages/client/src/pages/user/home.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 0fe4774bd..506c7002b 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -164,10 +164,10 @@ const age = $computed(() => {
 });
 
 const timeForThem = $computed(() => {
-	const tzInfo = cityTimezones.lookupViaCity(props.user.location!);
+	const tzInfo = cityTimezones.lookupViaCity(props.user.location!.replace(/\s.*/,''));
 	if (tzInfo.length == 0) return "";
-	const theirTz = tzInfo[0].timezone;
-	const theirTime = new Date().toLocaleString("en-US", { timeZone: theirTz, hour12: true })
+	const tz = tzInfo[0].timezone;
+	const theirTime = new Date().toLocaleString("en-US", { timeZone: tz, hour12: true })
 	return ` (${theirTime.split(",")[1].trim().split(":")[0]} ${theirTime.split(" ")[1].slice(-2)})`
 })
 

From 706ebbd853df9ab24561392ea2e7c408a290ad6d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 11:58:02 -0800
Subject: [PATCH 072/582] Masto API meta

---
 .../mastodon/ApiMastodonCompatibleService.ts  |  2 +-
 .../src/server/api/mastodon/endpoints/meta.ts | 21 +++++++++++--------
 .../server/api/mastodon/endpoints/status.ts   | 16 +++++++-------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
index cc60a8db9..9a690e19f 100644
--- a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
+++ b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
@@ -54,7 +54,7 @@ export function apiMastodonCompatible(router: Router): void {
 		// displayed without being logged in
 		try {
 			const data = await client.getInstance();
-			ctx.body = getInstance(data.data);
+			ctx.body = await getInstance(data.data);
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
index a67edc5b2..5fba6f8a6 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/meta.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
@@ -1,6 +1,9 @@
 import { Entity } from "@calckey/megalodon";
+import { fetchMeta } from "@/misc/fetch-meta.js";
+
 // TODO: add calckey features
-export function getInstance(response: Entity.Instance) {
+export async function getInstance(response: Entity.Instance) {
+	const meta = await fetchMeta(true);
 	return {
 		uri: response.uri,
 		title: response.title || "",
@@ -11,8 +14,8 @@ export function getInstance(response: Entity.Instance) {
 		urls: response.urls,
 		stats: response.stats,
 		thumbnail: response.thumbnail || "",
-		languages: ["en", "de", "ja"],
-		registrations: response.registrations,
+		languages: meta.langs,
+		registrations: !meta.disableRegistration || response.registrations,
 		approval_required: !response.registrations,
 		invites_enabled: response.registrations,
 		configuration: {
@@ -77,17 +80,17 @@ export function getInstance(response: Entity.Instance) {
 			bot: true,
 			discoverable: false,
 			group: false,
-			created_at: "1971-01-01T00:00:00.000Z",
-			note: "",
-			url: "https://http.cat/404",
-			avatar: "https://http.cat/404",
-			avatar_static: "https://http.cat/404",
+			created_at: Math.floor(new Date().getTime() / 1000),
+			note: "Please refer to the original instance for the actual admin contact.",
+			url: "/",
+			avatar: "/static-assets/badges/info.png",
+			avatar_static: "/static-assets/badges/info.png",
 			header: "https://http.cat/404",
 			header_static: "https://http.cat/404",
 			followers_count: -1,
 			following_count: 0,
 			statuses_count: 0,
-			last_status_at: "1971-01-01T00:00:00.000Z",
+			last_status_at: Math.floor(new Date().getTime() / 1000),
 			noindex: true,
 			emojis: [],
 			fields: [],
diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index 2be79c73a..a72ac2c7e 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -404,7 +404,7 @@ async function getFirstReaction(
 ) {
 	const accessTokenArr = accessTokens?.split(" ") ?? [null];
 	const accessToken = accessTokenArr[accessTokenArr.length - 1];
-	let react = "👍";
+	let react = "⭐";
 	try {
 		const api = await axios.post(`${BASE_URL}/api/i/registry/get-unsecure`, {
 			scope: ["client", "base"],
@@ -412,7 +412,7 @@ async function getFirstReaction(
 			i: accessToken,
 		});
 		const reactRaw = api.data;
-		react = Array.isArray(reactRaw) ? api.data[0] : "👍";
+		react = Array.isArray(reactRaw) ? api.data[0] : "⭐";
 		console.log(api.data);
 		return react;
 	} catch (e) {
@@ -426,16 +426,16 @@ export function statusModel(
 	emojis: MastodonEntity.Emoji[],
 	content: string,
 ) {
-	const now = "1970-01-02T00:00:00.000Z";
+	const now = Math.floor(new Date().getTime() / 1000);
 	return {
 		id: "9atm5frjhb",
 		uri: "https://http.cat/404", // ""
 		url: "https://http.cat/404", // "",
 		account: {
 			id: "9arzuvv0sw",
-			username: "ReactionBot",
-			acct: "ReactionBot",
-			display_name: "ReactionsToThisPost",
+			username: "Reactions",
+			acct: "Reactions",
+			display_name: "Reactions to this post",
 			locked: false,
 			created_at: now,
 			followers_count: 0,
@@ -443,8 +443,8 @@ export function statusModel(
 			statuses_count: 0,
 			note: "",
 			url: "https://http.cat/404",
-			avatar: "https://http.cat/404",
-			avatar_static: "https://http.cat/404",
+			avatar: "/static-assets/badges/info.png",
+			avatar_static: "/static-assets/badges/info.png",
 			header: "https://http.cat/404", // ""
 			header_static: "https://http.cat/404", // ""
 			emojis: [],

From aae1d293b53990c3fe5339993ac72533fb975d48 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 12:02:25 -0800
Subject: [PATCH 073/582] fix: :bug: Don't show image previews if NSFW

Closes #9636
---
 packages/backend/src/server/web/views/note.pug | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug
index b2dc5f63f..25eac0942 100644
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@@ -7,7 +7,7 @@ block vars
 	- const isRenote = note.renote && note.text == null && note.fileIds.length == 0 && note.poll == null;
 	- const isImage = note.files.length !== 0 && note.files[0].type.startsWith('image');
 	- const isVideo = note.files.length !== 0 && note.files[0].type.startsWith('video');
-	- const imageUrl = isImage ? note.files[0].url : isVideo ? note.files[0].thumbnailUrl : avatarUrl; 
+	- const imageUrl = isImage ? note.files[0].url : isVideo ? note.files[0].thumbnailUrl : avatarUrl;
 
 block title
 	= `${title} | ${instanceName}`
@@ -23,7 +23,7 @@ block og
 		meta(property='og:description' content= summary)
 		meta(property='og:url'         content= url)
 		meta(property='og:image'       content= imageUrl)
-		if isImage 
+		if isImage && !note.files[0].isSensitive
 			meta(property='og:image:width'     content=note.files[0].properties.width)
 			meta(property='og:image:height'    content=note.files[0].properties.height)
 			meta(property='og:image:type'      content=note.files[0].type)

From fb8c4726d6eb98d63188ab9e7ed384a8827aa83e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 15:27:12 -0800
Subject: [PATCH 074/582] feat: new modal

---
 packages/client/src/components/MkModal.vue    | 147 ++++++++++++------
 .../src/components/MkPostFormDialog.vue       |  59 +++++--
 2 files changed, 142 insertions(+), 64 deletions(-)

diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index ed0e7f59d..4048177a6 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -1,12 +1,19 @@
 <template>
-<transition :name="$store.state.animation ? (type === 'drawer') ? 'modal-drawer' : (type === 'popup') ? 'modal-popup' : 'modal' : ''" :duration="$store.state.animation ? 200 : 0" appear @after-leave="emit('closed')" @enter="emit('opening')" @after-enter="onOpened">
-	<div v-show="manualShowing != null ? manualShowing : showing" v-hotkey.global="keymap" class="qzhlnise" :class="{ drawer: type === 'drawer', dialog: type === 'dialog' || type === 'dialog:top', popup: type === 'popup' }" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
-		<div class="bg _modalBg" :class="{ transparent: transparentBg && (type === 'popup') }" :style="{ zIndex }" @click="onBgClick" @contextmenu.prevent.stop="() => {}"></div>
-		<div ref="content" class="content" :class="{ fixed, top: type === 'dialog:top' }" :style="{ zIndex }" @click.self="onBgClick">
-			<slot :max-height="maxHeight" :type="type"></slot>
+	<Transition
+		:name="transitionName"
+		:enter-active-class="$style['transition_' + transitionName + '_enterActive']"
+		:leave-active-class="$style['transition_' + transitionName + '_leaveActive']"
+		:enter-from-class="$style['transition_' + transitionName + '_enterFrom']"
+		:leave-to-class="$style['transition_' + transitionName + '_leaveTo']"
+		:duration="transitionDuration" appear @after-leave="emit('closed')" @enter="emit('opening')" @after-enter="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 class="_modalBg data-cy-bg" :class="[$style.bg, { [$style.bgTransparent]: isEnableBgTransparent, 'data-cy-transparent': 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>
+			</div>
 		</div>
-	</div>
-</transition>
+	</Transition>
 </template>
 
 <script lang="ts" setup>
@@ -26,7 +33,7 @@ function getFixedContainer(el: Element | null): Element | null {
 	}
 }
 
-type ModalTypes = 'popup' | 'dialog' | 'dialog:top' | 'drawer';
+type ModalTypes = 'popup' | 'dialog' | 'drawer';
 
 const props = withDefaults(defineProps<{
 	manualShowing?: boolean | null;
@@ -61,9 +68,10 @@ let maxHeight = $ref<number>();
 let fixed = $ref(false);
 let transformOrigin = $ref('center');
 let showing = $ref(true);
-let content = $ref<HTMLElement>();
+let content = $shallowRef<HTMLElement>();
 const zIndex = os.claimZIndex(props.zPriority);
-const type = $computed(() => {
+let useSendAnime = $ref(false);
+const type = $computed<ModalTypes>(() => {
 	if (props.preferType === 'auto') {
 		if (!defaultStore.state.disableDrawer && isTouchUsing && deviceKind === 'smartphone') {
 			return 'drawer';
@@ -74,19 +82,47 @@ const type = $computed(() => {
 		return props.preferType!;
 	}
 });
+const isEnableBgTransparent = $computed(() => props.transparentBg && (type === 'popup'));
+let transitionName = $computed((() =>
+	defaultStore.state.animation
+		? useSendAnime
+			? 'send'
+			: type === 'drawer'
+				? 'modal-drawer'
+				: type === 'popup'
+					? 'modal-popup'
+					: 'modal'
+		: ''
+));
+let transitionDuration = $computed((() =>
+	transitionName === 'send'
+		? 400
+		: transitionName === 'modal-popup'
+			? 100
+			: transitionName === 'modal'
+				? 200
+				: transitionName === 'modal-drawer'
+					? 200
+					: 0
+));
 
 let contentClicking = false;
 
-const close = () => {
+function close(opts: { useSendAnimation?: boolean } = {}) {
+	if (opts.useSendAnimation) {
+		useSendAnime = true;
+	}
+
+	// eslint-disable-next-line vue/no-mutating-props
 	if (props.src) props.src.style.pointerEvents = 'auto';
 	showing = false;
 	emit('close');
-};
+}
 
-const onBgClick = () => {
+function onBgClick() {
 	if (contentClicking) return;
 	emit('click');
-};
+}
 
 if (type === 'drawer') {
 	maxHeight = window.innerHeight / 1.5;
@@ -230,12 +266,13 @@ const onOpened = () => {
 onMounted(() => {
 	watch(() => props.src, async () => {
 		if (props.src) {
+			// eslint-disable-next-line vue/no-mutating-props
 			props.src.style.pointerEvents = 'none';
 		}
 		fixed = (type === 'drawer') || (getFixedContainer(props.src) != null);
 
 		await nextTick();
-		
+
 		align();
 	}, { immediate: true });
 
@@ -251,8 +288,33 @@ defineExpose({
 });
 </script>
 
-<style lang="scss" scoped>
-.modal-enter-active, .modal-leave-active {
+<style lang="scss" module>
+.transition_send_enterActive,
+.transition_send_leaveActive {
+	> .bg {
+		transition: opacity 0.3s !important;
+	}
+
+	> .content {
+		transform: translateY(0px);
+		transition: opacity 0.3s ease-in, transform 0.3s cubic-bezier(.5,-0.5,1,.5) !important;
+	}
+}
+.transition_send_enterFrom,
+.transition_send_leaveTo {
+	> .bg {
+		opacity: 0;
+	}
+
+	> .content {
+		pointer-events: none;
+		opacity: 0;
+		transform: translateY(-300px);
+	}
+}
+
+.transition_modal_enterActive,
+.transition_modal_leaveActive {
 	> .bg {
 		transition: opacity 0.2s !important;
 	}
@@ -262,7 +324,8 @@ defineExpose({
 		transition: opacity 0.2s, transform 0.2s !important;
 	}
 }
-.modal-enter-from, .modal-leave-to {
+.transition_modal_enterFrom,
+.transition_modal_leaveTo {
 	> .bg {
 		opacity: 0;
 	}
@@ -275,17 +338,19 @@ defineExpose({
 	}
 }
 
-.modal-popup-enter-active, .modal-popup-leave-active {
+.transition_modal-popup_enterActive,
+.transition_modal-popup_leaveActive {
 	> .bg {
-		transition: opacity 0.2s !important;
+		transition: opacity 0.1s !important;
 	}
 
 	> .content {
 		transform-origin: var(--transformOrigin);
-		transition: opacity 0.2s cubic-bezier(0, 0, 0.2, 1), transform 0.2s cubic-bezier(0, 0, 0.2, 1) !important;
+		transition: opacity 0.1s cubic-bezier(0, 0, 0.2, 1), transform 0.1s cubic-bezier(0, 0, 0.2, 1) !important;
 	}
 }
-.modal-popup-enter-from, .modal-popup-leave-to {
+.transition_modal-popup_enterFrom,
+.transition_modal-popup_leaveTo {
 	> .bg {
 		opacity: 0;
 	}
@@ -298,7 +363,7 @@ defineExpose({
 	}
 }
 
-.modal-drawer-enter-active {
+.transition_modal-drawer_enterActive {
 	> .bg {
 		transition: opacity 0.2s !important;
 	}
@@ -307,7 +372,7 @@ defineExpose({
 		transition: transform 0.2s cubic-bezier(0,.5,0,1) !important;
 	}
 }
-.modal-drawer-leave-active {
+.transition_modal-drawer_leaveActive {
 	> .bg {
 		transition: opacity 0.2s !important;
 	}
@@ -316,7 +381,8 @@ defineExpose({
 		transition: transform 0.2s cubic-bezier(0,.5,0,1) !important;
 	}
 }
-.modal-drawer-enter-from, .modal-drawer-leave-to {
+.transition_modal-drawer_enterFrom,
+.transition_modal-drawer_leaveTo {
 	> .bg {
 		opacity: 0;
 	}
@@ -327,15 +393,7 @@ defineExpose({
 	}
 }
 
-.qzhlnise {
-	> .bg {
-		&.transparent {
-			background: transparent;
-			-webkit-backdrop-filter: none;
-			backdrop-filter: none;
-		}
-	}
-
+.root {
 	&.dialog {
 		> .content {
 			position: fixed;
@@ -356,16 +414,6 @@ defineExpose({
 				-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 16px, rgba(0,0,0,1) calc(100% - 16px), rgba(0,0,0,0) 100%);
 				mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 16px, rgba(0,0,0,1) calc(100% - 16px), rgba(0,0,0,0) 100%);
 			}
-
-			> ::v-deep(*) {
-				margin: auto;
-			}
-
-			&.top {
-				> ::v-deep(*) {
-					margin-top: 0;
-				}
-			}
 		}
 	}
 
@@ -393,12 +441,15 @@ defineExpose({
 			left: 0;
 			right: 0;
 			margin: auto;
-
-			> ::v-deep(*) {
-				margin: auto;
-			}
 		}
 	}
+}
 
+.bg {
+	&.bgTransparent {
+		background: transparent;
+		-webkit-backdrop-filter: none;
+		backdrop-filter: none;
+	}
 }
 </style>
diff --git a/packages/client/src/components/MkPostFormDialog.vue b/packages/client/src/components/MkPostFormDialog.vue
index 6dabb1db1..479d5dd06 100644
--- a/packages/client/src/components/MkPostFormDialog.vue
+++ b/packages/client/src/components/MkPostFormDialog.vue
@@ -1,19 +1,46 @@
 <template>
-<MkModal ref="modal" :prefer-type="'dialog:top'" @click="$refs.modal.close()" @closed="$emit('closed')">
-	<MkPostForm v-bind="$attrs" @posted="$refs.modal.close()" @cancel="$refs.modal.close()" @esc="$refs.modal.close()"/>
-</MkModal>
-</template>
+	<MkModal ref="modal" :prefer-type="'dialog'" @click="modal.close()" @closed="onModalClosed()">
+		<MkPostForm ref="form" style="margin: 0 auto auto auto;" v-bind="props" autofocus freeze-after-posted @posted="onPosted" @cancel="modal.close()" @esc="modal.close()"/>
+	</MkModal>
+	</template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import MkModal from '@/components/MkModal.vue';
-import MkPostForm from '@/components/MkPostForm.vue';
+	<script lang="ts" setup>
+	import { } from 'vue';
+	import * as misskey from 'calckey-js';
+	import MkModal from '@/components/MkModal.vue';
+	import MkPostForm from '@/components/MkPostForm.vue';
 
-export default defineComponent({
-	components: {
-		MkModal,
-		MkPostForm,
-	},
-	emits: ['closed'],
-});
-</script>
+	const props = defineProps<{
+		reply?: misskey.entities.Note;
+		renote?: misskey.entities.Note;
+		channel?: any; // TODO
+		mention?: misskey.entities.User;
+		specified?: misskey.entities.User;
+		initialText?: string;
+		initialVisibility?: typeof misskey.noteVisibilities;
+		initialFiles?: misskey.entities.DriveFile[];
+		initialLocalOnly?: boolean;
+		initialVisibleUsers?: misskey.entities.User[];
+		initialNote?: misskey.entities.Note;
+		instant?: boolean;
+		fixed?: boolean;
+		autofocus?: boolean;
+	}>();
+
+	const emit = defineEmits<{
+		(ev: 'closed'): void;
+	}>();
+
+	let modal = $shallowRef<InstanceType<typeof MkModal>>();
+	let form = $shallowRef<InstanceType<typeof MkPostForm>>();
+
+	function onPosted() {
+		modal.close({
+			useSendAnimation: true,
+		});
+	}
+
+	function onModalClosed() {
+		emit('closed');
+	}
+	</script>

From 378be06d96f29638af1ec978e1df57a80b595656 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 15:34:41 -0800
Subject: [PATCH 075/582] fix: dialog

---
 packages/client/src/components/MkDialog.vue | 189 ++++++++++----------
 1 file changed, 97 insertions(+), 92 deletions(-)

diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue
index e01b0a332..ec55d15f7 100644
--- a/packages/client/src/components/MkDialog.vue
+++ b/packages/client/src/components/MkDialog.vue
@@ -1,51 +1,51 @@
 <template>
-<MkModal ref="modal" :prefer-type="'dialog'" :z-priority="'high'" @click="done(true)" @closed="emit('closed')">
-	<div class="mk-dialog">
-		<div v-if="icon" class="icon">
-			<i :class="icon"></i>
-		</div>
-		<div v-else-if="!input && !select" class="icon" :class="type">
-			<i v-if="type === 'success'" class="ph-check-bold ph-lg"></i>
-			<i v-else-if="type === 'error'" class="ph-circle-wavy-warning-bold ph-lg"></i>
-			<i v-else-if="type === 'warning'" class="ph-warning-bold ph-lg"></i>
-			<i v-else-if="type === 'info'" class="ph-info-bold ph-lg"></i>
-			<i v-else-if="type === 'question'" class="ph-question-bold ph-lg"></i>
-			<i v-else-if="type === 'waiting'" class="ph-circle-notch-bold ph-lg fa-pulse"></i>
-		</div>
-		<header v-if="title"><Mfm :text="title"/></header>
-		<div v-if="text" class="body"><Mfm :text="text"/></div>
-		<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" @keydown="onInputKeydown">
-			<template v-if="input.type === 'password'" #prefix><i class="ph-lock-bold ph-lg"></i></template>
-		</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>
-			<template v-else>
-				<optgroup v-for="groupedItem in select.groupedItems" :label="groupedItem.label">
-					<option v-for="item in groupedItem.items" :value="item.value">{{ item.text }}</option>
-				</optgroup>
-			</template>
-		</MkSelect>
-		<div v-if="(showOkButton || showCancelButton) && !actions" class="buttons">
-			<div v-if="!isYesNo">
-				<MkButton v-if="showOkButton" inline primary :autofocus="!input && !select" @click="ok">{{ (showCancelButton || input || select) ? i18n.ts.ok : i18n.ts.gotIt }}</MkButton>
-				<MkButton v-if="showCancelButton || input || select" inline @click="cancel">{{ i18n.ts.cancel }}</MkButton>
+	<MkModal ref="modal" :prefer-type="'dialog'" :z-priority="'high'" @click="done(true)" @closed="emit('closed')">
+		<div :class="$style.root">
+			<div v-if="icon" :class="$style.icon">
+				<i :class="icon"></i>
 			</div>
-			<div v-else>
-				<MkButton v-if="showOkButton" inline primary :autofocus="!input && !select" @click="ok">{{ i18n.ts.yes }}</MkButton>
-				<MkButton v-if="showCancelButton || input || select" inline @click="cancel">{{ i18n.ts.no }}</MkButton>
+			<div v-else-if="!input && !select" :class="[$style.icon, $style['type_' + type]]">
+				<i v-if="type === 'success'" :class="$style.iconInner" class="ph-check-bold ph-lg"></i>
+				<i v-else-if="type === 'error'" :class="$style.iconInner" class="ph-circle-wavy-warning-bold ph-lg"></i>
+				<i v-else-if="type === 'warning'" :class="$style.iconInner" class="ph-warning-bold ph-lg"></i>
+				<i v-else-if="type === 'info'" :class="$style.iconInner" class="ph-info-bold ph-lg"></i>
+				<i v-else-if="type === 'question'" :class="$style.iconInner" class="ph-circle-notch-bold ph-lg"></i>
+				<MkLoading v-else-if="type === 'waiting'" :class="$style.iconInner" :em="true"/>
+			</div>
+			<header v-if="title" :class="$style.title"><Mfm :text="title"/></header>
+			<div v-if="text" :class="$style.text"><Mfm :text="text"/></div>
+			<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" @keydown="onInputKeydown">
+				<template v-if="input.type === 'password'" #prefix><i class="ph-password-bold ph-lg"></i></template>
+			</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>
+				<template v-else>
+					<optgroup v-for="groupedItem in select.groupedItems" :label="groupedItem.label">
+						<option v-for="item in groupedItem.items" :value="item.value">{{ item.text }}</option>
+					</optgroup>
+				</template>
+			</MkSelect>
+			<div v-if="(showOkButton || showCancelButton) && !actions" :class="$style.buttons">
+				<div v-if="!isYesNo">
+					<MkButton v-if="showOkButton" inline primary :autofocus="!input && !select" @click="ok">{{ (showCancelButton || input || select) ? i18n.ts.ok : i18n.ts.gotIt }}</MkButton>
+					<MkButton v-if="showCancelButton || input || select" inline @click="cancel">{{ i18n.ts.cancel }}</MkButton>
+				</div>
+				<div v-else>
+					<MkButton v-if="showOkButton" inline primary :autofocus="!input && !select" @click="ok">{{ i18n.ts.yes }}</MkButton>
+					<MkButton v-if="showCancelButton || input || select" inline @click="cancel">{{ i18n.ts.no }}</MkButton>
+				</div>
+			</div>
+			<div v-if="actions" :class="$style.buttons">
+				<MkButton v-for="action in actions" :key="action.text" inline :primary="action.primary" @click="() => { action.callback(); modal?.close(); }">{{ action.text }}</MkButton>
 			</div>
 		</div>
-		<div v-if="actions" class="buttons">
-			<MkButton v-for="action in actions" :key="action.text" inline :primary="action.primary" @click="() => { action.callback(); close(); }">{{ action.text }}</MkButton>
-		</div>
-	</div>
-</MkModal>
+	</MkModal>
 </template>
 
 <script lang="ts" setup>
-import { onBeforeUnmount, onMounted, ref } from 'vue';
+import { onBeforeUnmount, onMounted, ref, shallowRef } from 'vue';
 import MkModal from '@/components/MkModal.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
@@ -88,12 +88,16 @@ const props = withDefaults(defineProps<{
 	showOkButton?: boolean;
 	showCancelButton?: boolean;
 	isYesNo?: boolean;
+
 	cancelableByBgClick?: boolean;
+	okText?: string;
+	cancelText?: string;
 }>(), {
 	type: 'info',
 	showOkButton: true,
 	showCancelButton: false,
 	isYesNo: false,
+
 	cancelableByBgClick: true,
 });
 
@@ -102,7 +106,7 @@ const emit = defineEmits<{
 	(ev: 'closed'): void;
 }>();
 
-const modal = ref<InstanceType<typeof MkModal>>();
+const modal = shallowRef<InstanceType<typeof MkModal>>();
 
 const inputValue = ref(props.input?.default || null);
 const selectedValue = ref(props.select?.default || null);
@@ -151,9 +155,10 @@ onBeforeUnmount(() => {
 });
 </script>
 
-<style lang="scss" scoped>
-.mk-dialog {
+<style lang="scss" module>
+.root {
 	position: relative;
+	margin: auto;
 	padding: 32px;
 	min-width: 320px;
 	max-width: 480px;
@@ -161,56 +166,56 @@ onBeforeUnmount(() => {
 	text-align: center;
 	background: var(--panel);
 	border-radius: var(--radius);
+}
 
-	> .icon {
-		font-size: 32px;
+.icon {
+	font-size: 24px;
 
-		&.info {
-			color: #55c4dd;
-		}
-
-		&.success {
-			color: var(--success);
-		}
-
-		&.error {
-			color: var(--error);
-		}
-
-		&.warning {
-			color: var(--warn);
-		}
-
-		> * {
-			display: block;
-			margin: 0 auto;
-		}
-
-		& + header {
-			margin-top: 16px;
-		}
-	}
-
-	> header {
-		margin: 0 0 8px 0;
-		font-weight: bold;
-		font-size: 20px;
-
-		& + .body {
-			margin-top: 8px;
-		}
-	}
-
-	> .body {
-		margin: 16px 0 0 0;
-	}
-
-	> .buttons {
-		margin-top: 16px;
-
-		> * {
-			margin: 0 8px;
-		}
+	& + .title {
+		margin-top: 8px;
 	}
 }
+
+.iconInner {
+	display: block;
+	margin: 0 auto;
+}
+
+.type_info {
+	color: var(--accent);
+}
+
+.type_success {
+	color: var(--success);
+}
+
+.type_error {
+	color: var(--error);
+}
+
+.type_warning {
+	color: var(--warn);
+}
+
+.title {
+	margin: 0 0 8px 0;
+	font-weight: bold;
+	font-size: 1.1em;
+
+	& + .text {
+		margin-top: 8px;
+	}
+}
+
+.text {
+	margin: 16px 0 0 0;
+}
+
+.buttons {
+	margin-top: 16px;
+	display: flex;
+	gap: 8px;
+	flex-wrap: wrap;
+	justify-content: center;
+}
 </style>

From 4e5e970036d7197b3bf43b4d7986381b641c4d94 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 15:48:46 -0800
Subject: [PATCH 076/582] fix?

---
 packages/client/src/components/MkModal.vue | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index 4048177a6..840a1aee2 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -414,6 +414,17 @@ defineExpose({
 				-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 16px, rgba(0,0,0,1) calc(100% - 16px), rgba(0,0,0,0) 100%);
 				mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 16px, rgba(0,0,0,1) calc(100% - 16px), rgba(0,0,0,0) 100%);
 			}
+
+			> ::v-deep(*) {
+				margin: auto;
+			}
+
+			&.top {
+				> ::v-deep(*) {
+					margin-top: 0;
+				}
+			}
+
 		}
 	}
 
@@ -441,6 +452,10 @@ defineExpose({
 			left: 0;
 			right: 0;
 			margin: auto;
+
+			> ::v-deep(*) {
+				margin: auto;
+			}
 		}
 	}
 }

From 6ca9860a72a0e453bf4f9f7f0b1438baf4023ed8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 15:53:19 -0800
Subject: [PATCH 077/582] formatting

---
 .../src/components/MkPostFormDialog.vue       | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/client/src/components/MkPostFormDialog.vue b/packages/client/src/components/MkPostFormDialog.vue
index 479d5dd06..147ba9542 100644
--- a/packages/client/src/components/MkPostFormDialog.vue
+++ b/packages/client/src/components/MkPostFormDialog.vue
@@ -2,45 +2,45 @@
 	<MkModal ref="modal" :prefer-type="'dialog'" @click="modal.close()" @closed="onModalClosed()">
 		<MkPostForm ref="form" style="margin: 0 auto auto auto;" v-bind="props" autofocus freeze-after-posted @posted="onPosted" @cancel="modal.close()" @esc="modal.close()"/>
 	</MkModal>
-	</template>
+</template>
 
-	<script lang="ts" setup>
-	import { } from 'vue';
-	import * as misskey from 'calckey-js';
-	import MkModal from '@/components/MkModal.vue';
-	import MkPostForm from '@/components/MkPostForm.vue';
+<script lang="ts" setup>
+import { } from 'vue';
+import * as misskey from 'calckey-js';
+import MkModal from '@/components/MkModal.vue';
+import MkPostForm from '@/components/MkPostForm.vue';
 
-	const props = defineProps<{
-		reply?: misskey.entities.Note;
-		renote?: misskey.entities.Note;
-		channel?: any; // TODO
-		mention?: misskey.entities.User;
-		specified?: misskey.entities.User;
-		initialText?: string;
-		initialVisibility?: typeof misskey.noteVisibilities;
-		initialFiles?: misskey.entities.DriveFile[];
-		initialLocalOnly?: boolean;
-		initialVisibleUsers?: misskey.entities.User[];
-		initialNote?: misskey.entities.Note;
-		instant?: boolean;
-		fixed?: boolean;
-		autofocus?: boolean;
-	}>();
+const props = defineProps<{
+	reply?: misskey.entities.Note;
+	renote?: misskey.entities.Note;
+	channel?: any; // TODO
+	mention?: misskey.entities.User;
+	specified?: misskey.entities.User;
+	initialText?: string;
+	initialVisibility?: typeof misskey.noteVisibilities;
+	initialFiles?: misskey.entities.DriveFile[];
+	initialLocalOnly?: boolean;
+	initialVisibleUsers?: misskey.entities.User[];
+	initialNote?: misskey.entities.Note;
+	instant?: boolean;
+	fixed?: boolean;
+	autofocus?: boolean;
+}>();
 
-	const emit = defineEmits<{
-		(ev: 'closed'): void;
-	}>();
+const emit = defineEmits<{
+	(ev: 'closed'): void;
+}>();
 
-	let modal = $shallowRef<InstanceType<typeof MkModal>>();
-	let form = $shallowRef<InstanceType<typeof MkPostForm>>();
+let modal = $shallowRef<InstanceType<typeof MkModal>>();
+let form = $shallowRef<InstanceType<typeof MkPostForm>>();
 
-	function onPosted() {
-		modal.close({
-			useSendAnimation: true,
-		});
-	}
+function onPosted() {
+	modal.close({
+		useSendAnimation: true,
+	});
+}
 
-	function onModalClosed() {
-		emit('closed');
-	}
-	</script>
+function onModalClosed() {
+	emit('closed');
+}
+</script>

From 3e78ff2439a2ed5ec939cb0ff9b647c974d1eab5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 16:16:24 -0800
Subject: [PATCH 078/582] fix??

---
 packages/client/src/components/MkModal.vue    | 14 +++----
 .../client/src/components/MkModalWindow.vue   | 38 ++++++++++---------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index 840a1aee2..b88dee380 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -7,9 +7,9 @@
 		:leave-to-class="$style['transition_' + transitionName + '_leaveTo']"
 		:duration="transitionDuration" appear @after-leave="emit('closed')" @enter="emit('opening')" @after-enter="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" v-hotkey.global="keymap" :class="[$style.root, { [$style.drawer]: type === 'drawer', [$style.dialog]: type === 'dialog' || type === 'dialog:top', [$style.popup]: type === 'popup' }]" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
 			<div class="_modalBg data-cy-bg" :class="[$style.bg, { [$style.bgTransparent]: isEnableBgTransparent, 'data-cy-transparent': 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">
+			<div ref="content" :class="[$style.content, { [$style.fixed]: fixed, top: type === 'dialog:top' }]" :style="{ zIndex }" @click.self="onBgClick">
 				<slot :max-height="maxHeight" :type="type"></slot>
 			</div>
 		</div>
@@ -33,7 +33,7 @@ function getFixedContainer(el: Element | null): Element | null {
 	}
 }
 
-type ModalTypes = 'popup' | 'dialog' | 'drawer';
+type ModalTypes = 'popup' | 'dialog' | 'dialog:top' | 'drawer';
 
 const props = withDefaults(defineProps<{
 	manualShowing?: boolean | null;
@@ -194,21 +194,21 @@ const align = () => {
 		}
 	} else {
 		// 画面から横にはみ出る場合
-		if (left + width - window.pageXOffset > window.innerWidth) {
-			left = window.innerWidth - width + window.pageXOffset - 1;
+		if (left + width - window.scrollX > window.innerWidth) {
+			left = window.innerWidth - width + window.scrollX - 1;
 		}
 
 		const underSpace = (window.innerHeight - MARGIN) - (top - window.pageYOffset);
 		const upperSpace = (srcRect.top - MARGIN);
 
 		// 画面から縦にはみ出る場合
-		if (top + height - window.pageYOffset > (window.innerHeight - MARGIN)) {
+		if (top + height - window.scrollY > (window.innerHeight - MARGIN)) {
 			if (props.noOverlap && props.anchor.x === 'center') {
 				if (underSpace >= (upperSpace / 3)) {
 					maxHeight = underSpace;
 				} else {
 					maxHeight = upperSpace;
-					top = window.pageYOffset + ((upperSpace + MARGIN) - height);
+					top = window.scrollY + ((upperSpace + MARGIN) - height);
 				}
 			} else {
 				top = (window.innerHeight - MARGIN) - height + window.pageYOffset - 1;
diff --git a/packages/client/src/components/MkModalWindow.vue b/packages/client/src/components/MkModalWindow.vue
index 666382466..2765a9927 100644
--- a/packages/client/src/components/MkModalWindow.vue
+++ b/packages/client/src/components/MkModalWindow.vue
@@ -1,19 +1,19 @@
 <template>
-<MkModal ref="modal" :prefer-type="'dialog'" @click="onBgClick" @closed="$emit('closed')">
-	<div ref="rootEl" class="ebkgoccj _narrow_" :style="{ width: `${width}px`, height: scroll ? (height ? `${height}px` : null) : (height ? `min(${height}px, 100%)` : '100%') }" @keydown="onKeydown">
-		<div ref="headerEl" class="header">
-			<button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="ph-x-bold ph-lg"></i></button>
-			<span class="title">
-				<slot name="header"></slot>
-			</span>
-			<button v-if="!withOkButton" class="_button" @click="$emit('close')"><i class="ph-x-bold ph-lg"></i></button>
-			<button v-if="withOkButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ph-check-bold ph-lg"></i></button>
+	<MkModal ref="modal" :prefer-type="'dialog'" @click="onBgClick" @closed="$emit('closed')">
+		<div ref="rootEl" class="ebkgoccj" :style="{ width: `${width}px`, height: scroll ? (height ? `${height}px` : null) : (height ? `min(${height}px, 100%)` : '100%') }" @keydown="onKeydown">
+			<div ref="headerEl" class="header">
+				<button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="ph-x-bold ph-lg"></i></button>
+				<span class="title">
+					<slot name="header"></slot>
+				</span>
+				<button v-if="!withOkButton" class="_button" @click="$emit('close')"><i class="ph-x-bold ph-lg"></i></button>
+				<button v-if="withOkButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ph-check-bold ph-lg"></i></button>
+			</div>
+			<div class="body">
+				<slot :width="bodyWidth" :height="bodyHeight"></slot>
+			</div>
 		</div>
-		<div class="body">
-			<slot :width="bodyWidth" :height="bodyHeight"></slot>
-		</div>
-	</div>
-</MkModal>
+	</MkModal>
 </template>
 
 <script lang="ts" setup>
@@ -41,9 +41,9 @@ const emit = defineEmits<{
 	(event: 'ok'): void;
 }>();
 
-let modal = $ref<InstanceType<typeof MkModal>>();
-let rootEl = $ref<HTMLElement>();
-let headerEl = $ref<HTMLElement>();
+let modal = $shallowRef<InstanceType<typeof MkModal>>();
+let rootEl = $shallowRef<HTMLElement>();
+let headerEl = $shallowRef<HTMLElement>();
 let bodyWidth = $ref(0);
 let bodyHeight = $ref(0);
 
@@ -85,12 +85,13 @@ defineExpose({
 
 <style lang="scss" scoped>
 .ebkgoccj {
+	margin: auto;
 	overflow: hidden;
 	display: flex;
 	flex-direction: column;
 	contain: content;
+	container-type: inline-size;
 	border-radius: var(--radius);
-	transition: all 0.2s;
 
 	--root-margin: 24px;
 
@@ -145,3 +146,4 @@ defineExpose({
 	}
 }
 </style>
+	
\ No newline at end of file

From 93a4e3cb0497f673b49b771754f26d2a86be9821 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 16:28:50 -0800
Subject: [PATCH 079/582] will fix?

---
 packages/client/src/components/MkUpdated.vue |  2 +-
 packages/client/src/os.ts                    | 51 ++++++++------------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/packages/client/src/components/MkUpdated.vue b/packages/client/src/components/MkUpdated.vue
index bd8882195..6f5ca6618 100644
--- a/packages/client/src/components/MkUpdated.vue
+++ b/packages/client/src/components/MkUpdated.vue
@@ -6,7 +6,7 @@
 		<div v-if="newRelease" class="releaseNotes">
 			<Mfm :text="data.notes"/>
 			<div v-if="data.screenshots.length > 0" style="max-width: 500">
-				<img v-for="i in data.screenshots" :key="i" :src="i"/>
+				<img v-for="i in data.screenshots" :key="i" :src="i" alt="screenshot"/>
 			</div>
 		</div>
 		<MkButton class="gotIt" primary full @click="modal.close()">{{ i18n.ts.gotIt }}</MkButton>
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index b25a3431b..d3516bf4c 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -7,6 +7,8 @@ import * as Misskey from "calckey-js";
 import { apiUrl, url } from "@/config";
 import MkPostFormDialog from "@/components/MkPostFormDialog.vue";
 import MkWaitingDialog from "@/components/MkWaitingDialog.vue";
+import MkToast from '@/components/MkToast.vue';
+import MkDialog from '@/components/MkDialog.vue';
 import { MenuItem } from "@/types/menu";
 import { $i } from "@/account";
 
@@ -246,54 +248,41 @@ export function modalPageWindow(path: string) {
 }
 
 export function toast(message: string) {
-	popup(
-		defineAsyncComponent(() => import("@/components/MkToast.vue")),
-		{
-			message,
-		},
-		{},
-		"closed",
-	);
+	popup(MkToast, {
+		message,
+	}, {}, 'closed');
 }
 
 export function alert(props: {
-	type?: "error" | "info" | "success" | "warning" | "waiting" | "question";
+	type?: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
 	title?: string | null;
 	text?: string | null;
 }): Promise<void> {
 	return new Promise((resolve, reject) => {
-		popup(
-			defineAsyncComponent(() => import("@/components/MkDialog.vue")),
-			props,
-			{
-				done: (result) => {
-					resolve();
-				},
+		popup(MkDialog, props, {
+			done: result => {
+				resolve();
 			},
-			"closed",
-		);
+		}, 'closed');
 	});
 }
 
 export function confirm(props: {
-	type: "error" | "info" | "success" | "warning" | "waiting" | "question";
+	type: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
 	title?: string | null;
 	text?: string | null;
+	okText?: string;
+	cancelText?: string;
 }): Promise<{ canceled: boolean }> {
 	return new Promise((resolve, reject) => {
-		popup(
-			defineAsyncComponent(() => import("@/components/MkDialog.vue")),
-			{
-				...props,
-				showCancelButton: true,
+		popup(MkDialog, {
+			...props,
+			showCancelButton: true,
+		}, {
+			done: result => {
+				resolve(result ? result : { canceled: true });
 			},
-			{
-				done: (result) => {
-					resolve(result ? result : { canceled: true });
-				},
-			},
-			"closed",
-		);
+		}, 'closed');
 	});
 }
 

From f06b39fbe929447408b0ac2f89fba35b71f9f6d2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 16:37:25 -0800
Subject: [PATCH 080/582] chore: :fire: remove ability to add Twitter
 integration

---
 packages/client/src/pages/admin/integrations.twitter.vue | 2 +-
 packages/client/src/pages/admin/integrations.vue         | 7 -------
 packages/client/src/pages/settings/integration.vue       | 7 -------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/packages/client/src/pages/admin/integrations.twitter.vue b/packages/client/src/pages/admin/integrations.twitter.vue
index 95a11eb82..d8ceb5e6c 100644
--- a/packages/client/src/pages/admin/integrations.twitter.vue
+++ b/packages/client/src/pages/admin/integrations.twitter.vue
@@ -7,7 +7,7 @@
 
 		<template v-if="enableTwitterIntegration">
 			<FormInfo class="_formBlock">Callback URL: {{ `${uri}/api/tw/cb` }}</FormInfo>
-		
+
 			<FormInput v-model="twitterConsumerKey" class="_formBlock">
 				<template #prefix><i class="ph-key-bold ph-lg"></i></template>
 				<template #label>Consumer Key</template>
diff --git a/packages/client/src/pages/admin/integrations.vue b/packages/client/src/pages/admin/integrations.vue
index 540eced4d..91a84bf20 100644
--- a/packages/client/src/pages/admin/integrations.vue
+++ b/packages/client/src/pages/admin/integrations.vue
@@ -3,12 +3,6 @@
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
-			<FormFolder class="_formBlock">
-				<template #icon><i class="ph-twitter-logo-bold ph-lg"></i></template>
-				<template #label>Twitter</template>
-				<template #suffix>{{ enableTwitterIntegration ? i18n.ts.enabled : i18n.ts.disabled }}</template>
-				<XTwitter/>
-			</FormFolder>
 			<FormFolder class="_formBlock">
 				<template #icon><i class="ph-github-logo-bold ph-lg"></i></template>
 				<template #label>GitHub</template>
@@ -28,7 +22,6 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import XTwitter from './integrations.twitter.vue';
 import XGithub from './integrations.github.vue';
 import XDiscord from './integrations.discord.vue';
 import FormSuspense from '@/components/form/suspense.vue';
diff --git a/packages/client/src/pages/settings/integration.vue b/packages/client/src/pages/settings/integration.vue
index 816ae40cd..e9e9d469c 100644
--- a/packages/client/src/pages/settings/integration.vue
+++ b/packages/client/src/pages/settings/integration.vue
@@ -1,12 +1,5 @@
 <template>
 <div class="_formRoot">
-	<FormSection v-if="instance.enableTwitterIntegration">
-		<template #label><i class="ph-twitter-logo-bold ph-lg"></i> Twitter</template>
-		<p v-if="integrations.twitter">{{ i18n.ts.connectedTo }}: <a :href="`https://twitter.com/${integrations.twitter.screenName}`" rel="nofollow noopener" target="_blank">@{{ integrations.twitter.screenName }}</a></p>
-		<MkButton v-if="integrations.twitter" danger @click="disconnectTwitter">{{ i18n.ts.disconnectService }}</MkButton>
-		<MkButton v-else primary @click="connectTwitter">{{ i18n.ts.connectService }}</MkButton>
-	</FormSection>
-
 	<FormSection v-if="instance.enableDiscordIntegration">
 		<template #label><i class="ph-discord-logo-bold ph-lg"></i> Discord</template>
 		<p v-if="integrations.discord">{{ i18n.ts.connectedTo }}: <a :href="`https://discord.com/users/${integrations.discord.id}`" rel="nofollow noopener" target="_blank">@{{ integrations.discord.username }}#{{ integrations.discord.discriminator }}</a></p>

From 16282222d0af7a6c2fbd2c04d804563a9cb51f8a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 16:39:38 -0800
Subject: [PATCH 081/582] chore: rm dead code

---
 .../src/pages/admin/integrations.twitter.vue  | 60 -------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 packages/client/src/pages/admin/integrations.twitter.vue

diff --git a/packages/client/src/pages/admin/integrations.twitter.vue b/packages/client/src/pages/admin/integrations.twitter.vue
deleted file mode 100644
index d8ceb5e6c..000000000
--- a/packages/client/src/pages/admin/integrations.twitter.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-<FormSuspense :p="init">
-	<div class="_formRoot">
-		<FormSwitch v-model="enableTwitterIntegration" class="_formBlock">
-			<template #label>{{ i18n.ts.enable }}</template>
-		</FormSwitch>
-
-		<template v-if="enableTwitterIntegration">
-			<FormInfo class="_formBlock">Callback URL: {{ `${uri}/api/tw/cb` }}</FormInfo>
-
-			<FormInput v-model="twitterConsumerKey" class="_formBlock">
-				<template #prefix><i class="ph-key-bold ph-lg"></i></template>
-				<template #label>Consumer Key</template>
-			</FormInput>
-
-			<FormInput v-model="twitterConsumerSecret" class="_formBlock">
-				<template #prefix><i class="ph-key-bold ph-lg"></i></template>
-				<template #label>Consumer Secret</template>
-			</FormInput>
-		</template>
-
-		<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
-	</div>
-</FormSuspense>
-</template>
-
-<script lang="ts" setup>
-import { defineComponent } from 'vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/MkButton.vue';
-import FormInfo from '@/components/MkInfo.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
-
-let uri: string = $ref('');
-let enableTwitterIntegration: boolean = $ref(false);
-let twitterConsumerKey: string | null = $ref(null);
-let twitterConsumerSecret: string | null = $ref(null);
-
-async function init() {
-	const meta = await os.api('admin/meta');
-	uri = meta.uri;
-	enableTwitterIntegration = meta.enableTwitterIntegration;
-	twitterConsumerKey = meta.twitterConsumerKey;
-	twitterConsumerSecret = meta.twitterConsumerSecret;
-}
-
-function save() {
-	os.apiWithDialog('admin/update-meta', {
-		enableTwitterIntegration,
-		twitterConsumerKey,
-		twitterConsumerSecret,
-	}).then(() => {
-		fetchInstance();
-	});
-}
-</script>

From d5e28cb129def31bca0b75980b38ee60b775ed2e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 19:48:25 -0800
Subject: [PATCH 082/582] fix

---
 packages/client/src/components/MkDialog.vue   |  2 +-
 .../src/components/global/MkLoading.vue       |  8 +++
 packages/client/src/os.ts                     | 51 ++++++++++++-------
 3 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue
index ec55d15f7..1bcfa81a5 100644
--- a/packages/client/src/components/MkDialog.vue
+++ b/packages/client/src/components/MkDialog.vue
@@ -9,7 +9,7 @@
 				<i v-else-if="type === 'error'" :class="$style.iconInner" class="ph-circle-wavy-warning-bold ph-lg"></i>
 				<i v-else-if="type === 'warning'" :class="$style.iconInner" class="ph-warning-bold ph-lg"></i>
 				<i v-else-if="type === 'info'" :class="$style.iconInner" class="ph-info-bold ph-lg"></i>
-				<i v-else-if="type === 'question'" :class="$style.iconInner" class="ph-circle-notch-bold ph-lg"></i>
+				<i v-else-if="type === 'question'" :class="$style.iconInner" class="ph-circle-question-bold ph-lg"></i>
 				<MkLoading v-else-if="type === 'waiting'" :class="$style.iconInner" :em="true"/>
 			</div>
 			<header v-if="title" :class="$style.title"><Mfm :text="title"/></header>
diff --git a/packages/client/src/components/global/MkLoading.vue b/packages/client/src/components/global/MkLoading.vue
index 362484f5f..dc61e577b 100644
--- a/packages/client/src/components/global/MkLoading.vue
+++ b/packages/client/src/components/global/MkLoading.vue
@@ -15,10 +15,12 @@ const props = withDefaults(defineProps<{
 	inline?: boolean;
 	colored?: boolean;
 	mini?: boolean;
+	em?: boolean;
 }>(), {
 	inline: false,
 	colored: true,
 	mini: false,
+	em: false,
 });
 </script>
 
@@ -70,6 +72,12 @@ const props = withDefaults(defineProps<{
 		padding: 16px;
 		--size: 32px;
 	}
+	&.em {
+		display: inline-block;
+		vertical-align: middle;
+		padding: 0;
+		--size: 1em;
+	}
 }
 
 .container {
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index d3516bf4c..0e6bdf318 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -7,8 +7,8 @@ import * as Misskey from "calckey-js";
 import { apiUrl, url } from "@/config";
 import MkPostFormDialog from "@/components/MkPostFormDialog.vue";
 import MkWaitingDialog from "@/components/MkWaitingDialog.vue";
-import MkToast from '@/components/MkToast.vue';
-import MkDialog from '@/components/MkDialog.vue';
+import MkToast from "@/components/MkToast.vue";
+import MkDialog from "@/components/MkDialog.vue";
 import { MenuItem } from "@/types/menu";
 import { $i } from "@/account";
 
@@ -248,41 +248,56 @@ export function modalPageWindow(path: string) {
 }
 
 export function toast(message: string) {
-	popup(MkToast, {
-		message,
-	}, {}, 'closed');
+	popup(
+		MkToast,
+		{
+			message,
+		},
+		{},
+		"closed",
+	);
 }
 
 export function alert(props: {
-	type?: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
+	type?: "error" | "info" | "success" | "warning" | "waiting" | "question";
 	title?: string | null;
 	text?: string | null;
 }): Promise<void> {
 	return new Promise((resolve, reject) => {
-		popup(MkDialog, props, {
-			done: result => {
-				resolve();
+		popup(
+			MkDialog,
+			props,
+			{
+				done: (result) => {
+					resolve();
+				},
 			},
-		}, 'closed');
+			"closed",
+		);
 	});
 }
 
 export function confirm(props: {
-	type: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
+	type: "error" | "info" | "success" | "warning" | "waiting" | "question";
 	title?: string | null;
 	text?: string | null;
 	okText?: string;
 	cancelText?: string;
 }): Promise<{ canceled: boolean }> {
 	return new Promise((resolve, reject) => {
-		popup(MkDialog, {
-			...props,
-			showCancelButton: true,
-		}, {
-			done: result => {
-				resolve(result ? result : { canceled: true });
+		popup(
+			MkDialog,
+			{
+				...props,
+				showCancelButton: true,
 			},
-		}, 'closed');
+			{
+				done: (result) => {
+					resolve(result ? result : { canceled: true });
+				},
+			},
+			"closed",
+		);
 	});
 }
 

From 20cc13434cffd831dd9aded85cfc05e6981dbd42 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 19:55:18 -0800
Subject: [PATCH 083/582] fix

---
 .../client/src/components/MkWaitingDialog.vue | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/packages/client/src/components/MkWaitingDialog.vue b/packages/client/src/components/MkWaitingDialog.vue
index dfc5115ca..00d34e949 100644
--- a/packages/client/src/components/MkWaitingDialog.vue
+++ b/packages/client/src/components/MkWaitingDialog.vue
@@ -1,18 +1,18 @@
 <template>
 <MkModal ref="modal" :prefer-type="'dialog'" :z-priority="'high'" @click="success ? done() : () => {}" @closed="emit('closed')">
-	<div class="iuyakobc" :class="{ iconOnly: (text == null) || success }">
-		<i v-if="success" class="ph-check-bold ph-lg icon success"></i>
-		<i v-else class="ph-circle-notch-bold ph-lg fa-pulse icon waiting"></i>
-		<div v-if="text && !success" class="text">{{ text }}<MkEllipsis/></div>
+	<div :class="[$style.root, { [$style.iconOnly]: (text == null) || success }]">
+		<i v-if="success" :class="[$style.icon, $style.success]" class="ph-check-bold ph-lg"></i>
+		<MkLoading v-else :class="[$style.icon, $style.waiting]" :em="true"/>
+		<div v-if="text && !success" :class="$style.text">{{ text }}<MkEllipsis/></div>
 	</div>
 </MkModal>
 </template>
 
 <script lang="ts" setup>
-import { watch, ref } from 'vue';
+import { watch, shallowRef } from 'vue';
 import MkModal from '@/components/MkModal.vue';
 
-const modal = ref<InstanceType<typeof MkModal>>();
+const modal = shallowRef<InstanceType<typeof MkModal>>();
 
 const props = defineProps<{
 	success: boolean;
@@ -27,7 +27,7 @@ const emit = defineEmits<{
 
 function done() {
 	emit('done');
-	modal.value.close();
+	modal.value?.close();
 }
 
 watch(() => props.showing, () => {
@@ -35,8 +35,9 @@ watch(() => props.showing, () => {
 });
 </script>
 
-<style lang="scss" scoped>
-.iuyakobc {
+<style lang="scss" module>
+.root {
+	margin: auto;
 	position: relative;
 	padding: 32px;
 	box-sizing: border-box;
@@ -53,21 +54,21 @@ watch(() => props.showing, () => {
 		align-items: center;
 		justify-content: center;
 	}
+}
 
-	> .icon {
-		font-size: 32px;
+.icon {
+	font-size: 32px;
 
-		&.success {
-			color: var(--accent);
-		}
-
-		&.waiting {
-			opacity: 0.7;
-		}
+	&.success {
+		color: var(--accent);
 	}
 
-	> .text {
-		margin-top: 16px;
+	&.waiting {
+		opacity: 0.7;
 	}
 }
+
+.text {
+	margin-top: 16px;
+}
 </style>

From 8008721c3ef8fe433cbd775ad5a5562e862609cd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 19:58:42 -0800
Subject: [PATCH 084/582] fix MkUpdated

---
 packages/client/src/components/MkUpdated.vue | 42 ++++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/client/src/components/MkUpdated.vue b/packages/client/src/components/MkUpdated.vue
index 6f5ca6618..d1df6af4c 100644
--- a/packages/client/src/components/MkUpdated.vue
+++ b/packages/client/src/components/MkUpdated.vue
@@ -1,15 +1,15 @@
 <template>
-<MkModal ref="modal" :z-priority="'middle'" @click="modal.close()" @closed="$emit('closed')">
-	<div class="ewlycnyt">
-		<div class="title"><MkSparkle>{{ i18n.ts.misskeyUpdated }}</MkSparkle></div>
-		<div class="version">✨ {{ version }} 🚀</div>
-		<div v-if="newRelease" class="releaseNotes">
+<MkModal ref="modal" :z-priority="'middle'" @click="$refs.modal.close()" @closed="$emit('closed')">
+	<div :class="$style.root">
+		<div :class="$style.title"><MkSparkle>{{ i18n.ts.misskeyUpdated }}</MkSparkle></div>
+		<div :class="$style.version">✨ {{ version }} 🚀</div>
+		<div v-if="newRelease" :class="$style.releaseNotes">
 			<Mfm :text="data.notes"/>
 			<div v-if="data.screenshots.length > 0" style="max-width: 500">
 				<img v-for="i in data.screenshots" :key="i" :src="i" alt="screenshot"/>
 			</div>
 		</div>
-		<MkButton class="gotIt" primary full @click="modal.close()">{{ i18n.ts.gotIt }}</MkButton>
+		<MkButton :class="$style.gotIt" primary full @click="$refs.modal.close()">{{ i18n.ts.gotIt }}</MkButton>
 	</div>
 </MkModal>
 </template>
@@ -39,7 +39,8 @@ console.log(data);
 </script>
 
 <style lang="scss" scoped>
-.ewlycnyt {
+.root {
+	margin: auto;
 	position: relative;
 	padding: 32px;
 	min-width: 320px;
@@ -48,24 +49,23 @@ console.log(data);
 	text-align: center;
 	background: var(--panel);
 	border-radius: var(--radius);
+}
 
-	> .title {
-		font-weight: bold;
-	}
+.title {
+	font-weight: bold;
+}
 
-	> .version {
-		margin: 1em 0;
-	}
+.version {
+	margin: 1em 0;
+}
 
-	> .gotIt {
-		margin: 8px 0 0 0;
-	}
+.gotIt {
+	margin: 8px 0 0 0;
+}
 
-	> .releaseNotes {
-
-		> img {
-			border-radius: 10px;
-		}
+> .releaseNotes {
+	> img {
+		border-radius: 10px;
 	}
 }
 </style>

From b43ee5481896a0da7cf25fb4720bf26abfe56600 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 20:01:00 -0800
Subject: [PATCH 085/582] style

---
 packages/client/src/components/MkModal.vue             |  4 ++--
 .../client/src/pages/admin/overview.federation.vue     |  4 ++--
 packages/client/src/pages/admin/overview.stats.vue     | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index b88dee380..80cfaf8da 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -341,12 +341,12 @@ defineExpose({
 .transition_modal-popup_enterActive,
 .transition_modal-popup_leaveActive {
 	> .bg {
-		transition: opacity 0.1s !important;
+		transition: opacity 0.2s !important;
 	}
 
 	> .content {
 		transform-origin: var(--transformOrigin);
-		transition: opacity 0.1s cubic-bezier(0, 0, 0.2, 1), transform 0.1s cubic-bezier(0, 0, 0.2, 1) !important;
+		transition: opacity 0.2s cubic-bezier(0, 0, 0.2, 1), transform 0.2s cubic-bezier(0, 0, 0.2, 1) !important;
 	}
 }
 .transition_modal-popup_enterFrom,
diff --git a/packages/client/src/pages/admin/overview.federation.vue b/packages/client/src/pages/admin/overview.federation.vue
index 961837b22..f47632d40 100644
--- a/packages/client/src/pages/admin/overview.federation.vue
+++ b/packages/client/src/pages/admin/overview.federation.vue
@@ -147,14 +147,14 @@ onMounted(async () => {
 
 				&.sub {
 					> .icon {
-						background: #907aa955;
+						background: #907aa922;
 						color: #c4a7e7;
 					}
 				}
 
 				&.pub {
 					> .icon {
-						background: #56949f55;
+						background: #56949f22;
 						color: #9ccfd8;
 					}
 				}
diff --git a/packages/client/src/pages/admin/overview.stats.vue b/packages/client/src/pages/admin/overview.stats.vue
index 0868cba3d..91ab73783 100644
--- a/packages/client/src/pages/admin/overview.stats.vue
+++ b/packages/client/src/pages/admin/overview.stats.vue
@@ -106,35 +106,35 @@ onMounted(async () => {
 
 			&.users {
 				> .icon {
-					background: #56949f55;
+					background: #56949f22;
 					color: #9ccfd8;
 				}
 			}
 
 			&.notes {
 				> .icon {
-					background: #28698355;
+					background: #28698322;
 					color: #31748f;
 				}
 			}
 
 			&.instances {
 				> .icon {
-					background: #d7827e55;
+					background: #d7827e22;
 					color: #ebbcba;
 				}
 			}
 
 			&.emojis {
 				> .icon {
-					background: #ea9d3455;
+					background: #ea9d3422;
 						color: #f6c177;
 				}
 			}
 
 			&.online {
 				> .icon {
-					background: #907aa955;
+					background: #907aa922;
 					color: #c4a7e7;
 				}
 			}

From d33570ad8f5ae2e659b7de5883316ea1cbf5bcf6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 20:02:58 -0800
Subject: [PATCH 086/582] fix broken style

---
 packages/client/src/components/MkUpdated.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkUpdated.vue b/packages/client/src/components/MkUpdated.vue
index d1df6af4c..a3fc37751 100644
--- a/packages/client/src/components/MkUpdated.vue
+++ b/packages/client/src/components/MkUpdated.vue
@@ -63,7 +63,7 @@ console.log(data);
 	margin: 8px 0 0 0;
 }
 
-> .releaseNotes {
+.releaseNotes {
 	> img {
 		border-radius: 10px;
 	}

From 5c7a9f66ebaaca00f4814809713d913324d427b5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 20:09:14 -0800
Subject: [PATCH 087/582] testing

---
 packages/client/src/components/MkUpdated.vue |  4 +++-
 packages/client/src/init.ts                  | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkUpdated.vue b/packages/client/src/components/MkUpdated.vue
index a3fc37751..640b722d2 100644
--- a/packages/client/src/components/MkUpdated.vue
+++ b/packages/client/src/components/MkUpdated.vue
@@ -15,6 +15,7 @@
 </template>
 
 <script lang="ts" setup>
+import { shallowRef } from 'vue';
 import MkModal from '@/components/MkModal.vue';
 import MkSparkle from '@/components/MkSparkle.vue';
 import MkButton from '@/components/MkButton.vue';
@@ -22,7 +23,7 @@ import { version } from '@/config';
 import { i18n } from '@/i18n';
 import * as os from '@/os';
 
-const modal = $ref<InstanceType<typeof MkModal>>();
+const modal = shallowRef<InstanceType<typeof MkModal>>();
 
 let newRelease = $ref(false);
 let data = $ref(Object);
@@ -31,6 +32,7 @@ os.api('release').then(res => {
 	data = res;
 	newRelease = (version === data?.version);
 });
+
 console.log(`Version: ${version}`)
 console.log(`Data version: ${data.version}`)
 console.log(newRelease)
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index e6bde24d1..efd130870 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -251,6 +251,16 @@ import { getAccountFromId } from "@/scripts/get-account-from-id";
 
 	// クライアントが更新されたか？
 	const lastVersion = localStorage.getItem("lastVersion");
+
+	// TESTING
+
+	popup(
+		defineAsyncComponent(() => import("@/components/MkUpdated.vue")),
+		{},
+		{},
+		"closed",
+	);
+
 	if (lastVersion !== version) {
 		localStorage.setItem("lastVersion", version);
 

From b7d7b979bafa32c7a4276b33d8addf0d6d44a917 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 18 Feb 2023 20:13:24 -0800
Subject: [PATCH 088/582] make css module

---
 packages/client/src/components/MkUpdated.vue | 2 +-
 packages/client/src/init.ts                  | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/client/src/components/MkUpdated.vue b/packages/client/src/components/MkUpdated.vue
index 640b722d2..0ffe2edea 100644
--- a/packages/client/src/components/MkUpdated.vue
+++ b/packages/client/src/components/MkUpdated.vue
@@ -40,7 +40,7 @@ console.log(data);
 
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" module>
 .root {
 	margin: auto;
 	position: relative;
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index efd130870..935fa6fef 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -252,15 +252,6 @@ import { getAccountFromId } from "@/scripts/get-account-from-id";
 	// クライアントが更新されたか？
 	const lastVersion = localStorage.getItem("lastVersion");
 
-	// TESTING
-
-	popup(
-		defineAsyncComponent(() => import("@/components/MkUpdated.vue")),
-		{},
-		{},
-		"closed",
-	);
-
 	if (lastVersion !== version) {
 		localStorage.setItem("lastVersion", version);
 

From 638f075f9a097fcdfcb15dfb84038cf8151b716f Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 19 Feb 2023 18:31:16 -0500
Subject: [PATCH 089/582] new threading, still wip

---
 .../client/src/components/MkNoteFooter.vue    |  2 +-
 packages/client/src/components/MkNoteSub.vue  | 83 ++++++++++++-------
 2 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
index ff5eb7702..ae29e17e4 100644
--- a/packages/client/src/components/MkNoteFooter.vue
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -126,7 +126,7 @@ function blur() {
 .footer {
 	display: flex;
 	flex-wrap: wrap;
-	margin-top: .4em;
+	// margin-top: .4em;
 	pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
 
 	> .button {
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index bd965f4a3..dd0ddc251 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -1,5 +1,6 @@
 <template>
-<div v-size="{ max: [450] }" class="wrpstxzv" :class="{ children: depth > 1 }">
+<div v-size="{ max: [450] }" class="wrpstxzv" :class="{ children: depth > 1, singleStart:replies.length == 1 }">
+	<div v-if="conversation && depth > 1" class="line"></div>
 	<div class="main" @click="router.push(notePage(note))">
 		<div class="avatar-container">
 			<MkAvatar class="avatar" :user="note.user"/>
@@ -20,8 +21,8 @@
 		</div>
 	</div>
 	<template v-if="conversation">
-		<template v-if="depth < 5 && replies.length == 1">
-			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply single" :conversation="conversation" :depth="depth"/>
+		<template v-if="replies.length == 1">
+			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply single" :conversation="conversation" :depth="depth + 1"/>
 		</template>
 		<template v-else-if="depth < 5">
 			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply" :conversation="conversation" :depth="depth + 1"/>
@@ -67,7 +68,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 
 
 	&.children {
-		padding: 10px 0 0 16px;
+		padding: 10px 0 0 var(--avatarSize);
 		font-size: 1em;
 		cursor: auto;
 
@@ -143,35 +144,59 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		&:first-child {
 			padding-top: 30px;
 		}
-		.avatar-container {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			margin-right: 14px;
-			width: var(--avatarSize);
-			> .avatar {
-				width: var(--avatarSize);
-				height: var(--avatarSize);
-				margin: 0;
-			}
-			> .line {
-				width: var(--avatarSize);
+		> .main > .body {
+			padding-bottom: 16px;
+		}
+	}
+	
+	// Reply Lines
+	&.reply, &.reply-to, &.reply-to-more {
+		> .main {
+			> .avatar-container {
 				display: flex;
-				flex-grow: 1;
-				&::before {
-					content: "";
-					display: block;
-					width: 2px;
-					background-color: var(--divider);
-					margin-inline: auto;
-					.note > & {
-						margin-bottom: -16px;
-					}
+				flex-direction: column;
+				align-items: center;
+				margin-right: 14px;
+				width: var(--avatarSize);
+				> .avatar {
+					width: var(--avatarSize);
+					height: var(--avatarSize);
+					margin: 0;
 				}
 			}
 		}
-		> .main > .body {
-			padding-bottom: 16px;
+		.line {
+			width: var(--avatarSize);
+			display: flex;
+			flex-grow: 1;
+			&::before {
+				content: "";
+				display: block;
+				width: 2px;
+				background-color: var(--divider);
+				background-color: white; // FOr now
+				margin-inline: auto;
+				.note > & {
+					margin-bottom: -16px;
+				}
+			}
+		}
+	}
+	.reply:last-child, &.reply:not(.children) {	// Hide line in last reply of thread
+		> .main:last-child > .avatar-container > .line { 
+			display: none;
+		}
+	}
+	.reply.children:not(:last-child) { // Line that goes through multiple replies
+		position: relative;
+		> .line {
+			position: absolute;
+			top: 0;
+			left: 0;
+			bottom: 0;
+		}
+		&:not(.single):not(.singleStart) > .main > .avatar-container > .line {
+			display: none;
 		}
 	}
 

From 4ea8fd4c67d879612730824f0d2a07dc79910d5d Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 19 Feb 2023 20:12:01 -0500
Subject: [PATCH 090/582] add reply connectors, a

---
 .../client/src/components/MkNoteFooter.vue    |  1 -
 packages/client/src/components/MkNoteSub.vue  | 48 ++++++++++++++-----
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
index ae29e17e4..8a40240b3 100644
--- a/packages/client/src/components/MkNoteFooter.vue
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -126,7 +126,6 @@ function blur() {
 .footer {
 	display: flex;
 	flex-wrap: wrap;
-	// margin-top: .4em;
 	pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
 
 	> .button {
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index dd0ddc251..4a4d27040 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -65,10 +65,11 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 <style lang="scss" scoped>
 .wrpstxzv {
 	padding: 16px 32px;
-
+	--divider: rgba(255,255,255,0.5); // for now
 
 	&.children {
-		padding: 10px 0 0 var(--avatarSize);
+		padding: 10px 0 0 var(--indent);
+		padding-left: var(--indent) !important;
 		font-size: 1em;
 		cursor: auto;
 
@@ -127,8 +128,10 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		}
 	}
 
+	&.reply :deep(.footer) {
+		font-size: .9em;
+	}
 	> .reply, > .more {
-		// border-left: solid 0.5px var(--divider);
 		margin-top: 10px;
 		&.single {
 			padding: 0 !important;
@@ -144,13 +147,14 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		&:first-child {
 			padding-top: 30px;
 		}
-		> .main > .body {
-			padding-bottom: 16px;
+		.line::before {
+			margin-bottom: -16px;
 		}
 	}
 	
 	// Reply Lines
 	&.reply, &.reply-to, &.reply-to-more {
+		--indent: var(--avatarSize);
 		> .main {
 			> .avatar-container {
 				display: flex;
@@ -172,16 +176,16 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			&::before {
 				content: "";
 				display: block;
-				width: 2px;
-				background-color: var(--divider);
-				background-color: white; // FOr now
+				border-left: 2px solid var(--divider);
 				margin-inline: auto;
-				.note > & {
-					margin-bottom: -16px;
-				}
 			}
 		}
 	}
+	&.single, &.singleStart {
+		> .main > .avatar-container > .line::before {
+			margin-bottom: -10px;
+		}
+	}
 	.reply:last-child, &.reply:not(.children) {	// Hide line in last reply of thread
 		> .main:last-child > .avatar-container > .line { 
 			display: none;
@@ -194,11 +198,33 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			top: 0;
 			left: 0;
 			bottom: 0;
+			&::before {
+				margin-top: -10px;
+			}
 		}
 		&:not(.single):not(.singleStart) > .main > .avatar-container > .line {
 			display: none;
 		}
 	}
+	// Reply line connectors
+	.reply.children:not(.single) {
+		position: relative;
+		> .line {
+			position: absolute;
+			left: 0;
+			&::after {
+				content: "";
+				position: absolute;
+				border-left: 2px solid var(--divider);
+				border-bottom: 2px solid var(--divider);
+				margin-left: calc(var(--avatarSize) / 2 - 1px);
+				margin-top: -20px;
+				width: calc(var(--indent) / 3);
+				height: calc((var(--avatarSize) / 2) + 20px);
+				border-bottom-left-radius: calc(var(--indent) / 3);
+			}
+		}
+	}
 
 	&.max-width_450px {
 		padding: 14px 16px;

From 4406671edf3c1dc3b4fc5824f6f31720c74a1391 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 19 Feb 2023 20:56:28 -0500
Subject: [PATCH 091/582] back to the smaller avatars

---
 packages/client/src/components/MkNoteSub.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 4a4d27040..52f427b7f 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -128,8 +128,14 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		}
 	}
 
-	&.reply :deep(.footer) {
-		font-size: .9em;
+	&.reply {
+		--avatarSize: 38px;
+		.avatar-container {
+			margin-right: 8px !important;
+		}
+		:deep(.footer) {
+			font-size: .9em;
+		}
 	}
 	> .reply, > .more {
 		margin-top: 10px;

From 4c5119d6808d654a9f63c9689fc4823c9f58a04b Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 20 Feb 2023 13:18:37 -0500
Subject: [PATCH 092/582] use accent color for lines

---
 packages/client/src/components/MkNoteSub.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 52f427b7f..39a4bc738 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -65,7 +65,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 <style lang="scss" scoped>
 .wrpstxzv {
 	padding: 16px 32px;
-	--divider: rgba(255,255,255,0.5); // for now
+	// --divider: rgba(255,255,255,0.5); // for now
 
 	&.children {
 		padding: 10px 0 0 var(--indent);
@@ -182,7 +182,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			&::before {
 				content: "";
 				display: block;
-				border-left: 2px solid var(--divider);
+				border-left: 2px solid var(--accent);
 				margin-inline: auto;
 			}
 		}
@@ -221,11 +221,11 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			&::after {
 				content: "";
 				position: absolute;
-				border-left: 2px solid var(--divider);
-				border-bottom: 2px solid var(--divider);
-				margin-left: calc(var(--avatarSize) / 2 - 1px);
+				border-left: 2px solid var(--accent);
+				border-bottom: 2px solid var(--accent);
+				margin-left: calc((var(--avatarSize) / 2) - 1px);
 				margin-top: -20px;
-				width: calc(var(--indent) / 3);
+				width: calc(var(--indent) / 2);
 				height: calc((var(--avatarSize) / 2) + 20px);
 				border-bottom-left-radius: calc(var(--indent) / 3);
 			}

From 60461bbabb844171aa44dcfefd6f8ffaa506b7fd Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 20 Feb 2023 13:19:12 -0500
Subject: [PATCH 093/582] Use bolder font on active reaction

---
 packages/client/src/components/MkReactionsViewer.reaction.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/components/MkReactionsViewer.reaction.vue b/packages/client/src/components/MkReactionsViewer.reaction.vue
index 63d92cabb..1aee52571 100644
--- a/packages/client/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/client/src/components/MkReactionsViewer.reaction.vue
@@ -120,6 +120,7 @@ useTooltip(buttonRef, async (showing) => {
 
 		> .count {
 			color: var(--fgOnAccent);
+			font-weight: 600;
 		}
 
 		> .icon {

From ef431cada447eaf5e443f734a26bca92a80c1d8e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 20 Feb 2023 13:30:15 -0500
Subject: [PATCH 094/582] Revert footer changes

---
 packages/client/src/components/MkNoteFooter.vue    |  4 +---
 packages/client/src/components/MkNoteSub.vue       |  3 +--
 .../client/src/components/MkReactionsViewer.vue    |  7 +++----
 .../client/src/components/MkSubNoteContent.vue     | 14 +++++++-------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
index 8a40240b3..1f47d4083 100644
--- a/packages/client/src/components/MkNoteFooter.vue
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -1,6 +1,6 @@
 <template>
 	<footer ref="el" class="footer" @click.stop.prevent>
-		<XReactionsViewer v-if="!conversation" ref="reactionsViewer" :note="appearNote"/>
+		<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
 		<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
 			<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
 			<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
@@ -18,7 +18,6 @@
 		<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
 			<i class="ph-dots-three-outline-bold ph-lg"></i>
 		</button>
-		<XReactionsViewer v-if="conversation" ref="reactionsViewer" :note="appearNote"/>
 	</footer>
 </template>
 
@@ -41,7 +40,6 @@ import { useNoteCapture } from '@/scripts/use-note-capture';
 
 const props = defineProps<{
 	note: misskey.entities.Note;
-	conversation?: misskey.entities.Note[];
 }>();
 
 let note = $ref(deepClone(props.note));
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 39a4bc738..645d2d277 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -17,7 +17,7 @@
 					<MkSubNoteContent class="text" :note="note" :detailed="true"/>
 				</div>
 			</div>
-			<MkNoteFooter :note="note" :conversation="conversation"></MkNoteFooter>
+			<MkNoteFooter :note="note"></MkNoteFooter>
 		</div>
 	</div>
 	<template v-if="conversation">
@@ -65,7 +65,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 <style lang="scss" scoped>
 .wrpstxzv {
 	padding: 16px 32px;
-	// --divider: rgba(255,255,255,0.5); // for now
 
 	&.children {
 		padding: 10px 0 0 var(--indent);
diff --git a/packages/client/src/components/MkReactionsViewer.vue b/packages/client/src/components/MkReactionsViewer.vue
index a9cf9b00c..eb60e3633 100644
--- a/packages/client/src/components/MkReactionsViewer.vue
+++ b/packages/client/src/components/MkReactionsViewer.vue
@@ -21,11 +21,10 @@ const isMe = computed(() => $i && $i.id === props.note.userId);
 
 <style lang="scss" scoped>
 .tdflqwzn {
-	margin: 0px -2px 0 -2px;
+	margin-inline: -2px;
+	margin-top: .2em;
 	width: 100%;
-	.reply & {
-		width: auto;
-	}
+	
 	&:empty {
 		display: none;
 	}
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index daded56d2..987d596f4 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -5,13 +5,13 @@
 		<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left-bold ph-lg"></i></MkA>
 		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 		<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">{{ i18n.ts.quoteAttached }}: ...</MkA>
-		<template v-if="detailed">
-			<!-- <div v-if="note.renoteId" class="renote">
-				<XNoteSimple :note="note.renote"/>
-			</div> -->
-			<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
-		</template>
 	</div>
+	<template v-if="detailed">
+		<!-- <div v-if="note.renoteId" class="renote">
+			<XNoteSimple :note="note.renote"/>
+		</div> -->
+		<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
+	</template>
 	<div v-if="note.files.length > 0">
 		<XMediaList :media-list="note.files"/>
 	</div>
@@ -58,7 +58,7 @@ const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : n
 <style lang="scss" scoped>
 .wrmlmaau {
 	overflow-wrap: break-word;
-
+	
 	> .body {
 		> .reply {
 			margin-right: 6px;

From 67363f2e17bda01fd2b66cc07b726a45373ab5d4 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 20 Feb 2023 11:51:15 -0800
Subject: [PATCH 095/582] refactor: max 5 url previews

Closes #9654
---
 packages/client/src/components/MkNote.vue         | 2 +-
 packages/client/src/components/MkNoteDetailed.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index ee6c5770f..4772ba080 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -60,7 +60,7 @@
 						<XMediaList :media-list="appearNote.files"/>
 					</div>
 					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
-					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
+					<MkUrlPreview v-for="url in urls.slice(0, 5)" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
 					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
 					<button v-if="isLong && collapsed" class="fade _button" @click.stop.prevent="collapsed = false">
 						<span>{{ i18n.ts.showMore }}</span>
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index fab06f1ab..6046d5b65 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -67,7 +67,7 @@
 						<XMediaList :media-list="appearNote.files"/>
 					</div>
 					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
-					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
+					<MkUrlPreview v-for="url in urls.slice(0, 5)" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
 					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
 				</div>
 				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>

From 02042b40cbff82308c449d891313f3755984a484 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 20 Feb 2023 12:13:55 -0800
Subject: [PATCH 096/582] =?UTF-8?q?docs:=20=F0=9F=93=9D=20migration=20from?=
 =?UTF-8?q?=20mk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                          |  9 ++----
 docker-README.md => docs/docker.md |  0
 docs/migrate.md                    | 51 ++++++++++++++++++++++++++++++
 docs/mkv13.patch                   | 45 ++++++++++++++++++++++++++
 4 files changed, 98 insertions(+), 7 deletions(-)
 rename docker-README.md => docs/docker.md (100%)
 create mode 100644 docs/migrate.md
 create mode 100644 docs/mkv13.patch

diff --git a/README.md b/README.md
index 55f599235..c4fdcf5c6 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ If you have access to a server that supports one of the sources below, I recomme
 
 ### 🐋 Docker
 
-[How to run Calckey with Docker](./docker-README.md).
+[How to run Calckey with Docker](./docs/docker.md).
 
 ## 🧑‍💻 Dependencies
 
@@ -136,12 +136,7 @@ psql postgres -c "create database calckey with encoding = 'UTF8';"
 
 ## 🚚 Migrating from Misskey to Calckey
 
-> ⚠️ Because of their changes, migrating from Foundkey is not supported.
-
-```sh
-cp ../misskey/.config/default.yml ./.config/default.yml # replace `../misskey/` with misskey path, add `docker.env` if you use Docker
-cp -r ../misskey/files .
-```
+For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](./docs/migrate.md).
 
 ## 🍀 NGINX
 
diff --git a/docker-README.md b/docs/docker.md
similarity index 100%
rename from docker-README.md
rename to docs/docker.md
diff --git a/docs/migrate.md b/docs/migrate.md
new file mode 100644
index 000000000..990ccf35e
--- /dev/null
+++ b/docs/migrate.md
@@ -0,0 +1,51 @@
+# 🚚 Migrating from Misskey to Calckey
+
+## Misskey v13 and above
+
+```sh
+git apply docs/mkv13.patch
+
+cd packages/backend
+
+LINE_NUM="$(npx typeorm migration:show -d ormconfig.js | grep -n activeEmailValidation1657346559800 | cut -d ':' -f 1)"
+NUM_MIGRATIONS="$(npx typeorm migration:show -d ormconfig.js | tail -n+"$LINE_NUM" | grep '\[X\]' | nl)"
+
+for i in $(seq 1 $NUM_MIGRAIONS); do
+    npx typeorm migration:revert -d ormconfig.js
+done
+
+git remote set-url origin https://codeberg.org/calckey/calckey.git
+git fetch
+git checkout main # or beta or develop
+git pull --ff
+# build using prefered method
+```
+
+## Misskey v12.119 and before
+
+```sh
+git remote set-url origin https://codeberg.org/calckey/calckey.git
+git fetch
+git checkout main # or beta or develop
+git pull --ff
+# build using prefered method
+```
+
+## Foundkey
+
+```sh
+cd packages/backend
+
+LINE_NUM="$(npx typeorm migration:show -d ormconfig.js | grep -n uniformThemecolor1652859567549 | cut -d ':' -f 1)"
+NUM_MIGRATIONS="$(npx typeorm migration:show -d ormconfig.js | tail -n+"$LINE_NUM" | grep '\[X\]' | nl)"
+
+for i in $(seq 1 $NUM_MIGRAIONS); do
+    npx typeorm migration:revert -d ormconfig.js
+done
+
+git remote set-url origin https://codeberg.org/calckey/calckey.git
+git fetch
+git checkout main # or beta or develop
+git pull --ff
+# build using prefered method
+```
diff --git a/docs/mkv13.patch b/docs/mkv13.patch
new file mode 100644
index 000000000..e6106b16f
--- /dev/null
+++ b/docs/mkv13.patch
@@ -0,0 +1,45 @@
+diff --git a/packages/backend/migration/1672704017999-remove-lastCommunicatedAt.js b/packages/backend/migration/1672704017999-remove-lastCommunicatedAt.js
+index 38a676985..c4ae690e0 100644
+--- a/packages/backend/migration/1672704017999-remove-lastCommunicatedAt.js
++++ b/packages/backend/migration/1672704017999-remove-lastCommunicatedAt.js
+@@ -6,6 +6,8 @@ export class removeLastCommunicatedAt1672704017999 {
+     }
+ 
+     async down(queryRunner) {
+-        await queryRunner.query(`ALTER TABLE "instance" ADD "lastCommunicatedAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
++        await queryRunner.query(`ALTER TABLE "instance" ADD "lastCommunicatedAt" TIMESTAMP WITH TIME ZONE`);
++        await queryRunner.query(`UPDATE "instance" SET "lastCommunicatedAt" = COALESCE("infoUpdatedAt", "caughtAt")`);
++        await queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "lastCommunicatedAt" SET NOT NULL`);
+     }
+ }
+diff --git a/packages/backend/migration/1673336077243-PollChoiceLength.js b/packages/backend/migration/1673336077243-PollChoiceLength.js
+index 810c626e0..5809528cb 100644
+--- a/packages/backend/migration/1673336077243-PollChoiceLength.js
++++ b/packages/backend/migration/1673336077243-PollChoiceLength.js
+@@ -6,6 +6,6 @@ export class PollChoiceLength1673336077243 {
+     }
+ 
+     async down(queryRunner) {
+-			await queryRunner.query(`ALTER TABLE "poll" ALTER COLUMN "choices" TYPE character varying(128) array`);
++			//await queryRunner.query(`ALTER TABLE "poll" ALTER COLUMN "choices" TYPE character varying(128) array`);
+     }
+ }
+diff --git a/packages/backend/migration/1674118260469-achievement.js b/packages/backend/migration/1674118260469-achievement.js
+index 131ab96f8..57a922f83 100644
+--- a/packages/backend/migration/1674118260469-achievement.js
++++ b/packages/backend/migration/1674118260469-achievement.js
+@@ -18,12 +18,13 @@ export class achievement1674118260469 {
+ 
+     async down(queryRunner) {
+         await queryRunner.query(`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'pollEnded')`);
++        await queryRunner.query(`CREATE TYPE "public"."notification_type_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
+         await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`);
+         await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum_old"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum_old"[]`);
+         await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`);
+         await queryRunner.query(`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum"`);
+         await queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum_old" RENAME TO "user_profile_mutingnotificationtypes_enum"`);
+-        await queryRunner.query(`CREATE TYPE "public"."notification_type_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
++        await queryRunner.query(`DELETE FROM "public"."notification" WHERE "type" = 'achievementEarned'`);
+         await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "public"."notification_type_enum_old" USING "type"::"text"::"public"."notification_type_enum_old"`);
+         await queryRunner.query(`DROP TYPE "public"."notification_type_enum"`);
+         await queryRunner.query(`ALTER TYPE "public"."notification_type_enum_old" RENAME TO "notification_type_enum"`);

From 529954ce00dc1aad37d0aefb92abd7316502afc3 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Mon, 20 Feb 2023 20:16:44 +0000
Subject: [PATCH 097/582] docs: get patch

---
 docs/migrate.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/migrate.md b/docs/migrate.md
index 990ccf35e..ee3446c85 100644
--- a/docs/migrate.md
+++ b/docs/migrate.md
@@ -3,7 +3,8 @@
 ## Misskey v13 and above
 
 ```sh
-git apply docs/mkv13.patch
+wget -O mkv13.patch https://codeberg.org/calckey/calckey/raw/branch/develop/docs/mkv13.patch
+git apply mkv13.patch
 
 cd packages/backend
 

From c2f670d11c4e62fdb3ead514c3a2948e73eb6594 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 20 Feb 2023 22:24:06 -0500
Subject: [PATCH 098/582] Prevent mention avatars from wrapping

---
 packages/client/src/components/MkMention.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkMention.vue b/packages/client/src/components/MkMention.vue
index 3091b435e..2df9f1235 100644
--- a/packages/client/src/components/MkMention.vue
+++ b/packages/client/src/components/MkMention.vue
@@ -42,8 +42,13 @@ const bgCss = bg.toRgbString();
 <style lang="scss" scoped>
 .akbvjaqn {
 	display: inline-block;
-	padding: 4px 8px 4px 4px;
+	padding: 2px 8px 2px 2px;
+	margin-block: 2px;
 	border-radius: 999px;
+	max-width: 100%;
+	white-space: nowrap;
+	overflow: clip;
+	text-overflow: ellipsis;
 	color: var(--mention);
 
 	&.isMe {

From 4dd7f5ef1b44a3b740353635f749c5b4aaf4058e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 20 Feb 2023 23:29:34 -0500
Subject: [PATCH 099/582] *Might* be something that can improve performance

---
 packages/client/src/components/MkNote.vue    | 1 +
 packages/client/src/components/MkNoteSub.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 20225843a..eaf0d159a 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -279,6 +279,7 @@ function readPromo() {
 	font-size: 1.05em;
 	overflow: clip;
 	contain: content;
+	content-visibility: auto;
 
 	// これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
 	// 下の方までスクロールすると上のノートの高さがここで決め打ちされたものに変化し、表示しているノートの位置が変わってしまう
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 645d2d277..6ba704306 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -65,6 +65,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 <style lang="scss" scoped>
 .wrpstxzv {
 	padding: 16px 32px;
+	content-visibility: auto;
 
 	&.children {
 		padding: 10px 0 0 var(--indent);

From e3a14367fb40104f5b3a32b4457b02e0c836418d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 21 Feb 2023 15:51:46 -0800
Subject: [PATCH 100/582] fix: :bug: url slicing

---
 packages/client/src/components/MkNote.vue         | 4 ++--
 packages/client/src/components/MkNoteDetailed.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 4772ba080..b4f3167bf 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -60,7 +60,7 @@
 						<XMediaList :media-list="appearNote.files"/>
 					</div>
 					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
-					<MkUrlPreview v-for="url in urls.slice(0, 5)" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
+					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
 					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
 					<button v-if="isLong && collapsed" class="fade _button" @click.stop.prevent="collapsed = false">
 						<span>{{ i18n.ts.showMore }}</span>
@@ -186,7 +186,7 @@ const isDeleted = ref(false);
 const muted = ref(checkWordMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
-const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)) : null;
+const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5) : null;
 const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance);
 
 const keymap = {
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 6046d5b65..144ffe062 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -67,7 +67,7 @@
 						<XMediaList :media-list="appearNote.files"/>
 					</div>
 					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
-					<MkUrlPreview v-for="url in urls.slice(0, 5)" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
+					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
 					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
 				</div>
 				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
@@ -187,7 +187,7 @@ const isDeleted = ref(false);
 const muted = ref(checkWordMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
-const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)) : null;
+const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5) : null;
 const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance);
 const conversation = ref<misskey.entities.Note[]>([]);
 const replies = ref<misskey.entities.Note[]>([]);

From 909900c2e96b33c6f13f631acedbd85c219ebbde Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 21 Feb 2023 16:04:00 -0800
Subject: [PATCH 101/582] fix: visibility picker

---
 .../src/components/MkVisibilityPicker.vue     | 220 +++++++++---------
 1 file changed, 110 insertions(+), 110 deletions(-)

diff --git a/packages/client/src/components/MkVisibilityPicker.vue b/packages/client/src/components/MkVisibilityPicker.vue
index eda66a522..333da48d6 100644
--- a/packages/client/src/components/MkVisibilityPicker.vue
+++ b/packages/client/src/components/MkVisibilityPicker.vue
@@ -1,45 +1,45 @@
 <template>
-<MkModal ref="modal" :z-priority="'high'" :src="src" @click="modal.close()" @closed="emit('closed')">
-	<div class="gqyayizv _popup">
-		<button key="public" class="_button" :class="{ active: v === 'public' }" data-index="1" @click="choose('public')">
-			<div><i class="ph-planet-bold ph-lg"></i></div>
-			<div>
-				<span>{{ i18n.ts._visibility.public }}</span>
-				<span>{{ i18n.ts._visibility.publicDescription }}</span>
-			</div>
-		</button>
-		<button key="home" class="_button" :class="{ active: v === 'home' }" data-index="2" @click="choose('home')">
-			<div><i class="ph-house-bold ph-lg"></i></div>
-			<div>
-				<span>{{ i18n.ts._visibility.home }}</span>
-				<span>{{ i18n.ts._visibility.homeDescription }}</span>
-			</div>
-		</button>
-		<button key="followers" class="_button" :class="{ active: v === 'followers' }" data-index="3" @click="choose('followers')">
-			<div><i class="ph-lock-simple-open-bold ph-lg"></i></div>
-			<div>
-				<span>{{ i18n.ts._visibility.followers }}</span>
-				<span>{{ i18n.ts._visibility.followersDescription }}</span>
-			</div>
-		</button>
-		<button key="specified" :disabled="localOnly" class="_button" :class="{ active: v === 'specified' }" data-index="4" @click="choose('specified')">
-			<div><i class="ph-envelope-simple-open-bold ph-lg"></i></div>
-			<div>
-				<span>{{ i18n.ts._visibility.specified }}</span>
-				<span>{{ i18n.ts._visibility.specifiedDescription }}</span>
-			</div>
-		</button>
-		<div class="divider"></div>
-		<button key="localOnly" class="_button localOnly" :class="{ active: localOnly }" data-index="5" @click="localOnly = !localOnly">
-			<div><i class="ph-hand-fist-bold ph-lg"></i></div>
-			<div>
-				<span>{{ i18n.ts._visibility.localOnly }}</span>
-				<span>{{ i18n.ts._visibility.localOnlyDescription }}</span>
-			</div>
-			<div><i :class="localOnly ? 'ph-toggle-right-bold ph-lg' : 'ph-toggle-left-bold ph-lg'"></i></div>
-		</button>
-	</div>
-</MkModal>
+	<MkModal ref="modal" :z-priority="'high'" :src="src" @click="modal.close()" @closed="emit('closed')">
+		<div class="_popup" :class="$style.root">
+			<button key="public" class="_button" :class="[$style.item, { [$style.active]: v === 'public' }]" data-index="1" @click="choose('public')">
+				<div :class="$style.icon"><i class="ph-planet-bold ph-lg"></i></div>
+				<div :class="$style.body">
+					<span :class="$style.itemTitle">{{ i18n.ts._visibility.public }}</span>
+					<span :class="$style.itemDescription">{{ i18n.ts._visibility.publicDescription }}</span>
+				</div>
+			</button>
+			<button key="home" class="_button" :class="[$style.item, { [$style.active]: v === 'home' }]" data-index="2" @click="choose('home')">
+				<div :class="$style.icon"><i class="ph-house-bold ph-lg"></i></div>
+				<div :class="$style.body">
+					<span :class="$style.itemTitle">{{ i18n.ts._visibility.home }}</span>
+					<span :class="$style.itemDescription">{{ i18n.ts._visibility.homeDescription }}</span>
+				</div>
+			</button>
+			<button key="followers" class="_button" :class="[$style.item, { [$style.active]: v === 'followers' }]" data-index="3" @click="choose('followers')">
+				<div :class="$style.icon"><i class="ph-lock-simple-open-bold ph-lg"></i></div>
+				<div :class="$style.body">
+					<span :class="$style.itemTitle">{{ i18n.ts._visibility.followers }}</span>
+					<span :class="$style.itemDescription">{{ i18n.ts._visibility.followersDescription }}</span>
+				</div>
+			</button>
+			<button key="specified" :disabled="localOnly" class="_button" :class="[$style.item, { [$style.active]: v === 'specified' }]" data-index="4" @click="choose('specified')">
+				<div :class="$style.icon"><i class="ph-envelope-simple-open-bold ph-lg"></i></div>
+				<div :class="$style.body">
+					<span :class="$style.itemTitle">{{ i18n.ts._visibility.specified }}</span>
+					<span :class="$style.itemDescription">{{ i18n.ts._visibility.specifiedDescription }}</span>
+				</div>
+			</button>
+			<div :class="$style.divider"></div>
+			<button key="localOnly" class="_button" :class="[$style.item, $style.localOnly, { [$style.active]: localOnly }]" data-index="5" @click="localOnly = !localOnly">
+				<div :class="$style.icon"><i class="ph-hand-fist-bold ph-lg"></i></div>
+				<div :class="$style.body">
+					<span :class="$style.itemTitle">{{ i18n.ts._visibility.localOnly }}</span>
+					<span :class="$style.itemDescription">{{ i18n.ts._visibility.localOnlyDescription }}</span>
+				</div>
+				<div :class="$style.toggle"><i :class="localOnly ? 'ph-toggle-right-bold ph-lg' : 'ph-toggle-left-bold ph-lg'"></i></div>
+			</button>
+		</div>
+	</MkModal>
 </template>
 
 <script lang="ts" setup>
@@ -48,7 +48,7 @@ import * as misskey from 'calckey-js';
 import MkModal from '@/components/MkModal.vue';
 import { i18n } from '@/i18n';
 
-const modal = $ref<InstanceType<typeof MkModal>>();
+const modal = $shallowRef<InstanceType<typeof MkModal>>();
 
 const props = withDefaults(defineProps<{
 	currentVisibility: typeof misskey.noteVisibilities[number];
@@ -79,81 +79,81 @@ function choose(visibility: typeof misskey.noteVisibilities[number]): void {
 }
 </script>
 
-<style lang="scss" scoped>
-.gqyayizv {
+<style lang="scss" module>
+.root {
 	width: 240px;
 	padding: 8px 0;
+}
 
-	> .divider {
-		margin: 8px 0;
-		border-top: solid 0.5px var(--divider);
+.divider {
+	margin: 8px 0;
+	border-top: solid 0.5px var(--divider);
+}
+
+.item {
+	display: flex;
+	padding: 8px 14px;
+	font-size: 12px;
+	text-align: left;
+	width: 100%;
+	box-sizing: border-box;
+
+	&:hover {
+		background: rgba(0, 0, 0, 0.05);
 	}
 
-	> button {
-		display: flex;
-		padding: 8px 14px;
-		font-size: 12px;
-		text-align: left;
-		width: 100%;
-		box-sizing: border-box;
+	&:active {
+		background: rgba(0, 0, 0, 0.1);
+	}
 
-		&:hover {
-			background: rgba(0, 0, 0, 0.05);
-		}
+	&.active {
+		color: var(--fgOnAccent);
+		background: var(--accent);
+	}
 
-		&:active {
-			background: rgba(0, 0, 0, 0.1);
-		}
-
-		&.active {
-			color: var(--fgOnAccent);
-			background: var(--accent);
-		}
-
-		&.localOnly.active {
-			color: var(--accent);
-			background: inherit;
-		}
-
-		> *:nth-child(1) {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-right: 10px;
-			width: 16px;
-			top: 0;
-			bottom: 0;
-			margin-top: auto;
-			margin-bottom: auto;
-		}
-
-		> *:nth-child(2) {
-			flex: 1 1 auto;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-
-			> span:first-child {
-				display: block;
-				font-weight: bold;
-			}
-
-			> span:last-child:not(:first-child) {
-				opacity: 0.6;
-			}
-		}
-
-		> *:nth-child(3) {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-left: 10px;
-			width: 16px;
-			top: 0;
-			bottom: 0;
-			margin-top: auto;
-			margin-bottom: auto;
-		}
+	&.localOnly.active {
+		color: var(--accent);
+		background: inherit;
 	}
 }
+
+.icon {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	margin-right: 10px;
+	width: 16px;
+	top: 0;
+	bottom: 0;
+	margin-top: auto;
+	margin-bottom: auto;
+}
+
+.body {
+	flex: 1 1 auto;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.itemTitle {
+	display: block;
+	font-weight: bold;
+}
+
+.itemDescription {
+	opacity: 0.6;
+}
+
+.toggle {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	margin-left: 10px;
+	width: 16px;
+	top: 0;
+	bottom: 0;
+	margin-top: auto;
+	margin-bottom: auto;
+}
 </style>

From e2ad9a94ec7079e3f0c17502cd89b1bbfe9715b2 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Wed, 22 Feb 2023 09:44:47 +0100
Subject: [PATCH 102/582] fix mastodon api stats

---
 .../backend/src/server/api/mastodon/endpoints/meta.ts  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
index 5fba6f8a6..a19acbaa1 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/meta.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
@@ -1,9 +1,13 @@
 import { Entity } from "@calckey/megalodon";
 import { fetchMeta } from "@/misc/fetch-meta.js";
+import { Users, Notes } from "@/models/index.js";
+import { IsNull, MoreThan } from "typeorm";
 
 // TODO: add calckey features
 export async function getInstance(response: Entity.Instance) {
 	const meta = await fetchMeta(true);
+	const totalUsers = Users.count({ where: { host: IsNull() } });
+	const totalStatuses = Notes.count({ where: { userHost: IsNull() } });
 	return {
 		uri: response.uri,
 		title: response.title || "",
@@ -12,7 +16,11 @@ export async function getInstance(response: Entity.Instance) {
 		email: response.email || "",
 		version: "3.0.0 compatible (Calckey)",
 		urls: response.urls,
-		stats: response.stats,
+		stats: {
+			user_count: totalUsers,
+			status_count: totalStatuses,
+			domain_count: response.stats.domain_count
+		},
 		thumbnail: response.thumbnail || "",
 		languages: meta.langs,
 		registrations: !meta.disableRegistration || response.registrations,

From e4a276a9892937b8c8d97ff74f4023a0c4aa3aaa Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 00:31:14 +0100
Subject: [PATCH 103/582] aaa

---
 packages/backend/src/server/api/index.ts              |  1 +
 .../src/server/api/mastodon/endpoints/status.ts       | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index 3ea3ff67e..0f58d3acf 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -171,6 +171,7 @@ errorRouter.all("(.*)", async (ctx) => {
 
 // Register router
 app.use(mastoRouter.routes());
+app.use(mastoRouter.allowedMethods());
 app.use(router.routes());
 app.use(errorRouter.routes());
 
diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index a72ac2c7e..0ba1e4229 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -289,14 +289,16 @@ export function apiStatusMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const multipartData = await ctx.file;
+			let multipartData = await ctx.request.files;
 			if (!multipartData) {
 				ctx.body = { error: "No image" };
+				ctx.status = 401;
 				return;
 			}
-			const [path] = await createTemp();
-			await pump(multipartData.buffer, fs.createWriteStream(path));
-			const image = fs.readFileSync(path);
+			if ((multipartData as any).file) {
+				multipartData = (multipartData as any).file;
+			}
+			const image = fs.readFileSync((multipartData as any).path);
 			const data = await client.uploadMedia(image);
 			ctx.body = data.data;
 		} catch (e: any) {
@@ -313,6 +315,7 @@ export function apiStatusMastodon(router: Router): void {
 			const multipartData = await ctx.file;
 			if (!multipartData) {
 				ctx.body = { error: "No image" };
+				ctx.status = 401;
 				return;
 			}
 			const [path] = await createTemp();

From 75bd0baf99193fc61a51952d38c2d8a97bee47aa Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 15:46:12 +0100
Subject: [PATCH 104/582] remove not needed middleware handlers

---
 .../server/api/mastodon/endpoints/status.ts   | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index 0ba1e4229..2ab834b64 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -9,8 +9,17 @@ import { emojiRegex, emojiRegexAtStartToEnd } from "@/misc/emoji-regex.js";
 import axios from "axios";
 const pump = promisify(pipeline);
 
+// Init multer instance
+const upload = multer({
+	storage: multer.diskStorage({}),
+	limits: {
+		fileSize: config.maxFileSize || 262144000,
+		files: 1,
+	},
+});
+
 export function apiStatusMastodon(router: Router): void {
-	router.post("/v1/statuses", async (ctx, reply) => {
+	router.post("/v1/statuses", async (ctx) => {
 		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
@@ -52,7 +61,7 @@ export function apiStatusMastodon(router: Router): void {
 	});
 	router.get<{ Params: { id: string } }>(
 		"/v1/statuses/:id",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -68,7 +77,7 @@ export function apiStatusMastodon(router: Router): void {
 	);
 	router.delete<{ Params: { id: string } }>(
 		"/v1/statuses/:id",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -90,7 +99,7 @@ export function apiStatusMastodon(router: Router): void {
 	}
 	router.get<{ Params: { id: string } }>(
 		"/v1/statuses/:id/context",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -123,7 +132,7 @@ export function apiStatusMastodon(router: Router): void {
 	);
 	router.get<{ Params: { id: string } }>(
 		"/v1/statuses/:id/reblogged_by",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -139,13 +148,13 @@ export function apiStatusMastodon(router: Router): void {
 	);
 	router.get<{ Params: { id: string } }>(
 		"/v1/statuses/:id/favourited_by",
-		async (ctx, reply) => {
+		async (ctx) => {
 			ctx.body = [];
 		},
 	);
 	router.post<{ Params: { id: string } }>(
 		"/v1/statuses/:id/favourite",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -167,7 +176,7 @@ export function apiStatusMastodon(router: Router): void {
 	);
 	router.post<{ Params: { id: string } }>(
 		"/v1/statuses/:id/unfavourite",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -185,7 +194,7 @@ export function apiStatusMastodon(router: Router): void {
 
 	router.post<{ Params: { id: string } }>(
 		"/v1/statuses/:id/reblog",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -202,7 +211,7 @@ export function apiStatusMastodon(router: Router): void {
 
 	router.post<{ Params: { id: string } }>(
 		"/v1/statuses/:id/unreblog",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -219,7 +228,7 @@ export function apiStatusMastodon(router: Router): void {
 
 	router.post<{ Params: { id: string } }>(
 		"/v1/statuses/:id/bookmark",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -236,7 +245,7 @@ export function apiStatusMastodon(router: Router): void {
 
 	router.post<{ Params: { id: string } }>(
 		"/v1/statuses/:id/unbookmark",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -253,7 +262,7 @@ export function apiStatusMastodon(router: Router): void {
 
 	router.post<{ Params: { id: string } }>(
 		"/v1/statuses/:id/pin",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -270,7 +279,7 @@ export function apiStatusMastodon(router: Router): void {
 
 	router.post<{ Params: { id: string } }>(
 		"/v1/statuses/:id/unpin",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -284,7 +293,7 @@ export function apiStatusMastodon(router: Router): void {
 			}
 		},
 	);
-	router.post("/v1/media", async (ctx, reply) => {
+	router.post("/v1/media", async (ctx) => {
 		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
@@ -307,7 +316,7 @@ export function apiStatusMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
-	router.post("/v2/media", async (ctx, reply) => {
+	router.post("/v2/media", async (ctx) => {
 		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
@@ -331,7 +340,7 @@ export function apiStatusMastodon(router: Router): void {
 	});
 	router.get<{ Params: { id: string } }>(
 		"/v1/media/:id",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -347,7 +356,7 @@ export function apiStatusMastodon(router: Router): void {
 	);
 	router.put<{ Params: { id: string } }>(
 		"/v1/media/:id",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -366,7 +375,7 @@ export function apiStatusMastodon(router: Router): void {
 	);
 	router.get<{ Params: { id: string } }>(
 		"/v1/polls/:id",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
@@ -382,7 +391,7 @@ export function apiStatusMastodon(router: Router): void {
 	);
 	router.post<{ Params: { id: string } }>(
 		"/v1/polls/:id/votes",
-		async (ctx, reply) => {
+		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);

From 0ca238d6806278e26183ac46598c1036b9dd2471 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 15:55:28 +0100
Subject: [PATCH 105/582] import multer

---
 packages/backend/src/server/api/mastodon/endpoints/status.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index 2ab834b64..89c733bd1 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -5,6 +5,7 @@ import fs from "fs";
 import { pipeline } from "node:stream";
 import { promisify } from "node:util";
 import { createTemp } from "@/misc/create-temp.js";
+import multer from "@koa/multer";
 import { emojiRegex, emojiRegexAtStartToEnd } from "@/misc/emoji-regex.js";
 import axios from "axios";
 const pump = promisify(pipeline);

From 83cc0c9828306813ae51a961e7a91fc690b03c86 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 15:58:54 +0100
Subject: [PATCH 106/582] import config

---
 packages/backend/src/server/api/mastodon/endpoints/status.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index 89c733bd1..7da2a2d7b 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -5,6 +5,7 @@ import fs from "fs";
 import { pipeline } from "node:stream";
 import { promisify } from "node:util";
 import { createTemp } from "@/misc/create-temp.js";
+import config from "@/config/index.js";
 import multer from "@koa/multer";
 import { emojiRegex, emojiRegexAtStartToEnd } from "@/misc/emoji-regex.js";
 import axios from "axios";

From b1d785b486be75a6a98aa2f97ea9d3b5ef400ab3 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 16:12:53 +0100
Subject: [PATCH 107/582] await the instance meta

---
 packages/backend/src/server/api/mastodon/endpoints/meta.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
index a19acbaa1..7ca6625f4 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/meta.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
@@ -17,8 +17,8 @@ export async function getInstance(response: Entity.Instance) {
 		version: "3.0.0 compatible (Calckey)",
 		urls: response.urls,
 		stats: {
-			user_count: totalUsers,
-			status_count: totalStatuses,
+			user_count: (await totalUsers),
+			status_count: (await totalStatuses),
 			domain_count: response.stats.domain_count
 		},
 		thumbnail: response.thumbnail || "",

From 273b86b9f4126620a50242da9297b84bcf9a6d6b Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 16:26:33 +0100
Subject: [PATCH 108/582] ??

---
 packages/backend/src/server/api/mastodon/endpoints/meta.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
index 7ca6625f4..e5726fbae 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/meta.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
@@ -89,6 +89,7 @@ export async function getInstance(response: Entity.Instance) {
 			discoverable: false,
 			group: false,
 			created_at: Math.floor(new Date().getTime() / 1000),
+			createdAt: Math.floor(new Date().getTime() / 1000),
 			note: "Please refer to the original instance for the actual admin contact.",
 			url: "/",
 			avatar: "/static-assets/badges/info.png",

From 506709d2eb0b5e70dfddde5f3e8687fb3b57aa13 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 16:32:21 +0100
Subject: [PATCH 109/582] fixed what ever calc did here, masto app didnt

---
 packages/backend/src/server/api/mastodon/endpoints/meta.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
index e5726fbae..809a9aa11 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/meta.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
@@ -88,8 +88,8 @@ export async function getInstance(response: Entity.Instance) {
 			bot: true,
 			discoverable: false,
 			group: false,
-			created_at: Math.floor(new Date().getTime() / 1000),
-			createdAt: Math.floor(new Date().getTime() / 1000),
+			created_at: new Date().toISOString(),
+			createdAt: new Date().toISOString(),
 			note: "Please refer to the original instance for the actual admin contact.",
 			url: "/",
 			avatar: "/static-assets/badges/info.png",
@@ -99,7 +99,7 @@ export async function getInstance(response: Entity.Instance) {
 			followers_count: -1,
 			following_count: 0,
 			statuses_count: 0,
-			last_status_at: Math.floor(new Date().getTime() / 1000),
+			last_status_at: new Date().toISOString(),
 			noindex: true,
 			emojis: [],
 			fields: [],

From 678c3c24838d4ba7debac0b05b7b2e2e14bebbaa Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 16:34:16 +0100
Subject: [PATCH 110/582] lol

---
 packages/backend/src/server/api/mastodon/endpoints/meta.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
index 809a9aa11..0a4ead16f 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/meta.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
@@ -89,7 +89,6 @@ export async function getInstance(response: Entity.Instance) {
 			discoverable: false,
 			group: false,
 			created_at: new Date().toISOString(),
-			createdAt: new Date().toISOString(),
 			note: "Please refer to the original instance for the actual admin contact.",
 			url: "/",
 			avatar: "/static-assets/badges/info.png",

From 6b97e42a7fe5f5175aa1f5a045e8e5ab487bb736 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 16:42:57 +0100
Subject: [PATCH 111/582] update thingy?

---
 .../backend/src/server/api/mastodon/endpoints/meta.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
index 0a4ead16f..67f3901e4 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/meta.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
@@ -89,10 +89,10 @@ export async function getInstance(response: Entity.Instance) {
 			discoverable: false,
 			group: false,
 			created_at: new Date().toISOString(),
-			note: "Please refer to the original instance for the actual admin contact.",
-			url: "/",
-			avatar: "/static-assets/badges/info.png",
-			avatar_static: "/static-assets/badges/info.png",
+			note: "<p>Please refer to the original instance for the actual admin contact.</p>",
+			url: `${response.uri}/`,
+			avatar: `${response.uri}/static-assets/badges/info.png`,
+			avatar_static: `${response.uri}/static-assets/badges/info.png`,
 			header: "https://http.cat/404",
 			header_static: "https://http.cat/404",
 			followers_count: -1,

From b712b67df3698451735c47892adf97b6e1dc7bd7 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 16:55:38 +0100
Subject: [PATCH 112/582] use multer upload instead

---
 .../server/api/mastodon/endpoints/status.ts    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index 7da2a2d7b..b2c6f9781 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -295,21 +295,18 @@ export function apiStatusMastodon(router: Router): void {
 			}
 		},
 	);
-	router.post("/v1/media", async (ctx) => {
+	router.post("/v1/media", upload.single("file"), async (ctx) => {
 		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			let multipartData = await ctx.request.files;
+			let multipartData = await ctx.request.file;
 			if (!multipartData) {
 				ctx.body = { error: "No image" };
 				ctx.status = 401;
 				return;
 			}
-			if ((multipartData as any).file) {
-				multipartData = (multipartData as any).file;
-			}
-			const image = fs.readFileSync((multipartData as any).path);
+			const image = fs.readFileSync((multipartData).path);
 			const data = await client.uploadMedia(image);
 			ctx.body = data.data;
 		} catch (e: any) {
@@ -318,20 +315,18 @@ export function apiStatusMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
-	router.post("/v2/media", async (ctx) => {
+	router.post("/v2/media", upload.single("file"), async (ctx) => {
 		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const multipartData = await ctx.file;
+			let multipartData = await ctx.request.file;
 			if (!multipartData) {
 				ctx.body = { error: "No image" };
 				ctx.status = 401;
 				return;
 			}
-			const [path] = await createTemp();
-			await pump(multipartData.buffer, fs.createWriteStream(path));
-			const image = fs.readFileSync(path);
+			const image = fs.readFileSync((multipartData).path);
 			const data = await client.uploadMedia(image);
 			ctx.body = data.data;
 		} catch (e: any) {
@@ -340,6 +335,7 @@ export function apiStatusMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
+	});
 	router.get<{ Params: { id: string } }>(
 		"/v1/media/:id",
 		async (ctx) => {

From 76a4228de3674d4f97bf73b22eebe852da02c893 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 16:57:21 +0100
Subject: [PATCH 113/582] oh ich hab verkackt

---
 packages/backend/src/server/api/mastodon/endpoints/status.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index b2c6f9781..c86132364 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -335,7 +335,6 @@ export function apiStatusMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
-	});
 	router.get<{ Params: { id: string } }>(
 		"/v1/media/:id",
 		async (ctx) => {

From 50687ef209035589ef6d6b3051dac7a98013f2fe Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 17:02:02 +0100
Subject: [PATCH 114/582] move file upload to new router

---
 packages/backend/src/server/api/index.ts      | 46 ++++++++++++++-
 .../server/api/mastodon/endpoints/status.ts   | 59 +------------------
 2 files changed, 46 insertions(+), 59 deletions(-)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index 0f58d3acf..9b6c62924 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -7,7 +7,7 @@ import Router from "@koa/router";
 import multer from "@koa/multer";
 import bodyParser from "koa-bodyparser";
 import cors from "@koa/cors";
-import { apiMastodonCompatible } from "./mastodon/ApiMastodonCompatibleService.js";
+import { apiMastodonCompatible, getClient } from "./mastodon/ApiMastodonCompatibleService.js";
 import { Instances, AccessTokens, Users } from "@/models/index.js";
 import config from "@/config/index.js";
 import endpoints from "./endpoints.js";
@@ -39,6 +39,7 @@ app.use(async (ctx, next) => {
 // Init router
 const router = new Router();
 const mastoRouter = new Router();
+const mastoFileRouter = new Router();
 const errorRouter = new Router();
 
 // Init multer instance
@@ -68,6 +69,48 @@ mastoRouter.use(
 	}),
 );
 
+
+mastoFileRouter.post("/v1/media", upload.single("file"), async (ctx) => {
+	const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
+	const accessTokens = ctx.headers.authorization;
+	const client = getClient(BASE_URL, accessTokens);
+	try {
+		let multipartData = await ctx.request.file;
+		if (!multipartData) {
+			ctx.body = { error: "No image" };
+			ctx.status = 401;
+			return;
+		}
+		const image = fs.readFileSync((multipartData).path);
+		const data = await client.uploadMedia(image);
+		ctx.body = data.data;
+	} catch (e: any) {
+		console.error(e);
+		ctx.status = 401;
+		ctx.body = e.response.data;
+	}
+});
+mastoFileRouter.post("/v2/media", upload.single("file"), async (ctx) => {
+	const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
+	const accessTokens = ctx.headers.authorization;
+	const client = getClient(BASE_URL, accessTokens);
+	try {
+		let multipartData = await ctx.request.file;
+		if (!multipartData) {
+			ctx.body = { error: "No image" };
+			ctx.status = 401;
+			return;
+		}
+		const image = fs.readFileSync((multipartData).path);
+		const data = await client.uploadMedia(image);
+		ctx.body = data.data;
+	} catch (e: any) {
+		console.error(e);
+		ctx.status = 401;
+		ctx.body = e.response.data;
+	}
+});
+
 mastoRouter.use(async (ctx, next) => {
 	if (ctx.request.query) {
 		if (!ctx.request.body || Object.keys(ctx.request.body).length === 0) {
@@ -170,6 +213,7 @@ errorRouter.all("(.*)", async (ctx) => {
 });
 
 // Register router
+app.use(mastoFileRouter.routes());
 app.use(mastoRouter.routes());
 app.use(mastoRouter.allowedMethods());
 app.use(router.routes());
diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index c86132364..3981a1781 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -1,24 +1,7 @@
 import Router from "@koa/router";
-import megalodon, { MegalodonInterface } from "@calckey/megalodon";
 import { getClient } from "../ApiMastodonCompatibleService.js";
-import fs from "fs";
-import { pipeline } from "node:stream";
-import { promisify } from "node:util";
-import { createTemp } from "@/misc/create-temp.js";
-import config from "@/config/index.js";
-import multer from "@koa/multer";
-import { emojiRegex, emojiRegexAtStartToEnd } from "@/misc/emoji-regex.js";
+import { emojiRegexAtStartToEnd } from "@/misc/emoji-regex.js";
 import axios from "axios";
-const pump = promisify(pipeline);
-
-// Init multer instance
-const upload = multer({
-	storage: multer.diskStorage({}),
-	limits: {
-		fileSize: config.maxFileSize || 262144000,
-		files: 1,
-	},
-});
 
 export function apiStatusMastodon(router: Router): void {
 	router.post("/v1/statuses", async (ctx) => {
@@ -295,46 +278,6 @@ export function apiStatusMastodon(router: Router): void {
 			}
 		},
 	);
-	router.post("/v1/media", upload.single("file"), async (ctx) => {
-		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-		const accessTokens = ctx.headers.authorization;
-		const client = getClient(BASE_URL, accessTokens);
-		try {
-			let multipartData = await ctx.request.file;
-			if (!multipartData) {
-				ctx.body = { error: "No image" };
-				ctx.status = 401;
-				return;
-			}
-			const image = fs.readFileSync((multipartData).path);
-			const data = await client.uploadMedia(image);
-			ctx.body = data.data;
-		} catch (e: any) {
-			console.error(e);
-			ctx.status = 401;
-			ctx.body = e.response.data;
-		}
-	});
-	router.post("/v2/media", upload.single("file"), async (ctx) => {
-		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-		const accessTokens = ctx.headers.authorization;
-		const client = getClient(BASE_URL, accessTokens);
-		try {
-			let multipartData = await ctx.request.file;
-			if (!multipartData) {
-				ctx.body = { error: "No image" };
-				ctx.status = 401;
-				return;
-			}
-			const image = fs.readFileSync((multipartData).path);
-			const data = await client.uploadMedia(image);
-			ctx.body = data.data;
-		} catch (e: any) {
-			console.error(e);
-			ctx.status = 401;
-			ctx.body = e.response.data;
-		}
-	});
 	router.get<{ Params: { id: string } }>(
 		"/v1/media/:id",
 		async (ctx) => {

From bab5577ee580b8611c4a4302fbb320293e597ebb Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 17:07:49 +0100
Subject: [PATCH 115/582] this is the sign I need a break

---
 packages/backend/src/server/api/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index 9b6c62924..dcf79d16d 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -10,6 +10,7 @@ import cors from "@koa/cors";
 import { apiMastodonCompatible, getClient } from "./mastodon/ApiMastodonCompatibleService.js";
 import { Instances, AccessTokens, Users } from "@/models/index.js";
 import config from "@/config/index.js";
+import fs from "fs";
 import endpoints from "./endpoints.js";
 import compatibility from "./compatibility.js";
 import handler from "./api-handler.js";

From ac6cc1ea45c4cffb66bf4936dbc69c633be7e12f Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 17:13:35 +0100
Subject: [PATCH 116/582] maybe buffer?

---
 packages/backend/src/server/api/index.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index dcf79d16d..a49664136 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -82,8 +82,7 @@ mastoFileRouter.post("/v1/media", upload.single("file"), async (ctx) => {
 			ctx.status = 401;
 			return;
 		}
-		const image = fs.readFileSync((multipartData).path);
-		const data = await client.uploadMedia(image);
+		const data = await client.uploadMedia(multipartData.buffer);
 		ctx.body = data.data;
 	} catch (e: any) {
 		console.error(e);
@@ -102,8 +101,7 @@ mastoFileRouter.post("/v2/media", upload.single("file"), async (ctx) => {
 			ctx.status = 401;
 			return;
 		}
-		const image = fs.readFileSync((multipartData).path);
-		const data = await client.uploadMedia(image);
+		const data = await client.uploadMedia(multipartData.buffer);
 		ctx.body = data.data;
 	} catch (e: any) {
 		console.error(e);

From 066b4fa78d60d806e77367a80f59b3acba91cf44 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 17:20:34 +0100
Subject: [PATCH 117/582] meow?

---
 packages/backend/src/server/api/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index a49664136..fbbd16ba0 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -82,7 +82,7 @@ mastoFileRouter.post("/v1/media", upload.single("file"), async (ctx) => {
 			ctx.status = 401;
 			return;
 		}
-		const data = await client.uploadMedia(multipartData.buffer);
+		const data = await client.uploadMedia(multipartData);
 		ctx.body = data.data;
 	} catch (e: any) {
 		console.error(e);
@@ -101,7 +101,7 @@ mastoFileRouter.post("/v2/media", upload.single("file"), async (ctx) => {
 			ctx.status = 401;
 			return;
 		}
-		const data = await client.uploadMedia(multipartData.buffer);
+		const data = await client.uploadMedia(multipartData);
 		ctx.body = data.data;
 	} catch (e: any) {
 		console.error(e);

From f013669e7b1a5fab3274989919a69a204b5f3f62 Mon Sep 17 00:00:00 2001
From: CutestNekoAqua <valentin.john@gmx.net>
Date: Thu, 23 Feb 2023 17:38:18 +0100
Subject: [PATCH 118/582] aa

---
 packages/backend/src/server/api/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index fbbd16ba0..752303e95 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -76,13 +76,13 @@ mastoFileRouter.post("/v1/media", upload.single("file"), async (ctx) => {
 	const accessTokens = ctx.headers.authorization;
 	const client = getClient(BASE_URL, accessTokens);
 	try {
-		let multipartData = await ctx.request.file;
+		let multipartData = await ctx.file;
 		if (!multipartData) {
 			ctx.body = { error: "No image" };
 			ctx.status = 401;
 			return;
 		}
-		const data = await client.uploadMedia(multipartData);
+		const data = await client.uploadMedia(multipartData.buffer);
 		ctx.body = data.data;
 	} catch (e: any) {
 		console.error(e);
@@ -95,13 +95,13 @@ mastoFileRouter.post("/v2/media", upload.single("file"), async (ctx) => {
 	const accessTokens = ctx.headers.authorization;
 	const client = getClient(BASE_URL, accessTokens);
 	try {
-		let multipartData = await ctx.request.file;
+		let multipartData = await ctx.file;
 		if (!multipartData) {
 			ctx.body = { error: "No image" };
 			ctx.status = 401;
 			return;
 		}
-		const data = await client.uploadMedia(multipartData);
+		const data = await client.uploadMedia(multipartData.buffer);
 		ctx.body = data.data;
 	} catch (e: any) {
 		console.error(e);

From f429766dd5abad2b03d3597c86957669babda1fb Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 23 Feb 2023 16:44:15 -0500
Subject: [PATCH 119/582] bruh why didn't I just do that

---
 packages/client/src/components/MkNoteSub.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 6ba704306..718b7e177 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -1,10 +1,10 @@
 <template>
-<div v-size="{ max: [450] }" class="wrpstxzv" :class="{ children: depth > 1, singleStart:replies.length == 1 }">
+<div v-size="{ max: [450] }" class="wrpstxzv" :class="{ children: depth > 1, singleStart: replies.length == 1 }">
 	<div v-if="conversation && depth > 1" class="line"></div>
 	<div class="main" @click="router.push(notePage(note))">
 		<div class="avatar-container">
 			<MkAvatar class="avatar" :user="note.user"/>
-			<div class="line"></div>
+			<div v-if="(!conversation) || replies.length > 0" class="line"></div>
 		</div>
 		<div class="body">
 			<XNoteHeader class="header" :note="note" :mini="true"/>
@@ -22,7 +22,7 @@
 	</div>
 	<template v-if="conversation">
 		<template v-if="replies.length == 1">
-			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply single" :conversation="conversation" :depth="depth + 1"/>
+			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply single" :conversation="conversation" :depth="depth"/>
 		</template>
 		<template v-else-if="depth < 5">
 			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply" :conversation="conversation" :depth="depth + 1"/>
@@ -192,11 +192,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			margin-bottom: -10px;
 		}
 	}
-	.reply:last-child, &.reply:not(.children) {	// Hide line in last reply of thread
-		> .main:last-child > .avatar-container > .line { 
-			display: none;
-		}
-	}
 	.reply.children:not(:last-child) { // Line that goes through multiple replies
 		position: relative;
 		> .line {
@@ -208,9 +203,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 				margin-top: -10px;
 			}
 		}
-		&:not(.single):not(.singleStart) > .main > .avatar-container > .line {
-			display: none;
-		}
 	}
 	// Reply line connectors
 	.reply.children:not(.single) {

From 1577f4771e753bdf87f4bb6a5543174f65b36963 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 23 Feb 2023 18:22:51 -0500
Subject: [PATCH 120/582] line alignment fixes

---
 packages/client/src/components/MkNoteSub.vue | 44 +++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 718b7e177..9ab9b4b04 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -66,7 +66,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 .wrpstxzv {
 	padding: 16px 32px;
 	content-visibility: auto;
-
 	&.children {
 		padding: 10px 0 0 var(--indent);
 		padding-left: var(--indent) !important;
@@ -141,6 +140,9 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		margin-top: 10px;
 		&.single {
 			padding: 0 !important;
+			> .line {
+				display: none;
+			}
 		}
 	}
 
@@ -160,7 +162,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 	
 	// Reply Lines
 	&.reply, &.reply-to, &.reply-to-more {
-		--indent: var(--avatarSize);
+		--indent: calc(var(--avatarSize) - 5px);
 		> .main {
 			> .avatar-container {
 				display: flex;
@@ -176,20 +178,30 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			}
 		}
 		.line {
+			position: relative;
 			width: var(--avatarSize);
 			display: flex;
 			flex-grow: 1;
+			margin-bottom: -10px;
 			&::before {
 				content: "";
-				display: block;
-				border-left: 2px solid var(--accent);
-				margin-inline: auto;
+				position: absolute;
+				border-left: 2px solid var(--divider);
+				margin-left: calc((var(--avatarSize) / 2) - 1px);
+				width: calc(var(--indent) / 2);
+				inset-block: 0;
+				min-height: 8px;
 			}
 		}
 	}
+	&.reply-to, &.reply-to-more {
+		> .main > .avatar-container > .line {
+			margin-bottom: 0px !important;
+		}
+	}
 	&.single, &.singleStart {
-		> .main > .avatar-container > .line::before {
-			margin-bottom: -10px;
+		> .main > .avatar-container > .line {
+			margin-bottom: -10px !important;
 		}
 	}
 	.reply.children:not(:last-child) { // Line that goes through multiple replies
@@ -199,9 +211,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			top: 0;
 			left: 0;
 			bottom: 0;
-			&::before {
-				margin-top: -10px;
-			}
 		}
 	}
 	// Reply line connectors
@@ -210,18 +219,23 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		> .line {
 			position: absolute;
 			left: 0;
+			top: 0;
 			&::after {
 				content: "";
 				position: absolute;
-				border-left: 2px solid var(--accent);
-				border-bottom: 2px solid var(--accent);
+				border-left: 2px solid var(--divider);
+				border-bottom: 2px solid var(--divider);
 				margin-left: calc((var(--avatarSize) / 2) - 1px);
-				margin-top: -20px;
 				width: calc(var(--indent) / 2);
-				height: calc((var(--avatarSize) / 2) + 20px);
-				border-bottom-left-radius: calc(var(--indent) / 3);
+				height: calc((var(--avatarSize) / 2));
+				border-bottom-left-radius: calc(var(--indent) / 2);
+				top: 8px;
 			}
 		}
+		&:not(:last-child) > .line::after {
+			mask: linear-gradient(to right, transparent 2px, black 2px);
+			-webkit-mask: linear-gradient(to right, transparent 2px, black 2px);
+		}
 	}
 
 	&.max-width_450px {

From 5fa6b03423443a0813ad381b85cc84be50345354 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 23 Feb 2023 18:28:32 -0500
Subject: [PATCH 121/582] change line color

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

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 9ab9b4b04..c896b1cfe 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -186,7 +186,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			&::before {
 				content: "";
 				position: absolute;
-				border-left: 2px solid var(--divider);
+				border-left: 2px solid var(--X13);
 				margin-left: calc((var(--avatarSize) / 2) - 1px);
 				width: calc(var(--indent) / 2);
 				inset-block: 0;
@@ -223,8 +223,8 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			&::after {
 				content: "";
 				position: absolute;
-				border-left: 2px solid var(--divider);
-				border-bottom: 2px solid var(--divider);
+				border-left: 2px solid var(--X13);
+				border-bottom: 2px solid var(--X13);
 				margin-left: calc((var(--avatarSize) / 2) - 1px);
 				width: calc(var(--indent) / 2);
 				height: calc((var(--avatarSize) / 2));

From 65bcb91ca52f0a052af87bdb60d38a6de54dcc8a Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 23 Feb 2023 20:14:43 -0500
Subject: [PATCH 122/582] fix click events

---
 packages/client/src/components/MkCwButton.vue |  2 +-
 .../client/src/components/MkMediaList.vue     |  2 +-
 packages/client/src/components/MkMention.vue  |  4 ++--
 packages/client/src/components/MkNote.vue     | 20 +++++++++----------
 .../client/src/components/MkNoteFooter.vue    |  2 +-
 .../client/src/components/MkNoteHeader.vue    |  2 +-
 .../client/src/components/MkNoteSimple.vue    |  2 +-
 packages/client/src/components/MkPoll.vue     |  4 ++--
 .../src/components/MkSubNoteContent.vue       |  4 ++--
 .../client/src/components/MkUrlPreview.vue    |  6 +++---
 .../client/src/components/global/MkAvatar.vue |  2 +-
 .../client/src/components/global/MkUrl.vue    |  2 +-
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 4e38b16b0..3baae82b9 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -1,5 +1,5 @@
 <template>
-<button class="nrvgflfu _button" @click.stop.prevent="toggle">
+<button class="nrvgflfu _button" @click.stop="toggle">
 	<b>{{ modelValue ? i18n.ts._cw.hide : i18n.ts._cw.show }}</b>
 	<span v-if="!modelValue">{{ label }}</span>
 </button>
diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue
index 6cc12c9df..8b6d2c2c9 100644
--- a/packages/client/src/components/MkMediaList.vue
+++ b/packages/client/src/components/MkMediaList.vue
@@ -2,7 +2,7 @@
 <div class="hoawjimk">
 	<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
 	<div v-if="mediaList.filter(media => previewable(media)).length > 0" class="gird-container" :class="{ dmWidth: inDm }">
-		<div ref="gallery" :data-count="mediaList.filter(media => previewable(media)).length" @click.stop.prevent>
+		<div ref="gallery" :data-count="mediaList.filter(media => previewable(media)).length" @click.stop>
 			<template v-for="media in mediaList.filter(media => previewable(media))">
 				<XVideo v-if="media.type.startsWith('video')" :key="media.id" :video="media"/>
 				<XImage v-else-if="media.type.startsWith('image')" :key="media.id" class="image" :data-id="media.id" :image="media" :raw="raw"/>
diff --git a/packages/client/src/components/MkMention.vue b/packages/client/src/components/MkMention.vue
index 2df9f1235..4b2e0d518 100644
--- a/packages/client/src/components/MkMention.vue
+++ b/packages/client/src/components/MkMention.vue
@@ -1,12 +1,12 @@
 <template>
-<MkA v-if="url.startsWith('/')" v-user-preview="canonical" class="akbvjaqn" :class="{ isMe }" :to="url" :style="{ background: bgCss }">
+<MkA v-if="url.startsWith('/')" v-user-preview="canonical" class="akbvjaqn" :class="{ isMe }" :to="url" :style="{ background: bgCss }" @click.stop>
 	<img class="icon" :src="`/avatar/@${username}@${host}`" alt="">
 	<span class="main">
 		<span class="username">@{{ username }}</span>
 		<span v-if="(host != localHost) || $store.state.showFullAcct" class="host">@{{ toUnicode(host) }}</span>
 	</span>
 </MkA>
-<a v-else class="akbvjaqn" :href="url" target="_blank" rel="noopener" :style="{ background: bgCss }">
+<a v-else class="akbvjaqn" :href="url" target="_blank" rel="noopener" :style="{ background: bgCss }" @click.stop>
 	<span class="main">
 		<span class="username">@{{ username }}</span>
 		<span class="host">@{{ toUnicode(host) }}</span>
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 753e98b0d..23a25321c 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -25,7 +25,7 @@
 				</template>
 			</I18n>
 			<div class="info">
-				<button ref="renoteTime" class="_button time" @click="showRenoteMenu()">
+				<button ref="renoteTime" class="_button time" @click.stop="showRenoteMenu()">
 					<i v-if="isMyRenote" class="ph-dots-three-outline-bold ph-lg dropdownIcon"></i>
 					<MkTime :time="note.createdAt"/>
 				</button>
@@ -33,24 +33,24 @@
 			</div>
 		</div>
 	</div>
-	<article class="article" @contextmenu.stop="onContextmenu" @click.self="router.push(notePage(appearNote))">
-		<div class="main" @click.self="router.push(notePage(appearNote))">
+	<article class="article" @contextmenu.stop="onContextmenu" @click="router.push(notePage(appearNote))">
+		<div class="main">
 			<div class="header-container">
 				<MkAvatar class="avatar" :user="appearNote.user"/>
 				<XNoteHeader class="header" :note="appearNote" :mini="true"/>
 			</div>
 			<div class="body">
 				<p v-if="appearNote.cw != null" class="cw">
-					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis" @click.stop/>
 					<XCwButton v-model="showContent" :note="appearNote"/>
 				</p>
 				<div v-show="appearNote.cw == null || showContent" class="content" :class="{ collapsed, isLong }">
-					<div class="text" @click.self="router.push(notePage(appearNote))">
-						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+					<div class="text">
+						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis" @click.stop/>
 						<!-- <a v-if="appearNote.renote != null" class="rp">RN:</a> -->
 						<div v-if="translating || translation" class="translation">
 							<MkLoading v-if="translating" mini/>
-							<div v-else class="translated">
+							<div v-else class="translated" @click.stop>
 								<b>{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: </b>
 								<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 							</div>
@@ -62,14 +62,14 @@
 					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
 					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
 					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
-					<button v-if="isLong && collapsed" class="fade _button" @click.stop.prevent="collapsed = false">
+					<button v-if="isLong && collapsed" class="fade _button" @click.stop="collapsed = false">
 						<span>{{ i18n.ts.showMore }}</span>
 					</button>
-					<button v-else-if="isLong && !collapsed" class="showLess _button" @click.stop.prevent="collapsed = true">
+					<button v-else-if="isLong && !collapsed" class="showLess _button" @click.stop="collapsed = true">
 						<span>{{ i18n.ts.showLess }}</span>
 					</button>
 				</div>
-				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
+				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`" @click.stop><i class="ph-television-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
 			</div>
 			<MkNoteFooter :note="appearNote"></MkNoteFooter>
 		</div>
diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
index 1f47d4083..d8fcffbea 100644
--- a/packages/client/src/components/MkNoteFooter.vue
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -1,5 +1,5 @@
 <template>
-	<footer ref="el" class="footer" @click.stop.prevent>
+	<footer ref="el" class="footer" @click.stop>
 		<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
 		<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
 			<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
diff --git a/packages/client/src/components/MkNoteHeader.vue b/packages/client/src/components/MkNoteHeader.vue
index 835611a43..f1d2d37b0 100644
--- a/packages/client/src/components/MkNoteHeader.vue
+++ b/packages/client/src/components/MkNoteHeader.vue
@@ -2,7 +2,7 @@
 <header class="kkwtjztg">
 	<div class="user-info">
 		<div>
-			<MkA v-user-preview="note.user.id" class="name" :to="userPage(note.user)">
+			<MkA v-user-preview="note.user.id" class="name" :to="userPage(note.user)" @click.stop>
 				<MkUserName :user="note.user" class="mkusername">
 					<span v-if="note.user.isBot" class="is-bot">bot</span>
 				</MkUserName>
diff --git a/packages/client/src/components/MkNoteSimple.vue b/packages/client/src/components/MkNoteSimple.vue
index 031c7313f..b882af29a 100644
--- a/packages/client/src/components/MkNoteSimple.vue
+++ b/packages/client/src/components/MkNoteSimple.vue
@@ -1,5 +1,5 @@
 <template>
-<div v-size="{ min: [350, 500] }" class="yohlumlk">
+<div v-size="{ min: [350, 500] }" class="yohlumlk" @click.stop>
 	<MkAvatar class="avatar" :user="note.user"/>
 	<div class="main">
 		<XNoteHeader class="header" :note="note" :mini="true"/>
diff --git a/packages/client/src/components/MkPoll.vue b/packages/client/src/components/MkPoll.vue
index 2c5d35c7a..4b41b99d7 100644
--- a/packages/client/src/components/MkPoll.vue
+++ b/packages/client/src/components/MkPoll.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="tivcixzd" :class="{ done: closed || isVoted }">
 	<ul>
-		<li v-for="(choice, i) in note.poll.choices" :key="i" :class="{ voted: choice.voted }" @click="vote(i)">
+		<li v-for="(choice, i) in note.poll.choices" :key="i" :class="{ voted: choice.voted }" @click.stop="vote(i)">
 			<div class="backdrop" :style="{ 'width': `${showResult ? (choice.votes / total * 100) : 0}%` }"></div>
 			<span>
 				<template v-if="choice.isVoted"><i class="ph-check-bold ph-lg"></i></template>
@@ -13,7 +13,7 @@
 	<p v-if="!readOnly">
 		<span>{{ i18n.t('_poll.totalVotes', { n: total }) }}</span>
 		<span> · </span>
-		<a v-if="!closed && !isVoted" @click="showResult = !showResult">{{ showResult ? i18n.ts._poll.vote : i18n.ts._poll.showResult }}</a>
+		<a v-if="!closed && !isVoted" @click.stop="showResult = !showResult">{{ showResult ? i18n.ts._poll.vote : i18n.ts._poll.showResult }}</a>
 		<span v-if="isVoted">{{ i18n.ts._poll.voted }}</span>
 		<span v-else-if="closed">{{ i18n.ts._poll.closed }}</span>
 		<span v-if="remaining > 0"> · {{ timer }}</span>
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 987d596f4..4c91a3189 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -19,10 +19,10 @@
 		<summary>{{ i18n.ts.poll }}</summary>
 		<XPoll :note="note"/>
 	</div>
-	<button v-if="isLong && collapsed" class="fade _button" @click.stop.prevent="collapsed = false">
+	<button v-if="isLong && collapsed" class="fade _button" @click.stop="collapsed = false">
 		<span>{{ i18n.ts.showMore }}</span>
 	</button>
-	<button v-if="isLong && !collapsed" class="showLess _button" @click.stop.prevent="collapsed = true">
+	<button v-if="isLong && !collapsed" class="showLess _button" @click.stop="collapsed = true">
 		<span>{{ i18n.ts.showLess }}</span>
 	</button>
 </div>
diff --git a/packages/client/src/components/MkUrlPreview.vue b/packages/client/src/components/MkUrlPreview.vue
index 865d4bcbe..371e84f01 100644
--- a/packages/client/src/components/MkUrlPreview.vue
+++ b/packages/client/src/components/MkUrlPreview.vue
@@ -1,12 +1,12 @@
 <template>
-<div v-if="playerEnabled" class="player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`">
+<div v-if="playerEnabled" class="player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`" @click.stop>
 	<button class="disablePlayer" :title="i18n.ts.disablePlayer" @click="playerEnabled = false"><i class="ph-x-bold ph-lg"></i></button>
 	<iframe :src="player.url + (player.url.match(/\?/) ? '&autoplay=1&auto_play=1' : '?autoplay=1&auto_play=1')" :width="player.width || '100%'" :heigth="player.height || 250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen/>
 </div>
-<div v-else-if="tweetId && tweetExpanded" ref="twitter" class="twitter">
+<div v-else-if="tweetId && tweetExpanded" ref="twitter" class="twitter" @click.stop>
 	<iframe ref="tweet" scrolling="no" frameborder="no" :style="{ position: 'relative', width: '100%', height: `${tweetHeight}px` }" :src="`https://platform.twitter.com/embed/index.html?embedId=${embedId}&amp;hideCard=false&amp;hideThread=false&amp;lang=en&amp;theme=${$store.state.darkMode ? 'dark' : 'light'}&amp;id=${tweetId}`"></iframe>
 </div>
-<div v-else v-size="{ max: [400, 350] }" class="mk-url-preview">
+<div v-else v-size="{ max: [400, 350] }" class="mk-url-preview" @click.stop>
 	<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
 		<component :is="self ? 'MkA' : 'a'" v-if="!fetching" class="link" :class="{ compact }" :[attr]="self ? url.substr(local.length) : url" rel="nofollow noopener" :target="target" :title="url">
 			<div v-if="thumbnail" class="thumbnail" :style="`background-image: url('${thumbnail}')`">
diff --git a/packages/client/src/components/global/MkAvatar.vue b/packages/client/src/components/global/MkAvatar.vue
index e391c433d..f2a39de61 100644
--- a/packages/client/src/components/global/MkAvatar.vue
+++ b/packages/client/src/components/global/MkAvatar.vue
@@ -3,7 +3,7 @@
 	<img class="inner" :src="url" decoding="async"/>
 	<MkUserOnlineIndicator v-if="showIndicator && user.instance == null" class="indicator" :user="user"/>
 </span>
-<MkA v-else v-user-preview="disablePreview ? undefined : user.id" class="eiwwqkts _noSelect" :class="{ cat: user.isCat, square: $store.state.squareAvatars }" :style="{ color }" :to="userPage(user)" :title="acct(user)" :target="target">
+<MkA v-else v-user-preview="disablePreview ? undefined : user.id" class="eiwwqkts _noSelect" :class="{ cat: user.isCat, square: $store.state.squareAvatars }" :style="{ color }" :to="userPage(user)" :title="acct(user)" :target="target" @click.stop>
 	<img class="inner" :src="url" decoding="async"/>
 	<MkUserOnlineIndicator v-if="showIndicator && user.instance == null" class="indicator" :user="user"/>
 </MkA>
diff --git a/packages/client/src/components/global/MkUrl.vue b/packages/client/src/components/global/MkUrl.vue
index d22c0b299..b1e3e1ba3 100644
--- a/packages/client/src/components/global/MkUrl.vue
+++ b/packages/client/src/components/global/MkUrl.vue
@@ -1,7 +1,7 @@
 <template>
 <component
 	:is="self ? 'MkA' : 'a'" ref="el" class="ieqqeuvs _link" :[attr]="self ? url.substr(local.length) : url" :rel="rel" :target="target"
-	@contextmenu.stop="() => {}"
+	@contextmenu.stop="() => {}" @click.stop
 >
 	<template v-if="!self">
 		<span class="schema">{{ schema }}//</span>

From 0b73ebfd74e0aac09c856f254058bfcd4ae708fd Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 23 Feb 2023 20:37:26 -0500
Subject: [PATCH 123/582] Make quotes clickable

---
 packages/client/src/components/MkNote.vue         | 6 +++++-
 packages/client/src/components/MkNoteDetailed.vue | 6 +++++-
 packages/client/src/components/MkNoteSimple.vue   | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 23a25321c..7ebeb6d56 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -61,7 +61,7 @@
 					</div>
 					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
 					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
-					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
+					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote" @click.stop="router.push(notePage(appearNote.renote))"/></div>
 					<button v-if="isLong && collapsed" class="fade _button" @click.stop="collapsed = false">
 						<span>{{ i18n.ts.showMore }}</span>
 					</button>
@@ -555,6 +555,10 @@ function readPromo() {
 							padding: 16px;
 							border: solid 1px var(--renote);
 							border-radius: 8px;
+							transition: background .2s;
+							&:hover, &:focus-within {
+								background-color: var(--panelHighlight);
+							}
 						}
 					}
 				}
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 864b27022..88e13119f 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -68,7 +68,7 @@
 					</div>
 					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
 					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
-					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
+					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote" @click.stop="router.push(notePage(appearNote.renote))"/></div>
 				</div>
 				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
 			</div>
@@ -530,6 +530,10 @@ onUnmounted(() => {
 							padding: 16px;
 							border: solid 1px var(--renote);
 							border-radius: 8px;
+							transition: background .2s;
+							&:hover, &:focus-within {
+								background-color: var(--panelHighlight);
+							}
 						}
 					}
 				}
diff --git a/packages/client/src/components/MkNoteSimple.vue b/packages/client/src/components/MkNoteSimple.vue
index b882af29a..031c7313f 100644
--- a/packages/client/src/components/MkNoteSimple.vue
+++ b/packages/client/src/components/MkNoteSimple.vue
@@ -1,5 +1,5 @@
 <template>
-<div v-size="{ min: [350, 500] }" class="yohlumlk" @click.stop>
+<div v-size="{ min: [350, 500] }" class="yohlumlk">
 	<MkAvatar class="avatar" :user="note.user"/>
 	<div class="main">
 		<XNoteHeader class="header" :note="note" :mini="true"/>

From 73478b42267045d28a37bf8deb7b63cf70b4cb35 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 23 Feb 2023 20:46:48 -0500
Subject: [PATCH 124/582] smaller reply avatars on mobile

---
 packages/client/src/components/MkNoteSub.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index c896b1cfe..66c5c4c46 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -240,6 +240,10 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 
 	&.max-width_450px {
 		padding: 14px 16px;
+		&.reply {
+			--avatarSize: 28px;
+			--indent: calc(var(--avatarSize) - 8px);
+		}
 		&.reply-to, &.reply-to-more {
 			padding-top: 14px !important;
 			padding-bottom: 0 !important;

From 4c8c2364b2844c478931e5dd7021e82029daf64d Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 23 Feb 2023 20:50:58 -0500
Subject: [PATCH 125/582] fix not being able to click around there are new
 posts button

---
 packages/client/src/pages/timeline.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 3646e8d86..9357050c7 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -315,12 +315,14 @@ onMounted(() => {
 		top: calc(var(--stickyTop, 0px) + 16px);
 		z-index: 1000;
 		width: 100%;
+		pointer-events: none;
 
 		> button {
 			display: block;
 			margin: var(--margin) auto 0 auto;
 			padding: 8px 16px;
 			border-radius: 32px;
+			pointer-events: all;
 		}
 	}
 

From d4139fff729a720c14daad1160ed73dcef215eee Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 23 Feb 2023 22:03:38 -0500
Subject: [PATCH 126/582] also add hover to link previews

---
 packages/client/src/components/MkSubNoteContent.vue | 4 ++++
 packages/client/src/components/MkUrlPreview.vue     | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 4c91a3189..5799bc6fb 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -72,6 +72,10 @@ const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : n
 		}
 	}
 
+	> .mk-url-preview {
+		margin-top: 8px;
+	}
+
 	&.collapsed {
 		position: relative;
 		max-height: 9em;
diff --git a/packages/client/src/components/MkUrlPreview.vue b/packages/client/src/components/MkUrlPreview.vue
index 371e84f01..6c8f19f58 100644
--- a/packages/client/src/components/MkUrlPreview.vue
+++ b/packages/client/src/components/MkUrlPreview.vue
@@ -214,9 +214,10 @@ onUnmounted(() => {
 		border: 1px solid var(--divider);
 		border-radius: 8px;
 		overflow: hidden;
-
-		&:hover {
+		transition: background .2s;
+		&:hover, &:focus-within {
 			text-decoration: none;
+			background-color: var(--panelHighlight);
 			> article > header > h1 {
 				text-decoration: underline;
 			}

From 9dd68d0c42614a21f33c7faee03bfdac6943494f Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 23 Feb 2023 22:45:12 -0500
Subject: [PATCH 127/582] Change reply order from oldest to newest

---
 packages/client/src/components/MkNoteDetailed.vue | 2 +-
 packages/client/src/components/MkNoteSub.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 88e13119f..302f4bc4f 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -294,7 +294,7 @@ os.api('notes/children', {
 	depth: 6,
 }).then(res => {
 	replies.value = res;
-	directReplies.value = res.filter(note => note.replyId === appearNote.id || note.renoteId === appearNote.id);
+	directReplies.value = res.filter(note => note.replyId === appearNote.id || note.renoteId === appearNote.id).reverse();
 });
 
 if (appearNote.replyId) {
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 66c5c4c46..16cbc20c0 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -59,7 +59,7 @@ const props = withDefaults(defineProps<{
 });
 
 let showContent = $ref(false);
-const replies: misskey.entities.Note[] = props.conversation?.filter(item => item.replyId === props.note.id || item.renoteId === props.note.id) ?? [];
+const replies: misskey.entities.Note[] = props.conversation?.filter(item => item.replyId === props.note.id || item.renoteId === props.note.id).reverse() ?? [];
 </script>
 
 <style lang="scss" scoped>

From 00e42db68103a022f50cc42b4b1859c1f7251254 Mon Sep 17 00:00:00 2001
From: Masaya Suzuki <15100604+massongit@users.noreply.github.com>
Date: Fri, 24 Feb 2023 14:09:17 +0900
Subject: [PATCH 128/582] Check redis connection

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
 package.json                      |  2 +-
 packages/backend/check_connect.js | 10 ++++++++++
 packages/backend/package.json     |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 packages/backend/check_connect.js

diff --git a/package.json b/package.json
index 11a539409..cc44c6468 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",
 		"build": "pnpm -r run build && pnpm run gulp",
-		"start": "pnpm --filter backend run start",
+		"start": "pnpm check:connect && pnpm --filter backend run start",
 		"start:test": "pnpm --filter backend run start:test",
 		"init": "pnpm run migrate",
 		"migrate": "pnpm --filter backend run migrate",
diff --git a/packages/backend/check_connect.js b/packages/backend/check_connect.js
new file mode 100644
index 000000000..8bf134a10
--- /dev/null
+++ b/packages/backend/check_connect.js
@@ -0,0 +1,10 @@
+import {loadConfig} from './built/config.js';
+import {createRedisConnection} from "./built/redis.js";
+
+const config = loadConfig();
+const redis = createRedisConnection(config);
+
+redis.on('connect', () => redis.disconnect());
+redis.on('error', (e) => {
+    throw e;
+});
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 55a64191a..f3aaafc9a 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -8,6 +8,7 @@
 		"start:test": "NODE_ENV=test pnpm node ./built/index.js",
 		"migrate": "typeorm migration:run -d ormconfig.js",
 		"revertmigration": "typeorm migration:revert -d ormconfig.js",
+		"check:connect": "node ./check_connect.js",
 		"build": "pnpm swc src -d built -D",
 		"watch": "pnpm swc src -d built -D -w",
 		"lint": "pnpm rome check \"src/**/*.ts\"",

From d2f12681950c6a0fc31bf411088faac1ba61f0d4 Mon Sep 17 00:00:00 2001
From: yawhn <kordaris@gmail.com>
Date: Fri, 24 Feb 2023 13:58:45 +0200
Subject: [PATCH 129/582] fix: multiple Ads' bugs. feat: Ads widget

https://codeberg.org/calckey/calckey/issues/9138
https://codeberg.org/calckey/calckey/issues/9080
---
 .../client/src/components/global/MkAd.vue     | 15 ++++++-----
 .../client/src/pages/admin/promotions.vue     | 26 +++++++++----------
 packages/client/src/ui/classic.widgets.vue    | 13 +++++-----
 .../client/src/ui/deck/widgets-column.vue     | 16 ++++++------
 packages/client/src/ui/universal.widgets.vue  | 12 ++++-----
 5 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/packages/client/src/components/global/MkAd.vue b/packages/client/src/components/global/MkAd.vue
index 0316a6bdf..7fa015266 100644
--- a/packages/client/src/components/global/MkAd.vue
+++ b/packages/client/src/components/global/MkAd.vue
@@ -56,10 +56,13 @@ const choseAd = (): Ad | null => {
 	}
 
 	const lowPriorityAds = ads.filter(ad => ad.ratio === 0);
+	const widgetAds = ads.filter(ad => ad.place === 'widget');
 	ads = ads.filter(ad => ad.ratio !== 0);
-
-	if (ads.length === 0) {
-		if (lowPriorityAds.length !== 0) {
+	
+	if (widgetAds.length !== 0) {
+			return widgetAds;
+	} else if (ads.length === 0) {
+		 if (lowPriorityAds.length !== 0) {
 			return lowPriorityAds[Math.floor(Math.random() * lowPriorityAds.length)];
 		} else {
 			return null;
@@ -132,7 +135,7 @@ function reduceFrequency(): void {
 			}
 		}
 
-		&.square {
+		&.widget {
 			> a ,
 			> a > img {
 				max-width: min(300px, 100%);
@@ -140,7 +143,7 @@ function reduceFrequency(): void {
 			}
 		}
 
-		&.horizontal {
+		&.inline {
 			padding: 8px;
 
 			> a ,
@@ -150,7 +153,7 @@ function reduceFrequency(): void {
 			}
 		}
 
-		&.horizontal-big {
+		&.inline-big {
 			padding: 8px;
 
 			> a ,
diff --git a/packages/client/src/pages/admin/promotions.vue b/packages/client/src/pages/admin/promotions.vue
index 09b7bd542..d2e57586e 100644
--- a/packages/client/src/pages/admin/promotions.vue
+++ b/packages/client/src/pages/admin/promotions.vue
@@ -13,20 +13,12 @@
 				</MkInput>
 				<FormRadios v-model="ad.place" class="_formBlock">
 					<template #label>Form</template>
-					<option value="square">square</option>
-					<option value="horizontal">horizontal</option>
-					<option value="horizontal-big">horizontal-big</option>
+					<option value="widget">widget</option>
+					<option value="inline">inline</option>
+					<option value="inline-big">inline-big</option>
 				</FormRadios>
-				<!--
-			<div style="margin: 32px 0;">
-				{{ i18n.ts.priority }}
-				<MkRadio v-model="ad.priority" value="high">{{ i18n.ts.high }}</MkRadio>
-				<MkRadio v-model="ad.priority" value="middle">{{ i18n.ts.middle }}</MkRadio>
-				<MkRadio v-model="ad.priority" value="low">{{ i18n.ts.low }}</MkRadio>
-			</div>
-			-->
 				<FormSplit>
-					<MkInput v-model="ad.ratio" type="number">
+					<MkInput :disabled="ad.place === 'widget'" v-model="ad.ratio" type="number">
 						<template #label>{{ i18n.ts.ratio }}</template>
 					</MkInput>
 					<MkInput v-model="ad.expiresAt" type="date">
@@ -56,23 +48,29 @@ import FormSplit from '@/components/form/split.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import { formatDateTimeString } from '@/scripts/format-time-string';
 
 let ads: any[] = $ref([]);
 
 os.api('admin/ad/list').then(adsResponse => {
 	ads = adsResponse;
+	// The date format should be changed to yyyy-MM-dd in order to be properly displayed
+	for (let i in ads) {
+		ads[i].expiresAt = ads[i].expiresAt.substr(0, 10);
+	}
 });
 
 function add() {
+	const tomorrow = formatDateTimeString(new Date(new Date().setDate(new Date().getDate() + 1)), 'yyyy-MM-dd');
 	ads.unshift({
 		id: null,
 		memo: '',
-		place: 'square',
+		place: 'widget',
 		priority: 'middle',
 		ratio: 1,
 		url: '',
 		imageUrl: null,
-		expiresAt: null,
+		expiresAt: tomorrow,
 	});
 }
 
diff --git a/packages/client/src/ui/classic.widgets.vue b/packages/client/src/ui/classic.widgets.vue
index 04ca34b55..3ed838d9f 100644
--- a/packages/client/src/ui/classic.widgets.vue
+++ b/packages/client/src/ui/classic.widgets.vue
@@ -1,11 +1,10 @@
 <template>
-<div class="ddiqwdnk">
-	<XWidgets class="widgets" :edit="editMode" :widgets="$store.reactiveState.widgets.value.filter(w => w.place === place)" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
-	<MkAd class="a" :prefer="['square']"/>
-
-	<button v-if="editMode" class="_textButton edit" style="font-size: 0.9em;" @click="editMode = false"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}</button>
-	<button v-else class="_textButton edit" style="font-size: 0.9em;" @click="editMode = true"><i class="ph-pencil-bold ph-lg"></i> {{ i18n.ts.editWidgets }}</button>
-</div>
+	<div class="ddiqwdnk">
+		<MkAd class="a" :prefer="['widget']"/>
+		<XWidgets class="widgets" :edit="editMode" :widgets="$store.reactiveState.widgets.value.filter(w => w.place === place)" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
+		<button v-if="editMode" class="_textButton edit" style="font-size: 0.9em;" @click="editMode = false"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}</button>
+		<button v-else class="_textButton edit" style="font-size: 0.9em;" @click="editMode = true"><i class="ph-pencil-bold ph-lg"></i> {{ i18n.ts.editWidgets }}</button>
+	</div>
 </template>
 
 <script lang="ts">
diff --git a/packages/client/src/ui/deck/widgets-column.vue b/packages/client/src/ui/deck/widgets-column.vue
index 486f86274..5fdbccf26 100644
--- a/packages/client/src/ui/deck/widgets-column.vue
+++ b/packages/client/src/ui/deck/widgets-column.vue
@@ -1,12 +1,12 @@
 <template>
-<XColumn :menu="menu" :naked="true" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
-	<template #header><i class="ph-browser-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
-
-	<div class="wtdtxvec">
-		<div v-if="!(column.widgets && column.widgets.length > 0) && !edit" class="intro">{{ i18n.ts._deck.widgetsIntroduction }}</div>
-		<XWidgets :edit="edit" :widgets="column.widgets" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="edit = false"/>
-	</div>
-</XColumn>
+	<XColumn :menu="menu" :naked="true" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
+		<template #header><i class="ph-browser-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
+		<div class="wtdtxvec">
+			<MkAd class="a" :prefer="['widget']"/>
+			<div v-if="!(column.widgets && column.widgets.length > 0) && !edit" class="intro">{{ i18n.ts._deck.widgetsIntroduction }}</div>
+			<XWidgets :edit="edit" :widgets="column.widgets" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="edit = false"/>
+		</div>
+	</XColumn>
 </template>
 
 <script lang="ts" setup>
diff --git a/packages/client/src/ui/universal.widgets.vue b/packages/client/src/ui/universal.widgets.vue
index 0304f7395..d07db8438 100644
--- a/packages/client/src/ui/universal.widgets.vue
+++ b/packages/client/src/ui/universal.widgets.vue
@@ -1,10 +1,10 @@
 <template>
-<div class="efzpzdvf">
-	<XWidgets :edit="editMode" :widgets="defaultStore.reactiveState.widgets.value" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
-
-	<button v-if="editMode" class="_textButton" style="font-size: 0.9em;" @click="editMode = false"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}</button>
-	<button v-else class="_textButton mk-widget-edit" style="font-size: 0.9em;" @click="editMode = true"><i class="ph-pencil-bold ph-lg"></i> {{ i18n.ts.editWidgets }}</button>
-</div>
+	<div class="efzpzdvf">
+		<MkAd class="a" :prefer="['widget']"/>
+		<XWidgets :edit="editMode" :widgets="defaultStore.reactiveState.widgets.value" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
+		<button v-if="editMode" class="_textButton" style="font-size: 0.9em;" @click="editMode = false"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}</button>
+		<button v-else class="_textButton mk-widget-edit" style="font-size: 0.9em;" @click="editMode = true"><i class="ph-pencil-bold ph-lg"></i> {{ i18n.ts.editWidgets }}</button>
+	</div>
 </template>
 
 <script lang="ts" setup>

From 50290f88879bb16f9c6ac5257ab7636b738314e2 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 24 Feb 2023 11:55:51 -0500
Subject: [PATCH 130/582] Reduce detailed note spacing on mobile

---
 packages/client/src/components/MkNoteDetailed.vue | 10 +++++++++-
 packages/client/src/components/MkNoteSub.vue      | 13 ++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 302f4bc4f..47d489ef6 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -291,7 +291,7 @@ function blur() {
 os.api('notes/children', {
 	noteId: appearNote.id,
 	limit: 30,
-	depth: 6,
+	depth: 12,
 }).then(res => {
 	replies.value = res;
 	directReplies.value = res.filter(note => note.replyId === appearNote.id || note.renoteId === appearNote.id).reverse();
@@ -599,6 +599,10 @@ onUnmounted(() => {
 		font-size: 0.9em;
 	}
 
+	@media (max-width: 500px) {
+		margin-inline: -24px;
+	}
+
 	&.max-width_450px {
 
 		> .reply-to-more:first-child {
@@ -616,6 +620,10 @@ onUnmounted(() => {
 		}
 	}
 
+	@media (max-width: 400px) {
+		margin-inline: -12px;
+	}
+
 	&.max-width_350px {
 		> .article {
 			> .main {
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 16cbc20c0..a422cf440 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -239,12 +239,8 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 	}
 
 	&.max-width_450px {
-		padding: 14px 16px;
-		&.reply {
-			--avatarSize: 28px;
-			--indent: calc(var(--avatarSize) - 8px);
-		}
 		&.reply-to, &.reply-to-more {
+			padding: 14px 16px;
 			padding-top: 14px !important;
 			padding-bottom: 0 !important;
 			margin-bottom: 0 !important;
@@ -253,5 +249,12 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			margin-right: 10px;
 		}
 	}
+	@media (max-width: 450px) {
+		padding: 14px 16px;
+		&.reply {
+			--avatarSize: 28px;
+			--indent: calc(var(--avatarSize) - 8px);
+		}
+	}
 }
 </style>

From 180cdc4e27c94179162b92f9d9588a06e178633c Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 24 Feb 2023 20:37:36 -0500
Subject: [PATCH 131/582] larger pfp's for first column of replies on mobile

---
 packages/client/src/components/MkNoteSub.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index a422cf440..da2443239 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -1,5 +1,5 @@
 <template>
-<div v-size="{ max: [450] }" class="wrpstxzv" :class="{ children: depth > 1, singleStart: replies.length == 1 }">
+<div v-size="{ max: [450] }" class="wrpstxzv" :class="{ children: depth > 1, singleStart: replies.length == 1, firstColumn: depth == 1 && conversation }">
 	<div v-if="conversation && depth > 1" class="line"></div>
 	<div class="main" @click="router.push(notePage(note))">
 		<div class="avatar-container">
@@ -252,8 +252,17 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 	@media (max-width: 450px) {
 		padding: 14px 16px;
 		&.reply {
-			--avatarSize: 28px;
-			--indent: calc(var(--avatarSize) - 8px);
+			--avatarSize: 24px;
+			--indent: calc(var(--avatarSize) - 4px);
+		}
+		&.firstColumn {
+			> .main, > .line, > .children:not(.single) > .line {
+				--avatarSize: 35px;
+				--indent: 35px;
+			}
+			> .children:not(.single) {
+				padding-left: 28px !important;
+			}
 		}
 	}
 }

From d407d355b26da1ac2f6a04b8841f72881f8a7d25 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 24 Feb 2023 22:33:21 -0500
Subject: [PATCH 132/582] style view thread continuation button + fix link
 underline

---
 packages/client/src/components/MkNoteSub.vue | 24 +++++++++++++++++++-
 packages/client/src/style.scss               |  1 +
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index da2443239..b346a15a0 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -28,6 +28,7 @@
 			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply" :conversation="conversation" :depth="depth + 1"/>
 		</template>
 		<div v-else-if="replies.length > 0" class="more">
+			<div class="line"></div>
 			<MkA class="text _link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ph-caret-double-right-bold ph-lg"></i></MkA>
 		</div>
 	</template>
@@ -135,6 +136,11 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		:deep(.footer) {
 			font-size: .9em;
 		}
+		> .main:hover {
+			:deep(.footer .button) {
+				opacity: 1;
+			}
+		}
 	}
 	> .reply, > .more {
 		margin-top: 10px;
@@ -147,7 +153,23 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 	}
 
 	> .more {
-		padding: 10px 0 0 16px;
+		display: flex;
+		padding-block: 10px;
+		font-weight: 600;
+		> .line {
+			flex-grow: 0 !important;
+			margin-top: -10px !important;
+			margin-bottom: 10px !important;
+			margin-right: 10px !important;
+			&::before {
+				border-left-style: dashed !important;
+				border-bottom-left-radius: 100px !important;
+			}
+		}
+		i {
+			font-size: 1em !important;
+			vertical-align: middle !important;
+		}
 	}
 
 	&.reply-to, &.reply-to-more {
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index ca8bd8b43..ea76118a2 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -479,6 +479,7 @@ hr {
 }
 
 ._link {
+	position: relative;
 	color: var(--link);
 
 	&:after {

From 46d8528739975c6979abcfefc98a9bd257e108dd Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 24 Feb 2023 22:35:37 -0500
Subject: [PATCH 133/582] increase size when indents decrease

---
 packages/client/src/components/MkNoteSub.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index b346a15a0..29f550687 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -271,7 +271,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			margin-right: 10px;
 		}
 	}
-	@media (max-width: 450px) {
+	@media (max-width: 500px) {
 		padding: 14px 16px;
 		&.reply {
 			--avatarSize: 24px;

From 759923c36ffbe87abeff7dd00363fb9b652ae526 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 24 Feb 2023 22:37:17 -0500
Subject: [PATCH 134/582] fix alignment

---
 packages/client/src/components/MkNoteSub.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 29f550687..d065168c9 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -271,8 +271,10 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			margin-right: 10px;
 		}
 	}
-	@media (max-width: 500px) {
+	@media (max-width: 450px) {
 		padding: 14px 16px;
+	}
+	@media (max-width: 500px) {
 		&.reply {
 			--avatarSize: 24px;
 			--indent: calc(var(--avatarSize) - 4px);

From 805dbe03d00a4b0333a0b0f483d52c870e676ec4 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 00:19:39 -0500
Subject: [PATCH 135/582] change reply hover

---
 .../client/src/components/MkNoteDetailed.vue  | 59 +++++++++++++++++--
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 47d489ef6..7b712145f 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -581,19 +581,66 @@ onUnmounted(() => {
 	> .reply {
 		border-top: solid 0.5px var(--divider);
 		cursor: pointer;
-
+		&:not(:last-child) {
+			padding-bottom: 4px;
+		}
 		@media (pointer: coarse) {
 			cursor: default;
 		}
 	}
 
-	> .reply, .reply-to, .reply-to-more {
-		transition: background-color 0.25s ease-in-out;
-		
-		&:hover {
-			background-color: var(--panelHighlight);
+	// Hover
+	.reply :deep(.main), .reply-to, .reply-to-more, :deep(.more) {
+		position: relative;
+		&::before {
+			content: "";
+			position: absolute;
+			inset: -12px -24px;
+			bottom: -0px;
+			background: var(--panelHighlight);
+			border-radius: var(--radius);
+			opacity: 0;
+			transition: opacity .2s;
+			z-index: -1;
 		}
+		&.reply-to, &.reply-to-more {
+			&::before {
+				inset: 0px 8px;
+			}
+		}
+		&.reply-to-more:first-of-type::before {
+			top: 12px;
+		}
+		&::after {
+			content: "";
+			position: absolute;
+			inset: -9999px;
+			background: var(--modalBg);
+			opacity: 0;
+			z-index: -2;
+			pointer-events: none;
+			transition: opacity .2s;
+		}
+		&.more::before {
+			inset: 0 !important;
+		}
+		&:hover, &:focus-within {
+			&::before {
+				opacity: 1;
+			}
+		}
+		// @media (pointer: coarse) {
+		// 	&:has(.button:focus-within) {
+		// 		z-index: 2;
+		// 		--X13: transparent;
+		// 		&::after {
+		// 			opacity: 1;
+		// 			backdrop-filter: var(--modalBgFilter);
+		// 		}
+		// 	}
+		// }
 	}
+	
 
 	&.max-width_500px {
 		font-size: 0.9em;

From c823e770cde98c2400fb4cf787650ff7cfe2f675 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 00:21:37 -0500
Subject: [PATCH 136/582] comment out unneeded bit (maybe for now)

---
 .../client/src/components/MkNoteDetailed.vue  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 7b712145f..082cb33d3 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -611,16 +611,16 @@ onUnmounted(() => {
 		&.reply-to-more:first-of-type::before {
 			top: 12px;
 		}
-		&::after {
-			content: "";
-			position: absolute;
-			inset: -9999px;
-			background: var(--modalBg);
-			opacity: 0;
-			z-index: -2;
-			pointer-events: none;
-			transition: opacity .2s;
-		}
+		// &::after {
+		// 	content: "";
+		// 	position: absolute;
+		// 	inset: -9999px;
+		// 	background: var(--modalBg);
+		// 	opacity: 0;
+		// 	z-index: -2;
+		// 	pointer-events: none;
+		// 	transition: opacity .2s;
+		// }
 		&.more::before {
 			inset: 0 !important;
 		}

From 72b951dc7810321b24f9b0d34d221140529101d4 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 00:39:43 -0500
Subject: [PATCH 137/582] add footer hover thingy to subnote too

---
 packages/client/src/components/MkNote.vue       | 10 +++++++---
 packages/client/src/components/MkNoteFooter.vue |  1 +
 packages/client/src/components/MkNoteSub.vue    | 13 ++++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 7ebeb6d56..0d0b977d7 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -312,10 +312,14 @@ function readPromo() {
 		}
 	}
 
-	&:hover > .article > .main > .footer > .button {
-		opacity: 1;
+	& > .article > .main {
+		&:hover, &:focus-within {
+			:deep(.footer .button) {
+				opacity: 1;
+			}
+		}
 	}
-
+	
 	> .reply-to {
 		& + .note-context {
 			.line::before {
diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
index d8fcffbea..a5a7eb175 100644
--- a/packages/client/src/components/MkNoteFooter.vue
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -135,6 +135,7 @@ function blur() {
 		width: max-content;
 		min-width: max-content;
 		pointer-events: all;
+		transition: opacity .2s;
 		&:first-of-type {
 			margin-left: -.5em;
 		}
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index d065168c9..8b11cbffc 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -136,11 +136,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		:deep(.footer) {
 			font-size: .9em;
 		}
-		> .main:hover {
-			:deep(.footer .button) {
-				opacity: 1;
-			}
-		}
 	}
 	> .reply, > .more {
 		margin-top: 10px;
@@ -172,6 +167,14 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		}
 	}
 
+	&.reply, &.reply-to, &.reply-to-more {
+		> .main:hover, > .main:focus-within {
+			:deep(.footer .button) {
+				opacity: 1;
+			}
+		}
+	}
+
 	&.reply-to, &.reply-to-more {
 		padding-bottom: 0;
 		&:first-child {

From 300fcc3b99a5f4f68f6738149a44db3ed07915a5 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 01:15:42 -0500
Subject: [PATCH 138/582] allow mfm to overflow w/out it blocking any buttons

---
 packages/client/src/components/MkCwButton.vue     | 2 ++
 packages/client/src/components/MkNote.vue         | 1 -
 packages/client/src/components/MkNoteDetailed.vue | 1 +
 packages/client/src/components/MkNoteFooter.vue   | 2 ++
 packages/client/src/components/MkNoteHeader.vue   | 2 ++
 packages/client/src/components/MkNoteSub.vue      | 1 +
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 3baae82b9..902fe6d97 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -36,6 +36,8 @@ const toggle = () => {
 
 <style lang="scss" scoped>
 .nrvgflfu {
+	position: relative;
+	z-index: 2;
 	display: inline-block;
 	padding: 4px 8px;
 	font-size: 0.8em;
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 0d0b977d7..91926db47 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -451,7 +451,6 @@ function readPromo() {
 
 			> .body {
 				margin-top: .7em;
-				overflow: hidden;
 
 				> .cw {
 					cursor: default;
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 082cb33d3..4b5ca111e 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -430,6 +430,7 @@ onUnmounted(() => {
 	> .article {
 		padding: 32px;
 		font-size: 1.2em;
+		overflow: clip;
 
 		> .header {
 			display: flex;
diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
index a5a7eb175..4183225b9 100644
--- a/packages/client/src/components/MkNoteFooter.vue
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -122,6 +122,8 @@ function blur() {
 
 <style lang="scss" scoped>
 .footer {
+	position: relative;
+	z-index: 2;
 	display: flex;
 	flex-wrap: wrap;
 	pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
diff --git a/packages/client/src/components/MkNoteHeader.vue b/packages/client/src/components/MkNoteHeader.vue
index f1d2d37b0..0d0b2183d 100644
--- a/packages/client/src/components/MkNoteHeader.vue
+++ b/packages/client/src/components/MkNoteHeader.vue
@@ -47,6 +47,8 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
 
 <style lang="scss" scoped>
 .kkwtjztg {
+	position: relative;
+	z-index: 2;
 	display: flex;
 	align-items: center;
 	white-space: nowrap;
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 8b11cbffc..422c2de12 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -67,6 +67,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 .wrpstxzv {
 	padding: 16px 32px;
 	content-visibility: auto;
+	overflow: clip;
 	&.children {
 		padding: 10px 0 0 var(--indent);
 		padding-left: var(--indent) !important;

From 6e6a09e02434667ca10902d6576ef9159f1a870d Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 01:18:21 -0500
Subject: [PATCH 139/582] Fix 'close' button in posts not sticking to bottom

thanmk you overlfow clip
---
 packages/client/src/style.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index ea76118a2..819bbecb5 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -155,6 +155,10 @@ hr {
 	box-shadow: 0px 4px 32px var(--shadow) !important;
 }
 
+.swiper {
+	overflow: clip !important;
+}
+
 ._button {
 	appearance: none;
 	display: inline-block;

From d5831c575f455b7730032699cd9c90fe921d6316 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sat, 25 Feb 2023 08:18:04 +0000
Subject: [PATCH 140/582] Update 'patrons.json'

---
 patrons.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/patrons.json b/patrons.json
index ee849a5bd..3584fb2b4 100644
--- a/patrons.json
+++ b/patrons.json
@@ -14,6 +14,7 @@
 		"@effy@social.effy.space",
 		"@Kio@kitsunes.club",
 		"@twann@tech.lgbt",
-		"$[sparkle Interkosmos Link]"
+		"@surfbum@surfzone.nz",
+		"Interkosmos Link"
 	]
 }

From 6652636e095c84ce5159d39bd18f26cdff3fdcd1 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 11:10:48 -0500
Subject: [PATCH 141/582] fix line alignment

---
 packages/client/src/components/MkNoteSub.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 422c2de12..d70fee5e2 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -67,7 +67,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 .wrpstxzv {
 	padding: 16px 32px;
 	content-visibility: auto;
-	overflow: clip;
 	&.children {
 		padding: 10px 0 0 var(--indent);
 		padding-left: var(--indent) !important;
@@ -97,6 +96,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			flex: 1;
 			min-width: 0;
 			cursor: pointer;
+			overflow: clip;
 			@media (pointer: coarse) {
 				cursor: default;
 			}

From a76e94c94133bccdbec9e129277ef6ec6e891c3e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 11:57:16 -0500
Subject: [PATCH 142/582] sort of fix replies count ?

---
 packages/client/src/components/MkNoteFooter.vue | 8 +++++++-
 packages/client/src/components/MkNoteSub.vue    | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
index 4183225b9..acdb6e73e 100644
--- a/packages/client/src/components/MkNoteFooter.vue
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -4,7 +4,12 @@
 		<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
 			<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
 			<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
-			<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
+			<template v-if="directReplies > 0">
+				<p class="count">{{ directReplies }}</p>
+			</template>
+			<template v-else-if="appearNote.repliesCount > 0">
+				<p class="count">{{ appearNote.repliesCount }}</p>
+			</template>
 		</button>
 		<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
 		<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
@@ -40,6 +45,7 @@ import { useNoteCapture } from '@/scripts/use-note-capture';
 
 const props = defineProps<{
 	note: misskey.entities.Note;
+	directReplies;
 }>();
 
 let note = $ref(deepClone(props.note));
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index d70fee5e2..bcdf5af7d 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -17,7 +17,7 @@
 					<MkSubNoteContent class="text" :note="note" :detailed="true"/>
 				</div>
 			</div>
-			<MkNoteFooter :note="note"></MkNoteFooter>
+			<MkNoteFooter :note="note" :directReplies="replies.length"></MkNoteFooter>
 		</div>
 	</div>
 	<template v-if="conversation">

From 28a0936dda71da824f792d0ebbc30457be8416f7 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 12:15:35 -0500
Subject: [PATCH 143/582] Remove content-visibility oh god that did not work as
 I expected

---
 packages/client/src/components/MkNote.vue    | 1 -
 packages/client/src/components/MkNoteSub.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 91926db47..9940e3700 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -280,7 +280,6 @@ function readPromo() {
 	font-size: 1.05em;
 	overflow: clip;
 	contain: content;
-	content-visibility: auto;
 
 	// これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
 	// 下の方までスクロールすると上のノートの高さがここで決め打ちされたものに変化し、表示しているノートの位置が変わってしまう
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index bcdf5af7d..44d5b8a60 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -66,7 +66,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 <style lang="scss" scoped>
 .wrpstxzv {
 	padding: 16px 32px;
-	content-visibility: auto;
 	&.children {
 		padding: 10px 0 0 var(--indent);
 		padding-left: var(--indent) !important;

From 50556220cf822544f7e1bb58a5b9a83808995f23 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 12:36:57 -0500
Subject: [PATCH 144/582] style fixes

---
 packages/client/src/components/MkNoteDetailed.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 4b5ca111e..fabf56d2e 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -335,7 +335,6 @@ onUnmounted(() => {
 .lxwezrsl {
 	position: relative;
 	transition: box-shadow 0.1s ease;
-	overflow: hidden;
 	contain: content;
 
 	&:focus-visible {
@@ -582,9 +581,7 @@ onUnmounted(() => {
 	> .reply {
 		border-top: solid 0.5px var(--divider);
 		cursor: pointer;
-		&:not(:last-child) {
-			padding-bottom: 4px;
-		}
+		padding-bottom: 4px;
 		@media (pointer: coarse) {
 			cursor: default;
 		}
@@ -608,9 +605,9 @@ onUnmounted(() => {
 			&::before {
 				inset: 0px 8px;
 			}
-		}
-		&.reply-to-more:first-of-type::before {
-			top: 12px;
+			&:first-of-type::before {
+				top: 12px;
+			}
 		}
 		// &::after {
 		// 	content: "";

From 4c10a7b0891a3416e290a0254002d4196a3d1e3f Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sat, 25 Feb 2023 18:08:37 +0000
Subject: [PATCH 145/582] docs: run mig step

---
 docs/migrate.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/migrate.md b/docs/migrate.md
index ee3446c85..d68b7bd70 100644
--- a/docs/migrate.md
+++ b/docs/migrate.md
@@ -19,6 +19,8 @@ git remote set-url origin https://codeberg.org/calckey/calckey.git
 git fetch
 git checkout main # or beta or develop
 git pull --ff
+
+NODE_ENV=production pnpm run migrate
 # build using prefered method
 ```
 
@@ -29,9 +31,13 @@ git remote set-url origin https://codeberg.org/calckey/calckey.git
 git fetch
 git checkout main # or beta or develop
 git pull --ff
+
+NODE_ENV=production pnpm run migrate
 # build using prefered method
 ```
 
+NODE_ENV=production pnpm run migrate
+# build using prefered method
 ## Foundkey
 
 ```sh
@@ -48,5 +54,7 @@ git remote set-url origin https://codeberg.org/calckey/calckey.git
 git fetch
 git checkout main # or beta or develop
 git pull --ff
+
+NODE_ENV=production pnpm run migrate
 # build using prefered method
 ```

From 02fe1f270e91018ced95624dcd0e74b44ebcb1b6 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 13:50:24 -0500
Subject: [PATCH 146/582] add some animations to reactions

---
 .../src/components/MkReactionsViewer.reaction.vue | 15 ++++++++++++++-
 packages/client/src/style.scss                    | 15 +++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkReactionsViewer.reaction.vue b/packages/client/src/components/MkReactionsViewer.reaction.vue
index 1aee52571..f21fe175a 100644
--- a/packages/client/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/client/src/components/MkReactionsViewer.reaction.vue
@@ -98,7 +98,20 @@ useTooltip(buttonRef, async (showing) => {
 	padding: 0 6px;
 	border-radius: 4px;
 	pointer-events: all;
-
+	animation: scaleInSmall .3s cubic-bezier(0,0,0,1.2);
+	:deep(.mk-emoji) {
+		animation: scaleIn .4s cubic-bezier(0,0,0,1.5);
+		transition: transform .4s cubic-bezier(0,0,0,6);
+	}
+	&.reacted :deep(.mk-emoji) {
+		transition: transform .4s cubic-bezier(0,0,0,1);
+	}
+	&:active {
+		:deep(.mk-emoji) {
+			transition: transform .4s cubic-bezier(0,0,0,1);
+			transform: scale(.85);
+		}
+	}
 	&.canToggle {
 		background: rgba(0, 0, 0, 0.05);
 
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 819bbecb5..ea16f054c 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -615,3 +615,18 @@ hr {
     transform:  scaleX(1.00) scaleY(1.00) ;
   }
 }
+
+@media(prefers-reduced-motion: no-preference) {
+	@keyframes scaleIn {
+		from {
+			transform: scale(0);
+			opacity: 0;
+		}
+	}
+	@keyframes scaleInSmall {
+		from {
+			transform: scale(.8);
+			opacity: 0;
+		}
+	}
+}

From 55ac72100cd0f6ddcda7f582737d35d10742a776 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 15:36:35 -0500
Subject: [PATCH 147/582] Only animate in if newly added

---
 .../components/MkReactionsViewer.reaction.vue | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/components/MkReactionsViewer.reaction.vue b/packages/client/src/components/MkReactionsViewer.reaction.vue
index f21fe175a..00f49e112 100644
--- a/packages/client/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/client/src/components/MkReactionsViewer.reaction.vue
@@ -4,7 +4,7 @@
 	ref="buttonRef"
 	v-ripple="canToggle"
 	class="hkzvhatu _button"
-	:class="{ reacted: note.myReaction == reaction, canToggle }"
+	:class="{ reacted: note.myReaction == reaction, canToggle, newlyAdded: !isInitial }"
 	@click="toggleReaction()"
 >
 	<XReactionIcon class="icon" :reaction="reaction" :custom-emojis="note.emojis"/>
@@ -13,7 +13,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onMounted, onUpdated, ref, watch } from 'vue';
 import * as misskey from 'calckey-js';
 import XDetails from '@/components/MkReactionsViewer.details.vue';
 import XReactionIcon from '@/components/MkReactionIcon.vue';
@@ -55,20 +55,6 @@ const toggleReaction = () => {
 	}
 };
 
-const anime = () => {
-	if (document.hidden) return;
-
-	// TODO: 新しくリアクションが付いたことが視覚的に分かりやすいアニメーション
-};
-
-watch(() => props.count, (newCount, oldCount) => {
-	if (oldCount < newCount) anime();
-});
-
-onMounted(() => {
-	if (!props.isInitial) anime();
-});
-
 useTooltip(buttonRef, async (showing) => {
 	const reactions = await os.apiGet('notes/reactions', {
 		noteId: props.note.id,
@@ -98,9 +84,13 @@ useTooltip(buttonRef, async (showing) => {
 	padding: 0 6px;
 	border-radius: 4px;
 	pointer-events: all;
-	animation: scaleInSmall .3s cubic-bezier(0,0,0,1.2);
+	&.newlyAdded {
+		animation: scaleInSmall .3s cubic-bezier(0,0,0,1.2);
+		:deep(.mk-emoji) {
+			animation: scaleIn .4s cubic-bezier(0,0,0,1.5);
+		}
+	}
 	:deep(.mk-emoji) {
-		animation: scaleIn .4s cubic-bezier(0,0,0,1.5);
 		transition: transform .4s cubic-bezier(0,0,0,6);
 	}
 	&.reacted :deep(.mk-emoji) {

From 87641518a5bfe92d6fc5e76efd5623252d4e5690 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 15:38:36 -0500
Subject: [PATCH 148/582] a

---
 packages/client/src/components/MkReactionsViewer.reaction.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkReactionsViewer.reaction.vue b/packages/client/src/components/MkReactionsViewer.reaction.vue
index 00f49e112..6b6ebbd9f 100644
--- a/packages/client/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/client/src/components/MkReactionsViewer.reaction.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, onUpdated, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 import * as misskey from 'calckey-js';
 import XDetails from '@/components/MkReactionsViewer.details.vue';
 import XReactionIcon from '@/components/MkReactionIcon.vue';

From 4b79ad9a3e3bfd94ec9dd6e6395c868891860237 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 15:51:51 -0500
Subject: [PATCH 149/582] remove unneeded bit

---
 packages/client/src/components/MkNote.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 9940e3700..17d81b37d 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -164,7 +164,6 @@ const muted = ref(checkWordMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5) : null;
-const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance);
 
 const keymap = {
 	'r': () => reply(true),

From efa59aee6776b592be2610ca7a5d6fe0c1b86a38 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 26 Feb 2023 08:35:37 +0900
Subject: [PATCH 150/582] Fix a copy-paste error in docs

---
 docs/migrate.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/migrate.md b/docs/migrate.md
index d68b7bd70..cdb59951f 100644
--- a/docs/migrate.md
+++ b/docs/migrate.md
@@ -36,8 +36,6 @@ NODE_ENV=production pnpm run migrate
 # build using prefered method
 ```
 
-NODE_ENV=production pnpm run migrate
-# build using prefered method
 ## Foundkey
 
 ```sh

From e8d11d57e1d89bbaaa720d65b49c01d85500e897 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 19:48:10 -0500
Subject: [PATCH 151/582] change line height

---
 packages/client/src/style.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index ea16f054c..0bab91771 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -32,7 +32,7 @@ html {
 	overflow-wrap: break-word;
 	font-family: "BIZ UDGothic", Roboto, HelveticaNeue, Arial, sans-serif;
 	font-size: 14px;
-	line-height: 1.35;
+	line-height: 1.6;
 	text-size-adjust: 100%;
 	tab-size: 2;
 

From 0e306779bc5539ed9ef2a52407fba2972dea8712 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 19:59:58 -0500
Subject: [PATCH 152/582] padding tweaks

---
 packages/client/src/components/MkNoteDetailed.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index fabf56d2e..3ecc30709 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -428,6 +428,10 @@ onUnmounted(() => {
 
 	> .article {
 		padding: 32px;
+		padding-bottom: 6px;
+		&:last-child {
+			padding-bottom: 24px;
+		}
 		font-size: 1.2em;
 		overflow: clip;
 
@@ -581,7 +585,8 @@ onUnmounted(() => {
 	> .reply {
 		border-top: solid 0.5px var(--divider);
 		cursor: pointer;
-		padding-bottom: 4px;
+		padding-top: 24px;
+		padding-bottom: 10px;
 		@media (pointer: coarse) {
 			cursor: default;
 		}

From 9d3aa98dfe3bf0fd371ab45737a02165c7a2bf07 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 20:08:53 -0500
Subject: [PATCH 153/582] increase clip area of subnote body

---
 packages/client/src/components/MkNoteSub.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 44d5b8a60..f0c5ecb7a 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -95,6 +95,10 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			flex: 1;
 			min-width: 0;
 			cursor: pointer;
+			margin: -200px;
+			padding: 200px;
+			margin-bottom: 0;
+			padding-bottom: 0;
 			overflow: clip;
 			@media (pointer: coarse) {
 				cursor: default;

From 353198ed2f28c65e765540a2934bade23c5b1482 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 20:22:17 -0500
Subject: [PATCH 154/582] =?UTF-8?q?fix=20subnote=20body=20clip=20area?=
 =?UTF-8?q?=E2=84=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/client/src/components/MkNoteSub.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index f0c5ecb7a..e10b8204e 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -77,6 +77,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		}
 	}
 
+	
 	> .main {
 		display: flex;
 
@@ -95,10 +96,8 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			flex: 1;
 			min-width: 0;
 			cursor: pointer;
-			margin: -200px;
-			padding: 200px;
-			margin-bottom: 0;
-			padding-bottom: 0;
+			margin: 0 -200px;
+			padding: 0 200px;
 			overflow: clip;
 			@media (pointer: coarse) {
 				cursor: default;
@@ -131,7 +130,10 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			}
 		}
 	}
-
+	&:first-child > .main > .body {
+		margin-top: -200px;
+		padding-top: 200px;
+	}
 	&.reply {
 		--avatarSize: 38px;
 		.avatar-container {

From 48ea54e498def9ff14457b3a9f2c9a18ff88919e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 20:36:00 -0500
Subject: [PATCH 155/582] Tweak reaction animation

---
 packages/client/src/components/MkReactionsViewer.reaction.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkReactionsViewer.reaction.vue b/packages/client/src/components/MkReactionsViewer.reaction.vue
index 6b6ebbd9f..8c952addc 100644
--- a/packages/client/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/client/src/components/MkReactionsViewer.reaction.vue
@@ -87,7 +87,7 @@ useTooltip(buttonRef, async (showing) => {
 	&.newlyAdded {
 		animation: scaleInSmall .3s cubic-bezier(0,0,0,1.2);
 		:deep(.mk-emoji) {
-			animation: scaleIn .4s cubic-bezier(0,0,0,1.5);
+			animation: scaleIn .4s cubic-bezier(0.7, 0, 0, 1.5);
 		}
 	}
 	:deep(.mk-emoji) {

From a4b0c5a1fa7c276bd72ef32fd6c86abe3333cdb5 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 21:22:23 -0500
Subject: [PATCH 156/582] fix small window sizes

---
 .../client/src/components/MkNoteDetailed.vue  | 12 +-----
 packages/client/src/components/MkNoteSub.vue  | 38 +++++++++----------
 packages/client/src/pages/note.vue            |  8 +++-
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 3ecc30709..f6bbdc215 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -648,13 +648,9 @@ onUnmounted(() => {
 	&.max-width_500px {
 		font-size: 0.9em;
 	}
-
-	@media (max-width: 500px) {
-		margin-inline: -24px;
-	}
-
+	
 	&.max-width_450px {
-
+		
 		> .reply-to-more:first-child {
 			padding-top: 14px;
 		}
@@ -670,10 +666,6 @@ onUnmounted(() => {
 		}
 	}
 
-	@media (max-width: 400px) {
-		margin-inline: -12px;
-	}
-
 	&.max-width_350px {
 		> .article {
 			> .main {
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index e10b8204e..234348976 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -1,5 +1,5 @@
 <template>
-<div v-size="{ max: [450] }" class="wrpstxzv" :class="{ children: depth > 1, singleStart: replies.length == 1, firstColumn: depth == 1 && conversation }">
+<div v-size="{ max: [450, 500] }" class="wrpstxzv" :class="{ children: depth > 1, singleStart: replies.length == 1, firstColumn: depth == 1 && conversation }">
 	<div v-if="conversation && depth > 1" class="line"></div>
 	<div class="main" @click="router.push(notePage(note))">
 		<div class="avatar-container">
@@ -269,7 +269,25 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		}
 	}
 
+	&.max-width_500px {
+		:not(.reply) > & {
+			.reply {
+				--avatarSize: 24px;
+				--indent: calc(var(--avatarSize) - 4px);
+			}
+			&.firstColumn {
+				> .main, > .line, > .children:not(.single) > .line {
+					--avatarSize: 35px;
+					--indent: 35px;
+				}
+				> .children:not(.single) {
+					padding-left: 28px !important;
+				}
+			}
+		}
+	}
 	&.max-width_450px {
+		padding: 14px 16px;
 		&.reply-to, &.reply-to-more {
 			padding: 14px 16px;
 			padding-top: 14px !important;
@@ -280,23 +298,5 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			margin-right: 10px;
 		}
 	}
-	@media (max-width: 450px) {
-		padding: 14px 16px;
-	}
-	@media (max-width: 500px) {
-		&.reply {
-			--avatarSize: 24px;
-			--indent: calc(var(--avatarSize) - 4px);
-		}
-		&.firstColumn {
-			> .main, > .line, > .children:not(.single) > .line {
-				--avatarSize: 35px;
-				--indent: 35px;
-			}
-			> .children:not(.single) {
-				padding-left: 28px !important;
-			}
-		}
-	}
 }
 </style>
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index f2a7bb78a..47a79d56a 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -2,7 +2,7 @@
 <MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :content-max="800">
-		<div class="fcuexfpr">
+		<div class="fcuexfpr" v-size="{ max: [500, 350] }">
 			<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
 				<div v-if="note" class="note">
 					<div v-if="showNext" class="_gap">
@@ -202,5 +202,11 @@ definePageMetadata(computed(() => note ? {
 			}
 		}
 	}
+	&.max-width_500px > .note {
+		margin-inline: -24px;
+	}
+	&.max-width_350px > .note {
+		margin-inline: -12px;
+	}
 }
 </style>

From af8460e90a0b84769a364b326487b74e42630391 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 21:49:41 -0500
Subject: [PATCH 157/582] don't know why that was like that oops

---
 packages/client/src/components/global/MkPageHeader.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index fce2c836c..1569cddf9 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -169,10 +169,10 @@ onMounted(() => {
 	});
 
   if (el && el.parentElement) {
-    narrow.value = el.parentElement.offsetWidth < 500;
+    narrow = el.parentElement.offsetWidth < 500;
     ro = new ResizeObserver((entries, observer) => {
       if (el.parentElement && document.body.contains(el)) {
-        narrow.value = el.parentElement.offsetWidth < 500;
+        narrow = el.parentElement.offsetWidth < 500;
       }
     });
     ro.observe(el.parentElement);

From 8201f0390c11d4f2ec085adc4787bd8e6e63bce3 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 21:51:37 -0500
Subject: [PATCH 158/582] fix indents on this ?

---
 .../src/components/global/MkPageHeader.vue     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 1569cddf9..5eaa5e4fe 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -168,15 +168,15 @@ onMounted(() => {
 		immediate: true,
 	});
 
-  if (el && el.parentElement) {
-    narrow = el.parentElement.offsetWidth < 500;
-    ro = new ResizeObserver((entries, observer) => {
-      if (el.parentElement && document.body.contains(el)) {
-        narrow = el.parentElement.offsetWidth < 500;
-      }
-    });
-    ro.observe(el.parentElement);
-  }
+	if (el && el.parentElement) {
+		narrow = el.parentElement.offsetWidth < 500;
+		ro = new ResizeObserver((entries, observer) => {
+			if (el.parentElement && document.body.contains(el)) {
+				narrow = el.parentElement.offsetWidth < 500;
+			}
+		});
+		ro.observe(el.parentElement);
+	}
 });
 
 onUnmounted(() => {

From 62ad11c354554571b3e739530d15dd4ae82eb433 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 25 Feb 2023 21:53:12 -0500
Subject: [PATCH 159/582] also fix that indent, huh

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

diff --git a/package.json b/package.json
index ef22dab20..11a539409 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
 		"test": "pnpm run mocha",
 		"format": "gulp format",
 		"clean": "pnpm node ./scripts/clean.js",
-	"clean-all": "pnpm node ./scripts/clean-all.js",
+		"clean-all": "pnpm node ./scripts/clean-all.js",
 		"cleanall": "pnpm run clean-all"
 	},
 	"resolutions": {

From f1275de03cba27990fed013f7513a9dcb1f087eb Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 26 Feb 2023 11:33:38 -0500
Subject: [PATCH 160/582] Only use regular reply icon

---
 packages/client/src/components/MkNoteFooter.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
index acdb6e73e..44feed322 100644
--- a/packages/client/src/components/MkNoteFooter.vue
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -2,8 +2,7 @@
 	<footer ref="el" class="footer" @click.stop>
 		<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
 		<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
-			<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
-			<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
+			<i class="ph-arrow-bend-up-left-bold ph-lg"></i>
 			<template v-if="directReplies > 0">
 				<p class="count">{{ directReplies }}</p>
 			</template>

From f0eabd3dd5a7348284834e4afe7083f26e6c6e89 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@noreply.codeberg.org>
Date: Sun, 26 Feb 2023 23:54:43 +0000
Subject: [PATCH 161/582] chore: update Japanese locale (#9673) Co-authored-by:
 Namekuji <nmkj@noreply.codeberg.org> Co-committed-by: Namekuji
 <nmkj@noreply.codeberg.org>

---
 locales/ja-JP.yml | 329 +++++++++++++++++++++-------------------------
 1 file changed, 152 insertions(+), 177 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 5372c8e3d..b676a5e17 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1,7 +1,7 @@
+---
 _lang_: "日本語"
-
-headlineMisskey: "ノートでつながるネットワーク"
-introMisskey: "ようこそ！Misskeyは、オープンソースの分散型マイクロブログサービスです。\n「ノート」を作成して、いま起こっていることを共有したり、あなたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素早く反応を追加することもできます👍\n新しい世界を探検しよう🚀"
+headlineMisskey: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム🚀"
+introMisskey: "ようこそ！Calckeyは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しよう📡\n「リアクション」機能で、皆の投稿に素早く反応を追加することもできます👍\n新しい世界を探検しよう🚀"
 monthAndDay: "{month}月 {day}日"
 search: "検索"
 notifications: "通知"
@@ -10,11 +10,11 @@ password: "パスワード"
 forgotPassword: "パスワードを忘れた"
 fetchingAsApObject: "連合に照会中"
 ok: "OK"
-gotIt: "わかった"
+gotIt: "わかった！"
 cancel: "キャンセル"
 enterUsername: "ユーザー名を入力"
-renotedBy: "{user}がRenote"
-noNotes: "ノートはありません"
+renotedBy: "{user}がブースト"
+noNotes: "投稿はありません"
 noNotifications: "通知はありません"
 instance: "インスタンス"
 settings: "設定"
@@ -32,6 +32,7 @@ uploading: "アップロード中"
 save: "保存"
 users: "ユーザー"
 addUser: "ユーザーを追加"
+addInstance: "インスタンスを追加"
 favorite: "お気に入り"
 favorites: "お気に入り"
 unfavorite: "お気に入り解除"
@@ -44,7 +45,7 @@ copyContent: "内容をコピー"
 copyLink: "リンクをコピー"
 delete: "削除"
 deleteAndEdit: "削除して編集"
-deleteAndEditConfirm: "このノートを削除してもう一度編集しますか？このノートへのリアクション、Renote、返信も全て削除されます。"
+deleteAndEditConfirm: "この投稿を削除してもう一度編集しますか？この投稿へのリアクション、ブースト、返信も全て削除されます。"
 addToList: "リストに追加"
 sendMessage: "メッセージを送信"
 copyUsername: "ユーザー名をコピー"
@@ -64,14 +65,14 @@ import: "インポート"
 export: "エクスポート"
 files: "ファイル"
 download: "ダウンロード"
-driveFileDeleteConfirm: "ファイル「{name}」を削除しますか？このファイルを添付したノートも消えます。"
+driveFileDeleteConfirm: "ファイル「{name}」を削除しますか？このファイルを添付した投稿も消えます。"
 unfollowConfirm: "{name}のフォローを解除しますか？"
 exportRequested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、「ドライブ」に追加されます。"
 importRequested: "インポートをリクエストしました。これには時間がかかる場合があります。"
 lists: "リスト"
 noLists: "リストはありません"
-note: "ノート"
-notes: "ノート"
+note: "投稿"
+notes: "投稿"
 following: "フォロー"
 followers: "フォロワー"
 followsYou: "フォローされています"
@@ -94,13 +95,13 @@ followRequests: "フォロー申請"
 unfollow: "フォロー解除"
 followRequestPending: "フォロー許可待ち"
 enterEmoji: "絵文字を入力"
-renote: "Renote"
-unrenote: "Renote解除"
-renoted: "Renoteしました。"
-cantRenote: "この投稿はRenoteできません。"
-cantReRenote: "RenoteをRenoteすることはできません。"
+renote: "ブースト"
+unrenote: "ブースト解除"
+renoted: "ブーストしました。"
+cantRenote: "この投稿はブーストできません。"
+cantReRenote: "ブーストをブーストすることはできません。"
 quote: "引用"
-pinnedNote: "ピン留めされたノート"
+pinnedNote: "ピン留めされた投稿"
 pinned: "ピン留め"
 you: "あなた"
 clickToShow: "クリックして表示"
@@ -139,11 +140,11 @@ settingGuide: "おすすめ設定"
 cacheRemoteFiles: "リモートのファイルをキャッシュする"
 cacheRemoteFilesDescription: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクするようになります。サーバーのストレージを節約できますが、サムネイルが生成されないので通信量が増加します。"
 flagAsBot: "Botとして設定"
-flagAsBotDescription: "このアカウントがプログラムによって運用される場合は、このフラグをオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Misskeyのシステム上での扱いがBotに合ったものになります。"
-flagAsCat: "Catとして設定"
+flagAsBotDescription: "このアカウントがプログラムによって運用される場合は、このフラグをオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Calckeyのシステム上での扱いがBotに合ったものになります。"
+flagAsCat: "あなたは…猫？😺"
 flagAsCatDescription: "このアカウントが猫であることを示す場合は、このフラグをオンにします。"
-flagShowTimelineReplies: "タイムラインにノートへの返信を表示する"
-flagShowTimelineRepliesDescription: "オンにすると、タイムラインにユーザーのノート以外にもそのユーザーの他のノートへの返信を表示します。"
+flagShowTimelineReplies: "タイムラインに投稿の返信を表示する"
+flagShowTimelineRepliesDescription: "オンにすると、タイムラインにユーザーの投稿以外にもそのユーザーの他の投稿への返信を表示します。"
 autoAcceptFollowed: "フォロー中ユーザーからのフォロリクを自動承認"
 addAccount: "アカウントを追加"
 loginFailed: "ログインに失敗しました"
@@ -160,6 +161,7 @@ proxyAccount: "プロキシアカウント"
 proxyAccountDescription: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがインスタンスに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
 host: "ホスト"
 selectUser: "ユーザーを選択"
+selectInstance: "インスタンスを選択"
 recipient: "宛先"
 annotation: "注釈"
 federation: "連合"
@@ -197,10 +199,11 @@ muteAndBlock: "ミュートとブロック"
 mutedUsers: "ミュートしたユーザー"
 blockedUsers: "ブロックしたユーザー"
 noUsers: "ユーザーはいません"
+noInstances: "インスタンスはありません"
 editProfile: "プロフィールを編集"
-noteDeleteConfirm: "このノートを削除しますか？"
+noteDeleteConfirm: "この投稿を削除しますか？"
 pinLimitExceeded: "これ以上ピン留めできません"
-intro: "Misskeyのインストールが完了しました！管理者アカウントを作成しましょう。"
+intro: "Calckeyのインストールが完了しました！管理者アカウントを作成しましょう。"
 done: "完了"
 processing: "処理中"
 preview: "プレビュー"
@@ -325,7 +328,7 @@ connectService: "接続する"
 disconnectService: "切断する"
 enableLocalTimeline: "ローカルタイムラインを有効にする"
 enableGlobalTimeline: "グローバルタイムラインを有効にする"
-enableRecommendedTimeline: "推奨されるタイムラインを有効にする"
+enableRecommendedTimeline: "おすすめタイムラインを有効にする"
 disablingTimelinesInfo: "これらのタイムラインを無効化しても、利便性のため管理者およびモデレーターは引き続き利用することができます。"
 registration: "登録"
 enableRegistration: "誰でも新規登録できるようにする"
@@ -342,7 +345,7 @@ pinnedUsersDescription: "「みつける」ページなどにピン留めした
 pinnedPages: "ピン留めページ"
 pinnedPagesDescription: "インスタンスのトップページにピン留めしたいページのパスを改行で区切って記述します。"
 pinnedClipId: "ピン留めするクリップのID"
-pinnedNotes: "ピン留めされたノート"
+pinnedNotes: "ピン留めされた投稿"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptchaを有効にする"
 hcaptchaSiteKey: "サイトキー"
@@ -359,10 +362,11 @@ antennaSource: "受信ソース"
 antennaKeywords: "受信キーワード"
 antennaExcludeKeywords: "除外キーワード"
 antennaKeywordsDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
-notifyAntenna: "新しいノートを通知する"
-withFileAntenna: "ファイルが添付されたノートのみ"
+notifyAntenna: "新しい投稿を通知する"
+withFileAntenna: "ファイルが添付された投稿のみ"
 enableServiceworker: "ブラウザへのプッシュ通知を有効にする"
 antennaUsersDescription: "ユーザー名を改行で区切って指定します"
+antennaInstancesDescription: "インスタンスを改行で区切って指定します"
 caseSensitive: "大文字小文字を区別する"
 withReplies: "返信を含む"
 connectedTo: "次のアカウントに接続されています"
@@ -393,7 +397,7 @@ securityKeyName: "キーの名前"
 registerSecurityKey: "セキュリティキーを登録する"
 lastUsed: "最後の使用"
 unregister: "登録を解除"
-passwordLessLogin: "パスワード無しログイン"
+passwordLessLogin: "パスワード無しでログイン"
 resetPassword: "パスワードをリセット"
 newPasswordIs: "新しいパスワードは「{password}」です"
 reduceUiAnimation: "UIのアニメーションを減らす"
@@ -422,9 +426,9 @@ messagingWithGroup: "グループでチャット"
 title: "タイトル"
 text: "テキスト"
 enable: "有効にする"
-next: "次"
+next: "次へ"
 retype: "再入力"
-noteOf: "{user}のノート"
+noteOf: "{user}の投稿"
 inviteToGroup: "グループに招待"
 quoteAttached: "引用付き"
 quoteQuestion: "引用として添付しますか？"
@@ -482,8 +486,8 @@ accountSettings: "アカウント設定"
 promotion: "プロモーション"
 promote: "プロモート"
 numberOfDays: "日数"
-hideThisNote: "このノートを非表示"
-showFeaturedNotesInTimeline: "タイムラインにおすすめのノートを表示する"
+hideThisNote: "この投稿を非表示"
+showFeaturedNotesInTimeline: "タイムラインにおすすめの投稿を表示する"
 objectStorage: "オブジェクトストレージ"
 useObjectStorage: "オブジェクトストレージを使用"
 objectStorageBaseUrl: "Base URL"
@@ -504,7 +508,7 @@ objectStorageSetPublicRead: "アップロード時に'public-read'を設定す
 serverLogs: "サーバーログ"
 deleteAll: "全て削除"
 showFixedPostForm: "タイムライン上部に投稿フォームを表示する"
-newNoteRecived: "新しいノートがあります"
+newNoteRecived: "新しい投稿があります"
 sounds: "サウンド"
 listen: "聴く"
 none: "なし"
@@ -519,7 +523,7 @@ recentUsed: "最近使用"
 install: "インストール"
 uninstall: "アンインストール"
 installedApps: "インストールされたアプリ"
-nothing: "ありません"
+nothing: "まだ何もありません"
 installedDate: "インストール日時"
 lastUsedDate: "最終使用日時"
 state: "状態"
@@ -527,10 +531,10 @@ sort: "ソート"
 ascendingOrder: "昇順"
 descendingOrder: "降順"
 scratchpad: "スクラッチパッド"
-scratchpadDescription: "スクラッチパッドは、AiScriptの実験環境を提供します。Misskeyと対話するコードの記述、実行、結果の確認ができます。"
+scratchpadDescription: "スクラッチパッドは、AiScriptの実験環境を提供します。Calckeyと対話するコードの記述、実行、結果の確認ができます。"
 output: "出力"
 script: "スクリプト"
-disablePagesScript: "Pagesのスクリプトを無効にする"
+disablePagesScript: "ページのスクリプトを無効にする"
 updateRemoteUser: "リモートユーザー情報の更新"
 deleteAllFiles: "すべてのファイルを削除"
 deleteAllFilesConfirm: "すべてのファイルを削除しますか？"
@@ -626,7 +630,7 @@ sample: "サンプル"
 abuseReports: "通報"
 reportAbuse: "通報"
 reportAbuseOf: "{name}を通報する"
-fillAbuseReportDescription: "通報理由の詳細を記入してください。対象のノートがある場合はそのURLも記入してください。"
+fillAbuseReportDescription: "通報理由の詳細を記入してください。対象の投稿がある場合はそのURLも記入してください。"
 abuseReported: "内容が送信されました。ご報告ありがとうございました。"
 reporter: "通報者"
 reporteeOrigin: "通報先"
@@ -639,7 +643,7 @@ openInNewTab: "新しいタブで開く"
 openInSideView: "サイドビューで開く"
 defaultNavigationBehaviour: "デフォルトのナビゲーション"
 editTheseSettingsMayBreakAccount: "これらの設定を編集するとアカウントが破損する可能性があります。"
-instanceTicker: "ノートのインスタンス情報"
+instanceTicker: "投稿のインスタンス情報"
 waitingFor: "{x}を待っています"
 random: "ランダム"
 system: "システム"
@@ -650,16 +654,16 @@ createNew: "新規作成"
 optional: "任意"
 createNewClip: "新しいクリップを作成"
 unclip: "クリップ解除"
-confirmToUnclipAlreadyClippedNote: "このノートはすでにクリップ「{name}」に含まれています。ノートをこのクリップから除外しますか？"
+confirmToUnclipAlreadyClippedNote: "この投稿はすでにクリップ「{name}」に含まれています。投稿をこのクリップから除外しますか？"
 public: "パブリック"
 i18nInfo: "Calckeyは有志によって様々な言語に翻訳されています。{link}で翻訳に協力できます。"
 manageAccessTokens: "アクセストークンの管理"
 accountInfo: "アカウント情報"
-notesCount: "ノートの数"
+notesCount: "投稿の数"
 repliesCount: "返信した数"
-renotesCount: "Renoteした数"
+renotesCount: "ブーストした数"
 repliedCount: "返信された数"
-renotedCount: "Renoteされた数"
+renotedCount: "ブーストされた数"
 followingCount: "フォロー数"
 followersCount: "フォロワー数"
 sentReactionsCount: "リアクションした数"
@@ -671,17 +675,17 @@ no: "いいえ"
 driveFilesCount: "ドライブのファイル数"
 driveUsage: "ドライブ使用量"
 noCrawle: "クローラーによるインデックスを拒否"
-noCrawleDescription: "検索エンジンにあなたのユーザーページ、ノート、Pagesなどのコンテンツを登録(インデックス)しないよう要請します。"
-lockedAccountInfo: "フォローを承認制にしても、ノートの公開範囲を「フォロワー」にしない限り、誰でもあなたのノートを見ることができます。"
+noCrawleDescription: "検索エンジンにあなたのプロフィールや投稿、ページなどのコンテンツを登録(インデックス)しないよう要請します。"
+lockedAccountInfo: "フォローを承認制にしても、投稿の公開範囲を「フォロワー」にしない限り、誰でもあなたの投稿を見ることができます。"
 alwaysMarkSensitive: "デフォルトでメディアを閲覧注意にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
 disableShowingAnimatedImages: "アニメーション画像を再生しない"
 verificationEmailSent: "確認のメールを送信しました。メールに記載されたリンクにアクセスして、設定を完了してください。"
 notSet: "未設定"
 emailVerified: "メールアドレスが確認されました"
-noteFavoritesCount: "お気に入りノートの数"
-pageLikesCount: "Pageにいいねした数"
-pageLikedCount: "Pageにいいねされた数"
+noteFavoritesCount: "お気に入りの投稿の数"
+pageLikesCount: "ページにいいねした数"
+pageLikedCount: "ページにいいねされた数"
 contact: "連絡先"
 useSystemFont: "システムのデフォルトのフォントを使う"
 clips: "クリップ"
@@ -689,7 +693,7 @@ experimentalFeatures: "実験的機能"
 developer: "開発者"
 makeExplorable: "アカウントを見つけやすくする"
 makeExplorableDescription: "オフにすると、「みつける」にアカウントが載らなくなります。"
-showGapBetweenNotesInTimeline: "タイムラインのノートを離して表示"
+showGapBetweenNotesInTimeline: "タイムラインの投稿を離して表示"
 duplicate: "複製"
 left: "左"
 center: "中央"
@@ -701,9 +705,9 @@ showTitlebar: "タイトルバーを表示する"
 clearCache: "キャッシュをクリア"
 onlineUsersCount: "{n}人がオンライン"
 nUsers: "{n}ユーザー"
-nNotes: "{n}ノート"
+nNotes: "{n}投稿"
 sendErrorReports: "エラーリポートを送信"
-sendErrorReportsDescription: "オンにすると、問題が発生したときにエラーの詳細情報がMisskeyに共有され、ソフトウェアの品質向上に役立てることができます。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれます。"
+sendErrorReportsDescription: "オンにすると、問題が発生したときにエラーの詳細情報がCalckeyに共有され、ソフトウェアの品質向上に役立てることができます。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれます。"
 myTheme: "マイテーマ"
 backgroundColor: "背景"
 accentColor: "アクセント"
@@ -742,7 +746,7 @@ unlikeConfirm: "いいね解除しますか？"
 fullView: "フルビュー"
 quitFullView: "フルビュー解除"
 addDescription: "説明を追加"
-userPagePinTip: "個々のノートのメニューから「ピン留め」を選択することで、ここにノートを表示しておくことができます。"
+userPagePinTip: "個々の投稿のメニューから「ピン留め」を選択することで、ここに投稿を表示しておくことができます。"
 notSpecifiedMentionWarning: "宛先に含まれていないメンションがあります"
 info: "情報"
 userInfo: "ユーザー情報"
@@ -772,7 +776,7 @@ postToGallery: "ギャラリーへ投稿"
 gallery: "ギャラリー"
 recentPosts: "最近の投稿"
 popularPosts: "人気の投稿"
-shareWithNote: "ノートで共有"
+shareWithNote: "投稿で共有"
 ads: "広告"
 expiration: "期限"
 memo: "メモ"
@@ -786,7 +790,7 @@ secureMode: "セキュアモード (Authorized Fetch)"
 instanceSecurity: "インスタンスのセキュリティー"
 secureModeInfo: "他のインスタンスからリクエストするときに、証明を付けなければ返送しません。他のインスタンスの設定ファイルでsignToActivityPubGetはtrueにしてください。"
 privateMode: "非公開モード"
-privateModeInfo: "有効にして、許可されているインスタンスのみがリクエストできます。すべてのノートが公開に非表示にします。"
+privateModeInfo: "有効にして、許可されているインスタンスのみがリクエストできます。すべての投稿が公開に非表示にします。"
 allowedInstances: "許可されたインスタンス"
 allowedInstancesDescription: "許可したいインスタンスのホストを改行で区切って設定します。非公開モードだけで有効です。"
 previewNoteText: "本文をプレビュー"
@@ -794,7 +798,7 @@ customCss: "カスタムCSS"
 customCssWarn: "この設定は必ず知識のある方が行ってください。不適切な設定を行うとクライアントが正常に使用できなくなる恐れがあります。"
 global: "グローバル"
 squareAvatars: "アイコンを四角形で表示"
-seperateRenoteQuote: "リノートと引用ボタンを分ける"
+seperateRenoteQuote: "ブーストと引用ボタンを分ける"
 sent: "送信"
 received: "受信"
 searchResult: "検索結果"
@@ -802,13 +806,13 @@ hashtags: "ハッシュタグ"
 troubleshooting: "トラブルシューティング"
 useBlurEffect: "UIにぼかし効果を使用"
 learnMore: "詳しく"
-misskeyUpdated: "Misskeyが更新されました！"
+misskeyUpdated: "Calckeyが更新されました！"
 whatIsNew: "更新情報を見る"
 translate: "翻訳"
 translatedFrom: "{x}から翻訳"
 accountDeletionInProgress: "アカウントの削除が進行中です"
 usernameInfo: "サーバー上であなたのアカウントを一意に識別するための名前。アルファベット(a~z, A~Z)、数字(0~9)、およびアンダーバー(_)が使用できます。ユーザー名は後から変更することは出来ません。"
-aiChanMode: "藍モード"
+aiChanMode: "藍モード（クラシックUI）"
 enterSendsMessage: "メッセージングでReturnキーを押すと、メッセージが送信されます（デフォルトはCtrl + Returnです）"
 keepCw: "CWを維持する"
 pubSub: "Pub/Subのアカウント"
@@ -912,15 +916,25 @@ customMOTDDescription: "ユーザがページをロード/リロードするた
 customSplashIcons: "カスタムスプラッシュスクリーンアイコン"
 customSplashIconsDescription: "ユーザがページをロード/リロードするたびにランダムに表示される、改行で区切られたカスタムスプラッシュスクリーンアイコンの URL。画像は静的なURLで、できればすべて192x192にリサイズしてください。"
 showUpdates: "Calckeyの更新時にポップアップを表示する"
-recommendedInstances: "推奨インスタンス"
-recommendedInstancesDescription: "推奨タイムラインに表示するために改行で区切られた推奨インスタンス。`https://`を追加しないでください。ドメインのみを追加してください。"
+recommendedInstances: "おすすめインスタンス"
+recommendedInstancesDescription: "おすすめタイムラインに表示される、改行で区切られたインスタンス。`https://`を追加しないでください。ドメインのみを追加してください。"
 caption: "自動キャプション"
 splash: "スプラッシュスクリーン"
-updateAvailable: "アップデートがありますよ"
+updateAvailable: "アップデートがありますよ！"
 swipeOnDesktop: "デスクトップでモバイルスタイルのスワイプを可能にする"
 logoImageUrl: "ロゴのURL"
 showAdminUpdates: "新しいCalckeyのバージョンが利用可能であることを示す(管理者のみ)"
-replayTutorial: "リプレイチュートリアル"
+replayTutorial: "もう一度チュートリアルを見る"
+migration: "アカウントの引っ越し"
+moveTo: "このアカウントを新しいアカウントに引っ越す"
+moveToLabel: "引っ越し先のアカウント："
+moveAccount: "引っ越し実行！"
+moveAccountDescription: "この操作は取り消せません。まずは引っ越し先のアカウントでこのアカウントに対しエイリアスを作成したことを確認してください。エイリアス作成後、引っ越し先のアカウントをこのように入力してください：@person@instance.com"
+moveFrom: "別のアカウントからこのアカウントに引っ越す"
+moveFromLabel: "引っ越し元のアカウント："
+moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。必ず引っ越しを実行する前に作成してください！引っ越し元のアカウントをこのように入力してください：@person@instance.com"
+migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用することはできません。\nまた、引っ越し先のアカウントでエイリアスを作成したことを確認してください。"
+defaultReaction: "リモートとローカルの投稿に対するデフォルトの絵文字リアクション"
 
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。"
@@ -930,24 +944,20 @@ _sensitiveMediaDetection:
   setSensitiveFlagAutomaticallyDescription: "この設定をオフにしても内部的に判定結果は保持されます。"
   analyzeVideos: "動画の解析を有効化"
   analyzeVideosDescription: "静止画に加えて動画も解析するようにします。サーバーの負荷が少し増えます。"
-
 _emailUnavailable:
   used: "既に使用されています"
   format: "形式が正しくありません"
   disposable: "恒久的に使用可能なアドレスではありません"
   mx: "正しいメールサーバーではありません"
   smtp: "メールサーバーが応答しません"
-
 _ffVisibility:
   public: "公開"
   followers: "フォロワーだけに公開"
   private: "非公開"
-
 _signup:
   almostThere: "ほとんど完了です"
   emailAddressInfo: "あなたが使っているメールアドレスを入力してください。メールアドレスが公開されることはありません。"
   emailSent: "入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。"
-
 _accountDelete:
   accountDelete: "アカウントの削除"
   mayTakeTime: "アカウントの削除は負荷のかかる処理であるため、作成したコンテンツの数やアップロードしたファイルの数が多いと完了までに時間がかかることがあります。"
@@ -955,33 +965,27 @@ _accountDelete:
   requestAccountDelete: "アカウント削除をリクエスト"
   started: "削除処理が開始されました。"
   inProgress: "削除が進行中"
-
 _ad:
   back: "戻る"
   reduceFrequencyOfThisAd: "この広告の表示頻度を下げる"
-
 _forgotPassword:
   enterEmail: "アカウントに登録したメールアドレスを入力してください。そのアドレス宛てに、パスワードリセット用のリンクが送信されます。"
   ifNoEmail: "メールアドレスを登録していない場合は、管理者までお問い合わせください。"
   contactAdmin: "このインスタンスではメールがサポートされていないため、パスワードリセットを行う場合は管理者までお問い合わせください。"
-
 _gallery:
   my: "自分の投稿"
   liked: "いいねした投稿"
   like: "いいね！"
   unlike: "いいね解除"
-
 _email:
   _follow:
     title: "フォローされました"
   _receiveFollowRequest:
     title: "フォローリクエストを受け取りました"
-
 _plugin:
   install: "プラグインのインストール"
   installWarn: "信頼できないプラグインはインストールしないでください。"
   manage: "プラグインの管理"
-
 _preferencesBackups:
   list: "作成したバックアップ"
   saveNew: "新規保存"
@@ -1000,33 +1004,29 @@ _preferencesBackups:
   updatedAt: "更新日時: {date} {time}"
   cannotLoad: "読み込みできません"
   invalidFile: "ファイル形式が違います。"
-
 _registry:
   scope: "スコープ"
   key: "キー"
   keys: "キー"
   domain: "ドメイン"
   createKey: "キーを作成"
-
 _aboutMisskey:
-  about: "Calckeyは、2022年から開発されているThatOneCalculator社製のMisskeyのforkです。"
+  about: "Calckeyは、2022年に生まれたThatOneCalculatorによるMisskeyのforkです。"
   contributors: "主なコントリビューター"
   allContributors: "全てのコントリビューター"
   source: "ソースコード"
-  translation: "Misskeyを翻訳"
-  donate: "Misskeyに寄付"
-  morePatrons: "他にも多くの方が支援してくれています。ありがとうございます🥰"
+  translation: "Calckeyを翻訳"
+  donate: "Calckeyに寄付"
+  morePatrons: "他にも多くの方が支援してくれています。ありがとうございます！ 🥰"
   patrons: "支援者"
-
 _nsfw:
   respect: "閲覧注意のメディアは隠す"
   ignore: "閲覧注意のメディアを隠さない"
   force: "常にメディアを隠す"
-
 _mfm:
   cheatSheet: "MFMチートシート"
-  intro: "MFMは、Misskey内の様々な場所で使用できる専用のマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
-  dummy: "MisskeyでFediverseの世界が広がります"
+  intro: "MFMは、MisskeyやCalckey、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
+  dummy: "CalckeyでFediverseの世界が広がります"
   mention: "メンション"
   mentionDescription: "アットマーク + ユーザー名で、特定のユーザーを示すことができます。"
   hashtag: "ハッシュタグ"
@@ -1089,18 +1089,15 @@ _mfm:
   rotateDescription: "指定した角度で回転させます。"
   plain: "プレーン"
   plainDescription: "内側の構文を全て無効にします。"
-
 _instanceTicker:
   none: "表示しない"
   remote: "リモートユーザーに表示"
   always: "常に表示"
-
 _serverDisconnectedBehavior:
   reload: "自動でリロード"
   dialog: "ダイアログで警告"
   quiet: "控えめに警告"
   nothing: "何も起こらない"
-
 _channel:
   create: "チャンネルを作成"
   edit: "チャンネルを編集"
@@ -1111,33 +1108,28 @@ _channel:
   following: "フォロー中"
   usersCount: "{n}人が参加中"
   notesCount: "{n}投稿があります"
-
 _messaging:
   dms: "ディーエム"
   groups: "グループ"
-
 _menuDisplay:
   sideFull: "横"
   sideIcon: "横(アイコン)"
   top: "上部"
   hide: "隠す"
-
 _wordMute:
   muteWords: "ミュートするワード"
   muteWordsDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。"
   muteWordsDescription2: "キーワードをスラッシュで囲むと正規表現になります。"
-  softDescription: "指定した条件のノートをタイムラインから隠します。"
-  hardDescription: "指定した条件のノートをタイムラインに追加しないようにします。追加されなかったノートは、条件を変更しても除外されたままになります。"
+  softDescription: "指定した条件の投稿をタイムラインから隠します。"
+  hardDescription: "指定した条件の投稿をタイムラインに追加しないようにします。追加されなかった投稿は、条件を変更しても除外されたままになります。"
   soft: "ソフト"
   hard: "ハード"
-  mutedNotes: "ミュートされたノート"
-
+  mutedNotes: "ミュートされた投稿"
 _instanceMute:
-  instanceMuteDescription: "ミュートしたインスタンスのユーザーへの返信を含めて、設定したインスタンスの全てのノートとRenoteをミュートします。"
+  instanceMuteDescription: "ミュートしたインスタンスのユーザーへの返信を含めて、設定したインスタンスの全ての投稿とブーストをミュートします。"
   instanceMuteDescription2: "改行で区切って設定します"
-  title: "設定したインスタンスのノートを隠します。"
+  title: "設定したインスタンスの投稿を隠します。"
   heading: "ミュートするインスタンス"
-
 _theme:
   explore: "テーマを探す"
   install: "テーマのインストール"
@@ -1168,7 +1160,6 @@ _theme:
   inputConstantName: "定数名を入力してください"
   importInfo: "ここにテーマコードを貼り付けて、エディターにインポートできます"
   deleteConstantConfirm: "定数 {const} を削除しても良いですか？"
-
   keys:
     accent: "アクセント"
     bg: "背景"
@@ -1187,7 +1178,7 @@ _theme:
     hashtag: "ハッシュタグ"
     mention: "メンション"
     mentionMe: "あなた宛てメンション"
-    renote: "Renote"
+    renote: "ブースト"
     modalBg: "モーダルの背景"
     divider: "分割線"
     scrollbarHandle: "スクロールバーの取っ手"
@@ -1213,16 +1204,14 @@ _theme:
     accentDarken: "アクセント (暗め)"
     accentLighten: "アクセント (明るめ)"
     fgHighlighted: "強調された文字"
-
 _sfx:
-  note: "ノート"
-  noteMy: "ノート(自分)"
+  note: "投稿"
+  noteMy: "投稿(自分)"
   notification: "通知"
   chat: "チャット"
   chatBg: "チャット(バックグラウンド)"
   antenna: "アンテナ受信"
   channel: "チャンネル通知"
-
 _ago:
   future: "未来"
   justNow: "たった今"
@@ -1233,35 +1222,32 @@ _ago:
   weeksAgo: "{n}週間前"
   monthsAgo: "{n}ヶ月前"
   yearsAgo: "{n}年前"
-
 _time:
   second: "秒"
   minute: "分"
   hour: "時間"
   day: "日"
-
 _tutorial:
   title: "Calckeyの使い方"
-  step1_1: "ようこそ!"
-  step1_2: "設定をしてみましょう"
-  step2_1: "メモを書いたり、誰かをフォローする前に、プロフィールの設定を済ませましょう。"
-  step2_2: "あなたが誰なのか、いくつかの情報を提供することで、他の人があなたのメモを見たり、フォローしたりしたいのかがわかりやすくなります。"
-  step3_1: "さあ、何人かの人をフォローする時間です！"
-  step3_2: "あなたのホームとソーシャルタイムラインは、あなたが誰をフォローしているかで決まります。 まずは、いくつかのアカウントをフォローしてみましょう。"
-  step4_1: "さあ、外に出てみましょう。"
-  step4_2: "最初の投稿は、{introduction}の投稿や、シンプルに「こんにちは、世界よ！」的な投稿をするのが好きな人もいます。"
+  step1_1: "ようこそ！"
+  step1_2: "使い始める前に、いくつか設定を済ませましょう。すぐできますよ！"
+  step2_1: "最初に、あなたのプロフィールを作りましょう。"
+  step2_2: "プロフィールを設定することで、他の人があなたの投稿を見たり、フォローしたりするときの助けになります。"
+  step3_1: "それでは、何人かフォローしてみましょう！"
+  step3_2: "あなたのホームとソーシャルタイムラインは、あなたが誰をフォローしているかで決まります。まずは、いくつかのアカウントをフォローしてみましょう。\nプロフィールの右上にある丸い＋ボタンをクリックするとフォローできます。"
+  step4_1: "投稿してみましょう！"
+  step4_2: "最初は{introduction}に投稿したり、シンプルに「こんにちは、アカウント作ってみました！」などの投稿をする人もいます。"
   step5_1: "タイムライン、タイムラインだらけ！"
-  step5_2: "あなたのインスタンスは{timelines}異なるタイムラインを有効にしています。"
-  step5_3: "ホーム{icon}のタイムラインは、あなたのフォロワーからの投稿を見ることができます。"
-  step5_4: "ローカル{icon}タイムラインは、このインスタンスのみんなの投稿を見ることができる場所です。"
-  step5_5: "おすすめ{icon}のタイムラインは、管理人がおすすめするインスタンスの投稿を見ることができます。"
-  step5_6: "ソーシャル{icon}のタイムラインは、あなたのフォロワーの友達の投稿を見ることができる場所です。"
-  step5_7: "グローバル{icon}タイムラインは、接続している他のすべてのインスタンスからの投稿を見ることができます。"
-  step6_1: "それで、ここは何なの？"
-  step6_2: "まあ、あなたはCalckeyに参加しただけではありません。何千ものサーバーが相互接続されたネットワークで インスタンスと呼ばれる。"
-  step6_3: "各サーバーは異なる方法で動作し、すべてのサーバーがCalckeyを実行するわけではありません。でも、このサーバーは動くんです"
-  step6_4: "さあ、探検して、楽しんでください!"
-
+  step5_2: "あなたのインスタンスでは{timelines}種類のタイムラインが有効になっています。"
+  step5_3: "ホーム{icon}タイムラインでは、あなたがフォローしているアカウントの投稿を見ることができます。"
+  step5_4: "ローカル{icon}タイムラインでは、このインスタンスのみんなの投稿を見ることができます。"
+  step5_5: "おすすめ{icon}タイムラインでは、管理人がおすすめするインスタンスの投稿を見ることができます。"
+  step5_6: "ソーシャル{icon}タイムラインでは、ホームタイムラインとローカルタイムラインの投稿を同時に見ることができます。"
+  step5_7: "グローバル{icon}タイムラインでは、接続している他のすべてのインスタンスからの投稿を見ることができます。"
+  step6_1: "じゃあ、ここはどんな場所なの？"
+  step6_2: "実は、あなたはただCalckeyに参加しただけではありません。ここは、何千もの相互接続されたサーバーが構成する Fediverse への入口です。各サーバーは「インスタンス」と呼ばれます。"
+  step6_3: "それぞれのサーバーでは必ずしもCalckeyが使われているわけではなく、異なる動作をするサーバーもあります。しかし、あなたは他のサーバーのアカウントもフォローしたり、返信・ブーストができます。一見難しそうですが大丈夫！すぐ慣れます。"
+  step6_4: "これで完了です。お楽しみください！"
 _2fa:
   alreadyRegistered: "既に設定は完了しています。"
   registerDevice: "デバイスを登録"
@@ -1272,7 +1258,6 @@ _2fa:
   step3: "アプリに表示されているトークンを入力して完了です。"
   step4: "これからログインするときも、同じようにトークンを入力します。"
   securityKeyInfo: "FIDO2をサポートするハードウェアセキュリティキーもしくは端末の指紋認証やPINを使用してログインするように設定できます。"
-
 _permissions:
   "read:account": "アカウントの情報を見る"
   "write:account": "アカウントの情報を変更する"
@@ -1288,7 +1273,7 @@ _permissions:
   "write:messaging": "チャットを操作する"
   "read:mutes": "ミュートを見る"
   "write:mutes": "ミュートを操作する"
-  "write:notes": "ノートを作成・削除する"
+  "write:notes": "投稿を作成・削除する"
   "read:notifications": "通知を見る"
   "write:notifications": "通知を操作する"
   "read:reactions": "リアクションを見る"
@@ -1306,22 +1291,21 @@ _permissions:
   "write:gallery": "ギャラリーを操作する"
   "read:gallery-likes": "ギャラリーのいいねを見る"
   "write:gallery-likes": "ギャラリーのいいねを操作する"
-
 _auth:
   shareAccess: "「{name}」がアカウントにアクセスすることを許可しますか？"
   shareAccessAsk: "アカウントへのアクセスを許可しますか？"
-  permissionAsk: "このアプリは次の権限を要求しています"
-  pleaseGoBack: "アプリケーションに戻ってやっていってください"
+  permissionAsk: "このアプリケーションは次の権限を要求しています"
+  pleaseGoBack: "アプリケーションに戻り続行してください"
   callback: "アプリケーションに戻っています"
   denied: "アクセスを拒否しました"
-
+  copyAsk: "以下の認証コードをアプリケーションにコピーしてください"
 _antennaSources:
-  all: "全てのノート"
-  homeTimeline: "フォローしているユーザーのノート"
-  users: "指定した一人または複数のユーザーのノート"
-  userList: "指定したリストのユーザーのノート"
-  userGroup: "指定したグループのユーザーのノート"
-
+  all: "全ての投稿"
+  homeTimeline: "フォローしているユーザーの投稿"
+  users: "指定した一人または複数のユーザーの投稿"
+  userList: "指定したリストのユーザーの投稿"
+  userGroup: "指定したグループのユーザーの投稿"
+  instances: "指定したインスタンスの全ユーザーの投稿"
 _weekday:
   sunday: "日曜日"
   monday: "月曜日"
@@ -1330,7 +1314,6 @@ _weekday:
   thursday: "木曜日"
   friday: "金曜日"
   saturday: "土曜日"
-
 _widgets:
   memo: "付箋"
   notifications: "通知"
@@ -1353,14 +1336,14 @@ _widgets:
   jobQueue: "ジョブキュー"
   serverMetric: "サーバーメトリクス"
   aiscript: "AiScriptコンソール"
-  aichan: "藍"
-
+  userList: "ユーザーリスト"
+  _userList:
+    chooseList: "リストを選択"
 _cw:
   hide: "隠す"
   show: "もっと見る"
   chars: "{count}文字"
   files: "{count}ファイル"
-
 _poll:
   noOnlyOneChoice: "選択肢は最低2つ必要です"
   choiceN: "選択肢{n}"
@@ -1383,7 +1366,6 @@ _poll:
   remainingHours: "終了まであと{h}時間{m}分"
   remainingMinutes: "終了まであと{m}分{s}秒"
   remainingSeconds: "終了まであと{s}秒"
-
 _visibility:
   public: "パブリック"
   publicDescription: "全てのユーザーに公開"
@@ -1395,10 +1377,9 @@ _visibility:
   specifiedDescription: "指定したユーザーのみに公開"
   localOnly: "ローカルのみ"
   localOnlyDescription: "リモートユーザーには非公開"
-
 _postForm:
-  replyPlaceholder: "このノートに返信..."
-  quotePlaceholder: "このノートを引用..."
+  replyPlaceholder: "この投稿に返信..."
+  quotePlaceholder: "この投稿を引用..."
   channelPlaceholder: "チャンネルに投稿..."
   _placeholders:
     a: "いまどうしてる？"
@@ -1407,7 +1388,6 @@ _postForm:
     d: "言いたいことは？"
     e: "ここに書いてください"
     f: "あなたが書くのを待っています..."
-
 _profile:
   name: "名前"
   username: "ユーザー名"
@@ -1420,51 +1400,47 @@ _profile:
   metadataContent: "内容"
   changeAvatar: "アバター画像を変更"
   changeBanner: "バナー画像を変更"
-
+  locationDescription: "正しく入力すると、あなたの現地時間が他のユーザーに表示されます。"
 _exportOrImport:
-  allNotes: "全てのノート"
+  allNotes: "全ての投稿"
   followingList: "フォロー"
   muteList: "ミュート"
   blockingList: "ブロック"
   userLists: "リスト"
   excludeMutingUsers: "ミュートしているユーザーを除外"
   excludeInactiveUsers: "使われていないアカウントを除外"
-
 _charts:
   federation: "連合"
   apRequest: "リクエスト"
   usersIncDec: "ユーザーの増減"
   usersTotal: "ユーザーの合計"
   activeUsers: "アクティブユーザー数"
-  notesIncDec: "ノートの増減"
-  localNotesIncDec: "ローカルのノートの増減"
-  remoteNotesIncDec: "リモートのノートの増減"
-  notesTotal: "ノートの合計"
+  notesIncDec: "投稿の増減"
+  localNotesIncDec: "ローカルの投稿の増減"
+  remoteNotesIncDec: "リモートの投稿の増減"
+  notesTotal: "投稿の合計"
   filesIncDec: "ファイルの増減"
   filesTotal: "ファイルの合計"
   storageUsageIncDec: "ストレージ使用量の増減"
   storageUsageTotal: "ストレージ使用量の合計"
-
 _instanceCharts:
   requests: "リクエスト"
   users: "ユーザーの増減"
   usersTotal: "ユーザーの累積"
-  notes: "ノートの増減"
-  notesTotal: "ノートの累積"
+  notes: "投稿の増減"
+  notesTotal: "投稿の累積"
   ff: "フォロー/フォロワーの増減"
   ffTotal: "フォロー/フォロワーの累積"
   cacheSize: "キャッシュサイズの増減"
   cacheSizeTotal: "キャッシュサイズの累積"
   files: "ファイル数の増減"
   filesTotal: "ファイル数の累積"
-
 _timelines:
   home: "ホーム"
   local: "ローカル"
-  recommended: "一押し"
+  recommended: "おすすめ"
   social: "ソーシャル"
   global: "グローバル"
-
 _pages:
   newPage: "ページの作成"
   editPage: "ページの編集"
@@ -1511,59 +1487,49 @@ _pages:
     section: "セクション"
     image: "画像"
     button: "ボタン"
-
     if: "もし"
     _if:
       variable: "変数"
-
     post: "投稿フォーム"
     _post:
       text: "内容"
       attachCanvasImage: "キャンバスの画像を添付する"
       canvasId: "キャンバスID"
-
     textInput: "テキスト入力"
     _textInput:
       name: "変数名"
       text: "タイトル"
       default: "デフォルト値"
-
     textareaInput: "複数行テキスト入力"
     _textareaInput:
       name: "変数名"
       text: "タイトル"
       default: "デフォルト値"
-
     numberInput: "数値入力"
     _numberInput:
       name: "変数名"
       text: "タイトル"
       default: "デフォルト値"
-
     canvas: "キャンバス"
     _canvas:
       id: "キャンバスID"
       width: "幅"
       height: "高さ"
-
-    note: "ノート埋め込み"
+    note: "投稿の埋め込み"
     _note:
-      id: "ノートID"
-      idDescription: "ノートURLをペーストして設定することもできます。"
+      id: "投稿のID"
+      idDescription: "投稿のURLをペーストして設定することもできます。"
       detailed: "詳細な表示"
-
     switch: "スイッチ"
     _switch:
       name: "変数名"
       text: "タイトル"
       default: "デフォルト値"
-
     counter: "カウンター"
     _counter:
       name: "変数名"
       text: "タイトル"
       inc: "増加値"
-
     _button:
       text: "タイトル"
       colored: "色付き"
@@ -1582,14 +1548,12 @@ _pages:
         callAiScript: "AiScript呼び出し"
         _callAiScript:
           functionName: "関数名"
-
     radioButton: "選択肢"
     _radioButton:
       name: "変数名"
       title: "タイトル"
       values: "改行で区切った選択肢"
       default: "デフォルト値"
-
   script:
     categories:
       flow: "制御"
@@ -1766,18 +1730,16 @@ _pages:
     enviromentVariables: "環境変数"
     pageVariables: "ページ要素"
     argVariables: "入力スロット"
-
 _relayStatus:
   requesting: "承認待ち"
   accepted: "承認済み"
   rejected: "拒否済み"
-
 _notification:
   fileUploaded: "ファイルがアップロードされました"
   youGotMention: "{name}からのメンション"
   youGotReply: "{name}からのリプライ"
   youGotQuote: "{name}による引用"
-  youRenoted: "{name}がRenoteしました"
+  youRenoted: "{name}がブーストしました"
   youGotPoll: "{name}が投票しました"
   youGotMessagingMessageFromUser: "{name}からのチャットがあります"
   youGotMessagingMessageFromGroup: "{name}のチャットがあります"
@@ -1787,13 +1749,12 @@ _notification:
   youWereInvitedToGroup: "{userName}があなたをグループに招待しました"
   pollEnded: "アンケートの結果が出ました"
   emptyPushNotificationMessage: "プッシュ通知の更新をしました"
-
   _types:
     all: "すべて"
     follow: "フォロー"
     mention: "メンション"
     reply: "リプライ"
-    renote: "Renote"
+    renote: "ブースト"
     quote: "引用"
     reaction: "リアクション"
     pollVote: "アンケートに投票された"
@@ -1802,12 +1763,10 @@ _notification:
     followRequestAccepted: "フォローが受理された"
     groupInvited: "グループに招待された"
     app: "連携アプリからの通知"
-
   _actions:
     followBack: "フォローバック"
     reply: "返信"
-    renote: "Renote"
-
+    renote: "ブースト"
 _deck:
   alwaysShowMainColumn: "常にメインカラムを表示"
   columnAlign: "カラムの寄せ"
@@ -1825,7 +1784,6 @@ _deck:
   introduction: "カラムを組み合わせて自分だけのインターフェイスを作りましょう！"
   introduction2: "画面の右にある + を押して、いつでもカラムを追加できます。"
   widgetsIntroduction: "カラムのメニューから、「ウィジェットの編集」を選択してウィジェットを追加してください"
-
   _columns:
     main: "メイン"
     widgets: "ウィジェット"
@@ -1835,3 +1793,20 @@ _deck:
     list: "リスト"
     mentions: "あなた宛て"
     direct: "ダイレクト"
+_apps:
+  apps: "アプリ"
+  crossPlatform: "クロスプラットフォーム"
+  mobile: "モバイル"
+  firstParty: "ファーストパーティ"
+  firstClass: "対応度◎"
+  secondClass: "対応度○"
+  thirdClass: "対応度△"
+  free: "無料"
+  paid: "有料"
+  pwa: "PWAをインストール"
+  kaiteki: "Kaiteki"
+  milktea: "Milktea"
+  subwayTooter: "Subway Tooter"
+  kimis: "Kimis"
+  theDesk: "TheDesk"
+  lesskey: "Lesskey"

From 7af448b8e74d909ffaac514cd4fb9a1ea54d8da1 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 27 Feb 2023 09:32:24 -0500
Subject: [PATCH 162/582] Don't think that needed a reverse

---
 packages/client/src/components/MkNoteDetailed.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index f6bbdc215..2caf34488 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -301,7 +301,7 @@ if (appearNote.replyId) {
 	os.api('notes/conversation', {
 		noteId: appearNote.replyId,
 	}).then(res => {
-		conversation.value = res.reverse();
+		conversation.value = res;
 	});
 }
 

From 43d23b17210e9f385ff164dfe99e915788c5edc9 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 27 Feb 2023 09:42:11 -0500
Subject: [PATCH 163/582] change continue thread text

---
 locales/en-US.yml                            |  2 +-
 packages/client/src/components/MkNoteSub.vue | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 97f5313c8..a8a3e056a 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -835,7 +835,7 @@ muteThread: "Mute thread"
 unmuteThread: "Unmute thread"
 ffVisibility: "Follows/Followers Visibility"
 ffVisibilityDescription: "Allows you to configure who can see who you follow and who follows you."
-continueThread: "View thread continuation"
+continueThread: "Continue thread"
 deleteAccountConfirm: "This will irreversibly delete your account. Proceed?"
 incorrectPassword: "Incorrect password."
 voteConfirm: "Confirm your vote for \"{choice}\"?"
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 234348976..2f7fe86d0 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -171,6 +171,17 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			font-size: 1em !important;
 			vertical-align: middle !important;
 		}
+		a {
+			position: static;
+			&::before {
+				content: "";
+				position: absolute;
+				inset: 0;
+			}
+			&::after {
+				content: unset;
+			}
+		}
 	}
 
 	&.reply, &.reply-to, &.reply-to-more {

From 83494b707d84afcf127a42bfcec9ed699eb52bab Mon Sep 17 00:00:00 2001
From: Cleo John <waterdev@galaxycrow.de>
Date: Tue, 28 Feb 2023 17:23:04 +0100
Subject: [PATCH 164/582] more mastodon work

---
 packages/backend/package.json                 |   2 +
 .../server/api/mastodon/endpoints/account.ts  |  22 +---
 .../src/server/api/mastodon/endpoints/auth.ts |  16 +--
 .../src/server/api/mastodon/endpoints/meta.ts |  10 +-
 .../server/api/mastodon/endpoints/search.ts   | 111 +++++++++++++++++-
 .../server/api/mastodon/endpoints/status.ts   |  21 +++-
 .../server/api/mastodon/endpoints/timeline.ts |  31 ++++-
 .../backend/src/server/api/stream/index.ts    |   3 +-
 packages/backend/src/server/index.ts          |  21 ++--
 packages/client/src/pages/auth.vue            |   9 +-
 pnpm-lock.yaml                                |  13 +-
 11 files changed, 203 insertions(+), 56 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index f3aaafc9a..3a009dd14 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -98,6 +98,7 @@
 		"punycode": "2.1.1",
 		"pureimage": "0.3.15",
 		"qrcode": "1.5.1",
+		"qs": "6.9.7",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
 		"re2": "1.18.0",
@@ -158,6 +159,7 @@
 		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
 		"@types/qrcode": "1.5.0",
+		"@types/qs": "6.9.7",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.4",
 		"@types/redis": "4.0.11",
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 5b7df948e..312e38135 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -71,26 +71,8 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			let userArray = ctx.query.acct?.toString().split("@");
-			let userid;
-			if (userArray === undefined) {
-				ctx.status = 401;
-				ctx.body = { error: "no user specified" };
-				return;
-			}
-			if (userArray.length === 1) {
-				const q: FindOptionsWhere<User> = {
-					usernameLower: userArray[0].toLowerCase(),
-					host: IsNull(),
-				};
-
-				const user = await Users.findOneBy(q);
-				userid = user?.id;
-			} else {
-				userid = (await resolveUser(userArray[0], userArray[1])).id;
-			}
-			const data = await client.getAccount(userid ? userid : "");
-			ctx.body = data.data;
+			const data = await client.search((request.query as any).acct, 'accounts');
+			ctx.body = data.data.accounts[0];
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
diff --git a/packages/backend/src/server/api/mastodon/endpoints/auth.ts b/packages/backend/src/server/api/mastodon/endpoints/auth.ts
index 5d10641fb..f1c54be0a 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/auth.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/auth.ts
@@ -44,12 +44,10 @@ const writeScope = [
 export function apiAuthMastodon(router: Router): void {
 	router.post("/v1/apps", async (ctx) => {
 		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
-		const accessTokens = ctx.request.headers.authorization;
-		const client = getClient(BASE_URL, accessTokens);
-		const body: any = ctx.request.body;
+		const client = getClient(BASE_URL, '');
+		const body: any = ctx.request.body || ctx.request.query;
 		try {
 			let scope = body.scopes;
-			console.log(body);
 			if (typeof scope === "string") scope = scope.split(" ");
 			const pushScope = new Set<string>();
 			for (const s of scope) {
@@ -64,14 +62,16 @@ export function apiAuthMastodon(router: Router): void {
 				redirect_uris: red,
 				website: body.website,
 			});
-			ctx.body = {
-				id: appData.id,
+			const returns = {
+				id: Math.floor(Math.random() * 100).toString(),
 				name: appData.name,
-				website: appData.website,
+				website: body.website,
 				redirect_uri: red,
 				client_id: Buffer.from(appData.url || "").toString("base64"),
-				client_secret: appData.clientSecret,
+				client_secret: appData.clientSecret
 			};
+			console.log(returns)
+			ctx.body = returns;
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = 401;
diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
index 67f3901e4..e5e0f2622 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/meta.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
@@ -10,18 +10,18 @@ export async function getInstance(response: Entity.Instance) {
 	const totalStatuses = Notes.count({ where: { userHost: IsNull() } });
 	return {
 		uri: response.uri,
-		title: response.title || "",
-		short_description: response.description || "",
-		description: response.description || "",
+		title: response.title || "Calckey",
+		short_description: response.description.substring(0, 50) || "See real server website",
+		description: response.description || "This is a vanilla Calckey Instance. It doesnt seem to have a description. BTW you are using the Mastodon api to access this server :)",
 		email: response.email || "",
-		version: "3.0.0 compatible (Calckey)",
+		version: "3.0.0 compatible (3.5+ Calckey)", //I hope this version string is correct, we will need to test it.
 		urls: response.urls,
 		stats: {
 			user_count: (await totalUsers),
 			status_count: (await totalStatuses),
 			domain_count: response.stats.domain_count
 		},
-		thumbnail: response.thumbnail || "",
+		thumbnail: response.thumbnail || 'https://http.cat/404',
 		languages: meta.langs,
 		registrations: !meta.disableRegistration || response.registrations,
 		approval_required: !response.registrations,
diff --git a/packages/backend/src/server/api/mastodon/endpoints/search.ts b/packages/backend/src/server/api/mastodon/endpoints/search.ts
index c8ca1f050..456050fa0 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/search.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/search.ts
@@ -1,6 +1,9 @@
 import megalodon, { MegalodonInterface } from "@calckey/megalodon";
 import Router from "@koa/router";
 import { getClient } from "../ApiMastodonCompatibleService.js";
+import axios from "axios";
+import { Converter } from "@calckey/megalodon";
+import { limitToInt } from "./timeline.js";
 
 export function apiSearchMastodon(router: Router): void {
 	router.get("/v1/search", async (ctx) => {
@@ -9,7 +12,7 @@ export function apiSearchMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		const body: any = ctx.request.body;
 		try {
-			const query: any = ctx.query;
+			const query: any = limitToInt(ctx.query);
 			const type = query.type || "";
 			const data = await client.search(query.q, type, query);
 			ctx.body = data.data;
@@ -19,4 +22,110 @@ export function apiSearchMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
+	router.get("/v2/search", async (ctx) => {
+		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+		const accessTokens = ctx.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens);
+		try {
+			const query: any = limitToInt(ctx.query);
+			const type = query.type;
+			if (type) {
+				const data = await client.search(query.q, type, query);
+				ctx.body = data.data;
+			} else {
+				const acct = await client.search(query.q, "accounts", query);
+				const stat = await client.search(query.q, "statuses", query);
+				const tags = await client.search(query.q, "hashtags", query);
+				ctx.body = {
+					accounts: acct.data.accounts,
+					statuses: stat.data.statuses,
+					hashtags: tags.data.hashtags,
+				};
+			}
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = (401);
+			ctx.body e.response.data;
+		}
+	});
+	router.get("/v1/trends/statuses", async (ctx) => {
+		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+		const accessTokens = ctx.headers.authorization;
+		try {
+			const data = await getHighlight(BASE_URL, ctx.request.hostname, accessTokens);
+			ctx.body = data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = (401);
+			ctx.body = e.response.data;
+		}
+	});
+	router.get("/v2/suggestions", async (ctx) => {
+		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+		const accessTokens = ctx.headers.authorization;
+		try {
+			const query: any = ctx.query;
+			const data = await getFeaturedUser(
+				BASE_URL,
+				ctx.request.hostname,
+				accessTokens,
+				query.limit || 20,
+			);
+			console.log(data);
+			ctx.body = data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = (401);
+			ctx.body = e.response.data;
+		}
+	});
+}
+async function getHighlight(
+	BASE_URL: string,
+	domain: string,
+	accessTokens: string | undefined,
+) {
+	const accessTokenArr = accessTokens?.split(" ") ?? [null];
+	const accessToken = accessTokenArr[accessTokenArr.length - 1];
+	try {
+		const api = await axios.post(`${BASE_URL}/api/notes/featured`, {
+			i: accessToken,
+		});
+		const data: MisskeyEntity.Note[] = api.data;
+		return data.map((note) => Converter.note(note, domain));
+	} catch (e: any) {
+		console.log(e);
+		console.log(e.response.data);
+		return [];
+	}
+}
+async function getFeaturedUser(
+	BASE_URL: string,
+	host: string,
+	accessTokens: string | undefined,
+	limit: number,
+) {
+	const accessTokenArr = accessTokens?.split(" ") ?? [null];
+	const accessToken = accessTokenArr[accessTokenArr.length - 1];
+	try {
+		const api = await axios.post(`${BASE_URL}/api/users`, {
+			i: accessToken,
+			limit,
+			origin: "local",
+			sort: "+follower",
+			state: "alive",
+		});
+		const data: MisskeyEntity.UserDetail[] = api.data;
+		console.log(data);
+		return data.map((u) => {
+			return {
+				source: "past_interactions",
+				account: Converter.userDetail(u, host),
+			};
+		});
+	} catch (e: any) {
+		console.log(e);
+		console.log(e.response.data);
+		return [];
+	}
 }
diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index 3981a1781..d04b7a8b9 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -2,6 +2,12 @@ import Router from "@koa/router";
 import { getClient } from "../ApiMastodonCompatibleService.js";
 import { emojiRegexAtStartToEnd } from "@/misc/emoji-regex.js";
 import axios from "axios";
+import querystring from 'node:querystring'
+import qs from 'qs'
+function normalizeQuery(data: any) {
+    const str = querystring.stringify(data);
+    return qs.parse(str);
+}
 
 export function apiStatusMastodon(router: Router): void {
 	router.post("/v1/statuses", async (ctx) => {
@@ -9,9 +15,12 @@ export function apiStatusMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const body: any = ctx.request.body;
+			let body: any = ctx.request.body;
+			if ((!body.poll && body['poll[options][]']) || (!body.media_ids && body['media_ids[]'])) {
+				body = normalizeQuery(body)
+			}
 			const text = body.status;
-			const removed = text.replace(/@\S+/g, "").replaceAll(" ", "");
+			const removed = text.replace(/@\S+/g, "").replace(/\s|​/g, '')
 			const isDefaultEmoji = emojiRegexAtStartToEnd.test(removed);
 			const isCustomEmoji = /^:[a-zA-Z0-9@_]+:$/.test(removed);
 			if ((body.in_reply_to_id && isDefaultEmoji) || isCustomEmoji) {
@@ -35,7 +44,9 @@ export function apiStatusMastodon(router: Router): void {
 				}
 			}
 			if (!body.media_ids) body.media_ids = undefined;
-			if (body.media_ids && !body.media_ids.length) body.media_ids = undefined;
+			if (body.media_ids && !body.media_ids.length) body.media_ids = undefined;		             
+			const { sensitive } = body
+			body.sensitive = typeof sensitive === 'string' ? sensitive === 'true' : sensitive
 			const data = await client.postStatus(text, body);
 			ctx.body = data.data;
 		} catch (e: any) {
@@ -70,7 +81,7 @@ export function apiStatusMastodon(router: Router): void {
 				const data = await client.deleteStatus(ctx.params.id);
 				ctx.body = data.data;
 			} catch (e: any) {
-				console.error(e);
+				console.error(e.response.data, request.params.id);
 				ctx.status = 401;
 				ctx.body = e.response.data;
 			}
@@ -430,6 +441,6 @@ export function statusModel(
 		pinned: false,
 		emoji_reactions: [],
 		bookmarked: false,
-		quote: false,
+		quote: null,
 	};
 }
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index 7cd9e26cb..1b5afd6d0 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -9,7 +9,9 @@ export function limitToInt(q: ParsedUrlQuery) {
 	let object: any = q;
 	if (q.limit)
 		if (typeof q.limit === "string") object.limit = parseInt(q.limit, 10);
-	return q;
+	if (q.offset)
+		if (typeof q.offset === "string") object.offset = parseInt(q.offset, 10);
+	return object;
 }
 
 export function argsToBools(q: ParsedUrlQuery) {
@@ -26,12 +28,29 @@ export function argsToBools(q: ParsedUrlQuery) {
 export function toTextWithReaction(status: Entity.Status[], host: string) {
 	return status.map((t) => {
 		if (!t) return statusModel(null, null, [], "no content");
+		t.quote = null as any;
 		if (!t.emoji_reactions) return t;
 		if (t.reblog) t.reblog = toTextWithReaction([t.reblog], host)[0];
-		const reactions = t.emoji_reactions.map(
-			(r) => `${r.name.replace("@.", "")} (${r.count}${r.me ? "* " : ""})`,
-		);
-		//t.emojis = getEmoji(t.content, host)
+		const reactions = t.emoji_reactions.map((r) => {
+			const emojiNotation = r.url ? `:${r.name.replace('@.', '')}:` : r.name
+			return `${emojiNotation} (${r.count}${r.me ? `* ` : ''})`
+		});
+		const reaction = t.emoji_reactions as Entity.Reaction[];
+		const emoji = t.emojis || []
+		for (const r of reaction) {
+				if (!r.url) continue
+				emoji.push({
+						'shortcode': r.name,
+						'url': r.url,
+						'static_url': r.url,
+						'visible_in_picker': true,
+				},)
+		}
+		const isMe = reaction.findIndex((r) => r.me) > -1;
+		const total = reaction.reduce((sum, reaction) => sum + reaction.count, 0);
+		t.favourited = isMe;
+		t.favourites_count = total;
+		t.emojis = emoji
 		t.content = `<p>${autoLinker(t.content, host)}</p><p>${reactions.join(
 			", ",
 		)}</p>`;
@@ -103,7 +122,7 @@ export function apiTimelineMastodon(router: Router): void {
 			}
 		},
 	);
-	router.get<{ Params: { hashtag: string } }>(
+	router.get(
 		"/v1/timelines/home",
 		async (ctx, reply) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index 10b9fb649..f285b2f5b 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -414,12 +414,13 @@ export default class Connection {
 				const client = getClient(this.host, this.accessToken);
 				client.getStatus(payload.id).then((data) => {
 					const newPost = toTextWithReaction([data.data], this.host);
+					const targetPost = newPost[0]
 					for (const stream of this.currentSubscribe) {
 						this.wsConnection.send(
 							JSON.stringify({
 								stream,
 								event: "status.update",
-								payload: JSON.stringify(newPost[0]),
+								payload: JSON.stringify(targetPost),
 							}),
 						);
 					}
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 6dff70665..e35bbb86b 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -154,24 +154,29 @@ router.get("/verify-email/:code", async (ctx) => {
 });
 
 mastoRouter.get("/oauth/authorize", async (ctx) => {
-	const client_id = ctx.request.query.client_id;
+	const { client_id, state, redirect_uri } = ctx.request.query.client_id;
 	console.log(ctx.request.req);
-	ctx.redirect(Buffer.from(client_id?.toString() || "", "base64").toString());
+	const param = state ? `state=${state}&mastodon=true` : "mastodon=true";
+	ctx.redirect(`${Buffer.from(client_id || '', 'base64').toString()}?${param}`);
 });
 
 mastoRouter.post("/oauth/token", async (ctx) => {
-	const body: any = ctx.request.body;
+	const body: any = ctx.request.body || ctx.request.query;
+	console.log('token-request', body)
 	let client_id: any = ctx.request.query.client_id;
 	const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
 	const generator = (megalodon as any).default;
 	const client = generator("misskey", BASE_URL, null) as MegalodonInterface;
 	let m = null;
+	let token = null;
 	if (body.code) {
-		m = body.code.match(/^[a-zA-Z0-9-]+/);
+		m = body.code.match(/^([a-zA-Z0-9]{8})([a-zA-Z0-9]{4})([a-zA-Z0-9]{4})([a-zA-Z0-9]{4})([a-zA-Z0-9]{12})/);
 		if (!m.length) {
 			ctx.body = { error: "Invalid code" };
 			return;
 		}
+		token = `${m[1]}-${m[2]}-${m[3]}-${m[4]}-${m[5]}`
+		console.log(body.code, token)
 	}
 	if (client_id instanceof Array) {
 		client_id = client_id.toString();
@@ -182,14 +187,16 @@ mastoRouter.post("/oauth/token", async (ctx) => {
 		const atData = await client.fetchAccessToken(
 			client_id,
 			body.client_secret,
-			m ? m[0] : "",
+			token ? token : "",
 		);
-		ctx.body = {
+		const ret = {
 			access_token: atData.accessToken,
 			token_type: "Bearer",
-			scope: "read write follow",
+			scope: body.scope || 'read write follow push',
 			created_at: Math.floor(new Date().getTime() / 1000),
 		};
+		console.log('token-response', ret)
+		ctx.body = ret;
 	} catch (err: any) {
 		console.error(err);
 		ctx.status = 401;
diff --git a/packages/client/src/pages/auth.vue b/packages/client/src/pages/auth.vue
index c3f580160..b7ea082c6 100644
--- a/packages/client/src/pages/auth.vue
+++ b/packages/client/src/pages/auth.vue
@@ -86,7 +86,14 @@ export default defineComponent({
 		accepted() {
 			this.state = 'accepted';
 			const getUrlParams = () => window.location.search.substring(1).split('&').reduce((result, query) => { const [k, v] = query.split('='); result[k] = decodeURI(v); return result; }, {});
-			if (this.session.app.callbackUrl) {
+			const isMastodon = !!getUrlParams().mastodon
+			if (this.session.app.callbackUrl && isMastodon) {
+				const state = getUrlParams().state
+				const stateParam = `&state=${state}`
+				const tokenRaw = this.session.token
+				const token = tokenRaw.replaceAll('-', '')
+				location.href = `${this.session.app.callbackUrl}?code=${token}${stateParam}`;
+			} else if (this.session.app.callbackUrl) {
 				const url = new URL(this.session.app.callbackUrl);
 				if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:'].includes(url.protocol)) throw new Error('invalid url');
 				if (this.session.app.callbackUrl === "urn:ietf:wg:oauth:2.0:oob") {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 80df2d79b..a6c6bd1b3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -100,6 +100,7 @@ importers:
       '@types/pug': 2.0.6
       '@types/punycode': 2.1.0
       '@types/qrcode': 1.5.0
+      '@types/qs': 6.9.7
       '@types/random-seed': 0.3.3
       '@types/ratelimiter': 3.4.4
       '@types/redis': 4.0.11
@@ -183,6 +184,7 @@ importers:
       punycode: 2.1.1
       pureimage: 0.3.15
       qrcode: 1.5.1
+      qs: 6.9.7
       random-seed: 0.3.0
       ratelimiter: 3.4.1
       re2: 1.18.0
@@ -295,6 +297,7 @@ importers:
       punycode: 2.1.1
       pureimage: 0.3.15
       qrcode: 1.5.1
+      qs: 6.9.7
       random-seed: 0.3.0
       ratelimiter: 3.4.1
       re2: 1.18.0
@@ -357,6 +360,7 @@ importers:
       '@types/pug': 2.0.6
       '@types/punycode': 2.1.0
       '@types/qrcode': 1.5.0
+      '@types/qs': 6.9.7
       '@types/random-seed': 0.3.3
       '@types/ratelimiter': 3.4.4
       '@types/redis': 4.0.11
@@ -4264,7 +4268,7 @@ packages:
     resolution: {integrity: sha512-sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ==}
     dependencies:
       inflation: 2.0.0
-      qs: 6.11.0
+      qs: 6.9.7
       raw-body: 2.5.1
       type-is: 1.6.18
     dev: false
@@ -4273,7 +4277,7 @@ packages:
     resolution: {integrity: sha512-m7pOT6CdLN7FuXUcpuz/8lfQ/L77x8SchHCF4G0RBTJO20Wzmhn5Sp4/5WsKy8OSpifBSUrmg83qEqaDHdyFuQ==}
     dependencies:
       inflation: 2.0.0
-      qs: 6.11.0
+      qs: 6.9.7
       raw-body: 2.5.1
       type-is: 1.6.18
     dev: false
@@ -10691,6 +10695,11 @@ packages:
     engines: {node: '>=0.6'}
     dev: false
 
+  /qs/6.9.7:
+    resolution: {integrity: sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==}
+    engines: {node: '>=0.6'}
+    dev: false
+
   /query-string/4.3.4:
     resolution: {integrity: sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==}
     engines: {node: '>=0.10.0'}

From 447547b911a78c883079b01457cff41108332d02 Mon Sep 17 00:00:00 2001
From: Cleo John <waterdev@galaxycrow.de>
Date: Tue, 28 Feb 2023 17:38:48 +0100
Subject: [PATCH 165/582] fix errors

---
 packages/backend/src/server/api/mastodon/endpoints/search.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/search.ts b/packages/backend/src/server/api/mastodon/endpoints/search.ts
index 456050fa0..b610e784d 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/search.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/search.ts
@@ -45,7 +45,7 @@ export function apiSearchMastodon(router: Router): void {
 		} catch (e: any) {
 			console.error(e);
 			ctx.status = (401);
-			ctx.body e.response.data;
+			ctx.body = e.response.data;
 		}
 	});
 	router.get("/v1/trends/statuses", async (ctx) => {

From 4229ea9ca091a7a95bbe6f033bf51d662eeceb5e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Tue, 28 Feb 2023 17:12:29 -0500
Subject: [PATCH 166/582] Add divider to header

---
 .../src/components/global/MkPageHeader.vue    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 5eaa5e4fe..a6f71d967 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -220,9 +220,14 @@ onUnmounted(() => {
 		}
 		> .tabs {
 			padding-inline: 12px;
-			mask: linear-gradient(to right, black 80%, transparent);
-			-webkit-mask: linear-gradient(to right, black 80%, transparent);
+			mask: linear-gradient(to right, transparent, black 10px 80%, transparent);
+			-webkit-mask: linear-gradient(to right, transparent, black 10px 80%, transparent);
+			margin-left: -10px;
+			padding-left: 22px;
 			scrollbar-width: none;
+			&::before {
+				content: unset;
+			}
 			&::-webkit-scrollbar {
 				display: none;
 			}
@@ -353,6 +358,16 @@ onUnmounted(() => {
 		white-space: nowrap;
 		contain: strict;
 
+		&::before {
+			content: "";
+			display: inline-block;
+			height: 40%;
+			border-left: 1px solid var(--divider);
+			margin-right: 1em;
+			margin-left: 10px;
+			vertical-align: -1px;
+		}
+
 		> .tab {
 			display: inline-flex;
 			align-items: center;

From 1c674fcf01d3426563ee261dfbe6e766b7d4e7d4 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 1 Mar 2023 15:04:01 +0100
Subject: [PATCH 167/582] some quick fixes

---
 package.json                                       |  2 +-
 packages/backend/package.json                      |  1 +
 .../@types/koa-remove-trailing-slashes/index.d.ts  |  1 +
 packages/backend/src/server/index.ts               | 14 +++++++++++---
 pnpm-lock.yaml                                     |  6 ++++++
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 packages/backend/src/@types/koa-remove-trailing-slashes/index.d.ts

diff --git a/package.json b/package.json
index cc44c6468..11a539409 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",
 		"build": "pnpm -r run build && pnpm run gulp",
-		"start": "pnpm check:connect && pnpm --filter backend run start",
+		"start": "pnpm --filter backend run start",
 		"start:test": "pnpm --filter backend run start:test",
 		"init": "pnpm run migrate",
 		"migrate": "pnpm --filter backend run migrate",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 3a009dd14..910ffd374 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -72,6 +72,7 @@
 		"jsonld": "6.0.0",
 		"jsrsasign": "10.6.1",
 		"koa": "2.13.4",
+		"koa-remove-trailing-slashes": "2.0.3",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
 		"koa-json-body": "5.3.0",
diff --git a/packages/backend/src/@types/koa-remove-trailing-slashes/index.d.ts b/packages/backend/src/@types/koa-remove-trailing-slashes/index.d.ts
new file mode 100644
index 000000000..eda0cf142
--- /dev/null
+++ b/packages/backend/src/@types/koa-remove-trailing-slashes/index.d.ts
@@ -0,0 +1 @@
+declare module 'koa-remove-trailing-slashes';
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index e35bbb86b..cfd3c001c 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -30,6 +30,7 @@ import proxyServer from "./proxy/index.js";
 import webServer from "./web/index.js";
 import { initializeStreamingServer } from "./api/streaming.js";
 import { koaBody } from "koa-body";
+import * as removeTrailingSlash from "koa-remove-trailing-slashes";
 
 export const serverLogger = new Logger("server", "gray", false);
 
@@ -37,6 +38,8 @@ export const serverLogger = new Logger("server", "gray", false);
 const app = new Koa();
 app.proxy = true;
 
+app.use(removeTrailingSlash());
+
 if (!["production", "test"].includes(process.env.NODE_ENV || "")) {
 	// Logger
 	app.use(
@@ -154,10 +157,15 @@ router.get("/verify-email/:code", async (ctx) => {
 });
 
 mastoRouter.get("/oauth/authorize", async (ctx) => {
-	const { client_id, state, redirect_uri } = ctx.request.query.client_id;
+	const { client_id, state, redirect_uri } = ctx.request.query;
 	console.log(ctx.request.req);
-	const param = state ? `state=${state}&mastodon=true` : "mastodon=true";
-	ctx.redirect(`${Buffer.from(client_id || '', 'base64').toString()}?${param}`);
+	let param = "mastodon=true";
+	if (state)
+		param += `&state=${state}`;
+	if (redirect_uri)
+		param += `&redirect_uri=${redirect_uri}`;
+	const client = client_id? client_id : "";
+	ctx.redirect(`${Buffer.from(client.toString(), 'base64').toString()}?${param}`);
 });
 
 mastoRouter.post("/oauth/token", async (ctx) => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a6c6bd1b3..7ea97aef1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -162,6 +162,7 @@ importers:
       koa-json-body: 5.3.0
       koa-logger: 3.2.1
       koa-mount: 4.0.0
+      koa-remove-trailing-slashes: 2.0.3
       koa-send: 5.0.1
       koa-slow: 2.1.0
       koa-views: 7.0.2
@@ -277,6 +278,7 @@ importers:
       koa-json-body: 5.3.0
       koa-logger: 3.2.1
       koa-mount: 4.0.0
+      koa-remove-trailing-slashes: 2.0.3
       koa-send: 5.0.1
       koa-slow: 2.1.0
       koa-views: 7.0.2_6tybghmia4wsnt33xeid7y4rby
@@ -8266,6 +8268,10 @@ packages:
       - supports-color
     dev: false
 
+  /koa-remove-trailing-slashes/2.0.3:
+    resolution: {integrity: sha512-NFFF9Sl1wxFo5h0I3OzrHDINdFPaqG+Hx19590F7PNOcmm7yYeFW71p4XicVuSovbcx75GWGb3fi6N6kI6E/3g==}
+    dev: false
+
   /koa-router/10.1.1:
     resolution: {integrity: sha512-z/OzxVjf5NyuNO3t9nJpx7e1oR3FSBAauiwXtMQu4ppcnuNZzTaQ4p21P8A6r2Es8uJJM339oc4oVW+qX7SqnQ==}
     engines: {node: '>= 8.0.0'}

From 83216f0b3bb430342f75608c7d182467cdf7a7b6 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 1 Mar 2023 15:07:35 +0100
Subject: [PATCH 168/582] fix import

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

diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index cfd3c001c..6f7dcfd39 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -30,7 +30,7 @@ import proxyServer from "./proxy/index.js";
 import webServer from "./web/index.js";
 import { initializeStreamingServer } from "./api/streaming.js";
 import { koaBody } from "koa-body";
-import * as removeTrailingSlash from "koa-remove-trailing-slashes";
+import removeTrailingSlash from "koa-remove-trailing-slashes";
 
 export const serverLogger = new Logger("server", "gray", false);
 

From a176e5b9aa9ca1b55765fde8d38bebdbd1b13acf Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 1 Mar 2023 15:53:40 +0100
Subject: [PATCH 169/582] parse full multipart data to media endpoints

---
 packages/backend/src/server/api/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index 752303e95..96b03a4f6 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -82,7 +82,7 @@ mastoFileRouter.post("/v1/media", upload.single("file"), async (ctx) => {
 			ctx.status = 401;
 			return;
 		}
-		const data = await client.uploadMedia(multipartData.buffer);
+		const data = await client.uploadMedia(multipartData);
 		ctx.body = data.data;
 	} catch (e: any) {
 		console.error(e);
@@ -101,7 +101,7 @@ mastoFileRouter.post("/v2/media", upload.single("file"), async (ctx) => {
 			ctx.status = 401;
 			return;
 		}
-		const data = await client.uploadMedia(multipartData.buffer);
+		const data = await client.uploadMedia(multipartData);
 		ctx.body = data.data;
 	} catch (e: any) {
 		console.error(e);

From 1cd7b8bc3866dde9cbe07fbc79916c49c83fdc5d Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 3 Mar 2023 21:43:49 -0800
Subject: [PATCH 170/582] fix: post button text alignment

---
 packages/client/src/ui/_common_/navbar.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 2c3702bd7..f44a64c7e 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -209,12 +209,13 @@ function more(ev: MouseEvent) {
 
 				> .post {
 					position: relative;
-					display: block;
 					width: 100%;
 					height: 40px;
 					color: var(--fgOnAccent);
 					font-weight: bold;
 					text-align: left;
+					display: flex;
+					align-items: center;
 
 					&:before {
 						content: "";

From cc0d324fd7f63e9c351792bdeb7df89413b7d2c1 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 3 Mar 2023 22:09:57 -0800
Subject: [PATCH 171/582] fix mobile navbar

---
 packages/client/src/ui/_common_/navbar-for-mobile.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index 663ffe0fa..4cb9ed4d0 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -119,7 +119,8 @@ function more() {
 
 			> .post {
 				position: relative;
-				display: block;
+				display: flex;
+				align-items: center;
 				width: 100%;
 				height: 40px;
 				color: var(--fgOnAccent);

From 8f4558fa908c9ac71bcee2e9ed4d390ec8ac3844 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 3 Mar 2023 22:12:11 -0800
Subject: [PATCH 172/582] chore: notes --> posts

---
 locales/ca-ES.yml                          | 6 +++---
 locales/fr-FR.yml                          | 4 ++--
 packages/client/src/components/MkChart.vue | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index f32927519..360ef4c22 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -69,8 +69,8 @@ exportRequested: "Has sol·licitat una exportació. Això pot trigar una estona.
 importRequested: "Has sol·licitat una importació. Això pot trigar una estona."
 lists: "Llistes"
 noLists: "No tens cap llista"
-note: "Nota"
-notes: "Notes"
+note: "Post"
+notes: "Posts"
 following: "Seguint"
 followers: "Seguidors"
 followsYou: "Et segueix"
@@ -141,7 +141,7 @@ _theme:
     mention: "Menció"
     renote: "Renotar"
 _sfx:
-  note: "Notes"
+  note: "Posts"
   notification: "Notificacions"
 _2fa:
   step2Url: "També pots inserir aquest enllaç i utilitzes una aplicació d'escriptori:"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 9f7028d3b..2d918b5ad 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -70,8 +70,8 @@ exportRequested: "Vous avez demandé une exportation. L’opération pourrait pr
 importRequested: "Vous avez initié un import. Cela pourrait prendre un peu de temps."
 lists: "Listes"
 noLists: "Vous n’avez aucune liste"
-note: "Notes"
-notes: "Notes"
+note: "Post"
+notes: "Posts"
 following: "Abonnements"
 followers: "Abonné·e·s"
 followsYou: "Vous suit"
diff --git a/packages/client/src/components/MkChart.vue b/packages/client/src/components/MkChart.vue
index 701deafae..2ff45a229 100644
--- a/packages/client/src/components/MkChart.vue
+++ b/packages/client/src/components/MkChart.vue
@@ -666,7 +666,7 @@ const fetchInstanceNotesChart = async (total: boolean): Promise<typeof chartData
 	const raw = await os.apiGet('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
 	return {
 		series: [{
-			name: 'Notes',
+			name: 'Posts',
 			type: 'area',
 			color: '#31748f',
 			data: format(total

From 55b2708009530c05e5581b48e291d270a89c2ce9 Mon Sep 17 00:00:00 2001
From: Kaity A <supakaity@blahaj.zone>
Date: Sat, 4 Mar 2023 08:24:22 +0000
Subject: [PATCH 173/582] Set movedToUri & alsoKnownAs null when undefined

---
 packages/backend/src/remote/activitypub/models/person.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 372ef99e1..16b265b0b 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -413,8 +413,8 @@ export async function updatePerson(
 		isBot: getApType(object) === "Service",
 		isCat: (person as any).isCat === true,
 		isLocked: !!person.manuallyApprovesFollowers,
-		movedToUri: person.movedTo,
-		alsoKnownAs: person.alsoKnownAs,
+		movedToUri: person.movedTo || null,
+		alsoKnownAs: person.alsoKnownAs || null,
 		isExplorable: !!person.discoverable,
 	} as Partial<User>;
 

From be4d51fcad3febeeef97f1bada87260ee55c8e0b Mon Sep 17 00:00:00 2001
From: Kaity A <supakaity@blahaj.zone>
Date: Sat, 4 Mar 2023 14:16:20 +0000
Subject: [PATCH 174/582] Expand caption limit to 1500 characters

---
 .config/example.yml                                   |  3 +++
 .../backend/migration/1677935903517-DriveComment.js   | 11 +++++++++++
 packages/backend/src/config/types.ts                  |  1 +
 packages/backend/src/const.ts                         |  5 +++++
 packages/backend/src/misc/hard-limits.ts              |  2 +-
 packages/backend/src/models/entities/drive-file.ts    |  4 +++-
 .../backend/src/server/api/endpoints/admin/meta.ts    |  8 +++++++-
 packages/backend/src/server/api/endpoints/meta.ts     |  9 +++++++--
 packages/backend/src/server/nodeinfo.ts               |  3 ++-
 packages/client/src/components/MkMediaCaption.vue     |  6 ++++--
 10 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 packages/backend/migration/1677935903517-DriveComment.js

diff --git a/.config/example.yml b/.config/example.yml
index 900ac0905..02661b7fb 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -96,6 +96,9 @@ id: 'aid'
 # Max note length, should be < 8000.
 #maxNoteLength: 3000
 
+# Maximum lenght of an image caption or file comment (default 1500, max 8192)
+#maxCaptionLength: 1500
+
 # Whether disable HSTS
 #disableHsts: true
 
diff --git a/packages/backend/migration/1677935903517-DriveComment.js b/packages/backend/migration/1677935903517-DriveComment.js
new file mode 100644
index 000000000..41c7556f0
--- /dev/null
+++ b/packages/backend/migration/1677935903517-DriveComment.js
@@ -0,0 +1,11 @@
+export class DriveComment1677935903517 {
+    name = 'DriveComment1677935903517'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "drive_file" ALTER "comment" TYPE character varying(8192)`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "drive_file" ALTER "comment" TYPE character varying(512)`);
+    }
+}
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index e9c42c08f..ed9b0ece0 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -74,6 +74,7 @@ export type Source = {
 	maxUserSignups?: number;
 	isManagedHosting?: boolean;
 	maxNoteLength?: number;
+	maxCaptionLength?: number;
 	deepl: {
 		managed?: boolean;
 		authKey?: string;
diff --git a/packages/backend/src/const.ts b/packages/backend/src/const.ts
index 82a093100..7e8f96444 100644
--- a/packages/backend/src/const.ts
+++ b/packages/backend/src/const.ts
@@ -1,7 +1,12 @@
 import config from "@/config/index.js";
+import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
 
 export const MAX_NOTE_TEXT_LENGTH =
 	config.maxNoteLength != null ? config.maxNoteLength : 3000; // <- should we increase this?
+export const MAX_CAPTION_TEXT_LENGTH = Math.min(
+	config.maxCaptionLength ?? 1500,
+	DB_MAX_IMAGE_COMMENT_LENGTH,
+);
 
 export const SECOND = 1000;
 export const SEC = 1000; // why do we need this duplicate here?
diff --git a/packages/backend/src/misc/hard-limits.ts b/packages/backend/src/misc/hard-limits.ts
index 4ba90293c..51d2c0f5d 100644
--- a/packages/backend/src/misc/hard-limits.ts
+++ b/packages/backend/src/misc/hard-limits.ts
@@ -10,4 +10,4 @@ export const DB_MAX_NOTE_TEXT_LENGTH = 8192;
  * Maximum image description length that can be stored in DB.
  * Surrogate pairs count as one
  */
-export const DB_MAX_IMAGE_COMMENT_LENGTH = 512;
+export const DB_MAX_IMAGE_COMMENT_LENGTH = 8192;
diff --git a/packages/backend/src/models/entities/drive-file.ts b/packages/backend/src/models/entities/drive-file.ts
index 1fa91b1a9..32e19bc6e 100644
--- a/packages/backend/src/models/entities/drive-file.ts
+++ b/packages/backend/src/models/entities/drive-file.ts
@@ -9,6 +9,7 @@ import {
 import { id } from "../id.js";
 import { User } from "./user.js";
 import { DriveFolder } from "./drive-folder.js";
+import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
 
 @Entity()
 @Index(['userId', 'folderId', 'id'])
@@ -69,7 +70,8 @@ export class DriveFile {
 	public size: number;
 
 	@Column('varchar', {
-		length: 512, nullable: true,
+		length: DB_MAX_IMAGE_COMMENT_LENGTH,
+		nullable: true,
 		comment: 'The comment of the DriveFile.',
 	})
 	public comment: string | null;
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index 1808de118..c8c639f50 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -1,6 +1,6 @@
 import config from "@/config/index.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
-import { MAX_NOTE_TEXT_LENGTH } from "@/const.js";
+import { MAX_NOTE_TEXT_LENGTH, MAX_CAPTION_TEXT_LENGTH } from "@/const.js";
 import define from "../../define.js";
 
 export const meta = {
@@ -86,6 +86,11 @@ export const meta = {
 				optional: false,
 				nullable: false,
 			},
+			maxCaptionTextLength: {
+				type: "number",
+				optional: false,
+				nullable: false,
+			},
 			emojis: {
 				type: "array",
 				optional: false,
@@ -499,6 +504,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		backgroundImageUrl: instance.backgroundImageUrl,
 		logoImageUrl: instance.logoImageUrl,
 		maxNoteTextLength: MAX_NOTE_TEXT_LENGTH, // 後方互換性のため
+		maxCaptionTextLength: MAX_CAPTION_TEXT_LENGTH,
 		defaultLightTheme: instance.defaultLightTheme,
 		defaultDarkTheme: instance.defaultDarkTheme,
 		enableEmail: instance.enableEmail,
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 476a0c29f..4dc1c941e 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -2,8 +2,7 @@ import { IsNull, MoreThan } from "typeorm";
 import config from "@/config/index.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 import { Ads, Emojis, Users } from "@/models/index.js";
-import { DB_MAX_NOTE_TEXT_LENGTH } from "@/misc/hard-limits.js";
-import { MAX_NOTE_TEXT_LENGTH } from "@/const.js";
+import { MAX_NOTE_TEXT_LENGTH, MAX_CAPTION_TEXT_LENGTH } from "@/const.js";
 import define from "../define.js";
 
 export const meta = {
@@ -178,6 +177,11 @@ export const meta = {
 				optional: false,
 				nullable: false,
 			},
+			maxCaptionTextLength: {
+				type: "number",
+				optional: false,
+				nullable: false,
+			},
 			emojis: {
 				type: "array",
 				optional: false,
@@ -456,6 +460,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		backgroundImageUrl: instance.backgroundImageUrl,
 		logoImageUrl: instance.logoImageUrl,
 		maxNoteTextLength: MAX_NOTE_TEXT_LENGTH, // 後方互換性のため
+		maxCaptionTextLength: MAX_CAPTION_TEXT_LENGTH,
 		emojis: instance.privateMode && !me ? [] : await Emojis.packMany(emojis),
 		defaultLightTheme: instance.defaultLightTheme,
 		defaultDarkTheme: instance.defaultDarkTheme,
diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts
index a7fa0de4c..8563573d4 100644
--- a/packages/backend/src/server/nodeinfo.ts
+++ b/packages/backend/src/server/nodeinfo.ts
@@ -3,7 +3,7 @@ import config from "@/config/index.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 import { Users, Notes } from "@/models/index.js";
 import { IsNull, MoreThan } from "typeorm";
-import { MAX_NOTE_TEXT_LENGTH } from "@/const.js";
+import { MAX_NOTE_TEXT_LENGTH, MAX_CAPTION_TEXT_LENGTH } from "@/const.js";
 import { Cache } from "@/misc/cache.js";
 
 const router = new Router();
@@ -85,6 +85,7 @@ const nodeinfo2 = async () => {
 			enableHcaptcha: meta.enableHcaptcha,
 			enableRecaptcha: meta.enableRecaptcha,
 			maxNoteTextLength: MAX_NOTE_TEXT_LENGTH,
+			maxCaptionTextLength: MAX_CAPTION_TEXT_LENGTH,
 			enableTwitterIntegration: meta.enableTwitterIntegration,
 			enableGithubIntegration: meta.enableGithubIntegration,
 			enableDiscordIntegration: meta.enableDiscordIntegration,
diff --git a/packages/client/src/components/MkMediaCaption.vue b/packages/client/src/components/MkMediaCaption.vue
index ff195974a..7168d8723 100644
--- a/packages/client/src/components/MkMediaCaption.vue
+++ b/packages/client/src/components/MkMediaCaption.vue
@@ -39,6 +39,7 @@ import MkButton from '@/components/MkButton.vue';
 import bytes from '@/filters/bytes';
 import number from '@/filters/number';
 import { i18n } from '@/i18n';
+import { instance } from '@/instance';
 
 export default defineComponent({
 	components: {
@@ -87,8 +88,9 @@ export default defineComponent({
 
 	computed: {
 		remainingLength(): number {
-			if (typeof this.inputValue !== "string") return 512;
-			return 512 - length(this.inputValue);
+			const maxCaptionLength = instance.maxCaptionTextLength ?? 512;
+			if (typeof this.inputValue !== "string") return maxCaptionLength;
+			return maxCaptionLength - length(this.inputValue);
 		}
 	},
 

From 437d4167dc65c8ffdcdefcd46874db499cf84799 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 11 Mar 2023 12:22:54 -0800
Subject: [PATCH 175/582] chore: apps

---
 locales/en-US.yml                  |  2 +-
 locales/ja-JP.yml                  |  2 +-
 packages/client/src/pages/apps.vue | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 97f5313c8..e859929f3 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1806,7 +1806,7 @@ _apps:
   pwa: "Install PWA"
   kaiteki: "Kaiteki"
   milktea: "Milktea"
-  subwayTooter: "Subway Tooter"
+  missLi: "MissLi"
   kimis: "Kimis"
   theDesk: "TheDesk"
   lesskey: "Lesskey"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b676a5e17..e668d1afb 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1806,7 +1806,7 @@ _apps:
   pwa: "PWAをインストール"
   kaiteki: "Kaiteki"
   milktea: "Milktea"
-  subwayTooter: "Subway Tooter"
+  missLi: "MissLi"
   kimis: "Kimis"
   theDesk: "TheDesk"
   lesskey: "Lesskey"
diff --git a/packages/client/src/pages/apps.vue b/packages/client/src/pages/apps.vue
index d49b1c540..0bb4aa904 100644
--- a/packages/client/src/pages/apps.vue
+++ b/packages/client/src/pages/apps.vue
@@ -32,13 +32,13 @@
 							{{ i18n.ts._apps.milktea }}
 							<template #suffix>{{ i18n.ts._apps.firstClass }}, {{ i18n.ts._apps.free }}</template>
 						</FormLink>
-						<FormLink to="https://play.google.com/store/apps/details?id=jp.juggler.subwaytooter&gl=US" external>
+						<!-- <FormLink to="https://play.google.com/store/apps/details?id=jp.juggler.subwaytooter&gl=US" external>
 							<template #icon>
 								<i class="ph-android-logo-bold ph-xl"/>
 							</template>
 							{{ i18n.ts._apps.subwayTooter }}
 							<template #suffix>{{ i18n.ts._apps.secondClass }}, {{ i18n.ts._apps.free }}</template>
-						</FormLink>
+						</FormLink> -->
 						<!-- <FormLink to="https://apps.apple.com/app/kimis-a-client-for-misskey/id1667275125" external>
 							<template #icon>
 								<i class="ph-apple-logo-bold ph-xl"/>
@@ -60,11 +60,11 @@
 							{{ i18n.ts._apps.theDesk }}
 							<template #suffix>{{ i18n.ts._apps.secondClass }}, {{ i18n.ts._apps.free }}</template>
 						</FormLink>
-						<FormLink to="https://github.com/AsPulse/lesskey" external>
+						<FormLink to="https://uboar.github.io/missli/" external>
 							<template #icon>
-								<i class="ph-terminal-window-bold ph-xl"/>
+								<i class="ph-globe-bold ph-xl"/>
 							</template>
-							{{ i18n.ts._apps.lesskey }}
+							{{ i18n.ts._apps.missLi }}
 							<template #suffix>{{ i18n.ts._apps.secondClass }}, {{ i18n.ts._apps.free }}</template>
 						</FormLink>
 					</div>

From 7157d54fbda31a63e28eaf51e6e6e5a4f2f2ab18 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 11 Mar 2023 13:00:52 -0800
Subject: [PATCH 176/582] refactor: :arrow_up: phosphor 2, sorta

thank you sammy
---
 gulpfile.js                                 |     6 +-
 package.json                                |     1 -
 packages/backend/assets/Phosphor-Bold.woff2 |     3 +
 packages/client/src/icons.scss              | 20728 ++----------------
 pnpm-lock.yaml                              |    21 +-
 5 files changed, 1785 insertions(+), 18974 deletions(-)
 create mode 100644 packages/backend/assets/Phosphor-Bold.woff2

diff --git a/gulpfile.js b/gulpfile.js
index 87063c0bc..f994f0029 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -24,10 +24,6 @@ gulp.task('copy:client:fonts', () =>
 	gulp.src('./packages/client/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/'))
 );
 
-gulp.task('copy:client:phosphor', () =>
-	gulp.src('./node_modules/phosphor-icons/src/fonts/*').pipe(gulp.dest('./built/_client_dist_/phosphor/'))
-);
-
 gulp.task('copy:client:locales', cb => {
 	fs.mkdirSync('./built/_client_dist_/locales', { recursive: true });
 
@@ -59,7 +55,7 @@ gulp.task('build:backend:style', () => {
 });
 
 gulp.task('build', gulp.parallel(
-	'copy:client:locales', 'copy:backend:views', 'copy:backend:custom', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:phosphor'
+	'copy:client:locales', 'copy:backend:views', 'copy:backend:custom', 'build:backend:script', 'build:backend:style', 'copy:client:fonts'
 ));
 
 gulp.task('default', gulp.task('build'));
diff --git a/package.json b/package.json
index 11a539409..7f14982fd 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
 		"@tensorflow/tfjs": "^3.21.0",
 		"calckey-js": "^0.0.22",
 		"js-yaml": "4.1.0",
-		"phosphor-icons": "^1.4.2",
 		"seedrandom": "^3.0.5"
 	},
 	"devDependencies": {
diff --git a/packages/backend/assets/Phosphor-Bold.woff2 b/packages/backend/assets/Phosphor-Bold.woff2
new file mode 100644
index 000000000..68cf031ca
--- /dev/null
+++ b/packages/backend/assets/Phosphor-Bold.woff2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ebf508632602024303604ef418c709d32be7f46ce626ac4974d56df9c017904f
+size 107760
diff --git a/packages/client/src/icons.scss b/packages/client/src/icons.scss
index 2af4ccb9c..81675440d 100644
--- a/packages/client/src/icons.scss
+++ b/packages/client/src/icons.scss
@@ -1,6 +1,6 @@
 @font-face {
-  font-family: "Phosphor";
-  src: url("/assets/phosphor/Phosphor.woff2") format("woff2");
+  font-family: "Phosphor-Bold";
+  src: url("/static-assets/Phosphor-Bold.woff2") format("woff2");
   font-weight: normal;
   font-style: normal;
 }
@@ -23,6 +23,7 @@
   /* Better Font Rendering */
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+	speak: never;
 }
 /*------------------------
   change icon size
@@ -86,20942 +87,3747 @@
 	icons
 -------------------------*/
 
-.ph-activity-thin::before {
+.ph-bold.ph-address-book:before {
+  content: "\e900";
+}
+.ph-bold.ph-airplane:before {
+  content: "\e901";
+}
+.ph-bold.ph-airplane-in-flight:before {
+  content: "\e902";
+}
+.ph-bold.ph-airplane-landing:before {
+  content: "\e903";
+}
+.ph-bold.ph-airplane-takeoff:before {
+  content: "\e904";
+}
+.ph-bold.ph-airplane-tilt:before {
+  content: "\e905";
+}
+.ph-bold.ph-airplay:before {
+  content: "\e906";
+}
+.ph-bold.ph-air-traffic-control:before {
+  content: "\e907";
+}
+.ph-bold.ph-alarm:before {
+  content: "\e908";
+}
+.ph-bold.ph-alien:before {
+  content: "\e909";
+}
+.ph-bold.ph-align-bottom:before {
+  content: "\e90a";
+}
+.ph-bold.ph-align-bottom-simple:before {
+  content: "\e90b";
+}
+.ph-bold.ph-align-center-horizontal:before {
+  content: "\e90c";
+}
+.ph-bold.ph-align-center-horizontal-simple:before {
+  content: "\e90d";
+}
+.ph-bold.ph-align-center-vertical:before {
+  content: "\e90e";
+}
+.ph-bold.ph-align-center-vertical-simple:before {
+  content: "\e90f";
+}
+.ph-bold.ph-align-left:before {
+  content: "\e910";
+}
+.ph-bold.ph-align-left-simple:before {
+  content: "\e911";
+}
+.ph-bold.ph-align-right:before {
+  content: "\e912";
+}
+.ph-bold.ph-align-right-simple:before {
+  content: "\e913";
+}
+.ph-bold.ph-align-top:before {
+  content: "\e914";
+}
+.ph-bold.ph-align-top-simple:before {
+  content: "\e915";
+}
+.ph-bold.ph-amazon-logo:before {
+  content: "\e916";
+}
+.ph-bold.ph-anchor:before {
+  content: "\e917";
+}
+.ph-bold.ph-anchor-simple:before {
+  content: "\e918";
+}
+.ph-bold.ph-android-logo:before {
+  content: "\e919";
+}
+.ph-bold.ph-angular-logo:before {
+  content: "\e91a";
+}
+.ph-bold.ph-aperture:before {
+  content: "\e91b";
+}
+.ph-bold.ph-apple-logo:before {
+  content: "\e91c";
+}
+.ph-bold.ph-apple-podcasts-logo:before {
+  content: "\e91d";
+}
+.ph-bold.ph-app-store-logo:before {
+  content: "\e91e";
+}
+.ph-bold.ph-app-window:before {
+  content: "\e91f";
+}
+.ph-bold.ph-archive:before {
+  content: "\e920";
+}
+.ph-bold.ph-archive-box:before {
+  content: "\e921";
+}
+.ph-bold.ph-archive-tray:before {
+  content: "\e922";
+}
+.ph-bold.ph-armchair:before {
+  content: "\e923";
+}
+.ph-bold.ph-arrow-arc-left:before {
+  content: "\e924";
+}
+.ph-bold.ph-arrow-arc-right:before {
+  content: "\e925";
+}
+.ph-bold.ph-arrow-bend-double-up-left:before {
+  content: "\e926";
+}
+.ph-bold.ph-arrow-bend-double-up-right:before {
+  content: "\e927";
+}
+.ph-bold.ph-arrow-bend-down-left:before {
+  content: "\e928";
+}
+.ph-bold.ph-arrow-bend-down-right:before {
+  content: "\e929";
+}
+.ph-bold.ph-arrow-bend-left-down:before {
+  content: "\e92a";
+}
+.ph-bold.ph-arrow-bend-left-up:before {
+  content: "\e92b";
+}
+.ph-bold.ph-arrow-bend-right-down:before {
+  content: "\e92c";
+}
+.ph-bold.ph-arrow-bend-right-up:before {
+  content: "\e92d";
+}
+.ph-bold.ph-arrow-bend-up-left:before {
+  content: "\e92e";
+}
+.ph-bold.ph-arrow-bend-up-right:before {
+  content: "\e92f";
+}
+.ph-bold.ph-arrow-circle-down:before {
+  content: "\e930";
+}
+.ph-bold.ph-arrow-circle-down-left:before {
+  content: "\e931";
+}
+.ph-bold.ph-arrow-circle-down-right:before {
+  content: "\e932";
+}
+.ph-bold.ph-arrow-circle-left:before {
+  content: "\e933";
+}
+.ph-bold.ph-arrow-circle-right:before {
+  content: "\e934";
+}
+.ph-bold.ph-arrow-circle-up:before {
+  content: "\e935";
+}
+.ph-bold.ph-arrow-circle-up-left:before {
+  content: "\e936";
+}
+.ph-bold.ph-arrow-circle-up-right:before {
+  content: "\e937";
+}
+.ph-bold.ph-arrow-clockwise:before {
+  content: "\e938";
+}
+.ph-bold.ph-arrow-counter-clockwise:before {
+  content: "\e939";
+}
+.ph-bold.ph-arrow-down:before {
+  content: "\e93a";
+}
+.ph-bold.ph-arrow-down-left:before {
+  content: "\e93b";
+}
+.ph-bold.ph-arrow-down-right:before {
+  content: "\e93c";
+}
+.ph-bold.ph-arrow-elbow-down-left:before {
+  content: "\e93d";
+}
+.ph-bold.ph-arrow-elbow-down-right:before {
+  content: "\e93e";
+}
+.ph-bold.ph-arrow-elbow-left:before {
+  content: "\e93f";
+}
+.ph-bold.ph-arrow-elbow-left-down:before {
+  content: "\e940";
+}
+.ph-bold.ph-arrow-elbow-left-up:before {
+  content: "\e941";
+}
+.ph-bold.ph-arrow-elbow-right:before {
+  content: "\e942";
+}
+.ph-bold.ph-arrow-elbow-right-down:before {
+  content: "\e943";
+}
+.ph-bold.ph-arrow-elbow-right-up:before {
+  content: "\e944";
+}
+.ph-bold.ph-arrow-elbow-up-left:before {
+  content: "\e945";
+}
+.ph-bold.ph-arrow-elbow-up-right:before {
+  content: "\e946";
+}
+.ph-bold.ph-arrow-fat-down:before {
+  content: "\e947";
+}
+.ph-bold.ph-arrow-fat-left:before {
+  content: "\e948";
+}
+.ph-bold.ph-arrow-fat-line-down:before {
+  content: "\e949";
+}
+.ph-bold.ph-arrow-fat-line-left:before {
+  content: "\e94a";
+}
+.ph-bold.ph-arrow-fat-line-right:before {
+  content: "\e94b";
+}
+.ph-bold.ph-arrow-fat-lines-down:before {
+  content: "\e94c";
+}
+.ph-bold.ph-arrow-fat-lines-left:before {
+  content: "\e94d";
+}
+.ph-bold.ph-arrow-fat-lines-right:before {
+  content: "\e94e";
+}
+.ph-bold.ph-arrow-fat-lines-up:before {
+  content: "\e94f";
+}
+.ph-bold.ph-arrow-fat-line-up:before {
+  content: "\e950";
+}
+.ph-bold.ph-arrow-fat-right:before {
+  content: "\e951";
+}
+.ph-bold.ph-arrow-fat-up:before {
+  content: "\e952";
+}
+.ph-bold.ph-arrow-left:before {
+  content: "\e953";
+}
+.ph-bold.ph-arrow-line-down:before {
+  content: "\e954";
+}
+.ph-bold.ph-arrow-line-down-left:before {
+  content: "\e955";
+}
+.ph-bold.ph-arrow-line-down-right:before {
+  content: "\e956";
+}
+.ph-bold.ph-arrow-line-left:before {
+  content: "\e957";
+}
+.ph-bold.ph-arrow-line-right:before {
+  content: "\e958";
+}
+.ph-bold.ph-arrow-line-up:before {
+  content: "\e959";
+}
+.ph-bold.ph-arrow-line-up-left:before {
+  content: "\e95a";
+}
+.ph-bold.ph-arrow-line-up-right:before {
+  content: "\e95b";
+}
+.ph-bold.ph-arrow-right:before {
+  content: "\e95c";
+}
+.ph-bold.ph-arrows-clockwise:before {
+  content: "\e95d";
+}
+.ph-bold.ph-arrows-counter-clockwise:before {
+  content: "\e95e";
+}
+.ph-bold.ph-arrows-down-up:before {
+  content: "\e95f";
+}
+.ph-bold.ph-arrows-horizontal:before {
+  content: "\e960";
+}
+.ph-bold.ph-arrows-in:before {
+  content: "\e961";
+}
+.ph-bold.ph-arrows-in-cardinal:before {
+  content: "\e962";
+}
+.ph-bold.ph-arrows-in-line-horizontal:before {
+  content: "\e963";
+}
+.ph-bold.ph-arrows-in-line-vertical:before {
+  content: "\e964";
+}
+.ph-bold.ph-arrows-in-simple:before {
+  content: "\e965";
+}
+.ph-bold.ph-arrows-left-right:before {
+  content: "\e966";
+}
+.ph-bold.ph-arrows-merge:before {
+  content: "\e967";
+}
+.ph-bold.ph-arrows-out:before {
+  content: "\e968";
+}
+.ph-bold.ph-arrows-out-cardinal:before {
+  content: "\e969";
+}
+.ph-bold.ph-arrows-out-line-horizontal:before {
+  content: "\e96a";
+}
+.ph-bold.ph-arrows-out-line-vertical:before {
+  content: "\e96b";
+}
+.ph-bold.ph-arrows-out-simple:before {
+  content: "\e96c";
+}
+.ph-bold.ph-arrow-square-down:before {
+  content: "\e96d";
+}
+.ph-bold.ph-arrow-square-down-left:before {
+  content: "\e96e";
+}
+.ph-bold.ph-arrow-square-down-right:before {
+  content: "\e96f";
+}
+.ph-bold.ph-arrow-square-in:before {
+  content: "\e970";
+}
+.ph-bold.ph-arrow-square-left:before {
+  content: "\e971";
+}
+.ph-bold.ph-arrow-square-out:before {
+  content: "\e972";
+}
+.ph-bold.ph-arrow-square-right:before {
+  content: "\e973";
+}
+.ph-bold.ph-arrow-square-up:before {
+  content: "\e974";
+}
+.ph-bold.ph-arrow-square-up-left:before {
+  content: "\e975";
+}
+.ph-bold.ph-arrow-square-up-right:before {
+  content: "\e976";
+}
+.ph-bold.ph-arrows-split:before {
+  content: "\e977";
+}
+.ph-bold.ph-arrows-vertical:before {
+  content: "\e978";
+}
+.ph-bold.ph-arrow-u-down-left:before {
+  content: "\e979";
+}
+.ph-bold.ph-arrow-u-down-right:before {
+  content: "\e97a";
+}
+.ph-bold.ph-arrow-u-left-down:before {
+  content: "\e97b";
+}
+.ph-bold.ph-arrow-u-left-up:before {
+  content: "\e97c";
+}
+.ph-bold.ph-arrow-up:before {
+  content: "\e97d";
+}
+.ph-bold.ph-arrow-up-left:before {
+  content: "\e97e";
+}
+.ph-bold.ph-arrow-up-right:before {
+  content: "\e97f";
+}
+.ph-bold.ph-arrow-u-right-down:before {
+  content: "\e980";
+}
+.ph-bold.ph-arrow-u-right-up:before {
+  content: "\e981";
+}
+.ph-bold.ph-arrow-u-up-left:before {
+  content: "\e982";
+}
+.ph-bold.ph-arrow-u-up-right:before {
+  content: "\e983";
+}
+.ph-bold.ph-article:before {
+  content: "\e984";
+}
+.ph-bold.ph-article-medium:before {
+  content: "\e985";
+}
+.ph-bold.ph-article-ny-times:before {
+  content: "\e986";
+}
+.ph-bold.ph-asterisk:before {
+  content: "\e987";
+}
+.ph-bold.ph-asterisk-simple:before {
+  content: "\e988";
+}
+.ph-bold.ph-at:before {
+  content: "\e989";
+}
+.ph-bold.ph-atom:before {
+  content: "\e98a";
+}
+.ph-bold.ph-baby:before {
+  content: "\e98b";
+}
+.ph-bold.ph-backpack:before {
+  content: "\e98c";
+}
+.ph-bold.ph-backspace:before {
+  content: "\e98d";
+}
+.ph-bold.ph-bag:before {
+  content: "\e98e";
+}
+.ph-bold.ph-bag-simple:before {
+  content: "\e98f";
+}
+.ph-bold.ph-balloon:before {
+  content: "\e990";
+}
+.ph-bold.ph-bandaids:before {
+  content: "\e991";
+}
+.ph-bold.ph-bank:before {
+  content: "\e992";
+}
+.ph-bold.ph-barbell:before {
+  content: "\e993";
+}
+.ph-bold.ph-barcode:before {
+  content: "\e994";
+}
+.ph-bold.ph-barricade:before {
+  content: "\e995";
+}
+.ph-bold.ph-baseball:before {
+  content: "\e996";
+}
+.ph-bold.ph-baseball-cap:before {
+  content: "\e997";
+}
+.ph-bold.ph-basketball:before {
+  content: "\e998";
+}
+.ph-bold.ph-basket:before {
+  content: "\e999";
+}
+.ph-bold.ph-bathtub:before {
+  content: "\e99a";
+}
+.ph-bold.ph-battery-charging:before {
+  content: "\e99b";
+}
+.ph-bold.ph-battery-charging-vertical:before {
+  content: "\e99c";
+}
+.ph-bold.ph-battery-empty:before {
+  content: "\e99d";
+}
+.ph-bold.ph-battery-full:before {
+  content: "\e99e";
+}
+.ph-bold.ph-battery-high:before {
+  content: "\e99f";
+}
+.ph-bold.ph-battery-low:before {
+  content: "\e9a0";
+}
+.ph-bold.ph-battery-medium:before {
+  content: "\e9a1";
+}
+.ph-bold.ph-battery-plus:before {
+  content: "\e9a2";
+}
+.ph-bold.ph-battery-plus-vertical:before {
+  content: "\e9a3";
+}
+.ph-bold.ph-battery-vertical-empty:before {
+  content: "\e9a4";
+}
+.ph-bold.ph-battery-vertical-full:before {
+  content: "\e9a5";
+}
+.ph-bold.ph-battery-vertical-high:before {
+  content: "\e9a6";
+}
+.ph-bold.ph-battery-vertical-low:before {
+  content: "\e9a7";
+}
+.ph-bold.ph-battery-vertical-medium:before {
+  content: "\e9a8";
+}
+.ph-bold.ph-battery-warning:before {
+  content: "\e9a9";
+}
+.ph-bold.ph-battery-warning-vertical:before {
+  content: "\e9aa";
+}
+.ph-bold.ph-bed:before {
+  content: "\e9ab";
+}
+.ph-bold.ph-beer-bottle:before {
+  content: "\e9ac";
+}
+.ph-bold.ph-beer-stein:before {
+  content: "\e9ad";
+}
+.ph-bold.ph-behance-logo:before {
+  content: "\e9ae";
+}
+.ph-bold.ph-bell:before {
+  content: "\e9af";
+}
+.ph-bold.ph-bell-ringing:before {
+  content: "\e9b0";
+}
+.ph-bold.ph-bell-simple:before {
+  content: "\e9b1";
+}
+.ph-bold.ph-bell-simple-ringing:before {
+  content: "\e9b2";
+}
+.ph-bold.ph-bell-simple-slash:before {
+  content: "\e9b3";
+}
+.ph-bold.ph-bell-simple-z:before {
+  content: "\e9b4";
+}
+.ph-bold.ph-bell-slash:before {
+  content: "\e9b5";
+}
+.ph-bold.ph-bell-z:before {
+  content: "\e9b6";
+}
+.ph-bold.ph-bezier-curve:before {
+  content: "\e9b7";
+}
+.ph-bold.ph-bicycle:before {
+  content: "\e9b8";
+}
+.ph-bold.ph-binoculars:before {
+  content: "\e9b9";
+}
+.ph-bold.ph-bird:before {
+  content: "\e9ba";
+}
+.ph-bold.ph-bluetooth:before {
+  content: "\e9bb";
+}
+.ph-bold.ph-bluetooth-connected:before {
+  content: "\e9bc";
+}
+.ph-bold.ph-bluetooth-slash:before {
+  content: "\e9bd";
+}
+.ph-bold.ph-bluetooth-x:before {
+  content: "\e9be";
+}
+.ph-bold.ph-boat:before {
+  content: "\e9bf";
+}
+.ph-bold.ph-bone:before {
+  content: "\e9c0";
+}
+.ph-bold.ph-book:before {
+  content: "\e9c1";
+}
+.ph-bold.ph-book-bookmark:before {
+  content: "\e9c2";
+}
+.ph-bold.ph-bookmark:before {
+  content: "\e9c3";
+}
+.ph-bold.ph-bookmarks:before {
+  content: "\e9c4";
+}
+.ph-bold.ph-bookmark-simple:before {
+  content: "\e9c5";
+}
+.ph-bold.ph-bookmarks-simple:before {
+  content: "\e9c6";
+}
+.ph-bold.ph-book-open:before {
+  content: "\e9c7";
+}
+.ph-bold.ph-book-open-text:before {
+  content: "\e9c8";
+}
+.ph-bold.ph-books:before {
+  content: "\e9c9";
+}
+.ph-bold.ph-boot:before {
+  content: "\e9ca";
+}
+.ph-bold.ph-bounding-box:before {
+  content: "\e9cb";
+}
+.ph-bold.ph-bowl-food:before {
+  content: "\e9cc";
+}
+.ph-bold.ph-brackets-angle:before {
+  content: "\e9cd";
+}
+.ph-bold.ph-brackets-curly:before {
+  content: "\e9ce";
+}
+.ph-bold.ph-brackets-round:before {
+  content: "\e9cf";
+}
+.ph-bold.ph-brackets-square:before {
+  content: "\e9d0";
+}
+.ph-bold.ph-brain:before {
+  content: "\e9d1";
+}
+.ph-bold.ph-brandy:before {
+  content: "\e9d2";
+}
+.ph-bold.ph-bridge:before {
+  content: "\e9d3";
+}
+.ph-bold.ph-briefcase:before {
+  content: "\e9d4";
+}
+.ph-bold.ph-briefcase-metal:before {
+  content: "\e9d5";
+}
+.ph-bold.ph-broadcast:before {
+  content: "\e9d6";
+}
+.ph-bold.ph-broom:before {
+  content: "\e9d7";
+}
+.ph-bold.ph-browser:before {
+  content: "\e9d8";
+}
+.ph-bold.ph-browsers:before {
+  content: "\e9d9";
+}
+.ph-bold.ph-bug-beetle:before {
+  content: "\e9da";
+}
+.ph-bold.ph-bug:before {
+  content: "\e9db";
+}
+.ph-bold.ph-bug-droid:before {
+  content: "\e9dc";
+}
+.ph-bold.ph-buildings:before {
+  content: "\e9dd";
+}
+.ph-bold.ph-bus:before {
+  content: "\e9de";
+}
+.ph-bold.ph-butterfly:before {
+  content: "\e9df";
+}
+.ph-bold.ph-cactus:before {
+  content: "\e9e0";
+}
+.ph-bold.ph-cake:before {
+  content: "\e9e1";
+}
+.ph-bold.ph-calculator:before {
+  content: "\e9e2";
+}
+.ph-bold.ph-calendar-blank:before {
+  content: "\e9e3";
+}
+.ph-bold.ph-calendar:before {
+  content: "\e9e4";
+}
+.ph-bold.ph-calendar-check:before {
+  content: "\e9e5";
+}
+.ph-bold.ph-calendar-plus:before {
+  content: "\e9e6";
+}
+.ph-bold.ph-calendar-x:before {
+  content: "\e9e7";
+}
+.ph-bold.ph-call-bell:before {
+  content: "\e9e8";
+}
+.ph-bold.ph-camera:before {
+  content: "\e9e9";
+}
+.ph-bold.ph-camera-plus:before {
+  content: "\e9ea";
+}
+.ph-bold.ph-camera-rotate:before {
+  content: "\e9eb";
+}
+.ph-bold.ph-camera-slash:before {
+  content: "\e9ec";
+}
+.ph-bold.ph-campfire:before {
+  content: "\e9ed";
+}
+.ph-bold.ph-car:before {
+  content: "\e9ee";
+}
+.ph-bold.ph-cardholder:before {
+  content: "\e9ef";
+}
+.ph-bold.ph-cards:before {
+  content: "\e9f0";
+}
+.ph-bold.ph-caret-circle-double-down:before {
+  content: "\e9f1";
+}
+.ph-bold.ph-caret-circle-double-left:before {
+  content: "\e9f2";
+}
+.ph-bold.ph-caret-circle-double-right:before {
+  content: "\e9f3";
+}
+.ph-bold.ph-caret-circle-double-up:before {
+  content: "\e9f4";
+}
+.ph-bold.ph-caret-circle-down:before {
+  content: "\e9f5";
+}
+.ph-bold.ph-caret-circle-left:before {
+  content: "\e9f6";
+}
+.ph-bold.ph-caret-circle-right:before {
+  content: "\e9f7";
+}
+.ph-bold.ph-caret-circle-up:before {
+  content: "\e9f8";
+}
+.ph-bold.ph-caret-circle-up-down:before {
+  content: "\e9f9";
+}
+.ph-bold.ph-caret-double-down:before {
+  content: "\e9fa";
+}
+.ph-bold.ph-caret-double-left:before {
+  content: "\e9fb";
+}
+.ph-bold.ph-caret-double-right:before {
+  content: "\e9fc";
+}
+.ph-bold.ph-caret-double-up:before {
+  content: "\e9fd";
+}
+.ph-bold.ph-caret-down:before {
+  content: "\e9fe";
+}
+.ph-bold.ph-caret-left:before {
+  content: "\e9ff";
+}
+.ph-bold.ph-caret-right:before {
+  content: "\ea00";
+}
+.ph-bold.ph-caret-up:before {
+  content: "\ea01";
+}
+.ph-bold.ph-caret-up-down:before {
   content: "\ea02";
 }
-
-.ph-address-book-thin::before {
+.ph-bold.ph-car-profile:before {
   content: "\ea03";
 }
-
-.ph-airplane-in-flight-thin::before {
+.ph-bold.ph-carrot:before {
   content: "\ea04";
 }
-
-.ph-airplane-landing-thin::before {
+.ph-bold.ph-car-simple:before {
   content: "\ea05";
 }
-
-.ph-airplane-takeoff-thin::before {
+.ph-bold.ph-cassette-tape:before {
   content: "\ea06";
 }
-
-.ph-airplane-thin::before {
+.ph-bold.ph-castle-turret:before {
   content: "\ea07";
 }
-
-.ph-airplane-tilt-thin::before {
+.ph-bold.ph-cat:before {
   content: "\ea08";
 }
-
-.ph-airplay-thin::before {
+.ph-bold.ph-cell-signal-full:before {
   content: "\ea09";
 }
-
-.ph-alarm-thin::before {
+.ph-bold.ph-cell-signal-high:before {
   content: "\ea0a";
 }
-
-.ph-alien-thin::before {
+.ph-bold.ph-cell-signal-low:before {
   content: "\ea0b";
 }
-
-.ph-align-bottom-simple-thin::before {
+.ph-bold.ph-cell-signal-medium:before {
   content: "\ea0c";
 }
-
-.ph-align-bottom-thin::before {
+.ph-bold.ph-cell-signal-none:before {
   content: "\ea0d";
 }
-
-.ph-align-center-horizontal-simple-thin::before {
+.ph-bold.ph-cell-signal-slash:before {
   content: "\ea0e";
 }
-
-.ph-align-center-horizontal-thin::before {
+.ph-bold.ph-cell-signal-x:before {
   content: "\ea0f";
 }
-
-.ph-align-center-vertical-simple-thin::before {
+.ph-bold.ph-certificate:before {
   content: "\ea10";
 }
-
-.ph-align-center-vertical-thin::before {
+.ph-bold.ph-chair:before {
   content: "\ea11";
 }
-
-.ph-align-left-simple-thin::before {
+.ph-bold.ph-chalkboard:before {
   content: "\ea12";
 }
-
-.ph-align-left-thin::before {
+.ph-bold.ph-chalkboard-simple:before {
   content: "\ea13";
 }
-
-.ph-align-right-simple-thin::before {
+.ph-bold.ph-chalkboard-teacher:before {
   content: "\ea14";
 }
-
-.ph-align-right-thin::before {
+.ph-bold.ph-champagne:before {
   content: "\ea15";
 }
-
-.ph-align-top-simple-thin::before {
+.ph-bold.ph-charging-station:before {
   content: "\ea16";
 }
-
-.ph-align-top-thin::before {
+.ph-bold.ph-chart-bar:before {
   content: "\ea17";
 }
-
-.ph-anchor-simple-thin::before {
+.ph-bold.ph-chart-bar-horizontal:before {
   content: "\ea18";
 }
-
-.ph-anchor-thin::before {
+.ph-bold.ph-chart-donut:before {
   content: "\ea19";
 }
-
-.ph-android-logo-thin::before {
+.ph-bold.ph-chart-line:before {
   content: "\ea1a";
 }
-
-.ph-angular-logo-thin::before {
+.ph-bold.ph-chart-line-down:before {
   content: "\ea1b";
 }
-
-.ph-aperture-thin::before {
+.ph-bold.ph-chart-line-up:before {
   content: "\ea1c";
 }
-
-.ph-app-store-logo-thin::before {
+.ph-bold.ph-chart-pie:before {
   content: "\ea1d";
 }
-
-.ph-app-window-thin::before {
+.ph-bold.ph-chart-pie-slice:before {
   content: "\ea1e";
 }
-
-.ph-apple-logo-thin::before {
+.ph-bold.ph-chart-polar:before {
   content: "\ea1f";
 }
-
-.ph-apple-podcasts-logo-thin::before {
+.ph-bold.ph-chart-scatter:before {
   content: "\ea20";
 }
-
-.ph-archive-box-thin::before {
+.ph-bold.ph-chat:before {
   content: "\ea21";
 }
-
-.ph-archive-thin::before {
+.ph-bold.ph-chat-centered:before {
   content: "\ea22";
 }
-
-.ph-archive-tray-thin::before {
+.ph-bold.ph-chat-centered-dots:before {
   content: "\ea23";
 }
-
-.ph-armchair-thin::before {
+.ph-bold.ph-chat-centered-text:before {
   content: "\ea24";
 }
-
-.ph-arrow-arc-left-thin::before {
+.ph-bold.ph-chat-circle:before {
   content: "\ea25";
 }
-
-.ph-arrow-arc-right-thin::before {
+.ph-bold.ph-chat-circle-dots:before {
   content: "\ea26";
 }
-
-.ph-arrow-bend-double-up-left-thin::before {
+.ph-bold.ph-chat-circle-text:before {
   content: "\ea27";
 }
-
-.ph-arrow-bend-double-up-right-thin::before {
+.ph-bold.ph-chat-dots:before {
   content: "\ea28";
 }
-
-.ph-arrow-bend-down-left-thin::before {
+.ph-bold.ph-chats:before {
   content: "\ea29";
 }
-
-.ph-arrow-bend-down-right-thin::before {
+.ph-bold.ph-chats-circle:before {
   content: "\ea2a";
 }
-
-.ph-arrow-bend-left-down-thin::before {
+.ph-bold.ph-chats-teardrop:before {
   content: "\ea2b";
 }
-
-.ph-arrow-bend-left-up-thin::before {
+.ph-bold.ph-chat-teardrop:before {
   content: "\ea2c";
 }
-
-.ph-arrow-bend-right-down-thin::before {
+.ph-bold.ph-chat-teardrop-dots:before {
   content: "\ea2d";
 }
-
-.ph-arrow-bend-right-up-thin::before {
+.ph-bold.ph-chat-teardrop-text:before {
   content: "\ea2e";
 }
-
-.ph-arrow-bend-up-left-thin::before {
+.ph-bold.ph-chat-text:before {
   content: "\ea2f";
 }
-
-.ph-arrow-bend-up-right-thin::before {
+.ph-bold.ph-check:before {
   content: "\ea30";
 }
-
-.ph-arrow-circle-down-left-thin::before {
+.ph-bold.ph-check-circle:before {
   content: "\ea31";
 }
-
-.ph-arrow-circle-down-right-thin::before {
+.ph-bold.ph-check-fat:before {
   content: "\ea32";
 }
-
-.ph-arrow-circle-down-thin::before {
+.ph-bold.ph-checks:before {
   content: "\ea33";
 }
-
-.ph-arrow-circle-left-thin::before {
+.ph-bold.ph-check-square:before {
   content: "\ea34";
 }
-
-.ph-arrow-circle-right-thin::before {
+.ph-bold.ph-check-square-offset:before {
   content: "\ea35";
 }
-
-.ph-arrow-circle-up-left-thin::before {
+.ph-bold.ph-church:before {
   content: "\ea36";
 }
-
-.ph-arrow-circle-up-right-thin::before {
+.ph-bold.ph-circle:before {
   content: "\ea37";
 }
-
-.ph-arrow-circle-up-thin::before {
+.ph-bold.ph-circle-dashed:before {
   content: "\ea38";
 }
-
-.ph-arrow-clockwise-thin::before {
+.ph-bold.ph-circle-half:before {
   content: "\ea39";
 }
-
-.ph-arrow-counter-clockwise-thin::before {
+.ph-bold.ph-circle-half-tilt:before {
   content: "\ea3a";
 }
-
-.ph-arrow-down-left-thin::before {
+.ph-bold.ph-circle-notch:before {
   content: "\ea3b";
 }
-
-.ph-arrow-down-right-thin::before {
+.ph-bold.ph-circles-four:before {
   content: "\ea3c";
 }
-
-.ph-arrow-down-thin::before {
+.ph-bold.ph-circles-three:before {
   content: "\ea3d";
 }
-
-.ph-arrow-elbow-down-left-thin::before {
+.ph-bold.ph-circles-three-plus:before {
   content: "\ea3e";
 }
-
-.ph-arrow-elbow-down-right-thin::before {
+.ph-bold.ph-circuitry:before {
   content: "\ea3f";
 }
-
-.ph-arrow-elbow-left-down-thin::before {
+.ph-bold.ph-clipboard:before {
   content: "\ea40";
 }
-
-.ph-arrow-elbow-left-thin::before {
+.ph-bold.ph-clipboard-text:before {
   content: "\ea41";
 }
-
-.ph-arrow-elbow-left-up-thin::before {
+.ph-bold.ph-clock-afternoon:before {
   content: "\ea42";
 }
-
-.ph-arrow-elbow-right-down-thin::before {
+.ph-bold.ph-clock:before {
   content: "\ea43";
 }
-
-.ph-arrow-elbow-right-thin::before {
+.ph-bold.ph-clock-clockwise:before {
   content: "\ea44";
 }
-
-.ph-arrow-elbow-right-up-thin::before {
+.ph-bold.ph-clock-countdown:before {
   content: "\ea45";
 }
-
-.ph-arrow-elbow-up-left-thin::before {
+.ph-bold.ph-clock-counter-clockwise:before {
   content: "\ea46";
 }
-
-.ph-arrow-elbow-up-right-thin::before {
+.ph-bold.ph-closed-captioning:before {
   content: "\ea47";
 }
-
-.ph-arrow-fat-down-thin::before {
+.ph-bold.ph-cloud-arrow-down:before {
   content: "\ea48";
 }
-
-.ph-arrow-fat-left-thin::before {
+.ph-bold.ph-cloud-arrow-up:before {
   content: "\ea49";
 }
-
-.ph-arrow-fat-line-down-thin::before {
+.ph-bold.ph-cloud:before {
   content: "\ea4a";
 }
-
-.ph-arrow-fat-line-left-thin::before {
+.ph-bold.ph-cloud-check:before {
   content: "\ea4b";
 }
-
-.ph-arrow-fat-line-right-thin::before {
+.ph-bold.ph-cloud-fog:before {
   content: "\ea4c";
 }
-
-.ph-arrow-fat-line-up-thin::before {
+.ph-bold.ph-cloud-lightning:before {
   content: "\ea4d";
 }
-
-.ph-arrow-fat-lines-down-thin::before {
+.ph-bold.ph-cloud-moon:before {
   content: "\ea4e";
 }
-
-.ph-arrow-fat-lines-left-thin::before {
+.ph-bold.ph-cloud-rain:before {
   content: "\ea4f";
 }
-
-.ph-arrow-fat-lines-right-thin::before {
+.ph-bold.ph-cloud-slash:before {
   content: "\ea50";
 }
-
-.ph-arrow-fat-lines-up-thin::before {
+.ph-bold.ph-cloud-snow:before {
   content: "\ea51";
 }
-
-.ph-arrow-fat-right-thin::before {
+.ph-bold.ph-cloud-sun:before {
   content: "\ea52";
 }
-
-.ph-arrow-fat-up-thin::before {
+.ph-bold.ph-cloud-warning:before {
   content: "\ea53";
 }
-
-.ph-arrow-left-thin::before {
+.ph-bold.ph-cloud-x:before {
   content: "\ea54";
 }
-
-.ph-arrow-line-down-left-thin::before {
+.ph-bold.ph-club:before {
   content: "\ea55";
 }
-
-.ph-arrow-line-down-right-thin::before {
+.ph-bold.ph-coat-hanger:before {
   content: "\ea56";
 }
-
-.ph-arrow-line-down-thin::before {
+.ph-bold.ph-coda-logo:before {
   content: "\ea57";
 }
-
-.ph-arrow-line-left-thin::before {
+.ph-bold.ph-code-block:before {
   content: "\ea58";
 }
-
-.ph-arrow-line-right-thin::before {
+.ph-bold.ph-code:before {
   content: "\ea59";
 }
-
-.ph-arrow-line-up-left-thin::before {
+.ph-bold.ph-codepen-logo:before {
   content: "\ea5a";
 }
-
-.ph-arrow-line-up-right-thin::before {
+.ph-bold.ph-codesandbox-logo:before {
   content: "\ea5b";
 }
-
-.ph-arrow-line-up-thin::before {
+.ph-bold.ph-code-simple:before {
   content: "\ea5c";
 }
-
-.ph-arrow-right-thin::before {
+.ph-bold.ph-coffee:before {
   content: "\ea5d";
 }
-
-.ph-arrow-square-down-left-thin::before {
+.ph-bold.ph-coin:before {
   content: "\ea5e";
 }
-
-.ph-arrow-square-down-right-thin::before {
+.ph-bold.ph-coins:before {
   content: "\ea5f";
 }
-
-.ph-arrow-square-down-thin::before {
+.ph-bold.ph-coin-vertical:before {
   content: "\ea60";
 }
-
-.ph-arrow-square-in-thin::before {
+.ph-bold.ph-columns:before {
   content: "\ea61";
 }
-
-.ph-arrow-square-left-thin::before {
+.ph-bold.ph-command:before {
   content: "\ea62";
 }
-
-.ph-arrow-square-out-thin::before {
+.ph-bold.ph-compass:before {
   content: "\ea63";
 }
-
-.ph-arrow-square-right-thin::before {
+.ph-bold.ph-compass-tool:before {
   content: "\ea64";
 }
-
-.ph-arrow-square-up-left-thin::before {
+.ph-bold.ph-computer-tower:before {
   content: "\ea65";
 }
-
-.ph-arrow-square-up-right-thin::before {
+.ph-bold.ph-confetti:before {
   content: "\ea66";
 }
-
-.ph-arrow-square-up-thin::before {
+.ph-bold.ph-contactless-payment:before {
   content: "\ea67";
 }
-
-.ph-arrow-u-down-left-thin::before {
+.ph-bold.ph-control:before {
   content: "\ea68";
 }
-
-.ph-arrow-u-down-right-thin::before {
+.ph-bold.ph-cookie:before {
   content: "\ea69";
 }
-
-.ph-arrow-u-left-down-thin::before {
+.ph-bold.ph-cooking-pot:before {
   content: "\ea6a";
 }
-
-.ph-arrow-u-left-up-thin::before {
+.ph-bold.ph-copy:before {
   content: "\ea6b";
 }
-
-.ph-arrow-u-right-down-thin::before {
+.ph-bold.ph-copyleft:before {
   content: "\ea6c";
 }
-
-.ph-arrow-u-right-up-thin::before {
+.ph-bold.ph-copyright:before {
   content: "\ea6d";
 }
-
-.ph-arrow-u-up-left-thin::before {
+.ph-bold.ph-copy-simple:before {
   content: "\ea6e";
 }
-
-.ph-arrow-u-up-right-thin::before {
+.ph-bold.ph-corners-in:before {
   content: "\ea6f";
 }
-
-.ph-arrow-up-left-thin::before {
+.ph-bold.ph-corners-out:before {
   content: "\ea70";
 }
-
-.ph-arrow-up-right-thin::before {
+.ph-bold.ph-couch:before {
   content: "\ea71";
 }
-
-.ph-arrow-up-thin::before {
+.ph-bold.ph-cpu:before {
   content: "\ea72";
 }
-
-.ph-arrows-clockwise-thin::before {
+.ph-bold.ph-credit-card:before {
   content: "\ea73";
 }
-
-.ph-arrows-counter-clockwise-thin::before {
+.ph-bold.ph-crop:before {
   content: "\ea74";
 }
-
-.ph-arrows-down-up-thin::before {
+.ph-bold.ph-cross:before {
   content: "\ea75";
 }
-
-.ph-arrows-horizontal-thin::before {
+.ph-bold.ph-crosshair:before {
   content: "\ea76";
 }
-
-.ph-arrows-in-cardinal-thin::before {
+.ph-bold.ph-crosshair-simple:before {
   content: "\ea77";
 }
-
-.ph-arrows-in-line-horizontal-thin::before {
+.ph-bold.ph-crown:before {
   content: "\ea78";
 }
-
-.ph-arrows-in-line-vertical-thin::before {
+.ph-bold.ph-crown-simple:before {
   content: "\ea79";
 }
-
-.ph-arrows-in-simple-thin::before {
+.ph-bold.ph-cube:before {
   content: "\ea7a";
 }
-
-.ph-arrows-in-thin::before {
+.ph-bold.ph-cube-focus:before {
   content: "\ea7b";
 }
-
-.ph-arrows-left-right-thin::before {
+.ph-bold.ph-cube-transparent:before {
   content: "\ea7c";
 }
-
-.ph-arrows-out-cardinal-thin::before {
+.ph-bold.ph-currency-btc:before {
   content: "\ea7d";
 }
-
-.ph-arrows-out-line-horizontal-thin::before {
+.ph-bold.ph-currency-circle-dollar:before {
   content: "\ea7e";
 }
-
-.ph-arrows-out-line-vertical-thin::before {
+.ph-bold.ph-currency-cny:before {
   content: "\ea7f";
 }
-
-.ph-arrows-out-simple-thin::before {
+.ph-bold.ph-currency-dollar:before {
   content: "\ea80";
 }
-
-.ph-arrows-out-thin::before {
+.ph-bold.ph-currency-dollar-simple:before {
   content: "\ea81";
 }
-
-.ph-arrows-vertical-thin::before {
+.ph-bold.ph-currency-eth:before {
   content: "\ea82";
 }
-
-.ph-article-medium-thin::before {
+.ph-bold.ph-currency-eur:before {
   content: "\ea83";
 }
-
-.ph-article-ny-times-thin::before {
+.ph-bold.ph-currency-gbp:before {
   content: "\ea84";
 }
-
-.ph-article-thin::before {
+.ph-bold.ph-currency-inr:before {
   content: "\ea85";
 }
-
-.ph-asterisk-simple-thin::before {
+.ph-bold.ph-currency-jpy:before {
   content: "\ea86";
 }
-
-.ph-asterisk-thin::before {
+.ph-bold.ph-currency-krw:before {
   content: "\ea87";
 }
-
-.ph-at-thin::before {
+.ph-bold.ph-currency-kzt:before {
   content: "\ea88";
 }
-
-.ph-atom-thin::before {
+.ph-bold.ph-currency-ngn:before {
   content: "\ea89";
 }
-
-.ph-baby-thin::before {
+.ph-bold.ph-currency-rub:before {
   content: "\ea8a";
 }
-
-.ph-backpack-thin::before {
+.ph-bold.ph-cursor:before {
   content: "\ea8b";
 }
-
-.ph-backspace-thin::before {
+.ph-bold.ph-cursor-click:before {
   content: "\ea8c";
 }
-
-.ph-bag-simple-thin::before {
+.ph-bold.ph-cursor-text:before {
   content: "\ea8d";
 }
-
-.ph-bag-thin::before {
+.ph-bold.ph-cylinder:before {
   content: "\ea8e";
 }
-
-.ph-balloon-thin::before {
+.ph-bold.ph-database:before {
   content: "\ea8f";
 }
-
-.ph-bandaids-thin::before {
+.ph-bold.ph-desktop:before {
   content: "\ea90";
 }
-
-.ph-bank-thin::before {
+.ph-bold.ph-desktop-tower:before {
   content: "\ea91";
 }
-
-.ph-barbell-thin::before {
+.ph-bold.ph-detective:before {
   content: "\ea92";
 }
-
-.ph-barcode-thin::before {
+.ph-bold.ph-device-mobile:before {
   content: "\ea93";
 }
-
-.ph-barricade-thin::before {
+.ph-bold.ph-device-mobile-camera:before {
   content: "\ea94";
 }
-
-.ph-baseball-thin::before {
+.ph-bold.ph-device-mobile-speaker:before {
   content: "\ea95";
 }
-
-.ph-basketball-thin::before {
+.ph-bold.ph-devices:before {
   content: "\ea96";
 }
-
-.ph-bathtub-thin::before {
+.ph-bold.ph-device-tablet:before {
   content: "\ea97";
 }
-
-.ph-battery-charging-thin::before {
+.ph-bold.ph-device-tablet-camera:before {
   content: "\ea98";
 }
-
-.ph-battery-charging-vertical-thin::before {
+.ph-bold.ph-device-tablet-speaker:before {
   content: "\ea99";
 }
-
-.ph-battery-empty-thin::before {
+.ph-bold.ph-dev-to-logo:before {
   content: "\ea9a";
 }
-
-.ph-battery-full-thin::before {
+.ph-bold.ph-diamond:before {
   content: "\ea9b";
 }
-
-.ph-battery-high-thin::before {
+.ph-bold.ph-diamonds-four:before {
   content: "\ea9c";
 }
-
-.ph-battery-low-thin::before {
+.ph-bold.ph-dice-five:before {
   content: "\ea9d";
 }
-
-.ph-battery-medium-thin::before {
+.ph-bold.ph-dice-four:before {
   content: "\ea9e";
 }
-
-.ph-battery-plus-thin::before {
+.ph-bold.ph-dice-one:before {
   content: "\ea9f";
 }
-
-.ph-battery-warning-thin::before {
+.ph-bold.ph-dice-six:before {
   content: "\eaa0";
 }
-
-.ph-battery-warning-vertical-thin::before {
+.ph-bold.ph-dice-three:before {
   content: "\eaa1";
 }
-
-.ph-bed-thin::before {
+.ph-bold.ph-dice-two:before {
   content: "\eaa2";
 }
-
-.ph-beer-bottle-thin::before {
+.ph-bold.ph-disc:before {
   content: "\eaa3";
 }
-
-.ph-behance-logo-thin::before {
+.ph-bold.ph-discord-logo:before {
   content: "\eaa4";
 }
-
-.ph-bell-ringing-thin::before {
+.ph-bold.ph-divide:before {
   content: "\eaa5";
 }
-
-.ph-bell-simple-ringing-thin::before {
+.ph-bold.ph-dna:before {
   content: "\eaa6";
 }
-
-.ph-bell-simple-slash-thin::before {
+.ph-bold.ph-dog:before {
   content: "\eaa7";
 }
-
-.ph-bell-simple-thin::before {
+.ph-bold.ph-door:before {
   content: "\eaa8";
 }
-
-.ph-bell-simple-z-thin::before {
+.ph-bold.ph-door-open:before {
   content: "\eaa9";
 }
-
-.ph-bell-slash-thin::before {
+.ph-bold.ph-dot:before {
   content: "\eaaa";
 }
-
-.ph-bell-thin::before {
+.ph-bold.ph-dot-outline:before {
   content: "\eaab";
 }
-
-.ph-bell-z-thin::before {
+.ph-bold.ph-dots-nine:before {
   content: "\eaac";
 }
-
-.ph-bezier-curve-thin::before {
+.ph-bold.ph-dots-six:before {
   content: "\eaad";
 }
-
-.ph-bicycle-thin::before {
+.ph-bold.ph-dots-six-vertical:before {
   content: "\eaae";
 }
-
-.ph-binoculars-thin::before {
+.ph-bold.ph-dots-three:before {
   content: "\eaaf";
 }
-
-.ph-bird-thin::before {
+.ph-bold.ph-dots-three-circle:before {
   content: "\eab0";
 }
-
-.ph-bluetooth-connected-thin::before {
+.ph-bold.ph-dots-three-circle-vertical:before {
   content: "\eab1";
 }
-
-.ph-bluetooth-slash-thin::before {
+.ph-bold.ph-dots-three-outline:before {
   content: "\eab2";
 }
-
-.ph-bluetooth-thin::before {
+.ph-bold.ph-dots-three-outline-vertical:before {
   content: "\eab3";
 }
-
-.ph-bluetooth-x-thin::before {
+.ph-bold.ph-dots-three-vertical:before {
   content: "\eab4";
 }
-
-.ph-boat-thin::before {
+.ph-bold.ph-download:before {
   content: "\eab5";
 }
-
-.ph-book-bookmark-thin::before {
+.ph-bold.ph-download-simple:before {
   content: "\eab6";
 }
-
-.ph-book-open-thin::before {
+.ph-bold.ph-dress:before {
   content: "\eab7";
 }
-
-.ph-book-thin::before {
+.ph-bold.ph-dribbble-logo:before {
   content: "\eab8";
 }
-
-.ph-bookmark-simple-thin::before {
+.ph-bold.ph-drop:before {
   content: "\eab9";
 }
-
-.ph-bookmark-thin::before {
+.ph-bold.ph-dropbox-logo:before {
   content: "\eaba";
 }
-
-.ph-bookmarks-simple-thin::before {
+.ph-bold.ph-drop-half:before {
   content: "\eabb";
 }
-
-.ph-bookmarks-thin::before {
+.ph-bold.ph-drop-half-bottom:before {
   content: "\eabc";
 }
-
-.ph-books-thin::before {
+.ph-bold.ph-ear:before {
   content: "\eabd";
 }
-
-.ph-bounding-box-thin::before {
+.ph-bold.ph-ear-slash:before {
   content: "\eabe";
 }
-
-.ph-brackets-angle-thin::before {
+.ph-bold.ph-egg:before {
   content: "\eabf";
 }
-
-.ph-brackets-curly-thin::before {
+.ph-bold.ph-egg-crack:before {
   content: "\eac0";
 }
-
-.ph-brackets-round-thin::before {
+.ph-bold.ph-eject:before {
   content: "\eac1";
 }
-
-.ph-brackets-square-thin::before {
+.ph-bold.ph-eject-simple:before {
   content: "\eac2";
 }
-
-.ph-brain-thin::before {
+.ph-bold.ph-elevator:before {
   content: "\eac3";
 }
-
-.ph-brandy-thin::before {
+.ph-bold.ph-engine:before {
   content: "\eac4";
 }
-
-.ph-briefcase-metal-thin::before {
+.ph-bold.ph-envelope:before {
   content: "\eac5";
 }
-
-.ph-briefcase-thin::before {
+.ph-bold.ph-envelope-open:before {
   content: "\eac6";
 }
-
-.ph-broadcast-thin::before {
+.ph-bold.ph-envelope-simple:before {
   content: "\eac7";
 }
-
-.ph-browser-thin::before {
+.ph-bold.ph-envelope-simple-open:before {
   content: "\eac8";
 }
-
-.ph-browsers-thin::before {
+.ph-bold.ph-equalizer:before {
   content: "\eac9";
 }
-
-.ph-bug-beetle-thin::before {
+.ph-bold.ph-equals:before {
   content: "\eaca";
 }
-
-.ph-bug-droid-thin::before {
+.ph-bold.ph-eraser:before {
   content: "\eacb";
 }
-
-.ph-bug-thin::before {
+.ph-bold.ph-escalator-down:before {
   content: "\eacc";
 }
-
-.ph-buildings-thin::before {
+.ph-bold.ph-escalator-up:before {
   content: "\eacd";
 }
-
-.ph-bus-thin::before {
+.ph-bold.ph-exam:before {
   content: "\eace";
 }
-
-.ph-butterfly-thin::before {
+.ph-bold.ph-exclude:before {
   content: "\eacf";
 }
-
-.ph-cactus-thin::before {
+.ph-bold.ph-exclude-square:before {
   content: "\ead0";
 }
-
-.ph-cake-thin::before {
+.ph-bold.ph-export:before {
   content: "\ead1";
 }
-
-.ph-calculator-thin::before {
+.ph-bold.ph-eye:before {
   content: "\ead2";
 }
-
-.ph-calendar-blank-thin::before {
+.ph-bold.ph-eye-closed:before {
   content: "\ead3";
 }
-
-.ph-calendar-check-thin::before {
+.ph-bold.ph-eyedropper:before {
   content: "\ead4";
 }
-
-.ph-calendar-plus-thin::before {
+.ph-bold.ph-eyedropper-sample:before {
   content: "\ead5";
 }
-
-.ph-calendar-thin::before {
+.ph-bold.ph-eyeglasses:before {
   content: "\ead6";
 }
-
-.ph-calendar-x-thin::before {
+.ph-bold.ph-eye-slash:before {
   content: "\ead7";
 }
-
-.ph-camera-rotate-thin::before {
+.ph-bold.ph-facebook-logo:before {
   content: "\ead8";
 }
-
-.ph-camera-slash-thin::before {
+.ph-bold.ph-face-mask:before {
   content: "\ead9";
 }
-
-.ph-camera-thin::before {
+.ph-bold.ph-factory:before {
   content: "\eada";
 }
-
-.ph-campfire-thin::before {
+.ph-bold.ph-faders:before {
   content: "\eadb";
 }
-
-.ph-car-simple-thin::before {
+.ph-bold.ph-faders-horizontal:before {
   content: "\eadc";
 }
-
-.ph-car-thin::before {
+.ph-bold.ph-fan:before {
   content: "\eadd";
 }
-
-.ph-cardholder-thin::before {
+.ph-bold.ph-fast-forward:before {
   content: "\eade";
 }
-
-.ph-cards-thin::before {
+.ph-bold.ph-fast-forward-circle:before {
   content: "\eadf";
 }
-
-.ph-caret-circle-double-down-thin::before {
+.ph-bold.ph-feather:before {
   content: "\eae0";
 }
-
-.ph-caret-circle-double-left-thin::before {
+.ph-bold.ph-figma-logo:before {
   content: "\eae1";
 }
-
-.ph-caret-circle-double-right-thin::before {
+.ph-bold.ph-file-archive:before {
   content: "\eae2";
 }
-
-.ph-caret-circle-double-up-thin::before {
+.ph-bold.ph-file-arrow-down:before {
   content: "\eae3";
 }
-
-.ph-caret-circle-down-thin::before {
+.ph-bold.ph-file-arrow-up:before {
   content: "\eae4";
 }
-
-.ph-caret-circle-left-thin::before {
+.ph-bold.ph-file-audio:before {
   content: "\eae5";
 }
-
-.ph-caret-circle-right-thin::before {
+.ph-bold.ph-file:before {
   content: "\eae6";
 }
-
-.ph-caret-circle-up-thin::before {
+.ph-bold.ph-file-cloud:before {
   content: "\eae7";
 }
-
-.ph-caret-double-down-thin::before {
+.ph-bold.ph-file-code:before {
   content: "\eae8";
 }
-
-.ph-caret-double-left-thin::before {
+.ph-bold.ph-file-css:before {
   content: "\eae9";
 }
-
-.ph-caret-double-right-thin::before {
+.ph-bold.ph-file-csv:before {
   content: "\eaea";
 }
-
-.ph-caret-double-up-thin::before {
+.ph-bold.ph-file-dashed:before, .ph-bold.ph-file-dotted:before {
   content: "\eaeb";
 }
-
-.ph-caret-down-thin::before {
+.ph-bold.ph-file-doc:before {
   content: "\eaec";
 }
-
-.ph-caret-left-thin::before {
+.ph-bold.ph-file-html:before {
   content: "\eaed";
 }
-
-.ph-caret-right-thin::before {
+.ph-bold.ph-file-image:before {
   content: "\eaee";
 }
-
-.ph-caret-up-thin::before {
+.ph-bold.ph-file-jpg:before {
   content: "\eaef";
 }
-
-.ph-cat-thin::before {
+.ph-bold.ph-file-js:before {
   content: "\eaf0";
 }
-
-.ph-cell-signal-full-thin::before {
+.ph-bold.ph-file-jsx:before {
   content: "\eaf1";
 }
-
-.ph-cell-signal-high-thin::before {
+.ph-bold.ph-file-lock:before {
   content: "\eaf2";
 }
-
-.ph-cell-signal-low-thin::before {
+.ph-bold.ph-file-magnifying-glass:before, .ph-bold.ph-file-search:before {
   content: "\eaf3";
 }
-
-.ph-cell-signal-medium-thin::before {
+.ph-bold.ph-file-minus:before {
   content: "\eaf4";
 }
-
-.ph-cell-signal-none-thin::before {
+.ph-bold.ph-file-pdf:before {
   content: "\eaf5";
 }
-
-.ph-cell-signal-slash-thin::before {
+.ph-bold.ph-file-plus:before {
   content: "\eaf6";
 }
-
-.ph-cell-signal-x-thin::before {
+.ph-bold.ph-file-png:before {
   content: "\eaf7";
 }
-
-.ph-chalkboard-simple-thin::before {
+.ph-bold.ph-file-ppt:before {
   content: "\eaf8";
 }
-
-.ph-chalkboard-teacher-thin::before {
+.ph-bold.ph-file-rs:before {
   content: "\eaf9";
 }
-
-.ph-chalkboard-thin::before {
+.ph-bold.ph-files:before {
   content: "\eafa";
 }
-
-.ph-chart-bar-horizontal-thin::before {
+.ph-bold.ph-file-sql:before {
   content: "\eafb";
 }
-
-.ph-chart-bar-thin::before {
+.ph-bold.ph-file-svg:before {
   content: "\eafc";
 }
-
-.ph-chart-line-thin::before {
+.ph-bold.ph-file-text:before {
   content: "\eafd";
 }
-
-.ph-chart-line-up-thin::before {
+.ph-bold.ph-file-ts:before {
   content: "\eafe";
 }
-
-.ph-chart-pie-slice-thin::before {
+.ph-bold.ph-file-tsx:before {
   content: "\eaff";
 }
-
-.ph-chart-pie-thin::before {
+.ph-bold.ph-file-video:before {
   content: "\eb00";
 }
-
-.ph-chat-centered-dots-thin::before {
+.ph-bold.ph-file-vue:before {
   content: "\eb01";
 }
-
-.ph-chat-centered-text-thin::before {
+.ph-bold.ph-file-x:before {
   content: "\eb02";
 }
-
-.ph-chat-centered-thin::before {
+.ph-bold.ph-file-xls:before {
   content: "\eb03";
 }
-
-.ph-chat-circle-dots-thin::before {
+.ph-bold.ph-file-zip:before {
   content: "\eb04";
 }
-
-.ph-chat-circle-text-thin::before {
+.ph-bold.ph-film-reel:before {
   content: "\eb05";
 }
-
-.ph-chat-circle-thin::before {
+.ph-bold.ph-film-script:before {
   content: "\eb06";
 }
-
-.ph-chat-dots-thin::before {
+.ph-bold.ph-film-slate:before {
   content: "\eb07";
 }
-
-.ph-chat-teardrop-dots-thin::before {
+.ph-bold.ph-film-strip:before {
   content: "\eb08";
 }
-
-.ph-chat-teardrop-text-thin::before {
+.ph-bold.ph-fingerprint:before {
   content: "\eb09";
 }
-
-.ph-chat-teardrop-thin::before {
+.ph-bold.ph-fingerprint-simple:before {
   content: "\eb0a";
 }
-
-.ph-chat-text-thin::before {
+.ph-bold.ph-finn-the-human:before {
   content: "\eb0b";
 }
-
-.ph-chat-thin::before {
+.ph-bold.ph-fire:before {
   content: "\eb0c";
 }
-
-.ph-chats-circle-thin::before {
+.ph-bold.ph-fire-extinguisher:before {
   content: "\eb0d";
 }
-
-.ph-chats-teardrop-thin::before {
+.ph-bold.ph-fire-simple:before {
   content: "\eb0e";
 }
-
-.ph-chats-thin::before {
+.ph-bold.ph-first-aid:before {
   content: "\eb0f";
 }
-
-.ph-check-circle-thin::before {
+.ph-bold.ph-first-aid-kit:before {
   content: "\eb10";
 }
-
-.ph-check-square-offset-thin::before {
+.ph-bold.ph-fish:before {
   content: "\eb11";
 }
-
-.ph-check-square-thin::before {
+.ph-bold.ph-fish-simple:before {
   content: "\eb12";
 }
-
-.ph-check-thin::before {
+.ph-bold.ph-flag-banner:before {
   content: "\eb13";
 }
-
-.ph-checks-thin::before {
+.ph-bold.ph-flag:before {
   content: "\eb14";
 }
-
-.ph-circle-dashed-thin::before {
+.ph-bold.ph-flag-checkered:before {
   content: "\eb15";
 }
-
-.ph-circle-half-thin::before {
+.ph-bold.ph-flag-pennant:before {
   content: "\eb16";
 }
-
-.ph-circle-half-tilt-thin::before {
+.ph-bold.ph-flame:before {
   content: "\eb17";
 }
-
-.ph-circle-notch-thin::before {
+.ph-bold.ph-flashlight:before {
   content: "\eb18";
 }
-
-.ph-circle-thin::before {
+.ph-bold.ph-flask:before {
   content: "\eb19";
 }
-
-.ph-circle-wavy-check-thin::before {
+.ph-bold.ph-floppy-disk-back:before {
   content: "\eb1a";
 }
-
-.ph-circle-wavy-question-thin::before {
+.ph-bold.ph-floppy-disk:before {
   content: "\eb1b";
 }
-
-.ph-circle-wavy-thin::before {
+.ph-bold.ph-flow-arrow:before {
   content: "\eb1c";
 }
-
-.ph-circle-wavy-warning-thin::before {
+.ph-bold.ph-flower:before {
   content: "\eb1d";
 }
-
-.ph-circles-four-thin::before {
+.ph-bold.ph-flower-lotus:before {
   content: "\eb1e";
 }
-
-.ph-circles-three-plus-thin::before {
+.ph-bold.ph-flower-tulip:before {
   content: "\eb1f";
 }
-
-.ph-circles-three-thin::before {
+.ph-bold.ph-flying-saucer:before {
   content: "\eb20";
 }
-
-.ph-clipboard-text-thin::before {
+.ph-bold.ph-folder:before {
   content: "\eb21";
 }
-
-.ph-clipboard-thin::before {
+.ph-bold.ph-folder-dashed:before, .ph-bold.ph-folder-dotted:before {
   content: "\eb22";
 }
-
-.ph-clock-afternoon-thin::before {
+.ph-bold.ph-folder-lock:before {
   content: "\eb23";
 }
-
-.ph-clock-clockwise-thin::before {
+.ph-bold.ph-folder-minus:before {
   content: "\eb24";
 }
-
-.ph-clock-counter-clockwise-thin::before {
+.ph-bold.ph-folder-notch:before {
   content: "\eb25";
 }
-
-.ph-clock-thin::before {
+.ph-bold.ph-folder-notch-minus:before {
   content: "\eb26";
 }
-
-.ph-closed-captioning-thin::before {
+.ph-bold.ph-folder-notch-open:before {
   content: "\eb27";
 }
-
-.ph-cloud-arrow-down-thin::before {
+.ph-bold.ph-folder-notch-plus:before {
   content: "\eb28";
 }
-
-.ph-cloud-arrow-up-thin::before {
+.ph-bold.ph-folder-open:before {
   content: "\eb29";
 }
-
-.ph-cloud-check-thin::before {
+.ph-bold.ph-folder-plus:before {
   content: "\eb2a";
 }
-
-.ph-cloud-fog-thin::before {
+.ph-bold.ph-folders:before {
   content: "\eb2b";
 }
-
-.ph-cloud-lightning-thin::before {
+.ph-bold.ph-folder-simple:before {
   content: "\eb2c";
 }
-
-.ph-cloud-moon-thin::before {
+.ph-bold.ph-folder-simple-dashed:before, .ph-bold.ph-folder-simple-dotted:before {
   content: "\eb2d";
 }
-
-.ph-cloud-rain-thin::before {
+.ph-bold.ph-folder-simple-lock:before {
   content: "\eb2e";
 }
-
-.ph-cloud-slash-thin::before {
+.ph-bold.ph-folder-simple-minus:before {
   content: "\eb2f";
 }
-
-.ph-cloud-snow-thin::before {
+.ph-bold.ph-folder-simple-plus:before {
   content: "\eb30";
 }
-
-.ph-cloud-sun-thin::before {
+.ph-bold.ph-folder-simple-star:before {
   content: "\eb31";
 }
-
-.ph-cloud-thin::before {
+.ph-bold.ph-folder-simple-user:before {
   content: "\eb32";
 }
-
-.ph-club-thin::before {
+.ph-bold.ph-folder-star:before {
   content: "\eb33";
 }
-
-.ph-coat-hanger-thin::before {
+.ph-bold.ph-folder-user:before {
   content: "\eb34";
 }
-
-.ph-code-simple-thin::before {
+.ph-bold.ph-football:before {
   content: "\eb35";
 }
-
-.ph-code-thin::before {
+.ph-bold.ph-footprints:before {
   content: "\eb36";
 }
-
-.ph-codepen-logo-thin::before {
+.ph-bold.ph-fork-knife:before {
   content: "\eb37";
 }
-
-.ph-codesandbox-logo-thin::before {
+.ph-bold.ph-frame-corners:before {
   content: "\eb38";
 }
-
-.ph-coffee-thin::before {
+.ph-bold.ph-framer-logo:before {
   content: "\eb39";
 }
-
-.ph-coin-thin::before {
+.ph-bold.ph-function:before {
   content: "\eb3a";
 }
-
-.ph-coin-vertical-thin::before {
+.ph-bold.ph-funnel:before {
   content: "\eb3b";
 }
-
-.ph-coins-thin::before {
+.ph-bold.ph-funnel-simple:before {
   content: "\eb3c";
 }
-
-.ph-columns-thin::before {
+.ph-bold.ph-game-controller:before {
   content: "\eb3d";
 }
-
-.ph-command-thin::before {
+.ph-bold.ph-garage:before {
   content: "\eb3e";
 }
-
-.ph-compass-thin::before {
+.ph-bold.ph-gas-can:before {
   content: "\eb3f";
 }
-
-.ph-computer-tower-thin::before {
+.ph-bold.ph-gas-pump:before {
   content: "\eb40";
 }
-
-.ph-confetti-thin::before {
+.ph-bold.ph-gauge:before {
   content: "\eb41";
 }
-
-.ph-cookie-thin::before {
+.ph-bold.ph-gavel:before {
   content: "\eb42";
 }
-
-.ph-cooking-pot-thin::before {
+.ph-bold.ph-gear:before {
   content: "\eb43";
 }
-
-.ph-copy-simple-thin::before {
+.ph-bold.ph-gear-fine:before {
   content: "\eb44";
 }
-
-.ph-copy-thin::before {
+.ph-bold.ph-gear-six:before {
   content: "\eb45";
 }
-
-.ph-copyleft-thin::before {
+.ph-bold.ph-gender-female:before {
   content: "\eb46";
 }
-
-.ph-copyright-thin::before {
+.ph-bold.ph-gender-intersex:before {
   content: "\eb47";
 }
-
-.ph-corners-in-thin::before {
+.ph-bold.ph-gender-male:before {
   content: "\eb48";
 }
-
-.ph-corners-out-thin::before {
+.ph-bold.ph-gender-neuter:before {
   content: "\eb49";
 }
-
-.ph-cpu-thin::before {
+.ph-bold.ph-gender-nonbinary:before {
   content: "\eb4a";
 }
-
-.ph-credit-card-thin::before {
+.ph-bold.ph-gender-transgender:before {
   content: "\eb4b";
 }
-
-.ph-crop-thin::before {
+.ph-bold.ph-ghost:before {
   content: "\eb4c";
 }
-
-.ph-crosshair-simple-thin::before {
+.ph-bold.ph-gif:before {
   content: "\eb4d";
 }
-
-.ph-crosshair-thin::before {
+.ph-bold.ph-gift:before {
   content: "\eb4e";
 }
-
-.ph-crown-simple-thin::before {
+.ph-bold.ph-git-branch:before {
   content: "\eb4f";
 }
-
-.ph-crown-thin::before {
+.ph-bold.ph-git-commit:before {
   content: "\eb50";
 }
-
-.ph-cube-thin::before {
+.ph-bold.ph-git-diff:before {
   content: "\eb51";
 }
-
-.ph-currency-btc-thin::before {
+.ph-bold.ph-git-fork:before {
   content: "\eb52";
 }
-
-.ph-currency-circle-dollar-thin::before {
+.ph-bold.ph-github-logo:before {
   content: "\eb53";
 }
-
-.ph-currency-cny-thin::before {
+.ph-bold.ph-gitlab-logo:before {
   content: "\eb54";
 }
-
-.ph-currency-dollar-simple-thin::before {
+.ph-bold.ph-gitlab-logo-simple:before {
   content: "\eb55";
 }
-
-.ph-currency-dollar-thin::before {
+.ph-bold.ph-git-merge:before {
   content: "\eb56";
 }
-
-.ph-currency-eth-thin::before {
+.ph-bold.ph-git-pull-request:before {
   content: "\eb57";
 }
-
-.ph-currency-eur-thin::before {
+.ph-bold.ph-globe:before {
   content: "\eb58";
 }
-
-.ph-currency-gbp-thin::before {
+.ph-bold.ph-globe-hemisphere-east:before {
   content: "\eb59";
 }
-
-.ph-currency-inr-thin::before {
+.ph-bold.ph-globe-hemisphere-west:before {
   content: "\eb5a";
 }
-
-.ph-currency-jpy-thin::before {
+.ph-bold.ph-globe-simple:before {
   content: "\eb5b";
 }
-
-.ph-currency-krw-thin::before {
+.ph-bold.ph-globe-stand:before {
   content: "\eb5c";
 }
-
-.ph-currency-kzt-thin::before {
+.ph-bold.ph-goggles:before {
   content: "\eb5d";
 }
-
-.ph-currency-ngn-thin::before {
+.ph-bold.ph-goodreads-logo:before {
   content: "\eb5e";
 }
-
-.ph-currency-rub-thin::before {
+.ph-bold.ph-google-cardboard-logo:before {
   content: "\eb5f";
 }
-
-.ph-cursor-text-thin::before {
+.ph-bold.ph-google-chrome-logo:before {
   content: "\eb60";
 }
-
-.ph-cursor-thin::before {
+.ph-bold.ph-google-drive-logo:before {
   content: "\eb61";
 }
-
-.ph-cylinder-thin::before {
+.ph-bold.ph-google-logo:before {
   content: "\eb62";
 }
-
-.ph-database-thin::before {
+.ph-bold.ph-google-photos-logo:before {
   content: "\eb63";
 }
-
-.ph-desktop-thin::before {
+.ph-bold.ph-google-play-logo:before {
   content: "\eb64";
 }
-
-.ph-desktop-tower-thin::before {
+.ph-bold.ph-google-podcasts-logo:before {
   content: "\eb65";
 }
-
-.ph-detective-thin::before {
+.ph-bold.ph-gradient:before {
   content: "\eb66";
 }
-
-.ph-device-mobile-camera-thin::before {
+.ph-bold.ph-graduation-cap:before {
   content: "\eb67";
 }
-
-.ph-device-mobile-speaker-thin::before {
+.ph-bold.ph-grains:before {
   content: "\eb68";
 }
-
-.ph-device-mobile-thin::before {
+.ph-bold.ph-grains-slash:before {
   content: "\eb69";
 }
-
-.ph-device-tablet-camera-thin::before {
+.ph-bold.ph-graph:before {
   content: "\eb6a";
 }
-
-.ph-device-tablet-speaker-thin::before {
+.ph-bold.ph-grid-four:before {
   content: "\eb6b";
 }
-
-.ph-device-tablet-thin::before {
+.ph-bold.ph-grid-nine:before {
   content: "\eb6c";
 }
-
-.ph-diamond-thin::before {
+.ph-bold.ph-guitar:before {
   content: "\eb6d";
 }
-
-.ph-diamonds-four-thin::before {
+.ph-bold.ph-hamburger:before {
   content: "\eb6e";
 }
-
-.ph-dice-five-thin::before {
+.ph-bold.ph-hammer:before {
   content: "\eb6f";
 }
-
-.ph-dice-four-thin::before {
+.ph-bold.ph-handbag:before {
   content: "\eb70";
 }
-
-.ph-dice-one-thin::before {
+.ph-bold.ph-handbag-simple:before {
   content: "\eb71";
 }
-
-.ph-dice-six-thin::before {
+.ph-bold.ph-hand:before {
   content: "\eb72";
 }
-
-.ph-dice-three-thin::before {
+.ph-bold.ph-hand-coins:before {
   content: "\eb73";
 }
-
-.ph-dice-two-thin::before {
+.ph-bold.ph-hand-eye:before {
   content: "\eb74";
 }
-
-.ph-disc-thin::before {
+.ph-bold.ph-hand-fist:before {
   content: "\eb75";
 }
-
-.ph-discord-logo-thin::before {
+.ph-bold.ph-hand-grabbing:before {
   content: "\eb76";
 }
-
-.ph-divide-thin::before {
+.ph-bold.ph-hand-heart:before {
   content: "\eb77";
 }
-
-.ph-dog-thin::before {
+.ph-bold.ph-hand-palm:before {
   content: "\eb78";
 }
-
-.ph-door-thin::before {
+.ph-bold.ph-hand-pointing:before {
   content: "\eb79";
 }
-
-.ph-dots-nine-thin::before {
+.ph-bold.ph-hands-clapping:before {
   content: "\eb7a";
 }
-
-.ph-dots-six-thin::before {
+.ph-bold.ph-handshake:before {
   content: "\eb7b";
 }
-
-.ph-dots-six-vertical-thin::before {
+.ph-bold.ph-hand-soap:before {
   content: "\eb7c";
 }
-
-.ph-dots-three-circle-thin::before {
+.ph-bold.ph-hands-praying:before {
   content: "\eb7d";
 }
-
-.ph-dots-three-circle-vertical-thin::before {
+.ph-bold.ph-hand-swipe-left:before {
   content: "\eb7e";
 }
-
-.ph-dots-three-outline-thin::before {
+.ph-bold.ph-hand-swipe-right:before {
   content: "\eb7f";
 }
-
-.ph-dots-three-outline-vertical-thin::before {
+.ph-bold.ph-hand-tap:before {
   content: "\eb80";
 }
-
-.ph-dots-three-thin::before {
+.ph-bold.ph-hand-waving:before {
   content: "\eb81";
 }
-
-.ph-dots-three-vertical-thin::before {
+.ph-bold.ph-hard-drive:before {
   content: "\eb82";
 }
-
-.ph-download-simple-thin::before {
+.ph-bold.ph-hard-drives:before {
   content: "\eb83";
 }
-
-.ph-download-thin::before {
+.ph-bold.ph-hash:before {
   content: "\eb84";
 }
-
-.ph-dribbble-logo-thin::before {
+.ph-bold.ph-hash-straight:before {
   content: "\eb85";
 }
-
-.ph-drop-half-bottom-thin::before {
+.ph-bold.ph-headlights:before {
   content: "\eb86";
 }
-
-.ph-drop-half-thin::before {
+.ph-bold.ph-headphones:before {
   content: "\eb87";
 }
-
-.ph-drop-thin::before {
+.ph-bold.ph-headset:before {
   content: "\eb88";
 }
-
-.ph-ear-slash-thin::before {
+.ph-bold.ph-heartbeat:before {
   content: "\eb89";
 }
-
-.ph-ear-thin::before {
+.ph-bold.ph-heart:before {
   content: "\eb8a";
 }
-
-.ph-egg-crack-thin::before {
+.ph-bold.ph-heart-break:before {
   content: "\eb8b";
 }
-
-.ph-egg-thin::before {
+.ph-bold.ph-heart-half:before {
   content: "\eb8c";
 }
-
-.ph-eject-simple-thin::before {
+.ph-bold.ph-heart-straight:before {
   content: "\eb8d";
 }
-
-.ph-eject-thin::before {
+.ph-bold.ph-heart-straight-break:before {
   content: "\eb8e";
 }
-
-.ph-envelope-open-thin::before {
+.ph-bold.ph-hexagon:before {
   content: "\eb8f";
 }
-
-.ph-envelope-simple-open-thin::before {
+.ph-bold.ph-high-heel:before {
   content: "\eb90";
 }
-
-.ph-envelope-simple-thin::before {
+.ph-bold.ph-highlighter-circle:before {
   content: "\eb91";
 }
-
-.ph-envelope-thin::before {
+.ph-bold.ph-hoodie:before {
   content: "\eb92";
 }
-
-.ph-equalizer-thin::before {
+.ph-bold.ph-horse:before {
   content: "\eb93";
 }
-
-.ph-equals-thin::before {
+.ph-bold.ph-hourglass:before {
   content: "\eb94";
 }
-
-.ph-eraser-thin::before {
+.ph-bold.ph-hourglass-high:before {
   content: "\eb95";
 }
-
-.ph-exam-thin::before {
+.ph-bold.ph-hourglass-low:before {
   content: "\eb96";
 }
-
-.ph-export-thin::before {
+.ph-bold.ph-hourglass-medium:before {
   content: "\eb97";
 }
-
-.ph-eye-closed-thin::before {
+.ph-bold.ph-hourglass-simple:before {
   content: "\eb98";
 }
-
-.ph-eye-slash-thin::before {
+.ph-bold.ph-hourglass-simple-high:before {
   content: "\eb99";
 }
-
-.ph-eye-thin::before {
+.ph-bold.ph-hourglass-simple-low:before {
   content: "\eb9a";
 }
-
-.ph-eyedropper-sample-thin::before {
+.ph-bold.ph-hourglass-simple-medium:before {
   content: "\eb9b";
 }
-
-.ph-eyedropper-thin::before {
+.ph-bold.ph-house:before {
   content: "\eb9c";
 }
-
-.ph-eyeglasses-thin::before {
+.ph-bold.ph-house-line:before {
   content: "\eb9d";
 }
-
-.ph-face-mask-thin::before {
+.ph-bold.ph-house-simple:before {
   content: "\eb9e";
 }
-
-.ph-facebook-logo-thin::before {
+.ph-bold.ph-ice-cream:before {
   content: "\eb9f";
 }
-
-.ph-factory-thin::before {
+.ph-bold.ph-identification-badge:before {
   content: "\eba0";
 }
-
-.ph-faders-horizontal-thin::before {
+.ph-bold.ph-identification-card:before {
   content: "\eba1";
 }
-
-.ph-faders-thin::before {
+.ph-bold.ph-image:before {
   content: "\eba2";
 }
-
-.ph-fast-forward-circle-thin::before {
+.ph-bold.ph-images:before {
   content: "\eba3";
 }
-
-.ph-fast-forward-thin::before {
+.ph-bold.ph-image-square:before {
   content: "\eba4";
 }
-
-.ph-figma-logo-thin::before {
+.ph-bold.ph-images-square:before {
   content: "\eba5";
 }
-
-.ph-file-arrow-down-thin::before {
+.ph-bold.ph-infinity:before {
   content: "\eba6";
 }
-
-.ph-file-arrow-up-thin::before {
+.ph-bold.ph-info:before {
   content: "\eba7";
 }
-
-.ph-file-audio-thin::before {
+.ph-bold.ph-instagram-logo:before {
   content: "\eba8";
 }
-
-.ph-file-cloud-thin::before {
+.ph-bold.ph-intersect:before {
   content: "\eba9";
 }
-
-.ph-file-code-thin::before {
+.ph-bold.ph-intersect-square:before {
   content: "\ebaa";
 }
-
-.ph-file-css-thin::before {
+.ph-bold.ph-intersect-three:before {
   content: "\ebab";
 }
-
-.ph-file-csv-thin::before {
+.ph-bold.ph-jeep:before {
   content: "\ebac";
 }
-
-.ph-file-doc-thin::before {
+.ph-bold.ph-kanban:before {
   content: "\ebad";
 }
-
-.ph-file-dotted-thin::before {
+.ph-bold.ph-keyboard:before {
   content: "\ebae";
 }
-
-.ph-file-html-thin::before {
+.ph-bold.ph-key:before {
   content: "\ebaf";
 }
-
-.ph-file-image-thin::before {
+.ph-bold.ph-keyhole:before {
   content: "\ebb0";
 }
-
-.ph-file-jpg-thin::before {
+.ph-bold.ph-key-return:before {
   content: "\ebb1";
 }
-
-.ph-file-js-thin::before {
+.ph-bold.ph-knife:before {
   content: "\ebb2";
 }
-
-.ph-file-jsx-thin::before {
+.ph-bold.ph-ladder:before {
   content: "\ebb3";
 }
-
-.ph-file-lock-thin::before {
+.ph-bold.ph-ladder-simple:before {
   content: "\ebb4";
 }
-
-.ph-file-minus-thin::before {
+.ph-bold.ph-lamp:before {
   content: "\ebb5";
 }
-
-.ph-file-pdf-thin::before {
+.ph-bold.ph-laptop:before {
   content: "\ebb6";
 }
-
-.ph-file-plus-thin::before {
+.ph-bold.ph-layout:before {
   content: "\ebb7";
 }
-
-.ph-file-png-thin::before {
+.ph-bold.ph-leaf:before {
   content: "\ebb8";
 }
-
-.ph-file-ppt-thin::before {
+.ph-bold.ph-lifebuoy:before {
   content: "\ebb9";
 }
-
-.ph-file-rs-thin::before {
+.ph-bold.ph-lightbulb:before {
   content: "\ebba";
 }
-
-.ph-file-search-thin::before {
+.ph-bold.ph-lightbulb-filament:before {
   content: "\ebbb";
 }
-
-.ph-file-text-thin::before {
+.ph-bold.ph-lighthouse:before {
   content: "\ebbc";
 }
-
-.ph-file-thin::before {
+.ph-bold.ph-lightning-a:before {
   content: "\ebbd";
 }
-
-.ph-file-ts-thin::before {
+.ph-bold.ph-lightning:before {
   content: "\ebbe";
 }
-
-.ph-file-tsx-thin::before {
+.ph-bold.ph-lightning-slash:before {
   content: "\ebbf";
 }
-
-.ph-file-video-thin::before {
+.ph-bold.ph-line-segment:before {
   content: "\ebc0";
 }
-
-.ph-file-vue-thin::before {
+.ph-bold.ph-line-segments:before {
   content: "\ebc1";
 }
-
-.ph-file-x-thin::before {
+.ph-bold.ph-link:before {
   content: "\ebc2";
 }
-
-.ph-file-xls-thin::before {
+.ph-bold.ph-link-break:before {
   content: "\ebc3";
 }
-
-.ph-file-zip-thin::before {
+.ph-bold.ph-linkedin-logo:before {
   content: "\ebc4";
 }
-
-.ph-files-thin::before {
+.ph-bold.ph-link-simple:before {
   content: "\ebc5";
 }
-
-.ph-film-script-thin::before {
+.ph-bold.ph-link-simple-break:before {
   content: "\ebc6";
 }
-
-.ph-film-slate-thin::before {
+.ph-bold.ph-link-simple-horizontal:before {
   content: "\ebc7";
 }
-
-.ph-film-strip-thin::before {
+.ph-bold.ph-link-simple-horizontal-break:before {
   content: "\ebc8";
 }
-
-.ph-fingerprint-simple-thin::before {
+.ph-bold.ph-linux-logo:before {
   content: "\ebc9";
 }
-
-.ph-fingerprint-thin::before {
+.ph-bold.ph-list:before {
   content: "\ebca";
 }
-
-.ph-finn-the-human-thin::before {
+.ph-bold.ph-list-bullets:before {
   content: "\ebcb";
 }
-
-.ph-fire-simple-thin::before {
+.ph-bold.ph-list-checks:before {
   content: "\ebcc";
 }
-
-.ph-fire-thin::before {
+.ph-bold.ph-list-dashes:before {
   content: "\ebcd";
 }
-
-.ph-first-aid-kit-thin::before {
+.ph-bold.ph-list-magnifying-glass:before {
   content: "\ebce";
 }
-
-.ph-first-aid-thin::before {
+.ph-bold.ph-list-numbers:before {
   content: "\ebcf";
 }
-
-.ph-fish-simple-thin::before {
+.ph-bold.ph-list-plus:before {
   content: "\ebd0";
 }
-
-.ph-fish-thin::before {
+.ph-bold.ph-lock:before {
   content: "\ebd1";
 }
-
-.ph-flag-banner-thin::before {
+.ph-bold.ph-lockers:before {
   content: "\ebd2";
 }
-
-.ph-flag-checkered-thin::before {
+.ph-bold.ph-lock-key:before {
   content: "\ebd3";
 }
-
-.ph-flag-thin::before {
+.ph-bold.ph-lock-key-open:before {
   content: "\ebd4";
 }
-
-.ph-flame-thin::before {
+.ph-bold.ph-lock-laminated:before {
   content: "\ebd5";
 }
-
-.ph-flashlight-thin::before {
+.ph-bold.ph-lock-laminated-open:before {
   content: "\ebd6";
 }
-
-.ph-flask-thin::before {
+.ph-bold.ph-lock-open:before {
   content: "\ebd7";
 }
-
-.ph-floppy-disk-back-thin::before {
+.ph-bold.ph-lock-simple:before {
   content: "\ebd8";
 }
-
-.ph-floppy-disk-thin::before {
+.ph-bold.ph-lock-simple-open:before {
   content: "\ebd9";
 }
-
-.ph-flow-arrow-thin::before {
+.ph-bold.ph-magic-wand:before {
   content: "\ebda";
 }
-
-.ph-flower-lotus-thin::before {
+.ph-bold.ph-magnet:before {
   content: "\ebdb";
 }
-
-.ph-flower-thin::before {
+.ph-bold.ph-magnet-straight:before {
   content: "\ebdc";
 }
-
-.ph-flying-saucer-thin::before {
+.ph-bold.ph-magnifying-glass:before {
   content: "\ebdd";
 }
-
-.ph-folder-dotted-thin::before {
+.ph-bold.ph-magnifying-glass-minus:before {
   content: "\ebde";
 }
-
-.ph-folder-lock-thin::before {
+.ph-bold.ph-magnifying-glass-plus:before {
   content: "\ebdf";
 }
-
-.ph-folder-minus-thin::before {
+.ph-bold.ph-map-pin:before {
   content: "\ebe0";
 }
-
-.ph-folder-notch-minus-thin::before {
+.ph-bold.ph-map-pin-line:before {
   content: "\ebe1";
 }
-
-.ph-folder-notch-open-thin::before {
+.ph-bold.ph-map-trifold:before {
   content: "\ebe2";
 }
-
-.ph-folder-notch-plus-thin::before {
+.ph-bold.ph-marker-circle:before {
   content: "\ebe3";
 }
-
-.ph-folder-notch-thin::before {
+.ph-bold.ph-martini:before {
   content: "\ebe4";
 }
-
-.ph-folder-open-thin::before {
+.ph-bold.ph-mask-happy:before {
   content: "\ebe5";
 }
-
-.ph-folder-plus-thin::before {
+.ph-bold.ph-mask-sad:before {
   content: "\ebe6";
 }
-
-.ph-folder-simple-dotted-thin::before {
+.ph-bold.ph-math-operations:before {
   content: "\ebe7";
 }
-
-.ph-folder-simple-lock-thin::before {
+.ph-bold.ph-medal:before {
   content: "\ebe8";
 }
-
-.ph-folder-simple-minus-thin::before {
+.ph-bold.ph-medal-military:before {
   content: "\ebe9";
 }
-
-.ph-folder-simple-plus-thin::before {
+.ph-bold.ph-medium-logo:before {
   content: "\ebea";
 }
-
-.ph-folder-simple-star-thin::before {
+.ph-bold.ph-megaphone:before {
   content: "\ebeb";
 }
-
-.ph-folder-simple-thin::before {
+.ph-bold.ph-megaphone-simple:before {
   content: "\ebec";
 }
-
-.ph-folder-simple-user-thin::before {
+.ph-bold.ph-messenger-logo:before {
   content: "\ebed";
 }
-
-.ph-folder-star-thin::before {
+.ph-bold.ph-meta-logo:before {
   content: "\ebee";
 }
-
-.ph-folder-thin::before {
+.ph-bold.ph-metronome:before {
   content: "\ebef";
 }
-
-.ph-folder-user-thin::before {
+.ph-bold.ph-microphone:before {
   content: "\ebf0";
 }
-
-.ph-folders-thin::before {
+.ph-bold.ph-microphone-slash:before {
   content: "\ebf1";
 }
-
-.ph-football-thin::before {
+.ph-bold.ph-microphone-stage:before {
   content: "\ebf2";
 }
-
-.ph-fork-knife-thin::before {
+.ph-bold.ph-microsoft-excel-logo:before {
   content: "\ebf3";
 }
-
-.ph-frame-corners-thin::before {
+.ph-bold.ph-microsoft-outlook-logo:before {
   content: "\ebf4";
 }
-
-.ph-framer-logo-thin::before {
+.ph-bold.ph-microsoft-powerpoint-logo:before {
   content: "\ebf5";
 }
-
-.ph-function-thin::before {
+.ph-bold.ph-microsoft-teams-logo:before {
   content: "\ebf6";
 }
-
-.ph-funnel-simple-thin::before {
+.ph-bold.ph-microsoft-word-logo:before {
   content: "\ebf7";
 }
-
-.ph-funnel-thin::before {
+.ph-bold.ph-minus:before {
   content: "\ebf8";
 }
-
-.ph-game-controller-thin::before {
+.ph-bold.ph-minus-circle:before {
   content: "\ebf9";
 }
-
-.ph-gas-pump-thin::before {
+.ph-bold.ph-minus-square:before {
   content: "\ebfa";
 }
-
-.ph-gauge-thin::before {
+.ph-bold.ph-money:before {
   content: "\ebfb";
 }
-
-.ph-gear-six-thin::before {
+.ph-bold.ph-monitor:before {
   content: "\ebfc";
 }
-
-.ph-gear-thin::before {
+.ph-bold.ph-monitor-play:before {
   content: "\ebfd";
 }
-
-.ph-gender-female-thin::before {
+.ph-bold.ph-moon:before {
   content: "\ebfe";
 }
-
-.ph-gender-intersex-thin::before {
+.ph-bold.ph-moon-stars:before {
   content: "\ebff";
 }
-
-.ph-gender-male-thin::before {
+.ph-bold.ph-moped:before {
   content: "\ec00";
 }
-
-.ph-gender-neuter-thin::before {
+.ph-bold.ph-moped-front:before {
   content: "\ec01";
 }
-
-.ph-gender-nonbinary-thin::before {
+.ph-bold.ph-mosque:before {
   content: "\ec02";
 }
-
-.ph-gender-transgender-thin::before {
+.ph-bold.ph-motorcycle:before {
   content: "\ec03";
 }
-
-.ph-ghost-thin::before {
+.ph-bold.ph-mountains:before {
   content: "\ec04";
 }
-
-.ph-gif-thin::before {
+.ph-bold.ph-mouse:before {
   content: "\ec05";
 }
-
-.ph-gift-thin::before {
+.ph-bold.ph-mouse-simple:before {
   content: "\ec06";
 }
-
-.ph-git-branch-thin::before {
+.ph-bold.ph-music-note:before {
   content: "\ec07";
 }
-
-.ph-git-commit-thin::before {
+.ph-bold.ph-music-notes:before {
   content: "\ec08";
 }
-
-.ph-git-diff-thin::before {
+.ph-bold.ph-music-note-simple:before {
   content: "\ec09";
 }
-
-.ph-git-fork-thin::before {
+.ph-bold.ph-music-notes-plus:before {
   content: "\ec0a";
 }
-
-.ph-git-merge-thin::before {
+.ph-bold.ph-music-notes-simple:before {
   content: "\ec0b";
 }
-
-.ph-git-pull-request-thin::before {
+.ph-bold.ph-navigation-arrow:before {
   content: "\ec0c";
 }
-
-.ph-github-logo-thin::before {
+.ph-bold.ph-needle:before {
   content: "\ec0d";
 }
-
-.ph-gitlab-logo-simple-thin::before {
+.ph-bold.ph-newspaper:before {
   content: "\ec0e";
 }
-
-.ph-gitlab-logo-thin::before {
+.ph-bold.ph-newspaper-clipping:before {
   content: "\ec0f";
 }
-
-.ph-globe-hemisphere-east-thin::before {
+.ph-bold.ph-notches:before {
   content: "\ec10";
 }
-
-.ph-globe-hemisphere-west-thin::before {
+.ph-bold.ph-note-blank:before {
   content: "\ec11";
 }
-
-.ph-globe-simple-thin::before {
+.ph-bold.ph-note:before {
   content: "\ec12";
 }
-
-.ph-globe-stand-thin::before {
+.ph-bold.ph-notebook:before {
   content: "\ec13";
 }
-
-.ph-globe-thin::before {
+.ph-bold.ph-notepad:before {
   content: "\ec14";
 }
-
-.ph-google-chrome-logo-thin::before {
+.ph-bold.ph-note-pencil:before {
   content: "\ec15";
 }
-
-.ph-google-logo-thin::before {
+.ph-bold.ph-notification:before {
   content: "\ec16";
 }
-
-.ph-google-photos-logo-thin::before {
+.ph-bold.ph-notion-logo:before {
   content: "\ec17";
 }
-
-.ph-google-play-logo-thin::before {
+.ph-bold.ph-number-circle-eight:before {
   content: "\ec18";
 }
-
-.ph-google-podcasts-logo-thin::before {
+.ph-bold.ph-number-circle-five:before {
   content: "\ec19";
 }
-
-.ph-gradient-thin::before {
+.ph-bold.ph-number-circle-four:before {
   content: "\ec1a";
 }
-
-.ph-graduation-cap-thin::before {
+.ph-bold.ph-number-circle-nine:before {
   content: "\ec1b";
 }
-
-.ph-graph-thin::before {
+.ph-bold.ph-number-circle-one:before {
   content: "\ec1c";
 }
-
-.ph-grid-four-thin::before {
+.ph-bold.ph-number-circle-seven:before {
   content: "\ec1d";
 }
-
-.ph-hamburger-thin::before {
+.ph-bold.ph-number-circle-six:before {
   content: "\ec1e";
 }
-
-.ph-hand-eye-thin::before {
+.ph-bold.ph-number-circle-three:before {
   content: "\ec1f";
 }
-
-.ph-hand-fist-thin::before {
+.ph-bold.ph-number-circle-two:before {
   content: "\ec20";
 }
-
-.ph-hand-grabbing-thin::before {
+.ph-bold.ph-number-circle-zero:before {
   content: "\ec21";
 }
-
-.ph-hand-palm-thin::before {
+.ph-bold.ph-number-eight:before {
   content: "\ec22";
 }
-
-.ph-hand-pointing-thin::before {
+.ph-bold.ph-number-five:before {
   content: "\ec23";
 }
-
-.ph-hand-soap-thin::before {
+.ph-bold.ph-number-four:before {
   content: "\ec24";
 }
-
-.ph-hand-thin::before {
+.ph-bold.ph-number-nine:before {
   content: "\ec25";
 }
-
-.ph-hand-waving-thin::before {
+.ph-bold.ph-number-one:before {
   content: "\ec26";
 }
-
-.ph-handbag-simple-thin::before {
+.ph-bold.ph-number-seven:before {
   content: "\ec27";
 }
-
-.ph-handbag-thin::before {
+.ph-bold.ph-number-six:before {
   content: "\ec28";
 }
-
-.ph-hands-clapping-thin::before {
+.ph-bold.ph-number-square-eight:before {
   content: "\ec29";
 }
-
-.ph-handshake-thin::before {
+.ph-bold.ph-number-square-five:before {
   content: "\ec2a";
 }
-
-.ph-hard-drive-thin::before {
+.ph-bold.ph-number-square-four:before {
   content: "\ec2b";
 }
-
-.ph-hard-drives-thin::before {
+.ph-bold.ph-number-square-nine:before {
   content: "\ec2c";
 }
-
-.ph-hash-straight-thin::before {
+.ph-bold.ph-number-square-one:before {
   content: "\ec2d";
 }
-
-.ph-hash-thin::before {
+.ph-bold.ph-number-square-seven:before {
   content: "\ec2e";
 }
-
-.ph-headlights-thin::before {
+.ph-bold.ph-number-square-six:before {
   content: "\ec2f";
 }
-
-.ph-headphones-thin::before {
+.ph-bold.ph-number-square-three:before {
   content: "\ec30";
 }
-
-.ph-headset-thin::before {
+.ph-bold.ph-number-square-two:before {
   content: "\ec31";
 }
-
-.ph-heart-break-thin::before {
+.ph-bold.ph-number-square-zero:before {
   content: "\ec32";
 }
-
-.ph-heart-straight-break-thin::before {
+.ph-bold.ph-number-three:before {
   content: "\ec33";
 }
-
-.ph-heart-straight-thin::before {
+.ph-bold.ph-number-two:before {
   content: "\ec34";
 }
-
-.ph-heart-thin::before {
+.ph-bold.ph-number-zero:before {
   content: "\ec35";
 }
-
-.ph-heartbeat-thin::before {
+.ph-bold.ph-nut:before {
   content: "\ec36";
 }
-
-.ph-hexagon-thin::before {
+.ph-bold.ph-ny-times-logo:before {
   content: "\ec37";
 }
-
-.ph-highlighter-circle-thin::before {
+.ph-bold.ph-octagon:before {
   content: "\ec38";
 }
-
-.ph-horse-thin::before {
+.ph-bold.ph-office-chair:before {
   content: "\ec39";
 }
-
-.ph-hourglass-high-thin::before {
+.ph-bold.ph-option:before {
   content: "\ec3a";
 }
-
-.ph-hourglass-low-thin::before {
+.ph-bold.ph-orange-slice:before {
   content: "\ec3b";
 }
-
-.ph-hourglass-medium-thin::before {
+.ph-bold.ph-package:before {
   content: "\ec3c";
 }
-
-.ph-hourglass-simple-high-thin::before {
+.ph-bold.ph-paint-brush:before {
   content: "\ec3d";
 }
-
-.ph-hourglass-simple-low-thin::before {
+.ph-bold.ph-paint-brush-broad:before {
   content: "\ec3e";
 }
-
-.ph-hourglass-simple-medium-thin::before {
+.ph-bold.ph-paint-brush-household:before {
   content: "\ec3f";
 }
-
-.ph-hourglass-simple-thin::before {
+.ph-bold.ph-paint-bucket:before {
   content: "\ec40";
 }
-
-.ph-hourglass-thin::before {
+.ph-bold.ph-paint-roller:before {
   content: "\ec41";
 }
-
-.ph-house-line-thin::before {
+.ph-bold.ph-palette:before {
   content: "\ec42";
 }
-
-.ph-house-simple-thin::before {
+.ph-bold.ph-pants:before {
   content: "\ec43";
 }
-
-.ph-house-thin::before {
+.ph-bold.ph-paperclip:before {
   content: "\ec44";
 }
-
-.ph-identification-badge-thin::before {
+.ph-bold.ph-paperclip-horizontal:before {
   content: "\ec45";
 }
-
-.ph-identification-card-thin::before {
+.ph-bold.ph-paper-plane:before {
   content: "\ec46";
 }
-
-.ph-image-square-thin::before {
+.ph-bold.ph-paper-plane-right:before {
   content: "\ec47";
 }
-
-.ph-image-thin::before {
+.ph-bold.ph-paper-plane-tilt:before {
   content: "\ec48";
 }
-
-.ph-infinity-thin::before {
+.ph-bold.ph-parachute:before {
   content: "\ec49";
 }
-
-.ph-info-thin::before {
+.ph-bold.ph-paragraph:before {
   content: "\ec4a";
 }
-
-.ph-instagram-logo-thin::before {
+.ph-bold.ph-parallelogram:before {
   content: "\ec4b";
 }
-
-.ph-intersect-thin::before {
+.ph-bold.ph-park:before {
   content: "\ec4c";
 }
-
-.ph-jeep-thin::before {
+.ph-bold.ph-password:before {
   content: "\ec4d";
 }
-
-.ph-kanban-thin::before {
+.ph-bold.ph-path:before {
   content: "\ec4e";
 }
-
-.ph-key-return-thin::before {
+.ph-bold.ph-patreon-logo:before {
   content: "\ec4f";
 }
-
-.ph-key-thin::before {
+.ph-bold.ph-pause:before {
   content: "\ec50";
 }
-
-.ph-keyboard-thin::before {
+.ph-bold.ph-pause-circle:before {
   content: "\ec51";
 }
-
-.ph-keyhole-thin::before {
+.ph-bold.ph-paw-print:before {
   content: "\ec52";
 }
-
-.ph-knife-thin::before {
+.ph-bold.ph-paypal-logo:before {
   content: "\ec53";
 }
-
-.ph-ladder-simple-thin::before {
+.ph-bold.ph-peace:before {
   content: "\ec54";
 }
-
-.ph-ladder-thin::before {
+.ph-bold.ph-pen:before {
   content: "\ec55";
 }
-
-.ph-lamp-thin::before {
+.ph-bold.ph-pencil:before {
   content: "\ec56";
 }
-
-.ph-laptop-thin::before {
+.ph-bold.ph-pencil-circle:before {
   content: "\ec57";
 }
-
-.ph-layout-thin::before {
+.ph-bold.ph-pencil-line:before {
   content: "\ec58";
 }
-
-.ph-leaf-thin::before {
+.ph-bold.ph-pencil-simple:before {
   content: "\ec59";
 }
-
-.ph-lifebuoy-thin::before {
+.ph-bold.ph-pencil-simple-line:before {
   content: "\ec5a";
 }
-
-.ph-lightbulb-filament-thin::before {
+.ph-bold.ph-pencil-simple-slash:before {
   content: "\ec5b";
 }
-
-.ph-lightbulb-thin::before {
+.ph-bold.ph-pencil-slash:before {
   content: "\ec5c";
 }
-
-.ph-lightning-slash-thin::before {
+.ph-bold.ph-pen-nib:before {
   content: "\ec5d";
 }
-
-.ph-lightning-thin::before {
+.ph-bold.ph-pen-nib-straight:before {
   content: "\ec5e";
 }
-
-.ph-line-segment-thin::before {
+.ph-bold.ph-pentagram:before {
   content: "\ec5f";
 }
-
-.ph-line-segments-thin::before {
+.ph-bold.ph-pepper:before {
   content: "\ec60";
 }
-
-.ph-link-break-thin::before {
+.ph-bold.ph-percent:before {
   content: "\ec61";
 }
-
-.ph-link-simple-break-thin::before {
+.ph-bold.ph-person-arms-spread:before {
   content: "\ec62";
 }
-
-.ph-link-simple-horizontal-break-thin::before {
+.ph-bold.ph-person:before {
   content: "\ec63";
 }
-
-.ph-link-simple-horizontal-thin::before {
+.ph-bold.ph-person-simple-bike:before {
   content: "\ec64";
 }
-
-.ph-link-simple-thin::before {
+.ph-bold.ph-person-simple:before {
   content: "\ec65";
 }
-
-.ph-link-thin::before {
+.ph-bold.ph-person-simple-run:before {
   content: "\ec66";
 }
-
-.ph-linkedin-logo-thin::before {
+.ph-bold.ph-person-simple-throw:before {
   content: "\ec67";
 }
-
-.ph-linux-logo-thin::before {
+.ph-bold.ph-person-simple-walk:before {
   content: "\ec68";
 }
-
-.ph-list-bullets-thin::before {
+.ph-bold.ph-perspective:before {
   content: "\ec69";
 }
-
-.ph-list-checks-thin::before {
+.ph-bold.ph-phone:before {
   content: "\ec6a";
 }
-
-.ph-list-dashes-thin::before {
+.ph-bold.ph-phone-call:before {
   content: "\ec6b";
 }
-
-.ph-list-numbers-thin::before {
+.ph-bold.ph-phone-disconnect:before {
   content: "\ec6c";
 }
-
-.ph-list-plus-thin::before {
+.ph-bold.ph-phone-incoming:before {
   content: "\ec6d";
 }
-
-.ph-list-thin::before {
+.ph-bold.ph-phone-outgoing:before {
   content: "\ec6e";
 }
-
-.ph-lock-key-open-thin::before {
+.ph-bold.ph-phone-plus:before {
   content: "\ec6f";
 }
-
-.ph-lock-key-thin::before {
+.ph-bold.ph-phone-slash:before {
   content: "\ec70";
 }
-
-.ph-lock-laminated-open-thin::before {
+.ph-bold.ph-phone-x:before {
   content: "\ec71";
 }
-
-.ph-lock-laminated-thin::before {
+.ph-bold.ph-phosphor-logo:before {
   content: "\ec72";
 }
-
-.ph-lock-open-thin::before {
+.ph-bold.ph-piano-keys:before {
   content: "\ec73";
 }
-
-.ph-lock-simple-open-thin::before {
+.ph-bold.ph-pi:before {
   content: "\ec74";
 }
-
-.ph-lock-simple-thin::before {
+.ph-bold.ph-picture-in-picture:before {
   content: "\ec75";
 }
-
-.ph-lock-thin::before {
+.ph-bold.ph-piggy-bank:before {
   content: "\ec76";
 }
-
-.ph-magic-wand-thin::before {
+.ph-bold.ph-pill:before {
   content: "\ec77";
 }
-
-.ph-magnet-straight-thin::before {
+.ph-bold.ph-pinterest-logo:before {
   content: "\ec78";
 }
-
-.ph-magnet-thin::before {
+.ph-bold.ph-pinwheel:before {
   content: "\ec79";
 }
-
-.ph-magnifying-glass-minus-thin::before {
+.ph-bold.ph-pizza:before {
   content: "\ec7a";
 }
-
-.ph-magnifying-glass-plus-thin::before {
+.ph-bold.ph-placeholder:before {
   content: "\ec7b";
 }
-
-.ph-magnifying-glass-thin::before {
+.ph-bold.ph-planet:before {
   content: "\ec7c";
 }
-
-.ph-map-pin-line-thin::before {
+.ph-bold.ph-plant:before {
   content: "\ec7d";
 }
-
-.ph-map-pin-thin::before {
+.ph-bold.ph-play:before {
   content: "\ec7e";
 }
-
-.ph-map-trifold-thin::before {
+.ph-bold.ph-play-circle:before {
   content: "\ec7f";
 }
-
-.ph-marker-circle-thin::before {
+.ph-bold.ph-playlist:before {
   content: "\ec80";
 }
-
-.ph-martini-thin::before {
+.ph-bold.ph-play-pause:before {
   content: "\ec81";
 }
-
-.ph-mask-happy-thin::before {
+.ph-bold.ph-plug:before {
   content: "\ec82";
 }
-
-.ph-mask-sad-thin::before {
+.ph-bold.ph-plug-charging:before {
   content: "\ec83";
 }
-
-.ph-math-operations-thin::before {
+.ph-bold.ph-plugs:before {
   content: "\ec84";
 }
-
-.ph-medal-thin::before {
+.ph-bold.ph-plugs-connected:before {
   content: "\ec85";
 }
-
-.ph-medium-logo-thin::before {
+.ph-bold.ph-plus:before {
   content: "\ec86";
 }
-
-.ph-megaphone-simple-thin::before {
+.ph-bold.ph-plus-circle:before {
   content: "\ec87";
 }
-
-.ph-megaphone-thin::before {
+.ph-bold.ph-plus-minus:before {
   content: "\ec88";
 }
-
-.ph-messenger-logo-thin::before {
+.ph-bold.ph-plus-square:before {
   content: "\ec89";
 }
-
-.ph-microphone-slash-thin::before {
+.ph-bold.ph-poker-chip:before {
   content: "\ec8a";
 }
-
-.ph-microphone-stage-thin::before {
+.ph-bold.ph-police-car:before {
   content: "\ec8b";
 }
-
-.ph-microphone-thin::before {
+.ph-bold.ph-polygon:before {
   content: "\ec8c";
 }
-
-.ph-microsoft-excel-logo-thin::before {
+.ph-bold.ph-popcorn:before {
   content: "\ec8d";
 }
-
-.ph-microsoft-powerpoint-logo-thin::before {
+.ph-bold.ph-potted-plant:before {
   content: "\ec8e";
 }
-
-.ph-microsoft-teams-logo-thin::before {
+.ph-bold.ph-power:before {
   content: "\ec8f";
 }
-
-.ph-microsoft-word-logo-thin::before {
+.ph-bold.ph-prescription:before {
   content: "\ec90";
 }
-
-.ph-minus-circle-thin::before {
+.ph-bold.ph-presentation:before {
   content: "\ec91";
 }
-
-.ph-minus-thin::before {
+.ph-bold.ph-presentation-chart:before {
   content: "\ec92";
 }
-
-.ph-money-thin::before {
+.ph-bold.ph-printer:before {
   content: "\ec93";
 }
-
-.ph-monitor-play-thin::before {
+.ph-bold.ph-prohibit:before {
   content: "\ec94";
 }
-
-.ph-monitor-thin::before {
+.ph-bold.ph-prohibit-inset:before {
   content: "\ec95";
 }
-
-.ph-moon-stars-thin::before {
+.ph-bold.ph-projector-screen:before {
   content: "\ec96";
 }
-
-.ph-moon-thin::before {
+.ph-bold.ph-projector-screen-chart:before {
   content: "\ec97";
 }
-
-.ph-mountains-thin::before {
+.ph-bold.ph-pulse:before, .ph-bold.ph-activity:before {
   content: "\ec98";
 }
-
-.ph-mouse-simple-thin::before {
+.ph-bold.ph-push-pin:before {
   content: "\ec99";
 }
-
-.ph-mouse-thin::before {
+.ph-bold.ph-push-pin-simple:before {
   content: "\ec9a";
 }
-
-.ph-music-note-simple-thin::before {
+.ph-bold.ph-push-pin-simple-slash:before {
   content: "\ec9b";
 }
-
-.ph-music-note-thin::before {
+.ph-bold.ph-push-pin-slash:before {
   content: "\ec9c";
 }
-
-.ph-music-notes-plus-thin::before {
+.ph-bold.ph-puzzle-piece:before {
   content: "\ec9d";
 }
-
-.ph-music-notes-simple-thin::before {
+.ph-bold.ph-qr-code:before {
   content: "\ec9e";
 }
-
-.ph-music-notes-thin::before {
+.ph-bold.ph-question:before {
   content: "\ec9f";
 }
-
-.ph-navigation-arrow-thin::before {
+.ph-bold.ph-queue:before {
   content: "\eca0";
 }
-
-.ph-needle-thin::before {
+.ph-bold.ph-quotes:before {
   content: "\eca1";
 }
-
-.ph-newspaper-clipping-thin::before {
+.ph-bold.ph-radical:before {
   content: "\eca2";
 }
-
-.ph-newspaper-thin::before {
+.ph-bold.ph-radioactive:before {
   content: "\eca3";
 }
-
-.ph-note-blank-thin::before {
+.ph-bold.ph-radio:before {
   content: "\eca4";
 }
-
-.ph-note-pencil-thin::before {
+.ph-bold.ph-radio-button:before {
   content: "\eca5";
 }
-
-.ph-note-thin::before {
+.ph-bold.ph-rainbow:before {
   content: "\eca6";
 }
-
-.ph-notebook-thin::before {
+.ph-bold.ph-rainbow-cloud:before {
   content: "\eca7";
 }
-
-.ph-notepad-thin::before {
+.ph-bold.ph-read-cv-logo:before {
   content: "\eca8";
 }
-
-.ph-notification-thin::before {
+.ph-bold.ph-receipt:before {
   content: "\eca9";
 }
-
-.ph-number-circle-eight-thin::before {
+.ph-bold.ph-receipt-x:before {
   content: "\ecaa";
 }
-
-.ph-number-circle-five-thin::before {
+.ph-bold.ph-record:before {
   content: "\ecab";
 }
-
-.ph-number-circle-four-thin::before {
+.ph-bold.ph-rectangle:before {
   content: "\ecac";
 }
-
-.ph-number-circle-nine-thin::before {
+.ph-bold.ph-recycle:before {
   content: "\ecad";
 }
-
-.ph-number-circle-one-thin::before {
+.ph-bold.ph-reddit-logo:before {
   content: "\ecae";
 }
-
-.ph-number-circle-seven-thin::before {
+.ph-bold.ph-repeat:before {
   content: "\ecaf";
 }
-
-.ph-number-circle-six-thin::before {
+.ph-bold.ph-repeat-once:before {
   content: "\ecb0";
 }
-
-.ph-number-circle-three-thin::before {
+.ph-bold.ph-rewind:before {
   content: "\ecb1";
 }
-
-.ph-number-circle-two-thin::before {
+.ph-bold.ph-rewind-circle:before {
   content: "\ecb2";
 }
-
-.ph-number-circle-zero-thin::before {
+.ph-bold.ph-road-horizon:before {
   content: "\ecb3";
 }
-
-.ph-number-eight-thin::before {
+.ph-bold.ph-robot:before {
   content: "\ecb4";
 }
-
-.ph-number-five-thin::before {
+.ph-bold.ph-rocket:before {
   content: "\ecb5";
 }
-
-.ph-number-four-thin::before {
+.ph-bold.ph-rocket-launch:before {
   content: "\ecb6";
 }
-
-.ph-number-nine-thin::before {
+.ph-bold.ph-rows:before {
   content: "\ecb7";
 }
-
-.ph-number-one-thin::before {
+.ph-bold.ph-rss:before {
   content: "\ecb8";
 }
-
-.ph-number-seven-thin::before {
+.ph-bold.ph-rss-simple:before {
   content: "\ecb9";
 }
-
-.ph-number-six-thin::before {
+.ph-bold.ph-rug:before {
   content: "\ecba";
 }
-
-.ph-number-square-eight-thin::before {
+.ph-bold.ph-ruler:before {
   content: "\ecbb";
 }
-
-.ph-number-square-five-thin::before {
+.ph-bold.ph-scales:before {
   content: "\ecbc";
 }
-
-.ph-number-square-four-thin::before {
+.ph-bold.ph-scan:before {
   content: "\ecbd";
 }
-
-.ph-number-square-nine-thin::before {
+.ph-bold.ph-scissors:before {
   content: "\ecbe";
 }
-
-.ph-number-square-one-thin::before {
+.ph-bold.ph-scooter:before {
   content: "\ecbf";
 }
-
-.ph-number-square-seven-thin::before {
+.ph-bold.ph-screencast:before {
   content: "\ecc0";
 }
-
-.ph-number-square-six-thin::before {
+.ph-bold.ph-scribble-loop:before {
   content: "\ecc1";
 }
-
-.ph-number-square-three-thin::before {
+.ph-bold.ph-scroll:before {
   content: "\ecc2";
 }
-
-.ph-number-square-two-thin::before {
+.ph-bold.ph-seal:before, .ph-bold.ph-circle-wavy:before {
   content: "\ecc3";
 }
-
-.ph-number-square-zero-thin::before {
+.ph-bold.ph-seal-check:before, .ph-bold.ph-circle-wavy-check:before {
   content: "\ecc4";
 }
-
-.ph-number-three-thin::before {
+.ph-bold.ph-seal-question:before, .ph-bold.ph-circle-wavy-question:before {
   content: "\ecc5";
 }
-
-.ph-number-two-thin::before {
+.ph-bold.ph-seal-warning:before, .ph-bold.ph-circle-wavy-warning:before {
   content: "\ecc6";
 }
-
-.ph-number-zero-thin::before {
+.ph-bold.ph-selection-all:before {
   content: "\ecc7";
 }
-
-.ph-nut-thin::before {
+.ph-bold.ph-selection-background:before {
   content: "\ecc8";
 }
-
-.ph-ny-times-logo-thin::before {
+.ph-bold.ph-selection:before {
   content: "\ecc9";
 }
-
-.ph-octagon-thin::before {
+.ph-bold.ph-selection-foreground:before {
   content: "\ecca";
 }
-
-.ph-option-thin::before {
+.ph-bold.ph-selection-inverse:before {
   content: "\eccb";
 }
-
-.ph-package-thin::before {
+.ph-bold.ph-selection-plus:before {
   content: "\eccc";
 }
-
-.ph-paint-brush-broad-thin::before {
+.ph-bold.ph-selection-slash:before {
   content: "\eccd";
 }
-
-.ph-paint-brush-household-thin::before {
+.ph-bold.ph-shapes:before {
   content: "\ecce";
 }
-
-.ph-paint-brush-thin::before {
+.ph-bold.ph-share:before {
   content: "\eccf";
 }
-
-.ph-paint-bucket-thin::before {
+.ph-bold.ph-share-fat:before {
   content: "\ecd0";
 }
-
-.ph-paint-roller-thin::before {
+.ph-bold.ph-share-network:before {
   content: "\ecd1";
 }
-
-.ph-palette-thin::before {
+.ph-bold.ph-shield:before {
   content: "\ecd2";
 }
-
-.ph-paper-plane-right-thin::before {
+.ph-bold.ph-shield-check:before {
   content: "\ecd3";
 }
-
-.ph-paper-plane-thin::before {
+.ph-bold.ph-shield-checkered:before {
   content: "\ecd4";
 }
-
-.ph-paper-plane-tilt-thin::before {
+.ph-bold.ph-shield-chevron:before {
   content: "\ecd5";
 }
-
-.ph-paperclip-horizontal-thin::before {
+.ph-bold.ph-shield-plus:before {
   content: "\ecd6";
 }
-
-.ph-paperclip-thin::before {
+.ph-bold.ph-shield-slash:before {
   content: "\ecd7";
 }
-
-.ph-parachute-thin::before {
+.ph-bold.ph-shield-star:before {
   content: "\ecd8";
 }
-
-.ph-password-thin::before {
+.ph-bold.ph-shield-warning:before {
   content: "\ecd9";
 }
-
-.ph-path-thin::before {
+.ph-bold.ph-shirt-folded:before {
   content: "\ecda";
 }
-
-.ph-pause-circle-thin::before {
+.ph-bold.ph-shooting-star:before {
   content: "\ecdb";
 }
-
-.ph-pause-thin::before {
+.ph-bold.ph-shopping-bag:before {
   content: "\ecdc";
 }
-
-.ph-paw-print-thin::before {
+.ph-bold.ph-shopping-bag-open:before {
   content: "\ecdd";
 }
-
-.ph-peace-thin::before {
+.ph-bold.ph-shopping-cart:before {
   content: "\ecde";
 }
-
-.ph-pen-nib-straight-thin::before {
+.ph-bold.ph-shopping-cart-simple:before {
   content: "\ecdf";
 }
-
-.ph-pen-nib-thin::before {
+.ph-bold.ph-shower:before {
   content: "\ece0";
 }
-
-.ph-pen-thin::before {
+.ph-bold.ph-shrimp:before {
   content: "\ece1";
 }
-
-.ph-pencil-circle-thin::before {
+.ph-bold.ph-shuffle-angular:before {
   content: "\ece2";
 }
-
-.ph-pencil-line-thin::before {
+.ph-bold.ph-shuffle:before {
   content: "\ece3";
 }
-
-.ph-pencil-simple-line-thin::before {
+.ph-bold.ph-shuffle-simple:before {
   content: "\ece4";
 }
-
-.ph-pencil-simple-thin::before {
+.ph-bold.ph-sidebar:before {
   content: "\ece5";
 }
-
-.ph-pencil-thin::before {
+.ph-bold.ph-sidebar-simple:before {
   content: "\ece6";
 }
-
-.ph-percent-thin::before {
+.ph-bold.ph-sigma:before {
   content: "\ece7";
 }
-
-.ph-person-simple-run-thin::before {
+.ph-bold.ph-signature:before {
   content: "\ece8";
 }
-
-.ph-person-simple-thin::before {
+.ph-bold.ph-sign-in:before {
   content: "\ece9";
 }
-
-.ph-person-simple-walk-thin::before {
+.ph-bold.ph-sign-out:before {
   content: "\ecea";
 }
-
-.ph-person-thin::before {
+.ph-bold.ph-signpost:before {
   content: "\eceb";
 }
-
-.ph-perspective-thin::before {
+.ph-bold.ph-sim-card:before {
   content: "\ecec";
 }
-
-.ph-phone-call-thin::before {
+.ph-bold.ph-siren:before {
   content: "\eced";
 }
-
-.ph-phone-disconnect-thin::before {
+.ph-bold.ph-sketch-logo:before {
   content: "\ecee";
 }
-
-.ph-phone-incoming-thin::before {
+.ph-bold.ph-skip-back:before {
   content: "\ecef";
 }
-
-.ph-phone-outgoing-thin::before {
+.ph-bold.ph-skip-back-circle:before {
   content: "\ecf0";
 }
-
-.ph-phone-slash-thin::before {
+.ph-bold.ph-skip-forward:before {
   content: "\ecf1";
 }
-
-.ph-phone-thin::before {
+.ph-bold.ph-skip-forward-circle:before {
   content: "\ecf2";
 }
-
-.ph-phone-x-thin::before {
+.ph-bold.ph-skull:before {
   content: "\ecf3";
 }
-
-.ph-phosphor-logo-thin::before {
+.ph-bold.ph-slack-logo:before {
   content: "\ecf4";
 }
-
-.ph-piano-keys-thin::before {
+.ph-bold.ph-sliders:before {
   content: "\ecf5";
 }
-
-.ph-picture-in-picture-thin::before {
+.ph-bold.ph-sliders-horizontal:before {
   content: "\ecf6";
 }
-
-.ph-pill-thin::before {
+.ph-bold.ph-slideshow:before {
   content: "\ecf7";
 }
-
-.ph-pinterest-logo-thin::before {
+.ph-bold.ph-smiley-angry:before {
   content: "\ecf8";
 }
-
-.ph-pinwheel-thin::before {
+.ph-bold.ph-smiley-blank:before {
   content: "\ecf9";
 }
-
-.ph-pizza-thin::before {
+.ph-bold.ph-smiley:before {
   content: "\ecfa";
 }
-
-.ph-placeholder-thin::before {
+.ph-bold.ph-smiley-meh:before {
   content: "\ecfb";
 }
-
-.ph-planet-thin::before {
+.ph-bold.ph-smiley-nervous:before {
   content: "\ecfc";
 }
-
-.ph-play-circle-thin::before {
+.ph-bold.ph-smiley-sad:before {
   content: "\ecfd";
 }
-
-.ph-play-thin::before {
+.ph-bold.ph-smiley-sticker:before {
   content: "\ecfe";
 }
-
-.ph-playlist-thin::before {
+.ph-bold.ph-smiley-wink:before {
   content: "\ecff";
 }
-
-.ph-plug-thin::before {
+.ph-bold.ph-smiley-x-eyes:before {
   content: "\ed00";
 }
-
-.ph-plugs-connected-thin::before {
+.ph-bold.ph-snapchat-logo:before {
   content: "\ed01";
 }
-
-.ph-plugs-thin::before {
+.ph-bold.ph-sneaker:before {
   content: "\ed02";
 }
-
-.ph-plus-circle-thin::before {
+.ph-bold.ph-sneaker-move:before {
   content: "\ed03";
 }
-
-.ph-plus-minus-thin::before {
+.ph-bold.ph-snowflake:before {
   content: "\ed04";
 }
-
-.ph-plus-thin::before {
+.ph-bold.ph-soccer-ball:before {
   content: "\ed05";
 }
-
-.ph-poker-chip-thin::before {
+.ph-bold.ph-sort-ascending:before {
   content: "\ed06";
 }
-
-.ph-police-car-thin::before {
+.ph-bold.ph-sort-descending:before {
   content: "\ed07";
 }
-
-.ph-polygon-thin::before {
+.ph-bold.ph-soundcloud-logo:before {
   content: "\ed08";
 }
-
-.ph-popcorn-thin::before {
+.ph-bold.ph-spade:before {
   content: "\ed09";
 }
-
-.ph-power-thin::before {
+.ph-bold.ph-sparkle:before {
   content: "\ed0a";
 }
-
-.ph-prescription-thin::before {
+.ph-bold.ph-speaker-hifi:before {
   content: "\ed0b";
 }
-
-.ph-presentation-chart-thin::before {
+.ph-bold.ph-speaker-high:before {
   content: "\ed0c";
 }
-
-.ph-presentation-thin::before {
+.ph-bold.ph-speaker-low:before {
   content: "\ed0d";
 }
-
-.ph-printer-thin::before {
+.ph-bold.ph-speaker-none:before {
   content: "\ed0e";
 }
-
-.ph-prohibit-inset-thin::before {
+.ph-bold.ph-speaker-simple-high:before {
   content: "\ed0f";
 }
-
-.ph-prohibit-thin::before {
+.ph-bold.ph-speaker-simple-low:before {
   content: "\ed10";
 }
-
-.ph-projector-screen-chart-thin::before {
+.ph-bold.ph-speaker-simple-none:before {
   content: "\ed11";
 }
-
-.ph-projector-screen-thin::before {
+.ph-bold.ph-speaker-simple-slash:before {
   content: "\ed12";
 }
-
-.ph-push-pin-simple-slash-thin::before {
+.ph-bold.ph-speaker-simple-x:before {
   content: "\ed13";
 }
-
-.ph-push-pin-simple-thin::before {
+.ph-bold.ph-speaker-slash:before {
   content: "\ed14";
 }
-
-.ph-push-pin-slash-thin::before {
+.ph-bold.ph-speaker-x:before {
   content: "\ed15";
 }
-
-.ph-push-pin-thin::before {
+.ph-bold.ph-spinner:before {
   content: "\ed16";
 }
-
-.ph-puzzle-piece-thin::before {
+.ph-bold.ph-spinner-gap:before {
   content: "\ed17";
 }
-
-.ph-qr-code-thin::before {
+.ph-bold.ph-spiral:before {
   content: "\ed18";
 }
-
-.ph-question-thin::before {
+.ph-bold.ph-split-horizontal:before {
   content: "\ed19";
 }
-
-.ph-queue-thin::before {
+.ph-bold.ph-split-vertical:before {
   content: "\ed1a";
 }
-
-.ph-quotes-thin::before {
+.ph-bold.ph-spotify-logo:before {
   content: "\ed1b";
 }
-
-.ph-radical-thin::before {
+.ph-bold.ph-square:before {
   content: "\ed1c";
 }
-
-.ph-radio-button-thin::before {
+.ph-bold.ph-square-half:before {
   content: "\ed1d";
 }
-
-.ph-radio-thin::before {
+.ph-bold.ph-square-half-bottom:before {
   content: "\ed1e";
 }
-
-.ph-rainbow-cloud-thin::before {
+.ph-bold.ph-square-logo:before {
   content: "\ed1f";
 }
-
-.ph-rainbow-thin::before {
+.ph-bold.ph-squares-four:before {
   content: "\ed20";
 }
-
-.ph-receipt-thin::before {
+.ph-bold.ph-square-split-horizontal:before {
   content: "\ed21";
 }
-
-.ph-record-thin::before {
+.ph-bold.ph-square-split-vertical:before {
   content: "\ed22";
 }
-
-.ph-rectangle-thin::before {
+.ph-bold.ph-stack:before {
   content: "\ed23";
 }
-
-.ph-recycle-thin::before {
+.ph-bold.ph-stack-overflow-logo:before {
   content: "\ed24";
 }
-
-.ph-reddit-logo-thin::before {
+.ph-bold.ph-stack-simple:before {
   content: "\ed25";
 }
-
-.ph-repeat-once-thin::before {
+.ph-bold.ph-stairs:before {
   content: "\ed26";
 }
-
-.ph-repeat-thin::before {
+.ph-bold.ph-stamp:before {
   content: "\ed27";
 }
-
-.ph-rewind-circle-thin::before {
+.ph-bold.ph-star-and-crescent:before {
   content: "\ed28";
 }
-
-.ph-rewind-thin::before {
+.ph-bold.ph-star:before {
   content: "\ed29";
 }
-
-.ph-robot-thin::before {
+.ph-bold.ph-star-four:before {
   content: "\ed2a";
 }
-
-.ph-rocket-launch-thin::before {
+.ph-bold.ph-star-half:before {
   content: "\ed2b";
 }
-
-.ph-rocket-thin::before {
+.ph-bold.ph-star-of-david:before {
   content: "\ed2c";
 }
-
-.ph-rows-thin::before {
+.ph-bold.ph-steering-wheel:before {
   content: "\ed2d";
 }
-
-.ph-rss-simple-thin::before {
+.ph-bold.ph-steps:before {
   content: "\ed2e";
 }
-
-.ph-rss-thin::before {
+.ph-bold.ph-stethoscope:before {
   content: "\ed2f";
 }
-
-.ph-rug-thin::before {
+.ph-bold.ph-sticker:before {
   content: "\ed30";
 }
-
-.ph-ruler-thin::before {
+.ph-bold.ph-stool:before {
   content: "\ed31";
 }
-
-.ph-scales-thin::before {
+.ph-bold.ph-stop:before {
   content: "\ed32";
 }
-
-.ph-scan-thin::before {
+.ph-bold.ph-stop-circle:before {
   content: "\ed33";
 }
-
-.ph-scissors-thin::before {
+.ph-bold.ph-storefront:before {
   content: "\ed34";
 }
-
-.ph-screencast-thin::before {
+.ph-bold.ph-strategy:before {
   content: "\ed35";
 }
-
-.ph-scribble-loop-thin::before {
+.ph-bold.ph-stripe-logo:before {
   content: "\ed36";
 }
-
-.ph-scroll-thin::before {
+.ph-bold.ph-student:before {
   content: "\ed37";
 }
-
-.ph-selection-all-thin::before {
+.ph-bold.ph-subtitles:before {
   content: "\ed38";
 }
-
-.ph-selection-background-thin::before {
+.ph-bold.ph-subtract:before {
   content: "\ed39";
 }
-
-.ph-selection-foreground-thin::before {
+.ph-bold.ph-subtract-square:before {
   content: "\ed3a";
 }
-
-.ph-selection-inverse-thin::before {
+.ph-bold.ph-suitcase:before {
   content: "\ed3b";
 }
-
-.ph-selection-plus-thin::before {
+.ph-bold.ph-suitcase-rolling:before {
   content: "\ed3c";
 }
-
-.ph-selection-slash-thin::before {
+.ph-bold.ph-suitcase-simple:before {
   content: "\ed3d";
 }
-
-.ph-selection-thin::before {
+.ph-bold.ph-sun:before {
   content: "\ed3e";
 }
-
-.ph-share-network-thin::before {
+.ph-bold.ph-sun-dim:before {
   content: "\ed3f";
 }
-
-.ph-share-thin::before {
+.ph-bold.ph-sunglasses:before {
   content: "\ed40";
 }
-
-.ph-shield-check-thin::before {
+.ph-bold.ph-sun-horizon:before {
   content: "\ed41";
 }
-
-.ph-shield-checkered-thin::before {
+.ph-bold.ph-swap:before {
   content: "\ed42";
 }
-
-.ph-shield-chevron-thin::before {
+.ph-bold.ph-swatches:before {
   content: "\ed43";
 }
-
-.ph-shield-plus-thin::before {
+.ph-bold.ph-swimming-pool:before {
   content: "\ed44";
 }
-
-.ph-shield-slash-thin::before {
+.ph-bold.ph-sword:before {
   content: "\ed45";
 }
-
-.ph-shield-star-thin::before {
+.ph-bold.ph-synagogue:before {
   content: "\ed46";
 }
-
-.ph-shield-thin::before {
+.ph-bold.ph-syringe:before {
   content: "\ed47";
 }
-
-.ph-shield-warning-thin::before {
+.ph-bold.ph-table:before {
   content: "\ed48";
 }
-
-.ph-shopping-bag-open-thin::before {
+.ph-bold.ph-tabs:before {
   content: "\ed49";
 }
-
-.ph-shopping-bag-thin::before {
+.ph-bold.ph-tag:before {
   content: "\ed4a";
 }
-
-.ph-shopping-cart-simple-thin::before {
+.ph-bold.ph-tag-chevron:before {
   content: "\ed4b";
 }
-
-.ph-shopping-cart-thin::before {
+.ph-bold.ph-tag-simple:before {
   content: "\ed4c";
 }
-
-.ph-shower-thin::before {
+.ph-bold.ph-target:before {
   content: "\ed4d";
 }
-
-.ph-shuffle-angular-thin::before {
+.ph-bold.ph-taxi:before {
   content: "\ed4e";
 }
-
-.ph-shuffle-simple-thin::before {
+.ph-bold.ph-telegram-logo:before {
   content: "\ed4f";
 }
-
-.ph-shuffle-thin::before {
+.ph-bold.ph-television:before {
   content: "\ed50";
 }
-
-.ph-sidebar-simple-thin::before {
+.ph-bold.ph-television-simple:before {
   content: "\ed51";
 }
-
-.ph-sidebar-thin::before {
+.ph-bold.ph-tennis-ball:before {
   content: "\ed52";
 }
-
-.ph-sign-in-thin::before {
+.ph-bold.ph-tent:before {
   content: "\ed53";
 }
-
-.ph-sign-out-thin::before {
+.ph-bold.ph-terminal:before {
   content: "\ed54";
 }
-
-.ph-signpost-thin::before {
+.ph-bold.ph-terminal-window:before {
   content: "\ed55";
 }
-
-.ph-sim-card-thin::before {
+.ph-bold.ph-test-tube:before {
   content: "\ed56";
 }
-
-.ph-sketch-logo-thin::before {
+.ph-bold.ph-text-aa:before {
   content: "\ed57";
 }
-
-.ph-skip-back-circle-thin::before {
+.ph-bold.ph-text-align-center:before {
   content: "\ed58";
 }
-
-.ph-skip-back-thin::before {
+.ph-bold.ph-text-align-justify:before {
   content: "\ed59";
 }
-
-.ph-skip-forward-circle-thin::before {
+.ph-bold.ph-text-align-left:before {
   content: "\ed5a";
 }
-
-.ph-skip-forward-thin::before {
+.ph-bold.ph-text-align-right:before {
   content: "\ed5b";
 }
-
-.ph-skull-thin::before {
+.ph-bold.ph-text-a-underline:before {
   content: "\ed5c";
 }
-
-.ph-slack-logo-thin::before {
+.ph-bold.ph-text-b:before, .ph-bold.ph-text-bolder:before {
   content: "\ed5d";
 }
-
-.ph-sliders-horizontal-thin::before {
+.ph-bold.ph-textbox:before {
   content: "\ed5e";
 }
-
-.ph-sliders-thin::before {
+.ph-bold.ph-text-columns:before {
   content: "\ed5f";
 }
-
-.ph-smiley-blank-thin::before {
+.ph-bold.ph-text-h:before {
   content: "\ed60";
 }
-
-.ph-smiley-meh-thin::before {
+.ph-bold.ph-text-h-five:before {
   content: "\ed61";
 }
-
-.ph-smiley-nervous-thin::before {
+.ph-bold.ph-text-h-four:before {
   content: "\ed62";
 }
-
-.ph-smiley-sad-thin::before {
+.ph-bold.ph-text-h-one:before {
   content: "\ed63";
 }
-
-.ph-smiley-sticker-thin::before {
+.ph-bold.ph-text-h-six:before {
   content: "\ed64";
 }
-
-.ph-smiley-thin::before {
+.ph-bold.ph-text-h-three:before {
   content: "\ed65";
 }
-
-.ph-smiley-wink-thin::before {
+.ph-bold.ph-text-h-two:before {
   content: "\ed66";
 }
-
-.ph-smiley-x-eyes-thin::before {
+.ph-bold.ph-text-indent:before {
   content: "\ed67";
 }
-
-.ph-snapchat-logo-thin::before {
+.ph-bold.ph-text-italic:before {
   content: "\ed68";
 }
-
-.ph-snowflake-thin::before {
+.ph-bold.ph-text-outdent:before {
   content: "\ed69";
 }
-
-.ph-soccer-ball-thin::before {
+.ph-bold.ph-text-strikethrough:before {
   content: "\ed6a";
 }
-
-.ph-sort-ascending-thin::before {
+.ph-bold.ph-text-t:before {
   content: "\ed6b";
 }
-
-.ph-sort-descending-thin::before {
+.ph-bold.ph-text-underline:before {
   content: "\ed6c";
 }
-
-.ph-spade-thin::before {
+.ph-bold.ph-thermometer:before {
   content: "\ed6d";
 }
-
-.ph-sparkle-thin::before {
+.ph-bold.ph-thermometer-cold:before {
   content: "\ed6e";
 }
-
-.ph-speaker-high-thin::before {
+.ph-bold.ph-thermometer-hot:before {
   content: "\ed6f";
 }
-
-.ph-speaker-low-thin::before {
+.ph-bold.ph-thermometer-simple:before {
   content: "\ed70";
 }
-
-.ph-speaker-none-thin::before {
+.ph-bold.ph-thumbs-down:before {
   content: "\ed71";
 }
-
-.ph-speaker-simple-high-thin::before {
+.ph-bold.ph-thumbs-up:before {
   content: "\ed72";
 }
-
-.ph-speaker-simple-low-thin::before {
+.ph-bold.ph-ticket:before {
   content: "\ed73";
 }
-
-.ph-speaker-simple-none-thin::before {
+.ph-bold.ph-tidal-logo:before {
   content: "\ed74";
 }
-
-.ph-speaker-simple-slash-thin::before {
+.ph-bold.ph-tiktok-logo:before {
   content: "\ed75";
 }
-
-.ph-speaker-simple-x-thin::before {
+.ph-bold.ph-timer:before {
   content: "\ed76";
 }
-
-.ph-speaker-slash-thin::before {
+.ph-bold.ph-tipi:before {
   content: "\ed77";
 }
-
-.ph-speaker-x-thin::before {
+.ph-bold.ph-toggle-left:before {
   content: "\ed78";
 }
-
-.ph-spinner-gap-thin::before {
+.ph-bold.ph-toggle-right:before {
   content: "\ed79";
 }
-
-.ph-spinner-thin::before {
+.ph-bold.ph-toilet:before {
   content: "\ed7a";
 }
-
-.ph-spiral-thin::before {
+.ph-bold.ph-toilet-paper:before {
   content: "\ed7b";
 }
-
-.ph-spotify-logo-thin::before {
+.ph-bold.ph-toolbox:before {
   content: "\ed7c";
 }
-
-.ph-square-half-bottom-thin::before {
+.ph-bold.ph-tooth:before {
   content: "\ed7d";
 }
-
-.ph-square-half-thin::before {
+.ph-bold.ph-tote:before {
   content: "\ed7e";
 }
-
-.ph-square-logo-thin::before {
+.ph-bold.ph-tote-simple:before {
   content: "\ed7f";
 }
-
-.ph-square-thin::before {
+.ph-bold.ph-trademark:before {
   content: "\ed80";
 }
-
-.ph-squares-four-thin::before {
+.ph-bold.ph-trademark-registered:before {
   content: "\ed81";
 }
-
-.ph-stack-overflow-logo-thin::before {
+.ph-bold.ph-traffic-cone:before {
   content: "\ed82";
 }
-
-.ph-stack-simple-thin::before {
+.ph-bold.ph-traffic-signal:before {
   content: "\ed83";
 }
-
-.ph-stack-thin::before {
+.ph-bold.ph-traffic-sign:before {
   content: "\ed84";
 }
-
-.ph-stamp-thin::before {
+.ph-bold.ph-train:before {
   content: "\ed85";
 }
-
-.ph-star-four-thin::before {
+.ph-bold.ph-train-regional:before {
   content: "\ed86";
 }
-
-.ph-star-half-thin::before {
+.ph-bold.ph-train-simple:before {
   content: "\ed87";
 }
-
-.ph-star-thin::before {
+.ph-bold.ph-tram:before {
   content: "\ed88";
 }
-
-.ph-sticker-thin::before {
+.ph-bold.ph-translate:before {
   content: "\ed89";
 }
-
-.ph-stop-circle-thin::before {
+.ph-bold.ph-trash:before {
   content: "\ed8a";
 }
-
-.ph-stop-thin::before {
+.ph-bold.ph-trash-simple:before {
   content: "\ed8b";
 }
-
-.ph-storefront-thin::before {
+.ph-bold.ph-tray:before {
   content: "\ed8c";
 }
-
-.ph-strategy-thin::before {
+.ph-bold.ph-tree:before {
   content: "\ed8d";
 }
-
-.ph-stripe-logo-thin::before {
+.ph-bold.ph-tree-evergreen:before {
   content: "\ed8e";
 }
-
-.ph-student-thin::before {
+.ph-bold.ph-tree-palm:before {
   content: "\ed8f";
 }
-
-.ph-suitcase-simple-thin::before {
+.ph-bold.ph-tree-structure:before {
   content: "\ed90";
 }
-
-.ph-suitcase-thin::before {
+.ph-bold.ph-trend-down:before {
   content: "\ed91";
 }
-
-.ph-sun-dim-thin::before {
+.ph-bold.ph-trend-up:before {
   content: "\ed92";
 }
-
-.ph-sun-horizon-thin::before {
+.ph-bold.ph-triangle:before {
   content: "\ed93";
 }
-
-.ph-sun-thin::before {
+.ph-bold.ph-trophy:before {
   content: "\ed94";
 }
-
-.ph-sunglasses-thin::before {
+.ph-bold.ph-truck:before {
   content: "\ed95";
 }
-
-.ph-swap-thin::before {
+.ph-bold.ph-t-shirt:before {
   content: "\ed96";
 }
-
-.ph-swatches-thin::before {
+.ph-bold.ph-twitch-logo:before {
   content: "\ed97";
 }
-
-.ph-sword-thin::before {
+.ph-bold.ph-twitter-logo:before {
   content: "\ed98";
 }
-
-.ph-syringe-thin::before {
+.ph-bold.ph-umbrella:before {
   content: "\ed99";
 }
-
-.ph-t-shirt-thin::before {
+.ph-bold.ph-umbrella-simple:before {
   content: "\ed9a";
 }
-
-.ph-table-thin::before {
+.ph-bold.ph-unite:before {
   content: "\ed9b";
 }
-
-.ph-tabs-thin::before {
+.ph-bold.ph-unite-square:before {
   content: "\ed9c";
 }
-
-.ph-tag-chevron-thin::before {
+.ph-bold.ph-upload:before {
   content: "\ed9d";
 }
-
-.ph-tag-simple-thin::before {
+.ph-bold.ph-upload-simple:before {
   content: "\ed9e";
 }
-
-.ph-tag-thin::before {
+.ph-bold.ph-usb:before {
   content: "\ed9f";
 }
-
-.ph-target-thin::before {
+.ph-bold.ph-user:before {
   content: "\eda0";
 }
-
-.ph-taxi-thin::before {
+.ph-bold.ph-user-circle:before {
   content: "\eda1";
 }
-
-.ph-telegram-logo-thin::before {
+.ph-bold.ph-user-circle-gear:before {
   content: "\eda2";
 }
-
-.ph-television-simple-thin::before {
+.ph-bold.ph-user-circle-minus:before {
   content: "\eda3";
 }
-
-.ph-television-thin::before {
+.ph-bold.ph-user-circle-plus:before {
   content: "\eda4";
 }
-
-.ph-tennis-ball-thin::before {
+.ph-bold.ph-user-focus:before {
   content: "\eda5";
 }
-
-.ph-terminal-thin::before {
+.ph-bold.ph-user-gear:before {
   content: "\eda6";
 }
-
-.ph-terminal-window-thin::before {
+.ph-bold.ph-user-list:before {
   content: "\eda7";
 }
-
-.ph-test-tube-thin::before {
+.ph-bold.ph-user-minus:before {
   content: "\eda8";
 }
-
-.ph-text-aa-thin::before {
+.ph-bold.ph-user-plus:before {
   content: "\eda9";
 }
-
-.ph-text-align-center-thin::before {
+.ph-bold.ph-user-rectangle:before {
   content: "\edaa";
 }
-
-.ph-text-align-justify-thin::before {
+.ph-bold.ph-users:before {
   content: "\edab";
 }
-
-.ph-text-align-left-thin::before {
+.ph-bold.ph-users-four:before {
   content: "\edac";
 }
-
-.ph-text-align-right-thin::before {
+.ph-bold.ph-user-square:before {
   content: "\edad";
 }
-
-.ph-text-bolder-thin::before {
+.ph-bold.ph-users-three:before {
   content: "\edae";
 }
-
-.ph-text-h-five-thin::before {
+.ph-bold.ph-user-switch:before {
   content: "\edaf";
 }
-
-.ph-text-h-four-thin::before {
+.ph-bold.ph-van:before {
   content: "\edb0";
 }
-
-.ph-text-h-one-thin::before {
+.ph-bold.ph-vault:before {
   content: "\edb1";
 }
-
-.ph-text-h-six-thin::before {
+.ph-bold.ph-vibrate:before {
   content: "\edb2";
 }
-
-.ph-text-h-thin::before {
+.ph-bold.ph-video:before {
   content: "\edb3";
 }
-
-.ph-text-h-three-thin::before {
+.ph-bold.ph-video-camera:before {
   content: "\edb4";
 }
-
-.ph-text-h-two-thin::before {
+.ph-bold.ph-video-camera-slash:before {
   content: "\edb5";
 }
-
-.ph-text-indent-thin::before {
+.ph-bold.ph-vignette:before {
   content: "\edb6";
 }
-
-.ph-text-italic-thin::before {
+.ph-bold.ph-vinyl-record:before {
   content: "\edb7";
 }
-
-.ph-text-outdent-thin::before {
+.ph-bold.ph-virtual-reality:before {
   content: "\edb8";
 }
-
-.ph-text-strikethrough-thin::before {
+.ph-bold.ph-virus:before {
   content: "\edb9";
 }
-
-.ph-text-t-thin::before {
+.ph-bold.ph-voicemail:before {
   content: "\edba";
 }
-
-.ph-text-underline-thin::before {
+.ph-bold.ph-volleyball:before {
   content: "\edbb";
 }
-
-.ph-textbox-thin::before {
+.ph-bold.ph-wall:before {
   content: "\edbc";
 }
-
-.ph-thermometer-cold-thin::before {
+.ph-bold.ph-wallet:before {
   content: "\edbd";
 }
-
-.ph-thermometer-hot-thin::before {
+.ph-bold.ph-warehouse:before {
   content: "\edbe";
 }
-
-.ph-thermometer-simple-thin::before {
+.ph-bold.ph-warning:before {
   content: "\edbf";
 }
-
-.ph-thermometer-thin::before {
+.ph-bold.ph-warning-circle:before {
   content: "\edc0";
 }
-
-.ph-thumbs-down-thin::before {
+.ph-bold.ph-warning-diamond:before {
   content: "\edc1";
 }
-
-.ph-thumbs-up-thin::before {
+.ph-bold.ph-warning-octagon:before {
   content: "\edc2";
 }
-
-.ph-ticket-thin::before {
+.ph-bold.ph-watch:before {
   content: "\edc3";
 }
-
-.ph-tiktok-logo-thin::before {
+.ph-bold.ph-waveform:before {
   content: "\edc4";
 }
-
-.ph-timer-thin::before {
+.ph-bold.ph-wave-sawtooth:before {
   content: "\edc5";
 }
-
-.ph-toggle-left-thin::before {
+.ph-bold.ph-waves:before {
   content: "\edc6";
 }
-
-.ph-toggle-right-thin::before {
+.ph-bold.ph-wave-sine:before {
   content: "\edc7";
 }
-
-.ph-toilet-paper-thin::before {
+.ph-bold.ph-wave-square:before {
   content: "\edc8";
 }
-
-.ph-toilet-thin::before {
+.ph-bold.ph-wave-triangle:before {
   content: "\edc9";
 }
-
-.ph-tote-simple-thin::before {
+.ph-bold.ph-webcam:before {
   content: "\edca";
 }
-
-.ph-tote-thin::before {
+.ph-bold.ph-webcam-slash:before {
   content: "\edcb";
 }
-
-.ph-trademark-registered-thin::before {
+.ph-bold.ph-webhooks-logo:before {
   content: "\edcc";
 }
-
-.ph-traffic-cone-thin::before {
+.ph-bold.ph-wechat-logo:before {
   content: "\edcd";
 }
-
-.ph-traffic-sign-thin::before {
+.ph-bold.ph-whatsapp-logo:before {
   content: "\edce";
 }
-
-.ph-traffic-signal-thin::before {
+.ph-bold.ph-wheelchair:before {
   content: "\edcf";
 }
-
-.ph-train-regional-thin::before {
+.ph-bold.ph-wheelchair-motion:before {
   content: "\edd0";
 }
-
-.ph-train-simple-thin::before {
+.ph-bold.ph-wifi-high:before {
   content: "\edd1";
 }
-
-.ph-train-thin::before {
+.ph-bold.ph-wifi-low:before {
   content: "\edd2";
 }
-
-.ph-translate-thin::before {
+.ph-bold.ph-wifi-medium:before {
   content: "\edd3";
 }
-
-.ph-trash-simple-thin::before {
+.ph-bold.ph-wifi-none:before {
   content: "\edd4";
 }
-
-.ph-trash-thin::before {
+.ph-bold.ph-wifi-slash:before {
   content: "\edd5";
 }
-
-.ph-tray-thin::before {
+.ph-bold.ph-wifi-x:before {
   content: "\edd6";
 }
-
-.ph-tree-evergreen-thin::before {
+.ph-bold.ph-wind:before {
   content: "\edd7";
 }
-
-.ph-tree-structure-thin::before {
+.ph-bold.ph-windows-logo:before {
   content: "\edd8";
 }
-
-.ph-tree-thin::before {
+.ph-bold.ph-wine:before {
   content: "\edd9";
 }
-
-.ph-trend-down-thin::before {
+.ph-bold.ph-wrench:before {
   content: "\edda";
 }
-
-.ph-trend-up-thin::before {
+.ph-bold.ph-x:before {
   content: "\eddb";
 }
-
-.ph-triangle-thin::before {
+.ph-bold.ph-x-circle:before {
   content: "\eddc";
 }
-
-.ph-trophy-thin::before {
+.ph-bold.ph-x-square:before {
   content: "\eddd";
 }
-
-.ph-truck-thin::before {
+.ph-bold.ph-yin-yang:before {
   content: "\edde";
 }
-
-.ph-twitch-logo-thin::before {
+.ph-bold.ph-youtube-logo:before {
   content: "\eddf";
 }
-
-.ph-twitter-logo-thin::before {
-  content: "\ede0";
-}
-
-.ph-umbrella-simple-thin::before {
-  content: "\ede1";
-}
-
-.ph-umbrella-thin::before {
-  content: "\ede2";
-}
-
-.ph-upload-simple-thin::before {
-  content: "\ede3";
-}
-
-.ph-upload-thin::before {
-  content: "\ede4";
-}
-
-.ph-user-circle-gear-thin::before {
-  content: "\ede5";
-}
-
-.ph-user-circle-minus-thin::before {
-  content: "\ede6";
-}
-
-.ph-user-circle-plus-thin::before {
-  content: "\ede7";
-}
-
-.ph-user-circle-thin::before {
-  content: "\ede8";
-}
-
-.ph-user-focus-thin::before {
-  content: "\ede9";
-}
-
-.ph-user-gear-thin::before {
-  content: "\edea";
-}
-
-.ph-user-list-thin::before {
-  content: "\edeb";
-}
-
-.ph-user-minus-thin::before {
-  content: "\edec";
-}
-
-.ph-user-plus-thin::before {
-  content: "\eded";
-}
-
-.ph-user-rectangle-thin::before {
-  content: "\edee";
-}
-
-.ph-user-square-thin::before {
-  content: "\edef";
-}
-
-.ph-user-switch-thin::before {
-  content: "\edf0";
-}
-
-.ph-user-thin::before {
-  content: "\edf1";
-}
-
-.ph-users-four-thin::before {
-  content: "\edf2";
-}
-
-.ph-users-thin::before {
-  content: "\edf3";
-}
-
-.ph-users-three-thin::before {
-  content: "\edf4";
-}
-
-.ph-vault-thin::before {
-  content: "\edf5";
-}
-
-.ph-vibrate-thin::before {
-  content: "\edf6";
-}
-
-.ph-video-camera-slash-thin::before {
-  content: "\edf7";
-}
-
-.ph-video-camera-thin::before {
-  content: "\edf8";
-}
-
-.ph-vignette-thin::before {
-  content: "\edf9";
-}
-
-.ph-voicemail-thin::before {
-  content: "\edfa";
-}
-
-.ph-volleyball-thin::before {
-  content: "\edfb";
-}
-
-.ph-wall-thin::before {
-  content: "\edfc";
-}
-
-.ph-wallet-thin::before {
-  content: "\edfd";
-}
-
-.ph-warning-circle-thin::before {
-  content: "\edfe";
-}
-
-.ph-warning-octagon-thin::before {
-  content: "\edff";
-}
-
-.ph-warning-thin::before {
-  content: "\ee00";
-}
-
-.ph-watch-thin::before {
-  content: "\ee01";
-}
-
-.ph-wave-sawtooth-thin::before {
-  content: "\ee02";
-}
-
-.ph-wave-sine-thin::before {
-  content: "\ee03";
-}
-
-.ph-wave-square-thin::before {
-  content: "\ee04";
-}
-
-.ph-wave-triangle-thin::before {
-  content: "\ee05";
-}
-
-.ph-waves-thin::before {
-  content: "\ee06";
-}
-
-.ph-webcam-thin::before {
-  content: "\ee07";
-}
-
-.ph-whatsapp-logo-thin::before {
-  content: "\ee08";
-}
-
-.ph-wheelchair-thin::before {
-  content: "\ee09";
-}
-
-.ph-wifi-high-thin::before {
-  content: "\ee0a";
-}
-
-.ph-wifi-low-thin::before {
-  content: "\ee0b";
-}
-
-.ph-wifi-medium-thin::before {
-  content: "\ee0c";
-}
-
-.ph-wifi-none-thin::before {
-  content: "\ee0d";
-}
-
-.ph-wifi-slash-thin::before {
-  content: "\ee0e";
-}
-
-.ph-wifi-x-thin::before {
-  content: "\ee0f";
-}
-
-.ph-wind-thin::before {
-  content: "\ee10";
-}
-
-.ph-windows-logo-thin::before {
-  content: "\ee11";
-}
-
-.ph-wine-thin::before {
-  content: "\ee12";
-}
-
-.ph-wrench-thin::before {
-  content: "\ee13";
-}
-
-.ph-x-circle-thin::before {
-  content: "\ee14";
-}
-
-.ph-x-square-thin::before {
-  content: "\ee15";
-}
-
-.ph-x-thin::before {
-  content: "\ee16";
-}
-
-.ph-yin-yang-thin::before {
-  content: "\ee17";
-}
-
-.ph-youtube-logo-thin::before {
-  content: "\ee18";
-}
-
-.ph-activity-light::before {
-  content: "\ee19";
-}
-
-.ph-address-book-light::before {
-  content: "\ee1a";
-}
-
-.ph-airplane-in-flight-light::before {
-  content: "\ee1b";
-}
-
-.ph-airplane-landing-light::before {
-  content: "\ee1c";
-}
-
-.ph-airplane-light::before {
-  content: "\ee1d";
-}
-
-.ph-airplane-takeoff-light::before {
-  content: "\ee1e";
-}
-
-.ph-airplane-tilt-light::before {
-  content: "\ee1f";
-}
-
-.ph-airplay-light::before {
-  content: "\ee20";
-}
-
-.ph-alarm-light::before {
-  content: "\ee21";
-}
-
-.ph-alien-light::before {
-  content: "\ee22";
-}
-
-.ph-align-bottom-light::before {
-  content: "\ee23";
-}
-
-.ph-align-bottom-simple-light::before {
-  content: "\ee24";
-}
-
-.ph-align-center-horizontal-light::before {
-  content: "\ee25";
-}
-
-.ph-align-center-horizontal-simple-light::before {
-  content: "\ee26";
-}
-
-.ph-align-center-vertical-light::before {
-  content: "\ee27";
-}
-
-.ph-align-center-vertical-simple-light::before {
-  content: "\ee28";
-}
-
-.ph-align-left-light::before {
-  content: "\ee29";
-}
-
-.ph-align-left-simple-light::before {
-  content: "\ee2a";
-}
-
-.ph-align-right-light::before {
-  content: "\ee2b";
-}
-
-.ph-align-right-simple-light::before {
-  content: "\ee2c";
-}
-
-.ph-align-top-light::before {
-  content: "\ee2d";
-}
-
-.ph-align-top-simple-light::before {
-  content: "\ee2e";
-}
-
-.ph-anchor-light::before {
-  content: "\ee2f";
-}
-
-.ph-anchor-simple-light::before {
-  content: "\ee30";
-}
-
-.ph-android-logo-light::before {
-  content: "\ee31";
-}
-
-.ph-angular-logo-light::before {
-  content: "\ee32";
-}
-
-.ph-aperture-light::before {
-  content: "\ee33";
-}
-
-.ph-app-store-logo-light::before {
-  content: "\ee34";
-}
-
-.ph-app-window-light::before {
-  content: "\ee35";
-}
-
-.ph-apple-logo-light::before {
-  content: "\ee36";
-}
-
-.ph-apple-podcasts-logo-light::before {
-  content: "\ee37";
-}
-
-.ph-archive-box-light::before {
-  content: "\ee38";
-}
-
-.ph-archive-light::before {
-  content: "\ee39";
-}
-
-.ph-archive-tray-light::before {
-  content: "\ee3a";
-}
-
-.ph-armchair-light::before {
-  content: "\ee3b";
-}
-
-.ph-arrow-arc-left-light::before {
-  content: "\ee3c";
-}
-
-.ph-arrow-arc-right-light::before {
-  content: "\ee3d";
-}
-
-.ph-arrow-bend-double-up-left-light::before {
-  content: "\ee3e";
-}
-
-.ph-arrow-bend-double-up-right-light::before {
-  content: "\ee3f";
-}
-
-.ph-arrow-bend-down-left-light::before {
-  content: "\ee40";
-}
-
-.ph-arrow-bend-down-right-light::before {
-  content: "\ee41";
-}
-
-.ph-arrow-bend-left-down-light::before {
-  content: "\ee42";
-}
-
-.ph-arrow-bend-left-up-light::before {
-  content: "\ee43";
-}
-
-.ph-arrow-bend-right-down-light::before {
-  content: "\ee44";
-}
-
-.ph-arrow-bend-right-up-light::before {
-  content: "\ee45";
-}
-
-.ph-arrow-bend-up-left-light::before {
-  content: "\ee46";
-}
-
-.ph-arrow-bend-up-right-light::before {
-  content: "\ee47";
-}
-
-.ph-arrow-circle-down-left-light::before {
-  content: "\ee48";
-}
-
-.ph-arrow-circle-down-light::before {
-  content: "\ee49";
-}
-
-.ph-arrow-circle-down-right-light::before {
-  content: "\ee4a";
-}
-
-.ph-arrow-circle-left-light::before {
-  content: "\ee4b";
-}
-
-.ph-arrow-circle-right-light::before {
-  content: "\ee4c";
-}
-
-.ph-arrow-circle-up-left-light::before {
-  content: "\ee4d";
-}
-
-.ph-arrow-circle-up-light::before {
-  content: "\ee4e";
-}
-
-.ph-arrow-circle-up-right-light::before {
-  content: "\ee4f";
-}
-
-.ph-arrow-clockwise-light::before {
-  content: "\ee50";
-}
-
-.ph-arrow-counter-clockwise-light::before {
-  content: "\ee51";
-}
-
-.ph-arrow-down-left-light::before {
-  content: "\ee52";
-}
-
-.ph-arrow-down-light::before {
-  content: "\ee53";
-}
-
-.ph-arrow-down-right-light::before {
-  content: "\ee54";
-}
-
-.ph-arrow-elbow-down-left-light::before {
-  content: "\ee55";
-}
-
-.ph-arrow-elbow-down-right-light::before {
-  content: "\ee56";
-}
-
-.ph-arrow-elbow-left-down-light::before {
-  content: "\ee57";
-}
-
-.ph-arrow-elbow-left-light::before {
-  content: "\ee58";
-}
-
-.ph-arrow-elbow-left-up-light::before {
-  content: "\ee59";
-}
-
-.ph-arrow-elbow-right-down-light::before {
-  content: "\ee5a";
-}
-
-.ph-arrow-elbow-right-light::before {
-  content: "\ee5b";
-}
-
-.ph-arrow-elbow-right-up-light::before {
-  content: "\ee5c";
-}
-
-.ph-arrow-elbow-up-left-light::before {
-  content: "\ee5d";
-}
-
-.ph-arrow-elbow-up-right-light::before {
-  content: "\ee5e";
-}
-
-.ph-arrow-fat-down-light::before {
-  content: "\ee5f";
-}
-
-.ph-arrow-fat-left-light::before {
-  content: "\ee60";
-}
-
-.ph-arrow-fat-line-down-light::before {
-  content: "\ee61";
-}
-
-.ph-arrow-fat-line-left-light::before {
-  content: "\ee62";
-}
-
-.ph-arrow-fat-line-right-light::before {
-  content: "\ee63";
-}
-
-.ph-arrow-fat-line-up-light::before {
-  content: "\ee64";
-}
-
-.ph-arrow-fat-lines-down-light::before {
-  content: "\ee65";
-}
-
-.ph-arrow-fat-lines-left-light::before {
-  content: "\ee66";
-}
-
-.ph-arrow-fat-lines-right-light::before {
-  content: "\ee67";
-}
-
-.ph-arrow-fat-lines-up-light::before {
-  content: "\ee68";
-}
-
-.ph-arrow-fat-right-light::before {
-  content: "\ee69";
-}
-
-.ph-arrow-fat-up-light::before {
-  content: "\ee6a";
-}
-
-.ph-arrow-left-light::before {
-  content: "\ee6b";
-}
-
-.ph-arrow-line-down-left-light::before {
-  content: "\ee6c";
-}
-
-.ph-arrow-line-down-light::before {
-  content: "\ee6d";
-}
-
-.ph-arrow-line-down-right-light::before {
-  content: "\ee6e";
-}
-
-.ph-arrow-line-left-light::before {
-  content: "\ee6f";
-}
-
-.ph-arrow-line-right-light::before {
-  content: "\ee70";
-}
-
-.ph-arrow-line-up-left-light::before {
-  content: "\ee71";
-}
-
-.ph-arrow-line-up-light::before {
-  content: "\ee72";
-}
-
-.ph-arrow-line-up-right-light::before {
-  content: "\ee73";
-}
-
-.ph-arrow-right-light::before {
-  content: "\ee74";
-}
-
-.ph-arrow-square-down-left-light::before {
-  content: "\ee75";
-}
-
-.ph-arrow-square-down-light::before {
-  content: "\ee76";
-}
-
-.ph-arrow-square-down-right-light::before {
-  content: "\ee77";
-}
-
-.ph-arrow-square-in-light::before {
-  content: "\ee78";
-}
-
-.ph-arrow-square-left-light::before {
-  content: "\ee79";
-}
-
-.ph-arrow-square-out-light::before {
-  content: "\ee7a";
-}
-
-.ph-arrow-square-right-light::before {
-  content: "\ee7b";
-}
-
-.ph-arrow-square-up-left-light::before {
-  content: "\ee7c";
-}
-
-.ph-arrow-square-up-light::before {
-  content: "\ee7d";
-}
-
-.ph-arrow-square-up-right-light::before {
-  content: "\ee7e";
-}
-
-.ph-arrow-u-down-left-light::before {
-  content: "\ee7f";
-}
-
-.ph-arrow-u-down-right-light::before {
-  content: "\ee80";
-}
-
-.ph-arrow-u-left-down-light::before {
-  content: "\ee81";
-}
-
-.ph-arrow-u-left-up-light::before {
-  content: "\ee82";
-}
-
-.ph-arrow-u-right-down-light::before {
-  content: "\ee83";
-}
-
-.ph-arrow-u-right-up-light::before {
-  content: "\ee84";
-}
-
-.ph-arrow-u-up-left-light::before {
-  content: "\ee85";
-}
-
-.ph-arrow-u-up-right-light::before {
-  content: "\ee86";
-}
-
-.ph-arrow-up-left-light::before {
-  content: "\ee87";
-}
-
-.ph-arrow-up-light::before {
-  content: "\ee88";
-}
-
-.ph-arrow-up-right-light::before {
-  content: "\ee89";
-}
-
-.ph-arrows-clockwise-light::before {
-  content: "\ee8a";
-}
-
-.ph-arrows-counter-clockwise-light::before {
-  content: "\ee8b";
-}
-
-.ph-arrows-down-up-light::before {
-  content: "\ee8c";
-}
-
-.ph-arrows-horizontal-light::before {
-  content: "\ee8d";
-}
-
-.ph-arrows-in-cardinal-light::before {
-  content: "\ee8e";
-}
-
-.ph-arrows-in-light::before {
-  content: "\ee8f";
-}
-
-.ph-arrows-in-line-horizontal-light::before {
-  content: "\ee90";
-}
-
-.ph-arrows-in-line-vertical-light::before {
-  content: "\ee91";
-}
-
-.ph-arrows-in-simple-light::before {
-  content: "\ee92";
-}
-
-.ph-arrows-left-right-light::before {
-  content: "\ee93";
-}
-
-.ph-arrows-out-cardinal-light::before {
-  content: "\ee94";
-}
-
-.ph-arrows-out-light::before {
-  content: "\ee95";
-}
-
-.ph-arrows-out-line-horizontal-light::before {
-  content: "\ee96";
-}
-
-.ph-arrows-out-line-vertical-light::before {
-  content: "\ee97";
-}
-
-.ph-arrows-out-simple-light::before {
-  content: "\ee98";
-}
-
-.ph-arrows-vertical-light::before {
-  content: "\ee99";
-}
-
-.ph-article-light::before {
-  content: "\ee9a";
-}
-
-.ph-article-medium-light::before {
-  content: "\ee9b";
-}
-
-.ph-article-ny-times-light::before {
-  content: "\ee9c";
-}
-
-.ph-asterisk-light::before {
-  content: "\ee9d";
-}
-
-.ph-asterisk-simple-light::before {
-  content: "\ee9e";
-}
-
-.ph-at-light::before {
-  content: "\ee9f";
-}
-
-.ph-atom-light::before {
-  content: "\eea0";
-}
-
-.ph-baby-light::before {
-  content: "\eea1";
-}
-
-.ph-backpack-light::before {
-  content: "\eea2";
-}
-
-.ph-backspace-light::before {
-  content: "\eea3";
-}
-
-.ph-bag-light::before {
-  content: "\eea4";
-}
-
-.ph-bag-simple-light::before {
-  content: "\eea5";
-}
-
-.ph-balloon-light::before {
-  content: "\eea6";
-}
-
-.ph-bandaids-light::before {
-  content: "\eea7";
-}
-
-.ph-bank-light::before {
-  content: "\eea8";
-}
-
-.ph-barbell-light::before {
-  content: "\eea9";
-}
-
-.ph-barcode-light::before {
-  content: "\eeaa";
-}
-
-.ph-barricade-light::before {
-  content: "\eeab";
-}
-
-.ph-baseball-light::before {
-  content: "\eeac";
-}
-
-.ph-basketball-light::before {
-  content: "\eead";
-}
-
-.ph-bathtub-light::before {
-  content: "\eeae";
-}
-
-.ph-battery-charging-light::before {
-  content: "\eeaf";
-}
-
-.ph-battery-charging-vertical-light::before {
-  content: "\eeb0";
-}
-
-.ph-battery-empty-light::before {
-  content: "\eeb1";
-}
-
-.ph-battery-full-light::before {
-  content: "\eeb2";
-}
-
-.ph-battery-high-light::before {
-  content: "\eeb3";
-}
-
-.ph-battery-low-light::before {
-  content: "\eeb4";
-}
-
-.ph-battery-medium-light::before {
-  content: "\eeb5";
-}
-
-.ph-battery-plus-light::before {
-  content: "\eeb6";
-}
-
-.ph-battery-warning-light::before {
-  content: "\eeb7";
-}
-
-.ph-battery-warning-vertical-light::before {
-  content: "\eeb8";
-}
-
-.ph-bed-light::before {
-  content: "\eeb9";
-}
-
-.ph-beer-bottle-light::before {
-  content: "\eeba";
-}
-
-.ph-behance-logo-light::before {
-  content: "\eebb";
-}
-
-.ph-bell-light::before {
-  content: "\eebc";
-}
-
-.ph-bell-ringing-light::before {
-  content: "\eebd";
-}
-
-.ph-bell-simple-light::before {
-  content: "\eebe";
-}
-
-.ph-bell-simple-ringing-light::before {
-  content: "\eebf";
-}
-
-.ph-bell-simple-slash-light::before {
-  content: "\eec0";
-}
-
-.ph-bell-simple-z-light::before {
-  content: "\eec1";
-}
-
-.ph-bell-slash-light::before {
-  content: "\eec2";
-}
-
-.ph-bell-z-light::before {
-  content: "\eec3";
-}
-
-.ph-bezier-curve-light::before {
-  content: "\eec4";
-}
-
-.ph-bicycle-light::before {
-  content: "\eec5";
-}
-
-.ph-binoculars-light::before {
-  content: "\eec6";
-}
-
-.ph-bird-light::before {
-  content: "\eec7";
-}
-
-.ph-bluetooth-connected-light::before {
-  content: "\eec8";
-}
-
-.ph-bluetooth-light::before {
-  content: "\eec9";
-}
-
-.ph-bluetooth-slash-light::before {
-  content: "\eeca";
-}
-
-.ph-bluetooth-x-light::before {
-  content: "\eecb";
-}
-
-.ph-boat-light::before {
-  content: "\eecc";
-}
-
-.ph-book-bookmark-light::before {
-  content: "\eecd";
-}
-
-.ph-book-light::before {
-  content: "\eece";
-}
-
-.ph-book-open-light::before {
-  content: "\eecf";
-}
-
-.ph-bookmark-light::before {
-  content: "\eed0";
-}
-
-.ph-bookmark-simple-light::before {
-  content: "\eed1";
-}
-
-.ph-bookmarks-light::before {
-  content: "\eed2";
-}
-
-.ph-bookmarks-simple-light::before {
-  content: "\eed3";
-}
-
-.ph-books-light::before {
-  content: "\eed4";
-}
-
-.ph-bounding-box-light::before {
-  content: "\eed5";
-}
-
-.ph-brackets-angle-light::before {
-  content: "\eed6";
-}
-
-.ph-brackets-curly-light::before {
-  content: "\eed7";
-}
-
-.ph-brackets-round-light::before {
-  content: "\eed8";
-}
-
-.ph-brackets-square-light::before {
-  content: "\eed9";
-}
-
-.ph-brain-light::before {
-  content: "\eeda";
-}
-
-.ph-brandy-light::before {
-  content: "\eedb";
-}
-
-.ph-briefcase-light::before {
-  content: "\eedc";
-}
-
-.ph-briefcase-metal-light::before {
-  content: "\eedd";
-}
-
-.ph-broadcast-light::before {
-  content: "\eede";
-}
-
-.ph-browser-light::before {
-  content: "\eedf";
-}
-
-.ph-browsers-light::before {
-  content: "\eee0";
-}
-
-.ph-bug-beetle-light::before {
-  content: "\eee1";
-}
-
-.ph-bug-droid-light::before {
-  content: "\eee2";
-}
-
-.ph-bug-light::before {
-  content: "\eee3";
-}
-
-.ph-buildings-light::before {
-  content: "\eee4";
-}
-
-.ph-bus-light::before {
-  content: "\eee5";
-}
-
-.ph-butterfly-light::before {
-  content: "\eee6";
-}
-
-.ph-cactus-light::before {
-  content: "\eee7";
-}
-
-.ph-cake-light::before {
-  content: "\eee8";
-}
-
-.ph-calculator-light::before {
-  content: "\eee9";
-}
-
-.ph-calendar-blank-light::before {
-  content: "\eeea";
-}
-
-.ph-calendar-check-light::before {
-  content: "\eeeb";
-}
-
-.ph-calendar-light::before {
-  content: "\eeec";
-}
-
-.ph-calendar-plus-light::before {
-  content: "\eeed";
-}
-
-.ph-calendar-x-light::before {
-  content: "\eeee";
-}
-
-.ph-camera-light::before {
-  content: "\eeef";
-}
-
-.ph-camera-rotate-light::before {
-  content: "\eef0";
-}
-
-.ph-camera-slash-light::before {
-  content: "\eef1";
-}
-
-.ph-campfire-light::before {
-  content: "\eef2";
-}
-
-.ph-car-light::before {
-  content: "\eef3";
-}
-
-.ph-car-simple-light::before {
-  content: "\eef4";
-}
-
-.ph-cardholder-light::before {
-  content: "\eef5";
-}
-
-.ph-cards-light::before {
-  content: "\eef6";
-}
-
-.ph-caret-circle-double-down-light::before {
-  content: "\eef7";
-}
-
-.ph-caret-circle-double-left-light::before {
-  content: "\eef8";
-}
-
-.ph-caret-circle-double-right-light::before {
-  content: "\eef9";
-}
-
-.ph-caret-circle-double-up-light::before {
-  content: "\eefa";
-}
-
-.ph-caret-circle-down-light::before {
-  content: "\eefb";
-}
-
-.ph-caret-circle-left-light::before {
-  content: "\eefc";
-}
-
-.ph-caret-circle-right-light::before {
-  content: "\eefd";
-}
-
-.ph-caret-circle-up-light::before {
-  content: "\eefe";
-}
-
-.ph-caret-double-down-light::before {
-  content: "\eeff";
-}
-
-.ph-caret-double-left-light::before {
-  content: "\ef00";
-}
-
-.ph-caret-double-right-light::before {
-  content: "\ef01";
-}
-
-.ph-caret-double-up-light::before {
-  content: "\ef02";
-}
-
-.ph-caret-down-light::before {
-  content: "\ef03";
-}
-
-.ph-caret-left-light::before {
-  content: "\ef04";
-}
-
-.ph-caret-right-light::before {
-  content: "\ef05";
-}
-
-.ph-caret-up-light::before {
-  content: "\ef06";
-}
-
-.ph-cat-light::before {
-  content: "\ef07";
-}
-
-.ph-cell-signal-full-light::before {
-  content: "\ef08";
-}
-
-.ph-cell-signal-high-light::before {
-  content: "\ef09";
-}
-
-.ph-cell-signal-low-light::before {
-  content: "\ef0a";
-}
-
-.ph-cell-signal-medium-light::before {
-  content: "\ef0b";
-}
-
-.ph-cell-signal-none-light::before {
-  content: "\ef0c";
-}
-
-.ph-cell-signal-slash-light::before {
-  content: "\ef0d";
-}
-
-.ph-cell-signal-x-light::before {
-  content: "\ef0e";
-}
-
-.ph-chalkboard-light::before {
-  content: "\ef0f";
-}
-
-.ph-chalkboard-simple-light::before {
-  content: "\ef10";
-}
-
-.ph-chalkboard-teacher-light::before {
-  content: "\ef11";
-}
-
-.ph-chart-bar-horizontal-light::before {
-  content: "\ef12";
-}
-
-.ph-chart-bar-light::before {
-  content: "\ef13";
-}
-
-.ph-chart-line-light::before {
-  content: "\ef14";
-}
-
-.ph-chart-line-up-light::before {
-  content: "\ef15";
-}
-
-.ph-chart-pie-light::before {
-  content: "\ef16";
-}
-
-.ph-chart-pie-slice-light::before {
-  content: "\ef17";
-}
-
-.ph-chat-centered-dots-light::before {
-  content: "\ef18";
-}
-
-.ph-chat-centered-light::before {
-  content: "\ef19";
-}
-
-.ph-chat-centered-text-light::before {
-  content: "\ef1a";
-}
-
-.ph-chat-circle-dots-light::before {
-  content: "\ef1b";
-}
-
-.ph-chat-circle-light::before {
-  content: "\ef1c";
-}
-
-.ph-chat-circle-text-light::before {
-  content: "\ef1d";
-}
-
-.ph-chat-dots-light::before {
-  content: "\ef1e";
-}
-
-.ph-chat-light::before {
-  content: "\ef1f";
-}
-
-.ph-chat-teardrop-dots-light::before {
-  content: "\ef20";
-}
-
-.ph-chat-teardrop-light::before {
-  content: "\ef21";
-}
-
-.ph-chat-teardrop-text-light::before {
-  content: "\ef22";
-}
-
-.ph-chat-text-light::before {
-  content: "\ef23";
-}
-
-.ph-chats-circle-light::before {
-  content: "\ef24";
-}
-
-.ph-chats-light::before {
-  content: "\ef25";
-}
-
-.ph-chats-teardrop-light::before {
-  content: "\ef26";
-}
-
-.ph-check-circle-light::before {
-  content: "\ef27";
-}
-
-.ph-check-light::before {
-  content: "\ef28";
-}
-
-.ph-check-square-light::before {
-  content: "\ef29";
-}
-
-.ph-check-square-offset-light::before {
-  content: "\ef2a";
-}
-
-.ph-checks-light::before {
-  content: "\ef2b";
-}
-
-.ph-circle-dashed-light::before {
-  content: "\ef2c";
-}
-
-.ph-circle-half-light::before {
-  content: "\ef2d";
-}
-
-.ph-circle-half-tilt-light::before {
-  content: "\ef2e";
-}
-
-.ph-circle-light::before {
-  content: "\ef2f";
-}
-
-.ph-circle-notch-light::before {
-  content: "\ef30";
-}
-
-.ph-circle-wavy-check-light::before {
-  content: "\ef31";
-}
-
-.ph-circle-wavy-light::before {
-  content: "\ef32";
-}
-
-.ph-circle-wavy-question-light::before {
-  content: "\ef33";
-}
-
-.ph-circle-wavy-warning-light::before {
-  content: "\ef34";
-}
-
-.ph-circles-four-light::before {
-  content: "\ef35";
-}
-
-.ph-circles-three-light::before {
-  content: "\ef36";
-}
-
-.ph-circles-three-plus-light::before {
-  content: "\ef37";
-}
-
-.ph-clipboard-light::before {
-  content: "\ef38";
-}
-
-.ph-clipboard-text-light::before {
-  content: "\ef39";
-}
-
-.ph-clock-afternoon-light::before {
-  content: "\ef3a";
-}
-
-.ph-clock-clockwise-light::before {
-  content: "\ef3b";
-}
-
-.ph-clock-counter-clockwise-light::before {
-  content: "\ef3c";
-}
-
-.ph-clock-light::before {
-  content: "\ef3d";
-}
-
-.ph-closed-captioning-light::before {
-  content: "\ef3e";
-}
-
-.ph-cloud-arrow-down-light::before {
-  content: "\ef3f";
-}
-
-.ph-cloud-arrow-up-light::before {
-  content: "\ef40";
-}
-
-.ph-cloud-check-light::before {
-  content: "\ef41";
-}
-
-.ph-cloud-fog-light::before {
-  content: "\ef42";
-}
-
-.ph-cloud-light::before {
-  content: "\ef43";
-}
-
-.ph-cloud-lightning-light::before {
-  content: "\ef44";
-}
-
-.ph-cloud-moon-light::before {
-  content: "\ef45";
-}
-
-.ph-cloud-rain-light::before {
-  content: "\ef46";
-}
-
-.ph-cloud-slash-light::before {
-  content: "\ef47";
-}
-
-.ph-cloud-snow-light::before {
-  content: "\ef48";
-}
-
-.ph-cloud-sun-light::before {
-  content: "\ef49";
-}
-
-.ph-club-light::before {
-  content: "\ef4a";
-}
-
-.ph-coat-hanger-light::before {
-  content: "\ef4b";
-}
-
-.ph-code-light::before {
-  content: "\ef4c";
-}
-
-.ph-code-simple-light::before {
-  content: "\ef4d";
-}
-
-.ph-codepen-logo-light::before {
-  content: "\ef4e";
-}
-
-.ph-codesandbox-logo-light::before {
-  content: "\ef4f";
-}
-
-.ph-coffee-light::before {
-  content: "\ef50";
-}
-
-.ph-coin-light::before {
-  content: "\ef51";
-}
-
-.ph-coin-vertical-light::before {
-  content: "\ef52";
-}
-
-.ph-coins-light::before {
-  content: "\ef53";
-}
-
-.ph-columns-light::before {
-  content: "\ef54";
-}
-
-.ph-command-light::before {
-  content: "\ef55";
-}
-
-.ph-compass-light::before {
-  content: "\ef56";
-}
-
-.ph-computer-tower-light::before {
-  content: "\ef57";
-}
-
-.ph-confetti-light::before {
-  content: "\ef58";
-}
-
-.ph-cookie-light::before {
-  content: "\ef59";
-}
-
-.ph-cooking-pot-light::before {
-  content: "\ef5a";
-}
-
-.ph-copy-light::before {
-  content: "\ef5b";
-}
-
-.ph-copy-simple-light::before {
-  content: "\ef5c";
-}
-
-.ph-copyleft-light::before {
-  content: "\ef5d";
-}
-
-.ph-copyright-light::before {
-  content: "\ef5e";
-}
-
-.ph-corners-in-light::before {
-  content: "\ef5f";
-}
-
-.ph-corners-out-light::before {
-  content: "\ef60";
-}
-
-.ph-cpu-light::before {
-  content: "\ef61";
-}
-
-.ph-credit-card-light::before {
-  content: "\ef62";
-}
-
-.ph-crop-light::before {
-  content: "\ef63";
-}
-
-.ph-crosshair-light::before {
-  content: "\ef64";
-}
-
-.ph-crosshair-simple-light::before {
-  content: "\ef65";
-}
-
-.ph-crown-light::before {
-  content: "\ef66";
-}
-
-.ph-crown-simple-light::before {
-  content: "\ef67";
-}
-
-.ph-cube-light::before {
-  content: "\ef68";
-}
-
-.ph-currency-btc-light::before {
-  content: "\ef69";
-}
-
-.ph-currency-circle-dollar-light::before {
-  content: "\ef6a";
-}
-
-.ph-currency-cny-light::before {
-  content: "\ef6b";
-}
-
-.ph-currency-dollar-light::before {
-  content: "\ef6c";
-}
-
-.ph-currency-dollar-simple-light::before {
-  content: "\ef6d";
-}
-
-.ph-currency-eth-light::before {
-  content: "\ef6e";
-}
-
-.ph-currency-eur-light::before {
-  content: "\ef6f";
-}
-
-.ph-currency-gbp-light::before {
-  content: "\ef70";
-}
-
-.ph-currency-inr-light::before {
-  content: "\ef71";
-}
-
-.ph-currency-jpy-light::before {
-  content: "\ef72";
-}
-
-.ph-currency-krw-light::before {
-  content: "\ef73";
-}
-
-.ph-currency-kzt-light::before {
-  content: "\ef74";
-}
-
-.ph-currency-ngn-light::before {
-  content: "\ef75";
-}
-
-.ph-currency-rub-light::before {
-  content: "\ef76";
-}
-
-.ph-cursor-light::before {
-  content: "\ef77";
-}
-
-.ph-cursor-text-light::before {
-  content: "\ef78";
-}
-
-.ph-cylinder-light::before {
-  content: "\ef79";
-}
-
-.ph-database-light::before {
-  content: "\ef7a";
-}
-
-.ph-desktop-light::before {
-  content: "\ef7b";
-}
-
-.ph-desktop-tower-light::before {
-  content: "\ef7c";
-}
-
-.ph-detective-light::before {
-  content: "\ef7d";
-}
-
-.ph-device-mobile-camera-light::before {
-  content: "\ef7e";
-}
-
-.ph-device-mobile-light::before {
-  content: "\ef7f";
-}
-
-.ph-device-mobile-speaker-light::before {
-  content: "\ef80";
-}
-
-.ph-device-tablet-camera-light::before {
-  content: "\ef81";
-}
-
-.ph-device-tablet-light::before {
-  content: "\ef82";
-}
-
-.ph-device-tablet-speaker-light::before {
-  content: "\ef83";
-}
-
-.ph-diamond-light::before {
-  content: "\ef84";
-}
-
-.ph-diamonds-four-light::before {
-  content: "\ef85";
-}
-
-.ph-dice-five-light::before {
-  content: "\ef86";
-}
-
-.ph-dice-four-light::before {
-  content: "\ef87";
-}
-
-.ph-dice-one-light::before {
-  content: "\ef88";
-}
-
-.ph-dice-six-light::before {
-  content: "\ef89";
-}
-
-.ph-dice-three-light::before {
-  content: "\ef8a";
-}
-
-.ph-dice-two-light::before {
-  content: "\ef8b";
-}
-
-.ph-disc-light::before {
-  content: "\ef8c";
-}
-
-.ph-discord-logo-light::before {
-  content: "\ef8d";
-}
-
-.ph-divide-light::before {
-  content: "\ef8e";
-}
-
-.ph-dog-light::before {
-  content: "\ef8f";
-}
-
-.ph-door-light::before {
-  content: "\ef90";
-}
-
-.ph-dots-nine-light::before {
-  content: "\ef91";
-}
-
-.ph-dots-six-light::before {
-  content: "\ef92";
-}
-
-.ph-dots-six-vertical-light::before {
-  content: "\ef93";
-}
-
-.ph-dots-three-circle-light::before {
-  content: "\ef94";
-}
-
-.ph-dots-three-circle-vertical-light::before {
-  content: "\ef95";
-}
-
-.ph-dots-three-light::before {
-  content: "\ef96";
-}
-
-.ph-dots-three-outline-light::before {
-  content: "\ef97";
-}
-
-.ph-dots-three-outline-vertical-light::before {
-  content: "\ef98";
-}
-
-.ph-dots-three-vertical-light::before {
-  content: "\ef99";
-}
-
-.ph-download-light::before {
-  content: "\ef9a";
-}
-
-.ph-download-simple-light::before {
-  content: "\ef9b";
-}
-
-.ph-dribbble-logo-light::before {
-  content: "\ef9c";
-}
-
-.ph-drop-half-bottom-light::before {
-  content: "\ef9d";
-}
-
-.ph-drop-half-light::before {
-  content: "\ef9e";
-}
-
-.ph-drop-light::before {
-  content: "\ef9f";
-}
-
-.ph-ear-light::before {
-  content: "\efa0";
-}
-
-.ph-ear-slash-light::before {
-  content: "\efa1";
-}
-
-.ph-egg-crack-light::before {
-  content: "\efa2";
-}
-
-.ph-egg-light::before {
-  content: "\efa3";
-}
-
-.ph-eject-light::before {
-  content: "\efa4";
-}
-
-.ph-eject-simple-light::before {
-  content: "\efa5";
-}
-
-.ph-envelope-light::before {
-  content: "\efa6";
-}
-
-.ph-envelope-open-light::before {
-  content: "\efa7";
-}
-
-.ph-envelope-simple-light::before {
-  content: "\efa8";
-}
-
-.ph-envelope-simple-open-light::before {
-  content: "\efa9";
-}
-
-.ph-equalizer-light::before {
-  content: "\efaa";
-}
-
-.ph-equals-light::before {
-  content: "\efab";
-}
-
-.ph-eraser-light::before {
-  content: "\efac";
-}
-
-.ph-exam-light::before {
-  content: "\efad";
-}
-
-.ph-export-light::before {
-  content: "\efae";
-}
-
-.ph-eye-closed-light::before {
-  content: "\efaf";
-}
-
-.ph-eye-light::before {
-  content: "\efb0";
-}
-
-.ph-eye-slash-light::before {
-  content: "\efb1";
-}
-
-.ph-eyedropper-light::before {
-  content: "\efb2";
-}
-
-.ph-eyedropper-sample-light::before {
-  content: "\efb3";
-}
-
-.ph-eyeglasses-light::before {
-  content: "\efb4";
-}
-
-.ph-face-mask-light::before {
-  content: "\efb5";
-}
-
-.ph-facebook-logo-light::before {
-  content: "\efb6";
-}
-
-.ph-factory-light::before {
-  content: "\efb7";
-}
-
-.ph-faders-horizontal-light::before {
-  content: "\efb8";
-}
-
-.ph-faders-light::before {
-  content: "\efb9";
-}
-
-.ph-fast-forward-circle-light::before {
-  content: "\efba";
-}
-
-.ph-fast-forward-light::before {
-  content: "\efbb";
-}
-
-.ph-figma-logo-light::before {
-  content: "\efbc";
-}
-
-.ph-file-arrow-down-light::before {
-  content: "\efbd";
-}
-
-.ph-file-arrow-up-light::before {
-  content: "\efbe";
-}
-
-.ph-file-audio-light::before {
-  content: "\efbf";
-}
-
-.ph-file-cloud-light::before {
-  content: "\efc0";
-}
-
-.ph-file-code-light::before {
-  content: "\efc1";
-}
-
-.ph-file-css-light::before {
-  content: "\efc2";
-}
-
-.ph-file-csv-light::before {
-  content: "\efc3";
-}
-
-.ph-file-doc-light::before {
-  content: "\efc4";
-}
-
-.ph-file-dotted-light::before {
-  content: "\efc5";
-}
-
-.ph-file-html-light::before {
-  content: "\efc6";
-}
-
-.ph-file-image-light::before {
-  content: "\efc7";
-}
-
-.ph-file-jpg-light::before {
-  content: "\efc8";
-}
-
-.ph-file-js-light::before {
-  content: "\efc9";
-}
-
-.ph-file-jsx-light::before {
-  content: "\efca";
-}
-
-.ph-file-light::before {
-  content: "\efcb";
-}
-
-.ph-file-lock-light::before {
-  content: "\efcc";
-}
-
-.ph-file-minus-light::before {
-  content: "\efcd";
-}
-
-.ph-file-pdf-light::before {
-  content: "\efce";
-}
-
-.ph-file-plus-light::before {
-  content: "\efcf";
-}
-
-.ph-file-png-light::before {
-  content: "\efd0";
-}
-
-.ph-file-ppt-light::before {
-  content: "\efd1";
-}
-
-.ph-file-rs-light::before {
-  content: "\efd2";
-}
-
-.ph-file-search-light::before {
-  content: "\efd3";
-}
-
-.ph-file-text-light::before {
-  content: "\efd4";
-}
-
-.ph-file-ts-light::before {
-  content: "\efd5";
-}
-
-.ph-file-tsx-light::before {
-  content: "\efd6";
-}
-
-.ph-file-video-light::before {
-  content: "\efd7";
-}
-
-.ph-file-vue-light::before {
-  content: "\efd8";
-}
-
-.ph-file-x-light::before {
-  content: "\efd9";
-}
-
-.ph-file-xls-light::before {
-  content: "\efda";
-}
-
-.ph-file-zip-light::before {
-  content: "\efdb";
-}
-
-.ph-files-light::before {
-  content: "\efdc";
-}
-
-.ph-film-script-light::before {
-  content: "\efdd";
-}
-
-.ph-film-slate-light::before {
-  content: "\efde";
-}
-
-.ph-film-strip-light::before {
-  content: "\efdf";
-}
-
-.ph-fingerprint-light::before {
-  content: "\efe0";
-}
-
-.ph-fingerprint-simple-light::before {
-  content: "\efe1";
-}
-
-.ph-finn-the-human-light::before {
-  content: "\efe2";
-}
-
-.ph-fire-light::before {
-  content: "\efe3";
-}
-
-.ph-fire-simple-light::before {
-  content: "\efe4";
-}
-
-.ph-first-aid-kit-light::before {
-  content: "\efe5";
-}
-
-.ph-first-aid-light::before {
-  content: "\efe6";
-}
-
-.ph-fish-light::before {
-  content: "\efe7";
-}
-
-.ph-fish-simple-light::before {
-  content: "\efe8";
-}
-
-.ph-flag-banner-light::before {
-  content: "\efe9";
-}
-
-.ph-flag-checkered-light::before {
-  content: "\efea";
-}
-
-.ph-flag-light::before {
-  content: "\efeb";
-}
-
-.ph-flame-light::before {
-  content: "\efec";
-}
-
-.ph-flashlight-light::before {
-  content: "\efed";
-}
-
-.ph-flask-light::before {
-  content: "\efee";
-}
-
-.ph-floppy-disk-back-light::before {
-  content: "\efef";
-}
-
-.ph-floppy-disk-light::before {
-  content: "\eff0";
-}
-
-.ph-flow-arrow-light::before {
-  content: "\eff1";
-}
-
-.ph-flower-light::before {
-  content: "\eff2";
-}
-
-.ph-flower-lotus-light::before {
-  content: "\eff3";
-}
-
-.ph-flying-saucer-light::before {
-  content: "\eff4";
-}
-
-.ph-folder-dotted-light::before {
-  content: "\eff5";
-}
-
-.ph-folder-light::before {
-  content: "\eff6";
-}
-
-.ph-folder-lock-light::before {
-  content: "\eff7";
-}
-
-.ph-folder-minus-light::before {
-  content: "\eff8";
-}
-
-.ph-folder-notch-light::before {
-  content: "\eff9";
-}
-
-.ph-folder-notch-minus-light::before {
-  content: "\effa";
-}
-
-.ph-folder-notch-open-light::before {
-  content: "\effb";
-}
-
-.ph-folder-notch-plus-light::before {
-  content: "\effc";
-}
-
-.ph-folder-open-light::before {
-  content: "\effd";
-}
-
-.ph-folder-plus-light::before {
-  content: "\effe";
-}
-
-.ph-folder-simple-dotted-light::before {
-  content: "\efff";
-}
-
-.ph-folder-simple-light::before {
-  content: "\f000";
-}
-
-.ph-folder-simple-lock-light::before {
-  content: "\f001";
-}
-
-.ph-folder-simple-minus-light::before {
-  content: "\f002";
-}
-
-.ph-folder-simple-plus-light::before {
-  content: "\f003";
-}
-
-.ph-folder-simple-star-light::before {
-  content: "\f004";
-}
-
-.ph-folder-simple-user-light::before {
-  content: "\f005";
-}
-
-.ph-folder-star-light::before {
-  content: "\f006";
-}
-
-.ph-folder-user-light::before {
-  content: "\f007";
-}
-
-.ph-folders-light::before {
-  content: "\f008";
-}
-
-.ph-football-light::before {
-  content: "\f009";
-}
-
-.ph-fork-knife-light::before {
-  content: "\f00a";
-}
-
-.ph-frame-corners-light::before {
-  content: "\f00b";
-}
-
-.ph-framer-logo-light::before {
-  content: "\f00c";
-}
-
-.ph-function-light::before {
-  content: "\f00d";
-}
-
-.ph-funnel-light::before {
-  content: "\f00e";
-}
-
-.ph-funnel-simple-light::before {
-  content: "\f00f";
-}
-
-.ph-game-controller-light::before {
-  content: "\f010";
-}
-
-.ph-gas-pump-light::before {
-  content: "\f011";
-}
-
-.ph-gauge-light::before {
-  content: "\f012";
-}
-
-.ph-gear-light::before {
-  content: "\f013";
-}
-
-.ph-gear-six-light::before {
-  content: "\f014";
-}
-
-.ph-gender-female-light::before {
-  content: "\f015";
-}
-
-.ph-gender-intersex-light::before {
-  content: "\f016";
-}
-
-.ph-gender-male-light::before {
-  content: "\f017";
-}
-
-.ph-gender-neuter-light::before {
-  content: "\f018";
-}
-
-.ph-gender-nonbinary-light::before {
-  content: "\f019";
-}
-
-.ph-gender-transgender-light::before {
-  content: "\f01a";
-}
-
-.ph-ghost-light::before {
-  content: "\f01b";
-}
-
-.ph-gif-light::before {
-  content: "\f01c";
-}
-
-.ph-gift-light::before {
-  content: "\f01d";
-}
-
-.ph-git-branch-light::before {
-  content: "\f01e";
-}
-
-.ph-git-commit-light::before {
-  content: "\f01f";
-}
-
-.ph-git-diff-light::before {
-  content: "\f020";
-}
-
-.ph-git-fork-light::before {
-  content: "\f021";
-}
-
-.ph-git-merge-light::before {
-  content: "\f022";
-}
-
-.ph-git-pull-request-light::before {
-  content: "\f023";
-}
-
-.ph-github-logo-light::before {
-  content: "\f024";
-}
-
-.ph-gitlab-logo-light::before {
-  content: "\f025";
-}
-
-.ph-gitlab-logo-simple-light::before {
-  content: "\f026";
-}
-
-.ph-globe-hemisphere-east-light::before {
-  content: "\f027";
-}
-
-.ph-globe-hemisphere-west-light::before {
-  content: "\f028";
-}
-
-.ph-globe-light::before {
-  content: "\f029";
-}
-
-.ph-globe-simple-light::before {
-  content: "\f02a";
-}
-
-.ph-globe-stand-light::before {
-  content: "\f02b";
-}
-
-.ph-google-chrome-logo-light::before {
-  content: "\f02c";
-}
-
-.ph-google-logo-light::before {
-  content: "\f02d";
-}
-
-.ph-google-photos-logo-light::before {
-  content: "\f02e";
-}
-
-.ph-google-play-logo-light::before {
-  content: "\f02f";
-}
-
-.ph-google-podcasts-logo-light::before {
-  content: "\f030";
-}
-
-.ph-gradient-light::before {
-  content: "\f031";
-}
-
-.ph-graduation-cap-light::before {
-  content: "\f032";
-}
-
-.ph-graph-light::before {
-  content: "\f033";
-}
-
-.ph-grid-four-light::before {
-  content: "\f034";
-}
-
-.ph-hamburger-light::before {
-  content: "\f035";
-}
-
-.ph-hand-eye-light::before {
-  content: "\f036";
-}
-
-.ph-hand-fist-light::before {
-  content: "\f037";
-}
-
-.ph-hand-grabbing-light::before {
-  content: "\f038";
-}
-
-.ph-hand-light::before {
-  content: "\f039";
-}
-
-.ph-hand-palm-light::before {
-  content: "\f03a";
-}
-
-.ph-hand-pointing-light::before {
-  content: "\f03b";
-}
-
-.ph-hand-soap-light::before {
-  content: "\f03c";
-}
-
-.ph-hand-waving-light::before {
-  content: "\f03d";
-}
-
-.ph-handbag-light::before {
-  content: "\f03e";
-}
-
-.ph-handbag-simple-light::before {
-  content: "\f03f";
-}
-
-.ph-hands-clapping-light::before {
-  content: "\f040";
-}
-
-.ph-handshake-light::before {
-  content: "\f041";
-}
-
-.ph-hard-drive-light::before {
-  content: "\f042";
-}
-
-.ph-hard-drives-light::before {
-  content: "\f043";
-}
-
-.ph-hash-light::before {
-  content: "\f044";
-}
-
-.ph-hash-straight-light::before {
-  content: "\f045";
-}
-
-.ph-headlights-light::before {
-  content: "\f046";
-}
-
-.ph-headphones-light::before {
-  content: "\f047";
-}
-
-.ph-headset-light::before {
-  content: "\f048";
-}
-
-.ph-heart-break-light::before {
-  content: "\f049";
-}
-
-.ph-heart-light::before {
-  content: "\f04a";
-}
-
-.ph-heart-straight-break-light::before {
-  content: "\f04b";
-}
-
-.ph-heart-straight-light::before {
-  content: "\f04c";
-}
-
-.ph-heartbeat-light::before {
-  content: "\f04d";
-}
-
-.ph-hexagon-light::before {
-  content: "\f04e";
-}
-
-.ph-highlighter-circle-light::before {
-  content: "\f04f";
-}
-
-.ph-horse-light::before {
-  content: "\f050";
-}
-
-.ph-hourglass-high-light::before {
-  content: "\f051";
-}
-
-.ph-hourglass-light::before {
-  content: "\f052";
-}
-
-.ph-hourglass-low-light::before {
-  content: "\f053";
-}
-
-.ph-hourglass-medium-light::before {
-  content: "\f054";
-}
-
-.ph-hourglass-simple-high-light::before {
-  content: "\f055";
-}
-
-.ph-hourglass-simple-light::before {
-  content: "\f056";
-}
-
-.ph-hourglass-simple-low-light::before {
-  content: "\f057";
-}
-
-.ph-hourglass-simple-medium-light::before {
-  content: "\f058";
-}
-
-.ph-house-light::before {
-  content: "\f059";
-}
-
-.ph-house-line-light::before {
-  content: "\f05a";
-}
-
-.ph-house-simple-light::before {
-  content: "\f05b";
-}
-
-.ph-identification-badge-light::before {
-  content: "\f05c";
-}
-
-.ph-identification-card-light::before {
-  content: "\f05d";
-}
-
-.ph-image-light::before {
-  content: "\f05e";
-}
-
-.ph-image-square-light::before {
-  content: "\f05f";
-}
-
-.ph-infinity-light::before {
-  content: "\f060";
-}
-
-.ph-info-light::before {
-  content: "\f061";
-}
-
-.ph-instagram-logo-light::before {
-  content: "\f062";
-}
-
-.ph-intersect-light::before {
-  content: "\f063";
-}
-
-.ph-jeep-light::before {
-  content: "\f064";
-}
-
-.ph-kanban-light::before {
-  content: "\f065";
-}
-
-.ph-key-light::before {
-  content: "\f066";
-}
-
-.ph-key-return-light::before {
-  content: "\f067";
-}
-
-.ph-keyboard-light::before {
-  content: "\f068";
-}
-
-.ph-keyhole-light::before {
-  content: "\f069";
-}
-
-.ph-knife-light::before {
-  content: "\f06a";
-}
-
-.ph-ladder-light::before {
-  content: "\f06b";
-}
-
-.ph-ladder-simple-light::before {
-  content: "\f06c";
-}
-
-.ph-lamp-light::before {
-  content: "\f06d";
-}
-
-.ph-laptop-light::before {
-  content: "\f06e";
-}
-
-.ph-layout-light::before {
-  content: "\f06f";
-}
-
-.ph-leaf-light::before {
-  content: "\f070";
-}
-
-.ph-lifebuoy-light::before {
-  content: "\f071";
-}
-
-.ph-lightbulb-filament-light::before {
-  content: "\f072";
-}
-
-.ph-lightbulb-light::before {
-  content: "\f073";
-}
-
-.ph-lightning-light::before {
-  content: "\f074";
-}
-
-.ph-lightning-slash-light::before {
-  content: "\f075";
-}
-
-.ph-line-segment-light::before {
-  content: "\f076";
-}
-
-.ph-line-segments-light::before {
-  content: "\f077";
-}
-
-.ph-link-break-light::before {
-  content: "\f078";
-}
-
-.ph-link-light::before {
-  content: "\f079";
-}
-
-.ph-link-simple-break-light::before {
-  content: "\f07a";
-}
-
-.ph-link-simple-horizontal-break-light::before {
-  content: "\f07b";
-}
-
-.ph-link-simple-horizontal-light::before {
-  content: "\f07c";
-}
-
-.ph-link-simple-light::before {
-  content: "\f07d";
-}
-
-.ph-linkedin-logo-light::before {
-  content: "\f07e";
-}
-
-.ph-linux-logo-light::before {
-  content: "\f07f";
-}
-
-.ph-list-bullets-light::before {
-  content: "\f080";
-}
-
-.ph-list-checks-light::before {
-  content: "\f081";
-}
-
-.ph-list-dashes-light::before {
-  content: "\f082";
-}
-
-.ph-list-light::before {
-  content: "\f083";
-}
-
-.ph-list-numbers-light::before {
-  content: "\f084";
-}
-
-.ph-list-plus-light::before {
-  content: "\f085";
-}
-
-.ph-lock-key-light::before {
-  content: "\f086";
-}
-
-.ph-lock-key-open-light::before {
-  content: "\f087";
-}
-
-.ph-lock-laminated-light::before {
-  content: "\f088";
-}
-
-.ph-lock-laminated-open-light::before {
-  content: "\f089";
-}
-
-.ph-lock-light::before {
-  content: "\f08a";
-}
-
-.ph-lock-open-light::before {
-  content: "\f08b";
-}
-
-.ph-lock-simple-light::before {
-  content: "\f08c";
-}
-
-.ph-lock-simple-open-light::before {
-  content: "\f08d";
-}
-
-.ph-magic-wand-light::before {
-  content: "\f08e";
-}
-
-.ph-magnet-light::before {
-  content: "\f08f";
-}
-
-.ph-magnet-straight-light::before {
-  content: "\f090";
-}
-
-.ph-magnifying-glass-light::before {
-  content: "\f091";
-}
-
-.ph-magnifying-glass-minus-light::before {
-  content: "\f092";
-}
-
-.ph-magnifying-glass-plus-light::before {
-  content: "\f093";
-}
-
-.ph-map-pin-light::before {
-  content: "\f094";
-}
-
-.ph-map-pin-line-light::before {
-  content: "\f095";
-}
-
-.ph-map-trifold-light::before {
-  content: "\f096";
-}
-
-.ph-marker-circle-light::before {
-  content: "\f097";
-}
-
-.ph-martini-light::before {
-  content: "\f098";
-}
-
-.ph-mask-happy-light::before {
-  content: "\f099";
-}
-
-.ph-mask-sad-light::before {
-  content: "\f09a";
-}
-
-.ph-math-operations-light::before {
-  content: "\f09b";
-}
-
-.ph-medal-light::before {
-  content: "\f09c";
-}
-
-.ph-medium-logo-light::before {
-  content: "\f09d";
-}
-
-.ph-megaphone-light::before {
-  content: "\f09e";
-}
-
-.ph-megaphone-simple-light::before {
-  content: "\f09f";
-}
-
-.ph-messenger-logo-light::before {
-  content: "\f0a0";
-}
-
-.ph-microphone-light::before {
-  content: "\f0a1";
-}
-
-.ph-microphone-slash-light::before {
-  content: "\f0a2";
-}
-
-.ph-microphone-stage-light::before {
-  content: "\f0a3";
-}
-
-.ph-microsoft-excel-logo-light::before {
-  content: "\f0a4";
-}
-
-.ph-microsoft-powerpoint-logo-light::before {
-  content: "\f0a5";
-}
-
-.ph-microsoft-teams-logo-light::before {
-  content: "\f0a6";
-}
-
-.ph-microsoft-word-logo-light::before {
-  content: "\f0a7";
-}
-
-.ph-minus-circle-light::before {
-  content: "\f0a8";
-}
-
-.ph-minus-light::before {
-  content: "\f0a9";
-}
-
-.ph-money-light::before {
-  content: "\f0aa";
-}
-
-.ph-monitor-light::before {
-  content: "\f0ab";
-}
-
-.ph-monitor-play-light::before {
-  content: "\f0ac";
-}
-
-.ph-moon-light::before {
-  content: "\f0ad";
-}
-
-.ph-moon-stars-light::before {
-  content: "\f0ae";
-}
-
-.ph-mountains-light::before {
-  content: "\f0af";
-}
-
-.ph-mouse-light::before {
-  content: "\f0b0";
-}
-
-.ph-mouse-simple-light::before {
-  content: "\f0b1";
-}
-
-.ph-music-note-light::before {
-  content: "\f0b2";
-}
-
-.ph-music-note-simple-light::before {
-  content: "\f0b3";
-}
-
-.ph-music-notes-light::before {
-  content: "\f0b4";
-}
-
-.ph-music-notes-plus-light::before {
-  content: "\f0b5";
-}
-
-.ph-music-notes-simple-light::before {
-  content: "\f0b6";
-}
-
-.ph-navigation-arrow-light::before {
-  content: "\f0b7";
-}
-
-.ph-needle-light::before {
-  content: "\f0b8";
-}
-
-.ph-newspaper-clipping-light::before {
-  content: "\f0b9";
-}
-
-.ph-newspaper-light::before {
-  content: "\f0ba";
-}
-
-.ph-note-blank-light::before {
-  content: "\f0bb";
-}
-
-.ph-note-light::before {
-  content: "\f0bc";
-}
-
-.ph-note-pencil-light::before {
-  content: "\f0bd";
-}
-
-.ph-notebook-light::before {
-  content: "\f0be";
-}
-
-.ph-notepad-light::before {
-  content: "\f0bf";
-}
-
-.ph-notification-light::before {
-  content: "\f0c0";
-}
-
-.ph-number-circle-eight-light::before {
-  content: "\f0c1";
-}
-
-.ph-number-circle-five-light::before {
-  content: "\f0c2";
-}
-
-.ph-number-circle-four-light::before {
-  content: "\f0c3";
-}
-
-.ph-number-circle-nine-light::before {
-  content: "\f0c4";
-}
-
-.ph-number-circle-one-light::before {
-  content: "\f0c5";
-}
-
-.ph-number-circle-seven-light::before {
-  content: "\f0c6";
-}
-
-.ph-number-circle-six-light::before {
-  content: "\f0c7";
-}
-
-.ph-number-circle-three-light::before {
-  content: "\f0c8";
-}
-
-.ph-number-circle-two-light::before {
-  content: "\f0c9";
-}
-
-.ph-number-circle-zero-light::before {
-  content: "\f0ca";
-}
-
-.ph-number-eight-light::before {
-  content: "\f0cb";
-}
-
-.ph-number-five-light::before {
-  content: "\f0cc";
-}
-
-.ph-number-four-light::before {
-  content: "\f0cd";
-}
-
-.ph-number-nine-light::before {
-  content: "\f0ce";
-}
-
-.ph-number-one-light::before {
-  content: "\f0cf";
-}
-
-.ph-number-seven-light::before {
-  content: "\f0d0";
-}
-
-.ph-number-six-light::before {
-  content: "\f0d1";
-}
-
-.ph-number-square-eight-light::before {
-  content: "\f0d2";
-}
-
-.ph-number-square-five-light::before {
-  content: "\f0d3";
-}
-
-.ph-number-square-four-light::before {
-  content: "\f0d4";
-}
-
-.ph-number-square-nine-light::before {
-  content: "\f0d5";
-}
-
-.ph-number-square-one-light::before {
-  content: "\f0d6";
-}
-
-.ph-number-square-seven-light::before {
-  content: "\f0d7";
-}
-
-.ph-number-square-six-light::before {
-  content: "\f0d8";
-}
-
-.ph-number-square-three-light::before {
-  content: "\f0d9";
-}
-
-.ph-number-square-two-light::before {
-  content: "\f0da";
-}
-
-.ph-number-square-zero-light::before {
-  content: "\f0db";
-}
-
-.ph-number-three-light::before {
-  content: "\f0dc";
-}
-
-.ph-number-two-light::before {
-  content: "\f0dd";
-}
-
-.ph-number-zero-light::before {
-  content: "\f0de";
-}
-
-.ph-nut-light::before {
-  content: "\f0df";
-}
-
-.ph-ny-times-logo-light::before {
-  content: "\f0e0";
-}
-
-.ph-octagon-light::before {
-  content: "\f0e1";
-}
-
-.ph-option-light::before {
-  content: "\f0e2";
-}
-
-.ph-package-light::before {
-  content: "\f0e3";
-}
-
-.ph-paint-brush-broad-light::before {
-  content: "\f0e4";
-}
-
-.ph-paint-brush-household-light::before {
-  content: "\f0e5";
-}
-
-.ph-paint-brush-light::before {
-  content: "\f0e6";
-}
-
-.ph-paint-bucket-light::before {
-  content: "\f0e7";
-}
-
-.ph-paint-roller-light::before {
-  content: "\f0e8";
-}
-
-.ph-palette-light::before {
-  content: "\f0e9";
-}
-
-.ph-paper-plane-light::before {
-  content: "\f0ea";
-}
-
-.ph-paper-plane-right-light::before {
-  content: "\f0eb";
-}
-
-.ph-paper-plane-tilt-light::before {
-  content: "\f0ec";
-}
-
-.ph-paperclip-horizontal-light::before {
-  content: "\f0ed";
-}
-
-.ph-paperclip-light::before {
-  content: "\f0ee";
-}
-
-.ph-parachute-light::before {
-  content: "\f0ef";
-}
-
-.ph-password-light::before {
-  content: "\f0f0";
-}
-
-.ph-path-light::before {
-  content: "\f0f1";
-}
-
-.ph-pause-circle-light::before {
-  content: "\f0f2";
-}
-
-.ph-pause-light::before {
-  content: "\f0f3";
-}
-
-.ph-paw-print-light::before {
-  content: "\f0f4";
-}
-
-.ph-peace-light::before {
-  content: "\f0f5";
-}
-
-.ph-pen-light::before {
-  content: "\f0f6";
-}
-
-.ph-pen-nib-light::before {
-  content: "\f0f7";
-}
-
-.ph-pen-nib-straight-light::before {
-  content: "\f0f8";
-}
-
-.ph-pencil-circle-light::before {
-  content: "\f0f9";
-}
-
-.ph-pencil-light::before {
-  content: "\f0fa";
-}
-
-.ph-pencil-line-light::before {
-  content: "\f0fb";
-}
-
-.ph-pencil-simple-light::before {
-  content: "\f0fc";
-}
-
-.ph-pencil-simple-line-light::before {
-  content: "\f0fd";
-}
-
-.ph-percent-light::before {
-  content: "\f0fe";
-}
-
-.ph-person-light::before {
-  content: "\f0ff";
-}
-
-.ph-person-simple-light::before {
-  content: "\f100";
-}
-
-.ph-person-simple-run-light::before {
-  content: "\f101";
-}
-
-.ph-person-simple-walk-light::before {
-  content: "\f102";
-}
-
-.ph-perspective-light::before {
-  content: "\f103";
-}
-
-.ph-phone-call-light::before {
-  content: "\f104";
-}
-
-.ph-phone-disconnect-light::before {
-  content: "\f105";
-}
-
-.ph-phone-incoming-light::before {
-  content: "\f106";
-}
-
-.ph-phone-light::before {
-  content: "\f107";
-}
-
-.ph-phone-outgoing-light::before {
-  content: "\f108";
-}
-
-.ph-phone-slash-light::before {
-  content: "\f109";
-}
-
-.ph-phone-x-light::before {
-  content: "\f10a";
-}
-
-.ph-phosphor-logo-light::before {
-  content: "\f10b";
-}
-
-.ph-piano-keys-light::before {
-  content: "\f10c";
-}
-
-.ph-picture-in-picture-light::before {
-  content: "\f10d";
-}
-
-.ph-pill-light::before {
-  content: "\f10e";
-}
-
-.ph-pinterest-logo-light::before {
-  content: "\f10f";
-}
-
-.ph-pinwheel-light::before {
-  content: "\f110";
-}
-
-.ph-pizza-light::before {
-  content: "\f111";
-}
-
-.ph-placeholder-light::before {
-  content: "\f112";
-}
-
-.ph-planet-light::before {
-  content: "\f113";
-}
-
-.ph-play-circle-light::before {
-  content: "\f114";
-}
-
-.ph-play-light::before {
-  content: "\f115";
-}
-
-.ph-playlist-light::before {
-  content: "\f116";
-}
-
-.ph-plug-light::before {
-  content: "\f117";
-}
-
-.ph-plugs-connected-light::before {
-  content: "\f118";
-}
-
-.ph-plugs-light::before {
-  content: "\f119";
-}
-
-.ph-plus-circle-light::before {
-  content: "\f11a";
-}
-
-.ph-plus-light::before {
-  content: "\f11b";
-}
-
-.ph-plus-minus-light::before {
-  content: "\f11c";
-}
-
-.ph-poker-chip-light::before {
-  content: "\f11d";
-}
-
-.ph-police-car-light::before {
-  content: "\f11e";
-}
-
-.ph-polygon-light::before {
-  content: "\f11f";
-}
-
-.ph-popcorn-light::before {
-  content: "\f120";
-}
-
-.ph-power-light::before {
-  content: "\f121";
-}
-
-.ph-prescription-light::before {
-  content: "\f122";
-}
-
-.ph-presentation-chart-light::before {
-  content: "\f123";
-}
-
-.ph-presentation-light::before {
-  content: "\f124";
-}
-
-.ph-printer-light::before {
-  content: "\f125";
-}
-
-.ph-prohibit-inset-light::before {
-  content: "\f126";
-}
-
-.ph-prohibit-light::before {
-  content: "\f127";
-}
-
-.ph-projector-screen-chart-light::before {
-  content: "\f128";
-}
-
-.ph-projector-screen-light::before {
-  content: "\f129";
-}
-
-.ph-push-pin-light::before {
-  content: "\f12a";
-}
-
-.ph-push-pin-simple-light::before {
-  content: "\f12b";
-}
-
-.ph-push-pin-simple-slash-light::before {
-  content: "\f12c";
-}
-
-.ph-push-pin-slash-light::before {
-  content: "\f12d";
-}
-
-.ph-puzzle-piece-light::before {
-  content: "\f12e";
-}
-
-.ph-qr-code-light::before {
-  content: "\f12f";
-}
-
-.ph-question-light::before {
-  content: "\f130";
-}
-
-.ph-queue-light::before {
-  content: "\f131";
-}
-
-.ph-quotes-light::before {
-  content: "\f132";
-}
-
-.ph-radical-light::before {
-  content: "\f133";
-}
-
-.ph-radio-button-light::before {
-  content: "\f134";
-}
-
-.ph-radio-light::before {
-  content: "\f135";
-}
-
-.ph-rainbow-cloud-light::before {
-  content: "\f136";
-}
-
-.ph-rainbow-light::before {
-  content: "\f137";
-}
-
-.ph-receipt-light::before {
-  content: "\f138";
-}
-
-.ph-record-light::before {
-  content: "\f139";
-}
-
-.ph-rectangle-light::before {
-  content: "\f13a";
-}
-
-.ph-recycle-light::before {
-  content: "\f13b";
-}
-
-.ph-reddit-logo-light::before {
-  content: "\f13c";
-}
-
-.ph-repeat-light::before {
-  content: "\f13d";
-}
-
-.ph-repeat-once-light::before {
-  content: "\f13e";
-}
-
-.ph-rewind-circle-light::before {
-  content: "\f13f";
-}
-
-.ph-rewind-light::before {
-  content: "\f140";
-}
-
-.ph-robot-light::before {
-  content: "\f141";
-}
-
-.ph-rocket-launch-light::before {
-  content: "\f142";
-}
-
-.ph-rocket-light::before {
-  content: "\f143";
-}
-
-.ph-rows-light::before {
-  content: "\f144";
-}
-
-.ph-rss-light::before {
-  content: "\f145";
-}
-
-.ph-rss-simple-light::before {
-  content: "\f146";
-}
-
-.ph-rug-light::before {
-  content: "\f147";
-}
-
-.ph-ruler-light::before {
-  content: "\f148";
-}
-
-.ph-scales-light::before {
-  content: "\f149";
-}
-
-.ph-scan-light::before {
-  content: "\f14a";
-}
-
-.ph-scissors-light::before {
-  content: "\f14b";
-}
-
-.ph-screencast-light::before {
-  content: "\f14c";
-}
-
-.ph-scribble-loop-light::before {
-  content: "\f14d";
-}
-
-.ph-scroll-light::before {
-  content: "\f14e";
-}
-
-.ph-selection-all-light::before {
-  content: "\f14f";
-}
-
-.ph-selection-background-light::before {
-  content: "\f150";
-}
-
-.ph-selection-foreground-light::before {
-  content: "\f151";
-}
-
-.ph-selection-inverse-light::before {
-  content: "\f152";
-}
-
-.ph-selection-light::before {
-  content: "\f153";
-}
-
-.ph-selection-plus-light::before {
-  content: "\f154";
-}
-
-.ph-selection-slash-light::before {
-  content: "\f155";
-}
-
-.ph-share-light::before {
-  content: "\f156";
-}
-
-.ph-share-network-light::before {
-  content: "\f157";
-}
-
-.ph-shield-check-light::before {
-  content: "\f158";
-}
-
-.ph-shield-checkered-light::before {
-  content: "\f159";
-}
-
-.ph-shield-chevron-light::before {
-  content: "\f15a";
-}
-
-.ph-shield-light::before {
-  content: "\f15b";
-}
-
-.ph-shield-plus-light::before {
-  content: "\f15c";
-}
-
-.ph-shield-slash-light::before {
-  content: "\f15d";
-}
-
-.ph-shield-star-light::before {
-  content: "\f15e";
-}
-
-.ph-shield-warning-light::before {
-  content: "\f15f";
-}
-
-.ph-shopping-bag-light::before {
-  content: "\f160";
-}
-
-.ph-shopping-bag-open-light::before {
-  content: "\f161";
-}
-
-.ph-shopping-cart-light::before {
-  content: "\f162";
-}
-
-.ph-shopping-cart-simple-light::before {
-  content: "\f163";
-}
-
-.ph-shower-light::before {
-  content: "\f164";
-}
-
-.ph-shuffle-angular-light::before {
-  content: "\f165";
-}
-
-.ph-shuffle-light::before {
-  content: "\f166";
-}
-
-.ph-shuffle-simple-light::before {
-  content: "\f167";
-}
-
-.ph-sidebar-light::before {
-  content: "\f168";
-}
-
-.ph-sidebar-simple-light::before {
-  content: "\f169";
-}
-
-.ph-sign-in-light::before {
-  content: "\f16a";
-}
-
-.ph-sign-out-light::before {
-  content: "\f16b";
-}
-
-.ph-signpost-light::before {
-  content: "\f16c";
-}
-
-.ph-sim-card-light::before {
-  content: "\f16d";
-}
-
-.ph-sketch-logo-light::before {
-  content: "\f16e";
-}
-
-.ph-skip-back-circle-light::before {
-  content: "\f16f";
-}
-
-.ph-skip-back-light::before {
-  content: "\f170";
-}
-
-.ph-skip-forward-circle-light::before {
-  content: "\f171";
-}
-
-.ph-skip-forward-light::before {
-  content: "\f172";
-}
-
-.ph-skull-light::before {
-  content: "\f173";
-}
-
-.ph-slack-logo-light::before {
-  content: "\f174";
-}
-
-.ph-sliders-horizontal-light::before {
-  content: "\f175";
-}
-
-.ph-sliders-light::before {
-  content: "\f176";
-}
-
-.ph-smiley-blank-light::before {
-  content: "\f177";
-}
-
-.ph-smiley-light::before {
-  content: "\f178";
-}
-
-.ph-smiley-meh-light::before {
-  content: "\f179";
-}
-
-.ph-smiley-nervous-light::before {
-  content: "\f17a";
-}
-
-.ph-smiley-sad-light::before {
-  content: "\f17b";
-}
-
-.ph-smiley-sticker-light::before {
-  content: "\f17c";
-}
-
-.ph-smiley-wink-light::before {
-  content: "\f17d";
-}
-
-.ph-smiley-x-eyes-light::before {
-  content: "\f17e";
-}
-
-.ph-snapchat-logo-light::before {
-  content: "\f17f";
-}
-
-.ph-snowflake-light::before {
-  content: "\f180";
-}
-
-.ph-soccer-ball-light::before {
-  content: "\f181";
-}
-
-.ph-sort-ascending-light::before {
-  content: "\f182";
-}
-
-.ph-sort-descending-light::before {
-  content: "\f183";
-}
-
-.ph-spade-light::before {
-  content: "\f184";
-}
-
-.ph-sparkle-light::before {
-  content: "\f185";
-}
-
-.ph-speaker-high-light::before {
-  content: "\f186";
-}
-
-.ph-speaker-low-light::before {
-  content: "\f187";
-}
-
-.ph-speaker-none-light::before {
-  content: "\f188";
-}
-
-.ph-speaker-simple-high-light::before {
-  content: "\f189";
-}
-
-.ph-speaker-simple-low-light::before {
-  content: "\f18a";
-}
-
-.ph-speaker-simple-none-light::before {
-  content: "\f18b";
-}
-
-.ph-speaker-simple-slash-light::before {
-  content: "\f18c";
-}
-
-.ph-speaker-simple-x-light::before {
-  content: "\f18d";
-}
-
-.ph-speaker-slash-light::before {
-  content: "\f18e";
-}
-
-.ph-speaker-x-light::before {
-  content: "\f18f";
-}
-
-.ph-spinner-gap-light::before {
-  content: "\f190";
-}
-
-.ph-spinner-light::before {
-  content: "\f191";
-}
-
-.ph-spiral-light::before {
-  content: "\f192";
-}
-
-.ph-spotify-logo-light::before {
-  content: "\f193";
-}
-
-.ph-square-half-bottom-light::before {
-  content: "\f194";
-}
-
-.ph-square-half-light::before {
-  content: "\f195";
-}
-
-.ph-square-light::before {
-  content: "\f196";
-}
-
-.ph-square-logo-light::before {
-  content: "\f197";
-}
-
-.ph-squares-four-light::before {
-  content: "\f198";
-}
-
-.ph-stack-light::before {
-  content: "\f199";
-}
-
-.ph-stack-overflow-logo-light::before {
-  content: "\f19a";
-}
-
-.ph-stack-simple-light::before {
-  content: "\f19b";
-}
-
-.ph-stamp-light::before {
-  content: "\f19c";
-}
-
-.ph-star-four-light::before {
-  content: "\f19d";
-}
-
-.ph-star-half-light::before {
-  content: "\f19e";
-}
-
-.ph-star-light::before {
-  content: "\f19f";
-}
-
-.ph-sticker-light::before {
-  content: "\f1a0";
-}
-
-.ph-stop-circle-light::before {
-  content: "\f1a1";
-}
-
-.ph-stop-light::before {
-  content: "\f1a2";
-}
-
-.ph-storefront-light::before {
-  content: "\f1a3";
-}
-
-.ph-strategy-light::before {
-  content: "\f1a4";
-}
-
-.ph-stripe-logo-light::before {
-  content: "\f1a5";
-}
-
-.ph-student-light::before {
-  content: "\f1a6";
-}
-
-.ph-suitcase-light::before {
-  content: "\f1a7";
-}
-
-.ph-suitcase-simple-light::before {
-  content: "\f1a8";
-}
-
-.ph-sun-dim-light::before {
-  content: "\f1a9";
-}
-
-.ph-sun-horizon-light::before {
-  content: "\f1aa";
-}
-
-.ph-sun-light::before {
-  content: "\f1ab";
-}
-
-.ph-sunglasses-light::before {
-  content: "\f1ac";
-}
-
-.ph-swap-light::before {
-  content: "\f1ad";
-}
-
-.ph-swatches-light::before {
-  content: "\f1ae";
-}
-
-.ph-sword-light::before {
-  content: "\f1af";
-}
-
-.ph-syringe-light::before {
-  content: "\f1b0";
-}
-
-.ph-t-shirt-light::before {
-  content: "\f1b1";
-}
-
-.ph-table-light::before {
-  content: "\f1b2";
-}
-
-.ph-tabs-light::before {
-  content: "\f1b3";
-}
-
-.ph-tag-chevron-light::before {
-  content: "\f1b4";
-}
-
-.ph-tag-light::before {
-  content: "\f1b5";
-}
-
-.ph-tag-simple-light::before {
-  content: "\f1b6";
-}
-
-.ph-target-light::before {
-  content: "\f1b7";
-}
-
-.ph-taxi-light::before {
-  content: "\f1b8";
-}
-
-.ph-telegram-logo-light::before {
-  content: "\f1b9";
-}
-
-.ph-television-light::before {
-  content: "\f1ba";
-}
-
-.ph-television-simple-light::before {
-  content: "\f1bb";
-}
-
-.ph-tennis-ball-light::before {
-  content: "\f1bc";
-}
-
-.ph-terminal-light::before {
-  content: "\f1bd";
-}
-
-.ph-terminal-window-light::before {
-  content: "\f1be";
-}
-
-.ph-test-tube-light::before {
-  content: "\f1bf";
-}
-
-.ph-text-aa-light::before {
-  content: "\f1c0";
-}
-
-.ph-text-align-center-light::before {
-  content: "\f1c1";
-}
-
-.ph-text-align-justify-light::before {
-  content: "\f1c2";
-}
-
-.ph-text-align-left-light::before {
-  content: "\f1c3";
-}
-
-.ph-text-align-right-light::before {
-  content: "\f1c4";
-}
-
-.ph-text-bolder-light::before {
-  content: "\f1c5";
-}
-
-.ph-text-h-five-light::before {
-  content: "\f1c6";
-}
-
-.ph-text-h-four-light::before {
-  content: "\f1c7";
-}
-
-.ph-text-h-light::before {
-  content: "\f1c8";
-}
-
-.ph-text-h-one-light::before {
-  content: "\f1c9";
-}
-
-.ph-text-h-six-light::before {
-  content: "\f1ca";
-}
-
-.ph-text-h-three-light::before {
-  content: "\f1cb";
-}
-
-.ph-text-h-two-light::before {
-  content: "\f1cc";
-}
-
-.ph-text-indent-light::before {
-  content: "\f1cd";
-}
-
-.ph-text-italic-light::before {
-  content: "\f1ce";
-}
-
-.ph-text-outdent-light::before {
-  content: "\f1cf";
-}
-
-.ph-text-strikethrough-light::before {
-  content: "\f1d0";
-}
-
-.ph-text-t-light::before {
-  content: "\f1d1";
-}
-
-.ph-text-underline-light::before {
-  content: "\f1d2";
-}
-
-.ph-textbox-light::before {
-  content: "\f1d3";
-}
-
-.ph-thermometer-cold-light::before {
-  content: "\f1d4";
-}
-
-.ph-thermometer-hot-light::before {
-  content: "\f1d5";
-}
-
-.ph-thermometer-light::before {
-  content: "\f1d6";
-}
-
-.ph-thermometer-simple-light::before {
-  content: "\f1d7";
-}
-
-.ph-thumbs-down-light::before {
-  content: "\f1d8";
-}
-
-.ph-thumbs-up-light::before {
-  content: "\f1d9";
-}
-
-.ph-ticket-light::before {
-  content: "\f1da";
-}
-
-.ph-tiktok-logo-light::before {
-  content: "\f1db";
-}
-
-.ph-timer-light::before {
-  content: "\f1dc";
-}
-
-.ph-toggle-left-light::before {
-  content: "\f1dd";
-}
-
-.ph-toggle-right-light::before {
-  content: "\f1de";
-}
-
-.ph-toilet-light::before {
-  content: "\f1df";
-}
-
-.ph-toilet-paper-light::before {
-  content: "\f1e0";
-}
-
-.ph-tote-light::before {
-  content: "\f1e1";
-}
-
-.ph-tote-simple-light::before {
-  content: "\f1e2";
-}
-
-.ph-trademark-registered-light::before {
-  content: "\f1e3";
-}
-
-.ph-traffic-cone-light::before {
-  content: "\f1e4";
-}
-
-.ph-traffic-sign-light::before {
-  content: "\f1e5";
-}
-
-.ph-traffic-signal-light::before {
-  content: "\f1e6";
-}
-
-.ph-train-light::before {
-  content: "\f1e7";
-}
-
-.ph-train-regional-light::before {
-  content: "\f1e8";
-}
-
-.ph-train-simple-light::before {
-  content: "\f1e9";
-}
-
-.ph-translate-light::before {
-  content: "\f1ea";
-}
-
-.ph-trash-light::before {
-  content: "\f1eb";
-}
-
-.ph-trash-simple-light::before {
-  content: "\f1ec";
-}
-
-.ph-tray-light::before {
-  content: "\f1ed";
-}
-
-.ph-tree-evergreen-light::before {
-  content: "\f1ee";
-}
-
-.ph-tree-light::before {
-  content: "\f1ef";
-}
-
-.ph-tree-structure-light::before {
-  content: "\f1f0";
-}
-
-.ph-trend-down-light::before {
-  content: "\f1f1";
-}
-
-.ph-trend-up-light::before {
-  content: "\f1f2";
-}
-
-.ph-triangle-light::before {
-  content: "\f1f3";
-}
-
-.ph-trophy-light::before {
-  content: "\f1f4";
-}
-
-.ph-truck-light::before {
-  content: "\f1f5";
-}
-
-.ph-twitch-logo-light::before {
-  content: "\f1f6";
-}
-
-.ph-twitter-logo-light::before {
-  content: "\f1f7";
-}
-
-.ph-umbrella-light::before {
-  content: "\f1f8";
-}
-
-.ph-umbrella-simple-light::before {
-  content: "\f1f9";
-}
-
-.ph-upload-light::before {
-  content: "\f1fa";
-}
-
-.ph-upload-simple-light::before {
-  content: "\f1fb";
-}
-
-.ph-user-circle-gear-light::before {
-  content: "\f1fc";
-}
-
-.ph-user-circle-light::before {
-  content: "\f1fd";
-}
-
-.ph-user-circle-minus-light::before {
-  content: "\f1fe";
-}
-
-.ph-user-circle-plus-light::before {
-  content: "\f1ff";
-}
-
-.ph-user-focus-light::before {
-  content: "\f200";
-}
-
-.ph-user-gear-light::before {
-  content: "\f201";
-}
-
-.ph-user-light::before {
-  content: "\f202";
-}
-
-.ph-user-list-light::before {
-  content: "\f203";
-}
-
-.ph-user-minus-light::before {
-  content: "\f204";
-}
-
-.ph-user-plus-light::before {
-  content: "\f205";
-}
-
-.ph-user-rectangle-light::before {
-  content: "\f206";
-}
-
-.ph-user-square-light::before {
-  content: "\f207";
-}
-
-.ph-user-switch-light::before {
-  content: "\f208";
-}
-
-.ph-users-four-light::before {
-  content: "\f209";
-}
-
-.ph-users-light::before {
-  content: "\f20a";
-}
-
-.ph-users-three-light::before {
-  content: "\f20b";
-}
-
-.ph-vault-light::before {
-  content: "\f20c";
-}
-
-.ph-vibrate-light::before {
-  content: "\f20d";
-}
-
-.ph-video-camera-light::before {
-  content: "\f20e";
-}
-
-.ph-video-camera-slash-light::before {
-  content: "\f20f";
-}
-
-.ph-vignette-light::before {
-  content: "\f210";
-}
-
-.ph-voicemail-light::before {
-  content: "\f211";
-}
-
-.ph-volleyball-light::before {
-  content: "\f212";
-}
-
-.ph-wall-light::before {
-  content: "\f213";
-}
-
-.ph-wallet-light::before {
-  content: "\f214";
-}
-
-.ph-warning-circle-light::before {
-  content: "\f215";
-}
-
-.ph-warning-light::before {
-  content: "\f216";
-}
-
-.ph-warning-octagon-light::before {
-  content: "\f217";
-}
-
-.ph-watch-light::before {
-  content: "\f218";
-}
-
-.ph-wave-sawtooth-light::before {
-  content: "\f219";
-}
-
-.ph-wave-sine-light::before {
-  content: "\f21a";
-}
-
-.ph-wave-square-light::before {
-  content: "\f21b";
-}
-
-.ph-wave-triangle-light::before {
-  content: "\f21c";
-}
-
-.ph-waves-light::before {
-  content: "\f21d";
-}
-
-.ph-webcam-light::before {
-  content: "\f21e";
-}
-
-.ph-whatsapp-logo-light::before {
-  content: "\f21f";
-}
-
-.ph-wheelchair-light::before {
-  content: "\f220";
-}
-
-.ph-wifi-high-light::before {
-  content: "\f221";
-}
-
-.ph-wifi-low-light::before {
-  content: "\f222";
-}
-
-.ph-wifi-medium-light::before {
-  content: "\f223";
-}
-
-.ph-wifi-none-light::before {
-  content: "\f224";
-}
-
-.ph-wifi-slash-light::before {
-  content: "\f225";
-}
-
-.ph-wifi-x-light::before {
-  content: "\f226";
-}
-
-.ph-wind-light::before {
-  content: "\f227";
-}
-
-.ph-windows-logo-light::before {
-  content: "\f228";
-}
-
-.ph-wine-light::before {
-  content: "\f229";
-}
-
-.ph-wrench-light::before {
-  content: "\f22a";
-}
-
-.ph-x-circle-light::before {
-  content: "\f22b";
-}
-
-.ph-x-light::before {
-  content: "\f22c";
-}
-
-.ph-x-square-light::before {
-  content: "\f22d";
-}
-
-.ph-yin-yang-light::before {
-  content: "\f22e";
-}
-
-.ph-youtube-logo-light::before {
-  content: "\f22f";
-}
-
-.ph-activity::before {
-  content: "\f230";
-}
-
-.ph-address-book::before {
-  content: "\f231";
-}
-
-.ph-airplane::before {
-  content: "\f232";
-}
-
-.ph-airplane-in-flight::before {
-  content: "\f233";
-}
-
-.ph-airplane-landing::before {
-  content: "\f234";
-}
-
-.ph-airplane-takeoff::before {
-  content: "\f235";
-}
-
-.ph-airplane-tilt::before {
-  content: "\f236";
-}
-
-.ph-airplay::before {
-  content: "\f237";
-}
-
-.ph-alarm::before {
-  content: "\f238";
-}
-
-.ph-alien::before {
-  content: "\f239";
-}
-
-.ph-align-bottom::before {
-  content: "\f23a";
-}
-
-.ph-align-bottom-simple::before {
-  content: "\f23b";
-}
-
-.ph-align-center-horizontal::before {
-  content: "\f23c";
-}
-
-.ph-align-center-horizontal-simple::before {
-  content: "\f23d";
-}
-
-.ph-align-center-vertical::before {
-  content: "\f23e";
-}
-
-.ph-align-center-vertical-simple::before {
-  content: "\f23f";
-}
-
-.ph-align-left::before {
-  content: "\f240";
-}
-
-.ph-align-left-simple::before {
-  content: "\f241";
-}
-
-.ph-align-right::before {
-  content: "\f242";
-}
-
-.ph-align-right-simple::before {
-  content: "\f243";
-}
-
-.ph-align-top::before {
-  content: "\f244";
-}
-
-.ph-align-top-simple::before {
-  content: "\f245";
-}
-
-.ph-anchor::before {
-  content: "\f246";
-}
-
-.ph-anchor-simple::before {
-  content: "\f247";
-}
-
-.ph-android-logo::before {
-  content: "\f248";
-}
-
-.ph-angular-logo::before {
-  content: "\f249";
-}
-
-.ph-aperture::before {
-  content: "\f24a";
-}
-
-.ph-app-store-logo::before {
-  content: "\f24b";
-}
-
-.ph-app-window::before {
-  content: "\f24c";
-}
-
-.ph-apple-logo::before {
-  content: "\f24d";
-}
-
-.ph-apple-podcasts-logo::before {
-  content: "\f24e";
-}
-
-.ph-archive::before {
-  content: "\f24f";
-}
-
-.ph-archive-box::before {
-  content: "\f250";
-}
-
-.ph-archive-tray::before {
-  content: "\f251";
-}
-
-.ph-armchair::before {
-  content: "\f252";
-}
-
-.ph-arrow-arc-left::before {
-  content: "\f253";
-}
-
-.ph-arrow-arc-right::before {
-  content: "\f254";
-}
-
-.ph-arrow-bend-double-up-left::before {
-  content: "\f255";
-}
-
-.ph-arrow-bend-double-up-right::before {
-  content: "\f256";
-}
-
-.ph-arrow-bend-down-left::before {
-  content: "\f257";
-}
-
-.ph-arrow-bend-down-right::before {
-  content: "\f258";
-}
-
-.ph-arrow-bend-left-down::before {
-  content: "\f259";
-}
-
-.ph-arrow-bend-left-up::before {
-  content: "\f25a";
-}
-
-.ph-arrow-bend-right-down::before {
-  content: "\f25b";
-}
-
-.ph-arrow-bend-right-up::before {
-  content: "\f25c";
-}
-
-.ph-arrow-bend-up-left::before {
-  content: "\f25d";
-}
-
-.ph-arrow-bend-up-right::before {
-  content: "\f25e";
-}
-
-.ph-arrow-circle-down::before {
-  content: "\f25f";
-}
-
-.ph-arrow-circle-down-left::before {
-  content: "\f260";
-}
-
-.ph-arrow-circle-down-right::before {
-  content: "\f261";
-}
-
-.ph-arrow-circle-left::before {
-  content: "\f262";
-}
-
-.ph-arrow-circle-right::before {
-  content: "\f263";
-}
-
-.ph-arrow-circle-up::before {
-  content: "\f264";
-}
-
-.ph-arrow-circle-up-left::before {
-  content: "\f265";
-}
-
-.ph-arrow-circle-up-right::before {
-  content: "\f266";
-}
-
-.ph-arrow-clockwise::before {
-  content: "\f267";
-}
-
-.ph-arrow-counter-clockwise::before {
-  content: "\f268";
-}
-
-.ph-arrow-down::before {
-  content: "\f269";
-}
-
-.ph-arrow-down-left::before {
-  content: "\f26a";
-}
-
-.ph-arrow-down-right::before {
-  content: "\f26b";
-}
-
-.ph-arrow-elbow-down-left::before {
-  content: "\f26c";
-}
-
-.ph-arrow-elbow-down-right::before {
-  content: "\f26d";
-}
-
-.ph-arrow-elbow-left::before {
-  content: "\f26e";
-}
-
-.ph-arrow-elbow-left-down::before {
-  content: "\f26f";
-}
-
-.ph-arrow-elbow-left-up::before {
-  content: "\f270";
-}
-
-.ph-arrow-elbow-right::before {
-  content: "\f271";
-}
-
-.ph-arrow-elbow-right-down::before {
-  content: "\f272";
-}
-
-.ph-arrow-elbow-right-up::before {
-  content: "\f273";
-}
-
-.ph-arrow-elbow-up-left::before {
-  content: "\f274";
-}
-
-.ph-arrow-elbow-up-right::before {
-  content: "\f275";
-}
-
-.ph-arrow-fat-down::before {
-  content: "\f276";
-}
-
-.ph-arrow-fat-left::before {
-  content: "\f277";
-}
-
-.ph-arrow-fat-line-down::before {
-  content: "\f278";
-}
-
-.ph-arrow-fat-line-left::before {
-  content: "\f279";
-}
-
-.ph-arrow-fat-line-right::before {
-  content: "\f27a";
-}
-
-.ph-arrow-fat-line-up::before {
-  content: "\f27b";
-}
-
-.ph-arrow-fat-lines-down::before {
-  content: "\f27c";
-}
-
-.ph-arrow-fat-lines-left::before {
-  content: "\f27d";
-}
-
-.ph-arrow-fat-lines-right::before {
-  content: "\f27e";
-}
-
-.ph-arrow-fat-lines-up::before {
-  content: "\f27f";
-}
-
-.ph-arrow-fat-right::before {
-  content: "\f280";
-}
-
-.ph-arrow-fat-up::before {
-  content: "\f281";
-}
-
-.ph-arrow-left::before {
-  content: "\f282";
-}
-
-.ph-arrow-line-down::before {
-  content: "\f283";
-}
-
-.ph-arrow-line-down-left::before {
-  content: "\f284";
-}
-
-.ph-arrow-line-down-right::before {
-  content: "\f285";
-}
-
-.ph-arrow-line-left::before {
-  content: "\f286";
-}
-
-.ph-arrow-line-right::before {
-  content: "\f287";
-}
-
-.ph-arrow-line-up::before {
-  content: "\f288";
-}
-
-.ph-arrow-line-up-left::before {
-  content: "\f289";
-}
-
-.ph-arrow-line-up-right::before {
-  content: "\f28a";
-}
-
-.ph-arrow-right::before {
-  content: "\f28b";
-}
-
-.ph-arrow-square-down::before {
-  content: "\f28c";
-}
-
-.ph-arrow-square-down-left::before {
-  content: "\f28d";
-}
-
-.ph-arrow-square-down-right::before {
-  content: "\f28e";
-}
-
-.ph-arrow-square-in::before {
-  content: "\f28f";
-}
-
-.ph-arrow-square-left::before {
-  content: "\f290";
-}
-
-.ph-arrow-square-out::before {
-  content: "\f291";
-}
-
-.ph-arrow-square-right::before {
-  content: "\f292";
-}
-
-.ph-arrow-square-up::before {
-  content: "\f293";
-}
-
-.ph-arrow-square-up-left::before {
-  content: "\f294";
-}
-
-.ph-arrow-square-up-right::before {
-  content: "\f295";
-}
-
-.ph-arrow-u-down-left::before {
-  content: "\f296";
-}
-
-.ph-arrow-u-down-right::before {
-  content: "\f297";
-}
-
-.ph-arrow-u-left-down::before {
-  content: "\f298";
-}
-
-.ph-arrow-u-left-up::before {
-  content: "\f299";
-}
-
-.ph-arrow-u-right-down::before {
-  content: "\f29a";
-}
-
-.ph-arrow-u-right-up::before {
-  content: "\f29b";
-}
-
-.ph-arrow-u-up-left::before {
-  content: "\f29c";
-}
-
-.ph-arrow-u-up-right::before {
-  content: "\f29d";
-}
-
-.ph-arrow-up::before {
-  content: "\f29e";
-}
-
-.ph-arrow-up-left::before {
-  content: "\f29f";
-}
-
-.ph-arrow-up-right::before {
-  content: "\f2a0";
-}
-
-.ph-arrows-clockwise::before {
-  content: "\f2a1";
-}
-
-.ph-arrows-counter-clockwise::before {
-  content: "\f2a2";
-}
-
-.ph-arrows-down-up::before {
-  content: "\f2a3";
-}
-
-.ph-arrows-horizontal::before {
-  content: "\f2a4";
-}
-
-.ph-arrows-in::before {
-  content: "\f2a5";
-}
-
-.ph-arrows-in-cardinal::before {
-  content: "\f2a6";
-}
-
-.ph-arrows-in-line-horizontal::before {
-  content: "\f2a7";
-}
-
-.ph-arrows-in-line-vertical::before {
-  content: "\f2a8";
-}
-
-.ph-arrows-in-simple::before {
-  content: "\f2a9";
-}
-
-.ph-arrows-left-right::before {
-  content: "\f2aa";
-}
-
-.ph-arrows-out::before {
-  content: "\f2ab";
-}
-
-.ph-arrows-out-cardinal::before {
-  content: "\f2ac";
-}
-
-.ph-arrows-out-line-horizontal::before {
-  content: "\f2ad";
-}
-
-.ph-arrows-out-line-vertical::before {
-  content: "\f2ae";
-}
-
-.ph-arrows-out-simple::before {
-  content: "\f2af";
-}
-
-.ph-arrows-vertical::before {
-  content: "\f2b0";
-}
-
-.ph-article::before {
-  content: "\f2b1";
-}
-
-.ph-article-medium::before {
-  content: "\f2b2";
-}
-
-.ph-article-ny-times::before {
-  content: "\f2b3";
-}
-
-.ph-asterisk::before {
-  content: "\f2b4";
-}
-
-.ph-asterisk-simple::before {
-  content: "\f2b5";
-}
-
-.ph-at::before {
-  content: "\f2b6";
-}
-
-.ph-atom::before {
-  content: "\f2b7";
-}
-
-.ph-baby::before {
-  content: "\f2b8";
-}
-
-.ph-backpack::before {
-  content: "\f2b9";
-}
-
-.ph-backspace::before {
-  content: "\f2ba";
-}
-
-.ph-bag::before {
-  content: "\f2bb";
-}
-
-.ph-bag-simple::before {
-  content: "\f2bc";
-}
-
-.ph-balloon::before {
-  content: "\f2bd";
-}
-
-.ph-bandaids::before {
-  content: "\f2be";
-}
-
-.ph-bank::before {
-  content: "\f2bf";
-}
-
-.ph-barbell::before {
-  content: "\f2c0";
-}
-
-.ph-barcode::before {
-  content: "\f2c1";
-}
-
-.ph-barricade::before {
-  content: "\f2c2";
-}
-
-.ph-baseball::before {
-  content: "\f2c3";
-}
-
-.ph-basketball::before {
-  content: "\f2c4";
-}
-
-.ph-bathtub::before {
-  content: "\f2c5";
-}
-
-.ph-battery-charging::before {
-  content: "\f2c6";
-}
-
-.ph-battery-charging-vertical::before {
-  content: "\f2c7";
-}
-
-.ph-battery-empty::before {
-  content: "\f2c8";
-}
-
-.ph-battery-full::before {
-  content: "\f2c9";
-}
-
-.ph-battery-high::before {
-  content: "\f2ca";
-}
-
-.ph-battery-low::before {
-  content: "\f2cb";
-}
-
-.ph-battery-medium::before {
-  content: "\f2cc";
-}
-
-.ph-battery-plus::before {
-  content: "\f2cd";
-}
-
-.ph-battery-warning::before {
-  content: "\f2ce";
-}
-
-.ph-battery-warning-vertical::before {
-  content: "\f2cf";
-}
-
-.ph-bed::before {
-  content: "\f2d0";
-}
-
-.ph-beer-bottle::before {
-  content: "\f2d1";
-}
-
-.ph-behance-logo::before {
-  content: "\f2d2";
-}
-
-.ph-bell::before {
-  content: "\f2d3";
-}
-
-.ph-bell-ringing::before {
-  content: "\f2d4";
-}
-
-.ph-bell-simple::before {
-  content: "\f2d5";
-}
-
-.ph-bell-simple-ringing::before {
-  content: "\f2d6";
-}
-
-.ph-bell-simple-slash::before {
-  content: "\f2d7";
-}
-
-.ph-bell-simple-z::before {
-  content: "\f2d8";
-}
-
-.ph-bell-slash::before {
-  content: "\f2d9";
-}
-
-.ph-bell-z::before {
-  content: "\f2da";
-}
-
-.ph-bezier-curve::before {
-  content: "\f2db";
-}
-
-.ph-bicycle::before {
-  content: "\f2dc";
-}
-
-.ph-binoculars::before {
-  content: "\f2dd";
-}
-
-.ph-bird::before {
-  content: "\f2de";
-}
-
-.ph-bluetooth::before {
-  content: "\f2df";
-}
-
-.ph-bluetooth-connected::before {
-  content: "\f2e0";
-}
-
-.ph-bluetooth-slash::before {
-  content: "\f2e1";
-}
-
-.ph-bluetooth-x::before {
-  content: "\f2e2";
-}
-
-.ph-boat::before {
-  content: "\f2e3";
-}
-
-.ph-book::before {
-  content: "\f2e4";
-}
-
-.ph-book-bookmark::before {
-  content: "\f2e5";
-}
-
-.ph-book-open::before {
-  content: "\f2e6";
-}
-
-.ph-bookmark::before {
-  content: "\f2e7";
-}
-
-.ph-bookmark-simple::before {
-  content: "\f2e8";
-}
-
-.ph-bookmarks::before {
-  content: "\f2e9";
-}
-
-.ph-bookmarks-simple::before {
-  content: "\f2ea";
-}
-
-.ph-books::before {
-  content: "\f2eb";
-}
-
-.ph-bounding-box::before {
-  content: "\f2ec";
-}
-
-.ph-brackets-angle::before {
-  content: "\f2ed";
-}
-
-.ph-brackets-curly::before {
-  content: "\f2ee";
-}
-
-.ph-brackets-round::before {
-  content: "\f2ef";
-}
-
-.ph-brackets-square::before {
-  content: "\f2f0";
-}
-
-.ph-brain::before {
-  content: "\f2f1";
-}
-
-.ph-brandy::before {
-  content: "\f2f2";
-}
-
-.ph-briefcase::before {
-  content: "\f2f3";
-}
-
-.ph-briefcase-metal::before {
-  content: "\f2f4";
-}
-
-.ph-broadcast::before {
-  content: "\f2f5";
-}
-
-.ph-browser::before {
-  content: "\f2f6";
-}
-
-.ph-browsers::before {
-  content: "\f2f7";
-}
-
-.ph-bug::before {
-  content: "\f2f8";
-}
-
-.ph-bug-beetle::before {
-  content: "\f2f9";
-}
-
-.ph-bug-droid::before {
-  content: "\f2fa";
-}
-
-.ph-buildings::before {
-  content: "\f2fb";
-}
-
-.ph-bus::before {
-  content: "\f2fc";
-}
-
-.ph-butterfly::before {
-  content: "\f2fd";
-}
-
-.ph-cactus::before {
-  content: "\f2fe";
-}
-
-.ph-cake::before {
-  content: "\f2ff";
-}
-
-.ph-calculator::before {
-  content: "\f300";
-}
-
-.ph-calendar::before {
-  content: "\f301";
-}
-
-.ph-calendar-blank::before {
-  content: "\f302";
-}
-
-.ph-calendar-check::before {
-  content: "\f303";
-}
-
-.ph-calendar-plus::before {
-  content: "\f304";
-}
-
-.ph-calendar-x::before {
-  content: "\f305";
-}
-
-.ph-camera::before {
-  content: "\f306";
-}
-
-.ph-camera-rotate::before {
-  content: "\f307";
-}
-
-.ph-camera-slash::before {
-  content: "\f308";
-}
-
-.ph-campfire::before {
-  content: "\f309";
-}
-
-.ph-car::before {
-  content: "\f30a";
-}
-
-.ph-car-simple::before {
-  content: "\f30b";
-}
-
-.ph-cardholder::before {
-  content: "\f30c";
-}
-
-.ph-cards::before {
-  content: "\f30d";
-}
-
-.ph-caret-circle-double-down::before {
-  content: "\f30e";
-}
-
-.ph-caret-circle-double-left::before {
-  content: "\f30f";
-}
-
-.ph-caret-circle-double-right::before {
-  content: "\f310";
-}
-
-.ph-caret-circle-double-up::before {
-  content: "\f311";
-}
-
-.ph-caret-circle-down::before {
-  content: "\f312";
-}
-
-.ph-caret-circle-left::before {
-  content: "\f313";
-}
-
-.ph-caret-circle-right::before {
-  content: "\f314";
-}
-
-.ph-caret-circle-up::before {
-  content: "\f315";
-}
-
-.ph-caret-double-down::before {
-  content: "\f316";
-}
-
-.ph-caret-double-left::before {
-  content: "\f317";
-}
-
-.ph-caret-double-right::before {
-  content: "\f318";
-}
-
-.ph-caret-double-up::before {
-  content: "\f319";
-}
-
-.ph-caret-down::before {
-  content: "\f31a";
-}
-
-.ph-caret-left::before {
-  content: "\f31b";
-}
-
-.ph-caret-right::before {
-  content: "\f31c";
-}
-
-.ph-caret-up::before {
-  content: "\f31d";
-}
-
-.ph-cat::before {
-  content: "\f31e";
-}
-
-.ph-cell-signal-full::before {
-  content: "\f31f";
-}
-
-.ph-cell-signal-high::before {
-  content: "\f320";
-}
-
-.ph-cell-signal-low::before {
-  content: "\f321";
-}
-
-.ph-cell-signal-medium::before {
-  content: "\f322";
-}
-
-.ph-cell-signal-none::before {
-  content: "\f323";
-}
-
-.ph-cell-signal-slash::before {
-  content: "\f324";
-}
-
-.ph-cell-signal-x::before {
-  content: "\f325";
-}
-
-.ph-chalkboard::before {
-  content: "\f326";
-}
-
-.ph-chalkboard-simple::before {
-  content: "\f327";
-}
-
-.ph-chalkboard-teacher::before {
-  content: "\f328";
-}
-
-.ph-chart-bar::before {
-  content: "\f329";
-}
-
-.ph-chart-bar-horizontal::before {
-  content: "\f32a";
-}
-
-.ph-chart-line::before {
-  content: "\f32b";
-}
-
-.ph-chart-line-up::before {
-  content: "\f32c";
-}
-
-.ph-chart-pie::before {
-  content: "\f32d";
-}
-
-.ph-chart-pie-slice::before {
-  content: "\f32e";
-}
-
-.ph-chat::before {
-  content: "\f32f";
-}
-
-.ph-chat-centered::before {
-  content: "\f330";
-}
-
-.ph-chat-centered-dots::before {
-  content: "\f331";
-}
-
-.ph-chat-centered-text::before {
-  content: "\f332";
-}
-
-.ph-chat-circle::before {
-  content: "\f333";
-}
-
-.ph-chat-circle-dots::before {
-  content: "\f334";
-}
-
-.ph-chat-circle-text::before {
-  content: "\f335";
-}
-
-.ph-chat-dots::before {
-  content: "\f336";
-}
-
-.ph-chat-teardrop::before {
-  content: "\f337";
-}
-
-.ph-chat-teardrop-dots::before {
-  content: "\f338";
-}
-
-.ph-chat-teardrop-text::before {
-  content: "\f339";
-}
-
-.ph-chat-text::before {
-  content: "\f33a";
-}
-
-.ph-chats::before {
-  content: "\f33b";
-}
-
-.ph-chats-circle::before {
-  content: "\f33c";
-}
-
-.ph-chats-teardrop::before {
-  content: "\f33d";
-}
-
-.ph-check::before {
-  content: "\f33e";
-}
-
-.ph-check-circle::before {
-  content: "\f33f";
-}
-
-.ph-check-square::before {
-  content: "\f340";
-}
-
-.ph-check-square-offset::before {
-  content: "\f341";
-}
-
-.ph-checks::before {
-  content: "\f342";
-}
-
-.ph-circle::before {
-  content: "\f343";
-}
-
-.ph-circle-dashed::before {
-  content: "\f344";
-}
-
-.ph-circle-half::before {
-  content: "\f345";
-}
-
-.ph-circle-half-tilt::before {
-  content: "\f346";
-}
-
-.ph-circle-notch::before {
-  content: "\f347";
-}
-
-.ph-circle-wavy::before {
-  content: "\f348";
-}
-
-.ph-circle-wavy-check::before {
-  content: "\f349";
-}
-
-.ph-circle-wavy-question::before {
-  content: "\f34a";
-}
-
-.ph-circle-wavy-warning::before {
-  content: "\f34b";
-}
-
-.ph-circles-four::before {
-  content: "\f34c";
-}
-
-.ph-circles-three::before {
-  content: "\f34d";
-}
-
-.ph-circles-three-plus::before {
-  content: "\f34e";
-}
-
-.ph-clipboard::before {
-  content: "\f34f";
-}
-
-.ph-clipboard-text::before {
-  content: "\f350";
-}
-
-.ph-clock::before {
-  content: "\f351";
-}
-
-.ph-clock-afternoon::before {
-  content: "\f352";
-}
-
-.ph-clock-clockwise::before {
-  content: "\f353";
-}
-
-.ph-clock-counter-clockwise::before {
-  content: "\f354";
-}
-
-.ph-closed-captioning::before {
-  content: "\f355";
-}
-
-.ph-cloud::before {
-  content: "\f356";
-}
-
-.ph-cloud-arrow-down::before {
-  content: "\f357";
-}
-
-.ph-cloud-arrow-up::before {
-  content: "\f358";
-}
-
-.ph-cloud-check::before {
-  content: "\f359";
-}
-
-.ph-cloud-fog::before {
-  content: "\f35a";
-}
-
-.ph-cloud-lightning::before {
-  content: "\f35b";
-}
-
-.ph-cloud-moon::before {
-  content: "\f35c";
-}
-
-.ph-cloud-rain::before {
-  content: "\f35d";
-}
-
-.ph-cloud-slash::before {
-  content: "\f35e";
-}
-
-.ph-cloud-snow::before {
-  content: "\f35f";
-}
-
-.ph-cloud-sun::before {
-  content: "\f360";
-}
-
-.ph-club::before {
-  content: "\f361";
-}
-
-.ph-coat-hanger::before {
-  content: "\f362";
-}
-
-.ph-code::before {
-  content: "\f363";
-}
-
-.ph-code-simple::before {
-  content: "\f364";
-}
-
-.ph-codepen-logo::before {
-  content: "\f365";
-}
-
-.ph-codesandbox-logo::before {
-  content: "\f366";
-}
-
-.ph-coffee::before {
-  content: "\f367";
-}
-
-.ph-coin::before {
-  content: "\f368";
-}
-
-.ph-coin-vertical::before {
-  content: "\f369";
-}
-
-.ph-coins::before {
-  content: "\f36a";
-}
-
-.ph-columns::before {
-  content: "\f36b";
-}
-
-.ph-command::before {
-  content: "\f36c";
-}
-
-.ph-compass::before {
-  content: "\f36d";
-}
-
-.ph-computer-tower::before {
-  content: "\f36e";
-}
-
-.ph-confetti::before {
-  content: "\f36f";
-}
-
-.ph-cookie::before {
-  content: "\f370";
-}
-
-.ph-cooking-pot::before {
-  content: "\f371";
-}
-
-.ph-copy::before {
-  content: "\f372";
-}
-
-.ph-copy-simple::before {
-  content: "\f373";
-}
-
-.ph-copyleft::before {
-  content: "\f374";
-}
-
-.ph-copyright::before {
-  content: "\f375";
-}
-
-.ph-corners-in::before {
-  content: "\f376";
-}
-
-.ph-corners-out::before {
-  content: "\f377";
-}
-
-.ph-cpu::before {
-  content: "\f378";
-}
-
-.ph-credit-card::before {
-  content: "\f379";
-}
-
-.ph-crop::before {
-  content: "\f37a";
-}
-
-.ph-crosshair::before {
-  content: "\f37b";
-}
-
-.ph-crosshair-simple::before {
-  content: "\f37c";
-}
-
-.ph-crown::before {
-  content: "\f37d";
-}
-
-.ph-crown-simple::before {
-  content: "\f37e";
-}
-
-.ph-cube::before {
-  content: "\f37f";
-}
-
-.ph-currency-btc::before {
-  content: "\f380";
-}
-
-.ph-currency-circle-dollar::before {
-  content: "\f381";
-}
-
-.ph-currency-cny::before {
-  content: "\f382";
-}
-
-.ph-currency-dollar::before {
-  content: "\f383";
-}
-
-.ph-currency-dollar-simple::before {
-  content: "\f384";
-}
-
-.ph-currency-eth::before {
-  content: "\f385";
-}
-
-.ph-currency-eur::before {
-  content: "\f386";
-}
-
-.ph-currency-gbp::before {
-  content: "\f387";
-}
-
-.ph-currency-inr::before {
-  content: "\f388";
-}
-
-.ph-currency-jpy::before {
-  content: "\f389";
-}
-
-.ph-currency-krw::before {
-  content: "\f38a";
-}
-
-.ph-currency-kzt::before {
-  content: "\f38b";
-}
-
-.ph-currency-ngn::before {
-  content: "\f38c";
-}
-
-.ph-currency-rub::before {
-  content: "\f38d";
-}
-
-.ph-cursor::before {
-  content: "\f38e";
-}
-
-.ph-cursor-text::before {
-  content: "\f38f";
-}
-
-.ph-cylinder::before {
-  content: "\f390";
-}
-
-.ph-database::before {
-  content: "\f391";
-}
-
-.ph-desktop::before {
-  content: "\f392";
-}
-
-.ph-desktop-tower::before {
-  content: "\f393";
-}
-
-.ph-detective::before {
-  content: "\f394";
-}
-
-.ph-device-mobile::before {
-  content: "\f395";
-}
-
-.ph-device-mobile-camera::before {
-  content: "\f396";
-}
-
-.ph-device-mobile-speaker::before {
-  content: "\f397";
-}
-
-.ph-device-tablet::before {
-  content: "\f398";
-}
-
-.ph-device-tablet-camera::before {
-  content: "\f399";
-}
-
-.ph-device-tablet-speaker::before {
-  content: "\f39a";
-}
-
-.ph-diamond::before {
-  content: "\f39b";
-}
-
-.ph-diamonds-four::before {
-  content: "\f39c";
-}
-
-.ph-dice-five::before {
-  content: "\f39d";
-}
-
-.ph-dice-four::before {
-  content: "\f39e";
-}
-
-.ph-dice-one::before {
-  content: "\f39f";
-}
-
-.ph-dice-six::before {
-  content: "\f3a0";
-}
-
-.ph-dice-three::before {
-  content: "\f3a1";
-}
-
-.ph-dice-two::before {
-  content: "\f3a2";
-}
-
-.ph-disc::before {
-  content: "\f3a3";
-}
-
-.ph-discord-logo::before {
-  content: "\f3a4";
-}
-
-.ph-divide::before {
-  content: "\f3a5";
-}
-
-.ph-dog::before {
-  content: "\f3a6";
-}
-
-.ph-door::before {
-  content: "\f3a7";
-}
-
-.ph-dots-nine::before {
-  content: "\f3a8";
-}
-
-.ph-dots-six::before {
-  content: "\f3a9";
-}
-
-.ph-dots-six-vertical::before {
-  content: "\f3aa";
-}
-
-.ph-dots-three::before {
-  content: "\f3ab";
-}
-
-.ph-dots-three-circle::before {
-  content: "\f3ac";
-}
-
-.ph-dots-three-circle-vertical::before {
-  content: "\f3ad";
-}
-
-.ph-dots-three-outline::before {
-  content: "\f3ae";
-}
-
-.ph-dots-three-outline-vertical::before {
-  content: "\f3af";
-}
-
-.ph-dots-three-vertical::before {
-  content: "\f3b0";
-}
-
-.ph-download::before {
-  content: "\f3b1";
-}
-
-.ph-download-simple::before {
-  content: "\f3b2";
-}
-
-.ph-dribbble-logo::before {
-  content: "\f3b3";
-}
-
-.ph-drop::before {
-  content: "\f3b4";
-}
-
-.ph-drop-half::before {
-  content: "\f3b5";
-}
-
-.ph-drop-half-bottom::before {
-  content: "\f3b6";
-}
-
-.ph-ear::before {
-  content: "\f3b7";
-}
-
-.ph-ear-slash::before {
-  content: "\f3b8";
-}
-
-.ph-egg::before {
-  content: "\f3b9";
-}
-
-.ph-egg-crack::before {
-  content: "\f3ba";
-}
-
-.ph-eject::before {
-  content: "\f3bb";
-}
-
-.ph-eject-simple::before {
-  content: "\f3bc";
-}
-
-.ph-envelope::before {
-  content: "\f3bd";
-}
-
-.ph-envelope-open::before {
-  content: "\f3be";
-}
-
-.ph-envelope-simple::before {
-  content: "\f3bf";
-}
-
-.ph-envelope-simple-open::before {
-  content: "\f3c0";
-}
-
-.ph-equalizer::before {
-  content: "\f3c1";
-}
-
-.ph-equals::before {
-  content: "\f3c2";
-}
-
-.ph-eraser::before {
-  content: "\f3c3";
-}
-
-.ph-exam::before {
-  content: "\f3c4";
-}
-
-.ph-export::before {
-  content: "\f3c5";
-}
-
-.ph-eye::before {
-  content: "\f3c6";
-}
-
-.ph-eye-closed::before {
-  content: "\f3c7";
-}
-
-.ph-eye-slash::before {
-  content: "\f3c8";
-}
-
-.ph-eyedropper::before {
-  content: "\f3c9";
-}
-
-.ph-eyedropper-sample::before {
-  content: "\f3ca";
-}
-
-.ph-eyeglasses::before {
-  content: "\f3cb";
-}
-
-.ph-face-mask::before {
-  content: "\f3cc";
-}
-
-.ph-facebook-logo::before {
-  content: "\f3cd";
-}
-
-.ph-factory::before {
-  content: "\f3ce";
-}
-
-.ph-faders::before {
-  content: "\f3cf";
-}
-
-.ph-faders-horizontal::before {
-  content: "\f3d0";
-}
-
-.ph-fast-forward::before {
-  content: "\f3d1";
-}
-
-.ph-fast-forward-circle::before {
-  content: "\f3d2";
-}
-
-.ph-figma-logo::before {
-  content: "\f3d3";
-}
-
-.ph-file::before {
-  content: "\f3d4";
-}
-
-.ph-file-arrow-down::before {
-  content: "\f3d5";
-}
-
-.ph-file-arrow-up::before {
-  content: "\f3d6";
-}
-
-.ph-file-audio::before {
-  content: "\f3d7";
-}
-
-.ph-file-cloud::before {
-  content: "\f3d8";
-}
-
-.ph-file-code::before {
-  content: "\f3d9";
-}
-
-.ph-file-css::before {
-  content: "\f3da";
-}
-
-.ph-file-csv::before {
-  content: "\f3db";
-}
-
-.ph-file-doc::before {
-  content: "\f3dc";
-}
-
-.ph-file-dotted::before {
-  content: "\f3dd";
-}
-
-.ph-file-html::before {
-  content: "\f3de";
-}
-
-.ph-file-image::before {
-  content: "\f3df";
-}
-
-.ph-file-jpg::before {
-  content: "\f3e0";
-}
-
-.ph-file-js::before {
-  content: "\f3e1";
-}
-
-.ph-file-jsx::before {
-  content: "\f3e2";
-}
-
-.ph-file-lock::before {
-  content: "\f3e3";
-}
-
-.ph-file-minus::before {
-  content: "\f3e4";
-}
-
-.ph-file-pdf::before {
-  content: "\f3e5";
-}
-
-.ph-file-plus::before {
-  content: "\f3e6";
-}
-
-.ph-file-png::before {
-  content: "\f3e7";
-}
-
-.ph-file-ppt::before {
-  content: "\f3e8";
-}
-
-.ph-file-rs::before {
-  content: "\f3e9";
-}
-
-.ph-file-search::before {
-  content: "\f3ea";
-}
-
-.ph-file-text::before {
-  content: "\f3eb";
-}
-
-.ph-file-ts::before {
-  content: "\f3ec";
-}
-
-.ph-file-tsx::before {
-  content: "\f3ed";
-}
-
-.ph-file-video::before {
-  content: "\f3ee";
-}
-
-.ph-file-vue::before {
-  content: "\f3ef";
-}
-
-.ph-file-x::before {
-  content: "\f3f0";
-}
-
-.ph-file-xls::before {
-  content: "\f3f1";
-}
-
-.ph-file-zip::before {
-  content: "\f3f2";
-}
-
-.ph-files::before {
-  content: "\f3f3";
-}
-
-.ph-film-script::before {
-  content: "\f3f4";
-}
-
-.ph-film-slate::before {
-  content: "\f3f5";
-}
-
-.ph-film-strip::before {
-  content: "\f3f6";
-}
-
-.ph-fingerprint::before {
-  content: "\f3f7";
-}
-
-.ph-fingerprint-simple::before {
-  content: "\f3f8";
-}
-
-.ph-finn-the-human::before {
-  content: "\f3f9";
-}
-
-.ph-fire::before {
-  content: "\f3fa";
-}
-
-.ph-fire-simple::before {
-  content: "\f3fb";
-}
-
-.ph-first-aid::before {
-  content: "\f3fc";
-}
-
-.ph-first-aid-kit::before {
-  content: "\f3fd";
-}
-
-.ph-fish::before {
-  content: "\f3fe";
-}
-
-.ph-fish-simple::before {
-  content: "\f3ff";
-}
-
-.ph-flag::before {
-  content: "\f400";
-}
-
-.ph-flag-banner::before {
-  content: "\f401";
-}
-
-.ph-flag-checkered::before {
-  content: "\f402";
-}
-
-.ph-flame::before {
-  content: "\f403";
-}
-
-.ph-flashlight::before {
-  content: "\f404";
-}
-
-.ph-flask::before {
-  content: "\f405";
-}
-
-.ph-floppy-disk::before {
-  content: "\f406";
-}
-
-.ph-floppy-disk-back::before {
-  content: "\f407";
-}
-
-.ph-flow-arrow::before {
-  content: "\f408";
-}
-
-.ph-flower::before {
-  content: "\f409";
-}
-
-.ph-flower-lotus::before {
-  content: "\f40a";
-}
-
-.ph-flying-saucer::before {
-  content: "\f40b";
-}
-
-.ph-folder::before {
-  content: "\f40c";
-}
-
-.ph-folder-dotted::before {
-  content: "\f40d";
-}
-
-.ph-folder-lock::before {
-  content: "\f40e";
-}
-
-.ph-folder-minus::before {
-  content: "\f40f";
-}
-
-.ph-folder-notch::before {
-  content: "\f410";
-}
-
-.ph-folder-notch-minus::before {
-  content: "\f411";
-}
-
-.ph-folder-notch-open::before {
-  content: "\f412";
-}
-
-.ph-folder-notch-plus::before {
-  content: "\f413";
-}
-
-.ph-folder-open::before {
-  content: "\f414";
-}
-
-.ph-folder-plus::before {
-  content: "\f415";
-}
-
-.ph-folder-simple::before {
-  content: "\f416";
-}
-
-.ph-folder-simple-dotted::before {
-  content: "\f417";
-}
-
-.ph-folder-simple-lock::before {
-  content: "\f418";
-}
-
-.ph-folder-simple-minus::before {
-  content: "\f419";
-}
-
-.ph-folder-simple-plus::before {
-  content: "\f41a";
-}
-
-.ph-folder-simple-star::before {
-  content: "\f41b";
-}
-
-.ph-folder-simple-user::before {
-  content: "\f41c";
-}
-
-.ph-folder-star::before {
-  content: "\f41d";
-}
-
-.ph-folder-user::before {
-  content: "\f41e";
-}
-
-.ph-folders::before {
-  content: "\f41f";
-}
-
-.ph-football::before {
-  content: "\f420";
-}
-
-.ph-fork-knife::before {
-  content: "\f421";
-}
-
-.ph-frame-corners::before {
-  content: "\f422";
-}
-
-.ph-framer-logo::before {
-  content: "\f423";
-}
-
-.ph-function::before {
-  content: "\f424";
-}
-
-.ph-funnel::before {
-  content: "\f425";
-}
-
-.ph-funnel-simple::before {
-  content: "\f426";
-}
-
-.ph-game-controller::before {
-  content: "\f427";
-}
-
-.ph-gas-pump::before {
-  content: "\f428";
-}
-
-.ph-gauge::before {
-  content: "\f429";
-}
-
-.ph-gear::before {
-  content: "\f42a";
-}
-
-.ph-gear-six::before {
-  content: "\f42b";
-}
-
-.ph-gender-female::before {
-  content: "\f42c";
-}
-
-.ph-gender-intersex::before {
-  content: "\f42d";
-}
-
-.ph-gender-male::before {
-  content: "\f42e";
-}
-
-.ph-gender-neuter::before {
-  content: "\f42f";
-}
-
-.ph-gender-nonbinary::before {
-  content: "\f430";
-}
-
-.ph-gender-transgender::before {
-  content: "\f431";
-}
-
-.ph-ghost::before {
-  content: "\f432";
-}
-
-.ph-gif::before {
-  content: "\f433";
-}
-
-.ph-gift::before {
-  content: "\f434";
-}
-
-.ph-git-branch::before {
-  content: "\f435";
-}
-
-.ph-git-commit::before {
-  content: "\f436";
-}
-
-.ph-git-diff::before {
-  content: "\f437";
-}
-
-.ph-git-fork::before {
-  content: "\f438";
-}
-
-.ph-git-merge::before {
-  content: "\f439";
-}
-
-.ph-git-pull-request::before {
-  content: "\f43a";
-}
-
-.ph-github-logo::before {
-  content: "\f43b";
-}
-
-.ph-gitlab-logo::before {
-  content: "\f43c";
-}
-
-.ph-gitlab-logo-simple::before {
-  content: "\f43d";
-}
-
-.ph-globe::before {
-  content: "\f43e";
-}
-
-.ph-globe-hemisphere-east::before {
-  content: "\f43f";
-}
-
-.ph-globe-hemisphere-west::before {
-  content: "\f440";
-}
-
-.ph-globe-simple::before {
-  content: "\f441";
-}
-
-.ph-globe-stand::before {
-  content: "\f442";
-}
-
-.ph-google-chrome-logo::before {
-  content: "\f443";
-}
-
-.ph-google-logo::before {
-  content: "\f444";
-}
-
-.ph-google-photos-logo::before {
-  content: "\f445";
-}
-
-.ph-google-play-logo::before {
-  content: "\f446";
-}
-
-.ph-google-podcasts-logo::before {
-  content: "\f447";
-}
-
-.ph-gradient::before {
-  content: "\f448";
-}
-
-.ph-graduation-cap::before {
-  content: "\f449";
-}
-
-.ph-graph::before {
-  content: "\f44a";
-}
-
-.ph-grid-four::before {
-  content: "\f44b";
-}
-
-.ph-hamburger::before {
-  content: "\f44c";
-}
-
-.ph-hand::before {
-  content: "\f44d";
-}
-
-.ph-hand-eye::before {
-  content: "\f44e";
-}
-
-.ph-hand-fist::before {
-  content: "\f44f";
-}
-
-.ph-hand-grabbing::before {
-  content: "\f450";
-}
-
-.ph-hand-palm::before {
-  content: "\f451";
-}
-
-.ph-hand-pointing::before {
-  content: "\f452";
-}
-
-.ph-hand-soap::before {
-  content: "\f453";
-}
-
-.ph-hand-waving::before {
-  content: "\f454";
-}
-
-.ph-handbag::before {
-  content: "\f455";
-}
-
-.ph-handbag-simple::before {
-  content: "\f456";
-}
-
-.ph-hands-clapping::before {
-  content: "\f457";
-}
-
-.ph-handshake::before {
-  content: "\f458";
-}
-
-.ph-hard-drive::before {
-  content: "\f459";
-}
-
-.ph-hard-drives::before {
-  content: "\f45a";
-}
-
-.ph-hash::before {
-  content: "\f45b";
-}
-
-.ph-hash-straight::before {
-  content: "\f45c";
-}
-
-.ph-headlights::before {
-  content: "\f45d";
-}
-
-.ph-headphones::before {
-  content: "\f45e";
-}
-
-.ph-headset::before {
-  content: "\f45f";
-}
-
-.ph-heart::before {
-  content: "\f460";
-}
-
-.ph-heart-break::before {
-  content: "\f461";
-}
-
-.ph-heart-straight::before {
-  content: "\f462";
-}
-
-.ph-heart-straight-break::before {
-  content: "\f463";
-}
-
-.ph-heartbeat::before {
-  content: "\f464";
-}
-
-.ph-hexagon::before {
-  content: "\f465";
-}
-
-.ph-highlighter-circle::before {
-  content: "\f466";
-}
-
-.ph-horse::before {
-  content: "\f467";
-}
-
-.ph-hourglass::before {
-  content: "\f468";
-}
-
-.ph-hourglass-high::before {
-  content: "\f469";
-}
-
-.ph-hourglass-low::before {
-  content: "\f46a";
-}
-
-.ph-hourglass-medium::before {
-  content: "\f46b";
-}
-
-.ph-hourglass-simple::before {
-  content: "\f46c";
-}
-
-.ph-hourglass-simple-high::before {
-  content: "\f46d";
-}
-
-.ph-hourglass-simple-low::before {
-  content: "\f46e";
-}
-
-.ph-hourglass-simple-medium::before {
-  content: "\f46f";
-}
-
-.ph-house::before {
-  content: "\f470";
-}
-
-.ph-house-line::before {
-  content: "\f471";
-}
-
-.ph-house-simple::before {
-  content: "\f472";
-}
-
-.ph-identification-badge::before {
-  content: "\f473";
-}
-
-.ph-identification-card::before {
-  content: "\f474";
-}
-
-.ph-image::before {
-  content: "\f475";
-}
-
-.ph-image-square::before {
-  content: "\f476";
-}
-
-.ph-infinity::before {
-  content: "\f477";
-}
-
-.ph-info::before {
-  content: "\f478";
-}
-
-.ph-instagram-logo::before {
-  content: "\f479";
-}
-
-.ph-intersect::before {
-  content: "\f47a";
-}
-
-.ph-jeep::before {
-  content: "\f47b";
-}
-
-.ph-kanban::before {
-  content: "\f47c";
-}
-
-.ph-key::before {
-  content: "\f47d";
-}
-
-.ph-key-return::before {
-  content: "\f47e";
-}
-
-.ph-keyboard::before {
-  content: "\f47f";
-}
-
-.ph-keyhole::before {
-  content: "\f480";
-}
-
-.ph-knife::before {
-  content: "\f481";
-}
-
-.ph-ladder::before {
-  content: "\f482";
-}
-
-.ph-ladder-simple::before {
-  content: "\f483";
-}
-
-.ph-lamp::before {
-  content: "\f484";
-}
-
-.ph-laptop::before {
-  content: "\f485";
-}
-
-.ph-layout::before {
-  content: "\f486";
-}
-
-.ph-leaf::before {
-  content: "\f487";
-}
-
-.ph-lifebuoy::before {
-  content: "\f488";
-}
-
-.ph-lightbulb::before {
-  content: "\f489";
-}
-
-.ph-lightbulb-filament::before {
-  content: "\f48a";
-}
-
-.ph-lightning::before {
-  content: "\f48b";
-}
-
-.ph-lightning-slash::before {
-  content: "\f48c";
-}
-
-.ph-line-segment::before {
-  content: "\f48d";
-}
-
-.ph-line-segments::before {
-  content: "\f48e";
-}
-
-.ph-link::before {
-  content: "\f48f";
-}
-
-.ph-link-break::before {
-  content: "\f490";
-}
-
-.ph-link-simple::before {
-  content: "\f491";
-}
-
-.ph-link-simple-break::before {
-  content: "\f492";
-}
-
-.ph-link-simple-horizontal::before {
-  content: "\f493";
-}
-
-.ph-link-simple-horizontal-break::before {
-  content: "\f494";
-}
-
-.ph-linkedin-logo::before {
-  content: "\f495";
-}
-
-.ph-linux-logo::before {
-  content: "\f496";
-}
-
-.ph-list::before {
-  content: "\f497";
-}
-
-.ph-list-bullets::before {
-  content: "\f498";
-}
-
-.ph-list-checks::before {
-  content: "\f499";
-}
-
-.ph-list-dashes::before {
-  content: "\f49a";
-}
-
-.ph-list-numbers::before {
-  content: "\f49b";
-}
-
-.ph-list-plus::before {
-  content: "\f49c";
-}
-
-.ph-lock::before {
-  content: "\f49d";
-}
-
-.ph-lock-key::before {
-  content: "\f49e";
-}
-
-.ph-lock-key-open::before {
-  content: "\f49f";
-}
-
-.ph-lock-laminated::before {
-  content: "\f4a0";
-}
-
-.ph-lock-laminated-open::before {
-  content: "\f4a1";
-}
-
-.ph-lock-open::before {
-  content: "\f4a2";
-}
-
-.ph-lock-simple::before {
-  content: "\f4a3";
-}
-
-.ph-lock-simple-open::before {
-  content: "\f4a4";
-}
-
-.ph-magic-wand::before {
-  content: "\f4a5";
-}
-
-.ph-magnet::before {
-  content: "\f4a6";
-}
-
-.ph-magnet-straight::before {
-  content: "\f4a7";
-}
-
-.ph-magnifying-glass::before {
-  content: "\f4a8";
-}
-
-.ph-magnifying-glass-minus::before {
-  content: "\f4a9";
-}
-
-.ph-magnifying-glass-plus::before {
-  content: "\f4aa";
-}
-
-.ph-map-pin::before {
-  content: "\f4ab";
-}
-
-.ph-map-pin-line::before {
-  content: "\f4ac";
-}
-
-.ph-map-trifold::before {
-  content: "\f4ad";
-}
-
-.ph-marker-circle::before {
-  content: "\f4ae";
-}
-
-.ph-martini::before {
-  content: "\f4af";
-}
-
-.ph-mask-happy::before {
-  content: "\f4b0";
-}
-
-.ph-mask-sad::before {
-  content: "\f4b1";
-}
-
-.ph-math-operations::before {
-  content: "\f4b2";
-}
-
-.ph-medal::before {
-  content: "\f4b3";
-}
-
-.ph-medium-logo::before {
-  content: "\f4b4";
-}
-
-.ph-megaphone::before {
-  content: "\f4b5";
-}
-
-.ph-megaphone-simple::before {
-  content: "\f4b6";
-}
-
-.ph-messenger-logo::before {
-  content: "\f4b7";
-}
-
-.ph-microphone::before {
-  content: "\f4b8";
-}
-
-.ph-microphone-slash::before {
-  content: "\f4b9";
-}
-
-.ph-microphone-stage::before {
-  content: "\f4ba";
-}
-
-.ph-microsoft-excel-logo::before {
-  content: "\f4bb";
-}
-
-.ph-microsoft-powerpoint-logo::before {
-  content: "\f4bc";
-}
-
-.ph-microsoft-teams-logo::before {
-  content: "\f4bd";
-}
-
-.ph-microsoft-word-logo::before {
-  content: "\f4be";
-}
-
-.ph-minus::before {
-  content: "\f4bf";
-}
-
-.ph-minus-circle::before {
-  content: "\f4c0";
-}
-
-.ph-money::before {
-  content: "\f4c1";
-}
-
-.ph-monitor::before {
-  content: "\f4c2";
-}
-
-.ph-monitor-play::before {
-  content: "\f4c3";
-}
-
-.ph-moon::before {
-  content: "\f4c4";
-}
-
-.ph-moon-stars::before {
-  content: "\f4c5";
-}
-
-.ph-mountains::before {
-  content: "\f4c6";
-}
-
-.ph-mouse::before {
-  content: "\f4c7";
-}
-
-.ph-mouse-simple::before {
-  content: "\f4c8";
-}
-
-.ph-music-note::before {
-  content: "\f4c9";
-}
-
-.ph-music-note-simple::before {
-  content: "\f4ca";
-}
-
-.ph-music-notes::before {
-  content: "\f4cb";
-}
-
-.ph-music-notes-plus::before {
-  content: "\f4cc";
-}
-
-.ph-music-notes-simple::before {
-  content: "\f4cd";
-}
-
-.ph-navigation-arrow::before {
-  content: "\f4ce";
-}
-
-.ph-needle::before {
-  content: "\f4cf";
-}
-
-.ph-newspaper::before {
-  content: "\f4d0";
-}
-
-.ph-newspaper-clipping::before {
-  content: "\f4d1";
-}
-
-.ph-note::before {
-  content: "\f4d2";
-}
-
-.ph-note-blank::before {
-  content: "\f4d3";
-}
-
-.ph-note-pencil::before {
-  content: "\f4d4";
-}
-
-.ph-notebook::before {
-  content: "\f4d5";
-}
-
-.ph-notepad::before {
-  content: "\f4d6";
-}
-
-.ph-notification::before {
-  content: "\f4d7";
-}
-
-.ph-number-circle-eight::before {
-  content: "\f4d8";
-}
-
-.ph-number-circle-five::before {
-  content: "\f4d9";
-}
-
-.ph-number-circle-four::before {
-  content: "\f4da";
-}
-
-.ph-number-circle-nine::before {
-  content: "\f4db";
-}
-
-.ph-number-circle-one::before {
-  content: "\f4dc";
-}
-
-.ph-number-circle-seven::before {
-  content: "\f4dd";
-}
-
-.ph-number-circle-six::before {
-  content: "\f4de";
-}
-
-.ph-number-circle-three::before {
-  content: "\f4df";
-}
-
-.ph-number-circle-two::before {
-  content: "\f4e0";
-}
-
-.ph-number-circle-zero::before {
-  content: "\f4e1";
-}
-
-.ph-number-eight::before {
-  content: "\f4e2";
-}
-
-.ph-number-five::before {
-  content: "\f4e3";
-}
-
-.ph-number-four::before {
-  content: "\f4e4";
-}
-
-.ph-number-nine::before {
-  content: "\f4e5";
-}
-
-.ph-number-one::before {
-  content: "\f4e6";
-}
-
-.ph-number-seven::before {
-  content: "\f4e7";
-}
-
-.ph-number-six::before {
-  content: "\f4e8";
-}
-
-.ph-number-square-eight::before {
-  content: "\f4e9";
-}
-
-.ph-number-square-five::before {
-  content: "\f4ea";
-}
-
-.ph-number-square-four::before {
-  content: "\f4eb";
-}
-
-.ph-number-square-nine::before {
-  content: "\f4ec";
-}
-
-.ph-number-square-one::before {
-  content: "\f4ed";
-}
-
-.ph-number-square-seven::before {
-  content: "\f4ee";
-}
-
-.ph-number-square-six::before {
-  content: "\f4ef";
-}
-
-.ph-number-square-three::before {
-  content: "\f4f0";
-}
-
-.ph-number-square-two::before {
-  content: "\f4f1";
-}
-
-.ph-number-square-zero::before {
-  content: "\f4f2";
-}
-
-.ph-number-three::before {
-  content: "\f4f3";
-}
-
-.ph-number-two::before {
-  content: "\f4f4";
-}
-
-.ph-number-zero::before {
-  content: "\f4f5";
-}
-
-.ph-nut::before {
-  content: "\f4f6";
-}
-
-.ph-ny-times-logo::before {
-  content: "\f4f7";
-}
-
-.ph-octagon::before {
-  content: "\f4f8";
-}
-
-.ph-option::before {
-  content: "\f4f9";
-}
-
-.ph-package::before {
-  content: "\f4fa";
-}
-
-.ph-paint-brush::before {
-  content: "\f4fb";
-}
-
-.ph-paint-brush-broad::before {
-  content: "\f4fc";
-}
-
-.ph-paint-brush-household::before {
-  content: "\f4fd";
-}
-
-.ph-paint-bucket::before {
-  content: "\f4fe";
-}
-
-.ph-paint-roller::before {
-  content: "\f4ff";
-}
-
-.ph-palette::before {
-  content: "\f500";
-}
-
-.ph-paper-plane::before {
-  content: "\f501";
-}
-
-.ph-paper-plane-right::before {
-  content: "\f502";
-}
-
-.ph-paper-plane-tilt::before {
-  content: "\f503";
-}
-
-.ph-paperclip::before {
-  content: "\f504";
-}
-
-.ph-paperclip-horizontal::before {
-  content: "\f505";
-}
-
-.ph-parachute::before {
-  content: "\f506";
-}
-
-.ph-password::before {
-  content: "\f507";
-}
-
-.ph-path::before {
-  content: "\f508";
-}
-
-.ph-pause::before {
-  content: "\f509";
-}
-
-.ph-pause-circle::before {
-  content: "\f50a";
-}
-
-.ph-paw-print::before {
-  content: "\f50b";
-}
-
-.ph-peace::before {
-  content: "\f50c";
-}
-
-.ph-pen::before {
-  content: "\f50d";
-}
-
-.ph-pen-nib::before {
-  content: "\f50e";
-}
-
-.ph-pen-nib-straight::before {
-  content: "\f50f";
-}
-
-.ph-pencil::before {
-  content: "\f510";
-}
-
-.ph-pencil-circle::before {
-  content: "\f511";
-}
-
-.ph-pencil-line::before {
-  content: "\f512";
-}
-
-.ph-pencil-simple::before {
-  content: "\f513";
-}
-
-.ph-pencil-simple-line::before {
-  content: "\f514";
-}
-
-.ph-percent::before {
-  content: "\f515";
-}
-
-.ph-person::before {
-  content: "\f516";
-}
-
-.ph-person-simple::before {
-  content: "\f517";
-}
-
-.ph-person-simple-run::before {
-  content: "\f518";
-}
-
-.ph-person-simple-walk::before {
-  content: "\f519";
-}
-
-.ph-perspective::before {
-  content: "\f51a";
-}
-
-.ph-phone::before {
-  content: "\f51b";
-}
-
-.ph-phone-call::before {
-  content: "\f51c";
-}
-
-.ph-phone-disconnect::before {
-  content: "\f51d";
-}
-
-.ph-phone-incoming::before {
-  content: "\f51e";
-}
-
-.ph-phone-outgoing::before {
-  content: "\f51f";
-}
-
-.ph-phone-slash::before {
-  content: "\f520";
-}
-
-.ph-phone-x::before {
-  content: "\f521";
-}
-
-.ph-phosphor-logo::before {
-  content: "\f522";
-}
-
-.ph-piano-keys::before {
-  content: "\f523";
-}
-
-.ph-picture-in-picture::before {
-  content: "\f524";
-}
-
-.ph-pill::before {
-  content: "\f525";
-}
-
-.ph-pinterest-logo::before {
-  content: "\f526";
-}
-
-.ph-pinwheel::before {
-  content: "\f527";
-}
-
-.ph-pizza::before {
-  content: "\f528";
-}
-
-.ph-placeholder::before {
-  content: "\f529";
-}
-
-.ph-planet::before {
-  content: "\f52a";
-}
-
-.ph-play::before {
-  content: "\f52b";
-}
-
-.ph-play-circle::before {
-  content: "\f52c";
-}
-
-.ph-playlist::before {
-  content: "\f52d";
-}
-
-.ph-plug::before {
-  content: "\f52e";
-}
-
-.ph-plugs::before {
-  content: "\f52f";
-}
-
-.ph-plugs-connected::before {
-  content: "\f530";
-}
-
-.ph-plus::before {
-  content: "\f531";
-}
-
-.ph-plus-circle::before {
-  content: "\f532";
-}
-
-.ph-plus-minus::before {
-  content: "\f533";
-}
-
-.ph-poker-chip::before {
-  content: "\f534";
-}
-
-.ph-police-car::before {
-  content: "\f535";
-}
-
-.ph-polygon::before {
-  content: "\f536";
-}
-
-.ph-popcorn::before {
-  content: "\f537";
-}
-
-.ph-power::before {
-  content: "\f538";
-}
-
-.ph-prescription::before {
-  content: "\f539";
-}
-
-.ph-presentation::before {
-  content: "\f53a";
-}
-
-.ph-presentation-chart::before {
-  content: "\f53b";
-}
-
-.ph-printer::before {
-  content: "\f53c";
-}
-
-.ph-prohibit::before {
-  content: "\f53d";
-}
-
-.ph-prohibit-inset::before {
-  content: "\f53e";
-}
-
-.ph-projector-screen::before {
-  content: "\f53f";
-}
-
-.ph-projector-screen-chart::before {
-  content: "\f540";
-}
-
-.ph-push-pin::before {
-  content: "\f541";
-}
-
-.ph-push-pin-simple::before {
-  content: "\f542";
-}
-
-.ph-push-pin-simple-slash::before {
-  content: "\f543";
-}
-
-.ph-push-pin-slash::before {
-  content: "\f544";
-}
-
-.ph-puzzle-piece::before {
-  content: "\f545";
-}
-
-.ph-qr-code::before {
-  content: "\f546";
-}
-
-.ph-question::before {
-  content: "\f547";
-}
-
-.ph-queue::before {
-  content: "\f548";
-}
-
-.ph-quotes::before {
-  content: "\f549";
-}
-
-.ph-radical::before {
-  content: "\f54a";
-}
-
-.ph-radio::before {
-  content: "\f54b";
-}
-
-.ph-radio-button::before {
-  content: "\f54c";
-}
-
-.ph-rainbow::before {
-  content: "\f54d";
-}
-
-.ph-rainbow-cloud::before {
-  content: "\f54e";
-}
-
-.ph-receipt::before {
-  content: "\f54f";
-}
-
-.ph-record::before {
-  content: "\f550";
-}
-
-.ph-rectangle::before {
-  content: "\f551";
-}
-
-.ph-recycle::before {
-  content: "\f552";
-}
-
-.ph-reddit-logo::before {
-  content: "\f553";
-}
-
-.ph-repeat::before {
-  content: "\f554";
-}
-
-.ph-repeat-once::before {
-  content: "\f555";
-}
-
-.ph-rewind::before {
-  content: "\f556";
-}
-
-.ph-rewind-circle::before {
-  content: "\f557";
-}
-
-.ph-robot::before {
-  content: "\f558";
-}
-
-.ph-rocket::before {
-  content: "\f559";
-}
-
-.ph-rocket-launch::before {
-  content: "\f55a";
-}
-
-.ph-rows::before {
-  content: "\f55b";
-}
-
-.ph-rss::before {
-  content: "\f55c";
-}
-
-.ph-rss-simple::before {
-  content: "\f55d";
-}
-
-.ph-rug::before {
-  content: "\f55e";
-}
-
-.ph-ruler::before {
-  content: "\f55f";
-}
-
-.ph-scales::before {
-  content: "\f560";
-}
-
-.ph-scan::before {
-  content: "\f561";
-}
-
-.ph-scissors::before {
-  content: "\f562";
-}
-
-.ph-screencast::before {
-  content: "\f563";
-}
-
-.ph-scribble-loop::before {
-  content: "\f564";
-}
-
-.ph-scroll::before {
-  content: "\f565";
-}
-
-.ph-selection::before {
-  content: "\f566";
-}
-
-.ph-selection-all::before {
-  content: "\f567";
-}
-
-.ph-selection-background::before {
-  content: "\f568";
-}
-
-.ph-selection-foreground::before {
-  content: "\f569";
-}
-
-.ph-selection-inverse::before {
-  content: "\f56a";
-}
-
-.ph-selection-plus::before {
-  content: "\f56b";
-}
-
-.ph-selection-slash::before {
-  content: "\f56c";
-}
-
-.ph-share::before {
-  content: "\f56d";
-}
-
-.ph-share-network::before {
-  content: "\f56e";
-}
-
-.ph-shield::before {
-  content: "\f56f";
-}
-
-.ph-shield-check::before {
-  content: "\f570";
-}
-
-.ph-shield-checkered::before {
-  content: "\f571";
-}
-
-.ph-shield-chevron::before {
-  content: "\f572";
-}
-
-.ph-shield-plus::before {
-  content: "\f573";
-}
-
-.ph-shield-slash::before {
-  content: "\f574";
-}
-
-.ph-shield-star::before {
-  content: "\f575";
-}
-
-.ph-shield-warning::before {
-  content: "\f576";
-}
-
-.ph-shopping-bag::before {
-  content: "\f577";
-}
-
-.ph-shopping-bag-open::before {
-  content: "\f578";
-}
-
-.ph-shopping-cart::before {
-  content: "\f579";
-}
-
-.ph-shopping-cart-simple::before {
-  content: "\f57a";
-}
-
-.ph-shower::before {
-  content: "\f57b";
-}
-
-.ph-shuffle::before {
-  content: "\f57c";
-}
-
-.ph-shuffle-angular::before {
-  content: "\f57d";
-}
-
-.ph-shuffle-simple::before {
-  content: "\f57e";
-}
-
-.ph-sidebar::before {
-  content: "\f57f";
-}
-
-.ph-sidebar-simple::before {
-  content: "\f580";
-}
-
-.ph-sign-in::before {
-  content: "\f581";
-}
-
-.ph-sign-out::before {
-  content: "\f582";
-}
-
-.ph-signpost::before {
-  content: "\f583";
-}
-
-.ph-sim-card::before {
-  content: "\f584";
-}
-
-.ph-sketch-logo::before {
-  content: "\f585";
-}
-
-.ph-skip-back::before {
-  content: "\f586";
-}
-
-.ph-skip-back-circle::before {
-  content: "\f587";
-}
-
-.ph-skip-forward::before {
-  content: "\f588";
-}
-
-.ph-skip-forward-circle::before {
-  content: "\f589";
-}
-
-.ph-skull::before {
-  content: "\f58a";
-}
-
-.ph-slack-logo::before {
-  content: "\f58b";
-}
-
-.ph-sliders::before {
-  content: "\f58c";
-}
-
-.ph-sliders-horizontal::before {
-  content: "\f58d";
-}
-
-.ph-smiley::before {
-  content: "\f58e";
-}
-
-.ph-smiley-blank::before {
-  content: "\f58f";
-}
-
-.ph-smiley-meh::before {
-  content: "\f590";
-}
-
-.ph-smiley-nervous::before {
-  content: "\f591";
-}
-
-.ph-smiley-sad::before {
-  content: "\f592";
-}
-
-.ph-smiley-sticker::before {
-  content: "\f593";
-}
-
-.ph-smiley-wink::before {
-  content: "\f594";
-}
-
-.ph-smiley-x-eyes::before {
-  content: "\f595";
-}
-
-.ph-snapchat-logo::before {
-  content: "\f596";
-}
-
-.ph-snowflake::before {
-  content: "\f597";
-}
-
-.ph-soccer-ball::before {
-  content: "\f598";
-}
-
-.ph-sort-ascending::before {
-  content: "\f599";
-}
-
-.ph-sort-descending::before {
-  content: "\f59a";
-}
-
-.ph-spade::before {
-  content: "\f59b";
-}
-
-.ph-sparkle::before {
-  content: "\f59c";
-}
-
-.ph-speaker-high::before {
-  content: "\f59d";
-}
-
-.ph-speaker-low::before {
-  content: "\f59e";
-}
-
-.ph-speaker-none::before {
-  content: "\f59f";
-}
-
-.ph-speaker-simple-high::before {
-  content: "\f5a0";
-}
-
-.ph-speaker-simple-low::before {
-  content: "\f5a1";
-}
-
-.ph-speaker-simple-none::before {
-  content: "\f5a2";
-}
-
-.ph-speaker-simple-slash::before {
-  content: "\f5a3";
-}
-
-.ph-speaker-simple-x::before {
-  content: "\f5a4";
-}
-
-.ph-speaker-slash::before {
-  content: "\f5a5";
-}
-
-.ph-speaker-x::before {
-  content: "\f5a6";
-}
-
-.ph-spinner::before {
-  content: "\f5a7";
-}
-
-.ph-spinner-gap::before {
-  content: "\f5a8";
-}
-
-.ph-spiral::before {
-  content: "\f5a9";
-}
-
-.ph-spotify-logo::before {
-  content: "\f5aa";
-}
-
-.ph-square::before {
-  content: "\f5ab";
-}
-
-.ph-square-half::before {
-  content: "\f5ac";
-}
-
-.ph-square-half-bottom::before {
-  content: "\f5ad";
-}
-
-.ph-square-logo::before {
-  content: "\f5ae";
-}
-
-.ph-squares-four::before {
-  content: "\f5af";
-}
-
-.ph-stack::before {
-  content: "\f5b0";
-}
-
-.ph-stack-overflow-logo::before {
-  content: "\f5b1";
-}
-
-.ph-stack-simple::before {
-  content: "\f5b2";
-}
-
-.ph-stamp::before {
-  content: "\f5b3";
-}
-
-.ph-star::before {
-  content: "\f5b4";
-}
-
-.ph-star-four::before {
-  content: "\f5b5";
-}
-
-.ph-star-half::before {
-  content: "\f5b6";
-}
-
-.ph-sticker::before {
-  content: "\f5b7";
-}
-
-.ph-stop::before {
-  content: "\f5b8";
-}
-
-.ph-stop-circle::before {
-  content: "\f5b9";
-}
-
-.ph-storefront::before {
-  content: "\f5ba";
-}
-
-.ph-strategy::before {
-  content: "\f5bb";
-}
-
-.ph-stripe-logo::before {
-  content: "\f5bc";
-}
-
-.ph-student::before {
-  content: "\f5bd";
-}
-
-.ph-suitcase::before {
-  content: "\f5be";
-}
-
-.ph-suitcase-simple::before {
-  content: "\f5bf";
-}
-
-.ph-sun::before {
-  content: "\f5c0";
-}
-
-.ph-sun-dim::before {
-  content: "\f5c1";
-}
-
-.ph-sun-horizon::before {
-  content: "\f5c2";
-}
-
-.ph-sunglasses::before {
-  content: "\f5c3";
-}
-
-.ph-swap::before {
-  content: "\f5c4";
-}
-
-.ph-swatches::before {
-  content: "\f5c5";
-}
-
-.ph-sword::before {
-  content: "\f5c6";
-}
-
-.ph-syringe::before {
-  content: "\f5c7";
-}
-
-.ph-t-shirt::before {
-  content: "\f5c8";
-}
-
-.ph-table::before {
-  content: "\f5c9";
-}
-
-.ph-tabs::before {
-  content: "\f5ca";
-}
-
-.ph-tag::before {
-  content: "\f5cb";
-}
-
-.ph-tag-chevron::before {
-  content: "\f5cc";
-}
-
-.ph-tag-simple::before {
-  content: "\f5cd";
-}
-
-.ph-target::before {
-  content: "\f5ce";
-}
-
-.ph-taxi::before {
-  content: "\f5cf";
-}
-
-.ph-telegram-logo::before {
-  content: "\f5d0";
-}
-
-.ph-television::before {
-  content: "\f5d1";
-}
-
-.ph-television-simple::before {
-  content: "\f5d2";
-}
-
-.ph-tennis-ball::before {
-  content: "\f5d3";
-}
-
-.ph-terminal::before {
-  content: "\f5d4";
-}
-
-.ph-terminal-window::before {
-  content: "\f5d5";
-}
-
-.ph-test-tube::before {
-  content: "\f5d6";
-}
-
-.ph-text-aa::before {
-  content: "\f5d7";
-}
-
-.ph-text-align-center::before {
-  content: "\f5d8";
-}
-
-.ph-text-align-justify::before {
-  content: "\f5d9";
-}
-
-.ph-text-align-left::before {
-  content: "\f5da";
-}
-
-.ph-text-align-right::before {
-  content: "\f5db";
-}
-
-.ph-text-bolder::before {
-  content: "\f5dc";
-}
-
-.ph-text-h::before {
-  content: "\f5dd";
-}
-
-.ph-text-h-five::before {
-  content: "\f5de";
-}
-
-.ph-text-h-four::before {
-  content: "\f5df";
-}
-
-.ph-text-h-one::before {
-  content: "\f5e0";
-}
-
-.ph-text-h-six::before {
-  content: "\f5e1";
-}
-
-.ph-text-h-three::before {
-  content: "\f5e2";
-}
-
-.ph-text-h-two::before {
-  content: "\f5e3";
-}
-
-.ph-text-indent::before {
-  content: "\f5e4";
-}
-
-.ph-text-italic::before {
-  content: "\f5e5";
-}
-
-.ph-text-outdent::before {
-  content: "\f5e6";
-}
-
-.ph-text-strikethrough::before {
-  content: "\f5e7";
-}
-
-.ph-text-t::before {
-  content: "\f5e8";
-}
-
-.ph-text-underline::before {
-  content: "\f5e9";
-}
-
-.ph-textbox::before {
-  content: "\f5ea";
-}
-
-.ph-thermometer::before {
-  content: "\f5eb";
-}
-
-.ph-thermometer-cold::before {
-  content: "\f5ec";
-}
-
-.ph-thermometer-hot::before {
-  content: "\f5ed";
-}
-
-.ph-thermometer-simple::before {
-  content: "\f5ee";
-}
-
-.ph-thumbs-down::before {
-  content: "\f5ef";
-}
-
-.ph-thumbs-up::before {
-  content: "\f5f0";
-}
-
-.ph-ticket::before {
-  content: "\f5f1";
-}
-
-.ph-tiktok-logo::before {
-  content: "\f5f2";
-}
-
-.ph-timer::before {
-  content: "\f5f3";
-}
-
-.ph-toggle-left::before {
-  content: "\f5f4";
-}
-
-.ph-toggle-right::before {
-  content: "\f5f5";
-}
-
-.ph-toilet::before {
-  content: "\f5f6";
-}
-
-.ph-toilet-paper::before {
-  content: "\f5f7";
-}
-
-.ph-tote::before {
-  content: "\f5f8";
-}
-
-.ph-tote-simple::before {
-  content: "\f5f9";
-}
-
-.ph-trademark-registered::before {
-  content: "\f5fa";
-}
-
-.ph-traffic-cone::before {
-  content: "\f5fb";
-}
-
-.ph-traffic-sign::before {
-  content: "\f5fc";
-}
-
-.ph-traffic-signal::before {
-  content: "\f5fd";
-}
-
-.ph-train::before {
-  content: "\f5fe";
-}
-
-.ph-train-regional::before {
-  content: "\f5ff";
-}
-
-.ph-train-simple::before {
-  content: "\f600";
-}
-
-.ph-translate::before {
-  content: "\f601";
-}
-
-.ph-trash::before {
-  content: "\f602";
-}
-
-.ph-trash-simple::before {
-  content: "\f603";
-}
-
-.ph-tray::before {
-  content: "\f604";
-}
-
-.ph-tree::before {
-  content: "\f605";
-}
-
-.ph-tree-evergreen::before {
-  content: "\f606";
-}
-
-.ph-tree-structure::before {
-  content: "\f607";
-}
-
-.ph-trend-down::before {
-  content: "\f608";
-}
-
-.ph-trend-up::before {
-  content: "\f609";
-}
-
-.ph-triangle::before {
-  content: "\f60a";
-}
-
-.ph-trophy::before {
-  content: "\f60b";
-}
-
-.ph-truck::before {
-  content: "\f60c";
-}
-
-.ph-twitch-logo::before {
-  content: "\f60d";
-}
-
-.ph-twitter-logo::before {
-  content: "\f60e";
-}
-
-.ph-umbrella::before {
-  content: "\f60f";
-}
-
-.ph-umbrella-simple::before {
-  content: "\f610";
-}
-
-.ph-upload::before {
-  content: "\f611";
-}
-
-.ph-upload-simple::before {
-  content: "\f612";
-}
-
-.ph-user::before {
-  content: "\f613";
-}
-
-.ph-user-circle::before {
-  content: "\f614";
-}
-
-.ph-user-circle-gear::before {
-  content: "\f615";
-}
-
-.ph-user-circle-minus::before {
-  content: "\f616";
-}
-
-.ph-user-circle-plus::before {
-  content: "\f617";
-}
-
-.ph-user-focus::before {
-  content: "\f618";
-}
-
-.ph-user-gear::before {
-  content: "\f619";
-}
-
-.ph-user-list::before {
-  content: "\f61a";
-}
-
-.ph-user-minus::before {
-  content: "\f61b";
-}
-
-.ph-user-plus::before {
-  content: "\f61c";
-}
-
-.ph-user-rectangle::before {
-  content: "\f61d";
-}
-
-.ph-user-square::before {
-  content: "\f61e";
-}
-
-.ph-user-switch::before {
-  content: "\f61f";
-}
-
-.ph-users::before {
-  content: "\f620";
-}
-
-.ph-users-four::before {
-  content: "\f621";
-}
-
-.ph-users-three::before {
-  content: "\f622";
-}
-
-.ph-vault::before {
-  content: "\f623";
-}
-
-.ph-vibrate::before {
-  content: "\f624";
-}
-
-.ph-video-camera::before {
-  content: "\f625";
-}
-
-.ph-video-camera-slash::before {
-  content: "\f626";
-}
-
-.ph-vignette::before {
-  content: "\f627";
-}
-
-.ph-voicemail::before {
-  content: "\f628";
-}
-
-.ph-volleyball::before {
-  content: "\f629";
-}
-
-.ph-wall::before {
-  content: "\f62a";
-}
-
-.ph-wallet::before {
-  content: "\f62b";
-}
-
-.ph-warning::before {
-  content: "\f62c";
-}
-
-.ph-warning-circle::before {
-  content: "\f62d";
-}
-
-.ph-warning-octagon::before {
-  content: "\f62e";
-}
-
-.ph-watch::before {
-  content: "\f62f";
-}
-
-.ph-wave-sawtooth::before {
-  content: "\f630";
-}
-
-.ph-wave-sine::before {
-  content: "\f631";
-}
-
-.ph-wave-square::before {
-  content: "\f632";
-}
-
-.ph-wave-triangle::before {
-  content: "\f633";
-}
-
-.ph-waves::before {
-  content: "\f634";
-}
-
-.ph-webcam::before {
-  content: "\f635";
-}
-
-.ph-whatsapp-logo::before {
-  content: "\f636";
-}
-
-.ph-wheelchair::before {
-  content: "\f637";
-}
-
-.ph-wifi-high::before {
-  content: "\f638";
-}
-
-.ph-wifi-low::before {
-  content: "\f639";
-}
-
-.ph-wifi-medium::before {
-  content: "\f63a";
-}
-
-.ph-wifi-none::before {
-  content: "\f63b";
-}
-
-.ph-wifi-slash::before {
-  content: "\f63c";
-}
-
-.ph-wifi-x::before {
-  content: "\f63d";
-}
-
-.ph-wind::before {
-  content: "\f63e";
-}
-
-.ph-windows-logo::before {
-  content: "\f63f";
-}
-
-.ph-wine::before {
-  content: "\f640";
-}
-
-.ph-wrench::before {
-  content: "\f641";
-}
-
-.ph-x::before {
-  content: "\f642";
-}
-
-.ph-x-circle::before {
-  content: "\f643";
-}
-
-.ph-x-square::before {
-  content: "\f644";
-}
-
-.ph-yin-yang::before {
-  content: "\f645";
-}
-
-.ph-youtube-logo::before {
-  content: "\f646";
-}
-
-.ph-activity-bold::before {
-  content: "\f647";
-}
-
-.ph-address-book-bold::before {
-  content: "\f648";
-}
-
-.ph-airplane-bold::before {
-  content: "\f649";
-}
-
-.ph-airplane-in-flight-bold::before {
-  content: "\f64a";
-}
-
-.ph-airplane-landing-bold::before {
-  content: "\f64b";
-}
-
-.ph-airplane-takeoff-bold::before {
-  content: "\f64c";
-}
-
-.ph-airplane-tilt-bold::before {
-  content: "\f64d";
-}
-
-.ph-airplay-bold::before {
-  content: "\f64e";
-}
-
-.ph-alarm-bold::before {
-  content: "\f64f";
-}
-
-.ph-alien-bold::before {
-  content: "\f650";
-}
-
-.ph-align-bottom-bold::before {
-  content: "\f651";
-}
-
-.ph-align-bottom-simple-bold::before {
-  content: "\f652";
-}
-
-.ph-align-center-horizontal-bold::before {
-  content: "\f653";
-}
-
-.ph-align-center-horizontal-simple-bold::before {
-  content: "\f654";
-}
-
-.ph-align-center-vertical-bold::before {
-  content: "\f655";
-}
-
-.ph-align-center-vertical-simple-bold::before {
-  content: "\f656";
-}
-
-.ph-align-left-bold::before {
-  content: "\f657";
-}
-
-.ph-align-left-simple-bold::before {
-  content: "\f658";
-}
-
-.ph-align-right-bold::before {
-  content: "\f659";
-}
-
-.ph-align-right-simple-bold::before {
-  content: "\f65a";
-}
-
-.ph-align-top-bold::before {
-  content: "\f65b";
-}
-
-.ph-align-top-simple-bold::before {
-  content: "\f65c";
-}
-
-.ph-anchor-bold::before {
-  content: "\f65d";
-}
-
-.ph-anchor-simple-bold::before {
-  content: "\f65e";
-}
-
-.ph-android-logo-bold::before {
-  content: "\f65f";
-}
-
-.ph-angular-logo-bold::before {
-  content: "\f660";
-}
-
-.ph-aperture-bold::before {
-  content: "\f661";
-}
-
-.ph-app-store-logo-bold::before {
-  content: "\f662";
-}
-
-.ph-app-window-bold::before {
-  content: "\f663";
-}
-
-.ph-apple-logo-bold::before {
-  content: "\f664";
-}
-
-.ph-apple-podcasts-logo-bold::before {
-  content: "\f665";
-}
-
-.ph-archive-bold::before {
-  content: "\f666";
-}
-
-.ph-archive-box-bold::before {
-  content: "\f667";
-}
-
-.ph-archive-tray-bold::before {
-  content: "\f668";
-}
-
-.ph-armchair-bold::before {
-  content: "\f669";
-}
-
-.ph-arrow-arc-left-bold::before {
-  content: "\f66a";
-}
-
-.ph-arrow-arc-right-bold::before {
-  content: "\f66b";
-}
-
-.ph-arrow-bend-double-up-left-bold::before {
-  content: "\f66c";
-}
-
-.ph-arrow-bend-double-up-right-bold::before {
-  content: "\f66d";
-}
-
-.ph-arrow-bend-down-left-bold::before {
-  content: "\f66e";
-}
-
-.ph-arrow-bend-down-right-bold::before {
-  content: "\f66f";
-}
-
-.ph-arrow-bend-left-down-bold::before {
-  content: "\f670";
-}
-
-.ph-arrow-bend-left-up-bold::before {
-  content: "\f671";
-}
-
-.ph-arrow-bend-right-down-bold::before {
-  content: "\f672";
-}
-
-.ph-arrow-bend-right-up-bold::before {
-  content: "\f673";
-}
-
-.ph-arrow-bend-up-left-bold::before {
-  content: "\f674";
-}
-
-.ph-arrow-bend-up-right-bold::before {
-  content: "\f675";
-}
-
-.ph-arrow-circle-down-bold::before {
-  content: "\f676";
-}
-
-.ph-arrow-circle-down-left-bold::before {
-  content: "\f677";
-}
-
-.ph-arrow-circle-down-right-bold::before {
-  content: "\f678";
-}
-
-.ph-arrow-circle-left-bold::before {
-  content: "\f679";
-}
-
-.ph-arrow-circle-right-bold::before {
-  content: "\f67a";
-}
-
-.ph-arrow-circle-up-bold::before {
-  content: "\f67b";
-}
-
-.ph-arrow-circle-up-left-bold::before {
-  content: "\f67c";
-}
-
-.ph-arrow-circle-up-right-bold::before {
-  content: "\f67d";
-}
-
-.ph-arrow-clockwise-bold::before {
-  content: "\f67e";
-}
-
-.ph-arrow-counter-clockwise-bold::before {
-  content: "\f67f";
-}
-
-.ph-arrow-down-bold::before {
-  content: "\f680";
-}
-
-.ph-arrow-down-left-bold::before {
-  content: "\f681";
-}
-
-.ph-arrow-down-right-bold::before {
-  content: "\f682";
-}
-
-.ph-arrow-elbow-down-left-bold::before {
-  content: "\f683";
-}
-
-.ph-arrow-elbow-down-right-bold::before {
-  content: "\f684";
-}
-
-.ph-arrow-elbow-left-bold::before {
-  content: "\f685";
-}
-
-.ph-arrow-elbow-left-down-bold::before {
-  content: "\f686";
-}
-
-.ph-arrow-elbow-left-up-bold::before {
-  content: "\f687";
-}
-
-.ph-arrow-elbow-right-bold::before {
-  content: "\f688";
-}
-
-.ph-arrow-elbow-right-down-bold::before {
-  content: "\f689";
-}
-
-.ph-arrow-elbow-right-up-bold::before {
-  content: "\f68a";
-}
-
-.ph-arrow-elbow-up-left-bold::before {
-  content: "\f68b";
-}
-
-.ph-arrow-elbow-up-right-bold::before {
-  content: "\f68c";
-}
-
-.ph-arrow-fat-down-bold::before {
-  content: "\f68d";
-}
-
-.ph-arrow-fat-left-bold::before {
-  content: "\f68e";
-}
-
-.ph-arrow-fat-line-down-bold::before {
-  content: "\f68f";
-}
-
-.ph-arrow-fat-line-left-bold::before {
-  content: "\f690";
-}
-
-.ph-arrow-fat-line-right-bold::before {
-  content: "\f691";
-}
-
-.ph-arrow-fat-line-up-bold::before {
-  content: "\f692";
-}
-
-.ph-arrow-fat-lines-down-bold::before {
-  content: "\f693";
-}
-
-.ph-arrow-fat-lines-left-bold::before {
-  content: "\f694";
-}
-
-.ph-arrow-fat-lines-right-bold::before {
-  content: "\f695";
-}
-
-.ph-arrow-fat-lines-up-bold::before {
-  content: "\f696";
-}
-
-.ph-arrow-fat-right-bold::before {
-  content: "\f697";
-}
-
-.ph-arrow-fat-up-bold::before {
-  content: "\f698";
-}
-
-.ph-arrow-left-bold::before {
-  content: "\f699";
-}
-
-.ph-arrow-line-down-bold::before {
-  content: "\f69a";
-}
-
-.ph-arrow-line-down-left-bold::before {
-  content: "\f69b";
-}
-
-.ph-arrow-line-down-right-bold::before {
-  content: "\f69c";
-}
-
-.ph-arrow-line-left-bold::before {
-  content: "\f69d";
-}
-
-.ph-arrow-line-right-bold::before {
-  content: "\f69e";
-}
-
-.ph-arrow-line-up-bold::before {
-  content: "\f69f";
-}
-
-.ph-arrow-line-up-left-bold::before {
-  content: "\f6a0";
-}
-
-.ph-arrow-line-up-right-bold::before {
-  content: "\f6a1";
-}
-
-.ph-arrow-right-bold::before {
-  content: "\f6a2";
-}
-
-.ph-arrow-square-down-bold::before {
-  content: "\f6a3";
-}
-
-.ph-arrow-square-down-left-bold::before {
-  content: "\f6a4";
-}
-
-.ph-arrow-square-down-right-bold::before {
-  content: "\f6a5";
-}
-
-.ph-arrow-square-in-bold::before {
-  content: "\f6a6";
-}
-
-.ph-arrow-square-left-bold::before {
-  content: "\f6a7";
-}
-
-.ph-arrow-square-out-bold::before {
-  content: "\f6a8";
-}
-
-.ph-arrow-square-right-bold::before {
-  content: "\f6a9";
-}
-
-.ph-arrow-square-up-bold::before {
-  content: "\f6aa";
-}
-
-.ph-arrow-square-up-left-bold::before {
-  content: "\f6ab";
-}
-
-.ph-arrow-square-up-right-bold::before {
-  content: "\f6ac";
-}
-
-.ph-arrow-u-down-left-bold::before {
-  content: "\f6ad";
-}
-
-.ph-arrow-u-down-right-bold::before {
-  content: "\f6ae";
-}
-
-.ph-arrow-u-left-down-bold::before {
-  content: "\f6af";
-}
-
-.ph-arrow-u-left-up-bold::before {
-  content: "\f6b0";
-}
-
-.ph-arrow-u-right-down-bold::before {
-  content: "\f6b1";
-}
-
-.ph-arrow-u-right-up-bold::before {
-  content: "\f6b2";
-}
-
-.ph-arrow-u-up-left-bold::before {
-  content: "\f6b3";
-}
-
-.ph-arrow-u-up-right-bold::before {
-  content: "\f6b4";
-}
-
-.ph-arrow-up-bold::before {
-  content: "\f6b5";
-}
-
-.ph-arrow-up-left-bold::before {
-  content: "\f6b6";
-}
-
-.ph-arrow-up-right-bold::before {
-  content: "\f6b7";
-}
-
-.ph-arrows-clockwise-bold::before {
-  content: "\f6b8";
-}
-
-.ph-arrows-counter-clockwise-bold::before {
-  content: "\f6b9";
-}
-
-.ph-arrows-down-up-bold::before {
-  content: "\f6ba";
-}
-
-.ph-arrows-horizontal-bold::before {
-  content: "\f6bb";
-}
-
-.ph-arrows-in-bold::before {
-  content: "\f6bc";
-}
-
-.ph-arrows-in-cardinal-bold::before {
-  content: "\f6bd";
-}
-
-.ph-arrows-in-line-horizontal-bold::before {
-  content: "\f6be";
-}
-
-.ph-arrows-in-line-vertical-bold::before {
-  content: "\f6bf";
-}
-
-.ph-arrows-in-simple-bold::before {
-  content: "\f6c0";
-}
-
-.ph-arrows-left-right-bold::before {
-  content: "\f6c1";
-}
-
-.ph-arrows-out-bold::before {
-  content: "\f6c2";
-}
-
-.ph-arrows-out-cardinal-bold::before {
-  content: "\f6c3";
-}
-
-.ph-arrows-out-line-horizontal-bold::before {
-  content: "\f6c4";
-}
-
-.ph-arrows-out-line-vertical-bold::before {
-  content: "\f6c5";
-}
-
-.ph-arrows-out-simple-bold::before {
-  content: "\f6c6";
-}
-
-.ph-arrows-vertical-bold::before {
-  content: "\f6c7";
-}
-
-.ph-article-bold::before {
-  content: "\f6c8";
-}
-
-.ph-article-medium-bold::before {
-  content: "\f6c9";
-}
-
-.ph-article-ny-times-bold::before {
-  content: "\f6ca";
-}
-
-.ph-asterisk-bold::before {
-  content: "\f6cb";
-}
-
-.ph-asterisk-simple-bold::before {
-  content: "\f6cc";
-}
-
-.ph-at-bold::before {
-  content: "\f6cd";
-}
-
-.ph-atom-bold::before {
-  content: "\f6ce";
-}
-
-.ph-baby-bold::before {
-  content: "\f6cf";
-}
-
-.ph-backpack-bold::before {
-  content: "\f6d0";
-}
-
-.ph-backspace-bold::before {
-  content: "\f6d1";
-}
-
-.ph-bag-bold::before {
-  content: "\f6d2";
-}
-
-.ph-bag-simple-bold::before {
-  content: "\f6d3";
-}
-
-.ph-balloon-bold::before {
-  content: "\f6d4";
-}
-
-.ph-bandaids-bold::before {
-  content: "\f6d5";
-}
-
-.ph-bank-bold::before {
-  content: "\f6d6";
-}
-
-.ph-barbell-bold::before {
-  content: "\f6d7";
-}
-
-.ph-barcode-bold::before {
-  content: "\f6d8";
-}
-
-.ph-barricade-bold::before {
-  content: "\f6d9";
-}
-
-.ph-baseball-bold::before {
-  content: "\f6da";
-}
-
-.ph-basketball-bold::before {
-  content: "\f6db";
-}
-
-.ph-bathtub-bold::before {
-  content: "\f6dc";
-}
-
-.ph-battery-charging-bold::before {
-  content: "\f6dd";
-}
-
-.ph-battery-charging-vertical-bold::before {
-  content: "\f6de";
-}
-
-.ph-battery-empty-bold::before {
-  content: "\f6df";
-}
-
-.ph-battery-full-bold::before {
-  content: "\f6e0";
-}
-
-.ph-battery-high-bold::before {
-  content: "\f6e1";
-}
-
-.ph-battery-low-bold::before {
-  content: "\f6e2";
-}
-
-.ph-battery-medium-bold::before {
-  content: "\f6e3";
-}
-
-.ph-battery-plus-bold::before {
-  content: "\f6e4";
-}
-
-.ph-battery-warning-bold::before {
-  content: "\f6e5";
-}
-
-.ph-battery-warning-vertical-bold::before {
-  content: "\f6e6";
-}
-
-.ph-bed-bold::before {
-  content: "\f6e7";
-}
-
-.ph-beer-bottle-bold::before {
-  content: "\f6e8";
-}
-
-.ph-behance-logo-bold::before {
-  content: "\f6e9";
-}
-
-.ph-bell-bold::before {
-  content: "\f6ea";
-}
-
-.ph-bell-ringing-bold::before {
-  content: "\f6eb";
-}
-
-.ph-bell-simple-bold::before {
-  content: "\f6ec";
-}
-
-.ph-bell-simple-ringing-bold::before {
-  content: "\f6ed";
-}
-
-.ph-bell-simple-slash-bold::before {
-  content: "\f6ee";
-}
-
-.ph-bell-simple-z-bold::before {
-  content: "\f6ef";
-}
-
-.ph-bell-slash-bold::before {
-  content: "\f6f0";
-}
-
-.ph-bell-z-bold::before {
-  content: "\f6f1";
-}
-
-.ph-bezier-curve-bold::before {
-  content: "\f6f2";
-}
-
-.ph-bicycle-bold::before {
-  content: "\f6f3";
-}
-
-.ph-binoculars-bold::before {
-  content: "\f6f4";
-}
-
-.ph-bird-bold::before {
-  content: "\f6f5";
-}
-
-.ph-bluetooth-bold::before {
-  content: "\f6f6";
-}
-
-.ph-bluetooth-connected-bold::before {
-  content: "\f6f7";
-}
-
-.ph-bluetooth-slash-bold::before {
-  content: "\f6f8";
-}
-
-.ph-bluetooth-x-bold::before {
-  content: "\f6f9";
-}
-
-.ph-boat-bold::before {
-  content: "\f6fa";
-}
-
-.ph-book-bold::before {
-  content: "\f6fb";
-}
-
-.ph-book-bookmark-bold::before {
-  content: "\f6fc";
-}
-
-.ph-book-open-bold::before {
-  content: "\f6fd";
-}
-
-.ph-bookmark-bold::before {
-  content: "\f6fe";
-}
-
-.ph-bookmark-simple-bold::before {
-  content: "\f6ff";
-}
-
-.ph-bookmarks-bold::before {
-  content: "\f700";
-}
-
-.ph-bookmarks-simple-bold::before {
-  content: "\f701";
-}
-
-.ph-books-bold::before {
-  content: "\f702";
-}
-
-.ph-bounding-box-bold::before {
-  content: "\f703";
-}
-
-.ph-brackets-angle-bold::before {
-  content: "\f704";
-}
-
-.ph-brackets-curly-bold::before {
-  content: "\f705";
-}
-
-.ph-brackets-round-bold::before {
-  content: "\f706";
-}
-
-.ph-brackets-square-bold::before {
-  content: "\f707";
-}
-
-.ph-brain-bold::before {
-  content: "\f708";
-}
-
-.ph-brandy-bold::before {
-  content: "\f709";
-}
-
-.ph-briefcase-bold::before {
-  content: "\f70a";
-}
-
-.ph-briefcase-metal-bold::before {
-  content: "\f70b";
-}
-
-.ph-broadcast-bold::before {
-  content: "\f70c";
-}
-
-.ph-browser-bold::before {
-  content: "\f70d";
-}
-
-.ph-browsers-bold::before {
-  content: "\f70e";
-}
-
-.ph-bug-beetle-bold::before {
-  content: "\f70f";
-}
-
-.ph-bug-bold::before {
-  content: "\f710";
-}
-
-.ph-bug-droid-bold::before {
-  content: "\f711";
-}
-
-.ph-buildings-bold::before {
-  content: "\f712";
-}
-
-.ph-bus-bold::before {
-  content: "\f713";
-}
-
-.ph-butterfly-bold::before {
-  content: "\f714";
-}
-
-.ph-cactus-bold::before {
-  content: "\f715";
-}
-
-.ph-cake-bold::before {
-  content: "\f716";
-}
-
-.ph-calculator-bold::before {
-  content: "\f717";
-}
-
-.ph-calendar-blank-bold::before {
-  content: "\f718";
-}
-
-.ph-calendar-bold::before {
-  content: "\f719";
-}
-
-.ph-calendar-check-bold::before {
-  content: "\f71a";
-}
-
-.ph-calendar-plus-bold::before {
-  content: "\f71b";
-}
-
-.ph-calendar-x-bold::before {
-  content: "\f71c";
-}
-
-.ph-camera-bold::before {
-  content: "\f71d";
-}
-
-.ph-camera-rotate-bold::before {
-  content: "\f71e";
-}
-
-.ph-camera-slash-bold::before {
-  content: "\f71f";
-}
-
-.ph-campfire-bold::before {
-  content: "\f720";
-}
-
-.ph-car-bold::before {
-  content: "\f721";
-}
-
-.ph-car-simple-bold::before {
-  content: "\f722";
-}
-
-.ph-cardholder-bold::before {
-  content: "\f723";
-}
-
-.ph-cards-bold::before {
-  content: "\f724";
-}
-
-.ph-caret-circle-double-down-bold::before {
-  content: "\f725";
-}
-
-.ph-caret-circle-double-left-bold::before {
-  content: "\f726";
-}
-
-.ph-caret-circle-double-right-bold::before {
-  content: "\f727";
-}
-
-.ph-caret-circle-double-up-bold::before {
-  content: "\f728";
-}
-
-.ph-caret-circle-down-bold::before {
-  content: "\f729";
-}
-
-.ph-caret-circle-left-bold::before {
-  content: "\f72a";
-}
-
-.ph-caret-circle-right-bold::before {
-  content: "\f72b";
-}
-
-.ph-caret-circle-up-bold::before {
-  content: "\f72c";
-}
-
-.ph-caret-double-down-bold::before {
-  content: "\f72d";
-}
-
-.ph-caret-double-left-bold::before {
-  content: "\f72e";
-}
-
-.ph-caret-double-right-bold::before {
-  content: "\f72f";
-}
-
-.ph-caret-double-up-bold::before {
-  content: "\f730";
-}
-
-.ph-caret-down-bold::before {
-  content: "\f731";
-}
-
-.ph-caret-left-bold::before {
-  content: "\f732";
-}
-
-.ph-caret-right-bold::before {
-  content: "\f733";
-}
-
-.ph-caret-up-bold::before {
-  content: "\f734";
-}
-
-.ph-cat-bold::before {
-  content: "\f735";
-}
-
-.ph-cell-signal-full-bold::before {
-  content: "\f736";
-}
-
-.ph-cell-signal-high-bold::before {
-  content: "\f737";
-}
-
-.ph-cell-signal-low-bold::before {
-  content: "\f738";
-}
-
-.ph-cell-signal-medium-bold::before {
-  content: "\f739";
-}
-
-.ph-cell-signal-none-bold::before {
-  content: "\f73a";
-}
-
-.ph-cell-signal-slash-bold::before {
-  content: "\f73b";
-}
-
-.ph-cell-signal-x-bold::before {
-  content: "\f73c";
-}
-
-.ph-chalkboard-bold::before {
-  content: "\f73d";
-}
-
-.ph-chalkboard-simple-bold::before {
-  content: "\f73e";
-}
-
-.ph-chalkboard-teacher-bold::before {
-  content: "\f73f";
-}
-
-.ph-chart-bar-bold::before {
-  content: "\f740";
-}
-
-.ph-chart-bar-horizontal-bold::before {
-  content: "\f741";
-}
-
-.ph-chart-line-bold::before {
-  content: "\f742";
-}
-
-.ph-chart-line-up-bold::before {
-  content: "\f743";
-}
-
-.ph-chart-pie-bold::before {
-  content: "\f744";
-}
-
-.ph-chart-pie-slice-bold::before {
-  content: "\f745";
-}
-
-.ph-chat-bold::before {
-  content: "\f746";
-}
-
-.ph-chat-centered-bold::before {
-  content: "\f747";
-}
-
-.ph-chat-centered-dots-bold::before {
-  content: "\f748";
-}
-
-.ph-chat-centered-text-bold::before {
-  content: "\f749";
-}
-
-.ph-chat-circle-bold::before {
-  content: "\f74a";
-}
-
-.ph-chat-circle-dots-bold::before {
-  content: "\f74b";
-}
-
-.ph-chat-circle-text-bold::before {
-  content: "\f74c";
-}
-
-.ph-chat-dots-bold::before {
-  content: "\f74d";
-}
-
-.ph-chat-teardrop-bold::before {
-  content: "\f74e";
-}
-
-.ph-chat-teardrop-dots-bold::before {
-  content: "\f74f";
-}
-
-.ph-chat-teardrop-text-bold::before {
-  content: "\f750";
-}
-
-.ph-chat-text-bold::before {
-  content: "\f751";
-}
-
-.ph-chats-bold::before {
-  content: "\f752";
-}
-
-.ph-chats-circle-bold::before {
-  content: "\f753";
-}
-
-.ph-chats-teardrop-bold::before {
-  content: "\f754";
-}
-
-.ph-check-bold::before {
-  content: "\f755";
-}
-
-.ph-check-circle-bold::before {
-  content: "\f756";
-}
-
-.ph-check-square-bold::before {
-  content: "\f757";
-}
-
-.ph-check-square-offset-bold::before {
-  content: "\f758";
-}
-
-.ph-checks-bold::before {
-  content: "\f759";
-}
-
-.ph-circle-bold::before {
-  content: "\f75a";
-}
-
-.ph-circle-dashed-bold::before {
-  content: "\f75b";
-}
-
-.ph-circle-half-bold::before {
-  content: "\f75c";
-}
-
-.ph-circle-half-tilt-bold::before {
-  content: "\f75d";
-}
-
-.ph-circle-notch-bold::before {
-  content: "\f75e";
-}
-
-.ph-circle-wavy-bold::before {
-  content: "\f75f";
-}
-
-.ph-circle-wavy-check-bold::before {
-  content: "\f760";
-}
-
-.ph-circle-wavy-question-bold::before {
-  content: "\f761";
-}
-
-.ph-circle-wavy-warning-bold::before {
-  content: "\f762";
-}
-
-.ph-circles-four-bold::before {
-  content: "\f763";
-}
-
-.ph-circles-three-bold::before {
-  content: "\f764";
-}
-
-.ph-circles-three-plus-bold::before {
-  content: "\f765";
-}
-
-.ph-clipboard-bold::before {
-  content: "\f766";
-}
-
-.ph-clipboard-text-bold::before {
-  content: "\f767";
-}
-
-.ph-clock-afternoon-bold::before {
-  content: "\f768";
-}
-
-.ph-clock-bold::before {
-  content: "\f769";
-}
-
-.ph-clock-clockwise-bold::before {
-  content: "\f76a";
-}
-
-.ph-clock-counter-clockwise-bold::before {
-  content: "\f76b";
-}
-
-.ph-closed-captioning-bold::before {
-  content: "\f76c";
-}
-
-.ph-cloud-arrow-down-bold::before {
-  content: "\f76d";
-}
-
-.ph-cloud-arrow-up-bold::before {
-  content: "\f76e";
-}
-
-.ph-cloud-bold::before {
-  content: "\f76f";
-}
-
-.ph-cloud-check-bold::before {
-  content: "\f770";
-}
-
-.ph-cloud-fog-bold::before {
-  content: "\f771";
-}
-
-.ph-cloud-lightning-bold::before {
-  content: "\f772";
-}
-
-.ph-cloud-moon-bold::before {
-  content: "\f773";
-}
-
-.ph-cloud-rain-bold::before {
-  content: "\f774";
-}
-
-.ph-cloud-slash-bold::before {
-  content: "\f775";
-}
-
-.ph-cloud-snow-bold::before {
-  content: "\f776";
-}
-
-.ph-cloud-sun-bold::before {
-  content: "\f777";
-}
-
-.ph-club-bold::before {
-  content: "\f778";
-}
-
-.ph-coat-hanger-bold::before {
-  content: "\f779";
-}
-
-.ph-code-bold::before {
-  content: "\f77a";
-}
-
-.ph-code-simple-bold::before {
-  content: "\f77b";
-}
-
-.ph-codepen-logo-bold::before {
-  content: "\f77c";
-}
-
-.ph-codesandbox-logo-bold::before {
-  content: "\f77d";
-}
-
-.ph-coffee-bold::before {
-  content: "\f77e";
-}
-
-.ph-coin-bold::before {
-  content: "\f77f";
-}
-
-.ph-coin-vertical-bold::before {
-  content: "\f780";
-}
-
-.ph-coins-bold::before {
-  content: "\f781";
-}
-
-.ph-columns-bold::before {
-  content: "\f782";
-}
-
-.ph-command-bold::before {
-  content: "\f783";
-}
-
-.ph-compass-bold::before {
-  content: "\f784";
-}
-
-.ph-computer-tower-bold::before {
-  content: "\f785";
-}
-
-.ph-confetti-bold::before {
-  content: "\f786";
-}
-
-.ph-cookie-bold::before {
-  content: "\f787";
-}
-
-.ph-cooking-pot-bold::before {
-  content: "\f788";
-}
-
-.ph-copy-bold::before {
-  content: "\f789";
-}
-
-.ph-copy-simple-bold::before {
-  content: "\f78a";
-}
-
-.ph-copyleft-bold::before {
-  content: "\f78b";
-}
-
-.ph-copyright-bold::before {
-  content: "\f78c";
-}
-
-.ph-corners-in-bold::before {
-  content: "\f78d";
-}
-
-.ph-corners-out-bold::before {
-  content: "\f78e";
-}
-
-.ph-cpu-bold::before {
-  content: "\f78f";
-}
-
-.ph-credit-card-bold::before {
-  content: "\f790";
-}
-
-.ph-crop-bold::before {
-  content: "\f791";
-}
-
-.ph-crosshair-bold::before {
-  content: "\f792";
-}
-
-.ph-crosshair-simple-bold::before {
-  content: "\f793";
-}
-
-.ph-crown-bold::before {
-  content: "\f794";
-}
-
-.ph-crown-simple-bold::before {
-  content: "\f795";
-}
-
-.ph-cube-bold::before {
-  content: "\f796";
-}
-
-.ph-currency-btc-bold::before {
-  content: "\f797";
-}
-
-.ph-currency-circle-dollar-bold::before {
-  content: "\f798";
-}
-
-.ph-currency-cny-bold::before {
-  content: "\f799";
-}
-
-.ph-currency-dollar-bold::before {
-  content: "\f79a";
-}
-
-.ph-currency-dollar-simple-bold::before {
-  content: "\f79b";
-}
-
-.ph-currency-eth-bold::before {
-  content: "\f79c";
-}
-
-.ph-currency-eur-bold::before {
-  content: "\f79d";
-}
-
-.ph-currency-gbp-bold::before {
-  content: "\f79e";
-}
-
-.ph-currency-inr-bold::before {
-  content: "\f79f";
-}
-
-.ph-currency-jpy-bold::before {
-  content: "\f7a0";
-}
-
-.ph-currency-krw-bold::before {
-  content: "\f7a1";
-}
-
-.ph-currency-kzt-bold::before {
-  content: "\f7a2";
-}
-
-.ph-currency-ngn-bold::before {
-  content: "\f7a3";
-}
-
-.ph-currency-rub-bold::before {
-  content: "\f7a4";
-}
-
-.ph-cursor-bold::before {
-  content: "\f7a5";
-}
-
-.ph-cursor-text-bold::before {
-  content: "\f7a6";
-}
-
-.ph-cylinder-bold::before {
-  content: "\f7a7";
-}
-
-.ph-database-bold::before {
-  content: "\f7a8";
-}
-
-.ph-desktop-bold::before {
-  content: "\f7a9";
-}
-
-.ph-desktop-tower-bold::before {
-  content: "\f7aa";
-}
-
-.ph-detective-bold::before {
-  content: "\f7ab";
-}
-
-.ph-device-mobile-bold::before {
-  content: "\f7ac";
-}
-
-.ph-device-mobile-camera-bold::before {
-  content: "\f7ad";
-}
-
-.ph-device-mobile-speaker-bold::before {
-  content: "\f7ae";
-}
-
-.ph-device-tablet-bold::before {
-  content: "\f7af";
-}
-
-.ph-device-tablet-camera-bold::before {
-  content: "\f7b0";
-}
-
-.ph-device-tablet-speaker-bold::before {
-  content: "\f7b1";
-}
-
-.ph-diamond-bold::before {
-  content: "\f7b2";
-}
-
-.ph-diamonds-four-bold::before {
-  content: "\f7b3";
-}
-
-.ph-dice-five-bold::before {
-  content: "\f7b4";
-}
-
-.ph-dice-four-bold::before {
-  content: "\f7b5";
-}
-
-.ph-dice-one-bold::before {
-  content: "\f7b6";
-}
-
-.ph-dice-six-bold::before {
-  content: "\f7b7";
-}
-
-.ph-dice-three-bold::before {
-  content: "\f7b8";
-}
-
-.ph-dice-two-bold::before {
-  content: "\f7b9";
-}
-
-.ph-disc-bold::before {
-  content: "\f7ba";
-}
-
-.ph-discord-logo-bold::before {
-  content: "\f7bb";
-}
-
-.ph-divide-bold::before {
-  content: "\f7bc";
-}
-
-.ph-dog-bold::before {
-  content: "\f7bd";
-}
-
-.ph-door-bold::before {
-  content: "\f7be";
-}
-
-.ph-dots-nine-bold::before {
-  content: "\f7bf";
-}
-
-.ph-dots-six-bold::before {
-  content: "\f7c0";
-}
-
-.ph-dots-six-vertical-bold::before {
-  content: "\f7c1";
-}
-
-.ph-dots-three-bold::before {
-  content: "\f7c2";
-}
-
-.ph-dots-three-circle-bold::before {
-  content: "\f7c3";
-}
-
-.ph-dots-three-circle-vertical-bold::before {
-  content: "\f7c4";
-}
-
-.ph-dots-three-outline-bold::before {
-  content: "\f7c5";
-}
-
-.ph-dots-three-outline-vertical-bold::before {
-  content: "\f7c6";
-}
-
-.ph-dots-three-vertical-bold::before {
-  content: "\f7c7";
-}
-
-.ph-download-bold::before {
-  content: "\f7c8";
-}
-
-.ph-download-simple-bold::before {
-  content: "\f7c9";
-}
-
-.ph-dribbble-logo-bold::before {
-  content: "\f7ca";
-}
-
-.ph-drop-bold::before {
-  content: "\f7cb";
-}
-
-.ph-drop-half-bold::before {
-  content: "\f7cc";
-}
-
-.ph-drop-half-bottom-bold::before {
-  content: "\f7cd";
-}
-
-.ph-ear-bold::before {
-  content: "\f7ce";
-}
-
-.ph-ear-slash-bold::before {
-  content: "\f7cf";
-}
-
-.ph-egg-bold::before {
-  content: "\f7d0";
-}
-
-.ph-egg-crack-bold::before {
-  content: "\f7d1";
-}
-
-.ph-eject-bold::before {
-  content: "\f7d2";
-}
-
-.ph-eject-simple-bold::before {
-  content: "\f7d3";
-}
-
-.ph-envelope-bold::before {
-  content: "\f7d4";
-}
-
-.ph-envelope-open-bold::before {
-  content: "\f7d5";
-}
-
-.ph-envelope-simple-bold::before {
-  content: "\f7d6";
-}
-
-.ph-envelope-simple-open-bold::before {
-  content: "\f7d7";
-}
-
-.ph-equalizer-bold::before {
-  content: "\f7d8";
-}
-
-.ph-equals-bold::before {
-  content: "\f7d9";
-}
-
-.ph-eraser-bold::before {
-  content: "\f7da";
-}
-
-.ph-exam-bold::before {
-  content: "\f7db";
-}
-
-.ph-export-bold::before {
-  content: "\f7dc";
-}
-
-.ph-eye-bold::before {
-  content: "\f7dd";
-}
-
-.ph-eye-closed-bold::before {
-  content: "\f7de";
-}
-
-.ph-eye-slash-bold::before {
-  content: "\f7df";
-}
-
-.ph-eyedropper-bold::before {
-  content: "\f7e0";
-}
-
-.ph-eyedropper-sample-bold::before {
-  content: "\f7e1";
-}
-
-.ph-eyeglasses-bold::before {
-  content: "\f7e2";
-}
-
-.ph-face-mask-bold::before {
-  content: "\f7e3";
-}
-
-.ph-facebook-logo-bold::before {
-  content: "\f7e4";
-}
-
-.ph-factory-bold::before {
-  content: "\f7e5";
-}
-
-.ph-faders-bold::before {
-  content: "\f7e6";
-}
-
-.ph-faders-horizontal-bold::before {
-  content: "\f7e7";
-}
-
-.ph-fast-forward-bold::before {
-  content: "\f7e8";
-}
-
-.ph-fast-forward-circle-bold::before {
-  content: "\f7e9";
-}
-
-.ph-figma-logo-bold::before {
-  content: "\f7ea";
-}
-
-.ph-file-arrow-down-bold::before {
-  content: "\f7eb";
-}
-
-.ph-file-arrow-up-bold::before {
-  content: "\f7ec";
-}
-
-.ph-file-audio-bold::before {
-  content: "\f7ed";
-}
-
-.ph-file-bold::before {
-  content: "\f7ee";
-}
-
-.ph-file-cloud-bold::before {
-  content: "\f7ef";
-}
-
-.ph-file-code-bold::before {
-  content: "\f7f0";
-}
-
-.ph-file-css-bold::before {
-  content: "\f7f1";
-}
-
-.ph-file-csv-bold::before {
-  content: "\f7f2";
-}
-
-.ph-file-doc-bold::before {
-  content: "\f7f3";
-}
-
-.ph-file-dotted-bold::before {
-  content: "\f7f4";
-}
-
-.ph-file-html-bold::before {
-  content: "\f7f5";
-}
-
-.ph-file-image-bold::before {
-  content: "\f7f6";
-}
-
-.ph-file-jpg-bold::before {
-  content: "\f7f7";
-}
-
-.ph-file-js-bold::before {
-  content: "\f7f8";
-}
-
-.ph-file-jsx-bold::before {
-  content: "\f7f9";
-}
-
-.ph-file-lock-bold::before {
-  content: "\f7fa";
-}
-
-.ph-file-minus-bold::before {
-  content: "\f7fb";
-}
-
-.ph-file-pdf-bold::before {
-  content: "\f7fc";
-}
-
-.ph-file-plus-bold::before {
-  content: "\f7fd";
-}
-
-.ph-file-png-bold::before {
-  content: "\f7fe";
-}
-
-.ph-file-ppt-bold::before {
-  content: "\f7ff";
-}
-
-.ph-file-rs-bold::before {
-  content: "\f800";
-}
-
-.ph-file-search-bold::before {
-  content: "\f801";
-}
-
-.ph-file-text-bold::before {
-  content: "\f802";
-}
-
-.ph-file-ts-bold::before {
-  content: "\f803";
-}
-
-.ph-file-tsx-bold::before {
-  content: "\f804";
-}
-
-.ph-file-video-bold::before {
-  content: "\f805";
-}
-
-.ph-file-vue-bold::before {
-  content: "\f806";
-}
-
-.ph-file-x-bold::before {
-  content: "\f807";
-}
-
-.ph-file-xls-bold::before {
-  content: "\f808";
-}
-
-.ph-file-zip-bold::before {
-  content: "\f809";
-}
-
-.ph-files-bold::before {
-  content: "\f80a";
-}
-
-.ph-film-script-bold::before {
-  content: "\f80b";
-}
-
-.ph-film-slate-bold::before {
-  content: "\f80c";
-}
-
-.ph-film-strip-bold::before {
-  content: "\f80d";
-}
-
-.ph-fingerprint-bold::before {
-  content: "\f80e";
-}
-
-.ph-fingerprint-simple-bold::before {
-  content: "\f80f";
-}
-
-.ph-finn-the-human-bold::before {
-  content: "\f810";
-}
-
-.ph-fire-bold::before {
-  content: "\f811";
-}
-
-.ph-fire-simple-bold::before {
-  content: "\f812";
-}
-
-.ph-first-aid-bold::before {
-  content: "\f813";
-}
-
-.ph-first-aid-kit-bold::before {
-  content: "\f814";
-}
-
-.ph-fish-bold::before {
-  content: "\f815";
-}
-
-.ph-fish-simple-bold::before {
-  content: "\f816";
-}
-
-.ph-flag-banner-bold::before {
-  content: "\f817";
-}
-
-.ph-flag-bold::before {
-  content: "\f818";
-}
-
-.ph-flag-checkered-bold::before {
-  content: "\f819";
-}
-
-.ph-flame-bold::before {
-  content: "\f81a";
-}
-
-.ph-flashlight-bold::before {
-  content: "\f81b";
-}
-
-.ph-flask-bold::before {
-  content: "\f81c";
-}
-
-.ph-floppy-disk-back-bold::before {
-  content: "\f81d";
-}
-
-.ph-floppy-disk-bold::before {
-  content: "\f81e";
-}
-
-.ph-flow-arrow-bold::before {
-  content: "\f81f";
-}
-
-.ph-flower-bold::before {
-  content: "\f820";
-}
-
-.ph-flower-lotus-bold::before {
-  content: "\f821";
-}
-
-.ph-flying-saucer-bold::before {
-  content: "\f822";
-}
-
-.ph-folder-bold::before {
-  content: "\f823";
-}
-
-.ph-folder-dotted-bold::before {
-  content: "\f824";
-}
-
-.ph-folder-lock-bold::before {
-  content: "\f825";
-}
-
-.ph-folder-minus-bold::before {
-  content: "\f826";
-}
-
-.ph-folder-notch-bold::before {
-  content: "\f827";
-}
-
-.ph-folder-notch-minus-bold::before {
-  content: "\f828";
-}
-
-.ph-folder-notch-open-bold::before {
-  content: "\f829";
-}
-
-.ph-folder-notch-plus-bold::before {
-  content: "\f82a";
-}
-
-.ph-folder-open-bold::before {
-  content: "\f82b";
-}
-
-.ph-folder-plus-bold::before {
-  content: "\f82c";
-}
-
-.ph-folder-simple-bold::before {
-  content: "\f82d";
-}
-
-.ph-folder-simple-dotted-bold::before {
-  content: "\f82e";
-}
-
-.ph-folder-simple-lock-bold::before {
-  content: "\f82f";
-}
-
-.ph-folder-simple-minus-bold::before {
-  content: "\f830";
-}
-
-.ph-folder-simple-plus-bold::before {
-  content: "\f831";
-}
-
-.ph-folder-simple-star-bold::before {
-  content: "\f832";
-}
-
-.ph-folder-simple-user-bold::before {
-  content: "\f833";
-}
-
-.ph-folder-star-bold::before {
-  content: "\f834";
-}
-
-.ph-folder-user-bold::before {
-  content: "\f835";
-}
-
-.ph-folders-bold::before {
-  content: "\f836";
-}
-
-.ph-football-bold::before {
-  content: "\f837";
-}
-
-.ph-fork-knife-bold::before {
-  content: "\f838";
-}
-
-.ph-frame-corners-bold::before {
-  content: "\f839";
-}
-
-.ph-framer-logo-bold::before {
-  content: "\f83a";
-}
-
-.ph-function-bold::before {
-  content: "\f83b";
-}
-
-.ph-funnel-bold::before {
-  content: "\f83c";
-}
-
-.ph-funnel-simple-bold::before {
-  content: "\f83d";
-}
-
-.ph-game-controller-bold::before {
-  content: "\f83e";
-}
-
-.ph-gas-pump-bold::before {
-  content: "\f83f";
-}
-
-.ph-gauge-bold::before {
-  content: "\f840";
-}
-
-.ph-gear-bold::before {
-  content: "\f841";
-}
-
-.ph-gear-six-bold::before {
-  content: "\f842";
-}
-
-.ph-gender-female-bold::before {
-  content: "\f843";
-}
-
-.ph-gender-intersex-bold::before {
-  content: "\f844";
-}
-
-.ph-gender-male-bold::before {
-  content: "\f845";
-}
-
-.ph-gender-neuter-bold::before {
-  content: "\f846";
-}
-
-.ph-gender-nonbinary-bold::before {
-  content: "\f847";
-}
-
-.ph-gender-transgender-bold::before {
-  content: "\f848";
-}
-
-.ph-ghost-bold::before {
-  content: "\f849";
-}
-
-.ph-gif-bold::before {
-  content: "\f84a";
-}
-
-.ph-gift-bold::before {
-  content: "\f84b";
-}
-
-.ph-git-branch-bold::before {
-  content: "\f84c";
-}
-
-.ph-git-commit-bold::before {
-  content: "\f84d";
-}
-
-.ph-git-diff-bold::before {
-  content: "\f84e";
-}
-
-.ph-git-fork-bold::before {
-  content: "\f84f";
-}
-
-.ph-git-merge-bold::before {
-  content: "\f850";
-}
-
-.ph-git-pull-request-bold::before {
-  content: "\f851";
-}
-
-.ph-github-logo-bold::before {
-  content: "\f852";
-}
-
-.ph-gitlab-logo-bold::before {
-  content: "\f853";
-}
-
-.ph-gitlab-logo-simple-bold::before {
-  content: "\f854";
-}
-
-.ph-globe-bold::before {
-  content: "\f855";
-}
-
-.ph-globe-hemisphere-east-bold::before {
-  content: "\f856";
-}
-
-.ph-globe-hemisphere-west-bold::before {
-  content: "\f857";
-}
-
-.ph-globe-simple-bold::before {
-  content: "\f858";
-}
-
-.ph-globe-stand-bold::before {
-  content: "\f859";
-}
-
-.ph-google-chrome-logo-bold::before {
-  content: "\f85a";
-}
-
-.ph-google-logo-bold::before {
-  content: "\f85b";
-}
-
-.ph-google-photos-logo-bold::before {
-  content: "\f85c";
-}
-
-.ph-google-play-logo-bold::before {
-  content: "\f85d";
-}
-
-.ph-google-podcasts-logo-bold::before {
-  content: "\f85e";
-}
-
-.ph-gradient-bold::before {
-  content: "\f85f";
-}
-
-.ph-graduation-cap-bold::before {
-  content: "\f860";
-}
-
-.ph-graph-bold::before {
-  content: "\f861";
-}
-
-.ph-grid-four-bold::before {
-  content: "\f862";
-}
-
-.ph-hamburger-bold::before {
-  content: "\f863";
-}
-
-.ph-hand-bold::before {
-  content: "\f864";
-}
-
-.ph-hand-eye-bold::before {
-  content: "\f865";
-}
-
-.ph-hand-fist-bold::before {
-  content: "\f866";
-}
-
-.ph-hand-grabbing-bold::before {
-  content: "\f867";
-}
-
-.ph-hand-palm-bold::before {
-  content: "\f868";
-}
-
-.ph-hand-pointing-bold::before {
-  content: "\f869";
-}
-
-.ph-hand-soap-bold::before {
-  content: "\f86a";
-}
-
-.ph-hand-waving-bold::before {
-  content: "\f86b";
-}
-
-.ph-handbag-bold::before {
-  content: "\f86c";
-}
-
-.ph-handbag-simple-bold::before {
-  content: "\f86d";
-}
-
-.ph-hands-clapping-bold::before {
-  content: "\f86e";
-}
-
-.ph-handshake-bold::before {
-  content: "\f86f";
-}
-
-.ph-hard-drive-bold::before {
-  content: "\f870";
-}
-
-.ph-hard-drives-bold::before {
-  content: "\f871";
-}
-
-.ph-hash-bold::before {
-  content: "\f872";
-}
-
-.ph-hash-straight-bold::before {
-  content: "\f873";
-}
-
-.ph-headlights-bold::before {
-  content: "\f874";
-}
-
-.ph-headphones-bold::before {
-  content: "\f875";
-}
-
-.ph-headset-bold::before {
-  content: "\f876";
-}
-
-.ph-heart-bold::before {
-  content: "\f877";
-}
-
-.ph-heart-break-bold::before {
-  content: "\f878";
-}
-
-.ph-heart-straight-bold::before {
-  content: "\f879";
-}
-
-.ph-heart-straight-break-bold::before {
-  content: "\f87a";
-}
-
-.ph-heartbeat-bold::before {
-  content: "\f87b";
-}
-
-.ph-hexagon-bold::before {
-  content: "\f87c";
-}
-
-.ph-highlighter-circle-bold::before {
-  content: "\f87d";
-}
-
-.ph-horse-bold::before {
-  content: "\f87e";
-}
-
-.ph-hourglass-bold::before {
-  content: "\f87f";
-}
-
-.ph-hourglass-high-bold::before {
-  content: "\f880";
-}
-
-.ph-hourglass-low-bold::before {
-  content: "\f881";
-}
-
-.ph-hourglass-medium-bold::before {
-  content: "\f882";
-}
-
-.ph-hourglass-simple-bold::before {
-  content: "\f883";
-}
-
-.ph-hourglass-simple-high-bold::before {
-  content: "\f884";
-}
-
-.ph-hourglass-simple-low-bold::before {
-  content: "\f885";
-}
-
-.ph-hourglass-simple-medium-bold::before {
-  content: "\f886";
-}
-
-.ph-house-bold::before {
-  content: "\f887";
-}
-
-.ph-house-line-bold::before {
-  content: "\f888";
-}
-
-.ph-house-simple-bold::before {
-  content: "\f889";
-}
-
-.ph-identification-badge-bold::before {
-  content: "\f88a";
-}
-
-.ph-identification-card-bold::before {
-  content: "\f88b";
-}
-
-.ph-image-bold::before {
-  content: "\f88c";
-}
-
-.ph-image-square-bold::before {
-  content: "\f88d";
-}
-
-.ph-infinity-bold::before {
-  content: "\f88e";
-}
-
-.ph-info-bold::before {
-  content: "\f88f";
-}
-
-.ph-instagram-logo-bold::before {
-  content: "\f890";
-}
-
-.ph-intersect-bold::before {
-  content: "\f891";
-}
-
-.ph-jeep-bold::before {
-  content: "\f892";
-}
-
-.ph-kanban-bold::before {
-  content: "\f893";
-}
-
-.ph-key-bold::before {
-  content: "\f894";
-}
-
-.ph-key-return-bold::before {
-  content: "\f895";
-}
-
-.ph-keyboard-bold::before {
-  content: "\f896";
-}
-
-.ph-keyhole-bold::before {
-  content: "\f897";
-}
-
-.ph-knife-bold::before {
-  content: "\f898";
-}
-
-.ph-ladder-bold::before {
-  content: "\f899";
-}
-
-.ph-ladder-simple-bold::before {
-  content: "\f89a";
-}
-
-.ph-lamp-bold::before {
-  content: "\f89b";
-}
-
-.ph-laptop-bold::before {
-  content: "\f89c";
-}
-
-.ph-layout-bold::before {
-  content: "\f89d";
-}
-
-.ph-leaf-bold::before {
-  content: "\f89e";
-}
-
-.ph-lifebuoy-bold::before {
-  content: "\f89f";
-}
-
-.ph-lightbulb-bold::before {
-  content: "\f8a0";
-}
-
-.ph-lightbulb-filament-bold::before {
-  content: "\f8a1";
-}
-
-.ph-lightning-bold::before {
-  content: "\f8a2";
-}
-
-.ph-lightning-slash-bold::before {
-  content: "\f8a3";
-}
-
-.ph-line-segment-bold::before {
-  content: "\f8a4";
-}
-
-.ph-line-segments-bold::before {
-  content: "\f8a5";
-}
-
-.ph-link-bold::before {
-  content: "\f8a6";
-}
-
-.ph-link-break-bold::before {
-  content: "\f8a7";
-}
-
-.ph-link-simple-bold::before {
-  content: "\f8a8";
-}
-
-.ph-link-simple-break-bold::before {
-  content: "\f8a9";
-}
-
-.ph-link-simple-horizontal-bold::before {
-  content: "\f8aa";
-}
-
-.ph-link-simple-horizontal-break-bold::before {
-  content: "\f8ab";
-}
-
-.ph-linkedin-logo-bold::before {
-  content: "\f8ac";
-}
-
-.ph-linux-logo-bold::before {
-  content: "\f8ad";
-}
-
-.ph-list-bold::before {
-  content: "\f8ae";
-}
-
-.ph-list-bullets-bold::before {
-  content: "\f8af";
-}
-
-.ph-list-checks-bold::before {
-  content: "\f8b0";
-}
-
-.ph-list-dashes-bold::before {
-  content: "\f8b1";
-}
-
-.ph-list-numbers-bold::before {
-  content: "\f8b2";
-}
-
-.ph-list-plus-bold::before {
-  content: "\f8b3";
-}
-
-.ph-lock-bold::before {
-  content: "\f8b4";
-}
-
-.ph-lock-key-bold::before {
-  content: "\f8b5";
-}
-
-.ph-lock-key-open-bold::before {
-  content: "\f8b6";
-}
-
-.ph-lock-laminated-bold::before {
-  content: "\f8b7";
-}
-
-.ph-lock-laminated-open-bold::before {
-  content: "\f8b8";
-}
-
-.ph-lock-open-bold::before {
-  content: "\f8b9";
-}
-
-.ph-lock-simple-bold::before {
-  content: "\f8ba";
-}
-
-.ph-lock-simple-open-bold::before {
-  content: "\f8bb";
-}
-
-.ph-magic-wand-bold::before {
-  content: "\f8bc";
-}
-
-.ph-magnet-bold::before {
-  content: "\f8bd";
-}
-
-.ph-magnet-straight-bold::before {
-  content: "\f8be";
-}
-
-.ph-magnifying-glass-bold::before {
-  content: "\f8bf";
-}
-
-.ph-magnifying-glass-minus-bold::before {
-  content: "\f8c0";
-}
-
-.ph-magnifying-glass-plus-bold::before {
-  content: "\f8c1";
-}
-
-.ph-map-pin-bold::before {
-  content: "\f8c2";
-}
-
-.ph-map-pin-line-bold::before {
-  content: "\f8c3";
-}
-
-.ph-map-trifold-bold::before {
-  content: "\f8c4";
-}
-
-.ph-marker-circle-bold::before {
-  content: "\f8c5";
-}
-
-.ph-martini-bold::before {
-  content: "\f8c6";
-}
-
-.ph-mask-happy-bold::before {
-  content: "\f8c7";
-}
-
-.ph-mask-sad-bold::before {
-  content: "\f8c8";
-}
-
-.ph-math-operations-bold::before {
-  content: "\f8c9";
-}
-
-.ph-medal-bold::before {
-  content: "\f8ca";
-}
-
-.ph-medium-logo-bold::before {
-  content: "\f8cb";
-}
-
-.ph-megaphone-bold::before {
-  content: "\f8cc";
-}
-
-.ph-megaphone-simple-bold::before {
-  content: "\f8cd";
-}
-
-.ph-messenger-logo-bold::before {
-  content: "\f8ce";
-}
-
-.ph-microphone-bold::before {
-  content: "\f8cf";
-}
-
-.ph-microphone-slash-bold::before {
-  content: "\f8d0";
-}
-
-.ph-microphone-stage-bold::before {
-  content: "\f8d1";
-}
-
-.ph-microsoft-excel-logo-bold::before {
-  content: "\f8d2";
-}
-
-.ph-microsoft-powerpoint-logo-bold::before {
-  content: "\f8d3";
-}
-
-.ph-microsoft-teams-logo-bold::before {
-  content: "\f8d4";
-}
-
-.ph-microsoft-word-logo-bold::before {
-  content: "\f8d5";
-}
-
-.ph-minus-bold::before {
-  content: "\f8d6";
-}
-
-.ph-minus-circle-bold::before {
-  content: "\f8d7";
-}
-
-.ph-money-bold::before {
-  content: "\f8d8";
-}
-
-.ph-monitor-bold::before {
-  content: "\f8d9";
-}
-
-.ph-monitor-play-bold::before {
-  content: "\f8da";
-}
-
-.ph-moon-bold::before {
-  content: "\f8db";
-}
-
-.ph-moon-stars-bold::before {
-  content: "\f8dc";
-}
-
-.ph-mountains-bold::before {
-  content: "\f8dd";
-}
-
-.ph-mouse-bold::before {
-  content: "\f8de";
-}
-
-.ph-mouse-simple-bold::before {
-  content: "\f8df";
-}
-
-.ph-music-note-bold::before {
-  content: "\f8e0";
-}
-
-.ph-music-note-simple-bold::before {
-  content: "\f8e1";
-}
-
-.ph-music-notes-bold::before {
-  content: "\f8e2";
-}
-
-.ph-music-notes-plus-bold::before {
-  content: "\f8e3";
-}
-
-.ph-music-notes-simple-bold::before {
-  content: "\f8e4";
-}
-
-.ph-navigation-arrow-bold::before {
-  content: "\f8e5";
-}
-
-.ph-needle-bold::before {
-  content: "\f8e6";
-}
-
-.ph-newspaper-bold::before {
-  content: "\f8e7";
-}
-
-.ph-newspaper-clipping-bold::before {
-  content: "\f8e8";
-}
-
-.ph-note-blank-bold::before {
-  content: "\f8e9";
-}
-
-.ph-note-bold::before {
-  content: "\f8ea";
-}
-
-.ph-note-pencil-bold::before {
-  content: "\f8eb";
-}
-
-.ph-notebook-bold::before {
-  content: "\f8ec";
-}
-
-.ph-notepad-bold::before {
-  content: "\f8ed";
-}
-
-.ph-notification-bold::before {
-  content: "\f8ee";
-}
-
-.ph-number-circle-eight-bold::before {
-  content: "\f8ef";
-}
-
-.ph-number-circle-five-bold::before {
-  content: "\f8f0";
-}
-
-.ph-number-circle-four-bold::before {
-  content: "\f8f1";
-}
-
-.ph-number-circle-nine-bold::before {
-  content: "\f8f2";
-}
-
-.ph-number-circle-one-bold::before {
-  content: "\f8f3";
-}
-
-.ph-number-circle-seven-bold::before {
-  content: "\f8f4";
-}
-
-.ph-number-circle-six-bold::before {
-  content: "\f8f5";
-}
-
-.ph-number-circle-three-bold::before {
-  content: "\f8f6";
-}
-
-.ph-number-circle-two-bold::before {
-  content: "\f8f7";
-}
-
-.ph-number-circle-zero-bold::before {
-  content: "\f8f8";
-}
-
-.ph-number-eight-bold::before {
-  content: "\f8f9";
-}
-
-.ph-number-five-bold::before {
-  content: "\f8fa";
-}
-
-.ph-number-four-bold::before {
-  content: "\f8fb";
-}
-
-.ph-number-nine-bold::before {
-  content: "\f8fc";
-}
-
-.ph-number-one-bold::before {
-  content: "\f8fd";
-}
-
-.ph-number-seven-bold::before {
-  content: "\f8fe";
-}
-
-.ph-number-six-bold::before {
-  content: "\f8ff";
-}
-
-.ph-number-square-eight-bold::before {
-  content: "\f900";
-}
-
-.ph-number-square-five-bold::before {
-  content: "\f901";
-}
-
-.ph-number-square-four-bold::before {
-  content: "\f902";
-}
-
-.ph-number-square-nine-bold::before {
-  content: "\f903";
-}
-
-.ph-number-square-one-bold::before {
-  content: "\f904";
-}
-
-.ph-number-square-seven-bold::before {
-  content: "\f905";
-}
-
-.ph-number-square-six-bold::before {
-  content: "\f906";
-}
-
-.ph-number-square-three-bold::before {
-  content: "\f907";
-}
-
-.ph-number-square-two-bold::before {
-  content: "\f908";
-}
-
-.ph-number-square-zero-bold::before {
-  content: "\f909";
-}
-
-.ph-number-three-bold::before {
-  content: "\f90a";
-}
-
-.ph-number-two-bold::before {
-  content: "\f90b";
-}
-
-.ph-number-zero-bold::before {
-  content: "\f90c";
-}
-
-.ph-nut-bold::before {
-  content: "\f90d";
-}
-
-.ph-ny-times-logo-bold::before {
-  content: "\f90e";
-}
-
-.ph-octagon-bold::before {
-  content: "\f90f";
-}
-
-.ph-option-bold::before {
-  content: "\f910";
-}
-
-.ph-package-bold::before {
-  content: "\f911";
-}
-
-.ph-paint-brush-bold::before {
-  content: "\f912";
-}
-
-.ph-paint-brush-broad-bold::before {
-  content: "\f913";
-}
-
-.ph-paint-brush-household-bold::before {
-  content: "\f914";
-}
-
-.ph-paint-bucket-bold::before {
-  content: "\f915";
-}
-
-.ph-paint-roller-bold::before {
-  content: "\f916";
-}
-
-.ph-palette-bold::before {
-  content: "\f917";
-}
-
-.ph-paper-plane-bold::before {
-  content: "\f918";
-}
-
-.ph-paper-plane-right-bold::before {
-  content: "\f919";
-}
-
-.ph-paper-plane-tilt-bold::before {
-  content: "\f91a";
-}
-
-.ph-paperclip-bold::before {
-  content: "\f91b";
-}
-
-.ph-paperclip-horizontal-bold::before {
-  content: "\f91c";
-}
-
-.ph-parachute-bold::before {
-  content: "\f91d";
-}
-
-.ph-password-bold::before {
-  content: "\f91e";
-}
-
-.ph-path-bold::before {
-  content: "\f91f";
-}
-
-.ph-pause-bold::before {
-  content: "\f920";
-}
-
-.ph-pause-circle-bold::before {
-  content: "\f921";
-}
-
-.ph-paw-print-bold::before {
-  content: "\f922";
-}
-
-.ph-peace-bold::before {
-  content: "\f923";
-}
-
-.ph-pen-bold::before {
-  content: "\f924";
-}
-
-.ph-pen-nib-bold::before {
-  content: "\f925";
-}
-
-.ph-pen-nib-straight-bold::before {
-  content: "\f926";
-}
-
-.ph-pencil-bold::before {
-  content: "\f927";
-}
-
-.ph-pencil-circle-bold::before {
-  content: "\f928";
-}
-
-.ph-pencil-line-bold::before {
-  content: "\f929";
-}
-
-.ph-pencil-simple-bold::before {
-  content: "\f92a";
-}
-
-.ph-pencil-simple-line-bold::before {
-  content: "\f92b";
-}
-
-.ph-percent-bold::before {
-  content: "\f92c";
-}
-
-.ph-person-bold::before {
-  content: "\f92d";
-}
-
-.ph-person-simple-bold::before {
-  content: "\f92e";
-}
-
-.ph-person-simple-run-bold::before {
-  content: "\f92f";
-}
-
-.ph-person-simple-walk-bold::before {
-  content: "\f930";
-}
-
-.ph-perspective-bold::before {
-  content: "\f931";
-}
-
-.ph-phone-bold::before {
-  content: "\f932";
-}
-
-.ph-phone-call-bold::before {
-  content: "\f933";
-}
-
-.ph-phone-disconnect-bold::before {
-  content: "\f934";
-}
-
-.ph-phone-incoming-bold::before {
-  content: "\f935";
-}
-
-.ph-phone-outgoing-bold::before {
-  content: "\f936";
-}
-
-.ph-phone-slash-bold::before {
-  content: "\f937";
-}
-
-.ph-phone-x-bold::before {
-  content: "\f938";
-}
-
-.ph-phosphor-logo-bold::before {
-  content: "\f939";
-}
-
-.ph-piano-keys-bold::before {
-  content: "\f93a";
-}
-
-.ph-picture-in-picture-bold::before {
-  content: "\f93b";
-}
-
-.ph-pill-bold::before {
-  content: "\f93c";
-}
-
-.ph-pinterest-logo-bold::before {
-  content: "\f93d";
-}
-
-.ph-pinwheel-bold::before {
-  content: "\f93e";
-}
-
-.ph-pizza-bold::before {
-  content: "\f93f";
-}
-
-.ph-placeholder-bold::before {
-  content: "\f940";
-}
-
-.ph-planet-bold::before {
-  content: "\f941";
-}
-
-.ph-play-bold::before {
-  content: "\f942";
-}
-
-.ph-play-circle-bold::before {
-  content: "\f943";
-}
-
-.ph-playlist-bold::before {
-  content: "\f944";
-}
-
-.ph-plug-bold::before {
-  content: "\f945";
-}
-
-.ph-plugs-bold::before {
-  content: "\f946";
-}
-
-.ph-plugs-connected-bold::before {
-  content: "\f947";
-}
-
-.ph-plus-bold::before {
-  content: "\f948";
-}
-
-.ph-plus-circle-bold::before {
-  content: "\f949";
-}
-
-.ph-plus-minus-bold::before {
-  content: "\f94a";
-}
-
-.ph-poker-chip-bold::before {
-  content: "\f94b";
-}
-
-.ph-police-car-bold::before {
-  content: "\f94c";
-}
-
-.ph-polygon-bold::before {
-  content: "\f94d";
-}
-
-.ph-popcorn-bold::before {
-  content: "\f94e";
-}
-
-.ph-power-bold::before {
-  content: "\f94f";
-}
-
-.ph-prescription-bold::before {
-  content: "\f950";
-}
-
-.ph-presentation-bold::before {
-  content: "\f951";
-}
-
-.ph-presentation-chart-bold::before {
-  content: "\f952";
-}
-
-.ph-printer-bold::before {
-  content: "\f953";
-}
-
-.ph-prohibit-bold::before {
-  content: "\f954";
-}
-
-.ph-prohibit-inset-bold::before {
-  content: "\f955";
-}
-
-.ph-projector-screen-bold::before {
-  content: "\f956";
-}
-
-.ph-projector-screen-chart-bold::before {
-  content: "\f957";
-}
-
-.ph-push-pin-bold::before {
-  content: "\f958";
-}
-
-.ph-push-pin-simple-bold::before {
-  content: "\f959";
-}
-
-.ph-push-pin-simple-slash-bold::before {
-  content: "\f95a";
-}
-
-.ph-push-pin-slash-bold::before {
-  content: "\f95b";
-}
-
-.ph-puzzle-piece-bold::before {
-  content: "\f95c";
-}
-
-.ph-qr-code-bold::before {
-  content: "\f95d";
-}
-
-.ph-question-bold::before {
-  content: "\f95e";
-}
-
-.ph-queue-bold::before {
-  content: "\f95f";
-}
-
-.ph-quotes-bold::before {
-  content: "\f960";
-}
-
-.ph-radical-bold::before {
-  content: "\f961";
-}
-
-.ph-radio-bold::before {
-  content: "\f962";
-}
-
-.ph-radio-button-bold::before {
-  content: "\f963";
-}
-
-.ph-rainbow-bold::before {
-  content: "\f964";
-}
-
-.ph-rainbow-cloud-bold::before {
-  content: "\f965";
-}
-
-.ph-receipt-bold::before {
-  content: "\f966";
-}
-
-.ph-record-bold::before {
-  content: "\f967";
-}
-
-.ph-rectangle-bold::before {
-  content: "\f968";
-}
-
-.ph-recycle-bold::before {
-  content: "\f969";
-}
-
-.ph-reddit-logo-bold::before {
-  content: "\f96a";
-}
-
-.ph-repeat-bold::before {
-  content: "\f96b";
-}
-
-.ph-repeat-once-bold::before {
-  content: "\f96c";
-}
-
-.ph-rewind-bold::before {
-  content: "\f96d";
-}
-
-.ph-rewind-circle-bold::before {
-  content: "\f96e";
-}
-
-.ph-robot-bold::before {
-  content: "\f96f";
-}
-
-.ph-rocket-bold::before {
-  content: "\f970";
-}
-
-.ph-rocket-launch-bold::before {
-  content: "\f971";
-}
-
-.ph-rows-bold::before {
-  content: "\f972";
-}
-
-.ph-rss-bold::before {
-  content: "\f973";
-}
-
-.ph-rss-simple-bold::before {
-  content: "\f974";
-}
-
-.ph-rug-bold::before {
-  content: "\f975";
-}
-
-.ph-ruler-bold::before {
-  content: "\f976";
-}
-
-.ph-scales-bold::before {
-  content: "\f977";
-}
-
-.ph-scan-bold::before {
-  content: "\f978";
-}
-
-.ph-scissors-bold::before {
-  content: "\f979";
-}
-
-.ph-screencast-bold::before {
-  content: "\f97a";
-}
-
-.ph-scribble-loop-bold::before {
-  content: "\f97b";
-}
-
-.ph-scroll-bold::before {
-  content: "\f97c";
-}
-
-.ph-selection-all-bold::before {
-  content: "\f97d";
-}
-
-.ph-selection-background-bold::before {
-  content: "\f97e";
-}
-
-.ph-selection-bold::before {
-  content: "\f97f";
-}
-
-.ph-selection-foreground-bold::before {
-  content: "\f980";
-}
-
-.ph-selection-inverse-bold::before {
-  content: "\f981";
-}
-
-.ph-selection-plus-bold::before {
-  content: "\f982";
-}
-
-.ph-selection-slash-bold::before {
-  content: "\f983";
-}
-
-.ph-share-bold::before {
-  content: "\f984";
-}
-
-.ph-share-network-bold::before {
-  content: "\f985";
-}
-
-.ph-shield-bold::before {
-  content: "\f986";
-}
-
-.ph-shield-check-bold::before {
-  content: "\f987";
-}
-
-.ph-shield-checkered-bold::before {
-  content: "\f988";
-}
-
-.ph-shield-chevron-bold::before {
-  content: "\f989";
-}
-
-.ph-shield-plus-bold::before {
-  content: "\f98a";
-}
-
-.ph-shield-slash-bold::before {
-  content: "\f98b";
-}
-
-.ph-shield-star-bold::before {
-  content: "\f98c";
-}
-
-.ph-shield-warning-bold::before {
-  content: "\f98d";
-}
-
-.ph-shopping-bag-bold::before {
-  content: "\f98e";
-}
-
-.ph-shopping-bag-open-bold::before {
-  content: "\f98f";
-}
-
-.ph-shopping-cart-bold::before {
-  content: "\f990";
-}
-
-.ph-shopping-cart-simple-bold::before {
-  content: "\f991";
-}
-
-.ph-shower-bold::before {
-  content: "\f992";
-}
-
-.ph-shuffle-angular-bold::before {
-  content: "\f993";
-}
-
-.ph-shuffle-bold::before {
-  content: "\f994";
-}
-
-.ph-shuffle-simple-bold::before {
-  content: "\f995";
-}
-
-.ph-sidebar-bold::before {
-  content: "\f996";
-}
-
-.ph-sidebar-simple-bold::before {
-  content: "\f997";
-}
-
-.ph-sign-in-bold::before {
-  content: "\f998";
-}
-
-.ph-sign-out-bold::before {
-  content: "\f999";
-}
-
-.ph-signpost-bold::before {
-  content: "\f99a";
-}
-
-.ph-sim-card-bold::before {
-  content: "\f99b";
-}
-
-.ph-sketch-logo-bold::before {
-  content: "\f99c";
-}
-
-.ph-skip-back-bold::before {
-  content: "\f99d";
-}
-
-.ph-skip-back-circle-bold::before {
-  content: "\f99e";
-}
-
-.ph-skip-forward-bold::before {
-  content: "\f99f";
-}
-
-.ph-skip-forward-circle-bold::before {
-  content: "\f9a0";
-}
-
-.ph-skull-bold::before {
-  content: "\f9a1";
-}
-
-.ph-slack-logo-bold::before {
-  content: "\f9a2";
-}
-
-.ph-sliders-bold::before {
-  content: "\f9a3";
-}
-
-.ph-sliders-horizontal-bold::before {
-  content: "\f9a4";
-}
-
-.ph-smiley-blank-bold::before {
-  content: "\f9a5";
-}
-
-.ph-smiley-bold::before {
-  content: "\f9a6";
-}
-
-.ph-smiley-meh-bold::before {
-  content: "\f9a7";
-}
-
-.ph-smiley-nervous-bold::before {
-  content: "\f9a8";
-}
-
-.ph-smiley-sad-bold::before {
-  content: "\f9a9";
-}
-
-.ph-smiley-sticker-bold::before {
-  content: "\f9aa";
-}
-
-.ph-smiley-wink-bold::before {
-  content: "\f9ab";
-}
-
-.ph-smiley-x-eyes-bold::before {
-  content: "\f9ac";
-}
-
-.ph-snapchat-logo-bold::before {
-  content: "\f9ad";
-}
-
-.ph-snowflake-bold::before {
-  content: "\f9ae";
-}
-
-.ph-soccer-ball-bold::before {
-  content: "\f9af";
-}
-
-.ph-sort-ascending-bold::before {
-  content: "\f9b0";
-}
-
-.ph-sort-descending-bold::before {
-  content: "\f9b1";
-}
-
-.ph-spade-bold::before {
-  content: "\f9b2";
-}
-
-.ph-sparkle-bold::before {
-  content: "\f9b3";
-}
-
-.ph-speaker-high-bold::before {
-  content: "\f9b4";
-}
-
-.ph-speaker-low-bold::before {
-  content: "\f9b5";
-}
-
-.ph-speaker-none-bold::before {
-  content: "\f9b6";
-}
-
-.ph-speaker-simple-high-bold::before {
-  content: "\f9b7";
-}
-
-.ph-speaker-simple-low-bold::before {
-  content: "\f9b8";
-}
-
-.ph-speaker-simple-none-bold::before {
-  content: "\f9b9";
-}
-
-.ph-speaker-simple-slash-bold::before {
-  content: "\f9ba";
-}
-
-.ph-speaker-simple-x-bold::before {
-  content: "\f9bb";
-}
-
-.ph-speaker-slash-bold::before {
-  content: "\f9bc";
-}
-
-.ph-speaker-x-bold::before {
-  content: "\f9bd";
-}
-
-.ph-spinner-bold::before {
-  content: "\f9be";
-}
-
-.ph-spinner-gap-bold::before {
-  content: "\f9bf";
-}
-
-.ph-spiral-bold::before {
-  content: "\f9c0";
-}
-
-.ph-spotify-logo-bold::before {
-  content: "\f9c1";
-}
-
-.ph-square-bold::before {
-  content: "\f9c2";
-}
-
-.ph-square-half-bold::before {
-  content: "\f9c3";
-}
-
-.ph-square-half-bottom-bold::before {
-  content: "\f9c4";
-}
-
-.ph-square-logo-bold::before {
-  content: "\f9c5";
-}
-
-.ph-squares-four-bold::before {
-  content: "\f9c6";
-}
-
-.ph-stack-bold::before {
-  content: "\f9c7";
-}
-
-.ph-stack-overflow-logo-bold::before {
-  content: "\f9c8";
-}
-
-.ph-stack-simple-bold::before {
-  content: "\f9c9";
-}
-
-.ph-stamp-bold::before {
-  content: "\f9ca";
-}
-
-.ph-star-bold::before {
-  content: "\f9cb";
-}
-
-.ph-star-four-bold::before {
-  content: "\f9cc";
-}
-
-.ph-star-half-bold::before {
-  content: "\f9cd";
-}
-
-.ph-sticker-bold::before {
-  content: "\f9ce";
-}
-
-.ph-stop-bold::before {
-  content: "\f9cf";
-}
-
-.ph-stop-circle-bold::before {
-  content: "\f9d0";
-}
-
-.ph-storefront-bold::before {
-  content: "\f9d1";
-}
-
-.ph-strategy-bold::before {
-  content: "\f9d2";
-}
-
-.ph-stripe-logo-bold::before {
-  content: "\f9d3";
-}
-
-.ph-student-bold::before {
-  content: "\f9d4";
-}
-
-.ph-suitcase-bold::before {
-  content: "\f9d5";
-}
-
-.ph-suitcase-simple-bold::before {
-  content: "\f9d6";
-}
-
-.ph-sun-bold::before {
-  content: "\f9d7";
-}
-
-.ph-sun-dim-bold::before {
-  content: "\f9d8";
-}
-
-.ph-sun-horizon-bold::before {
-  content: "\f9d9";
-}
-
-.ph-sunglasses-bold::before {
-  content: "\f9da";
-}
-
-.ph-swap-bold::before {
-  content: "\f9db";
-}
-
-.ph-swatches-bold::before {
-  content: "\f9dc";
-}
-
-.ph-sword-bold::before {
-  content: "\f9dd";
-}
-
-.ph-syringe-bold::before {
-  content: "\f9de";
-}
-
-.ph-t-shirt-bold::before {
-  content: "\f9df";
-}
-
-.ph-table-bold::before {
-  content: "\f9e0";
-}
-
-.ph-tabs-bold::before {
-  content: "\f9e1";
-}
-
-.ph-tag-bold::before {
-  content: "\f9e2";
-}
-
-.ph-tag-chevron-bold::before {
-  content: "\f9e3";
-}
-
-.ph-tag-simple-bold::before {
-  content: "\f9e4";
-}
-
-.ph-target-bold::before {
-  content: "\f9e5";
-}
-
-.ph-taxi-bold::before {
-  content: "\f9e6";
-}
-
-.ph-telegram-logo-bold::before {
-  content: "\f9e7";
-}
-
-.ph-television-bold::before {
-  content: "\f9e8";
-}
-
-.ph-television-simple-bold::before {
-  content: "\f9e9";
-}
-
-.ph-tennis-ball-bold::before {
-  content: "\f9ea";
-}
-
-.ph-terminal-bold::before {
-  content: "\f9eb";
-}
-
-.ph-terminal-window-bold::before {
-  content: "\f9ec";
-}
-
-.ph-test-tube-bold::before {
-  content: "\f9ed";
-}
-
-.ph-text-aa-bold::before {
-  content: "\f9ee";
-}
-
-.ph-text-align-center-bold::before {
-  content: "\f9ef";
-}
-
-.ph-text-align-justify-bold::before {
-  content: "\f9f0";
-}
-
-.ph-text-align-left-bold::before {
-  content: "\f9f1";
-}
-
-.ph-text-align-right-bold::before {
-  content: "\f9f2";
-}
-
-.ph-text-bolder-bold::before {
-  content: "\f9f3";
-}
-
-.ph-text-h-bold::before {
-  content: "\f9f4";
-}
-
-.ph-text-h-five-bold::before {
-  content: "\f9f5";
-}
-
-.ph-text-h-four-bold::before {
-  content: "\f9f6";
-}
-
-.ph-text-h-one-bold::before {
-  content: "\f9f7";
-}
-
-.ph-text-h-six-bold::before {
-  content: "\f9f8";
-}
-
-.ph-text-h-three-bold::before {
-  content: "\f9f9";
-}
-
-.ph-text-h-two-bold::before {
-  content: "\f9fa";
-}
-
-.ph-text-indent-bold::before {
-  content: "\f9fb";
-}
-
-.ph-text-italic-bold::before {
-  content: "\f9fc";
-}
-
-.ph-text-outdent-bold::before {
-  content: "\f9fd";
-}
-
-.ph-text-strikethrough-bold::before {
-  content: "\f9fe";
-}
-
-.ph-text-t-bold::before {
-  content: "\f9ff";
-}
-
-.ph-text-underline-bold::before {
-  content: "\fa00";
-}
-
-.ph-textbox-bold::before {
-  content: "\fa01";
-}
-
-.ph-thermometer-bold::before {
-  content: "\fa02";
-}
-
-.ph-thermometer-cold-bold::before {
-  content: "\fa03";
-}
-
-.ph-thermometer-hot-bold::before {
-  content: "\fa04";
-}
-
-.ph-thermometer-simple-bold::before {
-  content: "\fa05";
-}
-
-.ph-thumbs-down-bold::before {
-  content: "\fa06";
-}
-
-.ph-thumbs-up-bold::before {
-  content: "\fa07";
-}
-
-.ph-ticket-bold::before {
-  content: "\fa08";
-}
-
-.ph-tiktok-logo-bold::before {
-  content: "\fa09";
-}
-
-.ph-timer-bold::before {
-  content: "\fa0a";
-}
-
-.ph-toggle-left-bold::before {
-  content: "\fa0b";
-}
-
-.ph-toggle-right-bold::before {
-  content: "\fa0c";
-}
-
-.ph-toilet-bold::before {
-  content: "\fa0d";
-}
-
-.ph-toilet-paper-bold::before {
-  content: "\fa0e";
-}
-
-.ph-tote-bold::before {
-  content: "\fa0f";
-}
-
-.ph-tote-simple-bold::before {
-  content: "\fa10";
-}
-
-.ph-trademark-registered-bold::before {
-  content: "\fa11";
-}
-
-.ph-traffic-cone-bold::before {
-  content: "\fa12";
-}
-
-.ph-traffic-sign-bold::before {
-  content: "\fa13";
-}
-
-.ph-traffic-signal-bold::before {
-  content: "\fa14";
-}
-
-.ph-train-bold::before {
-  content: "\fa15";
-}
-
-.ph-train-regional-bold::before {
-  content: "\fa16";
-}
-
-.ph-train-simple-bold::before {
-  content: "\fa17";
-}
-
-.ph-translate-bold::before {
-  content: "\fa18";
-}
-
-.ph-trash-bold::before {
-  content: "\fa19";
-}
-
-.ph-trash-simple-bold::before {
-  content: "\fa1a";
-}
-
-.ph-tray-bold::before {
-  content: "\fa1b";
-}
-
-.ph-tree-bold::before {
-  content: "\fa1c";
-}
-
-.ph-tree-evergreen-bold::before {
-  content: "\fa1d";
-}
-
-.ph-tree-structure-bold::before {
-  content: "\fa1e";
-}
-
-.ph-trend-down-bold::before {
-  content: "\fa1f";
-}
-
-.ph-trend-up-bold::before {
-  content: "\fa20";
-}
-
-.ph-triangle-bold::before {
-  content: "\fa21";
-}
-
-.ph-trophy-bold::before {
-  content: "\fa22";
-}
-
-.ph-truck-bold::before {
-  content: "\fa23";
-}
-
-.ph-twitch-logo-bold::before {
-  content: "\fa24";
-}
-
-.ph-twitter-logo-bold::before {
-  content: "\fa25";
-}
-
-.ph-umbrella-bold::before {
-  content: "\fa26";
-}
-
-.ph-umbrella-simple-bold::before {
-  content: "\fa27";
-}
-
-.ph-upload-bold::before {
-  content: "\fa28";
-}
-
-.ph-upload-simple-bold::before {
-  content: "\fa29";
-}
-
-.ph-user-bold::before {
-  content: "\fa2a";
-}
-
-.ph-user-circle-bold::before {
-  content: "\fa2b";
-}
-
-.ph-user-circle-gear-bold::before {
-  content: "\fa2c";
-}
-
-.ph-user-circle-minus-bold::before {
-  content: "\fa2d";
-}
-
-.ph-user-circle-plus-bold::before {
-  content: "\fa2e";
-}
-
-.ph-user-focus-bold::before {
-  content: "\fa2f";
-}
-
-.ph-user-gear-bold::before {
-  content: "\fa30";
-}
-
-.ph-user-list-bold::before {
-  content: "\fa31";
-}
-
-.ph-user-minus-bold::before {
-  content: "\fa32";
-}
-
-.ph-user-plus-bold::before {
-  content: "\fa33";
-}
-
-.ph-user-rectangle-bold::before {
-  content: "\fa34";
-}
-
-.ph-user-square-bold::before {
-  content: "\fa35";
-}
-
-.ph-user-switch-bold::before {
-  content: "\fa36";
-}
-
-.ph-users-bold::before {
-  content: "\fa37";
-}
-
-.ph-users-four-bold::before {
-  content: "\fa38";
-}
-
-.ph-users-three-bold::before {
-  content: "\fa39";
-}
-
-.ph-vault-bold::before {
-  content: "\fa3a";
-}
-
-.ph-vibrate-bold::before {
-  content: "\fa3b";
-}
-
-.ph-video-camera-bold::before {
-  content: "\fa3c";
-}
-
-.ph-video-camera-slash-bold::before {
-  content: "\fa3d";
-}
-
-.ph-vignette-bold::before {
-  content: "\fa3e";
-}
-
-.ph-voicemail-bold::before {
-  content: "\fa3f";
-}
-
-.ph-volleyball-bold::before {
-  content: "\fa40";
-}
-
-.ph-wall-bold::before {
-  content: "\fa41";
-}
-
-.ph-wallet-bold::before {
-  content: "\fa42";
-}
-
-.ph-warning-bold::before {
-  content: "\fa43";
-}
-
-.ph-warning-circle-bold::before {
-  content: "\fa44";
-}
-
-.ph-warning-octagon-bold::before {
-  content: "\fa45";
-}
-
-.ph-watch-bold::before {
-  content: "\fa46";
-}
-
-.ph-wave-sawtooth-bold::before {
-  content: "\fa47";
-}
-
-.ph-wave-sine-bold::before {
-  content: "\fa48";
-}
-
-.ph-wave-square-bold::before {
-  content: "\fa49";
-}
-
-.ph-wave-triangle-bold::before {
-  content: "\fa4a";
-}
-
-.ph-waves-bold::before {
-  content: "\fa4b";
-}
-
-.ph-webcam-bold::before {
-  content: "\fa4c";
-}
-
-.ph-whatsapp-logo-bold::before {
-  content: "\fa4d";
-}
-
-.ph-wheelchair-bold::before {
-  content: "\fa4e";
-}
-
-.ph-wifi-high-bold::before {
-  content: "\fa4f";
-}
-
-.ph-wifi-low-bold::before {
-  content: "\fa50";
-}
-
-.ph-wifi-medium-bold::before {
-  content: "\fa51";
-}
-
-.ph-wifi-none-bold::before {
-  content: "\fa52";
-}
-
-.ph-wifi-slash-bold::before {
-  content: "\fa53";
-}
-
-.ph-wifi-x-bold::before {
-  content: "\fa54";
-}
-
-.ph-wind-bold::before {
-  content: "\fa55";
-}
-
-.ph-windows-logo-bold::before {
-  content: "\fa56";
-}
-
-.ph-wine-bold::before {
-  content: "\fa57";
-}
-
-.ph-wrench-bold::before {
-  content: "\fa58";
-}
-
-.ph-x-bold::before {
-  content: "\fa59";
-}
-
-.ph-x-circle-bold::before {
-  content: "\fa5a";
-}
-
-.ph-x-square-bold::before {
-  content: "\fa5b";
-}
-
-.ph-yin-yang-bold::before {
-  content: "\fa5c";
-}
-
-.ph-youtube-logo-bold::before {
-  content: "\fa5d";
-}
-
-.ph-activity-fill::before {
-  content: "\fa5e";
-}
-
-.ph-address-book-fill::before {
-  content: "\fa5f";
-}
-
-.ph-airplane-fill::before {
-  content: "\fa60";
-}
-
-.ph-airplane-in-flight-fill::before {
-  content: "\fa61";
-}
-
-.ph-airplane-landing-fill::before {
-  content: "\fa62";
-}
-
-.ph-airplane-takeoff-fill::before {
-  content: "\fa63";
-}
-
-.ph-airplane-tilt-fill::before {
-  content: "\fa64";
-}
-
-.ph-airplay-fill::before {
-  content: "\fa65";
-}
-
-.ph-alarm-fill::before {
-  content: "\fa66";
-}
-
-.ph-alien-fill::before {
-  content: "\fa67";
-}
-
-.ph-align-bottom-fill::before {
-  content: "\fa68";
-}
-
-.ph-align-bottom-simple-fill::before {
-  content: "\fa69";
-}
-
-.ph-align-center-horizontal-fill::before {
-  content: "\fa6a";
-}
-
-.ph-align-center-horizontal-simple-fill::before {
-  content: "\fa6b";
-}
-
-.ph-align-center-vertical-fill::before {
-  content: "\fa6c";
-}
-
-.ph-align-center-vertical-simple-fill::before {
-  content: "\fa6d";
-}
-
-.ph-align-left-fill::before {
-  content: "\fa6e";
-}
-
-.ph-align-left-simple-fill::before {
-  content: "\fa6f";
-}
-
-.ph-align-right-fill::before {
-  content: "\fa70";
-}
-
-.ph-align-right-simple-fill::before {
-  content: "\fa71";
-}
-
-.ph-align-top-fill::before {
-  content: "\fa72";
-}
-
-.ph-align-top-simple-fill::before {
-  content: "\fa73";
-}
-
-.ph-anchor-fill::before {
-  content: "\fa74";
-}
-
-.ph-anchor-simple-fill::before {
-  content: "\fa75";
-}
-
-.ph-android-logo-fill::before {
-  content: "\fa76";
-}
-
-.ph-angular-logo-fill::before {
-  content: "\fa77";
-}
-
-.ph-aperture-fill::before {
-  content: "\fa78";
-}
-
-.ph-app-store-logo-fill::before {
-  content: "\fa79";
-}
-
-.ph-app-window-fill::before {
-  content: "\fa7a";
-}
-
-.ph-apple-logo-fill::before {
-  content: "\fa7b";
-}
-
-.ph-apple-podcasts-logo-fill::before {
-  content: "\fa7c";
-}
-
-.ph-archive-box-fill::before {
-  content: "\fa7d";
-}
-
-.ph-archive-fill::before {
-  content: "\fa7e";
-}
-
-.ph-archive-tray-fill::before {
-  content: "\fa7f";
-}
-
-.ph-armchair-fill::before {
-  content: "\fa80";
-}
-
-.ph-arrow-arc-left-fill::before {
-  content: "\fa81";
-}
-
-.ph-arrow-arc-right-fill::before {
-  content: "\fa82";
-}
-
-.ph-arrow-bend-double-up-left-fill::before {
-  content: "\fa83";
-}
-
-.ph-arrow-bend-double-up-right-fill::before {
-  content: "\fa84";
-}
-
-.ph-arrow-bend-down-left-fill::before {
-  content: "\fa85";
-}
-
-.ph-arrow-bend-down-right-fill::before {
-  content: "\fa86";
-}
-
-.ph-arrow-bend-left-down-fill::before {
-  content: "\fa87";
-}
-
-.ph-arrow-bend-left-up-fill::before {
-  content: "\fa88";
-}
-
-.ph-arrow-bend-right-down-fill::before {
-  content: "\fa89";
-}
-
-.ph-arrow-bend-right-up-fill::before {
-  content: "\fa8a";
-}
-
-.ph-arrow-bend-up-left-fill::before {
-  content: "\fa8b";
-}
-
-.ph-arrow-bend-up-right-fill::before {
-  content: "\fa8c";
-}
-
-.ph-arrow-circle-down-fill::before {
-  content: "\fa8d";
-}
-
-.ph-arrow-circle-down-left-fill::before {
-  content: "\fa8e";
-}
-
-.ph-arrow-circle-down-right-fill::before {
-  content: "\fa8f";
-}
-
-.ph-arrow-circle-left-fill::before {
-  content: "\fa90";
-}
-
-.ph-arrow-circle-right-fill::before {
-  content: "\fa91";
-}
-
-.ph-arrow-circle-up-fill::before {
-  content: "\fa92";
-}
-
-.ph-arrow-circle-up-left-fill::before {
-  content: "\fa93";
-}
-
-.ph-arrow-circle-up-right-fill::before {
-  content: "\fa94";
-}
-
-.ph-arrow-clockwise-fill::before {
-  content: "\fa95";
-}
-
-.ph-arrow-counter-clockwise-fill::before {
-  content: "\fa96";
-}
-
-.ph-arrow-down-fill::before {
-  content: "\fa97";
-}
-
-.ph-arrow-down-left-fill::before {
-  content: "\fa98";
-}
-
-.ph-arrow-down-right-fill::before {
-  content: "\fa99";
-}
-
-.ph-arrow-elbow-down-left-fill::before {
-  content: "\fa9a";
-}
-
-.ph-arrow-elbow-down-right-fill::before {
-  content: "\fa9b";
-}
-
-.ph-arrow-elbow-left-down-fill::before {
-  content: "\fa9c";
-}
-
-.ph-arrow-elbow-left-fill::before {
-  content: "\fa9d";
-}
-
-.ph-arrow-elbow-left-up-fill::before {
-  content: "\fa9e";
-}
-
-.ph-arrow-elbow-right-down-fill::before {
-  content: "\fa9f";
-}
-
-.ph-arrow-elbow-right-fill::before {
-  content: "\faa0";
-}
-
-.ph-arrow-elbow-right-up-fill::before {
-  content: "\faa1";
-}
-
-.ph-arrow-elbow-up-left-fill::before {
-  content: "\faa2";
-}
-
-.ph-arrow-elbow-up-right-fill::before {
-  content: "\faa3";
-}
-
-.ph-arrow-fat-down-fill::before {
-  content: "\faa4";
-}
-
-.ph-arrow-fat-left-fill::before {
-  content: "\faa5";
-}
-
-.ph-arrow-fat-line-down-fill::before {
-  content: "\faa6";
-}
-
-.ph-arrow-fat-line-left-fill::before {
-  content: "\faa7";
-}
-
-.ph-arrow-fat-line-right-fill::before {
-  content: "\faa8";
-}
-
-.ph-arrow-fat-line-up-fill::before {
-  content: "\faa9";
-}
-
-.ph-arrow-fat-lines-down-fill::before {
-  content: "\faaa";
-}
-
-.ph-arrow-fat-lines-left-fill::before {
-  content: "\faab";
-}
-
-.ph-arrow-fat-lines-right-fill::before {
-  content: "\faac";
-}
-
-.ph-arrow-fat-lines-up-fill::before {
-  content: "\faad";
-}
-
-.ph-arrow-fat-right-fill::before {
-  content: "\faae";
-}
-
-.ph-arrow-fat-up-fill::before {
-  content: "\faaf";
-}
-
-.ph-arrow-left-fill::before {
-  content: "\fab0";
-}
-
-.ph-arrow-line-down-fill::before {
-  content: "\fab1";
-}
-
-.ph-arrow-line-down-left-fill::before {
-  content: "\fab2";
-}
-
-.ph-arrow-line-down-right-fill::before {
-  content: "\fab3";
-}
-
-.ph-arrow-line-left-fill::before {
-  content: "\fab4";
-}
-
-.ph-arrow-line-right-fill::before {
-  content: "\fab5";
-}
-
-.ph-arrow-line-up-fill::before {
-  content: "\fab6";
-}
-
-.ph-arrow-line-up-left-fill::before {
-  content: "\fab7";
-}
-
-.ph-arrow-line-up-right-fill::before {
-  content: "\fab8";
-}
-
-.ph-arrow-right-fill::before {
-  content: "\fab9";
-}
-
-.ph-arrow-square-down-fill::before {
-  content: "\faba";
-}
-
-.ph-arrow-square-down-left-fill::before {
-  content: "\fabb";
-}
-
-.ph-arrow-square-down-right-fill::before {
-  content: "\fabc";
-}
-
-.ph-arrow-square-in-fill::before {
-  content: "\fabd";
-}
-
-.ph-arrow-square-left-fill::before {
-  content: "\fabe";
-}
-
-.ph-arrow-square-out-fill::before {
-  content: "\fabf";
-}
-
-.ph-arrow-square-right-fill::before {
-  content: "\fac0";
-}
-
-.ph-arrow-square-up-fill::before {
-  content: "\fac1";
-}
-
-.ph-arrow-square-up-left-fill::before {
-  content: "\fac2";
-}
-
-.ph-arrow-square-up-right-fill::before {
-  content: "\fac3";
-}
-
-.ph-arrow-u-down-left-fill::before {
-  content: "\fac4";
-}
-
-.ph-arrow-u-down-right-fill::before {
-  content: "\fac5";
-}
-
-.ph-arrow-u-left-down-fill::before {
-  content: "\fac6";
-}
-
-.ph-arrow-u-left-up-fill::before {
-  content: "\fac7";
-}
-
-.ph-arrow-u-right-down-fill::before {
-  content: "\fac8";
-}
-
-.ph-arrow-u-right-up-fill::before {
-  content: "\fac9";
-}
-
-.ph-arrow-u-up-left-fill::before {
-  content: "\faca";
-}
-
-.ph-arrow-u-up-right-fill::before {
-  content: "\facb";
-}
-
-.ph-arrow-up-fill::before {
-  content: "\facc";
-}
-
-.ph-arrow-up-left-fill::before {
-  content: "\facd";
-}
-
-.ph-arrow-up-right-fill::before {
-  content: "\face";
-}
-
-.ph-arrows-clockwise-fill::before {
-  content: "\facf";
-}
-
-.ph-arrows-counter-clockwise-fill::before {
-  content: "\fad0";
-}
-
-.ph-arrows-down-up-fill::before {
-  content: "\fad1";
-}
-
-.ph-arrows-horizontal-fill::before {
-  content: "\fad2";
-}
-
-.ph-arrows-in-cardinal-fill::before {
-  content: "\fad3";
-}
-
-.ph-arrows-in-fill::before {
-  content: "\fad4";
-}
-
-.ph-arrows-in-line-horizontal-fill::before {
-  content: "\fad5";
-}
-
-.ph-arrows-in-line-vertical-fill::before {
-  content: "\fad6";
-}
-
-.ph-arrows-in-simple-fill::before {
-  content: "\fad7";
-}
-
-.ph-arrows-left-right-fill::before {
-  content: "\fad8";
-}
-
-.ph-arrows-out-cardinal-fill::before {
-  content: "\fad9";
-}
-
-.ph-arrows-out-fill::before {
-  content: "\fada";
-}
-
-.ph-arrows-out-line-horizontal-fill::before {
-  content: "\fadb";
-}
-
-.ph-arrows-out-line-vertical-fill::before {
-  content: "\fadc";
-}
-
-.ph-arrows-out-simple-fill::before {
-  content: "\fadd";
-}
-
-.ph-arrows-vertical-fill::before {
-  content: "\fade";
-}
-
-.ph-article-fill::before {
-  content: "\fadf";
-}
-
-.ph-article-medium-fill::before {
-  content: "\fae0";
-}
-
-.ph-article-ny-times-fill::before {
-  content: "\fae1";
-}
-
-.ph-asterisk-fill::before {
-  content: "\fae2";
-}
-
-.ph-asterisk-simple-fill::before {
-  content: "\fae3";
-}
-
-.ph-at-fill::before {
-  content: "\fae4";
-}
-
-.ph-atom-fill::before {
-  content: "\fae5";
-}
-
-.ph-baby-fill::before {
-  content: "\fae6";
-}
-
-.ph-backpack-fill::before {
-  content: "\fae7";
-}
-
-.ph-backspace-fill::before {
-  content: "\fae8";
-}
-
-.ph-bag-fill::before {
-  content: "\fae9";
-}
-
-.ph-bag-simple-fill::before {
-  content: "\faea";
-}
-
-.ph-balloon-fill::before {
-  content: "\faeb";
-}
-
-.ph-bandaids-fill::before {
-  content: "\faec";
-}
-
-.ph-bank-fill::before {
-  content: "\faed";
-}
-
-.ph-barbell-fill::before {
-  content: "\faee";
-}
-
-.ph-barcode-fill::before {
-  content: "\faef";
-}
-
-.ph-barricade-fill::before {
-  content: "\faf0";
-}
-
-.ph-baseball-fill::before {
-  content: "\faf1";
-}
-
-.ph-basketball-fill::before {
-  content: "\faf2";
-}
-
-.ph-bathtub-fill::before {
-  content: "\faf3";
-}
-
-.ph-battery-charging-fill::before {
-  content: "\faf4";
-}
-
-.ph-battery-charging-vertical-fill::before {
-  content: "\faf5";
-}
-
-.ph-battery-empty-fill::before {
-  content: "\faf6";
-}
-
-.ph-battery-full-fill::before {
-  content: "\faf7";
-}
-
-.ph-battery-high-fill::before {
-  content: "\faf8";
-}
-
-.ph-battery-low-fill::before {
-  content: "\faf9";
-}
-
-.ph-battery-medium-fill::before {
-  content: "\fafa";
-}
-
-.ph-battery-plus-fill::before {
-  content: "\fafb";
-}
-
-.ph-battery-warning-fill::before {
-  content: "\fafc";
-}
-
-.ph-battery-warning-vertical-fill::before {
-  content: "\fafd";
-}
-
-.ph-bed-fill::before {
-  content: "\fafe";
-}
-
-.ph-beer-bottle-fill::before {
-  content: "\faff";
-}
-
-.ph-behance-logo-fill::before {
-  content: "\fb00";
-}
-
-.ph-bell-fill::before {
-  content: "\fb01";
-}
-
-.ph-bell-ringing-fill::before {
-  content: "\fb02";
-}
-
-.ph-bell-simple-fill::before {
-  content: "\fb03";
-}
-
-.ph-bell-simple-ringing-fill::before {
-  content: "\fb04";
-}
-
-.ph-bell-simple-slash-fill::before {
-  content: "\fb05";
-}
-
-.ph-bell-simple-z-fill::before {
-  content: "\fb06";
-}
-
-.ph-bell-slash-fill::before {
-  content: "\fb07";
-}
-
-.ph-bell-z-fill::before {
-  content: "\fb08";
-}
-
-.ph-bezier-curve-fill::before {
-  content: "\fb09";
-}
-
-.ph-bicycle-fill::before {
-  content: "\fb0a";
-}
-
-.ph-binoculars-fill::before {
-  content: "\fb0b";
-}
-
-.ph-bird-fill::before {
-  content: "\fb0c";
-}
-
-.ph-bluetooth-connected-fill::before {
-  content: "\fb0d";
-}
-
-.ph-bluetooth-fill::before {
-  content: "\fb0e";
-}
-
-.ph-bluetooth-slash-fill::before {
-  content: "\fb0f";
-}
-
-.ph-bluetooth-x-fill::before {
-  content: "\fb10";
-}
-
-.ph-boat-fill::before {
-  content: "\fb11";
-}
-
-.ph-book-bookmark-fill::before {
-  content: "\fb12";
-}
-
-.ph-book-fill::before {
-  content: "\fb13";
-}
-
-.ph-book-open-fill::before {
-  content: "\fb14";
-}
-
-.ph-bookmark-fill::before {
-  content: "\fb15";
-}
-
-.ph-bookmark-simple-fill::before {
-  content: "\fb16";
-}
-
-.ph-bookmarks-fill::before {
-  content: "\fb17";
-}
-
-.ph-bookmarks-simple-fill::before {
-  content: "\fb18";
-}
-
-.ph-books-fill::before {
-  content: "\fb19";
-}
-
-.ph-bounding-box-fill::before {
-  content: "\fb1a";
-}
-
-.ph-brackets-angle-fill::before {
-  content: "\fb1b";
-}
-
-.ph-brackets-curly-fill::before {
-  content: "\fb1c";
-}
-
-.ph-brackets-round-fill::before {
-  content: "\fb1d";
-}
-
-.ph-brackets-square-fill::before {
-  content: "\fb1e";
-}
-
-.ph-brain-fill::before {
-  content: "\fb1f";
-}
-
-.ph-brandy-fill::before {
-  content: "\fb20";
-}
-
-.ph-briefcase-fill::before {
-  content: "\fb21";
-}
-
-.ph-briefcase-metal-fill::before {
-  content: "\fb22";
-}
-
-.ph-broadcast-fill::before {
-  content: "\fb23";
-}
-
-.ph-browser-fill::before {
-  content: "\fb24";
-}
-
-.ph-browsers-fill::before {
-  content: "\fb25";
-}
-
-.ph-bug-beetle-fill::before {
-  content: "\fb26";
-}
-
-.ph-bug-droid-fill::before {
-  content: "\fb27";
-}
-
-.ph-bug-fill::before {
-  content: "\fb28";
-}
-
-.ph-buildings-fill::before {
-  content: "\fb29";
-}
-
-.ph-bus-fill::before {
-  content: "\fb2a";
-}
-
-.ph-butterfly-fill::before {
-  content: "\fb2b";
-}
-
-.ph-cactus-fill::before {
-  content: "\fb2c";
-}
-
-.ph-cake-fill::before {
-  content: "\fb2d";
-}
-
-.ph-calculator-fill::before {
-  content: "\fb2e";
-}
-
-.ph-calendar-blank-fill::before {
-  content: "\fb2f";
-}
-
-.ph-calendar-check-fill::before {
-  content: "\fb30";
-}
-
-.ph-calendar-fill::before {
-  content: "\fb31";
-}
-
-.ph-calendar-plus-fill::before {
-  content: "\fb32";
-}
-
-.ph-calendar-x-fill::before {
-  content: "\fb33";
-}
-
-.ph-camera-fill::before {
-  content: "\fb34";
-}
-
-.ph-camera-rotate-fill::before {
-  content: "\fb35";
-}
-
-.ph-camera-slash-fill::before {
-  content: "\fb36";
-}
-
-.ph-campfire-fill::before {
-  content: "\fb37";
-}
-
-.ph-car-fill::before {
-  content: "\fb38";
-}
-
-.ph-car-simple-fill::before {
-  content: "\fb39";
-}
-
-.ph-cardholder-fill::before {
-  content: "\fb3a";
-}
-
-.ph-cards-fill::before {
-  content: "\fb3b";
-}
-
-.ph-caret-circle-double-down-fill::before {
-  content: "\fb3c";
-}
-
-.ph-caret-circle-double-left-fill::before {
-  content: "\fb3d";
-}
-
-.ph-caret-circle-double-right-fill::before {
-  content: "\fb3e";
-}
-
-.ph-caret-circle-double-up-fill::before {
-  content: "\fb3f";
-}
-
-.ph-caret-circle-down-fill::before {
-  content: "\fb40";
-}
-
-.ph-caret-circle-left-fill::before {
-  content: "\fb41";
-}
-
-.ph-caret-circle-right-fill::before {
-  content: "\fb42";
-}
-
-.ph-caret-circle-up-fill::before {
-  content: "\fb43";
-}
-
-.ph-caret-double-down-fill::before {
-  content: "\fb44";
-}
-
-.ph-caret-double-left-fill::before {
-  content: "\fb45";
-}
-
-.ph-caret-double-right-fill::before {
-  content: "\fb46";
-}
-
-.ph-caret-double-up-fill::before {
-  content: "\fb47";
-}
-
-.ph-caret-down-fill::before {
-  content: "\fb48";
-}
-
-.ph-caret-left-fill::before {
-  content: "\fb49";
-}
-
-.ph-caret-right-fill::before {
-  content: "\fb4a";
-}
-
-.ph-caret-up-fill::before {
-  content: "\fb4b";
-}
-
-.ph-cat-fill::before {
-  content: "\fb4c";
-}
-
-.ph-cell-signal-full-fill::before {
-  content: "\fb4d";
-}
-
-.ph-cell-signal-high-fill::before {
-  content: "\fb4e";
-}
-
-.ph-cell-signal-low-fill::before {
-  content: "\fb4f";
-}
-
-.ph-cell-signal-medium-fill::before {
-  content: "\fb50";
-}
-
-.ph-cell-signal-none-fill::before {
-  content: "\fb51";
-}
-
-.ph-cell-signal-slash-fill::before {
-  content: "\fb52";
-}
-
-.ph-cell-signal-x-fill::before {
-  content: "\fb53";
-}
-
-.ph-chalkboard-fill::before {
-  content: "\fb54";
-}
-
-.ph-chalkboard-simple-fill::before {
-  content: "\fb55";
-}
-
-.ph-chalkboard-teacher-fill::before {
-  content: "\fb56";
-}
-
-.ph-chart-bar-fill::before {
-  content: "\fb57";
-}
-
-.ph-chart-bar-horizontal-fill::before {
-  content: "\fb58";
-}
-
-.ph-chart-line-fill::before {
-  content: "\fb59";
-}
-
-.ph-chart-line-up-fill::before {
-  content: "\fb5a";
-}
-
-.ph-chart-pie-fill::before {
-  content: "\fb5b";
-}
-
-.ph-chart-pie-slice-fill::before {
-  content: "\fb5c";
-}
-
-.ph-chat-centered-dots-fill::before {
-  content: "\fb5d";
-}
-
-.ph-chat-centered-fill::before {
-  content: "\fb5e";
-}
-
-.ph-chat-centered-text-fill::before {
-  content: "\fb5f";
-}
-
-.ph-chat-circle-dots-fill::before {
-  content: "\fb60";
-}
-
-.ph-chat-circle-fill::before {
-  content: "\fb61";
-}
-
-.ph-chat-circle-text-fill::before {
-  content: "\fb62";
-}
-
-.ph-chat-dots-fill::before {
-  content: "\fb63";
-}
-
-.ph-chat-fill::before {
-  content: "\fb64";
-}
-
-.ph-chat-teardrop-dots-fill::before {
-  content: "\fb65";
-}
-
-.ph-chat-teardrop-fill::before {
-  content: "\fb66";
-}
-
-.ph-chat-teardrop-text-fill::before {
-  content: "\fb67";
-}
-
-.ph-chat-text-fill::before {
-  content: "\fb68";
-}
-
-.ph-chats-circle-fill::before {
-  content: "\fb69";
-}
-
-.ph-chats-fill::before {
-  content: "\fb6a";
-}
-
-.ph-chats-teardrop-fill::before {
-  content: "\fb6b";
-}
-
-.ph-check-circle-fill::before {
-  content: "\fb6c";
-}
-
-.ph-check-fill::before {
-  content: "\fb6d";
-}
-
-.ph-check-square-fill::before {
-  content: "\fb6e";
-}
-
-.ph-check-square-offset-fill::before {
-  content: "\fb6f";
-}
-
-.ph-checks-fill::before {
-  content: "\fb70";
-}
-
-.ph-circle-dashed-fill::before {
-  content: "\fb71";
-}
-
-.ph-circle-fill::before {
-  content: "\fb72";
-}
-
-.ph-circle-half-fill::before {
-  content: "\fb73";
-}
-
-.ph-circle-half-tilt-fill::before {
-  content: "\fb74";
-}
-
-.ph-circle-notch-fill::before {
-  content: "\fb75";
-}
-
-.ph-circle-wavy-check-fill::before {
-  content: "\fb76";
-}
-
-.ph-circle-wavy-fill::before {
-  content: "\fb77";
-}
-
-.ph-circle-wavy-question-fill::before {
-  content: "\fb78";
-}
-
-.ph-circle-wavy-warning-fill::before {
-  content: "\fb79";
-}
-
-.ph-circles-four-fill::before {
-  content: "\fb7a";
-}
-
-.ph-circles-three-fill::before {
-  content: "\fb7b";
-}
-
-.ph-circles-three-plus-fill::before {
-  content: "\fb7c";
-}
-
-.ph-clipboard-fill::before {
-  content: "\fb7d";
-}
-
-.ph-clipboard-text-fill::before {
-  content: "\fb7e";
-}
-
-.ph-clock-afternoon-fill::before {
-  content: "\fb7f";
-}
-
-.ph-clock-clockwise-fill::before {
-  content: "\fb80";
-}
-
-.ph-clock-counter-clockwise-fill::before {
-  content: "\fb81";
-}
-
-.ph-clock-fill::before {
-  content: "\fb82";
-}
-
-.ph-closed-captioning-fill::before {
-  content: "\fb83";
-}
-
-.ph-cloud-arrow-down-fill::before {
-  content: "\fb84";
-}
-
-.ph-cloud-arrow-up-fill::before {
-  content: "\fb85";
-}
-
-.ph-cloud-check-fill::before {
-  content: "\fb86";
-}
-
-.ph-cloud-fill::before {
-  content: "\fb87";
-}
-
-.ph-cloud-fog-fill::before {
-  content: "\fb88";
-}
-
-.ph-cloud-lightning-fill::before {
-  content: "\fb89";
-}
-
-.ph-cloud-moon-fill::before {
-  content: "\fb8a";
-}
-
-.ph-cloud-rain-fill::before {
-  content: "\fb8b";
-}
-
-.ph-cloud-slash-fill::before {
-  content: "\fb8c";
-}
-
-.ph-cloud-snow-fill::before {
-  content: "\fb8d";
-}
-
-.ph-cloud-sun-fill::before {
-  content: "\fb8e";
-}
-
-.ph-club-fill::before {
-  content: "\fb8f";
-}
-
-.ph-coat-hanger-fill::before {
-  content: "\fb90";
-}
-
-.ph-code-fill::before {
-  content: "\fb91";
-}
-
-.ph-code-simple-fill::before {
-  content: "\fb92";
-}
-
-.ph-codepen-logo-fill::before {
-  content: "\fb93";
-}
-
-.ph-codesandbox-logo-fill::before {
-  content: "\fb94";
-}
-
-.ph-coffee-fill::before {
-  content: "\fb95";
-}
-
-.ph-coin-fill::before {
-  content: "\fb96";
-}
-
-.ph-coin-vertical-fill::before {
-  content: "\fb97";
-}
-
-.ph-coins-fill::before {
-  content: "\fb98";
-}
-
-.ph-columns-fill::before {
-  content: "\fb99";
-}
-
-.ph-command-fill::before {
-  content: "\fb9a";
-}
-
-.ph-compass-fill::before {
-  content: "\fb9b";
-}
-
-.ph-computer-tower-fill::before {
-  content: "\fb9c";
-}
-
-.ph-confetti-fill::before {
-  content: "\fb9d";
-}
-
-.ph-cookie-fill::before {
-  content: "\fb9e";
-}
-
-.ph-cooking-pot-fill::before {
-  content: "\fb9f";
-}
-
-.ph-copy-fill::before {
-  content: "\fba0";
-}
-
-.ph-copy-simple-fill::before {
-  content: "\fba1";
-}
-
-.ph-copyleft-fill::before {
-  content: "\fba2";
-}
-
-.ph-copyright-fill::before {
-  content: "\fba3";
-}
-
-.ph-corners-in-fill::before {
-  content: "\fba4";
-}
-
-.ph-corners-out-fill::before {
-  content: "\fba5";
-}
-
-.ph-cpu-fill::before {
-  content: "\fba6";
-}
-
-.ph-credit-card-fill::before {
-  content: "\fba7";
-}
-
-.ph-crop-fill::before {
-  content: "\fba8";
-}
-
-.ph-crosshair-fill::before {
-  content: "\fba9";
-}
-
-.ph-crosshair-simple-fill::before {
-  content: "\fbaa";
-}
-
-.ph-crown-fill::before {
-  content: "\fbab";
-}
-
-.ph-crown-simple-fill::before {
-  content: "\fbac";
-}
-
-.ph-cube-fill::before {
-  content: "\fbad";
-}
-
-.ph-currency-btc-fill::before {
-  content: "\fbae";
-}
-
-.ph-currency-circle-dollar-fill::before {
-  content: "\fbaf";
-}
-
-.ph-currency-cny-fill::before {
-  content: "\fbb0";
-}
-
-.ph-currency-dollar-fill::before {
-  content: "\fbb1";
-}
-
-.ph-currency-dollar-simple-fill::before {
-  content: "\fbb2";
-}
-
-.ph-currency-eth-fill::before {
-  content: "\fbb3";
-}
-
-.ph-currency-eur-fill::before {
-  content: "\fbb4";
-}
-
-.ph-currency-gbp-fill::before {
-  content: "\fbb5";
-}
-
-.ph-currency-inr-fill::before {
-  content: "\fbb6";
-}
-
-.ph-currency-jpy-fill::before {
-  content: "\fbb7";
-}
-
-.ph-currency-krw-fill::before {
-  content: "\fbb8";
-}
-
-.ph-currency-kzt-fill::before {
-  content: "\fbb9";
-}
-
-.ph-currency-ngn-fill::before {
-  content: "\fbba";
-}
-
-.ph-currency-rub-fill::before {
-  content: "\fbbb";
-}
-
-.ph-cursor-fill::before {
-  content: "\fbbc";
-}
-
-.ph-cursor-text-fill::before {
-  content: "\fbbd";
-}
-
-.ph-cylinder-fill::before {
-  content: "\fbbe";
-}
-
-.ph-database-fill::before {
-  content: "\fbbf";
-}
-
-.ph-desktop-fill::before {
-  content: "\fbc0";
-}
-
-.ph-desktop-tower-fill::before {
-  content: "\fbc1";
-}
-
-.ph-detective-fill::before {
-  content: "\fbc2";
-}
-
-.ph-device-mobile-camera-fill::before {
-  content: "\fbc3";
-}
-
-.ph-device-mobile-fill::before {
-  content: "\fbc4";
-}
-
-.ph-device-mobile-speaker-fill::before {
-  content: "\fbc5";
-}
-
-.ph-device-tablet-camera-fill::before {
-  content: "\fbc6";
-}
-
-.ph-device-tablet-fill::before {
-  content: "\fbc7";
-}
-
-.ph-device-tablet-speaker-fill::before {
-  content: "\fbc8";
-}
-
-.ph-diamond-fill::before {
-  content: "\fbc9";
-}
-
-.ph-diamonds-four-fill::before {
-  content: "\fbca";
-}
-
-.ph-dice-five-fill::before {
-  content: "\fbcb";
-}
-
-.ph-dice-four-fill::before {
-  content: "\fbcc";
-}
-
-.ph-dice-one-fill::before {
-  content: "\fbcd";
-}
-
-.ph-dice-six-fill::before {
-  content: "\fbce";
-}
-
-.ph-dice-three-fill::before {
-  content: "\fbcf";
-}
-
-.ph-dice-two-fill::before {
-  content: "\fbd0";
-}
-
-.ph-disc-fill::before {
-  content: "\fbd1";
-}
-
-.ph-discord-logo-fill::before {
-  content: "\fbd2";
-}
-
-.ph-divide-fill::before {
-  content: "\fbd3";
-}
-
-.ph-dog-fill::before {
-  content: "\fbd4";
-}
-
-.ph-door-fill::before {
-  content: "\fbd5";
-}
-
-.ph-dots-nine-fill::before {
-  content: "\fbd6";
-}
-
-.ph-dots-six-fill::before {
-  content: "\fbd7";
-}
-
-.ph-dots-six-vertical-fill::before {
-  content: "\fbd8";
-}
-
-.ph-dots-three-circle-fill::before {
-  content: "\fbd9";
-}
-
-.ph-dots-three-circle-vertical-fill::before {
-  content: "\fbda";
-}
-
-.ph-dots-three-fill::before {
-  content: "\fbdb";
-}
-
-.ph-dots-three-outline-fill::before {
-  content: "\fbdc";
-}
-
-.ph-dots-three-outline-vertical-fill::before {
-  content: "\fbdd";
-}
-
-.ph-dots-three-vertical-fill::before {
-  content: "\fbde";
-}
-
-.ph-download-fill::before {
-  content: "\fbdf";
-}
-
-.ph-download-simple-fill::before {
-  content: "\fbe0";
-}
-
-.ph-dribbble-logo-fill::before {
-  content: "\fbe1";
-}
-
-.ph-drop-fill::before {
-  content: "\fbe2";
-}
-
-.ph-drop-half-bottom-fill::before {
-  content: "\fbe3";
-}
-
-.ph-drop-half-fill::before {
-  content: "\fbe4";
-}
-
-.ph-ear-fill::before {
-  content: "\fbe5";
-}
-
-.ph-ear-slash-fill::before {
-  content: "\fbe6";
-}
-
-.ph-egg-crack-fill::before {
-  content: "\fbe7";
-}
-
-.ph-egg-fill::before {
-  content: "\fbe8";
-}
-
-.ph-eject-fill::before {
-  content: "\fbe9";
-}
-
-.ph-eject-simple-fill::before {
-  content: "\fbea";
-}
-
-.ph-envelope-fill::before {
-  content: "\fbeb";
-}
-
-.ph-envelope-open-fill::before {
-  content: "\fbec";
-}
-
-.ph-envelope-simple-fill::before {
-  content: "\fbed";
-}
-
-.ph-envelope-simple-open-fill::before {
-  content: "\fbee";
-}
-
-.ph-equalizer-fill::before {
-  content: "\fbef";
-}
-
-.ph-equals-fill::before {
-  content: "\fbf0";
-}
-
-.ph-eraser-fill::before {
-  content: "\fbf1";
-}
-
-.ph-exam-fill::before {
-  content: "\fbf2";
-}
-
-.ph-export-fill::before {
-  content: "\fbf3";
-}
-
-.ph-eye-closed-fill::before {
-  content: "\fbf4";
-}
-
-.ph-eye-fill::before {
-  content: "\fbf5";
-}
-
-.ph-eye-slash-fill::before {
-  content: "\fbf6";
-}
-
-.ph-eyedropper-fill::before {
-  content: "\fbf7";
-}
-
-.ph-eyedropper-sample-fill::before {
-  content: "\fbf8";
-}
-
-.ph-eyeglasses-fill::before {
-  content: "\fbf9";
-}
-
-.ph-face-mask-fill::before {
-  content: "\fbfa";
-}
-
-.ph-facebook-logo-fill::before {
-  content: "\fbfb";
-}
-
-.ph-factory-fill::before {
-  content: "\fbfc";
-}
-
-.ph-faders-fill::before {
-  content: "\fbfd";
-}
-
-.ph-faders-horizontal-fill::before {
-  content: "\fbfe";
-}
-
-.ph-fast-forward-circle-fill::before {
-  content: "\fbff";
-}
-
-.ph-fast-forward-fill::before {
-  content: "\fc00";
-}
-
-.ph-figma-logo-fill::before {
-  content: "\fc01";
-}
-
-.ph-file-arrow-down-fill::before {
-  content: "\fc02";
-}
-
-.ph-file-arrow-up-fill::before {
-  content: "\fc03";
-}
-
-.ph-file-audio-fill::before {
-  content: "\fc04";
-}
-
-.ph-file-cloud-fill::before {
-  content: "\fc05";
-}
-
-.ph-file-code-fill::before {
-  content: "\fc06";
-}
-
-.ph-file-css-fill::before {
-  content: "\fc07";
-}
-
-.ph-file-csv-fill::before {
-  content: "\fc08";
-}
-
-.ph-file-doc-fill::before {
-  content: "\fc09";
-}
-
-.ph-file-dotted-fill::before {
-  content: "\fc0a";
-}
-
-.ph-file-fill::before {
-  content: "\fc0b";
-}
-
-.ph-file-html-fill::before {
-  content: "\fc0c";
-}
-
-.ph-file-image-fill::before {
-  content: "\fc0d";
-}
-
-.ph-file-jpg-fill::before {
-  content: "\fc0e";
-}
-
-.ph-file-js-fill::before {
-  content: "\fc0f";
-}
-
-.ph-file-jsx-fill::before {
-  content: "\fc10";
-}
-
-.ph-file-lock-fill::before {
-  content: "\fc11";
-}
-
-.ph-file-minus-fill::before {
-  content: "\fc12";
-}
-
-.ph-file-pdf-fill::before {
-  content: "\fc13";
-}
-
-.ph-file-plus-fill::before {
-  content: "\fc14";
-}
-
-.ph-file-png-fill::before {
-  content: "\fc15";
-}
-
-.ph-file-ppt-fill::before {
-  content: "\fc16";
-}
-
-.ph-file-rs-fill::before {
-  content: "\fc17";
-}
-
-.ph-file-search-fill::before {
-  content: "\fc18";
-}
-
-.ph-file-text-fill::before {
-  content: "\fc19";
-}
-
-.ph-file-ts-fill::before {
-  content: "\fc1a";
-}
-
-.ph-file-tsx-fill::before {
-  content: "\fc1b";
-}
-
-.ph-file-video-fill::before {
-  content: "\fc1c";
-}
-
-.ph-file-vue-fill::before {
-  content: "\fc1d";
-}
-
-.ph-file-x-fill::before {
-  content: "\fc1e";
-}
-
-.ph-file-xls-fill::before {
-  content: "\fc1f";
-}
-
-.ph-file-zip-fill::before {
-  content: "\fc20";
-}
-
-.ph-files-fill::before {
-  content: "\fc21";
-}
-
-.ph-film-script-fill::before {
-  content: "\fc22";
-}
-
-.ph-film-slate-fill::before {
-  content: "\fc23";
-}
-
-.ph-film-strip-fill::before {
-  content: "\fc24";
-}
-
-.ph-fingerprint-fill::before {
-  content: "\fc25";
-}
-
-.ph-fingerprint-simple-fill::before {
-  content: "\fc26";
-}
-
-.ph-finn-the-human-fill::before {
-  content: "\fc27";
-}
-
-.ph-fire-fill::before {
-  content: "\fc28";
-}
-
-.ph-fire-simple-fill::before {
-  content: "\fc29";
-}
-
-.ph-first-aid-fill::before {
-  content: "\fc2a";
-}
-
-.ph-first-aid-kit-fill::before {
-  content: "\fc2b";
-}
-
-.ph-fish-fill::before {
-  content: "\fc2c";
-}
-
-.ph-fish-simple-fill::before {
-  content: "\fc2d";
-}
-
-.ph-flag-banner-fill::before {
-  content: "\fc2e";
-}
-
-.ph-flag-checkered-fill::before {
-  content: "\fc2f";
-}
-
-.ph-flag-fill::before {
-  content: "\fc30";
-}
-
-.ph-flame-fill::before {
-  content: "\fc31";
-}
-
-.ph-flashlight-fill::before {
-  content: "\fc32";
-}
-
-.ph-flask-fill::before {
-  content: "\fc33";
-}
-
-.ph-floppy-disk-back-fill::before {
-  content: "\fc34";
-}
-
-.ph-floppy-disk-fill::before {
-  content: "\fc35";
-}
-
-.ph-flow-arrow-fill::before {
-  content: "\fc36";
-}
-
-.ph-flower-fill::before {
-  content: "\fc37";
-}
-
-.ph-flower-lotus-fill::before {
-  content: "\fc38";
-}
-
-.ph-flying-saucer-fill::before {
-  content: "\fc39";
-}
-
-.ph-folder-dotted-fill::before {
-  content: "\fc3a";
-}
-
-.ph-folder-fill::before {
-  content: "\fc3b";
-}
-
-.ph-folder-lock-fill::before {
-  content: "\fc3c";
-}
-
-.ph-folder-minus-fill::before {
-  content: "\fc3d";
-}
-
-.ph-folder-notch-fill::before {
-  content: "\fc3e";
-}
-
-.ph-folder-notch-minus-fill::before {
-  content: "\fc3f";
-}
-
-.ph-folder-notch-open-fill::before {
-  content: "\fc40";
-}
-
-.ph-folder-notch-plus-fill::before {
-  content: "\fc41";
-}
-
-.ph-folder-open-fill::before {
-  content: "\fc42";
-}
-
-.ph-folder-plus-fill::before {
-  content: "\fc43";
-}
-
-.ph-folder-simple-dotted-fill::before {
-  content: "\fc44";
-}
-
-.ph-folder-simple-fill::before {
-  content: "\fc45";
-}
-
-.ph-folder-simple-lock-fill::before {
-  content: "\fc46";
-}
-
-.ph-folder-simple-minus-fill::before {
-  content: "\fc47";
-}
-
-.ph-folder-simple-plus-fill::before {
-  content: "\fc48";
-}
-
-.ph-folder-simple-star-fill::before {
-  content: "\fc49";
-}
-
-.ph-folder-simple-user-fill::before {
-  content: "\fc4a";
-}
-
-.ph-folder-star-fill::before {
-  content: "\fc4b";
-}
-
-.ph-folder-user-fill::before {
-  content: "\fc4c";
-}
-
-.ph-folders-fill::before {
-  content: "\fc4d";
-}
-
-.ph-football-fill::before {
-  content: "\fc4e";
-}
-
-.ph-fork-knife-fill::before {
-  content: "\fc4f";
-}
-
-.ph-frame-corners-fill::before {
-  content: "\fc50";
-}
-
-.ph-framer-logo-fill::before {
-  content: "\fc51";
-}
-
-.ph-function-fill::before {
-  content: "\fc52";
-}
-
-.ph-funnel-fill::before {
-  content: "\fc53";
-}
-
-.ph-funnel-simple-fill::before {
-  content: "\fc54";
-}
-
-.ph-game-controller-fill::before {
-  content: "\fc55";
-}
-
-.ph-gas-pump-fill::before {
-  content: "\fc56";
-}
-
-.ph-gauge-fill::before {
-  content: "\fc57";
-}
-
-.ph-gear-fill::before {
-  content: "\fc58";
-}
-
-.ph-gear-six-fill::before {
-  content: "\fc59";
-}
-
-.ph-gender-female-fill::before {
-  content: "\fc5a";
-}
-
-.ph-gender-intersex-fill::before {
-  content: "\fc5b";
-}
-
-.ph-gender-male-fill::before {
-  content: "\fc5c";
-}
-
-.ph-gender-neuter-fill::before {
-  content: "\fc5d";
-}
-
-.ph-gender-nonbinary-fill::before {
-  content: "\fc5e";
-}
-
-.ph-gender-transgender-fill::before {
-  content: "\fc5f";
-}
-
-.ph-ghost-fill::before {
-  content: "\fc60";
-}
-
-.ph-gif-fill::before {
-  content: "\fc61";
-}
-
-.ph-gift-fill::before {
-  content: "\fc62";
-}
-
-.ph-git-branch-fill::before {
-  content: "\fc63";
-}
-
-.ph-git-commit-fill::before {
-  content: "\fc64";
-}
-
-.ph-git-diff-fill::before {
-  content: "\fc65";
-}
-
-.ph-git-fork-fill::before {
-  content: "\fc66";
-}
-
-.ph-git-merge-fill::before {
-  content: "\fc67";
-}
-
-.ph-git-pull-request-fill::before {
-  content: "\fc68";
-}
-
-.ph-github-logo-fill::before {
-  content: "\fc69";
-}
-
-.ph-gitlab-logo-fill::before {
-  content: "\fc6a";
-}
-
-.ph-gitlab-logo-simple-fill::before {
-  content: "\fc6b";
-}
-
-.ph-globe-fill::before {
-  content: "\fc6c";
-}
-
-.ph-globe-hemisphere-east-fill::before {
-  content: "\fc6d";
-}
-
-.ph-globe-hemisphere-west-fill::before {
-  content: "\fc6e";
-}
-
-.ph-globe-simple-fill::before {
-  content: "\fc6f";
-}
-
-.ph-globe-stand-fill::before {
-  content: "\fc70";
-}
-
-.ph-google-chrome-logo-fill::before {
-  content: "\fc71";
-}
-
-.ph-google-logo-fill::before {
-  content: "\fc72";
-}
-
-.ph-google-photos-logo-fill::before {
-  content: "\fc73";
-}
-
-.ph-google-play-logo-fill::before {
-  content: "\fc74";
-}
-
-.ph-google-podcasts-logo-fill::before {
-  content: "\fc75";
-}
-
-.ph-gradient-fill::before {
-  content: "\fc76";
-}
-
-.ph-graduation-cap-fill::before {
-  content: "\fc77";
-}
-
-.ph-graph-fill::before {
-  content: "\fc78";
-}
-
-.ph-grid-four-fill::before {
-  content: "\fc79";
-}
-
-.ph-hamburger-fill::before {
-  content: "\fc7a";
-}
-
-.ph-hand-eye-fill::before {
-  content: "\fc7b";
-}
-
-.ph-hand-fill::before {
-  content: "\fc7c";
-}
-
-.ph-hand-fist-fill::before {
-  content: "\fc7d";
-}
-
-.ph-hand-grabbing-fill::before {
-  content: "\fc7e";
-}
-
-.ph-hand-palm-fill::before {
-  content: "\fc7f";
-}
-
-.ph-hand-pointing-fill::before {
-  content: "\fc80";
-}
-
-.ph-hand-soap-fill::before {
-  content: "\fc81";
-}
-
-.ph-hand-waving-fill::before {
-  content: "\fc82";
-}
-
-.ph-handbag-fill::before {
-  content: "\fc83";
-}
-
-.ph-handbag-simple-fill::before {
-  content: "\fc84";
-}
-
-.ph-hands-clapping-fill::before {
-  content: "\fc85";
-}
-
-.ph-handshake-fill::before {
-  content: "\fc86";
-}
-
-.ph-hard-drive-fill::before {
-  content: "\fc87";
-}
-
-.ph-hard-drives-fill::before {
-  content: "\fc88";
-}
-
-.ph-hash-fill::before {
-  content: "\fc89";
-}
-
-.ph-hash-straight-fill::before {
-  content: "\fc8a";
-}
-
-.ph-headlights-fill::before {
-  content: "\fc8b";
-}
-
-.ph-headphones-fill::before {
-  content: "\fc8c";
-}
-
-.ph-headset-fill::before {
-  content: "\fc8d";
-}
-
-.ph-heart-break-fill::before {
-  content: "\fc8e";
-}
-
-.ph-heart-fill::before {
-  content: "\fc8f";
-}
-
-.ph-heart-straight-break-fill::before {
-  content: "\fc90";
-}
-
-.ph-heart-straight-fill::before {
-  content: "\fc91";
-}
-
-.ph-heartbeat-fill::before {
-  content: "\fc92";
-}
-
-.ph-hexagon-fill::before {
-  content: "\fc93";
-}
-
-.ph-highlighter-circle-fill::before {
-  content: "\fc94";
-}
-
-.ph-horse-fill::before {
-  content: "\fc95";
-}
-
-.ph-hourglass-fill::before {
-  content: "\fc96";
-}
-
-.ph-hourglass-high-fill::before {
-  content: "\fc97";
-}
-
-.ph-hourglass-low-fill::before {
-  content: "\fc98";
-}
-
-.ph-hourglass-medium-fill::before {
-  content: "\fc99";
-}
-
-.ph-hourglass-simple-fill::before {
-  content: "\fc9a";
-}
-
-.ph-hourglass-simple-high-fill::before {
-  content: "\fc9b";
-}
-
-.ph-hourglass-simple-low-fill::before {
-  content: "\fc9c";
-}
-
-.ph-hourglass-simple-medium-fill::before {
-  content: "\fc9d";
-}
-
-.ph-house-fill::before {
-  content: "\fc9e";
-}
-
-.ph-house-line-fill::before {
-  content: "\fc9f";
-}
-
-.ph-house-simple-fill::before {
-  content: "\fca0";
-}
-
-.ph-identification-badge-fill::before {
-  content: "\fca1";
-}
-
-.ph-identification-card-fill::before {
-  content: "\fca2";
-}
-
-.ph-image-fill::before {
-  content: "\fca3";
-}
-
-.ph-image-square-fill::before {
-  content: "\fca4";
-}
-
-.ph-infinity-fill::before {
-  content: "\fca5";
-}
-
-.ph-info-fill::before {
-  content: "\fca6";
-}
-
-.ph-instagram-logo-fill::before {
-  content: "\fca7";
-}
-
-.ph-intersect-fill::before {
-  content: "\fca8";
-}
-
-.ph-jeep-fill::before {
-  content: "\fca9";
-}
-
-.ph-kanban-fill::before {
-  content: "\fcaa";
-}
-
-.ph-key-fill::before {
-  content: "\fcab";
-}
-
-.ph-key-return-fill::before {
-  content: "\fcac";
-}
-
-.ph-keyboard-fill::before {
-  content: "\fcad";
-}
-
-.ph-keyhole-fill::before {
-  content: "\fcae";
-}
-
-.ph-knife-fill::before {
-  content: "\fcaf";
-}
-
-.ph-ladder-fill::before {
-  content: "\fcb0";
-}
-
-.ph-ladder-simple-fill::before {
-  content: "\fcb1";
-}
-
-.ph-lamp-fill::before {
-  content: "\fcb2";
-}
-
-.ph-laptop-fill::before {
-  content: "\fcb3";
-}
-
-.ph-layout-fill::before {
-  content: "\fcb4";
-}
-
-.ph-leaf-fill::before {
-  content: "\fcb5";
-}
-
-.ph-lifebuoy-fill::before {
-  content: "\fcb6";
-}
-
-.ph-lightbulb-filament-fill::before {
-  content: "\fcb7";
-}
-
-.ph-lightbulb-fill::before {
-  content: "\fcb8";
-}
-
-.ph-lightning-fill::before {
-  content: "\fcb9";
-}
-
-.ph-lightning-slash-fill::before {
-  content: "\fcba";
-}
-
-.ph-line-segment-fill::before {
-  content: "\fcbb";
-}
-
-.ph-line-segments-fill::before {
-  content: "\fcbc";
-}
-
-.ph-link-break-fill::before {
-  content: "\fcbd";
-}
-
-.ph-link-fill::before {
-  content: "\fcbe";
-}
-
-.ph-link-simple-break-fill::before {
-  content: "\fcbf";
-}
-
-.ph-link-simple-fill::before {
-  content: "\fcc0";
-}
-
-.ph-link-simple-horizontal-break-fill::before {
-  content: "\fcc1";
-}
-
-.ph-link-simple-horizontal-fill::before {
-  content: "\fcc2";
-}
-
-.ph-linkedin-logo-fill::before {
-  content: "\fcc3";
-}
-
-.ph-linux-logo-fill::before {
-  content: "\fcc4";
-}
-
-.ph-list-bullets-fill::before {
-  content: "\fcc5";
-}
-
-.ph-list-checks-fill::before {
-  content: "\fcc6";
-}
-
-.ph-list-dashes-fill::before {
-  content: "\fcc7";
-}
-
-.ph-list-fill::before {
-  content: "\fcc8";
-}
-
-.ph-list-numbers-fill::before {
-  content: "\fcc9";
-}
-
-.ph-list-plus-fill::before {
-  content: "\fcca";
-}
-
-.ph-lock-fill::before {
-  content: "\fccb";
-}
-
-.ph-lock-key-fill::before {
-  content: "\fccc";
-}
-
-.ph-lock-key-open-fill::before {
-  content: "\fccd";
-}
-
-.ph-lock-laminated-fill::before {
-  content: "\fcce";
-}
-
-.ph-lock-laminated-open-fill::before {
-  content: "\fccf";
-}
-
-.ph-lock-open-fill::before {
-  content: "\fcd0";
-}
-
-.ph-lock-simple-fill::before {
-  content: "\fcd1";
-}
-
-.ph-lock-simple-open-fill::before {
-  content: "\fcd2";
-}
-
-.ph-magic-wand-fill::before {
-  content: "\fcd3";
-}
-
-.ph-magnet-fill::before {
-  content: "\fcd4";
-}
-
-.ph-magnet-straight-fill::before {
-  content: "\fcd5";
-}
-
-.ph-magnifying-glass-fill::before {
-  content: "\fcd6";
-}
-
-.ph-magnifying-glass-minus-fill::before {
-  content: "\fcd7";
-}
-
-.ph-magnifying-glass-plus-fill::before {
-  content: "\fcd8";
-}
-
-.ph-map-pin-fill::before {
-  content: "\fcd9";
-}
-
-.ph-map-pin-line-fill::before {
-  content: "\fcda";
-}
-
-.ph-map-trifold-fill::before {
-  content: "\fcdb";
-}
-
-.ph-marker-circle-fill::before {
-  content: "\fcdc";
-}
-
-.ph-martini-fill::before {
-  content: "\fcdd";
-}
-
-.ph-mask-happy-fill::before {
-  content: "\fcde";
-}
-
-.ph-mask-sad-fill::before {
-  content: "\fcdf";
-}
-
-.ph-math-operations-fill::before {
-  content: "\fce0";
-}
-
-.ph-medal-fill::before {
-  content: "\fce1";
-}
-
-.ph-medium-logo-fill::before {
-  content: "\fce2";
-}
-
-.ph-megaphone-fill::before {
-  content: "\fce3";
-}
-
-.ph-megaphone-simple-fill::before {
-  content: "\fce4";
-}
-
-.ph-messenger-logo-fill::before {
-  content: "\fce5";
-}
-
-.ph-microphone-fill::before {
-  content: "\fce6";
-}
-
-.ph-microphone-slash-fill::before {
-  content: "\fce7";
-}
-
-.ph-microphone-stage-fill::before {
-  content: "\fce8";
-}
-
-.ph-microsoft-excel-logo-fill::before {
-  content: "\fce9";
-}
-
-.ph-microsoft-powerpoint-logo-fill::before {
-  content: "\fcea";
-}
-
-.ph-microsoft-teams-logo-fill::before {
-  content: "\fceb";
-}
-
-.ph-microsoft-word-logo-fill::before {
-  content: "\fcec";
-}
-
-.ph-minus-circle-fill::before {
-  content: "\fced";
-}
-
-.ph-minus-fill::before {
-  content: "\fcee";
-}
-
-.ph-money-fill::before {
-  content: "\fcef";
-}
-
-.ph-monitor-fill::before {
-  content: "\fcf0";
-}
-
-.ph-monitor-play-fill::before {
-  content: "\fcf1";
-}
-
-.ph-moon-fill::before {
-  content: "\fcf2";
-}
-
-.ph-moon-stars-fill::before {
-  content: "\fcf3";
-}
-
-.ph-mountains-fill::before {
-  content: "\fcf4";
-}
-
-.ph-mouse-fill::before {
-  content: "\fcf5";
-}
-
-.ph-mouse-simple-fill::before {
-  content: "\fcf6";
-}
-
-.ph-music-note-fill::before {
-  content: "\fcf7";
-}
-
-.ph-music-note-simple-fill::before {
-  content: "\fcf8";
-}
-
-.ph-music-notes-fill::before {
-  content: "\fcf9";
-}
-
-.ph-music-notes-plus-fill::before {
-  content: "\fcfa";
-}
-
-.ph-music-notes-simple-fill::before {
-  content: "\fcfb";
-}
-
-.ph-navigation-arrow-fill::before {
-  content: "\fcfc";
-}
-
-.ph-needle-fill::before {
-  content: "\fcfd";
-}
-
-.ph-newspaper-clipping-fill::before {
-  content: "\fcfe";
-}
-
-.ph-newspaper-fill::before {
-  content: "\fcff";
-}
-
-.ph-note-blank-fill::before {
-  content: "\fd00";
-}
-
-.ph-note-fill::before {
-  content: "\fd01";
-}
-
-.ph-note-pencil-fill::before {
-  content: "\fd02";
-}
-
-.ph-notebook-fill::before {
-  content: "\fd03";
-}
-
-.ph-notepad-fill::before {
-  content: "\fd04";
-}
-
-.ph-notification-fill::before {
-  content: "\fd05";
-}
-
-.ph-number-circle-eight-fill::before {
-  content: "\fd06";
-}
-
-.ph-number-circle-five-fill::before {
-  content: "\fd07";
-}
-
-.ph-number-circle-four-fill::before {
-  content: "\fd08";
-}
-
-.ph-number-circle-nine-fill::before {
-  content: "\fd09";
-}
-
-.ph-number-circle-one-fill::before {
-  content: "\fd0a";
-}
-
-.ph-number-circle-seven-fill::before {
-  content: "\fd0b";
-}
-
-.ph-number-circle-six-fill::before {
-  content: "\fd0c";
-}
-
-.ph-number-circle-three-fill::before {
-  content: "\fd0d";
-}
-
-.ph-number-circle-two-fill::before {
-  content: "\fd0e";
-}
-
-.ph-number-circle-zero-fill::before {
-  content: "\fd0f";
-}
-
-.ph-number-eight-fill::before {
-  content: "\fd10";
-}
-
-.ph-number-five-fill::before {
-  content: "\fd11";
-}
-
-.ph-number-four-fill::before {
-  content: "\fd12";
-}
-
-.ph-number-nine-fill::before {
-  content: "\fd13";
-}
-
-.ph-number-one-fill::before {
-  content: "\fd14";
-}
-
-.ph-number-seven-fill::before {
-  content: "\fd15";
-}
-
-.ph-number-six-fill::before {
-  content: "\fd16";
-}
-
-.ph-number-square-eight-fill::before {
-  content: "\fd17";
-}
-
-.ph-number-square-five-fill::before {
-  content: "\fd18";
-}
-
-.ph-number-square-four-fill::before {
-  content: "\fd19";
-}
-
-.ph-number-square-nine-fill::before {
-  content: "\fd1a";
-}
-
-.ph-number-square-one-fill::before {
-  content: "\fd1b";
-}
-
-.ph-number-square-seven-fill::before {
-  content: "\fd1c";
-}
-
-.ph-number-square-six-fill::before {
-  content: "\fd1d";
-}
-
-.ph-number-square-three-fill::before {
-  content: "\fd1e";
-}
-
-.ph-number-square-two-fill::before {
-  content: "\fd1f";
-}
-
-.ph-number-square-zero-fill::before {
-  content: "\fd20";
-}
-
-.ph-number-three-fill::before {
-  content: "\fd21";
-}
-
-.ph-number-two-fill::before {
-  content: "\fd22";
-}
-
-.ph-number-zero-fill::before {
-  content: "\fd23";
-}
-
-.ph-nut-fill::before {
-  content: "\fd24";
-}
-
-.ph-ny-times-logo-fill::before {
-  content: "\fd25";
-}
-
-.ph-octagon-fill::before {
-  content: "\fd26";
-}
-
-.ph-option-fill::before {
-  content: "\fd27";
-}
-
-.ph-package-fill::before {
-  content: "\fd28";
-}
-
-.ph-paint-brush-broad-fill::before {
-  content: "\fd29";
-}
-
-.ph-paint-brush-fill::before {
-  content: "\fd2a";
-}
-
-.ph-paint-brush-household-fill::before {
-  content: "\fd2b";
-}
-
-.ph-paint-bucket-fill::before {
-  content: "\fd2c";
-}
-
-.ph-paint-roller-fill::before {
-  content: "\fd2d";
-}
-
-.ph-palette-fill::before {
-  content: "\fd2e";
-}
-
-.ph-paper-plane-fill::before {
-  content: "\fd2f";
-}
-
-.ph-paper-plane-right-fill::before {
-  content: "\fd30";
-}
-
-.ph-paper-plane-tilt-fill::before {
-  content: "\fd31";
-}
-
-.ph-paperclip-fill::before {
-  content: "\fd32";
-}
-
-.ph-paperclip-horizontal-fill::before {
-  content: "\fd33";
-}
-
-.ph-parachute-fill::before {
-  content: "\fd34";
-}
-
-.ph-password-fill::before {
-  content: "\fd35";
-}
-
-.ph-path-fill::before {
-  content: "\fd36";
-}
-
-.ph-pause-circle-fill::before {
-  content: "\fd37";
-}
-
-.ph-pause-fill::before {
-  content: "\fd38";
-}
-
-.ph-paw-print-fill::before {
-  content: "\fd39";
-}
-
-.ph-peace-fill::before {
-  content: "\fd3a";
-}
-
-.ph-pen-fill::before {
-  content: "\fd3b";
-}
-
-.ph-pen-nib-fill::before {
-  content: "\fd3c";
-}
-
-.ph-pen-nib-straight-fill::before {
-  content: "\fd3d";
-}
-
-.ph-pencil-circle-fill::before {
-  content: "\fd3e";
-}
-
-.ph-pencil-fill::before {
-  content: "\fd3f";
-}
-
-.ph-pencil-line-fill::before {
-  content: "\fd40";
-}
-
-.ph-pencil-simple-fill::before {
-  content: "\fd41";
-}
-
-.ph-pencil-simple-line-fill::before {
-  content: "\fd42";
-}
-
-.ph-percent-fill::before {
-  content: "\fd43";
-}
-
-.ph-person-fill::before {
-  content: "\fd44";
-}
-
-.ph-person-simple-fill::before {
-  content: "\fd45";
-}
-
-.ph-person-simple-run-fill::before {
-  content: "\fd46";
-}
-
-.ph-person-simple-walk-fill::before {
-  content: "\fd47";
-}
-
-.ph-perspective-fill::before {
-  content: "\fd48";
-}
-
-.ph-phone-call-fill::before {
-  content: "\fd49";
-}
-
-.ph-phone-disconnect-fill::before {
-  content: "\fd4a";
-}
-
-.ph-phone-fill::before {
-  content: "\fd4b";
-}
-
-.ph-phone-incoming-fill::before {
-  content: "\fd4c";
-}
-
-.ph-phone-outgoing-fill::before {
-  content: "\fd4d";
-}
-
-.ph-phone-slash-fill::before {
-  content: "\fd4e";
-}
-
-.ph-phone-x-fill::before {
-  content: "\fd4f";
-}
-
-.ph-phosphor-logo-fill::before {
-  content: "\fd50";
-}
-
-.ph-piano-keys-fill::before {
-  content: "\fd51";
-}
-
-.ph-picture-in-picture-fill::before {
-  content: "\fd52";
-}
-
-.ph-pill-fill::before {
-  content: "\fd53";
-}
-
-.ph-pinterest-logo-fill::before {
-  content: "\fd54";
-}
-
-.ph-pinwheel-fill::before {
-  content: "\fd55";
-}
-
-.ph-pizza-fill::before {
-  content: "\fd56";
-}
-
-.ph-placeholder-fill::before {
-  content: "\fd57";
-}
-
-.ph-planet-fill::before {
-  content: "\fd58";
-}
-
-.ph-play-circle-fill::before {
-  content: "\fd59";
-}
-
-.ph-play-fill::before {
-  content: "\fd5a";
-}
-
-.ph-playlist-fill::before {
-  content: "\fd5b";
-}
-
-.ph-plug-fill::before {
-  content: "\fd5c";
-}
-
-.ph-plugs-connected-fill::before {
-  content: "\fd5d";
-}
-
-.ph-plugs-fill::before {
-  content: "\fd5e";
-}
-
-.ph-plus-circle-fill::before {
-  content: "\fd5f";
-}
-
-.ph-plus-fill::before {
-  content: "\fd60";
-}
-
-.ph-plus-minus-fill::before {
-  content: "\fd61";
-}
-
-.ph-poker-chip-fill::before {
-  content: "\fd62";
-}
-
-.ph-police-car-fill::before {
-  content: "\fd63";
-}
-
-.ph-polygon-fill::before {
-  content: "\fd64";
-}
-
-.ph-popcorn-fill::before {
-  content: "\fd65";
-}
-
-.ph-power-fill::before {
-  content: "\fd66";
-}
-
-.ph-prescription-fill::before {
-  content: "\fd67";
-}
-
-.ph-presentation-chart-fill::before {
-  content: "\fd68";
-}
-
-.ph-presentation-fill::before {
-  content: "\fd69";
-}
-
-.ph-printer-fill::before {
-  content: "\fd6a";
-}
-
-.ph-prohibit-fill::before {
-  content: "\fd6b";
-}
-
-.ph-prohibit-inset-fill::before {
-  content: "\fd6c";
-}
-
-.ph-projector-screen-chart-fill::before {
-  content: "\fd6d";
-}
-
-.ph-projector-screen-fill::before {
-  content: "\fd6e";
-}
-
-.ph-push-pin-fill::before {
-  content: "\fd6f";
-}
-
-.ph-push-pin-simple-fill::before {
-  content: "\fd70";
-}
-
-.ph-push-pin-simple-slash-fill::before {
-  content: "\fd71";
-}
-
-.ph-push-pin-slash-fill::before {
-  content: "\fd72";
-}
-
-.ph-puzzle-piece-fill::before {
-  content: "\fd73";
-}
-
-.ph-qr-code-fill::before {
-  content: "\fd74";
-}
-
-.ph-question-fill::before {
-  content: "\fd75";
-}
-
-.ph-queue-fill::before {
-  content: "\fd76";
-}
-
-.ph-quotes-fill::before {
-  content: "\fd77";
-}
-
-.ph-radical-fill::before {
-  content: "\fd78";
-}
-
-.ph-radio-button-fill::before {
-  content: "\fd79";
-}
-
-.ph-radio-fill::before {
-  content: "\fd7a";
-}
-
-.ph-rainbow-cloud-fill::before {
-  content: "\fd7b";
-}
-
-.ph-rainbow-fill::before {
-  content: "\fd7c";
-}
-
-.ph-receipt-fill::before {
-  content: "\fd7d";
-}
-
-.ph-record-fill::before {
-  content: "\fd7e";
-}
-
-.ph-rectangle-fill::before {
-  content: "\fd7f";
-}
-
-.ph-recycle-fill::before {
-  content: "\fd80";
-}
-
-.ph-reddit-logo-fill::before {
-  content: "\fd81";
-}
-
-.ph-repeat-fill::before {
-  content: "\fd82";
-}
-
-.ph-repeat-once-fill::before {
-  content: "\fd83";
-}
-
-.ph-rewind-circle-fill::before {
-  content: "\fd84";
-}
-
-.ph-rewind-fill::before {
-  content: "\fd85";
-}
-
-.ph-robot-fill::before {
-  content: "\fd86";
-}
-
-.ph-rocket-fill::before {
-  content: "\fd87";
-}
-
-.ph-rocket-launch-fill::before {
-  content: "\fd88";
-}
-
-.ph-rows-fill::before {
-  content: "\fd89";
-}
-
-.ph-rss-fill::before {
-  content: "\fd8a";
-}
-
-.ph-rss-simple-fill::before {
-  content: "\fd8b";
-}
-
-.ph-rug-fill::before {
-  content: "\fd8c";
-}
-
-.ph-ruler-fill::before {
-  content: "\fd8d";
-}
-
-.ph-scales-fill::before {
-  content: "\fd8e";
-}
-
-.ph-scan-fill::before {
-  content: "\fd8f";
-}
-
-.ph-scissors-fill::before {
-  content: "\fd90";
-}
-
-.ph-screencast-fill::before {
-  content: "\fd91";
-}
-
-.ph-scribble-loop-fill::before {
-  content: "\fd92";
-}
-
-.ph-scroll-fill::before {
-  content: "\fd93";
-}
-
-.ph-selection-all-fill::before {
-  content: "\fd94";
-}
-
-.ph-selection-background-fill::before {
-  content: "\fd95";
-}
-
-.ph-selection-fill::before {
-  content: "\fd96";
-}
-
-.ph-selection-foreground-fill::before {
-  content: "\fd97";
-}
-
-.ph-selection-inverse-fill::before {
-  content: "\fd98";
-}
-
-.ph-selection-plus-fill::before {
-  content: "\fd99";
-}
-
-.ph-selection-slash-fill::before {
-  content: "\fd9a";
-}
-
-.ph-share-fill::before {
-  content: "\fd9b";
-}
-
-.ph-share-network-fill::before {
-  content: "\fd9c";
-}
-
-.ph-shield-check-fill::before {
-  content: "\fd9d";
-}
-
-.ph-shield-checkered-fill::before {
-  content: "\fd9e";
-}
-
-.ph-shield-chevron-fill::before {
-  content: "\fd9f";
-}
-
-.ph-shield-fill::before {
-  content: "\fda0";
-}
-
-.ph-shield-plus-fill::before {
-  content: "\fda1";
-}
-
-.ph-shield-slash-fill::before {
-  content: "\fda2";
-}
-
-.ph-shield-star-fill::before {
-  content: "\fda3";
-}
-
-.ph-shield-warning-fill::before {
-  content: "\fda4";
-}
-
-.ph-shopping-bag-fill::before {
-  content: "\fda5";
-}
-
-.ph-shopping-bag-open-fill::before {
-  content: "\fda6";
-}
-
-.ph-shopping-cart-fill::before {
-  content: "\fda7";
-}
-
-.ph-shopping-cart-simple-fill::before {
-  content: "\fda8";
-}
-
-.ph-shower-fill::before {
-  content: "\fda9";
-}
-
-.ph-shuffle-angular-fill::before {
-  content: "\fdaa";
-}
-
-.ph-shuffle-fill::before {
-  content: "\fdab";
-}
-
-.ph-shuffle-simple-fill::before {
-  content: "\fdac";
-}
-
-.ph-sidebar-fill::before {
-  content: "\fdad";
-}
-
-.ph-sidebar-simple-fill::before {
-  content: "\fdae";
-}
-
-.ph-sign-in-fill::before {
-  content: "\fdaf";
-}
-
-.ph-sign-out-fill::before {
-  content: "\fdb0";
-}
-
-.ph-signpost-fill::before {
-  content: "\fdb1";
-}
-
-.ph-sim-card-fill::before {
-  content: "\fdb2";
-}
-
-.ph-sketch-logo-fill::before {
-  content: "\fdb3";
-}
-
-.ph-skip-back-circle-fill::before {
-  content: "\fdb4";
-}
-
-.ph-skip-back-fill::before {
-  content: "\fdb5";
-}
-
-.ph-skip-forward-circle-fill::before {
-  content: "\fdb6";
-}
-
-.ph-skip-forward-fill::before {
-  content: "\fdb7";
-}
-
-.ph-skull-fill::before {
-  content: "\fdb8";
-}
-
-.ph-slack-logo-fill::before {
-  content: "\fdb9";
-}
-
-.ph-sliders-fill::before {
-  content: "\fdba";
-}
-
-.ph-sliders-horizontal-fill::before {
-  content: "\fdbb";
-}
-
-.ph-smiley-blank-fill::before {
-  content: "\fdbc";
-}
-
-.ph-smiley-fill::before {
-  content: "\fdbd";
-}
-
-.ph-smiley-meh-fill::before {
-  content: "\fdbe";
-}
-
-.ph-smiley-nervous-fill::before {
-  content: "\fdbf";
-}
-
-.ph-smiley-sad-fill::before {
-  content: "\fdc0";
-}
-
-.ph-smiley-sticker-fill::before {
-  content: "\fdc1";
-}
-
-.ph-smiley-wink-fill::before {
-  content: "\fdc2";
-}
-
-.ph-smiley-x-eyes-fill::before {
-  content: "\fdc3";
-}
-
-.ph-snapchat-logo-fill::before {
-  content: "\fdc4";
-}
-
-.ph-snowflake-fill::before {
-  content: "\fdc5";
-}
-
-.ph-soccer-ball-fill::before {
-  content: "\fdc6";
-}
-
-.ph-sort-ascending-fill::before {
-  content: "\fdc7";
-}
-
-.ph-sort-descending-fill::before {
-  content: "\fdc8";
-}
-
-.ph-spade-fill::before {
-  content: "\fdc9";
-}
-
-.ph-sparkle-fill::before {
-  content: "\fdca";
-}
-
-.ph-speaker-high-fill::before {
-  content: "\fdcb";
-}
-
-.ph-speaker-low-fill::before {
-  content: "\fdcc";
-}
-
-.ph-speaker-none-fill::before {
-  content: "\fdcd";
-}
-
-.ph-speaker-simple-high-fill::before {
-  content: "\fdce";
-}
-
-.ph-speaker-simple-low-fill::before {
-  content: "\fdcf";
-}
-
-.ph-speaker-simple-none-fill::before {
-  content: "\fdd0";
-}
-
-.ph-speaker-simple-slash-fill::before {
-  content: "\fdd1";
-}
-
-.ph-speaker-simple-x-fill::before {
-  content: "\fdd2";
-}
-
-.ph-speaker-slash-fill::before {
-  content: "\fdd3";
-}
-
-.ph-speaker-x-fill::before {
-  content: "\fdd4";
-}
-
-.ph-spinner-fill::before {
-  content: "\fdd5";
-}
-
-.ph-spinner-gap-fill::before {
-  content: "\fdd6";
-}
-
-.ph-spiral-fill::before {
-  content: "\fdd7";
-}
-
-.ph-spotify-logo-fill::before {
-  content: "\fdd8";
-}
-
-.ph-square-fill::before {
-  content: "\fdd9";
-}
-
-.ph-square-half-bottom-fill::before {
-  content: "\fdda";
-}
-
-.ph-square-half-fill::before {
-  content: "\fddb";
-}
-
-.ph-square-logo-fill::before {
-  content: "\fddc";
-}
-
-.ph-squares-four-fill::before {
-  content: "\fddd";
-}
-
-.ph-stack-fill::before {
-  content: "\fdde";
-}
-
-.ph-stack-overflow-logo-fill::before {
-  content: "\fddf";
-}
-
-.ph-stack-simple-fill::before {
-  content: "\fde0";
-}
-
-.ph-stamp-fill::before {
-  content: "\fde1";
-}
-
-.ph-star-fill::before {
-  content: "\fde2";
-}
-
-.ph-star-four-fill::before {
-  content: "\fde3";
-}
-
-.ph-star-half-fill::before {
-  content: "\fde4";
-}
-
-.ph-sticker-fill::before {
-  content: "\fde5";
-}
-
-.ph-stop-circle-fill::before {
-  content: "\fde6";
-}
-
-.ph-stop-fill::before {
-  content: "\fde7";
-}
-
-.ph-storefront-fill::before {
-  content: "\fde8";
-}
-
-.ph-strategy-fill::before {
-  content: "\fde9";
-}
-
-.ph-stripe-logo-fill::before {
-  content: "\fdea";
-}
-
-.ph-student-fill::before {
-  content: "\fdeb";
-}
-
-.ph-suitcase-fill::before {
-  content: "\fdec";
-}
-
-.ph-suitcase-simple-fill::before {
-  content: "\fded";
-}
-
-.ph-sun-dim-fill::before {
-  content: "\fdee";
-}
-
-.ph-sun-fill::before {
-  content: "\fdef";
-}
-
-.ph-sun-horizon-fill::before {
-  content: "\fdf0";
-}
-
-.ph-sunglasses-fill::before {
-  content: "\fdf1";
-}
-
-.ph-swap-fill::before {
-  content: "\fdf2";
-}
-
-.ph-swatches-fill::before {
-  content: "\fdf3";
-}
-
-.ph-sword-fill::before {
-  content: "\fdf4";
-}
-
-.ph-syringe-fill::before {
-  content: "\fdf5";
-}
-
-.ph-t-shirt-fill::before {
-  content: "\fdf6";
-}
-
-.ph-table-fill::before {
-  content: "\fdf7";
-}
-
-.ph-tabs-fill::before {
-  content: "\fdf8";
-}
-
-.ph-tag-chevron-fill::before {
-  content: "\fdf9";
-}
-
-.ph-tag-fill::before {
-  content: "\fdfa";
-}
-
-.ph-tag-simple-fill::before {
-  content: "\fdfb";
-}
-
-.ph-target-fill::before {
-  content: "\fdfc";
-}
-
-.ph-taxi-fill::before {
-  content: "\fdfd";
-}
-
-.ph-telegram-logo-fill::before {
-  content: "\fdfe";
-}
-
-.ph-television-fill::before {
-  content: "\fdff";
-}
-
-.ph-television-simple-fill::before {
-  content: "\fe00";
-}
-
-.ph-tennis-ball-fill::before {
-  content: "\fe01";
-}
-
-.ph-terminal-fill::before {
-  content: "\fe02";
-}
-
-.ph-terminal-window-fill::before {
-  content: "\fe03";
-}
-
-.ph-test-tube-fill::before {
-  content: "\fe04";
-}
-
-.ph-text-aa-fill::before {
-  content: "\fe05";
-}
-
-.ph-text-align-center-fill::before {
-  content: "\fe06";
-}
-
-.ph-text-align-justify-fill::before {
-  content: "\fe07";
-}
-
-.ph-text-align-left-fill::before {
-  content: "\fe08";
-}
-
-.ph-text-align-right-fill::before {
-  content: "\fe09";
-}
-
-.ph-text-bolder-fill::before {
-  content: "\fe0a";
-}
-
-.ph-text-h-fill::before {
-  content: "\fe0b";
-}
-
-.ph-text-h-five-fill::before {
-  content: "\fe0c";
-}
-
-.ph-text-h-four-fill::before {
-  content: "\fe0d";
-}
-
-.ph-text-h-one-fill::before {
-  content: "\fe0e";
-}
-
-.ph-text-h-six-fill::before {
-  content: "\fe0f";
-}
-
-.ph-text-h-three-fill::before {
-  content: "\fe10";
-}
-
-.ph-text-h-two-fill::before {
-  content: "\fe11";
-}
-
-.ph-text-indent-fill::before {
-  content: "\fe12";
-}
-
-.ph-text-italic-fill::before {
-  content: "\fe13";
-}
-
-.ph-text-outdent-fill::before {
-  content: "\fe14";
-}
-
-.ph-text-strikethrough-fill::before {
-  content: "\fe15";
-}
-
-.ph-text-t-fill::before {
-  content: "\fe16";
-}
-
-.ph-text-underline-fill::before {
-  content: "\fe17";
-}
-
-.ph-textbox-fill::before {
-  content: "\fe18";
-}
-
-.ph-thermometer-cold-fill::before {
-  content: "\fe19";
-}
-
-.ph-thermometer-fill::before {
-  content: "\fe1a";
-}
-
-.ph-thermometer-hot-fill::before {
-  content: "\fe1b";
-}
-
-.ph-thermometer-simple-fill::before {
-  content: "\fe1c";
-}
-
-.ph-thumbs-down-fill::before {
-  content: "\fe1d";
-}
-
-.ph-thumbs-up-fill::before {
-  content: "\fe1e";
-}
-
-.ph-ticket-fill::before {
-  content: "\fe1f";
-}
-
-.ph-tiktok-logo-fill::before {
-  content: "\fe20";
-}
-
-.ph-timer-fill::before {
-  content: "\fe21";
-}
-
-.ph-toggle-left-fill::before {
-  content: "\fe22";
-}
-
-.ph-toggle-right-fill::before {
-  content: "\fe23";
-}
-
-.ph-toilet-fill::before {
-  content: "\fe24";
-}
-
-.ph-toilet-paper-fill::before {
-  content: "\fe25";
-}
-
-.ph-tote-fill::before {
-  content: "\fe26";
-}
-
-.ph-tote-simple-fill::before {
-  content: "\fe27";
-}
-
-.ph-trademark-registered-fill::before {
-  content: "\fe28";
-}
-
-.ph-traffic-cone-fill::before {
-  content: "\fe29";
-}
-
-.ph-traffic-sign-fill::before {
-  content: "\fe2a";
-}
-
-.ph-traffic-signal-fill::before {
-  content: "\fe2b";
-}
-
-.ph-train-fill::before {
-  content: "\fe2c";
-}
-
-.ph-train-regional-fill::before {
-  content: "\fe2d";
-}
-
-.ph-train-simple-fill::before {
-  content: "\fe2e";
-}
-
-.ph-translate-fill::before {
-  content: "\fe2f";
-}
-
-.ph-trash-fill::before {
-  content: "\fe30";
-}
-
-.ph-trash-simple-fill::before {
-  content: "\fe31";
-}
-
-.ph-tray-fill::before {
-  content: "\fe32";
-}
-
-.ph-tree-evergreen-fill::before {
-  content: "\fe33";
-}
-
-.ph-tree-fill::before {
-  content: "\fe34";
-}
-
-.ph-tree-structure-fill::before {
-  content: "\fe35";
-}
-
-.ph-trend-down-fill::before {
-  content: "\fe36";
-}
-
-.ph-trend-up-fill::before {
-  content: "\fe37";
-}
-
-.ph-triangle-fill::before {
-  content: "\fe38";
-}
-
-.ph-trophy-fill::before {
-  content: "\fe39";
-}
-
-.ph-truck-fill::before {
-  content: "\fe3a";
-}
-
-.ph-twitch-logo-fill::before {
-  content: "\fe3b";
-}
-
-.ph-twitter-logo-fill::before {
-  content: "\fe3c";
-}
-
-.ph-umbrella-fill::before {
-  content: "\fe3d";
-}
-
-.ph-umbrella-simple-fill::before {
-  content: "\fe3e";
-}
-
-.ph-upload-fill::before {
-  content: "\fe3f";
-}
-
-.ph-upload-simple-fill::before {
-  content: "\fe40";
-}
-
-.ph-user-circle-fill::before {
-  content: "\fe41";
-}
-
-.ph-user-circle-gear-fill::before {
-  content: "\fe42";
-}
-
-.ph-user-circle-minus-fill::before {
-  content: "\fe43";
-}
-
-.ph-user-circle-plus-fill::before {
-  content: "\fe44";
-}
-
-.ph-user-fill::before {
-  content: "\fe45";
-}
-
-.ph-user-focus-fill::before {
-  content: "\fe46";
-}
-
-.ph-user-gear-fill::before {
-  content: "\fe47";
-}
-
-.ph-user-list-fill::before {
-  content: "\fe48";
-}
-
-.ph-user-minus-fill::before {
-  content: "\fe49";
-}
-
-.ph-user-plus-fill::before {
-  content: "\fe4a";
-}
-
-.ph-user-rectangle-fill::before {
-  content: "\fe4b";
-}
-
-.ph-user-square-fill::before {
-  content: "\fe4c";
-}
-
-.ph-user-switch-fill::before {
-  content: "\fe4d";
-}
-
-.ph-users-fill::before {
-  content: "\fe4e";
-}
-
-.ph-users-four-fill::before {
-  content: "\fe4f";
-}
-
-.ph-users-three-fill::before {
-  content: "\fe50";
-}
-
-.ph-vault-fill::before {
-  content: "\fe51";
-}
-
-.ph-vibrate-fill::before {
-  content: "\fe52";
-}
-
-.ph-video-camera-fill::before {
-  content: "\fe53";
-}
-
-.ph-video-camera-slash-fill::before {
-  content: "\fe54";
-}
-
-.ph-vignette-fill::before {
-  content: "\fe55";
-}
-
-.ph-voicemail-fill::before {
-  content: "\fe56";
-}
-
-.ph-volleyball-fill::before {
-  content: "\fe57";
-}
-
-.ph-wall-fill::before {
-  content: "\fe58";
-}
-
-.ph-wallet-fill::before {
-  content: "\fe59";
-}
-
-.ph-warning-circle-fill::before {
-  content: "\fe5a";
-}
-
-.ph-warning-fill::before {
-  content: "\fe5b";
-}
-
-.ph-warning-octagon-fill::before {
-  content: "\fe5c";
-}
-
-.ph-watch-fill::before {
-  content: "\fe5d";
-}
-
-.ph-wave-sawtooth-fill::before {
-  content: "\fe5e";
-}
-
-.ph-wave-sine-fill::before {
-  content: "\fe5f";
-}
-
-.ph-wave-square-fill::before {
-  content: "\fe60";
-}
-
-.ph-wave-triangle-fill::before {
-  content: "\fe61";
-}
-
-.ph-waves-fill::before {
-  content: "\fe62";
-}
-
-.ph-webcam-fill::before {
-  content: "\fe63";
-}
-
-.ph-whatsapp-logo-fill::before {
-  content: "\fe64";
-}
-
-.ph-wheelchair-fill::before {
-  content: "\fe65";
-}
-
-.ph-wifi-high-fill::before {
-  content: "\fe66";
-}
-
-.ph-wifi-low-fill::before {
-  content: "\fe67";
-}
-
-.ph-wifi-medium-fill::before {
-  content: "\fe68";
-}
-
-.ph-wifi-none-fill::before {
-  content: "\fe69";
-}
-
-.ph-wifi-slash-fill::before {
-  content: "\fe6a";
-}
-
-.ph-wifi-x-fill::before {
-  content: "\fe6b";
-}
-
-.ph-wind-fill::before {
-  content: "\fe6c";
-}
-
-.ph-windows-logo-fill::before {
-  content: "\fe6d";
-}
-
-.ph-wine-fill::before {
-  content: "\fe6e";
-}
-
-.ph-wrench-fill::before {
-  content: "\fe6f";
-}
-
-.ph-x-circle-fill::before {
-  content: "\fe70";
-}
-
-.ph-x-fill::before {
-  content: "\fe71";
-}
-
-.ph-x-square-fill::before {
-  content: "\fe72";
-}
-
-.ph-yin-yang-fill::before {
-  content: "\fe73";
-}
-
-.ph-youtube-logo-fill::before {
-  content: "\fe74";
-}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7ea97aef1..5bc362a2f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -23,7 +23,6 @@ importers:
       gulp-terser: 2.1.0
       install-peers: ^1.0.4
       js-yaml: 4.1.0
-      phosphor-icons: ^1.4.2
       rome: ^11.0.0
       seedrandom: ^3.0.5
       start-server-and-test: 1.15.2
@@ -34,7 +33,6 @@ importers:
       '@tensorflow/tfjs': 3.21.0_seedrandom@3.0.5
       calckey-js: 0.0.22
       js-yaml: 4.1.0
-      phosphor-icons: 1.4.2
       seedrandom: 3.0.5
     devDependencies:
       '@types/gulp': 4.0.10
@@ -3398,7 +3396,7 @@ packages:
   /axios/0.25.0_debug@4.3.4:
     resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2_debug@4.3.4
     transitivePeerDependencies:
       - debug
     dev: true
@@ -6397,6 +6395,19 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dev: false
+
+  /follow-redirects/1.15.2_debug@4.3.4:
+    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+    dependencies:
+      debug: 4.3.4
+    dev: true
 
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
@@ -10060,10 +10071,6 @@ packages:
       split2: 4.1.0
     dev: false
 
-  /phosphor-icons/1.4.2:
-    resolution: {integrity: sha512-vDyuRWLSEb87dxpoOGpP1GCjr/TFzA0Ljt0TtJcwXO7/iPdSZW0e/2m1jsANH1ML5ZyZXcjeWx6pzT0A0tgYDA==}
-    dev: false
-
   /photoswipe/5.3.4:
     resolution: {integrity: sha512-SN+RWHqxJvdwzXJsh8KrG+ajjPpdTX5HpKglEd0k9o6o5fW+QHPkW8//Bo11MB+NQwTa/hFw8BDv2EdxiDXjNw==}
     engines: {node: '>= 0.12.0'}

From 1979a60ff8514684ad34aad395d21e38103b7eaf Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 11 Mar 2023 13:01:04 -0800
Subject: [PATCH 177/582] icons

---
 packages/client/src/account.ts                |  6 +-
 .../src/components/MkAbuseReportWindow.vue    |  2 +-
 .../src/components/MkChannelFollowButton.vue  |  6 +-
 .../src/components/MkChannelPreview.vue       |  6 +-
 .../client/src/components/MkContainer.vue     |  4 +-
 .../src/components/MkDateSeparatedList.vue    |  4 +-
 packages/client/src/components/MkDialog.vue   | 12 +--
 .../client/src/components/MkDrive.file.vue    | 12 +--
 .../client/src/components/MkDrive.folder.vue  | 10 +--
 .../src/components/MkDrive.navFolder.vue      |  2 +-
 packages/client/src/components/MkDrive.vue    | 16 ++--
 .../src/components/MkDriveFileThumbnail.vue   | 18 ++---
 .../src/components/MkEmojiPicker.section.vue  |  2 +-
 .../client/src/components/MkEmojiPicker.vue   | 10 +--
 .../client/src/components/MkFileTypeIcon.vue  |  2 +-
 packages/client/src/components/MkFolder.vue   |  4 +-
 .../client/src/components/MkFollowButton.vue  | 14 ++--
 packages/client/src/components/MkGoogle.vue   |  2 +-
 packages/client/src/components/MkInfo.vue     |  4 +-
 packages/client/src/components/MkKeyValue.vue |  2 +-
 packages/client/src/components/MkLink.vue     |  2 +-
 .../client/src/components/MkMediaBanner.vue   |  4 +-
 .../client/src/components/MkMediaImage.vue    |  4 +-
 .../client/src/components/MkMediaVideo.vue    |  4 +-
 packages/client/src/components/MkMenu.vue     |  2 +-
 .../src/components/MkModalPageWindow.vue      | 12 +--
 .../client/src/components/MkModalWindow.vue   |  6 +-
 packages/client/src/components/MkMoved.vue    |  2 +-
 packages/client/src/components/MkNote.vue     | 24 +++---
 .../client/src/components/MkNoteDetailed.vue  | 18 ++---
 packages/client/src/components/MkNoteSub.vue  |  2 +-
 .../client/src/components/MkNotification.vue  | 20 ++---
 .../client/src/components/MkPageWindow.vue    | 12 +--
 packages/client/src/components/MkPoll.vue     |  2 +-
 .../client/src/components/MkPollEditor.vue    |  4 +-
 packages/client/src/components/MkPostForm.vue | 38 +++++-----
 .../src/components/MkPostFormAttaches.vue     | 10 +--
 .../client/src/components/MkQuoteButton.vue   |  2 +-
 .../client/src/components/MkRenoteButton.vue  | 10 +--
 packages/client/src/components/MkSignin.vue   | 12 +--
 packages/client/src/components/MkSignup.vue   | 54 +++++++-------
 .../client/src/components/MkStarButton.vue    |  6 +-
 .../src/components/MkSubNoteContent.vue       |  2 +-
 .../src/components/MkTutorialDialog.vue       | 22 +++---
 .../client/src/components/MkUrlPreview.vue    |  6 +-
 .../client/src/components/MkVisibility.vue    |  8 +-
 .../src/components/MkVisibilityPicker.vue     | 12 +--
 .../client/src/components/MkWaitingDialog.vue |  2 +-
 packages/client/src/components/MkWidgets.vue  |  8 +-
 packages/client/src/components/MkWindow.vue   |  6 +-
 .../client/src/components/form/checkbox.vue   |  2 +-
 .../client/src/components/form/folder.vue     |  4 +-
 packages/client/src/components/form/input.vue |  2 +-
 packages/client/src/components/form/link.vue  |  4 +-
 .../client/src/components/form/select.vue     |  4 +-
 .../client/src/components/form/suspense.vue   |  4 +-
 .../client/src/components/form/textarea.vue   |  2 +-
 packages/client/src/components/global/MkA.vue |  8 +-
 .../client/src/components/global/MkAd.vue     |  2 +-
 .../client/src/components/global/MkError.vue  |  2 +-
 .../client/src/components/global/MkUrl.vue    |  2 +-
 .../client/src/components/page/page.post.vue  |  4 +-
 packages/client/src/icons.scss                | 20 ++---
 packages/client/src/navbar.ts                 | 54 +++++++-------
 packages/client/src/pages/_error_.vue         |  4 +-
 packages/client/src/pages/about-calckey.vue   |  6 +-
 packages/client/src/pages/about.emojis.vue    |  2 +-
 .../client/src/pages/about.federation.vue     |  2 +-
 packages/client/src/pages/about.vue           | 10 +--
 packages/client/src/pages/admin-file.vue      | 12 +--
 packages/client/src/pages/admin/abuses.vue    |  2 +-
 .../client/src/pages/admin/announcements.vue  |  8 +-
 .../client/src/pages/admin/bot-protection.vue | 10 +--
 .../client/src/pages/admin/custom-css.vue     |  2 +-
 packages/client/src/pages/admin/database.vue  |  2 +-
 .../client/src/pages/admin/email-settings.vue |  6 +-
 .../src/pages/admin/emoji-edit-dialog.vue     |  2 +-
 packages/client/src/pages/admin/emojis.vue    | 20 ++---
 .../client/src/pages/admin/federation.vue     |  2 +-
 packages/client/src/pages/admin/files.vue     |  6 +-
 packages/client/src/pages/admin/index.vue     | 50 ++++++-------
 .../client/src/pages/admin/instance-block.vue |  4 +-
 .../src/pages/admin/integrations.discord.vue  |  6 +-
 .../src/pages/admin/integrations.github.vue   |  6 +-
 .../client/src/pages/admin/integrations.vue   |  6 +-
 packages/client/src/pages/admin/metrics.vue   |  6 +-
 .../client/src/pages/admin/object-storage.vue |  8 +-
 .../client/src/pages/admin/other-settings.vue |  4 +-
 .../src/pages/admin/overview.federation.vue   |  4 +-
 .../client/src/pages/admin/overview.stats.vue |  8 +-
 packages/client/src/pages/admin/overview.vue  |  2 +-
 .../client/src/pages/admin/promotions.vue     |  8 +-
 .../client/src/pages/admin/proxy-account.vue  |  2 +-
 packages/client/src/pages/admin/queue.vue     |  4 +-
 packages/client/src/pages/admin/relays.vue    | 12 +--
 packages/client/src/pages/admin/security.vue  | 14 ++--
 packages/client/src/pages/admin/settings.vue  | 24 +++---
 packages/client/src/pages/admin/users.vue     |  8 +-
 packages/client/src/pages/announcements.vue   |  4 +-
 .../client/src/pages/antenna-timeline.vue     |  8 +-
 packages/client/src/pages/api-console.vue     |  4 +-
 packages/client/src/pages/apps.vue            | 20 ++---
 packages/client/src/pages/channel-editor.vue  | 10 +--
 packages/client/src/pages/channel.vue         | 12 +--
 packages/client/src/pages/channels.vue        | 12 +--
 packages/client/src/pages/clip.vue            |  6 +-
 packages/client/src/pages/drive.vue           |  2 +-
 packages/client/src/pages/emojis.emoji.vue    |  2 +-
 packages/client/src/pages/explore.users.vue   | 18 ++---
 packages/client/src/pages/explore.vue         | 10 +--
 packages/client/src/pages/favorites.vue       |  2 +-
 packages/client/src/pages/follow-requests.vue |  6 +-
 packages/client/src/pages/gallery/edit.vue    | 14 ++--
 packages/client/src/pages/gallery/index.vue   | 16 ++--
 packages/client/src/pages/gallery/post.vue    | 14 ++--
 packages/client/src/pages/instance-info.vue   | 14 ++--
 packages/client/src/pages/messaging/index.vue | 18 ++---
 .../pages/messaging/messaging-room.form.vue   |  6 +-
 .../messaging/messaging-room.message.vue      |  2 +-
 .../src/pages/messaging/messaging-room.vue    |  4 +-
 packages/client/src/pages/mfm-cheat-sheet.vue |  2 +-
 .../client/src/pages/my-antennas/create.vue   |  2 +-
 .../client/src/pages/my-antennas/edit.vue     |  2 +-
 .../client/src/pages/my-antennas/editor.vue   |  4 +-
 .../client/src/pages/my-antennas/index.vue    |  6 +-
 packages/client/src/pages/my-clips/index.vue  |  6 +-
 packages/client/src/pages/my-groups/group.vue | 12 +--
 packages/client/src/pages/my-groups/index.vue |  6 +-
 packages/client/src/pages/my-lists/index.vue  |  8 +-
 packages/client/src/pages/my-lists/list.vue   |  4 +-
 packages/client/src/pages/not-found.vue       |  2 +-
 packages/client/src/pages/note.vue            |  4 +-
 packages/client/src/pages/notifications.vue   | 16 ++--
 .../page-editor/els/page-editor.el.button.vue |  2 +-
 .../page-editor/els/page-editor.el.canvas.vue |  4 +-
 .../els/page-editor.el.counter.vue            |  4 +-
 .../page-editor/els/page-editor.el.if.vue     |  4 +-
 .../page-editor/els/page-editor.el.image.vue  |  4 +-
 .../page-editor/els/page-editor.el.note.vue   |  2 +-
 .../els/page-editor.el.number-input.vue       |  4 +-
 .../page-editor/els/page-editor.el.post.vue   |  2 +-
 .../els/page-editor.el.radio-button.vue       |  4 +-
 .../els/page-editor.el.section.vue            |  6 +-
 .../page-editor/els/page-editor.el.switch.vue |  4 +-
 .../els/page-editor.el.text-input.vue         |  4 +-
 .../page-editor/els/page-editor.el.text.vue   |  2 +-
 .../els/page-editor.el.textarea-input.vue     |  4 +-
 .../els/page-editor.el.textarea.vue           |  2 +-
 .../page-editor/page-editor.container.vue     |  8 +-
 .../page-editor/page-editor.script-block.vue  |  4 +-
 .../src/pages/page-editor/page-editor.vue     | 26 +++----
 packages/client/src/pages/page.vue            | 22 +++---
 packages/client/src/pages/pages.vue           | 12 +--
 packages/client/src/pages/preview.vue         |  2 +-
 packages/client/src/pages/registry.keys.vue   |  2 +-
 packages/client/src/pages/registry.value.vue  |  6 +-
 packages/client/src/pages/registry.vue        |  2 +-
 packages/client/src/pages/reset-password.vue  |  4 +-
 packages/client/src/pages/scratchpad.vue      |  4 +-
 packages/client/src/pages/search.vue          |  2 +-
 packages/client/src/pages/settings/2fa.vue    |  4 +-
 .../src/pages/settings/account-info.vue       |  2 +-
 .../client/src/pages/settings/accounts.vue    |  8 +-
 packages/client/src/pages/settings/api.vue    |  2 +-
 packages/client/src/pages/settings/apps.vue   |  4 +-
 .../client/src/pages/settings/custom-css.vue  |  2 +-
 packages/client/src/pages/settings/deck.vue   |  2 +-
 .../src/pages/settings/delete-account.vue     |  2 +-
 packages/client/src/pages/settings/drive.vue  |  4 +-
 packages/client/src/pages/settings/email.vue  |  6 +-
 .../client/src/pages/settings/general.vue     | 10 +--
 .../src/pages/settings/import-export.vue      | 38 +++++-----
 packages/client/src/pages/settings/index.vue  | 52 ++++++-------
 .../src/pages/settings/instance-mute.vue      |  4 +-
 .../client/src/pages/settings/integration.vue |  6 +-
 .../client/src/pages/settings/migration.vue   |  8 +-
 .../client/src/pages/settings/mute-block.vue  |  2 +-
 packages/client/src/pages/settings/navbar.vue |  4 +-
 .../src/pages/settings/notifications.vue      |  4 +-
 packages/client/src/pages/settings/other.vue  |  6 +-
 .../src/pages/settings/plugin.install.vue     |  4 +-
 packages/client/src/pages/settings/plugin.vue |  8 +-
 .../pages/settings/preferences-backups.vue    | 12 +--
 .../client/src/pages/settings/privacy.vue     |  2 +-
 .../client/src/pages/settings/profile.vue     | 12 +--
 .../client/src/pages/settings/reaction.vue    | 10 +--
 .../client/src/pages/settings/security.vue    |  8 +-
 packages/client/src/pages/settings/sounds.vue |  8 +-
 .../client/src/pages/settings/statusbar.vue   |  2 +-
 .../src/pages/settings/theme.install.vue      |  6 +-
 .../src/pages/settings/theme.manage.vue       |  4 +-
 packages/client/src/pages/settings/theme.vue  | 14 ++--
 .../src/pages/settings/webhook.edit.vue       |  6 +-
 .../client/src/pages/settings/webhook.new.vue |  6 +-
 .../client/src/pages/settings/webhook.vue     |  8 +-
 .../client/src/pages/settings/word-mute.vue   |  4 +-
 packages/client/src/pages/share.vue           |  2 +-
 packages/client/src/pages/signup-complete.vue |  2 +-
 packages/client/src/pages/tag.vue             |  2 +-
 packages/client/src/pages/theme-editor.vue    |  8 +-
 packages/client/src/pages/timeline.vue        | 30 ++++----
 packages/client/src/pages/user-info.vue       | 16 ++--
 .../client/src/pages/user-list-timeline.vue   |  6 +-
 packages/client/src/pages/user/followers.vue  |  2 +-
 packages/client/src/pages/user/following.vue  |  2 +-
 packages/client/src/pages/user/home.vue       | 24 +++---
 .../client/src/pages/user/index.activity.vue  |  4 +-
 .../client/src/pages/user/index.photos.vue    |  2 +-
 packages/client/src/pages/user/index.vue      | 12 +--
 .../client/src/pages/welcome.entrance.a.vue   |  6 +-
 .../client/src/pages/welcome.entrance.b.vue   |  6 +-
 .../client/src/pages/welcome.entrance.c.vue   |  6 +-
 packages/client/src/pages/welcome.setup.vue   |  2 +-
 .../client/src/pages/welcome.timeline.vue     |  2 +-
 packages/client/src/scripts/get-note-menu.ts  | 50 ++++++-------
 packages/client/src/scripts/get-user-menu.ts  | 28 +++----
 packages/client/src/scripts/hpml/index.ts     | 14 ++--
 packages/client/src/scripts/hpml/lib.ts       | 74 +++++++++----------
 packages/client/src/scripts/search.ts         |  2 +-
 packages/client/src/scripts/select-file.ts    |  6 +-
 .../src/ui/_common_/navbar-for-mobile.vue     | 10 +--
 packages/client/src/ui/_common_/navbar.vue    | 12 +--
 packages/client/src/ui/_common_/upload.vue    |  2 +-
 packages/client/src/ui/classic.header.vue     | 10 +--
 packages/client/src/ui/classic.sidebar.vue    | 22 +++---
 packages/client/src/ui/classic.vue            |  4 +-
 packages/client/src/ui/classic.widgets.vue    |  4 +-
 packages/client/src/ui/deck.vue               | 18 ++---
 .../client/src/ui/deck/antenna-column.vue     |  4 +-
 packages/client/src/ui/deck/column.vue        | 24 +++---
 packages/client/src/ui/deck/direct-column.vue |  2 +-
 packages/client/src/ui/deck/list-column.vue   |  4 +-
 packages/client/src/ui/deck/main-column.vue   |  2 +-
 .../client/src/ui/deck/mentions-column.vue    |  2 +-
 .../src/ui/deck/notifications-column.vue      |  4 +-
 packages/client/src/ui/deck/tl-column.vue     | 12 +--
 .../client/src/ui/deck/widgets-column.vue     |  4 +-
 packages/client/src/ui/universal.vue          | 16 ++--
 packages/client/src/ui/universal.widgets.vue  |  4 +-
 packages/client/src/ui/visitor/b.vue          | 10 +--
 packages/client/src/ui/visitor/header.vue     | 16 ++--
 packages/client/src/widgets/activity.vue      |  4 +-
 packages/client/src/widgets/aiscript.vue      |  2 +-
 packages/client/src/widgets/federation.vue    |  2 +-
 packages/client/src/widgets/job-queue.vue     |  4 +-
 packages/client/src/widgets/memo.vue          |  2 +-
 packages/client/src/widgets/notifications.vue |  4 +-
 packages/client/src/widgets/photos.vue        |  2 +-
 packages/client/src/widgets/rss-ticker.vue    |  4 +-
 packages/client/src/widgets/rss.vue           |  4 +-
 .../client/src/widgets/server-metric/cpu.vue  |  2 +-
 .../client/src/widgets/server-metric/disk.vue |  2 +-
 .../src/widgets/server-metric/index.vue       |  4 +-
 .../client/src/widgets/server-metric/mem.vue  |  2 +-
 packages/client/src/widgets/timeline.vue      | 26 +++----
 packages/client/src/widgets/trends.vue        |  2 +-
 packages/client/src/widgets/user-list.vue     |  4 +-
 257 files changed, 1056 insertions(+), 1056 deletions(-)

diff --git a/packages/client/src/account.ts b/packages/client/src/account.ts
index 6f8a8292e..fd9bf48e6 100644
--- a/packages/client/src/account.ts
+++ b/packages/client/src/account.ts
@@ -242,7 +242,7 @@ export async function openAccountMenu(
 					...accountItemPromises,
 					{
 						type: "parent",
-						icon: "ph-plus-bold ph-lg",
+						icon: "ph-plus ph-bold ph-lg",
 						text: i18n.ts.addAccount,
 						children: [
 							{
@@ -261,13 +261,13 @@ export async function openAccountMenu(
 					},
 					{
 						type: "link",
-						icon: "ph-users-bold ph-lg",
+						icon: "ph-users ph-bold ph-lg",
 						text: i18n.ts.manageAccounts,
 						to: "/settings/accounts",
 					},
 					{
 						type: "button",
-						icon: "ph-sign-out-bold ph-lg",
+						icon: "ph-sign-out ph-bold ph-lg",
 						text: i18n.ts.logout,
 						action: () => {
 							signout();
diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue
index b8ef6686c..f1b3ae431 100644
--- a/packages/client/src/components/MkAbuseReportWindow.vue
+++ b/packages/client/src/components/MkAbuseReportWindow.vue
@@ -1,7 +1,7 @@
 <template>
 <XWindow ref="uiWindow" :initial-width="400" :initial-height="500" :can-resize="true" @closed="emit('closed')">
 	<template #header>
-		<i class="ph-warning-circle-bold ph-lg" style="margin-right: 0.5em;"></i>
+		<i class="ph-warning-circle ph-bold ph-lg" style="margin-right: 0.5em;"></i>
 		<I18n :src="i18n.ts.reportAbuseOf" tag="span">
 			<template #name>
 				<b><MkAcct :user="user"/></b>
diff --git a/packages/client/src/components/MkChannelFollowButton.vue b/packages/client/src/components/MkChannelFollowButton.vue
index 4da6ae53f..7c23b91ed 100644
--- a/packages/client/src/components/MkChannelFollowButton.vue
+++ b/packages/client/src/components/MkChannelFollowButton.vue
@@ -6,14 +6,14 @@
 >
 	<template v-if="!wait">
 		<template v-if="isFollowing">
-			<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="ph-minus-bold ph-lg"></i>
+			<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="ph-minus ph-bold ph-lg"></i>
 		</template>
 		<template v-else>
-			<span v-if="full">{{ i18n.ts.follow }}</span><i class="ph-plus-bold ph-lg"></i>
+			<span v-if="full">{{ i18n.ts.follow }}</span><i class="ph-plus ph-bold ph-lg"></i>
 		</template>
 	</template>
 	<template v-else>
-		<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch-bold ph-lg fa-pulse ph-fw ph-lg"></i>
+		<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
 	</template>
 </button>
 </template>
diff --git a/packages/client/src/components/MkChannelPreview.vue b/packages/client/src/components/MkChannelPreview.vue
index a970c9ae6..6af2a7b64 100644
--- a/packages/client/src/components/MkChannelPreview.vue
+++ b/packages/client/src/components/MkChannelPreview.vue
@@ -2,10 +2,10 @@
 <MkA :to="`/channels/${channel.id}`" class="eftoefju _panel" tabindex="-1">
 	<div class="banner" :style="bannerStyle">
 		<div class="fade"></div>
-		<div class="name"><i class="ph-television-bold ph-lg"></i> {{ channel.name }}</div>
+		<div class="name"><i class="ph-television ph-bold ph-lg"></i> {{ channel.name }}</div>
 		<div class="status">
 			<div>
-				<i class="ph-users-bold ph-lg ph-fw ph-lg"></i>
+				<i class="ph-users ph-bold ph-lg ph-fw ph-lg"></i>
 				<I18n :src="i18n.ts._channel.usersCount" tag="span" style="margin-left: 4px;">
 					<template #n>
 						<b>{{ channel.usersCount }}</b>
@@ -13,7 +13,7 @@
 				</I18n>
 			</div>
 			<div>
-				<i class="ph-pencil-bold ph-lg ph-fw ph-lg"></i>
+				<i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i>
 				<I18n :src="i18n.ts._channel.notesCount" tag="span" style="margin-left: 4px;">
 					<template #n>
 						<b>{{ channel.notesCount }}</b>
diff --git a/packages/client/src/components/MkContainer.vue b/packages/client/src/components/MkContainer.vue
index 02568c6ec..e601dd56b 100644
--- a/packages/client/src/components/MkContainer.vue
+++ b/packages/client/src/components/MkContainer.vue
@@ -5,8 +5,8 @@
 		<div class="sub">
 			<slot name="func"></slot>
 			<button v-if="foldable" class="_button" @click="() => showBody = !showBody">
-				<template v-if="showBody"><i class="ph-caret-up-bold ph-lg"></i></template>
-				<template v-else><i class="ph-caret-down-bold ph-lg"></i></template>
+				<template v-if="showBody"><i class="ph-caret-up ph-bold ph-lg"></i></template>
+				<template v-else><i class="ph-caret-down ph-bold ph-lg"></i></template>
 			</button>
 		</div>
 	</header>
diff --git a/packages/client/src/components/MkDateSeparatedList.vue b/packages/client/src/components/MkDateSeparatedList.vue
index 9897d356a..e8896a2a2 100644
--- a/packages/client/src/components/MkDateSeparatedList.vue
+++ b/packages/client/src/components/MkDateSeparatedList.vue
@@ -64,14 +64,14 @@ export default defineComponent({
 				}, [
 					h('span', [
 						h('i', {
-							class: 'ph-caret-up-bold ph-lg icon',
+							class: 'ph-caret-up ph-bold ph-lg icon',
 						}),
 						getDateText(item.createdAt),
 					]),
 					h('span', [
 						getDateText(props.items[i + 1].createdAt),
 						h('i', {
-							class: 'ph-caret-down-bold ph-lg icon',
+							class: 'ph-caret-down ph-bold ph-lg icon',
 						}),
 					]),
 				]));
diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue
index 1bcfa81a5..9f93d9f99 100644
--- a/packages/client/src/components/MkDialog.vue
+++ b/packages/client/src/components/MkDialog.vue
@@ -5,17 +5,17 @@
 				<i :class="icon"></i>
 			</div>
 			<div v-else-if="!input && !select" :class="[$style.icon, $style['type_' + type]]">
-				<i v-if="type === 'success'" :class="$style.iconInner" class="ph-check-bold ph-lg"></i>
-				<i v-else-if="type === 'error'" :class="$style.iconInner" class="ph-circle-wavy-warning-bold ph-lg"></i>
-				<i v-else-if="type === 'warning'" :class="$style.iconInner" class="ph-warning-bold ph-lg"></i>
-				<i v-else-if="type === 'info'" :class="$style.iconInner" class="ph-info-bold ph-lg"></i>
-				<i v-else-if="type === 'question'" :class="$style.iconInner" class="ph-circle-question-bold ph-lg"></i>
+				<i v-if="type === 'success'" :class="$style.iconInner" class="ph-check ph-bold ph-lg"></i>
+				<i v-else-if="type === 'error'" :class="$style.iconInner" class="ph-circle-wavy-warning ph-bold ph-lg"></i>
+				<i v-else-if="type === 'warning'" :class="$style.iconInner" class="ph-warning ph-bold ph-lg"></i>
+				<i v-else-if="type === 'info'" :class="$style.iconInner" class="ph-info ph-bold ph-lg"></i>
+				<i v-else-if="type === 'question'" :class="$style.iconInner" class="ph-circle-question ph-bold ph-lg"></i>
 				<MkLoading v-else-if="type === 'waiting'" :class="$style.iconInner" :em="true"/>
 			</div>
 			<header v-if="title" :class="$style.title"><Mfm :text="title"/></header>
 			<div v-if="text" :class="$style.text"><Mfm :text="text"/></div>
 			<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" @keydown="onInputKeydown">
-				<template v-if="input.type === 'password'" #prefix><i class="ph-password-bold ph-lg"></i></template>
+				<template v-if="input.type === 'password'" #prefix><i class="ph-password ph-bold ph-lg"></i></template>
 			</MkInput>
 			<MkSelect v-if="select" v-model="selectedValue" autofocus>
 				<template v-if="select.items">
diff --git a/packages/client/src/components/MkDrive.file.vue b/packages/client/src/components/MkDrive.file.vue
index ed3439e61..a91f4dd4e 100644
--- a/packages/client/src/components/MkDrive.file.vue
+++ b/packages/client/src/components/MkDrive.file.vue
@@ -63,30 +63,30 @@ const title = computed(() => `${props.file.name}\n${props.file.type} ${bytes(pro
 function getMenu() {
 	return [{
 		text: i18n.ts.rename,
-		icon: 'ph-cursor-text-bold ph-lg',
+		icon: 'ph-cursor-text ph-bold ph-lg',
 		action: rename,
 	}, {
 		text: props.file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
-		icon: props.file.isSensitive ? 'ph-eye-bold ph-lg' : 'ph-eye-slash-bold ph-lg',
+		icon: props.file.isSensitive ? 'ph-eye-bold ph-lg' : 'ph-eye-slash ph-bold ph-lg',
 		action: toggleSensitive,
 	}, {
 		text: i18n.ts.describeFile,
-		icon: 'ph-cursor-text-bold ph-lg',
+		icon: 'ph-cursor-text ph-bold ph-lg',
 		action: describe,
 	}, null, {
 		text: i18n.ts.copyUrl,
-		icon: 'ph-link-simple-bold ph-lg',
+		icon: 'ph-link-simple ph-bold ph-lg',
 		action: copyUrl,
 	}, {
 		type: 'a',
 		href: props.file.url,
 		target: '_blank',
 		text: i18n.ts.download,
-		icon: 'ph-download-simple-bold ph-lg',
+		icon: 'ph-download-simple ph-bold ph-lg',
 		download: props.file.name,
 	}, null, {
 		text: i18n.ts.delete,
-		icon: 'ph-trash-bold ph-lg',
+		icon: 'ph-trash ph-bold ph-lg',
 		danger: true,
 		action: deleteFile,
 	}];
diff --git a/packages/client/src/components/MkDrive.folder.vue b/packages/client/src/components/MkDrive.folder.vue
index b18a6b78e..a36ab2673 100644
--- a/packages/client/src/components/MkDrive.folder.vue
+++ b/packages/client/src/components/MkDrive.folder.vue
@@ -16,8 +16,8 @@
 	@dragend="onDragend"
 >
 	<p class="name">
-		<template v-if="hover"><i class="ph-folder-notch-open-bold ph-lg ph-fw ph-lg"></i></template>
-		<template v-if="!hover"><i class="ph-folder-notch-bold ph-lg ph-fw ph-lg"></i></template>
+		<template v-if="hover"><i class="ph-folder-notch-open ph-bold ph-lg ph-fw ph-lg"></i></template>
+		<template v-if="!hover"><i class="ph-folder-notch ph-bold ph-lg ph-fw ph-lg"></i></template>
 		{{ folder.name }}
 	</p>
 	<p v-if="defaultStore.state.uploadFolder == folder.id" class="upload">
@@ -229,7 +229,7 @@ function setAsUploadFolder() {
 function onContextmenu(ev: MouseEvent) {
 	os.contextMenu([{
 		text: i18n.ts.openInWindow,
-		icon: 'ph-copy-bold ph-lg',
+		icon: 'ph-copy ph-bold ph-lg',
 		action: () => {
 			os.popup(defineAsyncComponent(() => import('@/components/MkDriveWindow.vue')), {
 				initialFolder: props.folder,
@@ -238,11 +238,11 @@ function onContextmenu(ev: MouseEvent) {
 		},
 	}, null, {
 		text: i18n.ts.rename,
-		icon: 'ph-cursor-text-bold ph-lg',
+		icon: 'ph-cursor-text ph-bold ph-lg',
 		action: rename,
 	}, null, {
 		text: i18n.ts.delete,
-		icon: 'ph-trash-bold ph-lg',
+		icon: 'ph-trash ph-bold ph-lg',
 		danger: true,
 		action: deleteFolder,
 	}], ev);
diff --git a/packages/client/src/components/MkDrive.navFolder.vue b/packages/client/src/components/MkDrive.navFolder.vue
index 95ae9ba79..38fd76877 100644
--- a/packages/client/src/components/MkDrive.navFolder.vue
+++ b/packages/client/src/components/MkDrive.navFolder.vue
@@ -7,7 +7,7 @@
 	@dragleave="onDragleave"
 	@drop.stop="onDrop"
 >
-	<i v-if="folder == null" class="ph-cloud-bold ph-lg"></i>
+	<i v-if="folder == null" class="ph-cloud ph-bold ph-lg"></i>
 	<span>{{ folder == null ? i18n.ts.drive : folder.name }}</span>
 </div>
 </template>
diff --git a/packages/client/src/components/MkDrive.vue b/packages/client/src/components/MkDrive.vue
index b9f4c7d60..24c400c3e 100644
--- a/packages/client/src/components/MkDrive.vue
+++ b/packages/client/src/components/MkDrive.vue
@@ -11,7 +11,7 @@
 				@removeFolder="removeFolder"
 			/>
 			<template v-for="f in hierarchyFolders">
-				<span class="separator"><i class="ph-caret-right-bold ph-lg"></i></span>
+				<span class="separator"><i class="ph-caret-right ph-bold ph-lg"></i></span>
 				<XNavFolder
 					:folder="f"
 					:parent-folder="folder"
@@ -21,10 +21,10 @@
 					@removeFolder="removeFolder"
 				/>
 			</template>
-			<span v-if="folder != null" class="separator"><i class="ph-caret-right-bold ph-lg"></i></span>
+			<span v-if="folder != null" class="separator"><i class="ph-caret-right ph-bold ph-lg"></i></span>
 			<span v-if="folder != null" class="folder current">{{ folder.name }}</span>
 		</div>
-		<button class="menu _button" @click="showMenu"><i class="ph-dots-three-outline-bold ph-lg"></i></button>
+		<button class="menu _button" @click="showMenu"><i class="ph-dots-three-outline ph-bold ph-lg"></i></button>
 	</nav>
 	<div
 		ref="main" class="main"
@@ -573,26 +573,26 @@ function getMenu() {
 		type: 'label',
 	}, {
 		text: i18n.ts.upload,
-		icon: 'ph-upload-simple-bold ph-lg',
+		icon: 'ph-upload-simple ph-bold ph-lg',
 		action: () => { selectLocalFile(); },
 	}, {
 		text: i18n.ts.fromUrl,
-		icon: 'ph-link-simple-bold ph-lg',
+		icon: 'ph-link-simple ph-bold ph-lg',
 		action: () => { urlUpload(); },
 	}, null, {
 		text: folder.value ? folder.value.name : i18n.ts.drive,
 		type: 'label',
 	}, folder.value ? {
 		text: i18n.ts.renameFolder,
-		icon: 'ph-cursor-text-bold ph-lg',
+		icon: 'ph-cursor-text ph-bold ph-lg',
 		action: () => { renameFolder(folder.value); },
 	} : undefined, folder.value ? {
 		text: i18n.ts.deleteFolder,
-		icon: 'ph-trash-bold ph-lg',
+		icon: 'ph-trash ph-bold ph-lg',
 		action: () => { deleteFolder(folder.value as Misskey.entities.DriveFolder); },
 	} : undefined, {
 		text: i18n.ts.createFolder,
-		icon: 'ph-folder-notch-plus-bold ph-lg',
+		icon: 'ph-folder-notch-plus ph-bold ph-lg',
 		action: () => { createFolder(); },
 	}];
 }
diff --git a/packages/client/src/components/MkDriveFileThumbnail.vue b/packages/client/src/components/MkDriveFileThumbnail.vue
index a4816f580..da8137774 100644
--- a/packages/client/src/components/MkDriveFileThumbnail.vue
+++ b/packages/client/src/components/MkDriveFileThumbnail.vue
@@ -1,16 +1,16 @@
 <template>
 <div ref="thumbnail" class="zdjebgpv">
 	<ImgWithBlurhash v-if="isThumbnailAvailable" :hash="file.blurhash" :src="file.thumbnailUrl" :alt="file.name" :title="file.name" :cover="fit !== 'contain'"/>
-	<i v-else-if="is === 'image'" class="ph-file-image-bold ph-lg icon"></i>
-	<i v-else-if="is === 'video'" class="ph-file-video-bold ph-lg icon"></i>
-	<i v-else-if="is === 'audio' || is === 'midi'" class="ph-file-audio-bold ph-lg icon"></i>
-	<i v-else-if="is === 'csv'" class="ph-file-csv-bold ph-lg icon"></i>
-	<i v-else-if="is === 'pdf'" class="ph-file-pdf-bold ph-lg icon"></i>
-	<i v-else-if="is === 'textfile'" class="ph-file-text-bold ph-lg icon"></i>
-	<i v-else-if="is === 'archive'" class="ph-file-zip-bold ph-lg icon"></i>
-	<i v-else class="ph-file-bold ph-lg icon"></i>
+	<i v-else-if="is === 'image'" class="ph-file-image ph-bold ph-lg icon"></i>
+	<i v-else-if="is === 'video'" class="ph-file-video ph-bold ph-lg icon"></i>
+	<i v-else-if="is === 'audio' || is === 'midi'" class="ph-file-audio ph-bold ph-lg icon"></i>
+	<i v-else-if="is === 'csv'" class="ph-file-csv ph-bold ph-lg icon"></i>
+	<i v-else-if="is === 'pdf'" class="ph-file-pdf ph-bold ph-lg icon"></i>
+	<i v-else-if="is === 'textfile'" class="ph-file-text ph-bold ph-lg icon"></i>
+	<i v-else-if="is === 'archive'" class="ph-file-zip ph-bold ph-lg icon"></i>
+	<i v-else class="ph-file ph-bold ph-lg icon"></i>
 
-	<i v-if="isThumbnailAvailable && is === 'video'" class="ph-file-video-bold ph-lg icon-sub"></i>
+	<i v-if="isThumbnailAvailable && is === 'video'" class="ph-file-video ph-bold ph-lg icon-sub"></i>
 </div>
 </template>
 
diff --git a/packages/client/src/components/MkEmojiPicker.section.vue b/packages/client/src/components/MkEmojiPicker.section.vue
index afd854d6b..c9aea124b 100644
--- a/packages/client/src/components/MkEmojiPicker.section.vue
+++ b/packages/client/src/components/MkEmojiPicker.section.vue
@@ -2,7 +2,7 @@
 <!-- このコンポーネントの要素のclassは親から利用されるのでむやみに弄らないこと -->
 <section>
 	<header class="_acrylic" @click="shown = !shown">
-		<i class="toggle ph-fw ph-lg" :class="shown ? 'ph-caret-down-bold ph-lg' : 'ph-caret-up-bold ph-lg'"></i> <slot></slot> ({{ emojis.length }})
+		<i class="toggle ph-fw ph-lg" :class="shown ? 'ph-caret-down-bold ph-lg' : 'ph-caret-up ph-bold ph-lg'"></i> <slot></slot> ({{ emojis.length }})
 	</header>
 	<div v-if="shown" class="body">
 		<button
diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index b26eb1206..7daf2dabf 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -46,7 +46,7 @@
 			</section>
 
 			<section>
-				<header><i class="ph-alarm-bold ph-fw ph-lg"></i> {{ i18n.ts.recentUsed }}</header>
+				<header><i class="ph-alarm ph-bold ph-fw ph-lg"></i> {{ i18n.ts.recentUsed }}</header>
 				<div class="body">
 					<button
 						v-for="emoji in recentlyUsedEmojis"
@@ -69,10 +69,10 @@
 		</div>
 	</div>
 	<div class="tabs">
-		<button class="_button tab" :class="{ active: tab === 'index' }" @click="tab = 'index'"><i class="ph-asterisk-bold ph-lg ph-fw ph-lg"></i></button>
-		<button class="_button tab" :class="{ active: tab === 'custom' }" @click="tab = 'custom'"><i class="ph-smiley-bold ph-lg ph-fw ph-lg"></i></button>
-		<button class="_button tab" :class="{ active: tab === 'unicode' }" @click="tab = 'unicode'"><i class="ph-leaf-bold ph-lg ph-fw ph-lg"></i></button>
-		<button class="_button tab" :class="{ active: tab === 'tags' }" @click="tab = 'tags'"><i class="ph-hash-bold ph-lg ph-fw ph-lg"></i></button>
+		<button class="_button tab" :class="{ active: tab === 'index' }" @click="tab = 'index'"><i class="ph-asterisk ph-bold ph-lg ph-fw ph-lg"></i></button>
+		<button class="_button tab" :class="{ active: tab === 'custom' }" @click="tab = 'custom'"><i class="ph-smiley ph-bold ph-lg ph-fw ph-lg"></i></button>
+		<button class="_button tab" :class="{ active: tab === 'unicode' }" @click="tab = 'unicode'"><i class="ph-leaf ph-bold ph-lg ph-fw ph-lg"></i></button>
+		<button class="_button tab" :class="{ active: tab === 'tags' }" @click="tab = 'tags'"><i class="ph-hash ph-bold ph-lg ph-fw ph-lg"></i></button>
 	</div>
 </div>
 </template>
diff --git a/packages/client/src/components/MkFileTypeIcon.vue b/packages/client/src/components/MkFileTypeIcon.vue
index 2b39365b9..3e0761ae1 100644
--- a/packages/client/src/components/MkFileTypeIcon.vue
+++ b/packages/client/src/components/MkFileTypeIcon.vue
@@ -1,6 +1,6 @@
 <template>
 <span class="mk-file-type-icon">
-	<template v-if="kind == 'image'"><i class="ph-file-image-bold ph-lg"></i></template>
+	<template v-if="kind == 'image'"><i class="ph-file-image ph-bold ph-lg"></i></template>
 </span>
 </template>
 
diff --git a/packages/client/src/components/MkFolder.vue b/packages/client/src/components/MkFolder.vue
index 5de902938..a0be2e856 100644
--- a/packages/client/src/components/MkFolder.vue
+++ b/packages/client/src/components/MkFolder.vue
@@ -4,8 +4,8 @@
 		<div class="title"><slot name="header"></slot></div>
 		<div class="divider"></div>
 		<button class="_button">
-			<template v-if="showBody"><i class="ph-caret-up-bold ph-lg"></i></template>
-			<template v-else><i class="ph-caret-down-bold ph-lg"></i></template>
+			<template v-if="showBody"><i class="ph-caret-up ph-bold ph-lg"></i></template>
+			<template v-else><i class="ph-caret-down ph-bold ph-lg"></i></template>
 		</button>
 	</header>
 	<transition
diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index 5d2618ba9..cd419cd8b 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -13,27 +13,27 @@
 >
 	<template v-if="!wait">
 		<template v-if="isBlocking">
-			<span v-if="full">{{ i18n.ts.blocked }}</span><i class="ph-prohibit-bold ph-lg"></i>
+			<span v-if="full">{{ i18n.ts.blocked }}</span><i class="ph-prohibit ph-bold ph-lg"></i>
 		</template>
 		<template v-else-if="hasPendingFollowRequestFromYou && user.isLocked">
-			<span v-if="full">{{ i18n.ts.followRequestPending }}</span><i class="ph-hourglass-medium-bold ph-lg"></i>
+			<span v-if="full">{{ i18n.ts.followRequestPending }}</span><i class="ph-hourglass-medium ph-bold ph-lg"></i>
 		</template>
 		<template v-else-if="hasPendingFollowRequestFromYou && !user.isLocked">
 			<!-- つまりリモートフォローの場合。 -->
-			<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch-bold ph-lg fa-pulse"></i>
+			<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch ph-bold ph-lg fa-pulse"></i>
 		</template>
 		<template v-else-if="isFollowing">
-			<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="ph-minus-bold ph-lg"></i>
+			<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="ph-minus ph-bold ph-lg"></i>
 		</template>
 		<template v-else-if="!isFollowing && user.isLocked">
-			<span v-if="full">{{ i18n.ts.followRequest }}</span><i class="ph-plus-bold ph-lg"></i>
+			<span v-if="full">{{ i18n.ts.followRequest }}</span><i class="ph-plus ph-bold ph-lg"></i>
 		</template>
 		<template v-else-if="!isFollowing && !user.isLocked">
-			<span v-if="full">{{ i18n.ts.follow }}</span><i class="ph-plus-bold ph-lg"></i>
+			<span v-if="full">{{ i18n.ts.follow }}</span><i class="ph-plus ph-bold ph-lg"></i>
 		</template>
 	</template>
 	<template v-else>
-		<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch-bold ph-lg fa-pulse ph-fw ph-lg"></i>
+		<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
 	</template>
 </button>
 </template>
diff --git a/packages/client/src/components/MkGoogle.vue b/packages/client/src/components/MkGoogle.vue
index 42c796123..274f851a6 100644
--- a/packages/client/src/components/MkGoogle.vue
+++ b/packages/client/src/components/MkGoogle.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="mk-google">
 	<input v-model="query" type="search" :placeholder="q">
-	<button @click="search"><i class="ph-magnifying-glass-bold ph-lg"></i> {{ i18n.ts.searchByGoogle }}</button>
+	<button @click="search"><i class="ph-magnifying-glass ph-bold ph-lg"></i> {{ i18n.ts.searchByGoogle }}</button>
 </div>
 </template>
 
diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index 0790e58e3..005ac53ff 100644
--- a/packages/client/src/components/MkInfo.vue
+++ b/packages/client/src/components/MkInfo.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="fpezltsf" :class="{ warn }">
-	<i v-if="warn" class="ph-warning-bold ph-lg"></i>
-	<i v-else class="ph-info-bold ph-lg"></i>
+	<i v-if="warn" class="ph-warning ph-bold ph-lg"></i>
+	<i v-else class="ph-info ph-bold ph-lg"></i>
 	<slot></slot>
 </div>
 </template>
diff --git a/packages/client/src/components/MkKeyValue.vue b/packages/client/src/components/MkKeyValue.vue
index 9d392c3e9..de4673ffe 100644
--- a/packages/client/src/components/MkKeyValue.vue
+++ b/packages/client/src/components/MkKeyValue.vue
@@ -5,7 +5,7 @@
 	</div>
 	<div class="value">
 		<slot name="value"></slot>
-		<button v-if="copy" v-tooltip="i18n.ts.copy" class="_textButton" style="margin-left: 0.5em;" @click="copy_"><i class="ph-clipboard-text-bold"></i></button>
+		<button v-if="copy" v-tooltip="i18n.ts.copy" class="_textButton" style="margin-left: 0.5em;" @click="copy_"><i class="ph-clipboard-text ph-bold"></i></button>
 	</div>
 </div>
 </template>
diff --git a/packages/client/src/components/MkLink.vue b/packages/client/src/components/MkLink.vue
index 41c8c7e4d..307e6bec2 100644
--- a/packages/client/src/components/MkLink.vue
+++ b/packages/client/src/components/MkLink.vue
@@ -3,7 +3,7 @@
 	:title="url"
 >
 	<slot></slot>
-	<i v-if="target === '_blank'" class="ph-arrow-square-out-bold ph-lg icon"></i>
+	<i v-if="target === '_blank'" class="ph-arrow-square-out ph-bold ph-lg icon"></i>
 </component>
 </template>
 
diff --git a/packages/client/src/components/MkMediaBanner.vue b/packages/client/src/components/MkMediaBanner.vue
index daf9bfc23..b09e61d37 100644
--- a/packages/client/src/components/MkMediaBanner.vue
+++ b/packages/client/src/components/MkMediaBanner.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="mk-media-banner">
 	<div v-if="media.isSensitive && hide" class="sensitive" @click="hide = false">
-		<span class="icon"><i class="ph-warning-bold ph-lg"></i></span>
+		<span class="icon"><i class="ph-warning ph-bold ph-lg"></i></span>
 		<b>{{ i18n.ts.sensitive }}</b>
 		<span>{{ i18n.ts.clickToShow }}</span>
 	</div>
@@ -37,7 +37,7 @@
 		:title="media.name"
 		:download="media.name"
 	>
-		<span class="icon"><i class="ph-download-simple-bold ph-lg"></i></span>
+		<span class="icon"><i class="ph-download-simple ph-bold ph-lg"></i></span>
 		<b>{{ media.name }}</b>
 	</a>
 </div>
diff --git a/packages/client/src/components/MkMediaImage.vue b/packages/client/src/components/MkMediaImage.vue
index 5cf851d6b..4ad4ffaa7 100644
--- a/packages/client/src/components/MkMediaImage.vue
+++ b/packages/client/src/components/MkMediaImage.vue
@@ -3,7 +3,7 @@
 	<ImgWithBlurhash class="bg" :hash="image.blurhash" :title="image.comment" :alt="image.comment"/>
 	<div class="text">
 		<div class="wrapper">
-			<b style="display: block;"><i class="ph-warning-bold ph-lg"></i> {{ i18n.ts.sensitive }}</b>
+			<b style="display: block;"><i class="ph-warning ph-bold ph-lg"></i> {{ i18n.ts.sensitive }}</b>
 			<span style="display: block;">{{ i18n.ts.clickToShow }}</span>
 		</div>
 	</div>
@@ -16,7 +16,7 @@
 		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment" :type="image.type" :title="image.comment" :cover="false"/>
 		<div v-if="image.type === 'image/gif'" class="gif">GIF</div>
 	</a>
-	<button v-tooltip="i18n.ts.hide" class="_button hide" @click="hide = true"><i class="ph-eye-slash-bold ph-lg"></i></button>
+	<button v-tooltip="i18n.ts.hide" class="_button hide" @click="hide = true"><i class="ph-eye-slash ph-bold ph-lg"></i></button>
 </div>
 </template>
 
diff --git a/packages/client/src/components/MkMediaVideo.vue b/packages/client/src/components/MkMediaVideo.vue
index e5b4ba390..48a599407 100644
--- a/packages/client/src/components/MkMediaVideo.vue
+++ b/packages/client/src/components/MkMediaVideo.vue
@@ -1,7 +1,7 @@
 <template>
 <div v-if="hide" class="icozogqfvdetwohsdglrbswgrejoxbdj" @click="hide = false">
 	<div>
-		<b><i class="ph-warning-bold ph-lg"></i> {{ i18n.ts.sensitive }}</b>
+		<b><i class="ph-warning ph-bold ph-lg"></i> {{ i18n.ts.sensitive }}</b>
 		<span>{{ i18n.ts.clickToShow }}</span>
 	</div>
 </div>
@@ -36,7 +36,7 @@
 			>
 		</video>
 	</VuePlyr>
-	<i class="ph-eye-slash-bold ph-lg" @click="hide = true"></i>
+	<i class="ph-eye-slash ph-bold ph-lg" @click="hide = true"></i>
 </div>
 </template>
 
diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index c07185377..e5977e542 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -36,7 +36,7 @@
 			<button v-else-if="item.type === 'parent'" :tabindex="i" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<span>{{ item.text }}</span>
-				<span class="caret"><i class="ph-caret-right-bold ph-lg ph-fw ph-lg"></i></span>
+				<span class="caret"><i class="ph-caret-right ph-bold ph-lg ph-fw ph-lg"></i></span>
 			</button>
 			<button v-else-if="!item.hidden" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
diff --git a/packages/client/src/components/MkModalPageWindow.vue b/packages/client/src/components/MkModalPageWindow.vue
index 60ce03a2c..7d2a0e569 100644
--- a/packages/client/src/components/MkModalPageWindow.vue
+++ b/packages/client/src/components/MkModalPageWindow.vue
@@ -2,13 +2,13 @@
 <MkModal ref="modal" @click="$emit('click')" @closed="$emit('closed')">
 	<div ref="rootEl" class="hrmcaedk _narrow_" :style="{ width: `${width}px`, height: (height ? `min(${height}px, 100%)` : '100%') }">
 		<div class="header" @contextmenu="onContextmenu">
-			<button v-if="history.length > 0" v-tooltip="i18n.ts.goBack" class="_button" @click="back()"><i class="ph-caret-left-bold ph-lg"></i></button>
+			<button v-if="history.length > 0" v-tooltip="i18n.ts.goBack" class="_button" @click="back()"><i class="ph-caret-left ph-bold ph-lg"></i></button>
 			<span v-else style="display: inline-block; width: 20px"></span>
 			<span v-if="pageMetadata?.value" class="title">
 				<i v-if="pageMetadata?.value.icon" class="icon" :class="pageMetadata?.value.icon"></i>
 				<span>{{ pageMetadata?.value.title }}</span>
 			</span>
-			<button class="_button" @click="$refs.modal.close()"><i class="ph-x-bold ph-lg"></i></button>
+			<button class="_button" @click="$refs.modal.close()"><i class="ph-x ph-bold ph-lg"></i></button>
 		</div>
 		<div class="body">
 			<MkStickyContainer>
@@ -68,22 +68,22 @@ const contextmenu = $computed(() => {
 		type: 'label',
 		text: path,
 	}, {
-		icon: 'ph-arrows-out-simple-bold ph-lg',
+		icon: 'ph-arrows-out-simple ph-bold ph-lg',
 		text: i18n.ts.showInPage,
 		action: expand,
 	}, {
-		icon: 'ph-arrow-square-out-bold ph-lg',
+		icon: 'ph-arrow-square-out ph-bold ph-lg',
 		text: i18n.ts.popout,
 		action: popout,
 	}, null, {
-		icon: 'ph-arrow-square-out-bold ph-lg',
+		icon: 'ph-arrow-square-out ph-bold ph-lg',
 		text: i18n.ts.openInNewTab,
 		action: () => {
 			window.open(pageUrl, '_blank');
 			modal.close();
 		},
 	}, {
-		icon: 'ph-link-simple-bold ph-lg',
+		icon: 'ph-link-simple ph-bold ph-lg',
 		text: i18n.ts.copyLink,
 		action: () => {
 			copyToClipboard(pageUrl);
diff --git a/packages/client/src/components/MkModalWindow.vue b/packages/client/src/components/MkModalWindow.vue
index 2765a9927..1d10eba77 100644
--- a/packages/client/src/components/MkModalWindow.vue
+++ b/packages/client/src/components/MkModalWindow.vue
@@ -2,12 +2,12 @@
 	<MkModal ref="modal" :prefer-type="'dialog'" @click="onBgClick" @closed="$emit('closed')">
 		<div ref="rootEl" class="ebkgoccj" :style="{ width: `${width}px`, height: scroll ? (height ? `${height}px` : null) : (height ? `min(${height}px, 100%)` : '100%') }" @keydown="onKeydown">
 			<div ref="headerEl" class="header">
-				<button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="ph-x-bold ph-lg"></i></button>
+				<button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="ph-x ph-bold ph-lg"></i></button>
 				<span class="title">
 					<slot name="header"></slot>
 				</span>
-				<button v-if="!withOkButton" class="_button" @click="$emit('close')"><i class="ph-x-bold ph-lg"></i></button>
-				<button v-if="withOkButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ph-check-bold ph-lg"></i></button>
+				<button v-if="!withOkButton" class="_button" @click="$emit('close')"><i class="ph-x ph-bold ph-lg"></i></button>
+				<button v-if="withOkButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ph-check ph-bold ph-lg"></i></button>
 			</div>
 			<div class="body">
 				<slot :width="bodyWidth" :height="bodyHeight"></slot>
diff --git a/packages/client/src/components/MkMoved.vue b/packages/client/src/components/MkMoved.vue
index e9be9a079..d50d49faa 100644
--- a/packages/client/src/components/MkMoved.vue
+++ b/packages/client/src/components/MkMoved.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="msjugskd _block">
-	<i class="ph-airplane-takeoff-bold ph-lg" style="margin-right: 8px;"/>
+	<i class="ph-airplane-takeoff ph-bold ph-lg" style="margin-right: 8px;"/>
 	{{ i18n.ts.accountMoved }}
 	<MkMention class="link" :username="acct" :host="host"/>
 </div>
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index b4f3167bf..ea7ef07d5 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -12,11 +12,11 @@
 	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to"/>
 	<div class="note-context">
 		<div class="line"></div>
-		<div v-if="appearNote._prId_" class="info"><i class="ph-megaphone-simple-bold ph-lg"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ph-x-bold ph-lg"></i></button></div>
-		<div v-if="appearNote._featuredId_" class="info"><i class="ph-lightning-bold ph-lg"></i> {{ i18n.ts.featured }}</div>
-		<div v-if="pinned" class="info"><i class="ph-push-pin-bold ph-lg"></i>{{ i18n.ts.pinnedNote }}</div>
+		<div v-if="appearNote._prId_" class="info"><i class="ph-megaphone-simple-bold ph-lg"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ph-x ph-bold ph-lg"></i></button></div>
+		<div v-if="appearNote._featuredId_" class="info"><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts.featured }}</div>
+		<div v-if="pinned" class="info"><i class="ph-push-pin ph-bold ph-lg"></i>{{ i18n.ts.pinnedNote }}</div>
 		<div v-if="isRenote" class="renote">
-			<i class="ph-repeat-bold ph-lg"></i>
+			<i class="ph-repeat ph-bold ph-lg"></i>
 			<I18n :src="i18n.ts.renotedBy" tag="span">
 				<template #user>
 					<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)">
@@ -26,7 +26,7 @@
 			</I18n>
 			<div class="info">
 				<button ref="renoteTime" class="_button time" @click="showRenoteMenu()">
-					<i v-if="isMyRenote" class="ph-dots-three-outline-bold ph-lg dropdownIcon"></i>
+					<i v-if="isMyRenote" class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"></i>
 					<MkTime :time="note.createdAt"/>
 				</button>
 				<MkVisibility :note="note"/>
@@ -69,26 +69,26 @@
 						<span>{{ i18n.ts.showLess }}</span>
 					</button>
 				</div>
-				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
+				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television ph-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
 			</div>
 			<footer class="footer">
 				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
 				<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
-					<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
-					<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
+					<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left ph-bold ph-lg"></i></template>
+					<template v-else><i class="ph-arrow-bend-up-left ph-bold ph-lg"></i></template>
 					<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
 				</button>
 				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
 				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
 				<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
-					<i class="ph-smiley-bold ph-lg"></i>
+					<i class="ph-smiley ph-bold ph-lg"></i>
 				</button>
 				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
-					<i class="ph-minus-bold ph-lg"></i>
+					<i class="ph-minus ph-bold ph-lg"></i>
 				</button>
 				<XQuoteButton class="button" :note="appearNote"/>
 				<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
-					<i class="ph-dots-three-outline-bold ph-lg"></i>
+					<i class="ph-dots-three-outline ph-bold ph-lg"></i>
 				</button>
 			</footer>
 		</div>
@@ -267,7 +267,7 @@ function showRenoteMenu(viaKeyboard = false): void {
 	if (!isMyRenote) return;
 	os.popupMenu([{
 		text: i18n.ts.unrenote,
-		icon: 'ph-trash-bold ph-lg',
+		icon: 'ph-trash ph-bold ph-lg',
 		danger: true,
 		action: () => {
 			os.api('notes/delete', {
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 144ffe062..86b8ac0d0 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -13,7 +13,7 @@
 	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to" @click.self="router.push(notePage(appearNote))"/>
 	<div v-if="isRenote" class="renote">
 		<MkAvatar class="avatar" :user="note.user"/>
-		<i class="ph-repeat-bold ph-lg"></i>
+		<i class="ph-repeat ph-bold ph-lg"></i>
 		<I18n :src="i18n.ts.renotedBy" tag="span">
 			<template #user>
 				<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)">
@@ -23,7 +23,7 @@
 		</I18n>
 		<div class="info">
 			<button ref="renoteTime" class="_button time" @click="showRenoteMenu()">
-				<i v-if="isMyRenote" class="ph-dots-three-outline-bold ph-lg dropdownIcon"></i>
+				<i v-if="isMyRenote" class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"></i>
 				<MkTime :time="note.createdAt"/>
 			</button>
 			<MkVisibility :note="note"/>
@@ -70,7 +70,7 @@
 					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
 					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
 				</div>
-				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
+				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television ph-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
 			</div>
 			<footer class="footer">
 				<div class="info">
@@ -80,21 +80,21 @@
 				</div>
 				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
 				<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
-					<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
-					<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
+					<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left ph-bold ph-lg"></i></template>
+					<template v-else><i class="ph-arrow-bend-up-left ph-bold ph-lg"></i></template>
 					<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
 				</button>
 				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
 				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
 				<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
-					<i class="ph-smiley-bold ph-lg"></i>
+					<i class="ph-smiley ph-bold ph-lg"></i>
 				</button>
 				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
-					<i class="ph-minus-bold ph-lg"></i>
+					<i class="ph-minus ph-bold ph-lg"></i>
 				</button>
 				<XQuoteButton class="button" :note="appearNote"/>
 				<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
-					<i class="ph-dots-three-outline-bold ph-lg"></i>
+					<i class="ph-dots-three-outline ph-bold ph-lg"></i>
 				</button>
 			</footer>
 		</div>
@@ -267,7 +267,7 @@ function showRenoteMenu(viaKeyboard = false): void {
 	if (!isMyRenote) return;
 	os.popupMenu([{
 		text: i18n.ts.unrenote,
-		icon: 'ph-trash-bold ph-lg',
+		icon: 'ph-trash ph-bold ph-lg',
 		danger: true,
 		action: () => {
 			os.api('notes/delete', {
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index c0766ec5f..152a4a023 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -23,7 +23,7 @@
 			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply" :conversation="conversation" :depth="depth + 1"/>
 		</template>
 		<div v-else-if="replies.length > 0" class="more">
-			<MkA class="text _link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ph-caret-double-right-bold ph-lg"></i></MkA>
+			<MkA class="text _link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ph-caret-double-right ph-bold ph-lg"></i></MkA>
 		</div>
 	</template>
 </div>
diff --git a/packages/client/src/components/MkNotification.vue b/packages/client/src/components/MkNotification.vue
index 4c7679e90..7e2072f03 100644
--- a/packages/client/src/components/MkNotification.vue
+++ b/packages/client/src/components/MkNotification.vue
@@ -5,16 +5,16 @@
 		<MkAvatar v-else-if="notification.user" class="icon" :user="notification.user"/>
 		<img v-else-if="notification.icon" class="icon" :src="notification.icon" alt=""/>
 		<div class="sub-icon" :class="notification.type">
-			<i v-if="notification.type === 'follow'" class="ph-hand-waving-bold"></i>
-			<i v-else-if="notification.type === 'receiveFollowRequest'" class="ph-clock-bold"></i>
-			<i v-else-if="notification.type === 'followRequestAccepted'" class="ph-check-bold"></i>
-			<i v-else-if="notification.type === 'groupInvited'" class="ph-identification-card-bold"></i>
-			<i v-else-if="notification.type === 'renote'" class="ph-repeat-bold"></i>
-			<i v-else-if="notification.type === 'reply'" class="ph-arrow-bend-up-left-bold"></i>
-			<i v-else-if="notification.type === 'mention'" class="ph-at-bold"></i>
-			<i v-else-if="notification.type === 'quote'" class="ph-quotes-bold"></i>
-			<i v-else-if="notification.type === 'pollVote'" class="ph-microphone-stage-bold"></i>
-			<i v-else-if="notification.type === 'pollEnded'" class="ph-microphone-stage-bold"></i>
+			<i v-if="notification.type === 'follow'" class="ph-hand-waving ph-bold"></i>
+			<i v-else-if="notification.type === 'receiveFollowRequest'" class="ph-clock ph-bold"></i>
+			<i v-else-if="notification.type === 'followRequestAccepted'" class="ph-check ph-bold"></i>
+			<i v-else-if="notification.type === 'groupInvited'" class="ph-identification-card ph-bold"></i>
+			<i v-else-if="notification.type === 'renote'" class="ph-repeat ph-bold"></i>
+			<i v-else-if="notification.type === 'reply'" class="ph-arrow-bend-up-left ph-bold"></i>
+			<i v-else-if="notification.type === 'mention'" class="ph-at ph-bold"></i>
+			<i v-else-if="notification.type === 'quote'" class="ph-quotes ph-bold"></i>
+			<i v-else-if="notification.type === 'pollVote'" class="ph-microphone-stage ph-bold"></i>
+			<i v-else-if="notification.type === 'pollEnded'" class="ph-microphone-stage ph-bold"></i>
 			<!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
 			<XReactionIcon
 				v-else-if="notification.type === 'reaction'"
diff --git a/packages/client/src/components/MkPageWindow.vue b/packages/client/src/components/MkPageWindow.vue
index c7af0172e..497b27c6b 100644
--- a/packages/client/src/components/MkPageWindow.vue
+++ b/packages/client/src/components/MkPageWindow.vue
@@ -57,7 +57,7 @@ const buttonsLeft = $computed(() => {
 
 	if (history.length > 1) {
 		buttons.push({
-			icon: 'ph-caret-left-bold ph-lg',
+			icon: 'ph-caret-left ph-bold ph-lg',
 			onClick: back,
 		});
 	}
@@ -66,7 +66,7 @@ const buttonsLeft = $computed(() => {
 });
 const buttonsRight = $computed(() => {
 	const buttons = [{
-		icon: 'ph-arrows-out-simple-bold ph-lg',
+		icon: 'ph-arrows-out-simple ph-bold ph-lg',
 		title: i18n.ts.showInPage,
 		onClick: expand,
 	}];
@@ -86,22 +86,22 @@ provide('shouldOmitHeaderTitle', true);
 provide('shouldHeaderThin', true);
 
 const contextmenu = $computed(() => ([{
-	icon: 'ph-arrows-out-simple-bold ph-lg',
+	icon: 'ph-arrows-out-simple ph-bold ph-lg',
 	text: i18n.ts.showInPage,
 	action: expand,
 }, {
-	icon: 'ph-arrow-square-out-bold ph-lg',
+	icon: 'ph-arrow-square-out ph-bold ph-lg',
 	text: i18n.ts.popout,
 	action: popout,
 }, {
-	icon: 'ph-arrow-square-out-bold ph-lg',
+	icon: 'ph-arrow-square-out ph-bold ph-lg',
 	text: i18n.ts.openInNewTab,
 	action: () => {
 		window.open(url + router.getCurrentPath(), '_blank');
 		windowEl.close();
 	},
 }, {
-	icon: 'ph-link-simple-bold ph-lg',
+	icon: 'ph-link-simple ph-bold ph-lg',
 	text: i18n.ts.copyLink,
 	action: () => {
 		copyToClipboard(url + router.getCurrentPath());
diff --git a/packages/client/src/components/MkPoll.vue b/packages/client/src/components/MkPoll.vue
index 2c5d35c7a..7f593d3fb 100644
--- a/packages/client/src/components/MkPoll.vue
+++ b/packages/client/src/components/MkPoll.vue
@@ -4,7 +4,7 @@
 		<li v-for="(choice, i) in note.poll.choices" :key="i" :class="{ voted: choice.voted }" @click="vote(i)">
 			<div class="backdrop" :style="{ 'width': `${showResult ? (choice.votes / total * 100) : 0}%` }"></div>
 			<span>
-				<template v-if="choice.isVoted"><i class="ph-check-bold ph-lg"></i></template>
+				<template v-if="choice.isVoted"><i class="ph-check ph-bold ph-lg"></i></template>
 				<Mfm :text="choice.text" :plain="true" :custom-emojis="note.emojis"/>
 				<span v-if="showResult" class="votes">({{ i18n.t('_poll.votesCount', { n: choice.votes }) }})</span>
 			</span>
diff --git a/packages/client/src/components/MkPollEditor.vue b/packages/client/src/components/MkPollEditor.vue
index 3803d98dd..b5f8ea594 100644
--- a/packages/client/src/components/MkPollEditor.vue
+++ b/packages/client/src/components/MkPollEditor.vue
@@ -1,14 +1,14 @@
 <template>
 <div class="zmdxowus">
 	<p v-if="choices.length < 2" class="caution">
-		<i class="ph-warning-bold ph-lg"></i>{{ i18n.ts._poll.noOnlyOneChoice }}
+		<i class="ph-warning ph-bold ph-lg"></i>{{ i18n.ts._poll.noOnlyOneChoice }}
 	</p>
 	<ul>
 		<li v-for="(choice, i) in choices" :key="i">
 			<MkInput class="input" small :model-value="choice" :placeholder="i18n.t('_poll.choiceN', { n: i + 1 })" @update:modelValue="onInput(i, $event)">
 			</MkInput>
 			<button class="_button" @click="remove(i)">
-				<i class="ph-x-bold ph-lg"></i>
+				<i class="ph-x ph-bold ph-lg"></i>
 			</button>
 		</li>
 	</ul>
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 34418f6fc..4daa731f6 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -8,35 +8,35 @@
 	@drop.stop="onDrop"
 >
 	<header>
-		<button v-if="!fixed" class="cancel _button" @click="cancel"><i class="ph-x-bold ph-lg"></i></button>
+		<button v-if="!fixed" class="cancel _button" @click="cancel"><i class="ph-x ph-bold ph-lg"></i></button>
 		<button v-click-anime v-tooltip="i18n.ts.switchAccount" class="account _button" @click="openAccountMenu">
 			<MkAvatar :user="postAccount ?? $i" class="avatar"/>
 		</button>
 		<div class="right">
 			<span class="text-count" :class="{ over: textLength > maxTextLength }">{{ maxTextLength - textLength }}</span>
-			<span v-if="localOnly" class="local-only"><i class="ph-hand-fist-bold ph-lg"></i></span>
+			<span v-if="localOnly" class="local-only"><i class="ph-hand-fist ph-bold ph-lg"></i></span>
 			<button ref="visibilityButton" v-tooltip="i18n.ts.visibility" class="_button visibility" :disabled="channel != null" @click="setVisibility">
-				<span v-if="visibility === 'public'"><i class="ph-planet-bold ph-lg"></i></span>
-				<span v-if="visibility === 'home'"><i class="ph-house-bold ph-lg"></i></span>
-				<span v-if="visibility === 'followers'"><i class="ph-lock-simple-open-bold ph-lg"></i></span>
-				<span v-if="visibility === 'specified'"><i class="ph-envelope-simple-open-bold ph-lg"></i></span>
+				<span v-if="visibility === 'public'"><i class="ph-planet ph-bold ph-lg"></i></span>
+				<span v-if="visibility === 'home'"><i class="ph-house ph-bold ph-lg"></i></span>
+				<span v-if="visibility === 'followers'"><i class="ph-lock-simple-open ph-bold ph-lg"></i></span>
+				<span v-if="visibility === 'specified'"><i class="ph-envelope-simple-open ph-bold ph-lg"></i></span>
 			</button>
-			<button v-tooltip="i18n.ts.previewNoteText" class="_button preview" :class="{ active: showPreview }" @click="showPreview = !showPreview"><i class="ph-file-code-bold ph-lg"></i></button>
-			<button class="submit _buttonGradate" :disabled="!canPost" data-cy-open-post-form-submit @click="post">{{ submitText }}<i :class="reply ? 'ph-arrow-bend-up-left-bold ph-lg' : renote ? 'ph-quotes-bold ph-lg' : 'ph-paper-plane-tilt-bold ph-lg'"></i></button>
+			<button v-tooltip="i18n.ts.previewNoteText" class="_button preview" :class="{ active: showPreview }" @click="showPreview = !showPreview"><i class="ph-file-code ph-bold ph-lg"></i></button>
+			<button class="submit _buttonGradate" :disabled="!canPost" data-cy-open-post-form-submit @click="post">{{ submitText }}<i :class="reply ? 'ph-arrow-bend-up-left-bold ph-lg' : renote ? 'ph-quotes-bold ph-lg' : 'ph-paper-plane-tilt ph-bold ph-lg'"></i></button>
 		</div>
 	</header>
 	<div class="form" :class="{ fixed }">
 		<XNoteSimple v-if="reply" class="preview" :note="reply"/>
 		<XNoteSimple v-if="renote" class="preview" :note="renote"/>
-		<div v-if="quoteId" class="with-quote"><i class="ph-quotes-bold ph-lg"></i> {{ i18n.ts.quoteAttached }}<button @click="quoteId = null"><i class="ph-x-bold ph-lg"></i></button></div>
+		<div v-if="quoteId" class="with-quote"><i class="ph-quotes-bold ph-lg"></i> {{ i18n.ts.quoteAttached }}<button @click="quoteId = null"><i class="ph-x ph-bold ph-lg"></i></button></div>
 		<div v-if="visibility === 'specified'" class="to-specified">
 			<span style="margin-right: 8px;">{{ i18n.ts.recipient }}</span>
 			<div class="visibleUsers">
 				<span v-for="u in visibleUsers" :key="u.id">
 					<MkAcct :user="u"/>
-					<button class="_button" @click="removeVisibleUser(u)"><i class="ph-x-bold ph-lg"></i></button>
+					<button class="_button" @click="removeVisibleUser(u)"><i class="ph-x ph-bold ph-lg"></i></button>
 				</span>
-				<button class="_button" @click="addVisibleUser"><i class="ph-plus-bold ph-md ph-fw ph-lg"></i></button>
+				<button class="_button" @click="addVisibleUser"><i class="ph-plus ph-bold ph-md ph-fw ph-lg"></i></button>
 			</div>
 		</div>
 		<MkInfo v-if="hasNotSpecifiedMentions" warn class="hasNotSpecifiedMentions">{{ i18n.ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ i18n.ts.add }}</button></MkInfo>
@@ -47,14 +47,14 @@
 		<XPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/>
 		<XNotePreview v-if="showPreview" class="preview" :text="text"/>
 		<footer>
-			<button v-tooltip="i18n.ts.attachFile" class="_button" @click="chooseFileFrom"><i class="ph-upload-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts.poll" class="_button" :class="{ active: poll }" @click="togglePoll"><i class="ph-microphone-stage-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts.useCw" class="_button" :class="{ active: useCw }" @click="useCw = !useCw"><i class="ph-eye-slash-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts.mention" class="_button" @click="insertMention"><i class="ph-at-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts.hashtags" class="_button" :class="{ active: withHashtags }" @click="withHashtags = !withHashtags"><i class="ph-hash-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts.emoji" class="_button" @click="insertEmoji"><i class="ph-smiley-bold ph-lg"></i></button>
-			<button v-if="postFormActions.length > 0" v-tooltip="i18n.ts.plugin" class="_button" @click="showActions"><i class="ph-plug-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts._mfm.cheatSheet" class="_button right" @click="openCheatSheet"><i class="ph-question-bold ph-lg"></i></button>
+			<button v-tooltip="i18n.ts.attachFile" class="_button" @click="chooseFileFrom"><i class="ph-upload ph-bold ph-lg"></i></button>
+			<button v-tooltip="i18n.ts.poll" class="_button" :class="{ active: poll }" @click="togglePoll"><i class="ph-microphone-stage ph-bold ph-lg"></i></button>
+			<button v-tooltip="i18n.ts.useCw" class="_button" :class="{ active: useCw }" @click="useCw = !useCw"><i class="ph-eye-slash ph-bold ph-lg"></i></button>
+			<button v-tooltip="i18n.ts.mention" class="_button" @click="insertMention"><i class="ph-at ph-bold ph-lg"></i></button>
+			<button v-tooltip="i18n.ts.hashtags" class="_button" :class="{ active: withHashtags }" @click="withHashtags = !withHashtags"><i class="ph-hash ph-bold ph-lg"></i></button>
+			<button v-tooltip="i18n.ts.emoji" class="_button" @click="insertEmoji"><i class="ph-smiley ph-bold ph-lg"></i></button>
+			<button v-if="postFormActions.length > 0" v-tooltip="i18n.ts.plugin" class="_button" @click="showActions"><i class="ph-plug ph-bold ph-lg"></i></button>
+			<button v-tooltip="i18n.ts._mfm.cheatSheet" class="_button right" @click="openCheatSheet"><i class="ph-question ph-bold ph-lg"></i></button>
 		</footer>
 		<datalist id="hashtags">
 			<option v-for="hashtag in recentHashtags" :key="hashtag" :value="hashtag"/>
diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
index 8aba4a99a..68c00971a 100644
--- a/packages/client/src/components/MkPostFormAttaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -5,7 +5,7 @@
 			<div class="file" @click="showFileMenu(element, $event)" @contextmenu.prevent="showFileMenu(element, $event)">
 				<MkDriveFileThumbnail :data-id="element.id" class="thumbnail" :file="element" fit="cover"/>
 				<div v-if="element.isSensitive" class="sensitive">
-					<i class="ph-warning-bold ph-lg icon"></i>
+					<i class="ph-warning ph-bold ph-lg icon"></i>
 				</div>
 			</div>
 		</template>
@@ -115,19 +115,19 @@ export default defineComponent({
 			if (this.menu) return;
 			this.menu = os.popupMenu([{
 				text: i18n.ts.renameFile,
-				icon: 'ph-cursor-text-bold ph-lg',
+				icon: 'ph-cursor-text ph-bold ph-lg',
 				action: () => { this.rename(file); },
 			}, {
 				text: file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
-				icon: file.isSensitive ? 'ph-eye-slash-bold ph-lg' : 'ph-eye-bold ph-lg',
+				icon: file.isSensitive ? 'ph-eye-slash-bold ph-lg' : 'ph-eye ph-bold ph-lg',
 				action: () => { this.toggleSensitive(file); },
 			}, {
 				text: i18n.ts.describeFile,
-				icon: 'ph-cursor-text-bold ph-lg',
+				icon: 'ph-cursor-text ph-bold ph-lg',
 				action: () => { this.describe(file); },
 			}, {
 				text: i18n.ts.attachCancel,
-				icon: 'ph-circle-wavy-warning-bold ph-lg',
+				icon: 'ph-circle-wavy-warning ph-bold ph-lg',
 				action: () => { this.detachMedia(file.id); },
 			}], ev.currentTarget ?? ev.target).then(() => this.menu = null);
 		},
diff --git a/packages/client/src/components/MkQuoteButton.vue b/packages/client/src/components/MkQuoteButton.vue
index e5c26c28a..a936e791d 100644
--- a/packages/client/src/components/MkQuoteButton.vue
+++ b/packages/client/src/components/MkQuoteButton.vue
@@ -5,7 +5,7 @@
 	class="eddddedb _button"
 	@click="quote()"
 >
-	<i class="ph-quotes-bold ph-lg"></i>
+	<i class="ph-quotes ph-bold ph-lg"></i>
 </button>
 </template>
 
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index a39b916b6..5a9369a90 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -6,11 +6,11 @@
 	class="eddddedb _button canRenote"
 	@click="renote(false, $event)"
 >
-	<i class="ph-repeat-bold ph-lg"></i>
+	<i class="ph-repeat ph-bold ph-lg"></i>
 	<p v-if="count > 0" class="count">{{ count }}</p>
 </button>
 <button v-else class="eddddedb _button">
-	<i class="ph-prohibit-bold ph-lg"></i>
+	<i class="ph-prohibit ph-bold ph-lg"></i>
 </button>
 </template>
 
@@ -66,7 +66,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 
 	let buttonActions = [{
 		text: i18n.ts.renote,
-		icon: 'ph-repeat-bold ph-lg',
+		icon: 'ph-repeat ph-bold ph-lg',
 		danger: false,
 		action: () => {
 			os.api('notes/create', {
@@ -86,7 +86,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 	if (!defaultStore.state.seperateRenoteQuote) {
 		buttonActions.push({
 			text: i18n.ts.quote,
-			icon: 'ph-quotes-bold ph-lg',
+			icon: 'ph-quotes ph-bold ph-lg',
 			danger: false,
 			action: () => {
 				os.post({
@@ -99,7 +99,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 	if (hasRenotedBefore) {
 		buttonActions.push({
 			text: i18n.ts.unrenote,
-			icon: 'ph-trash-bold ph-lg',
+			icon: 'ph-trash ph-bold ph-lg',
 			danger: true,
 			action: () => {
 				os.api('notes/unrenote', {
diff --git a/packages/client/src/components/MkSignin.vue b/packages/client/src/components/MkSignin.vue
index b04f1cea6..63a5bf10e 100644
--- a/packages/client/src/components/MkSignin.vue
+++ b/packages/client/src/components/MkSignin.vue
@@ -11,7 +11,7 @@
 				<template #suffix>@{{ host }}</template>
 			</MkInput>
 			<MkInput v-if="!user || user && !user.usePasswordLessLogin" v-model="password" class="_formBlock" :placeholder="i18n.ts.password" type="password" :with-password-toggle="true" required data-cy-signin-password>
-				<template #prefix><i class="ph-lock-bold ph-lg"></i></template>
+				<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
 				<template #caption><button class="_textButton" type="button" @click="resetPassword">{{ i18n.ts.forgotPassword }}</button></template>
 			</MkInput>
 			<MkButton class="_formBlock" type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? i18n.ts.loggingIn : i18n.ts.login }}</MkButton>
@@ -30,20 +30,20 @@
 				<p style="margin-bottom:0;">{{ i18n.ts.twoStepAuthentication }}</p>
 				<MkInput v-if="user && user.usePasswordLessLogin" v-model="password" type="password" :with-password-toggle="true" required>
 					<template #label>{{ i18n.ts.password }}</template>
-					<template #prefix><i class="ph-lock-bold ph-lg"></i></template>
+					<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
 				</MkInput>
 				<MkInput v-model="token" type="text" pattern="^[0-9]{6}$" autocomplete="off" :spellcheck="false" required>
 					<template #label>{{ i18n.ts.token }}</template>
-					<template #prefix><i class="ph-poker-chip-bold ph-lg"></i></template>
+					<template #prefix><i class="ph-poker-chip ph-bold ph-lg"></i></template>
 				</MkInput>
 				<MkButton type="submit" :disabled="signing" primary style="margin: 0 auto;">{{ signing ? i18n.ts.loggingIn : i18n.ts.login }}</MkButton>
 			</div>
 		</div>
 	</div>
 	<div class="social _section">
-		<a v-if="meta && meta.enableTwitterIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/twitter`"><i class="ph-twitter-logo-bold ph-lg" style="margin-right: 4px;"></i>{{ i18n.t('signinWith', { x: 'Twitter' }) }}</a>
-		<a v-if="meta && meta.enableGithubIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/github`"><i class="ph-github-logo-bold ph-lg" style="margin-right: 4px;"></i>{{ i18n.t('signinWith', { x: 'GitHub' }) }}</a>
-		<a v-if="meta && meta.enableDiscordIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/discord`"><i class="ph-discord-logo-bold ph-lg" style="margin-right: 4px;"></i>{{ i18n.t('signinWith', { x: 'Discord' }) }}</a>
+		<a v-if="meta && meta.enableTwitterIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/twitter`"><i class="ph-twitter-logo ph-bold ph-lg" style="margin-right: 4px;"></i>{{ i18n.t('signinWith', { x: 'Twitter' }) }}</a>
+		<a v-if="meta && meta.enableGithubIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/github`"><i class="ph-github-logo ph-bold ph-lg" style="margin-right: 4px;"></i>{{ i18n.t('signinWith', { x: 'GitHub' }) }}</a>
+		<a v-if="meta && meta.enableDiscordIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/discord`"><i class="ph-discord-logo ph-bold ph-lg" style="margin-right: 4px;"></i>{{ i18n.t('signinWith', { x: 'Discord' }) }}</a>
 	</div>
 </form>
 </template>
diff --git a/packages/client/src/components/MkSignup.vue b/packages/client/src/components/MkSignup.vue
index 9b09e852e..b3f7f473c 100644
--- a/packages/client/src/components/MkSignup.vue
+++ b/packages/client/src/components/MkSignup.vue
@@ -2,53 +2,53 @@
 <form class="qlvuhzng _formRoot" autocomplete="new-password" @submit.prevent="onSubmit">
 	<MkInput v-if="instance.disableRegistration" v-model="invitationCode" class="_formBlock" type="text" :spellcheck="false" required data-cy-signup-invitation-code @update:modelValue="onChangeInvitationCode">
 		<template #label>{{ i18n.ts.invitationCode }}</template>
-		<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+		<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 	</MkInput>
 	<div v-if="!instance.disableRegistration || (instance.disableRegistration && invitationState === 'entered')">
 		<MkInput v-model="username" class="_formBlock" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :spellcheck="false" required data-cy-signup-username @update:modelValue="onChangeUsername">
-			<template #label>{{ i18n.ts.username }} <div v-tooltip:dialog="i18n.ts.usernameInfo" class="_button _help"><i class="ph-question-bold"></i></div></template>
+			<template #label>{{ i18n.ts.username }} <div v-tooltip:dialog="i18n.ts.usernameInfo" class="_button _help"><i class="ph-question ph-bold"></i></div></template>
 			<template #prefix>@</template>
 			<template #suffix>@{{ host }}</template>
 			<template #caption>
-				<span v-if="usernameState === 'wait'" style="color:#6e6a86"><i class="ph-circle-notch-bold ph-lg fa-pulse ph-fw ph-lg"></i> {{ i18n.ts.checking }}</span>
-				<span v-else-if="usernameState === 'ok'" style="color: var(--success)"><i class="ph-check-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.available }}</span>
-				<span v-else-if="usernameState === 'unavailable'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.unavailable }}</span>
-				<span v-else-if="usernameState === 'error'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.error }}</span>
-				<span v-else-if="usernameState === 'invalid-format'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.usernameInvalidFormat }}</span>
-				<span v-else-if="usernameState === 'min-range'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.tooShort }}</span>
-				<span v-else-if="usernameState === 'max-range'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.tooLong }}</span>
+				<span v-if="usernameState === 'wait'" style="color:#6e6a86"><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i> {{ i18n.ts.checking }}</span>
+				<span v-else-if="usernameState === 'ok'" style="color: var(--success)"><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.available }}</span>
+				<span v-else-if="usernameState === 'unavailable'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.unavailable }}</span>
+				<span v-else-if="usernameState === 'error'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.error }}</span>
+				<span v-else-if="usernameState === 'invalid-format'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.usernameInvalidFormat }}</span>
+				<span v-else-if="usernameState === 'min-range'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.tooShort }}</span>
+				<span v-else-if="usernameState === 'max-range'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.tooLong }}</span>
 			</template>
 		</MkInput>
 		<MkInput v-if="instance.emailRequiredForSignup" v-model="email" class="_formBlock" :debounce="true" type="email" :spellcheck="false" required data-cy-signup-email @update:modelValue="onChangeEmail">
-			<template #label>{{ i18n.ts.emailAddress }} <div v-tooltip:dialog="i18n.ts._signup.emailAddressInfo" class="_button _help"><i class="ph-question-bold"></i></div></template>
-			<template #prefix><i class="ph-envelope-simple-open-bold ph-lg"></i></template>
+			<template #label>{{ i18n.ts.emailAddress }} <div v-tooltip:dialog="i18n.ts._signup.emailAddressInfo" class="_button _help"><i class="ph-question ph-bold"></i></div></template>
+			<template #prefix><i class="ph-envelope-simple-open ph-bold ph-lg"></i></template>
 			<template #caption>
-				<span v-if="emailState === 'wait'" style="color:#6e6a86"><i class="ph-circle-notch-bold ph-lg fa-pulse ph-fw ph-lg"></i> {{ i18n.ts.checking }}</span>
-				<span v-else-if="emailState === 'ok'" style="color: var(--success)"><i class="ph-check-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.available }}</span>
-				<span v-else-if="emailState === 'unavailable:used'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.used }}</span>
-				<span v-else-if="emailState === 'unavailable:format'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.format }}</span>
-				<span v-else-if="emailState === 'unavailable:disposable'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.disposable }}</span>
-				<span v-else-if="emailState === 'unavailable:mx'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.mx }}</span>
-				<span v-else-if="emailState === 'unavailable:smtp'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.smtp }}</span>
-				<span v-else-if="emailState === 'unavailable'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.unavailable }}</span>
-				<span v-else-if="emailState === 'error'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.error }}</span>
+				<span v-if="emailState === 'wait'" style="color:#6e6a86"><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i> {{ i18n.ts.checking }}</span>
+				<span v-else-if="emailState === 'ok'" style="color: var(--success)"><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.available }}</span>
+				<span v-else-if="emailState === 'unavailable:used'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.used }}</span>
+				<span v-else-if="emailState === 'unavailable:format'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.format }}</span>
+				<span v-else-if="emailState === 'unavailable:disposable'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.disposable }}</span>
+				<span v-else-if="emailState === 'unavailable:mx'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.mx }}</span>
+				<span v-else-if="emailState === 'unavailable:smtp'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.smtp }}</span>
+				<span v-else-if="emailState === 'unavailable'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.unavailable }}</span>
+				<span v-else-if="emailState === 'error'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.error }}</span>
 			</template>
 		</MkInput>
 		<MkInput v-model="password" class="_formBlock" type="password" autocomplete="new-password" required data-cy-signup-password @update:modelValue="onChangePassword">
 			<template #label>{{ i18n.ts.password }}</template>
-			<template #prefix><i class="ph-lock-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
 			<template #caption>
-				<span v-if="passwordStrength == 'low'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.weakPassword }}</span>
-				<span v-if="passwordStrength == 'medium'" style="color: var(--warn)"><i class="ph-check-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.normalPassword }}</span>
-				<span v-if="passwordStrength == 'high'" style="color: var(--success)"><i class="ph-check-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.strongPassword }}</span>
+				<span v-if="passwordStrength == 'low'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.weakPassword }}</span>
+				<span v-if="passwordStrength == 'medium'" style="color: var(--warn)"><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.normalPassword }}</span>
+				<span v-if="passwordStrength == 'high'" style="color: var(--success)"><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.strongPassword }}</span>
 			</template>
 		</MkInput>
 		<MkInput v-model="retypedPassword" class="_formBlock" type="password" autocomplete="new-password" required data-cy-signup-password-retype @update:modelValue="onChangePasswordRetype">
 			<template #label>{{ i18n.ts.password }} ({{ i18n.ts.retype }})</template>
-			<template #prefix><i class="ph-lock-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
 			<template #caption>
-				<span v-if="passwordRetypeState == 'match'" style="color: var(--success)"><i class="ph-check-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.passwordMatched }}</span>
-				<span v-if="passwordRetypeState == 'not-match'" style="color: var(--error)"><i class="ph-warning-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.passwordNotMatched }}</span>
+				<span v-if="passwordRetypeState == 'match'" style="color: var(--success)"><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.passwordMatched }}</span>
+				<span v-if="passwordRetypeState == 'not-match'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.passwordNotMatched }}</span>
 			</template>
 		</MkInput>
 		<MkSwitch v-if="instance.tosUrl" v-model="ToSAgreement" class="_formBlock tou">
diff --git a/packages/client/src/components/MkStarButton.vue b/packages/client/src/components/MkStarButton.vue
index 9a0cca414..9327e1dd4 100644
--- a/packages/client/src/components/MkStarButton.vue
+++ b/packages/client/src/components/MkStarButton.vue
@@ -6,9 +6,9 @@
 		<path d="m23.186 29.526c-0.993 0-1.952-0.455-2.788-1.339-2.816-2.985-3.569-2.333-4.817-1.251-0.781 0.679-1.754 1.523-3.205 1.523-2.351 0-3.969-2.302-4.036-2.4-0.314-0.454-0.2-1.077 0.254-1.391 0.451-0.312 1.074-0.2 1.39 0.251 0.301 0.429 1.317 1.54 2.393 1.54 0.704 0 1.256-0.479 1.895-1.033 1.816-1.578 3.764-2.655 7.583 1.388 0.823 0.873 1.452 0.774 1.908 0.592 1.659-0.665 3.205-3.698 3.197-5.15-3e-3 -0.552 0.442-1.002 0.994-1.005h6e-3c0.55 0 0.997 0.444 1 0.995 0.012 2.103-1.854 5.976-4.454 7.017-0.443 0.175-0.885 0.262-1.32 0.263z"/>
 		<path d="m14.815 15.375c-0.584 2.114-1.642 3.083-3.152 2.666-1.509-0.417-2.343-1.909-1.76-4.023 0.583-2.112 2.175-3.363 3.684-2.946 1.511 0.417 1.812 2.19 1.228 4.303zm11.416-0.755c0.473 2.141-0.675 4.838-2.204 5.176s-3.28-1.719-3.753-3.86c-0.473-2.14 0.419-3.971 1.948-4.309s3.536 0.853 4.009 2.993z"/>
 	</g></svg>
-	<i v-else-if="instance.defaultReaction === '👍'" class="ph-thumbs-up-bold ph-lg"></i>
-	<i v-else-if="instance.defaultReaction === '❤️'" class="ph-heart-bold ph-lg"></i>
-	<i v-else class="ph-star-bold ph-lg"></i>
+	<i v-else-if="instance.defaultReaction === '👍'" class="ph-thumbs-up ph-bold ph-lg"></i>
+	<i v-else-if="instance.defaultReaction === '❤️'" class="ph-heart ph-bold ph-lg"></i>
+	<i v-else class="ph-star ph-bold ph-lg"></i>
 </button>
 </template>
 
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index b575fcc0a..5176a3825 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -2,7 +2,7 @@
 <div class="wrmlmaau" :class="{ collapsed, isLong }">
 	<div class="body">
 		<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
-		<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left-bold ph-lg"></i></MkA>
+		<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left ph-bold ph-lg"></i></MkA>
 		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 		<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">{{ i18n.ts.quoteAttached }}: ...</MkA>
 	</div>
diff --git a/packages/client/src/components/MkTutorialDialog.vue b/packages/client/src/components/MkTutorialDialog.vue
index 0160ace21..c077d3fc5 100644
--- a/packages/client/src/components/MkTutorialDialog.vue
+++ b/packages/client/src/components/MkTutorialDialog.vue
@@ -13,17 +13,17 @@
 				<div class="_footer navigation">
 					<div class="step">
 						<button class="arrow _button" :disabled="tutorial === 0" @click="tutorial--">
-							<i class="ph-caret-left-bold ph-lg"></i>
+							<i class="ph-caret-left ph-bold ph-lg"></i>
 						</button>
 						<span>{{ tutorial + 1 }} / 6</span>
 						<button class="arrow _button" :disabled="tutorial === 5" @click="tutorial++">
-							<i class="ph-caret-right-bold ph-lg"></i>
+							<i class="ph-caret-right ph-bold ph-lg"></i>
 						</button>
 					</div>
-					<MkButton v-if="tutorial === 5" class="ok" primary @click="close"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.gotIt }}</MkButton>
-					<MkButton v-else class="ok" primary @click="tutorial++"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.next }}</MkButton>
+					<MkButton v-if="tutorial === 5" class="ok" primary @click="close"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.gotIt }}</MkButton>
+					<MkButton v-else class="ok" primary @click="tutorial++"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.next }}</MkButton>
 				</div>
-				<h2 class="_title title"><i class="ph-info-bold ph-lg"></i> {{ i18n.ts._tutorial.title }}</h2>
+				<h2 class="_title title"><i class="ph-info ph-bold ph-lg"></i> {{ i18n.ts._tutorial.title }}</h2>
 				<Transition name="fade">
 					<div v-if="tutorial === 0" key="1" class="_content">
 						<h3>{{ i18n.ts._tutorial.step1_1 }}</h3>
@@ -41,7 +41,7 @@
 						<div>{{ i18n.ts._tutorial.step3_2 }}</div>
 						<XFeaturedUsers/>
 						<br/>
-						<MkButton class="ok" primary @click="tutorial++"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.next }}</MkButton>
+						<MkButton class="ok" primary @click="tutorial++"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.next }}</MkButton>
 					</div>
 					<div v-else-if="tutorial === 3" key="4" class="_content">
 						<h3>{{ i18n.ts._tutorial.step4_1 }}</h3>
@@ -64,35 +64,35 @@
 							<li>
 								<I18n :src="i18n.ts._tutorial.step5_3" tag="div">
 									<template #icon>
-										<i class="ph-house-bold ph-lg"/>
+										<i class="ph-house ph-bold ph-lg"/>
 									</template>
 								</I18n>
 							</li>
 							<li v-if="timelines.includes('local')">
 								<I18n :src="i18n.ts._tutorial.step5_4" tag="div">
 									<template #icon>
-										<i class="ph-users-bold ph-lg"/>
+										<i class="ph-users ph-bold ph-lg"/>
 									</template>
 								</I18n>
 							</li>
 							<li v-if="timelines.includes('recommended')">
 								<I18n :src="i18n.ts._tutorial.step5_5" tag="div">
 									<template #icon>
-										<i class="ph-thumbs-up-bold ph-lg"/>
+										<i class="ph-thumbs-up ph-bold ph-lg"/>
 									</template>
 								</I18n>
 							</li>
 							<li v-if="timelines.includes('social')">
 								<I18n :src="i18n.ts._tutorial.step5_6" tag="div">
 									<template #icon>
-										<i class="ph-handshake-bold ph-lg"/>
+										<i class="ph-handshake ph-bold ph-lg"/>
 									</template>
 								</I18n>
 							</li>
 							<li v-if="timelines.includes('global')">
 								<I18n :src="i18n.ts._tutorial.step5_7" tag="div">
 									<template #icon>
-										<i class="ph-planet-bold ph-lg"/>
+										<i class="ph-planet ph-bold ph-lg"/>
 									</template>
 								</I18n>
 							</li>
diff --git a/packages/client/src/components/MkUrlPreview.vue b/packages/client/src/components/MkUrlPreview.vue
index 865d4bcbe..6f0adfb14 100644
--- a/packages/client/src/components/MkUrlPreview.vue
+++ b/packages/client/src/components/MkUrlPreview.vue
@@ -1,6 +1,6 @@
 <template>
 <div v-if="playerEnabled" class="player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`">
-	<button class="disablePlayer" :title="i18n.ts.disablePlayer" @click="playerEnabled = false"><i class="ph-x-bold ph-lg"></i></button>
+	<button class="disablePlayer" :title="i18n.ts.disablePlayer" @click="playerEnabled = false"><i class="ph-x ph-bold ph-lg"></i></button>
 	<iframe :src="player.url + (player.url.match(/\?/) ? '&autoplay=1&auto_play=1' : '?autoplay=1&auto_play=1')" :width="player.width || '100%'" :heigth="player.height || 250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen/>
 </div>
 <div v-else-if="tweetId && tweetExpanded" ref="twitter" class="twitter">
@@ -10,7 +10,7 @@
 	<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
 		<component :is="self ? 'MkA' : 'a'" v-if="!fetching" class="link" :class="{ compact }" :[attr]="self ? url.substr(local.length) : url" rel="nofollow noopener" :target="target" :title="url">
 			<div v-if="thumbnail" class="thumbnail" :style="`background-image: url('${thumbnail}')`">
-				<button v-if="!playerEnabled && player.url" class="_button" :title="i18n.ts.enablePlayer" @click.prevent="playerEnabled = true"><i class="ph-play-circle-bold ph-lg"></i></button>
+				<button v-if="!playerEnabled && player.url" class="_button" :title="i18n.ts.enablePlayer" @click.prevent="playerEnabled = true"><i class="ph-play-circle ph-bold ph-lg"></i></button>
 			</div>
 			<article>
 				<header>
@@ -26,7 +26,7 @@
 	</transition>
 	<div v-if="tweetId" class="expandTweet">
 		<a @click="tweetExpanded = true">
-			<i class="ph-twitter-logo-bold ph-lg"></i> {{ i18n.ts.expandTweet }}
+			<i class="ph-twitter-logo ph-bold ph-lg"></i> {{ i18n.ts.expandTweet }}
 		</a>
 	</div>
 </div>
diff --git a/packages/client/src/components/MkVisibility.vue b/packages/client/src/components/MkVisibility.vue
index bed1e19b5..ff6535ed4 100644
--- a/packages/client/src/components/MkVisibility.vue
+++ b/packages/client/src/components/MkVisibility.vue
@@ -1,10 +1,10 @@
 <template>
 <span v-if="note.visibility !== 'public'" :class="$style.visibility">
-	<i v-if="note.visibility === 'home'" class="ph-house-bold ph-lg"></i>
-	<i v-else-if="note.visibility === 'followers'" class="ph-lock-simple-open-bold ph-lg"></i>
-	<i v-else-if="note.visibility === 'specified'" ref="specified" class="ph-envelope-simple-open-bold ph-lg"></i>
+	<i v-if="note.visibility === 'home'" class="ph-house ph-bold ph-lg"></i>
+	<i v-else-if="note.visibility === 'followers'" class="ph-lock-simple-open ph-bold ph-lg"></i>
+	<i v-else-if="note.visibility === 'specified'" ref="specified" class="ph-envelope-simple-open ph-bold ph-lg"></i>
 </span>
-<span v-if="note.localOnly" :class="$style.localOnly"><i class="ph-hand-fist-bold ph-lg"></i></span>
+<span v-if="note.localOnly" :class="$style.localOnly"><i class="ph-hand-fist ph-bold ph-lg"></i></span>
 </template>
 
 <script lang="ts" setup>
diff --git a/packages/client/src/components/MkVisibilityPicker.vue b/packages/client/src/components/MkVisibilityPicker.vue
index 333da48d6..8f747c031 100644
--- a/packages/client/src/components/MkVisibilityPicker.vue
+++ b/packages/client/src/components/MkVisibilityPicker.vue
@@ -2,28 +2,28 @@
 	<MkModal ref="modal" :z-priority="'high'" :src="src" @click="modal.close()" @closed="emit('closed')">
 		<div class="_popup" :class="$style.root">
 			<button key="public" class="_button" :class="[$style.item, { [$style.active]: v === 'public' }]" data-index="1" @click="choose('public')">
-				<div :class="$style.icon"><i class="ph-planet-bold ph-lg"></i></div>
+				<div :class="$style.icon"><i class="ph-planet ph-bold ph-lg"></i></div>
 				<div :class="$style.body">
 					<span :class="$style.itemTitle">{{ i18n.ts._visibility.public }}</span>
 					<span :class="$style.itemDescription">{{ i18n.ts._visibility.publicDescription }}</span>
 				</div>
 			</button>
 			<button key="home" class="_button" :class="[$style.item, { [$style.active]: v === 'home' }]" data-index="2" @click="choose('home')">
-				<div :class="$style.icon"><i class="ph-house-bold ph-lg"></i></div>
+				<div :class="$style.icon"><i class="ph-house ph-bold ph-lg"></i></div>
 				<div :class="$style.body">
 					<span :class="$style.itemTitle">{{ i18n.ts._visibility.home }}</span>
 					<span :class="$style.itemDescription">{{ i18n.ts._visibility.homeDescription }}</span>
 				</div>
 			</button>
 			<button key="followers" class="_button" :class="[$style.item, { [$style.active]: v === 'followers' }]" data-index="3" @click="choose('followers')">
-				<div :class="$style.icon"><i class="ph-lock-simple-open-bold ph-lg"></i></div>
+				<div :class="$style.icon"><i class="ph-lock-simple-open ph-bold ph-lg"></i></div>
 				<div :class="$style.body">
 					<span :class="$style.itemTitle">{{ i18n.ts._visibility.followers }}</span>
 					<span :class="$style.itemDescription">{{ i18n.ts._visibility.followersDescription }}</span>
 				</div>
 			</button>
 			<button key="specified" :disabled="localOnly" class="_button" :class="[$style.item, { [$style.active]: v === 'specified' }]" data-index="4" @click="choose('specified')">
-				<div :class="$style.icon"><i class="ph-envelope-simple-open-bold ph-lg"></i></div>
+				<div :class="$style.icon"><i class="ph-envelope-simple-open ph-bold ph-lg"></i></div>
 				<div :class="$style.body">
 					<span :class="$style.itemTitle">{{ i18n.ts._visibility.specified }}</span>
 					<span :class="$style.itemDescription">{{ i18n.ts._visibility.specifiedDescription }}</span>
@@ -31,12 +31,12 @@
 			</button>
 			<div :class="$style.divider"></div>
 			<button key="localOnly" class="_button" :class="[$style.item, $style.localOnly, { [$style.active]: localOnly }]" data-index="5" @click="localOnly = !localOnly">
-				<div :class="$style.icon"><i class="ph-hand-fist-bold ph-lg"></i></div>
+				<div :class="$style.icon"><i class="ph-hand-fist ph-bold ph-lg"></i></div>
 				<div :class="$style.body">
 					<span :class="$style.itemTitle">{{ i18n.ts._visibility.localOnly }}</span>
 					<span :class="$style.itemDescription">{{ i18n.ts._visibility.localOnlyDescription }}</span>
 				</div>
-				<div :class="$style.toggle"><i :class="localOnly ? 'ph-toggle-right-bold ph-lg' : 'ph-toggle-left-bold ph-lg'"></i></div>
+				<div :class="$style.toggle"><i :class="localOnly ? 'ph-toggle-right-bold ph-lg' : 'ph-toggle-left ph-bold ph-lg'"></i></div>
 			</button>
 		</div>
 	</MkModal>
diff --git a/packages/client/src/components/MkWaitingDialog.vue b/packages/client/src/components/MkWaitingDialog.vue
index 00d34e949..cd46f6739 100644
--- a/packages/client/src/components/MkWaitingDialog.vue
+++ b/packages/client/src/components/MkWaitingDialog.vue
@@ -1,7 +1,7 @@
 <template>
 <MkModal ref="modal" :prefer-type="'dialog'" :z-priority="'high'" @click="success ? done() : () => {}" @closed="emit('closed')">
 	<div :class="[$style.root, { [$style.iconOnly]: (text == null) || success }]">
-		<i v-if="success" :class="[$style.icon, $style.success]" class="ph-check-bold ph-lg"></i>
+		<i v-if="success" :class="[$style.icon, $style.success]" class="ph-check ph-bold ph-lg"></i>
 		<MkLoading v-else :class="[$style.icon, $style.waiting]" :em="true"/>
 		<div v-if="text && !success" :class="$style.text">{{ text }}<MkEllipsis/></div>
 	</div>
diff --git a/packages/client/src/components/MkWidgets.vue b/packages/client/src/components/MkWidgets.vue
index 261fb0dec..4bb1c0bb8 100644
--- a/packages/client/src/components/MkWidgets.vue
+++ b/packages/client/src/components/MkWidgets.vue
@@ -6,7 +6,7 @@
 				<template #label>{{ i18n.ts.selectWidget }}</template>
 				<option v-for="widget in widgetDefs" :key="widget" :value="widget">{{ i18n.t(`_widgets.${widget}`) }}</option>
 			</MkSelect>
-			<MkButton inline primary class="mk-widget-add" @click="addWidget"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
+			<MkButton inline primary class="mk-widget-add" @click="addWidget"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
 			<MkButton inline @click="$emit('exit')">{{ i18n.ts.close }}</MkButton>
 		</header>
 		<XDraggable
@@ -17,8 +17,8 @@
 		>
 			<template #item="{element}">
 				<div class="customize-container">
-					<button class="config _button" @click.prevent.stop="configWidget(element.id)"><i class="ph-gear-six-bold ph-lg"></i></button>
-					<button class="remove _button" @click.prevent.stop="removeWidget(element)"><i class="ph-x-bold ph-lg"></i></button>
+					<button class="config _button" @click.prevent.stop="configWidget(element.id)"><i class="ph-gear-six ph-bold ph-lg"></i></button>
+					<button class="remove _button" @click.prevent.stop="removeWidget(element)"><i class="ph-x ph-bold ph-lg"></i></button>
 					<div class="handle">
 						<component :is="`mkw-${element.name}`" :ref="el => widgetRefs[element.id] = el" class="widget" :widget="element" @updateProps="updateWidget(element.id, $event)"/>
 					</div>
@@ -104,7 +104,7 @@ function onContextmenu(widget: Widget, ev: MouseEvent) {
 		type: 'label',
 		text: i18n.t(`_widgets.${widget.name}`),
 	}, {
-		icon: 'ph-gear-six-bold ph-lg',
+		icon: 'ph-gear-six ph-bold ph-lg',
 		text: i18n.ts.settings,
 		action: () => {
 			configWidget(widget.id);
diff --git a/packages/client/src/components/MkWindow.vue b/packages/client/src/components/MkWindow.vue
index 9ceb755ff..6d43b0dc0 100644
--- a/packages/client/src/components/MkWindow.vue
+++ b/packages/client/src/components/MkWindow.vue
@@ -11,9 +11,9 @@
 				</span>
 				<span class="right">
 					<button v-for="button in buttonsRight" v-tooltip="button.title" class="button _button" :class="{ highlighted: button.highlighted }" @click="button.onClick"><i :class="button.icon"></i></button>
-					<button v-if="canResize && maximized" class="button _button" @click="unMaximize()"><i class="ph-copy-bold ph-lg"></i></button>
-					<button v-else-if="canResize && !maximized" class="button _button" @click="maximize()"><i class="ph-browser-bold ph-lg"></i></button>
-					<button v-if="closeButton" class="button _button" @click="close()"><i class="ph-x-bold ph-lg"></i></button>
+					<button v-if="canResize && maximized" class="button _button" @click="unMaximize()"><i class="ph-copy ph-bold ph-lg"></i></button>
+					<button v-else-if="canResize && !maximized" class="button _button" @click="maximize()"><i class="ph-browser ph-bold ph-lg"></i></button>
+					<button v-if="closeButton" class="button _button" @click="close()"><i class="ph-x ph-bold ph-lg"></i></button>
 				</span>
 			</div>
 			<div class="body">
diff --git a/packages/client/src/components/form/checkbox.vue b/packages/client/src/components/form/checkbox.vue
index a12472c88..a50b17246 100644
--- a/packages/client/src/components/form/checkbox.vue
+++ b/packages/client/src/components/form/checkbox.vue
@@ -10,7 +10,7 @@
 		@keydown.enter="toggle"
 	>
 	<span ref="button" v-adaptive-border v-tooltip="checked ? i18n.ts.itsOn : i18n.ts.itsOff" class="button" @click.prevent="toggle">
-		<i class="check ph-check-bold ph-lg"></i>
+		<i class="check ph-check ph-bold ph-lg"></i>
 	</span>
 	<span class="label">
 		<!-- TODO: 無名slotの方は廃止 -->
diff --git a/packages/client/src/components/form/folder.vue b/packages/client/src/components/form/folder.vue
index c1c3d5761..1a179879b 100644
--- a/packages/client/src/components/form/folder.vue
+++ b/packages/client/src/components/form/folder.vue
@@ -5,8 +5,8 @@
 		<span class="text"><slot name="label"></slot></span>
 		<span class="right">
 			<span class="text"><slot name="suffix"></slot></span>
-			<i v-if="opened" class="ph-caret-up-bold ph-lg icon"></i>
-			<i v-else class="ph-caret-down-bold ph-lg icon"></i>
+			<i v-if="opened" class="ph-caret-up ph-bold ph-lg icon"></i>
+			<i v-else class="ph-caret-down ph-bold ph-lg icon"></i>
 		</span>
 	</div>
 	<KeepAlive>
diff --git a/packages/client/src/components/form/input.vue b/packages/client/src/components/form/input.vue
index 2457b3f53..ee5371175 100644
--- a/packages/client/src/components/form/input.vue
+++ b/packages/client/src/components/form/input.vue
@@ -29,7 +29,7 @@
 	</div>
 	<div class="caption"><slot name="caption"></slot></div>
 
-	<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+	<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
 </div>
 </template>
 
diff --git a/packages/client/src/components/form/link.vue b/packages/client/src/components/form/link.vue
index c28ff4e6a..de675d08b 100644
--- a/packages/client/src/components/form/link.vue
+++ b/packages/client/src/components/form/link.vue
@@ -5,7 +5,7 @@
 		<span class="text"><slot></slot></span>
 		<span class="right">
 			<span class="text"><slot name="suffix"></slot></span>
-			<i class="ph-arrow-square-out-bold ph-lg icon"></i>
+			<i class="ph-arrow-square-out ph-bold ph-lg icon"></i>
 		</span>
 	</a>
 	<MkA v-else class="main _button" :class="{ active }" :to="to" :behavior="behavior">
@@ -13,7 +13,7 @@
 		<span class="text"><slot></slot></span>
 		<span class="right">
 			<span class="text"><slot name="suffix"></slot></span>
-			<i class="ph-caret-right-bold ph-lg icon"></i>
+			<i class="ph-caret-right ph-bold ph-lg icon"></i>
 		</span>
 	</MkA>
 </div>
diff --git a/packages/client/src/components/form/select.vue b/packages/client/src/components/form/select.vue
index e0b5ff566..b81865d4f 100644
--- a/packages/client/src/components/form/select.vue
+++ b/packages/client/src/components/form/select.vue
@@ -18,11 +18,11 @@
 		>
 			<slot></slot>
 		</select>
-		<div ref="suffixEl" class="suffix"><i class="ph-caret-down-bold ph-lg"></i></div>
+		<div ref="suffixEl" class="suffix"><i class="ph-caret-down ph-bold ph-lg"></i></div>
 	</div>
 	<div class="caption"><slot name="caption"></slot></div>
 
-	<MkButton v-if="manualSave && changed" primary @click="updated"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+	<MkButton v-if="manualSave && changed" primary @click="updated"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
 </div>
 </template>
 
diff --git a/packages/client/src/components/form/suspense.vue b/packages/client/src/components/form/suspense.vue
index 9ad5d3b43..29217f4b2 100644
--- a/packages/client/src/components/form/suspense.vue
+++ b/packages/client/src/components/form/suspense.vue
@@ -8,8 +8,8 @@
 	</div>
 	<div v-else>
 		<div class="wszdbhzo">
-			<div><i class="ph-warning-bold ph-lg"></i> {{ i18n.ts.somethingHappened }}</div>
-			<MkButton inline class="retry" @click="retry"><i class="ph-arrow-clockwise-bold ph-lg"></i> {{ i18n.ts.retry }}</MkButton>
+			<div><i class="ph-warning ph-bold ph-lg"></i> {{ i18n.ts.somethingHappened }}</div>
+			<MkButton inline class="retry" @click="retry"><i class="ph-arrow-clockwise ph-bold ph-lg"></i> {{ i18n.ts.retry }}</MkButton>
 		</div>
 	</div>
 </transition>
diff --git a/packages/client/src/components/form/textarea.vue b/packages/client/src/components/form/textarea.vue
index 546b66408..0cf61458a 100644
--- a/packages/client/src/components/form/textarea.vue
+++ b/packages/client/src/components/form/textarea.vue
@@ -22,7 +22,7 @@
 	</div>
 	<div class="caption"><slot name="caption"></slot></div>
 
-	<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+	<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
 </div>
 </template>
 
diff --git a/packages/client/src/components/global/MkA.vue b/packages/client/src/components/global/MkA.vue
index d3f1bd102..8133229df 100644
--- a/packages/client/src/components/global/MkA.vue
+++ b/packages/client/src/components/global/MkA.vue
@@ -41,25 +41,25 @@ function onContextmenu(ev) {
 		type: 'label',
 		text: props.to,
 	}, {
-		icon: 'ph-browser-bold ph-lg',
+		icon: 'ph-browser ph-bold ph-lg',
 		text: i18n.ts.openInWindow,
 		action: () => {
 			os.pageWindow(props.to);
 		},
 	}, {
-		icon: 'ph-arrows-out-simple-bold ph-lg',
+		icon: 'ph-arrows-out-simple ph-bold ph-lg',
 		text: i18n.ts.showInPage,
 		action: () => {
 			router.push(props.to, 'forcePage');
 		},
 	}, null, {
-		icon: 'ph-arrow-square-out-bold ph-lg',
+		icon: 'ph-arrow-square-out ph-bold ph-lg',
 		text: i18n.ts.openInNewTab,
 		action: () => {
 			window.open(props.to, '_blank');
 		},
 	}, {
-		icon: 'ph-link-simple-bold ph-lg',
+		icon: 'ph-link-simple ph-bold ph-lg',
 		text: i18n.ts.copyLink,
 		action: () => {
 			copyToClipboard(`${url}${props.to}`);
diff --git a/packages/client/src/components/global/MkAd.vue b/packages/client/src/components/global/MkAd.vue
index 7fa015266..bab9549eb 100644
--- a/packages/client/src/components/global/MkAd.vue
+++ b/packages/client/src/components/global/MkAd.vue
@@ -3,7 +3,7 @@
 	<div v-if="!showMenu" class="main" :class="chosen.place">
 		<a :href="chosen.url" target="_blank">
 			<img :src="chosen.imageUrl">
-			<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="ph-info-bold ph-lg info-circle"></span></button>
+			<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="ph-info ph-bold ph-lg info-circle"></span></button>
 		</a>
 	</div>
 	<div v-else class="menu">
diff --git a/packages/client/src/components/global/MkError.vue b/packages/client/src/components/global/MkError.vue
index 193d175ee..266e6b253 100644
--- a/packages/client/src/components/global/MkError.vue
+++ b/packages/client/src/components/global/MkError.vue
@@ -2,7 +2,7 @@
 <transition :name="$store.state.animation ? 'zoom' : ''" appear>
 	<div class="mjndxjcg">
 		<img src="/static-assets/badges/error.png" class="_ghost" alt="Error"/>
-		<p><i class="ph-warning-bold ph-lg"></i> {{ i18n.ts.somethingHappened }}</p>
+		<p><i class="ph-warning ph-bold ph-lg"></i> {{ i18n.ts.somethingHappened }}</p>
 		<MkButton class="button" @click="() => $emit('retry')">{{ i18n.ts.retry }}</MkButton>
 	</div>
 </transition>
diff --git a/packages/client/src/components/global/MkUrl.vue b/packages/client/src/components/global/MkUrl.vue
index d22c0b299..2936fa8cd 100644
--- a/packages/client/src/components/global/MkUrl.vue
+++ b/packages/client/src/components/global/MkUrl.vue
@@ -14,7 +14,7 @@
 	<span v-if="pathname != ''" class="pathname">{{ self ? pathname.substr(1) : pathname }}</span>
 	<span class="query">{{ query }}</span>
 	<span class="hash">{{ hash }}</span>
-	<i v-if="target === '_blank'" class="ph-arrow-square-out-bold ph-lg icon"></i>
+	<i v-if="target === '_blank'" class="ph-arrow-square-out ph-bold ph-lg icon"></i>
 </component>
 </template>
 
diff --git a/packages/client/src/components/page/page.post.vue b/packages/client/src/components/page/page.post.vue
index f28b0bbba..7ab9092bd 100644
--- a/packages/client/src/components/page/page.post.vue
+++ b/packages/client/src/components/page/page.post.vue
@@ -2,8 +2,8 @@
 <div class="ngbfujlo">
 	<MkTextarea :model-value="text" readonly style="margin: 0;"></MkTextarea>
 	<MkButton class="button" primary :disabled="posting || posted" @click="post()">
-		<i v-if="posted" class="ph-check-bold ph-lg"></i>
-		<i v-else class="ph-paper-plane-tilt-bold ph-lg"></i>
+		<i v-if="posted" class="ph-check ph-bold ph-lg"></i>
+		<i v-else class="ph-paper-plane-tilt ph-bold ph-lg"></i>
 	</MkButton>
 </div>
 </template>
diff --git a/packages/client/src/icons.scss b/packages/client/src/icons.scss
index 81675440d..d5a2e27e8 100644
--- a/packages/client/src/icons.scss
+++ b/packages/client/src/icons.scss
@@ -1560,7 +1560,7 @@
 .ph-bold.ph-file-csv:before {
   content: "\eaea";
 }
-.ph-bold.ph-file-dashed:before, .ph-bold.ph-file-dotted:before {
+.ph-bold.ph-file-dashed:before, .ph ph-bold.ph-file-dotted:before {
   content: "\eaeb";
 }
 .ph-bold.ph-file-doc:before {
@@ -1584,7 +1584,7 @@
 .ph-bold.ph-file-lock:before {
   content: "\eaf2";
 }
-.ph-bold.ph-file-magnifying-glass:before, .ph-bold.ph-file-search:before {
+.ph-bold.ph-file-magnifying-glass:before, .ph ph-bold.ph-file-search:before {
   content: "\eaf3";
 }
 .ph-bold.ph-file-minus:before {
@@ -1725,7 +1725,7 @@
 .ph-bold.ph-folder:before {
   content: "\eb21";
 }
-.ph-bold.ph-folder-dashed:before, .ph-bold.ph-folder-dotted:before {
+.ph-bold.ph-folder-dashed:before, .ph ph-bold.ph-folder-dotted:before {
   content: "\eb22";
 }
 .ph-bold.ph-folder-lock:before {
@@ -1758,7 +1758,7 @@
 .ph-bold.ph-folder-simple:before {
   content: "\eb2c";
 }
-.ph-bold.ph-folder-simple-dashed:before, .ph-bold.ph-folder-simple-dotted:before {
+.ph-bold.ph-folder-simple-dashed:before, .ph ph-bold.ph-folder-simple-dotted:before {
   content: "\eb2d";
 }
 .ph-bold.ph-folder-simple-lock:before {
@@ -2847,7 +2847,7 @@
 .ph-bold.ph-projector-screen-chart:before {
   content: "\ec97";
 }
-.ph-bold.ph-pulse:before, .ph-bold.ph-activity:before {
+.ph-bold.ph-pulse:before, .ph ph-bold.ph-activity:before {
   content: "\ec98";
 }
 .ph-bold.ph-push-pin:before {
@@ -2976,16 +2976,16 @@
 .ph-bold.ph-scroll:before {
   content: "\ecc2";
 }
-.ph-bold.ph-seal:before, .ph-bold.ph-circle-wavy:before {
+.ph-bold.ph-seal:before, .ph ph-bold.ph-circle-wavy:before {
   content: "\ecc3";
 }
-.ph-bold.ph-seal-check:before, .ph-bold.ph-circle-wavy-check:before {
+.ph-bold.ph-seal-check:before, .ph ph-bold.ph-circle-wavy-check:before {
   content: "\ecc4";
 }
-.ph-bold.ph-seal-question:before, .ph-bold.ph-circle-wavy-question:before {
+.ph-bold.ph-seal-question:before, .ph ph-bold.ph-circle-wavy-question:before {
   content: "\ecc5";
 }
-.ph-bold.ph-seal-warning:before, .ph-bold.ph-circle-wavy-warning:before {
+.ph-bold.ph-seal-warning:before, .ph ph-bold.ph-circle-wavy-warning:before {
   content: "\ecc6";
 }
 .ph-bold.ph-selection-all:before {
@@ -3438,7 +3438,7 @@
 .ph-bold.ph-text-a-underline:before {
   content: "\ed5c";
 }
-.ph-bold.ph-text-b:before, .ph-bold.ph-text-bolder:before {
+.ph-bold.ph-text-b:before, .ph-bold.ph-text ph-bolder:before {
   content: "\ed5d";
 }
 .ph-bold.ph-textbox:before {
diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts
index c8c455650..256d9bd85 100644
--- a/packages/client/src/navbar.ts
+++ b/packages/client/src/navbar.ts
@@ -13,102 +13,102 @@ import XTutorial from "@/components/MkTutorialDialog.vue";
 export const navbarItemDef = reactive({
 	notifications: {
 		title: "notifications",
-		icon: "ph-bell-bold ph-lg",
+		icon: "ph-bell ph-bold ph-lg",
 		show: computed(() => $i != null),
 		indicated: computed(() => $i?.hasUnreadNotification),
 		to: "/my/notifications",
 	},
 	messaging: {
 		title: "messaging",
-		icon: "ph-chats-teardrop-bold ph-lg",
+		icon: "ph-chats-teardrop ph-bold ph-lg",
 		show: computed(() => $i != null),
 		indicated: computed(() => $i?.hasUnreadMessagingMessage),
 		to: "/my/messaging",
 	},
 	drive: {
 		title: "drive",
-		icon: "ph-cloud-bold ph-lg",
+		icon: "ph-cloud ph-bold ph-lg",
 		show: computed(() => $i != null),
 		to: "/my/drive",
 	},
 	followRequests: {
 		title: "followRequests",
-		icon: "ph-hand-waving-bold ph-lg",
+		icon: "ph-hand-waving ph-bold ph-lg",
 		show: computed(() => $i?.isLocked),
 		indicated: computed(() => $i?.hasPendingReceivedFollowRequest),
 		to: "/my/follow-requests",
 	},
 	explore: {
 		title: "explore",
-		icon: "ph-compass-bold ph-lg",
+		icon: "ph-compass ph-bold ph-lg",
 		to: "/explore",
 	},
 	announcements: {
 		title: "announcements",
-		icon: "ph-megaphone-simple-bold ph-lg",
+		icon: "ph-megaphone-simple ph-bold ph-lg",
 		indicated: computed(() => $i?.hasUnreadAnnouncement),
 		to: "/announcements",
 	},
 	search: {
 		title: "search",
-		icon: "ph-magnifying-glass-bold ph-lg",
+		icon: "ph-magnifying-glass ph-bold ph-lg",
 		action: () => search(),
 	},
 	lists: {
 		title: "lists",
-		icon: "ph-list-bullets-bold ph-lg",
+		icon: "ph-list-bullets ph-bold ph-lg",
 		show: computed(() => $i != null),
 		to: "/my/lists",
 	},
 	/*
 	groups: {
 		title: 'groups',
-		icon: 'ph-users-three-bold ph-lg',
+		icon: 'ph-users-three ph-bold ph-lg',
 		show: computed(() => $i != null),
 		to: '/my/groups',
 	},
 	*/
 	antennas: {
 		title: "antennas",
-		icon: "ph-flying-saucer-bold ph-lg",
+		icon: "ph-flying-saucer ph-bold ph-lg",
 		show: computed(() => $i != null),
 		to: "/my/antennas",
 	},
 	favorites: {
 		title: "favorites",
-		icon: "ph-bookmark-simple-bold ph-lg",
+		icon: "ph-bookmark-simple ph-bold ph-lg",
 		show: computed(() => $i != null),
 		to: "/my/favorites",
 	},
 	pages: {
 		title: "pages",
-		icon: "ph-file-text-bold ph-lg",
+		icon: "ph-file-text ph-bold ph-lg",
 		to: "/pages",
 	},
 	gallery: {
 		title: "gallery",
-		icon: "ph-image-square-bold ph-lg",
+		icon: "ph-image-square ph-bold ph-lg",
 		to: "/gallery",
 	},
 	clips: {
 		title: "clip",
-		icon: "ph-paperclip-bold ph-lg",
+		icon: "ph-paperclip ph-bold ph-lg",
 		show: computed(() => $i != null),
 		to: "/my/clips",
 	},
 	channels: {
 		title: "channel",
-		icon: "ph-television-bold ph-lg",
+		icon: "ph-television ph-bold ph-lg",
 		to: "/channels",
 	},
 	groups: {
 		title: "groups",
-		icon: "ph-users-three-bold ph-lg",
+		icon: "ph-users-three ph-bold ph-lg",
 		to: "/my/groups",
 	},
 	ui: {
 		title: "switchUi",
-		icon: "ph-layout-bold ph-lg",
+		icon: "ph-layout ph-bold ph-lg",
 		action: (ev) => {
 			os.popupMenu(
 				[
@@ -143,14 +143,14 @@ export const navbarItemDef = reactive({
 	},
 	reload: {
 		title: "reload",
-		icon: "ph-arrows-clockwise-bold ph-lg",
+		icon: "ph-arrows-clockwise ph-bold ph-lg",
 		action: (ev) => {
 			location.reload();
 		},
 	},
 	help: {
 		title: "help",
-		icon: "ph-question-bold ph-lg",
+		icon: "ph-question ph-bold ph-lg",
 		action: (ev) => {
 			os.popupMenu(
 				[
@@ -161,19 +161,19 @@ export const navbarItemDef = reactive({
 					{
 						type: "link",
 						text: i18n.ts.instanceInfo,
-						icon: "ph-info-bold ph-lg",
+						icon: "ph-info ph-bold ph-lg",
 						to: "/about",
 					},
 					{
 						type: "link",
 						text: i18n.ts.aboutMisskey,
-						icon: "ph-lightbulb-bold ph-lg",
+						icon: "ph-lightbulb ph-bold ph-lg",
 						to: "/about-calckey",
 					},
 					{
 						type: "link",
 						text: i18n.ts._apps.apps,
-						icon: "ph-device-mobile-bold ph-lg",
+						icon: "ph-device-mobile ph-bold ph-lg",
 						to: "/apps",
 					},
 					{
@@ -183,23 +183,23 @@ export const navbarItemDef = reactive({
 							os.popup(XTutorial, {}, {}, "closed");
 						},
 						text: i18n.ts.replayTutorial,
-						icon: "ph-circle-wavy-question-bold ph-lg",
+						icon: "ph-circle-wavy-question ph-bold ph-lg",
 					},
 					null,
 					{
 						type: "parent",
 						text: i18n.ts.developer,
-						icon: "ph-code-bold ph-lg",
+						icon: "ph-code ph-bold ph-lg",
 						children: [
 							{
 								type: "link",
 								to: "/api-console",
 								text: "API Console",
-								icon: "ph-terminal-window-bold ph-lg",
+								icon: "ph-terminal-window ph-bold ph-lg",
 							},
 							{
 								text: i18n.ts.document,
-								icon: "ph-file-doc-bold ph-lg",
+								icon: "ph-file-doc ph-bold ph-lg",
 								action: () => {
 									window.open("/api-doc", "_blank");
 								},
@@ -208,7 +208,7 @@ export const navbarItemDef = reactive({
 								type: "link",
 								to: "/scratchpad",
 								text: "AiScript Scratchpad",
-								icon: "ph-scribble-loop-bold ph-lg",
+								icon: "ph-scribble-loop ph-bold ph-lg",
 							},
 						],
 					},
diff --git a/packages/client/src/pages/_error_.vue b/packages/client/src/pages/_error_.vue
index 8459926e1..f2b2c67fb 100644
--- a/packages/client/src/pages/_error_.vue
+++ b/packages/client/src/pages/_error_.vue
@@ -3,7 +3,7 @@
 <transition :name="$store.state.animation ? 'zoom' : ''" appear>
 	<div v-show="loaded" class="mjndxjch">
 		<img src="/static-assets/badges/error.png" class="_ghost" alt="Error"/>
-		<p><b><i class="ph-warning-bold ph-lg"></i> {{ i18n.ts.pageLoadError }}</b></p>
+		<p><b><i class="ph-warning ph-bold ph-lg"></i> {{ i18n.ts.pageLoadError }}</b></p>
 		<p v-if="meta && (version === meta.version)">{{ i18n.ts.pageLoadErrorDescription }}</p>
 		<p v-else-if="serverIsDead">{{ i18n.ts.serverIsDead }}</p>
 		<template v-else>
@@ -58,7 +58,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.error,
-	icon: 'ph-warning-bold ph-lg',
+	icon: 'ph-warning ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue
index 155faba81..a768be59c 100644
--- a/packages/client/src/pages/about-calckey.vue
+++ b/packages/client/src/pages/about-calckey.vue
@@ -20,17 +20,17 @@
 				<FormSection>
 					<div class="_formLinks">
 						<FormLink to="https://codeberg.org/calckey/calckey" external>
-							<template #icon><i class="ph-code-bold ph-lg"></i></template>
+							<template #icon><i class="ph-code ph-bold ph-lg"></i></template>
 							{{ i18n.ts._aboutMisskey.source }}
 							<template #suffix>Codeberg</template>
 						</FormLink>
 						<FormLink to="https://liberapay.com/ThatOneCalculator" external>
-							<template #icon><i class="ph-money-bold ph-lg"></i></template>
+							<template #icon><i class="ph-money ph-bold ph-lg"></i></template>
 							{{ i18n.ts._aboutMisskey.donate }}
 							<template #suffix>Donate</template>
 						</FormLink>
 						<FormLink to="https://hosted.weblate.org/engage/calckey/" external>
-							<template #icon><i class="ph-translate-bold ph-lg"></i></template>
+							<template #icon><i class="ph-translate ph-bold ph-lg"></i></template>
 							{{ i18n.ts._aboutMisskey.translation }}
 							<template #suffix>Translate</template>
 						</FormLink>
diff --git a/packages/client/src/pages/about.emojis.vue b/packages/client/src/pages/about.emojis.vue
index f5c950789..2a2ac6431 100644
--- a/packages/client/src/pages/about.emojis.vue
+++ b/packages/client/src/pages/about.emojis.vue
@@ -2,7 +2,7 @@
 <div class="driuhtrh">
 	<div class="query">
 		<MkInput v-model="q" class="" :placeholder="i18n.ts.search">
-			<template #prefix><i class="ph-magnifying-glass-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-magnifying-glass ph-bold ph-lg"></i></template>
 		</MkInput>
 
 		<!-- たくさんあると邪魔
diff --git a/packages/client/src/pages/about.federation.vue b/packages/client/src/pages/about.federation.vue
index 66ca69e49..c8f4594d6 100644
--- a/packages/client/src/pages/about.federation.vue
+++ b/packages/client/src/pages/about.federation.vue
@@ -2,7 +2,7 @@
 <div class="taeiyria">
 	<div class="query">
 		<MkInput v-model="host" :debounce="true" class="">
-			<template #prefix><i class="ph-magnifying-glass-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-magnifying-glass ph-bold ph-lg"></i></template>
 			<template #label>{{ i18n.ts.host }}</template>
 		</MkInput>
 		<FormSplit style="margin-top: var(--margin);">
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index f6e3b1e68..0a0335a30 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -140,15 +140,15 @@ const headerActions = $computed(() => []);
 let theTabs = [{
 	key: 'overview',
 	title: i18n.ts.overview,
-	icon: 'ph-map-trifold-bold ph-lg',
+	icon: 'ph-map-trifold ph-bold ph-lg',
 }, {
 	key: 'emojis',
 	title: i18n.ts.customEmojis,
-	icon: 'ph-smiley-bold ph-lg',
+	icon: 'ph-smiley ph-bold ph-lg',
 }, {
 	key: 'charts',
 	title: i18n.ts.charts,
-	icon: 'ph-chart-bar-bold ph-lg',
+	icon: 'ph-chart-bar ph-bold ph-lg',
 }];
 
 if (iAmModerator) {
@@ -156,7 +156,7 @@ if (iAmModerator) {
 		{
 			key: 'federation',
 			title: i18n.ts.federation,
-			icon: 'ph-planet-bold ph-lg',
+			icon: 'ph-planet ph-bold ph-lg',
 		},
 	);
 }
@@ -165,7 +165,7 @@ let headerTabs = $computed(() => theTabs);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.instanceInfo,
-	icon: 'ph-info-bold ph-lg',
+	icon: 'ph-info ph-bold ph-lg',
 })));
 
 async function sleep(seconds) {
diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index 47285e465..30e3d420c 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -45,7 +45,7 @@
 					</div>
 
 					<div class="_formBlock">
-						<MkButton danger @click="del"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
+						<MkButton danger @click="del"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
 					</div>
 				</div>
 			</swiper-slide>
@@ -140,7 +140,7 @@ async function toggleIsSensitive(v) {
 
 const headerActions = $computed(() => [{
 	text: i18n.ts.openInNewTab,
-	icon: 'ph-arrow-square-out-bold ph-lg',
+	icon: 'ph-arrow-square-out ph-bold ph-lg',
 	handler: () => {
 		window.open(file.url, '_blank');
 	},
@@ -149,20 +149,20 @@ const headerActions = $computed(() => [{
 const headerTabs = $computed(() => [{
 	key: 'overview',
 	title: i18n.ts.overview,
-	icon: 'ph-info-bold ph-lg',
+	icon: 'ph-info ph-bold ph-lg',
 }, iAmModerator ? {
 	key: 'ip',
 	title: 'IP',
-	icon: 'ph-receipt-bold ph-lg',
+	icon: 'ph-receipt ph-bold ph-lg',
 } : null, {
 	key: 'raw',
 	title: 'Raw data',
-	icon: 'ph-code-bold ph-lg',
+	icon: 'ph-code ph-bold ph-lg',
 }]);
 
 definePageMetadata(computed(() => ({
 	title: file ? i18n.ts.file + ': ' + file.name : i18n.ts.file,
-	icon: 'ph-file-bold ph-lg',
+	icon: 'ph-file ph-bold ph-lg',
 })));
 
 let swiperRef = null;
diff --git a/packages/client/src/pages/admin/abuses.vue b/packages/client/src/pages/admin/abuses.vue
index cc15638c3..27ea13de8 100644
--- a/packages/client/src/pages/admin/abuses.vue
+++ b/packages/client/src/pages/admin/abuses.vue
@@ -85,7 +85,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.abuseReports,
-	icon: 'ph-warning-circle-bold ph-lg',
+	icon: 'ph-warning-circle ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue
index 79ebdbe56..08038eca7 100644
--- a/packages/client/src/pages/admin/announcements.vue
+++ b/packages/client/src/pages/admin/announcements.vue
@@ -16,8 +16,8 @@
 					</MkInput>
 					<p v-if="announcement.reads">{{ i18n.t('nUsersRead', { n: announcement.reads }) }}</p>
 					<div class="buttons">
-						<MkButton class="button" inline primary @click="save(announcement)"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-						<MkButton class="button" inline @click="remove(announcement)"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.remove }}</MkButton>
+						<MkButton class="button" inline primary @click="save(announcement)"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+						<MkButton class="button" inline @click="remove(announcement)"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.remove }}</MkButton>
 					</div>
 				</div>
 			</section>
@@ -91,7 +91,7 @@ function save(announcement) {
 
 const headerActions = $computed(() => [{
 	asFullButton: true,
-	icon: 'ph-plus-bold ph-lg',
+	icon: 'ph-plus ph-bold ph-lg',
 	text: i18n.ts.add,
 	handler: add,
 }]);
@@ -100,7 +100,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.announcements,
-	icon: 'ph-megaphone-simple-bold ph-lg',
+	icon: 'ph-megaphone-simple ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/admin/bot-protection.vue b/packages/client/src/pages/admin/bot-protection.vue
index 09ac86b51..910bd8334 100644
--- a/packages/client/src/pages/admin/bot-protection.vue
+++ b/packages/client/src/pages/admin/bot-protection.vue
@@ -10,11 +10,11 @@
 
 			<template v-if="provider === 'hcaptcha'">
 				<FormInput v-model="hcaptchaSiteKey" class="_formBlock">
-					<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+					<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.hcaptchaSiteKey }}</template>
 				</FormInput>
 				<FormInput v-model="hcaptchaSecretKey" class="_formBlock">
-					<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+					<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.hcaptchaSecretKey }}</template>
 				</FormInput>
 				<FormSlot class="_formBlock">
@@ -24,11 +24,11 @@
 			</template>
 			<template v-else-if="provider === 'recaptcha'">
 				<FormInput v-model="recaptchaSiteKey" class="_formBlock">
-					<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+					<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.recaptchaSiteKey }}</template>
 				</FormInput>
 				<FormInput v-model="recaptchaSecretKey" class="_formBlock">
-					<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+					<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.recaptchaSecretKey }}</template>
 				</FormInput>
 				<FormSlot v-if="recaptchaSiteKey" class="_formBlock">
@@ -37,7 +37,7 @@
 				</FormSlot>
 			</template>
 
-			<FormButton primary @click="save"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
+			<FormButton primary @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
 		</div>
 	</FormSuspense>
 </div>
diff --git a/packages/client/src/pages/admin/custom-css.vue b/packages/client/src/pages/admin/custom-css.vue
index ca16fdafe..8c0e0459e 100644
--- a/packages/client/src/pages/admin/custom-css.vue
+++ b/packages/client/src/pages/admin/custom-css.vue
@@ -43,6 +43,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.customCss,
-	icon: 'ph-code-bold ph-lg',
+	icon: 'ph-code ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/database.vue b/packages/client/src/pages/admin/database.vue
index 6e2ecb075..f0b3f5cc8 100644
--- a/packages/client/src/pages/admin/database.vue
+++ b/packages/client/src/pages/admin/database.vue
@@ -28,6 +28,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.database,
-	icon: 'ph-database-bold ph-lg',
+	icon: 'ph-database ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/email-settings.vue b/packages/client/src/pages/admin/email-settings.vue
index 96667effb..0663f205c 100644
--- a/packages/client/src/pages/admin/email-settings.vue
+++ b/packages/client/src/pages/admin/email-settings.vue
@@ -107,12 +107,12 @@ function save() {
 
 const headerActions = $computed(() => [{
 	asFullButton: true,
-	icon: 'ph-test-tube-bold ph-lg',
+	icon: 'ph-test-tube ph-bold ph-lg',
 	text: i18n.ts.testEmail,
 	handler: testEmail,
 }, {
 	asFullButton: true,
-	icon: 'ph-check-bold ph-lg',
+	icon: 'ph-check ph-bold ph-lg',
 	text: i18n.ts.save,
 	handler: save,
 }]);
@@ -121,6 +121,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.emailServer,
-	icon: 'ph-envelope-simple-open-bold ph-lg',
+	icon: 'ph-envelope-simple-open ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/emoji-edit-dialog.vue b/packages/client/src/pages/admin/emoji-edit-dialog.vue
index 0fa55d494..b605541da 100644
--- a/packages/client/src/pages/admin/emoji-edit-dialog.vue
+++ b/packages/client/src/pages/admin/emoji-edit-dialog.vue
@@ -22,7 +22,7 @@
 				<template #label>{{ i18n.ts.tags }}</template>
 				<template #caption>{{ i18n.ts.setMultipleBySeparatingWithSpace }}</template>
 			</MkInput>
-			<MkButton danger @click="del()"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
+			<MkButton danger @click="del()"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
 		</div>
 	</div>
 </XModalWindow>
diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue
index f02a8b9b7..7729c2189 100644
--- a/packages/client/src/pages/admin/emojis.vue
+++ b/packages/client/src/pages/admin/emojis.vue
@@ -6,7 +6,7 @@
 			<div class="ogwlenmc">
 				<div v-if="tab === 'local'" class="local">
 					<MkInput v-model="query" :debounce="true" type="search">
-						<template #prefix><i class="ph-magnifying-glass-bold ph-lg"></i></template>
+						<template #prefix><i class="ph-magnifying-glass ph-bold ph-lg"></i></template>
 						<template #label>{{ i18n.ts.search }}</template>
 					</MkInput>
 					<MkSwitch v-model="selectMode" style="margin: 8px 0;">
@@ -39,7 +39,7 @@
 				<div v-else-if="tab === 'remote'" class="remote">
 					<FormSplit>
 						<MkInput v-model="queryRemote" :debounce="true" type="search">
-							<template #prefix><i class="ph-magnifying-glass-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-magnifying-glass ph-bold ph-lg"></i></template>
 							<template #label>{{ i18n.ts.search }}</template>
 						</MkInput>
 						<MkInput v-model="host" :debounce="true">
@@ -163,14 +163,14 @@ const remoteMenu = (emoji, ev: MouseEvent) => {
 		text: ':' + emoji.name + ':',
 	}, {
 		text: i18n.ts.import,
-		icon: 'ph-plus-bold ph-lg',
+		icon: 'ph-plus ph-bold ph-lg',
 		action: () => { im(emoji); },
 	}], ev.currentTarget ?? ev.target);
 };
 
 const menu = (ev: MouseEvent) => {
 	os.popupMenu([{
-		icon: 'ph-download-simple-bold ph-lg',
+		icon: 'ph-download-simple ph-bold ph-lg',
 		text: i18n.ts.export,
 		action: async () => {
 			os.api('export-custom-emojis', {
@@ -188,7 +188,7 @@ const menu = (ev: MouseEvent) => {
 				});
 		},
 	}, {
-		icon: 'ph-upload-simple-bold ph-lg',
+		icon: 'ph-upload-simple ph-bold ph-lg',
 		text: i18n.ts.import,
 		action: async () => {
 			const file = await selectFile(ev.currentTarget ?? ev.target);
@@ -272,27 +272,27 @@ const delBulk = async () => {
 
 const headerActions = $computed(() => [{
 	asFullButton: true,
-	icon: 'ph-plus-bold ph-lg',
+	icon: 'ph-plus ph-bold ph-lg',
 	text: i18n.ts.addEmoji,
 	handler: add,
 }, {
-	icon: 'ph-dots-three-outline-bold ph-lg',
+	icon: 'ph-dots-three-outline ph-bold ph-lg',
 	handler: menu,
 }]);
 
 const headerTabs = $computed(() => [{
 	key: 'local',
-	icon: 'ph-hand-fist-bold ph-lg',
+	icon: 'ph-hand-fist ph-bold ph-lg',
 	title: i18n.ts.local,
 }, {
 	key: 'remote',
-	icon: 'ph-planet-bold ph-lg',
+	icon: 'ph-planet ph-bold ph-lg',
 	title: i18n.ts.remote,
 }]);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.customEmojis,
-	icon: 'ph-smiley-bold ph-lg',
+	icon: 'ph-smiley ph-bold ph-lg',
 })));
 </script>
 
diff --git a/packages/client/src/pages/admin/federation.vue b/packages/client/src/pages/admin/federation.vue
index fb0be9f71..2faeec624 100644
--- a/packages/client/src/pages/admin/federation.vue
+++ b/packages/client/src/pages/admin/federation.vue
@@ -21,6 +21,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.federation,
-	icon: 'ph-planet-bold ph-lg',
+	icon: 'ph-planet ph-bold ph-lg',
 })));
 </script>
diff --git a/packages/client/src/pages/admin/files.vue b/packages/client/src/pages/admin/files.vue
index a5f4ff519..9bae0053c 100644
--- a/packages/client/src/pages/admin/files.vue
+++ b/packages/client/src/pages/admin/files.vue
@@ -96,11 +96,11 @@ async function find() {
 
 const headerActions = $computed(() => [{
 	text: i18n.ts.lookup,
-	icon: 'ph-magnifying-glass-bold ph-lg',
+	icon: 'ph-magnifying-glass ph-bold ph-lg',
 	handler: find,
 }, {
 	text: i18n.ts.clearCachedFiles,
-	icon: 'ph-trash-bold ph-lg',
+	icon: 'ph-trash ph-bold ph-lg',
 	handler: clear,
 }]);
 
@@ -108,7 +108,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.files,
-	icon: 'ph-cloud-bold ph-lg',
+	icon: 'ph-cloud ph-bold ph-lg',
 })));
 </script>
 
diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 736b40b12..8eb5e0987 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -44,7 +44,7 @@ const router = useRouter();
 
 const indexInfo = {
 	title: i18n.ts.controlPanel,
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 	hideHeader: true,
 };
 
@@ -90,59 +90,59 @@ const menuDef = $computed(() => [{
 	title: i18n.ts.quickAction,
 	items: [{
 		type: 'button',
-		icon: 'ph-magnifying-glass-bold ph-lg',
+		icon: 'ph-magnifying-glass ph-bold ph-lg',
 		text: i18n.ts.lookup,
 		action: lookup,
 	}, ...(instance.disableRegistration ? [{
 		type: 'button',
-		icon: 'ph-user-plus-bold ph-lg',
+		icon: 'ph-user-plus ph-bold ph-lg',
 		text: i18n.ts.invite,
 		action: invite,
 	}] : [])],
 }, {
 	title: i18n.ts.administration,
 	items: [{
-		icon: 'ph-gauge-bold ph-lg',
+		icon: 'ph-gauge ph-bold ph-lg',
 		text: i18n.ts.dashboard,
 		to: '/admin/overview',
 		active: currentPage?.route.name === 'overview',
 	}, {
-		icon: 'ph-users-bold ph-lg',
+		icon: 'ph-users ph-bold ph-lg',
 		text: i18n.ts.users,
 		to: '/admin/users',
 		active: currentPage?.route.name === 'users',
 	}, {
-		icon: 'ph-smiley-bold ph-lg',
+		icon: 'ph-smiley ph-bold ph-lg',
 		text: i18n.ts.customEmojis,
 		to: '/admin/emojis',
 		active: currentPage?.route.name === 'emojis',
 	}, {
-		icon: 'ph-planet-bold ph-lg',
+		icon: 'ph-planet ph-bold ph-lg',
 		text: i18n.ts.federation,
 		to: '/admin/federation',
 		active: currentPage?.route.name === 'federation',
 	}, {
-		icon: 'ph-clipboard-text-bold ph-lg',
+		icon: 'ph-clipboard-text ph-bold ph-lg',
 		text: i18n.ts.jobQueue,
 		to: '/admin/queue',
 		active: currentPage?.route.name === 'queue',
 	}, {
-		icon: 'ph-cloud-bold ph-lg',
+		icon: 'ph-cloud ph-bold ph-lg',
 		text: i18n.ts.files,
 		to: '/admin/files',
 		active: currentPage?.route.name === 'files',
 	}, {
-		icon: 'ph-megaphone-simple-bold ph-lg',
+		icon: 'ph-megaphone-simple ph-bold ph-lg',
 		text: i18n.ts.announcements,
 		to: '/admin/announcements',
 		active: currentPage?.route.name === 'announcements',
 	}, {
-		icon: 'ph-money-bold ph-lg',
+		icon: 'ph-money ph-bold ph-lg',
 		text: i18n.ts.ads,
 		to: '/admin/ads',
 		active: currentPage?.route.name === 'ads',
 	}, {
-		icon: 'ph-warning-circle-bold ph-lg',
+		icon: 'ph-warning-circle ph-bold ph-lg',
 		text: i18n.ts.abuseReports,
 		to: '/admin/abuses',
 		active: currentPage?.route.name === 'abuses',
@@ -150,42 +150,42 @@ const menuDef = $computed(() => [{
 }, ...($i?.isAdmin ? [{
 	title: i18n.ts.settings,
 	items: [{
-		icon: 'ph-gear-six-bold ph-lg',
+		icon: 'ph-gear-six ph-bold ph-lg',
 		text: i18n.ts.general,
 		to: '/admin/settings',
 		active: currentPage?.route.name === 'settings',
 	}, {
-		icon: 'ph-envelope-simple-open-bold ph-lg',
+		icon: 'ph-envelope-simple-open ph-bold ph-lg',
 		text: i18n.ts.emailServer,
 		to: '/admin/email-settings',
 		active: currentPage?.route.name === 'email-settings',
 	}, {
-		icon: 'ph-cloud-bold ph-lg',
+		icon: 'ph-cloud ph-bold ph-lg',
 		text: i18n.ts.objectStorage,
 		to: '/admin/object-storage',
 		active: currentPage?.route.name === 'object-storage',
 	}, {
-		icon: 'ph-lock-bold ph-lg',
+		icon: 'ph-lock ph-bold ph-lg',
 		text: i18n.ts.security,
 		to: '/admin/security',
 		active: currentPage?.route.name === 'security',
 	}, {
-		icon: 'ph-flow-arrow-bold ph-lg',
+		icon: 'ph-flow-arrow ph-bold ph-lg',
 		text: i18n.ts.relays,
 		to: '/admin/relays',
 		active: currentPage?.route.name === 'relays',
 	}, {
-		icon: 'ph-plug-bold ph-lg',
+		icon: 'ph-plug ph-bold ph-lg',
 		text: i18n.ts.integration,
 		to: '/admin/integrations',
 		active: currentPage?.route.name === 'integrations',
 	}, {
-		icon: 'ph-prohibit-bold ph-lg',
+		icon: 'ph-prohibit ph-bold ph-lg',
 		text: i18n.ts.instanceBlocking,
 		to: '/admin/instance-block',
 		active: currentPage?.route.name === 'instance-block',
 	}, {
-		icon: 'ph-ghost-bold ph-lg',
+		icon: 'ph-ghost ph-bold ph-lg',
 		text: i18n.ts.proxyAccount,
 		to: '/admin/proxy-account',
 		active: currentPage?.route.name === 'proxy-account',
@@ -193,7 +193,7 @@ const menuDef = $computed(() => [{
 }] : []), {
 	title: i18n.ts.info,
 	items: [{
-		icon: 'ph-database-bold ph-lg',
+		icon: 'ph-database ph-bold ph-lg',
 		text: i18n.ts.database,
 		to: '/admin/database',
 		active: currentPage?.route.name === 'database',
@@ -244,25 +244,25 @@ const invite = () => {
 const lookup = (ev) => {
 	os.popupMenu([{
 		text: i18n.ts.user,
-		icon: 'ph-user-bold ph-lg',
+		icon: 'ph-user ph-bold ph-lg',
 		action: () => {
 			lookupUser();
 		},
 	}, {
 		text: i18n.ts.note,
-		icon: 'ph-pencil-bold ph-lg',
+		icon: 'ph-pencil ph-bold ph-lg',
 		action: () => {
 			alert('TODO');
 		},
 	}, {
 		text: i18n.ts.file,
-		icon: 'ph-cloud-bold ph-lg',
+		icon: 'ph-cloud ph-bold ph-lg',
 		action: () => {
 			alert('TODO');
 		},
 	}, {
 		text: i18n.ts.instance,
-		icon: 'ph-planet-bold ph-lg',
+		icon: 'ph-planet ph-bold ph-lg',
 		action: () => {
 			alert('TODO');
 		},
diff --git a/packages/client/src/pages/admin/instance-block.vue b/packages/client/src/pages/admin/instance-block.vue
index b3209ec61..6e4e1d893 100644
--- a/packages/client/src/pages/admin/instance-block.vue
+++ b/packages/client/src/pages/admin/instance-block.vue
@@ -8,7 +8,7 @@
 				<template #caption>{{ i18n.ts.blockedInstancesDescription }}</template>
 			</FormTextarea>
 
-			<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
+			<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
 		</FormSuspense>
 	</MkSpacer>
 </MkStickyContainer>
@@ -45,6 +45,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.instanceBlocking,
-	icon: 'ph-prohibit-bold ph-lg',
+	icon: 'ph-prohibit ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/integrations.discord.vue b/packages/client/src/pages/admin/integrations.discord.vue
index 061310e95..dd932eb95 100644
--- a/packages/client/src/pages/admin/integrations.discord.vue
+++ b/packages/client/src/pages/admin/integrations.discord.vue
@@ -9,17 +9,17 @@
 			<FormInfo class="_formBlock">Callback URL: {{ `${uri}/api/dc/cb` }}</FormInfo>
 		
 			<FormInput v-model="discordClientId" class="_formBlock">
-				<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+				<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 				<template #label>Client ID</template>
 			</FormInput>
 
 			<FormInput v-model="discordClientSecret" class="_formBlock">
-				<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+				<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 				<template #label>Client Secret</template>
 			</FormInput>
 		</template>
 
-		<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
+		<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
 	</div>
 </FormSuspense>
 </template>
diff --git a/packages/client/src/pages/admin/integrations.github.vue b/packages/client/src/pages/admin/integrations.github.vue
index 942442516..186e4d70f 100644
--- a/packages/client/src/pages/admin/integrations.github.vue
+++ b/packages/client/src/pages/admin/integrations.github.vue
@@ -9,17 +9,17 @@
 			<FormInfo class="_formBlock">Callback URL: {{ `${uri}/api/gh/cb` }}</FormInfo>
 		
 			<FormInput v-model="githubClientId" class="_formBlock">
-				<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+				<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 				<template #label>Client ID</template>
 			</FormInput>
 
 			<FormInput v-model="githubClientSecret" class="_formBlock">
-				<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+				<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 				<template #label>Client Secret</template>
 			</FormInput>
 		</template>
 
-		<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
+		<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
 	</div>
 </FormSuspense>
 </template>
diff --git a/packages/client/src/pages/admin/integrations.vue b/packages/client/src/pages/admin/integrations.vue
index 91a84bf20..f241baf66 100644
--- a/packages/client/src/pages/admin/integrations.vue
+++ b/packages/client/src/pages/admin/integrations.vue
@@ -4,13 +4,13 @@
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<FormFolder class="_formBlock">
-				<template #icon><i class="ph-github-logo-bold ph-lg"></i></template>
+				<template #icon><i class="ph-github-logo ph-bold ph-lg"></i></template>
 				<template #label>GitHub</template>
 				<template #suffix>{{ enableGithubIntegration ? i18n.ts.enabled : i18n.ts.disabled }}</template>
 				<XGithub/>
 			</FormFolder>
 			<FormFolder class="_formBlock">
-				<template #icon><i class="ph-discord-logo-bold ph-lg"></i></template>
+				<template #icon><i class="ph-discord-logo ph-bold ph-lg"></i></template>
 				<template #label>Discord</template>
 				<template #suffix>{{ enableDiscordIntegration ? i18n.ts.enabled : i18n.ts.disabled }}</template>
 				<XDiscord/>
@@ -47,6 +47,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.integration,
-	icon: 'ph-plug-bold ph-lg',
+	icon: 'ph-plug ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/metrics.vue b/packages/client/src/pages/admin/metrics.vue
index 4309ecce6..071e5ebe7 100644
--- a/packages/client/src/pages/admin/metrics.vue
+++ b/packages/client/src/pages/admin/metrics.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="_debobigegoItem">
-	<div class="_debobigegoLabel"><i class="ph-microchip-bold ph-lg"></i> {{ i18n.ts.cpuAndMemory }}</div>
+	<div class="_debobigegoLabel"><i class="ph-microchip ph-bold ph-lg"></i> {{ i18n.ts.cpuAndMemory }}</div>
 	<div class="_debobigegoPanel xhexznfu">
 		<div>
 			<canvas :ref="cpumem"></canvas>
@@ -17,7 +17,7 @@
 	</div>
 </div>
 <div class="_debobigegoItem">
-	<div class="_debobigegoLabel"><i class="ph-hard-drives-bold ph-lg"></i> {{ i18n.ts.disk }}</div>
+	<div class="_debobigegoLabel"><i class="ph-hard-drives ph-bold ph-lg"></i> {{ i18n.ts.disk }}</div>
 	<div class="_debobigegoPanel xhexznfu">
 		<div>
 			<canvas :ref="disk"></canvas>
@@ -34,7 +34,7 @@
 	</div>
 </div>
 <div class="_debobigegoItem">
-	<div class="_debobigegoLabel"><i class="ph-swap-bold ph-lg"></i> {{ i18n.ts.network }}</div>
+	<div class="_debobigegoLabel"><i class="ph-swap ph-bold ph-lg"></i> {{ i18n.ts.network }}</div>
 	<div class="_debobigegoPanel xhexznfu">
 		<div>
 			<canvas :ref="net"></canvas>
diff --git a/packages/client/src/pages/admin/object-storage.vue b/packages/client/src/pages/admin/object-storage.vue
index 4d710de4d..d23f94837 100644
--- a/packages/client/src/pages/admin/object-storage.vue
+++ b/packages/client/src/pages/admin/object-storage.vue
@@ -34,12 +34,12 @@
 
 					<FormSplit :min-width="280">
 						<FormInput v-model="objectStorageAccessKey" class="_formBlock">
-							<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 							<template #label>Access key</template>
 						</FormInput>
 
 						<FormInput v-model="objectStorageSecretKey" class="_formBlock">
-							<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 							<template #label>Secret key</template>
 						</FormInput>
 					</FormSplit>
@@ -133,7 +133,7 @@ function save() {
 
 const headerActions = $computed(() => [{
 	asFullButton: true,
-	icon: 'ph-check-bold ph-lg',
+	icon: 'ph-check ph-bold ph-lg',
 	text: i18n.ts.save,
 	handler: save,
 }]);
@@ -142,6 +142,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.objectStorage,
-	icon: 'ph-cloud-bold ph-lg',
+	icon: 'ph-cloud ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/other-settings.vue b/packages/client/src/pages/admin/other-settings.vue
index cd247ab63..abeee11ac 100644
--- a/packages/client/src/pages/admin/other-settings.vue
+++ b/packages/client/src/pages/admin/other-settings.vue
@@ -29,7 +29,7 @@ function save() {
 
 const headerActions = $computed(() => [{
 	asFullButton: true,
-	icon: 'ph-check-bold ph-lg',
+	icon: 'ph-check ph-bold ph-lg',
 	text: i18n.ts.save,
 	handler: save,
 }]);
@@ -38,6 +38,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.other,
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/overview.federation.vue b/packages/client/src/pages/admin/overview.federation.vue
index f47632d40..b9e53d17d 100644
--- a/packages/client/src/pages/admin/overview.federation.vue
+++ b/packages/client/src/pages/admin/overview.federation.vue
@@ -16,7 +16,7 @@
 		</div>
 		<div v-if="!fetching" class="items">
 			<div class="item _panel sub">
-				<div class="icon"><i class="ph-download-bold ph-xl"></i></div>
+				<div class="icon"><i class="ph-download ph-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						{{ number(federationSubActive) }}
@@ -26,7 +26,7 @@
 				</div>
 			</div>
 			<div class="item _panel pub">
-				<div class="icon"><i class="ph-upload-bold ph-xl"></i></div>
+				<div class="icon"><i class="ph-upload ph-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						{{ number(federationPubActive) }}
diff --git a/packages/client/src/pages/admin/overview.stats.vue b/packages/client/src/pages/admin/overview.stats.vue
index 91ab73783..797a0ba08 100644
--- a/packages/client/src/pages/admin/overview.stats.vue
+++ b/packages/client/src/pages/admin/overview.stats.vue
@@ -4,7 +4,7 @@
 		<MkLoading v-if="fetching"/>
 		<div v-else :class="$style.root">
 			<div class="item _panel users">
-				<div class="icon"><i class="ph-users-bold ph-xl"></i></div>
+				<div class="icon"><i class="ph-users ph-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						<MkNumber :value="stats.originalUsersCount" style="margin-right: 0.5em;"/>
@@ -14,7 +14,7 @@
 				</div>
 			</div>
 			<div class="item _panel notes">
-				<div class="icon"><i class="ph-pencil-bold ph-xl"></i></div>
+				<div class="icon"><i class="ph-pencil ph-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						<MkNumber :value="stats.originalNotesCount" style="margin-right: 0.5em;"/>
@@ -24,7 +24,7 @@
 				</div>
 			</div>
 			<div class="item _panel instances">
-				<div class="icon"><i class="ph-planet-bold ph-xl"></i></div>
+				<div class="icon"><i class="ph-planet ph-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						<MkNumber :value="stats.instances" style="margin-right: 0.5em;"/>
@@ -33,7 +33,7 @@
 				</div>
 			</div>
 			<div class="item _panel online">
-				<div class="icon"><i class="ph-broadcast-bold ph-xl"></i></div>
+				<div class="icon"><i class="ph-broadcast ph-bold ph-xl"></i></div>
 				<div class="body">
 					<div class="value">
 						<MkNumber :value="onlineUsersCount" style="margin-right: 0.5em;"/>
diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index dad0f7c10..f5873d080 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -170,7 +170,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.dashboard,
-	icon: 'ph-gauge-bold ph-lg',
+	icon: 'ph-gauge ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/admin/promotions.vue b/packages/client/src/pages/admin/promotions.vue
index d2e57586e..3b725c8fc 100644
--- a/packages/client/src/pages/admin/promotions.vue
+++ b/packages/client/src/pages/admin/promotions.vue
@@ -29,8 +29,8 @@
 					<template #label>{{ i18n.ts.memo }}</template>
 				</MkTextarea>
 				<div class="buttons _formBlock">
-					<MkButton class="button" inline primary style="margin-right: 12px;" @click="save(ad)"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-					<MkButton class="button" inline danger @click="remove(ad)"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.remove }}</MkButton>
+					<MkButton class="button" inline primary style="margin-right: 12px;" @click="save(ad)"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+					<MkButton class="button" inline danger @click="remove(ad)"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.remove }}</MkButton>
 				</div>
 			</div>
 		</div>
@@ -103,7 +103,7 @@ function save(ad) {
 
 const headerActions = $computed(() => [{
 	asFullButton: true,
-	icon: 'ph-plus-bold ph-lg',
+	icon: 'ph-plus ph-bold ph-lg',
 	text: i18n.ts.add,
 	handler: add,
 }]);
@@ -112,7 +112,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.ads,
-	icon: 'ph-money-bold ph-lg',
+	icon: 'ph-money ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/admin/proxy-account.vue b/packages/client/src/pages/admin/proxy-account.vue
index a141d4a31..7992620ae 100644
--- a/packages/client/src/pages/admin/proxy-account.vue
+++ b/packages/client/src/pages/admin/proxy-account.vue
@@ -59,6 +59,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.proxyAccount,
-	icon: 'ph-ghost-bold ph-lg',
+	icon: 'ph-ghost ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue
index c4ae5a47a..30fe3fb16 100644
--- a/packages/client/src/pages/admin/queue.vue
+++ b/packages/client/src/pages/admin/queue.vue
@@ -33,7 +33,7 @@ function clear() {
 
 const headerActions = $computed(() => [{
 	asFullButton: true,
-	icon: 'ph-arrow-square-up-right-bold ph-lg',
+	icon: 'ph-arrow-square-up-right ph-bold ph-lg',
 	text: i18n.ts.dashboard,
 	handler: () => {
 		window.open(config.url + '/queue', '_blank');
@@ -50,6 +50,6 @@ const headerTabs = $computed(() => [{
 
 definePageMetadata({
 	title: i18n.ts.jobQueue,
-	icon: 'ph-clipboard-text-bold ph-lg',
+	icon: 'ph-clipboard-text ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/relays.vue b/packages/client/src/pages/admin/relays.vue
index 259db1ff0..b3f8307cf 100644
--- a/packages/client/src/pages/admin/relays.vue
+++ b/packages/client/src/pages/admin/relays.vue
@@ -5,12 +5,12 @@
 		<div v-for="relay in relays" :key="relay.inbox" class="relaycxt _panel _block" style="padding: 16px;">
 			<div>{{ relay.inbox }}</div>
 			<div class="status">
-				<i v-if="relay.status === 'accepted'" class="ph-check-bold ph-lg icon accepted"></i>
-				<i v-else-if="relay.status === 'rejected'" class="ph-prohibit-bold ph-lg icon rejected"></i>
-				<i v-else class="ph-clock-bold ph-lg icon requesting"></i>
+				<i v-if="relay.status === 'accepted'" class="ph-check ph-bold ph-lg icon accepted"></i>
+				<i v-else-if="relay.status === 'rejected'" class="ph-prohibit ph-bold ph-lg icon rejected"></i>
+				<i v-else class="ph-clock ph-bold ph-lg icon requesting"></i>
 				<span>{{ i18n.t(`_relayStatus.${relay.status}`) }}</span>
 			</div>
-			<MkButton class="button" inline danger @click="remove(relay.inbox)"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.remove }}</MkButton>
+			<MkButton class="button" inline danger @click="remove(relay.inbox)"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.remove }}</MkButton>
 		</div>
 	</MkSpacer>
 </MkStickyContainer>
@@ -67,7 +67,7 @@ refresh();
 
 const headerActions = $computed(() => [{
 	asFullButton: true,
-	icon: 'ph-plus-bold ph-lg',
+	icon: 'ph-plus ph-bold ph-lg',
 	text: i18n.ts.addRelay,
 	handler: addRelay,
 }]);
@@ -76,7 +76,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.relays,
-	icon: 'ph-flow-arrow-bold ph-lg',
+	icon: 'ph-flow-arrow ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/admin/security.vue b/packages/client/src/pages/admin/security.vue
index a14f16ec4..d1828a449 100644
--- a/packages/client/src/pages/admin/security.vue
+++ b/packages/client/src/pages/admin/security.vue
@@ -5,7 +5,7 @@
 		<FormSuspense :p="init">
 			<div class="_formRoot">
 				<FormFolder class="_formBlock">
-					<template #icon><i class="ph-robot-bold ph-lg"></i></template>
+					<template #icon><i class="ph-robot ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.botProtection }}</template>
 					<template v-if="enableHcaptcha" #suffix>hCaptcha</template>
 					<template v-else-if="enableRecaptcha" #suffix>reCAPTCHA</template>
@@ -15,7 +15,7 @@
 				</FormFolder>
 
 				<FormFolder class="_formBlock">
-					<template #icon><i class="ph-eye-slash-bold ph-lg"></i></template>
+					<template #icon><i class="ph-eye-slash ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.sensitiveMediaDetection }}</template>
 					<template v-if="sensitiveMediaDetection === 'all'" #suffix>{{ i18n.ts.all }}</template>
 					<template v-else-if="sensitiveMediaDetection === 'local'" #suffix>{{ i18n.ts.localOnly }}</template>
@@ -53,7 +53,7 @@
 						</FormSwitch>
 						-->
 
-						<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
+						<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
 					</div>
 				</FormFolder>
 
@@ -87,11 +87,11 @@
 
 					<div class="_formRoot">
 						<FormInput v-model="summalyProxy" class="_formBlock">
-							<template #prefix><i class="ph-link-simple-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
 							<template #label>Summaly Proxy URL</template>
 						</FormInput>
 
-						<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
+						<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
 					</div>
 				</FormFolder>
 
@@ -111,7 +111,7 @@
 							<template #label>{{ i18n.ts.allowedInstances }}</template>
 							<template #caption>{{ i18n.ts.allowedInstancesDescription }}</template>
 						</FormTextarea>
-						<FormButton primary class="_formBlock" @click="saveInstance"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
+						<FormButton primary class="_formBlock" @click="saveInstance"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
 					</div>
 				</FormFolder>
 			</div>
@@ -209,6 +209,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.security,
-	icon: 'ph-lock-bold ph-lg',
+	icon: 'ph-lock ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue
index 83eb12730..1a4589ab3 100644
--- a/packages/client/src/pages/admin/settings.vue
+++ b/packages/client/src/pages/admin/settings.vue
@@ -14,7 +14,7 @@
 					</FormTextarea>
 
 					<FormInput v-model="tosUrl" class="_formBlock">
-						<template #prefix><i class="ph-link-simple-bold ph-lg"></i></template>
+						<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
 						<template #label>{{ i18n.ts.tosUrl }}</template>
 					</FormInput>
 
@@ -24,7 +24,7 @@
 						</FormInput>
 
 						<FormInput v-model="maintainerEmail" type="email" class="_formBlock">
-							<template #prefix><i class="ph-envelope-simple-open-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-envelope-simple-open ph-bold ph-lg"></i></template>
 							<template #label>{{ i18n.ts.maintainerEmail }}</template>
 						</FormInput>
 					</FormSplit>
@@ -80,27 +80,27 @@
 						<template #label>{{ i18n.ts.theme }}</template>
 
 						<FormInput v-model="iconUrl" class="_formBlock">
-							<template #prefix><i class="ph-link-simple-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
 							<template #label>{{ i18n.ts.iconUrl }}</template>
 						</FormInput>
 
 						<FormInput v-model="bannerUrl" class="_formBlock">
-							<template #prefix><i class="ph-link-simple-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
 							<template #label>{{ i18n.ts.bannerUrl }}</template>
 						</FormInput>
 
 						<FormInput v-model="logoImageUrl" class="_formBlock">
-							<template #prefix><i class="ph-link-simple-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
 							<template #label>{{ i18n.ts.logoImageUrl }}</template>
 						</FormInput>
 
 						<FormInput v-model="backgroundImageUrl" class="_formBlock">
-							<template #prefix><i class="ph-link-simple-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
 							<template #label>{{ i18n.ts.backgroundImageUrl }}</template>
 						</FormInput>
 
 						<FormInput v-model="themeColor" class="_formBlock">
-							<template #prefix><i class="ph-palette-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-palette ph-bold ph-lg"></i></template>
 							<template #label>{{ i18n.ts.themeColor }}</template>
 							<template #caption>#RRGGBB</template>
 						</FormInput>
@@ -163,12 +163,12 @@
 
 						<template v-if="enableServiceWorker">
 							<FormInput v-model="swPublicKey" class="_formBlock">
-								<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+								<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 								<template #label>Public key</template>
 							</FormInput>
 
 							<FormInput v-model="swPrivateKey" class="_formBlock">
-								<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+								<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 								<template #label>Private key</template>
 							</FormInput>
 						</template>
@@ -178,7 +178,7 @@
 						<template #label>DeepL Translation</template>
 
 						<FormInput v-model="deeplAuthKey" class="_formBlock">
-							<template #prefix><i class="ph-key-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 							<template #label>DeepL Auth Key</template>
 						</FormInput>
 						<FormSwitch v-model="deeplIsPro" class="_formBlock">
@@ -316,7 +316,7 @@ function save() {
 
 const headerActions = $computed(() => [{
 	asFullButton: true,
-	icon: 'ph-check-bold ph-lg',
+	icon: 'ph-check ph-bold ph-lg',
 	text: i18n.ts.save,
 	handler: save,
 }]);
@@ -325,6 +325,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.general,
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/users.vue b/packages/client/src/pages/admin/users.vue
index dc8079c0e..4a26ed07c 100644
--- a/packages/client/src/pages/admin/users.vue
+++ b/packages/client/src/pages/admin/users.vue
@@ -114,17 +114,17 @@ function show(user) {
 }
 
 const headerActions = $computed(() => [{
-	icon: 'ph-magnifying-glass-bold ph-lg',
+	icon: 'ph-magnifying-glass ph-bold ph-lg',
 	text: i18n.ts.search,
 	handler: searchUser,
 }, {
 	asFullButton: true,
-	icon: 'ph-plus-bold ph-lg',
+	icon: 'ph-plus ph-bold ph-lg',
 	text: i18n.ts.addUser,
 	handler: addUser,
 }, {
 	asFullButton: true,
-	icon: 'ph-magnifying-glass-bold ph-lg',
+	icon: 'ph-magnifying-glass ph-bold ph-lg',
 	text: i18n.ts.lookup,
 	handler: lookupUser,
 }]);
@@ -133,7 +133,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.users,
-	icon: 'ph-users-bold ph-lg',
+	icon: 'ph-users ph-bold ph-lg',
 })));
 </script>
 
diff --git a/packages/client/src/pages/announcements.vue b/packages/client/src/pages/announcements.vue
index 94fc5ba26..452ab8014 100644
--- a/packages/client/src/pages/announcements.vue
+++ b/packages/client/src/pages/announcements.vue
@@ -10,7 +10,7 @@
 					<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
 				</div>
 				<div v-if="$i && !announcement.isRead" class="_footer">
-					<MkButton primary @click="read(items, announcement, i)"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.gotIt }}</MkButton>
+					<MkButton primary @click="read(items, announcement, i)"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.gotIt }}</MkButton>
 				</div>
 			</section>
 		</MkPagination>
@@ -46,7 +46,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.announcements,
-	icon: 'ph-megaphone-simple-bold ph-lg',
+	icon: 'ph-megaphone-simple ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/antenna-timeline.vue b/packages/client/src/pages/antenna-timeline.vue
index 7624d6104..f883645e3 100644
--- a/packages/client/src/pages/antenna-timeline.vue
+++ b/packages/client/src/pages/antenna-timeline.vue
@@ -88,15 +88,15 @@ watch(() => props.antennaId, async () => {
 }, { immediate: true });
 
 const headerActions = $computed(() => antenna ? [{
-	icon: 'ph-calendar-blank-bold ph-lg',
+	icon: 'ph-calendar-blank ph-bold ph-lg',
 	text: i18n.ts.jumpToSpecifiedDate,
 	handler: timetravel,
 }, {
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 	text: i18n.ts.settings,
 	handler: settings,
 }, {
-	icon: 'ph-check-bold ph-lg',
+	icon: 'ph-check ph-bold ph-lg',
 	text: i18n.ts.markAllAsRead,
 	handler: markRead,
 }] : []);
@@ -105,7 +105,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => antenna ? {
 	title: antenna.name,
-	icon: 'ph-flying-saucer-bold ph-lg',
+	icon: 'ph-flying-saucer ph-bold ph-lg',
 } : null));
 </script>
 
diff --git a/packages/client/src/pages/api-console.vue b/packages/client/src/pages/api-console.vue
index e43f4c76d..0707f52f9 100644
--- a/packages/client/src/pages/api-console.vue
+++ b/packages/client/src/pages/api-console.vue
@@ -15,7 +15,7 @@
 				</MkSwitch>
 				<MkButton class="_formBlock" primary :disabled="sending" @click="send">
 					<template v-if="sending"><MkEllipsis/></template>
-					<template v-else><i class="ph-paper-plane-tilt-bold ph-lg"></i> Send</template>
+					<template v-else><i class="ph-paper-plane-tilt ph-bold ph-lg"></i> Send</template>
 				</MkButton>
 			</div>
 			<div v-if="res" class="_formBlock">
@@ -84,6 +84,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: 'API console',
-	icon: 'ph-terminal-window-bold ph-lg',
+	icon: 'ph-terminal-window ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/apps.vue b/packages/client/src/pages/apps.vue
index 0bb4aa904..24d704571 100644
--- a/packages/client/src/pages/apps.vue
+++ b/packages/client/src/pages/apps.vue
@@ -13,9 +13,9 @@
 					<div class="_formLinks">
 						<FormLink to="https://kaiteki.app" external>
 							<template #icon>
-								<i class="ph-android-logo-bold ph-xl"/>
-								<i class="ph-windows-logo-bold ph-xl"/>
-								<i class="ph-linux-logo-bold ph-xl"/>
+								<i class="ph-android-logo ph-bold ph-xl"/>
+								<i class="ph-windows-logo ph-bold ph-xl"/>
+								<i class="ph-linux-logo ph-bold ph-xl"/>
 							</template>
 							{{ i18n.ts._apps.kaiteki }}
 							<template #suffix>{{ i18n.ts._apps.firstClass }}, {{ i18n.ts._apps.free }}</template>
@@ -27,21 +27,21 @@
 					<div class="_formLinks">
 						<FormLink to="https://play.google.com/store/apps/details?id=jp.panta.misskeyandroidclient" external>
 							<template #icon>
-								<i class="ph-android-logo-bold ph-xl"/>
+								<i class="ph-android-logo ph-bold ph-xl"/>
 							</template>
 							{{ i18n.ts._apps.milktea }}
 							<template #suffix>{{ i18n.ts._apps.firstClass }}, {{ i18n.ts._apps.free }}</template>
 						</FormLink>
 						<!-- <FormLink to="https://play.google.com/store/apps/details?id=jp.juggler.subwaytooter&gl=US" external>
 							<template #icon>
-								<i class="ph-android-logo-bold ph-xl"/>
+								<i class="ph-android-logo ph-bold ph-xl"/>
 							</template>
 							{{ i18n.ts._apps.subwayTooter }}
 							<template #suffix>{{ i18n.ts._apps.secondClass }}, {{ i18n.ts._apps.free }}</template>
 						</FormLink> -->
 						<!-- <FormLink to="https://apps.apple.com/app/kimis-a-client-for-misskey/id1667275125" external>
 							<template #icon>
-								<i class="ph-apple-logo-bold ph-xl"/>
+								<i class="ph-apple-logo ph-bold ph-xl"/>
 							</template>
 							{{ i18n.ts._apps.kimis }}
 							<template #suffix>{{ i18n.ts._apps.secondClass }}, {{ i18n.ts._apps.paid }}</template>
@@ -53,16 +53,16 @@
 					<div class="_formLinks">
 						<FormLink to="https://thedesk.top/" external>
 							<template #icon>
-								<i class="ph-apple-logo-bold ph-xl"/>
-								<i class="ph-windows-logo-bold ph-xl"/>
-								<i class="ph-linux-logo-bold ph-xl"/>
+								<i class="ph-apple-logo ph-bold ph-xl"/>
+								<i class="ph-windows-logo ph-bold ph-xl"/>
+								<i class="ph-linux-logo ph-bold ph-xl"/>
 							</template>
 							{{ i18n.ts._apps.theDesk }}
 							<template #suffix>{{ i18n.ts._apps.secondClass }}, {{ i18n.ts._apps.free }}</template>
 						</FormLink>
 						<FormLink to="https://uboar.github.io/missli/" external>
 							<template #icon>
-								<i class="ph-globe-bold ph-xl"/>
+								<i class="ph-globe ph-bold ph-xl"/>
 							</template>
 							{{ i18n.ts._apps.missLi }}
 							<template #suffix>{{ i18n.ts._apps.secondClass }}, {{ i18n.ts._apps.free }}</template>
diff --git a/packages/client/src/pages/channel-editor.vue b/packages/client/src/pages/channel-editor.vue
index 7b750c9c4..3aca69f3d 100644
--- a/packages/client/src/pages/channel-editor.vue
+++ b/packages/client/src/pages/channel-editor.vue
@@ -12,14 +12,14 @@
 			</MkTextarea>
 
 			<div class="banner">
-				<MkButton v-if="bannerId == null" @click="setBannerImage"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts._channel.setBanner }}</MkButton>
+				<MkButton v-if="bannerId == null" @click="setBannerImage"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts._channel.setBanner }}</MkButton>
 				<div v-else-if="bannerUrl">
 					<img :src="bannerUrl" style="width: 100%;"/>
-					<MkButton @click="removeBannerImage()"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts._channel.removeBanner }}</MkButton>
+					<MkButton @click="removeBannerImage()"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts._channel.removeBanner }}</MkButton>
 				</div>
 			</div>
 			<div class="_formBlock">
-				<MkButton primary @click="save()"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ channelId ? i18n.ts.save : i18n.ts.create }}</MkButton>
+				<MkButton primary @click="save()"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ channelId ? i18n.ts.save : i18n.ts.create }}</MkButton>
 			</div>
 		</div>
 	</MkSpacer>
@@ -110,10 +110,10 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => props.channelId ? {
 	title: i18n.ts._channel.edit,
-	icon: 'ph-television-bold ph-lg',
+	icon: 'ph-television ph-bold ph-lg',
 } : {
 	title: i18n.ts._channel.create,
-	icon: 'ph-television-bold ph-lg',
+	icon: 'ph-television ph-bold ph-lg',
 }));
 </script>
 
diff --git a/packages/client/src/pages/channel.vue b/packages/client/src/pages/channel.vue
index 61e87f47d..f1eb450c8 100644
--- a/packages/client/src/pages/channel.vue
+++ b/packages/client/src/pages/channel.vue
@@ -6,15 +6,15 @@
 			<div class="wpgynlbz _panel _gap" :class="{ hide: !showBanner }">
 				<XChannelFollowButton :channel="channel" :full="true" class="subscribe"/>
 				<button class="_button toggle" @click="() => showBanner = !showBanner">
-					<template v-if="showBanner"><i class="ph-caret-up-bold ph-lg"></i></template>
-					<template v-else><i class="ph-caret-down-bold ph-lg"></i></template>
+					<template v-if="showBanner"><i class="ph-caret-up ph-bold ph-lg"></i></template>
+					<template v-else><i class="ph-caret-down ph-bold ph-lg"></i></template>
 				</button>
 				<div v-if="!showBanner" class="hideOverlay">
 				</div>
 				<div :style="{ backgroundImage: channel.bannerUrl ? `url(${channel.bannerUrl})` : null }" class="banner">
 					<div class="status">
-						<div><i class="ph-users-bold ph-lg ph-fw ph-lg"></i><I18n :src="i18n.ts._channel.usersCount" tag="span" style="margin-left: 4px;"><template #n><b>{{ channel.usersCount }}</b></template></I18n></div>
-						<div><i class="ph-pencil-bold ph-lg ph-fw ph-lg"></i><I18n :src="i18n.ts._channel.notesCount" tag="span" style="margin-left: 4px;"><template #n><b>{{ channel.notesCount }}</b></template></I18n></div>
+						<div><i class="ph-users ph-bold ph-lg ph-fw ph-lg"></i><I18n :src="i18n.ts._channel.usersCount" tag="span" style="margin-left: 4px;"><template #n><b>{{ channel.usersCount }}</b></template></I18n></div>
+						<div><i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i><I18n :src="i18n.ts._channel.notesCount" tag="span" style="margin-left: 4px;"><template #n><b>{{ channel.notesCount }}</b></template></I18n></div>
 					</div>
 					<div class="fade"></div>
 				</div>
@@ -70,7 +70,7 @@ function edit() {
 }
 
 const headerActions = $computed(() => channel && channel.userId ? [{
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 	text: i18n.ts.edit,
 	handler: edit,
 }] : null);
@@ -79,7 +79,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => channel ? {
 	title: channel.name,
-	icon: 'ph-television-bold ph-lg',
+	icon: 'ph-television ph-bold ph-lg',
 } : null));
 </script>
 
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index 0f741bd90..7d96e6018 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -26,7 +26,7 @@
 			</swiper-slide>
 			<swiper-slide>
 				<div class="_content grwlizim owned">
-					<MkButton class="new" @click="create()"><i class="ph-plus-bold ph-lg"></i></MkButton>
+					<MkButton class="new" @click="create()"><i class="ph-plus ph-bold ph-lg"></i></MkButton>
 					<MkPagination v-slot="{items}" :pagination="ownedPagination">
 						<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
 					</MkPagination>
@@ -77,7 +77,7 @@ function create() {
 }
 
 const headerActions = $computed(() => [{
-	icon: 'ph-plus-bold ph-lg',
+	icon: 'ph-plus ph-bold ph-lg',
 	text: i18n.ts.create,
 	handler: create,
 }]);
@@ -85,20 +85,20 @@ const headerActions = $computed(() => [{
 const headerTabs = $computed(() => [{
 	key: 'featured',
 	title: i18n.ts._channel.featured,
-	icon: 'ph-fire-simple-bold ph-lg',
+	icon: 'ph-fire-simple ph-bold ph-lg',
 }, {
 	key: 'following',
 	title: i18n.ts._channel.following,
-	icon: 'ph-heart-bold ph-lg',
+	icon: 'ph-heart ph-bold ph-lg',
 }, {
 	key: 'owned',
 	title: i18n.ts._channel.owned,
-	icon: 'ph-crown-simple-bold ph-lg',
+	icon: 'ph-crown-simple ph-bold ph-lg',
 }]);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.channel,
-	icon: 'ph-television-bold ph-lg',
+	icon: 'ph-television ph-bold ph-lg',
 })));
 
 let swiperRef = null;
diff --git a/packages/client/src/pages/clip.vue b/packages/client/src/pages/clip.vue
index 8fef3e290..eb58b4769 100644
--- a/packages/client/src/pages/clip.vue
+++ b/packages/client/src/pages/clip.vue
@@ -53,7 +53,7 @@ watch(() => props.clipId, async () => {
 provide('currentClipPage', $$(clip));
 
 const headerActions = $computed(() => clip && isOwned ? [{
-	icon: 'ph-pencil-bold ph-lg',
+	icon: 'ph-pencil ph-bold ph-lg',
 	text: i18n.ts.edit,
 	handler: async (): Promise<void> => {
 		const { canceled, result } = await os.form(clip.name, {
@@ -83,7 +83,7 @@ const headerActions = $computed(() => clip && isOwned ? [{
 		});
 	},
 }, {
-	icon: 'ph-trash-bold ph-lg',
+	icon: 'ph-trash ph-bold ph-lg',
 	text: i18n.ts.delete,
 	danger: true,
 	handler: async (): Promise<void> => {
@@ -101,7 +101,7 @@ const headerActions = $computed(() => clip && isOwned ? [{
 
 definePageMetadata(computed(() => clip ? {
 	title: clip.name,
-	icon: 'ph-paperclip-bold ph-lg',
+	icon: 'ph-paperclip ph-bold ph-lg',
 } : null));
 </script>
 
diff --git a/packages/client/src/pages/drive.vue b/packages/client/src/pages/drive.vue
index 512106f05..bd38e9e42 100644
--- a/packages/client/src/pages/drive.vue
+++ b/packages/client/src/pages/drive.vue
@@ -19,7 +19,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => ({
 	title: folder ? folder.name : i18n.ts.drive,
-	icon: 'ph-cloud-bold ph-lg',
+	icon: 'ph-cloud ph-bold ph-lg',
 	hideHeader: true,
 })));
 </script>
diff --git a/packages/client/src/pages/emojis.emoji.vue b/packages/client/src/pages/emojis.emoji.vue
index c23858014..f87bc467b 100644
--- a/packages/client/src/pages/emojis.emoji.vue
+++ b/packages/client/src/pages/emojis.emoji.vue
@@ -24,7 +24,7 @@ function menu(ev) {
 		text: ':' + props.emoji.name + ':',
 	}, {
 		text: i18n.ts.copy,
-		icon: 'ph-clipboard-text-bold ph-lg',
+		icon: 'ph-clipboard-text ph-bold ph-lg',
 		action: () => {
 			copyToClipboard(`:${props.emoji.name}:`);
 			os.success();
diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue
index b58d0a33e..d810b3115 100644
--- a/packages/client/src/pages/explore.users.vue
+++ b/packages/client/src/pages/explore.users.vue
@@ -9,26 +9,26 @@
 	<div v-if="origin === 'local'">
 		<template v-if="tag == null">
 			<MkFolder class="_gap" persist-key="explore-pinned-users">
-				<template #header><i class="ph-bookmark-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedUsers }}</template>
+				<template #header><i class="ph-bookmark ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedUsers }}</template>
 				<XUserList :pagination="pinnedUsers"/>
 			</MkFolder>
 			<MkFolder v-if="$i != null" class="_gap" persist-key="explore-popular-users">
-				<template #header><i class="ph-chart-line-up-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
+				<template #header><i class="ph-chart-line-up ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
 				<XUserList :pagination="popularUsers"/>
 			</MkFolder>
 			<MkFolder v-if="$i != null" class="_gap" persist-key="explore-recently-updated-users">
-				<template #header><i class="ph-activity-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
+				<template #header><i class="ph-activity ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
 				<XUserList :pagination="recentlyUpdatedUsers"/>
 			</MkFolder>
 			<MkFolder v-if="$i != null" class="_gap" persist-key="explore-recently-registered-users">
-				<template #header><i class="ph-butterfly-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyRegisteredUsers }}</template>
+				<template #header><i class="ph-butterfly ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyRegisteredUsers }}</template>
 				<XUserList :pagination="recentlyRegisteredUsers"/>
 			</MkFolder>
 		</template>
 	</div>
 	<div v-else>
 		<MkFolder ref="tagsEl" :foldable="true" :expanded="false" class="_gap">
-			<template #header><i class="ph-compass-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularTags }}</template>
+			<template #header><i class="ph-compass ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularTags }}</template>
 
 			<div class="vxjfqztj">
 				<MkA v-for="tag in tagsLocal" :key="'local:' + tag.tag" :to="`/explore/tags/${tag.tag}`" class="local">{{ tag.tag }}</MkA>
@@ -37,21 +37,21 @@
 		</MkFolder>
 
 		<MkFolder v-if="tag != null" :key="`${tag}`" class="_gap">
-			<template #header><i class="ph-hash-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ tag }}</template>
+			<template #header><i class="ph-hash ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ tag }}</template>
 			<XUserList :pagination="tagUsers"/>
 		</MkFolder>
 
 		<template v-if="tag == null && $i != null">
 			<MkFolder class="_gap">
-				<template #header><i class="ph-chart-line-up-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
+				<template #header><i class="ph-chart-line-up ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
 				<XUserList :pagination="popularUsersF"/>
 			</MkFolder>
 			<MkFolder class="_gap">
-				<template #header><i class="ph-activity-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
+				<template #header><i class="ph-activity ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
 				<XUserList :pagination="recentlyUpdatedUsersF"/>
 			</MkFolder>
 			<MkFolder class="_gap">
-				<template #header><i class="ph-rocke-launch-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyDiscoveredUsers }}</template>
+				<template #header><i class="ph-rocke-launch ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyDiscoveredUsers }}</template>
 				<XUserList :pagination="recentlyRegisteredUsersF"/>
 			</MkFolder>
 		</template>
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index a4c6b04f5..8865a6466 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -20,7 +20,7 @@
 				<swiper-slide>
 					<div>
 						<MkInput v-model="searchQuery" :debounce="true" type="search" class="_formBlock">
-							<template #prefix><i class="ph-magnifying-glass-bold ph-lg"></i></template>
+							<template #prefix><i class="ph-magnifying-glass ph-bold ph-lg"></i></template>
 							<template #label>{{ i18n.ts.searchUser }}</template>
 						</MkInput>
 						<MkRadios v-model="searchOrigin" class="_formBlock">
@@ -83,21 +83,21 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => [{
 	key: 'featured',
-	icon: 'ph-lightning-bold ph-lg',
+	icon: 'ph-lightning ph-bold ph-lg',
 	title: i18n.ts.featured,
 }, {
 	key: 'users',
-	icon: 'ph-users-bold ph-lg',
+	icon: 'ph-users ph-bold ph-lg',
 	title: i18n.ts.users,
 }, {
 	key: 'search',
-	icon: 'ph-magnifying-glass-bold ph-lg',
+	icon: 'ph-magnifying-glass ph-bold ph-lg',
 	title: i18n.ts.search,
 }]);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.explore,
-	icon: 'ph-compass-bold ph-lg',
+	icon: 'ph-compass ph-bold ph-lg',
 })));
 
 let swiperRef = null;
diff --git a/packages/client/src/pages/favorites.vue b/packages/client/src/pages/favorites.vue
index 4895af18d..1fca212c2 100644
--- a/packages/client/src/pages/favorites.vue
+++ b/packages/client/src/pages/favorites.vue
@@ -47,7 +47,7 @@ const pagingComponent = ref<InstanceType<typeof MkPagination>>();
 
 definePageMetadata({
 	title: i18n.ts.favorites,
-	icon: "ph-bookmark-simple-bold ph-lg",
+	icon: "ph-bookmark-simple ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue
index eba48e0ff..289a43bd4 100644
--- a/packages/client/src/pages/follow-requests.vue
+++ b/packages/client/src/pages/follow-requests.vue
@@ -22,8 +22,8 @@
 								<Mfm :text="req.follower.description" :is-note="false" :author="req.follower" :i="$i" :custom-emojis="req.follower.emojis" :plain="true" :nowrap="true"/>
 							</div>
 							<div class="actions">
-								<button class="_button" @click="accept(req.follower)"><i class="ph-check-bold ph-lg"></i></button>
-								<button class="_button" @click="reject(req.follower)"><i class="ph-x-bold ph-lg"></i></button>
+								<button class="_button" @click="accept(req.follower)"><i class="ph-check ph-bold ph-lg"></i></button>
+								<button class="_button" @click="reject(req.follower)"><i class="ph-x ph-bold ph-lg"></i></button>
 							</div>
 						</div>
 					</div>
@@ -67,7 +67,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.followRequests,
-	icon: 'ph-hand-waving-bold ph-lg',
+	icon: 'ph-hand-waving ph-bold ph-lg',
 })));
 </script>
 
diff --git a/packages/client/src/pages/gallery/edit.vue b/packages/client/src/pages/gallery/edit.vue
index 2e14661da..c2b93d6a0 100644
--- a/packages/client/src/pages/gallery/edit.vue
+++ b/packages/client/src/pages/gallery/edit.vue
@@ -14,17 +14,17 @@
 			<div class="">
 				<div v-for="file in files" :key="file.id" class="wqugxsfx" :style="{ backgroundImage: file ? `url(${ file.thumbnailUrl })` : null }">
 					<div class="name">{{ file.name }}</div>
-					<button v-tooltip="i18n.ts.remove" class="remove _button" @click="remove(file)"><i class="ph-x-bold ph-lg"></i></button>
+					<button v-tooltip="i18n.ts.remove" class="remove _button" @click="remove(file)"><i class="ph-x ph-bold ph-lg"></i></button>
 				</div>
-				<FormButton primary @click="selectFile"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.attachFile }}</FormButton>
+				<FormButton primary @click="selectFile"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.attachFile }}</FormButton>
 			</div>
 
 			<FormSwitch v-model="isSensitive">{{ i18n.ts.markAsSensitive }}</FormSwitch>
 
-			<FormButton v-if="postId" primary @click="save"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
-			<FormButton v-else primary @click="save"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.publish }}</FormButton>
+			<FormButton v-if="postId" primary @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
+			<FormButton v-else primary @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.publish }}</FormButton>
 
-			<FormButton v-if="postId" danger @click="del"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.delete }}</FormButton>
+			<FormButton v-if="postId" danger @click="del"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</FormButton>
 		</FormSuspense>
 	</MkSpacer>
 </MkStickyContainer>
@@ -115,10 +115,10 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => props.postId ? {
 	title: i18n.ts.edit,
-	icon: 'ph-pencil-bold ph-lg',
+	icon: 'ph-pencil ph-bold ph-lg',
 } : {
 	title: i18n.ts.postToGallery,
-	icon: 'ph-pencil-bold ph-lg',
+	icon: 'ph-pencil ph-bold ph-lg',
 }));
 </script>
 
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index 20a1d380c..3bc7da22e 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -12,7 +12,7 @@
 		>
 			<swiper-slide>
 				<MkFolder class="_gap">
-					<template #header><i class="ph-clock-bold ph-lg"></i> {{ i18n.ts.recentPosts }}</template>
+					<template #header><i class="ph-clock ph-bold ph-lg"></i> {{ i18n.ts.recentPosts }}</template>
 					<MkPagination v-slot="{items}" :pagination="recentPostsPagination" :disable-auto-load="true">
 						<div class="vfpdbgtk">
 							<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
@@ -20,7 +20,7 @@
 					</MkPagination>
 				</MkFolder>
 				<MkFolder class="_gap">
-					<template #header><i class="ph-fire-simple-bold ph-lg"></i> {{ i18n.ts.popularPosts }}</template>
+					<template #header><i class="ph-fire-simple ph-bold ph-lg"></i> {{ i18n.ts.popularPosts }}</template>
 					<MkPagination v-slot="{items}" :pagination="popularPostsPagination" :disable-auto-load="true">
 						<div class="vfpdbgtk">
 							<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
@@ -36,7 +36,7 @@
 				</MkPagination>
 			</swiper-slide>
 			<swiper-slide>
-				<MkA to="/gallery/new" class="_link" style="margin: 16px;"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.postToGallery }}</MkA>
+				<MkA to="/gallery/new" class="_link" style="margin: 16px;"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.postToGallery }}</MkA>
 				<MkPagination v-slot="{items}" :pagination="myPostsPagination">
 					<div class="vfpdbgtk">
 						<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
@@ -97,7 +97,7 @@ watch(() => props.tag, () => {
 });
 
 const headerActions = $computed(() => [{
-	icon: 'ph-plus-bold ph-lg',
+	icon: 'ph-plus ph-bold ph-lg',
 	text: i18n.ts.create,
 	handler: () => {
 		router.push('/gallery/new');
@@ -107,20 +107,20 @@ const headerActions = $computed(() => [{
 const headerTabs = $computed(() => [{
 	key: 'explore',
 	title: i18n.ts.gallery,
-	icon: 'ph-image-square-bold ph-lg',
+	icon: 'ph-image-square ph-bold ph-lg',
 }, {
 	key: 'liked',
 	title: i18n.ts._gallery.liked,
-	icon: 'ph-heart-bold ph-lg',
+	icon: 'ph-heart ph-bold ph-lg',
 }, {
 	key: 'my',
 	title: i18n.ts._gallery.my,
-	icon: 'ph-crown-simple-bold ph-lg',
+	icon: 'ph-crown-simple ph-bold ph-lg',
 }]);
 
 definePageMetadata({
 	title: i18n.ts.gallery,
-	icon: 'ph-image-square-bold ph-lg',
+	icon: 'ph-image-square ph-bold ph-lg',
 });
 
 let swiperRef = null;
diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue
index fd557d869..9e8d67245 100644
--- a/packages/client/src/pages/gallery/post.vue
+++ b/packages/client/src/pages/gallery/post.vue
@@ -14,17 +14,17 @@
 						<div class="title">{{ post.title }}</div>
 						<div class="description"><Mfm :text="post.description"/></div>
 						<div class="info">
-							<i class="ph-clock-bold ph-lg"></i> <MkTime :time="post.createdAt" mode="detail"/>
+							<i class="ph-clock ph-bold ph-lg"></i> <MkTime :time="post.createdAt" mode="detail"/>
 						</div>
 						<div class="actions">
 							<div class="like">
 								<MkButton v-if="post.isLiked" v-tooltip="i18n.ts._gallery.unlike" class="button" primary @click="unlike()"><i class="ph-heart-fill ph-lg"></i><span v-if="post.likedCount > 0" class="count">{{ post.likedCount }}</span></MkButton>
-								<MkButton v-else v-tooltip="i18n.ts._gallery.like" class="button" @click="like()"><i class="ph-heart-bold"></i><span v-if="post.likedCount > 0" class="count">{{ post.likedCount }}</span></MkButton>
+								<MkButton v-else v-tooltip="i18n.ts._gallery.like" class="button" @click="like()"><i class="ph-heart ph-bold"></i><span v-if="post.likedCount > 0" class="count">{{ post.likedCount }}</span></MkButton>
 							</div>
 							<div class="other">
-								<button v-if="$i && $i.id === post.user.id" v-tooltip="i18n.ts.edit" v-click-anime class="_button" @click="edit"><i class="ph-pencil-bold ph-lg ph-fw ph-lg"></i></button>
-								<button v-tooltip="i18n.ts.shareWithNote" v-click-anime class="_button" @click="shareWithNote"><i class="ph-repeat-bold ph-lg ph-fw ph-lg"></i></button>
-								<button v-if="shareAvailable()" v-tooltip="i18n.ts.share" v-click-anime class="_button" @click="share"><i class="ph-share-network-bold ph-lg ph-fw ph-lg"></i></button>
+								<button v-if="$i && $i.id === post.user.id" v-tooltip="i18n.ts.edit" v-click-anime class="_button" @click="edit"><i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i></button>
+								<button v-tooltip="i18n.ts.shareWithNote" v-click-anime class="_button" @click="shareWithNote"><i class="ph-repeat ph-bold ph-lg ph-fw ph-lg"></i></button>
+								<button v-if="shareAvailable()" v-tooltip="i18n.ts.share" v-click-anime class="_button" @click="share"><i class="ph-share-network ph-bold ph-lg ph-fw ph-lg"></i></button>
 							</div>
 						</div>
 						<div class="user">
@@ -38,7 +38,7 @@
 					</div>
 					<MkAd :prefer="['horizontal', 'horizontal-big']"/>
 					<MkContainer :max-height="300" :foldable="true" class="other">
-						<template #header><i class="ph-clock-bold ph-lg"></i> {{ i18n.ts.recentPosts }}</template>
+						<template #header><i class="ph-clock ph-bold ph-lg"></i> {{ i18n.ts.recentPosts }}</template>
 						<MkPagination v-slot="{items}" :pagination="otherPostsPagination">
 							<div class="sdrarzaf">
 								<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
@@ -135,7 +135,7 @@ function edit() {
 watch(() => props.postId, fetchPost, { immediate: true });
 
 const headerActions = $computed(() => [{
-	icon: 'ph-pencil-bold ph-lg',
+	icon: 'ph-pencil ph-bold ph-lg',
 	text: i18n.ts.edit,
 	handler: edit,
 }]);
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index 59547a3cb..15c9a7cd8 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -37,7 +37,7 @@
 						<template #label>Moderation</template>
 						<FormSwitch v-model="suspended" class="_formBlock" @update:modelValue="toggleSuspend">{{ i18n.ts.stopActivityDelivery }}</FormSwitch>
 						<FormSwitch v-model="isBlocked" class="_formBlock" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</FormSwitch>
-						<MkButton @click="refreshMetadata"><i class="ph-arrows-clockwise-bold ph-lg"></i> Refresh metadata</MkButton>
+						<MkButton @click="refreshMetadata"><i class="ph-arrows-clockwise ph-bold ph-lg"></i> Refresh metadata</MkButton>
 					</FormSection>
 
 					<FormSection>
@@ -221,7 +221,7 @@ fetch();
 
 const headerActions = $computed(() => [{
 	text: `https://${props.host}`,
-	icon: 'ph-arrow-square-out-bold ph-lg',
+	icon: 'ph-arrow-square-out ph-bold ph-lg',
 	handler: () => {
 		window.open(`https://${props.host}`, '_blank');
 	},
@@ -230,7 +230,7 @@ const headerActions = $computed(() => [{
 let theTabs = [{
 	key: 'overview',
 	title: i18n.ts.overview,
-	icon: 'ph-info-bold ph-lg',
+	icon: 'ph-info ph-bold ph-lg',
 }];
 
 if (iAmModerator) {
@@ -238,15 +238,15 @@ if (iAmModerator) {
 		{
 			key: 'chart',
 			title: i18n.ts.charts,
-			icon: 'ph-chart-bar-bold ph-lg',
+			icon: 'ph-chart-bar ph-bold ph-lg',
 		}, {
 			key: 'users',
 			title: i18n.ts.users,
-			icon: 'ph-users-bold ph-lg',
+			icon: 'ph-users ph-bold ph-lg',
 		}, {
 			key: 'raw',
 			title: 'Raw',
-			icon: 'ph-code-bold ph-lg',
+			icon: 'ph-code ph-bold ph-lg',
 		},
 	);
 }
@@ -255,7 +255,7 @@ let headerTabs = $computed(() => theTabs);
 
 definePageMetadata({
 	title: props.host,
-	icon: 'ph-hard-drives-bold ph-lg',
+	icon: 'ph-hard-drives ph-bold ph-lg',
 });
 
 let swiperRef = null;
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index af2baf852..17ed9e721 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -13,7 +13,7 @@
 			>
 				<swiper-slide>
 					<div class="_content yweeujhr dms">
-						<MkButton primary class="start" @click="startUser"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
+						<MkButton primary class="start" @click="startUser"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
 						<MkPagination v-slot="{items}" :pagination="dmsPagination">
 							<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block" :message="message"/>
 						</MkPagination>
@@ -22,8 +22,8 @@
 				<swiper-slide>
 					<div class="_content yweeujhr groups">
 						<div class="groupsbuttons">
-							<MkButton primary class="start" :link="true" to="/my/groups"><i class="ph-user-circle-gear-bold ph-lg"></i> {{ i18n.ts.manageGroups }}</MkButton>
-							<MkButton primary class="start" @click="startGroup"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
+							<MkButton primary class="start" :link="true" to="/my/groups"><i class="ph-user-circle-gear ph-bold ph-lg"></i> {{ i18n.ts.manageGroups }}</MkButton>
+							<MkButton primary class="start" @click="startGroup"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
 						</div>
 						<MkPagination v-slot="{items}" :pagination="groupsPagination">
 							<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block" :message="message"/>
@@ -66,7 +66,7 @@ watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
 
 const headerActions = $computed(() => [{
 	asFullButton: true,
-	icon: 'ph-plus-bold ph-lg',
+	icon: 'ph-plus ph-bold ph-lg',
 	text: i18n.ts.addUser,
 	handler: startMenu,
 }]);
@@ -74,16 +74,16 @@ const headerActions = $computed(() => [{
 const headerTabs = $computed(() => [{
 	key: 'dms',
 	title: i18n.ts._messaging.dms,
-	icon: 'ph-user-bold ph-lg',
+	icon: 'ph-user ph-bold ph-lg',
 }, {
 	key: 'groups',
 	title: i18n.ts._messaging.groups,
-	icon: 'ph-users-three-bold ph-lg',
+	icon: 'ph-users-three ph-bold ph-lg',
 }]);
 
 definePageMetadata({
 	title: i18n.ts.messaging,
-	icon: 'ph-chats-teardrop-bold ph-lg',
+	icon: 'ph-chats-teardrop ph-bold ph-lg',
 });
 
 const dmsPagination = {
@@ -130,11 +130,11 @@ function onRead(ids): void {
 function startMenu(ev) {
 	os.popupMenu([{
 		text: i18n.ts.messagingWithUser,
-		icon: 'ph-user-bold ph-lg',
+		icon: 'ph-user ph-bold ph-lg',
 		action: () => { startUser(); },
 	}, {
 		text: i18n.ts.messagingWithGroup,
-		icon: 'ph-users-three-bold ph-lg',
+		icon: 'ph-users-three ph-bold ph-lg',
 		action: () => { startGroup(); },
 	}], ev.currentTarget ?? ev.target);
 }
diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue
index 6e489d895..4fe372277 100644
--- a/packages/client/src/pages/messaging/messaging-room.form.vue
+++ b/packages/client/src/pages/messaging/messaging-room.form.vue
@@ -15,10 +15,10 @@
 	<footer>
 		<div v-if="file" class="file" @click="file = null">{{ file.name }}</div>
 		<div class="buttons">
-			<button class="_button" @click="chooseFile"><i class="ph-upload-bold ph-lg"></i></button>
-			<button class="_button" @click="insertEmoji"><i class="ph-smiley-bold ph-lg"></i></button>
+			<button class="_button" @click="chooseFile"><i class="ph-upload ph-bold ph-lg"></i></button>
+			<button class="_button" @click="insertEmoji"><i class="ph-smiley ph-bold ph-lg"></i></button>
 			<button class="send _button" :disabled="!canSend || sending" :title="i18n.ts.send" @click="send">
-				<template v-if="!sending"><i class="ph-paper-plane-tilt-bold ph-lg"></i></template><template v-if="sending"><i class="ph-circle-notch-bold ph-lg fa-pulse ph-fw ph-lg"></i></template>
+				<template v-if="!sending"><i class="ph-paper-plane-tilt-bold ph-lg"></i></template><template v-if="sending"><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i></template>
 			</button>
 		</div>
 	</footer>
diff --git a/packages/client/src/pages/messaging/messaging-room.message.vue b/packages/client/src/pages/messaging/messaging-room.message.vue
index 051406eae..d28128506 100644
--- a/packages/client/src/pages/messaging/messaging-room.message.vue
+++ b/packages/client/src/pages/messaging/messaging-room.message.vue
@@ -29,7 +29,7 @@
 				<span v-if="isMe && message.isRead" class="read">{{ i18n.ts.messageRead }}</span>
 			</template>
 			<MkTime :time="message.createdAt"/>
-			<template v-if="message.is_edited"><i class="ph-pencil-bold ph-lg"></i></template>
+			<template v-if="message.is_edited"><i class="ph-pencil ph-bold ph-lg"></i></template>
 		</footer>
 	</div>
 </div>
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 11f944860..17532cebd 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -40,7 +40,7 @@
 				</div>
 				<transition :name="animation ? 'fade' : ''">
 					<div v-show="showIndicator" class="new-message">
-						<button class="_buttonPrimary" @click="onIndicatorClick"><i class="fas ph-fw ph-lg ph-arrow-circle-down-bold ph-lg"></i>{{ i18n.ts.newMessageExists }}</button>
+						<button class="_buttonPrimary" @click="onIndicatorClick"><i class="fas ph-fw ph-lg ph-arrow-circle-down ph-bold ph-lg"></i>{{ i18n.ts.newMessageExists }}</button>
 					</div>
 				</transition>
 				<XForm v-if="!fetching" ref="formEl" :user="user" :group="group" class="form"/>
@@ -277,7 +277,7 @@ onMounted(() => {
 	fetch();
 	definePageMetadata(computed(() => ({
 		title: group != null ? group.name : user?.name,
-		icon: 'ph-chats-teardrop-bold ph-lg',
+		icon: 'ph-chats-teardrop ph-bold ph-lg',
 	})));
 });
 
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index ebff51b79..061bf9b2f 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -341,7 +341,7 @@ let preview_plain = $ref('<plain>**bold** @mention #hashtag `code` $[x2 🍮]</p
 
 definePageMetadata({
 	title: i18n.ts._mfm.cheatSheet,
-	icon: 'ph-question-bold ph-lg',
+	icon: 'ph-question ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/my-antennas/create.vue b/packages/client/src/pages/my-antennas/create.vue
index 337816e00..121c91300 100644
--- a/packages/client/src/pages/my-antennas/create.vue
+++ b/packages/client/src/pages/my-antennas/create.vue
@@ -33,7 +33,7 @@ function onAntennaCreated() {
 
 definePageMetadata({
 	title: i18n.ts.manageAntennas,
-	icon: 'ph-flying-saucer-bold ph-lg',
+	icon: 'ph-flying-saucer ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/my-antennas/edit.vue b/packages/client/src/pages/my-antennas/edit.vue
index 65cc2b230..7ba6c9776 100644
--- a/packages/client/src/pages/my-antennas/edit.vue
+++ b/packages/client/src/pages/my-antennas/edit.vue
@@ -34,7 +34,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.manageAntennas,
-	icon: 'ph-flying-saucer-bold ph-lg',
+	icon: 'ph-flying-saucer ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/my-antennas/editor.vue b/packages/client/src/pages/my-antennas/editor.vue
index ee13ecf5e..55249f879 100644
--- a/packages/client/src/pages/my-antennas/editor.vue
+++ b/packages/client/src/pages/my-antennas/editor.vue
@@ -43,8 +43,8 @@
 		<MkSwitch v-model="notify" class="_formBlock">{{ i18n.ts.notifyAntenna }}</MkSwitch>
 	</div>
 	<div class="actions">
-		<MkButton inline primary @click="saveAntenna()"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-		<MkButton v-if="antenna.id != null" inline danger @click="deleteAntenna()"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
+		<MkButton inline primary @click="saveAntenna()"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+		<MkButton v-if="antenna.id != null" inline danger @click="deleteAntenna()"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
 	</div>
 </div>
 </template>
diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue
index 44897c9e2..a3660755b 100644
--- a/packages/client/src/pages/my-antennas/index.vue
+++ b/packages/client/src/pages/my-antennas/index.vue
@@ -3,13 +3,13 @@
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :content-max="700">
 		<div class="ieepwinx">
-			<MkButton :link="true" to="/my/antennas/create" primary class="add"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
+			<MkButton :link="true" to="/my/antennas/create" primary class="add"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
 
 			<div class="">
 				<MkPagination v-slot="{items}" ref="list" :pagination="pagination">
 					<div v-for="antenna in items" :key="antenna.id">
 						<MkA class="uopelskx" :link="true" :to="`/timeline/antenna/${antenna.id}`">
-							<i class="ph-flying-saucer-bold ph-lg"></i><i :class="`${antenna.hasUnreadNote ? 'ph-circle-fill' : 'ph-check'} ph-xs notify-icon`"></i>
+							<i class="ph-flying-saucer ph-bold ph-lg"></i><i :class="`${antenna.hasUnreadNote ? 'ph-circle-fill' : 'ph-check'} ph-xs notify-icon`"></i>
 						</MkA>
 						<MkA class="ljoevbzj" :to="`/my/antennas/${antenna.id}`">
 							<div class="name">{{ antenna.name }}</div>
@@ -65,7 +65,7 @@ onDeactivated(() => {
 
 definePageMetadata({
 	title: i18n.ts.manageAntennas,
-	icon: 'ph-flying-saucer-bold ph-lg',
+	icon: 'ph-flying-saucer ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue
index a5f6b2505..e19cdfc62 100644
--- a/packages/client/src/pages/my-clips/index.vue
+++ b/packages/client/src/pages/my-clips/index.vue
@@ -3,7 +3,7 @@
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :content-max="700">
 		<div class="qtcaoidl">
-			<MkButton primary class="add" @click="create"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
+			<MkButton primary class="add" @click="create"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
 
 			<MkPagination v-slot="{items}" ref="pagingComponent" :pagination="pagination" class="list">
 				<MkA v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap">
@@ -70,9 +70,9 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.clip,
-	icon: 'ph-paperclip-bold ph-lg',
+	icon: 'ph-paperclip ph-bold ph-lg',
 	action: {
-		icon: 'ph-plus-bold ph-lg',
+		icon: 'ph-plus ph-bold ph-lg',
 		handler: create,
 	},
 });
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index 33754e0b2..1ea23847d 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -13,7 +13,7 @@
 						</div>
 						<div class="action">
 							<button class="_button" @click="removeUser(user)">
-								<i class="ph-x-bold ph-lg"></i>
+								<i class="ph-x ph-bold ph-lg"></i>
 							</button>
 						</div>
 					</div>
@@ -123,25 +123,25 @@ async function deleteGroup() {
 definePageMetadata(
 	computed(() => ({
 		title: i18n.ts.members,
-		icon: "ph-users-three-bold ph-lg",
+		icon: "ph-users-three ph-bold ph-lg",
 	})),
 );
 
 const headerActions = $computed(() => [
 	{
-		icon: 'ph-plus-bold ph-lg',
+		icon: 'ph-plus ph-bold ph-lg',
 		text: i18n.ts.invite,
 		handler: invite,
 	}, {
-		icon: 'ph-cursor-text-bold ph-lg',
+		icon: 'ph-cursor-text ph-bold ph-lg',
 		text: i18n.ts.rename,
 		handler: renameGroup,
 	}, {
-		icon: 'ph-arrows-left-right-bold ph-lg',
+		icon: 'ph-arrows-left-right ph-bold ph-lg',
 		text: i18n.ts.transfer,
 		handler: transfer,
 	}, {
-		icon: 'ph-trash-bold ph-lg',
+		icon: 'ph-trash ph-bold ph-lg',
 		text: i18n.ts.delete,
 		handler: deleteGroup,
 	},
diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index 3363b0fa5..2f01ab541 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -2,7 +2,7 @@
 <MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions"/></template>
 	<MkSpacer :content-max="800" :margin-min="20">
-		<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.createGroup }}</MkButton>
+		<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.createGroup }}</MkButton>
 		<MkPagination v-slot="{items}" ref="owned" :pagination="ownedPagination">
 			<div v-for="group in items" :key="group.id" class="_card">
 				<div class="_title"><MkA :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</MkA></div>
@@ -51,7 +51,7 @@ const joinedPagination = {
 
 const headerActions = $computed(() => [
 	{
-		icon: 'ph-plus-bold ph-lg',
+		icon: 'ph-plus ph-bold ph-lg',
 		text: i18n.ts.createGroup,
 		handler: create,
 	},
@@ -60,7 +60,7 @@ const headerActions = $computed(() => [
 definePageMetadata(
 	computed(() => ({
 		title: i18n.ts.groups,
-		icon: "ph-users-three-bold ph-lg",
+		icon: "ph-users-three ph-bold ph-lg",
 	})),
 );
 
diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue
index 6c7835ae6..4f1b63fff 100644
--- a/packages/client/src/pages/my-lists/index.vue
+++ b/packages/client/src/pages/my-lists/index.vue
@@ -4,8 +4,8 @@
 	<MkSpacer :content-max="700">
 		<div class="qkcjvfiv">
 			<div class="buttonWrapper">
-				<MkButton primary class="add" @click="create"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.createList }}</MkButton>
-				<MkButton @click="deleteAll"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.deleteAll }}</MkButton>
+				<MkButton primary class="add" @click="create"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.createList }}</MkButton>
+				<MkButton @click="deleteAll"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.deleteAll }}</MkButton>
 			</div>
 
 			<MkPagination v-slot="{items}" ref="pagingComponent" :pagination="pagination" class="lists _content">
@@ -61,9 +61,9 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.manageLists,
-	icon: 'ph-list-bullets-bold ph-lg',
+	icon: 'ph-list-bullets ph-bold ph-lg',
 	action: {
-		icon: 'ph-plus-bold ph-lg',
+		icon: 'ph-plus ph-bold ph-lg',
 		handler: create,
 	},
 });
diff --git a/packages/client/src/pages/my-lists/list.vue b/packages/client/src/pages/my-lists/list.vue
index 6ea16c5e8..e3c211fc2 100644
--- a/packages/client/src/pages/my-lists/list.vue
+++ b/packages/client/src/pages/my-lists/list.vue
@@ -25,7 +25,7 @@
 									<MkAcct :user="user" class="acct"/>
 								</div>
 								<div class="action">
-									<button class="_button" @click="removeUser(user)"><i class="ph-x-bold ph-lg"></i></button>
+									<button class="_button" @click="removeUser(user)"><i class="ph-x ph-bold ph-lg"></i></button>
 								</div>
 							</div>
 						</div>
@@ -122,7 +122,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => list ? {
 	title: list.name,
-	icon: 'ph-list-bullets-bold ph-lg',
+	icon: 'ph-list-bullets ph-bold ph-lg',
 } : null));
 </script>
 
diff --git a/packages/client/src/pages/not-found.vue b/packages/client/src/pages/not-found.vue
index 6d3e27f5f..d6f701b56 100644
--- a/packages/client/src/pages/not-found.vue
+++ b/packages/client/src/pages/not-found.vue
@@ -17,6 +17,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.notFound,
-	icon: 'ph-warning-bold ph-lg',
+	icon: 'ph-warning ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index f2a7bb78a..9f400907d 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -10,7 +10,7 @@
 					</div>
 
 					<div class="main _gap">
-						<MkButton v-if="!showNext && hasNext" class="load next" @click="showNext = true"><i class="ph-caret-up-bold ph-lg"></i></MkButton>
+						<MkButton v-if="!showNext && hasNext" class="load next" @click="showNext = true"><i class="ph-caret-up ph-bold ph-lg"></i></MkButton>
 						<div class="note _gap">
 							<MkRemoteCaution v-if="note.user.host != null" :href="note.url ?? note.uri"/>
 							<XNoteDetailed :key="note.id" v-model:note="note" class="note"/>
@@ -25,7 +25,7 @@
 								</div>
 							</MkA>
 						</div>
-						<MkButton v-if="!showPrev && hasPrev" class="load prev" @click="showPrev = true"><i class="ph-caret-down-bold ph-lg"></i></MkButton>
+						<MkButton v-if="!showPrev && hasPrev" class="load prev" @click="showPrev = true"><i class="ph-caret-down ph-bold ph-lg"></i></MkButton>
 					</div>
 
 					<div v-if="showPrev" class="_gap">
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index 14ff8dfde..e587a1f78 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -88,7 +88,7 @@ function setFilter(ev) {
 		},
 	}));
 	const items = includeTypes != null ? [{
-		icon: 'ph-x-bold ph-lg',
+		icon: 'ph-x ph-bold ph-lg',
 		text: i18n.ts.clear,
 		action: () => {
 			includeTypes = null;
@@ -99,12 +99,12 @@ function setFilter(ev) {
 
 const headerActions = $computed(() => [tab === 'all' ? {
 	text: i18n.ts.filter,
-	icon: 'ph-funnel-bold ph-lg',
+	icon: 'ph-funnel ph-bold ph-lg',
 	highlighted: includeTypes != null,
 	handler: setFilter,
 } : undefined, tab === 'all' ? {
 	text: i18n.ts.markAllAsRead,
-	icon: 'ph-check-bold ph-lg',
+	icon: 'ph-check ph-bold ph-lg',
 	handler: () => {
 		os.apiWithDialog('notifications/mark-all-as-read');
 	},
@@ -113,24 +113,24 @@ const headerActions = $computed(() => [tab === 'all' ? {
 const headerTabs = $computed(() => [{
 	key: 'all',
 	title: i18n.ts.all,
-	icon: 'ph-bell-bold ph-lg',
+	icon: 'ph-bell ph-bold ph-lg',
 }, {
 	key: 'unread',
 	title: i18n.ts.unread,
-	icon: 'ph-circle-wavy-warning-bold ph-lg',
+	icon: 'ph-circle-wavy-warning ph-bold ph-lg',
 }, {
 	key: 'mentions',
 	title: i18n.ts.mentions,
-	icon: 'ph-at-bold ph-lg',
+	icon: 'ph-at ph-bold ph-lg',
 }, {
 	key: 'directNotes',
 	title: i18n.ts.directNotes,
-	icon: 'ph-envelope-simple-open-bold ph-lg',
+	icon: 'ph-envelope-simple-open ph-bold ph-lg',
 }]);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.notifications,
-	icon: 'ph-bell-bold ph-lg',
+	icon: 'ph-bell ph-bold ph-lg',
 })));
 
 let swiperRef = null;
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.button.vue b/packages/client/src/pages/page-editor/els/page-editor.el.button.vue
index 23060248d..1d25e5493 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.button.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.button.vue
@@ -1,7 +1,7 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning-bold ph-lg"></i> {{ i18n.ts._pages.blocks.button }}</template>
+	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.button }}</template>
 
 	<section class="xfhsjczc">
 		<MkInput v-model="value.text"><template #label>{{ i18n.ts._pages.blocks._button.text }}</template></MkInput>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.canvas.vue b/packages/client/src/pages/page-editor/els/page-editor.el.canvas.vue
index dc0f2fa6b..c92835789 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.canvas.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.canvas.vue
@@ -1,11 +1,11 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-paint-brush-household-bold ph-lg"></i> {{ i18n.ts._pages.blocks.canvas }}</template>
+	<template #header><i class="ph-paint-brush-household ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.canvas }}</template>
 
 	<section style="padding: 0 16px 0 16px;">
 		<MkInput v-model="value.name">
-			<template #prefix><i class="ph-magic-wand-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template>
 			<template #label>{{ i18n.ts._pages.blocks._canvas.id }}</template>
 		</MkInput>
 		<MkInput v-model="value.width" type="number">
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue b/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue
index 74519e201..5b0c2a266 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue
@@ -1,11 +1,11 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning-bold ph-lg"></i> {{ i18n.ts._pages.blocks.counter }}</template>
+	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.counter }}</template>
 
 	<section style="padding: 0 16px 0 16px;">
 		<MkInput v-model="value.name">
-			<template #prefix><i class="ph-magic-wand-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template>
 			<template #label>{{ i18n.ts._pages.blocks._counter.name }}</template>
 		</MkInput>
 		<MkInput v-model="value.text">
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.if.vue b/packages/client/src/pages/page-editor/els/page-editor.el.if.vue
index 7915527e3..6e4525e4b 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.if.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.if.vue
@@ -1,10 +1,10 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-question-bold ph-lg"></i> {{ i18n.ts._pages.blocks.if }}</template>
+	<template #header><i class="ph-question ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.if }}</template>
 	<template #func>
 		<button class="_button" @click="add()">
-			<i class="ph-plus-bold ph-lg"></i>
+			<i class="ph-plus ph-bold ph-lg"></i>
 		</button>
 	</template>
 
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.image.vue b/packages/client/src/pages/page-editor/els/page-editor.el.image.vue
index f855f01c2..81d4a10bf 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.image.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.image.vue
@@ -1,10 +1,10 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-image-bold ph-lg"></i> {{ i18n.ts._pages.blocks.image }}</template>
+	<template #header><i class="ph-image ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.image }}</template>
 	<template #func>
 		<button @click="choose()">
-			<i class="ph-folder-notch-open-bold ph-lg"></i>
+			<i class="ph-folder-notch-open ph-bold ph-lg"></i>
 		</button>
 	</template>
 
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.note.vue b/packages/client/src/pages/page-editor/els/page-editor.el.note.vue
index 027a0143f..323ac93a8 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.note.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.note.vue
@@ -1,7 +1,7 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-sticker-bold ph-lg"></i> {{ i18n.ts._pages.blocks.note }}</template>
+	<template #header><i class="ph-sticker ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.note }}</template>
 
 	<section style="padding: 0 16px 0 16px;">
 		<MkInput v-model="id">
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.number-input.vue b/packages/client/src/pages/page-editor/els/page-editor.el.number-input.vue
index 0964e2221..98d23cb45 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.number-input.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.number-input.vue
@@ -1,11 +1,11 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning-bold ph-lg"></i> {{ i18n.ts._pages.blocks.numberInput }}</template>
+	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.numberInput }}</template>
 
 	<section style="padding: 0 16px 0 16px;">
 		<MkInput v-model="value.name">
-			<template #prefix><i class="ph-magic-wand-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template>
 			<template #label>{{ i18n.ts._pages.blocks._numberInput.name }}</template>
 		</MkInput>
 		<MkInput v-model="value.text">
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.post.vue b/packages/client/src/pages/page-editor/els/page-editor.el.post.vue
index 34a695904..9828c99d1 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.post.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.post.vue
@@ -1,7 +1,7 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-paper-plane-tilt-bold ph-lg"></i> {{ i18n.ts._pages.blocks.post }}</template>
+	<template #header><i class="ph-paper-plane-tilt ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.post }}</template>
 
 	<section style="padding: 16px;">
 		<MkTextarea v-model="value.text"><template #label>{{ i18n.ts._pages.blocks._post.text }}</template></MkTextarea>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.radio-button.vue b/packages/client/src/pages/page-editor/els/page-editor.el.radio-button.vue
index 4ef176809..852c3d60c 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.radio-button.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.radio-button.vue
@@ -1,10 +1,10 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning-bold ph-lg"></i> {{ i18n.ts._pages.blocks.radioButton }}</template>
+	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.radioButton }}</template>
 
 	<section style="padding: 0 16px 16px 16px;">
-		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._radioButton.name }}</template></MkInput>
+		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._radioButton.name }}</template></MkInput>
 		<MkInput v-model="value.title"><template #label>{{ i18n.ts._pages.blocks._radioButton.title }}</template></MkInput>
 		<MkTextarea v-model="values"><template #label>{{ i18n.ts._pages.blocks._radioButton.values }}</template></MkTextarea>
 		<MkInput v-model="value.default"><template #label>{{ i18n.ts._pages.blocks._radioButton.default }}</template></MkInput>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.section.vue b/packages/client/src/pages/page-editor/els/page-editor.el.section.vue
index 301625b79..ee88d8a05 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.section.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.section.vue
@@ -1,13 +1,13 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-sticker-bold ph-lg"></i> {{ value.title }}</template>
+	<template #header><i class="ph-sticker ph-bold ph-lg"></i> {{ value.title }}</template>
 	<template #func>
 		<button class="_button" @click="rename()">
-			<i class="ph-pencil-bold ph-lg"></i>
+			<i class="ph-pencil ph-bold ph-lg"></i>
 		</button>
 		<button class="_button" @click="add()">
-			<i class="ph-plus-bold ph-lg"></i>
+			<i class="ph-plus ph-bold ph-lg"></i>
 		</button>
 	</template>
 
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.switch.vue b/packages/client/src/pages/page-editor/els/page-editor.el.switch.vue
index 542997b38..cc7aabbfe 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.switch.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.switch.vue
@@ -1,10 +1,10 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning-bold ph-lg"></i> {{ i18n.ts._pages.blocks.switch }}</template>
+	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.switch }}</template>
 
 	<section class="kjuadyyj">
-		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._switch.name }}</template></MkInput>
+		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._switch.name }}</template></MkInput>
 		<MkInput v-model="value.text"><template #label>{{ i18n.ts._pages.blocks._switch.text }}</template></MkInput>
 		<MkSwitch v-model="value.default"><span>{{ i18n.ts._pages.blocks._switch.default }}</span></MkSwitch>
 	</section>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.text-input.vue b/packages/client/src/pages/page-editor/els/page-editor.el.text-input.vue
index 525376b52..f1a6fbd8d 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.text-input.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.text-input.vue
@@ -1,10 +1,10 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning-bold ph-lg"></i> {{ i18n.ts._pages.blocks.textInput }}</template>
+	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.textInput }}</template>
 
 	<section style="padding: 0 16px 0 16px;">
-		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._textInput.name }}</template></MkInput>
+		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._textInput.name }}</template></MkInput>
 		<MkInput v-model="value.text"><template #label>{{ i18n.ts._pages.blocks._textInput.text }}</template></MkInput>
 		<MkInput v-model="value.default" type="text"><template #label>{{ i18n.ts._pages.blocks._textInput.default }}</template></MkInput>
 	</section>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.text.vue b/packages/client/src/pages/page-editor/els/page-editor.el.text.vue
index 87b5d674d..bbe01c9ed 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.text.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.text.vue
@@ -1,7 +1,7 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-align-left-bold ph-lg"></i> {{ i18n.ts._pages.blocks.text }}</template>
+	<template #header><i class="ph-align-left ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.text }}</template>
 
 	<section class="vckmsadr">
 		<textarea v-model="value.text"></textarea>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.textarea-input.vue b/packages/client/src/pages/page-editor/els/page-editor.el.textarea-input.vue
index 550ef556d..e48512815 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.textarea-input.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.textarea-input.vue
@@ -1,10 +1,10 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning-bold ph-lg"></i> {{ i18n.ts._pages.blocks.textareaInput }}</template>
+	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.textareaInput }}</template>
 
 	<section style="padding: 0 16px 16px 16px;">
-		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._textareaInput.name }}</template></MkInput>
+		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._textareaInput.name }}</template></MkInput>
 		<MkInput v-model="value.text"><template #label>{{ i18n.ts._pages.blocks._textareaInput.text }}</template></MkInput>
 		<MkTextarea v-model="value.default"><template #label>{{ i18n.ts._pages.blocks._textareaInput.default }}</template></MkTextarea>
 	</section>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.textarea.vue b/packages/client/src/pages/page-editor/els/page-editor.el.textarea.vue
index bf598411b..cdae20a2e 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.textarea.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.textarea.vue
@@ -1,7 +1,7 @@
 <template>
 
 <XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-align-left-bold ph-lg"></i> {{ i18n.ts._pages.blocks.textarea }}</template>
+	<template #header><i class="ph-align-left ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.textarea }}</template>
 
 	<section class="ihymsbbe">
 		<textarea v-model="value.text"></textarea>
diff --git a/packages/client/src/pages/page-editor/page-editor.container.vue b/packages/client/src/pages/page-editor/page-editor.container.vue
index 341e1040d..af0c588b3 100644
--- a/packages/client/src/pages/page-editor/page-editor.container.vue
+++ b/packages/client/src/pages/page-editor/page-editor.container.vue
@@ -5,14 +5,14 @@
 		<div class="buttons">
 			<slot name="func"></slot>
 			<button v-if="removable" class="_button" @click="remove()">
-				<i class="ph-trash-bold ph-lg"></i>
+				<i class="ph-trash ph-bold ph-lg"></i>
 			</button>
 			<button v-if="draggable" class="drag-handle _button">
-				<i class="ph-list-bold ph-lg"></i>
+				<i class="ph-list ph-bold ph-lg"></i>
 			</button>
 			<button class="_button" @click="toggleContent(!showBody)">
-				<template v-if="showBody"><i class="ph-caret-up-bold ph-lg"></i></template>
-				<template v-else><i class="ph-caret-down-bold ph-lg"></i></template>
+				<template v-if="showBody"><i class="ph-caret-up ph-bold ph-lg"></i></template>
+				<template v-else><i class="ph-caret-down ph-bold ph-lg"></i></template>
 			</button>
 		</div>
 	</header>
diff --git a/packages/client/src/pages/page-editor/page-editor.script-block.vue b/packages/client/src/pages/page-editor/page-editor.script-block.vue
index ab5997151..2f437cf8b 100644
--- a/packages/client/src/pages/page-editor/page-editor.script-block.vue
+++ b/packages/client/src/pages/page-editor/page-editor.script-block.vue
@@ -4,7 +4,7 @@
 	<template #header><i v-if="icon" :class="icon"></i> <template v-if="title">{{ title }} <span v-if="typeText" class="turmquns">({{ typeText }})</span></template><template v-else-if="typeText">{{ typeText }}</template></template>
 	<template #func>
 		<button class="_button" @click="changeType()">
-			<i class="ph-pencil-bold ph-lg"></i>
+			<i class="ph-pencil ph-bold ph-lg"></i>
 		</button>
 	</template>
 
@@ -118,7 +118,7 @@ export default defineComponent({
 	computed: {
 		icon(): any {
 			if (this.modelValue.type === null) return null;
-			if (this.modelValue.type.startsWith('fn:')) return 'ph-plug-bold ph-lg';
+			if (this.modelValue.type.startsWith('fn:')) return 'ph-plug ph-bold ph-lg';
 			return blockDefs.find(x => x.type === this.modelValue.type).icon;
 		},
 		typeText(): any {
diff --git a/packages/client/src/pages/page-editor/page-editor.vue b/packages/client/src/pages/page-editor/page-editor.vue
index fd8fe0ed6..89af1a63e 100644
--- a/packages/client/src/pages/page-editor/page-editor.vue
+++ b/packages/client/src/pages/page-editor/page-editor.vue
@@ -3,10 +3,10 @@
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :content-max="700">
 		<div class="jqqmcavi">
-			<MkButton v-if="pageId" class="button" inline link :to="`/@${ author.username }/pages/${ currentName }`"><i class="ph-arrow-square-out-bold ph-lg"></i> {{ i18n.ts._pages.viewPage }}</MkButton>
-			<MkButton v-if="!readonly" inline primary class="button" @click="save"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-			<MkButton v-if="pageId" inline class="button" @click="duplicate"><i class="ph-clipboard-text-bold ph-lg"></i> {{ i18n.ts.duplicate }}</MkButton>
-			<MkButton v-if="pageId && !readonly" inline class="button" danger @click="del"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
+			<MkButton v-if="pageId" class="button" inline link :to="`/@${ author.username }/pages/${ currentName }`"><i class="ph-arrow-square-out ph-bold ph-lg"></i> {{ i18n.ts._pages.viewPage }}</MkButton>
+			<MkButton v-if="!readonly" inline primary class="button" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+			<MkButton v-if="pageId" inline class="button" @click="duplicate"><i class="ph-clipboard-text ph-bold ph-lg"></i> {{ i18n.ts.duplicate }}</MkButton>
+			<MkButton v-if="pageId && !readonly" inline class="button" danger @click="del"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
 		</div>
 
 		<div v-if="tab === 'settings'">
@@ -36,10 +36,10 @@
 				<MkSwitch v-model="hideTitleWhenPinned" class="_formBlock">{{ i18n.ts._pages.hideTitleWhenPinned }}</MkSwitch>
 
 				<div class="eyeCatch">
-					<MkButton v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts._pages.eyeCatchingImageSet }}</MkButton>
+					<MkButton v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts._pages.eyeCatchingImageSet }}</MkButton>
 					<div v-else-if="eyeCatchingImage">
 						<img :src="eyeCatchingImage.url" :alt="eyeCatchingImage.name" style="max-width: 100%;"/>
-						<MkButton v-if="!readonly" @click="removeEyeCatchingImage()"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts._pages.eyeCatchingImageRemove }}</MkButton>
+						<MkButton v-if="!readonly" @click="removeEyeCatchingImage()"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts._pages.eyeCatchingImageRemove }}</MkButton>
 					</div>
 				</div>
 			</div>
@@ -48,7 +48,7 @@
 		<div v-else-if="tab === 'contents'">
 			<div>
 				<XBlocks v-model="content" class="content" :hpml="hpml"/>
-				<MkButton v-if="!readonly" @click="add()"><i class="ph-plus-bold ph-lg"></i></MkButton>
+				<MkButton v-if="!readonly" @click="add()"><i class="ph-plus ph-bold ph-lg"></i></MkButton>
 			</div>
 		</div>
 
@@ -68,7 +68,7 @@
 					</template>
 				</XDraggable>
 
-				<MkButton v-if="!readonly" class="add" @click="addVariable()"><i class="ph-plus-bold ph-lg"></i></MkButton>
+				<MkButton v-if="!readonly" class="add" @click="addVariable()"><i class="ph-plus ph-bold ph-lg"></i></MkButton>
 			</div>
 		</div>
 
@@ -416,19 +416,19 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => [{
 	key: 'settings',
 	title: i18n.ts._pages.pageSetting,
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 }, {
 	key: 'contents',
 	title: i18n.ts._pages.contents,
-	icon: 'ph-sticker-bold ph-lg',
+	icon: 'ph-sticker ph-bold ph-lg',
 }, {
 	key: 'variables',
 	title: i18n.ts._pages.variables,
-	icon: 'ph-magic-wand-bold ph-lg',
+	icon: 'ph-magic-wand ph-bold ph-lg',
 }, {
 	key: 'script',
 	title: i18n.ts.script,
-	icon: 'ph-code-bold ph-lg',
+	icon: 'ph-code ph-bold ph-lg',
 }]);
 
 definePageMetadata(computed(() => {
@@ -441,7 +441,7 @@ definePageMetadata(computed(() => {
 	}
 	return {
 		title: title,
-		icon: 'ph-pencil-bold ph-lg',
+		icon: 'ph-pencil ph-bold ph-lg',
 	};
 }));
 </script>
diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue
index 0d6893c32..87a3d1f8b 100644
--- a/packages/client/src/pages/page.vue
+++ b/packages/client/src/pages/page.vue
@@ -5,8 +5,8 @@
 		<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
 			<div v-if="page" :key="page.id" v-size="{ max: [450] }" class="xcukqgmh">
 				<div class="footer">
-					<div><i class="ph-alarm-bold"/> {{ i18n.ts.createdAt }}: <MkTime :time="page.createdAt" mode="detail"/></div>
-					<div v-if="page.createdAt != page.updatedAt"><i class="ph-alarm-bold"></i> {{ i18n.ts.updatedAt }}: <MkTime :time="page.updatedAt" mode="detail"/></div>
+					<div><i class="ph-alarm ph-bold"/> {{ i18n.ts.createdAt }}: <MkTime :time="page.createdAt" mode="detail"/></div>
+					<div v-if="page.createdAt != page.updatedAt"><i class="ph-alarm ph-bold"></i> {{ i18n.ts.updatedAt }}: <MkTime :time="page.updatedAt" mode="detail"/></div>
 				</div>
 				<div class="_block main">
 					<div class="banner">
@@ -15,12 +15,12 @@
 								<h1>{{ page.title }}</h1>
 							</div>
 							<div class="menu-actions">
-								<button v-tooltip="i18n.ts.copyUrl" @click="copyUrl" class="menu _button"><i class="ph-link-simple-bold ph-lg"/></button>
-								<MkA v-tooltip="i18n.ts._pages.viewSource" :to="`/@${username}/pages/${pageName}/view-source`" class="menu _button"><i class="ph-code-bold ph-lg"/></MkA>
+								<button v-tooltip="i18n.ts.copyUrl" @click="copyUrl" class="menu _button"><i class="ph-link-simple ph-bold ph-lg"/></button>
+								<MkA v-tooltip="i18n.ts._pages.viewSource" :to="`/@${username}/pages/${pageName}/view-source`" class="menu _button"><i class="ph-code ph-bold ph-lg"/></MkA>
 								<template v-if="$i && $i.id === page.userId">
-									<MkA v-tooltip="i18n.ts._pages.editPage" class="menu _button" :to="`/pages/edit/${page.id}`"><i class="ph-pencil-bold ph-lg"/></MkA>
-									<button v-if="$i.pinnedPageId === page.id" v-tooltip="i18n.ts.unpin" class="menu _button" @click="pin(false)"><i class="ph-push-pin-slash-bold ph-lg"/></button>
-									<button v-else v-tooltip="i18n.ts.pin" class="menu _button" @click="pin(true)"><i class="ph-push-pin-bold ph-lg"/></button>
+									<MkA v-tooltip="i18n.ts._pages.editPage" class="menu _button" :to="`/pages/edit/${page.id}`"><i class="ph-pencil ph-bold ph-lg"/></MkA>
+									<button v-if="$i.pinnedPageId === page.id" v-tooltip="i18n.ts.unpin" class="menu _button" @click="pin(false)"><i class="ph-push-pin-slash ph-bold ph-lg"/></button>
+									<button v-else v-tooltip="i18n.ts.pin" class="menu _button" @click="pin(true)"><i class="ph-push-pin ph-bold ph-lg"/></button>
 								</template>
 							</div>
 						</div>
@@ -31,11 +31,11 @@
 					<div class="actions">
 						<div class="like">
 							<MkButton v-if="page.isLiked" v-tooltip="i18n.ts._pages.unlike" class="button" primary @click="unlike()"><i class="ph-heart-fill ph-lg"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
-							<MkButton v-else v-tooltip="i18n.ts._pages.like" class="button" @click="like()"><i class="ph-heart-bold"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
+							<MkButton v-else v-tooltip="i18n.ts._pages.like" class="button" @click="like()"><i class="ph-heart ph-bold"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
 						</div>
 						<div class="other">
-							<button v-tooltip="i18n.ts.shareWithNote" v-click-anime class="_button" @click="shareWithNote"><i class="ph-repeat-bold ph-lg ph-fw ph-lg"></i></button>
-							<button v-if="shareAvailable()" v-tooltip="i18n.ts.share" v-click-anime class="_button" @click="share"><i class="ph-share-network-bold ph-lg ph-fw ph-lg"></i></button>
+							<button v-tooltip="i18n.ts.shareWithNote" v-click-anime class="_button" @click="shareWithNote"><i class="ph-repeat ph-bold ph-lg ph-fw ph-lg"></i></button>
+							<button v-if="shareAvailable()" v-tooltip="i18n.ts.share" v-click-anime class="_button" @click="share"><i class="ph-share-network ph-bold ph-lg ph-fw ph-lg"></i></button>
 						</div>
 						<div class="user">
 							<MkAvatar :user="page.user" class="avatar"/>
@@ -57,7 +57,7 @@
 				</div>
 				<MkAd :prefer="['horizontal', 'horizontal-big']"/>
 				<MkContainer :max-height="300" :foldable="true" :expanded="false" class="other">
-					<template #header><i class="ph-clock-bold ph-lg"></i> {{ i18n.ts.recentPosts }}</template>
+					<template #header><i class="ph-clock ph-bold ph-lg"></i> {{ i18n.ts.recentPosts }}</template>
 					<MkPagination v-slot="{items}" :pagination="otherPostsPagination">
 						<MkPagePreview v-for="page in items" :key="page.id" :page="page" class="_gap"/>
 					</MkPagination>
diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index 62d71c384..5aaf76834 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -27,7 +27,7 @@
 			<swiper-slide>
 				<div class="rknalgpo my">
 					<div class="buttoncontainer">
-						<MkButton class="new primary" @click="create()"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts._pages.newPage }}</MkButton>
+						<MkButton class="new primary" @click="create()"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts._pages.newPage }}</MkButton>
 					</div>
 					<MkPagination v-slot="{items}" :pagination="myPagesPagination">
 						<MkPagePreview v-for="page in items" :key="page.id" class="ckltabjg" :page="page"/>
@@ -78,7 +78,7 @@ function create() {
 }
 
 const headerActions = $computed(() => [{
-	icon: 'ph-plus-bold ph-lg',
+	icon: 'ph-plus ph-bold ph-lg',
 	text: i18n.ts.create,
 	handler: create,
 }]);
@@ -86,20 +86,20 @@ const headerActions = $computed(() => [{
 const headerTabs = $computed(() => [{
 	key: 'featured',
 	title: i18n.ts._pages.featured,
-	icon: 'ph-fire-simple-bold ph-lg',
+	icon: 'ph-fire-simple ph-bold ph-lg',
 }, {
 	key: 'liked',
 	title: i18n.ts._pages.liked,
-	icon: 'ph-heart-bold ph-lg',
+	icon: 'ph-heart ph-bold ph-lg',
 }, {
 	key: 'my',
 	title: i18n.ts._pages.my,
-	icon: 'ph-crown-simple-bold ph-lg',
+	icon: 'ph-crown-simple ph-bold ph-lg',
 }]);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.pages,
-	icon: 'ph-file-text-bold ph-lg',
+	icon: 'ph-file-text ph-bold ph-lg',
 })));
 
 let swiperRef = null;
diff --git a/packages/client/src/pages/preview.vue b/packages/client/src/pages/preview.vue
index 1eb3a6ff3..4fda74806 100644
--- a/packages/client/src/pages/preview.vue
+++ b/packages/client/src/pages/preview.vue
@@ -16,7 +16,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.preview,
-	icon: 'ph-eye-bold ph-lg',
+	icon: 'ph-eye ph-bold ph-lg',
 })));
 </script>
 
diff --git a/packages/client/src/pages/registry.keys.vue b/packages/client/src/pages/registry.keys.vue
index 85c762184..4217e4079 100644
--- a/packages/client/src/pages/registry.keys.vue
+++ b/packages/client/src/pages/registry.keys.vue
@@ -88,7 +88,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.registry,
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/registry.value.vue b/packages/client/src/pages/registry.value.vue
index cfe3ad45d..2057dee29 100644
--- a/packages/client/src/pages/registry.value.vue
+++ b/packages/client/src/pages/registry.value.vue
@@ -24,14 +24,14 @@
 				<template #label>{{ i18n.ts.value }} (JSON)</template>
 			</FormTextarea>
 
-			<MkButton class="_formBlock" primary @click="save"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+			<MkButton class="_formBlock" primary @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
 
 			<MkKeyValue class="_formBlock">
 				<template #key>{{ i18n.ts.updatedAt }}</template>
 				<template #value><MkTime :time="value.updatedAt" mode="detail"/></template>
 			</MkKeyValue>
 
-			<MkButton danger @click="del"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
+			<MkButton danger @click="del"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
 		</template>
 	</MkSpacer>
 </MkStickyContainer>
@@ -115,7 +115,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.registry,
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/registry.vue b/packages/client/src/pages/registry.vue
index ea9cc8bbf..dc286d5cf 100644
--- a/packages/client/src/pages/registry.vue
+++ b/packages/client/src/pages/registry.vue
@@ -66,7 +66,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.registry,
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/reset-password.vue b/packages/client/src/pages/reset-password.vue
index 498951a75..6726671bb 100644
--- a/packages/client/src/pages/reset-password.vue
+++ b/packages/client/src/pages/reset-password.vue
@@ -4,7 +4,7 @@
 	<MkSpacer v-if="token" :content-max="700" :margin-min="16" :margin-max="32">
 		<div class="_formRoot">
 			<FormInput v-model="password" type="password" class="_formBlock">
-				<template #prefix><i class="ph-lock-bold ph-lg"></i></template>
+				<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
 				<template #label>{{ i18n.ts.newPassword }}</template>
 			</FormInput>
 		
@@ -50,7 +50,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.resetPassword,
-	icon: 'ph-lock-bold ph-lg',
+	icon: 'ph-lock ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/scratchpad.vue b/packages/client/src/pages/scratchpad.vue
index f674632b6..c448986a5 100644
--- a/packages/client/src/pages/scratchpad.vue
+++ b/packages/client/src/pages/scratchpad.vue
@@ -2,7 +2,7 @@
 <div class="iltifgqe">
 	<div class="editor _panel _gap">
 		<PrismEditor v-model="code" class="_code code" :highlight="highlighter" :line-numbers="false"/>
-		<MkButton style="position: absolute; top: 8px; right: 8px;" primary @click="run()"><i class="ph-play-bold ph-lg"></i></MkButton>
+		<MkButton style="position: absolute; top: 8px; right: 8px;" primary @click="run()"><i class="ph-play ph-bold ph-lg"></i></MkButton>
 	</div>
 
 	<MkContainer :foldable="true" class="_gap">
@@ -112,7 +112,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.scratchpad,
-	icon: 'ph-terminal-window-bold ph-lg',
+	icon: 'ph-terminal-window ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index 02d6c76ff..c2a1d2af6 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -33,6 +33,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => ({
 	title: i18n.t('searchWith', { q: props.query }),
-	icon: 'ph-magnifying-glass-bold ph-lg',
+	icon: 'ph-magnifying-glass ph-bold ph-lg',
 })));
 </script>
diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue
index 5c91972ee..71a76c716 100644
--- a/packages/client/src/pages/settings/2fa.vue
+++ b/packages/client/src/pages/settings/2fa.vue
@@ -26,7 +26,7 @@
 			<ol v-if="registration && !registration.error">
 				<li v-if="registration.stage >= 0">
 					{{ i18n.ts.tapSecurityKey }}
-					<i v-if="registration.saving && registration.stage == 0" class="ph-circle-notch-bold ph-lg fa-pulse ph-fw ph-lg"></i>
+					<i v-if="registration.saving && registration.stage == 0" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
 				</li>
 				<li v-if="registration.stage >= 1">
 					<MkForm :disabled="registration.stage != 1 || registration.saving">
@@ -34,7 +34,7 @@
 							<template #label>{{ i18n.ts.securityKeyName }}</template>
 						</MkInput>
 						<MkButton :disabled="keyName.length == 0" @click="registerKey">{{ i18n.ts.registerSecurityKey }}</MkButton>
-						<i v-if="registration.saving && registration.stage == 1" class="ph-circle-notch-bold ph-lg fa-pulse ph-fw ph-lg"></i>
+						<i v-if="registration.saving && registration.stage == 1" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
 					</MkForm>
 				</li>
 			</ol>
diff --git a/packages/client/src/pages/settings/account-info.vue b/packages/client/src/pages/settings/account-info.vue
index 395953467..0f8ae6725 100644
--- a/packages/client/src/pages/settings/account-info.vue
+++ b/packages/client/src/pages/settings/account-info.vue
@@ -153,6 +153,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.accountInfo,
-	icon: 'ph-info-bold ph-lg',
+	icon: 'ph-info ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/accounts.vue b/packages/client/src/pages/settings/accounts.vue
index 37b1d5c08..3f90c4b33 100644
--- a/packages/client/src/pages/settings/accounts.vue
+++ b/packages/client/src/pages/settings/accounts.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="_formRoot">
 	<FormSuspense :p="init">
-		<FormButton primary @click="addAccount"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.addAccount }}</FormButton>
+		<FormButton primary @click="addAccount"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.addAccount }}</FormButton>
 
 		<div v-for="account in accounts" :key="account.id" class="_panel _button lcjjdxlm" @click="menu(account, $event)">
 			<div class="avatar">
@@ -50,11 +50,11 @@ const init = async () => {
 function menu(account, ev) {
 	os.popupMenu([{
 		text: i18n.ts.switch,
-		icon: 'ph-swap-bold ph-lg',
+		icon: 'ph-swap ph-bold ph-lg',
 		action: () => switchAccount(account),
 	}, {
 		text: i18n.ts.remove,
-		icon: 'ph-trash-bold ph-lg',
+		icon: 'ph-trash ph-bold ph-lg',
 		danger: true,
 		action: () => removeAccount(account),
 	}], ev.currentTarget ?? ev.target);
@@ -108,7 +108,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.accounts,
-	icon: 'ph-users-bold ph-lg',
+	icon: 'ph-users ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/api.vue b/packages/client/src/pages/settings/api.vue
index 0d6f6c007..0c3cd38f5 100644
--- a/packages/client/src/pages/settings/api.vue
+++ b/packages/client/src/pages/settings/api.vue
@@ -41,6 +41,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: 'API',
-	icon: 'ph-key-bold ph-lg',
+	icon: 'ph-key ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/apps.vue b/packages/client/src/pages/settings/apps.vue
index da0de12ff..608200c82 100644
--- a/packages/client/src/pages/settings/apps.vue
+++ b/packages/client/src/pages/settings/apps.vue
@@ -22,7 +22,7 @@
 						<div><MkTime :time="token.lastUsedAt"/></div>
 					</div>
 					<div class="actions">
-						<button class="_button" @click="revoke(token)"><i class="ph-trash-bold ph-lg"></i></button>
+						<button class="_button" @click="revoke(token)"><i class="ph-trash ph-bold ph-lg"></i></button>
 					</div>
 					<details>
 						<summary>{{ i18n.ts.details }}</summary>
@@ -66,7 +66,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.installedApps,
-	icon: 'ph-plug-bold ph-lg',
+	icon: 'ph-plug ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/custom-css.vue b/packages/client/src/pages/settings/custom-css.vue
index 6534a117a..fe24de237 100644
--- a/packages/client/src/pages/settings/custom-css.vue
+++ b/packages/client/src/pages/settings/custom-css.vue
@@ -41,6 +41,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.customCss,
-	icon: 'ph-code-bold ph-lg',
+	icon: 'ph-code ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/deck.vue b/packages/client/src/pages/settings/deck.vue
index 7f6c3762e..aa44985dd 100644
--- a/packages/client/src/pages/settings/deck.vue
+++ b/packages/client/src/pages/settings/deck.vue
@@ -34,6 +34,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.deck,
-	icon: 'ph-layout-bold ph-lg',
+	icon: 'ph-layout ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/delete-account.vue b/packages/client/src/pages/settings/delete-account.vue
index 5cda51ae1..044219f43 100644
--- a/packages/client/src/pages/settings/delete-account.vue
+++ b/packages/client/src/pages/settings/delete-account.vue
@@ -47,6 +47,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts._accountDelete.accountDelete,
-	icon: 'ph-warning-bold ph-lg',
+	icon: 'ph-warning ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/drive.vue b/packages/client/src/pages/settings/drive.vue
index 593169e57..cff31e45a 100644
--- a/packages/client/src/pages/settings/drive.vue
+++ b/packages/client/src/pages/settings/drive.vue
@@ -26,7 +26,7 @@
 		<FormLink @click="chooseUploadFolder()">
 			{{ i18n.ts.uploadFolder }}
 			<template #suffix>{{ uploadFolder ? uploadFolder.name : '-' }}</template>
-			<template #suffixIcon><i class="ph-folder-notch-open-bold ph-lg"></i></template>
+			<template #suffixIcon><i class="ph-folder-notch-open ph-bold ph-lg"></i></template>
 		</FormLink>
 		<FormSwitch v-model="keepOriginalUploading" class="_formBlock">
 			<template #label>{{ i18n.ts.keepOriginalUploading }}</template>
@@ -120,7 +120,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.drive,
-	icon: 'ph-cloud-bold ph-lg',
+	icon: 'ph-cloud ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/email.vue b/packages/client/src/pages/settings/email.vue
index 176ddc943..bd8b76e6d 100644
--- a/packages/client/src/pages/settings/email.vue
+++ b/packages/client/src/pages/settings/email.vue
@@ -3,9 +3,9 @@
 	<FormSection>
 		<template #label>{{ i18n.ts.emailAddress }}</template>
 		<FormInput v-model="emailAddress" type="email" manual-save>
-			<template #prefix><i class="ph-envelope-simple-open-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-envelope-simple-open ph-bold ph-lg"></i></template>
 			<template v-if="$i.email && !$i.emailVerified" #caption>{{ i18n.ts.verificationEmailSent }}</template>
-			<template v-else-if="emailAddress === $i.email && $i.emailVerified" #caption><i class="ph-check-bold ph-lg" style="color: var(--success);"></i> {{ i18n.ts.emailVerified }}</template>
+			<template v-else-if="emailAddress === $i.email && $i.emailVerified" #caption><i class="ph-check ph-bold ph-lg" style="color: var(--success);"></i> {{ i18n.ts.emailVerified }}</template>
 		</FormInput>
 	</FormSection>
 
@@ -106,6 +106,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.email,
-	icon: 'ph-envelope-simple-open-bold ph-lg',
+	icon: 'ph-envelope-simple-open ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index faea5008e..5df37c958 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -15,9 +15,9 @@
 	<FormRadios v-model="overridedDeviceKind" class="_formBlock">
 		<template #label>{{ i18n.ts.overridedDeviceKind }}</template>
 		<option :value="null">{{ i18n.ts.auto }}</option>
-		<option value="smartphone"><i class="ph-device-mobile-bold ph-lg"/> {{ i18n.ts.smartphone }}</option>
-		<option value="tablet"><i class="ph-device-tablet-bold ph-lg"/> {{ i18n.ts.tablet }}</option>
-		<option value="desktop"><i class="ph-desktop-bold ph-lg"/> {{ i18n.ts.desktop }}</option>
+		<option value="smartphone"><i class="ph-device-mobile ph-bold ph-lg"/> {{ i18n.ts.smartphone }}</option>
+		<option value="tablet"><i class="ph-device-tablet ph-bold ph-lg"/> {{ i18n.ts.tablet }}</option>
+		<option value="desktop"><i class="ph-desktop ph-bold ph-lg"/> {{ i18n.ts.desktop }}</option>
 	</FormRadios>
 
 	<FormSwitch v-model="showFixedPostForm" class="_formBlock">{{ i18n.ts.showFixedPostForm }}</FormSwitch>
@@ -91,7 +91,7 @@
 
 	<FormLink to="/settings/deck" class="_formBlock">{{ i18n.ts.deck }}</FormLink>
 
-	<FormLink to="/settings/custom-css" class="_formBlock"><template #icon><i class="ph-code-bold ph-lg"></i></template>{{ i18n.ts.customCss }}</FormLink>
+	<FormLink to="/settings/custom-css" class="_formBlock"><template #icon><i class="ph-code ph-bold ph-lg"></i></template>{{ i18n.ts.customCss }}</FormLink>
 </div>
 </template>
 
@@ -198,6 +198,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.general,
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index 5e33a8ce5..64c3cb4f9 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -4,66 +4,66 @@
 		<template #label>{{ i18n.ts._exportOrImport.allNotes }}</template>
 		<FormFolder>
 			<template #label>{{ i18n.ts.export }}</template>
-			<template #icon><i class="ph-download-simple-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="exportNotes()"><i class="ph-download-simple-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
+			<template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>
+			<MkButton primary :class="$style.button" inline @click="exportNotes()"><i class="ph-download-simple ph-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
 		</FormFolder>
 	</FormSection>
 	<FormSection>
 		<template #label>{{ i18n.ts._exportOrImport.followingList }}</template>
 		<FormFolder class="_formBlock">
 			<template #label>{{ i18n.ts.export }}</template>
-			<template #icon><i class="ph-download-simple-bold ph-lg"></i></template>
+			<template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>
 			<FormSwitch v-model="excludeMutingUsers" class="_formBlock">
 				{{ i18n.ts._exportOrImport.excludeMutingUsers }}
 			</FormSwitch>
 			<FormSwitch v-model="excludeInactiveUsers" class="_formBlock">
 				{{ i18n.ts._exportOrImport.excludeInactiveUsers }}
 			</FormSwitch>
-			<MkButton primary :class="$style.button" inline @click="exportFollowing()"><i class="ph-download-simple-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
+			<MkButton primary :class="$style.button" inline @click="exportFollowing()"><i class="ph-download-simple ph-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
 		</FormFolder>
 		<FormFolder class="_formBlock">
 			<template #label>{{ i18n.ts.import }}</template>
-			<template #icon><i class="ph-upload-simple-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="importFollowing($event)"><i class="ph-upload-simple-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
+			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
+			<MkButton primary :class="$style.button" inline @click="importFollowing($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
 		</FormFolder>
 	</FormSection>
 	<FormSection>
 		<template #label>{{ i18n.ts._exportOrImport.userLists }}</template>
 		<FormFolder class="_formBlock">
 			<template #label>{{ i18n.ts.export }}</template>
-			<template #icon><i class="ph-download-simple-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="exportUserLists()"><i class="ph-download-simple-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
+			<template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>
+			<MkButton primary :class="$style.button" inline @click="exportUserLists()"><i class="ph-download-simple ph-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
 		</FormFolder>
 		<FormFolder class="_formBlock">
 			<template #label>{{ i18n.ts.import }}</template>
-			<template #icon><i class="ph-upload-simple-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="importUserLists($event)"><i class="ph-upload-simple-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
+			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
+			<MkButton primary :class="$style.button" inline @click="importUserLists($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
 		</FormFolder>
 	</FormSection>
 	<FormSection>
 		<template #label>{{ i18n.ts._exportOrImport.muteList }}</template>
 		<FormFolder class="_formBlock">
 			<template #label>{{ i18n.ts.export }}</template>
-			<template #icon><i class="ph-download-simple-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="exportMuting()"><i class="ph-download-simple-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
+			<template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>
+			<MkButton primary :class="$style.button" inline @click="exportMuting()"><i class="ph-download-simple ph-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
 		</FormFolder>
 		<FormFolder class="_formBlock">
 			<template #label>{{ i18n.ts.import }}</template>
-			<template #icon><i class="ph-upload-simple-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="importMuting($event)"><i class="ph-upload-simple-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
+			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
+			<MkButton primary :class="$style.button" inline @click="importMuting($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
 		</FormFolder>
 	</FormSection>
 	<FormSection>
 		<template #label>{{ i18n.ts._exportOrImport.blockingList }}</template>
 		<FormFolder class="_formBlock">
 			<template #label>{{ i18n.ts.export }}</template>
-			<template #icon><i class="ph-download-simple-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="exportBlocking()"><i class="ph-download-simple-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
+			<template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>
+			<MkButton primary :class="$style.button" inline @click="exportBlocking()"><i class="ph-download-simple ph-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
 		</FormFolder>
 		<FormFolder class="_formBlock">
 			<template #label>{{ i18n.ts.import }}</template>
-			<template #icon><i class="ph-upload-simple-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="importBlocking($event)"><i class="ph-upload-simple-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
+			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
+			<MkButton primary :class="$style.button" inline @click="importBlocking($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
 		</FormFolder>
 	</FormSection>
 </div>
@@ -154,7 +154,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.importAndExport,
-	icon: 'ph-package-bold ph-lg',
+	icon: 'ph-package ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue
index f6ca654ef..b03140ff2 100644
--- a/packages/client/src/pages/settings/index.vue
+++ b/packages/client/src/pages/settings/index.vue
@@ -36,7 +36,7 @@ import * as os from '@/os';
 
 const indexInfo = {
 	title: i18n.ts.settings,
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 	hideHeader: true,
 };
 const INFO = ref(indexInfo);
@@ -58,42 +58,42 @@ const ro = new ResizeObserver((entries, observer) => {
 const menuDef = computed(() => [{
 	title: i18n.ts.basicSettings,
 	items: [{
-		icon: 'ph-user-bold ph-lg',
+		icon: 'ph-user ph-bold ph-lg',
 		text: i18n.ts.profile,
 		to: '/settings/profile',
 		active: currentPage?.route.name === 'profile',
 	}, {
-		icon: 'ph-lock-open-bold ph-lg',
+		icon: 'ph-lock-open ph-bold ph-lg',
 		text: i18n.ts.privacy,
 		to: '/settings/privacy',
 		active: currentPage?.route.name === 'privacy',
 	}, {
-		icon: 'ph-smiley-bold ph-lg',
+		icon: 'ph-smiley ph-bold ph-lg',
 		text: i18n.ts.reaction,
 		to: '/settings/reaction',
 		active: currentPage?.route.name === 'reaction',
 	}, {
-		icon: 'ph-cloud-bold ph-lg',
+		icon: 'ph-cloud ph-bold ph-lg',
 		text: i18n.ts.drive,
 		to: '/settings/drive',
 		active: currentPage?.route.name === 'drive',
 	}, {
-		icon: 'ph-bell-bold ph-lg',
+		icon: 'ph-bell ph-bold ph-lg',
 		text: i18n.ts.notifications,
 		to: '/settings/notifications',
 		active: currentPage?.route.name === 'notifications',
 	}, {
-		icon: 'ph-envelope-simple-open-bold ph-lg',
+		icon: 'ph-envelope-simple-open ph-bold ph-lg',
 		text: i18n.ts.email,
 		to: '/settings/email',
 		active: currentPage?.route.name === 'email',
 	}, {
-		icon: 'ph-share-network-bold ph-lg',
+		icon: 'ph-share-network ph-bold ph-lg',
 		text: i18n.ts.integration,
 		to: '/settings/integration',
 		active: currentPage?.route.name === 'integration',
 	}, {
-		icon: 'ph-lock-bold ph-lg',
+		icon: 'ph-lock ph-bold ph-lg',
 		text: i18n.ts.security,
 		to: '/settings/security',
 		active: currentPage?.route.name === 'security',
@@ -101,32 +101,32 @@ const menuDef = computed(() => [{
 }, {
 	title: i18n.ts.clientSettings,
 	items: [{
-		icon: 'ph-gear-six-bold ph-lg',
+		icon: 'ph-gear-six ph-bold ph-lg',
 		text: i18n.ts.general,
 		to: '/settings/general',
 		active: currentPage?.route.name === 'general',
 	}, {
-		icon: 'ph-palette-bold ph-lg',
+		icon: 'ph-palette ph-bold ph-lg',
 		text: i18n.ts.theme,
 		to: '/settings/theme',
 		active: currentPage?.route.name === 'theme',
 	}, {
-		icon: 'ph-list-bold ph-lg',
+		icon: 'ph-list ph-bold ph-lg',
 		text: i18n.ts.navbar,
 		to: '/settings/navbar',
 		active: currentPage?.route.name === 'navbar',
 	}, {
-		icon: 'ph-traffic-signal-bold ph-lg',
+		icon: 'ph-traffic-signal ph-bold ph-lg',
 		text: i18n.ts.statusbar,
 		to: '/settings/statusbar',
 		active: currentPage?.route.name === 'statusbar',
 	}, {
-		icon: 'ph-speaker-high-bold ph-lg',
+		icon: 'ph-speaker-high ph-bold ph-lg',
 		text: i18n.ts.sounds,
 		to: '/settings/sounds',
 		active: currentPage?.route.name === 'sounds',
 	}, {
-		icon: 'ph-plug-bold ph-lg',
+		icon: 'ph-plug ph-bold ph-lg',
 		text: i18n.ts.plugins,
 		to: '/settings/plugin',
 		active: currentPage?.route.name === 'plugin',
@@ -134,55 +134,55 @@ const menuDef = computed(() => [{
 }, {
 	title: i18n.ts.otherSettings,
 	items: [{
-		icon: 'ph-airplane-takeoff-bold ph-lg',
+		icon: 'ph-airplane-takeoff ph-bold ph-lg',
 		text: i18n.ts.migration,
 		to: '/settings/migration',
 		active: currentPage?.route.name === 'migration',
 	}, {
-		icon: 'ph-package-bold ph-lg',
+		icon: 'ph-package ph-bold ph-lg',
 		text: i18n.ts.importAndExport,
 		to: '/settings/import-export',
 		active: currentPage?.route.name === 'import-export',
 	}, {
-		icon: 'ph-speaker-none-bold ph-lg',
+		icon: 'ph-speaker-none ph-bold ph-lg',
 		text: i18n.ts.instanceMute,
 		to: '/settings/instance-mute',
 		active: currentPage?.route.name === 'instance-mute',
 	}, {
-		icon: 'ph-prohibit-bold ph-lg',
+		icon: 'ph-prohibit ph-bold ph-lg',
 		text: i18n.ts.muteAndBlock,
 		to: '/settings/mute-block',
 		active: currentPage?.route.name === 'mute-block',
 	}, {
-		icon: 'ph-speaker-x-bold ph-lg',
+		icon: 'ph-speaker-x ph-bold ph-lg',
 		text: i18n.ts.wordMute,
 		to: '/settings/word-mute',
 		active: currentPage?.route.name === 'word-mute',
 	}, {
-		icon: 'ph-key-bold ph-lg',
+		icon: 'ph-key ph-bold ph-lg',
 		text: 'API',
 		to: '/settings/api',
 		active: currentPage?.route.name === 'api',
 	}, {
-		icon: 'ph-lightning-bold ph-lg',
+		icon: 'ph-lightning ph-bold ph-lg',
 		text: 'Webhook',
 		to: '/settings/webhook',
 		active: currentPage?.route.name === 'webhook',
 	}, {
-		icon: 'ph-dots-three-outline-bold ph-lg',
+		icon: 'ph-dots-three-outline ph-bold ph-lg',
 		text: i18n.ts.other,
 		to: '/settings/other',
 		active: currentPage?.route.name === 'other',
 	}],
 }, {
 	items: [{
-		icon: 'ph-floppy-disk-bold ph-lg',
+		icon: 'ph-floppy-disk ph-bold ph-lg',
 		text: i18n.ts.preferencesBackups,
 		to: '/settings/preferences-backups',
 		active: currentPage?.route.name === 'preferences-backups',
 	}, {
 		type: 'button',
-		icon: 'ph-trash-bold ph-lg',
+		icon: 'ph-trash ph-bold ph-lg',
 		text: i18n.ts.clearCache,
 		action: () => {
 			localStorage.removeItem('locale');
@@ -191,7 +191,7 @@ const menuDef = computed(() => [{
 		},
 	}, {
 		type: 'button',
-		icon: 'ph-sign-in-bold ph-lg fa-flip-horizontal',
+		icon: 'ph-sign-in ph-bold ph-lg fa-flip-horizontal',
 		text: i18n.ts.logout,
 		action: async () => {
 			const { canceled } = await os.confirm({
diff --git a/packages/client/src/pages/settings/instance-mute.vue b/packages/client/src/pages/settings/instance-mute.vue
index 446f3c0f9..c4ce06d6e 100644
--- a/packages/client/src/pages/settings/instance-mute.vue
+++ b/packages/client/src/pages/settings/instance-mute.vue
@@ -5,7 +5,7 @@
 		<template #label>{{ i18n.ts._instanceMute.heading }}</template>
 		<template #caption>{{ i18n.ts._instanceMute.instanceMuteDescription }}<br>{{ i18n.ts._instanceMute.instanceMuteDescription2 }}</template>
 	</FormTextarea>
-	<MkButton primary :disabled="!changed" class="_formBlock" @click="save()"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+	<MkButton primary :disabled="!changed" class="_formBlock" @click="save()"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
 </div>
 </template>
 
@@ -48,6 +48,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.instanceMute,
-	icon: 'ph-speaker-none-bold ph-lg',
+	icon: 'ph-speaker-none ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/integration.vue b/packages/client/src/pages/settings/integration.vue
index e9e9d469c..e85137390 100644
--- a/packages/client/src/pages/settings/integration.vue
+++ b/packages/client/src/pages/settings/integration.vue
@@ -1,14 +1,14 @@
 <template>
 <div class="_formRoot">
 	<FormSection v-if="instance.enableDiscordIntegration">
-		<template #label><i class="ph-discord-logo-bold ph-lg"></i> Discord</template>
+		<template #label><i class="ph-discord-logo ph-bold ph-lg"></i> Discord</template>
 		<p v-if="integrations.discord">{{ i18n.ts.connectedTo }}: <a :href="`https://discord.com/users/${integrations.discord.id}`" rel="nofollow noopener" target="_blank">@{{ integrations.discord.username }}#{{ integrations.discord.discriminator }}</a></p>
 		<MkButton v-if="integrations.discord" danger @click="disconnectDiscord">{{ i18n.ts.disconnectService }}</MkButton>
 		<MkButton v-else primary @click="connectDiscord">{{ i18n.ts.connectService }}</MkButton>
 	</FormSection>
 
 	<FormSection v-if="instance.enableGithubIntegration">
-		<template #label><i class="ph-github-logo-bold ph-lg"></i> GitHub</template>
+		<template #label><i class="ph-github-logo ph-bold ph-lg"></i> GitHub</template>
 		<p v-if="integrations.github">{{ i18n.ts.connectedTo }}: <a :href="`https://github.com/${integrations.github.login}`" rel="nofollow noopener" target="_blank">@{{ integrations.github.login }}</a></p>
 		<MkButton v-if="integrations.github" danger @click="disconnectGithub">{{ i18n.ts.disconnectService }}</MkButton>
 		<MkButton v-else primary @click="connectGithub">{{ i18n.ts.connectService }}</MkButton>
@@ -87,6 +87,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.integration,
-	icon: 'ph-share-network-bold ph-lg',
+	icon: 'ph-share-network ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/migration.vue b/packages/client/src/pages/settings/migration.vue
index dcab0f8d1..49d244091 100644
--- a/packages/client/src/pages/settings/migration.vue
+++ b/packages/client/src/pages/settings/migration.vue
@@ -3,7 +3,7 @@
 	<FormSection>
 		<template #label>{{ i18n.ts.moveTo }}</template>
 		<FormInput v-model="moveToAccount" class="_formBlock">
-			<template #prefix><i class="ph-airplane-takeoff-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-airplane-takeoff ph-bold ph-lg"></i></template>
 			<template #label>{{ i18n.ts.moveToLabel }}</template>
 		</FormInput>
 		<FormButton primary danger @click="move(moveToAccount)">
@@ -15,11 +15,11 @@
 	<FormSection>
 		<template #label>{{ i18n.ts.moveFrom }}</template>
 		<FormInput v-model="accountAlias" class="_formBlock">
-			<template #prefix><i class="ph-airplane-landing-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-airplane-landing ph-bold ph-lg"></i></template>
 			<template #label>{{ i18n.ts.moveFromLabel }}</template>
 		</FormInput>
 		<FormButton class="button" inline primary @click="save(accountAlias.toString())">
-			<i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}
+			<i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}
 		</FormButton>
 		<div class="description">{{ i18n.ts.moveFromDescription }}</div>
 	</FormSection>
@@ -56,7 +56,7 @@ async function move(account): Promise<void> {
 
 definePageMetadata({
 	title: i18n.ts.security,
-	icon: 'ph-lock-bold ph-lg',
+	icon: 'ph-lock ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/mute-block.vue b/packages/client/src/pages/settings/mute-block.vue
index 1a143a3c3..c081e6bc2 100644
--- a/packages/client/src/pages/settings/mute-block.vue
+++ b/packages/client/src/pages/settings/mute-block.vue
@@ -56,6 +56,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.muteAndBlock,
-	icon: 'ph-prohibit-bold ph-lg',
+	icon: 'ph-prohibit ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/navbar.vue b/packages/client/src/pages/settings/navbar.vue
index 9c41fdb89..bea7609ac 100644
--- a/packages/client/src/pages/settings/navbar.vue
+++ b/packages/client/src/pages/settings/navbar.vue
@@ -13,7 +13,7 @@
 		<!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ i18n.ts._menuDisplay.hide }}</MkRadio>--> <!-- TODO: サイドバーを完全に隠せるようにすると、別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 -->
 	</FormRadios>
 
-	<FormButton danger class="_formBlock" @click="reset()"><i class="ph-arrow-clockwise-bold ph-lg"></i> {{ i18n.ts.default }}</FormButton>
+	<FormButton danger class="_formBlock" @click="reset()"><i class="ph-arrow-clockwise ph-bold ph-lg"></i> {{ i18n.ts.default }}</FormButton>
 </div>
 </template>
 
@@ -82,6 +82,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.navbar,
-	icon: 'ph-list-bullets-bold ph-lg',
+	icon: 'ph-list-bullets ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/notifications.vue b/packages/client/src/pages/settings/notifications.vue
index 2c019d45a..324d93ab9 100644
--- a/packages/client/src/pages/settings/notifications.vue
+++ b/packages/client/src/pages/settings/notifications.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="_formRoot">
-	<FormLink class="_formBlock" @click="configure"><template #icon><i class="ph-gear-six-bold ph-lg"></i></template>{{ i18n.ts.notificationSetting }}</FormLink>
+	<FormLink class="_formBlock" @click="configure"><template #icon><i class="ph-gear-six ph-bold ph-lg"></i></template>{{ i18n.ts.notificationSetting }}</FormLink>
 	<FormSection>
 		<FormLink class="_formBlock" @click="readAllNotifications">{{ i18n.ts.markAsReadAllNotifications }}</FormLink>
 		<FormLink class="_formBlock" @click="readAllUnreadNotes">{{ i18n.ts.markAsReadAllUnreadNotes }}</FormLink>
@@ -55,6 +55,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.notifications,
-	icon: 'ph-bell-bold ph-lg',
+	icon: 'ph-bell ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/other.vue b/packages/client/src/pages/settings/other.vue
index 609b33cd3..1782024f8 100644
--- a/packages/client/src/pages/settings/other.vue
+++ b/packages/client/src/pages/settings/other.vue
@@ -10,9 +10,9 @@
 
 	<FormLink to="/settings/account-info" class="_formBlock">{{ i18n.ts.accountInfo }}</FormLink>
 
-	<FormLink to="/registry" class="_formBlock"><template #icon><i class="ph-gear-six-bold ph-lg"></i></template>{{ i18n.ts.registry }}</FormLink>
+	<FormLink to="/registry" class="_formBlock"><template #icon><i class="ph-gear-six ph-bold ph-lg"></i></template>{{ i18n.ts.registry }}</FormLink>
 
-	<FormLink to="/settings/delete-account" class="_formBlock"><template #icon><i class="ph-warning-bold ph-lg"></i></template>{{ i18n.ts.closeAccount }}</FormLink>
+	<FormLink to="/settings/delete-account" class="_formBlock"><template #icon><i class="ph-warning ph-bold ph-lg"></i></template>{{ i18n.ts.closeAccount }}</FormLink>
 </div>
 </template>
 
@@ -44,6 +44,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.other,
-	icon: 'ph-dots-three-outline-bold ph-lg',
+	icon: 'ph-dots-three-outline ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/plugin.install.vue b/packages/client/src/pages/settings/plugin.install.vue
index 923a6204e..25895c93f 100644
--- a/packages/client/src/pages/settings/plugin.install.vue
+++ b/packages/client/src/pages/settings/plugin.install.vue
@@ -7,7 +7,7 @@
 	</FormTextarea>
 
 	<div class="_formBlock">
-		<FormButton :disabled="code == null" primary inline @click="install"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.install }}</FormButton>
+		<FormButton :disabled="code == null" primary inline @click="install"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.install }}</FormButton>
 	</div>
 </div>
 </template>
@@ -119,6 +119,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts._plugin.install,
-	icon: 'ph-download-simple-bold ph-lg',
+	icon: 'ph-download-simple ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/plugin.vue b/packages/client/src/pages/settings/plugin.vue
index 96c7314ca..7949bff03 100644
--- a/packages/client/src/pages/settings/plugin.vue
+++ b/packages/client/src/pages/settings/plugin.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="_formRoot">
-	<FormLink to="/settings/plugin/install"><template #icon><i class="ph-download-simple-bold ph-lg"></i></template>{{ i18n.ts._plugin.install }}</FormLink>
+	<FormLink to="/settings/plugin/install"><template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>{{ i18n.ts._plugin.install }}</FormLink>
 
 	<FormSection>
 		<template #label>{{ i18n.ts.manage }}</template>
@@ -23,8 +23,8 @@
 			</MkKeyValue>
 
 			<div style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-				<MkButton v-if="plugin.config" inline @click="config(plugin)"><i class="ph-gear-six-bold ph-lg"></i> {{ i18n.ts.settings }}</MkButton>
-				<MkButton inline danger @click="uninstall(plugin)"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.uninstall }}</MkButton>
+				<MkButton v-if="plugin.config" inline @click="config(plugin)"><i class="ph-gear-six ph-bold ph-lg"></i> {{ i18n.ts.settings }}</MkButton>
+				<MkButton inline danger @click="uninstall(plugin)"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.uninstall }}</MkButton>
 			</div>
 		</div>
 	</FormSection>
@@ -89,7 +89,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.plugins,
-	icon: 'ph-plug-bold ph-lg',
+	icon: 'ph-plug ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index 024f4f23b..9340b4440 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -380,25 +380,25 @@ function menu(ev: MouseEvent, profileId: string) {
 
 	return os.popupMenu([{
 		text: ts._preferencesBackups.apply,
-		icon: 'ph-caret-circle-down-bold ph-lg',
+		icon: 'ph-caret-circle-down ph-bold ph-lg',
 		action: () => applyProfile(profileId),
 	}, {
 		type: 'a',
 		text: ts.download,
-		icon: 'ph-download-simple-bold ph-lg',
+		icon: 'ph-download-simple ph-bold ph-lg',
 		href: URL.createObjectURL(new Blob([JSON.stringify(profiles[profileId], null, 2)], { type: 'application/json' })),
 		download: `${profiles[profileId].name}.json`,
 	}, null, {
 		text: ts.rename,
-		icon: 'ph-cursor-text-bold ph-lg',
+		icon: 'ph-cursor-text ph-bold ph-lg',
 		action: () => rename(profileId),
 	}, {
 		text: ts._preferencesBackups.save,
-		icon: 'ph-floppy-disk-bold ph-lg',
+		icon: 'ph-floppy-disk ph-bold ph-lg',
 		action: () => save(profileId),
 	}, null, {
 		text: ts._preferencesBackups.delete,
-		icon: 'ph-trash-bold ph-lg',
+		icon: 'ph-trash ph-bold ph-lg',
 		action: () => deleteProfile(profileId),
 		danger: true,
 	}], ev.currentTarget ?? ev.target);
@@ -420,7 +420,7 @@ onUnmounted(() => {
 
 definePageMetadata(computed(() => ({
 	title: ts.preferencesBackups,
-	icon: 'ph-floppy-disk-bold ph-lg',
+	icon: 'ph-floppy-disk ph-bold ph-lg',
 	bg: 'var(--bg)',
 })));
 </script>
diff --git a/packages/client/src/pages/settings/privacy.vue b/packages/client/src/pages/settings/privacy.vue
index a644b860e..0a8de0b38 100644
--- a/packages/client/src/pages/settings/privacy.vue
+++ b/packages/client/src/pages/settings/privacy.vue
@@ -95,6 +95,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.privacy,
-	icon: 'ph-lock-open-bold ph-lg',
+	icon: 'ph-lock-open ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/profile.vue b/packages/client/src/pages/settings/profile.vue
index e201ed2d8..a2ed6fd41 100644
--- a/packages/client/src/pages/settings/profile.vue
+++ b/packages/client/src/pages/settings/profile.vue
@@ -23,13 +23,13 @@
 
 	<FormInput v-model="profile.location" manual-save class="_formBlock">
 		<template #label>{{ i18n.ts.location }}</template>
-		<template #prefix><i class="ph-map-pin-bold ph-lg"></i></template>
+		<template #prefix><i class="ph-map-pin ph-bold ph-lg"></i></template>
 		<template #caption>{{ i18n.ts._profile.locationDescription }}</template>
 	</FormInput>
 
 	<FormInput v-model="profile.birthday" type="date" manual-save class="_formBlock">
 		<template #label>{{ i18n.ts.birthday }}</template>
-		<template #prefix><i class="ph-cake-bold ph-lg"></i></template>
+		<template #prefix><i class="ph-cake ph-bold ph-lg"></i></template>
 	</FormInput>
 
 	<FormSelect v-model="profile.lang" class="_formBlock">
@@ -39,7 +39,7 @@
 
 	<FormSlot class="_formBlock">
 		<FormFolder>
-			<template #icon><i class="ph-table-bold ph-lg"></i></template>
+			<template #icon><i class="ph-table ph-bold ph-lg"></i></template>
 			<template #label>{{ i18n.ts._profile.metadataEdit }}</template>
 
 			<div class="_formRoot">
@@ -51,8 +51,8 @@
 						<template #label>{{ i18n.ts._profile.metadataContent }} #{{ i + 1 }}</template>
 					</FormInput>
 				</FormSplit>
-				<MkButton :disabled="fields.length >= 16" inline style="margin-right: 8px;" @click="addField"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
-				<MkButton inline primary @click="saveFields"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+				<MkButton :disabled="fields.length >= 16" inline style="margin-right: 8px;" @click="addField"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
+				<MkButton inline primary @click="saveFields"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
 			</div>
 		</FormFolder>
 		<template #caption>{{ i18n.ts._profile.metadataDescription }}</template>
@@ -191,7 +191,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.profile,
-	icon: 'ph-user-bold ph-lg',
+	icon: 'ph-user ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index 30a85a179..ace283fc4 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -10,7 +10,7 @@
 					</button>
 				</template>
 				<template #footer>
-					<button class="_button add" @click="chooseEmoji"><i class="ph-plus-bold ph-lg"></i></button>
+					<button class="_button add" @click="chooseEmoji"><i class="ph-plus ph-bold ph-lg"></i></button>
 				</template>
 			</XDraggable>
 		</div>
@@ -46,8 +46,8 @@
 
 	<FormSection>
 		<div style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-			<FormButton inline @click="preview"><i class="ph-eye-bold ph-lg"></i> {{ i18n.ts.preview }}</FormButton>
-			<FormButton inline danger @click="setDefault"><i class="ph-arrow-counter-clockwise-bold ph-lg"></i> {{ i18n.ts.default }}</FormButton>
+			<FormButton inline @click="preview"><i class="ph-eye ph-bold ph-lg"></i> {{ i18n.ts.preview }}</FormButton>
+			<FormButton inline danger @click="setDefault"><i class="ph-arrow-counter-clockwise ph-bold ph-lg"></i> {{ i18n.ts.default }}</FormButton>
 		</div>
 	</FormSection>
 </div>
@@ -127,9 +127,9 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.reaction,
-	icon: 'ph-smiley-bold ph-lg',
+	icon: 'ph-smiley ph-bold ph-lg',
 	action: {
-		icon: 'ph-eye-bold ph-lg',
+		icon: 'ph-eye ph-bold ph-lg',
 		handler: preview,
 	},
 });
diff --git a/packages/client/src/pages/settings/security.vue b/packages/client/src/pages/settings/security.vue
index a5fbc774e..86632234f 100644
--- a/packages/client/src/pages/settings/security.vue
+++ b/packages/client/src/pages/settings/security.vue
@@ -17,8 +17,8 @@
 				<div>
 					<div v-for="item in items" :key="item.id" v-panel class="timnmucd">
 						<header>
-							<i v-if="item.success" class="ph-check-bold ph-lg icon succ"></i>
-							<i v-else class="ph-circle-wavy-warning-bold ph-lg icon fail"></i>
+							<i v-if="item.success" class="ph-check ph-bold ph-lg icon succ"></i>
+							<i v-else class="ph-circle-wavy-warning ph-bold ph-lg icon fail"></i>
 							<code class="ip _monospace">{{ item.ip }}</code>
 							<MkTime :time="item.createdAt" class="time"/>
 						</header>
@@ -30,7 +30,7 @@
 
 	<FormSection>
 		<FormSlot>
-			<FormButton danger @click="regenerateToken"><i class="ph-arrows-clockwise-bold ph-lg"></i> {{ i18n.ts.regenerateLoginToken }}</FormButton>
+			<FormButton danger @click="regenerateToken"><i class="ph-arrows-clockwise ph-bold ph-lg"></i> {{ i18n.ts.regenerateLoginToken }}</FormButton>
 			<template #caption>{{ i18n.ts.regenerateLoginTokenDescription }}</template>
 		</FormSlot>
 	</FormSection>
@@ -103,7 +103,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.security,
-	icon: 'ph-lock-bold ph-lg',
+	icon: 'ph-lock ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/sounds.vue b/packages/client/src/pages/settings/sounds.vue
index c2297e212..e7f2c8391 100644
--- a/packages/client/src/pages/settings/sounds.vue
+++ b/packages/client/src/pages/settings/sounds.vue
@@ -9,11 +9,11 @@
 		<FormLink v-for="type in Object.keys(sounds)" :key="type" style="margin-bottom: 8px;" @click="edit(type)">
 			{{ i18n.t('_sfx.' + type) }}
 			<template #suffix>{{ sounds[type].type || i18n.ts.none }}</template>
-			<template #suffixIcon><i class="ph-caret-down-bold ph-lg"></i></template>
+			<template #suffixIcon><i class="ph-caret-down ph-bold ph-lg"></i></template>
 		</FormLink>
 	</FormSection>
 
-	<FormButton danger class="_formBlock" @click="reset()"><i class="ph-arrow-clockwise-bold ph-lg"></i> {{ i18n.ts.default }}</FormButton>
+	<FormButton danger class="_formBlock" @click="reset()"><i class="ph-arrow-clockwise ph-bold ph-lg"></i> {{ i18n.ts.default }}</FormButton>
 </div>
 </template>
 
@@ -38,7 +38,7 @@ const masterVolume = computed({
 	},
 });
 
-const volumeIcon = computed(() => masterVolume.value === 0 ? 'ph-speaker-none-bold ph-lg' : 'ph-speaker-high-bold ph-lg');
+const volumeIcon = computed(() => masterVolume.value === 0 ? 'ph-speaker-none-bold ph-lg' : 'ph-speaker-high ph-bold ph-lg');
 
 const sounds = ref({
 	note: ColdDeviceStorage.get('sound_note'),
@@ -106,6 +106,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.sounds,
-	icon: 'ph-speaker-high-bold ph-lg',
+	icon: 'ph-speaker-high ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/statusbar.vue b/packages/client/src/pages/settings/statusbar.vue
index 52ad2abec..dd12576ac 100644
--- a/packages/client/src/pages/settings/statusbar.vue
+++ b/packages/client/src/pages/settings/statusbar.vue
@@ -48,7 +48,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.statusbar,
-	icon: 'ph-list-bullets-bold ph-lg',
+	icon: 'ph-list-bullets ph-bold ph-lg',
 	bg: 'var(--bg)',
 });
 </script>
diff --git a/packages/client/src/pages/settings/theme.install.vue b/packages/client/src/pages/settings/theme.install.vue
index d3b94690d..03dcd24c1 100644
--- a/packages/client/src/pages/settings/theme.install.vue
+++ b/packages/client/src/pages/settings/theme.install.vue
@@ -5,8 +5,8 @@
 	</FormTextarea>
 
 	<div class="_formBlock" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-		<FormButton :disabled="installThemeCode == null" inline @click="() => preview(installThemeCode)"><i class="ph-eye-bold ph-lg"></i> {{ i18n.ts.preview }}</FormButton>
-		<FormButton :disabled="installThemeCode == null" primary inline @click="() => install(installThemeCode)"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.install }}</FormButton>
+		<FormButton :disabled="installThemeCode == null" inline @click="() => preview(installThemeCode)"><i class="ph-eye ph-bold ph-lg"></i> {{ i18n.ts.preview }}</FormButton>
+		<FormButton :disabled="installThemeCode == null" primary inline @click="() => install(installThemeCode)"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.install }}</FormButton>
 	</div>
 </div>
 </template>
@@ -75,6 +75,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts._theme.install,
-	icon: 'ph-download-simple-bold ph-lg',
+	icon: 'ph-download-simple ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/theme.manage.vue b/packages/client/src/pages/settings/theme.manage.vue
index 02eea112b..b0742b279 100644
--- a/packages/client/src/pages/settings/theme.manage.vue
+++ b/packages/client/src/pages/settings/theme.manage.vue
@@ -20,7 +20,7 @@
 			<template #label>{{ i18n.ts._theme.code }}</template>
 			<template #caption><button class="_textButton" @click="copyThemeCode()">{{ i18n.ts.copy }}</button></template>
 		</FormTextarea>
-		<FormButton v-if="!builtinThemes.some(t => t.id == selectedTheme.id)" class="_formBlock" danger @click="uninstall()"><i class="ph-trash-bold ph-lg"></i> {{ i18n.ts.uninstall }}</FormButton>
+		<FormButton v-if="!builtinThemes.some(t => t.id == selectedTheme.id)" class="_formBlock" danger @click="uninstall()"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.uninstall }}</FormButton>
 	</template>
 </div>
 </template>
@@ -73,6 +73,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts._theme.manage,
-	icon: 'ph-folder-notch-open-bold ph-lg',
+	icon: 'ph-folder-notch-open ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/theme.vue b/packages/client/src/pages/settings/theme.vue
index 4cb43be54..15c65bd10 100644
--- a/packages/client/src/pages/settings/theme.vue
+++ b/packages/client/src/pages/settings/theme.vue
@@ -29,7 +29,7 @@
 	<div class="selects _formBlock">
 		<FormSelect v-model="lightThemeId" large class="select">
 			<template #label>{{ i18n.ts.themeForLightMode }}</template>
-			<template #prefix><i class="ph-sun-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-sun ph-bold ph-lg"></i></template>
 			<option v-if="instanceLightTheme" :key="'instance:' + instanceLightTheme.id" :value="instanceLightTheme.id">{{ instanceLightTheme.name }}</option>
 			<optgroup v-if="installedLightThemes.length > 0" :label="i18n.ts._theme.installedThemes">
 				<option v-for="x in installedLightThemes" :key="'installed:' + x.id" :value="x.id">{{ x.name }}</option>
@@ -40,7 +40,7 @@
 		</FormSelect>
 		<FormSelect v-model="darkThemeId" large class="select">
 			<template #label>{{ i18n.ts.themeForDarkMode }}</template>
-			<template #prefix><i class="ph-moon-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-moon ph-bold ph-lg"></i></template>
 			<option v-if="instanceDarkTheme" :key="'instance:' + instanceDarkTheme.id" :value="instanceDarkTheme.id">{{ instanceDarkTheme.name }}</option>
 			<optgroup v-if="installedDarkThemes.length > 0" :label="i18n.ts._theme.installedThemes">
 				<option v-for="x in installedDarkThemes" :key="'installed:' + x.id" :value="x.id">{{ x.name }}</option>
@@ -53,10 +53,10 @@
 
 	<FormSection>
 		<div class="_formLinksGrid">
-			<FormLink to="/settings/theme/manage"><template #icon><i class="ph-folder-notch-open-bold ph-lg"></i></template>{{ i18n.ts._theme.manage }}<template #suffix>{{ themesCount }}</template></FormLink>
-			<FormLink to="https://assets.misskey.io/theme/list" external><template #icon><i class="ph-planet-bold ph-lg"></i></template>{{ i18n.ts._theme.explore }}</FormLink>
-			<FormLink to="/settings/theme/install"><template #icon><i class="ph-download-simple-bold ph-lg"></i></template>{{ i18n.ts._theme.install }}</FormLink>
-			<FormLink to="/theme-editor"><template #icon><i class="ph-paint-brush-broad-bold ph-lg"></i></template>{{ i18n.ts._theme.make }}</FormLink>
+			<FormLink to="/settings/theme/manage"><template #icon><i class="ph-folder-notch-open ph-bold ph-lg"></i></template>{{ i18n.ts._theme.manage }}<template #suffix>{{ themesCount }}</template></FormLink>
+			<FormLink to="https://assets.misskey.io/theme/list" external><template #icon><i class="ph-planet ph-bold ph-lg"></i></template>{{ i18n.ts._theme.explore }}</FormLink>
+			<FormLink to="/settings/theme/install"><template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>{{ i18n.ts._theme.install }}</FormLink>
+			<FormLink to="/theme-editor"><template #icon><i class="ph-paint-brush-broad ph-bold ph-lg"></i></template>{{ i18n.ts._theme.make }}</FormLink>
 		</div>
 	</FormSection>
 
@@ -160,7 +160,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.theme,
-	icon: 'ph-palette-bold ph-lg',
+	icon: 'ph-palette ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/webhook.edit.vue b/packages/client/src/pages/settings/webhook.edit.vue
index d99de887d..7c4cc3460 100644
--- a/packages/client/src/pages/settings/webhook.edit.vue
+++ b/packages/client/src/pages/settings/webhook.edit.vue
@@ -9,7 +9,7 @@
 	</FormInput>
 
 	<FormInput v-model="secret" class="_formBlock">
-		<template #prefix><i class="ph-lock-bold ph-lg"></i></template>
+		<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
 		<template #label>Secret</template>
 	</FormInput>
 
@@ -28,7 +28,7 @@
 	<FormSwitch v-model="active" class="_formBlock">Active</FormSwitch>
 
 	<div class="_formBlock" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-		<FormButton primary inline @click="save"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
+		<FormButton primary inline @click="save"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
 	</div>
 </div>
 </template>
@@ -89,6 +89,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: 'Edit webhook',
-	icon: 'ph-lightning-bold ph-lg',
+	icon: 'ph-lightning ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/webhook.new.vue b/packages/client/src/pages/settings/webhook.new.vue
index c0ebd993d..ab16ccecd 100644
--- a/packages/client/src/pages/settings/webhook.new.vue
+++ b/packages/client/src/pages/settings/webhook.new.vue
@@ -9,7 +9,7 @@
 	</FormInput>
 
 	<FormInput v-model="secret" class="_formBlock">
-		<template #prefix><i class="ph-lock-bold ph-lg"></i></template>
+		<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
 		<template #label>Secret</template>
 	</FormInput>
 
@@ -26,7 +26,7 @@
 	</FormSection>
 
 	<div class="_formBlock" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-		<FormButton primary inline @click="create"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.create }}</FormButton>
+		<FormButton primary inline @click="create"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.create }}</FormButton>
 	</div>
 </div>
 </template>
@@ -77,6 +77,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: 'Create new webhook',
-	icon: 'ph-lightning-bold ph-lg',
+	icon: 'ph-lightning ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/webhook.vue b/packages/client/src/pages/settings/webhook.vue
index e0ad346dd..ae42f3e30 100644
--- a/packages/client/src/pages/settings/webhook.vue
+++ b/packages/client/src/pages/settings/webhook.vue
@@ -11,10 +11,10 @@
 			<template #default="{items}">
 				<FormLink v-for="webhook in items" :key="webhook.id" :to="`/settings/webhook/edit/${webhook.id}`" class="_formBlock">
 					<template #icon>
-						<i v-if="webhook.active === false" class="ph-pause-circle-bold ph-lg"></i>
+						<i v-if="webhook.active === false" class="ph-pause-circle ph-bold ph-lg"></i>
 						<i v-else-if="webhook.latestStatus === null" class="ph-circle-fill"></i>
-						<i v-else-if="[200, 201, 204].includes(webhook.latestStatus)" class="ph-check-bold ph-lg" :style="{ color: 'var(--success)' }"></i>
-						<i v-else class="ph-warning-bold ph-lg" :style="{ color: 'var(--error)' }"></i>
+						<i v-else-if="[200, 201, 204].includes(webhook.latestStatus)" class="ph-check ph-bold ph-lg" :style="{ color: 'var(--success)' }"></i>
+						<i v-else class="ph-warning ph-bold ph-lg" :style="{ color: 'var(--error)' }"></i>
 					</template>
 					{{ webhook.name || webhook.url }}
 					<template #suffix>
@@ -48,6 +48,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: 'Webhook',
-	icon: 'ph-lightning-bold ph-lg',
+	icon: 'ph-lightning ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/settings/word-mute.vue b/packages/client/src/pages/settings/word-mute.vue
index 81738a265..744ab0395 100644
--- a/packages/client/src/pages/settings/word-mute.vue
+++ b/packages/client/src/pages/settings/word-mute.vue
@@ -24,7 +24,7 @@
 			</MkKeyValue>
 		</div>
 	</div>
-	<MkButton primary inline :disabled="!changed" @click="save()"><i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+	<MkButton primary inline :disabled="!changed" @click="save()"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
 </div>
 </template>
 
@@ -123,6 +123,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.wordMute,
-	icon: 'ph-speaker-x-bold ph-lg',
+	icon: 'ph-speaker-x ph-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/share.vue b/packages/client/src/pages/share.vue
index 07cdd607d..c073c2690 100644
--- a/packages/client/src/pages/share.vue
+++ b/packages/client/src/pages/share.vue
@@ -158,7 +158,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.share,
-	icon: 'ph-share-network-bold ph-lg',
+	icon: 'ph-share-network ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/signup-complete.vue b/packages/client/src/pages/signup-complete.vue
index 00411dbe1..7c11d4c81 100644
--- a/packages/client/src/pages/signup-complete.vue
+++ b/packages/client/src/pages/signup-complete.vue
@@ -32,7 +32,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.signup,
-	icon: 'ph-user-bold ph-lg',
+	icon: 'ph-user ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue
index 1713490a3..7570deb41 100644
--- a/packages/client/src/pages/tag.vue
+++ b/packages/client/src/pages/tag.vue
@@ -30,6 +30,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => ({
 	title: props.tag,
-	icon: 'ph-hash-bold ph-lg',
+	icon: 'ph-hash ph-bold ph-lg',
 })));
 </script>
diff --git a/packages/client/src/pages/theme-editor.vue b/packages/client/src/pages/theme-editor.vue
index 4ebc7aa99..7643da986 100644
--- a/packages/client/src/pages/theme-editor.vue
+++ b/packages/client/src/pages/theme-editor.vue
@@ -42,7 +42,7 @@
 			</FormFolder>
 
 			<FormFolder :default-open="false" class="_formBlock">
-				<template #icon><i class="ph-code-bold ph-lg"></i></template>
+				<template #icon><i class="ph-code ph-bold ph-lg"></i></template>
 				<template #label>{{ i18n.ts.editCode }}</template>
 
 				<div class="_formRoot">
@@ -210,12 +210,12 @@ watch($$(theme), apply, { deep: true });
 
 const headerActions = $computed(() => [{
 	asFullButton: true,
-	icon: 'ph-eye-bold ph-lg',
+	icon: 'ph-eye ph-bold ph-lg',
 	text: i18n.ts.preview,
 	handler: showPreview,
 }, {
 	asFullButton: true,
-	icon: 'ph-check-bold ph-lg',
+	icon: 'ph-check ph-bold ph-lg',
 	text: i18n.ts.saveAs,
 	handler: saveAs,
 }]);
@@ -224,7 +224,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.themeEditor,
-	icon: 'ph-palette-bold ph-lg',
+	icon: 'ph-palette ph-bold ph-lg',
 });
 </script>
 
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 9357050c7..a3d272e4d 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -147,7 +147,7 @@ async function chooseList(ev: MouseEvent): Promise<void> {
 	const items = [{
 		type: 'link' as const,
 		text: i18n.ts.manageLists,
-		icon: 'ph-faders-horizontal-bold ph-lg',
+		icon: 'ph-faders-horizontal ph-bold ph-lg',
 		to: '/my/lists',
 	}].concat(lists.map((list) => ({
 		type: 'link' as const,
@@ -164,7 +164,7 @@ async function chooseAntenna(ev: MouseEvent): Promise<void> {
 		type: 'link' as const,
 		indicate: false,
 		text: i18n.ts.manageAntennas,
-		icon: 'ph-faders-horizontal-bold ph-lg',
+		icon: 'ph-faders-horizontal ph-bold ph-lg',
 		to: '/my/antennas',
 	}].concat(antennas.map((antenna) => ({
 		type: 'link' as const,
@@ -200,20 +200,20 @@ function focus(): void {
 
 const headerActions = $computed(() => [
 	{
-		icon: 'ph-list-bullets-bold ph-lg',
+		icon: 'ph-list-bullets ph-bold ph-lg',
 		title: i18n.ts.lists,
 		text: i18n.ts.lists,
 		iconOnly: true,
 		handler: chooseList,
 	},
 	{
-		icon: 'ph-flying-saucer-bold ph-lg',
+		icon: 'ph-flying-saucer ph-bold ph-lg',
 		title: i18n.ts.antennas,
 		text: i18n.ts.antennas,
 		iconOnly: true,
 		handler: chooseAntenna,
 	} /* **TODO: fix timetravel** {
-	icon: 'ph-calendar-blank-bold ph-lg',
+	icon: 'ph-calendar-blank ph-bold ph-lg',
 	title: i18n.ts.jumpToSpecifiedDate,
 	iconOnly: true,
 	handler: timetravel,
@@ -224,7 +224,7 @@ const headerTabs = $computed(() => [
 	{
 		key: 'home',
 		title: i18n.ts._timelines.home,
-		icon: 'ph-house-bold ph-lg',
+		icon: 'ph-house ph-bold ph-lg',
 		iconOnly: true,
 	},
 	...(isLocalTimelineAvailable
@@ -232,7 +232,7 @@ const headerTabs = $computed(() => [
 			{
 				key: 'local',
 				title: i18n.ts._timelines.local,
-				icon: 'ph-users-bold ph-lg',
+				icon: 'ph-users ph-bold ph-lg',
 				iconOnly: true,
 			},
 		]
@@ -242,7 +242,7 @@ const headerTabs = $computed(() => [
 			{
 				key: 'recommended',
 				title: i18n.ts._timelines.recommended,
-				icon: 'ph-thumbs-up-bold ph-lg',
+				icon: 'ph-thumbs-up ph-bold ph-lg',
 				iconOnly: true,
 			},
 		]
@@ -252,7 +252,7 @@ const headerTabs = $computed(() => [
 			{
 				key: 'social',
 				title: i18n.ts._timelines.social,
-				icon: 'ph-handshake-bold ph-lg',
+				icon: 'ph-handshake ph-bold ph-lg',
 				iconOnly: true,
 			},
 		]
@@ -262,7 +262,7 @@ const headerTabs = $computed(() => [
 			{
 				key: 'global',
 				title: i18n.ts._timelines.global,
-				icon: 'ph-planet-bold ph-lg',
+				icon: 'ph-planet ph-bold ph-lg',
 				iconOnly: true,
 			},
 		]
@@ -274,14 +274,14 @@ definePageMetadata(
 		title: i18n.ts.timeline,
 		icon:
 			src === 'local'
-				? 'ph-users-bold ph-lg'
+				? 'ph-users ph-bold ph-lg'
 				: src === 'social'
-					? 'ph-handshake-bold ph-lg'
+					? 'ph-handshake ph-bold ph-lg'
 					: src === 'recommended'
-						? 'ph-thumbs-up-bold ph-lg'
+						? 'ph-thumbs-up ph-bold ph-lg'
 						: src === 'global'
-							? 'ph-planet-bold ph-lg'
-							: 'ph-house-bold ph-lg',
+							? 'ph-planet ph-bold ph-lg'
+							: 'ph-house ph-bold ph-lg',
 	})),
 );
 
diff --git a/packages/client/src/pages/user-info.vue b/packages/client/src/pages/user-info.vue
index 6863ae1f9..f2fcd6665 100644
--- a/packages/client/src/pages/user-info.vue
+++ b/packages/client/src/pages/user-info.vue
@@ -58,7 +58,7 @@
 					<div class="_formBlock">
 						<MkKeyValue v-if="user.host" oneline style="margin: 1em 0;">
 							<template #key>{{ i18n.ts.instanceInfo }}</template>
-							<template #value><MkA :to="`/instance-info/${user.host}`" class="_link">{{ user.host }} <i class="ph-caret-right-bold ph-lg"></i></MkA></template>
+							<template #value><MkA :to="`/instance-info/${user.host}`" class="_link">{{ user.host }} <i class="ph-caret-right ph-bold ph-lg"></i></MkA></template>
 						</MkKeyValue>
 						<MkKeyValue v-else oneline style="margin: 1em 0;">
 							<template #key>{{ i18n.ts.instanceInfo }}</template>
@@ -74,7 +74,7 @@
 						</MkKeyValue>
 					</div>
 
-					<FormButton v-if="user.host != null" class="_formBlock" @click="updateRemoteUser"><i class="ph-arrows-clockwise-bold ph-lg"></i> {{ i18n.ts.updateRemoteUser }}</FormButton>
+					<FormButton v-if="user.host != null" class="_formBlock" @click="updateRemoteUser"><i class="ph-arrows-clockwise ph-bold ph-lg"></i> {{ i18n.ts.updateRemoteUser }}</FormButton>
 
 					<FormFolder class="_formBlock">
 						<template #label>Raw</template>
@@ -90,7 +90,7 @@
 				<FormSwitch v-model="suspended" class="_formBlock" @update:modelValue="toggleSuspend">{{ i18n.ts.suspend }}</FormSwitch>
 				{{ i18n.ts.reflectMayTakeTime }}
 				<div class="_formBlock">
-					<FormButton v-if="user.host == null && iAmModerator" inline style="margin-right: 8px;" @click="resetPassword"><i class="ph-key-bold ph-lg"></i> {{ i18n.ts.resetPassword }}</FormButton>
+					<FormButton v-if="user.host == null && iAmModerator" inline style="margin-right: 8px;" @click="resetPassword"><i class="ph-key ph-bold ph-lg"></i> {{ i18n.ts.resetPassword }}</FormButton>
 					<FormButton v-if="$i.isAdmin" inline danger @click="deleteAccount">{{ i18n.ts.deleteAccount }}</FormButton>
 				</div>
 				<FormTextarea v-model="moderationNote" manual-save class="_formBlock">
@@ -364,24 +364,24 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => [{
 	key: 'overview',
 	title: i18n.ts.overview,
-	icon: 'ph-info-bold ph-lg',
+	icon: 'ph-info ph-bold ph-lg',
 }, iAmModerator ? {
 	key: 'moderation',
 	title: i18n.ts.moderation,
-	icon: 'ph-shield-bold ph-lg',
+	icon: 'ph-shield ph-bold ph-lg',
 } : null, {
 	key: 'chart',
 	title: i18n.ts.charts,
-	icon: 'ph-chart-bar-bold ph-lg',
+	icon: 'ph-chart-bar ph-bold ph-lg',
 }, {
 	key: 'raw',
 	title: 'Raw',
-	icon: 'ph-code-bold ph-lg',
+	icon: 'ph-code ph-bold ph-lg',
 }].filter(x => x != null));
 
 definePageMetadata(computed(() => ({
 	title: user ? acct(user) : i18n.ts.userInfo,
-	icon: 'ph-info-bold ph-lg',
+	icon: 'ph-info ph-bold ph-lg',
 })));
 </script>
 
diff --git a/packages/client/src/pages/user-list-timeline.vue b/packages/client/src/pages/user-list-timeline.vue
index 066eb4d3b..42c8960b4 100644
--- a/packages/client/src/pages/user-list-timeline.vue
+++ b/packages/client/src/pages/user-list-timeline.vue
@@ -65,11 +65,11 @@ async function timetravel() {
 }
 
 const headerActions = $computed(() => list ? [{
-	icon: 'ph-calendar-blank-bold ph-lg',
+	icon: 'ph-calendar-blank ph-bold ph-lg',
 	text: i18n.ts.jumpToSpecifiedDate,
 	handler: timetravel,
 }, {
-	icon: 'ph-gear-six-bold ph-lg',
+	icon: 'ph-gear-six ph-bold ph-lg',
 	text: i18n.ts.settings,
 	handler: settings,
 }] : []);
@@ -78,7 +78,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => list ? {
 	title: list.name,
-	icon: 'ph-list-bullets-bold ph-lg',
+	icon: 'ph-list-bullets ph-bold ph-lg',
 } : null));
 </script>
 
diff --git a/packages/client/src/pages/user/followers.vue b/packages/client/src/pages/user/followers.vue
index 43af31ccb..5fbf38985 100644
--- a/packages/client/src/pages/user/followers.vue
+++ b/packages/client/src/pages/user/followers.vue
@@ -49,7 +49,7 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => user ? {
-	icon: 'ph-user-bold ph-lg',
+	icon: 'ph-user ph-bold ph-lg',
 	title: user.name ? `${user.name} (@${user.username})` : `@${user.username}`,
 	subtitle: i18n.ts.followers,
 	userName: user,
diff --git a/packages/client/src/pages/user/following.vue b/packages/client/src/pages/user/following.vue
index 27bf69b04..c970668f4 100644
--- a/packages/client/src/pages/user/following.vue
+++ b/packages/client/src/pages/user/following.vue
@@ -49,7 +49,7 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => []);
 
 definePageMetadata(computed(() => user ? {
-	icon: 'ph-user-bold ph-lg',
+	icon: 'ph-user ph-bold ph-lg',
 	title: user.name ? `${user.name} (@${user.username})` : `@${user.username}`,
 	subtitle: i18n.ts.following,
 	userName: user,
diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 506c7002b..b24b7cf22 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -3,8 +3,8 @@
 	<div ref="rootEl" v-size="{ max: [500] }" class="ftskorzw" :class="{ wide: !narrow }">
 		<div class="main">
 			<!-- TODO -->
-			<!-- <div class="punished" v-if="user.isSuspended"><i class="ph-warning-bold ph-lg" style="margin-right: 8px;"></i> {{ i18n.ts.userSuspended }}</div> -->
-			<!-- <div class="punished" v-if="user.isSilenced"><i class="ph-warning-bold ph-lg" style="margin-right: 8px;"></i> {{ i18n.ts.userSilenced }}</div> -->
+			<!-- <div class="punished" v-if="user.isSuspended"><i class="ph-warning ph-bold ph-lg" style="margin-right: 8px;"></i> {{ i18n.ts.userSuspended }}</div> -->
+			<!-- <div class="punished" v-if="user.isSilenced"><i class="ph-warning ph-bold ph-lg" style="margin-right: 8px;"></i> {{ i18n.ts.userSilenced }}</div> -->
 
 			<div class="profile">
 				<MkMoved v-if="user.movedToUri" :host="user.movedToUri.host" :acct="user.movedToUri.username"/>
@@ -22,9 +22,9 @@
 							<div class="bottom">
 								<span class="username"><MkAcct :user="user" :detail="true"/></span>
 								<span v-if="user.isAdmin" :title="i18n.ts.isAdmin" style="color: var(--badge);"><i class="ph-bookmark-simple-fill ph-lg"></i></span>
-								<span v-if="!user.isAdmin && user.isModerator" :title="i18n.ts.isModerator" style="color: var(--badge);"><i class="ph-bookmark-simple-bold"></i></span>
-								<span v-if="user.isLocked" :title="i18n.ts.isLocked"><i class="ph-lock-bold ph-lg"></i></span>
-								<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ph-robot-bold ph-lg"></i></span>
+								<span v-if="!user.isAdmin && user.isModerator" :title="i18n.ts.isModerator" style="color: var(--badge);"><i class="ph-bookmark-simple ph-bold"></i></span>
+								<span v-if="user.isLocked" :title="i18n.ts.isLocked"><i class="ph-lock ph-bold ph-lg"></i></span>
+								<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ph-robot ph-bold ph-lg"></i></span>
 							</div>
 						</div>
 					</div>
@@ -37,15 +37,15 @@
 						<div class="bottom">
 							<span class="username"><MkAcct :user="user" :detail="true"/></span>
 							<span v-if="user.isAdmin" :title="i18n.ts.isAdmin" style="color: var(--badge);"><i class="ph-bookmark-simple-fill ph-lg"></i></span>
-							<span v-if="!user.isAdmin && user.isModerator" :title="i18n.ts.isModerator" style="color: var(--badge);"><i class="ph-bookmark-simple-bold"></i></span>
-							<span v-if="user.isLocked" :title="i18n.ts.isLocked"><i class="ph-lock-bold ph-lg"></i></span>
-							<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ph-robot-bold ph-lg"></i></span>
+							<span v-if="!user.isAdmin && user.isModerator" :title="i18n.ts.isModerator" style="color: var(--badge);"><i class="ph-bookmark-simple ph-bold"></i></span>
+							<span v-if="user.isLocked" :title="i18n.ts.isLocked"><i class="ph-lock ph-bold ph-lg"></i></span>
+							<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ph-robot ph-bold ph-lg"></i></span>
 						</div>
 					</div>
 					<div class="follow-container">
 						<div class="actions">
 							<MkFollowButton v-if="$i != null && $i.id != user.id" :user="user" @refresh="emit('refresh')" :inline="true" :transparent="false" :full="!narrow" class="koudoku"/>
-							<button class="menu _button" @click="menu"><i class="ph-dots-three-outline-bold ph-lg"></i></button>
+							<button class="menu _button" @click="menu"><i class="ph-dots-three-outline ph-bold ph-lg"></i></button>
 							<!-- <MkFollowButton v-else-if="$i == null" :user="user" :remote="true" :inline="true" :transparent="false" :full="true" class="koudoku"/> -->
 						</div>
 					</div>
@@ -55,15 +55,15 @@
 					</div>
 					<div class="fields system">
 						<dl v-if="user.location" class="field">
-							<dt class="name"><i class="ph-map-pin-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.location }}</dt>
+							<dt class="name"><i class="ph-map-pin ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.location }}</dt>
 							<dd class="value">{{ user.location }}{{ timeForThem }}</dd>
 						</dl>
 						<dl v-if="user.birthday" class="field">
-							<dt class="name"><i class="ph-cake-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.birthday }}</dt>
+							<dt class="name"><i class="ph-cake ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.birthday }}</dt>
 							<dd class="value">{{ user.birthday.replace('-', '/').replace('-', '/') }} ({{ i18n.t('yearsOld', { age }) }})</dd>
 						</dl>
 						<dl class="field">
-							<dt class="name"><i class="ph-calendar-blank-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.registeredDate }}</dt>
+							<dt class="name"><i class="ph-calendar-blank ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.registeredDate }}</dt>
 							<dd class="value">{{ new Date(user.createdAt).toLocaleString() }} (<MkTime :time="user.createdAt"/>)</dd>
 						</dl>
 					</div>
diff --git a/packages/client/src/pages/user/index.activity.vue b/packages/client/src/pages/user/index.activity.vue
index dc78c4a73..b51ab60ad 100644
--- a/packages/client/src/pages/user/index.activity.vue
+++ b/packages/client/src/pages/user/index.activity.vue
@@ -1,9 +1,9 @@
 <template>
 <MkContainer>
-	<template #header><i class="ph-chart-bar-bold ph-lg" style="margin-right: 0.5em;"></i>{{ i18n.ts.activity }}</template>
+	<template #header><i class="ph-chart-bar ph-bold ph-lg" style="margin-right: 0.5em;"></i>{{ i18n.ts.activity }}</template>
 	<template #func>
 		<button class="_button" @click="showMenu">
-			<i class="ph-dots-three-outline-bold ph-lg"></i>
+			<i class="ph-dots-three-outline ph-bold ph-lg"></i>
 		</button>
 	</template>
 
diff --git a/packages/client/src/pages/user/index.photos.vue b/packages/client/src/pages/user/index.photos.vue
index 255b2b81b..5418d1f9d 100644
--- a/packages/client/src/pages/user/index.photos.vue
+++ b/packages/client/src/pages/user/index.photos.vue
@@ -1,6 +1,6 @@
 <template>
 <MkContainer id="photos-container" :max-height="300" :foldable="true">
-	<template #header><i class="ph-image-bold ph-lg" style="margin-right: 0.5em;"></i>{{ i18n.ts.images }}</template>
+	<template #header><i class="ph-image ph-bold ph-lg" style="margin-right: 0.5em;"></i>{{ i18n.ts.images }}</template>
 	<div class="ujigsodd">
 		<MkLoading v-if="fetching"/>
 		<div v-if="!fetching && images.length > 0" class="stream">
diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue
index d387a13b0..2e0efffb4 100644
--- a/packages/client/src/pages/user/index.vue
+++ b/packages/client/src/pages/user/index.vue
@@ -83,26 +83,26 @@ const headerTabs = $computed(() =>
 			{
 				key: 'home',
 				title: i18n.ts.overview,
-				icon: 'ph-user-bold ph-lg',
+				icon: 'ph-user ph-bold ph-lg',
 			},
 			...(($i && $i.id === user.id) || user.publicReactions
 				? [{
 					key: 'reactions',
 					title: i18n.ts.reaction,
-					icon: 'ph-smiley-bold ph-lg',
+					icon: 'ph-smiley ph-bold ph-lg',
 				}] : []),
 			...(user.instance == null ? [{
 				key: 'clips',
 				title: i18n.ts.clips,
-				icon: 'ph-paperclip-bold ph-lg',
+				icon: 'ph-paperclip ph-bold ph-lg',
 			}, {
 				key: 'pages',
 				title: i18n.ts.pages,
-				icon: 'ph-file-text-bold ph-lg',
+				icon: 'ph-file-text ph-bold ph-lg',
 			}, {
 				key: 'gallery',
 				title: i18n.ts.gallery,
-				icon: 'ph-image-square-bold ph-lg',
+				icon: 'ph-image-square ph-bold ph-lg',
 			}] : []),
 		]
 		: null,
@@ -112,7 +112,7 @@ definePageMetadata(
 	computed(() =>
 		user
 			? {
-				icon: 'ph-user-bold ph-lg',
+				icon: 'ph-user ph-bold ph-lg',
 				title: user.name
 					? `${user.name} (@${user.username})`
 					: `@${user.username}`,
diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue
index 4608ecb38..cdbdeb8fb 100644
--- a/packages/client/src/pages/welcome.entrance.a.vue
+++ b/packages/client/src/pages/welcome.entrance.a.vue
@@ -21,7 +21,7 @@
 		</div>
 		<div class="main">
 			<img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" alt="" class="icon"/>
-			<button class="_button _acrylic menu" @click="showMenu"><i class="ph-dots-three-outline-bold ph-lg"></i></button>
+			<button class="_button _acrylic menu" @click="showMenu"><i class="ph-dots-three-outline ph-bold ph-lg"></i></button>
 			<div class="fg">
 				<h1>
 					<img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl">
@@ -111,13 +111,13 @@ function signup() {
 function showMenu(ev) {
 	os.popupMenu([{
 		text: i18n.ts.instanceInfo,
-		icon: 'ph-info-bold ph-lg',
+		icon: 'ph-info ph-bold ph-lg',
 		action: () => {
 			os.pageWindow('/about');
 		},
 	}, {
 		text: i18n.ts.aboutMisskey,
-		icon: 'ph-info-bold ph-lg',
+		icon: 'ph-info ph-bold ph-lg',
 		action: () => {
 			os.pageWindow('/about-calckey');
 		},
diff --git a/packages/client/src/pages/welcome.entrance.b.vue b/packages/client/src/pages/welcome.entrance.b.vue
index 317fc1ad6..9dc9e14fc 100644
--- a/packages/client/src/pages/welcome.entrance.b.vue
+++ b/packages/client/src/pages/welcome.entrance.b.vue
@@ -105,19 +105,19 @@ export default defineComponent({
 		showMenu(ev) {
 			os.popupMenu([{
 				text: i18n.t('aboutX', { x: instanceName }),
-				icon: 'ph-info-bold ph-lg',
+				icon: 'ph-info ph-bold ph-lg',
 				action: () => {
 					os.pageWindow('/about');
 				}
 			}, {
 				text: i18n.ts.aboutMisskey,
-				icon: 'ph-info-bold ph-lg',
+				icon: 'ph-info ph-bold ph-lg',
 				action: () => {
 					os.pageWindow('/about-calckey');
 				}
 			}, null, {
 				text: i18n.ts.help,
-				icon: 'ph-question-bold ph-lg',
+				icon: 'ph-question ph-bold ph-lg',
 				action: () => {
 					window.open(`https://misskey-hub.net/help.md`, '_blank');
 				}
diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue
index afa8a7307..635bd9e55 100644
--- a/packages/client/src/pages/welcome.entrance.c.vue
+++ b/packages/client/src/pages/welcome.entrance.c.vue
@@ -40,7 +40,7 @@
 							<template #n><b>{{ onlineUsersCount }}</b></template>
 						</I18n>
 					</div>
-					<button class="_button _acrylic menu" @click="showMenu"><i class="ph-dots-three-outline-bold ph-lg"></i></button>
+					<button class="_button _acrylic menu" @click="showMenu"><i class="ph-dots-three-outline ph-bold ph-lg"></i></button>
 				</div>
 			</div>
 			<nav class="nav">
@@ -125,13 +125,13 @@ export default defineComponent({
 		showMenu(ev) {
 			os.popupMenu([{
 				text: i18n.t('aboutX', { x: instanceName }),
-				icon: 'ph-info-bold ph-lg',
+				icon: 'ph-info ph-bold ph-lg',
 				action: () => {
 					os.pageWindow('/about');
 				},
 			}, {
 				text: i18n.ts.aboutMisskey,
-				icon: 'ph-info-bold ph-lg',
+				icon: 'ph-info ph-bold ph-lg',
 				action: () => {
 					os.pageWindow('/about-calckey');
 				},
diff --git a/packages/client/src/pages/welcome.setup.vue b/packages/client/src/pages/welcome.setup.vue
index f01d17263..bc89a0860 100644
--- a/packages/client/src/pages/welcome.setup.vue
+++ b/packages/client/src/pages/welcome.setup.vue
@@ -10,7 +10,7 @@
 		</MkInput>
 		<MkInput v-model="password" type="password" data-cy-admin-password class="_formBlock">
 			<template #label>{{ i18n.ts.password }}</template>
-			<template #prefix><i class="ph-lock-bold ph-lg"></i></template>
+			<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
 		</MkInput>
 		<div class="bottom _formBlock">
 			<MkButton gradate type="submit" :disabled="submitting" data-cy-admin-ok>
diff --git a/packages/client/src/pages/welcome.timeline.vue b/packages/client/src/pages/welcome.timeline.vue
index 2ec9db08d..220a8edde 100644
--- a/packages/client/src/pages/welcome.timeline.vue
+++ b/packages/client/src/pages/welcome.timeline.vue
@@ -4,7 +4,7 @@
 		<div v-for="note in notes" class="note">
 			<div class="content _panel">
 				<div class="body">
-					<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left-bold ph-lg"></i></MkA>
+					<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left ph-bold ph-lg"></i></MkA>
 					<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 					<!-- <MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA> -->
 				</div>
diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts
index eb8006c1c..0c8d517e5 100644
--- a/packages/client/src/scripts/get-note-menu.ts
+++ b/packages/client/src/scripts/get-note-menu.ts
@@ -122,7 +122,7 @@ export function getNoteMenu(props: {
 		os.popupMenu(
 			[
 				{
-					icon: "ph-plus-bold ph-lg",
+					icon: "ph-plus ph-bold ph-lg",
 					text: i18n.ts.createNew,
 					action: async () => {
 						const { canceled, result } = await os.form(i18n.ts.createNewClip, {
@@ -257,7 +257,7 @@ export function getNoteMenu(props: {
 			...(props.currentClipPage?.value.userId === $i.id
 				? [
 						{
-							icon: "ph-minus-circle-bold ph-lg",
+							icon: "ph-minus-circle ph-bold ph-lg",
 							text: i18n.ts.unclip,
 							danger: true,
 							action: unclip,
@@ -266,23 +266,23 @@ export function getNoteMenu(props: {
 				  ]
 				: []),
 			{
-				icon: "ph-smiley-bold ph-lg",
+				icon: "ph-smiley ph-bold ph-lg",
 				text: i18n.ts.reaction,
 				action: showReactions,
 			},
 			{
-				icon: "ph-clipboard-text-bold ph-lg",
+				icon: "ph-clipboard-text ph-bold ph-lg",
 				text: i18n.ts.copyContent,
 				action: copyContent,
 			},
 			{
-				icon: "ph-link-simple-bold ph-lg",
+				icon: "ph-link-simple ph-bold ph-lg",
 				text: i18n.ts.copyLink,
 				action: copyLink,
 			},
 			appearNote.url || appearNote.uri
 				? {
-						icon: "ph-arrow-square-out-bold ph-lg",
+						icon: "ph-arrow-square-out ph-bold ph-lg",
 						text: i18n.ts.showOnRemote,
 						action: () => {
 							window.open(appearNote.url || appearNote.uri, "_blank");
@@ -291,14 +291,14 @@ export function getNoteMenu(props: {
 				: undefined,
 			shareAvailable()
 				? {
-						icon: "ph-share-network-bold ph-lg",
+						icon: "ph-share-network ph-bold ph-lg",
 						text: i18n.ts.share,
 						action: share,
 				  }
 				: undefined,
 			instance.translatorAvailable
 				? {
-						icon: "ph-translate-bold ph-lg",
+						icon: "ph-translate ph-bold ph-lg",
 						text: i18n.ts.translate,
 						action: translate,
 				  }
@@ -307,18 +307,18 @@ export function getNoteMenu(props: {
 			statePromise.then((state) =>
 				state?.isFavorited
 					? {
-							icon: "ph-bookmark-simple-bold ph-lg",
+							icon: "ph-bookmark-simple ph-bold ph-lg",
 							text: i18n.ts.unfavorite,
 							action: () => toggleFavorite(false),
 					  }
 					: {
-							icon: "ph-bookmark-simple-bold ph-lg",
+							icon: "ph-bookmark-simple ph-bold ph-lg",
 							text: i18n.ts.favorite,
 							action: () => toggleFavorite(true),
 					  },
 			),
 			{
-				icon: "ph-paperclip-bold ph-lg",
+				icon: "ph-paperclip ph-bold ph-lg",
 				text: i18n.ts.clip,
 				action: () => clip(),
 			},
@@ -326,12 +326,12 @@ export function getNoteMenu(props: {
 				? statePromise.then((state) =>
 						state.isWatching
 							? {
-									icon: "ph-eye-slash-bold ph-lg",
+									icon: "ph-eye-slash ph-bold ph-lg",
 									text: i18n.ts.unwatch,
 									action: () => toggleWatch(false),
 							  }
 							: {
-									icon: "ph-eye-bold ph-lg",
+									icon: "ph-eye ph-bold ph-lg",
 									text: i18n.ts.watch,
 									action: () => toggleWatch(true),
 							  },
@@ -340,12 +340,12 @@ export function getNoteMenu(props: {
 			statePromise.then((state) =>
 				state.isMutedThread
 					? {
-							icon: "ph-speaker-x-bold ph-lg",
+							icon: "ph-speaker-x ph-bold ph-lg",
 							text: i18n.ts.unmuteThread,
 							action: () => toggleThreadMute(false),
 					  }
 					: {
-							icon: "ph-speaker-x-bold ph-lg",
+							icon: "ph-speaker-x ph-bold ph-lg",
 							text: i18n.ts.muteThread,
 							action: () => toggleThreadMute(true),
 					  },
@@ -353,12 +353,12 @@ export function getNoteMenu(props: {
 			appearNote.userId === $i.id
 				? ($i.pinnedNoteIds || []).includes(appearNote.id)
 					? {
-							icon: "ph-push-pin-bold ph-lg",
+							icon: "ph-push-pin ph-bold ph-lg",
 							text: i18n.ts.unpin,
 							action: () => togglePin(false),
 					  }
 					: {
-							icon: "ph-push-pin-bold ph-lg",
+							icon: "ph-push-pin ph-bold ph-lg",
 							text: i18n.ts.pin,
 							action: () => togglePin(true),
 					  }
@@ -367,7 +367,7 @@ export function getNoteMenu(props: {
 		...($i.isModerator || $i.isAdmin ? [
 			null,
 			{
-				icon: 'ph-megaphone-simple-bold ph-lg',
+				icon: 'ph-megaphone-simple ph-bold ph-lg',
 				text: i18n.ts.promote,
 				action: promote
 			}]
@@ -377,7 +377,7 @@ export function getNoteMenu(props: {
 				? [
 						null,
 						{
-							icon: "ph-warning-circle-bold ph-lg",
+							icon: "ph-warning-circle ph-bold ph-lg",
 							text: i18n.ts.reportAbuse,
 							action: () => {
 								const u =
@@ -404,13 +404,13 @@ export function getNoteMenu(props: {
 						null,
 						appearNote.userId === $i.id
 							? {
-									icon: "ph-eraser-bold ph-lg",
+									icon: "ph-eraser ph-bold ph-lg",
 									text: i18n.ts.deleteAndEdit,
 									action: delEdit,
 							  }
 							: undefined,
 						{
-							icon: "ph-trash-bold ph-lg",
+							icon: "ph-trash ph-bold ph-lg",
 							text: i18n.ts.delete,
 							danger: true,
 							action: del,
@@ -421,18 +421,18 @@ export function getNoteMenu(props: {
 	} else {
 		menu = [
 			{
-				icon: "ph-clipboard-text-bold ph-lg",
+				icon: "ph-clipboard-text ph-bold ph-lg",
 				text: i18n.ts.copyContent,
 				action: copyContent,
 			},
 			{
-				icon: "ph-link-simple-bold ph-lg",
+				icon: "ph-link-simple ph-bold ph-lg",
 				text: i18n.ts.copyLink,
 				action: copyLink,
 			},
 			appearNote.url || appearNote.uri
 				? {
-						icon: "ph-arrow-square-out-bold ph-lg",
+						icon: "ph-arrow-square-out ph-bold ph-lg",
 						text: i18n.ts.showOnRemote,
 						action: () => {
 							window.open(appearNote.url || appearNote.uri, "_blank");
@@ -446,7 +446,7 @@ export function getNoteMenu(props: {
 		menu = menu.concat([
 			null,
 			...noteActions.map((action) => ({
-				icon: "ph-plug-bold ph-lg",
+				icon: "ph-plug ph-bold ph-lg",
 				text: action.title,
 				action: () => {
 					action.handler(appearNote);
diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts
index 3ce1a8173..eae47d74f 100644
--- a/packages/client/src/scripts/get-user-menu.ts
+++ b/packages/client/src/scripts/get-user-menu.ts
@@ -215,21 +215,21 @@ export function getUserMenu(user, router: Router = mainRouter) {
 
 	let menu = [
 		{
-			icon: "ph-at-bold ph-lg",
+			icon: "ph-at ph-bold ph-lg",
 			text: i18n.ts.copyUsername,
 			action: () => {
 				copyToClipboard(`@${user.username}@${user.host || host}`);
 			},
 		},
 		{
-			icon: "ph-info-bold ph-lg",
+			icon: "ph-info ph-bold ph-lg",
 			text: i18n.ts.info,
 			action: () => {
 				router.push(`/user-info/${user.id}`);
 			},
 		},
 		{
-			icon: "ph-envelope-simple-open-bold ph-lg",
+			icon: "ph-envelope-simple-open ph-bold ph-lg",
 			text: i18n.ts.sendMessage,
 			action: () => {
 				os.post({ specified: user });
@@ -238,20 +238,20 @@ export function getUserMenu(user, router: Router = mainRouter) {
 		meId !== user.id
 			? {
 					type: "link",
-					icon: "ph-chats-teardrop-bold ph-lg",
+					icon: "ph-chats-teardrop ph-bold ph-lg",
 					text: i18n.ts.startMessaging,
 					to: `/my/messaging/${Acct.toString(user)}`,
 			  }
 			: undefined,
 		null,
 		{
-			icon: "ph-list-bullets-bold ph-lg",
+			icon: "ph-list-bullets ph-bold ph-lg",
 			text: i18n.ts.addToList,
 			action: pushList,
 		},
 		meId !== user.id
 			? {
-					icon: "ph-users-three-bold ph-lg",
+					icon: "ph-users-three ph-bold ph-lg",
 					text: i18n.ts.inviteToGroup,
 					action: inviteGroup,
 			  }
@@ -262,13 +262,13 @@ export function getUserMenu(user, router: Router = mainRouter) {
 		menu = menu.concat([
 			null,
 			{
-				icon: user.isMuted ? "ph-eye-bold ph-lg" : "ph-eye-slash-bold ph-lg",
+				icon: user.isMuted ? "ph-eye-bold ph-lg" : "ph-eye-slash ph-bold ph-lg",
 				text: user.isMuted ? i18n.ts.unmute : i18n.ts.mute,
 				hidden: user.isBlocking === true,
 				action: toggleMute,
 			},
 			{
-				icon: "ph-prohibit-bold ph-lg",
+				icon: "ph-prohibit ph-bold ph-lg",
 				text: user.isBlocking ? i18n.ts.unblock : i18n.ts.block,
 				action: toggleBlock,
 			},
@@ -277,7 +277,7 @@ export function getUserMenu(user, router: Router = mainRouter) {
 		if (user.isFollowed) {
 			menu = menu.concat([
 				{
-					icon: "ph-link-break-bold ph-lg",
+					icon: "ph-link-break ph-bold ph-lg",
 					text: i18n.ts.breakFollow,
 					action: invalidateFollow,
 				},
@@ -287,7 +287,7 @@ export function getUserMenu(user, router: Router = mainRouter) {
 		menu = menu.concat([
 			null,
 			{
-				icon: "ph-warning-circle-bold ph-lg",
+				icon: "ph-warning-circle ph-bold ph-lg",
 				text: i18n.ts.reportAbuse,
 				action: reportAbuse,
 			},
@@ -297,12 +297,12 @@ export function getUserMenu(user, router: Router = mainRouter) {
 			menu = menu.concat([
 				null,
 				{
-					icon: "ph-microphone-slash-bold ph-lg",
+					icon: "ph-microphone-slash ph-bold ph-lg",
 					text: user.isSilenced ? i18n.ts.unsilence : i18n.ts.silence,
 					action: toggleSilence,
 				},
 				{
-					icon: "ph-snowflake-bold ph-lg",
+					icon: "ph-snowflake ph-bold ph-lg",
 					text: user.isSuspended ? i18n.ts.unsuspend : i18n.ts.suspend,
 					action: toggleSuspend,
 				},
@@ -314,7 +314,7 @@ export function getUserMenu(user, router: Router = mainRouter) {
 		menu = menu.concat([
 			null,
 			{
-				icon: "ph-pencil-bold ph-lg",
+				icon: "ph-pencil ph-bold ph-lg",
 				text: i18n.ts.editProfile,
 				action: () => {
 					router.push("/settings/profile");
@@ -327,7 +327,7 @@ export function getUserMenu(user, router: Router = mainRouter) {
 		menu = menu.concat([
 			null,
 			...userActions.map((action) => ({
-				icon: "ph-plug-bold ph-lg",
+				icon: "ph-plug ph-bold ph-lg",
 				text: action.title,
 				action: () => {
 					action.handler(user);
diff --git a/packages/client/src/scripts/hpml/index.ts b/packages/client/src/scripts/hpml/index.ts
index b585531f2..914d714a5 100644
--- a/packages/client/src/scripts/hpml/index.ts
+++ b/packages/client/src/scripts/hpml/index.ts
@@ -17,29 +17,29 @@ export const literalDefs: Record<
 	string,
 	{ out: any; category: string; icon: any }
 > = {
-	text: { out: "string", category: "value", icon: "ph-quotes-bold ph-lg" },
+	text: { out: "string", category: "value", icon: "ph-quotes ph-bold ph-lg" },
 	multiLineText: {
 		out: "string",
 		category: "value",
-		icon: "ph-align-left-bold ph-lg",
+		icon: "ph-align-left ph-bold ph-lg",
 	},
 	textList: {
 		out: "stringArray",
 		category: "value",
-		icon: "ph-list-bold ph-lg",
+		icon: "ph-list ph-bold ph-lg",
 	},
 	number: {
 		out: "number",
 		category: "value",
-		icon: "ph-sort-descending-up-bold ph-lg",
+		icon: "ph-sort-descending-up ph-bold ph-lg",
 	},
-	ref: { out: null, category: "value", icon: "ph-magic-wand-bold ph-lg" },
+	ref: { out: null, category: "value", icon: "ph-magic-wand ph-bold ph-lg" },
 	aiScriptVar: {
 		out: null,
 		category: "value",
-		icon: "ph-magic-wand-bold ph-lg",
+		icon: "ph-magic-wand ph-bold ph-lg",
 	},
-	fn: { out: "function", category: "value", icon: "ph-radical-bold ph-lg" },
+	fn: { out: "function", category: "value", icon: "ph-radical ph-bold ph-lg" },
 };
 
 export const blockDefs = [
diff --git a/packages/client/src/scripts/hpml/lib.ts b/packages/client/src/scripts/hpml/lib.ts
index fb2578ff5..d0f774e36 100644
--- a/packages/client/src/scripts/hpml/lib.ts
+++ b/packages/client/src/scripts/hpml/lib.ts
@@ -240,223 +240,223 @@ export const funcDefs: Record<
 		in: ["boolean", 0, 0],
 		out: 0,
 		category: "flow",
-		icon: "ph-share-network-bold ph-lg",
+		icon: "ph-share-network ph-bold ph-lg",
 	},
 	for: {
 		in: ["number", "function"],
 		out: null,
 		category: "flow",
-		icon: "ph-recycle-bold ph-lg",
+		icon: "ph-recycle ph-bold ph-lg",
 	},
 	not: {
 		in: ["boolean"],
 		out: "boolean",
 		category: "logical",
-		icon: "ph-flag-bold ph-lg",
+		icon: "ph-flag ph-bold ph-lg",
 	},
 	or: {
 		in: ["boolean", "boolean"],
 		out: "boolean",
 		category: "logical",
-		icon: "ph-flag-bold ph-lg",
+		icon: "ph-flag ph-bold ph-lg",
 	},
 	and: {
 		in: ["boolean", "boolean"],
 		out: "boolean",
 		category: "logical",
-		icon: "ph-flag-bold ph-lg",
+		icon: "ph-flag ph-bold ph-lg",
 	},
 	add: {
 		in: ["number", "number"],
 		out: "number",
 		category: "operation",
-		icon: "ph-plus-bold ph-lg",
+		icon: "ph-plus ph-bold ph-lg",
 	},
 	subtract: {
 		in: ["number", "number"],
 		out: "number",
 		category: "operation",
-		icon: "ph-minus-bold ph-lg",
+		icon: "ph-minus ph-bold ph-lg",
 	},
 	multiply: {
 		in: ["number", "number"],
 		out: "number",
 		category: "operation",
-		icon: "ph-x-bold ph-lg",
+		icon: "ph-x ph-bold ph-lg",
 	},
 	divide: {
 		in: ["number", "number"],
 		out: "number",
 		category: "operation",
-		icon: "ph-divide-bold ph-lg",
+		icon: "ph-divide ph-bold ph-lg",
 	},
 	mod: {
 		in: ["number", "number"],
 		out: "number",
 		category: "operation",
-		icon: "ph-divide-bold ph-lg",
+		icon: "ph-divide ph-bold ph-lg",
 	},
 	round: {
 		in: ["number"],
 		out: "number",
 		category: "operation",
-		icon: "ph-calculator-bold ph-lg",
+		icon: "ph-calculator ph-bold ph-lg",
 	},
 	eq: {
 		in: [0, 0],
 		out: "boolean",
 		category: "comparison",
-		icon: "ph-equals-bold ph-lg",
+		icon: "ph-equals ph-bold ph-lg",
 	},
 	notEq: {
 		in: [0, 0],
 		out: "boolean",
 		category: "comparison",
-		icon: "ph-prohibit-insert-bold ph-lg",
+		icon: "ph-prohibit-insert ph-bold ph-lg",
 	},
 	gt: {
 		in: ["number", "number"],
 		out: "boolean",
 		category: "comparison",
-		icon: "ph-caret-right-bold ph-lg",
+		icon: "ph-caret-right ph-bold ph-lg",
 	},
 	lt: {
 		in: ["number", "number"],
 		out: "boolean",
 		category: "comparison",
-		icon: "ph-caret-left-bold ph-lg",
+		icon: "ph-caret-left ph-bold ph-lg",
 	},
 	gtEq: {
 		in: ["number", "number"],
 		out: "boolean",
 		category: "comparison",
-		icon: "ph-caret-double-right-bold ph-lg",
+		icon: "ph-caret-double-right ph-bold ph-lg",
 	},
 	ltEq: {
 		in: ["number", "number"],
 		out: "boolean",
 		category: "comparison",
-		icon: "ph-caret-double-right-bold ph-lg",
+		icon: "ph-caret-double-right ph-bold ph-lg",
 	},
 	strLen: {
 		in: ["string"],
 		out: "number",
 		category: "text",
-		icon: "ph-quotes-bold ph-lg",
+		icon: "ph-quotes ph-bold ph-lg",
 	},
 	strPick: {
 		in: ["string", "number"],
 		out: "string",
 		category: "text",
-		icon: "ph-quotes-bold ph-lg",
+		icon: "ph-quotes ph-bold ph-lg",
 	},
 	strReplace: {
 		in: ["string", "string", "string"],
 		out: "string",
 		category: "text",
-		icon: "ph-quotes-bold ph-lg",
+		icon: "ph-quotes ph-bold ph-lg",
 	},
 	strReverse: {
 		in: ["string"],
 		out: "string",
 		category: "text",
-		icon: "ph-quotes-bold ph-lg",
+		icon: "ph-quotes ph-bold ph-lg",
 	},
 	join: {
 		in: ["stringArray", "string"],
 		out: "string",
 		category: "text",
-		icon: "ph-quotes-bold ph-lg",
+		icon: "ph-quotes ph-bold ph-lg",
 	},
 	stringToNumber: {
 		in: ["string"],
 		out: "number",
 		category: "convert",
-		icon: "ph-swap-bold ph-lg",
+		icon: "ph-swap ph-bold ph-lg",
 	},
 	numberToString: {
 		in: ["number"],
 		out: "string",
 		category: "convert",
-		icon: "ph-swap-bold ph-lg",
+		icon: "ph-swap ph-bold ph-lg",
 	},
 	splitStrByLine: {
 		in: ["string"],
 		out: "stringArray",
 		category: "convert",
-		icon: "ph-swap-bold ph-lg",
+		icon: "ph-swap ph-bold ph-lg",
 	},
 	pick: {
 		in: [null, "number"],
 		out: null,
 		category: "list",
-		icon: "ph-text-indent-bold ph-lg",
+		icon: "ph-text-indent ph-bold ph-lg",
 	},
 	listLen: {
 		in: [null],
 		out: "number",
 		category: "list",
-		icon: "ph-text-indent-bold ph-lg",
+		icon: "ph-text-indent ph-bold ph-lg",
 	},
 	rannum: {
 		in: ["number", "number"],
 		out: "number",
 		category: "random",
-		icon: "ph-dice-five-bold ph-lg",
+		icon: "ph-dice-five ph-bold ph-lg",
 	},
 	dailyRannum: {
 		in: ["number", "number"],
 		out: "number",
 		category: "random",
-		icon: "ph-dice-five-bold ph-lg",
+		icon: "ph-dice-five ph-bold ph-lg",
 	},
 	seedRannum: {
 		in: [null, "number", "number"],
 		out: "number",
 		category: "random",
-		icon: "ph-dice-five-bold ph-lg",
+		icon: "ph-dice-five ph-bold ph-lg",
 	},
 	random: {
 		in: ["number"],
 		out: "boolean",
 		category: "random",
-		icon: "ph-dice-five-bold ph-lg",
+		icon: "ph-dice-five ph-bold ph-lg",
 	},
 	dailyRandom: {
 		in: ["number"],
 		out: "boolean",
 		category: "random",
-		icon: "ph-dice-five-bold ph-lg",
+		icon: "ph-dice-five ph-bold ph-lg",
 	},
 	seedRandom: {
 		in: [null, "number"],
 		out: "boolean",
 		category: "random",
-		icon: "ph-dice-five-bold ph-lg",
+		icon: "ph-dice-five ph-bold ph-lg",
 	},
 	randomPick: {
 		in: [0],
 		out: 0,
 		category: "random",
-		icon: "ph-dice-five-bold ph-lg",
+		icon: "ph-dice-five ph-bold ph-lg",
 	},
 	dailyRandomPick: {
 		in: [0],
 		out: 0,
 		category: "random",
-		icon: "ph-dice-five-bold ph-lg",
+		icon: "ph-dice-five ph-bold ph-lg",
 	},
 	seedRandomPick: {
 		in: [null, 0],
 		out: 0,
 		category: "random",
-		icon: "ph-dice-five-bold ph-lg",
+		icon: "ph-dice-five ph-bold ph-lg",
 	},
 	DRPWPM: {
 		in: ["stringArray"],
 		out: "string",
 		category: "random",
-		icon: "ph-dice-five-bold ph-lg",
+		icon: "ph-dice-five ph-bold ph-lg",
 	}, // dailyRandomPickWithProbabilityMapping
 };
 
diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index 92955f488..36646d24f 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -35,7 +35,7 @@ export async function search() {
 		// TODO
 		//v.$root.$emit('warp', date);
 		os.alert({
-			icon: "ph-clock-counter-clockwise-bold ph-lg",
+			icon: "ph-clock-counter-clockwise ph-bold ph-lg",
 			iconOnly: true,
 			autoClose: true,
 		});
diff --git a/packages/client/src/scripts/select-file.ts b/packages/client/src/scripts/select-file.ts
index 57448e92a..d249b2d55 100644
--- a/packages/client/src/scripts/select-file.ts
+++ b/packages/client/src/scripts/select-file.ts
@@ -99,17 +99,17 @@ function select(
 				},
 				{
 					text: i18n.ts.upload,
-					icon: "ph-upload-simple-bold ph-lg",
+					icon: "ph-upload-simple ph-bold ph-lg",
 					action: chooseFileFromPc,
 				},
 				{
 					text: i18n.ts.fromDrive,
-					icon: "ph-cloud-bold ph-lg",
+					icon: "ph-cloud ph-bold ph-lg",
 					action: chooseFileFromDrive,
 				},
 				{
 					text: i18n.ts.fromUrl,
-					icon: "ph-link-simple-bold ph-lg",
+					icon: "ph-link-simple ph-bold ph-lg",
 					action: chooseFileFromUrl,
 				},
 			],
diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index 4cb9ed4d0..a17381155 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -9,7 +9,7 @@
 		</div>
 		<div class="middle">
 			<MkA v-click-anime class="item index" active-class="active" to="/" exact>
-				<i class="icon ph-house-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.timeline }}</span>
+				<i class="icon ph-house ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.timeline }}</span>
 			</MkA>
 			<template v-for="item in menu">
 				<div v-if="item === '-'" class="divider"></div>
@@ -20,19 +20,19 @@
 			</template>
 			<div class="divider"></div>
 			<MkA v-if="$i.isAdmin || $i.isModerator" v-click-anime class="item" active-class="active" to="/admin">
-				<i class="icon ph-door-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
+				<i class="icon ph-door ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
 			</MkA>
 			<button v-click-anime class="item _button" @click="more">
-				<i class="icon ph-dots-three-outline-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
+				<i class="icon ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
 				<span v-if="otherMenuItemIndicated" class="indicator"><i class="icon ph-circle-fill"></i></span>
 			</button>
 			<MkA v-click-anime class="item" active-class="active" to="/settings">
-				<i class="icon ph-gear-six-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
+				<i class="icon ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
 			</MkA>
 		</div>
 		<div class="bottom">
 			<button class="item _button post" data-cy-open-post-form @click="os.post">
-				<i class="icon ph-pencil-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.note }}</span>
+				<i class="icon ph-pencil ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.note }}</span>
 			</button>
 		</div>
 	</div>
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index f44a64c7e..0dc349a41 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -9,7 +9,7 @@
 		</div>
 		<div class="middle">
 			<MkA v-click-anime v-tooltip.noDelay.right="i18n.ts.timeline" class="item index" active-class="active" to="/" exact>
-				<i class="icon ph-house-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.timeline }}</span>
+				<i class="icon ph-house ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.timeline }}</span>
 			</MkA>
 			<template v-for="item in menu">
 				<div v-if="item === '-'" class="divider"></div>
@@ -30,23 +30,23 @@
 			</template>
 			<div class="divider"></div>
 			<MkA v-if="$i.isAdmin || $i.isModerator" v-click-anime v-tooltip.noDelay.right="i18n.ts.controlPanel" class="item _button" active-class="active" to="/admin">
-				<span v-if="thereIsUnresolvedAbuseReport || noMaintainerInformation || noBotProtection || noEmailServer || updateAvailable" class="indicator"></span><i class="icon ph-door-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
+				<span v-if="thereIsUnresolvedAbuseReport || noMaintainerInformation || noBotProtection || noEmailServer || updateAvailable" class="indicator"></span><i class="icon ph-door ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
 			</MkA>
 			<button v-click-anime class="item _button" @click="more">
-				<i class="icon ph-dots-three-outline-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
+				<i class="icon ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
 				<span v-if="otherMenuItemIndicated" class="indicator"><i class="icon ph-circle-fill"></i></span>
 			</button>
 			<MkA v-click-anime v-tooltip.noDelay.right="i18n.ts.settings" class="item _button" active-class="active" to="/settings">
-				<i class="icon ph-gear-six-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
+				<i class="icon ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
 			</MkA>
 		</div>
 		<div class="bottom">
 			<button v-tooltip.noDelay.right="i18n.ts.note" class="item _button post" data-cy-open-post-form @click="os.post">
-				<i class="icon ph-pencil-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.note }}</span>
+				<i class="icon ph-pencil ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.note }}</span>
 			</button>
 			<!-- <div class="help">
 				<button v-tooltip.noDelay.right="i18n.ts.help" class="item _button" @click="openHelpMenu">
-					<i class="icon ph-info-bold ph-xl ph-fw ph-lg"></i>
+					<i class="icon ph-info ph-bold ph-xl ph-fw ph-lg"></i>
 				</button>
 			</div> -->
 			<!-- <button v-click-anime v-tooltip.noDelay.right="$instance.name ?? i18n.ts.instance" class="item _button instance" @click="openInstanceMenu">
diff --git a/packages/client/src/ui/_common_/upload.vue b/packages/client/src/ui/_common_/upload.vue
index 68d6b6749..6c7787f99 100644
--- a/packages/client/src/ui/_common_/upload.vue
+++ b/packages/client/src/ui/_common_/upload.vue
@@ -4,7 +4,7 @@
 		<li v-for="ctx in uploads" :key="ctx.id">
 			<div class="img" :style="{ backgroundImage: `url(${ ctx.img })` }"></div>
 			<div class="top">
-				<p class="name"><i class="ph-circle-notch-bold ph-lg fa-pulse"></i>{{ ctx.name }}</p>
+				<p class="name"><i class="ph-circle-notch ph-bold ph-lg fa-pulse"></i>{{ ctx.name }}</p>
 				<p class="status">
 					<span v-if="ctx.progressValue === undefined" class="initing">{{ i18n.ts.waiting }}<MkEllipsis/></span>
 					<span v-if="ctx.progressValue !== undefined" class="kb">{{ String(Math.floor(ctx.progressValue / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }}<i>KB</i> / {{ String(Math.floor(ctx.progressMax / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }}<i>KB</i></span>
diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue
index 8bb2c36e1..1ff8444d7 100644
--- a/packages/client/src/ui/classic.header.vue
+++ b/packages/client/src/ui/classic.header.vue
@@ -3,7 +3,7 @@
 	<div class="body">
 		<div class="left">
 			<MkA v-click-anime v-tooltip="i18n.ts.timeline" class="item index" active-class="active" to="/" exact>
-				<i class="ph-house-bold ph-lg ph-fw ph-lg"></i>
+				<i class="ph-house ph-bold ph-lg ph-fw ph-lg"></i>
 			</MkA>
 			<template v-for="item in menu">
 				<div v-if="item === '-'" class="divider"></div>
@@ -14,23 +14,23 @@
 			</template>
 			<div class="divider"></div>
 			<MkA v-if="$i.isAdmin || $i.isModerator" v-click-anime v-tooltip="i18n.ts.controlPanel" class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null">
-				<i class="ph-door-bold ph-lg ph-fw ph-lg"></i>
+				<i class="ph-door ph-bold ph-lg ph-fw ph-lg"></i>
 			</MkA>
 			<button v-click-anime class="item _button" @click="more">
-				<i class="ph-dots-three-outline-bold ph-lg ph-fw ph-lg"></i>
+				<i class="ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i>
 				<span v-if="otherNavItemIndicated" class="indicator"><i class="ph-circle-fill"></i></span>
 			</button>
 		</div>
 		<div class="right">
 			<MkA v-click-anime v-tooltip="i18n.ts.settings" class="item" active-class="active" to="/settings" :behavior="settingsWindowed ? 'modalWindow' : null">
-				<i class="ph-gear-six-bold ph-lg ph-fw ph-lg"></i>
+				<i class="ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i>
 			</MkA>
 			<button v-click-anime class="item _button account" @click="openAccountMenu">
 				<MkAvatar :user="$i" class="avatar"/><MkAcct class="acct" :user="$i"/>
 			</button>
 			<div class="post" @click="post">
 				<MkButton class="button" gradate full rounded>
-					<i class="ph-pencil-bold ph-lg ph-fw ph-lg"></i>
+					<i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i>
 				</MkButton>
 			</div>
 		</div>
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index e4e1d4d88..5b34d3a5f 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -5,12 +5,12 @@
 	</button>
 	<div class="post" data-cy-open-post-form @click="post">
 		<MkButton class="button" gradate full rounded>
-			<i class="ph-pencil-bold ph-lg ph-fw ph-lg"></i><span v-if="!iconOnly" class="text">{{ i18n.ts.note }}</span>
+			<i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i><span v-if="!iconOnly" class="text">{{ i18n.ts.note }}</span>
 		</MkButton>
 	</div>
 	<div class="divider"></div>
 	<MkA v-click-anime class="item index" active-class="active" to="/" exact>
-		<i class="ph-house-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.timeline }}</span>
+		<i class="ph-house ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.timeline }}</span>
 	</MkA>
 	<template v-for="item in menu">
 		<div v-if="item === '-'" class="divider"></div>
@@ -21,14 +21,14 @@
 	</template>
 	<div class="divider"></div>
 	<MkA v-if="$i.isAdmin || $i.isModerator" v-click-anime class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null">
-		<i class="ph-door-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
+		<i class="ph-door ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
 	</MkA>
 	<button v-click-anime class="item _button" @click="more">
-		<i class="ph-dots-three-outline-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
+		<i class="ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
 		<span v-if="otherNavItemIndicated" class="indicator"><i class="ph-circle-fill"></i></span>
 	</button>
 	<MkA v-click-anime class="item" active-class="active" to="/settings" :behavior="settingsWindowed ? 'modalWindow' : null">
-		<i class="ph-gear-six-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
+		<i class="ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
 	</MkA>
 	<div class="divider"></div>
 	<div class="about">
@@ -143,30 +143,30 @@ function openInstanceMenu(ev: MouseEvent) {
 	}, {
 		type: 'link',
 		text: i18n.ts.instanceInfo,
-		icon: 'ph-info-bold ph-lg',
+		icon: 'ph-info ph-bold ph-lg',
 		to: '/about',
 	}, null, {
 		type: 'parent',
 		text: i18n.ts.help,
-		icon: 'ph-question-bold ph-lg',
+		icon: 'ph-question ph-bold ph-lg',
 		children: [{
 			type: 'link',
 			to: '/mfm-cheat-sheet',
 			text: i18n.ts._mfm.cheatSheet,
-			icon: 'ph-code-bold ph-lg',
+			icon: 'ph-code ph-bold ph-lg',
 		}, {
 			type: 'link',
 			to: '/scratchpad',
 			text: i18n.ts.scratchpad,
-			icon: 'ph-terminal-window-bold ph-lg',
+			icon: 'ph-terminal-window ph-bold ph-lg',
 		}, {
 			type: 'link',
 			to: '/api-console',
 			text: 'API Console',
-			icon: 'ph-terminal-window-bold ph-lg',
+			icon: 'ph-terminal-window ph-bold ph-lg',
 		}, null, {
 			text: i18n.ts.document,
-			icon: 'ph-question-bold ph-lg',
+			icon: 'ph-question ph-bold ph-lg',
 			action: () => {
 				window.open('https://misskey-hub.net/help.html', '_blank');
 			},
diff --git a/packages/client/src/ui/classic.vue b/packages/client/src/ui/classic.vue
index 352f61c5a..965fde814 100644
--- a/packages/client/src/ui/classic.vue
+++ b/packages/client/src/ui/classic.vue
@@ -104,13 +104,13 @@ function onContextmenu(ev: MouseEvent) {
 		type: 'label',
 		text: path,
 	}, {
-		icon: fullView ? 'ph-arrows-in-simple-bold ph-lg' : 'ph-arrows-out-simple-bold ph-lg',
+		icon: fullView ? 'ph-arrows-in-simple-bold ph-lg' : 'ph-arrows-out-simple ph-bold ph-lg',
 		text: fullView ? i18n.ts.quitFullView : i18n.ts.fullView,
 		action: () => {
 			fullView = !fullView;
 		},
 	}, {
-		icon: 'ph-browser-bold ph-lg',
+		icon: 'ph-browser ph-bold ph-lg',
 		text: i18n.ts.openInWindow,
 		action: () => {
 			os.pageWindow(path);
diff --git a/packages/client/src/ui/classic.widgets.vue b/packages/client/src/ui/classic.widgets.vue
index 3ed838d9f..0f0854a05 100644
--- a/packages/client/src/ui/classic.widgets.vue
+++ b/packages/client/src/ui/classic.widgets.vue
@@ -2,8 +2,8 @@
 	<div class="ddiqwdnk">
 		<MkAd class="a" :prefer="['widget']"/>
 		<XWidgets class="widgets" :edit="editMode" :widgets="$store.reactiveState.widgets.value.filter(w => w.place === place)" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
-		<button v-if="editMode" class="_textButton edit" style="font-size: 0.9em;" @click="editMode = false"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}</button>
-		<button v-else class="_textButton edit" style="font-size: 0.9em;" @click="editMode = true"><i class="ph-pencil-bold ph-lg"></i> {{ i18n.ts.editWidgets }}</button>
+		<button v-if="editMode" class="_textButton edit" style="font-size: 0.9em;" @click="editMode = false"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}</button>
+		<button v-else class="_textButton edit" style="font-size: 0.9em;" @click="editMode = true"><i class="ph-pencil ph-bold ph-lg"></i> {{ i18n.ts.editWidgets }}</button>
 	</div>
 </template>
 
diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index d007e7bd5..151a50db4 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -34,24 +34,24 @@
 			</div>
 			<div class="sideMenu">
 				<div class="top">
-					<button v-tooltip.noDelay.left="`${i18n.ts._deck.profile}: ${deckStore.state.profile}`" class="_button button" @click="changeProfile"><i class="ph-caret-down-bold ph-lg"></i></button>
-					<button v-tooltip.noDelay.left="i18n.ts._deck.deleteProfile" class="_button button" @click="deleteProfile"><i class="ph-trash-bold ph-lg"></i></button>
+					<button v-tooltip.noDelay.left="`${i18n.ts._deck.profile}: ${deckStore.state.profile}`" class="_button button" @click="changeProfile"><i class="ph-caret-down ph-bold ph-lg"></i></button>
+					<button v-tooltip.noDelay.left="i18n.ts._deck.deleteProfile" class="_button button" @click="deleteProfile"><i class="ph-trash ph-bold ph-lg"></i></button>
 				</div>
 				<div class="middle">
-					<button v-tooltip.noDelay.left="i18n.ts._deck.addColumn" class="_button button new" @click="addColumn"><i class="ph-plus-bold ph-lg"></i></button>
+					<button v-tooltip.noDelay.left="i18n.ts._deck.addColumn" class="_button button new" @click="addColumn"><i class="ph-plus ph-bold ph-lg"></i></button>
 				</div>
 				<div class="bottom">
-					<button v-tooltip.noDelay.left="i18n.ts.settings" class="_button button settings" @click="showSettings"><i class="ph-gear-six-bold ph-lg"></i></button>
+					<button v-tooltip.noDelay.left="i18n.ts.settings" class="_button button settings" @click="showSettings"><i class="ph-gear-six ph-bold ph-lg"></i></button>
 				</div>
 			</div>
 		</div>
 	</div>
 
 	<div v-if="isMobile" class="buttons">
-		<button class="button nav _button" @click="drawerMenuShowing = true"><i class="ph-list-bold ph-lg"></i><span v-if="menuIndicated" class="indicator"><i class="ph-circle-fill"></i></span></button>
-		<button class="button home _button" @click="mainRouter.push('/')"><i class="ph-house-bold ph-lg"></i></button>
-		<button class="button notifications _button" @click="mainRouter.push('/my/notifications')"><i class="ph-bell-bold ph-lg"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="ph-circle-fill"></i></span></button>
-		<button class="button post _button" @click="os.post()"><i class="ph-pencil-bold ph-lg"></i></button>
+		<button class="button nav _button" @click="drawerMenuShowing = true"><i class="ph-list ph-bold ph-lg"></i><span v-if="menuIndicated" class="indicator"><i class="ph-circle-fill"></i></span></button>
+		<button class="button home _button" @click="mainRouter.push('/')"><i class="ph-house ph-bold ph-lg"></i></button>
+		<button class="button notifications _button" @click="mainRouter.push('/my/notifications')"><i class="ph-bell ph-bold ph-lg"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="ph-circle-fill"></i></span></button>
+		<button class="button post _button" @click="os.post()"><i class="ph-pencil ph-bold ph-lg"></i></button>
 	</div>
 
 	<transition :name="$store.state.animation ? 'menu-back' : ''">
@@ -194,7 +194,7 @@ function changeProfile(ev: MouseEvent) {
 			},
 		}))), null, {
 			text: i18n.ts._deck.newProfile,
-			icon: 'ph-plus-bold ph-lg',
+			icon: 'ph-plus ph-bold ph-lg',
 			action: async () => {
 				const { canceled, result: name } = await os.inputText({
 					title: i18n.ts._deck.profile,
diff --git a/packages/client/src/ui/deck/antenna-column.vue b/packages/client/src/ui/deck/antenna-column.vue
index 616f55bbe..d06b79c96 100644
--- a/packages/client/src/ui/deck/antenna-column.vue
+++ b/packages/client/src/ui/deck/antenna-column.vue
@@ -1,7 +1,7 @@
 <template>
 <XColumn :menu="menu" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
 	<template #header>
-		<i class="ph-television-bold ph-lg"></i><span style="margin-left: 8px;">{{ column.name }}</span>
+		<i class="ph-television ph-bold ph-lg"></i><span style="margin-left: 8px;">{{ column.name }}</span>
 	</template>
 
 	<XTimeline v-if="column.antennaId" ref="timeline" src="antenna" :antenna="column.antennaId" @after="() => emit('loaded')"/>
@@ -50,7 +50,7 @@ async function setAntenna() {
 }
 
 const menu = [{
-	icon: 'ph-pencil-bold ph-lg',
+	icon: 'ph-pencil ph-bold ph-lg',
 	text: i18n.ts.selectAntenna,
 	action: setAntenna,
 }];
diff --git a/packages/client/src/ui/deck/column.vue b/packages/client/src/ui/deck/column.vue
index 68189af8f..058d47544 100644
--- a/packages/client/src/ui/deck/column.vue
+++ b/packages/client/src/ui/deck/column.vue
@@ -16,14 +16,14 @@
 		@contextmenu.prevent.stop="onContextmenu"
 	>
 		<button v-if="isStacked && !isMainColumn" class="toggleActive _button" @click="toggleActive">
-			<template v-if="active"><i class="ph-caret-up-bold ph-lg"></i></template>
-			<template v-else><i class="ph-caret-down-bold ph-lg"></i></template>
+			<template v-if="active"><i class="ph-caret-up ph-bold ph-lg"></i></template>
+			<template v-else><i class="ph-caret-down ph-bold ph-lg"></i></template>
 		</button>
 		<div class="action">
 			<slot name="action"></slot>
 		</div>
 		<span class="header"><slot name="header"></slot></span>
-		<button v-tooltip="i18n.ts.settings" class="menu _button" @click.stop="showSettingsMenu"><i class="ph-dots-three-outline-vertical-bold ph-lg"></i></button>
+		<button v-tooltip="i18n.ts.settings" class="menu _button" @click.stop="showSettingsMenu"><i class="ph-dots-three-outline-vertical ph-bold ph-lg"></i></button>
 	</header>
 	<div v-show="active" ref="body">
 		<slot></slot>
@@ -105,7 +105,7 @@ function toggleActive() {
 
 function getMenu() {
 	let items = [{
-		icon: 'ph-gear-six-bold ph-lg',
+		icon: 'ph-gear-six ph-bold ph-lg',
 		text: i18n.ts._deck.configureColumn,
 		action: async () => {
 			const { canceled, result } = await os.form(props.column.name, {
@@ -131,46 +131,46 @@ function getMenu() {
 	}, {
 		type: 'parent',
 		text: i18n.ts.move + '...',
-		icon: 'ph-arrows-out-cardinal-bold ph-lg',
+		icon: 'ph-arrows-out-cardinal ph-bold ph-lg',
 		children: [{
-			icon: 'ph-caret-left-bold ph-lg',
+			icon: 'ph-caret-left ph-bold ph-lg',
 			text: i18n.ts._deck.swapLeft,
 			action: () => {
 				swapLeftColumn(props.column.id);
 			},
 		}, {
-			icon: 'ph-caret-right-bold ph-lg',
+			icon: 'ph-caret-right ph-bold ph-lg',
 			text: i18n.ts._deck.swapRight,
 			action: () => {
 				swapRightColumn(props.column.id);
 			},
 		}, props.isStacked ? {
-			icon: 'ph-caret-up-bold ph-lg',
+			icon: 'ph-caret-up ph-bold ph-lg',
 			text: i18n.ts._deck.swapUp,
 			action: () => {
 				swapUpColumn(props.column.id);
 			},
 		} : undefined, props.isStacked ? {
-			icon: 'ph-caret-down-bold ph-lg',
+			icon: 'ph-caret-down ph-bold ph-lg',
 			text: i18n.ts._deck.swapDown,
 			action: () => {
 				swapDownColumn(props.column.id);
 			},
 		} : undefined],
 	}, {
-		icon: 'ph-copy-bold ph-lg',
+		icon: 'ph-copy ph-bold ph-lg',
 		text: i18n.ts._deck.stackLeft,
 		action: () => {
 			stackLeftColumn(props.column.id);
 		},
 	}, props.isStacked ? {
-		icon: 'ph-browser-bold ph-lg',
+		icon: 'ph-browser ph-bold ph-lg',
 		text: i18n.ts._deck.popRight,
 		action: () => {
 			popRightColumn(props.column.id);
 		},
 	} : undefined, null, {
-		icon: 'ph-trash-bold ph-lg',
+		icon: 'ph-trash ph-bold ph-lg',
 		text: i18n.ts.remove,
 		danger: true,
 		action: () => {
diff --git a/packages/client/src/ui/deck/direct-column.vue b/packages/client/src/ui/deck/direct-column.vue
index 7b65a5d46..cf84ad517 100644
--- a/packages/client/src/ui/deck/direct-column.vue
+++ b/packages/client/src/ui/deck/direct-column.vue
@@ -1,6 +1,6 @@
 <template>
 <XColumn :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
-	<template #header><i class="ph-envelope-simple-open-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
+	<template #header><i class="ph-envelope-simple-open ph-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
 
 	<XNotes :pagination="pagination"/>
 </XColumn>
diff --git a/packages/client/src/ui/deck/list-column.vue b/packages/client/src/ui/deck/list-column.vue
index 8f617df06..9247285fd 100644
--- a/packages/client/src/ui/deck/list-column.vue
+++ b/packages/client/src/ui/deck/list-column.vue
@@ -1,7 +1,7 @@
 <template>
 <XColumn :menu="menu" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
 	<template #header>
-		<i class="ph-list-bullets-bold ph-lg"></i><span style="margin-left: 8px;">{{ column.name }}</span>
+		<i class="ph-list-bullets ph-bold ph-lg"></i><span style="margin-left: 8px;">{{ column.name }}</span>
 	</template>
 
 	<XTimeline v-if="column.listId" ref="timeline" src="list" :list="column.listId" @after="() => emit('loaded')"/>
@@ -48,7 +48,7 @@ async function setList() {
 }
 
 const menu = [{
-	icon: 'ph-pencil-bold ph-lg',
+	icon: 'ph-pencil ph-bold ph-lg',
 	text: i18n.ts.selectList,
 	action: setList,
 }];
diff --git a/packages/client/src/ui/deck/main-column.vue b/packages/client/src/ui/deck/main-column.vue
index 3abbdccff..358a4a9be 100644
--- a/packages/client/src/ui/deck/main-column.vue
+++ b/packages/client/src/ui/deck/main-column.vue
@@ -58,7 +58,7 @@ function onContextmenu(ev: MouseEvent) {
 		type: 'label',
 		text: path,
 	}, {
-		icon: 'ph-browser-bold ph-lg',
+		icon: 'ph-browser ph-bold ph-lg',
 		text: i18n.ts.openInWindow,
 		action: () => {
 			os.pageWindow(path);
diff --git a/packages/client/src/ui/deck/mentions-column.vue b/packages/client/src/ui/deck/mentions-column.vue
index 084f0e1ab..5510416d1 100644
--- a/packages/client/src/ui/deck/mentions-column.vue
+++ b/packages/client/src/ui/deck/mentions-column.vue
@@ -1,6 +1,6 @@
 <template>
 <XColumn :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
-	<template #header><i class="ph-at-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
+	<template #header><i class="ph-at ph-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
 
 	<XNotes :pagination="pagination"/>
 </XColumn>
diff --git a/packages/client/src/ui/deck/notifications-column.vue b/packages/client/src/ui/deck/notifications-column.vue
index f3eda132c..7e0e85a46 100644
--- a/packages/client/src/ui/deck/notifications-column.vue
+++ b/packages/client/src/ui/deck/notifications-column.vue
@@ -1,6 +1,6 @@
 <template>
 <XColumn :column="column" :is-stacked="isStacked" :menu="menu" @parent-focus="$event => emit('parent-focus', $event)">
-	<template #header><i class="ph-bell-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
+	<template #header><i class="ph-bell ph-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
 
 	<XNotifications :include-types="column.includingTypes"/>
 </XColumn>
@@ -38,7 +38,7 @@ function func(): void {
 }
 
 const menu = [{
-	icon: 'ph-pencil-bold ph-lg',
+	icon: 'ph-pencil ph-bold ph-lg',
 	text: i18n.ts.notificationSetting,
 	action: func,
 }];
diff --git a/packages/client/src/ui/deck/tl-column.vue b/packages/client/src/ui/deck/tl-column.vue
index e4102747d..280ab6c35 100644
--- a/packages/client/src/ui/deck/tl-column.vue
+++ b/packages/client/src/ui/deck/tl-column.vue
@@ -1,16 +1,16 @@
 <template>
 <XColumn :menu="menu" :column="column" :is-stacked="isStacked" :indicated="indicated" @change-active-state="onChangeActiveState" @parent-focus="$event => emit('parent-focus', $event)">
 	<template #header>
-		<i v-if="column.tl === 'home'" class="ph-house-bold ph-lg"></i>
-		<i v-else-if="column.tl === 'local'" class="ph-chats-circle-bold ph-lg"></i>
-		<i v-else-if="column.tl === 'social'" class="ph-share-network-bold ph-lg"></i>
-		<i v-else-if="column.tl === 'global'" class="ph-planet-bold ph-lg"></i>
+		<i v-if="column.tl === 'home'" class="ph-house ph-bold ph-lg"></i>
+		<i v-else-if="column.tl === 'local'" class="ph-chats-circle ph-bold ph-lg"></i>
+		<i v-else-if="column.tl === 'social'" class="ph-share-network ph-bold ph-lg"></i>
+		<i v-else-if="column.tl === 'global'" class="ph-planet ph-bold ph-lg"></i>
 		<span style="margin-left: 8px;">{{ column.name }}</span>
 	</template>
 
 	<div v-if="disabled" class="iwaalbte">
 		<p>
-			<i class="ph-minus-circle-bold ph-lg"></i>
+			<i class="ph-minus-circle ph-bold ph-lg"></i>
 			{{ i18n.t('disabled-timeline.title') }}
 		</p>
 		<p class="desc">{{ i18n.t('disabled-timeline.description') }}</p>
@@ -101,7 +101,7 @@ function onChangeActiveState(state) {
 }
 
 const menu = [{
-	icon: 'ph-pencil-bold ph-lg',
+	icon: 'ph-pencil ph-bold ph-lg',
 	text: i18n.ts.timeline,
 	action: setType,
 }];
diff --git a/packages/client/src/ui/deck/widgets-column.vue b/packages/client/src/ui/deck/widgets-column.vue
index 5fdbccf26..50a53ec63 100644
--- a/packages/client/src/ui/deck/widgets-column.vue
+++ b/packages/client/src/ui/deck/widgets-column.vue
@@ -1,6 +1,6 @@
 <template>
 	<XColumn :menu="menu" :naked="true" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
-		<template #header><i class="ph-browser-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
+		<template #header><i class="ph-browser ph-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
 		<div class="wtdtxvec">
 			<MkAd class="a" :prefer="['widget']"/>
 			<div v-if="!(column.widgets && column.widgets.length > 0) && !edit" class="intro">{{ i18n.ts._deck.widgetsIntroduction }}</div>
@@ -48,7 +48,7 @@ function func() {
 }
 
 const menu = [{
-	icon: 'ph-pencil-bold ph-lg',
+	icon: 'ph-pencil ph-bold ph-lg',
 	text: i18n.ts.editWidgets,
 	action: func,
 }];
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 9ffe4c23f..4a862ba93 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -16,37 +16,37 @@
 		<XWidgets @mounted="attachSticky"/>
 	</div>
 
-	<button v-if="!isDesktop && !isMobile" class="widgetButton _button" @click="widgetsShowing = true"><i class="ph-stack-bold ph-lg"></i></button>
+	<button v-if="!isDesktop && !isMobile" class="widgetButton _button" @click="widgetsShowing = true"><i class="ph-stack ph-bold ph-lg"></i></button>
 
 	<div v-if="isMobile" class="buttons">
 		<button class="button nav _button" @click="drawerMenuShowing = true">
 			<div class="button-wrapper">
-				<i class="ph-list-bold ph-lg"></i><span v-if="menuIndicated" class="indicator"><i class="ph-circle-fill"></i></span>
+				<i class="ph-list ph-bold ph-lg"></i><span v-if="menuIndicated" class="indicator"><i class="ph-circle-fill"></i></span>
 			</div>
 		</button>
 		<button class="button home _button" @click="mainRouter.currentRoute.value.name === 'index' ? top() : mainRouter.push('/'); updateButtonState();">
 			<div class="button-wrapper" :class="buttonAnimIndex === 0 ? 'on' : ''">
-				<i class="ph-house-bold ph-lg"></i>
+				<i class="ph-house ph-bold ph-lg"></i>
 			</div>
 		</button>
 		<button class="button notifications _button" @click="mainRouter.push('/my/notifications'); updateButtonState();">
 			<div class="button-wrapper" :class="buttonAnimIndex === 1 ? 'on' : ''">
-				<i class="ph-bell-bold ph-lg"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="ph-circle-fill"></i></span>
+				<i class="ph-bell ph-bold ph-lg"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="ph-circle-fill"></i></span>
 			</div>
 		</button>
 		<button class="button messaging _button" @click="mainRouter.push('/my/messaging'); updateButtonState();">
 			<div class="button-wrapper" :class="buttonAnimIndex === 2 ? 'on' : ''">
-				<i class="ph-chats-teardrop-bold ph-lg"></i><span v-if="$i?.hasUnreadMessagingMessage" class="indicator"><i class="ph-circle-fill"></i></span>
+				<i class="ph-chats-teardrop ph-bold ph-lg"></i><span v-if="$i?.hasUnreadMessagingMessage" class="indicator"><i class="ph-circle-fill"></i></span>
 			</div>
 		</button>
 		<button class="button widget _button" @click="widgetsShowing = true">
 			<div class="button-wrapper">
-				<i class="ph-stack-bold ph-lg"></i>
+				<i class="ph-stack ph-bold ph-lg"></i>
 			</div>
 		</button>
 	</div>
 
-	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'index'" ref="postButton" class="postButton button post _button" @click="os.post()"><i class="ph-pencil-bold ph-lg"></i></button>
+	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'index'" ref="postButton" class="postButton button post _button" @click="os.post()"><i class="ph-pencil ph-bold ph-lg"></i></button>
 
 	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
 		<div
@@ -196,7 +196,7 @@ const onContextmenu = (ev: MouseEvent) => {
 		type: 'label',
 		text: path,
 	}, {
-		icon: 'ph-browser-bold ph-lg',
+		icon: 'ph-browser ph-bold ph-lg',
 		text: i18n.ts.openInWindow,
 		action: () => {
 			os.pageWindow(path);
diff --git a/packages/client/src/ui/universal.widgets.vue b/packages/client/src/ui/universal.widgets.vue
index d07db8438..2daa6916f 100644
--- a/packages/client/src/ui/universal.widgets.vue
+++ b/packages/client/src/ui/universal.widgets.vue
@@ -2,8 +2,8 @@
 	<div class="efzpzdvf">
 		<MkAd class="a" :prefer="['widget']"/>
 		<XWidgets :edit="editMode" :widgets="defaultStore.reactiveState.widgets.value" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
-		<button v-if="editMode" class="_textButton" style="font-size: 0.9em;" @click="editMode = false"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}</button>
-		<button v-else class="_textButton mk-widget-edit" style="font-size: 0.9em;" @click="editMode = true"><i class="ph-pencil-bold ph-lg"></i> {{ i18n.ts.editWidgets }}</button>
+		<button v-if="editMode" class="_textButton" style="font-size: 0.9em;" @click="editMode = false"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}</button>
+		<button v-else class="_textButton mk-widget-edit" style="font-size: 0.9em;" @click="editMode = true"><i class="ph-pencil ph-bold ph-lg"></i> {{ i18n.ts.editWidgets }}</button>
 	</div>
 </template>
 
diff --git a/packages/client/src/ui/visitor/b.vue b/packages/client/src/ui/visitor/b.vue
index 03186981e..3e72584a0 100644
--- a/packages/client/src/ui/visitor/b.vue
+++ b/packages/client/src/ui/visitor/b.vue
@@ -30,11 +30,11 @@
 
 	<transition :name="$store.state.animation ? 'tray' : ''">
 		<div v-if="showMenu" class="menu">
-			<MkA to="/" class="link" active-class="active"><i class="ph-house-bold ph-lg icon"></i>{{ i18n.ts.home }}</MkA>
-			<MkA to="/explore" class="link" active-class="active"><i class="ph-compass-bold ph-lg icon"></i>{{ i18n.ts.explore }}</MkA>
-			<MkA to="/channels" class="link" active-class="active"><i class="ph-television-bold ph-lg icon"></i>{{ i18n.ts.channel }}</MkA>
-			<MkA to="/pages" class="link" active-class="active"><i class="ph-file-text-bold ph-lg icon"></i>{{ i18n.ts.pages }}</MkA>
-			<MkA to="/gallery" class="link" active-class="active"><i class="ph-image-square-bold ph-lg icon"></i>{{ i18n.ts.gallery }}</MkA>
+			<MkA to="/" class="link" active-class="active"><i class="ph-house ph-bold ph-lg icon"></i>{{ i18n.ts.home }}</MkA>
+			<MkA to="/explore" class="link" active-class="active"><i class="ph-compass ph-bold ph-lg icon"></i>{{ i18n.ts.explore }}</MkA>
+			<MkA to="/channels" class="link" active-class="active"><i class="ph-television ph-bold ph-lg icon"></i>{{ i18n.ts.channel }}</MkA>
+			<MkA to="/pages" class="link" active-class="active"><i class="ph-file-text ph-bold ph-lg icon"></i>{{ i18n.ts.pages }}</MkA>
+			<MkA to="/gallery" class="link" active-class="active"><i class="ph-image-square ph-bold ph-lg icon"></i>{{ i18n.ts.gallery }}</MkA>
 			<div class="action">
 				<button class="_buttonPrimary" @click="signup()">{{ i18n.ts.signup }}</button>
 				<button class="_button" @click="signin()">{{ i18n.ts.login }}</button>
diff --git a/packages/client/src/ui/visitor/header.vue b/packages/client/src/ui/visitor/header.vue
index 779fd0b15..00522134a 100644
--- a/packages/client/src/ui/visitor/header.vue
+++ b/packages/client/src/ui/visitor/header.vue
@@ -2,12 +2,12 @@
 <div class="sqxihjet">
 	<div v-if="narrow === false" class="wide">
 		<div class="content">
-			<MkA to="/" class="link" active-class="active"><i class="ph-house-bold ph-lg icon"></i>{{ i18n.ts.home }}</MkA>
-			<MkA v-if="isTimelineAvailable" to="/timeline" class="link" active-class="active"><i class="ph-chats-circle-bold ph-lg icon"></i>{{ i18n.ts.timeline }}</MkA>
-			<MkA to="/explore" class="link" active-class="active"><i class="ph-compass-bold ph-lg icon"></i>{{ i18n.ts.explore }}</MkA>
-			<MkA to="/channels" class="link" active-class="active"><i class="ph-television-bold ph-lg icon"></i>{{ i18n.ts.channel }}</MkA>
-			<MkA to="/pages" class="link" active-class="active"><i class="ph-file-text-bold ph-lg icon"></i>{{ i18n.ts.pages }}</MkA>
-			<MkA to="/gallery" class="link" active-class="active"><i class="ph-image-square-bold ph-lg icon"></i>{{ i18n.ts.gallery }}</MkA>
+			<MkA to="/" class="link" active-class="active"><i class="ph-house ph-bold ph-lg icon"></i>{{ i18n.ts.home }}</MkA>
+			<MkA v-if="isTimelineAvailable" to="/timeline" class="link" active-class="active"><i class="ph-chats-circle ph-bold ph-lg icon"></i>{{ i18n.ts.timeline }}</MkA>
+			<MkA to="/explore" class="link" active-class="active"><i class="ph-compass ph-bold ph-lg icon"></i>{{ i18n.ts.explore }}</MkA>
+			<MkA to="/channels" class="link" active-class="active"><i class="ph-television ph-bold ph-lg icon"></i>{{ i18n.ts.channel }}</MkA>
+			<MkA to="/pages" class="link" active-class="active"><i class="ph-file-text ph-bold ph-lg icon"></i>{{ i18n.ts.pages }}</MkA>
+			<MkA to="/gallery" class="link" active-class="active"><i class="ph-image-square ph-bold ph-lg icon"></i>{{ i18n.ts.gallery }}</MkA>
 			<div v-if="info" class="page active link">
 				<div class="title">
 					<i v-if="info.icon" class="icon" :class="info.icon"></i>
@@ -18,7 +18,7 @@
 				<button v-if="info.action" class="_button action" @click.stop="info.action.handler"><!-- TODO --></button>
 			</div>
 			<div class="right">
-				<button class="_button search" @click="search()"><i class="ph-magnifying-glass-bold ph-lg icon"></i><span>{{ i18n.ts.search }}</span></button>
+				<button class="_button search" @click="search()"><i class="ph-magnifying-glass ph-bold ph-lg icon"></i><span>{{ i18n.ts.search }}</span></button>
 				<button class="_buttonPrimary signup" @click="signup()">{{ i18n.ts.signup }}</button>
 				<button class="_button login" @click="signin()">{{ i18n.ts.login }}</button>
 			</div>
@@ -26,7 +26,7 @@
 	</div>
 	<div v-else-if="narrow === true" class="narrow">
 		<button class="menu _button" @click="$parent.showMenu = true">
-			<i class="ph-list-bold ph-lg icon"></i>
+			<i class="ph-list ph-bold ph-lg icon"></i>
 		</button>
 		<div v-if="info" class="title">
 			<i v-if="info.icon" class="icon" :class="info.icon"></i>
diff --git a/packages/client/src/widgets/activity.vue b/packages/client/src/widgets/activity.vue
index 79e7f35dc..f514458b9 100644
--- a/packages/client/src/widgets/activity.vue
+++ b/packages/client/src/widgets/activity.vue
@@ -1,7 +1,7 @@
 <template>
 <MkContainer :show-header="widgetProps.showHeader" :naked="widgetProps.transparent" class="mkw-activity">
-	<template #header><i class="ph-chart-bar-bold ph-lg"></i>{{ i18n.ts._widgets.activity }}</template>
-	<template #func><button class="_button" @click="toggleView()"><i class="ph-sort-ascending-bold ph-lg"></i></button></template>
+	<template #header><i class="ph-chart-bar ph-bold ph-lg"></i>{{ i18n.ts._widgets.activity }}</template>
+	<template #func><button class="_button" @click="toggleView()"><i class="ph-sort-ascending ph-bold ph-lg"></i></button></template>
 
 	<div>
 		<MkLoading v-if="fetching"/>
diff --git a/packages/client/src/widgets/aiscript.vue b/packages/client/src/widgets/aiscript.vue
index e3e4b136a..d0eddacbb 100644
--- a/packages/client/src/widgets/aiscript.vue
+++ b/packages/client/src/widgets/aiscript.vue
@@ -1,6 +1,6 @@
 <template>
 <MkContainer :show-header="widgetProps.showHeader" class="mkw-aiscript">
-	<template #header><i class="ph-terminal-window-bold ph-lg"></i>{{ i18n.ts._widgets.aiscript }}</template>
+	<template #header><i class="ph-terminal-window ph-bold ph-lg"></i>{{ i18n.ts._widgets.aiscript }}</template>
 
 	<div class="uylguesu _monospace">
 		<textarea v-model="widgetProps.script" placeholder="(1 + 1)"></textarea>
diff --git a/packages/client/src/widgets/federation.vue b/packages/client/src/widgets/federation.vue
index 706712668..e2937de5e 100644
--- a/packages/client/src/widgets/federation.vue
+++ b/packages/client/src/widgets/federation.vue
@@ -1,6 +1,6 @@
 <template>
 <MkContainer :show-header="widgetProps.showHeader" :foldable="foldable" :scrollable="scrollable" class="mkw-federation">
-	<template #header><i class="ph-planet-bold ph-lg"></i>{{ i18n.ts._widgets.federation }}</template>
+	<template #header><i class="ph-planet ph-bold ph-lg"></i>{{ i18n.ts._widgets.federation }}</template>
 
 	<div class="wbrkwalb">
 		<MkLoading v-if="fetching"/>
diff --git a/packages/client/src/widgets/job-queue.vue b/packages/client/src/widgets/job-queue.vue
index 48e3f03a6..7f04aca59 100644
--- a/packages/client/src/widgets/job-queue.vue
+++ b/packages/client/src/widgets/job-queue.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="mkw-jobQueue _monospace" :class="{ _panel: !widgetProps.transparent }">
 	<div class="inbox">
-		<div class="label">Inbox queue<i v-if="current.inbox.waiting > 0" class="ph-warning-bold ph-lg icon"></i></div>
+		<div class="label">Inbox queue<i v-if="current.inbox.waiting > 0" class="ph-warning ph-bold ph-lg icon"></i></div>
 		<div class="values">
 			<div>
 				<div>Process</div>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	<div class="deliver">
-		<div class="label">Deliver queue<i v-if="current.deliver.waiting > 0" class="ph-warning-bold ph-lg icon"></i></div>
+		<div class="label">Deliver queue<i v-if="current.deliver.waiting > 0" class="ph-warning ph-bold ph-lg icon"></i></div>
 		<div class="values">
 			<div>
 				<div>Process</div>
diff --git a/packages/client/src/widgets/memo.vue b/packages/client/src/widgets/memo.vue
index 3369dff10..140a1960b 100644
--- a/packages/client/src/widgets/memo.vue
+++ b/packages/client/src/widgets/memo.vue
@@ -1,6 +1,6 @@
 <template>
 <MkContainer :show-header="widgetProps.showHeader" class="mkw-memo">
-	<template #header><i class="ph-sticker-bold ph-lg"></i>{{ i18n.ts._widgets.memo }}</template>
+	<template #header><i class="ph-sticker ph-bold ph-lg"></i>{{ i18n.ts._widgets.memo }}</template>
 
 	<div class="otgbylcu">
 		<textarea v-model="text" :placeholder="i18n.ts.placeholder" @input="onChange"></textarea>
diff --git a/packages/client/src/widgets/notifications.vue b/packages/client/src/widgets/notifications.vue
index 4568e6173..86d6035e3 100644
--- a/packages/client/src/widgets/notifications.vue
+++ b/packages/client/src/widgets/notifications.vue
@@ -1,7 +1,7 @@
 <template>
 <MkContainer :style="`height: ${widgetProps.height}px;`" :show-header="widgetProps.showHeader" :scrollable="true" class="mkw-notifications">
-	<template #header><i class="ph-bell-bold ph-lg"></i>{{ i18n.ts.notifications }}</template>
-	<template #func><button class="_button" @click="os.apiWithDialog('notifications/mark-all-as-read');"><i class="ph-check-bold ph-lg"></i></button><button class="_button" @click="configureNotification()"><i class="ph-gear-six-bold ph-lg"></i></button></template>
+	<template #header><i class="ph-bell ph-bold ph-lg"></i>{{ i18n.ts.notifications }}</template>
+	<template #func><button class="_button" @click="os.apiWithDialog('notifications/mark-all-as-read');"><i class="ph-check-bold ph-lg"></i></button><button class="_button" @click="configureNotification()"><i class="ph-gear-six ph-bold ph-lg"></i></button></template>
 	<div>
 		<XNotifications :include-types="widgetProps.includingTypes"/>
 	</div>
diff --git a/packages/client/src/widgets/photos.vue b/packages/client/src/widgets/photos.vue
index 124b9cbbd..bc18cd815 100644
--- a/packages/client/src/widgets/photos.vue
+++ b/packages/client/src/widgets/photos.vue
@@ -1,6 +1,6 @@
 <template>
 <MkContainer :show-header="widgetProps.showHeader" :naked="widgetProps.transparent" :class="$style.root" :data-transparent="widgetProps.transparent ? true : null" class="mkw-photos">
-	<template #header><i class="ph-camera-bold ph-lg"></i>{{ i18n.ts._widgets.photos }}</template>
+	<template #header><i class="ph-camera ph-bold ph-lg"></i>{{ i18n.ts._widgets.photos }}</template>
 
 	<div class="">
 		<MkLoading v-if="fetching"/>
diff --git a/packages/client/src/widgets/rss-ticker.vue b/packages/client/src/widgets/rss-ticker.vue
index e7737a90a..788c3c5c8 100644
--- a/packages/client/src/widgets/rss-ticker.vue
+++ b/packages/client/src/widgets/rss-ticker.vue
@@ -1,7 +1,7 @@
 <template>
 <MkContainer :naked="widgetProps.transparent" :show-header="widgetProps.showHeader" class="mkw-rss-ticker">
-	<template #header><i class="ph-rss-bold ph-lg"></i>RSS</template>
-	<template #func><button class="_button" @click="configure"><i class="ph-gear-six-bold ph-lg"></i></button></template>
+	<template #header><i class="ph-rss ph-bold ph-lg"></i>RSS</template>
+	<template #func><button class="_button" @click="configure"><i class="ph-gear-six ph-bold ph-lg"></i></button></template>
 
 	<div class="ekmkgxbk">
 		<MkLoading v-if="fetching"/>
diff --git a/packages/client/src/widgets/rss.vue b/packages/client/src/widgets/rss.vue
index 50835537b..236d348a9 100644
--- a/packages/client/src/widgets/rss.vue
+++ b/packages/client/src/widgets/rss.vue
@@ -1,7 +1,7 @@
 <template>
 <MkContainer :show-header="widgetProps.showHeader" class="mkw-rss">
-	<template #header><i class="ph-rss-bold ph-lg"></i>RSS</template>
-	<template #func><button class="_button" @click="configure"><i class="ph-gear-six-bold ph-lg"></i></button></template>
+	<template #header><i class="ph-rss ph-bold ph-lg"></i>RSS</template>
+	<template #func><button class="_button" @click="configure"><i class="ph-gear-six ph-bold ph-lg"></i></button></template>
 
 	<div class="ekmkgxbj">
 		<MkLoading v-if="fetching"/>
diff --git a/packages/client/src/widgets/server-metric/cpu.vue b/packages/client/src/widgets/server-metric/cpu.vue
index be5387820..cafebeb1d 100644
--- a/packages/client/src/widgets/server-metric/cpu.vue
+++ b/packages/client/src/widgets/server-metric/cpu.vue
@@ -2,7 +2,7 @@
 <div class="vrvdvrys">
 	<XPie class="pie" :value="usage"/>
 	<div>
-		<p><i class="ph-microchip-bold ph-lg"></i>CPU</p>
+		<p><i class="ph-microchip ph-bold ph-lg"></i>CPU</p>
 		<p>{{ meta.cpu.cores }} Logical cores</p>
 		<p>{{ meta.cpu.model }}</p>
 	</div>
diff --git a/packages/client/src/widgets/server-metric/disk.vue b/packages/client/src/widgets/server-metric/disk.vue
index 21a2a99c1..b16e5db60 100644
--- a/packages/client/src/widgets/server-metric/disk.vue
+++ b/packages/client/src/widgets/server-metric/disk.vue
@@ -2,7 +2,7 @@
 <div class="zbwaqsat">
 	<XPie class="pie" :value="usage"/>
 	<div>
-		<p><i class="ph-hard-drives-bold ph-lg"></i>Disk</p>
+		<p><i class="ph-hard-drives ph-bold ph-lg"></i>Disk</p>
 		<p>Total: {{ bytes(total, 1) }}</p>
 		<p>Free: {{ bytes(available, 1) }}</p>
 		<p>Used: {{ bytes(used, 1) }}</p>
diff --git a/packages/client/src/widgets/server-metric/index.vue b/packages/client/src/widgets/server-metric/index.vue
index f8731762a..58a41f2e6 100644
--- a/packages/client/src/widgets/server-metric/index.vue
+++ b/packages/client/src/widgets/server-metric/index.vue
@@ -1,7 +1,7 @@
 <template>
 <MkContainer :show-header="widgetProps.showHeader" :naked="widgetProps.transparent">
-	<template #header><i class="ph-hard-drives-bold ph-lg"></i>{{ i18n.ts._widgets.serverMetric }}</template>
-	<template #func><button class="_button" @click="toggleView()"><i class="ph-sort-ascending-bold ph-lg"></i></button></template>
+	<template #header><i class="ph-hard-drives ph-bold ph-lg"></i>{{ i18n.ts._widgets.serverMetric }}</template>
+	<template #func><button class="_button" @click="toggleView()"><i class="ph-sort-ascending ph-bold ph-lg"></i></button></template>
 
 	<div v-if="meta" class="mkw-serverMetric">
 		<XCpuMemory v-if="widgetProps.view === 0" :connection="connection" :meta="meta"/>
diff --git a/packages/client/src/widgets/server-metric/mem.vue b/packages/client/src/widgets/server-metric/mem.vue
index 7b69a55a4..11ab1b2bf 100644
--- a/packages/client/src/widgets/server-metric/mem.vue
+++ b/packages/client/src/widgets/server-metric/mem.vue
@@ -2,7 +2,7 @@
 <div class="zlxnikvl">
 	<XPie class="pie" :value="usage"/>
 	<div>
-		<p><i class="ph-cpu-bold ph-lg"></i>RAM</p>
+		<p><i class="ph-cpu ph-bold ph-lg"></i>RAM</p>
 		<p>Total: {{ bytes(total, 1) }}</p>
 		<p>Used: {{ bytes(used, 1) }}</p>
 		<p>Free: {{ bytes(free, 1) }}</p>
diff --git a/packages/client/src/widgets/timeline.vue b/packages/client/src/widgets/timeline.vue
index 05080281b..cf6f1b48e 100644
--- a/packages/client/src/widgets/timeline.vue
+++ b/packages/client/src/widgets/timeline.vue
@@ -2,14 +2,14 @@
 <MkContainer :show-header="widgetProps.showHeader" :style="`height: ${widgetProps.height}px;`" :scrollable="true" class="mkw-timeline">
 	<template #header>
 		<button class="_button" @click="choose">
-			<i v-if="widgetProps.src === 'home'" class="ph-house-bold ph-lg"></i>
-			<i v-else-if="widgetProps.src === 'local'" class="ph-chats-circle-bold ph-lg"></i>
-			<i v-else-if="widgetProps.src === 'social'" class="ph-share-network-bold ph-lg"></i>
-			<i v-else-if="widgetProps.src === 'global'" class="ph-planet-bold ph-lg"></i>
-			<i v-else-if="widgetProps.src === 'list'" class="ph-list-bullets-bold ph-lg"></i>
-			<i v-else-if="widgetProps.src === 'antenna'" class="ph-television-bold ph-lg"></i>
+			<i v-if="widgetProps.src === 'home'" class="ph-house ph-bold ph-lg"></i>
+			<i v-else-if="widgetProps.src === 'local'" class="ph-chats-circle ph-bold ph-lg"></i>
+			<i v-else-if="widgetProps.src === 'social'" class="ph-share-network ph-bold ph-lg"></i>
+			<i v-else-if="widgetProps.src === 'global'" class="ph-planet ph-bold ph-lg"></i>
+			<i v-else-if="widgetProps.src === 'list'" class="ph-list-bullets ph-bold ph-lg"></i>
+			<i v-else-if="widgetProps.src === 'antenna'" class="ph-television ph-bold ph-lg"></i>
 			<span style="margin-left: 8px;">{{ widgetProps.src === 'list' ? widgetProps.list.name : widgetProps.src === 'antenna' ? widgetProps.antenna.name : i18n.t('_timelines.' + widgetProps.src) }}</span>
-			<i :class="menuOpened ? 'ph-caret-up-bold ph-lg' : 'ph-caret-down-bold ph-lg'" style="margin-left: 8px;"></i>
+			<i :class="menuOpened ? 'ph-caret-up-bold ph-lg' : 'ph-caret-down ph-bold ph-lg'" style="margin-left: 8px;"></i>
 		</button>
 	</template>
 
@@ -86,7 +86,7 @@ const choose = async (ev) => {
 	]);
 	const antennaItems = antennas.map(antenna => ({
 		text: antenna.name,
-		icon: 'ph-flying-saucer-bold ph-lg',
+		icon: 'ph-flying-saucer ph-bold ph-lg',
 		action: () => {
 			widgetProps.antenna = antenna;
 			setSrc('antenna');
@@ -94,7 +94,7 @@ const choose = async (ev) => {
 	}));
 	const listItems = lists.map(list => ({
 		text: list.name,
-		icon: 'ph-list-bullets-bold ph-lg',
+		icon: 'ph-list-bullets ph-bold ph-lg',
 		action: () => {
 			widgetProps.list = list;
 			setSrc('list');
@@ -102,19 +102,19 @@ const choose = async (ev) => {
 	}));
 	os.popupMenu([{
 		text: i18n.ts._timelines.home,
-		icon: 'ph-house-bold ph-lg',
+		icon: 'ph-house ph-bold ph-lg',
 		action: () => { setSrc('home'); }
 	}, {
 		text: i18n.ts._timelines.local,
-		icon: 'ph-chats-teardrop-bold ph-lg',
+		icon: 'ph-chats-teardrop ph-bold ph-lg',
 		action: () => { setSrc('local'); }
 	}, {
 		text: i18n.ts._timelines.social,
-		icon: 'ph-share-network-bold ph-lg',
+		icon: 'ph-share-network ph-bold ph-lg',
 		action: () => { setSrc('social'); }
 	}, {
 		text: i18n.ts._timelines.global,
-		icon: 'ph-planet-bold ph-lg',
+		icon: 'ph-planet ph-bold ph-lg',
 		action: () => { setSrc('global'); }
 	}, antennaItems.length > 0 ? null : undefined, ...antennaItems, listItems.length > 0 ? null : undefined, ...listItems], ev.currentTarget ?? ev.target).then(() => {
 		menuOpened.value = false;
diff --git a/packages/client/src/widgets/trends.vue b/packages/client/src/widgets/trends.vue
index a1d612c75..4789293d6 100644
--- a/packages/client/src/widgets/trends.vue
+++ b/packages/client/src/widgets/trends.vue
@@ -1,6 +1,6 @@
 <template>
 <MkContainer :show-header="widgetProps.showHeader" class="mkw-trends">
-	<template #header><i class="ph-hash-bold ph-lg"></i>{{ i18n.ts._widgets.trends }}</template>
+	<template #header><i class="ph-hash ph-bold ph-lg"></i>{{ i18n.ts._widgets.trends }}</template>
 
 	<div class="wbrkwala">
 		<MkLoading v-if="fetching"/>
diff --git a/packages/client/src/widgets/user-list.vue b/packages/client/src/widgets/user-list.vue
index 4173f5c36..441845549 100644
--- a/packages/client/src/widgets/user-list.vue
+++ b/packages/client/src/widgets/user-list.vue
@@ -1,7 +1,7 @@
 <template>
 	<MkContainer :show-header="widgetProps.showHeader" class="mkw-userList">
-		<template #header><i class="ph-user-list-bold ph-lg"></i> {{ list ? list.name : i18n.ts._widgets.userList }}</template>
-		<template #func="{ buttonStyleClass }"><button class="_button" :class="buttonStyleClass" @click="configure()"><i class="ph-gear-six-bold ph-lg"></i></button></template>
+		<template #header><i class="ph-user-list ph-bold ph-lg"></i> {{ list ? list.name : i18n.ts._widgets.userList }}</template>
+		<template #func="{ buttonStyleClass }"><button class="_button" :class="buttonStyleClass" @click="configure()"><i class="ph-gear-six ph-bold ph-lg"></i></button></template>
 
 		<div class="wsdlkfj">
 			<div v-if="widgetProps.listId == null" class="init">

From bd15a1d8d61c052cea7e75260ce13921843c48b7 Mon Sep 17 00:00:00 2001
From: Luna <tsuki@noreply.codeberg.org>
Date: Wed, 1 Mar 2023 21:37:49 -0500
Subject: [PATCH 178/582] Enable multipart for masto oauth endpoints to fix
 Ivory

---
 packages/backend/src/server/index.ts | 15 +++++++++------
 packages/client/src/pages/auth.vue   |  5 ++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 6f7dcfd39..92f1c549d 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -78,6 +78,7 @@ const mastoRouter = new Router();
 mastoRouter.use(
 	koaBody({
 		urlencoded: true,
+		multipart: true,
 	}),
 );
 
@@ -171,6 +172,7 @@ mastoRouter.get("/oauth/authorize", async (ctx) => {
 mastoRouter.post("/oauth/token", async (ctx) => {
 	const body: any = ctx.request.body || ctx.request.query;
 	console.log('token-request', body)
+	console.log('token-query', ctx.request.query)
 	let client_id: any = ctx.request.query.client_id;
 	const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
 	const generator = (megalodon as any).default;
@@ -178,13 +180,14 @@ mastoRouter.post("/oauth/token", async (ctx) => {
 	let m = null;
 	let token = null;
 	if (body.code) {
-		m = body.code.match(/^([a-zA-Z0-9]{8})([a-zA-Z0-9]{4})([a-zA-Z0-9]{4})([a-zA-Z0-9]{4})([a-zA-Z0-9]{12})/);
-		if (!m.length) {
-			ctx.body = { error: "Invalid code" };
-			return;
-		}
-		token = `${m[1]}-${m[2]}-${m[3]}-${m[4]}-${m[5]}`
+		//m = body.code.match(/^([a-zA-Z0-9]{8})([a-zA-Z0-9]{4})([a-zA-Z0-9]{4})([a-zA-Z0-9]{4})([a-zA-Z0-9]{12})/);
+		//if (!m.length) {
+		//	ctx.body = { error: "Invalid code" };
+		//	return;
+		//}
+		//token = `${m[1]}-${m[2]}-${m[3]}-${m[4]}-${m[5]}`
 		console.log(body.code, token)
+		token = body.code
 	}
 	if (client_id instanceof Array) {
 		client_id = client_id.toString();
diff --git a/packages/client/src/pages/auth.vue b/packages/client/src/pages/auth.vue
index b7ea082c6..2b4c67ba7 100644
--- a/packages/client/src/pages/auth.vue
+++ b/packages/client/src/pages/auth.vue
@@ -88,11 +88,10 @@ export default defineComponent({
 			const getUrlParams = () => window.location.search.substring(1).split('&').reduce((result, query) => { const [k, v] = query.split('='); result[k] = decodeURI(v); return result; }, {});
 			const isMastodon = !!getUrlParams().mastodon
 			if (this.session.app.callbackUrl && isMastodon) {
-				const state = getUrlParams().state
-				const stateParam = `&state=${state}`
+				const stateParam = !!getUrlParams().state ? `&state=$(getUrlParams().state)` : ''; 
 				const tokenRaw = this.session.token
 				const token = tokenRaw.replaceAll('-', '')
-				location.href = `${this.session.app.callbackUrl}?code=${token}${stateParam}`;
+				location.href = `${this.session.app.callbackUrl}?code=${tokenRaw}${stateParam}`;
 			} else if (this.session.app.callbackUrl) {
 				const url = new URL(this.session.app.callbackUrl);
 				if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:'].includes(url.protocol)) throw new Error('invalid url');

From 07d45c6a703085ec593e1928d51e1c669d1adc93 Mon Sep 17 00:00:00 2001
From: Luna <tsuki@noreply.codeberg.org>
Date: Wed, 1 Mar 2023 23:45:34 -0500
Subject: [PATCH 179/582] Convert limit parameter to int for certain Mastodon
 account endpoints

---
 .../backend/src/server/api/mastodon/endpoints/account.ts     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 312e38135..3e9da5750 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -42,6 +42,7 @@ export function apiAccountMastodon(router: Router): void {
 				sensitive: false,
 				language: "",
 			};
+			console.log(acct);
 			ctx.body = acct;
 		} catch (e: any) {
 			console.error(e);
@@ -126,7 +127,7 @@ export function apiAccountMastodon(router: Router): void {
 			try {
 				const data = await client.getAccountFollowers(
 					ctx.params.id,
-					ctx.query as any,
+					limitToInt(ctx.query as any),
 				);
 				ctx.body = data.data;
 			} catch (e: any) {
@@ -146,7 +147,7 @@ export function apiAccountMastodon(router: Router): void {
 			try {
 				const data = await client.getAccountFollowing(
 					ctx.params.id,
-					ctx.query as any,
+					limitToInt(ctx.query as any),
 				);
 				ctx.body = data.data;
 			} catch (e: any) {

From 36566d3dfe7c6b2f98e7f90f4f96731ce92629d5 Mon Sep 17 00:00:00 2001
From: Luna <tsuki@noreply.codeberg.org>
Date: Thu, 2 Mar 2023 17:21:14 -0500
Subject: [PATCH 180/582] Clean up auth.vue

---
 packages/client/src/pages/auth.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/client/src/pages/auth.vue b/packages/client/src/pages/auth.vue
index 2b4c67ba7..4ad7d08c6 100644
--- a/packages/client/src/pages/auth.vue
+++ b/packages/client/src/pages/auth.vue
@@ -89,9 +89,7 @@ export default defineComponent({
 			const isMastodon = !!getUrlParams().mastodon
 			if (this.session.app.callbackUrl && isMastodon) {
 				const stateParam = !!getUrlParams().state ? `&state=$(getUrlParams().state)` : ''; 
-				const tokenRaw = this.session.token
-				const token = tokenRaw.replaceAll('-', '')
-				location.href = `${this.session.app.callbackUrl}?code=${tokenRaw}${stateParam}`;
+				location.href = `${this.session.app.callbackUrl}?code=${this.session.token}${stateParam}`;
 			} else if (this.session.app.callbackUrl) {
 				const url = new URL(this.session.app.callbackUrl);
 				if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:'].includes(url.protocol)) throw new Error('invalid url');

From 2d7225a179ae7818d429affd13ed03f5fcee08ab Mon Sep 17 00:00:00 2001
From: Luna <tsuki@noreply.codeberg.org>
Date: Thu, 2 Mar 2023 22:29:28 -0500
Subject: [PATCH 181/582] Proxy object IDs for Mastodon API to prevent Calckey
 ID format incompatibilities

---
 packages/backend/src/server/api/index.ts      |  26 +++
 .../server/api/mastodon/endpoints/account.ts  | 170 +++++++++++++-----
 2 files changed, 151 insertions(+), 45 deletions(-)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index 96b03a4f6..aa6507743 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -22,6 +22,32 @@ import github from "./service/github.js";
 import twitter from "./service/twitter.js";
 import { koaBody } from "koa-body";
 
+export enum IdType {
+	CalckeyId,
+	MastodonId
+};
+
+export function convertId(idIn: string, idConvertTo: IdType ) {
+	let idArray = []
+	switch (idConvertTo) {
+		case IdType.CalckeyId:
+			idArray = [...idIn].map(item => item.charCodeAt(0));
+			idArray = idArray.map(item => {
+				if (item.toString().length < 3) {
+					return `0${item.toString()}`
+				}
+				else return item.toString()
+			});
+			return idArray.join('');
+		case IdType.MastodonId:
+			for (let i = 0; i < idIn.length; i += 3) {
+				idArray.push(idIn.slice(i, i+3));
+			}
+			idArray = idArray.map(item => String.fromCharCode(item));
+			return idArray.join('');
+	}
+};
+
 // Init app
 const app = new Koa();
 
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 3e9da5750..1c5e31fe8 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -4,8 +4,9 @@ import Router from "@koa/router";
 import { FindOptionsWhere, IsNull } from "typeorm";
 import { getClient } from "../ApiMastodonCompatibleService.js";
 import { argsToBools, limitToInt } from "./timeline.js";
+import { convertId, IdType } from "../../index.js";
 
-const relationshopModel = {
+const relationshipModel = {
 	id: "",
 	following: false,
 	followed_by: false,
@@ -29,7 +30,8 @@ export function apiAccountMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.verifyAccountCredentials();
-			const acct = data.data;
+			let acct = data.data;
+			acct.id = convertId(acct.id, IdType.MastodonId);
 			acct.url = `${BASE_URL}/@${acct.url}`;
 			acct.note = "";
 			acct.avatar_static = acct.avatar;
@@ -59,7 +61,9 @@ export function apiAccountMastodon(router: Router): void {
 			const data = await client.updateCredentials(
 				(ctx.request as any).body as any,
 			);
-			ctx.body = data.data;
+			let resp = data.data;
+			resp.id = convertId(resp.id, IdType.MastodonId);
+			ctx.body = resp;
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -72,8 +76,10 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.search((request.query as any).acct, 'accounts');
-			ctx.body = data.data.accounts[0];
+			const data = await client.search((ctx.request.query as any).acct, 'accounts');
+			let resp = data.data.accounts[0];
+			resp.id = convertId(resp.id, IdType.MastodonId);
+			ctx.body = resp;
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -88,8 +94,11 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.getAccount(ctx.params.id);
-				ctx.body = data.data;
+				const calcId = convertId(ctx.params.id, IdType.CalckeyId);
+				const data = await client.getAccount(calcId);
+				let resp = data.data;
+				resp.id = convertId(resp.id, IdType.MastodonId);
+				ctx.body = resp;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -106,10 +115,20 @@ export function apiAccountMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.getAccountStatuses(
-					ctx.params.id,
+					convertId(ctx.params.id, IdType.CalckeyId),
 					argsToBools(limitToInt(ctx.query as any)),
 				);
-				ctx.body = data.data;
+				let resp = data.data;
+				for (let statIdx = 0; statIdx < resp.length; statIdx++) {
+					resp[statIdx].id = convertId(resp[statIdx].id, IdType.MastodonId);
+					resp[statIdx].in_reply_to_account_id = resp[statIdx].in_reply_to_account_id ? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId) : null;
+					resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id ? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId) : null;
+					let mentions = resp[statIdx].mentions
+					for (let mtnIdx = 0; mtnIdx < mentions.length; mtnIdx++) {
+						resp[statIdx].mentions[mtnIdx].id = convertId(mentions[mtnIdx].id, IdType.MastodonId);
+					}
+				}
+				ctx.body = resp;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -126,10 +145,14 @@ export function apiAccountMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.getAccountFollowers(
-					ctx.params.id,
+					convertId(ctx.params.id, IdType.CalckeyId),
 					limitToInt(ctx.query as any),
 				);
-				ctx.body = data.data;
+				let resp = data.data;
+				for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
+					resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
+				}
+				ctx.body = resp;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -146,10 +169,14 @@ export function apiAccountMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.getAccountFollowing(
-					ctx.params.id,
+					convertId(ctx.params.id, IdType.CalckeyId),
 					limitToInt(ctx.query as any),
 				);
-				ctx.body = data.data;
+				let resp = data.data;
+				for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
+					resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
+				}
+				ctx.body = resp;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -182,10 +209,11 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.followAccount(ctx.params.id);
-				const acct = data.data;
+				const data = await client.followAccount(convertId(ctx.params.id, IdType.CalckeyId));
+				let acct = data.data;
 				acct.following = true;
-				ctx.body = data.data;
+				acct.id = convertId(acct.id, IdType.MastodonId);
+				ctx.body = acct;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -201,10 +229,11 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.unfollowAccount(ctx.params.id);
-				const acct = data.data;
+				const data = await client.unfollowAccount(convertId(ctx.params.id, IdType.CalckeyId));
+				let acct = data.data;
+				acct.id = convertId(acct.id, IdType.MastodonId);
 				acct.following = false;
-				ctx.body = data.data;
+				ctx.body = acct;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -220,8 +249,10 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.blockAccount(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.blockAccount(convertId(ctx.params.id, IdType.CalckeyId));
+				let resp = data.data;
+				resp.id = convertId(resp.id, IdType.MastodonId);
+				ctx.body = resp;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -237,8 +268,10 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.unblockAccount(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.unblockAccount(convertId(ctx.params.id, IdType.MastodonId));
+				let resp = data.data;
+				resp.id = convertId(resp.id, IdType.MastodonId);
+				ctx.body = resp;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -255,10 +288,12 @@ export function apiAccountMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const data = await client.muteAccount(
-					ctx.params.id,
+					convertId(ctx.params.id, IdType.CalckeyId),
 					(ctx.request as any).body as any,
 				);
-				ctx.body = data.data;
+				let resp = data.data;
+				resp.id = convertId(resp.id, IdType.MastodonId);
+				ctx.body = resp;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -274,8 +309,10 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.unmuteAccount(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.unmuteAccount(convertId(ctx.params.id, IdType.CalckeyId));
+				let resp = data.data;
+				resp.id = convertId(resp.id, IdType.MastodonId);
+				ctx.body = resp;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -291,16 +328,23 @@ export function apiAccountMastodon(router: Router): void {
 		let users;
 		try {
 			// TODO: this should be body
-			const idsRaw = ctx.request.query ? ctx.request.query["id[]"] : null;
-			const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw;
+			let ids = ctx.request.query ? ctx.request.query["id[]"] : null;
+			if (typeof ids === "string") {
+				ids = [ids];
+			}
 			users = ids;
-			relationshopModel.id = idsRaw?.toString() || "1";
-			if (!idsRaw) {
-				ctx.body = [relationshopModel];
+			relationshipModel.id = ids?.toString() || "1";
+			if (!ids) {
+				ctx.body = [relationshipModel];
 				return;
 			}
+			
 			const data = await client.getRelationships(ids);
-			ctx.body = data.data;
+			let resp = data.data;
+			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
+				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
+			}
+			ctx.body = resp;
 		} catch (e: any) {
 			console.error(e);
 			let data = e.response.data;
@@ -316,7 +360,17 @@ export function apiAccountMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = (await client.getBookmarks(ctx.query as any)) as any;
-			ctx.body = data.data;
+			let resp = data.data;
+			for (let statIdx = 0; statIdx < resp.length; statIdx++) {
+				resp[statIdx].id = convertId(resp[statIdx].id, IdType.MastodonId);
+				resp[statIdx].in_reply_to_account_id = resp[statIdx].in_reply_to_account_id ? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId) : null;
+				resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id ? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId) : null;
+				let mentions = resp[statIdx].mentions
+				for (let mtnIdx = 0; mtnIdx < mentions.length; mtnIdx++) {
+					resp[statIdx].mentions[mtnIdx].id = convertId(mentions[mtnIdx].id, IdType.MastodonId);
+				}
+			}
+			ctx.body = resp;
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -330,7 +384,17 @@ export function apiAccountMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.getFavourites(ctx.query as any);
-			ctx.body = data.data;
+			let resp = data.data;
+			for (let statIdx = 0; statIdx < resp.length; statIdx++) {
+				resp[statIdx].id = convertId(resp[statIdx].id, IdType.MastodonId);
+				resp[statIdx].in_reply_to_account_id = resp[statIdx].in_reply_to_account_id ? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId) : null;
+				resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id ? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId) : null;
+				let mentions = resp[statIdx].mentions
+				for (let mtnIdx = 0; mtnIdx < mentions.length; mtnIdx++) {
+					resp[statIdx].mentions[mtnIdx].id = convertId(mentions[mtnIdx].id, IdType.MastodonId);
+				}
+			}
+			ctx.body = resp;
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -344,7 +408,11 @@ export function apiAccountMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.getMutes(ctx.query as any);
-			ctx.body = data.data;
+			let resp = data.data;
+			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
+				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
+			}
+			ctx.body = resp;
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -358,7 +426,11 @@ export function apiAccountMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			const data = await client.getBlocks(ctx.query as any);
-			ctx.body = data.data;
+			let resp = data.data;
+			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
+				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
+			}
+			ctx.body = resp;
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -366,7 +438,7 @@ export function apiAccountMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
-	router.get("/v1/follow_ctxs", async (ctx) => {
+	router.get("/v1/follow_requests", async (ctx) => {
 		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
@@ -374,7 +446,11 @@ export function apiAccountMastodon(router: Router): void {
 			const data = await client.getFollowRequests(
 				((ctx.query as any) || { limit: 20 }).limit,
 			);
-			ctx.body = data.data;
+			let resp = data.data;
+			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
+				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
+			}
+			ctx.body = resp;
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
@@ -383,14 +459,16 @@ export function apiAccountMastodon(router: Router): void {
 		}
 	});
 	router.post<{ Params: { id: string } }>(
-		"/v1/follow_ctxs/:id/authorize",
+		"/v1/follow_requests/:id/authorize",
 		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.acceptFollowRequest(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.acceptFollowRequest(convertId(ctx.params.id, IdType.CalckeyId));
+				let resp = data.data;
+				resp.id = convertId(resp.id, IdType.MastodonId);
+				ctx.body = resp;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);
@@ -400,14 +478,16 @@ export function apiAccountMastodon(router: Router): void {
 		},
 	);
 	router.post<{ Params: { id: string } }>(
-		"/v1/follow_ctxs/:id/reject",
+		"/v1/follow_requests/:id/reject",
 		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.rejectFollowRequest(ctx.params.id);
-				ctx.body = data.data;
+				const data = await client.rejectFollowRequest(convertId(ctx.params.id, IdType.CalckeyId));
+				let resp = data.data;
+				resp.id = convertId(resp.id, IdType.MastodonId);
+				ctx.body = resp;
 			} catch (e: any) {
 				console.error(e);
 				console.error(e.response.data);

From 8cb2efa186cdd4540e305d1951ac28a52fb8efa7 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 11 Mar 2023 13:07:51 -0800
Subject: [PATCH 182/582] fix?

---
 packages/client/package.json   |    5 +-
 packages/client/src/icons.scss | 3833 --------------------------------
 packages/client/src/init.ts    |    3 +-
 packages/client/src/style.scss |   69 +
 pnpm-lock.yaml                 |    7 +
 5 files changed, 82 insertions(+), 3835 deletions(-)
 delete mode 100644 packages/client/src/icons.scss

diff --git a/packages/client/package.json b/packages/client/package.json
index 4289d8049..aecf80758 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -34,9 +34,9 @@
 		"calckey-js": "^0.0.22",
 		"chart.js": "4.1.1",
 		"chartjs-adapter-date-fns": "2.0.1",
+		"chartjs-chart-matrix": "^2.0.1",
 		"chartjs-plugin-gradient": "0.5.1",
 		"chartjs-plugin-zoom": "1.2.1",
-		"chartjs-chart-matrix": "^2.0.1",
 		"city-timezones": "^1.2.1",
 		"compare-versions": "5.0.3",
 		"cropperjs": "2.0.0-beta.2",
@@ -82,5 +82,8 @@
 		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.1.0"
+	},
+	"dependencies": {
+		"@phosphor-icons/web": "^2.0.1"
 	}
 }
diff --git a/packages/client/src/icons.scss b/packages/client/src/icons.scss
deleted file mode 100644
index d5a2e27e8..000000000
--- a/packages/client/src/icons.scss
+++ /dev/null
@@ -1,3833 +0,0 @@
-@font-face {
-  font-family: "Phosphor-Bold";
-  src: url("/static-assets/Phosphor-Bold.woff2") format("woff2");
-  font-weight: normal;
-  font-style: normal;
-}
-/*------------------------
-	base class definition
--------------------------*/
-[class^="ph-"],
-[class*=" ph-"] {
-  display: inline-flex;
-}
-
-[class^="ph-"]:before,
-[class*=" ph-"]:before {
-  font: normal normal normal 1em/1 "Phosphor";
-  color: inherit;
-  flex-shrink: 0;
-  text-transform: none;
-  text-decoration: inherit;
-  text-align: center;
-  /* Better Font Rendering */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-	speak: never;
-}
-/*------------------------
-  change icon size
--------------------------*/
-/* relative units */
-.ph-xxs {
-  font-size: 0.5em;
-}
-.ph-xs {
-  font-size: 0.75em;
-}
-.ph-sm {
-  font-size: 0.875em;
-}
-.ph-lg {
-  font-size: 1.3333em;
-  line-height: 0.75em;
-  vertical-align: -0.0667em;
-}
-.ph-xl {
-  font-size: 1.5em;
-  line-height: 0.6666em;
-  vertical-align: -0.075em;
-}
-.ph-1x {
-  font-size: 1em;
-}
-.ph-2x {
-  font-size: 2em;
-}
-.ph-3x {
-  font-size: 3em;
-}
-.ph-4x {
-  font-size: 4em;
-}
-.ph-5x {
-  font-size: 5em;
-}
-.ph-6x {
-  font-size: 6em;
-}
-.ph-7x {
-  font-size: 7em;
-}
-.ph-8x {
-  font-size: 8em;
-}
-.ph-9x {
-  font-size: 9em;
-}
-.ph-10x {
-  font-size: 10em;
-}
-.ph-fw {
-  text-align: center;
-  width: 1.25em;
-}
-
-/*------------------------
-	icons
--------------------------*/
-
-.ph-bold.ph-address-book:before {
-  content: "\e900";
-}
-.ph-bold.ph-airplane:before {
-  content: "\e901";
-}
-.ph-bold.ph-airplane-in-flight:before {
-  content: "\e902";
-}
-.ph-bold.ph-airplane-landing:before {
-  content: "\e903";
-}
-.ph-bold.ph-airplane-takeoff:before {
-  content: "\e904";
-}
-.ph-bold.ph-airplane-tilt:before {
-  content: "\e905";
-}
-.ph-bold.ph-airplay:before {
-  content: "\e906";
-}
-.ph-bold.ph-air-traffic-control:before {
-  content: "\e907";
-}
-.ph-bold.ph-alarm:before {
-  content: "\e908";
-}
-.ph-bold.ph-alien:before {
-  content: "\e909";
-}
-.ph-bold.ph-align-bottom:before {
-  content: "\e90a";
-}
-.ph-bold.ph-align-bottom-simple:before {
-  content: "\e90b";
-}
-.ph-bold.ph-align-center-horizontal:before {
-  content: "\e90c";
-}
-.ph-bold.ph-align-center-horizontal-simple:before {
-  content: "\e90d";
-}
-.ph-bold.ph-align-center-vertical:before {
-  content: "\e90e";
-}
-.ph-bold.ph-align-center-vertical-simple:before {
-  content: "\e90f";
-}
-.ph-bold.ph-align-left:before {
-  content: "\e910";
-}
-.ph-bold.ph-align-left-simple:before {
-  content: "\e911";
-}
-.ph-bold.ph-align-right:before {
-  content: "\e912";
-}
-.ph-bold.ph-align-right-simple:before {
-  content: "\e913";
-}
-.ph-bold.ph-align-top:before {
-  content: "\e914";
-}
-.ph-bold.ph-align-top-simple:before {
-  content: "\e915";
-}
-.ph-bold.ph-amazon-logo:before {
-  content: "\e916";
-}
-.ph-bold.ph-anchor:before {
-  content: "\e917";
-}
-.ph-bold.ph-anchor-simple:before {
-  content: "\e918";
-}
-.ph-bold.ph-android-logo:before {
-  content: "\e919";
-}
-.ph-bold.ph-angular-logo:before {
-  content: "\e91a";
-}
-.ph-bold.ph-aperture:before {
-  content: "\e91b";
-}
-.ph-bold.ph-apple-logo:before {
-  content: "\e91c";
-}
-.ph-bold.ph-apple-podcasts-logo:before {
-  content: "\e91d";
-}
-.ph-bold.ph-app-store-logo:before {
-  content: "\e91e";
-}
-.ph-bold.ph-app-window:before {
-  content: "\e91f";
-}
-.ph-bold.ph-archive:before {
-  content: "\e920";
-}
-.ph-bold.ph-archive-box:before {
-  content: "\e921";
-}
-.ph-bold.ph-archive-tray:before {
-  content: "\e922";
-}
-.ph-bold.ph-armchair:before {
-  content: "\e923";
-}
-.ph-bold.ph-arrow-arc-left:before {
-  content: "\e924";
-}
-.ph-bold.ph-arrow-arc-right:before {
-  content: "\e925";
-}
-.ph-bold.ph-arrow-bend-double-up-left:before {
-  content: "\e926";
-}
-.ph-bold.ph-arrow-bend-double-up-right:before {
-  content: "\e927";
-}
-.ph-bold.ph-arrow-bend-down-left:before {
-  content: "\e928";
-}
-.ph-bold.ph-arrow-bend-down-right:before {
-  content: "\e929";
-}
-.ph-bold.ph-arrow-bend-left-down:before {
-  content: "\e92a";
-}
-.ph-bold.ph-arrow-bend-left-up:before {
-  content: "\e92b";
-}
-.ph-bold.ph-arrow-bend-right-down:before {
-  content: "\e92c";
-}
-.ph-bold.ph-arrow-bend-right-up:before {
-  content: "\e92d";
-}
-.ph-bold.ph-arrow-bend-up-left:before {
-  content: "\e92e";
-}
-.ph-bold.ph-arrow-bend-up-right:before {
-  content: "\e92f";
-}
-.ph-bold.ph-arrow-circle-down:before {
-  content: "\e930";
-}
-.ph-bold.ph-arrow-circle-down-left:before {
-  content: "\e931";
-}
-.ph-bold.ph-arrow-circle-down-right:before {
-  content: "\e932";
-}
-.ph-bold.ph-arrow-circle-left:before {
-  content: "\e933";
-}
-.ph-bold.ph-arrow-circle-right:before {
-  content: "\e934";
-}
-.ph-bold.ph-arrow-circle-up:before {
-  content: "\e935";
-}
-.ph-bold.ph-arrow-circle-up-left:before {
-  content: "\e936";
-}
-.ph-bold.ph-arrow-circle-up-right:before {
-  content: "\e937";
-}
-.ph-bold.ph-arrow-clockwise:before {
-  content: "\e938";
-}
-.ph-bold.ph-arrow-counter-clockwise:before {
-  content: "\e939";
-}
-.ph-bold.ph-arrow-down:before {
-  content: "\e93a";
-}
-.ph-bold.ph-arrow-down-left:before {
-  content: "\e93b";
-}
-.ph-bold.ph-arrow-down-right:before {
-  content: "\e93c";
-}
-.ph-bold.ph-arrow-elbow-down-left:before {
-  content: "\e93d";
-}
-.ph-bold.ph-arrow-elbow-down-right:before {
-  content: "\e93e";
-}
-.ph-bold.ph-arrow-elbow-left:before {
-  content: "\e93f";
-}
-.ph-bold.ph-arrow-elbow-left-down:before {
-  content: "\e940";
-}
-.ph-bold.ph-arrow-elbow-left-up:before {
-  content: "\e941";
-}
-.ph-bold.ph-arrow-elbow-right:before {
-  content: "\e942";
-}
-.ph-bold.ph-arrow-elbow-right-down:before {
-  content: "\e943";
-}
-.ph-bold.ph-arrow-elbow-right-up:before {
-  content: "\e944";
-}
-.ph-bold.ph-arrow-elbow-up-left:before {
-  content: "\e945";
-}
-.ph-bold.ph-arrow-elbow-up-right:before {
-  content: "\e946";
-}
-.ph-bold.ph-arrow-fat-down:before {
-  content: "\e947";
-}
-.ph-bold.ph-arrow-fat-left:before {
-  content: "\e948";
-}
-.ph-bold.ph-arrow-fat-line-down:before {
-  content: "\e949";
-}
-.ph-bold.ph-arrow-fat-line-left:before {
-  content: "\e94a";
-}
-.ph-bold.ph-arrow-fat-line-right:before {
-  content: "\e94b";
-}
-.ph-bold.ph-arrow-fat-lines-down:before {
-  content: "\e94c";
-}
-.ph-bold.ph-arrow-fat-lines-left:before {
-  content: "\e94d";
-}
-.ph-bold.ph-arrow-fat-lines-right:before {
-  content: "\e94e";
-}
-.ph-bold.ph-arrow-fat-lines-up:before {
-  content: "\e94f";
-}
-.ph-bold.ph-arrow-fat-line-up:before {
-  content: "\e950";
-}
-.ph-bold.ph-arrow-fat-right:before {
-  content: "\e951";
-}
-.ph-bold.ph-arrow-fat-up:before {
-  content: "\e952";
-}
-.ph-bold.ph-arrow-left:before {
-  content: "\e953";
-}
-.ph-bold.ph-arrow-line-down:before {
-  content: "\e954";
-}
-.ph-bold.ph-arrow-line-down-left:before {
-  content: "\e955";
-}
-.ph-bold.ph-arrow-line-down-right:before {
-  content: "\e956";
-}
-.ph-bold.ph-arrow-line-left:before {
-  content: "\e957";
-}
-.ph-bold.ph-arrow-line-right:before {
-  content: "\e958";
-}
-.ph-bold.ph-arrow-line-up:before {
-  content: "\e959";
-}
-.ph-bold.ph-arrow-line-up-left:before {
-  content: "\e95a";
-}
-.ph-bold.ph-arrow-line-up-right:before {
-  content: "\e95b";
-}
-.ph-bold.ph-arrow-right:before {
-  content: "\e95c";
-}
-.ph-bold.ph-arrows-clockwise:before {
-  content: "\e95d";
-}
-.ph-bold.ph-arrows-counter-clockwise:before {
-  content: "\e95e";
-}
-.ph-bold.ph-arrows-down-up:before {
-  content: "\e95f";
-}
-.ph-bold.ph-arrows-horizontal:before {
-  content: "\e960";
-}
-.ph-bold.ph-arrows-in:before {
-  content: "\e961";
-}
-.ph-bold.ph-arrows-in-cardinal:before {
-  content: "\e962";
-}
-.ph-bold.ph-arrows-in-line-horizontal:before {
-  content: "\e963";
-}
-.ph-bold.ph-arrows-in-line-vertical:before {
-  content: "\e964";
-}
-.ph-bold.ph-arrows-in-simple:before {
-  content: "\e965";
-}
-.ph-bold.ph-arrows-left-right:before {
-  content: "\e966";
-}
-.ph-bold.ph-arrows-merge:before {
-  content: "\e967";
-}
-.ph-bold.ph-arrows-out:before {
-  content: "\e968";
-}
-.ph-bold.ph-arrows-out-cardinal:before {
-  content: "\e969";
-}
-.ph-bold.ph-arrows-out-line-horizontal:before {
-  content: "\e96a";
-}
-.ph-bold.ph-arrows-out-line-vertical:before {
-  content: "\e96b";
-}
-.ph-bold.ph-arrows-out-simple:before {
-  content: "\e96c";
-}
-.ph-bold.ph-arrow-square-down:before {
-  content: "\e96d";
-}
-.ph-bold.ph-arrow-square-down-left:before {
-  content: "\e96e";
-}
-.ph-bold.ph-arrow-square-down-right:before {
-  content: "\e96f";
-}
-.ph-bold.ph-arrow-square-in:before {
-  content: "\e970";
-}
-.ph-bold.ph-arrow-square-left:before {
-  content: "\e971";
-}
-.ph-bold.ph-arrow-square-out:before {
-  content: "\e972";
-}
-.ph-bold.ph-arrow-square-right:before {
-  content: "\e973";
-}
-.ph-bold.ph-arrow-square-up:before {
-  content: "\e974";
-}
-.ph-bold.ph-arrow-square-up-left:before {
-  content: "\e975";
-}
-.ph-bold.ph-arrow-square-up-right:before {
-  content: "\e976";
-}
-.ph-bold.ph-arrows-split:before {
-  content: "\e977";
-}
-.ph-bold.ph-arrows-vertical:before {
-  content: "\e978";
-}
-.ph-bold.ph-arrow-u-down-left:before {
-  content: "\e979";
-}
-.ph-bold.ph-arrow-u-down-right:before {
-  content: "\e97a";
-}
-.ph-bold.ph-arrow-u-left-down:before {
-  content: "\e97b";
-}
-.ph-bold.ph-arrow-u-left-up:before {
-  content: "\e97c";
-}
-.ph-bold.ph-arrow-up:before {
-  content: "\e97d";
-}
-.ph-bold.ph-arrow-up-left:before {
-  content: "\e97e";
-}
-.ph-bold.ph-arrow-up-right:before {
-  content: "\e97f";
-}
-.ph-bold.ph-arrow-u-right-down:before {
-  content: "\e980";
-}
-.ph-bold.ph-arrow-u-right-up:before {
-  content: "\e981";
-}
-.ph-bold.ph-arrow-u-up-left:before {
-  content: "\e982";
-}
-.ph-bold.ph-arrow-u-up-right:before {
-  content: "\e983";
-}
-.ph-bold.ph-article:before {
-  content: "\e984";
-}
-.ph-bold.ph-article-medium:before {
-  content: "\e985";
-}
-.ph-bold.ph-article-ny-times:before {
-  content: "\e986";
-}
-.ph-bold.ph-asterisk:before {
-  content: "\e987";
-}
-.ph-bold.ph-asterisk-simple:before {
-  content: "\e988";
-}
-.ph-bold.ph-at:before {
-  content: "\e989";
-}
-.ph-bold.ph-atom:before {
-  content: "\e98a";
-}
-.ph-bold.ph-baby:before {
-  content: "\e98b";
-}
-.ph-bold.ph-backpack:before {
-  content: "\e98c";
-}
-.ph-bold.ph-backspace:before {
-  content: "\e98d";
-}
-.ph-bold.ph-bag:before {
-  content: "\e98e";
-}
-.ph-bold.ph-bag-simple:before {
-  content: "\e98f";
-}
-.ph-bold.ph-balloon:before {
-  content: "\e990";
-}
-.ph-bold.ph-bandaids:before {
-  content: "\e991";
-}
-.ph-bold.ph-bank:before {
-  content: "\e992";
-}
-.ph-bold.ph-barbell:before {
-  content: "\e993";
-}
-.ph-bold.ph-barcode:before {
-  content: "\e994";
-}
-.ph-bold.ph-barricade:before {
-  content: "\e995";
-}
-.ph-bold.ph-baseball:before {
-  content: "\e996";
-}
-.ph-bold.ph-baseball-cap:before {
-  content: "\e997";
-}
-.ph-bold.ph-basketball:before {
-  content: "\e998";
-}
-.ph-bold.ph-basket:before {
-  content: "\e999";
-}
-.ph-bold.ph-bathtub:before {
-  content: "\e99a";
-}
-.ph-bold.ph-battery-charging:before {
-  content: "\e99b";
-}
-.ph-bold.ph-battery-charging-vertical:before {
-  content: "\e99c";
-}
-.ph-bold.ph-battery-empty:before {
-  content: "\e99d";
-}
-.ph-bold.ph-battery-full:before {
-  content: "\e99e";
-}
-.ph-bold.ph-battery-high:before {
-  content: "\e99f";
-}
-.ph-bold.ph-battery-low:before {
-  content: "\e9a0";
-}
-.ph-bold.ph-battery-medium:before {
-  content: "\e9a1";
-}
-.ph-bold.ph-battery-plus:before {
-  content: "\e9a2";
-}
-.ph-bold.ph-battery-plus-vertical:before {
-  content: "\e9a3";
-}
-.ph-bold.ph-battery-vertical-empty:before {
-  content: "\e9a4";
-}
-.ph-bold.ph-battery-vertical-full:before {
-  content: "\e9a5";
-}
-.ph-bold.ph-battery-vertical-high:before {
-  content: "\e9a6";
-}
-.ph-bold.ph-battery-vertical-low:before {
-  content: "\e9a7";
-}
-.ph-bold.ph-battery-vertical-medium:before {
-  content: "\e9a8";
-}
-.ph-bold.ph-battery-warning:before {
-  content: "\e9a9";
-}
-.ph-bold.ph-battery-warning-vertical:before {
-  content: "\e9aa";
-}
-.ph-bold.ph-bed:before {
-  content: "\e9ab";
-}
-.ph-bold.ph-beer-bottle:before {
-  content: "\e9ac";
-}
-.ph-bold.ph-beer-stein:before {
-  content: "\e9ad";
-}
-.ph-bold.ph-behance-logo:before {
-  content: "\e9ae";
-}
-.ph-bold.ph-bell:before {
-  content: "\e9af";
-}
-.ph-bold.ph-bell-ringing:before {
-  content: "\e9b0";
-}
-.ph-bold.ph-bell-simple:before {
-  content: "\e9b1";
-}
-.ph-bold.ph-bell-simple-ringing:before {
-  content: "\e9b2";
-}
-.ph-bold.ph-bell-simple-slash:before {
-  content: "\e9b3";
-}
-.ph-bold.ph-bell-simple-z:before {
-  content: "\e9b4";
-}
-.ph-bold.ph-bell-slash:before {
-  content: "\e9b5";
-}
-.ph-bold.ph-bell-z:before {
-  content: "\e9b6";
-}
-.ph-bold.ph-bezier-curve:before {
-  content: "\e9b7";
-}
-.ph-bold.ph-bicycle:before {
-  content: "\e9b8";
-}
-.ph-bold.ph-binoculars:before {
-  content: "\e9b9";
-}
-.ph-bold.ph-bird:before {
-  content: "\e9ba";
-}
-.ph-bold.ph-bluetooth:before {
-  content: "\e9bb";
-}
-.ph-bold.ph-bluetooth-connected:before {
-  content: "\e9bc";
-}
-.ph-bold.ph-bluetooth-slash:before {
-  content: "\e9bd";
-}
-.ph-bold.ph-bluetooth-x:before {
-  content: "\e9be";
-}
-.ph-bold.ph-boat:before {
-  content: "\e9bf";
-}
-.ph-bold.ph-bone:before {
-  content: "\e9c0";
-}
-.ph-bold.ph-book:before {
-  content: "\e9c1";
-}
-.ph-bold.ph-book-bookmark:before {
-  content: "\e9c2";
-}
-.ph-bold.ph-bookmark:before {
-  content: "\e9c3";
-}
-.ph-bold.ph-bookmarks:before {
-  content: "\e9c4";
-}
-.ph-bold.ph-bookmark-simple:before {
-  content: "\e9c5";
-}
-.ph-bold.ph-bookmarks-simple:before {
-  content: "\e9c6";
-}
-.ph-bold.ph-book-open:before {
-  content: "\e9c7";
-}
-.ph-bold.ph-book-open-text:before {
-  content: "\e9c8";
-}
-.ph-bold.ph-books:before {
-  content: "\e9c9";
-}
-.ph-bold.ph-boot:before {
-  content: "\e9ca";
-}
-.ph-bold.ph-bounding-box:before {
-  content: "\e9cb";
-}
-.ph-bold.ph-bowl-food:before {
-  content: "\e9cc";
-}
-.ph-bold.ph-brackets-angle:before {
-  content: "\e9cd";
-}
-.ph-bold.ph-brackets-curly:before {
-  content: "\e9ce";
-}
-.ph-bold.ph-brackets-round:before {
-  content: "\e9cf";
-}
-.ph-bold.ph-brackets-square:before {
-  content: "\e9d0";
-}
-.ph-bold.ph-brain:before {
-  content: "\e9d1";
-}
-.ph-bold.ph-brandy:before {
-  content: "\e9d2";
-}
-.ph-bold.ph-bridge:before {
-  content: "\e9d3";
-}
-.ph-bold.ph-briefcase:before {
-  content: "\e9d4";
-}
-.ph-bold.ph-briefcase-metal:before {
-  content: "\e9d5";
-}
-.ph-bold.ph-broadcast:before {
-  content: "\e9d6";
-}
-.ph-bold.ph-broom:before {
-  content: "\e9d7";
-}
-.ph-bold.ph-browser:before {
-  content: "\e9d8";
-}
-.ph-bold.ph-browsers:before {
-  content: "\e9d9";
-}
-.ph-bold.ph-bug-beetle:before {
-  content: "\e9da";
-}
-.ph-bold.ph-bug:before {
-  content: "\e9db";
-}
-.ph-bold.ph-bug-droid:before {
-  content: "\e9dc";
-}
-.ph-bold.ph-buildings:before {
-  content: "\e9dd";
-}
-.ph-bold.ph-bus:before {
-  content: "\e9de";
-}
-.ph-bold.ph-butterfly:before {
-  content: "\e9df";
-}
-.ph-bold.ph-cactus:before {
-  content: "\e9e0";
-}
-.ph-bold.ph-cake:before {
-  content: "\e9e1";
-}
-.ph-bold.ph-calculator:before {
-  content: "\e9e2";
-}
-.ph-bold.ph-calendar-blank:before {
-  content: "\e9e3";
-}
-.ph-bold.ph-calendar:before {
-  content: "\e9e4";
-}
-.ph-bold.ph-calendar-check:before {
-  content: "\e9e5";
-}
-.ph-bold.ph-calendar-plus:before {
-  content: "\e9e6";
-}
-.ph-bold.ph-calendar-x:before {
-  content: "\e9e7";
-}
-.ph-bold.ph-call-bell:before {
-  content: "\e9e8";
-}
-.ph-bold.ph-camera:before {
-  content: "\e9e9";
-}
-.ph-bold.ph-camera-plus:before {
-  content: "\e9ea";
-}
-.ph-bold.ph-camera-rotate:before {
-  content: "\e9eb";
-}
-.ph-bold.ph-camera-slash:before {
-  content: "\e9ec";
-}
-.ph-bold.ph-campfire:before {
-  content: "\e9ed";
-}
-.ph-bold.ph-car:before {
-  content: "\e9ee";
-}
-.ph-bold.ph-cardholder:before {
-  content: "\e9ef";
-}
-.ph-bold.ph-cards:before {
-  content: "\e9f0";
-}
-.ph-bold.ph-caret-circle-double-down:before {
-  content: "\e9f1";
-}
-.ph-bold.ph-caret-circle-double-left:before {
-  content: "\e9f2";
-}
-.ph-bold.ph-caret-circle-double-right:before {
-  content: "\e9f3";
-}
-.ph-bold.ph-caret-circle-double-up:before {
-  content: "\e9f4";
-}
-.ph-bold.ph-caret-circle-down:before {
-  content: "\e9f5";
-}
-.ph-bold.ph-caret-circle-left:before {
-  content: "\e9f6";
-}
-.ph-bold.ph-caret-circle-right:before {
-  content: "\e9f7";
-}
-.ph-bold.ph-caret-circle-up:before {
-  content: "\e9f8";
-}
-.ph-bold.ph-caret-circle-up-down:before {
-  content: "\e9f9";
-}
-.ph-bold.ph-caret-double-down:before {
-  content: "\e9fa";
-}
-.ph-bold.ph-caret-double-left:before {
-  content: "\e9fb";
-}
-.ph-bold.ph-caret-double-right:before {
-  content: "\e9fc";
-}
-.ph-bold.ph-caret-double-up:before {
-  content: "\e9fd";
-}
-.ph-bold.ph-caret-down:before {
-  content: "\e9fe";
-}
-.ph-bold.ph-caret-left:before {
-  content: "\e9ff";
-}
-.ph-bold.ph-caret-right:before {
-  content: "\ea00";
-}
-.ph-bold.ph-caret-up:before {
-  content: "\ea01";
-}
-.ph-bold.ph-caret-up-down:before {
-  content: "\ea02";
-}
-.ph-bold.ph-car-profile:before {
-  content: "\ea03";
-}
-.ph-bold.ph-carrot:before {
-  content: "\ea04";
-}
-.ph-bold.ph-car-simple:before {
-  content: "\ea05";
-}
-.ph-bold.ph-cassette-tape:before {
-  content: "\ea06";
-}
-.ph-bold.ph-castle-turret:before {
-  content: "\ea07";
-}
-.ph-bold.ph-cat:before {
-  content: "\ea08";
-}
-.ph-bold.ph-cell-signal-full:before {
-  content: "\ea09";
-}
-.ph-bold.ph-cell-signal-high:before {
-  content: "\ea0a";
-}
-.ph-bold.ph-cell-signal-low:before {
-  content: "\ea0b";
-}
-.ph-bold.ph-cell-signal-medium:before {
-  content: "\ea0c";
-}
-.ph-bold.ph-cell-signal-none:before {
-  content: "\ea0d";
-}
-.ph-bold.ph-cell-signal-slash:before {
-  content: "\ea0e";
-}
-.ph-bold.ph-cell-signal-x:before {
-  content: "\ea0f";
-}
-.ph-bold.ph-certificate:before {
-  content: "\ea10";
-}
-.ph-bold.ph-chair:before {
-  content: "\ea11";
-}
-.ph-bold.ph-chalkboard:before {
-  content: "\ea12";
-}
-.ph-bold.ph-chalkboard-simple:before {
-  content: "\ea13";
-}
-.ph-bold.ph-chalkboard-teacher:before {
-  content: "\ea14";
-}
-.ph-bold.ph-champagne:before {
-  content: "\ea15";
-}
-.ph-bold.ph-charging-station:before {
-  content: "\ea16";
-}
-.ph-bold.ph-chart-bar:before {
-  content: "\ea17";
-}
-.ph-bold.ph-chart-bar-horizontal:before {
-  content: "\ea18";
-}
-.ph-bold.ph-chart-donut:before {
-  content: "\ea19";
-}
-.ph-bold.ph-chart-line:before {
-  content: "\ea1a";
-}
-.ph-bold.ph-chart-line-down:before {
-  content: "\ea1b";
-}
-.ph-bold.ph-chart-line-up:before {
-  content: "\ea1c";
-}
-.ph-bold.ph-chart-pie:before {
-  content: "\ea1d";
-}
-.ph-bold.ph-chart-pie-slice:before {
-  content: "\ea1e";
-}
-.ph-bold.ph-chart-polar:before {
-  content: "\ea1f";
-}
-.ph-bold.ph-chart-scatter:before {
-  content: "\ea20";
-}
-.ph-bold.ph-chat:before {
-  content: "\ea21";
-}
-.ph-bold.ph-chat-centered:before {
-  content: "\ea22";
-}
-.ph-bold.ph-chat-centered-dots:before {
-  content: "\ea23";
-}
-.ph-bold.ph-chat-centered-text:before {
-  content: "\ea24";
-}
-.ph-bold.ph-chat-circle:before {
-  content: "\ea25";
-}
-.ph-bold.ph-chat-circle-dots:before {
-  content: "\ea26";
-}
-.ph-bold.ph-chat-circle-text:before {
-  content: "\ea27";
-}
-.ph-bold.ph-chat-dots:before {
-  content: "\ea28";
-}
-.ph-bold.ph-chats:before {
-  content: "\ea29";
-}
-.ph-bold.ph-chats-circle:before {
-  content: "\ea2a";
-}
-.ph-bold.ph-chats-teardrop:before {
-  content: "\ea2b";
-}
-.ph-bold.ph-chat-teardrop:before {
-  content: "\ea2c";
-}
-.ph-bold.ph-chat-teardrop-dots:before {
-  content: "\ea2d";
-}
-.ph-bold.ph-chat-teardrop-text:before {
-  content: "\ea2e";
-}
-.ph-bold.ph-chat-text:before {
-  content: "\ea2f";
-}
-.ph-bold.ph-check:before {
-  content: "\ea30";
-}
-.ph-bold.ph-check-circle:before {
-  content: "\ea31";
-}
-.ph-bold.ph-check-fat:before {
-  content: "\ea32";
-}
-.ph-bold.ph-checks:before {
-  content: "\ea33";
-}
-.ph-bold.ph-check-square:before {
-  content: "\ea34";
-}
-.ph-bold.ph-check-square-offset:before {
-  content: "\ea35";
-}
-.ph-bold.ph-church:before {
-  content: "\ea36";
-}
-.ph-bold.ph-circle:before {
-  content: "\ea37";
-}
-.ph-bold.ph-circle-dashed:before {
-  content: "\ea38";
-}
-.ph-bold.ph-circle-half:before {
-  content: "\ea39";
-}
-.ph-bold.ph-circle-half-tilt:before {
-  content: "\ea3a";
-}
-.ph-bold.ph-circle-notch:before {
-  content: "\ea3b";
-}
-.ph-bold.ph-circles-four:before {
-  content: "\ea3c";
-}
-.ph-bold.ph-circles-three:before {
-  content: "\ea3d";
-}
-.ph-bold.ph-circles-three-plus:before {
-  content: "\ea3e";
-}
-.ph-bold.ph-circuitry:before {
-  content: "\ea3f";
-}
-.ph-bold.ph-clipboard:before {
-  content: "\ea40";
-}
-.ph-bold.ph-clipboard-text:before {
-  content: "\ea41";
-}
-.ph-bold.ph-clock-afternoon:before {
-  content: "\ea42";
-}
-.ph-bold.ph-clock:before {
-  content: "\ea43";
-}
-.ph-bold.ph-clock-clockwise:before {
-  content: "\ea44";
-}
-.ph-bold.ph-clock-countdown:before {
-  content: "\ea45";
-}
-.ph-bold.ph-clock-counter-clockwise:before {
-  content: "\ea46";
-}
-.ph-bold.ph-closed-captioning:before {
-  content: "\ea47";
-}
-.ph-bold.ph-cloud-arrow-down:before {
-  content: "\ea48";
-}
-.ph-bold.ph-cloud-arrow-up:before {
-  content: "\ea49";
-}
-.ph-bold.ph-cloud:before {
-  content: "\ea4a";
-}
-.ph-bold.ph-cloud-check:before {
-  content: "\ea4b";
-}
-.ph-bold.ph-cloud-fog:before {
-  content: "\ea4c";
-}
-.ph-bold.ph-cloud-lightning:before {
-  content: "\ea4d";
-}
-.ph-bold.ph-cloud-moon:before {
-  content: "\ea4e";
-}
-.ph-bold.ph-cloud-rain:before {
-  content: "\ea4f";
-}
-.ph-bold.ph-cloud-slash:before {
-  content: "\ea50";
-}
-.ph-bold.ph-cloud-snow:before {
-  content: "\ea51";
-}
-.ph-bold.ph-cloud-sun:before {
-  content: "\ea52";
-}
-.ph-bold.ph-cloud-warning:before {
-  content: "\ea53";
-}
-.ph-bold.ph-cloud-x:before {
-  content: "\ea54";
-}
-.ph-bold.ph-club:before {
-  content: "\ea55";
-}
-.ph-bold.ph-coat-hanger:before {
-  content: "\ea56";
-}
-.ph-bold.ph-coda-logo:before {
-  content: "\ea57";
-}
-.ph-bold.ph-code-block:before {
-  content: "\ea58";
-}
-.ph-bold.ph-code:before {
-  content: "\ea59";
-}
-.ph-bold.ph-codepen-logo:before {
-  content: "\ea5a";
-}
-.ph-bold.ph-codesandbox-logo:before {
-  content: "\ea5b";
-}
-.ph-bold.ph-code-simple:before {
-  content: "\ea5c";
-}
-.ph-bold.ph-coffee:before {
-  content: "\ea5d";
-}
-.ph-bold.ph-coin:before {
-  content: "\ea5e";
-}
-.ph-bold.ph-coins:before {
-  content: "\ea5f";
-}
-.ph-bold.ph-coin-vertical:before {
-  content: "\ea60";
-}
-.ph-bold.ph-columns:before {
-  content: "\ea61";
-}
-.ph-bold.ph-command:before {
-  content: "\ea62";
-}
-.ph-bold.ph-compass:before {
-  content: "\ea63";
-}
-.ph-bold.ph-compass-tool:before {
-  content: "\ea64";
-}
-.ph-bold.ph-computer-tower:before {
-  content: "\ea65";
-}
-.ph-bold.ph-confetti:before {
-  content: "\ea66";
-}
-.ph-bold.ph-contactless-payment:before {
-  content: "\ea67";
-}
-.ph-bold.ph-control:before {
-  content: "\ea68";
-}
-.ph-bold.ph-cookie:before {
-  content: "\ea69";
-}
-.ph-bold.ph-cooking-pot:before {
-  content: "\ea6a";
-}
-.ph-bold.ph-copy:before {
-  content: "\ea6b";
-}
-.ph-bold.ph-copyleft:before {
-  content: "\ea6c";
-}
-.ph-bold.ph-copyright:before {
-  content: "\ea6d";
-}
-.ph-bold.ph-copy-simple:before {
-  content: "\ea6e";
-}
-.ph-bold.ph-corners-in:before {
-  content: "\ea6f";
-}
-.ph-bold.ph-corners-out:before {
-  content: "\ea70";
-}
-.ph-bold.ph-couch:before {
-  content: "\ea71";
-}
-.ph-bold.ph-cpu:before {
-  content: "\ea72";
-}
-.ph-bold.ph-credit-card:before {
-  content: "\ea73";
-}
-.ph-bold.ph-crop:before {
-  content: "\ea74";
-}
-.ph-bold.ph-cross:before {
-  content: "\ea75";
-}
-.ph-bold.ph-crosshair:before {
-  content: "\ea76";
-}
-.ph-bold.ph-crosshair-simple:before {
-  content: "\ea77";
-}
-.ph-bold.ph-crown:before {
-  content: "\ea78";
-}
-.ph-bold.ph-crown-simple:before {
-  content: "\ea79";
-}
-.ph-bold.ph-cube:before {
-  content: "\ea7a";
-}
-.ph-bold.ph-cube-focus:before {
-  content: "\ea7b";
-}
-.ph-bold.ph-cube-transparent:before {
-  content: "\ea7c";
-}
-.ph-bold.ph-currency-btc:before {
-  content: "\ea7d";
-}
-.ph-bold.ph-currency-circle-dollar:before {
-  content: "\ea7e";
-}
-.ph-bold.ph-currency-cny:before {
-  content: "\ea7f";
-}
-.ph-bold.ph-currency-dollar:before {
-  content: "\ea80";
-}
-.ph-bold.ph-currency-dollar-simple:before {
-  content: "\ea81";
-}
-.ph-bold.ph-currency-eth:before {
-  content: "\ea82";
-}
-.ph-bold.ph-currency-eur:before {
-  content: "\ea83";
-}
-.ph-bold.ph-currency-gbp:before {
-  content: "\ea84";
-}
-.ph-bold.ph-currency-inr:before {
-  content: "\ea85";
-}
-.ph-bold.ph-currency-jpy:before {
-  content: "\ea86";
-}
-.ph-bold.ph-currency-krw:before {
-  content: "\ea87";
-}
-.ph-bold.ph-currency-kzt:before {
-  content: "\ea88";
-}
-.ph-bold.ph-currency-ngn:before {
-  content: "\ea89";
-}
-.ph-bold.ph-currency-rub:before {
-  content: "\ea8a";
-}
-.ph-bold.ph-cursor:before {
-  content: "\ea8b";
-}
-.ph-bold.ph-cursor-click:before {
-  content: "\ea8c";
-}
-.ph-bold.ph-cursor-text:before {
-  content: "\ea8d";
-}
-.ph-bold.ph-cylinder:before {
-  content: "\ea8e";
-}
-.ph-bold.ph-database:before {
-  content: "\ea8f";
-}
-.ph-bold.ph-desktop:before {
-  content: "\ea90";
-}
-.ph-bold.ph-desktop-tower:before {
-  content: "\ea91";
-}
-.ph-bold.ph-detective:before {
-  content: "\ea92";
-}
-.ph-bold.ph-device-mobile:before {
-  content: "\ea93";
-}
-.ph-bold.ph-device-mobile-camera:before {
-  content: "\ea94";
-}
-.ph-bold.ph-device-mobile-speaker:before {
-  content: "\ea95";
-}
-.ph-bold.ph-devices:before {
-  content: "\ea96";
-}
-.ph-bold.ph-device-tablet:before {
-  content: "\ea97";
-}
-.ph-bold.ph-device-tablet-camera:before {
-  content: "\ea98";
-}
-.ph-bold.ph-device-tablet-speaker:before {
-  content: "\ea99";
-}
-.ph-bold.ph-dev-to-logo:before {
-  content: "\ea9a";
-}
-.ph-bold.ph-diamond:before {
-  content: "\ea9b";
-}
-.ph-bold.ph-diamonds-four:before {
-  content: "\ea9c";
-}
-.ph-bold.ph-dice-five:before {
-  content: "\ea9d";
-}
-.ph-bold.ph-dice-four:before {
-  content: "\ea9e";
-}
-.ph-bold.ph-dice-one:before {
-  content: "\ea9f";
-}
-.ph-bold.ph-dice-six:before {
-  content: "\eaa0";
-}
-.ph-bold.ph-dice-three:before {
-  content: "\eaa1";
-}
-.ph-bold.ph-dice-two:before {
-  content: "\eaa2";
-}
-.ph-bold.ph-disc:before {
-  content: "\eaa3";
-}
-.ph-bold.ph-discord-logo:before {
-  content: "\eaa4";
-}
-.ph-bold.ph-divide:before {
-  content: "\eaa5";
-}
-.ph-bold.ph-dna:before {
-  content: "\eaa6";
-}
-.ph-bold.ph-dog:before {
-  content: "\eaa7";
-}
-.ph-bold.ph-door:before {
-  content: "\eaa8";
-}
-.ph-bold.ph-door-open:before {
-  content: "\eaa9";
-}
-.ph-bold.ph-dot:before {
-  content: "\eaaa";
-}
-.ph-bold.ph-dot-outline:before {
-  content: "\eaab";
-}
-.ph-bold.ph-dots-nine:before {
-  content: "\eaac";
-}
-.ph-bold.ph-dots-six:before {
-  content: "\eaad";
-}
-.ph-bold.ph-dots-six-vertical:before {
-  content: "\eaae";
-}
-.ph-bold.ph-dots-three:before {
-  content: "\eaaf";
-}
-.ph-bold.ph-dots-three-circle:before {
-  content: "\eab0";
-}
-.ph-bold.ph-dots-three-circle-vertical:before {
-  content: "\eab1";
-}
-.ph-bold.ph-dots-three-outline:before {
-  content: "\eab2";
-}
-.ph-bold.ph-dots-three-outline-vertical:before {
-  content: "\eab3";
-}
-.ph-bold.ph-dots-three-vertical:before {
-  content: "\eab4";
-}
-.ph-bold.ph-download:before {
-  content: "\eab5";
-}
-.ph-bold.ph-download-simple:before {
-  content: "\eab6";
-}
-.ph-bold.ph-dress:before {
-  content: "\eab7";
-}
-.ph-bold.ph-dribbble-logo:before {
-  content: "\eab8";
-}
-.ph-bold.ph-drop:before {
-  content: "\eab9";
-}
-.ph-bold.ph-dropbox-logo:before {
-  content: "\eaba";
-}
-.ph-bold.ph-drop-half:before {
-  content: "\eabb";
-}
-.ph-bold.ph-drop-half-bottom:before {
-  content: "\eabc";
-}
-.ph-bold.ph-ear:before {
-  content: "\eabd";
-}
-.ph-bold.ph-ear-slash:before {
-  content: "\eabe";
-}
-.ph-bold.ph-egg:before {
-  content: "\eabf";
-}
-.ph-bold.ph-egg-crack:before {
-  content: "\eac0";
-}
-.ph-bold.ph-eject:before {
-  content: "\eac1";
-}
-.ph-bold.ph-eject-simple:before {
-  content: "\eac2";
-}
-.ph-bold.ph-elevator:before {
-  content: "\eac3";
-}
-.ph-bold.ph-engine:before {
-  content: "\eac4";
-}
-.ph-bold.ph-envelope:before {
-  content: "\eac5";
-}
-.ph-bold.ph-envelope-open:before {
-  content: "\eac6";
-}
-.ph-bold.ph-envelope-simple:before {
-  content: "\eac7";
-}
-.ph-bold.ph-envelope-simple-open:before {
-  content: "\eac8";
-}
-.ph-bold.ph-equalizer:before {
-  content: "\eac9";
-}
-.ph-bold.ph-equals:before {
-  content: "\eaca";
-}
-.ph-bold.ph-eraser:before {
-  content: "\eacb";
-}
-.ph-bold.ph-escalator-down:before {
-  content: "\eacc";
-}
-.ph-bold.ph-escalator-up:before {
-  content: "\eacd";
-}
-.ph-bold.ph-exam:before {
-  content: "\eace";
-}
-.ph-bold.ph-exclude:before {
-  content: "\eacf";
-}
-.ph-bold.ph-exclude-square:before {
-  content: "\ead0";
-}
-.ph-bold.ph-export:before {
-  content: "\ead1";
-}
-.ph-bold.ph-eye:before {
-  content: "\ead2";
-}
-.ph-bold.ph-eye-closed:before {
-  content: "\ead3";
-}
-.ph-bold.ph-eyedropper:before {
-  content: "\ead4";
-}
-.ph-bold.ph-eyedropper-sample:before {
-  content: "\ead5";
-}
-.ph-bold.ph-eyeglasses:before {
-  content: "\ead6";
-}
-.ph-bold.ph-eye-slash:before {
-  content: "\ead7";
-}
-.ph-bold.ph-facebook-logo:before {
-  content: "\ead8";
-}
-.ph-bold.ph-face-mask:before {
-  content: "\ead9";
-}
-.ph-bold.ph-factory:before {
-  content: "\eada";
-}
-.ph-bold.ph-faders:before {
-  content: "\eadb";
-}
-.ph-bold.ph-faders-horizontal:before {
-  content: "\eadc";
-}
-.ph-bold.ph-fan:before {
-  content: "\eadd";
-}
-.ph-bold.ph-fast-forward:before {
-  content: "\eade";
-}
-.ph-bold.ph-fast-forward-circle:before {
-  content: "\eadf";
-}
-.ph-bold.ph-feather:before {
-  content: "\eae0";
-}
-.ph-bold.ph-figma-logo:before {
-  content: "\eae1";
-}
-.ph-bold.ph-file-archive:before {
-  content: "\eae2";
-}
-.ph-bold.ph-file-arrow-down:before {
-  content: "\eae3";
-}
-.ph-bold.ph-file-arrow-up:before {
-  content: "\eae4";
-}
-.ph-bold.ph-file-audio:before {
-  content: "\eae5";
-}
-.ph-bold.ph-file:before {
-  content: "\eae6";
-}
-.ph-bold.ph-file-cloud:before {
-  content: "\eae7";
-}
-.ph-bold.ph-file-code:before {
-  content: "\eae8";
-}
-.ph-bold.ph-file-css:before {
-  content: "\eae9";
-}
-.ph-bold.ph-file-csv:before {
-  content: "\eaea";
-}
-.ph-bold.ph-file-dashed:before, .ph ph-bold.ph-file-dotted:before {
-  content: "\eaeb";
-}
-.ph-bold.ph-file-doc:before {
-  content: "\eaec";
-}
-.ph-bold.ph-file-html:before {
-  content: "\eaed";
-}
-.ph-bold.ph-file-image:before {
-  content: "\eaee";
-}
-.ph-bold.ph-file-jpg:before {
-  content: "\eaef";
-}
-.ph-bold.ph-file-js:before {
-  content: "\eaf0";
-}
-.ph-bold.ph-file-jsx:before {
-  content: "\eaf1";
-}
-.ph-bold.ph-file-lock:before {
-  content: "\eaf2";
-}
-.ph-bold.ph-file-magnifying-glass:before, .ph ph-bold.ph-file-search:before {
-  content: "\eaf3";
-}
-.ph-bold.ph-file-minus:before {
-  content: "\eaf4";
-}
-.ph-bold.ph-file-pdf:before {
-  content: "\eaf5";
-}
-.ph-bold.ph-file-plus:before {
-  content: "\eaf6";
-}
-.ph-bold.ph-file-png:before {
-  content: "\eaf7";
-}
-.ph-bold.ph-file-ppt:before {
-  content: "\eaf8";
-}
-.ph-bold.ph-file-rs:before {
-  content: "\eaf9";
-}
-.ph-bold.ph-files:before {
-  content: "\eafa";
-}
-.ph-bold.ph-file-sql:before {
-  content: "\eafb";
-}
-.ph-bold.ph-file-svg:before {
-  content: "\eafc";
-}
-.ph-bold.ph-file-text:before {
-  content: "\eafd";
-}
-.ph-bold.ph-file-ts:before {
-  content: "\eafe";
-}
-.ph-bold.ph-file-tsx:before {
-  content: "\eaff";
-}
-.ph-bold.ph-file-video:before {
-  content: "\eb00";
-}
-.ph-bold.ph-file-vue:before {
-  content: "\eb01";
-}
-.ph-bold.ph-file-x:before {
-  content: "\eb02";
-}
-.ph-bold.ph-file-xls:before {
-  content: "\eb03";
-}
-.ph-bold.ph-file-zip:before {
-  content: "\eb04";
-}
-.ph-bold.ph-film-reel:before {
-  content: "\eb05";
-}
-.ph-bold.ph-film-script:before {
-  content: "\eb06";
-}
-.ph-bold.ph-film-slate:before {
-  content: "\eb07";
-}
-.ph-bold.ph-film-strip:before {
-  content: "\eb08";
-}
-.ph-bold.ph-fingerprint:before {
-  content: "\eb09";
-}
-.ph-bold.ph-fingerprint-simple:before {
-  content: "\eb0a";
-}
-.ph-bold.ph-finn-the-human:before {
-  content: "\eb0b";
-}
-.ph-bold.ph-fire:before {
-  content: "\eb0c";
-}
-.ph-bold.ph-fire-extinguisher:before {
-  content: "\eb0d";
-}
-.ph-bold.ph-fire-simple:before {
-  content: "\eb0e";
-}
-.ph-bold.ph-first-aid:before {
-  content: "\eb0f";
-}
-.ph-bold.ph-first-aid-kit:before {
-  content: "\eb10";
-}
-.ph-bold.ph-fish:before {
-  content: "\eb11";
-}
-.ph-bold.ph-fish-simple:before {
-  content: "\eb12";
-}
-.ph-bold.ph-flag-banner:before {
-  content: "\eb13";
-}
-.ph-bold.ph-flag:before {
-  content: "\eb14";
-}
-.ph-bold.ph-flag-checkered:before {
-  content: "\eb15";
-}
-.ph-bold.ph-flag-pennant:before {
-  content: "\eb16";
-}
-.ph-bold.ph-flame:before {
-  content: "\eb17";
-}
-.ph-bold.ph-flashlight:before {
-  content: "\eb18";
-}
-.ph-bold.ph-flask:before {
-  content: "\eb19";
-}
-.ph-bold.ph-floppy-disk-back:before {
-  content: "\eb1a";
-}
-.ph-bold.ph-floppy-disk:before {
-  content: "\eb1b";
-}
-.ph-bold.ph-flow-arrow:before {
-  content: "\eb1c";
-}
-.ph-bold.ph-flower:before {
-  content: "\eb1d";
-}
-.ph-bold.ph-flower-lotus:before {
-  content: "\eb1e";
-}
-.ph-bold.ph-flower-tulip:before {
-  content: "\eb1f";
-}
-.ph-bold.ph-flying-saucer:before {
-  content: "\eb20";
-}
-.ph-bold.ph-folder:before {
-  content: "\eb21";
-}
-.ph-bold.ph-folder-dashed:before, .ph ph-bold.ph-folder-dotted:before {
-  content: "\eb22";
-}
-.ph-bold.ph-folder-lock:before {
-  content: "\eb23";
-}
-.ph-bold.ph-folder-minus:before {
-  content: "\eb24";
-}
-.ph-bold.ph-folder-notch:before {
-  content: "\eb25";
-}
-.ph-bold.ph-folder-notch-minus:before {
-  content: "\eb26";
-}
-.ph-bold.ph-folder-notch-open:before {
-  content: "\eb27";
-}
-.ph-bold.ph-folder-notch-plus:before {
-  content: "\eb28";
-}
-.ph-bold.ph-folder-open:before {
-  content: "\eb29";
-}
-.ph-bold.ph-folder-plus:before {
-  content: "\eb2a";
-}
-.ph-bold.ph-folders:before {
-  content: "\eb2b";
-}
-.ph-bold.ph-folder-simple:before {
-  content: "\eb2c";
-}
-.ph-bold.ph-folder-simple-dashed:before, .ph ph-bold.ph-folder-simple-dotted:before {
-  content: "\eb2d";
-}
-.ph-bold.ph-folder-simple-lock:before {
-  content: "\eb2e";
-}
-.ph-bold.ph-folder-simple-minus:before {
-  content: "\eb2f";
-}
-.ph-bold.ph-folder-simple-plus:before {
-  content: "\eb30";
-}
-.ph-bold.ph-folder-simple-star:before {
-  content: "\eb31";
-}
-.ph-bold.ph-folder-simple-user:before {
-  content: "\eb32";
-}
-.ph-bold.ph-folder-star:before {
-  content: "\eb33";
-}
-.ph-bold.ph-folder-user:before {
-  content: "\eb34";
-}
-.ph-bold.ph-football:before {
-  content: "\eb35";
-}
-.ph-bold.ph-footprints:before {
-  content: "\eb36";
-}
-.ph-bold.ph-fork-knife:before {
-  content: "\eb37";
-}
-.ph-bold.ph-frame-corners:before {
-  content: "\eb38";
-}
-.ph-bold.ph-framer-logo:before {
-  content: "\eb39";
-}
-.ph-bold.ph-function:before {
-  content: "\eb3a";
-}
-.ph-bold.ph-funnel:before {
-  content: "\eb3b";
-}
-.ph-bold.ph-funnel-simple:before {
-  content: "\eb3c";
-}
-.ph-bold.ph-game-controller:before {
-  content: "\eb3d";
-}
-.ph-bold.ph-garage:before {
-  content: "\eb3e";
-}
-.ph-bold.ph-gas-can:before {
-  content: "\eb3f";
-}
-.ph-bold.ph-gas-pump:before {
-  content: "\eb40";
-}
-.ph-bold.ph-gauge:before {
-  content: "\eb41";
-}
-.ph-bold.ph-gavel:before {
-  content: "\eb42";
-}
-.ph-bold.ph-gear:before {
-  content: "\eb43";
-}
-.ph-bold.ph-gear-fine:before {
-  content: "\eb44";
-}
-.ph-bold.ph-gear-six:before {
-  content: "\eb45";
-}
-.ph-bold.ph-gender-female:before {
-  content: "\eb46";
-}
-.ph-bold.ph-gender-intersex:before {
-  content: "\eb47";
-}
-.ph-bold.ph-gender-male:before {
-  content: "\eb48";
-}
-.ph-bold.ph-gender-neuter:before {
-  content: "\eb49";
-}
-.ph-bold.ph-gender-nonbinary:before {
-  content: "\eb4a";
-}
-.ph-bold.ph-gender-transgender:before {
-  content: "\eb4b";
-}
-.ph-bold.ph-ghost:before {
-  content: "\eb4c";
-}
-.ph-bold.ph-gif:before {
-  content: "\eb4d";
-}
-.ph-bold.ph-gift:before {
-  content: "\eb4e";
-}
-.ph-bold.ph-git-branch:before {
-  content: "\eb4f";
-}
-.ph-bold.ph-git-commit:before {
-  content: "\eb50";
-}
-.ph-bold.ph-git-diff:before {
-  content: "\eb51";
-}
-.ph-bold.ph-git-fork:before {
-  content: "\eb52";
-}
-.ph-bold.ph-github-logo:before {
-  content: "\eb53";
-}
-.ph-bold.ph-gitlab-logo:before {
-  content: "\eb54";
-}
-.ph-bold.ph-gitlab-logo-simple:before {
-  content: "\eb55";
-}
-.ph-bold.ph-git-merge:before {
-  content: "\eb56";
-}
-.ph-bold.ph-git-pull-request:before {
-  content: "\eb57";
-}
-.ph-bold.ph-globe:before {
-  content: "\eb58";
-}
-.ph-bold.ph-globe-hemisphere-east:before {
-  content: "\eb59";
-}
-.ph-bold.ph-globe-hemisphere-west:before {
-  content: "\eb5a";
-}
-.ph-bold.ph-globe-simple:before {
-  content: "\eb5b";
-}
-.ph-bold.ph-globe-stand:before {
-  content: "\eb5c";
-}
-.ph-bold.ph-goggles:before {
-  content: "\eb5d";
-}
-.ph-bold.ph-goodreads-logo:before {
-  content: "\eb5e";
-}
-.ph-bold.ph-google-cardboard-logo:before {
-  content: "\eb5f";
-}
-.ph-bold.ph-google-chrome-logo:before {
-  content: "\eb60";
-}
-.ph-bold.ph-google-drive-logo:before {
-  content: "\eb61";
-}
-.ph-bold.ph-google-logo:before {
-  content: "\eb62";
-}
-.ph-bold.ph-google-photos-logo:before {
-  content: "\eb63";
-}
-.ph-bold.ph-google-play-logo:before {
-  content: "\eb64";
-}
-.ph-bold.ph-google-podcasts-logo:before {
-  content: "\eb65";
-}
-.ph-bold.ph-gradient:before {
-  content: "\eb66";
-}
-.ph-bold.ph-graduation-cap:before {
-  content: "\eb67";
-}
-.ph-bold.ph-grains:before {
-  content: "\eb68";
-}
-.ph-bold.ph-grains-slash:before {
-  content: "\eb69";
-}
-.ph-bold.ph-graph:before {
-  content: "\eb6a";
-}
-.ph-bold.ph-grid-four:before {
-  content: "\eb6b";
-}
-.ph-bold.ph-grid-nine:before {
-  content: "\eb6c";
-}
-.ph-bold.ph-guitar:before {
-  content: "\eb6d";
-}
-.ph-bold.ph-hamburger:before {
-  content: "\eb6e";
-}
-.ph-bold.ph-hammer:before {
-  content: "\eb6f";
-}
-.ph-bold.ph-handbag:before {
-  content: "\eb70";
-}
-.ph-bold.ph-handbag-simple:before {
-  content: "\eb71";
-}
-.ph-bold.ph-hand:before {
-  content: "\eb72";
-}
-.ph-bold.ph-hand-coins:before {
-  content: "\eb73";
-}
-.ph-bold.ph-hand-eye:before {
-  content: "\eb74";
-}
-.ph-bold.ph-hand-fist:before {
-  content: "\eb75";
-}
-.ph-bold.ph-hand-grabbing:before {
-  content: "\eb76";
-}
-.ph-bold.ph-hand-heart:before {
-  content: "\eb77";
-}
-.ph-bold.ph-hand-palm:before {
-  content: "\eb78";
-}
-.ph-bold.ph-hand-pointing:before {
-  content: "\eb79";
-}
-.ph-bold.ph-hands-clapping:before {
-  content: "\eb7a";
-}
-.ph-bold.ph-handshake:before {
-  content: "\eb7b";
-}
-.ph-bold.ph-hand-soap:before {
-  content: "\eb7c";
-}
-.ph-bold.ph-hands-praying:before {
-  content: "\eb7d";
-}
-.ph-bold.ph-hand-swipe-left:before {
-  content: "\eb7e";
-}
-.ph-bold.ph-hand-swipe-right:before {
-  content: "\eb7f";
-}
-.ph-bold.ph-hand-tap:before {
-  content: "\eb80";
-}
-.ph-bold.ph-hand-waving:before {
-  content: "\eb81";
-}
-.ph-bold.ph-hard-drive:before {
-  content: "\eb82";
-}
-.ph-bold.ph-hard-drives:before {
-  content: "\eb83";
-}
-.ph-bold.ph-hash:before {
-  content: "\eb84";
-}
-.ph-bold.ph-hash-straight:before {
-  content: "\eb85";
-}
-.ph-bold.ph-headlights:before {
-  content: "\eb86";
-}
-.ph-bold.ph-headphones:before {
-  content: "\eb87";
-}
-.ph-bold.ph-headset:before {
-  content: "\eb88";
-}
-.ph-bold.ph-heartbeat:before {
-  content: "\eb89";
-}
-.ph-bold.ph-heart:before {
-  content: "\eb8a";
-}
-.ph-bold.ph-heart-break:before {
-  content: "\eb8b";
-}
-.ph-bold.ph-heart-half:before {
-  content: "\eb8c";
-}
-.ph-bold.ph-heart-straight:before {
-  content: "\eb8d";
-}
-.ph-bold.ph-heart-straight-break:before {
-  content: "\eb8e";
-}
-.ph-bold.ph-hexagon:before {
-  content: "\eb8f";
-}
-.ph-bold.ph-high-heel:before {
-  content: "\eb90";
-}
-.ph-bold.ph-highlighter-circle:before {
-  content: "\eb91";
-}
-.ph-bold.ph-hoodie:before {
-  content: "\eb92";
-}
-.ph-bold.ph-horse:before {
-  content: "\eb93";
-}
-.ph-bold.ph-hourglass:before {
-  content: "\eb94";
-}
-.ph-bold.ph-hourglass-high:before {
-  content: "\eb95";
-}
-.ph-bold.ph-hourglass-low:before {
-  content: "\eb96";
-}
-.ph-bold.ph-hourglass-medium:before {
-  content: "\eb97";
-}
-.ph-bold.ph-hourglass-simple:before {
-  content: "\eb98";
-}
-.ph-bold.ph-hourglass-simple-high:before {
-  content: "\eb99";
-}
-.ph-bold.ph-hourglass-simple-low:before {
-  content: "\eb9a";
-}
-.ph-bold.ph-hourglass-simple-medium:before {
-  content: "\eb9b";
-}
-.ph-bold.ph-house:before {
-  content: "\eb9c";
-}
-.ph-bold.ph-house-line:before {
-  content: "\eb9d";
-}
-.ph-bold.ph-house-simple:before {
-  content: "\eb9e";
-}
-.ph-bold.ph-ice-cream:before {
-  content: "\eb9f";
-}
-.ph-bold.ph-identification-badge:before {
-  content: "\eba0";
-}
-.ph-bold.ph-identification-card:before {
-  content: "\eba1";
-}
-.ph-bold.ph-image:before {
-  content: "\eba2";
-}
-.ph-bold.ph-images:before {
-  content: "\eba3";
-}
-.ph-bold.ph-image-square:before {
-  content: "\eba4";
-}
-.ph-bold.ph-images-square:before {
-  content: "\eba5";
-}
-.ph-bold.ph-infinity:before {
-  content: "\eba6";
-}
-.ph-bold.ph-info:before {
-  content: "\eba7";
-}
-.ph-bold.ph-instagram-logo:before {
-  content: "\eba8";
-}
-.ph-bold.ph-intersect:before {
-  content: "\eba9";
-}
-.ph-bold.ph-intersect-square:before {
-  content: "\ebaa";
-}
-.ph-bold.ph-intersect-three:before {
-  content: "\ebab";
-}
-.ph-bold.ph-jeep:before {
-  content: "\ebac";
-}
-.ph-bold.ph-kanban:before {
-  content: "\ebad";
-}
-.ph-bold.ph-keyboard:before {
-  content: "\ebae";
-}
-.ph-bold.ph-key:before {
-  content: "\ebaf";
-}
-.ph-bold.ph-keyhole:before {
-  content: "\ebb0";
-}
-.ph-bold.ph-key-return:before {
-  content: "\ebb1";
-}
-.ph-bold.ph-knife:before {
-  content: "\ebb2";
-}
-.ph-bold.ph-ladder:before {
-  content: "\ebb3";
-}
-.ph-bold.ph-ladder-simple:before {
-  content: "\ebb4";
-}
-.ph-bold.ph-lamp:before {
-  content: "\ebb5";
-}
-.ph-bold.ph-laptop:before {
-  content: "\ebb6";
-}
-.ph-bold.ph-layout:before {
-  content: "\ebb7";
-}
-.ph-bold.ph-leaf:before {
-  content: "\ebb8";
-}
-.ph-bold.ph-lifebuoy:before {
-  content: "\ebb9";
-}
-.ph-bold.ph-lightbulb:before {
-  content: "\ebba";
-}
-.ph-bold.ph-lightbulb-filament:before {
-  content: "\ebbb";
-}
-.ph-bold.ph-lighthouse:before {
-  content: "\ebbc";
-}
-.ph-bold.ph-lightning-a:before {
-  content: "\ebbd";
-}
-.ph-bold.ph-lightning:before {
-  content: "\ebbe";
-}
-.ph-bold.ph-lightning-slash:before {
-  content: "\ebbf";
-}
-.ph-bold.ph-line-segment:before {
-  content: "\ebc0";
-}
-.ph-bold.ph-line-segments:before {
-  content: "\ebc1";
-}
-.ph-bold.ph-link:before {
-  content: "\ebc2";
-}
-.ph-bold.ph-link-break:before {
-  content: "\ebc3";
-}
-.ph-bold.ph-linkedin-logo:before {
-  content: "\ebc4";
-}
-.ph-bold.ph-link-simple:before {
-  content: "\ebc5";
-}
-.ph-bold.ph-link-simple-break:before {
-  content: "\ebc6";
-}
-.ph-bold.ph-link-simple-horizontal:before {
-  content: "\ebc7";
-}
-.ph-bold.ph-link-simple-horizontal-break:before {
-  content: "\ebc8";
-}
-.ph-bold.ph-linux-logo:before {
-  content: "\ebc9";
-}
-.ph-bold.ph-list:before {
-  content: "\ebca";
-}
-.ph-bold.ph-list-bullets:before {
-  content: "\ebcb";
-}
-.ph-bold.ph-list-checks:before {
-  content: "\ebcc";
-}
-.ph-bold.ph-list-dashes:before {
-  content: "\ebcd";
-}
-.ph-bold.ph-list-magnifying-glass:before {
-  content: "\ebce";
-}
-.ph-bold.ph-list-numbers:before {
-  content: "\ebcf";
-}
-.ph-bold.ph-list-plus:before {
-  content: "\ebd0";
-}
-.ph-bold.ph-lock:before {
-  content: "\ebd1";
-}
-.ph-bold.ph-lockers:before {
-  content: "\ebd2";
-}
-.ph-bold.ph-lock-key:before {
-  content: "\ebd3";
-}
-.ph-bold.ph-lock-key-open:before {
-  content: "\ebd4";
-}
-.ph-bold.ph-lock-laminated:before {
-  content: "\ebd5";
-}
-.ph-bold.ph-lock-laminated-open:before {
-  content: "\ebd6";
-}
-.ph-bold.ph-lock-open:before {
-  content: "\ebd7";
-}
-.ph-bold.ph-lock-simple:before {
-  content: "\ebd8";
-}
-.ph-bold.ph-lock-simple-open:before {
-  content: "\ebd9";
-}
-.ph-bold.ph-magic-wand:before {
-  content: "\ebda";
-}
-.ph-bold.ph-magnet:before {
-  content: "\ebdb";
-}
-.ph-bold.ph-magnet-straight:before {
-  content: "\ebdc";
-}
-.ph-bold.ph-magnifying-glass:before {
-  content: "\ebdd";
-}
-.ph-bold.ph-magnifying-glass-minus:before {
-  content: "\ebde";
-}
-.ph-bold.ph-magnifying-glass-plus:before {
-  content: "\ebdf";
-}
-.ph-bold.ph-map-pin:before {
-  content: "\ebe0";
-}
-.ph-bold.ph-map-pin-line:before {
-  content: "\ebe1";
-}
-.ph-bold.ph-map-trifold:before {
-  content: "\ebe2";
-}
-.ph-bold.ph-marker-circle:before {
-  content: "\ebe3";
-}
-.ph-bold.ph-martini:before {
-  content: "\ebe4";
-}
-.ph-bold.ph-mask-happy:before {
-  content: "\ebe5";
-}
-.ph-bold.ph-mask-sad:before {
-  content: "\ebe6";
-}
-.ph-bold.ph-math-operations:before {
-  content: "\ebe7";
-}
-.ph-bold.ph-medal:before {
-  content: "\ebe8";
-}
-.ph-bold.ph-medal-military:before {
-  content: "\ebe9";
-}
-.ph-bold.ph-medium-logo:before {
-  content: "\ebea";
-}
-.ph-bold.ph-megaphone:before {
-  content: "\ebeb";
-}
-.ph-bold.ph-megaphone-simple:before {
-  content: "\ebec";
-}
-.ph-bold.ph-messenger-logo:before {
-  content: "\ebed";
-}
-.ph-bold.ph-meta-logo:before {
-  content: "\ebee";
-}
-.ph-bold.ph-metronome:before {
-  content: "\ebef";
-}
-.ph-bold.ph-microphone:before {
-  content: "\ebf0";
-}
-.ph-bold.ph-microphone-slash:before {
-  content: "\ebf1";
-}
-.ph-bold.ph-microphone-stage:before {
-  content: "\ebf2";
-}
-.ph-bold.ph-microsoft-excel-logo:before {
-  content: "\ebf3";
-}
-.ph-bold.ph-microsoft-outlook-logo:before {
-  content: "\ebf4";
-}
-.ph-bold.ph-microsoft-powerpoint-logo:before {
-  content: "\ebf5";
-}
-.ph-bold.ph-microsoft-teams-logo:before {
-  content: "\ebf6";
-}
-.ph-bold.ph-microsoft-word-logo:before {
-  content: "\ebf7";
-}
-.ph-bold.ph-minus:before {
-  content: "\ebf8";
-}
-.ph-bold.ph-minus-circle:before {
-  content: "\ebf9";
-}
-.ph-bold.ph-minus-square:before {
-  content: "\ebfa";
-}
-.ph-bold.ph-money:before {
-  content: "\ebfb";
-}
-.ph-bold.ph-monitor:before {
-  content: "\ebfc";
-}
-.ph-bold.ph-monitor-play:before {
-  content: "\ebfd";
-}
-.ph-bold.ph-moon:before {
-  content: "\ebfe";
-}
-.ph-bold.ph-moon-stars:before {
-  content: "\ebff";
-}
-.ph-bold.ph-moped:before {
-  content: "\ec00";
-}
-.ph-bold.ph-moped-front:before {
-  content: "\ec01";
-}
-.ph-bold.ph-mosque:before {
-  content: "\ec02";
-}
-.ph-bold.ph-motorcycle:before {
-  content: "\ec03";
-}
-.ph-bold.ph-mountains:before {
-  content: "\ec04";
-}
-.ph-bold.ph-mouse:before {
-  content: "\ec05";
-}
-.ph-bold.ph-mouse-simple:before {
-  content: "\ec06";
-}
-.ph-bold.ph-music-note:before {
-  content: "\ec07";
-}
-.ph-bold.ph-music-notes:before {
-  content: "\ec08";
-}
-.ph-bold.ph-music-note-simple:before {
-  content: "\ec09";
-}
-.ph-bold.ph-music-notes-plus:before {
-  content: "\ec0a";
-}
-.ph-bold.ph-music-notes-simple:before {
-  content: "\ec0b";
-}
-.ph-bold.ph-navigation-arrow:before {
-  content: "\ec0c";
-}
-.ph-bold.ph-needle:before {
-  content: "\ec0d";
-}
-.ph-bold.ph-newspaper:before {
-  content: "\ec0e";
-}
-.ph-bold.ph-newspaper-clipping:before {
-  content: "\ec0f";
-}
-.ph-bold.ph-notches:before {
-  content: "\ec10";
-}
-.ph-bold.ph-note-blank:before {
-  content: "\ec11";
-}
-.ph-bold.ph-note:before {
-  content: "\ec12";
-}
-.ph-bold.ph-notebook:before {
-  content: "\ec13";
-}
-.ph-bold.ph-notepad:before {
-  content: "\ec14";
-}
-.ph-bold.ph-note-pencil:before {
-  content: "\ec15";
-}
-.ph-bold.ph-notification:before {
-  content: "\ec16";
-}
-.ph-bold.ph-notion-logo:before {
-  content: "\ec17";
-}
-.ph-bold.ph-number-circle-eight:before {
-  content: "\ec18";
-}
-.ph-bold.ph-number-circle-five:before {
-  content: "\ec19";
-}
-.ph-bold.ph-number-circle-four:before {
-  content: "\ec1a";
-}
-.ph-bold.ph-number-circle-nine:before {
-  content: "\ec1b";
-}
-.ph-bold.ph-number-circle-one:before {
-  content: "\ec1c";
-}
-.ph-bold.ph-number-circle-seven:before {
-  content: "\ec1d";
-}
-.ph-bold.ph-number-circle-six:before {
-  content: "\ec1e";
-}
-.ph-bold.ph-number-circle-three:before {
-  content: "\ec1f";
-}
-.ph-bold.ph-number-circle-two:before {
-  content: "\ec20";
-}
-.ph-bold.ph-number-circle-zero:before {
-  content: "\ec21";
-}
-.ph-bold.ph-number-eight:before {
-  content: "\ec22";
-}
-.ph-bold.ph-number-five:before {
-  content: "\ec23";
-}
-.ph-bold.ph-number-four:before {
-  content: "\ec24";
-}
-.ph-bold.ph-number-nine:before {
-  content: "\ec25";
-}
-.ph-bold.ph-number-one:before {
-  content: "\ec26";
-}
-.ph-bold.ph-number-seven:before {
-  content: "\ec27";
-}
-.ph-bold.ph-number-six:before {
-  content: "\ec28";
-}
-.ph-bold.ph-number-square-eight:before {
-  content: "\ec29";
-}
-.ph-bold.ph-number-square-five:before {
-  content: "\ec2a";
-}
-.ph-bold.ph-number-square-four:before {
-  content: "\ec2b";
-}
-.ph-bold.ph-number-square-nine:before {
-  content: "\ec2c";
-}
-.ph-bold.ph-number-square-one:before {
-  content: "\ec2d";
-}
-.ph-bold.ph-number-square-seven:before {
-  content: "\ec2e";
-}
-.ph-bold.ph-number-square-six:before {
-  content: "\ec2f";
-}
-.ph-bold.ph-number-square-three:before {
-  content: "\ec30";
-}
-.ph-bold.ph-number-square-two:before {
-  content: "\ec31";
-}
-.ph-bold.ph-number-square-zero:before {
-  content: "\ec32";
-}
-.ph-bold.ph-number-three:before {
-  content: "\ec33";
-}
-.ph-bold.ph-number-two:before {
-  content: "\ec34";
-}
-.ph-bold.ph-number-zero:before {
-  content: "\ec35";
-}
-.ph-bold.ph-nut:before {
-  content: "\ec36";
-}
-.ph-bold.ph-ny-times-logo:before {
-  content: "\ec37";
-}
-.ph-bold.ph-octagon:before {
-  content: "\ec38";
-}
-.ph-bold.ph-office-chair:before {
-  content: "\ec39";
-}
-.ph-bold.ph-option:before {
-  content: "\ec3a";
-}
-.ph-bold.ph-orange-slice:before {
-  content: "\ec3b";
-}
-.ph-bold.ph-package:before {
-  content: "\ec3c";
-}
-.ph-bold.ph-paint-brush:before {
-  content: "\ec3d";
-}
-.ph-bold.ph-paint-brush-broad:before {
-  content: "\ec3e";
-}
-.ph-bold.ph-paint-brush-household:before {
-  content: "\ec3f";
-}
-.ph-bold.ph-paint-bucket:before {
-  content: "\ec40";
-}
-.ph-bold.ph-paint-roller:before {
-  content: "\ec41";
-}
-.ph-bold.ph-palette:before {
-  content: "\ec42";
-}
-.ph-bold.ph-pants:before {
-  content: "\ec43";
-}
-.ph-bold.ph-paperclip:before {
-  content: "\ec44";
-}
-.ph-bold.ph-paperclip-horizontal:before {
-  content: "\ec45";
-}
-.ph-bold.ph-paper-plane:before {
-  content: "\ec46";
-}
-.ph-bold.ph-paper-plane-right:before {
-  content: "\ec47";
-}
-.ph-bold.ph-paper-plane-tilt:before {
-  content: "\ec48";
-}
-.ph-bold.ph-parachute:before {
-  content: "\ec49";
-}
-.ph-bold.ph-paragraph:before {
-  content: "\ec4a";
-}
-.ph-bold.ph-parallelogram:before {
-  content: "\ec4b";
-}
-.ph-bold.ph-park:before {
-  content: "\ec4c";
-}
-.ph-bold.ph-password:before {
-  content: "\ec4d";
-}
-.ph-bold.ph-path:before {
-  content: "\ec4e";
-}
-.ph-bold.ph-patreon-logo:before {
-  content: "\ec4f";
-}
-.ph-bold.ph-pause:before {
-  content: "\ec50";
-}
-.ph-bold.ph-pause-circle:before {
-  content: "\ec51";
-}
-.ph-bold.ph-paw-print:before {
-  content: "\ec52";
-}
-.ph-bold.ph-paypal-logo:before {
-  content: "\ec53";
-}
-.ph-bold.ph-peace:before {
-  content: "\ec54";
-}
-.ph-bold.ph-pen:before {
-  content: "\ec55";
-}
-.ph-bold.ph-pencil:before {
-  content: "\ec56";
-}
-.ph-bold.ph-pencil-circle:before {
-  content: "\ec57";
-}
-.ph-bold.ph-pencil-line:before {
-  content: "\ec58";
-}
-.ph-bold.ph-pencil-simple:before {
-  content: "\ec59";
-}
-.ph-bold.ph-pencil-simple-line:before {
-  content: "\ec5a";
-}
-.ph-bold.ph-pencil-simple-slash:before {
-  content: "\ec5b";
-}
-.ph-bold.ph-pencil-slash:before {
-  content: "\ec5c";
-}
-.ph-bold.ph-pen-nib:before {
-  content: "\ec5d";
-}
-.ph-bold.ph-pen-nib-straight:before {
-  content: "\ec5e";
-}
-.ph-bold.ph-pentagram:before {
-  content: "\ec5f";
-}
-.ph-bold.ph-pepper:before {
-  content: "\ec60";
-}
-.ph-bold.ph-percent:before {
-  content: "\ec61";
-}
-.ph-bold.ph-person-arms-spread:before {
-  content: "\ec62";
-}
-.ph-bold.ph-person:before {
-  content: "\ec63";
-}
-.ph-bold.ph-person-simple-bike:before {
-  content: "\ec64";
-}
-.ph-bold.ph-person-simple:before {
-  content: "\ec65";
-}
-.ph-bold.ph-person-simple-run:before {
-  content: "\ec66";
-}
-.ph-bold.ph-person-simple-throw:before {
-  content: "\ec67";
-}
-.ph-bold.ph-person-simple-walk:before {
-  content: "\ec68";
-}
-.ph-bold.ph-perspective:before {
-  content: "\ec69";
-}
-.ph-bold.ph-phone:before {
-  content: "\ec6a";
-}
-.ph-bold.ph-phone-call:before {
-  content: "\ec6b";
-}
-.ph-bold.ph-phone-disconnect:before {
-  content: "\ec6c";
-}
-.ph-bold.ph-phone-incoming:before {
-  content: "\ec6d";
-}
-.ph-bold.ph-phone-outgoing:before {
-  content: "\ec6e";
-}
-.ph-bold.ph-phone-plus:before {
-  content: "\ec6f";
-}
-.ph-bold.ph-phone-slash:before {
-  content: "\ec70";
-}
-.ph-bold.ph-phone-x:before {
-  content: "\ec71";
-}
-.ph-bold.ph-phosphor-logo:before {
-  content: "\ec72";
-}
-.ph-bold.ph-piano-keys:before {
-  content: "\ec73";
-}
-.ph-bold.ph-pi:before {
-  content: "\ec74";
-}
-.ph-bold.ph-picture-in-picture:before {
-  content: "\ec75";
-}
-.ph-bold.ph-piggy-bank:before {
-  content: "\ec76";
-}
-.ph-bold.ph-pill:before {
-  content: "\ec77";
-}
-.ph-bold.ph-pinterest-logo:before {
-  content: "\ec78";
-}
-.ph-bold.ph-pinwheel:before {
-  content: "\ec79";
-}
-.ph-bold.ph-pizza:before {
-  content: "\ec7a";
-}
-.ph-bold.ph-placeholder:before {
-  content: "\ec7b";
-}
-.ph-bold.ph-planet:before {
-  content: "\ec7c";
-}
-.ph-bold.ph-plant:before {
-  content: "\ec7d";
-}
-.ph-bold.ph-play:before {
-  content: "\ec7e";
-}
-.ph-bold.ph-play-circle:before {
-  content: "\ec7f";
-}
-.ph-bold.ph-playlist:before {
-  content: "\ec80";
-}
-.ph-bold.ph-play-pause:before {
-  content: "\ec81";
-}
-.ph-bold.ph-plug:before {
-  content: "\ec82";
-}
-.ph-bold.ph-plug-charging:before {
-  content: "\ec83";
-}
-.ph-bold.ph-plugs:before {
-  content: "\ec84";
-}
-.ph-bold.ph-plugs-connected:before {
-  content: "\ec85";
-}
-.ph-bold.ph-plus:before {
-  content: "\ec86";
-}
-.ph-bold.ph-plus-circle:before {
-  content: "\ec87";
-}
-.ph-bold.ph-plus-minus:before {
-  content: "\ec88";
-}
-.ph-bold.ph-plus-square:before {
-  content: "\ec89";
-}
-.ph-bold.ph-poker-chip:before {
-  content: "\ec8a";
-}
-.ph-bold.ph-police-car:before {
-  content: "\ec8b";
-}
-.ph-bold.ph-polygon:before {
-  content: "\ec8c";
-}
-.ph-bold.ph-popcorn:before {
-  content: "\ec8d";
-}
-.ph-bold.ph-potted-plant:before {
-  content: "\ec8e";
-}
-.ph-bold.ph-power:before {
-  content: "\ec8f";
-}
-.ph-bold.ph-prescription:before {
-  content: "\ec90";
-}
-.ph-bold.ph-presentation:before {
-  content: "\ec91";
-}
-.ph-bold.ph-presentation-chart:before {
-  content: "\ec92";
-}
-.ph-bold.ph-printer:before {
-  content: "\ec93";
-}
-.ph-bold.ph-prohibit:before {
-  content: "\ec94";
-}
-.ph-bold.ph-prohibit-inset:before {
-  content: "\ec95";
-}
-.ph-bold.ph-projector-screen:before {
-  content: "\ec96";
-}
-.ph-bold.ph-projector-screen-chart:before {
-  content: "\ec97";
-}
-.ph-bold.ph-pulse:before, .ph ph-bold.ph-activity:before {
-  content: "\ec98";
-}
-.ph-bold.ph-push-pin:before {
-  content: "\ec99";
-}
-.ph-bold.ph-push-pin-simple:before {
-  content: "\ec9a";
-}
-.ph-bold.ph-push-pin-simple-slash:before {
-  content: "\ec9b";
-}
-.ph-bold.ph-push-pin-slash:before {
-  content: "\ec9c";
-}
-.ph-bold.ph-puzzle-piece:before {
-  content: "\ec9d";
-}
-.ph-bold.ph-qr-code:before {
-  content: "\ec9e";
-}
-.ph-bold.ph-question:before {
-  content: "\ec9f";
-}
-.ph-bold.ph-queue:before {
-  content: "\eca0";
-}
-.ph-bold.ph-quotes:before {
-  content: "\eca1";
-}
-.ph-bold.ph-radical:before {
-  content: "\eca2";
-}
-.ph-bold.ph-radioactive:before {
-  content: "\eca3";
-}
-.ph-bold.ph-radio:before {
-  content: "\eca4";
-}
-.ph-bold.ph-radio-button:before {
-  content: "\eca5";
-}
-.ph-bold.ph-rainbow:before {
-  content: "\eca6";
-}
-.ph-bold.ph-rainbow-cloud:before {
-  content: "\eca7";
-}
-.ph-bold.ph-read-cv-logo:before {
-  content: "\eca8";
-}
-.ph-bold.ph-receipt:before {
-  content: "\eca9";
-}
-.ph-bold.ph-receipt-x:before {
-  content: "\ecaa";
-}
-.ph-bold.ph-record:before {
-  content: "\ecab";
-}
-.ph-bold.ph-rectangle:before {
-  content: "\ecac";
-}
-.ph-bold.ph-recycle:before {
-  content: "\ecad";
-}
-.ph-bold.ph-reddit-logo:before {
-  content: "\ecae";
-}
-.ph-bold.ph-repeat:before {
-  content: "\ecaf";
-}
-.ph-bold.ph-repeat-once:before {
-  content: "\ecb0";
-}
-.ph-bold.ph-rewind:before {
-  content: "\ecb1";
-}
-.ph-bold.ph-rewind-circle:before {
-  content: "\ecb2";
-}
-.ph-bold.ph-road-horizon:before {
-  content: "\ecb3";
-}
-.ph-bold.ph-robot:before {
-  content: "\ecb4";
-}
-.ph-bold.ph-rocket:before {
-  content: "\ecb5";
-}
-.ph-bold.ph-rocket-launch:before {
-  content: "\ecb6";
-}
-.ph-bold.ph-rows:before {
-  content: "\ecb7";
-}
-.ph-bold.ph-rss:before {
-  content: "\ecb8";
-}
-.ph-bold.ph-rss-simple:before {
-  content: "\ecb9";
-}
-.ph-bold.ph-rug:before {
-  content: "\ecba";
-}
-.ph-bold.ph-ruler:before {
-  content: "\ecbb";
-}
-.ph-bold.ph-scales:before {
-  content: "\ecbc";
-}
-.ph-bold.ph-scan:before {
-  content: "\ecbd";
-}
-.ph-bold.ph-scissors:before {
-  content: "\ecbe";
-}
-.ph-bold.ph-scooter:before {
-  content: "\ecbf";
-}
-.ph-bold.ph-screencast:before {
-  content: "\ecc0";
-}
-.ph-bold.ph-scribble-loop:before {
-  content: "\ecc1";
-}
-.ph-bold.ph-scroll:before {
-  content: "\ecc2";
-}
-.ph-bold.ph-seal:before, .ph ph-bold.ph-circle-wavy:before {
-  content: "\ecc3";
-}
-.ph-bold.ph-seal-check:before, .ph ph-bold.ph-circle-wavy-check:before {
-  content: "\ecc4";
-}
-.ph-bold.ph-seal-question:before, .ph ph-bold.ph-circle-wavy-question:before {
-  content: "\ecc5";
-}
-.ph-bold.ph-seal-warning:before, .ph ph-bold.ph-circle-wavy-warning:before {
-  content: "\ecc6";
-}
-.ph-bold.ph-selection-all:before {
-  content: "\ecc7";
-}
-.ph-bold.ph-selection-background:before {
-  content: "\ecc8";
-}
-.ph-bold.ph-selection:before {
-  content: "\ecc9";
-}
-.ph-bold.ph-selection-foreground:before {
-  content: "\ecca";
-}
-.ph-bold.ph-selection-inverse:before {
-  content: "\eccb";
-}
-.ph-bold.ph-selection-plus:before {
-  content: "\eccc";
-}
-.ph-bold.ph-selection-slash:before {
-  content: "\eccd";
-}
-.ph-bold.ph-shapes:before {
-  content: "\ecce";
-}
-.ph-bold.ph-share:before {
-  content: "\eccf";
-}
-.ph-bold.ph-share-fat:before {
-  content: "\ecd0";
-}
-.ph-bold.ph-share-network:before {
-  content: "\ecd1";
-}
-.ph-bold.ph-shield:before {
-  content: "\ecd2";
-}
-.ph-bold.ph-shield-check:before {
-  content: "\ecd3";
-}
-.ph-bold.ph-shield-checkered:before {
-  content: "\ecd4";
-}
-.ph-bold.ph-shield-chevron:before {
-  content: "\ecd5";
-}
-.ph-bold.ph-shield-plus:before {
-  content: "\ecd6";
-}
-.ph-bold.ph-shield-slash:before {
-  content: "\ecd7";
-}
-.ph-bold.ph-shield-star:before {
-  content: "\ecd8";
-}
-.ph-bold.ph-shield-warning:before {
-  content: "\ecd9";
-}
-.ph-bold.ph-shirt-folded:before {
-  content: "\ecda";
-}
-.ph-bold.ph-shooting-star:before {
-  content: "\ecdb";
-}
-.ph-bold.ph-shopping-bag:before {
-  content: "\ecdc";
-}
-.ph-bold.ph-shopping-bag-open:before {
-  content: "\ecdd";
-}
-.ph-bold.ph-shopping-cart:before {
-  content: "\ecde";
-}
-.ph-bold.ph-shopping-cart-simple:before {
-  content: "\ecdf";
-}
-.ph-bold.ph-shower:before {
-  content: "\ece0";
-}
-.ph-bold.ph-shrimp:before {
-  content: "\ece1";
-}
-.ph-bold.ph-shuffle-angular:before {
-  content: "\ece2";
-}
-.ph-bold.ph-shuffle:before {
-  content: "\ece3";
-}
-.ph-bold.ph-shuffle-simple:before {
-  content: "\ece4";
-}
-.ph-bold.ph-sidebar:before {
-  content: "\ece5";
-}
-.ph-bold.ph-sidebar-simple:before {
-  content: "\ece6";
-}
-.ph-bold.ph-sigma:before {
-  content: "\ece7";
-}
-.ph-bold.ph-signature:before {
-  content: "\ece8";
-}
-.ph-bold.ph-sign-in:before {
-  content: "\ece9";
-}
-.ph-bold.ph-sign-out:before {
-  content: "\ecea";
-}
-.ph-bold.ph-signpost:before {
-  content: "\eceb";
-}
-.ph-bold.ph-sim-card:before {
-  content: "\ecec";
-}
-.ph-bold.ph-siren:before {
-  content: "\eced";
-}
-.ph-bold.ph-sketch-logo:before {
-  content: "\ecee";
-}
-.ph-bold.ph-skip-back:before {
-  content: "\ecef";
-}
-.ph-bold.ph-skip-back-circle:before {
-  content: "\ecf0";
-}
-.ph-bold.ph-skip-forward:before {
-  content: "\ecf1";
-}
-.ph-bold.ph-skip-forward-circle:before {
-  content: "\ecf2";
-}
-.ph-bold.ph-skull:before {
-  content: "\ecf3";
-}
-.ph-bold.ph-slack-logo:before {
-  content: "\ecf4";
-}
-.ph-bold.ph-sliders:before {
-  content: "\ecf5";
-}
-.ph-bold.ph-sliders-horizontal:before {
-  content: "\ecf6";
-}
-.ph-bold.ph-slideshow:before {
-  content: "\ecf7";
-}
-.ph-bold.ph-smiley-angry:before {
-  content: "\ecf8";
-}
-.ph-bold.ph-smiley-blank:before {
-  content: "\ecf9";
-}
-.ph-bold.ph-smiley:before {
-  content: "\ecfa";
-}
-.ph-bold.ph-smiley-meh:before {
-  content: "\ecfb";
-}
-.ph-bold.ph-smiley-nervous:before {
-  content: "\ecfc";
-}
-.ph-bold.ph-smiley-sad:before {
-  content: "\ecfd";
-}
-.ph-bold.ph-smiley-sticker:before {
-  content: "\ecfe";
-}
-.ph-bold.ph-smiley-wink:before {
-  content: "\ecff";
-}
-.ph-bold.ph-smiley-x-eyes:before {
-  content: "\ed00";
-}
-.ph-bold.ph-snapchat-logo:before {
-  content: "\ed01";
-}
-.ph-bold.ph-sneaker:before {
-  content: "\ed02";
-}
-.ph-bold.ph-sneaker-move:before {
-  content: "\ed03";
-}
-.ph-bold.ph-snowflake:before {
-  content: "\ed04";
-}
-.ph-bold.ph-soccer-ball:before {
-  content: "\ed05";
-}
-.ph-bold.ph-sort-ascending:before {
-  content: "\ed06";
-}
-.ph-bold.ph-sort-descending:before {
-  content: "\ed07";
-}
-.ph-bold.ph-soundcloud-logo:before {
-  content: "\ed08";
-}
-.ph-bold.ph-spade:before {
-  content: "\ed09";
-}
-.ph-bold.ph-sparkle:before {
-  content: "\ed0a";
-}
-.ph-bold.ph-speaker-hifi:before {
-  content: "\ed0b";
-}
-.ph-bold.ph-speaker-high:before {
-  content: "\ed0c";
-}
-.ph-bold.ph-speaker-low:before {
-  content: "\ed0d";
-}
-.ph-bold.ph-speaker-none:before {
-  content: "\ed0e";
-}
-.ph-bold.ph-speaker-simple-high:before {
-  content: "\ed0f";
-}
-.ph-bold.ph-speaker-simple-low:before {
-  content: "\ed10";
-}
-.ph-bold.ph-speaker-simple-none:before {
-  content: "\ed11";
-}
-.ph-bold.ph-speaker-simple-slash:before {
-  content: "\ed12";
-}
-.ph-bold.ph-speaker-simple-x:before {
-  content: "\ed13";
-}
-.ph-bold.ph-speaker-slash:before {
-  content: "\ed14";
-}
-.ph-bold.ph-speaker-x:before {
-  content: "\ed15";
-}
-.ph-bold.ph-spinner:before {
-  content: "\ed16";
-}
-.ph-bold.ph-spinner-gap:before {
-  content: "\ed17";
-}
-.ph-bold.ph-spiral:before {
-  content: "\ed18";
-}
-.ph-bold.ph-split-horizontal:before {
-  content: "\ed19";
-}
-.ph-bold.ph-split-vertical:before {
-  content: "\ed1a";
-}
-.ph-bold.ph-spotify-logo:before {
-  content: "\ed1b";
-}
-.ph-bold.ph-square:before {
-  content: "\ed1c";
-}
-.ph-bold.ph-square-half:before {
-  content: "\ed1d";
-}
-.ph-bold.ph-square-half-bottom:before {
-  content: "\ed1e";
-}
-.ph-bold.ph-square-logo:before {
-  content: "\ed1f";
-}
-.ph-bold.ph-squares-four:before {
-  content: "\ed20";
-}
-.ph-bold.ph-square-split-horizontal:before {
-  content: "\ed21";
-}
-.ph-bold.ph-square-split-vertical:before {
-  content: "\ed22";
-}
-.ph-bold.ph-stack:before {
-  content: "\ed23";
-}
-.ph-bold.ph-stack-overflow-logo:before {
-  content: "\ed24";
-}
-.ph-bold.ph-stack-simple:before {
-  content: "\ed25";
-}
-.ph-bold.ph-stairs:before {
-  content: "\ed26";
-}
-.ph-bold.ph-stamp:before {
-  content: "\ed27";
-}
-.ph-bold.ph-star-and-crescent:before {
-  content: "\ed28";
-}
-.ph-bold.ph-star:before {
-  content: "\ed29";
-}
-.ph-bold.ph-star-four:before {
-  content: "\ed2a";
-}
-.ph-bold.ph-star-half:before {
-  content: "\ed2b";
-}
-.ph-bold.ph-star-of-david:before {
-  content: "\ed2c";
-}
-.ph-bold.ph-steering-wheel:before {
-  content: "\ed2d";
-}
-.ph-bold.ph-steps:before {
-  content: "\ed2e";
-}
-.ph-bold.ph-stethoscope:before {
-  content: "\ed2f";
-}
-.ph-bold.ph-sticker:before {
-  content: "\ed30";
-}
-.ph-bold.ph-stool:before {
-  content: "\ed31";
-}
-.ph-bold.ph-stop:before {
-  content: "\ed32";
-}
-.ph-bold.ph-stop-circle:before {
-  content: "\ed33";
-}
-.ph-bold.ph-storefront:before {
-  content: "\ed34";
-}
-.ph-bold.ph-strategy:before {
-  content: "\ed35";
-}
-.ph-bold.ph-stripe-logo:before {
-  content: "\ed36";
-}
-.ph-bold.ph-student:before {
-  content: "\ed37";
-}
-.ph-bold.ph-subtitles:before {
-  content: "\ed38";
-}
-.ph-bold.ph-subtract:before {
-  content: "\ed39";
-}
-.ph-bold.ph-subtract-square:before {
-  content: "\ed3a";
-}
-.ph-bold.ph-suitcase:before {
-  content: "\ed3b";
-}
-.ph-bold.ph-suitcase-rolling:before {
-  content: "\ed3c";
-}
-.ph-bold.ph-suitcase-simple:before {
-  content: "\ed3d";
-}
-.ph-bold.ph-sun:before {
-  content: "\ed3e";
-}
-.ph-bold.ph-sun-dim:before {
-  content: "\ed3f";
-}
-.ph-bold.ph-sunglasses:before {
-  content: "\ed40";
-}
-.ph-bold.ph-sun-horizon:before {
-  content: "\ed41";
-}
-.ph-bold.ph-swap:before {
-  content: "\ed42";
-}
-.ph-bold.ph-swatches:before {
-  content: "\ed43";
-}
-.ph-bold.ph-swimming-pool:before {
-  content: "\ed44";
-}
-.ph-bold.ph-sword:before {
-  content: "\ed45";
-}
-.ph-bold.ph-synagogue:before {
-  content: "\ed46";
-}
-.ph-bold.ph-syringe:before {
-  content: "\ed47";
-}
-.ph-bold.ph-table:before {
-  content: "\ed48";
-}
-.ph-bold.ph-tabs:before {
-  content: "\ed49";
-}
-.ph-bold.ph-tag:before {
-  content: "\ed4a";
-}
-.ph-bold.ph-tag-chevron:before {
-  content: "\ed4b";
-}
-.ph-bold.ph-tag-simple:before {
-  content: "\ed4c";
-}
-.ph-bold.ph-target:before {
-  content: "\ed4d";
-}
-.ph-bold.ph-taxi:before {
-  content: "\ed4e";
-}
-.ph-bold.ph-telegram-logo:before {
-  content: "\ed4f";
-}
-.ph-bold.ph-television:before {
-  content: "\ed50";
-}
-.ph-bold.ph-television-simple:before {
-  content: "\ed51";
-}
-.ph-bold.ph-tennis-ball:before {
-  content: "\ed52";
-}
-.ph-bold.ph-tent:before {
-  content: "\ed53";
-}
-.ph-bold.ph-terminal:before {
-  content: "\ed54";
-}
-.ph-bold.ph-terminal-window:before {
-  content: "\ed55";
-}
-.ph-bold.ph-test-tube:before {
-  content: "\ed56";
-}
-.ph-bold.ph-text-aa:before {
-  content: "\ed57";
-}
-.ph-bold.ph-text-align-center:before {
-  content: "\ed58";
-}
-.ph-bold.ph-text-align-justify:before {
-  content: "\ed59";
-}
-.ph-bold.ph-text-align-left:before {
-  content: "\ed5a";
-}
-.ph-bold.ph-text-align-right:before {
-  content: "\ed5b";
-}
-.ph-bold.ph-text-a-underline:before {
-  content: "\ed5c";
-}
-.ph-bold.ph-text-b:before, .ph-bold.ph-text ph-bolder:before {
-  content: "\ed5d";
-}
-.ph-bold.ph-textbox:before {
-  content: "\ed5e";
-}
-.ph-bold.ph-text-columns:before {
-  content: "\ed5f";
-}
-.ph-bold.ph-text-h:before {
-  content: "\ed60";
-}
-.ph-bold.ph-text-h-five:before {
-  content: "\ed61";
-}
-.ph-bold.ph-text-h-four:before {
-  content: "\ed62";
-}
-.ph-bold.ph-text-h-one:before {
-  content: "\ed63";
-}
-.ph-bold.ph-text-h-six:before {
-  content: "\ed64";
-}
-.ph-bold.ph-text-h-three:before {
-  content: "\ed65";
-}
-.ph-bold.ph-text-h-two:before {
-  content: "\ed66";
-}
-.ph-bold.ph-text-indent:before {
-  content: "\ed67";
-}
-.ph-bold.ph-text-italic:before {
-  content: "\ed68";
-}
-.ph-bold.ph-text-outdent:before {
-  content: "\ed69";
-}
-.ph-bold.ph-text-strikethrough:before {
-  content: "\ed6a";
-}
-.ph-bold.ph-text-t:before {
-  content: "\ed6b";
-}
-.ph-bold.ph-text-underline:before {
-  content: "\ed6c";
-}
-.ph-bold.ph-thermometer:before {
-  content: "\ed6d";
-}
-.ph-bold.ph-thermometer-cold:before {
-  content: "\ed6e";
-}
-.ph-bold.ph-thermometer-hot:before {
-  content: "\ed6f";
-}
-.ph-bold.ph-thermometer-simple:before {
-  content: "\ed70";
-}
-.ph-bold.ph-thumbs-down:before {
-  content: "\ed71";
-}
-.ph-bold.ph-thumbs-up:before {
-  content: "\ed72";
-}
-.ph-bold.ph-ticket:before {
-  content: "\ed73";
-}
-.ph-bold.ph-tidal-logo:before {
-  content: "\ed74";
-}
-.ph-bold.ph-tiktok-logo:before {
-  content: "\ed75";
-}
-.ph-bold.ph-timer:before {
-  content: "\ed76";
-}
-.ph-bold.ph-tipi:before {
-  content: "\ed77";
-}
-.ph-bold.ph-toggle-left:before {
-  content: "\ed78";
-}
-.ph-bold.ph-toggle-right:before {
-  content: "\ed79";
-}
-.ph-bold.ph-toilet:before {
-  content: "\ed7a";
-}
-.ph-bold.ph-toilet-paper:before {
-  content: "\ed7b";
-}
-.ph-bold.ph-toolbox:before {
-  content: "\ed7c";
-}
-.ph-bold.ph-tooth:before {
-  content: "\ed7d";
-}
-.ph-bold.ph-tote:before {
-  content: "\ed7e";
-}
-.ph-bold.ph-tote-simple:before {
-  content: "\ed7f";
-}
-.ph-bold.ph-trademark:before {
-  content: "\ed80";
-}
-.ph-bold.ph-trademark-registered:before {
-  content: "\ed81";
-}
-.ph-bold.ph-traffic-cone:before {
-  content: "\ed82";
-}
-.ph-bold.ph-traffic-signal:before {
-  content: "\ed83";
-}
-.ph-bold.ph-traffic-sign:before {
-  content: "\ed84";
-}
-.ph-bold.ph-train:before {
-  content: "\ed85";
-}
-.ph-bold.ph-train-regional:before {
-  content: "\ed86";
-}
-.ph-bold.ph-train-simple:before {
-  content: "\ed87";
-}
-.ph-bold.ph-tram:before {
-  content: "\ed88";
-}
-.ph-bold.ph-translate:before {
-  content: "\ed89";
-}
-.ph-bold.ph-trash:before {
-  content: "\ed8a";
-}
-.ph-bold.ph-trash-simple:before {
-  content: "\ed8b";
-}
-.ph-bold.ph-tray:before {
-  content: "\ed8c";
-}
-.ph-bold.ph-tree:before {
-  content: "\ed8d";
-}
-.ph-bold.ph-tree-evergreen:before {
-  content: "\ed8e";
-}
-.ph-bold.ph-tree-palm:before {
-  content: "\ed8f";
-}
-.ph-bold.ph-tree-structure:before {
-  content: "\ed90";
-}
-.ph-bold.ph-trend-down:before {
-  content: "\ed91";
-}
-.ph-bold.ph-trend-up:before {
-  content: "\ed92";
-}
-.ph-bold.ph-triangle:before {
-  content: "\ed93";
-}
-.ph-bold.ph-trophy:before {
-  content: "\ed94";
-}
-.ph-bold.ph-truck:before {
-  content: "\ed95";
-}
-.ph-bold.ph-t-shirt:before {
-  content: "\ed96";
-}
-.ph-bold.ph-twitch-logo:before {
-  content: "\ed97";
-}
-.ph-bold.ph-twitter-logo:before {
-  content: "\ed98";
-}
-.ph-bold.ph-umbrella:before {
-  content: "\ed99";
-}
-.ph-bold.ph-umbrella-simple:before {
-  content: "\ed9a";
-}
-.ph-bold.ph-unite:before {
-  content: "\ed9b";
-}
-.ph-bold.ph-unite-square:before {
-  content: "\ed9c";
-}
-.ph-bold.ph-upload:before {
-  content: "\ed9d";
-}
-.ph-bold.ph-upload-simple:before {
-  content: "\ed9e";
-}
-.ph-bold.ph-usb:before {
-  content: "\ed9f";
-}
-.ph-bold.ph-user:before {
-  content: "\eda0";
-}
-.ph-bold.ph-user-circle:before {
-  content: "\eda1";
-}
-.ph-bold.ph-user-circle-gear:before {
-  content: "\eda2";
-}
-.ph-bold.ph-user-circle-minus:before {
-  content: "\eda3";
-}
-.ph-bold.ph-user-circle-plus:before {
-  content: "\eda4";
-}
-.ph-bold.ph-user-focus:before {
-  content: "\eda5";
-}
-.ph-bold.ph-user-gear:before {
-  content: "\eda6";
-}
-.ph-bold.ph-user-list:before {
-  content: "\eda7";
-}
-.ph-bold.ph-user-minus:before {
-  content: "\eda8";
-}
-.ph-bold.ph-user-plus:before {
-  content: "\eda9";
-}
-.ph-bold.ph-user-rectangle:before {
-  content: "\edaa";
-}
-.ph-bold.ph-users:before {
-  content: "\edab";
-}
-.ph-bold.ph-users-four:before {
-  content: "\edac";
-}
-.ph-bold.ph-user-square:before {
-  content: "\edad";
-}
-.ph-bold.ph-users-three:before {
-  content: "\edae";
-}
-.ph-bold.ph-user-switch:before {
-  content: "\edaf";
-}
-.ph-bold.ph-van:before {
-  content: "\edb0";
-}
-.ph-bold.ph-vault:before {
-  content: "\edb1";
-}
-.ph-bold.ph-vibrate:before {
-  content: "\edb2";
-}
-.ph-bold.ph-video:before {
-  content: "\edb3";
-}
-.ph-bold.ph-video-camera:before {
-  content: "\edb4";
-}
-.ph-bold.ph-video-camera-slash:before {
-  content: "\edb5";
-}
-.ph-bold.ph-vignette:before {
-  content: "\edb6";
-}
-.ph-bold.ph-vinyl-record:before {
-  content: "\edb7";
-}
-.ph-bold.ph-virtual-reality:before {
-  content: "\edb8";
-}
-.ph-bold.ph-virus:before {
-  content: "\edb9";
-}
-.ph-bold.ph-voicemail:before {
-  content: "\edba";
-}
-.ph-bold.ph-volleyball:before {
-  content: "\edbb";
-}
-.ph-bold.ph-wall:before {
-  content: "\edbc";
-}
-.ph-bold.ph-wallet:before {
-  content: "\edbd";
-}
-.ph-bold.ph-warehouse:before {
-  content: "\edbe";
-}
-.ph-bold.ph-warning:before {
-  content: "\edbf";
-}
-.ph-bold.ph-warning-circle:before {
-  content: "\edc0";
-}
-.ph-bold.ph-warning-diamond:before {
-  content: "\edc1";
-}
-.ph-bold.ph-warning-octagon:before {
-  content: "\edc2";
-}
-.ph-bold.ph-watch:before {
-  content: "\edc3";
-}
-.ph-bold.ph-waveform:before {
-  content: "\edc4";
-}
-.ph-bold.ph-wave-sawtooth:before {
-  content: "\edc5";
-}
-.ph-bold.ph-waves:before {
-  content: "\edc6";
-}
-.ph-bold.ph-wave-sine:before {
-  content: "\edc7";
-}
-.ph-bold.ph-wave-square:before {
-  content: "\edc8";
-}
-.ph-bold.ph-wave-triangle:before {
-  content: "\edc9";
-}
-.ph-bold.ph-webcam:before {
-  content: "\edca";
-}
-.ph-bold.ph-webcam-slash:before {
-  content: "\edcb";
-}
-.ph-bold.ph-webhooks-logo:before {
-  content: "\edcc";
-}
-.ph-bold.ph-wechat-logo:before {
-  content: "\edcd";
-}
-.ph-bold.ph-whatsapp-logo:before {
-  content: "\edce";
-}
-.ph-bold.ph-wheelchair:before {
-  content: "\edcf";
-}
-.ph-bold.ph-wheelchair-motion:before {
-  content: "\edd0";
-}
-.ph-bold.ph-wifi-high:before {
-  content: "\edd1";
-}
-.ph-bold.ph-wifi-low:before {
-  content: "\edd2";
-}
-.ph-bold.ph-wifi-medium:before {
-  content: "\edd3";
-}
-.ph-bold.ph-wifi-none:before {
-  content: "\edd4";
-}
-.ph-bold.ph-wifi-slash:before {
-  content: "\edd5";
-}
-.ph-bold.ph-wifi-x:before {
-  content: "\edd6";
-}
-.ph-bold.ph-wind:before {
-  content: "\edd7";
-}
-.ph-bold.ph-windows-logo:before {
-  content: "\edd8";
-}
-.ph-bold.ph-wine:before {
-  content: "\edd9";
-}
-.ph-bold.ph-wrench:before {
-  content: "\edda";
-}
-.ph-bold.ph-x:before {
-  content: "\eddb";
-}
-.ph-bold.ph-x-circle:before {
-  content: "\eddc";
-}
-.ph-bold.ph-x-square:before {
-  content: "\eddd";
-}
-.ph-bold.ph-yin-yang:before {
-  content: "\edde";
-}
-.ph-bold.ph-youtube-logo:before {
-  content: "\eddf";
-}
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 935fa6fef..34cdc16ef 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -6,7 +6,8 @@
 import "vite/modulepreload-polyfill";
 
 import "@/style.scss";
-import "@/icons.scss";
+import "@phosphor-icons/web/bold";
+import "@phosphor-icons/web/fill";
 
 //#region account indexedDB migration
 import { set } from "@/scripts/idb-proxy";
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index ca8bd8b43..6057b2a6b 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -610,3 +610,72 @@ hr {
     transform:  scaleX(1.00) scaleY(1.00) ;
   }
 }
+
+.ph-xxs {
+  font-size: 0.5em;
+}
+
+.ph-xs {
+  font-size: 0.75em;
+}
+
+.ph-sm {
+  font-size: 0.875em;
+}
+
+.ph-lg {
+  font-size: 1.3333em;
+  line-height: 0.75em;
+  vertical-align: -0.0667em;
+}
+
+.ph-xl {
+  font-size: 1.5em;
+  line-height: 0.6666em;
+  vertical-align: -0.075em;
+}
+
+.ph-1x {
+  font-size: 1em;
+}
+
+.ph-2x {
+  font-size: 2em;
+}
+
+.ph-3x {
+  font-size: 3em;
+}
+
+.ph-4x {
+  font-size: 4em;
+}
+
+.ph-5x {
+  font-size: 5em;
+}
+
+.ph-6x {
+  font-size: 6em;
+}
+
+.ph-7x {
+  font-size: 7em;
+}
+
+.ph-8x {
+  font-size: 8em;
+}
+
+.ph-9x {
+  font-size: 9em;
+}
+
+.ph-10x {
+  font-size: 10em;
+}
+
+.ph-fw {
+  text-align: center;
+  width: 1.25em;
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5bc362a2f..29dac3336 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -396,6 +396,7 @@ importers:
     specifiers:
       '@discordapp/twemoji': 14.0.2
       '@khmyznikov/pwa-install': ^0.2.0
+      '@phosphor-icons/web': ^2.0.1
       '@rollup/plugin-alias': 3.1.9
       '@rollup/plugin-json': 4.1.0
       '@rollup/pluginutils': ^4.2.1
@@ -469,6 +470,8 @@ importers:
       vue-plyr: ^7.0.0
       vue-prism-editor: 2.0.0-alpha.2
       vuedraggable: 4.1.0
+    dependencies:
+      '@phosphor-icons/web': 2.0.1
     devDependencies:
       '@discordapp/twemoji': 14.0.2
       '@khmyznikov/pwa-install': 0.2.0
@@ -1423,6 +1426,10 @@ packages:
       sshpk: 1.17.0
     dev: false
 
+  /@phosphor-icons/web/2.0.1:
+    resolution: {integrity: sha512-lxNCH+c1HXMSi2L1bDe8yFFSK5rVavsn1WKAyyRX/yuaGdEIf+iE3ypb1DDGKsorPQN1jENv5cRElhDyfa5k0w==}
+    dev: false
+
   /@redis/bloom/1.1.0_@redis+client@1.4.2:
     resolution: {integrity: sha512-9QovlxmpRtvxVbN0UBcv8WfdSMudNZZTFqCsnBszcQXqaZb/TVe30ScgGEO7u1EAIacTPAo7/oCYjYAxiHLanQ==}
     peerDependencies:

From 471f7c4c009c8f9b03090428a27223b4b56a447b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 11 Mar 2023 13:29:18 -0800
Subject: [PATCH 183/582] rm unessicary file

---
 packages/backend/assets/Phosphor-Bold.woff2 | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 packages/backend/assets/Phosphor-Bold.woff2

diff --git a/packages/backend/assets/Phosphor-Bold.woff2 b/packages/backend/assets/Phosphor-Bold.woff2
deleted file mode 100644
index 68cf031ca..000000000
--- a/packages/backend/assets/Phosphor-Bold.woff2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ebf508632602024303604ef418c709d32be7f46ce626ac4974d56df9c017904f
-size 107760

From 7f81d3c2b8ffec3989ba0cbd10ac82b738f52315 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 11 Mar 2023 13:36:40 -0800
Subject: [PATCH 184/582] style: inlie-flex on ph-fw

---
 packages/client/src/style.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 6057b2a6b..92b97919a 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -678,4 +678,5 @@ hr {
 .ph-fw {
   text-align: center;
   width: 1.25em;
+	display: inline-flex;
 }

From fae58085dd7f8d0a7649464266b24d76b2756e45 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 11 Mar 2023 13:44:57 -0800
Subject: [PATCH 185/582] chore: phosphor 2.0.2

adds woff2 as of 2.0.2 (my pr)
---
 packages/client/package.json |  4 +---
 pnpm-lock.yaml               | 11 +++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index aecf80758..2f7b617f6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -9,6 +9,7 @@
 	"devDependencies": {
 		"@discordapp/twemoji": "14.0.2",
 		"@khmyznikov/pwa-install": "^0.2.0",
+		"@phosphor-icons/web": "^2.0.2",
 		"@rollup/plugin-alias": "3.1.9",
 		"@rollup/plugin-json": "4.1.0",
 		"@rollup/pluginutils": "^4.2.1",
@@ -82,8 +83,5 @@
 		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.1.0"
-	},
-	"dependencies": {
-		"@phosphor-icons/web": "^2.0.1"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 29dac3336..d528bcbc0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -396,7 +396,7 @@ importers:
     specifiers:
       '@discordapp/twemoji': 14.0.2
       '@khmyznikov/pwa-install': ^0.2.0
-      '@phosphor-icons/web': ^2.0.1
+      '@phosphor-icons/web': ^2.0.2
       '@rollup/plugin-alias': 3.1.9
       '@rollup/plugin-json': 4.1.0
       '@rollup/pluginutils': ^4.2.1
@@ -470,11 +470,10 @@ importers:
       vue-plyr: ^7.0.0
       vue-prism-editor: 2.0.0-alpha.2
       vuedraggable: 4.1.0
-    dependencies:
-      '@phosphor-icons/web': 2.0.1
     devDependencies:
       '@discordapp/twemoji': 14.0.2
       '@khmyznikov/pwa-install': 0.2.0
+      '@phosphor-icons/web': 2.0.2
       '@rollup/plugin-alias': 3.1.9_rollup@3.9.1
       '@rollup/plugin-json': 4.1.0_rollup@3.9.1
       '@rollup/pluginutils': 4.2.1
@@ -1426,9 +1425,9 @@ packages:
       sshpk: 1.17.0
     dev: false
 
-  /@phosphor-icons/web/2.0.1:
-    resolution: {integrity: sha512-lxNCH+c1HXMSi2L1bDe8yFFSK5rVavsn1WKAyyRX/yuaGdEIf+iE3ypb1DDGKsorPQN1jENv5cRElhDyfa5k0w==}
-    dev: false
+  /@phosphor-icons/web/2.0.2:
+    resolution: {integrity: sha512-CbCor9mjRC+GWhHYqyrixtyMKgPnJDPBxR/MxiJ0Fyo//699s1k/f72+DvZuMebH7JQK3IHKwLl4uQ5L4e/5iw==}
+    dev: true
 
   /@redis/bloom/1.1.0_@redis+client@1.4.2:
     resolution: {integrity: sha512-9QovlxmpRtvxVbN0UBcv8WfdSMudNZZTFqCsnBszcQXqaZb/TVe30ScgGEO7u1EAIacTPAo7/oCYjYAxiHLanQ==}

From 8e3036fc51072bea0436487cd662c773d78a52ac Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 11 Mar 2023 13:52:11 -0800
Subject: [PATCH 186/582] forgot about the fill icons

---
 packages/client/src/components/MkDrive.file.vue  |  2 +-
 packages/client/src/components/MkLaunchPad.vue   |  4 ++--
 packages/client/src/components/MkMenu.vue        |  8 ++++----
 .../client/src/components/MkNotification.vue     | 16 ++++++++--------
 packages/client/src/components/MkPostForm.vue    |  4 ++--
 packages/client/src/pages/gallery/post.vue       |  2 +-
 packages/client/src/pages/my-antennas/index.vue  |  4 ++--
 packages/client/src/pages/page.vue               |  2 +-
 packages/client/src/pages/settings/webhook.vue   |  2 +-
 packages/client/src/pages/user/home.vue          |  4 ++--
 packages/client/src/scripts/get-user-menu.ts     |  2 +-
 .../client/src/ui/_common_/navbar-for-mobile.vue |  4 ++--
 packages/client/src/ui/_common_/navbar.vue       |  4 ++--
 packages/client/src/ui/classic.header.vue        |  4 ++--
 packages/client/src/ui/classic.sidebar.vue       |  4 ++--
 packages/client/src/ui/deck.vue                  |  4 ++--
 packages/client/src/ui/universal.vue             |  6 +++---
 packages/client/src/widgets/notifications.vue    |  2 +-
 18 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/packages/client/src/components/MkDrive.file.vue b/packages/client/src/components/MkDrive.file.vue
index a91f4dd4e..4ebf74199 100644
--- a/packages/client/src/components/MkDrive.file.vue
+++ b/packages/client/src/components/MkDrive.file.vue
@@ -67,7 +67,7 @@ function getMenu() {
 		action: rename,
 	}, {
 		text: props.file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
-		icon: props.file.isSensitive ? 'ph-eye-bold ph-lg' : 'ph-eye-slash ph-bold ph-lg',
+		icon: props.file.isSensitive ? 'ph-eye ph-bold ph-lg' : 'ph-eye-slash ph-bold ph-lg',
 		action: toggleSensitive,
 	}, {
 		text: i18n.ts.describeFile,
diff --git a/packages/client/src/components/MkLaunchPad.vue b/packages/client/src/components/MkLaunchPad.vue
index a88700131..39e99e6c2 100644
--- a/packages/client/src/components/MkLaunchPad.vue
+++ b/packages/client/src/components/MkLaunchPad.vue
@@ -6,12 +6,12 @@
 				<button v-if="item.action" v-click-anime class="_button" @click="$event => { item.action($event); close(); }">
 					<i class="icon" :class="item.icon"></i>
 					<div class="text">{{ item.text }}</div>
-					<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
+					<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
 				</button>
 				<MkA v-else v-click-anime :to="item.to" @click.passive="close()">
 					<i class="icon" :class="item.icon"></i>
 					<div class="text">{{ item.text }}</div>
-					<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
+					<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
 				</MkA>
 			</template>
 		</div>
diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index e5977e542..1b8a609c9 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -19,16 +19,16 @@
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
 				<span>{{ item.text }}</span>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
+				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</MkA>
 			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="i" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<span>{{ item.text }}</span>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
+				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</a>
 			<button v-else-if="item.type === 'user' && !items.hidden" :tabindex="i" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<MkAvatar :user="item.user" class="avatar"/><MkUserName :user="item.user"/>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
+				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</button>
 			<span v-else-if="item.type === 'switch'" :tabindex="i" class="item" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch">{{ item.text }}</FormSwitch>
@@ -42,7 +42,7 @@
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
 				<span>{{ item.text }}</span>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle-fill"></i></span>
+				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</button>
 		</template>
 		<span v-if="items2.length === 0" class="none item">
diff --git a/packages/client/src/components/MkNotification.vue b/packages/client/src/components/MkNotification.vue
index 7e2072f03..1e75c59a9 100644
--- a/packages/client/src/components/MkNotification.vue
+++ b/packages/client/src/components/MkNotification.vue
@@ -33,14 +33,14 @@
 			<MkTime v-if="withTime" :time="notification.createdAt" class="time"/>
 		</header>
 		<MkA v-if="notification.type === 'reaction'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-			<i class="ph-quotes-fill ph-lg"></i>
+			<i class="ph-quotes ph-fill ph-lg"></i>
 			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
-			<i class="ph-quotes-fill ph-lg"></i>
+			<i class="ph-quotes ph-fill ph-lg"></i>
 		</MkA>
 		<MkA v-if="notification.type === 'renote'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note.renote)">
-			<i class="ph-quotes-fill ph-lg"></i>
+			<i class="ph-quotes ph-fill ph-lg"></i>
 			<Mfm :text="getNoteSummary(notification.note.renote)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.renote.emojis"/>
-			<i class="ph-quotes-fill ph-lg"></i>
+			<i class="ph-quotes ph-fill ph-lg"></i>
 		</MkA>
 		<MkA v-if="notification.type === 'reply'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
 			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
@@ -52,14 +52,14 @@
 			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
 		</MkA>
 		<MkA v-if="notification.type === 'pollVote'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-			<i class="ph-quotes-fill ph-lg"></i>
+			<i class="ph-quotes ph-fill ph-lg"></i>
 			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
-			<i class="ph-quotes-fill ph-lg"></i>
+			<i class="ph-quotes ph-fill ph-lg"></i>
 		</MkA>
 		<MkA v-if="notification.type === 'pollEnded'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-			<i class="ph-quotes-fill ph-lg"></i>
+			<i class="ph-quotes ph-fill ph-lg"></i>
 			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
-			<i class="ph-quotes-fill ph-lg"></i>
+			<i class="ph-quotes ph-fill ph-lg"></i>
 		</MkA>
 		<span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ i18n.ts.youGotNewFollower }}<div v-if="full"><MkFollowButton :user="notification.user" :full="true"/></div></span>
 		<span v-if="notification.type === 'followRequestAccepted'" class="text" style="opacity: 0.6;">{{ i18n.ts.followRequestAccepted }}</span>
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 4daa731f6..4bb5d2343 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -22,13 +22,13 @@
 				<span v-if="visibility === 'specified'"><i class="ph-envelope-simple-open ph-bold ph-lg"></i></span>
 			</button>
 			<button v-tooltip="i18n.ts.previewNoteText" class="_button preview" :class="{ active: showPreview }" @click="showPreview = !showPreview"><i class="ph-file-code ph-bold ph-lg"></i></button>
-			<button class="submit _buttonGradate" :disabled="!canPost" data-cy-open-post-form-submit @click="post">{{ submitText }}<i :class="reply ? 'ph-arrow-bend-up-left-bold ph-lg' : renote ? 'ph-quotes-bold ph-lg' : 'ph-paper-plane-tilt ph-bold ph-lg'"></i></button>
+			<button class="submit _buttonGradate" :disabled="!canPost" data-cy-open-post-form-submit @click="post">{{ submitText }}<i :class="reply ? 'ph-arrow-bend-up-left-bold ph-lg' : renote ? 'ph-quotes ph-bold ph-lg' : 'ph-paper-plane-tilt ph-bold ph-lg'"></i></button>
 		</div>
 	</header>
 	<div class="form" :class="{ fixed }">
 		<XNoteSimple v-if="reply" class="preview" :note="reply"/>
 		<XNoteSimple v-if="renote" class="preview" :note="renote"/>
-		<div v-if="quoteId" class="with-quote"><i class="ph-quotes-bold ph-lg"></i> {{ i18n.ts.quoteAttached }}<button @click="quoteId = null"><i class="ph-x ph-bold ph-lg"></i></button></div>
+		<div v-if="quoteId" class="with-quote"><i class="ph-quotes ph-bold ph-lg"></i> {{ i18n.ts.quoteAttached }}<button @click="quoteId = null"><i class="ph-x ph-bold ph-lg"></i></button></div>
 		<div v-if="visibility === 'specified'" class="to-specified">
 			<span style="margin-right: 8px;">{{ i18n.ts.recipient }}</span>
 			<div class="visibleUsers">
diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue
index 9e8d67245..dd2a445ab 100644
--- a/packages/client/src/pages/gallery/post.vue
+++ b/packages/client/src/pages/gallery/post.vue
@@ -18,7 +18,7 @@
 						</div>
 						<div class="actions">
 							<div class="like">
-								<MkButton v-if="post.isLiked" v-tooltip="i18n.ts._gallery.unlike" class="button" primary @click="unlike()"><i class="ph-heart-fill ph-lg"></i><span v-if="post.likedCount > 0" class="count">{{ post.likedCount }}</span></MkButton>
+								<MkButton v-if="post.isLiked" v-tooltip="i18n.ts._gallery.unlike" class="button" primary @click="unlike()"><i class="ph-heart ph-fill ph-lg"></i><span v-if="post.likedCount > 0" class="count">{{ post.likedCount }}</span></MkButton>
 								<MkButton v-else v-tooltip="i18n.ts._gallery.like" class="button" @click="like()"><i class="ph-heart ph-bold"></i><span v-if="post.likedCount > 0" class="count">{{ post.likedCount }}</span></MkButton>
 							</div>
 							<div class="other">
diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue
index a3660755b..1104a8179 100644
--- a/packages/client/src/pages/my-antennas/index.vue
+++ b/packages/client/src/pages/my-antennas/index.vue
@@ -9,7 +9,7 @@
 				<MkPagination v-slot="{items}" ref="list" :pagination="pagination">
 					<div v-for="antenna in items" :key="antenna.id">
 						<MkA class="uopelskx" :link="true" :to="`/timeline/antenna/${antenna.id}`">
-							<i class="ph-flying-saucer ph-bold ph-lg"></i><i :class="`${antenna.hasUnreadNote ? 'ph-circle-fill' : 'ph-check'} ph-xs notify-icon`"></i>
+							<i class="ph-flying-saucer ph-bold ph-lg"></i><i :class="`${antenna.hasUnreadNote ? 'ph-circle ph-fill' : 'ph-check'} ph-xs notify-icon`"></i>
 						</MkA>
 						<MkA class="ljoevbzj" :to="`/my/antennas/${antenna.id}`">
 							<div class="name">{{ antenna.name }}</div>
@@ -112,7 +112,7 @@ definePageMetadata({
     top: -1em;
     left: -0.5em;
 
-		&.ph-circle-fill {
+		&.ph-circle ph-fill {
 			color: var(--indicator);
 			animation: blink 1s infinite;
 		}
diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue
index 87a3d1f8b..f1a967c4a 100644
--- a/packages/client/src/pages/page.vue
+++ b/packages/client/src/pages/page.vue
@@ -30,7 +30,7 @@
 					</div>
 					<div class="actions">
 						<div class="like">
-							<MkButton v-if="page.isLiked" v-tooltip="i18n.ts._pages.unlike" class="button" primary @click="unlike()"><i class="ph-heart-fill ph-lg"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
+							<MkButton v-if="page.isLiked" v-tooltip="i18n.ts._pages.unlike" class="button" primary @click="unlike()"><i class="ph-heart ph-fill ph-lg"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
 							<MkButton v-else v-tooltip="i18n.ts._pages.like" class="button" @click="like()"><i class="ph-heart ph-bold"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
 						</div>
 						<div class="other">
diff --git a/packages/client/src/pages/settings/webhook.vue b/packages/client/src/pages/settings/webhook.vue
index ae42f3e30..bf5f8ca4a 100644
--- a/packages/client/src/pages/settings/webhook.vue
+++ b/packages/client/src/pages/settings/webhook.vue
@@ -12,7 +12,7 @@
 				<FormLink v-for="webhook in items" :key="webhook.id" :to="`/settings/webhook/edit/${webhook.id}`" class="_formBlock">
 					<template #icon>
 						<i v-if="webhook.active === false" class="ph-pause-circle ph-bold ph-lg"></i>
-						<i v-else-if="webhook.latestStatus === null" class="ph-circle-fill"></i>
+						<i v-else-if="webhook.latestStatus === null" class="ph-circle ph-fill"></i>
 						<i v-else-if="[200, 201, 204].includes(webhook.latestStatus)" class="ph-check ph-bold ph-lg" :style="{ color: 'var(--success)' }"></i>
 						<i v-else class="ph-warning ph-bold ph-lg" :style="{ color: 'var(--error)' }"></i>
 					</template>
diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index b24b7cf22..360bf77ba 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -21,7 +21,7 @@
 							</div>
 							<div class="bottom">
 								<span class="username"><MkAcct :user="user" :detail="true"/></span>
-								<span v-if="user.isAdmin" :title="i18n.ts.isAdmin" style="color: var(--badge);"><i class="ph-bookmark-simple-fill ph-lg"></i></span>
+								<span v-if="user.isAdmin" :title="i18n.ts.isAdmin" style="color: var(--badge);"><i class="ph-bookmark-simple ph-fill ph-lg"></i></span>
 								<span v-if="!user.isAdmin && user.isModerator" :title="i18n.ts.isModerator" style="color: var(--badge);"><i class="ph-bookmark-simple ph-bold"></i></span>
 								<span v-if="user.isLocked" :title="i18n.ts.isLocked"><i class="ph-lock ph-bold ph-lg"></i></span>
 								<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ph-robot ph-bold ph-lg"></i></span>
@@ -36,7 +36,7 @@
 						</div>
 						<div class="bottom">
 							<span class="username"><MkAcct :user="user" :detail="true"/></span>
-							<span v-if="user.isAdmin" :title="i18n.ts.isAdmin" style="color: var(--badge);"><i class="ph-bookmark-simple-fill ph-lg"></i></span>
+							<span v-if="user.isAdmin" :title="i18n.ts.isAdmin" style="color: var(--badge);"><i class="ph-bookmark-simple ph-fill ph-lg"></i></span>
 							<span v-if="!user.isAdmin && user.isModerator" :title="i18n.ts.isModerator" style="color: var(--badge);"><i class="ph-bookmark-simple ph-bold"></i></span>
 							<span v-if="user.isLocked" :title="i18n.ts.isLocked"><i class="ph-lock ph-bold ph-lg"></i></span>
 							<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ph-robot ph-bold ph-lg"></i></span>
diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts
index eae47d74f..d5ec5e0d5 100644
--- a/packages/client/src/scripts/get-user-menu.ts
+++ b/packages/client/src/scripts/get-user-menu.ts
@@ -262,7 +262,7 @@ export function getUserMenu(user, router: Router = mainRouter) {
 		menu = menu.concat([
 			null,
 			{
-				icon: user.isMuted ? "ph-eye-bold ph-lg" : "ph-eye-slash ph-bold ph-lg",
+				icon: user.isMuted ? "ph-eye ph-bold ph-lg" : "ph-eye-slash ph-bold ph-lg",
 				text: user.isMuted ? i18n.ts.unmute : i18n.ts.mute,
 				hidden: user.isBlocking === true,
 				action: toggleMute,
diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index a17381155..c41e5276b 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -15,7 +15,7 @@
 				<div v-if="item === '-'" class="divider"></div>
 				<component :is="navbarItemDef[item].to ? 'MkA' : 'button'" v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)" v-click-anime class="item _button" :class="[item, { active: navbarItemDef[item].active }]" active-class="active" :to="navbarItemDef[item].to" v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}">
 					<i class="icon ph-fw ph-lg" :class="navbarItemDef[item].icon"></i><span class="text">{{ i18n.ts[navbarItemDef[item].title] }}</span>
-					<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="icon ph-circle-fill"></i></span>
+					<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="icon ph-circle ph-fill"></i></span>
 				</component>
 			</template>
 			<div class="divider"></div>
@@ -24,7 +24,7 @@
 			</MkA>
 			<button v-click-anime class="item _button" @click="more">
 				<i class="icon ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
-				<span v-if="otherMenuItemIndicated" class="indicator"><i class="icon ph-circle-fill"></i></span>
+				<span v-if="otherMenuItemIndicated" class="indicator"><i class="icon ph-circle ph-fill"></i></span>
 			</button>
 			<MkA v-click-anime class="item" active-class="active" to="/settings">
 				<i class="icon ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 0dc349a41..56817a0bf 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -25,7 +25,7 @@
 					v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}"
 				>
 					<i class="icon ph-fw ph-lg" :class="navbarItemDef[item].icon"></i><span class="text">{{ i18n.ts[navbarItemDef[item].title] }}</span>
-					<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="icon ph-circle-fill"></i></span>
+					<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="icon ph-circle ph-fill"></i></span>
 				</component>
 			</template>
 			<div class="divider"></div>
@@ -34,7 +34,7 @@
 			</MkA>
 			<button v-click-anime class="item _button" @click="more">
 				<i class="icon ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
-				<span v-if="otherMenuItemIndicated" class="indicator"><i class="icon ph-circle-fill"></i></span>
+				<span v-if="otherMenuItemIndicated" class="indicator"><i class="icon ph-circle ph-fill"></i></span>
 			</button>
 			<MkA v-click-anime v-tooltip.noDelay.right="i18n.ts.settings" class="item _button" active-class="active" to="/settings">
 				<i class="icon ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue
index 1ff8444d7..38579678d 100644
--- a/packages/client/src/ui/classic.header.vue
+++ b/packages/client/src/ui/classic.header.vue
@@ -9,7 +9,7 @@
 				<div v-if="item === '-'" class="divider"></div>
 				<component :is="navbarItemDef[item].to ? 'MkA' : 'button'" v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)" v-click-anime v-tooltip="$ts[navbarItemDef[item].title]" class="item _button" :class="item" active-class="active" :to="navbarItemDef[item].to" v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}">
 					<i class="ph-fw ph-lg" :class="navbarItemDef[item].icon"></i>
-					<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="ph-circle-fill"></i></span>
+					<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="ph-circle ph-fill"></i></span>
 				</component>
 			</template>
 			<div class="divider"></div>
@@ -18,7 +18,7 @@
 			</MkA>
 			<button v-click-anime class="item _button" @click="more">
 				<i class="ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i>
-				<span v-if="otherNavItemIndicated" class="indicator"><i class="ph-circle-fill"></i></span>
+				<span v-if="otherNavItemIndicated" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</button>
 		</div>
 		<div class="right">
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index 5b34d3a5f..62a4a4b1b 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -16,7 +16,7 @@
 		<div v-if="item === '-'" class="divider"></div>
 		<component :is="navbarItemDef[item].to ? 'MkA' : 'button'" v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)" v-click-anime class="item _button" :class="item" active-class="active" :to="navbarItemDef[item].to" v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}">
 			<i class="ph-fw ph-lg" :class="navbarItemDef[item].icon"></i><span class="text">{{ $ts[navbarItemDef[item].title] }}</span>
-			<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="ph-circle-fill"></i></span>
+			<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="ph-circle ph-fill"></i></span>
 		</component>
 	</template>
 	<div class="divider"></div>
@@ -25,7 +25,7 @@
 	</MkA>
 	<button v-click-anime class="item _button" @click="more">
 		<i class="ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
-		<span v-if="otherNavItemIndicated" class="indicator"><i class="ph-circle-fill"></i></span>
+		<span v-if="otherNavItemIndicated" class="indicator"><i class="ph-circle ph-fill"></i></span>
 	</button>
 	<MkA v-click-anime class="item" active-class="active" to="/settings" :behavior="settingsWindowed ? 'modalWindow' : null">
 		<i class="ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index 151a50db4..5cb8e36c3 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -48,9 +48,9 @@
 	</div>
 
 	<div v-if="isMobile" class="buttons">
-		<button class="button nav _button" @click="drawerMenuShowing = true"><i class="ph-list ph-bold ph-lg"></i><span v-if="menuIndicated" class="indicator"><i class="ph-circle-fill"></i></span></button>
+		<button class="button nav _button" @click="drawerMenuShowing = true"><i class="ph-list ph-bold ph-lg"></i><span v-if="menuIndicated" class="indicator"><i class="ph-circle ph-fill"></i></span></button>
 		<button class="button home _button" @click="mainRouter.push('/')"><i class="ph-house ph-bold ph-lg"></i></button>
-		<button class="button notifications _button" @click="mainRouter.push('/my/notifications')"><i class="ph-bell ph-bold ph-lg"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="ph-circle-fill"></i></span></button>
+		<button class="button notifications _button" @click="mainRouter.push('/my/notifications')"><i class="ph-bell ph-bold ph-lg"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="ph-circle ph-fill"></i></span></button>
 		<button class="button post _button" @click="os.post()"><i class="ph-pencil ph-bold ph-lg"></i></button>
 	</div>
 
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 4a862ba93..564cab199 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -21,7 +21,7 @@
 	<div v-if="isMobile" class="buttons">
 		<button class="button nav _button" @click="drawerMenuShowing = true">
 			<div class="button-wrapper">
-				<i class="ph-list ph-bold ph-lg"></i><span v-if="menuIndicated" class="indicator"><i class="ph-circle-fill"></i></span>
+				<i class="ph-list ph-bold ph-lg"></i><span v-if="menuIndicated" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</div>
 		</button>
 		<button class="button home _button" @click="mainRouter.currentRoute.value.name === 'index' ? top() : mainRouter.push('/'); updateButtonState();">
@@ -31,12 +31,12 @@
 		</button>
 		<button class="button notifications _button" @click="mainRouter.push('/my/notifications'); updateButtonState();">
 			<div class="button-wrapper" :class="buttonAnimIndex === 1 ? 'on' : ''">
-				<i class="ph-bell ph-bold ph-lg"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="ph-circle-fill"></i></span>
+				<i class="ph-bell ph-bold ph-lg"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</div>
 		</button>
 		<button class="button messaging _button" @click="mainRouter.push('/my/messaging'); updateButtonState();">
 			<div class="button-wrapper" :class="buttonAnimIndex === 2 ? 'on' : ''">
-				<i class="ph-chats-teardrop ph-bold ph-lg"></i><span v-if="$i?.hasUnreadMessagingMessage" class="indicator"><i class="ph-circle-fill"></i></span>
+				<i class="ph-chats-teardrop ph-bold ph-lg"></i><span v-if="$i?.hasUnreadMessagingMessage" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</div>
 		</button>
 		<button class="button widget _button" @click="widgetsShowing = true">
diff --git a/packages/client/src/widgets/notifications.vue b/packages/client/src/widgets/notifications.vue
index 86d6035e3..9cdbb94c0 100644
--- a/packages/client/src/widgets/notifications.vue
+++ b/packages/client/src/widgets/notifications.vue
@@ -1,7 +1,7 @@
 <template>
 <MkContainer :style="`height: ${widgetProps.height}px;`" :show-header="widgetProps.showHeader" :scrollable="true" class="mkw-notifications">
 	<template #header><i class="ph-bell ph-bold ph-lg"></i>{{ i18n.ts.notifications }}</template>
-	<template #func><button class="_button" @click="os.apiWithDialog('notifications/mark-all-as-read');"><i class="ph-check-bold ph-lg"></i></button><button class="_button" @click="configureNotification()"><i class="ph-gear-six ph-bold ph-lg"></i></button></template>
+	<template #func><button class="_button" @click="os.apiWithDialog('notifications/mark-all-as-read');"><i class="ph-check ph-bold ph-lg"></i></button><button class="_button" @click="configureNotification()"><i class="ph-gear-six ph-bold ph-lg"></i></button></template>
 	<div>
 		<XNotifications :include-types="widgetProps.includingTypes"/>
 	</div>

From 540d3892ccb6850980f1e1cc346e21fea510bbfb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 11 Mar 2023 13:59:36 -0800
Subject: [PATCH 187/582] how did vscode not catch these?

---
 packages/client/src/components/MkPostForm.vue         | 2 +-
 packages/client/src/components/MkPostFormAttaches.vue | 2 +-
 packages/client/src/components/MkVisibilityPicker.vue | 2 +-
 packages/client/src/pages/settings/sounds.vue         | 2 +-
 packages/client/src/ui/classic.vue                    | 2 +-
 packages/client/src/widgets/timeline.vue              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 4bb5d2343..c7a1e17a7 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -22,7 +22,7 @@
 				<span v-if="visibility === 'specified'"><i class="ph-envelope-simple-open ph-bold ph-lg"></i></span>
 			</button>
 			<button v-tooltip="i18n.ts.previewNoteText" class="_button preview" :class="{ active: showPreview }" @click="showPreview = !showPreview"><i class="ph-file-code ph-bold ph-lg"></i></button>
-			<button class="submit _buttonGradate" :disabled="!canPost" data-cy-open-post-form-submit @click="post">{{ submitText }}<i :class="reply ? 'ph-arrow-bend-up-left-bold ph-lg' : renote ? 'ph-quotes ph-bold ph-lg' : 'ph-paper-plane-tilt ph-bold ph-lg'"></i></button>
+			<button class="submit _buttonGradate" :disabled="!canPost" data-cy-open-post-form-submit @click="post">{{ submitText }}<i :class="reply ? 'ph-arrow-bend-up-left ph-bold ph-lg' : renote ? 'ph-quotes ph-bold ph-lg' : 'ph-paper-plane-tilt ph-bold ph-lg'"></i></button>
 		</div>
 	</header>
 	<div class="form" :class="{ fixed }">
diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
index 68c00971a..ab8321057 100644
--- a/packages/client/src/components/MkPostFormAttaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -119,7 +119,7 @@ export default defineComponent({
 				action: () => { this.rename(file); },
 			}, {
 				text: file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
-				icon: file.isSensitive ? 'ph-eye-slash-bold ph-lg' : 'ph-eye ph-bold ph-lg',
+				icon: file.isSensitive ? 'ph-eye-slash ph-bold ph-lg' : 'ph-eye ph-bold ph-lg',
 				action: () => { this.toggleSensitive(file); },
 			}, {
 				text: i18n.ts.describeFile,
diff --git a/packages/client/src/components/MkVisibilityPicker.vue b/packages/client/src/components/MkVisibilityPicker.vue
index 8f747c031..2ad521055 100644
--- a/packages/client/src/components/MkVisibilityPicker.vue
+++ b/packages/client/src/components/MkVisibilityPicker.vue
@@ -36,7 +36,7 @@
 					<span :class="$style.itemTitle">{{ i18n.ts._visibility.localOnly }}</span>
 					<span :class="$style.itemDescription">{{ i18n.ts._visibility.localOnlyDescription }}</span>
 				</div>
-				<div :class="$style.toggle"><i :class="localOnly ? 'ph-toggle-right-bold ph-lg' : 'ph-toggle-left ph-bold ph-lg'"></i></div>
+				<div :class="$style.toggle"><i :class="localOnly ? 'ph-toggle-right ph-bold ph-lg' : 'ph-toggle-left ph-bold ph-lg'"></i></div>
 			</button>
 		</div>
 	</MkModal>
diff --git a/packages/client/src/pages/settings/sounds.vue b/packages/client/src/pages/settings/sounds.vue
index e7f2c8391..13ebfcee3 100644
--- a/packages/client/src/pages/settings/sounds.vue
+++ b/packages/client/src/pages/settings/sounds.vue
@@ -38,7 +38,7 @@ const masterVolume = computed({
 	},
 });
 
-const volumeIcon = computed(() => masterVolume.value === 0 ? 'ph-speaker-none-bold ph-lg' : 'ph-speaker-high ph-bold ph-lg');
+const volumeIcon = computed(() => masterVolume.value === 0 ? 'ph-speaker-none ph-bold ph-lg' : 'ph-speaker-high ph-bold ph-lg');
 
 const sounds = ref({
 	note: ColdDeviceStorage.get('sound_note'),
diff --git a/packages/client/src/ui/classic.vue b/packages/client/src/ui/classic.vue
index 965fde814..4992ae3c4 100644
--- a/packages/client/src/ui/classic.vue
+++ b/packages/client/src/ui/classic.vue
@@ -104,7 +104,7 @@ function onContextmenu(ev: MouseEvent) {
 		type: 'label',
 		text: path,
 	}, {
-		icon: fullView ? 'ph-arrows-in-simple-bold ph-lg' : 'ph-arrows-out-simple ph-bold ph-lg',
+		icon: fullView ? 'ph-arrows-in-simple ph-bold ph-lg' : 'ph-arrows-out-simple ph-bold ph-lg',
 		text: fullView ? i18n.ts.quitFullView : i18n.ts.fullView,
 		action: () => {
 			fullView = !fullView;
diff --git a/packages/client/src/widgets/timeline.vue b/packages/client/src/widgets/timeline.vue
index cf6f1b48e..f0e7232bf 100644
--- a/packages/client/src/widgets/timeline.vue
+++ b/packages/client/src/widgets/timeline.vue
@@ -9,7 +9,7 @@
 			<i v-else-if="widgetProps.src === 'list'" class="ph-list-bullets ph-bold ph-lg"></i>
 			<i v-else-if="widgetProps.src === 'antenna'" class="ph-television ph-bold ph-lg"></i>
 			<span style="margin-left: 8px;">{{ widgetProps.src === 'list' ? widgetProps.list.name : widgetProps.src === 'antenna' ? widgetProps.antenna.name : i18n.t('_timelines.' + widgetProps.src) }}</span>
-			<i :class="menuOpened ? 'ph-caret-up-bold ph-lg' : 'ph-caret-down ph-bold ph-lg'" style="margin-left: 8px;"></i>
+			<i :class="menuOpened ? 'ph-caret-up ph-bold ph-lg' : 'ph-caret-down ph-bold ph-lg'" style="margin-left: 8px;"></i>
 		</button>
 	</template>
 

From 75fd6d068d1487f5c9717adb987a1d53ade88108 Mon Sep 17 00:00:00 2001
From: Luna <tsuki@noreply.codeberg.org>
Date: Sat, 11 Mar 2023 23:02:41 -0500
Subject: [PATCH 188/582] Sorta kinda handle client_credentials auth flow

---
 packages/backend/src/server/index.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 92f1c549d..174aaf222 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -31,6 +31,7 @@ import webServer from "./web/index.js";
 import { initializeStreamingServer } from "./api/streaming.js";
 import { koaBody } from "koa-body";
 import removeTrailingSlash from "koa-remove-trailing-slashes";
+import {v4 as uuid} from "uuid";
 
 export const serverLogger = new Logger("server", "gray", false);
 
@@ -171,9 +172,19 @@ mastoRouter.get("/oauth/authorize", async (ctx) => {
 
 mastoRouter.post("/oauth/token", async (ctx) => {
 	const body: any = ctx.request.body || ctx.request.query;
-	console.log('token-request', body)
-	console.log('token-query', ctx.request.query)
-	let client_id: any = ctx.request.query.client_id;
+	console.log('token-request', body);
+	console.log('token-query', ctx.request.query);
+	if (body.redirect_uri.startsWith('com.tapbots') && body.grant_type === 'client_credentials') {
+		const ret = {
+			access_token: uuid(),
+			token_type: "Bearer",
+			scope: "read",
+			created_at: Math.floor(new Date().getTime() / 1000),
+		};
+		ctx.body = ret;
+		return;
+	}
+	let client_id: any = body.client_id;
 	const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
 	const generator = (megalodon as any).default;
 	const client = generator("misskey", BASE_URL, null) as MegalodonInterface;

From a338bb48d0e015ec29cee27eb917f594c735fe3f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 11 Mar 2023 21:44:11 -0800
Subject: [PATCH 189/582] chore: update patrons list

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

diff --git a/patrons.json b/patrons.json
index 3584fb2b4..b6c9747e6 100644
--- a/patrons.json
+++ b/patrons.json
@@ -15,6 +15,8 @@
 		"@Kio@kitsunes.club",
 		"@twann@tech.lgbt",
 		"@surfbum@surfzone.nz",
+		"@topher@mastodon.online",
+		"@hanicef@stop.voring.me",
 		"Interkosmos Link"
 	]
 }

From 036c699da95a2ad0967fbe4ffaf18e46b103cfff Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 12 Mar 2023 13:43:37 -0700
Subject: [PATCH 190/582] chore: up icons

---
 packages/client/package.json |  2 +-
 pnpm-lock.yaml               | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 2f7b617f6..1f3270b1d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -9,7 +9,7 @@
 	"devDependencies": {
 		"@discordapp/twemoji": "14.0.2",
 		"@khmyznikov/pwa-install": "^0.2.0",
-		"@phosphor-icons/web": "^2.0.2",
+		"@phosphor-icons/web": "^2.0.3",
 		"@rollup/plugin-alias": "3.1.9",
 		"@rollup/plugin-json": "4.1.0",
 		"@rollup/pluginutils": "^4.2.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d528bcbc0..3d55f7446 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -396,7 +396,7 @@ importers:
     specifiers:
       '@discordapp/twemoji': 14.0.2
       '@khmyznikov/pwa-install': ^0.2.0
-      '@phosphor-icons/web': ^2.0.2
+      '@phosphor-icons/web': ^2.0.3
       '@rollup/plugin-alias': 3.1.9
       '@rollup/plugin-json': 4.1.0
       '@rollup/pluginutils': ^4.2.1
@@ -473,7 +473,7 @@ importers:
     devDependencies:
       '@discordapp/twemoji': 14.0.2
       '@khmyznikov/pwa-install': 0.2.0
-      '@phosphor-icons/web': 2.0.2
+      '@phosphor-icons/web': 2.0.3
       '@rollup/plugin-alias': 3.1.9_rollup@3.9.1
       '@rollup/plugin-json': 4.1.0_rollup@3.9.1
       '@rollup/pluginutils': 4.2.1
@@ -1425,8 +1425,8 @@ packages:
       sshpk: 1.17.0
     dev: false
 
-  /@phosphor-icons/web/2.0.2:
-    resolution: {integrity: sha512-CbCor9mjRC+GWhHYqyrixtyMKgPnJDPBxR/MxiJ0Fyo//699s1k/f72+DvZuMebH7JQK3IHKwLl4uQ5L4e/5iw==}
+  /@phosphor-icons/web/2.0.3:
+    resolution: {integrity: sha512-9oYmohi2fo87w3DbtfjBoJxrklVojgXq2wuGcqxKccj2TxMq7UIusKDrGUZYOQHM9pUKkh+kvfmutETMGDR6gg==}
     dev: true
 
   /@redis/bloom/1.1.0_@redis+client@1.4.2:
@@ -4861,6 +4861,12 @@ packages:
   /core-js/3.27.1:
     resolution: {integrity: sha512-GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww==}
     requiresBuild: true
+    dev: false
+
+  /core-js/3.29.0:
+    resolution: {integrity: sha512-VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg==}
+    requiresBuild: true
+    dev: true
 
   /core-util-is/1.0.2:
     resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
@@ -13575,7 +13581,7 @@ packages:
     name: plyr
     version: 3.7.0
     dependencies:
-      core-js: 3.27.1
+      core-js: 3.29.0
       custom-event-polyfill: 1.0.7
       loadjs: 4.2.0
       rangetouch: 2.0.1

From f02b1429e92ddf39b0c35214322d4163900a4052 Mon Sep 17 00:00:00 2001
From: Luna <tsuki@noreply.codeberg.org>
Date: Mon, 13 Mar 2023 00:44:38 -0400
Subject: [PATCH 191/582] Small fix to Masto ID conversion code

---
 packages/backend/src/server/api/index.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index aa6507743..4eb87a614 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -30,7 +30,7 @@ export enum IdType {
 export function convertId(idIn: string, idConvertTo: IdType ) {
 	let idArray = []
 	switch (idConvertTo) {
-		case IdType.CalckeyId:
+		case IdType.MastodonId:
 			idArray = [...idIn].map(item => item.charCodeAt(0));
 			idArray = idArray.map(item => {
 				if (item.toString().length < 3) {
@@ -39,8 +39,11 @@ export function convertId(idIn: string, idConvertTo: IdType ) {
 				else return item.toString()
 			});
 			return idArray.join('');
-		case IdType.MastodonId:
+		case IdType.CalckeyId:
 			for (let i = 0; i < idIn.length; i += 3) {
+				if ((idIn.length % 3) !== 0) {
+					idIn = `0${idIn}`
+				}
 				idArray.push(idIn.slice(i, i+3));
 			}
 			idArray = idArray.map(item => String.fromCharCode(item));

From c1a6e342e9e2261e233f6c0db51b380004ba1288 Mon Sep 17 00:00:00 2001
From: Cleo John <waterdev@galaxycrow.de>
Date: Tue, 14 Mar 2023 17:18:30 +0100
Subject: [PATCH 192/582] webhook mastodon fixes

---
 packages/backend/src/queue/processors/webhook-deliver.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/queue/processors/webhook-deliver.ts b/packages/backend/src/queue/processors/webhook-deliver.ts
index a130fcd38..2edf4f696 100644
--- a/packages/backend/src/queue/processors/webhook-deliver.ts
+++ b/packages/backend/src/queue/processors/webhook-deliver.ts
@@ -20,6 +20,7 @@ export default async (job: Bull.Job<WebhookDeliverJobData>) => {
 				"X-Calckey-Host": config.host,
 				"X-Calckey-Hook-Id": job.data.webhookId,
 				"X-Calckey-Hook-Secret": job.data.secret,
+				'Content-Type': 'application/json'
 			},
 			body: JSON.stringify({
 				hookId: job.data.webhookId,

From d09c36f1cc3aa71575f76b247b82538580f1c998 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 14 Mar 2023 16:20:46 -0700
Subject: [PATCH 193/582] apps: mona

---
 locales/en-US.yml                  |  2 +-
 locales/ja-JP.yml                  |  2 +-
 packages/client/src/pages/apps.vue | 15 ++++-----------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index e859929f3..47cbb783c 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1807,6 +1807,6 @@ _apps:
   kaiteki: "Kaiteki"
   milktea: "Milktea"
   missLi: "MissLi"
-  kimis: "Kimis"
+  mona: "Mona"
   theDesk: "TheDesk"
   lesskey: "Lesskey"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e668d1afb..fe672c16e 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1807,6 +1807,6 @@ _apps:
   kaiteki: "Kaiteki"
   milktea: "Milktea"
   missLi: "MissLi"
-  kimis: "Kimis"
+  mona: "Mona"
   theDesk: "TheDesk"
   lesskey: "Lesskey"
diff --git a/packages/client/src/pages/apps.vue b/packages/client/src/pages/apps.vue
index 24d704571..f3999ef21 100644
--- a/packages/client/src/pages/apps.vue
+++ b/packages/client/src/pages/apps.vue
@@ -32,20 +32,13 @@
 							{{ i18n.ts._apps.milktea }}
 							<template #suffix>{{ i18n.ts._apps.firstClass }}, {{ i18n.ts._apps.free }}</template>
 						</FormLink>
-						<!-- <FormLink to="https://play.google.com/store/apps/details?id=jp.juggler.subwaytooter&gl=US" external>
-							<template #icon>
-								<i class="ph-android-logo ph-bold ph-xl"/>
-							</template>
-							{{ i18n.ts._apps.subwayTooter }}
-							<template #suffix>{{ i18n.ts._apps.secondClass }}, {{ i18n.ts._apps.free }}</template>
-						</FormLink> -->
-						<!-- <FormLink to="https://apps.apple.com/app/kimis-a-client-for-misskey/id1667275125" external>
+						<FormLink to="https://testflight.apple.com/join/xNdgUbh6" external>
 							<template #icon>
 								<i class="ph-apple-logo ph-bold ph-xl"/>
 							</template>
-							{{ i18n.ts._apps.kimis }}
-							<template #suffix>{{ i18n.ts._apps.secondClass }}, {{ i18n.ts._apps.paid }}</template>
-						</FormLink> -->
+							{{ i18n.ts._apps.mona }}
+							<template #suffix>{{ i18n.ts._apps.thirdClass }}, {{ i18n.ts._apps.paid }}</template>
+						</FormLink>
 					</div>
 				</FormSection>
 				<FormSection>

From ff7aae02dd683b0541be967d975c5653d603073d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 14 Mar 2023 16:23:40 -0700
Subject: [PATCH 194/582] fix: mona is free

---
 packages/client/src/pages/apps.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/apps.vue b/packages/client/src/pages/apps.vue
index f3999ef21..377c692e9 100644
--- a/packages/client/src/pages/apps.vue
+++ b/packages/client/src/pages/apps.vue
@@ -37,7 +37,7 @@
 								<i class="ph-apple-logo ph-bold ph-xl"/>
 							</template>
 							{{ i18n.ts._apps.mona }}
-							<template #suffix>{{ i18n.ts._apps.thirdClass }}, {{ i18n.ts._apps.paid }}</template>
+							<template #suffix>{{ i18n.ts._apps.thirdClass }}, {{ i18n.ts._apps.free }}</template>
 						</FormLink>
 					</div>
 				</FormSection>

From 1653cb596485921c761d19b7bc62896bc760490c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 14 Mar 2023 16:55:24 -0700
Subject: [PATCH 195/582] release notes

---
 release.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.json b/release.json
index 8eb30cbe2..89f9752ff 100644
--- a/release.json
+++ b/release.json
@@ -1,5 +1,5 @@
 {
-	"version": "13.1.3-rc",
-	"notes": "This release candidate has the following changes:\n• Better blocking/muting\n• Better user refreshing\n• New help menu with app list (More! > Help)\n• Bug fixes and performance improvements",
+	"version": "13.1.3",
+	"notes": "This release candidate has the following changes:\n• Better blocking/muting\n• Better user refreshing\n• New help menu with app list (More! > Help)\n• New headerbar style\n• Bug + security fixes and performance improvements",
 	"screenshots": []
 }

From 77ff4ca78fa3088eb70a31d277e37c5e197a245d Mon Sep 17 00:00:00 2001
From: fruye <fruye@noreply.codeberg.org>
Date: Wed, 15 Mar 2023 07:18:18 +0000
Subject: [PATCH 196/582] fix: Isolate unicode characters in display names
 (#9702)

This fixes a 'Follows you' badge on a profile page and account addresses in threads from being drawn backwards when an account has some special Unicode characters that change the direction of text in their name (i.e. U+202E RIGHT-TO-LEFT OVERRIDE).

Co-authored-by: fruye <fruye@unix.dog>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9702
Co-authored-by: fruye <fruye@noreply.codeberg.org>
Co-committed-by: fruye <fruye@noreply.codeberg.org>
---
 packages/client/src/components/global/MkUserName.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/global/MkUserName.vue b/packages/client/src/components/global/MkUserName.vue
index f1a4bfb22..4dfa91b18 100644
--- a/packages/client/src/components/global/MkUserName.vue
+++ b/packages/client/src/components/global/MkUserName.vue
@@ -1,5 +1,5 @@
 <template>
-<Mfm :text="user.name || user.username" :plain="true" :nowrap="nowrap" :custom-emojis="user.emojis"/>
+<Mfm :class="$style.root" :text="user.name || user.username" :plain="true" :nowrap="nowrap" :custom-emojis="user.emojis"/>
 </template>
 
 <script lang="ts" setup>
@@ -13,3 +13,9 @@ const props = withDefaults(defineProps<{
 	nowrap: true,
 });
 </script>
+
+<style lang="scss" module>
+.root {
+	unicode-bidi: isolate;
+}
+</style>

From b62b1d43d6dd18da072d98eead1cfba29d85fd9d Mon Sep 17 00:00:00 2001
From: fruye <fruye@unix.dog>
Date: Wed, 15 Mar 2023 21:38:12 +0100
Subject: [PATCH 197/582] fix: Run to boolean conversion in mastoAPI public and
 hashtag timelines

The `only_media` query parameter in `/api/v1/timelines/public` and
`/api/v1/timelines/tag/:hashtag` was previously passed directly as-is to
the Misskey API, which made it pretty upset because it was receiving a
string named 'true' instead of the value 'true'.

Needed for pleromaFE to display a timeline.
---
 .../backend/src/server/api/mastodon/endpoints/timeline.ts   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index 1b5afd6d0..58ca8d677 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -92,8 +92,8 @@ export function apiTimelineMastodon(router: Router): void {
 		try {
 			const query: any = ctx.query;
 			const data = query.local
-				? await client.getLocalTimeline(limitToInt(query))
-				: await client.getPublicTimeline(limitToInt(query));
+				? await client.getLocalTimeline(argsToBools(limitToInt(query)))
+				: await client.getPublicTimeline(argsToBools(limitToInt(query)));
 			ctx.body = toTextWithReaction(data.data, ctx.hostname);
 		} catch (e: any) {
 			console.error(e);
@@ -111,7 +111,7 @@ export function apiTimelineMastodon(router: Router): void {
 			try {
 				const data = await client.getTagTimeline(
 					ctx.params.hashtag,
-					limitToInt(ctx.query),
+					argsToBools(limitToInt(ctx.query)),
 				);
 				ctx.body = toTextWithReaction(data.data, ctx.hostname);
 			} catch (e: any) {

From 3e26fa255e5a313a252756f93beed48eea80bf27 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 15 Mar 2023 18:58:35 -0400
Subject: [PATCH 198/582] fix footer icons

---
 packages/client/src/components/MkNoteFooter.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
index 44feed322..cd0709b79 100644
--- a/packages/client/src/components/MkNoteFooter.vue
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -2,7 +2,7 @@
 	<footer ref="el" class="footer" @click.stop>
 		<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
 		<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
-			<i class="ph-arrow-bend-up-left-bold ph-lg"></i>
+			<i class="ph-arrow-bend-up-left ph-bold ph-lg"></i>
 			<template v-if="directReplies > 0">
 				<p class="count">{{ directReplies }}</p>
 			</template>
@@ -13,14 +13,14 @@
 		<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
 		<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
 		<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
-			<i class="ph-smiley-bold ph-lg"></i>
+			<i class="ph-smiley ph-bold ph-lg"></i>
 		</button>
 		<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
-			<i class="ph-minus-bold ph-lg"></i>
+			<i class="ph-minus ph-bold ph-lg"></i>
 		</button>
 		<XQuoteButton class="button" :note="appearNote"/>
 		<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
-			<i class="ph-dots-three-outline-bold ph-lg"></i>
+			<i class="ph-dots-three-outline ph-bold ph-lg"></i>
 		</button>
 	</footer>
 </template>

From f0a22b3ae49e25189205dd45efcd678839d1b393 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 15 Mar 2023 19:18:26 -0400
Subject: [PATCH 199/582] fix line in boosted text

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

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index a7c8cdcbc..08075e531 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -324,9 +324,9 @@ function readPromo() {
 				content: "";
 				display: block;
 				margin-bottom: -10px;
-				width: 2px;
-				background-color: var(--divider);
-				margin-inline: auto;
+				margin-top: 16px;
+				border-left: 2px solid var(--divider);
+				margin-left: calc((var(--avatarSize) / 2) - 1px);
 			}
 		}
 	}

From 0c56144f929ddca8d3d2110c2d25bc2ea5502fb6 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 15 Mar 2023 19:53:22 -0400
Subject: [PATCH 200/582] fix line alignment in smaller windows

---
 packages/client/src/components/MkNoteSub.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 14bcf5826..e90c3da14 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -286,14 +286,14 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 				--avatarSize: 24px;
 				--indent: calc(var(--avatarSize) - 4px);
 			}
-			&.firstColumn {
-				> .main, > .line, > .children:not(.single) > .line {
-					--avatarSize: 35px;
-					--indent: 35px;
-				}
-				> .children:not(.single) {
-					padding-left: 28px !important;
-				}
+		}
+		.firstColumn {
+			> .main, > .line, > .children:not(.single) > .line {
+				--avatarSize: 35px;
+				--indent: 35px;
+			}
+			> .children:not(.single) {
+				padding-left: 28px !important;
 			}
 		}
 	}

From 0842eeeef13719f96077a350788bf1f269b8e169 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 15 Mar 2023 20:26:13 -0400
Subject: [PATCH 201/582] *actually* fix the line alignment

---
 packages/client/src/components/MkNoteSub.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index e90c3da14..c204cb2f9 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -287,7 +287,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 				--indent: calc(var(--avatarSize) - 4px);
 			}
 		}
-		.firstColumn {
+		&.firstColumn {
 			> .main, > .line, > .children:not(.single) > .line {
 				--avatarSize: 35px;
 				--indent: 35px;

From 6c147fe6186c06058da194b1e4bc2fda62a14516 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 15 Mar 2023 21:24:12 -0400
Subject: [PATCH 202/582] Change reply icon (also align the icon in the posting
 form)

---
 packages/client/src/components/MkNoteFooter.vue | 2 +-
 packages/client/src/components/MkPostForm.vue   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
index cd0709b79..579cfcb07 100644
--- a/packages/client/src/components/MkNoteFooter.vue
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -2,7 +2,7 @@
 	<footer ref="el" class="footer" @click.stop>
 		<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
 		<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
-			<i class="ph-arrow-bend-up-left ph-bold ph-lg"></i>
+			<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
 			<template v-if="directReplies > 0">
 				<p class="count">{{ directReplies }}</p>
 			</template>
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index c7a1e17a7..7ce990b21 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -22,7 +22,7 @@
 				<span v-if="visibility === 'specified'"><i class="ph-envelope-simple-open ph-bold ph-lg"></i></span>
 			</button>
 			<button v-tooltip="i18n.ts.previewNoteText" class="_button preview" :class="{ active: showPreview }" @click="showPreview = !showPreview"><i class="ph-file-code ph-bold ph-lg"></i></button>
-			<button class="submit _buttonGradate" :disabled="!canPost" data-cy-open-post-form-submit @click="post">{{ submitText }}<i :class="reply ? 'ph-arrow-bend-up-left ph-bold ph-lg' : renote ? 'ph-quotes ph-bold ph-lg' : 'ph-paper-plane-tilt ph-bold ph-lg'"></i></button>
+			<button class="submit _buttonGradate" :disabled="!canPost" data-cy-open-post-form-submit @click="post">{{ submitText }}<i :class="reply ? 'ph-arrow-u-up-left ph-bold ph-lg' : renote ? 'ph-quotes ph-bold ph-lg' : 'ph-paper-plane-tilt ph-bold ph-lg'"></i></button>
 		</div>
 	</header>
 	<div class="form" :class="{ fixed }">
@@ -796,6 +796,8 @@ onMounted(() => {
 			}
 
 			> .submit {
+				display: inline-flex;
+				align-items: center;
 				margin: 16px 16px 16px 0;
 				padding: 0 12px;
 				line-height: 34px;

From 6d71456244fb8a7f4569f81a4d1de4fdf81e7bfd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 15 Mar 2023 18:28:53 -0700
Subject: [PATCH 203/582] docs: :memo: accurate update instructions

Closes #9709
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c4fdcf5c6..99144809f 100644
--- a/README.md
+++ b/README.md
@@ -155,7 +155,8 @@ For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](
 
 ```sh
 # git pull
-NODE_ENV=production pnpm install && pnpm run build && pnpm run migrate
+pnpm install
+NODE_ENV=production pnpm run build && pnpm run migrate
 pm2 start "NODE_ENV=production pnpm run start" --name Calckey
 ```
 

From 95d67c9ab637b9c161c2bd9c63452ecd2b2a383b Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 15 Mar 2023 22:29:48 -0400
Subject: [PATCH 204/582] fix deck view margins

---
 packages/client/src/pages/note.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index 65fda4699..1b0380cc2 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -202,11 +202,13 @@ definePageMetadata(computed(() => note ? {
 			}
 		}
 	}
-	&.max-width_500px > .note {
-		margin-inline: -24px;
-	}
-	&.max-width_350px > .note {
-		margin-inline: -12px;
+	#calckey_app > :not(.mk-deck) {
+		&.max-width_500px > .note {
+			margin-inline: -24px;
+		}
+		&.max-width_350px > .note {
+			margin-inline: -12px;
+		}
 	}
 }
 </style>

From d4e77ccd9b91116bc74102051f482289ab7d784e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 16 Mar 2023 15:37:49 -0700
Subject: [PATCH 205/582] better border color

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

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 4e38b16b0..d3172c4bc 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -44,6 +44,7 @@ const toggle = () => {
 	padding: 6px 10px;
 	width: 90%;
 	border-radius: 10px;
+	border: 1px solid var(--divider);
 	margin-top: 10px;
 	margin-bottom: 10px;
 	transition: background-color 0.25s ease-in-out;

From 5eec5ac2ef86708744b562ab1a319bd888d3a8cc Mon Sep 17 00:00:00 2001
From: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
Date: Fri, 17 Mar 2023 01:16:31 +0000
Subject: [PATCH 206/582] feat: Make follower counts for remote users correct
 (#9705)

#9293

Not sure if this is the right approach for this

Co-authored-by: s1idewhist1e <trombonedude05@gmail.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9705
Co-authored-by: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
Co-committed-by: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
---
 .../backend/src/models/repositories/user.ts   |  4 +-
 .../src/remote/activitypub/models/person.ts   | 78 ++++++++++++++++++-
 2 files changed, 78 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index aa224b667..0455b9a5f 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -488,8 +488,8 @@ export const UserRepository = db.getRepository(User).extend({
 						birthday: profile!.birthday,
 						lang: profile!.lang,
 						fields: profile!.fields,
-						followersCount: followersCount || 0,
-						followingCount: followingCount || 0,
+						followersCount: followersCount || '?',
+						followingCount: followingCount || '?',
 						notesCount: user.notesCount,
 						pinnedNoteIds: pins.map((pin) => pin.noteId),
 						pinnedNotes: Notes.packMany(
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 16b265b0b..f4f792df1 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -198,9 +198,36 @@ export async function createPerson(
 	const url = getOneApHrefNullable(person.url);
 
 	if (url && !url.startsWith("https://")) {
-		throw new Error(`unexpected shcema of person url: ${url}`);
+		throw new Error(`unexpected schema of person url: ${url}`);
 	}
 
+	let followersCount: number | undefined;
+
+	if (typeof person.followers === "string") {
+		try {
+			let data = await fetch(person.followers, { headers: { "Accept": "application/json" } });
+			let json_data = JSON.parse(await data.text());
+
+			followersCount = json_data.totalItems;
+		} catch {
+			followersCount = undefined;
+		}
+	}
+
+	let followingCount: number | undefined;
+
+	if (typeof person.following === "string") {
+		try {
+			let data = await fetch(person.following, { headers: { "Accept": "application/json" } });
+			let json_data = JSON.parse(await data.text());
+
+			followingCount = json_data.totalItems;
+		} catch (e) {
+			followingCount = undefined;
+		}
+	}
+
+
 	// Create user
 	let user: IRemoteUser;
 	try {
@@ -228,6 +255,16 @@ export async function createPerson(
 					followersUri: person.followers
 						? getApId(person.followers)
 						: undefined,
+					followersCount: followersCount !== undefined
+						? followersCount
+						: person.followers && typeof person.followers !== "string" && isCollectionOrOrderedCollection(person.followers)
+							? person.followers.totalItems
+							: undefined,
+					followingCount: followingCount !== undefined
+						? followingCount
+						: person.following && typeof person.following !== "string" && isCollectionOrOrderedCollection(person.following)
+							? person.following.totalItems
+							: undefined,
 					featured: person.featured ? getApId(person.featured) : undefined,
 					uri: person.id,
 					tags,
@@ -396,7 +433,34 @@ export async function updatePerson(
 	const url = getOneApHrefNullable(person.url);
 
 	if (url && !url.startsWith("https://")) {
-		throw new Error(`unexpected shcema of person url: ${url}`);
+		throw new Error(`unexpected schema of person url: ${url}`);
+	}
+
+	let followersCount: number | undefined;
+
+	if (typeof person.followers === "string") {
+		try {
+			let data = await fetch(person.followers, { headers: { "Accept": "application/json" } } );
+			let json_data = JSON.parse(await data.text());
+
+			followersCount = json_data.totalItems;
+		} catch {
+			followersCount = undefined;
+		}
+	}
+
+
+	let followingCount: number | undefined;
+
+	if (typeof person.following === "string") {
+		try {
+			let data = await fetch(person.following, { headers: { "Accept": "application/json" } } );
+			let json_data = JSON.parse(await data.text());
+
+			followingCount = json_data.totalItems;
+		} catch {
+			followingCount = undefined;
+		}
 	}
 
 	const updates = {
@@ -406,6 +470,16 @@ export async function updatePerson(
 			person.sharedInbox ||
 			(person.endpoints ? person.endpoints.sharedInbox : undefined),
 		followersUri: person.followers ? getApId(person.followers) : undefined,
+		followersCount: followersCount !== undefined
+			? followersCount
+			: person.followers && typeof person.followers !== "string" && isCollectionOrOrderedCollection(person.followers)
+				? person.followers.totalItems
+				: undefined,
+		followingCount: followingCount !== undefined
+			? followingCount
+			: person.following && typeof person.following !== "string" && isCollectionOrOrderedCollection(person.following)
+				? person.following.totalItems
+				: undefined,
 		featured: person.featured,
 		emojis: emojiNames,
 		name: truncate(person.name, nameLength),

From 734866a19109e5a87ba62f2e9b72e66346edfc1c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 16 Mar 2023 18:17:53 -0700
Subject: [PATCH 207/582] docs: changes

---
 CALCKEY.md | 4 ++++
 README.md  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/CALCKEY.md b/CALCKEY.md
index 015232f70..110aaf264 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -108,6 +108,10 @@
   - Allows custom emoji
 - Fix lint errors
 - Use Rome instead of ESLint
+- Mastodon API support
+- More antenna options
+- New dashboard
+- Backfill follower counts
 - MissV: [fix Misskey Forkbomb](https://code.vtopia.live/Vtopia/MissV/commit/40b23c070bd4adbb3188c73546c6c625138fb3c1)
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)
diff --git a/README.md b/README.md
index 99144809f..2b5a80b0d 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,8 @@
   - OCR image captioning
   - New and improved Groups
   - Better intro tutorial
+  - Compatibility with Mastodon clients/apps
+  - Backfill user information
   - Many more user and admin settings
   - [So much more!](./CALCKEY.md)
 

From 3d7868c9dc742045efc05f27a1773c4feba79970 Mon Sep 17 00:00:00 2001
From: fruye <fruye@unix.dog>
Date: Fri, 17 Mar 2023 13:58:01 +0000
Subject: [PATCH 208/582] fix: Parse mastoAPI `limit` argument in more places &
 Improve converting arguments to boolean (#9716)

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9716
Authored-by: fruye <fruye@unix.dog>
Signed-off-by: Cleo John <waterdev@galaxycrow.de>
Co-authored-by: fruye <fruye@unix.dog>
Co-committed-by: fruye <fruye@unix.dog>
---
 .../backend/src/server/api/mastodon/endpoints/account.ts  | 8 ++++----
 .../backend/src/server/api/mastodon/endpoints/status.ts   | 4 +++-
 .../backend/src/server/api/mastodon/endpoints/timeline.ts | 7 +++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 1c5e31fe8..bd1a2e648 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -359,7 +359,7 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = (await client.getBookmarks(ctx.query as any)) as any;
+			const data = (await client.getBookmarks(limitToInt(ctx.query as any))) as any;
 			let resp = data.data;
 			for (let statIdx = 0; statIdx < resp.length; statIdx++) {
 				resp[statIdx].id = convertId(resp[statIdx].id, IdType.MastodonId);
@@ -383,7 +383,7 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getFavourites(ctx.query as any);
+			const data = await client.getFavourites(limitToInt(ctx.query as any));
 			let resp = data.data;
 			for (let statIdx = 0; statIdx < resp.length; statIdx++) {
 				resp[statIdx].id = convertId(resp[statIdx].id, IdType.MastodonId);
@@ -407,7 +407,7 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getMutes(ctx.query as any);
+			const data = await client.getMutes(limitToInt(ctx.query as any));
 			let resp = data.data;
 			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
 				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
@@ -425,7 +425,7 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.getBlocks(ctx.query as any);
+			const data = await client.getBlocks(limitToInt(ctx.query as any));
 			let resp = data.data;
 			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
 				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index d04b7a8b9..012820140 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -4,6 +4,8 @@ import { emojiRegexAtStartToEnd } from "@/misc/emoji-regex.js";
 import axios from "axios";
 import querystring from 'node:querystring'
 import qs from 'qs'
+import { limitToInt } from "./timeline.js";
+
 function normalizeQuery(data: any) {
     const str = querystring.stringify(data);
     return qs.parse(str);
@@ -101,7 +103,7 @@ export function apiStatusMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const id = ctx.params.id;
-				const data = await client.getStatusContext(id, ctx.query as any);
+				const data = await client.getStatusContext(id, limitToInt(ctx.query as any));
 				const status = await client.getStatus(id);
 				const reactionsAxios = await axios.get(
 					`${BASE_URL}/api/notes/reactions?noteId=${id}`,
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index 58ca8d677..23729e480 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -15,13 +15,16 @@ export function limitToInt(q: ParsedUrlQuery) {
 }
 
 export function argsToBools(q: ParsedUrlQuery) {
+	// Values taken from https://docs.joinmastodon.org/client/intro/#boolean
+	const toBoolean = (value: string) => !['0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF'].includes(value);
+
 	let object: any = q;
 	if (q.only_media)
 		if (typeof q.only_media === "string")
-			object.only_media = q.only_media.toLowerCase() === "true";
+			object.only_media = toBoolean(q.only_media);
 	if (q.exclude_replies)
 		if (typeof q.exclude_replies === "string")
-			object.exclude_replies = q.exclude_replies.toLowerCase() === "true";
+			object.exclude_replies = toBoolean(q.exclude_replies);
 	return q;
 }
 

From d437653729faca4d78e64a0c84e4a3526786dd30 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Mar 2023 09:31:39 -0700
Subject: [PATCH 209/582] fix: send button

---
 packages/client/src/pages/messaging/messaging-room.form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue
index 4fe372277..18f2ba7a3 100644
--- a/packages/client/src/pages/messaging/messaging-room.form.vue
+++ b/packages/client/src/pages/messaging/messaging-room.form.vue
@@ -18,7 +18,7 @@
 			<button class="_button" @click="chooseFile"><i class="ph-upload ph-bold ph-lg"></i></button>
 			<button class="_button" @click="insertEmoji"><i class="ph-smiley ph-bold ph-lg"></i></button>
 			<button class="send _button" :disabled="!canSend || sending" :title="i18n.ts.send" @click="send">
-				<template v-if="!sending"><i class="ph-paper-plane-tilt-bold ph-lg"></i></template><template v-if="sending"><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i></template>
+				<template v-if="!sending"><i class="ph-paper-plane-tilt ph-bold ph-lg"></i></template><template v-if="sending"><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i></template>
 			</button>
 		</div>
 	</footer>

From f2f9c1a7bdb8967b8a9019a447598a7fa85b08a6 Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Sat, 18 Mar 2023 00:44:00 +0000
Subject: [PATCH 210/582] note-improvements (#9720) Co-authored-by: Free
 <freeplay@duck.com> Co-committed-by: Free <freeplay@duck.com>

---
 .../client/src/components/MkNoteDetailed.vue  |  2 +-
 packages/client/src/components/MkNoteSub.vue  | 14 +++++++++----
 .../src/components/MkSubNoteContent.vue       | 20 +++++++++++--------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index ac948b8ce..f29129f87 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -301,7 +301,7 @@ if (appearNote.replyId) {
 	os.api('notes/conversation', {
 		noteId: appearNote.replyId,
 	}).then(res => {
-		conversation.value = res;
+		conversation.value = res.reverse();
 	});
 }
 
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index c204cb2f9..48e9866d8 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -10,11 +10,13 @@
 			<XNoteHeader class="header" :note="note" :mini="true"/>
 			<div class="body">
 				<p v-if="note.cw != null" class="cw">
+					<i v-if="note.replyId" class="ph-arrow-bend-up-left ph-bold ph-lg reply-icon"></i>
+					<i v-if="note.renoteId != parentId" class="ph-quotes ph-bold ph-lg reply-icon"></i>
 					<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 					<XCwButton v-model="showContent" :note="note"/>
 				</p>
 				<div v-show="note.cw == null || showContent" class="content" @click="router.push(notePage(note))">
-					<MkSubNoteContent class="text" :note="note" :detailed="true"/>
+					<MkSubNoteContent class="text" :note="note" :detailed="true" :parentId="note.parentId"/>
 				</div>
 			</div>
 			<MkNoteFooter :note="note" :directReplies="replies.length"></MkNoteFooter>
@@ -22,10 +24,10 @@
 	</div>
 	<template v-if="conversation">
 		<template v-if="replies.length == 1">
-			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply single" :conversation="conversation" :depth="depth"/>
+			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply single" :conversation="conversation" :depth="depth" :parentId="note.replyId"/>
 		</template>
 		<template v-else-if="depth < 5">
-			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply" :conversation="conversation" :depth="depth + 1"/>
+			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply" :conversation="conversation" :depth="depth + 1" :parentId="note.replyId"/>
 		</template>
 		<div v-else-if="replies.length > 0" class="more">
 			<div class="line"></div>
@@ -52,6 +54,7 @@ const router = useRouter();
 const props = withDefaults(defineProps<{
 	note: misskey.entities.Note;
 	conversation?: misskey.entities.Note[];
+	parentId?;
 
 	// how many notes are in between this one and the note being viewed in detail
 	depth?: number;
@@ -115,7 +118,10 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 					margin: 0;
 					padding: 0;
 					overflow-wrap: break-word;
-
+					> .reply-icon {
+						margin-right: 6px;
+						color: var(--accent);
+					}
 					> .text {
 						margin-right: 8px;
 					}
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 299ed2ea0..87e927df0 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -2,16 +2,13 @@
 <div class="wrmlmaau" :class="{ collapsed, isLong }">
 	<div class="body">
 		<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
-		<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left ph-bold ph-lg"></i></MkA>
+		<template v-if="!note.cw">
+			<i v-if="note.replyId" class="ph-arrow-bend-up-left ph-bold ph-lg reply-icon"></i>
+			<i v-if="note.renoteId != parentId" class="ph-quotes ph-bold ph-lg reply-icon"></i>
+		</template>
 		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 		<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">{{ i18n.ts.quoteAttached }}: ...</MkA>
 	</div>
-	<template v-if="detailed">
-		<!-- <div v-if="note.renoteId" class="renote">
-			<XNoteSimple :note="note.renote"/>
-		</div> -->
-		<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
-	</template>
 	<div v-if="note.files.length > 0">
 		<XMediaList :media-list="note.files"/>
 	</div>
@@ -19,6 +16,12 @@
 		<summary>{{ i18n.ts.poll }}</summary>
 		<XPoll :note="note"/>
 	</div>
+	<template v-if="detailed">
+		<!-- <div v-if="note.renoteId" class="renote">
+			<XNoteSimple :note="note.renote"/>
+		</div> -->
+		<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
+	</template>
 	<button v-if="isLong && collapsed" class="fade _button" @click.stop="collapsed = false">
 		<span>{{ i18n.ts.showMore }}</span>
 	</button>
@@ -41,6 +44,7 @@ import { i18n } from '@/i18n';
 
 const props = defineProps<{
 	note: misskey.entities.Note;
+	parentId?;
 	detailed?: boolean;
 }>();
 
@@ -60,7 +64,7 @@ const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : n
 	overflow-wrap: break-word;
 	
 	> .body {
-		> .reply {
+		> .reply-icon {
 			margin-right: 6px;
 			color: var(--accent);
 		}

From 4cfa9b0a83806d377e03a2d579c3c923484a83dd Mon Sep 17 00:00:00 2001
From: Kaitlyn Allan <kaitlyn.allan@enlabs.cloud>
Date: Sat, 18 Mar 2023 18:07:39 +1000
Subject: [PATCH 211/582] Don't show channel edit button unless owner

---
 packages/client/src/pages/channel.vue | 28 ++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/pages/channel.vue b/packages/client/src/pages/channel.vue
index f1eb450c8..003986ac8 100644
--- a/packages/client/src/pages/channel.vue
+++ b/packages/client/src/pages/channel.vue
@@ -51,13 +51,6 @@ const props = defineProps<{
 
 let channel = $ref(null);
 let showBanner = $ref(true);
-const pagination = {
-	endpoint: 'channels/timeline' as const,
-	limit: 10,
-	params: computed(() => ({
-		channelId: props.channelId,
-	})),
-};
 
 watch(() => props.channelId, async () => {
 	channel = await os.api('channels/show', {
@@ -66,14 +59,23 @@ watch(() => props.channelId, async () => {
 }, { immediate: true });
 
 function edit() {
-	router.push(`/channels/${channel.id}/edit`);
+	router.push(`/channels/${channel?.id}/edit`);
 }
 
-const headerActions = $computed(() => channel && channel.userId ? [{
-	icon: 'ph-gear-six ph-bold ph-lg',
-	text: i18n.ts.edit,
-	handler: edit,
-}] : null);
+const headerActions = $computed(() =>  [
+	...(
+		channel
+		&& channel?.userId === $i?.id
+		? [
+			{
+				icon: 'ph-gear-six ph-bold ph-lg',
+				text: i18n.ts.edit,
+				handler: edit,
+			}
+		]
+		: []
+	),
+]);
 
 const headerTabs = $computed(() => []);
 

From 25896f0093f6da21c1929e3d6de8b616f91ad4f1 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Sat, 18 Mar 2023 11:52:12 +0100
Subject: [PATCH 212/582] chore: update megalodon

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

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 910ffd374..ce6efde9c 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -81,7 +81,7 @@
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
-		"@calckey/megalodon": "5.1.2",
+		"@calckey/megalodon": "5.1.21",
 		"mfm-js": "0.23.2",
 		"mime-types": "2.1.35",
 		"multer": "1.4.4-lts.1",

From 8593dbed95d3913ddddba36351578553a966f3c4 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Sat, 18 Mar 2023 11:53:17 +0100
Subject: [PATCH 213/582] chore: update package locks

---
 pnpm-lock.yaml | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3d55f7446..c1a00fbfd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -55,7 +55,7 @@ importers:
       '@bull-board/api': ^4.6.4
       '@bull-board/koa': ^4.6.4
       '@bull-board/ui': ^4.6.4
-      '@calckey/megalodon': 5.1.2
+      '@calckey/megalodon': 5.1.21
       '@discordapp/twemoji': 14.0.2
       '@elastic/elasticsearch': 7.17.0
       '@koa/cors': 3.4.3
@@ -224,7 +224,7 @@ importers:
       '@bull-board/api': 4.10.2
       '@bull-board/koa': 4.10.2_6tybghmia4wsnt33xeid7y4rby
       '@bull-board/ui': 4.10.2
-      '@calckey/megalodon': 5.1.2
+      '@calckey/megalodon': 5.1.21
       '@discordapp/twemoji': 14.0.2
       '@elastic/elasticsearch': 7.17.0
       '@koa/cors': 3.4.3
@@ -759,8 +759,8 @@ packages:
       '@bull-board/api': 4.10.2
     dev: false
 
-  /@calckey/megalodon/5.1.2:
-    resolution: {integrity: sha512-bUjPOfASy8X2NxdBvYDOWN9Rw/KdkfbTxy5vMQBcrGXepFbT4M+00blEYNc00Uu/epwH9YoNqpQC8PKQr/WU4w==}
+  /@calckey/megalodon/5.1.21:
+    resolution: {integrity: sha512-wThdyNb/UofklvYzyeFNQwxJNHqaSLD+z0glQLzV1tmAvSB0EZOL0D15dvpdB0LED0Q2rpJlwaonejkTI9JQhA==}
     engines: {node: '>=15.0.0'}
     dependencies:
       '@types/oauth': 0.9.1
@@ -3402,7 +3402,7 @@ packages:
   /axios/0.25.0_debug@4.3.4:
     resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==}
     dependencies:
-      follow-redirects: 1.15.2_debug@4.3.4
+      follow-redirects: 1.15.2
     transitivePeerDependencies:
       - debug
     dev: true
@@ -6407,19 +6407,6 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
-    dev: false
-
-  /follow-redirects/1.15.2_debug@4.3.4:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dependencies:
-      debug: 4.3.4
-    dev: true
 
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}

From 9c0416df65e190694117691996277ef3611afdcb Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Sat, 18 Mar 2023 12:09:43 +0100
Subject: [PATCH 214/582] add 404 as replacements

---
 .../backend/src/server/api/mastodon/endpoints/account.ts    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index bd1a2e648..8c6622964 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -33,10 +33,10 @@ export function apiAccountMastodon(router: Router): void {
 			let acct = data.data;
 			acct.id = convertId(acct.id, IdType.MastodonId);
 			acct.url = `${BASE_URL}/@${acct.url}`;
-			acct.note = "";
+			acct.note = acct.note || "";
 			acct.avatar_static = acct.avatar;
-			acct.header = acct.header || "";
-			acct.header_static = acct.header || "";
+			acct.header = acct.header || "https://http.cat/404";
+			acct.header_static = acct.header || "https://http.cat/404";
 			acct.source = {
 				note: acct.note,
 				fields: acct.fields,

From 3e748cb401a0dc70e2be651e00e21aec576d4763 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Sat, 18 Mar 2023 12:23:03 +0100
Subject: [PATCH 215/582] fix: intermediarily convert ids

---
 .../backend/src/server/api/mastodon/endpoints/account.ts   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 8c6622964..ae8f9a786 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -338,8 +338,13 @@ export function apiAccountMastodon(router: Router): void {
 				ctx.body = [relationshipModel];
 				return;
 			}
+
+			let reqIds = [];
+			for (let i = 0; i < ids.length; i++) {
+				reqIds.push(convertId(ids[i], IdType.CalckeyId));
+			}
 			
-			const data = await client.getRelationships(ids);
+			const data = await client.getRelationships(reqIds);
 			let resp = data.data;
 			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
 				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);

From 3122701186f13b0497a176a39808feb1ecac5b96 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Sat, 18 Mar 2023 13:06:49 +0100
Subject: [PATCH 216/582] pass auth to metadata

---
 .../backend/src/server/api/mastodon/endpoints/status.ts    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index 012820140..38199740a 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -105,7 +105,12 @@ export function apiStatusMastodon(router: Router): void {
 				const id = ctx.params.id;
 				const data = await client.getStatusContext(id, limitToInt(ctx.query as any));
 				const status = await client.getStatus(id);
-				const reactionsAxios = await axios.get(
+				let reqInstance = axios.create({
+					headers: {
+						Authorization : ctx.headers.authorization
+					}
+				});
+				const reactionsAxios = await reqInstance.get(
 					`${BASE_URL}/api/notes/reactions?noteId=${id}`,
 				);
 				const reactions: IReaction[] = reactionsAxios.data;

From e08ec0dfaf1fdabb59b88ea48865f8889b75c7c8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 00:12:24 -0700
Subject: [PATCH 217/582] fix: mobile button alignment

---
 package.json                         | 2 +-
 packages/client/src/ui/universal.vue | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7f14982fd..756d2aa6a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev11",
+	"version": "13.2.0-dev12",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 564cab199..37296451e 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -376,10 +376,8 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
 			}
 
 			> .button-wrapper {
-
-				> i {
-					transform: translateY(0.05em);
-				}
+				display: inline-flex;
+				justify-content: center;
 
 				&.on {
 					background-color: var(--accentedBg);

From 5315201032238d2f6eb9529e717129c6bf3efff4 Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Sun, 19 Mar 2023 07:13:02 +0000
Subject: [PATCH 218/582] note-improvements (#9721)

boop

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9721
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 packages/client/src/components/MkNoteSub.vue  | 26 ++++++++++++++-----
 .../src/components/MkSubNoteContent.vue       | 13 +++++-----
 packages/client/src/pages/note.vue            | 12 ++-------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 48e9866d8..7fc7fc8dd 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -10,13 +10,17 @@
 			<XNoteHeader class="header" :note="note" :mini="true"/>
 			<div class="body">
 				<p v-if="note.cw != null" class="cw">
-					<i v-if="note.replyId" class="ph-arrow-bend-up-left ph-bold ph-lg reply-icon"></i>
-					<i v-if="note.renoteId != parentId" class="ph-quotes ph-bold ph-lg reply-icon"></i>
+					<MkA v-if="note.replyId"  :to="`/notes/${note.replyId}`" class="reply-icon" @click.stop>
+						<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
+					</MkA>
+					<MkA v-if="conversation && note.renoteId && note.renoteId != parentId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
+						<i class="ph-quotes ph-bold ph-lg"></i>
+					</MkA>
 					<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 					<XCwButton v-model="showContent" :note="note"/>
 				</p>
 				<div v-show="note.cw == null || showContent" class="content" @click="router.push(notePage(note))">
-					<MkSubNoteContent class="text" :note="note" :detailed="true" :parentId="note.parentId"/>
+					<MkSubNoteContent class="text" :note="note" :detailed="true" :parentId="note.parentId" :conversation="conversation"/>
 				</div>
 			</div>
 			<MkNoteFooter :note="note" :directReplies="replies.length"></MkNoteFooter>
@@ -112,16 +116,24 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			}
 
 			> .body {
+				:deep(.reply-icon) {
+					display: inline-block;
+					border-radius: 6px;
+					padding: .2em .2em;
+					margin-right: .2em;
+					color: var(--accent);
+					transition: background .2s;
+					&:hover, &:focus {
+						background: var(--buttonHoverBg);
+					}
+				}
 				> .cw {
 					cursor: default;
 					display: block;
 					margin: 0;
 					padding: 0;
 					overflow-wrap: break-word;
-					> .reply-icon {
-						margin-right: 6px;
-						color: var(--accent);
-					}
+
 					> .text {
 						margin-right: 8px;
 					}
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 87e927df0..3193834c9 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -3,8 +3,12 @@
 	<div class="body">
 		<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
 		<template v-if="!note.cw">
-			<i v-if="note.replyId" class="ph-arrow-bend-up-left ph-bold ph-lg reply-icon"></i>
-			<i v-if="note.renoteId != parentId" class="ph-quotes ph-bold ph-lg reply-icon"></i>
+			<MkA v-if="note.replyId"  :to="`/notes/${note.replyId}`" class="reply-icon" @click.stop>
+				<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
+			</MkA>
+			<MkA v-if="conversation && note.renoteId && note.renoteId != parentId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
+				<i class="ph-quotes ph-bold ph-lg"></i>
+			</MkA>
 		</template>
 		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 		<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">{{ i18n.ts.quoteAttached }}: ...</MkA>
@@ -45,6 +49,7 @@ import { i18n } from '@/i18n';
 const props = defineProps<{
 	note: misskey.entities.Note;
 	parentId?;
+	conversation?;
 	detailed?: boolean;
 }>();
 
@@ -64,10 +69,6 @@ const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : n
 	overflow-wrap: break-word;
 	
 	> .body {
-		> .reply-icon {
-			margin-right: 6px;
-			color: var(--accent);
-		}
 
 		> .rp {
 			margin-left: 4px;
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index 1b0380cc2..1baf1894f 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -1,8 +1,8 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="800">
-		<div class="fcuexfpr" v-size="{ max: [500, 350] }">
+	<MkSpacer :content-max="800" :marginMin="0">
+		<div class="fcuexfpr">
 			<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
 				<div v-if="note" class="note">
 					<div v-if="showNext" class="_gap">
@@ -202,13 +202,5 @@ definePageMetadata(computed(() => note ? {
 			}
 		}
 	}
-	#calckey_app > :not(.mk-deck) {
-		&.max-width_500px > .note {
-			margin-inline: -24px;
-		}
-		&.max-width_350px > .note {
-			margin-inline: -12px;
-		}
-	}
 }
 </style>

From d8c0ba079500f54a65a13c8700beb6fac1b7ebc6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 00:13:30 -0700
Subject: [PATCH 219/582] fix: when count is actually 0

---
 packages/backend/src/models/repositories/user.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 0455b9a5f..aa224b667 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -488,8 +488,8 @@ export const UserRepository = db.getRepository(User).extend({
 						birthday: profile!.birthday,
 						lang: profile!.lang,
 						fields: profile!.fields,
-						followersCount: followersCount || '?',
-						followingCount: followingCount || '?',
+						followersCount: followersCount || 0,
+						followingCount: followingCount || 0,
 						notesCount: user.notesCount,
 						pinnedNoteIds: pins.map((pin) => pin.noteId),
 						pinnedNotes: Notes.packMany(

From 94eb321431e9321e7baa062f0f378f3a03853098 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Sun, 19 Mar 2023 07:22:28 +0000
Subject: [PATCH 220/582] feat: set license information for custom emojis
 (#9719)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: #9711 (please check this issue first)

I cherry-picked two commits ([1](https://github.com/misskey-dev/misskey/commit/8ae9d2eaa8b0842671558370f787902e94b7f5a3), [2](https://github.com/misskey-dev/misskey/commit/ed51209172441927d24339f0759a5badbee3c9b6)) from [Misskey](https://github.com/misskey-dev/misskey) and made a few changes.
「ライセンス」should be written as "License" in the following screenshots, but it has not yet been translated.

It would be nice if we could include multiple lines of text, but I just ported what's been implemented so far in Misskey not to mess things up.

This is my first pull request (aside from typo correction). Feel free to point out any issues!

![](https://cdn.discordapp.com/attachments/823878222897741868/1086372711841935440/2023-03-18_042011.png)
![](https://cdn.discordapp.com/attachments/823878222897741868/1086373178214981853/01.png)
![](https://cdn.discordapp.com/attachments/823878222897741868/1086373336709341246/2023-03-18_042629.png)

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9719
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 locales/en-US.yml                             |  1 +
 locales/ja-JP.yml                             |  1 +
 ...678945242650-add-props-for-custom-emoji.js | 11 +++++
 packages/backend/src/models/entities/emoji.ts |  5 +++
 .../backend/src/models/repositories/emoji.ts  |  1 +
 packages/backend/src/models/schema/emoji.ts   |  5 +++
 .../processors/db/import-custom-emojis.ts     |  1 +
 packages/backend/src/server/api/endpoints.ts  |  4 ++
 .../server/api/endpoints/admin/emoji/add.ts   |  1 +
 .../server/api/endpoints/admin/emoji/copy.ts  |  1 +
 .../api/endpoints/admin/emoji/list-remote.ts  |  5 +++
 .../server/api/endpoints/admin/emoji/list.ts  |  5 +++
 .../endpoints/admin/emoji/set-license-bulk.ts | 45 +++++++++++++++++++
 .../api/endpoints/admin/emoji/update.ts       |  5 +++
 .../backend/src/server/api/endpoints/emoji.ts | 38 ++++++++++++++++
 packages/client/src/components/MkDialog.vue   |  5 ++-
 packages/client/src/os.ts                     | 34 ++++++++++++++
 .../src/pages/admin/emoji-edit-dialog.vue     |  7 +++
 packages/client/src/pages/admin/emojis.vue    | 13 ++++++
 packages/client/src/pages/emojis.emoji.vue    | 21 ++++++---
 20 files changed, 203 insertions(+), 6 deletions(-)
 create mode 100644 packages/backend/migration/1678945242650-add-props-for-custom-emoji.js
 create mode 100644 packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts
 create mode 100644 packages/backend/src/server/api/endpoints/emoji.ts

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 775327b47..f78d146d0 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -935,6 +935,7 @@ moveFromLabel: "Account you're moving from:"
 moveFromDescription: "This will set an alias of your old account so that you can move from that account to this current one. Do this BEFORE moving from your older account. Please enter the tag of the account formatted like @person@instance.com"
 migrationConfirm: "Are you absolutely sure you want to migrate your acccount to {account}? Once you do this, you won't be able to reverse it, and you won't be able to use your account normally again.\nAlso, please ensure that you've set this current account as the account you're moving from."
 defaultReaction: "Default emoji reaction for outgoing and incoming posts"
+license: "License"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index fe672c16e..59bf28d5a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -935,6 +935,7 @@ moveFromLabel: "引っ越し元のアカウント："
 moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。必ず引っ越しを実行する前に作成してください！引っ越し元のアカウントをこのように入力してください：@person@instance.com"
 migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用することはできません。\nまた、引っ越し先のアカウントでエイリアスを作成したことを確認してください。"
 defaultReaction: "リモートとローカルの投稿に対するデフォルトの絵文字リアクション"
+license: "ライセンス"
 
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。"
diff --git a/packages/backend/migration/1678945242650-add-props-for-custom-emoji.js b/packages/backend/migration/1678945242650-add-props-for-custom-emoji.js
new file mode 100644
index 000000000..656a92177
--- /dev/null
+++ b/packages/backend/migration/1678945242650-add-props-for-custom-emoji.js
@@ -0,0 +1,11 @@
+export class addPropsForCustomEmoji1678945242650 {
+    name = 'addPropsForCustomEmoji1678945242650'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "emoji" ADD "license" character varying(1024)`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "license"`);
+    }
+}
diff --git a/packages/backend/src/models/entities/emoji.ts b/packages/backend/src/models/entities/emoji.ts
index f251de897..231568696 100644
--- a/packages/backend/src/models/entities/emoji.ts
+++ b/packages/backend/src/models/entities/emoji.ts
@@ -55,4 +55,9 @@ export class Emoji {
 		array: true, length: 128, default: '{}',
 	})
 	public aliases: string[];
+
+	@Column('varchar', {
+		length: 1024, nullable: true,
+	})
+	public license: string | null;
 }
diff --git a/packages/backend/src/models/repositories/emoji.ts b/packages/backend/src/models/repositories/emoji.ts
index e868fe94f..6eabfe955 100644
--- a/packages/backend/src/models/repositories/emoji.ts
+++ b/packages/backend/src/models/repositories/emoji.ts
@@ -15,6 +15,7 @@ export const EmojiRepository = db.getRepository(Emoji).extend({
 			host: emoji.host,
 			// || emoji.originalUrl してるのは後方互換性のため
 			url: emoji.publicUrl || emoji.originalUrl,
+			license: emoji.license,
 		};
 	},
 
diff --git a/packages/backend/src/models/schema/emoji.ts b/packages/backend/src/models/schema/emoji.ts
index 1e1dab868..8994381b3 100644
--- a/packages/backend/src/models/schema/emoji.ts
+++ b/packages/backend/src/models/schema/emoji.ts
@@ -40,5 +40,10 @@ export const packedEmojiSchema = {
 			optional: false,
 			nullable: false,
 		},
+		license: {
+			type: "string",
+			optional: false,
+			nullable: true,
+		},
 	},
 } as const;
diff --git a/packages/backend/src/queue/processors/db/import-custom-emojis.ts b/packages/backend/src/queue/processors/db/import-custom-emojis.ts
index 45ab5ea9a..373a3a2da 100644
--- a/packages/backend/src/queue/processors/db/import-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/import-custom-emojis.ts
@@ -75,6 +75,7 @@ export async function importCustomEmojis(
 				originalUrl: driveFile.url,
 				publicUrl: driveFile.webpublicUrl ?? driveFile.url,
 				type: driveFile.webpublicType ?? driveFile.type,
+				license: emojiInfo.license,
 			}).then((x) => Emojis.findOneByOrFail(x.identifiers[0]));
 		}
 
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 7fb5fd320..bfafbaa62 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -29,6 +29,7 @@ import * as ep___admin_emoji_list from "./endpoints/admin/emoji/list.js";
 import * as ep___admin_emoji_removeAliasesBulk from "./endpoints/admin/emoji/remove-aliases-bulk.js";
 import * as ep___admin_emoji_setAliasesBulk from "./endpoints/admin/emoji/set-aliases-bulk.js";
 import * as ep___admin_emoji_setCategoryBulk from "./endpoints/admin/emoji/set-category-bulk.js";
+import * as ep___admin_emoji_setLicenseBulk from "./endpoints/admin/emoji/set-license-bulk.js";
 import * as ep___admin_emoji_update from "./endpoints/admin/emoji/update.js";
 import * as ep___admin_federation_deleteAllFiles from "./endpoints/admin/federation/delete-all-files.js";
 import * as ep___admin_federation_refreshRemoteInstanceMetadata from "./endpoints/admin/federation/refresh-remote-instance-metadata.js";
@@ -131,6 +132,7 @@ import * as ep___drive_folders_show from "./endpoints/drive/folders/show.js";
 import * as ep___drive_folders_update from "./endpoints/drive/folders/update.js";
 import * as ep___drive_stream from "./endpoints/drive/stream.js";
 import * as ep___emailAddress_available from "./endpoints/email-address/available.js";
+import * as ep___emoji from "./endpoints/emoji.js";
 import * as ep___endpoint from "./endpoints/endpoint.js";
 import * as ep___endpoints from "./endpoints/endpoints.js";
 import * as ep___exportCustomEmojis from "./endpoints/export-custom-emojis.js";
@@ -363,6 +365,7 @@ const eps = [
 	["admin/emoji/remove-aliases-bulk", ep___admin_emoji_removeAliasesBulk],
 	["admin/emoji/set-aliases-bulk", ep___admin_emoji_setAliasesBulk],
 	["admin/emoji/set-category-bulk", ep___admin_emoji_setCategoryBulk],
+	["admin/emoji/set-license-bulk", ep___admin_emoji_setLicenseBulk],
 	["admin/emoji/update", ep___admin_emoji_update],
 	["admin/federation/delete-all-files", ep___admin_federation_deleteAllFiles],
 	[
@@ -471,6 +474,7 @@ const eps = [
 	["drive/folders/update", ep___drive_folders_update],
 	["drive/stream", ep___drive_stream],
 	["email-address/available", ep___emailAddress_available],
+	["emoji", ep___emoji],
 	["endpoint", ep___endpoint],
 	["endpoints", ep___endpoints],
 	["export-custom-emojis", ep___exportCustomEmojis],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
index 601d754a0..bfc025834 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
@@ -49,6 +49,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		originalUrl: file.url,
 		publicUrl: file.webpublicUrl ?? file.url,
 		type: file.webpublicType ?? file.type,
+		license: null,
 	}).then((x) => Emojis.findOneByOrFail(x.identifiers[0]));
 
 	await db.queryResultCache!.remove(["meta_emojis"]);
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
index 4a7f2bc61..951158f7d 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
@@ -73,6 +73,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		originalUrl: driveFile.url,
 		publicUrl: driveFile.webpublicUrl ?? driveFile.url,
 		type: driveFile.webpublicType ?? driveFile.type,
+		license: emoji.license,
 	}).then((x) => Emojis.findOneByOrFail(x.identifiers[0]));
 
 	await db.queryResultCache!.remove(["meta_emojis"]);
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
index 63f60bc99..fae986dd9 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
@@ -55,6 +55,11 @@ export const meta = {
 					optional: false,
 					nullable: false,
 				},
+				license: {
+					type: "string",
+					optional: false,
+					nullable: true,
+				},
 			},
 		},
 	},
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
index bc4f1d29f..aa49f1480 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
@@ -55,6 +55,11 @@ export const meta = {
 					optional: false,
 					nullable: false,
 				},
+				license: {
+					type: "string",
+					optional: false,
+					nullable: true,
+				},
 			},
 		},
 	},
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts
new file mode 100644
index 000000000..c98ca03fa
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts
@@ -0,0 +1,45 @@
+import define from "../../../define.js";
+import { Emojis } from "@/models/index.js";
+import { In } from "typeorm";
+import { ApiError } from "../../../error.js";
+import { db } from "@/db/postgre.js";
+
+export const meta = {
+	tags: ["admin"],
+
+	requireCredential: true,
+	requireModerator: true,
+} as const;
+
+export const paramDef = {
+	type: "object",
+	properties: {
+		ids: {
+			type: "array",
+			items: {
+				type: "string",
+				format: "misskey:id",
+			},
+		},
+		license: {
+			type: "string",
+			nullable: true,
+			description: "Use `null` to reset the license.",
+		},
+	},
+	required: ["ids"],
+} as const;
+
+export default define(meta, paramDef, async (ps) => {
+	await Emojis.update(
+		{
+			id: In(ps.ids),
+		},
+		{
+			updatedAt: new Date(),
+			license: ps.license,
+		},
+	);
+
+	await db.queryResultCache!.remove(["meta_emojis"]);
+});
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
index 3f7f6639f..9e2e85476 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
@@ -34,6 +34,10 @@ export const paramDef = {
 				type: "string",
 			},
 		},
+		license: {
+			type: "string",
+			nullable: true,
+		},
 	},
 	required: ["id", "name", "aliases"],
 } as const;
@@ -48,6 +52,7 @@ export default define(meta, paramDef, async (ps) => {
 		name: ps.name,
 		category: ps.category,
 		aliases: ps.aliases,
+		license: ps.license,
 	});
 
 	await db.queryResultCache!.remove(["meta_emojis"]);
diff --git a/packages/backend/src/server/api/endpoints/emoji.ts b/packages/backend/src/server/api/endpoints/emoji.ts
new file mode 100644
index 000000000..5d3c77e5e
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/emoji.ts
@@ -0,0 +1,38 @@
+import { IsNull } from "typeorm";
+import { Emojis } from "@/models/index.js";
+import define from "../define.js";
+
+export const meta = {
+	tags: ["meta"],
+
+	requireCredential: false,
+	allowGet: true,
+	cacheSec: 3600,
+
+	res: {
+		type: "object",
+		optional: false, nullable: false,
+		ref: "Emoji",
+	},
+} as const;
+
+export const paramDef = {
+	type: "object",
+	properties: {
+		name: {
+			type: "string",
+		},
+	},
+	required: ["name"],
+} as const;
+
+export default define(meta, paramDef, async (ps, me) => {
+	const emoji = await Emojis.findOneOrFail({
+		where: {
+			name: ps.name,
+			host: IsNull(),
+		},
+	});
+
+	return Emojis.pack(emoji);
+});
diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue
index 9f93d9f99..5d5ca1e8d 100644
--- a/packages/client/src/components/MkDialog.vue
+++ b/packages/client/src/components/MkDialog.vue
@@ -14,9 +14,11 @@
 			</div>
 			<header v-if="title" :class="$style.title"><Mfm :text="title"/></header>
 			<div v-if="text" :class="$style.text"><Mfm :text="text"/></div>
-			<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" @keydown="onInputKeydown">
+			<MkInput v-if="input && input.type !== 'paragraph'" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" @keydown="onInputKeydown">
 				<template v-if="input.type === 'password'" #prefix><i class="ph-password ph-bold ph-lg"></i></template>
 			</MkInput>
+			<MkTextarea v-if="input && input.type === 'paragraph'" v-model="inputValue" autofocus :type="paragraph" :placeholder="input.placeholder || undefined">
+			</MkTextarea>
 			<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>
@@ -49,6 +51,7 @@ import { onBeforeUnmount, onMounted, ref, shallowRef } from 'vue';
 import MkModal from '@/components/MkModal.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
+import MkTextarea from '@/components/form/textarea.vue';
 import MkSelect from '@/components/form/select.vue';
 import { i18n } from '@/i18n';
 
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 0e6bdf318..ae2fc23a2 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -359,6 +359,40 @@ export function inputText(props: {
 	});
 }
 
+export function inputParagraph(props: {
+	title?: string | null;
+	text?: string | null;
+	placeholder?: string | null;
+	default?: string | null;
+}): Promise<
+	| { canceled: true; result: undefined }
+	| {
+			canceled: false;
+			result: string;
+	  }
+> {
+	return new Promise((resolve, reject) => {
+		popup(
+			defineAsyncComponent(() => import("@/components/MkDialog.vue")),
+			{
+				title: props.title,
+				text: props.text,
+				input: {
+					type: "paragraph",
+					placeholder: props.placeholder,
+					default: props.default,
+				},
+			},
+			{
+				done: (result) => {
+					resolve(result ? result : { canceled: true });
+				},
+			},
+			"closed",
+		);
+	});
+}
+
 export function inputNumber(props: {
 	title?: string | null;
 	text?: string | null;
diff --git a/packages/client/src/pages/admin/emoji-edit-dialog.vue b/packages/client/src/pages/admin/emoji-edit-dialog.vue
index b605541da..6a969b617 100644
--- a/packages/client/src/pages/admin/emoji-edit-dialog.vue
+++ b/packages/client/src/pages/admin/emoji-edit-dialog.vue
@@ -22,6 +22,9 @@
 				<template #label>{{ i18n.ts.tags }}</template>
 				<template #caption>{{ i18n.ts.setMultipleBySeparatingWithSpace }}</template>
 			</MkInput>
+			<MkTextarea v-model="license" class="_formBlock">
+				<template #label>{{ i18n.ts.license }}</template>
+			</MkTextarea>
 			<MkButton danger @click="del()"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
 		</div>
 	</div>
@@ -33,6 +36,7 @@ import { } from 'vue';
 import XModalWindow from '@/components/MkModalWindow.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
+import MkTextarea from '@/components/form/textarea.vue';
 import * as os from '@/os';
 import { unique } from '@/scripts/array';
 import { i18n } from '@/i18n';
@@ -47,6 +51,7 @@ let name: string = $ref(props.emoji.name);
 let category: string = $ref(props.emoji.category);
 let aliases: string = $ref(props.emoji.aliases.join(' '));
 let categories: string[] = $ref(emojiCategories);
+let license: string = $ref(props.emoji.license ?? '');
 
 const emit = defineEmits<{
 	(ev: 'done', v: { deleted?: boolean, updated?: any }): void,
@@ -63,6 +68,7 @@ async function update() {
 		name,
 		category,
 		aliases: aliases.split(' '),
+		license: license === '' ? null : license,
 	});
 
 	emit('done', {
@@ -71,6 +77,7 @@ async function update() {
 			name,
 			category,
 			aliases: aliases.split(' '),
+			license: license === '' ? null : license,
 		},
 	});
 
diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue
index 7729c2189..cfacd5855 100644
--- a/packages/client/src/pages/admin/emojis.vue
+++ b/packages/client/src/pages/admin/emojis.vue
@@ -18,6 +18,7 @@
 						<MkButton inline @click="addTagBulk">Add tag</MkButton>
 						<MkButton inline @click="removeTagBulk">Remove tag</MkButton>
 						<MkButton inline @click="setTagBulk">Set tag</MkButton>
+						<MkButton inline @click="setLicenseBulk">Set license</MkButton>
 						<MkButton inline danger @click="delBulk">Delete</MkButton>
 					</div>
 					<MkPagination ref="emojisPaginationComponent" :pagination="pagination">
@@ -258,6 +259,18 @@ const setTagBulk = async () => {
 	emojisPaginationComponent.value.reload();
 };
 
+const setLicenseBulk = async () => {
+	const { canceled, result } = await os.inputParagraph({
+		title: 'License',
+	});
+	if (canceled) return;
+	await os.apiWithDialog('admin/emoji/set-license-bulk', {
+		ids: selectedEmojis.value,
+		license: result,
+	});
+	emojisPaginationComponent.value.reload();
+};
+
 const delBulk = async () => {
 	const { canceled } = await os.confirm({
 		type: 'warning',
diff --git a/packages/client/src/pages/emojis.emoji.vue b/packages/client/src/pages/emojis.emoji.vue
index f87bc467b..e88eda5b2 100644
--- a/packages/client/src/pages/emojis.emoji.vue
+++ b/packages/client/src/pages/emojis.emoji.vue
@@ -3,7 +3,7 @@
 	<img :src="emoji.url" class="img" :alt="emoji.name"/>
 	<div class="body">
 		<div class="name _monospace">{{ emoji.name }}</div>
-		<div class="info">{{ emoji.aliases.join(' ') }}</div>
+		<div class="info">{{ emoji.aliases.join(" ") }}</div>
 	</div>
 </button>
 </template>
@@ -20,15 +20,26 @@ const props = defineProps<{
 
 function menu(ev) {
 	os.popupMenu([{
-		type: 'label',
-		text: ':' + props.emoji.name + ':',
+		type: "label",
+		text: ":" + props.emoji.name + ":",
 	}, {
 		text: i18n.ts.copy,
-		icon: 'ph-clipboard-text ph-bold ph-lg',
+		icon: "ph-clipboard-text ph-bold ph-lg",
 		action: () => {
 			copyToClipboard(`:${props.emoji.name}:`);
 			os.success();
-		}
+		},
+	}, {
+		text: i18n.ts.license,
+		icon: "ph-info ph-bold ph-lg",
+		action: () => {
+			os.apiGet("emoji", { name: props.emoji.name }).then(res => {
+				os.alert({
+					type: "info",
+					text: `${res.license || i18n.ts.notSet}`,
+				});
+			});
+		},
 	}], ev.currentTarget ?? ev.target);
 }
 </script>

From 923eeaa4cc1c8b9ba941a9f0ca0cf6be4dee2451 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 00:26:26 -0700
Subject: [PATCH 221/582] feat: compile time compression

---
 CALCKEY.md                     |  2 ++
 packages/client/package.json   |  1 +
 packages/client/vite.config.ts |  4 ++++
 pnpm-lock.yaml                 | 39 +++++++++++++++++++++++++++++++++-
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 110aaf264..66c6e8d42 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -112,6 +112,8 @@
 - More antenna options
 - New dashboard
 - Backfill follower counts
+- Improved emoji licensing
+- Compile time compression
 - MissV: [fix Misskey Forkbomb](https://code.vtopia.live/Vtopia/MissV/commit/40b23c070bd4adbb3188c73546c6c625138fb3c1)
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)
diff --git a/packages/client/package.json b/packages/client/package.json
index 1f3270b1d..be7538542 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -78,6 +78,7 @@
 		"uuid": "9.0.0",
 		"vanilla-tilt": "1.8.0",
 		"vite": "^4.1.1",
+		"vite-plugin-compression": "^0.5.1",
 		"vue": "3.2.45",
 		"vue-isyourpasswordsafe": "^2.0.0",
 		"vue-plyr": "^7.0.0",
diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index 7644ccaa0..f4d04e5ec 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -5,6 +5,7 @@ import { defineConfig } from 'vite';
 import locales from '../../locales';
 import meta from '../../package.json';
 import pluginJson5 from './vite.json5';
+import viteCompression from 'vite-plugin-compression';
 
 const extensions = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.json', '.json5', '.svg', '.sass', '.scss', '.css', '.vue'];
 
@@ -20,6 +21,9 @@ export default defineConfig(({ command, mode }) => {
 				reactivityTransform: true,
 			}),
 			pluginJson5(),
+			viteCompression({
+				algorithm: 'brotliCompress'
+			}),
 		],
 
 		resolve: {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c1a00fbfd..de1200477 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -465,6 +465,7 @@ importers:
       uuid: 9.0.0
       vanilla-tilt: 1.8.0
       vite: ^4.1.1
+      vite-plugin-compression: ^0.5.1
       vue: 3.2.45
       vue-isyourpasswordsafe: ^2.0.0
       vue-plyr: ^7.0.0
@@ -542,6 +543,7 @@ importers:
       uuid: 9.0.0
       vanilla-tilt: 1.8.0
       vite: 4.1.1_sass@1.57.1
+      vite-plugin-compression: 0.5.1_vite@4.1.1
       vue: 3.2.45
       vue-isyourpasswordsafe: 2.0.0
       vue-plyr: 7.0.0
@@ -3402,7 +3404,7 @@ packages:
   /axios/0.25.0_debug@4.3.4:
     resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2_debug@4.3.4
     transitivePeerDependencies:
       - debug
     dev: true
@@ -6407,6 +6409,19 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dev: false
+
+  /follow-redirects/1.15.2_debug@4.3.4:
+    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+    dependencies:
+      debug: 4.3.4
+    dev: true
 
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
@@ -6501,6 +6516,15 @@ packages:
   /fs-constants/1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
+  /fs-extra/10.1.0:
+    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      graceful-fs: 4.2.10
+      jsonfile: 6.1.0
+      universalify: 2.0.0
+    dev: true
+
   /fs-extra/8.1.0:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
     engines: {node: '>=6 <7 || >=8'}
@@ -12909,6 +12933,19 @@ packages:
       replace-ext: 1.0.1
     dev: true
 
+  /vite-plugin-compression/0.5.1_vite@4.1.1:
+    resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
+    peerDependencies:
+      vite: '>=2.0.0'
+    dependencies:
+      chalk: 4.1.2
+      debug: 4.3.4
+      fs-extra: 10.1.0
+      vite: 4.1.1_sass@1.57.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /vite/4.1.1_sass@1.57.1:
     resolution: {integrity: sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==}
     engines: {node: ^14.18.0 || >=16.0.0}

From e3fb0cbb3b2aa76aff3d47af1d04e48dab656f97 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 00:27:31 -0700
Subject: [PATCH 222/582] chore: bump pnpm version

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

diff --git a/package.json b/package.json
index 756d2aa6a..b9448f00e 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@7.27.1",
+	"packageManager": "pnpm@7.29.3",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",

From 77c12cba8d4b53b206ef68d7e497fb6887246bc1 Mon Sep 17 00:00:00 2001
From: Kaity A <supakaity@noreply.codeberg.org>
Date: Sun, 19 Mar 2023 08:26:47 +0000
Subject: [PATCH 223/582] Add sonic full-text search support (#9714)

This pull request adds support for the [sonic](https://github.com/valeriansaliou/sonic) full text indexing server into Calckey.

In addition to this, a stateful endpoint has been added that will completely (re-)index all notes into any (elasticsearch and/or sonic) indexing server defined in your config at `/api/admin/search/index-all`. It can (optionally) take input data to define the starting point, such as:

```
{"cursor": "9beg3lx6ad"}
```

Currently if both sonic and elasticsearch are defined in the config, sonic will take precedence for searching, but both indexes will continue to be updated for new note creations. Future enhancements may include the ability to choose which indexer to use (or combine multiple).

Co-authored-by: Kaitlyn Allan <kaitlyn.allan@enlabs.cloud>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9714
Co-authored-by: Kaity A <supakaity@noreply.codeberg.org>
Co-committed-by: Kaity A <supakaity@noreply.codeberg.org>
---
 .config/example.yml                           | 10 +++
 .gitignore                                    |  1 +
 packages/backend/package.json                 |  1 +
 packages/backend/src/config/types.ts          |  7 ++
 packages/backend/src/db/sonic.ts              | 51 ++++++++++++
 packages/backend/src/queue/index.ts           | 14 ++++
 .../processors/background/index-all-notes.ts  | 76 ++++++++++++++++++
 .../src/queue/processors/background/index.ts  | 15 ++++
 packages/backend/src/queue/queues.ts          |  2 +
 packages/backend/src/server/api/endpoints.ts  |  2 +
 .../server/api/endpoints/admin/queue/stats.ts |  8 ++
 .../api/endpoints/admin/search/index-all.ts   | 28 +++++++
 .../src/server/api/endpoints/notes/search.ts  | 79 ++++++++++++++++++-
 packages/backend/src/services/note/create.ts  | 41 +++++++---
 pnpm-lock.yaml                                |  7 ++
 15 files changed, 328 insertions(+), 14 deletions(-)
 create mode 100644 packages/backend/src/db/sonic.ts
 create mode 100644 packages/backend/src/queue/processors/background/index-all-notes.ts
 create mode 100644 packages/backend/src/queue/processors/background/index.ts
 create mode 100644 packages/backend/src/server/api/endpoints/admin/search/index-all.ts

diff --git a/.config/example.yml b/.config/example.yml
index 02661b7fb..b7b56f228 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -72,6 +72,16 @@ redis:
 #  user: 
 #  pass: 
 
+#   ┌─────────────────────┐
+#───┘ Sonic configuration └─────────────────────────────────────
+
+#sonic:
+#  host: localhost
+#  port: 1491
+#  auth: SecretPassword
+#  collection: notes
+#  bucket: default
+
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
 
diff --git a/.gitignore b/.gitignore
index 52139614c..5e1d4a26d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ ormconfig.json
 packages/backend/assets/instance.css
 packages/backend/assets/sounds/None.mp3
 
+!packages/backend/src/db
 
 # blender backups
 *.blend1
diff --git a/packages/backend/package.json b/packages/backend/package.json
index ce6efde9c..e7bec1a22 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -112,6 +112,7 @@
 		"seedrandom": "^3.0.5",
 		"semver": "7.3.8",
 		"sharp": "0.31.3",
+		"sonic-channel": "^1.3.1",
 		"speakeasy": "2.0.0",
 		"stringz": "2.1.0",
 		"summaly": "2.7.0",
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index ed9b0ece0..a7cdc89cf 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -32,6 +32,13 @@ export type Source = {
 		pass?: string;
 		index?: string;
 	};
+	sonic: {
+		host: string;
+		port: number;
+		auth?: string;
+		collection?: string;
+		bucket?: string;
+	};
 
 	proxy?: string;
 	proxySmtp?: string;
diff --git a/packages/backend/src/db/sonic.ts b/packages/backend/src/db/sonic.ts
new file mode 100644
index 000000000..6c4d28f70
--- /dev/null
+++ b/packages/backend/src/db/sonic.ts
@@ -0,0 +1,51 @@
+import * as SonicChannel from "sonic-channel";
+import { dbLogger } from "./logger.js";
+
+import config from "@/config/index.js";
+
+const logger = dbLogger.createSubLogger("sonic", "gray", false);
+
+logger.info("Connecting to Sonic");
+
+const handlers = (type: string): SonicChannel.Handlers => (
+	{
+		connected: () => {
+			logger.succ(`Connected to Sonic ${type}`);
+		},
+		disconnected: (error) => {
+			logger.warn(`Disconnected from Sonic ${type}, error: ${error}`);
+		},
+		error: (error) => {
+			logger.warn(`Sonic ${type} error: ${error}`);
+		},
+		retrying: () => {
+			logger.info(`Sonic ${type} retrying`);
+		},
+		timeout: () => {
+			logger.warn(`Sonic ${type} timeout`);
+		},
+	}
+)
+
+const hasConfig =
+	config.sonic
+	&& ( config.sonic.host
+		|| config.sonic.port
+		|| config.sonic.auth
+	)
+
+const host = hasConfig ? config.sonic.host ?? "localhost" : "";
+const port = hasConfig ? config.sonic.port ?? 1491 : 0;
+const auth = hasConfig ? config.sonic.auth ?? "SecretPassword" : "";
+const collection = hasConfig ? config.sonic.collection ?? "main" : "";
+const bucket = hasConfig ? config.sonic.bucket ?? "default" : "";
+
+export default hasConfig
+	? {
+			search: new SonicChannel.Search({host, port, auth}).connect(handlers("search")),
+			ingest: new SonicChannel.Ingest({host, port, auth}).connect(handlers("ingest")),
+
+			collection,
+			bucket,
+		}
+	: null;
diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts
index c40b3c6ae..c387efe92 100644
--- a/packages/backend/src/queue/index.ts
+++ b/packages/backend/src/queue/index.ts
@@ -13,6 +13,7 @@ import processDb from "./processors/db/index.js";
 import processObjectStorage from "./processors/object-storage/index.js";
 import processSystemQueue from "./processors/system/index.js";
 import processWebhookDeliver from "./processors/webhook-deliver.js";
+import processBackground from "./processors/background/index.js";
 import { endedPollNotification } from "./processors/ended-poll-notification.js";
 import { queueLogger } from "./logger.js";
 import { getJobInfo } from "./get-job-info.js";
@@ -24,6 +25,7 @@ import {
 	objectStorageQueue,
 	endedPollNotificationQueue,
 	webhookDeliverQueue,
+	backgroundQueue,
 } from "./queues.js";
 import type { ThinUser } from "./types.js";
 
@@ -418,6 +420,17 @@ export function createCleanRemoteFilesJob() {
 	);
 }
 
+export function createIndexAllNotesJob(data = {}) {
+	return backgroundQueue.add(
+		"indexAllNotes",
+		data,
+		{
+			removeOnComplete: true,
+			removeOnFail: true,
+		},
+	);
+}
+
 export function webhookDeliver(
 	webhook: Webhook,
 	type: typeof webhookEventTypes[number],
@@ -454,6 +467,7 @@ export default function () {
 	webhookDeliverQueue.process(64, processWebhookDeliver);
 	processDb(dbQueue);
 	processObjectStorage(objectStorageQueue);
+	processBackground(backgroundQueue);
 
 	systemQueue.add(
 		"tickCharts",
diff --git a/packages/backend/src/queue/processors/background/index-all-notes.ts b/packages/backend/src/queue/processors/background/index-all-notes.ts
new file mode 100644
index 000000000..f03275886
--- /dev/null
+++ b/packages/backend/src/queue/processors/background/index-all-notes.ts
@@ -0,0 +1,76 @@
+import type Bull from "bull";
+
+import { queueLogger } from "../../logger.js";
+import { Notes } from "@/models/index.js";
+import { MoreThan } from "typeorm";
+import { index } from "@/services/note/create.js"
+import { Note } from "@/models/entities/note.js";
+
+const logger = queueLogger.createSubLogger("index-all-notes");
+
+export default async function indexAllNotes(
+	job: Bull.Job<Record<string, unknown>>,
+	done: ()=>void,
+): Promise<void> {
+	logger.info("Indexing all notes...");
+
+	let cursor: string|null = job.data.cursor as string ?? null;
+	let indexedCount: number = job.data.indexedCount as number ?? 0;
+	let total: number = job.data.total as number ?? 0;
+
+	let running = true;
+	const take = 50000;
+	const batch = 100;
+	while (running) {
+		logger.info(`Querying for ${take} notes ${indexedCount}/${total ? total : '?'} at ${cursor}`);
+
+		let notes: Note[] = [];
+		try {
+			notes = await Notes.find({
+				where: {
+					...(cursor ? { id: MoreThan(cursor) } : {}),
+				},
+				take: take,
+				order: {
+					id: 1,
+				},
+			});
+		} catch (e) {
+			logger.error(`Failed to query notes ${e}`);
+			continue;
+		}
+
+		if (notes.length === 0) {
+			job.progress(100);
+			running = false;
+			break;
+		}
+
+		try {
+			const count = await Notes.count();
+			total = count;
+			job.update({ indexedCount, cursor, total })
+		} catch (e) {
+		}
+
+		for (let i = 0; i < notes.length; i += batch) {
+			const chunk = notes.slice(i, i + batch);
+			await Promise.all(chunk.map(note => index(note)));
+
+			indexedCount += chunk.length;
+			const pct = (indexedCount / total)*100;
+			job.update({ indexedCount, cursor, total })
+			job.progress(+(pct.toFixed(1)));
+			logger.info(`Indexed notes ${indexedCount}/${total ? total : '?'}`);
+		}
+		cursor = notes[notes.length - 1].id;
+		job.update({ indexedCount, cursor, total })
+
+		if (notes.length < take) {
+			running = false;
+		}
+	}
+
+	done();
+	logger.info("All notes have been indexed.");
+}
diff --git a/packages/backend/src/queue/processors/background/index.ts b/packages/backend/src/queue/processors/background/index.ts
new file mode 100644
index 000000000..cf96b67ef
--- /dev/null
+++ b/packages/backend/src/queue/processors/background/index.ts
@@ -0,0 +1,15 @@
+import type Bull from "bull";
+import indexAllNotes from "./index-all-notes.js";
+
+const jobs = {
+	indexAllNotes,
+} as Record<
+	string,
+	Bull.ProcessCallbackFunction<Record<string, unknown>>
+>;
+
+export default function (q: Bull.Queue) {
+	for (const [k, v] of Object.entries(jobs)) {
+		q.process(k, 16, v);
+	}
+}
diff --git a/packages/backend/src/queue/queues.ts b/packages/backend/src/queue/queues.ts
index 12d9d6620..6d7fffcb3 100644
--- a/packages/backend/src/queue/queues.ts
+++ b/packages/backend/src/queue/queues.ts
@@ -27,6 +27,7 @@ export const webhookDeliverQueue = initializeQueue<WebhookDeliverJobData>(
 	"webhookDeliver",
 	64,
 );
+export const backgroundQueue = initializeQueue<Record<string, unknown>>("bg");
 
 export const queues = [
 	systemQueue,
@@ -36,4 +37,5 @@ export const queues = [
 	dbQueue,
 	objectStorageQueue,
 	webhookDeliverQueue,
+	backgroundQueue,
 ];
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index bfafbaa62..ba0e721b9 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -51,6 +51,7 @@ import * as ep___admin_relays_list from "./endpoints/admin/relays/list.js";
 import * as ep___admin_relays_remove from "./endpoints/admin/relays/remove.js";
 import * as ep___admin_resetPassword from "./endpoints/admin/reset-password.js";
 import * as ep___admin_resolveAbuseUserReport from "./endpoints/admin/resolve-abuse-user-report.js";
+import * as ep___admin_search_indexAll from "./endpoints/admin/search/index-all.js";
 import * as ep___admin_sendEmail from "./endpoints/admin/send-email.js";
 import * as ep___admin_serverInfo from "./endpoints/admin/server-info.js";
 import * as ep___admin_showModerationLogs from "./endpoints/admin/show-moderation-logs.js";
@@ -393,6 +394,7 @@ const eps = [
 	["admin/relays/remove", ep___admin_relays_remove],
 	["admin/reset-password", ep___admin_resetPassword],
 	["admin/resolve-abuse-user-report", ep___admin_resolveAbuseUserReport],
+	["admin/search/index-all", ep___admin_search_indexAll],
 	["admin/send-email", ep___admin_sendEmail],
 	["admin/server-info", ep___admin_serverInfo],
 	["admin/show-moderation-logs", ep___admin_showModerationLogs],
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/stats.ts b/packages/backend/src/server/api/endpoints/admin/queue/stats.ts
index ecd67d893..4a437c3d1 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/stats.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/stats.ts
@@ -3,6 +3,7 @@ import {
 	inboxQueue,
 	dbQueue,
 	objectStorageQueue,
+	backgroundQueue,
 } from "@/queue/queues.js";
 import define from "../../../define.js";
 
@@ -37,6 +38,11 @@ export const meta = {
 				nullable: false,
 				ref: "QueueCount",
 			},
+			backgroundQueue: {
+				optional: false,
+				nullable: false,
+				ref: "QueueCount",
+			},
 		},
 	},
 } as const;
@@ -52,11 +58,13 @@ export default define(meta, paramDef, async (ps) => {
 	const inboxJobCounts = await inboxQueue.getJobCounts();
 	const dbJobCounts = await dbQueue.getJobCounts();
 	const objectStorageJobCounts = await objectStorageQueue.getJobCounts();
+	const backgroundJobCounts = await backgroundQueue.getJobCounts();
 
 	return {
 		deliver: deliverJobCounts,
 		inbox: inboxJobCounts,
 		db: dbJobCounts,
 		objectStorage: objectStorageJobCounts,
+		backgroundQueue: backgroundJobCounts,
 	};
 });
diff --git a/packages/backend/src/server/api/endpoints/admin/search/index-all.ts b/packages/backend/src/server/api/endpoints/admin/search/index-all.ts
new file mode 100644
index 000000000..135b48ecc
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/search/index-all.ts
@@ -0,0 +1,28 @@
+import define from "../../../define.js";
+import { createIndexAllNotesJob } from "@/queue/index.js";
+
+export const meta = {
+	tags: ["admin"],
+
+	requireCredential: true,
+	requireModerator: true,
+} as const;
+
+export const paramDef = {
+	type: "object",
+	properties: {
+		cursor: {
+			type: "string",
+			format: "misskey:id",
+			nullable: true,
+			default: null,
+		},
+	},
+	required: [],
+} as const;
+
+export default define(meta, paramDef, async (ps, _me) => {
+	createIndexAllNotesJob({
+		cursor: ps.cursor ?? undefined,
+	});
+});
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index ce60436db..5e431d4f7 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -1,7 +1,9 @@
 import { In } from "typeorm";
 import { Notes } from "@/models/index.js";
+import { Note } from "@/models/entities/note.js";
 import config from "@/config/index.js";
 import es from "../../../../db/elasticsearch.js";
+import sonic from "../../../../db/sonic.js";
 import define from "../../define.js";
 import { makePaginationQuery } from "../../common/make-pagination-query.js";
 import { generateVisibilityQuery } from "../../common/generate-visibility-query.js";
@@ -59,7 +61,7 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async (ps, me) => {
-	if (es == null) {
+	if (es == null && sonic == null) {
 		const query = makePaginationQuery(
 			Notes.createQueryBuilder("note"),
 			ps.sinceId,
@@ -92,9 +94,82 @@ export default define(meta, paramDef, async (ps, me) => {
 		if (me) generateMutedUserQuery(query, me);
 		if (me) generateBlockedUserQuery(query, me);
 
-		const notes = await query.take(ps.limit).getMany();
+		const notes: Note[] = await query.take(ps.limit).getMany();
 
 		return await Notes.packMany(notes, me);
+	} else if (sonic) {
+		let start = 0;
+		const chunkSize = 100;
+
+		// Use sonic to fetch and step through all search results that could match the requirements
+		const ids = [];
+		while (true) {
+			const results = await sonic.search.query(
+				sonic.collection,
+				sonic.bucket,
+				ps.query,
+				{
+					limit: chunkSize,
+					offset: start,
+				},
+			);
+
+			start += chunkSize;
+
+			if (results.length === 0) {
+				break;
+			}
+
+			const res = results
+				.map((k) => JSON.parse(k))
+				.filter((key) => {
+					if (ps.userId && key.userId !== ps.userId) {
+						return false;
+					}
+					if (ps.channelId && key.channelId !== ps.channelId) {
+						return false;
+					}
+					if (ps.sinceId && key.id <= ps.sinceId) {
+						return false;
+					}
+					if (ps.untilId && key.id >= ps.untilId) {
+						return false;
+					}
+					return true;
+				})
+				.map((key) => key.id);
+
+				ids.push(...res);
+		}
+
+		// Sort all the results by note id DESC (newest first)
+		ids.sort((a, b) => b - a);
+
+		// Fetch the notes from the database until we have enough to satisfy the limit
+		start = 0;
+		const found = [];
+		while (found.length < ps.limit && start < ids.length) {
+			const chunk = ids.slice(start, start + chunkSize);
+			const notes: Note[] = await Notes.find({
+				where: {
+					id: In(chunk),
+				},
+				order: {
+					id: "DESC",
+				},
+			});
+
+			// The notes are checked for visibility and muted/blocked users when packed
+			found.push(...await Notes.packMany(notes, me));
+			start += chunkSize;
+		}
+
+		// If we have more results than the limit, trim them
+		if (found.length > ps.limit) {
+			found.length = ps.limit;
+		}
+
+		return found;
 	} else {
 		const userQuery =
 			ps.userId != null
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 968aed880..6c7fd9ad5 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -1,5 +1,6 @@
 import * as mfm from "mfm-js";
 import es from "../../db/elasticsearch.js";
+import sonic from "../../db/sonic.js";
 import {
 	publishMainStream,
 	publishNotesStream,
@@ -588,7 +589,7 @@ export default async (
 		}
 
 		// Register to search database
-		index(note);
+		await index(note);
 	});
 
 async function renderNoteOrRenoteActivity(data: Option, note: Note) {
@@ -728,18 +729,34 @@ async function insertNote(
 	}
 }
 
-function index(note: Note) {
-	if (note.text == null || config.elasticsearch == null) return;
+export async function index(note: Note): Promise<void> {
+	if (!note.text) return;
 
-	es!.index({
-		index: config.elasticsearch.index || "misskey_note",
-		id: note.id.toString(),
-		body: {
-			text: normalizeForSearch(note.text),
-			userId: note.userId,
-			userHost: note.userHost,
-		},
-	});
+	if (config.elasticsearch && es) {
+		es.index({
+			index: config.elasticsearch.index || "misskey_note",
+			id: note.id.toString(),
+			body: {
+				text: normalizeForSearch(note.text),
+				userId: note.userId,
+				userHost: note.userHost,
+			},
+		});
+	}
+
+	if (sonic) {
+		await sonic.ingest.push(
+			sonic.collection,
+			sonic.bucket,
+			JSON.stringify({
+				id: note.id,
+				userId: note.userId,
+				userHost: note.userHost,
+				channelId: note.channelId,
+			}),
+			note.text,
+		);
+	}
 }
 
 async function notifyToWatchersOfRenotee(
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index de1200477..37bc6c805 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -196,6 +196,7 @@ importers:
       seedrandom: ^3.0.5
       semver: 7.3.8
       sharp: 0.31.3
+      sonic-channel: ^1.3.1
       speakeasy: 2.0.0
       strict-event-emitter-types: 2.0.0
       stringz: 2.1.0
@@ -310,6 +311,7 @@ importers:
       seedrandom: 3.0.5
       semver: 7.3.8
       sharp: 0.31.3
+      sonic-channel: 1.3.1
       speakeasy: 2.0.0
       stringz: 2.1.0
       summaly: 2.7.0
@@ -11594,6 +11596,11 @@ packages:
       smart-buffer: 4.2.0
     dev: false
 
+  /sonic-channel/1.3.1:
+    resolution: {integrity: sha512-+K4IZVFE7Tf2DB4EFZ23xo7a/+gJaiOHhFzXVZpzkX6Rs/rvf4YbSxnEGdYw8mrTcjtpG+jLVQEhP8sNTtN5VA==}
+    engines: {node: '>= 6.0.0'}
+    dev: false
+
   /sort-keys-length/1.0.1:
     resolution: {integrity: sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==}
     engines: {node: '>=0.10.0'}

From 31e2bc70c7b86781e4a9a6b48e45c39893d741e7 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 01:32:17 -0700
Subject: [PATCH 224/582] =?UTF-8?q?docs:=20=F0=9F=93=9D=20sonic=20instruct?=
 =?UTF-8?q?ions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2b5a80b0d..c430ce63e 100644
--- a/README.md
+++ b/README.md
@@ -80,8 +80,9 @@ If you have access to a server that supports one of the sources below, I recomme
 ### 😗 Optional dependencies
 
 - [FFmpeg](https://ffmpeg.org/) for video transcoding
-- [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search
-  - OpenSearch/Sonic are not supported as of right now
+- Full text search (choost one of the following)
+  - 🦔 [Sonic](https://crates.io/crates/sonic-server) (highly recommended!)
+  - [ElasticSearch](https://www.elastic.co/elasticsearch/)
 - Management (choose one of the following)
   - 🛰️ [pm2](https://pm2.io/)
   - 🐳 [Docker](https://docker.com)
@@ -121,6 +122,17 @@ Assuming you set up PostgreSQL correctly, all you have to run is:
 psql postgres -c "create database calckey with encoding = 'UTF8';"
 ```
 
+In Calckey's directory, fill out the `db` section of `.config/default.yml` with the correct information, where the `db` key is `calckey`.
+
+## 🦔 Set up search
+
+Follow sonic's [installation guide](https://github.com/valeriansaliou/sonic#installation)
+
+If you use IPv4: in Sonic's directory, edit the `config.cfg` file to change `inet` to `"0.0.0.0:1491"`.
+
+In Calckey's directory, fill out the `sonic` section of `.config/default.yml` with the correct information.
+
+
 ## 💅 Customize
 
 - To add custom CSS for all users, edit `./custom/assets/instance.css`.

From 1914ce10ce29bda30c81b77df5ea129a4a37b783 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 01:32:57 -0700
Subject: [PATCH 225/582] =?UTF-8?q?docs:=20=F0=9F=93=9D=20sonic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CALCKEY.md | 1 +
 README.md  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CALCKEY.md b/CALCKEY.md
index 66c6e8d42..73acd75bb 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -114,6 +114,7 @@
 - Backfill follower counts
 - Improved emoji licensing
 - Compile time compression
+- Sonic search
 - MissV: [fix Misskey Forkbomb](https://code.vtopia.live/Vtopia/MissV/commit/40b23c070bd4adbb3188c73546c6c625138fb3c1)
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)
diff --git a/README.md b/README.md
index c430ce63e..551210676 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@
   - Better intro tutorial
   - Compatibility with Mastodon clients/apps
   - Backfill user information
+  - Sonic search
   - Many more user and admin settings
   - [So much more!](./CALCKEY.md)
 

From 472164f5734c3715daa37c27122962c78d983042 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 01:59:33 -0700
Subject: [PATCH 226/582] feat: spruce up CLI

---
 packages/backend/src/server/web/cli.css | 18 +++++++++++++++---
 packages/backend/src/server/web/cli.js  |  9 +++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/server/web/cli.css b/packages/backend/src/server/web/cli.css
index 6903db983..1a7b78a66 100644
--- a/packages/backend/src/server/web/cli.css
+++ b/packages/backend/src/server/web/cli.css
@@ -6,13 +6,26 @@ main {
 	border-radius: 10px;
 }
 #tl > div {
-	padding: 16px;
-	border-bottom: 1px solid #908caa;
+	border: 1px solid #908caa;
+  border-radius: 10px;
+  margin: 10px;
+  padding: 10px;
+	width: fit-content;
 }
 #tl > div > header {
 	font-weight: 700;
 }
 
+img {
+	height: 45px;
+	border-radius: 10px;
+	margin-right: 10px;
+}
+
+#form {
+	text-align: center;
+}
+
 * {
 	font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif;
 }
@@ -26,7 +39,6 @@ html {
 	justify-content: center;
 	margin: auto;
 	padding: 10px;
-	text-align: center;
 }
 button {
 	border-radius:999px;
diff --git a/packages/backend/src/server/web/cli.js b/packages/backend/src/server/web/cli.js
index 290453f7e..bc2b7977c 100644
--- a/packages/backend/src/server/web/cli.js
+++ b/packages/backend/src/server/web/cli.js
@@ -45,11 +45,16 @@ window.onload = async () => {
 		const tl = document.getElementById("tl");
 		for (const note of notes) {
 			const el = document.createElement("div");
-			const name = document.createElement("header");
+			const header = document.createElement("header");
+			const name = document.createElement("p");
+			const avatar = document.createElement("img")
 			name.textContent = `${note.user.name} @${note.user.username}`;
+			avatar.src = note.user.avatar;
 			const text = document.createElement("div");
 			text.textContent = `${note.text}`;
-			el.appendChild(name);
+			el.appendChild(header);
+			header.appendChild(avatar);
+			header.appendChild(name);
 			el.appendChild(text);
 			tl.appendChild(el);
 		}

From 26cbcba6a6286a5cee005df75fa8b10edcfb8eee Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 02:08:08 -0700
Subject: [PATCH 227/582] fix cli more

---
 packages/backend/src/server/web/cli.css | 6 +++---
 packages/backend/src/server/web/cli.js  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/server/web/cli.css b/packages/backend/src/server/web/cli.css
index 1a7b78a66..20f4b4910 100644
--- a/packages/backend/src/server/web/cli.css
+++ b/packages/backend/src/server/web/cli.css
@@ -14,6 +14,7 @@ main {
 }
 #tl > div > header {
 	font-weight: 700;
+	display: inline-flex;
 }
 
 img {
@@ -26,14 +27,13 @@ img {
 	text-align: center;
 }
 
-* {
-	font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif;
-}
 #calckey_app {
 	display: none !important;
 }
+
 body,
 html {
+	font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif;
 	background-color: #191724;
 	color: #e0def4;
 	justify-content: center;
diff --git a/packages/backend/src/server/web/cli.js b/packages/backend/src/server/web/cli.js
index bc2b7977c..e93622ea2 100644
--- a/packages/backend/src/server/web/cli.js
+++ b/packages/backend/src/server/web/cli.js
@@ -49,7 +49,7 @@ window.onload = async () => {
 			const name = document.createElement("p");
 			const avatar = document.createElement("img")
 			name.textContent = `${note.user.name} @${note.user.username}`;
-			avatar.src = note.user.avatar;
+			avatar.src = note.user.avatarUrl;
 			const text = document.createElement("div");
 			text.textContent = `${note.text}`;
 			el.appendChild(header);

From c1da33a658c683873240961db88045926c38c5da Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 02:33:44 -0700
Subject: [PATCH 228/582] cli images

---
 packages/backend/src/server/web/cli.css |  1 -
 packages/backend/src/server/web/cli.js  | 12 +++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/web/cli.css b/packages/backend/src/server/web/cli.css
index 20f4b4910..460a7b7f3 100644
--- a/packages/backend/src/server/web/cli.css
+++ b/packages/backend/src/server/web/cli.css
@@ -18,7 +18,6 @@ main {
 }
 
 img {
-	height: 45px;
 	border-radius: 10px;
 	margin-right: 10px;
 }
diff --git a/packages/backend/src/server/web/cli.js b/packages/backend/src/server/web/cli.js
index e93622ea2..ca1c23375 100644
--- a/packages/backend/src/server/web/cli.js
+++ b/packages/backend/src/server/web/cli.js
@@ -50,12 +50,22 @@ window.onload = async () => {
 			const avatar = document.createElement("img")
 			name.textContent = `${note.user.name} @${note.user.username}`;
 			avatar.src = note.user.avatarUrl;
+			avatar.style = 'height: 40px'
 			const text = document.createElement("div");
 			text.textContent = `${note.text}`;
 			el.appendChild(header);
 			header.appendChild(avatar);
 			header.appendChild(name);
-			el.appendChild(text);
+			if (note.text) {
+				el.appendChild(text);
+			}
+			if (note.files) {
+				for (const file of note.files) {
+					const img = document.createElement("img");
+					img.src = file.properties.thumbnailUrl;
+					el.appendChild(img)
+				}
+			}
 			tl.appendChild(el);
 		}
 	});

From ebef0b14c63fd8f9895dcf05590b8800f80df2f6 Mon Sep 17 00:00:00 2001
From: Kaitlyn Allan <kaitlyn.allan@enlabs.cloud>
Date: Sun, 19 Mar 2023 20:06:24 +1000
Subject: [PATCH 229/582] Fix error saving drive file caption > 512 chars

---
 packages/backend/src/server/api/endpoints/drive/files/update.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/drive/files/update.ts b/packages/backend/src/server/api/endpoints/drive/files/update.ts
index d113b978f..e681f1294 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/update.ts
@@ -54,7 +54,7 @@ export const paramDef = {
 		folderId: { type: "string", format: "misskey:id", nullable: true },
 		name: { type: "string" },
 		isSensitive: { type: "boolean" },
-		comment: { type: "string", nullable: true, maxLength: 512 },
+		comment: { type: "string", nullable: true, maxLength: DB_MAX_IMAGE_COMMENT_LENGTH },
 	},
 	required: ["fileId"],
 } as const;

From ba4c2f65ae28f498e4fec6b70c6968715787a900 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 19 Mar 2023 20:28:19 +0900
Subject: [PATCH 230/582] fix: don't show smartphone UI when settings icon is
 double-clicked

---
 packages/client/src/pages/admin/index.vue    | 8 +++++++-
 packages/client/src/pages/settings/index.vue | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 8eb5e0987..81a27cf38 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -13,7 +13,7 @@
 				<MkInfo v-if="noEmailServer" warn class="info">{{ i18n.ts.noEmailServerWarning }} <MkA to="/admin/email-settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
 				<MkInfo v-if="updateAvailable" warn class="info">{{ i18n.ts.updateAvailable }} <a href="https://codeberg.org/calckey/calckey/releases" target="_bank" class="_link">{{ i18n.ts.check }}</a></MkInfo>
 
-				<MkSuperMenu :def="menuDef" :grid="currentPage?.route.name == null"></MkSuperMenu>
+				<MkSuperMenu :def="menuDef" :grid="narrow"></MkSuperMenu>
 			</div>
 		</MkSpacer>
 	</div>
@@ -219,6 +219,12 @@ onUnmounted(() => {
 	ro.disconnect();
 });
 
+watch(router.currentRef, (to) => {
+	if (to.route.path === "/admin" && to.child?.route.name == null && !narrow) {
+		router.replace('/admin/overview');
+	}
+});
+
 provideMetadataReceiver((info) => {
 	if (info == null) {
 		childInfo = null;
diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue
index b03140ff2..ef9ae91b9 100644
--- a/packages/client/src/pages/settings/index.vue
+++ b/packages/client/src/pages/settings/index.vue
@@ -7,7 +7,7 @@
 				<div v-if="!narrow || currentPage?.route.name == null" class="nav">
 					<div class="baaadecd">
 						<MkInfo v-if="emailNotConfigured" warn class="info">{{ i18n.ts.emailNotConfiguredWarning }} <MkA to="/settings/email" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
-						<MkSuperMenu :def="menuDef" :grid="currentPage?.route.name == null"></MkSuperMenu>
+						<MkSuperMenu :def="menuDef" :grid="narrow"></MkSuperMenu>
 					</div>
 				</div>
 				<div v-if="!(narrow && currentPage?.route.name == null)" class="main">
@@ -230,6 +230,12 @@ onUnmounted(() => {
 	ro.disconnect();
 });
 
+watch(router.currentRef, (to) => {
+	if (to.route.name === "settings" && to.child?.route.name == null && !narrow) {
+		router.replace('/settings/profile');
+	}
+});
+
 const emailNotConfigured = computed(() => instance.enableEmail && ($i.email == null || !$i.emailVerified));
 
 provideMetadataReceiver((info) => {

From 67c6f55a4ea3c8e393d467bfa5979f63e9f2030e Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 20 Mar 2023 00:24:16 +0100
Subject: [PATCH 231/582] fix: unicode aliases

---
 packages/client/src/emojilist.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/emojilist.json b/packages/client/src/emojilist.json
index 78390a7be..b0fa4457b 100644
--- a/packages/client/src/emojilist.json
+++ b/packages/client/src/emojilist.json
@@ -868,7 +868,7 @@
 	{ "category": "activity", "char": "🧩", "name": "jigsaw", "keywords": ["interlocking", "puzzle", "piece"] },
 	{ "category": "activity", "char": "🎳", "name": "bowling", "keywords": ["sports", "fun", "play"] },
 	{ "category": "activity", "char": "🪄", "name": "magic_wand", "keywords": ["spell", "horny", "wizardry"] },
-	{ "category": "activity", "char": "🪅", "name": "pinata", "keywords": ["birthday", "celebration", "fortnite", "fun"] },
+	{ "category": "activity", "char": "🪅", "name": "pinata", "keywords": ["birthday", "celebration", "fun"] },
 	{ "category": "activity", "char": "🪆", "name": "nesting_dolls", "keywords": ["russian", "handmade", "doll"] },
 	{ "category": "activity", "char": "\uD83E\uDEAC", "name": "hamsa", "keywords": [] },
 	{ "category": "activity", "char": "\uD83E\uDEA9", "name": "mirror_ball", "keywords": [] },

From eee4d0ae4b2c42a035f1540e78f73756f217ba04 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 20 Mar 2023 00:30:05 +0100
Subject: [PATCH 232/582] Revert "fix: unicode aliases"

This reverts commit 989b4975883849f81684e29c1235e881d28a9bb9.
---
 packages/client/src/emojilist.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/emojilist.json b/packages/client/src/emojilist.json
index b0fa4457b..78390a7be 100644
--- a/packages/client/src/emojilist.json
+++ b/packages/client/src/emojilist.json
@@ -868,7 +868,7 @@
 	{ "category": "activity", "char": "🧩", "name": "jigsaw", "keywords": ["interlocking", "puzzle", "piece"] },
 	{ "category": "activity", "char": "🎳", "name": "bowling", "keywords": ["sports", "fun", "play"] },
 	{ "category": "activity", "char": "🪄", "name": "magic_wand", "keywords": ["spell", "horny", "wizardry"] },
-	{ "category": "activity", "char": "🪅", "name": "pinata", "keywords": ["birthday", "celebration", "fun"] },
+	{ "category": "activity", "char": "🪅", "name": "pinata", "keywords": ["birthday", "celebration", "fortnite", "fun"] },
 	{ "category": "activity", "char": "🪆", "name": "nesting_dolls", "keywords": ["russian", "handmade", "doll"] },
 	{ "category": "activity", "char": "\uD83E\uDEAC", "name": "hamsa", "keywords": [] },
 	{ "category": "activity", "char": "\uD83E\uDEA9", "name": "mirror_ball", "keywords": [] },

From a0bcf42b88a3faf14b36d8bfdd6566e78f7970ba Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Mon, 20 Mar 2023 00:37:49 +0100
Subject: [PATCH 233/582] chore: add emoji aliases

---
 packages/client/src/emojilist.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/emojilist.json b/packages/client/src/emojilist.json
index 78390a7be..37a9765a5 100644
--- a/packages/client/src/emojilist.json
+++ b/packages/client/src/emojilist.json
@@ -547,7 +547,7 @@
 	{ "category": "animals_and_nature", "char": "🦤", "name": "dodo", "keywords": ["animal", "nature"] },
 	{ "category": "animals_and_nature", "char": "🪶", "name": "feather", "keywords": ["animal", "nature"] },
 	{ "category": "animals_and_nature", "char": "🦭", "name": "seal", "keywords": ["animal", "nature"] },
-	{ "category": "animals_and_nature", "char": "🐾", "name": "paw_prints", "keywords": ["animal", "tracking", "footprints", "dog", "cat", "pet", "feet"] },
+	{ "category": "animals_and_nature", "char": "🐾", "name": "paw_prints", "keywords": ["animal", "tracking", "footprints", "dog", "cat", "pet", "feet", "paws", "kitty"] },
 	{ "category": "animals_and_nature", "char": "🐉", "name": "dragon", "keywords": ["animal", "myth", "nature", "chinese", "green"] },
 	{ "category": "animals_and_nature", "char": "🐲", "name": "dragon_face", "keywords": ["animal", "myth", "nature", "chinese", "green"] },
 	{ "category": "animals_and_nature", "char": "🦧", "name": "orangutan", "keywords": ["animal", "nature"] },

From efef445eef7d6e98bcc7722ff9016077ef9eb6d0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 16:53:49 -0700
Subject: [PATCH 234/582] fix: repo url

---
 .../backend/migration/1679269929000-fix-repo.js     | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 packages/backend/migration/1679269929000-fix-repo.js

diff --git a/packages/backend/migration/1679269929000-fix-repo.js b/packages/backend/migration/1679269929000-fix-repo.js
new file mode 100644
index 000000000..6784b3793
--- /dev/null
+++ b/packages/backend/migration/1679269929000-fix-repo.js
@@ -0,0 +1,13 @@
+export class FixRepo1679269929000 {
+	name = 'FixRepo1679269929000'
+
+	async up(queryRunner) {
+		await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/calckey/calckey'`);
+		await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/calckey/calckey/issues'`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/calckey/calckey'`);
+		await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/calckey/calckey/issues'`);
+	}
+}

From 7fc19c4ea56636cf2124c95eb04d241cab4d699a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 16:58:54 -0700
Subject: [PATCH 235/582] generic color for online user count

---
 packages/client/src/widgets/online-users.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/widgets/online-users.vue b/packages/client/src/widgets/online-users.vue
index e9ab79b11..ed885bf13 100644
--- a/packages/client/src/widgets/online-users.vue
+++ b/packages/client/src/widgets/online-users.vue
@@ -67,7 +67,7 @@ defineExpose<WidgetComponentExpose>({
 
 	> .text {
 		::v-deep(b) {
-			color: #41b781;
+			color: var(--badge);
 		}
 
 		::v-deep(span) {

From bd29f6bf2e2efa52cae0a3dba4e4d383cb0d3312 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 18:44:08 -0700
Subject: [PATCH 236/582] feat: :sparkles: more themes!

---
 packages/client/src/scripts/theme.ts          |  6 ++
 .../src/themes/d-catppuccin-frappe.json5      | 94 +++++++++++++++++++
 .../src/themes/d-catppuccin-mocha.json5       | 94 +++++++++++++++++++
 packages/client/src/themes/d-gruvbox.json5    | 30 ++++++
 packages/client/src/themes/d-nord.json5       | 94 +++++++++++++++++++
 packages/client/src/themes/l-gruvbox.json5    | 30 ++++++
 packages/client/src/themes/l-nord.json5       | 94 +++++++++++++++++++
 7 files changed, 442 insertions(+)
 create mode 100644 packages/client/src/themes/d-catppuccin-frappe.json5
 create mode 100644 packages/client/src/themes/d-catppuccin-mocha.json5
 create mode 100644 packages/client/src/themes/d-gruvbox.json5
 create mode 100644 packages/client/src/themes/d-nord.json5
 create mode 100644 packages/client/src/themes/l-gruvbox.json5
 create mode 100644 packages/client/src/themes/l-nord.json5

diff --git a/packages/client/src/scripts/theme.ts b/packages/client/src/scripts/theme.ts
index 800267931..383deb34c 100644
--- a/packages/client/src/scripts/theme.ts
+++ b/packages/client/src/scripts/theme.ts
@@ -24,6 +24,8 @@ export const getBuiltinThemes = () =>
 		[
 			"l-rosepinedawn",
 			"l-light",
+			"l-nord",
+			"l-gruvbox",
 			"l-coffee",
 			"l-apricot",
 			"l-rainy",
@@ -35,6 +37,10 @@ export const getBuiltinThemes = () =>
 			"d-rosepine",
 			"d-rosepinemoon",
 			"d-dark",
+			"d-nord",
+			"d-gruvbox",
+			"d-catppuccin-frappe",
+			"d-catppuccin-mocha",
 			"d-persimmon",
 			"d-astro",
 			"d-future",
diff --git a/packages/client/src/themes/d-catppuccin-frappe.json5 b/packages/client/src/themes/d-catppuccin-frappe.json5
new file mode 100644
index 000000000..ecb464bd5
--- /dev/null
+++ b/packages/client/src/themes/d-catppuccin-frappe.json5
@@ -0,0 +1,94 @@
+{
+	id: 'ffcd3328-5c57-4ca3-9dac-4580cbf7742f',
+	base: 'dark',
+	name: 'Catppuccin frappe flamingo',
+	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: '#232634',
+		fg: '#c6d0f5',
+		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',
+		X17: ':alpha<0.8<@bg',
+		cwBg: '#51576d',
+		cwFg: '#b5bfe2',
+		link: '#8caaee',
+		warn: '#ef9f76',
+		badge: '#8caaee',
+		error: '#e78284',
+		focus: ':alpha<0.3<@accent',
+		navBg: '@panel',
+		navFg: '@fg',
+		panel: ':lighten<3<@bg',
+		popup: ':lighten<3<@panel',
+		accent: '#eebebe',
+		header: ':alpha<0.7<@panel',
+		infoBg: '#414559',
+		infoFg: '#a5adce',
+		renote: '#8caaee',
+		shadow: 'rgba(0, 0, 0, 0.3)',
+		divider: 'rgba(255, 255, 255, 0.1)',
+		hashtag: '#85c1dc',
+		mention: '@accent',
+		modalBg: 'rgba(0, 0, 0, 0.5)',
+		success: '#a6d189',
+		buttonBg: 'rgba(255, 255, 255, 0.05)',
+		switchBg: 'rgba(255, 255, 255, 0.15)',
+		acrylicBg: ':alpha<0.5<@bg',
+		cwHoverBg: '#626880',
+		indicator: '@accent',
+		mentionMe: '@mention',
+		messageBg: '@bg',
+		navActive: '@accent',
+		accentedBg: ':alpha<0.15<@accent',
+		codeNumber: '#a6d189',
+		codeString: '#ef9f76',
+		fgOnAccent: '#303446',
+		infoWarnBg: '#414559',
+		infoWarnFg: '#b5bfe2',
+		navHoverFg: ':lighten<17<@fg',
+		swutchOnBg: '@accentedBg',
+		swutchOnFg: '@accent',
+		codeBoolean: '@accent',
+		dateLabelFg: '@fg',
+		deckDivider: '#737994',
+		inputBorder: 'rgba(255, 255, 255, 0.1)',
+		panelBorder: 'solid 1px var(--divider)',
+		swutchOffBg: 'rgba(255, 255, 255, 0.1)',
+		swutchOffFg: '@fg',
+		accentDarken: ':darken<10<@accent',
+		acrylicPanel: ':alpha<0.5<@panel',
+		navIndicator: '@indicator',
+		windowHeader: ':alpha<0.85<@panel',
+		accentLighten: ':lighten<10<@accent',
+		buttonHoverBg: 'rgba(255, 255, 255, 0.1)',
+		driveFolderBg: ':alpha<0.3<@accent',
+		fgHighlighted: ':lighten<3<@fg',
+		fgTransparent: ':alpha<0.5<@fg',
+		panelHeaderBg: ':lighten<3<@panel',
+		panelHeaderFg: '@fg',
+		buttonGradateA: '@accent',
+		buttonGradateB: ':hue<20<@accent',
+		htmlThemeColor: '@bg',
+		panelHighlight: ':lighten<3<@panel',
+		listItemHoverBg: 'rgba(255, 255, 255, 0.03)',
+		scrollbarHandle: 'rgba(255, 255, 255, 0.2)',
+		inputBorderHover: 'rgba(255, 255, 255, 0.2)',
+		wallpaperOverlay: 'rgba(0, 0, 0, 0.5)',
+		fgTransparentWeak: ':alpha<0.75<@fg',
+		panelHeaderDivider: 'rgba(0, 0, 0, 0)',
+		scrollbarHandleHover: 'rgba(255, 255, 255, 0.4)',
+	},
+	author: 'somebody ¯_(ツ)_/¯',
+}
diff --git a/packages/client/src/themes/d-catppuccin-mocha.json5 b/packages/client/src/themes/d-catppuccin-mocha.json5
new file mode 100644
index 000000000..6c34a49ca
--- /dev/null
+++ b/packages/client/src/themes/d-catppuccin-mocha.json5
@@ -0,0 +1,94 @@
+{
+	id: 'd413f41f-a489-48be-9e20-3532ffbb4363',
+	base: 'dark',
+	name: 'Catppuccin mocha flamingo',
+	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: '#11111b',
+		fg: '#cdd6f4',
+		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',
+		X17: ':alpha<0.8<@bg',
+		cwBg: '#45475a',
+		cwFg: '#bac2de',
+		link: '#89b4fa',
+		warn: '#fab387',
+		badge: '#89b4fa',
+		error: '#f38ba8',
+		focus: ':alpha<0.3<@accent',
+		navBg: '@panel',
+		navFg: '@fg',
+		panel: ':lighten<3<@bg',
+		popup: ':lighten<3<@panel',
+		accent: '#f2cdcd',
+		header: ':alpha<0.7<@panel',
+		infoBg: '#313244',
+		infoFg: '#a6adc8',
+		renote: '#89b4fa',
+		shadow: 'rgba(0, 0, 0, 0.3)',
+		divider: 'rgba(255, 255, 255, 0.1)',
+		hashtag: '#74c7ec',
+		mention: '@accent',
+		modalBg: 'rgba(0, 0, 0, 0.5)',
+		success: '#a6e3a1',
+		buttonBg: 'rgba(255, 255, 255, 0.05)',
+		switchBg: 'rgba(255, 255, 255, 0.15)',
+		acrylicBg: ':alpha<0.5<@bg',
+		cwHoverBg: '#585b70',
+		indicator: '@accent',
+		mentionMe: '@mention',
+		messageBg: '@bg',
+		navActive: '@accent',
+		accentedBg: ':alpha<0.15<@accent',
+		codeNumber: '#a6e3a1',
+		codeString: '#fab387',
+		fgOnAccent: '#1e1e2e',
+		infoWarnBg: '#313244',
+		infoWarnFg: '#bac2de',
+		navHoverFg: ':lighten<17<@fg',
+		swutchOnBg: '@accentedBg',
+		swutchOnFg: '@accent',
+		codeBoolean: '@accent',
+		dateLabelFg: '@fg',
+		deckDivider: '#6c7086',
+		inputBorder: 'rgba(255, 255, 255, 0.1)',
+		panelBorder: 'solid 1px var(--divider)',
+		swutchOffBg: 'rgba(255, 255, 255, 0.1)',
+		swutchOffFg: '@fg',
+		accentDarken: ':darken<10<@accent',
+		acrylicPanel: ':alpha<0.5<@panel',
+		navIndicator: '@indicator',
+		windowHeader: ':alpha<0.85<@panel',
+		accentLighten: ':lighten<10<@accent',
+		buttonHoverBg: 'rgba(255, 255, 255, 0.1)',
+		driveFolderBg: ':alpha<0.3<@accent',
+		fgHighlighted: ':lighten<3<@fg',
+		fgTransparent: ':alpha<0.5<@fg',
+		panelHeaderBg: ':lighten<3<@panel',
+		panelHeaderFg: '@fg',
+		buttonGradateA: '@accent',
+		buttonGradateB: ':hue<20<@accent',
+		htmlThemeColor: '@bg',
+		panelHighlight: ':lighten<3<@panel',
+		listItemHoverBg: 'rgba(255, 255, 255, 0.03)',
+		scrollbarHandle: 'rgba(255, 255, 255, 0.2)',
+		inputBorderHover: 'rgba(255, 255, 255, 0.2)',
+		wallpaperOverlay: 'rgba(0, 0, 0, 0.5)',
+		fgTransparentWeak: ':alpha<0.75<@fg',
+		panelHeaderDivider: 'rgba(0, 0, 0, 0)',
+		scrollbarHandleHover: 'rgba(255, 255, 255, 0.4)',
+	},
+	author: 'somebody ¯_(ツ)_/¯',
+}
diff --git a/packages/client/src/themes/d-gruvbox.json5 b/packages/client/src/themes/d-gruvbox.json5
new file mode 100644
index 000000000..3386308a3
--- /dev/null
+++ b/packages/client/src/themes/d-gruvbox.json5
@@ -0,0 +1,30 @@
+{
+	id: '256a2e52-440f-4a00-8a76-c93501354dfb',
+	base: 'dark',
+	desc: 'Misskey gruvbox-dark-medium theme. Inspired by https://github.com/morhetz/gruvbox',
+	name: 'misskey-gruvbox-dark-medium',
+	props: {
+		bg: '#282828',
+		fg: '#ebdbb2',
+		link: '#b16286',
+		warn: '#d65d0e',
+		badge: '#458588',
+		error: '#fb4934',
+		navBg: '#32302f',
+		panel: '#32302f',
+		accent: '#98971a',
+		header: ':alpha<0.7<@panel',
+		renote: '@accent',
+		divider: '#7c6f64',
+		hashtag: '#458588',
+		mention: '#98971a',
+		success: '#98971a',
+		mentionMe: '#fb4934',
+		fgHighlighted: '#fbf1c7',
+		panelHeaderBg: '@panel',
+		buttonGradateA: '#98971a',
+		buttonGradateB: '#98971a',
+		panelHeaderDivider: '@divider',
+	},
+	author: '@razzlom@quietplace.xyz',
+}
diff --git a/packages/client/src/themes/d-nord.json5 b/packages/client/src/themes/d-nord.json5
new file mode 100644
index 000000000..7e8b4f4d0
--- /dev/null
+++ b/packages/client/src/themes/d-nord.json5
@@ -0,0 +1,94 @@
+{
+	id: 'dddbc0c6-af2c-46f8-b8f3-05964adcde0b',
+	base: 'dark',
+	desc: 'Nord: an arctic, north-bluish color palette',
+	name: 'Nord 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: '#2e3440',
+		fg: '#eceff4',
+		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',
+		X17: ':alpha<0.8<@bg',
+		cwBg: '#4c566a',
+		cwFg: '#393f4f',
+		link: '#b48ead',
+		warn: '#d08770',
+		badge: '#d08770',
+		error: '#bf616a',
+		focus: ':alpha<0.3<@accent',
+		navBg: '@panel',
+		navFg: '@fg',
+		panel: ':lighten<3<@bg',
+		popup: ':lighten<3<@panel',
+		accent: '#81a1c1',
+		header: ':alpha<0.7<@panel',
+		infoBg: '#4c566a',
+		infoFg: '#d08770',
+		renote: '#ebcb8b',
+		shadow: 'rgba(0, 0, 0, 0.3)',
+		divider: 'rgba(255, 255, 255, 0.1)',
+		hashtag: '#a3be8c',
+		mention: '@accent',
+		modalBg: 'rgba(0, 0, 0, 0.5)',
+		success: '#a3be8c',
+		buttonBg: 'rgba(255, 255, 255, 0.05)',
+		switchBg: 'rgba(255, 255, 255, 0.15)',
+		acrylicBg: ':alpha<0.5<@bg',
+		cwHoverBg: '#707b97',
+		indicator: '@accent',
+		mentionMe: '@mention',
+		messageBg: '@bg',
+		navActive: '@accent',
+		accentedBg: ':alpha<0.15<@accent',
+		codeNumber: '#a3be8c',
+		codeString: '#b48ead',
+		fgOnAccent: '#eceff4',
+		infoWarnBg: '#4c566a',
+		infoWarnFg: '#bf616a',
+		navHoverFg: ':lighten<17<@fg',
+		swutchOnBg: '@accentedBg',
+		swutchOnFg: '@accent',
+		codeBoolean: '#ebcb8b',
+		dateLabelFg: '@fg',
+		inputBorder: 'rgba(255, 255, 255, 0.1)',
+		panelBorder: '" solid 1px var(--divider)',
+		swutchOffBg: 'rgba(255, 255, 255, 0.1)',
+		swutchOffFg: '@fg',
+		accentDarken: '#5e81ac',
+		acrylicPanel: ':alpha<0.5<@panel',
+		navIndicator: '@indicator',
+		windowHeader: ':alpha<0.85<@panel',
+		accentLighten: '#88c0d0',
+		buttonHoverBg: 'rgba(255, 255, 255, 0.1)',
+		driveFolderBg: ':alpha<0.3<@accent',
+		fgHighlighted: ':lighten<3<@fg',
+		fgTransparent: ':alpha<0.5<@fg',
+		panelHeaderBg: ':lighten<3<@panel',
+		panelHeaderFg: '@fg',
+		buttonGradateA: '@accent',
+		buttonGradateB: '#8fbcbb',
+		htmlThemeColor: '@bg',
+		panelHighlight: ':lighten<3<@panel',
+		listItemHoverBg: 'rgba(255, 255, 255, 0.03)',
+		scrollbarHandle: 'rgba(255, 255, 255, 0.2)',
+		inputBorderHover: 'rgba(255, 255, 255, 0.2)',
+		wallpaperOverlay: 'rgba(0, 0, 0, 0.5)',
+		fgTransparentWeak: ':alpha<0.75<@fg',
+		panelHeaderDivider: 'rgba(0, 0, 0, 0)',
+		scrollbarHandleHover: 'rgba(255, 255, 255, 0.4)',
+	},
+	author: '@thatonecalculator@stop.voring.me',
+}
diff --git a/packages/client/src/themes/l-gruvbox.json5 b/packages/client/src/themes/l-gruvbox.json5
new file mode 100644
index 000000000..5ca6b3cd7
--- /dev/null
+++ b/packages/client/src/themes/l-gruvbox.json5
@@ -0,0 +1,30 @@
+{
+	id: '9be7b20e-58b4-4bd2-8b1d-49d41a676685',
+	base: 'light',
+	desc: 'Misskey gruvbox-light-medium theme. Inspired by https://github.com/morhetz/gruvbox',
+	name: 'misskey-gruvbox-light-medium',
+	props: {
+		bg: '#fbf1c7',
+		fg: '#3c3836',
+		link: '#b16286',
+		warn: '#d65d0e',
+		badge: '#458588',
+		error: '#fb4934',
+		navBg: '#f9f5c7',
+		panel: '#f9f5c7',
+		accent: '#98971a',
+		header: ':alpha<0.7<@panel',
+		renote: '@accent',
+		divider: '#7c6f64',
+		hashtag: '#458588',
+		mention: '#98971a',
+		success: '#98971a',
+		mentionMe: '#9d0006',
+		fgHighlighted: '#fbf1c7',
+		panelHeaderBg: '@panel',
+		buttonGradateA: '#98971a',
+		buttonGradateB: '#98971a',
+		panelHeaderDivider: '@divider',
+	},
+	author: '@razzlom@quietplace.xyz',
+}
diff --git a/packages/client/src/themes/l-nord.json5 b/packages/client/src/themes/l-nord.json5
new file mode 100644
index 000000000..e359f31f4
--- /dev/null
+++ b/packages/client/src/themes/l-nord.json5
@@ -0,0 +1,94 @@
+{
+	id: 'a4b1932e-740c-4ca4-b5d7-06e3322dced4',
+	base: 'light',
+	desc: 'Nord: an arctic, north-bluish color palette',
+	name: 'Nord 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: '#d8dee9',
+		fg: '#3b4252',
+		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',
+		X17: ':alpha<0.8<@bg',
+		cwBg: '#687390',
+		cwFg: '#393f4f',
+		link: '#44a4c1',
+		warn: '#ecb637',
+		badge: '#31b1ce',
+		error: '#ec4137',
+		focus: ':alpha<0.3<@accent',
+		navBg: '@panel',
+		navFg: '@fg',
+		panel: ':lighten<3<@bg',
+		popup: ':lighten<3<@panel',
+		accent: '#81a1c1',
+		header: ':alpha<0.7<@panel',
+		infoBg: '#253142',
+		infoFg: '#fff',
+		renote: '#229e82',
+		shadow: 'rgba(0, 0, 0, 0.3)',
+		divider: 'rgba(255, 255, 255, 0.1)',
+		hashtag: '#ff9156',
+		mention: '@accent',
+		modalBg: 'rgba(0, 0, 0, 0.5)',
+		success: '#86b300',
+		buttonBg: 'rgba(255, 255, 255, 0.05)',
+		switchBg: 'rgba(255, 255, 255, 0.15)',
+		acrylicBg: ':alpha<0.5<@bg',
+		cwHoverBg: '#707b97',
+		indicator: '@accent',
+		mentionMe: '@mention',
+		messageBg: '@bg',
+		navActive: '@accent',
+		accentedBg: ':alpha<0.15<@accent',
+		codeNumber: '#cfff9e',
+		codeString: '#ffb675',
+		fgOnAccent: '#fff',
+		infoWarnBg: '#42321c',
+		infoWarnFg: '#ffbd3e',
+		navHoverFg: ':lighten<17<@fg',
+		swutchOnBg: '@accentedBg',
+		swutchOnFg: '@accent',
+		codeBoolean: '#c59eff',
+		dateLabelFg: '@fg',
+		inputBorder: 'rgba(255, 255, 255, 0.1)',
+		panelBorder: '" solid 1px var(--divider)',
+		swutchOffBg: 'rgba(255, 255, 255, 0.1)',
+		swutchOffFg: '@fg',
+		accentDarken: ':darken<10<@accent',
+		acrylicPanel: ':alpha<0.5<@panel',
+		navIndicator: '@indicator',
+		windowHeader: ':alpha<0.85<@panel',
+		accentLighten: ':lighten<10<@accent',
+		buttonHoverBg: 'rgba(255, 255, 255, 0.1)',
+		driveFolderBg: ':alpha<0.3<@accent',
+		fgHighlighted: ':lighten<3<@fg',
+		fgTransparent: ':alpha<0.5<@fg',
+		panelHeaderBg: ':lighten<3<@panel',
+		panelHeaderFg: '@fg',
+		buttonGradateA: '@accent',
+		buttonGradateB: ':hue<20<@accent',
+		htmlThemeColor: '@bg',
+		panelHighlight: ':lighten<3<@panel',
+		listItemHoverBg: 'rgba(255, 255, 255, 0.03)',
+		scrollbarHandle: 'rgba(255, 255, 255, 0.2)',
+		inputBorderHover: 'rgba(255, 255, 255, 0.2)',
+		wallpaperOverlay: 'rgba(0, 0, 0, 0.5)',
+		fgTransparentWeak: ':alpha<0.75<@fg',
+		panelHeaderDivider: 'rgba(0, 0, 0, 0)',
+		scrollbarHandleHover: 'rgba(255, 255, 255, 0.4)',
+	},
+	author: '@thatonecalculator@stop.voring.me',
+}

From b29b181533b4670ffd64d8d7fe2b9e2756de5244 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 18:44:17 -0700
Subject: [PATCH 237/582] dev13

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

diff --git a/package.json b/package.json
index b9448f00e..003972b3b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev12",
+	"version": "13.2.0-dev13",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From d2f5f5d89d7bb08078d41a0264aaad012d31c8ca Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 18:44:48 -0700
Subject: [PATCH 238/582] cl

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 73acd75bb..415c55e86 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -115,6 +115,7 @@
 - Improved emoji licensing
 - Compile time compression
 - Sonic search
+- Popular color schemes, including Nord, Gruvbox, and Catppuccin
 - MissV: [fix Misskey Forkbomb](https://code.vtopia.live/Vtopia/MissV/commit/40b23c070bd4adbb3188c73546c6c625138fb3c1)
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)

From 9302a10a714807c4955c7a6cf041a19e67038d2c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 18:49:25 -0700
Subject: [PATCH 239/582] theme names

---
 packages/client/src/themes/d-catppuccin-frappe.json5 | 2 +-
 packages/client/src/themes/d-catppuccin-mocha.json5  | 2 +-
 packages/client/src/themes/d-gruvbox.json5           | 2 +-
 packages/client/src/themes/l-gruvbox.json5           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/themes/d-catppuccin-frappe.json5 b/packages/client/src/themes/d-catppuccin-frappe.json5
index ecb464bd5..891fe1805 100644
--- a/packages/client/src/themes/d-catppuccin-frappe.json5
+++ b/packages/client/src/themes/d-catppuccin-frappe.json5
@@ -1,7 +1,7 @@
 {
 	id: 'ffcd3328-5c57-4ca3-9dac-4580cbf7742f',
 	base: 'dark',
-	name: 'Catppuccin frappe flamingo',
+	name: 'Catppuccin frappe',
 	props: {
 		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
diff --git a/packages/client/src/themes/d-catppuccin-mocha.json5 b/packages/client/src/themes/d-catppuccin-mocha.json5
index 6c34a49ca..94e1381c7 100644
--- a/packages/client/src/themes/d-catppuccin-mocha.json5
+++ b/packages/client/src/themes/d-catppuccin-mocha.json5
@@ -1,7 +1,7 @@
 {
 	id: 'd413f41f-a489-48be-9e20-3532ffbb4363',
 	base: 'dark',
-	name: 'Catppuccin mocha flamingo',
+	name: 'Catppuccin mocha',
 	props: {
 		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
diff --git a/packages/client/src/themes/d-gruvbox.json5 b/packages/client/src/themes/d-gruvbox.json5
index 3386308a3..5f4ad602b 100644
--- a/packages/client/src/themes/d-gruvbox.json5
+++ b/packages/client/src/themes/d-gruvbox.json5
@@ -2,7 +2,7 @@
 	id: '256a2e52-440f-4a00-8a76-c93501354dfb',
 	base: 'dark',
 	desc: 'Misskey gruvbox-dark-medium theme. Inspired by https://github.com/morhetz/gruvbox',
-	name: 'misskey-gruvbox-dark-medium',
+	name: 'Gruvbox Dark Medium',
 	props: {
 		bg: '#282828',
 		fg: '#ebdbb2',
diff --git a/packages/client/src/themes/l-gruvbox.json5 b/packages/client/src/themes/l-gruvbox.json5
index 5ca6b3cd7..3e93aae50 100644
--- a/packages/client/src/themes/l-gruvbox.json5
+++ b/packages/client/src/themes/l-gruvbox.json5
@@ -2,7 +2,7 @@
 	id: '9be7b20e-58b4-4bd2-8b1d-49d41a676685',
 	base: 'light',
 	desc: 'Misskey gruvbox-light-medium theme. Inspired by https://github.com/morhetz/gruvbox',
-	name: 'misskey-gruvbox-light-medium',
+	name: 'Gruvbox Light Medium',
 	props: {
 		bg: '#fbf1c7',
 		fg: '#3c3836',

From 10a9a2121d55ba6d3fad3b6f564946d2d225e2fa Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 19:29:15 -0700
Subject: [PATCH 240/582] change follow button background, finally

---
 packages/client/src/components/MkFollowButton.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index cd419cd8b..f7c199951 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -144,13 +144,12 @@ onBeforeUnmount(() => {
 	display: inline-block;
 	font-weight: bold;
 	color: var(--accent);
-	background: transparent;
 	border: solid 1px var(--accent);
 	padding: 0;
 	height: 31px;
 	font-size: 16px;
 	border-radius: 32px;
-	background: #fff;
+	background: var(--accentedBg);
 
 	&.full {
 		padding: 0 8px 0 12px;

From 1913648047629decc2c55ab53006dad58c74980a Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Mon, 20 Mar 2023 02:31:02 +0000
Subject: [PATCH 241/582] note-improvements (#9734)

Not sure if this is the best way to jump to the post

This also lets you select text w/out clicking to the post (and clicking normally on top of the text opens the post)

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9734
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 packages/client/src/components/MkNote.vue     | 16 ++++++---
 .../client/src/components/MkNoteDetailed.vue  | 34 ++++++++++++++-----
 packages/client/src/components/MkNoteSub.vue  | 12 +++++--
 packages/client/src/style.scss                |  1 -
 4 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 08075e531..1ed23b3ff 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -33,7 +33,7 @@
 			</div>
 		</div>
 	</div>
-	<article class="article" @contextmenu.stop="onContextmenu" @click="router.push(notePage(appearNote))">
+	<article class="article" @contextmenu.stop="onContextmenu" @click="noteClick">
 		<div class="main">
 			<div class="header-container">
 				<MkAvatar class="avatar" :user="appearNote.user"/>
@@ -41,16 +41,16 @@
 			</div>
 			<div class="body">
 				<p v-if="appearNote.cw != null" class="cw">
-					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis" @click.stop/>
+					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :custom-emojis="appearNote.emojis" :i="$i"/>
 					<XCwButton v-model="showContent" :note="appearNote"/>
 				</p>
 				<div v-show="appearNote.cw == null || showContent" class="content" :class="{ collapsed, isLong }">
 					<div class="text">
-						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis" @click.stop/>
+						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 						<!-- <a v-if="appearNote.renote != null" class="rp">RN:</a> -->
 						<div v-if="translating || translation" class="translation">
 							<MkLoading v-if="translating" mini/>
-							<div v-else class="translated" @click.stop>
+							<div v-else class="translated">
 								<b>{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: </b>
 								<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 							</div>
@@ -264,6 +264,14 @@ function focusAfter() {
 	focusNext(el.value);
 }
 
+function noteClick(e) {
+	if (document.getSelection().type === 'Range') {
+		e.stopPropagation();
+	} else {
+		router.push(notePage(appearNote))
+	}
+}
+
 function readPromo() {
 	os.api('promo/read', {
 		noteId: appearNote.id,
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index f29129f87..03e9e728b 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -9,8 +9,8 @@
 	:tabindex="!isDeleted ? '-1' : null"
 	:class="{ renote: isRenote }"
 >
-	<MkNoteSub v-for="note in conversation" :key="note.id" class="reply-to-more" :note="note" @click.self="router.push(notePage(note))"/>
-	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to" @click.self="router.push(notePage(appearNote))"/>
+	<MkNoteSub v-for="note in conversation" :key="note.id" class="reply-to-more" :note="note"/>
+	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to"/>
 	<div v-if="isRenote" class="renote">
 		<MkAvatar class="avatar" :user="note.user"/>
 		<i class="ph-repeat ph-bold ph-lg"></i>
@@ -29,7 +29,7 @@
 			<MkVisibility :note="note"/>
 		</div>
 	</div>
-	<article class="article" @contextmenu.stop="onContextmenu">
+	<article ref="noteEl" class="article" @contextmenu.stop="onContextmenu" tabindex="-1">
 		<header class="header">
 			<MkAvatar class="avatar" :user="appearNote.user" :show-indicator="true"/>
 			<div class="body">
@@ -99,7 +99,7 @@
 			</footer>
 		</div>
 	</article>
-	<MkNoteSub v-for="note in directReplies" :key="note.id" :note="note" class="reply" :conversation="replies" @click.self="router.push(notePage(note))"/>
+	<MkNoteSub v-for="note in directReplies" :key="note.id" :note="note" class="reply" :conversation="replies"/>
 </div>
 <div v-else class="_panel muted" @click="muted = false">
 	<I18n :src="i18n.ts.userSaysSomething" tag="small">
@@ -113,7 +113,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, onMounted, onUnmounted, reactive, ref } from 'vue';
+import { computed, inject, onMounted, onUnmounted, onUpdated, reactive, ref } from 'vue';
 import * as mfm from 'mfm-js';
 import type * as misskey from 'calckey-js';
 import MkNoteSub from '@/components/MkNoteSub.vue';
@@ -175,6 +175,7 @@ const isRenote = (
 );
 
 const el = ref<HTMLElement>();
+const noteEl = $ref();
 const menuButton = ref<HTMLElement>();
 const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
@@ -192,6 +193,8 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
 const conversation = ref<misskey.entities.Note[]>([]);
 const replies = ref<misskey.entities.Note[]>([]);
 const directReplies = ref<misskey.entities.Note[]>([]);
+let isScrolling;
+
 
 const keymap = {
 	'r': () => reply(true),
@@ -281,11 +284,11 @@ function showRenoteMenu(viaKeyboard = false): void {
 }
 
 function focus() {
-	el.value.focus();
+	noteEl.focus();
 }
 
 function blur() {
-	el.value.blur();
+	noteEl.blur();
 }
 
 os.api('notes/children', {
@@ -302,6 +305,7 @@ if (appearNote.replyId) {
 		noteId: appearNote.replyId,
 	}).then(res => {
 		conversation.value = res.reverse();
+		focus();
 	});
 }
 
@@ -322,13 +326,26 @@ function onNoteReplied(noteData: NoteUpdatedEvent): void {
 	
 }
 
+document.addEventListener("wheel", () => {
+	isScrolling = true;
+})
+
 onMounted(() => {
 	stream.on("noteUpdated", onNoteReplied);
+	isScrolling = false;
+	noteEl.scrollIntoView();
 });
 
+onUpdated(() => {
+	if (!isScrolling) {
+		noteEl.scrollIntoView()
+	}
+})
+
 onUnmounted(() => {
 	stream.off("noteUpdated", onNoteReplied);
 });
+
 </script>
 
 <style lang="scss" scoped>
@@ -434,7 +451,8 @@ onUnmounted(() => {
 		}
 		font-size: 1.2em;
 		overflow: clip;
-
+		outline: none;
+		scroll-margin-top: calc(var(--stickyTop) + 20vh);
 		> .header {
 			display: flex;
 			position: relative;
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 7fc7fc8dd..6c46946a6 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -1,7 +1,7 @@
 <template>
 <div v-size="{ max: [450, 500] }" class="wrpstxzv" :class="{ children: depth > 1, singleStart: replies.length == 1, firstColumn: depth == 1 && conversation }">
 	<div v-if="conversation && depth > 1" class="line"></div>
-	<div class="main" @click="router.push(notePage(note))">
+	<div class="main" @click="noteClick">
 		<div class="avatar-container">
 			<MkAvatar class="avatar" :user="note.user"/>
 			<div v-if="(!conversation) || replies.length > 0" class="line"></div>
@@ -19,7 +19,7 @@
 					<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 					<XCwButton v-model="showContent" :note="note"/>
 				</p>
-				<div v-show="note.cw == null || showContent" class="content" @click="router.push(notePage(note))">
+				<div v-show="note.cw == null || showContent" class="content">
 					<MkSubNoteContent class="text" :note="note" :detailed="true" :parentId="note.parentId" :conversation="conversation"/>
 				</div>
 			</div>
@@ -68,6 +68,14 @@ const props = withDefaults(defineProps<{
 
 let showContent = $ref(false);
 const replies: misskey.entities.Note[] = props.conversation?.filter(item => item.replyId === props.note.id || item.renoteId === props.note.id).reverse() ?? [];
+
+function noteClick(e) {
+	if (document.getSelection().type === 'Range') {
+		e.stopPropagation();
+	} else {
+		router.push(notePage(props.note))
+	}
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index cc89bc809..0176f7c80 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -88,7 +88,6 @@ html._themeChanging_ {
 html, body {
 	margin: 0;
 	padding: 0;
-	scroll-behavior: smooth;
 }
 
 a {

From 887673ecdd3593b954769d935f79b546039da213 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 19:59:00 -0700
Subject: [PATCH 242/582] refactor: nyaize on the frontend

---
 packages/backend/src/models/repositories/note.ts            | 5 ++---
 packages/client/src/components/MkPostForm.vue               | 5 +++++
 packages/{backend/src/misc => client/src/scripts}/nyaize.ts | 0
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename packages/{backend/src/misc => client/src/scripts}/nyaize.ts (100%)

diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index 882cfdd31..ca284b923 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -12,7 +12,6 @@ import {
 	Channels,
 } from "../index.js";
 import type { Packed } from "@/misc/schema.js";
-import { nyaize } from "@/misc/nyaize.js";
 import { awaitAll } from "@/prelude/await-all.js";
 import {
 	convertLegacyReaction,
@@ -263,7 +262,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 				: {}),
 		});
 
-		if (packed.user.isCat && packed.text) {
+		/* if (packed.user.isCat && packed.text) {
 			const tokens = packed.text ? mfm.parse(packed.text) : [];
 			mfm.inspect(tokens, (node) => {
 				if (node.type === "text") {
@@ -272,7 +271,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 				}
 			});
 			packed.text = mfm.toString(tokens);
-		}
+		} */
 
 		return packed;
 	},
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 7ce990b21..f72423d13 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -91,6 +91,7 @@ import { instance } from '@/instance';
 import { $i, getAccounts, openAccountMenu as openAccountMenu_ } from '@/account';
 import { uploadFile } from '@/scripts/upload';
 import { deepClone } from '@/scripts/clone';
+import { nyaize } from '@/scripts/nyaize';
 import XCheatSheet from '@/components/MkCheatSheetDialog.vue';
 
 const modal = inject('modal');
@@ -582,6 +583,10 @@ async function post() {
 		}
 	}
 
+	if ($i?.isCat) {
+		postData.text = nyaize(`${postData.text}`);
+	}
+
 	let token = undefined;
 
 	if (postAccount) {
diff --git a/packages/backend/src/misc/nyaize.ts b/packages/client/src/scripts/nyaize.ts
similarity index 100%
rename from packages/backend/src/misc/nyaize.ts
rename to packages/client/src/scripts/nyaize.ts

From 82c9428b458bbb90233bc908119e51bce72a7506 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 20:02:14 -0700
Subject: [PATCH 243/582] fix: :bug: can't send blank messages

Closes #9661
---
 packages/client/src/pages/messaging/messaging-room.form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue
index 18f2ba7a3..4e7fa30a6 100644
--- a/packages/client/src/pages/messaging/messaging-room.form.vue
+++ b/packages/client/src/pages/messaging/messaging-room.form.vue
@@ -57,7 +57,7 @@ const typing = throttle(3000, () => {
 });
 
 let draftKey = $computed(() => props.user ? 'user:' + props.user.id : 'group:' + props.group?.id);
-let canSend = $computed(() => (text != null && text !== '') || file != null);
+let canSend = $computed(() => (text != null && text.trim() !== '') || file != null);
 
 watch([$$(text), $$(file)], saveDraft);
 

From 7420f6ce568376fa1a82be72026fdc4d664dacc4 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 20:03:49 -0700
Subject: [PATCH 244/582] validate blank messages on backend

---
 .../src/server/api/endpoints/messaging/messages/create.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
index 99d392ce4..03d762e97 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
@@ -151,7 +151,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// テキストが無いかつ添付ファイルも無かったらエラー
-	if (ps.text == null && file == null) {
+	if ((ps.text == null || ps.text.trim() === '') && file == null) {
 		throw new ApiError(meta.errors.contentRequired);
 	}
 

From 8250c146463f5bb056a9004c468b0a952590e696 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 20:15:49 -0700
Subject: [PATCH 245/582] fix: make sure cw button is on new line

---
 packages/client/src/components/MkNote.vue         | 1 +
 packages/client/src/components/MkNoteDetailed.vue | 3 ++-
 packages/client/src/components/MkNoteSimple.vue   | 1 +
 packages/client/src/components/MkNoteSub.vue      | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 1ed23b3ff..b9e741749 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -42,6 +42,7 @@
 			<div class="body">
 				<p v-if="appearNote.cw != null" class="cw">
 					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :custom-emojis="appearNote.emojis" :i="$i"/>
+					<br/>
 					<XCwButton v-model="showContent" :note="appearNote"/>
 				</p>
 				<div v-show="appearNote.cw == null || showContent" class="content" :class="{ collapsed, isLong }">
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 03e9e728b..96c82ea6c 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -48,8 +48,9 @@
 		</header>
 		<div class="main">
 			<div class="body">
-				<p v-if="appearNote.cw != null" class="cw">
+				< v-if="appearNote.cw != null" class="cw">
 					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+					<br/>
 					<XCwButton v-model="showContent" :note="appearNote"/>
 				</p>
 				<div v-show="appearNote.cw == null || showContent" class="content">
diff --git a/packages/client/src/components/MkNoteSimple.vue b/packages/client/src/components/MkNoteSimple.vue
index 031c7313f..dad1bf97d 100644
--- a/packages/client/src/components/MkNoteSimple.vue
+++ b/packages/client/src/components/MkNoteSimple.vue
@@ -6,6 +6,7 @@
 		<div class="body">
 			<p v-if="note.cw != null" class="cw">
 				<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
+				<br/>
 				<XCwButton v-model="showContent" :note="note"/>
 			</p>
 			<div v-show="note.cw == null || showContent" class="content">
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 6c46946a6..4c6edf46e 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -17,6 +17,7 @@
 						<i class="ph-quotes ph-bold ph-lg"></i>
 					</MkA>
 					<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
+					<br/>
 					<XCwButton v-model="showContent" :note="note"/>
 				</p>
 				<div v-show="note.cw == null || showContent" class="content">

From ea9efcc81a3540c80b1825487a4c714dc2fb1cd0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 19 Mar 2023 20:19:40 -0700
Subject: [PATCH 246/582] typo

---
 packages/client/src/components/MkNoteDetailed.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 96c82ea6c..260886ff2 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -48,11 +48,11 @@
 		</header>
 		<div class="main">
 			<div class="body">
-				< v-if="appearNote.cw != null" class="cw">
+				<div v-if="appearNote.cw != null" class="cw">
 					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 					<br/>
 					<XCwButton v-model="showContent" :note="appearNote"/>
-				</p>
+				</div>
 				<div v-show="appearNote.cw == null || showContent" class="content">
 					<div class="text">
 						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>

From 3a39ea7588ecefc71114268b8cdd182e50ad9cc3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 20 Mar 2023 12:28:40 -0700
Subject: [PATCH 247/582] cl

---
 CALCKEY.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 415c55e86..525bccf28 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -3,21 +3,17 @@
 ## Planned
 
 - Stucture
-  - [Sonic](https://crates.io/crates/sonic-server) support as an ElasticSearch alternative
   - [DragonflyDB](https://dragonflydb.io/) support as a Redis alternative
   - Optionally use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes
   - Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum)
 - Function
   - Federate with note edits
-  - Admin customizable max note length (100-8000)
   - User "choices" (recommended users) like Mastodon and Soapbox
   - Join Reason system like Mastodon/Pleroma
   - Option to publicize instance blocks
-  - Backfill remote users
   - Build flag to remove NSFW/AI stuff
   - Timeline filters
   - Filter notifications by user
-  - Non-nyaify cat mode
   - Exclude self from antenna
 - Form
   - MFM button
@@ -37,6 +33,7 @@
 - Admin custom CSS
 - Add back time machine (jump to date)
 - Improve accesibility
+- Non-nyaify cat mode
 
 ## Implemented
 

From a4107d01a80e657251f35fba632c62d4e5950801 Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Mon, 20 Mar 2023 20:26:05 +0000
Subject: [PATCH 248/582] note-improvements (#9739)

fixes #9735, translations, plus other tweaks

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9739
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 packages/client/src/components/MkLink.vue     |   2 +-
 packages/client/src/components/MkNote.vue     |  72 +++++++-
 .../client/src/components/MkNoteFooter.vue    | 164 -----------------
 packages/client/src/components/MkNoteSub.vue  | 169 +++++++++++++++++-
 .../src/components/MkSubNoteContent.vue       |  12 +-
 packages/client/src/components/global/MkA.vue |   2 +-
 packages/client/src/pages/note.vue            |   2 +-
 7 files changed, 244 insertions(+), 179 deletions(-)
 delete mode 100644 packages/client/src/components/MkNoteFooter.vue

diff --git a/packages/client/src/components/MkLink.vue b/packages/client/src/components/MkLink.vue
index 307e6bec2..753628489 100644
--- a/packages/client/src/components/MkLink.vue
+++ b/packages/client/src/components/MkLink.vue
@@ -1,6 +1,6 @@
 <template>
 <component :is="self ? 'MkA' : 'a'" ref="el" class="xlcxczvw _link" :[attr]="self ? url.substr(local.length) : url" :rel="rel" :target="target"
-	:title="url"
+	:title="url" @click.stop
 >
 	<slot></slot>
 	<i v-if="target === '_blank'" class="ph-arrow-square-out ph-bold ph-lg icon"></i>
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index b9e741749..852eb48b5 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -72,7 +72,28 @@
 				</div>
 				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`" @click.stop><i class="ph-television ph-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
 			</div>
-			<MkNoteFooter :note="appearNote"></MkNoteFooter>
+			<footer ref="el" class="footer" @click.stop>
+				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
+				<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
+					<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
+					<template v-if="appearNote.repliesCount > 0">
+						<p class="count">{{ appearNote.repliesCount }}</p>
+					</template>
+				</button>
+				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
+				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
+				<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
+					<i class="ph-smiley ph-bold ph-lg"></i>
+				</button>
+				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
+					<i class="ph-minus ph-bold ph-lg"></i>
+				</button>
+				<XQuoteButton class="button" :note="appearNote"/>
+				<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
+					<i class="ph-dots-three-outline ph-bold ph-lg"></i>
+				</button>
+			</footer>
+			<!-- <MkNoteFooter :note="appearNote"></MkNoteFooter> -->
 		</div>
 	</article>
 </div>
@@ -97,9 +118,11 @@ import XNoteHeader from '@/components/MkNoteHeader.vue';
 import XNoteSimple from '@/components/MkNoteSimple.vue';
 import XMediaList from '@/components/MkMediaList.vue';
 import XCwButton from '@/components/MkCwButton.vue';
-import MkNoteFooter from '@/components/MkNoteFooter.vue';
 import XPoll from '@/components/MkPoll.vue';
 import XRenoteButton from '@/components/MkRenoteButton.vue';
+import XReactionsViewer from '@/components/MkReactionsViewer.vue';
+import XStarButton from '@/components/MkStarButton.vue';
+import XQuoteButton from '@/components/MkQuoteButton.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkVisibility from '@/components/MkVisibility.vue';
 import { pleaseLogin } from '@/scripts/please-login';
@@ -149,6 +172,7 @@ const isRenote = (
 
 const el = ref<HTMLElement>();
 const menuButton = ref<HTMLElement>();
+const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
 const renoteTime = ref<HTMLElement>();
 const reactButton = ref<HTMLElement>();
@@ -206,6 +230,14 @@ function react(viaKeyboard = false): void {
 	});
 }
 
+function undoReact(note): void {
+	const oldReaction = note.myReaction;
+	if (!oldReaction) return;
+	os.api('notes/reactions/delete', {
+		noteId: note.id,
+	});
+}
+
 const currentClipPage = inject<Ref<misskey.entities.Clip> | null>('currentClipPage', null);
 
 function onContextmenu(ev: MouseEvent): void {
@@ -578,8 +610,44 @@ function readPromo() {
 					font-size: 80%;
 				}
 			}
+			> .footer {
+				position: relative;
+				z-index: 2;
+				display: flex;
+				flex-wrap: wrap;
+				pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
+
+				> .button {
+					margin: 0;
+					padding: 8px;
+					opacity: 0.7;
+					flex-grow: 1;
+					max-width: 3.5em;
+					width: max-content;
+					min-width: max-content;
+					pointer-events: all;
+					transition: opacity .2s;
+					&:first-of-type {
+						margin-left: -.5em;
+					}
+					&:hover {
+						color: var(--fgHighlighted);
+					}
+
+					> .count {
+						display: inline;
+						margin: 0 0 0 8px;
+						opacity: 0.7;
+					}
+
+					&.reacted {
+						color: var(--accent);
+					}
+				}
+			}
 		}
 	}
+	
 
 	> .reply {
 		border-top: solid 0.5px var(--divider);
diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
deleted file mode 100644
index 579cfcb07..000000000
--- a/packages/client/src/components/MkNoteFooter.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-	<footer ref="el" class="footer" @click.stop>
-		<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-		<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
-			<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
-			<template v-if="directReplies > 0">
-				<p class="count">{{ directReplies }}</p>
-			</template>
-			<template v-else-if="appearNote.repliesCount > 0">
-				<p class="count">{{ appearNote.repliesCount }}</p>
-			</template>
-		</button>
-		<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
-		<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
-		<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
-			<i class="ph-smiley ph-bold ph-lg"></i>
-		</button>
-		<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
-			<i class="ph-minus ph-bold ph-lg"></i>
-		</button>
-		<XQuoteButton class="button" :note="appearNote"/>
-		<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
-			<i class="ph-dots-three-outline ph-bold ph-lg"></i>
-		</button>
-	</footer>
-</template>
-
-<script lang="ts" setup>
-import { inject, ref } from 'vue';
-import type { Ref } from 'vue';
-import type * as misskey from 'calckey-js';
-import XReactionsViewer from '@/components/MkReactionsViewer.vue';
-import XStarButton from '@/components/MkStarButton.vue';
-import XRenoteButton from '@/components/MkRenoteButton.vue';
-import XQuoteButton from '@/components/MkQuoteButton.vue';
-import { pleaseLogin } from '@/scripts/please-login';
-import * as os from '@/os';
-import { reactionPicker } from '@/scripts/reaction-picker';
-import { i18n } from '@/i18n';
-import { getNoteMenu } from '@/scripts/get-note-menu';
-import { deepClone } from '@/scripts/clone';
-import { useNoteCapture } from '@/scripts/use-note-capture';
-
-
-const props = defineProps<{
-	note: misskey.entities.Note;
-	directReplies;
-}>();
-
-let note = $ref(deepClone(props.note));
-
-const isRenote = (
-	note.renote != null &&
-	note.text == null &&
-	note.fileIds.length === 0 &&
-	note.poll == null
-);
-
-const el = ref<HTMLElement>();
-const menuButton = ref<HTMLElement>();
-const starButton = ref<InstanceType<typeof XStarButton>>();
-const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
-const reactButton = ref<HTMLElement>();
-let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note : note);
-const isDeleted = ref(false);
-const translation = ref(null);
-const translating = ref(false);
-
-useNoteCapture({
-	rootEl: el,
-	note: $$(appearNote),
-	isDeletedRef: isDeleted,
-});
-
-
-function reply(viaKeyboard = false): void {
-	pleaseLogin();
-	os.post({
-		reply: appearNote,
-		animation: !viaKeyboard,
-	}, () => {
-		focus();
-	});
-}
-
-function react(viaKeyboard = false): void {
-	pleaseLogin();
-	blur();
-	reactionPicker.show(reactButton.value, reaction => {
-		os.api('notes/reactions/create', {
-			noteId: appearNote.id,
-			reaction: reaction,
-		});
-	}, () => {
-		focus();
-	});
-}
-
-function undoReact(note): void {
-	const oldReaction = note.myReaction;
-	if (!oldReaction) return;
-	os.api('notes/reactions/delete', {
-		noteId: note.id,
-	});
-}
-
-const currentClipPage = inject<Ref<misskey.entities.Clip> | null>('currentClipPage', null);
-
-
-function menu(viaKeyboard = false): void {
-	os.popupMenu(getNoteMenu({ note: note, translating, translation, menuButton, isDeleted, currentClipPage }), menuButton.value, {
-		viaKeyboard,
-	}).then(focus);
-}
-
-function focus() {
-	el.value.focus();
-}
-
-function blur() {
-	el.value.blur();
-}
-
-
-</script>
-
-
-<style lang="scss" scoped>
-.footer {
-	position: relative;
-	z-index: 2;
-	display: flex;
-	flex-wrap: wrap;
-	pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
-
-	> .button {
-		margin: 0;
-		padding: 8px;
-		opacity: 0.7;
-		flex-grow: 1;
-		max-width: 3.5em;
-		width: max-content;
-		min-width: max-content;
-		pointer-events: all;
-		transition: opacity .2s;
-		&:first-of-type {
-			margin-left: -.5em;
-		}
-		&:hover {
-			color: var(--fgHighlighted);
-		}
-
-		> .count {
-			display: inline;
-			margin: 0 0 0 8px;
-			opacity: 0.7;
-		}
-
-		&.reacted {
-			color: var(--accent);
-		}
-	}
-}
-</style>
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 4c6edf46e..5b9d4b33a 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -1,5 +1,9 @@
 <template>
-<div v-size="{ max: [450, 500] }" class="wrpstxzv" :class="{ children: depth > 1, singleStart: replies.length == 1, firstColumn: depth == 1 && conversation }">
+<div ref="el" 
+	v-size="{ max: [450, 500] }"
+	class="wrpstxzv"
+	:class="{ children: depth > 1, singleStart: replies.length == 1, firstColumn: depth == 1 && conversation }"
+>
 	<div v-if="conversation && depth > 1" class="line"></div>
 	<div class="main" @click="noteClick">
 		<div class="avatar-container">
@@ -23,8 +27,36 @@
 				<div v-show="note.cw == null || showContent" class="content">
 					<MkSubNoteContent class="text" :note="note" :detailed="true" :parentId="note.parentId" :conversation="conversation"/>
 				</div>
+				<div v-if="translating || translation" class="translation">
+					<MkLoading v-if="translating" mini/>
+					<div v-else class="translated">
+						<b>{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: </b>
+						<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+					</div>
+				</div>
 			</div>
-			<MkNoteFooter :note="note" :directReplies="replies.length"></MkNoteFooter>
+			<footer class="footer" @click.stop>
+				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
+				<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
+					<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
+					<template v-if="appearNote.repliesCount > 0">
+						<p class="count">{{ appearNote.repliesCount }}</p>
+					</template>
+				</button>
+				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
+				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
+				<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
+					<i class="ph-smiley ph-bold ph-lg"></i>
+				</button>
+				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
+					<i class="ph-minus ph-bold ph-lg"></i>
+				</button>
+				<XQuoteButton class="button" :note="appearNote"/>
+				<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
+					<i class="ph-dots-three-outline ph-bold ph-lg"></i>
+				</button>
+			</footer>
+			<!-- <MkNoteFooter :note="note" :directReplies="replies.length"></MkNoteFooter> -->
 		</div>
 	</div>
 	<template v-if="conversation">
@@ -43,16 +75,26 @@
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
+import { inject, ref } from 'vue';
+import type { Ref } from 'vue';
 import * as misskey from 'calckey-js';
 import XNoteHeader from '@/components/MkNoteHeader.vue';
 import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
+import XReactionsViewer from '@/components/MkReactionsViewer.vue';
+import XStarButton from '@/components/MkStarButton.vue';
+import XRenoteButton from '@/components/MkRenoteButton.vue';
+import XQuoteButton from '@/components/MkQuoteButton.vue';
 import XCwButton from '@/components/MkCwButton.vue';
-import MkNoteFooter from '@/components/MkNoteFooter.vue';
+import { pleaseLogin } from '@/scripts/please-login';
+import { getNoteMenu } from '@/scripts/get-note-menu';
 import { notePage } from '@/filters/note';
 import { useRouter } from '@/router';
 import * as os from '@/os';
+import { reactionPicker } from '@/scripts/reaction-picker';
 import { i18n } from '@/i18n';
+import { deepClone } from '@/scripts/clone';
+import { useNoteCapture } from '@/scripts/use-note-capture';
+
 
 const router = useRouter();
 
@@ -67,9 +109,81 @@ const props = withDefaults(defineProps<{
 	depth: 1,
 });
 
+let note = $ref(deepClone(props.note));
+
+const isRenote = (
+	note.renote != null &&
+	note.text == null &&
+	note.fileIds.length === 0 &&
+	note.poll == null
+);
+
+const el = ref<HTMLElement>();
+const menuButton = ref<HTMLElement>();
+const starButton = ref<InstanceType<typeof XStarButton>>();
+const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
+const reactButton = ref<HTMLElement>();
+let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note : note);
+const isDeleted = ref(false);
+const translation = ref(null);
+const translating = ref(false);
 let showContent = $ref(false);
 const replies: misskey.entities.Note[] = props.conversation?.filter(item => item.replyId === props.note.id || item.renoteId === props.note.id).reverse() ?? [];
 
+useNoteCapture({
+	rootEl: el,
+	note: $$(appearNote)
+});
+
+
+function reply(viaKeyboard = false): void {
+	pleaseLogin();
+	os.post({
+		reply: appearNote,
+		animation: !viaKeyboard,
+	}, () => {
+		focus();
+	});
+}
+
+function react(viaKeyboard = false): void {
+	pleaseLogin();
+	blur();
+	reactionPicker.show(reactButton.value, reaction => {
+		os.api('notes/reactions/create', {
+			noteId: appearNote.id,
+			reaction: reaction,
+		});
+	}, () => {
+		focus();
+	});
+}
+
+function undoReact(note): void {
+	const oldReaction = note.myReaction;
+	if (!oldReaction) return;
+	os.api('notes/reactions/delete', {
+		noteId: note.id,
+	});
+}
+
+const currentClipPage = inject<Ref<misskey.entities.Clip> | null>('currentClipPage', null);
+
+
+function menu(viaKeyboard = false): void {
+	os.popupMenu(getNoteMenu({ note: note, translating, translation, menuButton, isDeleted, currentClipPage }), menuButton.value, {
+		viaKeyboard,
+	}).then(focus);
+}
+
+function focus() {
+	el.value.focus();
+}
+
+function blur() {
+	el.value.blur();
+}
+
 function noteClick(e) {
 	if (document.getSelection().type === 'Range') {
 		e.stopPropagation();
@@ -125,7 +239,7 @@ function noteClick(e) {
 			}
 
 			> .body {
-				:deep(.reply-icon) {
+				.reply-icon {
 					display: inline-block;
 					border-radius: 6px;
 					padding: .2em .2em;
@@ -147,13 +261,53 @@ function noteClick(e) {
 						margin-right: 8px;
 					}
 				}
-
 				> .content {
 					> .text {
 						margin: 0;
 						padding: 0;
 					}
 				}
+				> .translation {
+					border: solid 0.5px var(--divider);
+					border-radius: var(--radius);
+					padding: 12px;
+					margin-top: 8px;
+				}
+			}
+			> .footer {
+				position: relative;
+				z-index: 2;
+				display: flex;
+				flex-wrap: wrap;
+				pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
+	
+				> .button {
+					margin: 0;
+					padding: 8px;
+					opacity: 0.7;
+					flex-grow: 1;
+					max-width: 3.5em;
+					width: max-content;
+					min-width: max-content;
+					pointer-events: all;
+					transition: opacity .2s;
+					&:first-of-type {
+						margin-left: -.5em;
+					}
+					&:hover {
+						color: var(--fgHighlighted);
+					}
+	
+					> .count {
+						display: inline;
+						margin: 0 0 0 8px;
+						opacity: 0.7;
+					}
+	
+					&.reacted {
+						color: var(--accent);
+					}
+				}
 			}
 		}
 	}
@@ -166,9 +320,6 @@ function noteClick(e) {
 		.avatar-container {
 			margin-right: 8px !important;
 		}
-		:deep(.footer) {
-			font-size: .9em;
-		}
 	}
 	> .reply, > .more {
 		margin-top: 10px;
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 3193834c9..abb0def32 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -69,12 +69,22 @@ const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : n
 	overflow-wrap: break-word;
 	
 	> .body {
-
 		> .rp {
 			margin-left: 4px;
 			font-style: oblique;
 			color: var(--renote);
 		}
+		.reply-icon {
+			display: inline-block;
+			border-radius: 6px;
+			padding: .2em .2em;
+			margin-right: .2em;
+			color: var(--accent);
+			transition: background .2s;
+			&:hover, &:focus {
+				background: var(--buttonHoverBg);
+			}
+		}
 	}
 
 	> .mk-url-preview {
diff --git a/packages/client/src/components/global/MkA.vue b/packages/client/src/components/global/MkA.vue
index 8133229df..a75cd3429 100644
--- a/packages/client/src/components/global/MkA.vue
+++ b/packages/client/src/components/global/MkA.vue
@@ -1,5 +1,5 @@
 <template>
-<a :href="to" :class="active ? activeClass : null" @click.prevent="nav" @contextmenu.prevent.stop="onContextmenu">
+<a :href="to" :class="active ? activeClass : null" @click.prevent="nav" @contextmenu.prevent.stop="onContextmenu" @click.stop>
 	<slot></slot>
 </a>
 </template>
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index 1baf1894f..5298194a6 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -1,7 +1,7 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="800" :marginMin="0">
+	<MkSpacer :content-max="800" :marginMin="6">
 		<div class="fcuexfpr">
 			<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
 				<div v-if="note" class="note">

From 138d329a60d92ee07eca6833f3c51d2557aea9e0 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Tue, 21 Mar 2023 08:24:02 +0900
Subject: [PATCH 249/582] fix: local time for users

---
 packages/client/src/pages/user/home.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 360bf77ba..a42bb0736 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -167,8 +167,8 @@ const timeForThem = $computed(() => {
 	const tzInfo = cityTimezones.lookupViaCity(props.user.location!.replace(/\s.*/,''));
 	if (tzInfo.length == 0) return "";
 	const tz = tzInfo[0].timezone;
-	const theirTime = new Date().toLocaleString("en-US", { timeZone: tz, hour12: true })
-	return ` (${theirTime.split(",")[1].trim().split(":")[0]} ${theirTime.split(" ")[1].slice(-2)})`
+	const theirTime = new Date().toLocaleString("en-US", { timeZone: tz, hour12: false });
+	return ` (${theirTime.split(",")[1].trim().split(":")[0]}:${theirTime.split(" ")[1].slice(-5,-3)})`;
 })
 
 function menu(ev) {

From 6fd932b5aeeec9b42318812db547951101e74bbf Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 20 Mar 2023 20:52:39 -0700
Subject: [PATCH 250/582] locale

---
 locales/en-US.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index f78d146d0..8da78d3b8 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1401,7 +1401,7 @@ _profile:
   metadataContent: "Content"
   changeAvatar: "Change avatar"
   changeBanner: "Change banner"
-  locationDescription: "If entered properly, this will display your local time to other users."
+  locationDescription: "If you enter your city, it will display your local time to other users."
 _exportOrImport:
   allNotes: "All posts"
   followingList: "Followed users"

From cca4156804ca89dacb06fdb015ffbe2947bd0fdd Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Tue, 21 Mar 2023 04:41:50 +0000
Subject: [PATCH 251/582] note-improvements (#9742)

Increases the limit of the replies loaded above the focused post from 10 to 30

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9742
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 packages/client/src/components/MkNoteDetailed.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 260886ff2..a06bac370 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -304,6 +304,7 @@ os.api('notes/children', {
 if (appearNote.replyId) {
 	os.api('notes/conversation', {
 		noteId: appearNote.replyId,
+		limit: 30,
 	}).then(res => {
 		conversation.value = res.reverse();
 		focus();

From b5130abc259a56e2e50aab177c8b2dda51da6a33 Mon Sep 17 00:00:00 2001
From: amy bones <amy@spookygirl.boo>
Date: Wed, 22 Mar 2023 02:10:43 -0700
Subject: [PATCH 252/582] fix: max user profile length to db field length

Resolves: #9749
---
 packages/backend/src/models/repositories/user.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index aa224b667..0bf31b1b3 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -66,7 +66,7 @@ const nameSchema = { type: "string", minLength: 1, maxLength: 50 } as const;
 const descriptionSchema = {
 	type: "string",
 	minLength: 1,
-	maxLength: 500,
+	maxLength: 2048,
 } as const;
 const locationSchema = { type: "string", minLength: 1, maxLength: 50 } as const;
 const birthdaySchema = {

From d8fe02042c1f0c7724133e8c3d8f4569d4ec360d Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 22 Mar 2023 14:40:50 +0100
Subject: [PATCH 253/582] allow client credentials not just for tapbots

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

diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 174aaf222..3f7f7c03c 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -174,7 +174,7 @@ mastoRouter.post("/oauth/token", async (ctx) => {
 	const body: any = ctx.request.body || ctx.request.query;
 	console.log('token-request', body);
 	console.log('token-query', ctx.request.query);
-	if (body.redirect_uri.startsWith('com.tapbots') && body.grant_type === 'client_credentials') {
+	if (body.grant_type === 'client_credentials') {
 		const ret = {
 			access_token: uuid(),
 			token_type: "Bearer",

From abfbb15feff7ef90a0eb27136d450d361b0bef08 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 22 Mar 2023 17:43:05 +0100
Subject: [PATCH 254/582] Masto api :)

---
 .../mastodon/ApiMastodonCompatibleService.ts  | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
index 9a690e19f..48eeec79c 100644
--- a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
+++ b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
@@ -61,4 +61,49 @@ export function apiMastodonCompatible(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
+
+	router.get("/v1/filters", async (ctx) => {
+		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+		const accessTokens = ctx.request.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens); // we are using this here, because in private mode some info isnt
+		// displayed without being logged in
+		try {
+			const data = await client.getFilters();
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
+
+	router.get("/v1/trends", async (ctx) => {
+		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+		const accessTokens = ctx.request.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens); // we are using this here, because in private mode some info isnt
+		// displayed without being logged in
+		try {
+			const data = await client.getInstanceTrends();
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
+
+	router.get("/v1/preferences", async (ctx) => {
+		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+		const accessTokens = ctx.request.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens); // we are using this here, because in private mode some info isnt
+		// displayed without being logged in
+		try {
+			const data = await client.getPreferences();
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
 }

From 55add2d7f691324366aa8afbfccb2a4f01b3df6e Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Wed, 22 Mar 2023 18:50:30 +0000
Subject: [PATCH 255/582] Allows ctrl+clicking internal links (#9603) (#9743)

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9743
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 packages/client/src/components/global/MkA.vue | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/global/MkA.vue b/packages/client/src/components/global/MkA.vue
index a75cd3429..661982787 100644
--- a/packages/client/src/components/global/MkA.vue
+++ b/packages/client/src/components/global/MkA.vue
@@ -1,5 +1,5 @@
 <template>
-<a :href="to" :class="active ? activeClass : null" @click.prevent="nav" @contextmenu.prevent.stop="onContextmenu" @click.stop>
+<a :href="to" :class="active ? activeClass : null" @click="nav" @contextmenu.prevent.stop="onContextmenu" @click.stop>
 	<slot></slot>
 </a>
 </template>
@@ -80,23 +80,27 @@ function popout() {
 }
 
 function nav(ev: MouseEvent) {
-	if (props.behavior === 'browser') {
-		location.href = props.to;
-		return;
-	}
+	if (!ev.ctrlKey) {
+		ev.preventDefault();
 
-	if (props.behavior) {
-		if (props.behavior === 'window') {
-			return openWindow();
-		} else if (props.behavior === 'modalWindow') {
-			return modalWindow();
+		if (props.behavior === 'browser') {
+			location.href = props.to;
+			return;
 		}
-	}
 
-	if (ev.shiftKey) {
-		return openWindow();
-	}
+		if (props.behavior) {
+			if (props.behavior === 'window') {
+				return openWindow();
+			} else if (props.behavior === 'modalWindow') {
+				return modalWindow();
+			}
+		}
 
-	router.push(props.to, ev.ctrlKey ? 'forcePage' : null);
+		if (ev.shiftKey) {
+			return openWindow();
+		}
+
+		router.push(props.to, ev.ctrlKey ? 'forcePage' : null);
+	}
 }
 </script>

From a23d554e7668fd6753549b5deb0b07606191f236 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 22 Mar 2023 11:54:09 -0700
Subject: [PATCH 256/582] fix: :bug: no nyaizing undefined text

Closes #9752
---
 packages/client/src/components/MkPostForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index f72423d13..e9d3de02f 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -583,7 +583,7 @@ async function post() {
 		}
 	}
 
-	if ($i?.isCat) {
+	if ($i?.isCat && (postData.text != null || postData.text!.length === 0)) {
 		postData.text = nyaize(`${postData.text}`);
 	}
 

From 92a8323f572b46ce609de4ca3308a45b1e6011d8 Mon Sep 17 00:00:00 2001
From: yawhn <kordaris@gmail.com>
Date: Tue, 21 Mar 2023 22:55:21 +0200
Subject: [PATCH 257/582] fix: a bug in ads

---
 .../client/src/components/global/MkAd.vue     | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/global/MkAd.vue b/packages/client/src/components/global/MkAd.vue
index bab9549eb..29639ca8d 100644
--- a/packages/client/src/components/global/MkAd.vue
+++ b/packages/client/src/components/global/MkAd.vue
@@ -1,21 +1,28 @@
 <template>
-<div v-if="chosen && defaultStore.state.showAds" class="qiivuoyo">
-	<div v-if="!showMenu" class="main" :class="chosen.place">
-		<a :href="chosen.url" target="_blank">
-			<img :src="chosen.imageUrl">
-			<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="ph-info ph-bold ph-lg info-circle"></span></button>
-		</a>
-	</div>
-	<div v-else class="menu">
-		<div class="body">
-			<div>Ads by {{ host }}</div>
-			<!--<MkButton class="button" primary>{{ i18n.ts._ad.like }}</MkButton>-->
-			<MkButton v-if="chosen.ratio !== 0" class="button" @click="reduceFrequency">{{ i18n.ts._ad.reduceFrequencyOfThisAd }}</MkButton>
-			<button class="_textButton" @click="toggleMenu">{{ i18n.ts._ad.back }}</button>
+	<div v-if="chosen && chosen.length > 0 && defaultStore.state.showAds" v-for="chosenItem in chosen" class="qiivuoyo">
+		<div v-if="!showMenu" class="main" :class="chosenItem.place">
+			<a :href="chosenItem.url" target="_blank">
+				<img :src="chosenItem.imageUrl">
+			</a>
 		</div>
 	</div>
-</div>
-<div v-else></div>
+	<div v-else-if="chosen && defaultStore.state.showAds" class="qiivuoyo">
+		<div v-if="!showMenu" class="main" :class="chosen.place">
+			<a :href="chosen.url" target="_blank">
+				<img :src="chosen.imageUrl">
+				<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="ph-info ph-bold ph-lg info-circle"></span></button>
+			</a>
+		</div>
+		<div v-else class="menu">
+			<div class="body">
+				<div>Ads by {{ host }}</div>
+				<!--<MkButton class="button" primary>{{ i18n.ts._ad.like }}</MkButton>-->
+				<MkButton v-if="chosen.ratio !== 0" class="button" @click="reduceFrequency">{{ i18n.ts._ad.reduceFrequencyOfThisAd }}</MkButton>
+				<button class="_textButton" @click="toggleMenu">{{ i18n.ts._ad.back }}</button>
+			</div>
+		</div>
+	</div>
+	<div v-else></div>
 </template>
 
 <script lang="ts" setup>

From 35cacf704eb8735b423a647a535a2347e8c2f88d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 22 Mar 2023 14:29:07 -0700
Subject: [PATCH 258/582] fix color in follow button

---
 packages/client/src/components/MkFollowButton.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index f7c199951..48fe686b1 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -149,7 +149,7 @@ onBeforeUnmount(() => {
 	height: 31px;
 	font-size: 16px;
 	border-radius: 32px;
-	background: var(--accentedBg);
+	background: var(--bg);
 
 	&.full {
 		padding: 0 8px 0 12px;

From 88295aad8f18b8e79c09bdc6477748c1b194c981 Mon Sep 17 00:00:00 2001
From: amy bones <amy@spookygirl.boo>
Date: Wed, 18 Jan 2023 20:16:41 -0800
Subject: [PATCH 259/582] fix: relay signature handling

A change sometime ago moved to setting some signature fields in the incoming
object to undefined as opposed to deleting them. The trouble is that downstream
code checks against existence, not undefinedness and rejects the message.

Resolves: #9665
---
 .../backend/src/remote/activitypub/misc/ld-signature.ts   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/misc/ld-signature.ts b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
index 0a4ec3a53..1657597ab 100644
--- a/packages/backend/src/remote/activitypub/misc/ld-signature.ts
+++ b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
@@ -70,13 +70,13 @@ export class LdSignature {
 			...options,
 			"@context": "https://w3id.org/identity/v1",
 		};
-		transformedOptions["type"] = undefined;
-		transformedOptions["id"] = undefined;
-		transformedOptions["signatureValue"] = undefined;
+		delete transformedOptions["type"];
+		delete transformedOptions["id"];
+		delete transformedOptions["signatureValue"];
 		const canonizedOptions = await this.normalize(transformedOptions);
 		const optionsHash = this.sha256(canonizedOptions);
 		const transformedData = { ...data };
-		transformedData["signature"] = undefined;
+		delete transformedData["signature"];
 		const cannonidedData = await this.normalize(transformedData);
 		if (this.debug) console.debug(`cannonidedData: ${cannonidedData}`);
 		const documentHash = this.sha256(cannonidedData);

From ac935ac76437dc04eaa3fa84ccad40e19bc5a549 Mon Sep 17 00:00:00 2001
From: yawhn <yawhn@noreply.codeberg.org>
Date: Thu, 23 Mar 2023 16:02:37 +0000
Subject: [PATCH 260/582] feat: swap home timeline with social's functionality
 (#9597)

The Home timeline functionality is swapped with social's. Meaning that Home timeline now consists of followee's and local posts. Social from now on will contain only followee's posts. See more info in the attached ticket.

Some changes applied in english locales as well. Probably the rest of the languages need to be fixed though.

This PR closes the ticket: https://codeberg.org/calckey/calckey/issues/9552

Co-authored-by: yawhn <kordaris@gmail.com>
Co-authored-by: ThatOneCalculator <kainoa@t1c.dev>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9597
Co-authored-by: yawhn <yawhn@noreply.codeberg.org>
Co-committed-by: yawhn <yawhn@noreply.codeberg.org>
---
 locales/ar-SA.yml                             | 21 -----
 locales/bn-BD.yml                             | 21 -----
 locales/en-US.yml                             |  9 +-
 locales/sk-SK.yml                             | 21 -----
 locales/vi-VN.yml                             | 21 -----
 .../client/src/pages/settings/general.vue     |  8 ++
 .../pages/settings/preferences-backups.vue    |  1 +
 packages/client/src/pages/timeline.vue        | 89 +++++++++++++------
 packages/client/src/store.ts                  |  4 +
 9 files changed, 81 insertions(+), 114 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index fc29623dd..844cfb5d5 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -1027,27 +1027,6 @@ _time:
   minute: "د"
   hour: "سا"
   day: "ي"
-_tutorial:
-  title: "How to use Calckey"
-  step1_1: "Welcome!"
-  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step2_1: "First, please fill out your profile."
-  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step3_1: "Now time to follow some people!"
-  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step4_1: "Let's get you out there."
-  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step5_1: "Timelines, timelines everywhere!"
-  step5_2: "Your instance has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "So, what is this place?"
-  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step6_4: "Now go, explore, and have fun!"
 _2fa:
   alreadyRegistered: "سجلت سلفًا جهازًا للاستيثاق بعاملين."
   registerDevice: "سجّل جهازًا جديدًا"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index 3ed6e53aa..8a9358e2a 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -1108,27 +1108,6 @@ _time:
   minute: "মিনিট"
   hour: "ঘণ্টা"
   day: "দিন"
-_tutorial:
-  title: "How to use Calckey"
-  step1_1: "Welcome!"
-  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step2_1: "First, please fill out your profile."
-  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step3_1: "Now time to follow some people!"
-  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step4_1: "Let's get you out there."
-  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step5_1: "Timelines, timelines everywhere!"
-  step5_2: "Your instance has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "So, what is this place?"
-  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step6_4: "Now go, explore, and have fun!"
 _2fa:
   alreadyRegistered: "আপনি ইতিমধ্যে একটি 2-ফ্যাক্টর অথেনটিকেশন ডিভাইস নিবন্ধন করেছেন৷"
   registerDevice: "নতুন ডিভাইস নিবন্ধন করুন"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 8da78d3b8..ee0025cb9 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -849,6 +849,9 @@ overridedDeviceKind: "Device type"
 smartphone: "Smartphone"
 tablet: "Tablet"
 auto: "Auto"
+showLocalPosts: "Show local posts in:"
+homeTimeline: "Home Timeline"
+socialTimeline: "Social Timeline"
 themeColor: "Instance Ticker Color"
 size: "Size"
 numberOfColumn: "Number of columns"
@@ -1240,10 +1243,10 @@ _tutorial:
   step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
   step5_1: "Timelines, timelines everywhere!"
   step5_2: "Your instance has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
+  step5_3: "The Home {icon} timeline is where you can see posts from the accounts you follow and from everyone else on this instance. If you prefer your Home timeline to only display posts from accounts you follow, you can easily change this in Settings!"
   step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_6: "The Social {icon} timeline is your home + local."
+  step5_5: "The Social {icon} timeline is where you can see posts only from the accounts you follow."
+  step5_6: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
   step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
   step6_1: "So, what is this place?"
   step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index ced0d67b7..3f8a4b7b9 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1174,27 +1174,6 @@ _time:
   minute: "min"
   hour: "hod"
   day: "dní"
-_tutorial:
-  title: "How to use Calckey"
-  step1_1: "Welcome!"
-  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step2_1: "First, please fill out your profile."
-  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step3_1: "Now time to follow some people!"
-  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step4_1: "Let's get you out there."
-  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step5_1: "Timelines, timelines everywhere!"
-  step5_2: "Your instance has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "So, what is this place?"
-  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step6_4: "Now go, explore, and have fun!"
 _2fa:
   alreadyRegistered: "Už ste zaregistrovali 2-faktorové autentifikačné zariadenie."
   registerDevice: "Registrovať nové zariadenie"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 4f38b80c8..48ef4e323 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1179,27 +1179,6 @@ _time:
   minute: "phút"
   hour: "giờ"
   day: "ngày"
-_tutorial:
-  title: "How to use Calckey"
-  step1_1: "Welcome!"
-  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step2_1: "First, please fill out your profile."
-  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step3_1: "Now time to follow some people!"
-  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step4_1: "Let's get you out there."
-  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step5_1: "Timelines, timelines everywhere!"
-  step5_2: "Your instance has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "So, what is this place?"
-  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step6_4: "Now go, explore, and have fun!"
 _2fa:
   alreadyRegistered: "Bạn đã đăng ký thiết bị xác minh 2 bước."
   registerDevice: "Đăng ký một thiết bị"
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 5df37c958..1e18b7aa6 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -20,6 +20,12 @@
 		<option value="desktop"><i class="ph-desktop ph-bold ph-lg"/> {{ i18n.ts.desktop }}</option>
 	</FormRadios>
 
+	<FormRadios v-model="showLocalPostsInTimeline" class="_formBlock">
+		<template #label>{{ i18n.ts.showLocalPosts }}</template>
+		<option value="home"><i class="ph-house ph-bold ph-lg"/> {{ i18n.ts.homeTimeline }}</option>
+		<option value="social"><i class="ph-handshake ph-bold ph-lg"/> {{ i18n.ts.socialTimeline }}</option>
+	</FormRadios>
+
 	<FormSwitch v-model="showFixedPostForm" class="_formBlock">{{ i18n.ts.showFixedPostForm }}</FormSwitch>
 
 	<FormSection>
@@ -127,6 +133,7 @@ async function reloadAsk() {
 }
 
 const overridedDeviceKind = computed(defaultStore.makeGetterSetter('overridedDeviceKind'));
+const showLocalPostsInTimeline = computed(defaultStore.makeGetterSetter('showLocalPostsInTimeline'));
 const serverDisconnectedBehavior = computed(defaultStore.makeGetterSetter('serverDisconnectedBehavior'));
 const reduceAnimation = computed(defaultStore.makeGetterSetter('animation', v => !v, v => !v));
 const useBlurEffectForModal = computed(defaultStore.makeGetterSetter('useBlurEffectForModal'));
@@ -183,6 +190,7 @@ watch([
 	showGapBetweenNotesInTimeline,
 	instanceTicker,
 	overridedDeviceKind,
+	showLocalPostsInTimeline,
 	showAds,
 	showUpdates,
 	swipeOnDesktop,
diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index 9340b4440..62ad029f3 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -55,6 +55,7 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'widgets',
 	'tl',
 	'overridedDeviceKind',
+	'showLocalPostsInTimeline',
 	'serverDisconnectedBehavior',
 	'nsfw',
 	'showAds',
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index a3d272e4d..5a5e51ec6 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -94,17 +94,27 @@ const keymap = {
 	t: focus,
 };
 
-let timelines = ['home'];
+let timelines = [];
+
+if (isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home') {
+	timelines.push('social');
+} else {
+	timelines.push('home');
+}
 
 if (isLocalTimelineAvailable) {
 	timelines.push('local');
 }
+
+if (isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home') {
+	timelines.push('home');
+} else if (isLocalTimelineAvailable) {
+	timelines.push('social');
+}
+
 if (isRecommendedTimelineAvailable) {
 	timelines.push('recommended');
 }
-if (isLocalTimelineAvailable) {
-	timelines.push('social');
-}
 if (isGlobalTimelineAvailable) {
 	timelines.push('global');
 }
@@ -220,13 +230,26 @@ const headerActions = $computed(() => [
 }*/,
 ]);
 
+// Swap home timeline with social's functionality
+
 const headerTabs = $computed(() => [
-	{
-		key: 'home',
-		title: i18n.ts._timelines.home,
-		icon: 'ph-house ph-bold ph-lg',
-		iconOnly: true,
-	},
+	...(isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home'
+		? [
+			{
+				key: 'social',
+				title: i18n.ts._timelines.home,
+				icon: 'ph-house ph-bold ph-lg',
+				iconOnly: true,
+			},
+		]
+		: [
+			{
+				key: 'home',
+				title: i18n.ts._timelines.home,
+				icon: 'ph-house ph-bold ph-lg',
+				iconOnly: true,
+			}
+		]),
 	...(isLocalTimelineAvailable
 		? [
 			{
@@ -237,6 +260,24 @@ const headerTabs = $computed(() => [
 			},
 		]
 		: []),
+	...(isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home'
+		? [
+			{
+				key: 'home',
+				title: i18n.ts._timelines.social,
+				icon: 'ph-handshake ph-bold ph-lg',
+				iconOnly: true,
+			},
+		]
+		: isLocalTimelineAvailable ? [
+ 			{
+				key: 'social',
+				title: i18n.ts._timelines.social,
+				icon: 'ph-handshake ph-bold ph-lg',
+				iconOnly: true,
+			},
+		]
+		: []),
 	...(isRecommendedTimelineAvailable
 		? [
 			{
@@ -247,16 +288,6 @@ const headerTabs = $computed(() => [
 			},
 		]
 		: []),
-	...(isLocalTimelineAvailable
-		? [
-			{
-				key: 'social',
-				title: i18n.ts._timelines.social,
-				icon: 'ph-handshake ph-bold ph-lg',
-				iconOnly: true,
-			},
-		]
-		: []),
 	...(isGlobalTimelineAvailable
 		? [
 			{
@@ -275,13 +306,17 @@ definePageMetadata(
 		icon:
 			src === 'local'
 				? 'ph-users ph-bold ph-lg'
-				: src === 'social'
-					? 'ph-handshake ph-bold ph-lg'
-					: src === 'recommended'
-						? 'ph-thumbs-up ph-bold ph-lg'
-						: src === 'global'
-							? 'ph-planet ph-bold ph-lg'
-							: 'ph-house ph-bold ph-lg',
+				: src === 'social' && defaultStore.state.showLocalPostsInTimeline === 'home'
+					? 'ph-house ph-bold ph-lg'
+					: src === 'social'
+						? 'ph-handshake ph-bold ph-lg'
+						: src === 'recommended'
+							? 'ph-thumbs-up ph-bold ph-lg'
+							: src === 'global'
+								? 'ph-planet ph-bold ph-lg'
+								: src === 'home' && defaultStore.state.showLocalPostsInTimeline === 'home'
+									? 'ph-handshake ph-bold ph-lg'
+									: 'ph-house ph-bold ph-lg',
 	})),
 );
 
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 0e23ae1b7..6c0398ac4 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -133,6 +133,10 @@ export const defaultStore = markRaw(
 			where: "device",
 			default: null as null | "smartphone" | "tablet" | "desktop",
 		},
+		showLocalPostsInTimeline: {
+			where: "device",
+			default: "home" as "home" | "social",
+		},
 		serverDisconnectedBehavior: {
 			where: "device",
 			default: "nothing" as "nothing" | "quiet" | "reload" | "dialog",

From ae9ba9b2c370c050ee0c8f41b7e68df850248802 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 09:06:32 -0700
Subject: [PATCH 261/582] Revert "refactor: nyaize on the frontend"

This reverts commit aff90b3ef225e5d4453469b36b7bf3a8565c7a68.
---
 packages/{client/src/scripts => backend/src/misc}/nyaize.ts | 0
 packages/backend/src/models/repositories/note.ts            | 5 +++--
 packages/client/src/components/MkPostForm.vue               | 5 -----
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename packages/{client/src/scripts => backend/src/misc}/nyaize.ts (100%)

diff --git a/packages/client/src/scripts/nyaize.ts b/packages/backend/src/misc/nyaize.ts
similarity index 100%
rename from packages/client/src/scripts/nyaize.ts
rename to packages/backend/src/misc/nyaize.ts
diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index ca284b923..882cfdd31 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -12,6 +12,7 @@ import {
 	Channels,
 } from "../index.js";
 import type { Packed } from "@/misc/schema.js";
+import { nyaize } from "@/misc/nyaize.js";
 import { awaitAll } from "@/prelude/await-all.js";
 import {
 	convertLegacyReaction,
@@ -262,7 +263,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 				: {}),
 		});
 
-		/* if (packed.user.isCat && packed.text) {
+		if (packed.user.isCat && packed.text) {
 			const tokens = packed.text ? mfm.parse(packed.text) : [];
 			mfm.inspect(tokens, (node) => {
 				if (node.type === "text") {
@@ -271,7 +272,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 				}
 			});
 			packed.text = mfm.toString(tokens);
-		} */
+		}
 
 		return packed;
 	},
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index e9d3de02f..7ce990b21 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -91,7 +91,6 @@ import { instance } from '@/instance';
 import { $i, getAccounts, openAccountMenu as openAccountMenu_ } from '@/account';
 import { uploadFile } from '@/scripts/upload';
 import { deepClone } from '@/scripts/clone';
-import { nyaize } from '@/scripts/nyaize';
 import XCheatSheet from '@/components/MkCheatSheetDialog.vue';
 
 const modal = inject('modal');
@@ -583,10 +582,6 @@ async function post() {
 		}
 	}
 
-	if ($i?.isCat && (postData.text != null || postData.text!.length === 0)) {
-		postData.text = nyaize(`${postData.text}`);
-	}
-
 	let token = undefined;
 
 	if (postAccount) {

From ffe08465bdcef22cd01ba92242ba7a9c87663481 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 14:43:21 -0700
Subject: [PATCH 262/582] feat: add sonic to docker

---
 docker-compose.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f51cf1b9a..5de14d0c8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     depends_on:
       - db
       - redis
-#      - es
+      - sonic
     ports:
       - "3000:3000"
     networks:
@@ -40,16 +40,14 @@ services:
     volumes:
       - ./db:/var/lib/postgresql/data
 
-#  es:
-#   restart: unless-stopped
-#   image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2
-#   environment:
-#      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-#      - "TAKE_FILE_OWNERSHIP=111"
-#    networks:
-#      - calcnet
-#    volumes:
-#      - ./elasticsearch:/usr/share/elasticsearch/data
+  sonic:
+    restart: unless-stopped
+    image: docker.io/valeriansaliou/sonic:v1.4.0
+    networks:
+      - calcnet
+    volumes:
+      - ./sonic:/var/lib/sonic/store
+      - ./sonic/config.cfg:/etc/sonic.cfg
 
 networks:
   calcnet:

From 65a47f61446a82e9abc16285bdc2eaf24f09cc95 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 14:45:33 -0700
Subject: [PATCH 263/582] docs: sonic

---
 .config/example.yml | 20 ++++++++++----------
 docs/docker.md      |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index b7b56f228..3f0ce4031 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -62,16 +62,6 @@ redis:
   #prefix: example-prefix
   #db: 1
 
-#   ┌─────────────────────────────┐
-#───┘ Elasticsearch configuration └─────────────────────────────
-
-#elasticsearch:
-#  host: localhost
-#  port: 9200
-#  ssl: false
-#  user: 
-#  pass: 
-
 #   ┌─────────────────────┐
 #───┘ Sonic configuration └─────────────────────────────────────
 
@@ -82,6 +72,16 @@ redis:
 #  collection: notes
 #  bucket: default
 
+#   ┌─────────────────────────────┐
+#───┘ Elasticsearch configuration └─────────────────────────────
+
+#elasticsearch:
+#  host: localhost
+#  port: 9200
+#  ssl: false
+#  user: 
+#  pass: 
+
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
 
diff --git a/docs/docker.md b/docs/docker.md
index 1119b34f1..8c42ee54d 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -14,7 +14,7 @@ There is a `docker-compose.yml` in the root of the project that you can use to b
 
 Rename the files:
 
-`cp .config/default_example.yml .config/default.yml`
+`cp .config/example.yml .config/default.yml`
 
 `cp .config/example.env .config/docker.env`
 
@@ -23,6 +23,7 @@ You can configure `docker.env` with anything you like, but you will have to pay
 - `url` should be set to the URL you will be hosting the web interface for the instance at.
 - `host`, `db`, `user`, `pass` will have to be configured in the `PostgreSQL configuration` section - `host` is the name of the postgres container (eg: *calckey_db_1*), and the others should match your `docker.env`.
 - `host`will need to be configured in the *Redis configuration* section - it is the name of the redis container (eg: *calckey_redis_1*)
+- `auth` will need to be configured in the *Sonic* section - cannot be the default `SecretPassword`
 
 Everything else can be left as-is.
 

From 99ad96bc7adf9df7aceac721424adb7969d2c051 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 14:45:57 -0700
Subject: [PATCH 264/582] dev 14

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 003972b3b..96391d537 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev13",
+	"version": "13.2.0-dev14",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@7.29.3",
+	"packageManager": "pnpm@7.30.1",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",

From 21061b680383a1429b2c74fa4ad87489192810a9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 16:16:14 -0700
Subject: [PATCH 265/582] feat: masto api add display name

---
 packages/backend/src/server/api/mastodon/endpoints/account.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index ae8f9a786..9f4070f2d 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -32,6 +32,7 @@ export function apiAccountMastodon(router: Router): void {
 			const data = await client.verifyAccountCredentials();
 			let acct = data.data;
 			acct.id = convertId(acct.id, IdType.MastodonId);
+			acct.display_name = acct.display_name || acct.username;
 			acct.url = `${BASE_URL}/@${acct.url}`;
 			acct.note = acct.note || "";
 			acct.avatar_static = acct.avatar;

From 9fa73242a06ca6cfb6dcb7d17ce38f8aa0f25126 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 16:20:21 -0700
Subject: [PATCH 266/582] chore: :package: upgrade megalodon

---
 packages/backend/package.json | 2 +-
 pnpm-lock.yaml                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index e7bec1a22..a34e24fda 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -81,7 +81,7 @@
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
-		"@calckey/megalodon": "5.1.21",
+		"@calckey/megalodon": "5.1.22",
 		"mfm-js": "0.23.2",
 		"mime-types": "2.1.35",
 		"multer": "1.4.4-lts.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 37bc6c805..6833c6459 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -55,7 +55,7 @@ importers:
       '@bull-board/api': ^4.6.4
       '@bull-board/koa': ^4.6.4
       '@bull-board/ui': ^4.6.4
-      '@calckey/megalodon': 5.1.21
+      '@calckey/megalodon': 5.1.22
       '@discordapp/twemoji': 14.0.2
       '@elastic/elasticsearch': 7.17.0
       '@koa/cors': 3.4.3
@@ -225,7 +225,7 @@ importers:
       '@bull-board/api': 4.10.2
       '@bull-board/koa': 4.10.2_6tybghmia4wsnt33xeid7y4rby
       '@bull-board/ui': 4.10.2
-      '@calckey/megalodon': 5.1.21
+      '@calckey/megalodon': 5.1.22
       '@discordapp/twemoji': 14.0.2
       '@elastic/elasticsearch': 7.17.0
       '@koa/cors': 3.4.3
@@ -763,8 +763,8 @@ packages:
       '@bull-board/api': 4.10.2
     dev: false
 
-  /@calckey/megalodon/5.1.21:
-    resolution: {integrity: sha512-wThdyNb/UofklvYzyeFNQwxJNHqaSLD+z0glQLzV1tmAvSB0EZOL0D15dvpdB0LED0Q2rpJlwaonejkTI9JQhA==}
+  /@calckey/megalodon/5.1.22:
+    resolution: {integrity: sha512-/wJ4XPyTL2RXGj7Tawy6uT3Imlh78zwpse6xf+m6loZXlpROxdSKJTq87+ffmAJHDoS6gHPTOfYdIxE699oTww==}
     engines: {node: '>=15.0.0'}
     dependencies:
       '@types/oauth': 0.9.1

From 8d1c7c787c205a4a6ccd756d39d95c8986e5baf3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 18:03:33 -0700
Subject: [PATCH 267/582] feat: :sparkles: post metadata uses full @

Closes #9660
---
 packages/backend/src/server/web/views/note.pug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug
index 25eac0942..476d42d9e 100644
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@@ -2,7 +2,7 @@ extends ./base
 
 block vars
 	- const user = note.user;
-	- const title = privateMode ? instanceName : (user.name ? `${user.name} (@${user.username})` : `@${user.username}`);
+	- const title = privateMode ? instanceName : (user.name ? `${user.name} (@${user.username}${user.host ? `@${user.host}` : ''})` : `@${user.username}`);
 	- const url = `${config.url}/notes/${note.id}`;
 	- const isRenote = note.renote && note.text == null && note.fileIds.length == 0 && note.poll == null;
 	- const isImage = note.files.length !== 0 && note.files[0].type.startsWith('image');

From f68f7415ab19e52de7f828394d557436c2c18166 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 24 Mar 2023 06:32:09 +0000
Subject: [PATCH 268/582] chore: update patron list

---
 patrons.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/patrons.json b/patrons.json
index b6c9747e6..46f630b97 100644
--- a/patrons.json
+++ b/patrons.json
@@ -17,6 +17,7 @@
 		"@surfbum@surfzone.nz",
 		"@topher@mastodon.online",
 		"@hanicef@stop.voring.me",
+		"@trapezial@calckey.jp",
 		"Interkosmos Link"
 	]
 }

From ba64c1523183e47143d93c0ea28d05e533decb85 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 23:51:59 -0700
Subject: [PATCH 269/582] feat: new chat button on mobile

---
 packages/client/src/ui/universal.vue | 43 ++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 37296451e..8c7651231 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -47,6 +47,7 @@
 	</div>
 
 	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'index'" ref="postButton" class="postButton button post _button" @click="os.post()"><i class="ph-pencil ph-bold ph-lg"></i></button>
+	<button v-if="isMobile && mainRouter.currentRoute.value.name === '/my/messaging'" ref="chatButton" class="postButton button post _button" @click="messagingStart()"><i class="ph-user-plus ph-bold ph-lg"></i></button>
 
 	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
 		<div
@@ -81,6 +82,7 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, provide, onMounted, computed, ref } from 'vue';
 import XCommon from './_common_/common.vue';
+import * as Acct from 'calckey-js/built/acct';
 import type { ComputedRef } from 'vue';
 import type { PageMetadata } from '@/scripts/page-metadata';
 import { instanceName } from '@/config';
@@ -115,6 +117,7 @@ const drawerMenuShowing = ref(false);
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 const widgetsEl = $ref<HTMLElement>();
 const postButton = $ref<HTMLElement>();
+const chatButton = $ref<HTMLElement>();
 const widgetsShowing = $ref(false);
 
 provide('router', mainRouter);
@@ -173,6 +176,46 @@ if (defaultStore.state.widgets.length === 0) {
 	}]);
 }
 
+function messagingStart(ev) {
+	os.popupMenu([{
+		text: i18n.ts.messagingWithUser,
+		icon: 'ph-user ph-bold ph-lg',
+		action: () => { startUser(); },
+	}, {
+		text: i18n.ts.messagingWithGroup,
+		icon: 'ph-users-three ph-bold ph-lg',
+		action: () => { startGroup(); },
+	}], ev.currentTarget ?? ev.target);
+}
+
+
+async function startUser(): void {
+	os.selectUser().then(user => {
+		mainRouter.push(`/my/messaging/${Acct.toString(user)}`);
+	});
+}
+
+async function startGroup(): void {
+	const groups1 = await os.api('users/groups/owned');
+	const groups2 = await os.api('users/groups/joined');
+	if (groups1.length === 0 && groups2.length === 0) {
+		os.alert({
+			type: 'warning',
+			title: i18n.ts.youHaveNoGroups,
+			text: i18n.ts.joinOrCreateGroup,
+		});
+		return;
+	}
+	const { canceled, result: group } = await os.select({
+		title: i18n.ts.group,
+		items: groups1.concat(groups2).map(group => ({
+			value: group, text: group.name,
+		})),
+	});
+	if (canceled) return;
+	router.push(`/my/messaging/group/${group.id}`);
+}
+
 onMounted(() => {
 	if (!isDesktop.value) {
 		window.addEventListener('resize', () => {

From 7a4e6705656b4652511436a2484e4aafe32f7f86 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 23 Mar 2023 23:59:42 -0700
Subject: [PATCH 270/582] console log

---
 packages/client/src/ui/universal.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 8c7651231..7047dfe72 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -47,7 +47,7 @@
 	</div>
 
 	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'index'" ref="postButton" class="postButton button post _button" @click="os.post()"><i class="ph-pencil ph-bold ph-lg"></i></button>
-	<button v-if="isMobile && mainRouter.currentRoute.value.name === '/my/messaging'" ref="chatButton" class="postButton button post _button" @click="messagingStart()"><i class="ph-user-plus ph-bold ph-lg"></i></button>
+	<button v-if="isMobile && mainRouter.currentRoute.value.name === '/my/messaging'" ref="postButton" class="postButton button post _button" @click="messagingStart()"><i class="ph-user-plus ph-bold ph-lg"></i></button>
 
 	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
 		<div
@@ -117,7 +117,6 @@ const drawerMenuShowing = ref(false);
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 const widgetsEl = $ref<HTMLElement>();
 const postButton = $ref<HTMLElement>();
-const chatButton = $ref<HTMLElement>();
 const widgetsShowing = $ref(false);
 
 provide('router', mainRouter);
@@ -259,7 +258,7 @@ function top() {
 }
 
 const wallpaper = localStorage.getItem('wallpaper') != null;
-
+console.log(mainRouter.currentRoute.value.name);
 </script>
 
 <style lang="scss" scoped>

From 759cd90d5400462b4bbb59a089b50e1ebc6908d2 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 24 Mar 2023 07:02:19 +0000
Subject: [PATCH 271/582] chore: update patrons

---
 patrons.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/patrons.json b/patrons.json
index 46f630b97..d12f5af12 100644
--- a/patrons.json
+++ b/patrons.json
@@ -17,6 +17,7 @@
 		"@surfbum@surfzone.nz",
 		"@topher@mastodon.online",
 		"@hanicef@stop.voring.me",
+		"@nmkj@calckey.jp",
 		"@trapezial@calckey.jp",
 		"Interkosmos Link"
 	]

From a5de287cb87d4569a0c0f3be6ce2716fc96d71b0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 24 Mar 2023 00:04:00 -0700
Subject: [PATCH 272/582] fix

---
 packages/client/src/ui/universal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 7047dfe72..42ce45b78 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -47,7 +47,7 @@
 	</div>
 
 	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'index'" ref="postButton" class="postButton button post _button" @click="os.post()"><i class="ph-pencil ph-bold ph-lg"></i></button>
-	<button v-if="isMobile && mainRouter.currentRoute.value.name === '/my/messaging'" ref="postButton" class="postButton button post _button" @click="messagingStart()"><i class="ph-user-plus ph-bold ph-lg"></i></button>
+	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'messaging'" ref="postButton" class="postButton button post _button" @click="messagingStart()"><i class="ph-user-plus ph-bold ph-lg"></i></button>
 
 	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
 		<div

From ed4baf9aedfbf910924441b14f788fab7c7093d2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 24 Mar 2023 00:34:13 -0700
Subject: [PATCH 273/582] fix

---
 packages/client/src/ui/universal.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 42ce45b78..bd95f7131 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -47,7 +47,7 @@
 	</div>
 
 	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'index'" ref="postButton" class="postButton button post _button" @click="os.post()"><i class="ph-pencil ph-bold ph-lg"></i></button>
-	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'messaging'" ref="postButton" class="postButton button post _button" @click="messagingStart()"><i class="ph-user-plus ph-bold ph-lg"></i></button>
+	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'messaging'" ref="postButton" class="postButton button post _button" @click="messagingStart"><i class="ph-user-plus ph-bold ph-lg"></i></button>
 
 	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
 		<div
@@ -184,6 +184,10 @@ function messagingStart(ev) {
 		text: i18n.ts.messagingWithGroup,
 		icon: 'ph-users-three ph-bold ph-lg',
 		action: () => { startGroup(); },
+	}, {
+		text: i18n.ts.manageGroups,
+		icon: 'ph-user-circle-gear ph-bold ph-lg',
+		action: () => { mainRouter.push('/my/groups'); },
 	}], ev.currentTarget ?? ev.target);
 }
 
@@ -212,7 +216,7 @@ async function startGroup(): void {
 		})),
 	});
 	if (canceled) return;
-	router.push(`/my/messaging/group/${group.id}`);
+	mainRouter.push(`/my/messaging/group/${group.id}`);
 }
 
 onMounted(() => {

From 2497c5b4f60934dce2bcc79374e1d9ed0a054025 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 24 Mar 2023 00:42:36 -0700
Subject: [PATCH 274/582] don't show buttons if mobile

---
 packages/client/src/pages/messaging/index.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 17ed9e721..b2fed66de 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -13,7 +13,7 @@
 			>
 				<swiper-slide>
 					<div class="_content yweeujhr dms">
-						<MkButton primary class="start" @click="startUser"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
+						<MkButton primary class="start" v-if="!isMobile" @click="startUser"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
 						<MkPagination v-slot="{items}" :pagination="dmsPagination">
 							<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block" :message="message"/>
 						</MkPagination>
@@ -21,7 +21,7 @@
 				</swiper-slide>
 				<swiper-slide>
 					<div class="_content yweeujhr groups">
-						<div class="groupsbuttons">
+						<div v-if="!isMobile" class="groupsbuttons">
 							<MkButton primary class="start" :link="true" to="/my/groups"><i class="ph-user-circle-gear ph-bold ph-lg"></i> {{ i18n.ts.manageGroups }}</MkButton>
 							<MkButton primary class="start" @click="startGroup"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
 						</div>
@@ -37,7 +37,7 @@
 </template>
 
 <script lang="ts" setup>
-import { markRaw, onMounted, onUnmounted, watch } from 'vue';
+import { ref, markRaw, onMounted, onUnmounted, watch } from 'vue';
 import * as Acct from 'calckey-js/built/acct';
 import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
@@ -64,6 +64,12 @@ const tabs = ['dms', 'groups'];
 let tab = $ref(tabs[0]);
 watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
 
+const MOBILE_THRESHOLD = 500;
+const isMobile = ref(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD);
+window.addEventListener('resize', () => {
+	isMobile.value = deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD;
+});
+
 const headerActions = $computed(() => [{
 	asFullButton: true,
 	icon: 'ph-plus ph-bold ph-lg',

From 7111b5cbdbeedb1830c63987a73dd53a85a90889 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.a-ef.org>
Date: Fri, 24 Mar 2023 06:55:23 -0400
Subject: [PATCH 275/582] fix callback url

---
 packages/client/src/pages/auth.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/auth.vue b/packages/client/src/pages/auth.vue
index 4ad7d08c6..34508610c 100644
--- a/packages/client/src/pages/auth.vue
+++ b/packages/client/src/pages/auth.vue
@@ -88,8 +88,10 @@ export default defineComponent({
 			const getUrlParams = () => window.location.search.substring(1).split('&').reduce((result, query) => { const [k, v] = query.split('='); result[k] = decodeURI(v); return result; }, {});
 			const isMastodon = !!getUrlParams().mastodon
 			if (this.session.app.callbackUrl && isMastodon) {
-				const stateParam = !!getUrlParams().state ? `&state=$(getUrlParams().state)` : ''; 
-				location.href = `${this.session.app.callbackUrl}?code=${this.session.token}${stateParam}`;
+				const callbackUrl = new URL(this.session.app.callbackUrl);
+				callbackUrl.searchParams.append("code", this.session.token);
+				if (!!getUrlParams().state) callbackUrl.searchParams.append("state", getUrlParams().state);
+				location.href = callbackUrl.toString();
 			} else if (this.session.app.callbackUrl) {
 				const url = new URL(this.session.app.callbackUrl);
 				if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:'].includes(url.protocol)) throw new Error('invalid url');

From b5a35488bc8d5bbe6f0172142df032edd6004fcf Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.a-ef.org>
Date: Thu, 23 Mar 2023 19:16:10 -0400
Subject: [PATCH 276/582] fix japanese locale

---
 locales/ja-JP.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 59bf28d5a..67bf18b56 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -849,6 +849,9 @@ overridedDeviceKind: "デバイスタイプ"
 smartphone: "スマートフォン"
 tablet: "タブレット"
 auto: "自動"
+showLocalPosts: "ローカルの投稿を表示する場所"
+homeTimeline: "ホームタイムライン"
+socialTimeline: "ソーシャルタイムライン"
 themeColor: "テーマカラー"
 size: "サイズ"
 numberOfColumn: "列の数"
@@ -1240,10 +1243,10 @@ _tutorial:
   step4_2: "最初は{introduction}に投稿したり、シンプルに「こんにちは、アカウント作ってみました！」などの投稿をする人もいます。"
   step5_1: "タイムライン、タイムラインだらけ！"
   step5_2: "あなたのインスタンスでは{timelines}種類のタイムラインが有効になっています。"
-  step5_3: "ホーム{icon}タイムラインでは、あなたがフォローしているアカウントの投稿を見ることができます。"
+  step5_3: "ホーム{icon}タイムラインでは、あなたがフォローしているアカウントとこのインスタンスのみんなの投稿を見ることができます。もしフォローしているアカウントの投稿だけ見たい場合は、設定から変更できます。"
   step5_4: "ローカル{icon}タイムラインでは、このインスタンスのみんなの投稿を見ることができます。"
-  step5_5: "おすすめ{icon}タイムラインでは、管理人がおすすめするインスタンスの投稿を見ることができます。"
-  step5_6: "ソーシャル{icon}タイムラインでは、ホームタイムラインとローカルタイムラインの投稿を同時に見ることができます。"
+  step5_5: "ソーシャル{icon}タイムラインでは、あなたがフォローしているアカウントの投稿を見ることができます。"
+  step5_6: "おすすめ{icon}タイムラインでは、管理人がおすすめするインスタンスの投稿を見ることができます。"
   step5_7: "グローバル{icon}タイムラインでは、接続している他のすべてのインスタンスからの投稿を見ることができます。"
   step6_1: "じゃあ、ここはどんな場所なの？"
   step6_2: "実は、あなたはただCalckeyに参加しただけではありません。ここは、何千もの相互接続されたサーバーが構成する Fediverse への入口です。各サーバーは「インスタンス」と呼ばれます。"

From bf358a2fb37a2fd3b8a981971ae3387daef50e60 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 24 Mar 2023 12:45:25 -0700
Subject: [PATCH 277/582] dev15

---
 package.json                  | 2 +-
 packages/backend/package.json | 2 +-
 pnpm-lock.yaml                | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 96391d537..6aa6fa649 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev14",
+	"version": "13.2.0-dev15",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index a34e24fda..1c26d32c3 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -81,7 +81,7 @@
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
-		"@calckey/megalodon": "5.1.22",
+		"@calckey/megalodon": "5.1.23",
 		"mfm-js": "0.23.2",
 		"mime-types": "2.1.35",
 		"multer": "1.4.4-lts.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6833c6459..15744bca1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -55,7 +55,7 @@ importers:
       '@bull-board/api': ^4.6.4
       '@bull-board/koa': ^4.6.4
       '@bull-board/ui': ^4.6.4
-      '@calckey/megalodon': 5.1.22
+      '@calckey/megalodon': 5.1.23
       '@discordapp/twemoji': 14.0.2
       '@elastic/elasticsearch': 7.17.0
       '@koa/cors': 3.4.3
@@ -225,7 +225,7 @@ importers:
       '@bull-board/api': 4.10.2
       '@bull-board/koa': 4.10.2_6tybghmia4wsnt33xeid7y4rby
       '@bull-board/ui': 4.10.2
-      '@calckey/megalodon': 5.1.22
+      '@calckey/megalodon': 5.1.23
       '@discordapp/twemoji': 14.0.2
       '@elastic/elasticsearch': 7.17.0
       '@koa/cors': 3.4.3
@@ -763,8 +763,8 @@ packages:
       '@bull-board/api': 4.10.2
     dev: false
 
-  /@calckey/megalodon/5.1.22:
-    resolution: {integrity: sha512-/wJ4XPyTL2RXGj7Tawy6uT3Imlh78zwpse6xf+m6loZXlpROxdSKJTq87+ffmAJHDoS6gHPTOfYdIxE699oTww==}
+  /@calckey/megalodon/5.1.23:
+    resolution: {integrity: sha512-08/1e1q4D/6d2hYoBU6zyLXIj2cCC8/aYc1QKueGV02wGhJcOJ5Ceu01d8wGyt0bOzOmy+MIOy/1Ms3dARx2qg==}
     engines: {node: '>=15.0.0'}
     dependencies:
       '@types/oauth': 0.9.1

From 00fffc10681c6d679cf17b540a5509cf9ce5279a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 24 Mar 2023 12:46:09 -0700
Subject: [PATCH 278/582] chore: bump pnpm

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

diff --git a/package.json b/package.json
index 6aa6fa649..20a755f20 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@7.30.1",
+	"packageManager": "pnpm@7.30.3",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",

From cdcd4320a920c20c8d7a27b6d5d4de18cf3bcf02 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 24 Mar 2023 13:14:41 -0700
Subject: [PATCH 279/582] fix?

---
 .../backend/src/server/api/mastodon/endpoints/status.ts  | 2 +-
 .../src/server/api/mastodon/endpoints/timeline.ts        | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index 38199740a..6494ad5a6 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -46,7 +46,7 @@ export function apiStatusMastodon(router: Router): void {
 				}
 			}
 			if (!body.media_ids) body.media_ids = undefined;
-			if (body.media_ids && !body.media_ids.length) body.media_ids = undefined;		             
+			if (body.media_ids && !body.media_ids.length) body.media_ids = undefined;
 			const { sensitive } = body
 			body.sensitive = typeof sensitive === 'string' ? sensitive === 'true' : sensitive
 			const data = await client.postStatus(text, body);
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index 23729e480..0393a206c 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -43,10 +43,11 @@ export function toTextWithReaction(status: Entity.Status[], host: string) {
 		for (const r of reaction) {
 				if (!r.url) continue
 				emoji.push({
-						'shortcode': r.name,
-						'url': r.url,
-						'static_url': r.url,
-						'visible_in_picker': true,
+					'shortcode': r.name,
+					'url': r.url,
+					'static_url': r.url,
+					'visible_in_picker': true,
+					category: ""
 				},)
 		}
 		const isMe = reaction.findIndex((r) => r.me) > -1;

From 23da34f495fa0c96069ac076e22565d246f0c3a1 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Sat, 25 Mar 2023 12:35:30 +0100
Subject: [PATCH 280/582] [PATCH] set workers to reduce their processing
 priority Authored-by: Kaitlyn Allan <kaitlyn.allan@enlabs.cloud>

---
 packages/backend/src/boot/index.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/backend/src/boot/index.ts b/packages/backend/src/boot/index.ts
index 4e1d94765..e4f2ed7b1 100644
--- a/packages/backend/src/boot/index.ts
+++ b/packages/backend/src/boot/index.ts
@@ -9,6 +9,7 @@ import { envOption } from "../env.js";
 import "reflect-metadata";
 import { masterMain } from "./master.js";
 import { workerMain } from "./worker.js";
+import os from "node:os";
 
 const logger = new Logger("core", "cyan");
 const clusterLogger = logger.createSubLogger("cluster", "orange", false);
@@ -31,6 +32,16 @@ export default async function () {
 		await workerMain();
 	}
 
+	if (cluster.isPrimary) {
+		// Leave the master process with a marginally lower priority but not too low.
+		os.setPriority(2);
+	}
+	if (cluster.isWorker) {
+		// Set workers to a much lower priority so that the master process will be
+		// able to respond to api calls even if the workers gank everything.
+		os.setPriority(10);
+	}
+
 	// For when Calckey is started in a child process during unit testing.
 	// Otherwise, process.send cannot be used, so start it.
 	if (process.send) {

From 89d59b5ea0877382c15a6737c45fcd99c22db653 Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Sun, 26 Mar 2023 03:33:44 +0000
Subject: [PATCH 281/582] note-improvements (#9768)

Fixes #9745, quote icon, note spacing adjustments, border radius's in noGap

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9768
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 .../src/components/MkDateSeparatedList.vue       |  7 +++++++
 packages/client/src/components/MkMention.vue     |  1 -
 packages/client/src/components/MkNote.vue        | 16 +++++-----------
 packages/client/src/components/MkNoteHeader.vue  |  4 ++--
 packages/client/src/components/MkNoteSub.vue     |  4 ++--
 packages/client/src/components/MkNotes.vue       |  1 +
 .../client/src/components/MkNotifications.vue    |  1 +
 .../client/src/components/MkSubNoteContent.vue   |  2 +-
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/packages/client/src/components/MkDateSeparatedList.vue b/packages/client/src/components/MkDateSeparatedList.vue
index e8896a2a2..41e7ac376 100644
--- a/packages/client/src/components/MkDateSeparatedList.vue
+++ b/packages/client/src/components/MkDateSeparatedList.vue
@@ -178,6 +178,13 @@ export default defineComponent({
 			border-radius: 0;
 			box-shadow: none;
 
+			&:first-child {
+				border-radius: var(--radius) var(--radius) 0 0;
+			}
+			&:last-child {
+				border-radius: 0 0 var(--radius) var(--radius);
+			}
+
 			&:not(:last-child) {
 				border-bottom: solid 0.5px var(--divider);
 			}
diff --git a/packages/client/src/components/MkMention.vue b/packages/client/src/components/MkMention.vue
index 4b2e0d518..2a7340421 100644
--- a/packages/client/src/components/MkMention.vue
+++ b/packages/client/src/components/MkMention.vue
@@ -47,7 +47,6 @@ const bgCss = bg.toRgbString();
 	border-radius: 999px;
 	max-width: 100%;
 	white-space: nowrap;
-	overflow: clip;
 	text-overflow: ellipsis;
 	color: var(--mention);
 
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 852eb48b5..c02e79d00 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -382,7 +382,6 @@ function readPromo() {
 			width: 0;
 			flex-grow: 1;
 			position: relative;
-			margin-bottom: -10px;
 			line-height: 28px;
 		}
 		> .line {
@@ -452,17 +451,13 @@ function readPromo() {
 				}
 			}
 		}
-
-		& + .article {
-			padding-top: 10px !important;
-		}
-
 	}
 
 	> .article {
-		padding: 28px 32px 16px;
+		padding: 4px 32px 10px;
 		cursor: pointer;
 
+
 		@media (pointer: coarse) {
 			cursor: default;
 		}
@@ -662,17 +657,16 @@ function readPromo() {
 		padding-top: 6px;
 		> .note-context {
 			padding-inline: 16px;
-			margin-top: 0;
+			margin-top: 8px;
 			> :not(.line) {
-				margin-top: 5px;
+				margin-top: 0px;
 			}
 			> .line {
 				margin-right: 10px;
 			}
 		}
 		> .article {
-			padding: 16px 16px 9px;
-
+			padding: 4px 16px 8px;
 			> .main > .header-container > .avatar {
 				margin-right: 10px;
 				// top: calc(14px + var(--stickyTop, 0px));
diff --git a/packages/client/src/components/MkNoteHeader.vue b/packages/client/src/components/MkNoteHeader.vue
index 0d0b2183d..6d55bcff5 100644
--- a/packages/client/src/components/MkNoteHeader.vue
+++ b/packages/client/src/components/MkNoteHeader.vue
@@ -56,7 +56,6 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
 	border-radius: 100px;
 	font-size: .8em;
 	text-shadow: 0 2px 2px var(--shadow);
-
 	> .avatar {
 		width: 3.7em;
 		height: 3.7em;
@@ -74,10 +73,11 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
 				width: 0;
 				overflow: hidden;
 				text-overflow: ellipsis;
+				gap: .1em 0;
 			}
 			&:last-child {
 				max-width: 50%;
-				gap: .2em .5em;
+				gap: .3em .5em;
 			}
 			.article > .main & {
 				display: flex;
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 5b9d4b33a..401d33ca8 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -17,7 +17,7 @@
 					<MkA v-if="note.replyId"  :to="`/notes/${note.replyId}`" class="reply-icon" @click.stop>
 						<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
 					</MkA>
-					<MkA v-if="conversation && note.renoteId && note.renoteId != parentId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
+					<MkA v-if="conversation && note.renoteId && note.renoteId != parentId && !note.replyId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
 						<i class="ph-quotes ph-bold ph-lg"></i>
 					</MkA>
 					<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
@@ -373,7 +373,7 @@ function noteClick(e) {
 	&.reply-to, &.reply-to-more {
 		padding-bottom: 0;
 		&:first-child {
-			padding-top: 30px;
+			padding-top: 24px;
 		}
 		.line::before {
 			margin-bottom: -16px;
diff --git a/packages/client/src/components/MkNotes.vue b/packages/client/src/components/MkNotes.vue
index a67b59d73..f1c8aab46 100644
--- a/packages/client/src/components/MkNotes.vue
+++ b/packages/client/src/components/MkNotes.vue
@@ -42,6 +42,7 @@ defineExpose({
 	&.noGap {
 		> .notes {
 			background: var(--panel);
+			border-radius: var(--radius);
 		}
 	}
 	&:not(.noGap) {
diff --git a/packages/client/src/components/MkNotifications.vue b/packages/client/src/components/MkNotifications.vue
index 1aa33e74d..a38c0e0b2 100644
--- a/packages/client/src/components/MkNotifications.vue
+++ b/packages/client/src/components/MkNotifications.vue
@@ -100,5 +100,6 @@ onUnmounted(() => {
 <style lang="scss" scoped>
 .elsfgstc {
 	background: var(--panel);
+	border-radius: var(--radius);
 }
 </style>
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index abb0def32..f58e9b763 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -6,7 +6,7 @@
 			<MkA v-if="note.replyId"  :to="`/notes/${note.replyId}`" class="reply-icon" @click.stop>
 				<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
 			</MkA>
-			<MkA v-if="conversation && note.renoteId && note.renoteId != parentId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
+			<MkA v-if="conversation && note.renoteId && note.renoteId != parentId && !note.replyId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
 				<i class="ph-quotes ph-bold ph-lg"></i>
 			</MkA>
 		</template>

From e696a13fb23fb10df1d8fba49b6f7a7b24b00030 Mon Sep 17 00:00:00 2001
From: Kaitlyn Allan <kaitlyn.allan@enlabs.cloud>
Date: Thu, 23 Mar 2023 17:12:41 +1000
Subject: [PATCH 282/582] set workers to reduce their processing priority

---
 packages/backend/src/boot/index.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/backend/src/boot/index.ts b/packages/backend/src/boot/index.ts
index 4e1d94765..e4f2ed7b1 100644
--- a/packages/backend/src/boot/index.ts
+++ b/packages/backend/src/boot/index.ts
@@ -9,6 +9,7 @@ import { envOption } from "../env.js";
 import "reflect-metadata";
 import { masterMain } from "./master.js";
 import { workerMain } from "./worker.js";
+import os from "node:os";
 
 const logger = new Logger("core", "cyan");
 const clusterLogger = logger.createSubLogger("cluster", "orange", false);
@@ -31,6 +32,16 @@ export default async function () {
 		await workerMain();
 	}
 
+	if (cluster.isPrimary) {
+		// Leave the master process with a marginally lower priority but not too low.
+		os.setPriority(2);
+	}
+	if (cluster.isWorker) {
+		// Set workers to a much lower priority so that the master process will be
+		// able to respond to api calls even if the workers gank everything.
+		os.setPriority(10);
+	}
+
 	// For when Calckey is started in a child process during unit testing.
 	// Otherwise, process.send cannot be used, so start it.
 	if (process.send) {

From f708786bbfa0b359559a3f8b216c678698e74f30 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 26 Mar 2023 00:37:11 -0700
Subject: [PATCH 283/582] pnpm 8!

---
 .npmrc         |    1 +
 package.json   |    2 +-
 pnpm-lock.yaml | 5579 ++++++++++++++++++++++++------------------------
 3 files changed, 2756 insertions(+), 2826 deletions(-)
 create mode 100644 .npmrc

diff --git a/.npmrc b/.npmrc
new file mode 100644
index 000000000..abb787e4c
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+use-lockfile-v6=true
diff --git a/package.json b/package.json
index 20a755f20..b110cfd68 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@7.30.3",
+	"packageManager": "pnpm@8.0.0-rc.1",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 15744bca1..c817abb81 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: 5.4
+lockfileVersion: '6.0'
 
 overrides:
   chokidar: ^3.3.1
@@ -6,582 +6,852 @@ overrides:
 importers:
 
   .:
-    specifiers:
-      '@bull-board/api': ^4.10.2
-      '@bull-board/ui': ^4.10.2
-      '@tensorflow/tfjs': ^3.21.0
-      '@types/gulp': 4.0.10
-      '@types/gulp-rename': 2.0.1
-      calckey-js: ^0.0.22
-      cross-env: 7.0.3
-      cypress: 10.11.0
-      execa: 5.1.1
-      gulp: 4.0.2
-      gulp-cssnano: 2.1.3
-      gulp-rename: 2.0.0
-      gulp-replace: 1.1.4
-      gulp-terser: 2.1.0
-      install-peers: ^1.0.4
-      js-yaml: 4.1.0
-      rome: ^11.0.0
-      seedrandom: ^3.0.5
-      start-server-and-test: 1.15.2
-      typescript: 4.9.4
     dependencies:
-      '@bull-board/api': 4.10.2
-      '@bull-board/ui': 4.10.2
-      '@tensorflow/tfjs': 3.21.0_seedrandom@3.0.5
-      calckey-js: 0.0.22
-      js-yaml: 4.1.0
-      seedrandom: 3.0.5
+      '@bull-board/api':
+        specifier: ^4.10.2
+        version: 4.10.2
+      '@bull-board/ui':
+        specifier: ^4.10.2
+        version: 4.10.2
+      '@tensorflow/tfjs':
+        specifier: ^3.21.0
+        version: 3.21.0(seedrandom@3.0.5)
+      calckey-js:
+        specifier: ^0.0.22
+        version: 0.0.22
+      js-yaml:
+        specifier: 4.1.0
+        version: 4.1.0
+      seedrandom:
+        specifier: ^3.0.5
+        version: 3.0.5
     devDependencies:
-      '@types/gulp': 4.0.10
-      '@types/gulp-rename': 2.0.1
-      cross-env: 7.0.3
-      cypress: 10.11.0
-      execa: 5.1.1
-      gulp: 4.0.2
-      gulp-cssnano: 2.1.3
-      gulp-rename: 2.0.0
-      gulp-replace: 1.1.4
-      gulp-terser: 2.1.0
-      install-peers: 1.0.4
-      rome: 11.0.0
-      start-server-and-test: 1.15.2
-      typescript: 4.9.4
+      '@types/gulp':
+        specifier: 4.0.10
+        version: 4.0.10
+      '@types/gulp-rename':
+        specifier: 2.0.1
+        version: 2.0.1
+      cross-env:
+        specifier: 7.0.3
+        version: 7.0.3
+      cypress:
+        specifier: 10.11.0
+        version: 10.11.0
+      execa:
+        specifier: 5.1.1
+        version: 5.1.1
+      gulp:
+        specifier: 4.0.2
+        version: 4.0.2
+      gulp-cssnano:
+        specifier: 2.1.3
+        version: 2.1.3
+      gulp-rename:
+        specifier: 2.0.0
+        version: 2.0.0
+      gulp-replace:
+        specifier: 1.1.4
+        version: 1.1.4
+      gulp-terser:
+        specifier: 2.1.0
+        version: 2.1.0
+      install-peers:
+        specifier: ^1.0.4
+        version: 1.0.4
+      rome:
+        specifier: ^11.0.0
+        version: 11.0.0
+      start-server-and-test:
+        specifier: 1.15.2
+        version: 1.15.2
+      typescript:
+        specifier: 4.9.4
+        version: 4.9.4
 
   packages/backend:
-    specifiers:
-      '@bull-board/api': ^4.6.4
-      '@bull-board/koa': ^4.6.4
-      '@bull-board/ui': ^4.6.4
-      '@calckey/megalodon': 5.1.23
-      '@discordapp/twemoji': 14.0.2
-      '@elastic/elasticsearch': 7.17.0
-      '@koa/cors': 3.4.3
-      '@koa/multer': 3.0.0
-      '@koa/router': 9.0.1
-      '@peertube/http-signature': 1.7.0
-      '@redocly/openapi-core': 1.0.0-beta.120
-      '@sinonjs/fake-timers': 9.1.2
-      '@swc/cli': ^0.1.59
-      '@swc/core': ^1.3.26
-      '@swc/core-android-arm64': 1.3.11
-      '@syuilo/aiscript': 0.11.1
-      '@tensorflow/tfjs': ^4.2.0
-      '@tensorflow/tfjs-node': 3.21.1
-      '@types/bcryptjs': 2.4.2
-      '@types/bull': 3.15.9
-      '@types/cbor': 6.0.0
-      '@types/escape-regexp': 0.0.1
-      '@types/fluent-ffmpeg': 2.1.20
-      '@types/js-yaml': 4.0.5
-      '@types/jsdom': 20.0.1
-      '@types/jsonld': 1.5.8
-      '@types/jsrsasign': 10.5.4
-      '@types/koa': 2.13.5
-      '@types/koa-bodyparser': 4.3.10
-      '@types/koa-cors': 0.0.2
-      '@types/koa-favicon': 2.0.21
-      '@types/koa-logger': 3.1.2
-      '@types/koa-mount': 4.0.2
-      '@types/koa-send': 4.1.3
-      '@types/koa-views': 7.0.0
-      '@types/koa__cors': 3.3.0
-      '@types/koa__multer': 2.0.4
-      '@types/koa__router': 8.0.11
-      '@types/mocha': 9.1.1
-      '@types/node': 18.11.18
-      '@types/node-fetch': 3.0.3
-      '@types/nodemailer': 6.4.7
-      '@types/oauth': 0.9.1
-      '@types/pug': 2.0.6
-      '@types/punycode': 2.1.0
-      '@types/qrcode': 1.5.0
-      '@types/qs': 6.9.7
-      '@types/random-seed': 0.3.3
-      '@types/ratelimiter': 3.4.4
-      '@types/redis': 4.0.11
-      '@types/rename': 1.0.4
-      '@types/sanitize-html': 2.8.0
-      '@types/semver': 7.3.13
-      '@types/sharp': 0.31.1
-      '@types/sinonjs__fake-timers': 8.1.2
-      '@types/speakeasy': 2.0.7
-      '@types/tinycolor2': 1.4.3
-      '@types/tmp': 0.2.3
-      '@types/uuid': 8.3.4
-      '@types/web-push': 3.3.2
-      '@types/websocket': 1.0.5
-      '@types/ws': 8.5.3
-      ajv: 8.11.2
-      archiver: 5.3.1
-      autobind-decorator: 2.4.0
-      autolinker: 4.0.0
-      autwh: 0.1.0
-      aws-sdk: 2.1277.0
-      axios: ^1.3.2
-      bcryptjs: 2.4.3
-      blurhash: 1.1.5
-      bull: 4.10.2
-      cacheable-lookup: 7.0.0
-      calckey-js: ^0.0.22
-      cbor: 8.1.0
-      chalk: 5.2.0
-      chalk-template: 0.4.0
-      chokidar: ^3.3.1
-      cli-highlight: 2.1.11
-      color-convert: 2.0.1
-      content-disposition: 0.5.4
-      cross-env: 7.0.3
-      date-fns: 2.29.3
-      deep-email-validator: 0.1.21
-      escape-regexp: 0.0.1
-      eslint: ^8.31.0
-      execa: 6.1.0
-      feed: 4.2.2
-      file-type: 17.1.6
-      fluent-ffmpeg: 2.1.2
-      got: 12.5.3
-      hpagent: 0.1.2
-      ioredis: 5.2.4
-      ip-cidr: 3.0.11
-      is-svg: 4.3.2
-      js-yaml: 4.1.0
-      jsdom: 20.0.3
-      json5: 2.2.3
-      json5-loader: 4.0.1
-      jsonld: 6.0.0
-      jsrsasign: 10.6.1
-      koa: 2.13.4
-      koa-body: ^6.0.1
-      koa-bodyparser: 4.3.0
-      koa-favicon: 2.1.0
-      koa-json-body: 5.3.0
-      koa-logger: 3.2.1
-      koa-mount: 4.0.0
-      koa-remove-trailing-slashes: 2.0.3
-      koa-send: 5.0.1
-      koa-slow: 2.1.0
-      koa-views: 7.0.2
-      mfm-js: 0.23.2
-      mime-types: 2.1.35
-      mocha: 10.2.0
-      multer: 1.4.4-lts.1
-      nested-property: 4.0.0
-      node-fetch: 3.3.0
-      nodemailer: 6.8.0
-      nsfwjs: 2.4.2
-      oauth: ^0.10.0
-      os-utils: 0.0.14
-      parse5: 7.1.2
-      pg: 8.8.0
-      private-ip: 2.3.4
-      probe-image-size: 7.2.3
-      promise-limit: 2.7.0
-      pug: 3.0.2
-      punycode: 2.1.1
-      pureimage: 0.3.15
-      qrcode: 1.5.1
-      qs: 6.9.7
-      random-seed: 0.3.0
-      ratelimiter: 3.4.1
-      re2: 1.18.0
-      redis-lock: 0.1.4
-      reflect-metadata: 0.1.13
-      rename: 1.0.4
-      rndstr: 1.0.0
-      rss-parser: 3.12.0
-      sanitize-html: 2.8.1
-      seedrandom: ^3.0.5
-      semver: 7.3.8
-      sharp: 0.31.3
-      sonic-channel: ^1.3.1
-      speakeasy: 2.0.0
-      strict-event-emitter-types: 2.0.0
-      stringz: 2.1.0
-      summaly: 2.7.0
-      swc-loader: ^0.2.3
-      syslog-pro: 1.0.0
-      systeminformation: 5.16.9
-      tesseract.js: ^3.0.3
-      tinycolor2: 1.5.2
-      tmp: 0.2.1
-      ts-loader: 9.4.2
-      ts-node: 10.9.1
-      tsconfig-paths: 4.1.2
-      twemoji-parser: 14.0.0
-      typeorm: 0.3.11
-      typescript: 4.9.4
-      ulid: 2.3.0
-      unzipper: 0.10.11
-      uuid: 9.0.0
-      web-push: 3.5.0
-      webpack: ^5.75.0
-      websocket: 1.0.34
-      ws: 8.11.0
-      xev: 3.0.2
     dependencies:
-      '@bull-board/api': 4.10.2
-      '@bull-board/koa': 4.10.2_6tybghmia4wsnt33xeid7y4rby
-      '@bull-board/ui': 4.10.2
-      '@calckey/megalodon': 5.1.23
-      '@discordapp/twemoji': 14.0.2
-      '@elastic/elasticsearch': 7.17.0
-      '@koa/cors': 3.4.3
-      '@koa/multer': 3.0.0_multer@1.4.4-lts.1
-      '@koa/router': 9.0.1
-      '@peertube/http-signature': 1.7.0
-      '@redocly/openapi-core': 1.0.0-beta.120
-      '@sinonjs/fake-timers': 9.1.2
-      '@syuilo/aiscript': 0.11.1
-      '@tensorflow/tfjs': 4.2.0_seedrandom@3.0.5
-      ajv: 8.11.2
-      archiver: 5.3.1
-      autobind-decorator: 2.4.0
-      autolinker: 4.0.0
-      autwh: 0.1.0
-      aws-sdk: 2.1277.0
-      axios: 1.3.2
-      bcryptjs: 2.4.3
-      blurhash: 1.1.5
-      bull: 4.10.2
-      cacheable-lookup: 7.0.0
-      calckey-js: 0.0.22
-      cbor: 8.1.0
-      chalk: 5.2.0
-      chalk-template: 0.4.0
-      chokidar: 3.5.3
-      cli-highlight: 2.1.11
-      color-convert: 2.0.1
-      content-disposition: 0.5.4
-      date-fns: 2.29.3
-      deep-email-validator: 0.1.21
-      escape-regexp: 0.0.1
-      feed: 4.2.2
-      file-type: 17.1.6
-      fluent-ffmpeg: 2.1.2
-      got: 12.5.3
-      hpagent: 0.1.2
-      ioredis: 5.2.4
-      ip-cidr: 3.0.11
-      is-svg: 4.3.2
-      js-yaml: 4.1.0
-      jsdom: 20.0.3
-      jsonld: 6.0.0
-      jsrsasign: 10.6.1
-      koa: 2.13.4
-      koa-body: 6.0.1
-      koa-bodyparser: 4.3.0
-      koa-favicon: 2.1.0
-      koa-json-body: 5.3.0
-      koa-logger: 3.2.1
-      koa-mount: 4.0.0
-      koa-remove-trailing-slashes: 2.0.3
-      koa-send: 5.0.1
-      koa-slow: 2.1.0
-      koa-views: 7.0.2_6tybghmia4wsnt33xeid7y4rby
-      mfm-js: 0.23.2
-      mime-types: 2.1.35
-      multer: 1.4.4-lts.1
-      nested-property: 4.0.0
-      node-fetch: 3.3.0
-      nodemailer: 6.8.0
-      nsfwjs: 2.4.2_@tensorflow+tfjs@4.2.0
-      oauth: 0.10.0
-      os-utils: 0.0.14
-      parse5: 7.1.2
-      pg: 8.8.0
-      private-ip: 2.3.4
-      probe-image-size: 7.2.3
-      promise-limit: 2.7.0
-      punycode: 2.1.1
-      pureimage: 0.3.15
-      qrcode: 1.5.1
-      qs: 6.9.7
-      random-seed: 0.3.0
-      ratelimiter: 3.4.1
-      re2: 1.18.0
-      redis-lock: 0.1.4
-      reflect-metadata: 0.1.13
-      rename: 1.0.4
-      rndstr: 1.0.0
-      rss-parser: 3.12.0
-      sanitize-html: 2.8.1
-      seedrandom: 3.0.5
-      semver: 7.3.8
-      sharp: 0.31.3
-      sonic-channel: 1.3.1
-      speakeasy: 2.0.0
-      stringz: 2.1.0
-      summaly: 2.7.0
-      syslog-pro: 1.0.0
-      systeminformation: 5.16.9
-      tesseract.js: 3.0.3_eslint@8.31.0
-      tinycolor2: 1.5.2
-      tmp: 0.2.1
-      twemoji-parser: 14.0.0
-      typeorm: 0.3.11_zfbzyadn2rnu3hf3pysto5crhm
-      ulid: 2.3.0
-      unzipper: 0.10.11
-      uuid: 9.0.0
-      web-push: 3.5.0
-      websocket: 1.0.34
-      xev: 3.0.2
+      '@bull-board/api':
+        specifier: ^4.6.4
+        version: 4.10.2
+      '@bull-board/koa':
+        specifier: ^4.6.4
+        version: 4.10.2(@types/koa@2.13.5)(pug@3.0.2)
+      '@bull-board/ui':
+        specifier: ^4.6.4
+        version: 4.10.2
+      '@calckey/megalodon':
+        specifier: 5.1.23
+        version: 5.1.23
+      '@discordapp/twemoji':
+        specifier: 14.0.2
+        version: 14.0.2
+      '@elastic/elasticsearch':
+        specifier: 7.17.0
+        version: 7.17.0
+      '@koa/cors':
+        specifier: 3.4.3
+        version: 3.4.3
+      '@koa/multer':
+        specifier: 3.0.0
+        version: 3.0.0(multer@1.4.4-lts.1)
+      '@koa/router':
+        specifier: 9.0.1
+        version: 9.0.1
+      '@peertube/http-signature':
+        specifier: 1.7.0
+        version: 1.7.0
+      '@redocly/openapi-core':
+        specifier: 1.0.0-beta.120
+        version: 1.0.0-beta.120
+      '@sinonjs/fake-timers':
+        specifier: 9.1.2
+        version: 9.1.2
+      '@syuilo/aiscript':
+        specifier: 0.11.1
+        version: 0.11.1
+      '@tensorflow/tfjs':
+        specifier: ^4.2.0
+        version: 4.2.0(seedrandom@3.0.5)
+      ajv:
+        specifier: 8.11.2
+        version: 8.11.2
+      archiver:
+        specifier: 5.3.1
+        version: 5.3.1
+      autobind-decorator:
+        specifier: 2.4.0
+        version: 2.4.0
+      autolinker:
+        specifier: 4.0.0
+        version: 4.0.0
+      autwh:
+        specifier: 0.1.0
+        version: 0.1.0
+      aws-sdk:
+        specifier: 2.1277.0
+        version: 2.1277.0
+      axios:
+        specifier: ^1.3.2
+        version: 1.3.2
+      bcryptjs:
+        specifier: 2.4.3
+        version: 2.4.3
+      blurhash:
+        specifier: 1.1.5
+        version: 1.1.5
+      bull:
+        specifier: 4.10.2
+        version: 4.10.2
+      cacheable-lookup:
+        specifier: 7.0.0
+        version: 7.0.0
+      calckey-js:
+        specifier: ^0.0.22
+        version: 0.0.22
+      cbor:
+        specifier: 8.1.0
+        version: 8.1.0
+      chalk:
+        specifier: 5.2.0
+        version: 5.2.0
+      chalk-template:
+        specifier: 0.4.0
+        version: 0.4.0
+      chokidar:
+        specifier: ^3.3.1
+        version: 3.5.3
+      cli-highlight:
+        specifier: 2.1.11
+        version: 2.1.11
+      color-convert:
+        specifier: 2.0.1
+        version: 2.0.1
+      content-disposition:
+        specifier: 0.5.4
+        version: 0.5.4
+      date-fns:
+        specifier: 2.29.3
+        version: 2.29.3
+      deep-email-validator:
+        specifier: 0.1.21
+        version: 0.1.21
+      escape-regexp:
+        specifier: 0.0.1
+        version: 0.0.1
+      feed:
+        specifier: 4.2.2
+        version: 4.2.2
+      file-type:
+        specifier: 17.1.6
+        version: 17.1.6
+      fluent-ffmpeg:
+        specifier: 2.1.2
+        version: 2.1.2
+      got:
+        specifier: 12.5.3
+        version: 12.5.3
+      hpagent:
+        specifier: 0.1.2
+        version: 0.1.2
+      ioredis:
+        specifier: 5.2.4
+        version: 5.2.4
+      ip-cidr:
+        specifier: 3.0.11
+        version: 3.0.11
+      is-svg:
+        specifier: 4.3.2
+        version: 4.3.2
+      js-yaml:
+        specifier: 4.1.0
+        version: 4.1.0
+      jsdom:
+        specifier: 20.0.3
+        version: 20.0.3
+      jsonld:
+        specifier: 6.0.0
+        version: 6.0.0
+      jsrsasign:
+        specifier: 10.6.1
+        version: 10.6.1
+      koa:
+        specifier: 2.13.4
+        version: 2.13.4
+      koa-body:
+        specifier: ^6.0.1
+        version: 6.0.1
+      koa-bodyparser:
+        specifier: 4.3.0
+        version: 4.3.0
+      koa-favicon:
+        specifier: 2.1.0
+        version: 2.1.0
+      koa-json-body:
+        specifier: 5.3.0
+        version: 5.3.0
+      koa-logger:
+        specifier: 3.2.1
+        version: 3.2.1
+      koa-mount:
+        specifier: 4.0.0
+        version: 4.0.0
+      koa-remove-trailing-slashes:
+        specifier: 2.0.3
+        version: 2.0.3
+      koa-send:
+        specifier: 5.0.1
+        version: 5.0.1
+      koa-slow:
+        specifier: 2.1.0
+        version: 2.1.0
+      koa-views:
+        specifier: 7.0.2
+        version: 7.0.2(@types/koa@2.13.5)(ejs@3.1.8)(pug@3.0.2)
+      mfm-js:
+        specifier: 0.23.2
+        version: 0.23.2
+      mime-types:
+        specifier: 2.1.35
+        version: 2.1.35
+      multer:
+        specifier: 1.4.4-lts.1
+        version: 1.4.4-lts.1
+      nested-property:
+        specifier: 4.0.0
+        version: 4.0.0
+      node-fetch:
+        specifier: 3.3.0
+        version: 3.3.0
+      nodemailer:
+        specifier: 6.8.0
+        version: 6.8.0
+      nsfwjs:
+        specifier: 2.4.2
+        version: 2.4.2(@tensorflow/tfjs@4.2.0)
+      oauth:
+        specifier: ^0.10.0
+        version: 0.10.0
+      os-utils:
+        specifier: 0.0.14
+        version: 0.0.14
+      parse5:
+        specifier: 7.1.2
+        version: 7.1.2
+      pg:
+        specifier: 8.8.0
+        version: 8.8.0
+      private-ip:
+        specifier: 2.3.4
+        version: 2.3.4
+      probe-image-size:
+        specifier: 7.2.3
+        version: 7.2.3
+      promise-limit:
+        specifier: 2.7.0
+        version: 2.7.0
+      punycode:
+        specifier: 2.1.1
+        version: 2.1.1
+      pureimage:
+        specifier: 0.3.15
+        version: 0.3.15
+      qrcode:
+        specifier: 1.5.1
+        version: 1.5.1
+      qs:
+        specifier: 6.9.7
+        version: 6.9.7
+      random-seed:
+        specifier: 0.3.0
+        version: 0.3.0
+      ratelimiter:
+        specifier: 3.4.1
+        version: 3.4.1
+      re2:
+        specifier: 1.18.0
+        version: 1.18.0
+      redis-lock:
+        specifier: 0.1.4
+        version: 0.1.4
+      reflect-metadata:
+        specifier: 0.1.13
+        version: 0.1.13
+      rename:
+        specifier: 1.0.4
+        version: 1.0.4
+      rndstr:
+        specifier: 1.0.0
+        version: 1.0.0
+      rss-parser:
+        specifier: 3.12.0
+        version: 3.12.0
+      sanitize-html:
+        specifier: 2.8.1
+        version: 2.8.1
+      seedrandom:
+        specifier: ^3.0.5
+        version: 3.0.5
+      semver:
+        specifier: 7.3.8
+        version: 7.3.8
+      sharp:
+        specifier: 0.31.3
+        version: 0.31.3
+      sonic-channel:
+        specifier: ^1.3.1
+        version: 1.3.1
+      speakeasy:
+        specifier: 2.0.0
+        version: 2.0.0
+      stringz:
+        specifier: 2.1.0
+        version: 2.1.0
+      summaly:
+        specifier: 2.7.0
+        version: 2.7.0
+      syslog-pro:
+        specifier: 1.0.0
+        version: 1.0.0
+      systeminformation:
+        specifier: 5.16.9
+        version: 5.16.9
+      tesseract.js:
+        specifier: ^3.0.3
+        version: 3.0.3(eslint@8.31.0)
+      tinycolor2:
+        specifier: 1.5.2
+        version: 1.5.2
+      tmp:
+        specifier: 0.2.1
+        version: 0.2.1
+      twemoji-parser:
+        specifier: 14.0.0
+        version: 14.0.0
+      typeorm:
+        specifier: 0.3.11
+        version: 0.3.11(ioredis@5.2.4)(pg@8.8.0)(ts-node@10.9.1)
+      ulid:
+        specifier: 2.3.0
+        version: 2.3.0
+      unzipper:
+        specifier: 0.10.11
+        version: 0.10.11
+      uuid:
+        specifier: 9.0.0
+        version: 9.0.0
+      web-push:
+        specifier: 3.5.0
+        version: 3.5.0
+      websocket:
+        specifier: 1.0.34
+        version: 1.0.34
+      xev:
+        specifier: 3.0.2
+        version: 3.0.2
     optionalDependencies:
-      '@swc/core-android-arm64': 1.3.11
-      '@tensorflow/tfjs-node': 3.21.1_seedrandom@3.0.5
+      '@swc/core-android-arm64':
+        specifier: 1.3.11
+        version: 1.3.11
+      '@tensorflow/tfjs-node':
+        specifier: 3.21.1
+        version: 3.21.1(seedrandom@3.0.5)
     devDependencies:
-      '@swc/cli': 0.1.59_cr4os3zuq4gmhe2qzzjtw2pxeu
-      '@swc/core': 1.3.26
-      '@types/bcryptjs': 2.4.2
-      '@types/bull': 3.15.9
-      '@types/cbor': 6.0.0
-      '@types/escape-regexp': 0.0.1
-      '@types/fluent-ffmpeg': 2.1.20
-      '@types/js-yaml': 4.0.5
-      '@types/jsdom': 20.0.1
-      '@types/jsonld': 1.5.8
-      '@types/jsrsasign': 10.5.4
-      '@types/koa': 2.13.5
-      '@types/koa-bodyparser': 4.3.10
-      '@types/koa-cors': 0.0.2
-      '@types/koa-favicon': 2.0.21
-      '@types/koa-logger': 3.1.2
-      '@types/koa-mount': 4.0.2
-      '@types/koa-send': 4.1.3
-      '@types/koa-views': 7.0.0_6tybghmia4wsnt33xeid7y4rby
-      '@types/koa__cors': 3.3.0
-      '@types/koa__multer': 2.0.4
-      '@types/koa__router': 8.0.11
-      '@types/mocha': 9.1.1
-      '@types/node': 18.11.18
-      '@types/node-fetch': 3.0.3
-      '@types/nodemailer': 6.4.7
-      '@types/oauth': 0.9.1
-      '@types/pug': 2.0.6
-      '@types/punycode': 2.1.0
-      '@types/qrcode': 1.5.0
-      '@types/qs': 6.9.7
-      '@types/random-seed': 0.3.3
-      '@types/ratelimiter': 3.4.4
-      '@types/redis': 4.0.11
-      '@types/rename': 1.0.4
-      '@types/sanitize-html': 2.8.0
-      '@types/semver': 7.3.13
-      '@types/sharp': 0.31.1
-      '@types/sinonjs__fake-timers': 8.1.2
-      '@types/speakeasy': 2.0.7
-      '@types/tinycolor2': 1.4.3
-      '@types/tmp': 0.2.3
-      '@types/uuid': 8.3.4
-      '@types/web-push': 3.3.2
-      '@types/websocket': 1.0.5
-      '@types/ws': 8.5.3
-      cross-env: 7.0.3
-      eslint: 8.31.0
-      execa: 6.1.0
-      json5: 2.2.3
-      json5-loader: 4.0.1_webpack@5.75.0
-      mocha: 10.2.0
-      pug: 3.0.2
-      strict-event-emitter-types: 2.0.0
-      swc-loader: 0.2.3_v4imsvpumnwpgduroyqmpcfjiy
-      ts-loader: 9.4.2_3fkjkrd3audxnith3e7fo4fnxi
-      ts-node: 10.9.1_fodzh64fuekdilycyvke2qmf2e
-      tsconfig-paths: 4.1.2
-      typescript: 4.9.4
-      webpack: 5.75.0_@swc+core@1.3.26
-      ws: 8.11.0
+      '@swc/cli':
+        specifier: ^0.1.59
+        version: 0.1.59(@swc/core@1.3.26)(chokidar@3.5.3)
+      '@swc/core':
+        specifier: ^1.3.26
+        version: 1.3.26
+      '@types/bcryptjs':
+        specifier: 2.4.2
+        version: 2.4.2
+      '@types/bull':
+        specifier: 3.15.9
+        version: 3.15.9
+      '@types/cbor':
+        specifier: 6.0.0
+        version: 6.0.0
+      '@types/escape-regexp':
+        specifier: 0.0.1
+        version: 0.0.1
+      '@types/fluent-ffmpeg':
+        specifier: 2.1.20
+        version: 2.1.20
+      '@types/js-yaml':
+        specifier: 4.0.5
+        version: 4.0.5
+      '@types/jsdom':
+        specifier: 20.0.1
+        version: 20.0.1
+      '@types/jsonld':
+        specifier: 1.5.8
+        version: 1.5.8
+      '@types/jsrsasign':
+        specifier: 10.5.4
+        version: 10.5.4
+      '@types/koa':
+        specifier: 2.13.5
+        version: 2.13.5
+      '@types/koa-bodyparser':
+        specifier: 4.3.10
+        version: 4.3.10
+      '@types/koa-cors':
+        specifier: 0.0.2
+        version: 0.0.2
+      '@types/koa-favicon':
+        specifier: 2.0.21
+        version: 2.0.21
+      '@types/koa-logger':
+        specifier: 3.1.2
+        version: 3.1.2
+      '@types/koa-mount':
+        specifier: 4.0.2
+        version: 4.0.2
+      '@types/koa-send':
+        specifier: 4.1.3
+        version: 4.1.3
+      '@types/koa-views':
+        specifier: 7.0.0
+        version: 7.0.0(@types/koa@2.13.5)(pug@3.0.2)
+      '@types/koa__cors':
+        specifier: 3.3.0
+        version: 3.3.0
+      '@types/koa__multer':
+        specifier: 2.0.4
+        version: 2.0.4
+      '@types/koa__router':
+        specifier: 8.0.11
+        version: 8.0.11
+      '@types/mocha':
+        specifier: 9.1.1
+        version: 9.1.1
+      '@types/node':
+        specifier: 18.11.18
+        version: 18.11.18
+      '@types/node-fetch':
+        specifier: 3.0.3
+        version: 3.0.3
+      '@types/nodemailer':
+        specifier: 6.4.7
+        version: 6.4.7
+      '@types/oauth':
+        specifier: 0.9.1
+        version: 0.9.1
+      '@types/pug':
+        specifier: 2.0.6
+        version: 2.0.6
+      '@types/punycode':
+        specifier: 2.1.0
+        version: 2.1.0
+      '@types/qrcode':
+        specifier: 1.5.0
+        version: 1.5.0
+      '@types/qs':
+        specifier: 6.9.7
+        version: 6.9.7
+      '@types/random-seed':
+        specifier: 0.3.3
+        version: 0.3.3
+      '@types/ratelimiter':
+        specifier: 3.4.4
+        version: 3.4.4
+      '@types/redis':
+        specifier: 4.0.11
+        version: 4.0.11
+      '@types/rename':
+        specifier: 1.0.4
+        version: 1.0.4
+      '@types/sanitize-html':
+        specifier: 2.8.0
+        version: 2.8.0
+      '@types/semver':
+        specifier: 7.3.13
+        version: 7.3.13
+      '@types/sharp':
+        specifier: 0.31.1
+        version: 0.31.1
+      '@types/sinonjs__fake-timers':
+        specifier: 8.1.2
+        version: 8.1.2
+      '@types/speakeasy':
+        specifier: 2.0.7
+        version: 2.0.7
+      '@types/tinycolor2':
+        specifier: 1.4.3
+        version: 1.4.3
+      '@types/tmp':
+        specifier: 0.2.3
+        version: 0.2.3
+      '@types/uuid':
+        specifier: 8.3.4
+        version: 8.3.4
+      '@types/web-push':
+        specifier: 3.3.2
+        version: 3.3.2
+      '@types/websocket':
+        specifier: 1.0.5
+        version: 1.0.5
+      '@types/ws':
+        specifier: 8.5.3
+        version: 8.5.3
+      cross-env:
+        specifier: 7.0.3
+        version: 7.0.3
+      eslint:
+        specifier: ^8.31.0
+        version: 8.31.0
+      execa:
+        specifier: 6.1.0
+        version: 6.1.0
+      json5:
+        specifier: 2.2.3
+        version: 2.2.3
+      json5-loader:
+        specifier: 4.0.1
+        version: 4.0.1(webpack@5.75.0)
+      mocha:
+        specifier: 10.2.0
+        version: 10.2.0
+      pug:
+        specifier: 3.0.2
+        version: 3.0.2
+      strict-event-emitter-types:
+        specifier: 2.0.0
+        version: 2.0.0
+      swc-loader:
+        specifier: ^0.2.3
+        version: 0.2.3(@swc/core@1.3.26)(webpack@5.75.0)
+      ts-loader:
+        specifier: 9.4.2
+        version: 9.4.2(typescript@4.9.4)(webpack@5.75.0)
+      ts-node:
+        specifier: 10.9.1
+        version: 10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4)
+      tsconfig-paths:
+        specifier: 4.1.2
+        version: 4.1.2
+      typescript:
+        specifier: 4.9.4
+        version: 4.9.4
+      webpack:
+        specifier: ^5.75.0
+        version: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      ws:
+        specifier: 8.11.0
+        version: 8.11.0
 
   packages/client:
-    specifiers:
-      '@discordapp/twemoji': 14.0.2
-      '@khmyznikov/pwa-install': ^0.2.0
-      '@phosphor-icons/web': ^2.0.3
-      '@rollup/plugin-alias': 3.1.9
-      '@rollup/plugin-json': 4.1.0
-      '@rollup/pluginutils': ^4.2.1
-      '@syuilo/aiscript': 0.11.1
-      '@types/escape-regexp': 0.0.1
-      '@types/glob': 8.0.0
-      '@types/gulp': 4.0.10
-      '@types/gulp-rename': 2.0.1
-      '@types/katex': 0.14.0
-      '@types/matter-js': 0.18.2
-      '@types/punycode': 2.1.0
-      '@types/seedrandom': 3.0.4
-      '@types/throttle-debounce': 5.0.0
-      '@types/tinycolor2': 1.4.3
-      '@types/uuid': 8.3.4
-      '@vitejs/plugin-vue': 4.0.0
-      '@vue/compiler-sfc': 3.2.45
-      autobind-decorator: 2.4.0
-      autosize: 5.0.2
-      blurhash: 1.1.5
-      broadcast-channel: 4.19.1
-      browser-image-resizer: https://github.com/misskey-dev/browser-image-resizer.git
-      calckey-js: ^0.0.22
-      chart.js: 4.1.1
-      chartjs-adapter-date-fns: 2.0.1
-      chartjs-chart-matrix: ^2.0.1
-      chartjs-plugin-gradient: 0.5.1
-      chartjs-plugin-zoom: 1.2.1
-      city-timezones: ^1.2.1
-      compare-versions: 5.0.3
-      cropperjs: 2.0.0-beta.2
-      cross-env: 7.0.3
-      cypress: 10.11.0
-      date-fns: 2.29.3
-      escape-regexp: 0.0.1
-      eventemitter3: 4.0.7
-      gsap: ^3.11.4
-      idb-keyval: 6.2.0
-      insert-text-at-cursor: 0.3.0
-      json5: 2.2.3
-      katex: 0.16.4
-      matter-js: 0.18.0
-      mfm-js: 0.23.2
-      photoswipe: 5.3.4
-      prismjs: 1.29.0
-      punycode: 2.1.1
-      querystring: 0.2.1
-      rndstr: 1.0.0
-      rollup: 3.9.1
-      s-age: 1.1.2
-      sass: 1.57.1
-      seedrandom: 3.0.5
-      start-server-and-test: 1.15.2
-      strict-event-emitter-types: 2.0.0
-      stringz: 2.1.0
-      swiper: ^8.4.5
-      syuilo-password-strength: 0.0.1
-      textarea-caret: 3.1.0
-      three: 0.146.0
-      throttle-debounce: 5.0.0
-      tinycolor2: 1.5.2
-      tsc-alias: 1.8.2
-      tsconfig-paths: 4.1.2
-      twemoji-parser: 14.0.0
-      typescript: 4.9.4
-      uuid: 9.0.0
-      vanilla-tilt: 1.8.0
-      vite: ^4.1.1
-      vite-plugin-compression: ^0.5.1
-      vue: 3.2.45
-      vue-isyourpasswordsafe: ^2.0.0
-      vue-plyr: ^7.0.0
-      vue-prism-editor: 2.0.0-alpha.2
-      vuedraggable: 4.1.0
     devDependencies:
-      '@discordapp/twemoji': 14.0.2
-      '@khmyznikov/pwa-install': 0.2.0
-      '@phosphor-icons/web': 2.0.3
-      '@rollup/plugin-alias': 3.1.9_rollup@3.9.1
-      '@rollup/plugin-json': 4.1.0_rollup@3.9.1
-      '@rollup/pluginutils': 4.2.1
-      '@syuilo/aiscript': 0.11.1
-      '@types/escape-regexp': 0.0.1
-      '@types/glob': 8.0.0
-      '@types/gulp': 4.0.10
-      '@types/gulp-rename': 2.0.1
-      '@types/katex': 0.14.0
-      '@types/matter-js': 0.18.2
-      '@types/punycode': 2.1.0
-      '@types/seedrandom': 3.0.4
-      '@types/throttle-debounce': 5.0.0
-      '@types/tinycolor2': 1.4.3
-      '@types/uuid': 8.3.4
-      '@vitejs/plugin-vue': 4.0.0_vite@4.1.1+vue@3.2.45
-      '@vue/compiler-sfc': 3.2.45
-      autobind-decorator: 2.4.0
-      autosize: 5.0.2
-      blurhash: 1.1.5
-      broadcast-channel: 4.19.1
-      browser-image-resizer: github.com/misskey-dev/browser-image-resizer/0380d12c8e736788ea7f4e6e985175521ea7b23c
-      calckey-js: 0.0.22
-      chart.js: 4.1.1
-      chartjs-adapter-date-fns: 2.0.1_chart.js@4.1.1
-      chartjs-chart-matrix: 2.0.1_chart.js@4.1.1
-      chartjs-plugin-gradient: 0.5.1_chart.js@4.1.1
-      chartjs-plugin-zoom: 1.2.1_chart.js@4.1.1
-      city-timezones: 1.2.1
-      compare-versions: 5.0.3
-      cropperjs: 2.0.0-beta.2
-      cross-env: 7.0.3
-      cypress: 10.11.0
-      date-fns: 2.29.3
-      escape-regexp: 0.0.1
-      eventemitter3: 4.0.7
-      gsap: 3.11.4
-      idb-keyval: 6.2.0
-      insert-text-at-cursor: 0.3.0
-      json5: 2.2.3
-      katex: 0.16.4
-      matter-js: 0.18.0
-      mfm-js: 0.23.2
-      photoswipe: 5.3.4
-      prismjs: 1.29.0
-      punycode: 2.1.1
-      querystring: 0.2.1
-      rndstr: 1.0.0
-      rollup: 3.9.1
-      s-age: 1.1.2
-      sass: 1.57.1
-      seedrandom: 3.0.5
-      start-server-and-test: 1.15.2
-      strict-event-emitter-types: 2.0.0
-      stringz: 2.1.0
-      swiper: 8.4.5
-      syuilo-password-strength: 0.0.1
-      textarea-caret: 3.1.0
-      three: 0.146.0
-      throttle-debounce: 5.0.0
-      tinycolor2: 1.5.2
-      tsc-alias: 1.8.2
-      tsconfig-paths: 4.1.2
-      twemoji-parser: 14.0.0
-      typescript: 4.9.4
-      uuid: 9.0.0
-      vanilla-tilt: 1.8.0
-      vite: 4.1.1_sass@1.57.1
-      vite-plugin-compression: 0.5.1_vite@4.1.1
-      vue: 3.2.45
-      vue-isyourpasswordsafe: 2.0.0
-      vue-plyr: 7.0.0
-      vue-prism-editor: 2.0.0-alpha.2_vue@3.2.45
-      vuedraggable: 4.1.0_vue@3.2.45
+      '@discordapp/twemoji':
+        specifier: 14.0.2
+        version: 14.0.2
+      '@khmyznikov/pwa-install':
+        specifier: ^0.2.0
+        version: 0.2.0
+      '@phosphor-icons/web':
+        specifier: ^2.0.3
+        version: 2.0.3
+      '@rollup/plugin-alias':
+        specifier: 3.1.9
+        version: 3.1.9(rollup@3.9.1)
+      '@rollup/plugin-json':
+        specifier: 4.1.0
+        version: 4.1.0(rollup@3.9.1)
+      '@rollup/pluginutils':
+        specifier: ^4.2.1
+        version: 4.2.1
+      '@syuilo/aiscript':
+        specifier: 0.11.1
+        version: 0.11.1
+      '@types/escape-regexp':
+        specifier: 0.0.1
+        version: 0.0.1
+      '@types/glob':
+        specifier: 8.0.0
+        version: 8.0.0
+      '@types/gulp':
+        specifier: 4.0.10
+        version: 4.0.10
+      '@types/gulp-rename':
+        specifier: 2.0.1
+        version: 2.0.1
+      '@types/katex':
+        specifier: 0.14.0
+        version: 0.14.0
+      '@types/matter-js':
+        specifier: 0.18.2
+        version: 0.18.2
+      '@types/punycode':
+        specifier: 2.1.0
+        version: 2.1.0
+      '@types/seedrandom':
+        specifier: 3.0.4
+        version: 3.0.4
+      '@types/throttle-debounce':
+        specifier: 5.0.0
+        version: 5.0.0
+      '@types/tinycolor2':
+        specifier: 1.4.3
+        version: 1.4.3
+      '@types/uuid':
+        specifier: 8.3.4
+        version: 8.3.4
+      '@vitejs/plugin-vue':
+        specifier: 4.0.0
+        version: 4.0.0(vite@4.1.1)(vue@3.2.45)
+      '@vue/compiler-sfc':
+        specifier: 3.2.45
+        version: 3.2.45
+      autobind-decorator:
+        specifier: 2.4.0
+        version: 2.4.0
+      autosize:
+        specifier: 5.0.2
+        version: 5.0.2
+      blurhash:
+        specifier: 1.1.5
+        version: 1.1.5
+      broadcast-channel:
+        specifier: 4.19.1
+        version: 4.19.1
+      browser-image-resizer:
+        specifier: https://github.com/misskey-dev/browser-image-resizer.git
+        version: github.com/misskey-dev/browser-image-resizer/0380d12c8e736788ea7f4e6e985175521ea7b23c
+      calckey-js:
+        specifier: ^0.0.22
+        version: 0.0.22
+      chart.js:
+        specifier: 4.1.1
+        version: 4.1.1
+      chartjs-adapter-date-fns:
+        specifier: 2.0.1
+        version: 2.0.1(chart.js@4.1.1)
+      chartjs-chart-matrix:
+        specifier: ^2.0.1
+        version: 2.0.1(chart.js@4.1.1)
+      chartjs-plugin-gradient:
+        specifier: 0.5.1
+        version: 0.5.1(chart.js@4.1.1)
+      chartjs-plugin-zoom:
+        specifier: 1.2.1
+        version: 1.2.1(chart.js@4.1.1)
+      city-timezones:
+        specifier: ^1.2.1
+        version: 1.2.1
+      compare-versions:
+        specifier: 5.0.3
+        version: 5.0.3
+      cropperjs:
+        specifier: 2.0.0-beta.2
+        version: 2.0.0-beta.2
+      cross-env:
+        specifier: 7.0.3
+        version: 7.0.3
+      cypress:
+        specifier: 10.11.0
+        version: 10.11.0
+      date-fns:
+        specifier: 2.29.3
+        version: 2.29.3
+      escape-regexp:
+        specifier: 0.0.1
+        version: 0.0.1
+      eventemitter3:
+        specifier: 4.0.7
+        version: 4.0.7
+      gsap:
+        specifier: ^3.11.4
+        version: 3.11.4
+      idb-keyval:
+        specifier: 6.2.0
+        version: 6.2.0
+      insert-text-at-cursor:
+        specifier: 0.3.0
+        version: 0.3.0
+      json5:
+        specifier: 2.2.3
+        version: 2.2.3
+      katex:
+        specifier: 0.16.4
+        version: 0.16.4
+      matter-js:
+        specifier: 0.18.0
+        version: 0.18.0
+      mfm-js:
+        specifier: 0.23.2
+        version: 0.23.2
+      photoswipe:
+        specifier: 5.3.4
+        version: 5.3.4
+      prismjs:
+        specifier: 1.29.0
+        version: 1.29.0
+      punycode:
+        specifier: 2.1.1
+        version: 2.1.1
+      querystring:
+        specifier: 0.2.1
+        version: 0.2.1
+      rndstr:
+        specifier: 1.0.0
+        version: 1.0.0
+      rollup:
+        specifier: 3.9.1
+        version: 3.9.1
+      s-age:
+        specifier: 1.1.2
+        version: 1.1.2
+      sass:
+        specifier: 1.57.1
+        version: 1.57.1
+      seedrandom:
+        specifier: 3.0.5
+        version: 3.0.5
+      start-server-and-test:
+        specifier: 1.15.2
+        version: 1.15.2
+      strict-event-emitter-types:
+        specifier: 2.0.0
+        version: 2.0.0
+      stringz:
+        specifier: 2.1.0
+        version: 2.1.0
+      swiper:
+        specifier: ^8.4.5
+        version: 8.4.5
+      syuilo-password-strength:
+        specifier: 0.0.1
+        version: 0.0.1
+      textarea-caret:
+        specifier: 3.1.0
+        version: 3.1.0
+      three:
+        specifier: 0.146.0
+        version: 0.146.0
+      throttle-debounce:
+        specifier: 5.0.0
+        version: 5.0.0
+      tinycolor2:
+        specifier: 1.5.2
+        version: 1.5.2
+      tsc-alias:
+        specifier: 1.8.2
+        version: 1.8.2
+      tsconfig-paths:
+        specifier: 4.1.2
+        version: 4.1.2
+      twemoji-parser:
+        specifier: 14.0.0
+        version: 14.0.0
+      typescript:
+        specifier: 4.9.4
+        version: 4.9.4
+      uuid:
+        specifier: 9.0.0
+        version: 9.0.0
+      vanilla-tilt:
+        specifier: 1.8.0
+        version: 1.8.0
+      vite:
+        specifier: ^4.1.1
+        version: 4.1.1(sass@1.57.1)
+      vite-plugin-compression:
+        specifier: ^0.5.1
+        version: 0.5.1(vite@4.1.1)
+      vue:
+        specifier: 3.2.45
+        version: 3.2.45
+      vue-isyourpasswordsafe:
+        specifier: ^2.0.0
+        version: 2.0.0
+      vue-plyr:
+        specifier: ^7.0.0
+        version: 7.0.0
+      vue-prism-editor:
+        specifier: 2.0.0-alpha.2
+        version: 2.0.0-alpha.2(vue@3.2.45)
+      vuedraggable:
+        specifier: 4.1.0
+        version: 4.1.0(vue@3.2.45)
 
   packages/sw:
-    specifiers:
-      '@swc/cli': ^0.1.59
-      '@swc/core': ^1.3.26
-      '@swc/core-android-arm64': 1.3.11
-      calckey-js: ^0.0.22
-      idb-keyval: ^6.2.0
-      swc-loader: ^0.2.3
-      webpack: ^5.75.0
-      webpack-cli: ^5.0.1
     devDependencies:
-      '@swc/cli': 0.1.59_@swc+core@1.3.26
-      '@swc/core': 1.3.26
-      '@swc/core-android-arm64': 1.3.11
-      calckey-js: 0.0.22
-      idb-keyval: 6.2.0
-      swc-loader: 0.2.3_v4imsvpumnwpgduroyqmpcfjiy
-      webpack: 5.75.0_bix6ghzcb3jjkfxenpixt6qrpa
-      webpack-cli: 5.0.1_webpack@5.75.0
+      '@swc/cli':
+        specifier: ^0.1.59
+        version: 0.1.59(@swc/core@1.3.26)(chokidar@3.5.3)
+      '@swc/core':
+        specifier: ^1.3.26
+        version: 1.3.26
+      '@swc/core-android-arm64':
+        specifier: 1.3.11
+        version: 1.3.11
+      calckey-js:
+        specifier: ^0.0.22
+        version: 0.0.22
+      idb-keyval:
+        specifier: ^6.2.0
+        version: 6.2.0
+      swc-loader:
+        specifier: ^0.2.3
+        version: 0.2.3(@swc/core@1.3.26)(webpack@5.75.0)
+      webpack:
+        specifier: ^5.75.0
+        version: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      webpack-cli:
+        specifier: ^5.0.1
+        version: 5.0.1(webpack@5.75.0)
 
 packages:
 
-  /@babel/code-frame/7.18.6:
+  /@babel/code-frame@7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.18.6
     dev: false
 
-  /@babel/generator/7.20.7:
+  /@babel/generator@7.20.7:
     resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -590,12 +860,12 @@ packages:
       jsesc: 2.5.2
     dev: false
 
-  /@babel/helper-environment-visitor/7.18.9:
+  /@babel/helper-environment-visitor@7.18.9:
     resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
     engines: {node: '>=6.9.0'}
     dev: false
 
-  /@babel/helper-function-name/7.19.0:
+  /@babel/helper-function-name@7.19.0:
     resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -603,29 +873,29 @@ packages:
       '@babel/types': 7.20.7
     dev: false
 
-  /@babel/helper-hoist-variables/7.18.6:
+  /@babel/helper-hoist-variables@7.18.6:
     resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.7
     dev: false
 
-  /@babel/helper-split-export-declaration/7.18.6:
+  /@babel/helper-split-export-declaration@7.18.6:
     resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.7
     dev: false
 
-  /@babel/helper-string-parser/7.19.4:
+  /@babel/helper-string-parser@7.19.4:
     resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-validator-identifier/7.19.1:
+  /@babel/helper-validator-identifier@7.19.1:
     resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/highlight/7.18.6:
+  /@babel/highlight@7.18.6:
     resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -634,21 +904,21 @@ packages:
       js-tokens: 4.0.0
     dev: false
 
-  /@babel/parser/7.20.7:
+  /@babel/parser@7.20.7:
     resolution: {integrity: sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
       '@babel/types': 7.20.7
 
-  /@babel/runtime/7.20.7:
+  /@babel/runtime@7.20.7:
     resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.11
     dev: true
 
-  /@babel/template/7.20.7:
+  /@babel/template@7.20.7:
     resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -657,7 +927,7 @@ packages:
       '@babel/types': 7.20.7
     dev: false
 
-  /@babel/traverse/7.20.12:
+  /@babel/traverse@7.20.12:
     resolution: {integrity: sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -669,13 +939,13 @@ packages:
       '@babel/helper-split-export-declaration': 7.18.6
       '@babel/parser': 7.20.7
       '@babel/types': 7.20.7
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@babel/types/7.20.7:
+  /@babel/types@7.20.7:
     resolution: {integrity: sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -683,13 +953,13 @@ packages:
       '@babel/helper-validator-identifier': 7.19.1
       to-fast-properties: 2.0.0
 
-  /@bull-board/api/4.10.2:
+  /@bull-board/api@4.10.2:
     resolution: {integrity: sha512-lRHo0A7hsz71aOx1ZN0SmLLWfSuvKdL6EZ4imlgo5SuXGozybvlRc5KPIJU2/E1w5meoUGi+nFezBwp1gT/SMw==}
     dependencies:
       redis-info: 3.1.0
     dev: false
 
-  /@bull-board/koa/4.10.2_6tybghmia4wsnt33xeid7y4rby:
+  /@bull-board/koa@4.10.2(@types/koa@2.13.5)(pug@3.0.2):
     resolution: {integrity: sha512-gabPtsMOt2SQHkS5VcY1q/FCpbBRFiFrbWbcouZ7zWKg413J8nG+yErz3pc0rbmp23kbKX6wTG/diWKhE7EWbA==}
     dependencies:
       '@bull-board/api': 4.10.2
@@ -699,7 +969,7 @@ packages:
       koa-mount: 4.0.0
       koa-router: 10.1.1
       koa-static: 5.0.0
-      koa-views: 7.0.2_no5ijl6tnlxntgm3uzzxedo2fe
+      koa-views: 7.0.2(@types/koa@2.13.5)(ejs@3.1.8)(pug@3.0.2)
     transitivePeerDependencies:
       - '@types/koa'
       - arc-templates
@@ -757,13 +1027,13 @@ packages:
       - whiskers
     dev: false
 
-  /@bull-board/ui/4.10.2:
+  /@bull-board/ui@4.10.2:
     resolution: {integrity: sha512-vaHGojG5D3xjnaed3nwOaLy4Y06RgDJdYRaFR5E06SjZ0vOvjVYGD6s4cykK512Aw/ElFhKDPwzhf8BvpwAtDQ==}
     dependencies:
       '@bull-board/api': 4.10.2
     dev: false
 
-  /@calckey/megalodon/5.1.23:
+  /@calckey/megalodon@5.1.23:
     resolution: {integrity: sha512-08/1e1q4D/6d2hYoBU6zyLXIj2cCC8/aYc1QKueGV02wGhJcOJ5Ceu01d8wGyt0bOzOmy+MIOy/1Ms3dARx2qg==}
     engines: {node: '>=15.0.0'}
     dependencies:
@@ -787,42 +1057,42 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@colors/colors/1.5.0:
+  /@colors/colors@1.5.0:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
     requiresBuild: true
     dev: true
     optional: true
 
-  /@cropper/element-canvas/2.0.0-beta.2:
+  /@cropper/element-canvas@2.0.0-beta.2:
     resolution: {integrity: sha512-LZcnMwv7M3ZxUKX9YrYGxqbf8YsYfeIUFREaB/IkKsm7E7ASaDrrjdc996QYMjdjUNcWdJjxhsoucPNEvl/DXA==}
     dependencies:
       '@cropper/element': 2.0.0-beta.2
       '@cropper/utils': 2.0.0-beta.2
     dev: true
 
-  /@cropper/element-crosshair/2.0.0-beta.2:
+  /@cropper/element-crosshair@2.0.0-beta.2:
     resolution: {integrity: sha512-kBxZ2zZ7uR7XlQcnUbudq7562XwtTOqbGNYg5VWem/ukcAAKwYmPlapNlv7n228DSUGEz5FxKW8GSwLucJlQ0Q==}
     dependencies:
       '@cropper/element': 2.0.0-beta.2
       '@cropper/utils': 2.0.0-beta.2
     dev: true
 
-  /@cropper/element-grid/2.0.0-beta.2:
+  /@cropper/element-grid@2.0.0-beta.2:
     resolution: {integrity: sha512-rWMOjlj+eq9L2oxAthNYdGxbV3sYyV+tra6VAuooZl+RbdQZ9XCnG0Pitb/RfgPZb860ia0q8biE5zEq4Uc8fA==}
     dependencies:
       '@cropper/element': 2.0.0-beta.2
       '@cropper/utils': 2.0.0-beta.2
     dev: true
 
-  /@cropper/element-handle/2.0.0-beta.2:
+  /@cropper/element-handle@2.0.0-beta.2:
     resolution: {integrity: sha512-IAFyqldnB57ZGzvf3VuE7Y9UAaq9IMmun15v17cAWX1q4ZCVqdFrugAWpRF+V5WgHBL2doxHUOQlfy7LznzRmg==}
     dependencies:
       '@cropper/element': 2.0.0-beta.2
       '@cropper/utils': 2.0.0-beta.2
     dev: true
 
-  /@cropper/element-image/2.0.0-beta.2:
+  /@cropper/element-image@2.0.0-beta.2:
     resolution: {integrity: sha512-FgYb+GfcxdewH6VKgw6Ltws8fw3TSP8d0HMH/WZubBC2w/NNAvp92EonwgjDoTLEFFJKbj5P2aKTFY0aO70R0Q==}
     dependencies:
       '@cropper/element': 2.0.0-beta.2
@@ -830,7 +1100,7 @@ packages:
       '@cropper/utils': 2.0.0-beta.2
     dev: true
 
-  /@cropper/element-selection/2.0.0-beta.2:
+  /@cropper/element-selection@2.0.0-beta.2:
     resolution: {integrity: sha512-O/fxpJe/WB5H+mELSVfp4tOAAa7yMVa+wn35DCRxaDPb/1Um55E7OT1G3puAL9Elm7NFA/CCMYuHohl9emE25A==}
     dependencies:
       '@cropper/element': 2.0.0-beta.2
@@ -839,7 +1109,7 @@ packages:
       '@cropper/utils': 2.0.0-beta.2
     dev: true
 
-  /@cropper/element-shade/2.0.0-beta.2:
+  /@cropper/element-shade@2.0.0-beta.2:
     resolution: {integrity: sha512-aY5RP2ygteq51ZDU3+rAj+f+0hSgEf+vRAdJ1YO2bJ1n25TpOaz2klO5COdHxn3unLVjYK97khIZGs7ClbV0rQ==}
     dependencies:
       '@cropper/element': 2.0.0-beta.2
@@ -848,7 +1118,7 @@ packages:
       '@cropper/utils': 2.0.0-beta.2
     dev: true
 
-  /@cropper/element-viewer/2.0.0-beta.2:
+  /@cropper/element-viewer@2.0.0-beta.2:
     resolution: {integrity: sha512-/2BhLFr2Ti5LnRvcIlLlR3NDSF3x9w9BvYukFbnCxoTLIbGvwM02YQV2Qx+al8C0mBoW0ab6uF5ykl6W8i9WkQ==}
     dependencies:
       '@cropper/element': 2.0.0-beta.2
@@ -858,13 +1128,13 @@ packages:
       '@cropper/utils': 2.0.0-beta.2
     dev: true
 
-  /@cropper/element/2.0.0-beta.2:
+  /@cropper/element@2.0.0-beta.2:
     resolution: {integrity: sha512-i3wfelk5d4MLNgAcQpRa/jOaxWAcDLRAUkiHmU6CMl7xvOAD/4TFQGB3qSpzgx3NK4hUDLn80/gp7gM2nvrBWg==}
     dependencies:
       '@cropper/utils': 2.0.0-beta.2
     dev: true
 
-  /@cropper/elements/2.0.0-beta.2:
+  /@cropper/elements@2.0.0-beta.2:
     resolution: {integrity: sha512-l08CmeOvLJ8XLJ95OQ+kSHSbf7+pHcsu3pvQYjustbrUj0H1vzBiWT8VygPjkCUMoVIfsBpYmBNpWVGJvjoy2Q==}
     dependencies:
       '@cropper/element': 2.0.0-beta.2
@@ -878,17 +1148,17 @@ packages:
       '@cropper/element-viewer': 2.0.0-beta.2
     dev: true
 
-  /@cropper/utils/2.0.0-beta.2:
+  /@cropper/utils@2.0.0-beta.2:
     resolution: {integrity: sha512-RJu5IWzH6vcygwLsx9KEqzwjnEqApPkSFViMzxCRbe0IuAXt2ZlSUmYKgLFZY+YJIdaZ+/P7PwiUcZ7GYH3Msw==}
     dev: true
 
-  /@cspotcode/source-map-support/0.8.1:
+  /@cspotcode/source-map-support@0.8.1:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
     dependencies:
       '@jridgewell/trace-mapping': 0.3.9
 
-  /@cypress/request/2.88.11:
+  /@cypress/request@2.88.11:
     resolution: {integrity: sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==}
     engines: {node: '>= 6'}
     dependencies:
@@ -912,27 +1182,27 @@ packages:
       uuid: 8.3.2
     dev: true
 
-  /@cypress/xvfb/1.2.4_supports-color@8.1.1:
+  /@cypress/xvfb@1.2.4(supports-color@8.1.1):
     resolution: {integrity: sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==}
     dependencies:
-      debug: 3.2.7_supports-color@8.1.1
+      debug: 3.2.7(supports-color@8.1.1)
       lodash.once: 4.1.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@digitalbazaar/http-client/3.2.0:
+  /@digitalbazaar/http-client@3.2.0:
     resolution: {integrity: sha512-NhYXcWE/JDE7AnJikNX7q0S6zNuUPA2NuIoRdUpmvHlarjmRqyr6hIO3Awu2FxlUzbdiI1uzuWrZyB9mD1tTvw==}
     engines: {node: '>=14.0'}
     dependencies:
       ky: 0.30.0
-      ky-universal: 0.10.1_ky@0.30.0
+      ky-universal: 0.10.1(ky@0.30.0)
       undici: 5.15.0
     transitivePeerDependencies:
       - web-streams-polyfill
     dev: false
 
-  /@discordapp/twemoji/14.0.2:
+  /@discordapp/twemoji@14.0.2:
     resolution: {integrity: sha512-eYJpFsjViDTYwq3f6v+tRu8iRc+yLAeGrlh6kmNRvvC6rroUE2bMlBfEQ/WNh+2Q1FtSEFXpxzuQPOHzRzbAyA==}
     dependencies:
       fs-extra: 8.1.0
@@ -940,16 +1210,16 @@ packages:
       twemoji-parser: 14.0.0
       universalify: 0.1.2
 
-  /@discoveryjs/json-ext/0.5.7:
+  /@discoveryjs/json-ext@0.5.7:
     resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==}
     engines: {node: '>=10.0.0'}
     dev: true
 
-  /@elastic/elasticsearch/7.17.0:
+  /@elastic/elasticsearch@7.17.0:
     resolution: {integrity: sha512-5QLPCjd0uLmLj1lSuKSThjNpq39f6NmlTy9ROLFwG5gjyTgpwSqufDeYG/Fm43Xs05uF7WcscoO7eguI3HuuYA==}
     engines: {node: '>=12'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       hpagent: 0.1.2
       ms: 2.1.3
       secure-json-parse: 2.7.0
@@ -957,16 +1227,7 @@ packages:
       - supports-color
     dev: false
 
-  /@esbuild/android-arm/0.16.17:
-    resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/android-arm64/0.16.17:
+  /@esbuild/android-arm64@0.16.17:
     resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -975,7 +1236,16 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-x64/0.16.17:
+  /@esbuild/android-arm@0.16.17:
+    resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-x64@0.16.17:
     resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -984,7 +1254,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64/0.16.17:
+  /@esbuild/darwin-arm64@0.16.17:
     resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -993,7 +1263,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64/0.16.17:
+  /@esbuild/darwin-x64@0.16.17:
     resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1002,7 +1272,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64/0.16.17:
+  /@esbuild/freebsd-arm64@0.16.17:
     resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1011,7 +1281,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64/0.16.17:
+  /@esbuild/freebsd-x64@0.16.17:
     resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1020,16 +1290,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm/0.16.17:
-    resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-arm64/0.16.17:
+  /@esbuild/linux-arm64@0.16.17:
     resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1038,7 +1299,16 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32/0.16.17:
+  /@esbuild/linux-arm@0.16.17:
+    resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ia32@0.16.17:
     resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -1047,7 +1317,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64/0.16.17:
+  /@esbuild/linux-loong64@0.16.17:
     resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==}
     engines: {node: '>=12'}
     cpu: [loong64]
@@ -1056,7 +1326,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el/0.16.17:
+  /@esbuild/linux-mips64el@0.16.17:
     resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==}
     engines: {node: '>=12'}
     cpu: [mips64el]
@@ -1065,7 +1335,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64/0.16.17:
+  /@esbuild/linux-ppc64@0.16.17:
     resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==}
     engines: {node: '>=12'}
     cpu: [ppc64]
@@ -1074,7 +1344,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64/0.16.17:
+  /@esbuild/linux-riscv64@0.16.17:
     resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==}
     engines: {node: '>=12'}
     cpu: [riscv64]
@@ -1083,7 +1353,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x/0.16.17:
+  /@esbuild/linux-s390x@0.16.17:
     resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==}
     engines: {node: '>=12'}
     cpu: [s390x]
@@ -1092,7 +1362,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-x64/0.16.17:
+  /@esbuild/linux-x64@0.16.17:
     resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1101,7 +1371,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64/0.16.17:
+  /@esbuild/netbsd-x64@0.16.17:
     resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1110,7 +1380,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64/0.16.17:
+  /@esbuild/openbsd-x64@0.16.17:
     resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1119,7 +1389,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64/0.16.17:
+  /@esbuild/sunos-x64@0.16.17:
     resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1128,7 +1398,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64/0.16.17:
+  /@esbuild/win32-arm64@0.16.17:
     resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1137,7 +1407,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32/0.16.17:
+  /@esbuild/win32-ia32@0.16.17:
     resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -1146,7 +1416,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-x64/0.16.17:
+  /@esbuild/win32-x64@0.16.17:
     resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1155,12 +1425,12 @@ packages:
     dev: true
     optional: true
 
-  /@eslint/eslintrc/1.4.1:
+  /@eslint/eslintrc@1.4.1:
     resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       espree: 9.4.1
       globals: 13.19.0
       ignore: 5.2.4
@@ -1171,41 +1441,41 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@gar/promisify/1.1.3:
+  /@gar/promisify@1.1.3:
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
     dev: false
 
-  /@hapi/hoek/9.3.0:
+  /@hapi/hoek@9.3.0:
     resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==}
     dev: true
 
-  /@hapi/topo/5.1.0:
+  /@hapi/topo@5.1.0:
     resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==}
     dependencies:
       '@hapi/hoek': 9.3.0
     dev: true
 
-  /@humanwhocodes/config-array/0.11.8:
+  /@humanwhocodes/config-array@0.11.8:
     resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
 
-  /@humanwhocodes/module-importer/1.0.1:
+  /@humanwhocodes/module-importer@1.0.1:
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
 
-  /@humanwhocodes/object-schema/1.2.1:
+  /@humanwhocodes/object-schema@1.2.1:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
 
-  /@ioredis/commands/1.2.0:
+  /@ioredis/commands@1.2.0:
     resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==}
 
-  /@jridgewell/gen-mapping/0.3.2:
+  /@jridgewell/gen-mapping@0.3.2:
     resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
     engines: {node: '>=6.0.0'}
     dependencies:
@@ -1213,51 +1483,51 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.14
       '@jridgewell/trace-mapping': 0.3.17
 
-  /@jridgewell/resolve-uri/3.1.0:
+  /@jridgewell/resolve-uri@3.1.0:
     resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
     engines: {node: '>=6.0.0'}
 
-  /@jridgewell/set-array/1.1.2:
+  /@jridgewell/set-array@1.1.2:
     resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
     engines: {node: '>=6.0.0'}
 
-  /@jridgewell/source-map/0.3.2:
+  /@jridgewell/source-map@0.3.2:
     resolution: {integrity: sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==}
     dependencies:
       '@jridgewell/gen-mapping': 0.3.2
       '@jridgewell/trace-mapping': 0.3.17
     dev: true
 
-  /@jridgewell/sourcemap-codec/1.4.14:
+  /@jridgewell/sourcemap-codec@1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
 
-  /@jridgewell/trace-mapping/0.3.17:
+  /@jridgewell/trace-mapping@0.3.17:
     resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==}
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
       '@jridgewell/sourcemap-codec': 1.4.14
 
-  /@jridgewell/trace-mapping/0.3.9:
+  /@jridgewell/trace-mapping@0.3.9:
     resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
       '@jridgewell/sourcemap-codec': 1.4.14
 
-  /@khmyznikov/pwa-install/0.2.0:
+  /@khmyznikov/pwa-install@0.2.0:
     resolution: {integrity: sha512-Lz8lvCf47/DCVzXgLyCGt46HDpie2U/lga++vOgVwil3B8bSMj8fL1+a/8oBhDikHjtLKinTCMf0jZvgW2xCZQ==}
     dependencies:
       '@lit/localize': 0.11.4
       lit: 2.6.1
     dev: true
 
-  /@koa/cors/3.4.3:
+  /@koa/cors@3.4.3:
     resolution: {integrity: sha512-WPXQUaAeAMVaLTEFpoq3T2O1C+FstkjJnDQqy95Ck1UdILajsRhu6mhJ8H2f4NFPRBoCNN+qywTJfq/gGki5mw==}
     engines: {node: '>= 8.0.0'}
     dependencies:
       vary: 1.1.2
     dev: false
 
-  /@koa/multer/3.0.0_multer@1.4.4-lts.1:
+  /@koa/multer@3.0.0(multer@1.4.4-lts.1):
     resolution: {integrity: sha512-y+OQBmex5D1jIl723gAEUYcAWPEicIXppaAKw/zCMfpllQ08ZNweDPwoCLxEoatqd5pCu2XG6V8dl67JRq3RJw==}
     engines: {node: '>= 8'}
     peerDependencies:
@@ -1266,11 +1536,11 @@ packages:
       multer: 1.4.4-lts.1
     dev: false
 
-  /@koa/router/9.0.1:
+  /@koa/router@9.0.1:
     resolution: {integrity: sha512-OI+OU49CJV4px0WkIMmayBeqVXB/JS1ZMq7UoGlTZt6Y7ijK7kdeQ18+SEHHJPytmtI1y6Hf8XLrpxva3mhv5Q==}
     engines: {node: '>= 8.0.0'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       http-errors: 1.8.1
       koa-compose: 4.1.0
       methods: 1.1.2
@@ -1279,28 +1549,28 @@ packages:
       - supports-color
     dev: false
 
-  /@kurkle/color/0.3.2:
+  /@kurkle/color@0.3.2:
     resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==}
     dev: true
 
-  /@lit-labs/ssr-dom-shim/1.0.0:
+  /@lit-labs/ssr-dom-shim@1.0.0:
     resolution: {integrity: sha512-ic93MBXfApIFTrup4a70M/+ddD8xdt2zxxj9sRwHQzhS9ag/syqkD8JPdTXsc1gUy2K8TTirhlCqyTEM/sifNw==}
     dev: true
 
-  /@lit/localize/0.11.4:
+  /@lit/localize@0.11.4:
     resolution: {integrity: sha512-RRIwIX2tAm3+DuEndoXSJrFjGrAK5cb5IXo5K6jcJ6sbgD829B8rSqHC5MaKVUmXTVLIR1bk5IZOZDf9wFereA==}
     dependencies:
       '@lit/reactive-element': 1.6.1
       lit: 2.6.1
     dev: true
 
-  /@lit/reactive-element/1.6.1:
+  /@lit/reactive-element@1.6.1:
     resolution: {integrity: sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA==}
     dependencies:
       '@lit-labs/ssr-dom-shim': 1.0.0
     dev: true
 
-  /@mapbox/node-pre-gyp/1.0.9:
+  /@mapbox/node-pre-gyp@1.0.9:
     resolution: {integrity: sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==}
     hasBin: true
     dependencies:
@@ -1319,7 +1589,7 @@ packages:
     dev: false
     optional: true
 
-  /@msgpackr-extract/msgpackr-extract-darwin-arm64/2.2.0:
+  /@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0:
     resolution: {integrity: sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==}
     cpu: [arm64]
     os: [darwin]
@@ -1327,7 +1597,7 @@ packages:
     dev: false
     optional: true
 
-  /@msgpackr-extract/msgpackr-extract-darwin-x64/2.2.0:
+  /@msgpackr-extract/msgpackr-extract-darwin-x64@2.2.0:
     resolution: {integrity: sha512-vq0tT8sjZsy4JdSqmadWVw6f66UXqUCabLmUVHZwUFzMgtgoIIQjT4VVRHKvlof3P/dMCkbMJ5hB1oJ9OWHaaw==}
     cpu: [x64]
     os: [darwin]
@@ -1335,15 +1605,7 @@ packages:
     dev: false
     optional: true
 
-  /@msgpackr-extract/msgpackr-extract-linux-arm/2.2.0:
-    resolution: {integrity: sha512-SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg==}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@msgpackr-extract/msgpackr-extract-linux-arm64/2.2.0:
+  /@msgpackr-extract/msgpackr-extract-linux-arm64@2.2.0:
     resolution: {integrity: sha512-hlxxLdRmPyq16QCutUtP8Tm6RDWcyaLsRssaHROatgnkOxdleMTgetf9JsdncL8vLh7FVy/RN9i3XR5dnb9cRA==}
     cpu: [arm64]
     os: [linux]
@@ -1351,7 +1613,15 @@ packages:
     dev: false
     optional: true
 
-  /@msgpackr-extract/msgpackr-extract-linux-x64/2.2.0:
+  /@msgpackr-extract/msgpackr-extract-linux-arm@2.2.0:
+    resolution: {integrity: sha512-SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg==}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@msgpackr-extract/msgpackr-extract-linux-x64@2.2.0:
     resolution: {integrity: sha512-94y5PJrSOqUNcFKmOl7z319FelCLAE0rz/jPCWS+UtdMZvpa4jrQd+cJPQCLp2Fes1yAW/YUQj/Di6YVT3c3Iw==}
     cpu: [x64]
     os: [linux]
@@ -1359,7 +1629,7 @@ packages:
     dev: false
     optional: true
 
-  /@msgpackr-extract/msgpackr-extract-win32-x64/2.2.0:
+  /@msgpackr-extract/msgpackr-extract-win32-x64@2.2.0:
     resolution: {integrity: sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA==}
     cpu: [x64]
     os: [win32]
@@ -1367,25 +1637,25 @@ packages:
     dev: false
     optional: true
 
-  /@nodelib/fs.scandir/2.1.5:
+  /@nodelib/fs.scandir@2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
     dependencies:
       '@nodelib/fs.stat': 2.0.5
       run-parallel: 1.2.0
 
-  /@nodelib/fs.stat/2.0.5:
+  /@nodelib/fs.stat@2.0.5:
     resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
     engines: {node: '>= 8'}
 
-  /@nodelib/fs.walk/1.2.8:
+  /@nodelib/fs.walk@1.2.8:
     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
     engines: {node: '>= 8'}
     dependencies:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.15.0
 
-  /@npmcli/fs/2.1.2:
+  /@npmcli/fs@2.1.2:
     resolution: {integrity: sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
@@ -1393,7 +1663,7 @@ packages:
       semver: 7.3.8
     dev: false
 
-  /@npmcli/move-file/2.0.1:
+  /@npmcli/move-file@2.0.1:
     resolution: {integrity: sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     deprecated: This functionality has been moved to @npmcli/fs
@@ -1402,7 +1672,7 @@ packages:
       rimraf: 3.0.2
     dev: false
 
-  /@nsfw-filter/gif-frames/1.0.2:
+  /@nsfw-filter/gif-frames@1.0.2:
     resolution: {integrity: sha512-XZrbJWEN8YfVla5i+PD4Wj51rRlJ8OgnXiPjjOt/OsrbsCR9GZRD4jr953oNWcwiRaoIcOCFWQNMQukO7Yb1dA==}
     dependencies:
       '@nsfw-filter/save-pixels': 2.3.4
@@ -1410,7 +1680,7 @@ packages:
       multi-integer-range: 3.0.0
     dev: false
 
-  /@nsfw-filter/save-pixels/2.3.4:
+  /@nsfw-filter/save-pixels@2.3.4:
     resolution: {integrity: sha512-dRZXwrXadMvxwJYKChrDBqC6GNvxVqlmdkyvZJO5DV65qyBsHZw8bPg9CnX7EgpxGl6+4ba/MAdHDLxs2XoD0Q==}
     dependencies:
       gif-encoder: 0.4.1
@@ -1420,7 +1690,7 @@ packages:
       through: 2.3.4
     dev: false
 
-  /@peertube/http-signature/1.7.0:
+  /@peertube/http-signature@1.7.0:
     resolution: {integrity: sha512-aGQIwo6/sWtyyqhVK4e1MtxYz4N1X8CNt6SOtCc+Wnczs5S5ONaLHDDR8LYaGn0MgOwvGgXyuZ5sJIfd7iyoUw==}
     engines: {node: '>=0.10'}
     dependencies:
@@ -1429,11 +1699,11 @@ packages:
       sshpk: 1.17.0
     dev: false
 
-  /@phosphor-icons/web/2.0.3:
+  /@phosphor-icons/web@2.0.3:
     resolution: {integrity: sha512-9oYmohi2fo87w3DbtfjBoJxrklVojgXq2wuGcqxKccj2TxMq7UIusKDrGUZYOQHM9pUKkh+kvfmutETMGDR6gg==}
     dev: true
 
-  /@redis/bloom/1.1.0_@redis+client@1.4.2:
+  /@redis/bloom@1.1.0(@redis/client@1.4.2):
     resolution: {integrity: sha512-9QovlxmpRtvxVbN0UBcv8WfdSMudNZZTFqCsnBszcQXqaZb/TVe30ScgGEO7u1EAIacTPAo7/oCYjYAxiHLanQ==}
     peerDependencies:
       '@redis/client': ^1.0.0
@@ -1441,7 +1711,7 @@ packages:
       '@redis/client': 1.4.2
     dev: true
 
-  /@redis/client/1.4.2:
+  /@redis/client@1.4.2:
     resolution: {integrity: sha512-oUdEjE0I7JS5AyaAjkD3aOXn9NhO7XKyPyXEyrgFDu++VrVBHUPnV6dgEya9TcMuj5nIJRuCzCm8ZP+c9zCHPw==}
     engines: {node: '>=14'}
     dependencies:
@@ -1450,7 +1720,7 @@ packages:
       yallist: 4.0.0
     dev: true
 
-  /@redis/graph/1.1.0_@redis+client@1.4.2:
+  /@redis/graph@1.1.0(@redis/client@1.4.2):
     resolution: {integrity: sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==}
     peerDependencies:
       '@redis/client': ^1.0.0
@@ -1458,7 +1728,7 @@ packages:
       '@redis/client': 1.4.2
     dev: true
 
-  /@redis/json/1.0.4_@redis+client@1.4.2:
+  /@redis/json@1.0.4(@redis/client@1.4.2):
     resolution: {integrity: sha512-LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw==}
     peerDependencies:
       '@redis/client': ^1.0.0
@@ -1466,7 +1736,7 @@ packages:
       '@redis/client': 1.4.2
     dev: true
 
-  /@redis/search/1.1.0_@redis+client@1.4.2:
+  /@redis/search@1.1.0(@redis/client@1.4.2):
     resolution: {integrity: sha512-NyFZEVnxIJEybpy+YskjgOJRNsfTYqaPbK/Buv6W2kmFNaRk85JiqjJZA5QkRmWvGbyQYwoO5QfDi2wHskKrQQ==}
     peerDependencies:
       '@redis/client': ^1.0.0
@@ -1474,7 +1744,7 @@ packages:
       '@redis/client': 1.4.2
     dev: true
 
-  /@redis/time-series/1.0.4_@redis+client@1.4.2:
+  /@redis/time-series@1.0.4(@redis/client@1.4.2):
     resolution: {integrity: sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==}
     peerDependencies:
       '@redis/client': ^1.0.0
@@ -1482,7 +1752,7 @@ packages:
       '@redis/client': 1.4.2
     dev: true
 
-  /@redocly/ajv/8.11.0:
+  /@redocly/ajv@8.11.0:
     resolution: {integrity: sha512-9GWx27t7xWhDIR02PA18nzBdLcKQRgc46xNQvjFkrYk4UOmvKhJ/dawwiX0cCOeetN5LcaaiqQbVOWYK62SGHw==}
     dependencies:
       fast-deep-equal: 3.1.3
@@ -1491,7 +1761,7 @@ packages:
       uri-js: 4.4.1
     dev: false
 
-  /@redocly/openapi-core/1.0.0-beta.120:
+  /@redocly/openapi-core@1.0.0-beta.120:
     resolution: {integrity: sha512-BvasunpVWm5O9F/mW6JmxUqat4XFU5zNnKJkMY6GJ9UYH2UxgKnGaMLWXKtbJEOBnMT12S/p9yeqrQHnk8rGhQ==}
     engines: {node: '>=12.0.0'}
     dependencies:
@@ -1509,7 +1779,7 @@ packages:
       - encoding
     dev: false
 
-  /@rollup/plugin-alias/3.1.9_rollup@3.9.1:
+  /@rollup/plugin-alias@3.1.9(rollup@3.9.1):
     resolution: {integrity: sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw==}
     engines: {node: '>=8.0.0'}
     peerDependencies:
@@ -1519,16 +1789,16 @@ packages:
       slash: 3.0.0
     dev: true
 
-  /@rollup/plugin-json/4.1.0_rollup@3.9.1:
+  /@rollup/plugin-json@4.1.0(rollup@3.9.1):
     resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==}
     peerDependencies:
       rollup: ^1.20.0 || ^2.0.0
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@3.9.1
+      '@rollup/pluginutils': 3.1.0(rollup@3.9.1)
       rollup: 3.9.1
     dev: true
 
-  /@rollup/pluginutils/3.1.0_rollup@3.9.1:
+  /@rollup/pluginutils@3.1.0(rollup@3.9.1):
     resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
@@ -1540,7 +1810,7 @@ packages:
       rollup: 3.9.1
     dev: true
 
-  /@rollup/pluginutils/4.2.1:
+  /@rollup/pluginutils@4.2.1:
     resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==}
     engines: {node: '>= 8.0.0'}
     dependencies:
@@ -1548,7 +1818,7 @@ packages:
       picomatch: 2.3.1
     dev: true
 
-  /@rometools/cli-darwin-arm64/11.0.0:
+  /@rometools/cli-darwin-arm64@11.0.0:
     resolution: {integrity: sha512-F3vkdY+s3FLIEnAjSbyHTuIPB88cLpccimW4ecid5I7S6GzGG3iUJI4xT00JhH73K4P/qW20/9r+kH1T9Du8Xg==}
     cpu: [arm64]
     os: [darwin]
@@ -1556,7 +1826,7 @@ packages:
     dev: true
     optional: true
 
-  /@rometools/cli-darwin-x64/11.0.0:
+  /@rometools/cli-darwin-x64@11.0.0:
     resolution: {integrity: sha512-X6jhtS6Iml4GOzgNtnLwIp/KXXhSdqeVyfv69m/AHnIzx3gQAjPZ7BPnJLvTCbhe4SKHL+uTZYFSCJpkUUKE6w==}
     cpu: [x64]
     os: [darwin]
@@ -1564,7 +1834,7 @@ packages:
     dev: true
     optional: true
 
-  /@rometools/cli-linux-arm64/11.0.0:
+  /@rometools/cli-linux-arm64@11.0.0:
     resolution: {integrity: sha512-dktTJJlTpmycBZ2TwhJBcAO8ztK8DdevdyZnFFxdYRvtmJgTjIsC2UFayf/SbKew8B8q1IhI0it+D6ihAeIpeg==}
     cpu: [arm64]
     os: [linux]
@@ -1572,7 +1842,7 @@ packages:
     dev: true
     optional: true
 
-  /@rometools/cli-linux-x64/11.0.0:
+  /@rometools/cli-linux-x64@11.0.0:
     resolution: {integrity: sha512-WVcnXPNdWGUWo0p4NU8YzuthjYR7q+b4vRcjdxtP1DlpphZmSsoC/RSE85nEqRAz8hChcKUansVzOPM8BSsuGA==}
     cpu: [x64]
     os: [linux]
@@ -1580,7 +1850,7 @@ packages:
     dev: true
     optional: true
 
-  /@rometools/cli-win32-arm64/11.0.0:
+  /@rometools/cli-win32-arm64@11.0.0:
     resolution: {integrity: sha512-tPj6RThQzS7Q45jqQll7NlTYvNcsg/BEP3LYiiazqSh9FAFnMkrV6ewUcMPKWyAfiyLs7jlz4rRvdNRUSygzfQ==}
     cpu: [arm64]
     os: [win32]
@@ -1588,7 +1858,7 @@ packages:
     dev: true
     optional: true
 
-  /@rometools/cli-win32-x64/11.0.0:
+  /@rometools/cli-win32-x64@11.0.0:
     resolution: {integrity: sha512-bmBai8WHxYjsGk1+je7ZTfCUCWq30WJI3pQM8pzTA674lfGTZ9ymJoZwTaIMSO4rL5V9mlO6uLunsBKso9VqOg==}
     cpu: [x64]
     os: [win32]
@@ -1596,72 +1866,52 @@ packages:
     dev: true
     optional: true
 
-  /@sideway/address/4.1.4:
+  /@sideway/address@4.1.4:
     resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
     dependencies:
       '@hapi/hoek': 9.3.0
     dev: true
 
-  /@sideway/formula/3.0.1:
+  /@sideway/formula@3.0.1:
     resolution: {integrity: sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==}
     dev: true
 
-  /@sideway/pinpoint/2.0.0:
+  /@sideway/pinpoint@2.0.0:
     resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==}
     dev: true
 
-  /@sindresorhus/is/0.7.0:
+  /@sindresorhus/is@0.7.0:
     resolution: {integrity: sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==}
     engines: {node: '>=4'}
     dev: true
 
-  /@sindresorhus/is/4.6.0:
+  /@sindresorhus/is@4.6.0:
     resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
     engines: {node: '>=10'}
     dev: false
 
-  /@sindresorhus/is/5.3.0:
+  /@sindresorhus/is@5.3.0:
     resolution: {integrity: sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==}
     engines: {node: '>=14.16'}
     dev: false
 
-  /@sinonjs/commons/1.8.6:
+  /@sinonjs/commons@1.8.6:
     resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==}
     dependencies:
       type-detect: 4.0.8
     dev: false
 
-  /@sinonjs/fake-timers/9.1.2:
+  /@sinonjs/fake-timers@9.1.2:
     resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==}
     dependencies:
       '@sinonjs/commons': 1.8.6
     dev: false
 
-  /@sqltools/formatter/1.2.5:
+  /@sqltools/formatter@1.2.5:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@swc/cli/0.1.59_@swc+core@1.3.26:
-    resolution: {integrity: sha512-BlX3wIxYTwdtR22dIqZ3FEIOJPqnlByAp4JY46OMZi2UXMB3ZbOzefawD2ZlLafRUWyy5NtiZZty5waKzaYRnA==}
-    engines: {node: '>= 12.13'}
-    hasBin: true
-    peerDependencies:
-      '@swc/core': ^1.2.66
-      chokidar: ^3.5.1
-    peerDependenciesMeta:
-      chokidar:
-        optional: true
-    dependencies:
-      '@swc/core': 1.3.26
-      bin-wrapper: 4.1.0
-      commander: 7.2.0
-      fast-glob: 3.2.12
-      semver: 7.3.8
-      slash: 3.0.0
-      source-map: 0.7.4
-    dev: true
-
-  /@swc/cli/0.1.59_cr4os3zuq4gmhe2qzzjtw2pxeu:
+  /@swc/cli@0.1.59(@swc/core@1.3.26)(chokidar@3.5.3):
     resolution: {integrity: sha512-BlX3wIxYTwdtR22dIqZ3FEIOJPqnlByAp4JY46OMZi2UXMB3ZbOzefawD2ZlLafRUWyy5NtiZZty5waKzaYRnA==}
     engines: {node: '>= 12.13'}
     hasBin: true
@@ -1682,7 +1932,7 @@ packages:
       source-map: 0.7.4
     dev: true
 
-  /@swc/core-android-arm64/1.3.11:
+  /@swc/core-android-arm64@1.3.11:
     resolution: {integrity: sha512-M7FamR3kFpVTyTw73FzKcOZmS7/TWHX75eqtwBTaU9fW4shf0KTLr/h9DnMxNKAnwUMeub/lqlINUe5EKFIKwQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
@@ -1691,7 +1941,7 @@ packages:
     dependencies:
       '@swc/wasm': 1.2.130
 
-  /@swc/core-darwin-arm64/1.3.26:
+  /@swc/core-darwin-arm64@1.3.26:
     resolution: {integrity: sha512-FWWflBfKRYrUJtko2xiedC5XCa31O75IZZqnTWuLpe9g3C5tnUuF3M8LSXZS/dn6wprome1MhtG9GMPkSYkhkg==}
     engines: {node: '>=10'}
     cpu: [arm64]
@@ -1699,7 +1949,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-darwin-x64/1.3.26:
+  /@swc/core-darwin-x64@1.3.26:
     resolution: {integrity: sha512-0uQeebAtsewqJ2b35aPZstGrylwd6oJjUyAJOfVJNbremFSJ5JzytB3NoDCIw7CT5UQrSRpvD3mU95gfdQjDGA==}
     engines: {node: '>=10'}
     cpu: [x64]
@@ -1707,7 +1957,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm-gnueabihf/1.3.26:
+  /@swc/core-linux-arm-gnueabihf@1.3.26:
     resolution: {integrity: sha512-06T+LbVFlyciQtwrUB5/a16A1ju1jFoYvd/hq9TWhf7GrtL43U7oJIgqMOPHx2j0+Ps2R3S6R/UUN5YXu618zA==}
     engines: {node: '>=10'}
     cpu: [arm]
@@ -1715,7 +1965,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm64-gnu/1.3.26:
+  /@swc/core-linux-arm64-gnu@1.3.26:
     resolution: {integrity: sha512-2NT/0xALPfK+U01qIlHxjkGdIj6F0txhu1U2v6B0YP2+k0whL2gCgYeg9QUvkYEXSD5r1Yx+vcb2R/vaSCSClg==}
     engines: {node: '>=10'}
     cpu: [arm64]
@@ -1723,7 +1973,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm64-musl/1.3.26:
+  /@swc/core-linux-arm64-musl@1.3.26:
     resolution: {integrity: sha512-64KrTay9hC0mTvZ1AmEFmNEwV5QDjw9U7PJU5riotSc28I+Q/ZoM0qcSFW9JRRa6F2Tr+IfMtyv8+eB2//BQ5g==}
     engines: {node: '>=10'}
     cpu: [arm64]
@@ -1731,7 +1981,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-x64-gnu/1.3.26:
+  /@swc/core-linux-x64-gnu@1.3.26:
     resolution: {integrity: sha512-Te8G13l3dcRM1Mf3J4JzGUngzNXLKnMYlUmBOYN/ORsx7e+VNelR3zsTLHC0+0jGqELDgqvMyzDfk+dux/C/bQ==}
     engines: {node: '>=10'}
     cpu: [x64]
@@ -1739,7 +1989,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-x64-musl/1.3.26:
+  /@swc/core-linux-x64-musl@1.3.26:
     resolution: {integrity: sha512-nqQWuSM6OTKepUiQ9+rXgERq/JiO72RBOpXKO2afYppsL96sngjIRewV74v5f6IAfyzw+k+AhC5pgRA4Xu/Jkg==}
     engines: {node: '>=10'}
     cpu: [x64]
@@ -1747,7 +1997,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-arm64-msvc/1.3.26:
+  /@swc/core-win32-arm64-msvc@1.3.26:
     resolution: {integrity: sha512-xx34mx+9IBV1sun7sxoNFiqNom9wiOuvsQFJUyQptCnZHgYwOr9OI204LBF95dCcBCZsTm2hT1wBnySJOeimYw==}
     engines: {node: '>=10'}
     cpu: [arm64]
@@ -1755,7 +2005,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-ia32-msvc/1.3.26:
+  /@swc/core-win32-ia32-msvc@1.3.26:
     resolution: {integrity: sha512-48LZ/HKNuU9zl8c7qG6IQKb5rBCwmJgysGOmEGzTRBYxAf/x6Scmt0aqxCoV4J02HOs2WduCBDnhUKsSQ2kcXQ==}
     engines: {node: '>=10'}
     cpu: [ia32]
@@ -1763,7 +2013,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-x64-msvc/1.3.26:
+  /@swc/core-win32-x64-msvc@1.3.26:
     resolution: {integrity: sha512-UPe7S+MezD/S6cKBIc50TduGzmw6PBz1Ms5p+5wDLOKYNS/LSEM4iRmLwvePzP5X8mOyesXrsbwxLy8KHP65Yw==}
     engines: {node: '>=10'}
     cpu: [x64]
@@ -1771,7 +2021,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core/1.3.26:
+  /@swc/core@1.3.26:
     resolution: {integrity: sha512-U7vEsaLn3IGg0XCRLJX/GTkK9WIfFHUX5USdrp1L2QD29sWPe25HqNndXmUR9KytzKmpDMNoUuHyiuhpVrnNeQ==}
     engines: {node: '>=10'}
     requiresBuild: true
@@ -1787,11 +2037,11 @@ packages:
       '@swc/core-win32-ia32-msvc': 1.3.26
       '@swc/core-win32-x64-msvc': 1.3.26
 
-  /@swc/wasm/1.2.130:
+  /@swc/wasm@1.2.130:
     resolution: {integrity: sha512-rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q==}
     requiresBuild: true
 
-  /@syuilo/aiscript/0.11.1:
+  /@syuilo/aiscript@0.11.1:
     resolution: {integrity: sha512-chwOIA3yLUKvOB0G611hjLArKTeOWNmTm3lHERSaDW1d+dS6do56naX6Lkwy2UpnwWC0qzeNSgg35elk6t2gZg==}
     dependencies:
       autobind-decorator: 2.4.0
@@ -1800,21 +2050,21 @@ packages:
       stringz: 2.1.0
       uuid: 7.0.3
 
-  /@szmarczak/http-timer/4.0.6:
+  /@szmarczak/http-timer@4.0.6:
     resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}
     engines: {node: '>=10'}
     dependencies:
       defer-to-connect: 2.0.1
     dev: false
 
-  /@szmarczak/http-timer/5.0.1:
+  /@szmarczak/http-timer@5.0.1:
     resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==}
     engines: {node: '>=14.16'}
     dependencies:
       defer-to-connect: 2.0.1
     dev: false
 
-  /@tensorflow/tfjs-backend-cpu/3.21.0_aipmo6igpprgzt4umpaa3m6sn4:
+  /@tensorflow/tfjs-backend-cpu@3.21.0(@tensorflow/tfjs-core@3.21.0):
     resolution: {integrity: sha512-88S21UAdzyK0CsLUrH17GPTD+26E85OP9CqmLZslaWjWUmBkeTQ5Zqyp6iK+gELnLxPx6q7JsNEeFuPv4254lQ==}
     engines: {yarn: '>= 1.3.2'}
     peerDependencies:
@@ -1825,7 +2075,7 @@ packages:
       seedrandom: 3.0.5
     dev: false
 
-  /@tensorflow/tfjs-backend-cpu/4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y:
+  /@tensorflow/tfjs-backend-cpu@4.2.0(@tensorflow/tfjs-core@4.2.0):
     resolution: {integrity: sha512-8HWg9J69m0Ovc6w8TVhhixMOcwA3t/NPXLblOA/sgJ+/JD5gsbpLWJk4QISQyb1RnpSVzw6PX3BSMTJU7hWVOg==}
     engines: {yarn: '>= 1.3.2'}
     peerDependencies:
@@ -1836,13 +2086,13 @@ packages:
       seedrandom: 3.0.5
     dev: false
 
-  /@tensorflow/tfjs-backend-webgl/3.21.0_aipmo6igpprgzt4umpaa3m6sn4:
+  /@tensorflow/tfjs-backend-webgl@3.21.0(@tensorflow/tfjs-core@3.21.0):
     resolution: {integrity: sha512-N4zitIAT9IX8B8oe489qM3f3VcESxGZIZvHmVP8varOQakTvTX859aaPo1s8hK1qCy4BjSGbweooZe4U8D4kTQ==}
     engines: {yarn: '>= 1.3.2'}
     peerDependencies:
       '@tensorflow/tfjs-core': 3.21.0
     dependencies:
-      '@tensorflow/tfjs-backend-cpu': 3.21.0_aipmo6igpprgzt4umpaa3m6sn4
+      '@tensorflow/tfjs-backend-cpu': 3.21.0(@tensorflow/tfjs-core@3.21.0)
       '@tensorflow/tfjs-core': 3.21.0
       '@types/offscreencanvas': 2019.3.0
       '@types/seedrandom': 2.4.30
@@ -1851,13 +2101,13 @@ packages:
       seedrandom: 3.0.5
     dev: false
 
-  /@tensorflow/tfjs-backend-webgl/4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y:
+  /@tensorflow/tfjs-backend-webgl@4.2.0(@tensorflow/tfjs-core@4.2.0):
     resolution: {integrity: sha512-Qvf+hD5pSh+xi48kChSGzcDKJemkc4EKfoVVjuxl4k25ZUPwuEd7zZUAtinkLu1dzgHNyvePZY8k+9rVm59HJA==}
     engines: {yarn: '>= 1.3.2'}
     peerDependencies:
       '@tensorflow/tfjs-core': 4.2.0
     dependencies:
-      '@tensorflow/tfjs-backend-cpu': 4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y
+      '@tensorflow/tfjs-backend-cpu': 4.2.0(@tensorflow/tfjs-core@4.2.0)
       '@tensorflow/tfjs-core': 4.2.0
       '@types/offscreencanvas': 2019.3.0
       '@types/seedrandom': 2.4.30
@@ -1865,7 +2115,7 @@ packages:
       seedrandom: 3.0.5
     dev: false
 
-  /@tensorflow/tfjs-converter/3.21.0_aipmo6igpprgzt4umpaa3m6sn4:
+  /@tensorflow/tfjs-converter@3.21.0(@tensorflow/tfjs-core@3.21.0):
     resolution: {integrity: sha512-12Y4zVDq3yW+wSjSDpSv4HnpL2sDZrNiGSg8XNiDE4HQBdjdA+a+Q3sZF/8NV9y2yoBhL5L7V4mMLDdbZBd9/Q==}
     peerDependencies:
       '@tensorflow/tfjs-core': 3.21.0
@@ -1873,7 +2123,7 @@ packages:
       '@tensorflow/tfjs-core': 3.21.0
     dev: false
 
-  /@tensorflow/tfjs-converter/4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y:
+  /@tensorflow/tfjs-converter@4.2.0(@tensorflow/tfjs-core@4.2.0):
     resolution: {integrity: sha512-m+E2KJM6yGQdi8ElzWpChdD/JaqhWMCi9yK70v/ndkOaCL2q2UN48nYP2T5S15vkDvMIgzAQyZfh7hxQsMuvRQ==}
     peerDependencies:
       '@tensorflow/tfjs-core': 4.2.0
@@ -1881,7 +2131,7 @@ packages:
       '@tensorflow/tfjs-core': 4.2.0
     dev: false
 
-  /@tensorflow/tfjs-core/3.21.0:
+  /@tensorflow/tfjs-core@3.21.0:
     resolution: {integrity: sha512-YSfsswOqWfd+M4bXIhT3hwtAb+IV8+ODwIxwdFR/7jTAPZP1wMVnSlpKnXHAN64HFOiP+Tm3HmKusEZ0+09A0w==}
     engines: {yarn: '>= 1.3.2'}
     dependencies:
@@ -1897,7 +2147,7 @@ packages:
       - encoding
     dev: false
 
-  /@tensorflow/tfjs-core/4.2.0:
+  /@tensorflow/tfjs-core@4.2.0:
     resolution: {integrity: sha512-uuHkiWVC8b00ngFbHvAV7J7haRlN/9PEdeenCi0CzBjgKd7aN25wPWaoN0TSQcU+GT4FJ8mofMZ9VBYZ/s/WLg==}
     engines: {yarn: '>= 1.3.2'}
     dependencies:
@@ -1913,7 +2163,7 @@ packages:
       - encoding
     dev: false
 
-  /@tensorflow/tfjs-data/3.21.0_5g5qgh2bedza5bmf2zfn7wcrmu:
+  /@tensorflow/tfjs-data@3.21.0(@tensorflow/tfjs-core@3.21.0)(seedrandom@3.0.5):
     resolution: {integrity: sha512-eFLfw2wIcFNxnP2Iv/SnVlihehzKMumk1b5Prcx1ixk/SbkCo5u0Lt7OVOWaEOKVqvB2sT+dJcTjAh6lrCC/QA==}
     peerDependencies:
       '@tensorflow/tfjs-core': 3.21.0
@@ -1928,7 +2178,7 @@ packages:
       - encoding
     dev: false
 
-  /@tensorflow/tfjs-data/4.2.0_qsavyspjcgrxymzlcpasp6rzxe:
+  /@tensorflow/tfjs-data@4.2.0(@tensorflow/tfjs-core@4.2.0)(seedrandom@3.0.5):
     resolution: {integrity: sha512-11t7Q+ikseduJgkd9iSeRrtor1aA3o5PVCFhC5yYvR3JLO55ic1+4Ryo0EJfhRoismS6zBUJrpzX4K0zlLbIfw==}
     peerDependencies:
       '@tensorflow/tfjs-core': 4.2.0
@@ -1943,7 +2193,7 @@ packages:
       - encoding
     dev: false
 
-  /@tensorflow/tfjs-layers/3.21.0_aipmo6igpprgzt4umpaa3m6sn4:
+  /@tensorflow/tfjs-layers@3.21.0(@tensorflow/tfjs-core@3.21.0):
     resolution: {integrity: sha512-CMVXsraakXgnXEnqD9QbtResA7nvV7Jz20pGmjFIodcQkClgmFFhdCG5N+zlVRHEz7VKG2OyfhltZ0dBq/OAhA==}
     peerDependencies:
       '@tensorflow/tfjs-core': 3.21.0
@@ -1951,7 +2201,7 @@ packages:
       '@tensorflow/tfjs-core': 3.21.0
     dev: false
 
-  /@tensorflow/tfjs-layers/4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y:
+  /@tensorflow/tfjs-layers@4.2.0(@tensorflow/tfjs-core@4.2.0):
     resolution: {integrity: sha512-SO0KTmCFOjrW+PlP9nKYXz07XGFq6uE7am9yH2bRaRPWpEeaKT/+k0C9vFMxI/GzRwY8AK4sLe4U+jE1mhYxGw==}
     peerDependencies:
       '@tensorflow/tfjs-core': 4.2.0
@@ -1959,13 +2209,13 @@ packages:
       '@tensorflow/tfjs-core': 4.2.0
     dev: false
 
-  /@tensorflow/tfjs-node/3.21.1_seedrandom@3.0.5:
+  /@tensorflow/tfjs-node@3.21.1(seedrandom@3.0.5):
     resolution: {integrity: sha512-WV77fiuux6E5RR7FRD8RL3yCruhoHjZMI9yybztGLItJwco2YVjHr6h4TOjaZcIMnxu9748iV118MN2ZeLXbdQ==}
     engines: {node: '>=8.11.0'}
     requiresBuild: true
     dependencies:
       '@mapbox/node-pre-gyp': 1.0.9
-      '@tensorflow/tfjs': 3.21.0_seedrandom@3.0.5
+      '@tensorflow/tfjs': 3.21.0(seedrandom@3.0.5)
       adm-zip: 0.5.10
       google-protobuf: 3.21.2
       https-proxy-agent: 2.2.4
@@ -1979,16 +2229,16 @@ packages:
     dev: false
     optional: true
 
-  /@tensorflow/tfjs/3.21.0_seedrandom@3.0.5:
+  /@tensorflow/tfjs@3.21.0(seedrandom@3.0.5):
     resolution: {integrity: sha512-khcARd3/872llL/oF4ouR40qlT71mylU66PGT8kHP/GJ5YKj44sv8lDRjU7lOVlJK7jsJFWEsNVHI3eMc/GWNQ==}
     hasBin: true
     dependencies:
-      '@tensorflow/tfjs-backend-cpu': 3.21.0_aipmo6igpprgzt4umpaa3m6sn4
-      '@tensorflow/tfjs-backend-webgl': 3.21.0_aipmo6igpprgzt4umpaa3m6sn4
-      '@tensorflow/tfjs-converter': 3.21.0_aipmo6igpprgzt4umpaa3m6sn4
+      '@tensorflow/tfjs-backend-cpu': 3.21.0(@tensorflow/tfjs-core@3.21.0)
+      '@tensorflow/tfjs-backend-webgl': 3.21.0(@tensorflow/tfjs-core@3.21.0)
+      '@tensorflow/tfjs-converter': 3.21.0(@tensorflow/tfjs-core@3.21.0)
       '@tensorflow/tfjs-core': 3.21.0
-      '@tensorflow/tfjs-data': 3.21.0_5g5qgh2bedza5bmf2zfn7wcrmu
-      '@tensorflow/tfjs-layers': 3.21.0_aipmo6igpprgzt4umpaa3m6sn4
+      '@tensorflow/tfjs-data': 3.21.0(@tensorflow/tfjs-core@3.21.0)(seedrandom@3.0.5)
+      '@tensorflow/tfjs-layers': 3.21.0(@tensorflow/tfjs-core@3.21.0)
       argparse: 1.0.10
       chalk: 4.1.2
       core-js: 3.27.1
@@ -1999,16 +2249,16 @@ packages:
       - seedrandom
     dev: false
 
-  /@tensorflow/tfjs/4.2.0_seedrandom@3.0.5:
+  /@tensorflow/tfjs@4.2.0(seedrandom@3.0.5):
     resolution: {integrity: sha512-iZmtyGC9IJkx+TpFnkgDol8BHv2BU3zJ01HyNcuvnm1w1EqoNe+1n8bwvLzI/sxHMcHTqzuu7VugMaphryxE+A==}
     hasBin: true
     dependencies:
-      '@tensorflow/tfjs-backend-cpu': 4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y
-      '@tensorflow/tfjs-backend-webgl': 4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y
-      '@tensorflow/tfjs-converter': 4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y
+      '@tensorflow/tfjs-backend-cpu': 4.2.0(@tensorflow/tfjs-core@4.2.0)
+      '@tensorflow/tfjs-backend-webgl': 4.2.0(@tensorflow/tfjs-core@4.2.0)
+      '@tensorflow/tfjs-converter': 4.2.0(@tensorflow/tfjs-core@4.2.0)
       '@tensorflow/tfjs-core': 4.2.0
-      '@tensorflow/tfjs-data': 4.2.0_qsavyspjcgrxymzlcpasp6rzxe
-      '@tensorflow/tfjs-layers': 4.2.0_tkoh6rxfpzme3tc2ndqbqcrg7y
+      '@tensorflow/tfjs-data': 4.2.0(@tensorflow/tfjs-core@4.2.0)(seedrandom@3.0.5)
+      '@tensorflow/tfjs-layers': 4.2.0(@tensorflow/tfjs-core@4.2.0)
       argparse: 1.0.10
       chalk: 4.1.2
       core-js: 3.27.1
@@ -2019,43 +2269,43 @@ packages:
       - seedrandom
     dev: false
 
-  /@tokenizer/token/0.3.0:
+  /@tokenizer/token@0.3.0:
     resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
     dev: false
 
-  /@tootallnate/once/2.0.0:
+  /@tootallnate/once@2.0.0:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
     dev: false
 
-  /@tsconfig/node10/1.0.9:
+  /@tsconfig/node10@1.0.9:
     resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
 
-  /@tsconfig/node12/1.0.11:
+  /@tsconfig/node12@1.0.11:
     resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
 
-  /@tsconfig/node14/1.0.3:
+  /@tsconfig/node14@1.0.3:
     resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
 
-  /@tsconfig/node16/1.0.3:
+  /@tsconfig/node16@1.0.3:
     resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==}
 
-  /@types/accepts/1.3.5:
+  /@types/accepts@1.3.5:
     resolution: {integrity: sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==}
     dependencies:
       '@types/node': 18.11.18
 
-  /@types/bcryptjs/2.4.2:
+  /@types/bcryptjs@2.4.2:
     resolution: {integrity: sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==}
     dev: true
 
-  /@types/body-parser/1.19.2:
+  /@types/body-parser@1.19.2:
     resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
     dependencies:
       '@types/connect': 3.4.35
       '@types/node': 18.11.18
 
-  /@types/bull/3.15.9:
+  /@types/bull@3.15.9:
     resolution: {integrity: sha512-MPUcyPPQauAmynoO3ezHAmCOhbB0pWmYyijr/5ctaCqhbKWsjW0YCod38ZcLzUBprosfZ9dPqfYIcfdKjk7RNQ==}
     dependencies:
       '@types/ioredis': 5.0.0
@@ -2064,7 +2314,7 @@ packages:
       - supports-color
     dev: true
 
-  /@types/cacheable-request/6.0.3:
+  /@types/cacheable-request@6.0.3:
     resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==}
     dependencies:
       '@types/http-cache-semantics': 4.0.1
@@ -2073,29 +2323,29 @@ packages:
       '@types/responselike': 1.0.0
     dev: false
 
-  /@types/cbor/6.0.0:
+  /@types/cbor@6.0.0:
     resolution: {integrity: sha512-mGQ1lbYOwVti5Xlarn1bTeBZqgY0kstsdjnkoEovgohYKdBjGejHyNGXHdMBeqyQazIv32Jjp33+5pBEaSRy2w==}
     deprecated: This is a stub types definition. cbor provides its own type definitions, so you do not need this installed.
     dependencies:
       cbor: 8.1.0
     dev: true
 
-  /@types/co-body/6.1.0:
+  /@types/co-body@6.1.0:
     resolution: {integrity: sha512-3e0q2jyDAnx/DSZi0z2H0yoZ2wt5yRDZ+P7ymcMObvq0ufWRT4tsajyO+Q1VwVWiv9PRR4W3YEjEzBjeZlhF+w==}
     dependencies:
       '@types/node': 18.11.18
       '@types/qs': 6.9.7
     dev: false
 
-  /@types/connect/3.4.35:
+  /@types/connect@3.4.35:
     resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
     dependencies:
       '@types/node': 18.11.18
 
-  /@types/content-disposition/0.5.5:
+  /@types/content-disposition@0.5.5:
     resolution: {integrity: sha512-v6LCdKfK6BwcqMo+wYW05rLS12S0ZO0Fl4w1h4aaZMD7bqT3gVUns6FvLJKGZHQmYn3SX55JWGpziwJRwVgutA==}
 
-  /@types/cookies/0.7.7:
+  /@types/cookies@0.7.7:
     resolution: {integrity: sha512-h7BcvPUogWbKCzBR2lY4oqaZbO3jXZksexYJVFvkrFeLgbZjQkU4x8pRq6eg2MHXQhY0McQdqmmsxRWlVAHooA==}
     dependencies:
       '@types/connect': 3.4.35
@@ -2103,48 +2353,48 @@ packages:
       '@types/keygrip': 1.0.2
       '@types/node': 18.11.18
 
-  /@types/disposable-email-domains/1.0.2:
+  /@types/disposable-email-domains@1.0.2:
     resolution: {integrity: sha512-SDKwyYTjk3y5aZBxxc38yRecpJPjsqn57STz1bNxYYlv4k11bBe7QB8w4llXDTmQXKT1mFvgGmJv+8Zdu3YmJw==}
     dev: false
 
-  /@types/escape-regexp/0.0.1:
+  /@types/escape-regexp@0.0.1:
     resolution: {integrity: sha512-ogj/ZTIdeFkiuxDwawYuZSIgC6suFGgBeZPr6Xs5lHEcvIXTjXGtH+/n8f1XhZhespaUwJ5LIGRICPji972FLw==}
     dev: true
 
-  /@types/eslint-scope/3.7.4:
+  /@types/eslint-scope@3.7.4:
     resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
     dependencies:
       '@types/eslint': 8.4.10
       '@types/estree': 0.0.51
     dev: true
 
-  /@types/eslint/8.4.10:
+  /@types/eslint@8.4.10:
     resolution: {integrity: sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==}
     dependencies:
       '@types/estree': 0.0.51
       '@types/json-schema': 7.0.11
     dev: true
 
-  /@types/estree/0.0.39:
+  /@types/estree@0.0.39:
     resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==}
     dev: true
 
-  /@types/estree/0.0.51:
+  /@types/estree@0.0.51:
     resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==}
     dev: true
 
-  /@types/expect/1.20.4:
+  /@types/expect@1.20.4:
     resolution: {integrity: sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==}
     dev: true
 
-  /@types/express-serve-static-core/4.17.32:
+  /@types/express-serve-static-core@4.17.32:
     resolution: {integrity: sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==}
     dependencies:
       '@types/node': 18.11.18
       '@types/qs': 6.9.7
       '@types/range-parser': 1.2.4
 
-  /@types/express/4.17.15:
+  /@types/express@4.17.15:
     resolution: {integrity: sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==}
     dependencies:
       '@types/body-parser': 1.19.2
@@ -2152,40 +2402,40 @@ packages:
       '@types/qs': 6.9.7
       '@types/serve-static': 1.15.0
 
-  /@types/fluent-ffmpeg/2.1.20:
+  /@types/fluent-ffmpeg@2.1.20:
     resolution: {integrity: sha512-B+OvhCdJ3LgEq2PhvWNOiB/EfwnXLElfMCgc4Z1K5zXgSfo9I6uGKwR/lqmNPFQuebNnes7re3gqkV77SyypLg==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/formidable/2.0.5:
+  /@types/formidable@2.0.5:
     resolution: {integrity: sha512-uvMcdn/KK3maPOaVUAc3HEYbCEhjaGFwww4EsX6IJfWIJ1tzHtDHczuImH3GKdusPnAAmzB07St90uabZeCKPA==}
     dependencies:
       '@types/node': 18.11.18
     dev: false
 
-  /@types/glob-stream/6.1.1:
+  /@types/glob-stream@6.1.1:
     resolution: {integrity: sha512-AGOUTsTdbPkRS0qDeyeS+6KypmfVpbT5j23SN8UPG63qjKXNKjXn6V9wZUr8Fin0m9l8oGYaPK8b2WUMF8xI1A==}
     dependencies:
       '@types/glob': 8.0.0
       '@types/node': 18.11.18
     dev: true
 
-  /@types/glob/8.0.0:
+  /@types/glob@8.0.0:
     resolution: {integrity: sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==}
     dependencies:
       '@types/minimatch': 5.1.2
       '@types/node': 18.11.18
     dev: true
 
-  /@types/gulp-rename/2.0.1:
+  /@types/gulp-rename@2.0.1:
     resolution: {integrity: sha512-9ZjeS2RHEnmBmTcyi2+oeye3BgCsWhvi4uv3qCnAg8i6plOuRdaeNxjOves0ELysEXYLBl7bCl5fbVs7AZtgTA==}
     dependencies:
       '@types/node': 18.11.18
       '@types/vinyl': 2.0.7
     dev: true
 
-  /@types/gulp/4.0.10:
+  /@types/gulp@4.0.10:
     resolution: {integrity: sha512-spgZHJFqiEJGwqGlf7T/k4nkBpBcLgP7T0EfN6G2vvnhUfvd4uO1h8RwpXOE8x/54DVYUs1XCAtBHkX/R3axAQ==}
     dependencies:
       '@types/undertaker': 1.2.8
@@ -2193,17 +2443,17 @@ packages:
       chokidar: 3.5.3
     dev: true
 
-  /@types/http-assert/1.5.3:
+  /@types/http-assert@1.5.3:
     resolution: {integrity: sha512-FyAOrDuQmBi8/or3ns4rwPno7/9tJTijVW6aQQjK02+kOQ8zmoNg2XJtAuQhvQcy1ASJq38wirX5//9J1EqoUA==}
 
-  /@types/http-cache-semantics/4.0.1:
+  /@types/http-cache-semantics@4.0.1:
     resolution: {integrity: sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==}
     dev: false
 
-  /@types/http-errors/2.0.1:
+  /@types/http-errors@2.0.1:
     resolution: {integrity: sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==}
 
-  /@types/ioredis/5.0.0:
+  /@types/ioredis@5.0.0:
     resolution: {integrity: sha512-zJbJ3FVE17CNl5KXzdeSPtdltc4tMT3TzC6fxQS0sQngkbFZ6h+0uTafsRqu+eSLIugf6Yb0Ea0SUuRr42Nk9g==}
     deprecated: This is a stub types definition. ioredis provides its own type definitions, so you do not need this installed.
     dependencies:
@@ -2212,11 +2462,11 @@ packages:
       - supports-color
     dev: true
 
-  /@types/js-yaml/4.0.5:
+  /@types/js-yaml@4.0.5:
     resolution: {integrity: sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==}
     dev: true
 
-  /@types/jsdom/20.0.1:
+  /@types/jsdom@20.0.1:
     resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==}
     dependencies:
       '@types/node': 18.11.18
@@ -2224,76 +2474,76 @@ packages:
       parse5: 7.1.2
     dev: true
 
-  /@types/json-schema/7.0.11:
+  /@types/json-schema@7.0.11:
     resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
     dev: true
 
-  /@types/jsonld/1.5.8:
+  /@types/jsonld@1.5.8:
     resolution: {integrity: sha512-4l5t/jDnJpqZ+i7CLTTgPcT5BYXnAnwJupb07aAokPufCV0SjDHcwctUkSTuhIuSU9yHok+WOOngIGCtpL96gw==}
     dev: true
 
-  /@types/jsrsasign/10.5.4:
+  /@types/jsrsasign@10.5.4:
     resolution: {integrity: sha512-05S2f4lGaWgCwFHsa3OEirc4VJf/sJRfhofzxUbuFbmm6NbffPXZrnJqquQAtS3g4C8Z0L9NHgW0znmtDxNoTQ==}
     dev: true
 
-  /@types/katex/0.14.0:
+  /@types/katex@0.14.0:
     resolution: {integrity: sha512-+2FW2CcT0K3P+JMR8YG846bmDwplKUTsWgT2ENwdQ1UdVfRk3GQrh6Mi4sTopy30gI8Uau5CEqHTDZ6YvWIUPA==}
     dev: true
 
-  /@types/keygrip/1.0.2:
+  /@types/keygrip@1.0.2:
     resolution: {integrity: sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw==}
 
-  /@types/keyv/3.1.4:
+  /@types/keyv@3.1.4:
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
     dependencies:
       '@types/node': 18.11.18
 
-  /@types/koa-bodyparser/4.3.10:
+  /@types/koa-bodyparser@4.3.10:
     resolution: {integrity: sha512-6ae05pjhmrmGhUR8GYD5qr5p9LTEMEGfGXCsK8VaSL+totwigm8+H/7MHW7K4854CMeuwRAubT8qcc/EagaeIA==}
     dependencies:
       '@types/koa': 2.13.5
     dev: true
 
-  /@types/koa-compose/3.2.5:
+  /@types/koa-compose@3.2.5:
     resolution: {integrity: sha512-B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ==}
     dependencies:
       '@types/koa': 2.13.5
 
-  /@types/koa-cors/0.0.2:
+  /@types/koa-cors@0.0.2:
     resolution: {integrity: sha512-uNaDY26HUVO+2C6arK8ZFODs9mBjYprD8mlvkVe2bYdX9wzEeKtycVXPafXpUkePhMh4sffIMkhRDyedokG/QA==}
     dependencies:
       '@types/koa': 2.13.5
     dev: true
 
-  /@types/koa-favicon/2.0.21:
+  /@types/koa-favicon@2.0.21:
     resolution: {integrity: sha512-paH1nheVhijx/VduoR/RCD/qTCiX+OI/6fHLi3mZae053Ts+gUBOrKtzl3pMTDbdEBqdLolfLje3PZbb6jW0jQ==}
     dependencies:
       '@types/koa': 2.13.5
     dev: true
 
-  /@types/koa-logger/3.1.2:
+  /@types/koa-logger@3.1.2:
     resolution: {integrity: sha512-sioTA1xlKYiIgryANWPRHBkG3XGbWftw9slWADUPC+qvPIY/yRLSrhvX7zkJwMrntub5dPO0GuAoyGGf0yitfQ==}
     dependencies:
       '@types/koa': 2.13.5
     dev: true
 
-  /@types/koa-mount/4.0.2:
+  /@types/koa-mount@4.0.2:
     resolution: {integrity: sha512-XnuGwV8bzw22nv2WqOs5a8wCHR2VgSnLLLuBQPzNTmhyiAvH0O6c+994rQVbMaBuwQJKefUInkvKoKuk+21uew==}
     dependencies:
       '@types/koa': 2.13.5
     dev: true
 
-  /@types/koa-send/4.1.3:
+  /@types/koa-send@4.1.3:
     resolution: {integrity: sha512-daaTqPZlgjIJycSTNjKpHYuKhXYP30atFc1pBcy6HHqB9+vcymDgYTguPdx9tO4HMOqNyz6bz/zqpxt5eLR+VA==}
     dependencies:
       '@types/koa': 2.13.5
     dev: true
 
-  /@types/koa-views/7.0.0_6tybghmia4wsnt33xeid7y4rby:
+  /@types/koa-views@7.0.0(@types/koa@2.13.5)(pug@3.0.2):
     resolution: {integrity: sha512-AB/NB+oFHcLOZJYFv3bG5Af8YbwYCD9/zK0WcKALsbjI/FRKrcXTUTC64RebDrkyOkBm3bpCgpGndhAH/3YQ2Q==}
     deprecated: This is a stub types definition. koa-views provides its own type definitions, so you do not need this installed.
     dependencies:
-      koa-views: 7.0.2_6tybghmia4wsnt33xeid7y4rby
+      koa-views: 7.0.2(@types/koa@2.13.5)(ejs@3.1.8)(pug@3.0.2)
     transitivePeerDependencies:
       - '@types/koa'
       - arc-templates
@@ -2352,7 +2602,7 @@ packages:
       - whiskers
     dev: true
 
-  /@types/koa/2.13.5:
+  /@types/koa@2.13.5:
     resolution: {integrity: sha512-HSUOdzKz3by4fnqagwthW/1w/yJspTgppyyalPVbgZf8jQWvdIXcVW5h2DGtw4zYntOaeRGx49r1hxoPWrD4aA==}
     dependencies:
       '@types/accepts': 1.3.5
@@ -2364,205 +2614,205 @@ packages:
       '@types/koa-compose': 3.2.5
       '@types/node': 18.11.18
 
-  /@types/koa__cors/3.3.0:
+  /@types/koa__cors@3.3.0:
     resolution: {integrity: sha512-FUN8YxcBakIs+walVe3+HcNP+Bxd0SB8BJHBWkglZ5C1XQWljlKcEFDG/dPiCIqwVCUbc5X0nYDlH62uEhdHMA==}
     dependencies:
       '@types/koa': 2.13.5
     dev: true
 
-  /@types/koa__multer/2.0.4:
+  /@types/koa__multer@2.0.4:
     resolution: {integrity: sha512-WRkshXhE5rpYFUbbtAjyMhdOOSdbu1XX+2AQlRNM6AZtgxd0/WXMU4lrP7e9tk5HWVTWbx8DOOsVBmfHjSGJ4w==}
     dependencies:
       '@types/koa': 2.13.5
     dev: true
 
-  /@types/koa__router/8.0.11:
+  /@types/koa__router@8.0.11:
     resolution: {integrity: sha512-WXgKWpBsbS14kzmzD9LeFapOIa678h7zvUHxDwXwSx4ETKXhXLVUAToX6jZ/U7EihM7qwyD9W/BZvB0MRu7MTQ==}
     dependencies:
       '@types/koa': 2.13.5
     dev: true
 
-  /@types/long/4.0.2:
+  /@types/long@4.0.2:
     resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==}
     dev: false
 
-  /@types/matter-js/0.18.2:
+  /@types/matter-js@0.18.2:
     resolution: {integrity: sha512-W9UC9DOPNBRTUocqqPZmzX3cbHmlZBI9jLn6SuxZz0n5QrPk382Ig3hbBWHqYU8TRUmTCJJhuanXeyMTavF7Mg==}
     dev: true
 
-  /@types/mime/3.0.1:
+  /@types/mime@3.0.1:
     resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==}
 
-  /@types/minimatch/5.1.2:
+  /@types/minimatch@5.1.2:
     resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
     dev: true
 
-  /@types/mocha/9.1.1:
+  /@types/mocha@9.1.1:
     resolution: {integrity: sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==}
     dev: true
 
-  /@types/node-fetch/2.6.2:
+  /@types/node-fetch@2.6.2:
     resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
     dependencies:
       '@types/node': 18.11.18
       form-data: 3.0.1
     dev: false
 
-  /@types/node-fetch/3.0.3:
+  /@types/node-fetch@3.0.3:
     resolution: {integrity: sha512-HhggYPH5N+AQe/OmN6fmhKmRRt2XuNJow+R3pQwJxOOF9GuwM7O2mheyGeIrs5MOIeNjDEdgdoyHBOrFeJBR3g==}
     deprecated: This is a stub types definition. node-fetch provides its own type definitions, so you do not need this installed.
     dependencies:
       node-fetch: 3.3.0
     dev: true
 
-  /@types/node/14.18.36:
+  /@types/node@14.18.36:
     resolution: {integrity: sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==}
 
-  /@types/node/18.11.18:
+  /@types/node@18.11.18:
     resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
 
-  /@types/nodemailer/6.4.7:
+  /@types/nodemailer@6.4.7:
     resolution: {integrity: sha512-f5qCBGAn/f0qtRcd4SEn88c8Fp3Swct1731X4ryPKqS61/A3LmmzN8zaEz7hneJvpjFbUUgY7lru/B/7ODTazg==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/oauth/0.9.1:
+  /@types/oauth@0.9.1:
     resolution: {integrity: sha512-a1iY62/a3yhZ7qH7cNUsxoI3U/0Fe9+RnuFrpTKr+0WVOzbKlSLojShCKe20aOD1Sppv+i8Zlq0pLDuTJnwS4A==}
     dependencies:
       '@types/node': 18.11.18
 
-  /@types/offscreencanvas/2019.3.0:
+  /@types/offscreencanvas@2019.3.0:
     resolution: {integrity: sha512-esIJx9bQg+QYF0ra8GnvfianIY8qWB0GBx54PK5Eps6m+xTj86KLavHv6qDhzKcu5UUOgNfJ2pWaIIV7TRUd9Q==}
     dev: false
 
-  /@types/offscreencanvas/2019.7.0:
+  /@types/offscreencanvas@2019.7.0:
     resolution: {integrity: sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg==}
     dev: false
 
-  /@types/pug/2.0.6:
+  /@types/pug@2.0.6:
     resolution: {integrity: sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==}
     dev: true
 
-  /@types/punycode/2.1.0:
+  /@types/punycode@2.1.0:
     resolution: {integrity: sha512-PG5aLpW6PJOeV2fHRslP4IOMWn+G+Uq8CfnyJ+PDS8ndCbU+soO+fB3NKCKo0p/Jh2Y4aPaiQZsrOXFdzpcA6g==}
     dev: true
 
-  /@types/qrcode/1.5.0:
+  /@types/qrcode@1.5.0:
     resolution: {integrity: sha512-x5ilHXRxUPIMfjtM+1vf/GPTRWZ81nqscursm5gMznJeK9M0YnZ1c3bEvRLQ0zSSgedLx1J6MGL231ObQGGhaA==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/qs/6.9.7:
+  /@types/qs@6.9.7:
     resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==}
 
-  /@types/random-seed/0.3.3:
+  /@types/random-seed@0.3.3:
     resolution: {integrity: sha512-kHsCbIRHNXJo6EN5W8EA5b4i1hdT6jaZke5crBPLUcLqaLdZ0QBq8QVMbafHzhjFF83Cl9qlee2dChD18d/kPg==}
     dev: true
 
-  /@types/range-parser/1.2.4:
+  /@types/range-parser@1.2.4:
     resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==}
 
-  /@types/ratelimiter/3.4.4:
+  /@types/ratelimiter@3.4.4:
     resolution: {integrity: sha512-GSMb93iSA8KKFDgVL2Wzs/kqrHMJcU8xhLdwI5omoACcj7K18SacklLtY1C4G02HC5drd6GygtsIaGbfxJSe0g==}
     dev: true
 
-  /@types/redis/2.8.32:
+  /@types/redis@2.8.32:
     resolution: {integrity: sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/redis/4.0.11:
+  /@types/redis@4.0.11:
     resolution: {integrity: sha512-bI+gth8La8Wg/QCR1+V1fhrL9+LZUSWfcqpOj2Kc80ZQ4ffbdL173vQd5wovmoV9i071FU9oP2g6etLuEwb6Rg==}
     deprecated: This is a stub types definition. redis provides its own type definitions, so you do not need this installed.
     dependencies:
       redis: 4.5.1
     dev: true
 
-  /@types/rename/1.0.4:
+  /@types/rename@1.0.4:
     resolution: {integrity: sha512-eV81+6bVv2mdCBahkMefjEUwAjKDAP3AuyhqWCWRxcRaeVdUeHUBaoq2zSz+5HNHF2jzTajMcfLvJsy4K3cbwA==}
     dev: true
 
-  /@types/responselike/1.0.0:
+  /@types/responselike@1.0.0:
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
     dependencies:
       '@types/node': 18.11.18
 
-  /@types/sanitize-html/2.8.0:
+  /@types/sanitize-html@2.8.0:
     resolution: {integrity: sha512-Uih6caOm3DsBYnVGOYn0A9NoTNe1c4aPStmHC/YA2JrpP9kx//jzaRcIklFvSpvVQEcpl/ZCr4DgISSf/YxTvg==}
     dependencies:
       htmlparser2: 8.0.1
     dev: true
 
-  /@types/seedrandom/2.4.30:
+  /@types/seedrandom@2.4.30:
     resolution: {integrity: sha512-AnxLHewubLVzoF/A4qdxBGHCKifw8cY32iro3DQX9TPcetE95zBeVt3jnsvtvAUf1vwzMfwzp4t/L2yqPlnjkQ==}
     dev: false
 
-  /@types/seedrandom/3.0.4:
+  /@types/seedrandom@3.0.4:
     resolution: {integrity: sha512-/rWdxeiuZenlawrHU+XV6ZHMTKOqrC2hMfeDfLTIWJhDZP5aVqXRysduYHBbhD7CeJO6FJr/D2uBVXB7GT6v7w==}
     dev: true
 
-  /@types/semver/7.3.13:
+  /@types/semver@7.3.13:
     resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
     dev: true
 
-  /@types/serve-static/1.15.0:
+  /@types/serve-static@1.15.0:
     resolution: {integrity: sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==}
     dependencies:
       '@types/mime': 3.0.1
       '@types/node': 18.11.18
 
-  /@types/sharp/0.31.1:
+  /@types/sharp@0.31.1:
     resolution: {integrity: sha512-5nWwamN9ZFHXaYEincMSuza8nNfOof8nmO+mcI+Agx1uMUk4/pQnNIcix+9rLPXzKrm1pS34+6WRDbDV0Jn7ag==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/sinonjs__fake-timers/8.1.1:
+  /@types/sinonjs__fake-timers@8.1.1:
     resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==}
     dev: true
 
-  /@types/sinonjs__fake-timers/8.1.2:
+  /@types/sinonjs__fake-timers@8.1.2:
     resolution: {integrity: sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==}
     dev: true
 
-  /@types/sizzle/2.3.3:
+  /@types/sizzle@2.3.3:
     resolution: {integrity: sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==}
     dev: true
 
-  /@types/speakeasy/2.0.7:
+  /@types/speakeasy@2.0.7:
     resolution: {integrity: sha512-JEcOhN2SQCoX86ZfiZEe8px84sVJtivBXMZfOVyARTYEj0hrwwbj1nF0FwEL3nJSoEV6uTbcdLllMKBgAYHWCQ==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/throttle-debounce/5.0.0:
+  /@types/throttle-debounce@5.0.0:
     resolution: {integrity: sha512-Pb7k35iCGFcGPECoNE4DYp3Oyf2xcTd3FbFQxXUI9hEYKUl6YX+KLf7HrBmgVcD05nl50LIH6i+80js4iYmWbw==}
     dev: true
 
-  /@types/tinycolor2/1.4.3:
+  /@types/tinycolor2@1.4.3:
     resolution: {integrity: sha512-Kf1w9NE5HEgGxCRyIcRXR/ZYtDv0V8FVPtYHwLxl0O+maGX0erE77pQlD0gpP+/KByMZ87mOA79SjifhSB3PjQ==}
     dev: true
 
-  /@types/tmp/0.2.3:
+  /@types/tmp@0.2.3:
     resolution: {integrity: sha512-dDZH/tXzwjutnuk4UacGgFRwV+JSLaXL1ikvidfJprkb7L9Nx1njcRHHmi3Dsvt7pgqqTEeucQuOrWHPFgzVHA==}
     dev: true
 
-  /@types/tough-cookie/4.0.2:
+  /@types/tough-cookie@4.0.2:
     resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==}
     dev: true
 
-  /@types/trusted-types/2.0.2:
+  /@types/trusted-types@2.0.2:
     resolution: {integrity: sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==}
     dev: true
 
-  /@types/undertaker-registry/1.0.1:
+  /@types/undertaker-registry@1.0.1:
     resolution: {integrity: sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==}
     dev: true
 
-  /@types/undertaker/1.2.8:
+  /@types/undertaker@1.2.8:
     resolution: {integrity: sha512-gW3PRqCHYpo45XFQHJBhch7L6hytPsIe0QeLujlnFsjHPnXLhJcPdN6a9368d7aIQgH2I/dUTPFBlGeSNA3qOg==}
     dependencies:
       '@types/node': 18.11.18
@@ -2570,11 +2820,11 @@ packages:
       async-done: 1.3.2
     dev: true
 
-  /@types/uuid/8.3.4:
+  /@types/uuid@8.3.4:
     resolution: {integrity: sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==}
     dev: true
 
-  /@types/vinyl-fs/2.4.12:
+  /@types/vinyl-fs@2.4.12:
     resolution: {integrity: sha512-LgBpYIWuuGsihnlF+OOWWz4ovwCYlT03gd3DuLwex50cYZLmX3yrW+sFF9ndtmh7zcZpS6Ri47PrIu+fV+sbXw==}
     dependencies:
       '@types/glob-stream': 6.1.1
@@ -2582,46 +2832,46 @@ packages:
       '@types/vinyl': 2.0.7
     dev: true
 
-  /@types/vinyl/2.0.7:
+  /@types/vinyl@2.0.7:
     resolution: {integrity: sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==}
     dependencies:
       '@types/expect': 1.20.4
       '@types/node': 18.11.18
     dev: true
 
-  /@types/web-push/3.3.2:
+  /@types/web-push@3.3.2:
     resolution: {integrity: sha512-JxWGVL/m7mWTIg4mRYO+A6s0jPmBkr4iJr39DqJpRJAc+jrPiEe1/asmkwerzRon8ZZDxaZJpsxpv0Z18Wo9gw==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/webgl-ext/0.0.30:
+  /@types/webgl-ext@0.0.30:
     resolution: {integrity: sha512-LKVgNmBxN0BbljJrVUwkxwRYqzsAEPcZOe6S2T6ZaBDIrFp0qu4FNlpc5sM1tGbXUYFgdVQIoeLk1Y1UoblyEg==}
     dev: false
 
-  /@types/webgl2/0.0.6:
+  /@types/webgl2@0.0.6:
     resolution: {integrity: sha512-50GQhDVTq/herLMiqSQkdtRu+d5q/cWHn4VvKJtrj4DJAjo1MNkWYa2MA41BaBO1q1HgsUjuQvEOk0QHvlnAaQ==}
     dev: false
 
-  /@types/websocket/1.0.5:
+  /@types/websocket@1.0.5:
     resolution: {integrity: sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/ws/8.5.3:
+  /@types/ws@8.5.3:
     resolution: {integrity: sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/ws/8.5.4:
+  /@types/ws@8.5.4:
     resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==}
     dependencies:
       '@types/node': 18.11.18
     dev: false
 
-  /@types/yauzl/2.10.0:
+  /@types/yauzl@2.10.0:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     requiresBuild: true
     dependencies:
@@ -2629,18 +2879,18 @@ packages:
     dev: true
     optional: true
 
-  /@vitejs/plugin-vue/4.0.0_vite@4.1.1+vue@3.2.45:
+  /@vitejs/plugin-vue@4.0.0(vite@4.1.1)(vue@3.2.45):
     resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^4.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 4.1.1_sass@1.57.1
+      vite: 4.1.1(sass@1.57.1)
       vue: 3.2.45
     dev: true
 
-  /@vue/compiler-core/3.2.45:
+  /@vue/compiler-core@3.2.45:
     resolution: {integrity: sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==}
     dependencies:
       '@babel/parser': 7.20.7
@@ -2649,14 +2899,14 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /@vue/compiler-dom/3.2.45:
+  /@vue/compiler-dom@3.2.45:
     resolution: {integrity: sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==}
     dependencies:
       '@vue/compiler-core': 3.2.45
       '@vue/shared': 3.2.45
     dev: true
 
-  /@vue/compiler-sfc/2.7.14:
+  /@vue/compiler-sfc@2.7.14:
     resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
     dependencies:
       '@babel/parser': 7.20.7
@@ -2664,7 +2914,7 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /@vue/compiler-sfc/3.2.45:
+  /@vue/compiler-sfc@3.2.45:
     resolution: {integrity: sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==}
     dependencies:
       '@babel/parser': 7.20.7
@@ -2679,14 +2929,14 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /@vue/compiler-ssr/3.2.45:
+  /@vue/compiler-ssr@3.2.45:
     resolution: {integrity: sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==}
     dependencies:
       '@vue/compiler-dom': 3.2.45
       '@vue/shared': 3.2.45
     dev: true
 
-  /@vue/reactivity-transform/3.2.45:
+  /@vue/reactivity-transform@3.2.45:
     resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==}
     dependencies:
       '@babel/parser': 7.20.7
@@ -2696,20 +2946,20 @@ packages:
       magic-string: 0.25.9
     dev: true
 
-  /@vue/reactivity/3.2.45:
+  /@vue/reactivity@3.2.45:
     resolution: {integrity: sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==}
     dependencies:
       '@vue/shared': 3.2.45
     dev: true
 
-  /@vue/runtime-core/3.2.45:
+  /@vue/runtime-core@3.2.45:
     resolution: {integrity: sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==}
     dependencies:
       '@vue/reactivity': 3.2.45
       '@vue/shared': 3.2.45
     dev: true
 
-  /@vue/runtime-dom/3.2.45:
+  /@vue/runtime-dom@3.2.45:
     resolution: {integrity: sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==}
     dependencies:
       '@vue/runtime-core': 3.2.45
@@ -2717,7 +2967,7 @@ packages:
       csstype: 2.6.21
     dev: true
 
-  /@vue/server-renderer/3.2.45_vue@3.2.45:
+  /@vue/server-renderer@3.2.45(vue@3.2.45):
     resolution: {integrity: sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==}
     peerDependencies:
       vue: 3.2.45
@@ -2727,30 +2977,30 @@ packages:
       vue: 3.2.45
     dev: true
 
-  /@vue/shared/3.2.45:
+  /@vue/shared@3.2.45:
     resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
     dev: true
 
-  /@webassemblyjs/ast/1.11.1:
+  /@webassemblyjs/ast@1.11.1:
     resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
     dependencies:
       '@webassemblyjs/helper-numbers': 1.11.1
       '@webassemblyjs/helper-wasm-bytecode': 1.11.1
     dev: true
 
-  /@webassemblyjs/floating-point-hex-parser/1.11.1:
+  /@webassemblyjs/floating-point-hex-parser@1.11.1:
     resolution: {integrity: sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==}
     dev: true
 
-  /@webassemblyjs/helper-api-error/1.11.1:
+  /@webassemblyjs/helper-api-error@1.11.1:
     resolution: {integrity: sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==}
     dev: true
 
-  /@webassemblyjs/helper-buffer/1.11.1:
+  /@webassemblyjs/helper-buffer@1.11.1:
     resolution: {integrity: sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==}
     dev: true
 
-  /@webassemblyjs/helper-numbers/1.11.1:
+  /@webassemblyjs/helper-numbers@1.11.1:
     resolution: {integrity: sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==}
     dependencies:
       '@webassemblyjs/floating-point-hex-parser': 1.11.1
@@ -2758,11 +3008,11 @@ packages:
       '@xtuc/long': 4.2.2
     dev: true
 
-  /@webassemblyjs/helper-wasm-bytecode/1.11.1:
+  /@webassemblyjs/helper-wasm-bytecode@1.11.1:
     resolution: {integrity: sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==}
     dev: true
 
-  /@webassemblyjs/helper-wasm-section/1.11.1:
+  /@webassemblyjs/helper-wasm-section@1.11.1:
     resolution: {integrity: sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==}
     dependencies:
       '@webassemblyjs/ast': 1.11.1
@@ -2771,23 +3021,23 @@ packages:
       '@webassemblyjs/wasm-gen': 1.11.1
     dev: true
 
-  /@webassemblyjs/ieee754/1.11.1:
+  /@webassemblyjs/ieee754@1.11.1:
     resolution: {integrity: sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==}
     dependencies:
       '@xtuc/ieee754': 1.2.0
     dev: true
 
-  /@webassemblyjs/leb128/1.11.1:
+  /@webassemblyjs/leb128@1.11.1:
     resolution: {integrity: sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==}
     dependencies:
       '@xtuc/long': 4.2.2
     dev: true
 
-  /@webassemblyjs/utf8/1.11.1:
+  /@webassemblyjs/utf8@1.11.1:
     resolution: {integrity: sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==}
     dev: true
 
-  /@webassemblyjs/wasm-edit/1.11.1:
+  /@webassemblyjs/wasm-edit@1.11.1:
     resolution: {integrity: sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==}
     dependencies:
       '@webassemblyjs/ast': 1.11.1
@@ -2800,7 +3050,7 @@ packages:
       '@webassemblyjs/wast-printer': 1.11.1
     dev: true
 
-  /@webassemblyjs/wasm-gen/1.11.1:
+  /@webassemblyjs/wasm-gen@1.11.1:
     resolution: {integrity: sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==}
     dependencies:
       '@webassemblyjs/ast': 1.11.1
@@ -2810,7 +3060,7 @@ packages:
       '@webassemblyjs/utf8': 1.11.1
     dev: true
 
-  /@webassemblyjs/wasm-opt/1.11.1:
+  /@webassemblyjs/wasm-opt@1.11.1:
     resolution: {integrity: sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==}
     dependencies:
       '@webassemblyjs/ast': 1.11.1
@@ -2819,7 +3069,7 @@ packages:
       '@webassemblyjs/wasm-parser': 1.11.1
     dev: true
 
-  /@webassemblyjs/wasm-parser/1.11.1:
+  /@webassemblyjs/wasm-parser@1.11.1:
     resolution: {integrity: sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==}
     dependencies:
       '@webassemblyjs/ast': 1.11.1
@@ -2830,44 +3080,44 @@ packages:
       '@webassemblyjs/utf8': 1.11.1
     dev: true
 
-  /@webassemblyjs/wast-printer/1.11.1:
+  /@webassemblyjs/wast-printer@1.11.1:
     resolution: {integrity: sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==}
     dependencies:
       '@webassemblyjs/ast': 1.11.1
       '@xtuc/long': 4.2.2
     dev: true
 
-  /@webgpu/types/0.1.16:
+  /@webgpu/types@0.1.16:
     resolution: {integrity: sha512-9E61voMP4+Rze02jlTXud++Htpjyyk8vw5Hyw9FGRrmhHQg2GqbuOfwf5Klrb8vTxc2XWI3EfO7RUHMpxTj26A==}
     dev: false
 
-  /@webgpu/types/0.1.21:
+  /@webgpu/types@0.1.21:
     resolution: {integrity: sha512-pUrWq3V5PiSGFLeLxoGqReTZmiiXwY3jRkIG5sLLKjyqNxrwm/04b4nw7LSmGWJcKk59XOM/YRTUwOzo4MMlow==}
     dev: false
 
-  /@webpack-cli/configtest/2.0.1_rjsyjcrmk25kqsjzwkvj3a2evq:
+  /@webpack-cli/configtest@2.0.1(webpack-cli@5.0.1)(webpack@5.75.0):
     resolution: {integrity: sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==}
     engines: {node: '>=14.15.0'}
     peerDependencies:
       webpack: 5.x.x
       webpack-cli: 5.x.x
     dependencies:
-      webpack: 5.75.0_bix6ghzcb3jjkfxenpixt6qrpa
-      webpack-cli: 5.0.1_webpack@5.75.0
+      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      webpack-cli: 5.0.1(webpack@5.75.0)
     dev: true
 
-  /@webpack-cli/info/2.0.1_rjsyjcrmk25kqsjzwkvj3a2evq:
+  /@webpack-cli/info@2.0.1(webpack-cli@5.0.1)(webpack@5.75.0):
     resolution: {integrity: sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==}
     engines: {node: '>=14.15.0'}
     peerDependencies:
       webpack: 5.x.x
       webpack-cli: 5.x.x
     dependencies:
-      webpack: 5.75.0_bix6ghzcb3jjkfxenpixt6qrpa
-      webpack-cli: 5.0.1_webpack@5.75.0
+      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      webpack-cli: 5.0.1(webpack@5.75.0)
     dev: true
 
-  /@webpack-cli/serve/2.0.1_rjsyjcrmk25kqsjzwkvj3a2evq:
+  /@webpack-cli/serve@2.0.1(webpack-cli@5.0.1)(webpack@5.75.0):
     resolution: {integrity: sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==}
     engines: {node: '>=14.15.0'}
     peerDependencies:
@@ -2878,33 +3128,33 @@ packages:
       webpack-dev-server:
         optional: true
     dependencies:
-      webpack: 5.75.0_bix6ghzcb3jjkfxenpixt6qrpa
-      webpack-cli: 5.0.1_webpack@5.75.0
+      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      webpack-cli: 5.0.1(webpack@5.75.0)
     dev: true
 
-  /@xtuc/ieee754/1.2.0:
+  /@xtuc/ieee754@1.2.0:
     resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
     dev: true
 
-  /@xtuc/long/4.2.2:
+  /@xtuc/long@4.2.2:
     resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
     dev: true
 
-  /abab/2.0.6:
+  /abab@2.0.6:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
     dev: false
 
-  /abbrev/1.1.1:
+  /abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
 
-  /abort-controller/3.0.0:
+  /abort-controller@3.0.0:
     resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
     engines: {node: '>=6.5'}
     dependencies:
       event-target-shim: 5.0.1
     dev: false
 
-  /accepts/1.3.8:
+  /accepts@1.3.8:
     resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
     engines: {node: '>= 0.6'}
     dependencies:
@@ -2912,14 +3162,14 @@ packages:
       negotiator: 0.6.3
     dev: false
 
-  /acorn-globals/7.0.1:
+  /acorn-globals@7.0.1:
     resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
     dependencies:
       acorn: 8.8.1
       acorn-walk: 8.2.0
     dev: false
 
-  /acorn-import-assertions/1.8.0_acorn@8.8.1:
+  /acorn-import-assertions@1.8.0(acorn@8.8.1):
     resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
     peerDependencies:
       acorn: ^8
@@ -2927,34 +3177,34 @@ packages:
       acorn: 8.8.1
     dev: true
 
-  /acorn-jsx/5.3.2_acorn@8.8.1:
+  /acorn-jsx@5.3.2(acorn@8.8.1):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       acorn: 8.8.1
 
-  /acorn-walk/8.2.0:
+  /acorn-walk@8.2.0:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
 
-  /acorn/7.4.1:
+  /acorn@7.4.1:
     resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  /acorn/8.8.1:
+  /acorn@8.8.1:
     resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  /adm-zip/0.5.10:
+  /adm-zip@0.5.10:
     resolution: {integrity: sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==}
     engines: {node: '>=6.0'}
     dev: false
     optional: true
 
-  /agent-base/4.3.0:
+  /agent-base@4.3.0:
     resolution: {integrity: sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==}
     engines: {node: '>= 4.0.0'}
     dependencies:
@@ -2962,34 +3212,34 @@ packages:
     dev: false
     optional: true
 
-  /agent-base/6.0.2:
+  /agent-base@6.0.2:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /agentkeepalive/4.2.1:
+  /agentkeepalive@4.2.1:
     resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==}
     engines: {node: '>= 8.0.0'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       depd: 1.1.2
       humanize-ms: 1.2.1
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /aggregate-error/3.1.0:
+  /aggregate-error@3.1.0:
     resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
     engines: {node: '>=8'}
     dependencies:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
-  /ajv-keywords/3.5.2_ajv@6.12.6:
+  /ajv-keywords@3.5.2(ajv@6.12.6):
     resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
     peerDependencies:
       ajv: ^6.9.1
@@ -2997,7 +3247,7 @@ packages:
       ajv: 6.12.6
     dev: true
 
-  /ajv/6.12.6:
+  /ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
     dependencies:
       fast-deep-equal: 3.1.3
@@ -3005,7 +3255,7 @@ packages:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  /ajv/8.11.2:
+  /ajv@8.11.2:
     resolution: {integrity: sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==}
     dependencies:
       fast-deep-equal: 3.1.3
@@ -3014,77 +3264,77 @@ packages:
       uri-js: 4.4.1
     dev: false
 
-  /alphanum-sort/1.0.2:
+  /alphanum-sort@1.0.2:
     resolution: {integrity: sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==}
     dev: true
 
-  /ansi-colors/1.1.0:
+  /ansi-colors@1.1.0:
     resolution: {integrity: sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       ansi-wrap: 0.1.0
     dev: true
 
-  /ansi-colors/4.1.1:
+  /ansi-colors@4.1.1:
     resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==}
     engines: {node: '>=6'}
     dev: true
 
-  /ansi-colors/4.1.3:
+  /ansi-colors@4.1.3:
     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
     engines: {node: '>=6'}
     dev: true
 
-  /ansi-escapes/4.3.2:
+  /ansi-escapes@4.3.2:
     resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.21.3
     dev: true
 
-  /ansi-gray/0.1.1:
+  /ansi-gray@0.1.1:
     resolution: {integrity: sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       ansi-wrap: 0.1.0
     dev: true
 
-  /ansi-regex/2.1.1:
+  /ansi-regex@2.1.1:
     resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /ansi-regex/5.0.1:
+  /ansi-regex@5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
 
-  /ansi-styles/2.2.1:
+  /ansi-styles@2.2.1:
     resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /ansi-styles/3.2.1:
+  /ansi-styles@3.2.1:
     resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
     engines: {node: '>=4'}
     dependencies:
       color-convert: 1.9.3
     dev: false
 
-  /ansi-styles/4.3.0:
+  /ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
     dependencies:
       color-convert: 2.0.1
 
-  /ansi-wrap/0.1.0:
+  /ansi-wrap@0.1.0:
     resolution: {integrity: sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /any-promise/1.3.0:
+  /any-promise@1.3.0:
     resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
 
-  /anymatch/2.0.0:
+  /anymatch@2.0.0:
     resolution: {integrity: sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==}
     dependencies:
       micromatch: 3.1.10
@@ -3093,45 +3343,45 @@ packages:
       - supports-color
     dev: true
 
-  /anymatch/3.1.3:
+  /anymatch@3.1.3:
     resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
     engines: {node: '>= 8'}
     dependencies:
       normalize-path: 3.0.0
       picomatch: 2.3.1
 
-  /app-root-path/3.1.0:
+  /app-root-path@3.1.0:
     resolution: {integrity: sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==}
     engines: {node: '>= 6.0.0'}
     dev: false
 
-  /append-buffer/1.0.2:
+  /append-buffer@1.0.2:
     resolution: {integrity: sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       buffer-equal: 1.0.1
     dev: true
 
-  /append-field/1.0.0:
+  /append-field@1.0.0:
     resolution: {integrity: sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==}
     dev: false
 
-  /aproba/2.0.0:
+  /aproba@2.0.0:
     resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
     dev: false
 
-  /arch/2.2.0:
+  /arch@2.2.0:
     resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
     dev: true
 
-  /archive-type/4.0.0:
+  /archive-type@4.0.0:
     resolution: {integrity: sha512-zV4Ky0v1F8dBrdYElwTvQhweQ0P7Kwc1aluqJsYtOBP01jXcWCyW2IEfI1YiqsG+Iy7ZR+o5LF1N+PGECBxHWA==}
     engines: {node: '>=4'}
     dependencies:
       file-type: 4.4.0
     dev: true
 
-  /archiver-utils/2.1.0:
+  /archiver-utils@2.1.0:
     resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
     engines: {node: '>= 6'}
     dependencies:
@@ -3147,7 +3397,7 @@ packages:
       readable-stream: 2.3.7
     dev: false
 
-  /archiver/5.3.1:
+  /archiver@5.3.1:
     resolution: {integrity: sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==}
     engines: {node: '>= 10'}
     dependencies:
@@ -3160,11 +3410,11 @@ packages:
       zip-stream: 4.1.0
     dev: false
 
-  /archy/1.0.0:
+  /archy@1.0.0:
     resolution: {integrity: sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==}
     dev: true
 
-  /are-we-there-yet/2.0.0:
+  /are-we-there-yet@2.0.0:
     resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==}
     engines: {node: '>=10'}
     dependencies:
@@ -3173,7 +3423,7 @@ packages:
     dev: false
     optional: true
 
-  /are-we-there-yet/3.0.1:
+  /are-we-there-yet@3.0.1:
     resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
@@ -3181,56 +3431,56 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /arg/4.1.3:
+  /arg@4.1.3:
     resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
 
-  /arg/5.0.2:
+  /arg@5.0.2:
     resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
     dev: true
 
-  /argparse/1.0.10:
+  /argparse@1.0.10:
     resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
     dependencies:
       sprintf-js: 1.0.3
 
-  /argparse/2.0.1:
+  /argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
-  /arr-diff/4.0.0:
+  /arr-diff@4.0.0:
     resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /arr-filter/1.1.2:
+  /arr-filter@1.1.2:
     resolution: {integrity: sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       make-iterator: 1.0.1
     dev: true
 
-  /arr-flatten/1.1.0:
+  /arr-flatten@1.1.0:
     resolution: {integrity: sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /arr-map/2.0.2:
+  /arr-map@2.0.2:
     resolution: {integrity: sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       make-iterator: 1.0.1
     dev: true
 
-  /arr-union/3.1.0:
+  /arr-union@3.1.0:
     resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /array-each/1.0.1:
+  /array-each@1.0.1:
     resolution: {integrity: sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /array-initial/1.1.0:
+  /array-initial@1.1.0:
     resolution: {integrity: sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -3238,19 +3488,19 @@ packages:
       is-number: 4.0.0
     dev: true
 
-  /array-last/1.3.0:
+  /array-last@1.3.0:
     resolution: {integrity: sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-number: 4.0.0
     dev: true
 
-  /array-slice/1.1.0:
+  /array-slice@1.1.0:
     resolution: {integrity: sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /array-sort/1.0.0:
+  /array-sort@1.0.0:
     resolution: {integrity: sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -3259,20 +3509,20 @@ packages:
       kind-of: 5.1.0
     dev: true
 
-  /array-union/2.1.0:
+  /array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
     dev: true
 
-  /array-unique/0.3.2:
+  /array-unique@0.3.2:
     resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /asap/2.0.6:
+  /asap@2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
 
-  /asn1.js/5.4.1:
+  /asn1.js@5.4.1:
     resolution: {integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==}
     dependencies:
       bn.js: 4.12.0
@@ -3281,29 +3531,29 @@ packages:
       safer-buffer: 2.1.2
     dev: false
 
-  /asn1/0.2.6:
+  /asn1@0.2.6:
     resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
     dependencies:
       safer-buffer: 2.1.2
 
-  /assert-never/1.2.1:
+  /assert-never@1.2.1:
     resolution: {integrity: sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==}
 
-  /assert-plus/1.0.0:
+  /assert-plus@1.0.0:
     resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
     engines: {node: '>=0.8'}
 
-  /assign-symbols/1.0.0:
+  /assign-symbols@1.0.0:
     resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /astral-regex/2.0.0:
+  /astral-regex@2.0.0:
     resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /async-done/1.3.2:
+  /async-done@1.3.2:
     resolution: {integrity: sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -3313,41 +3563,41 @@ packages:
       stream-exhaust: 1.0.2
     dev: true
 
-  /async-settle/1.0.0:
+  /async-settle@1.0.0:
     resolution: {integrity: sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==}
     engines: {node: '>= 0.10'}
     dependencies:
       async-done: 1.3.2
     dev: true
 
-  /async/3.2.4:
+  /async@3.2.4:
     resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==}
 
-  /asynckit/0.4.0:
+  /asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
 
-  /at-least-node/1.0.0:
+  /at-least-node@1.0.0:
     resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
     engines: {node: '>= 4.0.0'}
     dev: true
 
-  /atob/2.1.2:
+  /atob@2.1.2:
     resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
     engines: {node: '>= 4.5.0'}
     hasBin: true
     dev: true
 
-  /autobind-decorator/2.4.0:
+  /autobind-decorator@2.4.0:
     resolution: {integrity: sha512-OGYhWUO72V6DafbF8PM8rm3EPbfuyMZcJhtm5/n26IDwO18pohE4eNazLoCGhPiXOCD0gEGmrbU3849QvM8bbw==}
     engines: {node: '>=8.10', npm: '>=6.4.1'}
 
-  /autolinker/4.0.0:
+  /autolinker@4.0.0:
     resolution: {integrity: sha512-fl5Kh6BmEEZx+IWBfEirnRUU5+cOiV0OK7PEt0RBKvJMJ8GaRseIOeDU3FKf4j3CE5HVefcjHmhYPOcaVt0bZw==}
     dependencies:
       tslib: 2.4.1
     dev: false
 
-  /autoprefixer/6.7.7:
+  /autoprefixer@6.7.7:
     resolution: {integrity: sha512-WKExI/eSGgGAkWAO+wMVdFObZV7hQen54UpD1kCCTN3tvlL3W1jL4+lPP/M7MwoP7Q4RHzKtO3JQ4HxYEcd+xQ==}
     dependencies:
       browserslist: 1.7.7
@@ -3358,22 +3608,22 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /autosize/5.0.2:
+  /autosize@5.0.2:
     resolution: {integrity: sha512-FPVt5ynkqUAA9gcMZnJHka1XfQgr1WNd/yRfIjmj5WGmjua+u5Hl9hn8M2nU5CNy2bEIcj1ZUwXq7IOHsfZG9w==}
     dev: true
 
-  /autwh/0.1.0:
+  /autwh@0.1.0:
     resolution: {integrity: sha512-IkGZ4kjVlZMkEmDiVtZpGG3lDGHPqsMBIh4IpQKN7idYOJ5EGedqKPO+ychNqh8zrJEEqYsN0NcBkcmoE2uFAw==}
     dependencies:
       oauth: 0.9.15
     dev: false
 
-  /available-typed-arrays/1.0.5:
+  /available-typed-arrays@1.0.5:
     resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
     engines: {node: '>= 0.4'}
     dev: false
 
-  /aws-sdk/2.1277.0:
+  /aws-sdk@2.1277.0:
     resolution: {integrity: sha512-cEZ0rg0j3STtLX6rba5tHMrV/KrhXKLtSleleF2IdTFzUjqRvxI54Pqc51w2D7tgAPUgEhMB4Q/ruKPqB8w+2Q==}
     engines: {node: '>= 10.0.0'}
     dependencies:
@@ -3389,49 +3639,49 @@ packages:
       xml2js: 0.4.19
     dev: false
 
-  /aws-sign2/0.7.0:
+  /aws-sign2@0.7.0:
     resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
 
-  /aws4/1.12.0:
+  /aws4@1.12.0:
     resolution: {integrity: sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==}
 
-  /axios/0.24.0:
+  /axios@0.24.0:
     resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2(debug@4.3.4)
     transitivePeerDependencies:
       - debug
     dev: false
 
-  /axios/0.25.0_debug@4.3.4:
+  /axios@0.25.0(debug@4.3.4):
     resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==}
     dependencies:
-      follow-redirects: 1.15.2_debug@4.3.4
+      follow-redirects: 1.15.2(debug@4.3.4)
     transitivePeerDependencies:
       - debug
     dev: true
 
-  /axios/1.2.2:
+  /axios@1.2.2:
     resolution: {integrity: sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2(debug@4.3.4)
       form-data: 4.0.0
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
     dev: false
 
-  /axios/1.3.2:
+  /axios@1.3.2:
     resolution: {integrity: sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.2(debug@4.3.4)
       form-data: 4.0.0
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
     dev: false
 
-  /babel-eslint/10.1.0_eslint@8.31.0:
+  /babel-eslint@10.1.0(eslint@8.31.0):
     resolution: {integrity: sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==}
     engines: {node: '>=6'}
     deprecated: babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.
@@ -3449,13 +3699,13 @@ packages:
       - supports-color
     dev: false
 
-  /babel-walk/3.0.0-canary-5:
+  /babel-walk@3.0.0-canary-5:
     resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==}
     engines: {node: '>= 10.0.0'}
     dependencies:
       '@babel/types': 7.20.7
 
-  /bach/1.2.0:
+  /bach@1.2.0:
     resolution: {integrity: sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -3470,14 +3720,21 @@ packages:
       now-and-later: 2.0.1
     dev: true
 
-  /balanced-match/0.4.2:
+  /balanced-match@0.4.2:
     resolution: {integrity: sha512-STw03mQKnGUYtoNjmowo4F2cRmIIxYEGiMsjjwla/u5P1lxadj/05WkNaFjNiKTgJkj8KiXbgAiRTmcQRwQNtg==}
     dev: true
 
-  /balanced-match/1.0.2:
+  /balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
-  /base/0.11.2:
+  /base32.js@0.0.1:
+    resolution: {integrity: sha512-EGHIRiegFa62/SsA1J+Xs2tIzludPdzM064N9wjbiEgHnGnJ1V0WEpA4pEwCYT5nDvZk3ubf0shqaCS7k6xeUQ==}
+    dev: false
+
+  /base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
+  /base@0.11.2:
     resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -3490,32 +3747,25 @@ packages:
       pascalcase: 0.1.1
     dev: true
 
-  /base32.js/0.0.1:
-    resolution: {integrity: sha512-EGHIRiegFa62/SsA1J+Xs2tIzludPdzM064N9wjbiEgHnGnJ1V0WEpA4pEwCYT5nDvZk3ubf0shqaCS7k6xeUQ==}
-    dev: false
-
-  /base64-js/1.5.1:
-    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
-
-  /bcrypt-pbkdf/1.0.2:
+  /bcrypt-pbkdf@1.0.2:
     resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
     dependencies:
       tweetnacl: 0.14.5
 
-  /bcryptjs/2.4.3:
+  /bcryptjs@2.4.3:
     resolution: {integrity: sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==}
     dev: false
 
-  /big-integer/1.6.51:
+  /big-integer@1.6.51:
     resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==}
     engines: {node: '>=0.6'}
     dev: false
 
-  /big.js/5.2.2:
+  /big.js@5.2.2:
     resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
     dev: true
 
-  /bin-check/4.1.0:
+  /bin-check@4.1.0:
     resolution: {integrity: sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==}
     engines: {node: '>=4'}
     dependencies:
@@ -3523,7 +3773,7 @@ packages:
       executable: 4.1.1
     dev: true
 
-  /bin-version-check/4.0.0:
+  /bin-version-check@4.0.0:
     resolution: {integrity: sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==}
     engines: {node: '>=6'}
     dependencies:
@@ -3532,7 +3782,7 @@ packages:
       semver-truncate: 1.1.2
     dev: true
 
-  /bin-version/3.1.0:
+  /bin-version@3.1.0:
     resolution: {integrity: sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==}
     engines: {node: '>=6'}
     dependencies:
@@ -3540,7 +3790,7 @@ packages:
       find-versions: 3.2.0
     dev: true
 
-  /bin-wrapper/4.1.0:
+  /bin-wrapper@4.1.0:
     resolution: {integrity: sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==}
     engines: {node: '>=6'}
     dependencies:
@@ -3552,30 +3802,30 @@ packages:
       pify: 4.0.1
     dev: true
 
-  /binary-extensions/2.2.0:
+  /binary-extensions@2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
 
-  /binary/0.3.0:
+  /binary@0.3.0:
     resolution: {integrity: sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==}
     dependencies:
       buffers: 0.1.1
       chainsaw: 0.1.0
     dev: false
 
-  /binaryextensions/2.3.0:
+  /binaryextensions@2.3.0:
     resolution: {integrity: sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==}
     engines: {node: '>=0.8'}
     dev: true
 
-  /bl/1.2.3:
+  /bl@1.2.3:
     resolution: {integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==}
     dependencies:
       readable-stream: 2.3.7
       safe-buffer: 5.2.1
     dev: true
 
-  /bl/4.1.0:
+  /bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
     dependencies:
       buffer: 5.7.1
@@ -3583,44 +3833,44 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /blob-util/2.0.2:
+  /blob-util@2.0.2:
     resolution: {integrity: sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==}
     dev: true
 
-  /bluebird/3.4.7:
+  /bluebird@3.4.7:
     resolution: {integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==}
     dev: false
 
-  /bluebird/3.7.2:
+  /bluebird@3.7.2:
     resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
 
-  /blurhash/1.1.5:
+  /blurhash@1.1.5:
     resolution: {integrity: sha512-a+LO3A2DfxTaTztsmkbLYmUzUeApi0LZuKalwbNmqAHR6HhJGMt1qSV/R3wc+w4DL28holjqO3Bg74aUGavGjg==}
 
-  /bmp-js/0.1.0:
+  /bmp-js@0.1.0:
     resolution: {integrity: sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==}
     dev: false
 
-  /bn.js/4.12.0:
+  /bn.js@4.12.0:
     resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
     dev: false
 
-  /boolbase/1.0.0:
+  /boolbase@1.0.0:
     resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
     dev: false
 
-  /brace-expansion/1.1.11:
+  /brace-expansion@1.1.11:
     resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
-  /brace-expansion/2.0.1:
+  /brace-expansion@2.0.1:
     resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
     dependencies:
       balanced-match: 1.0.2
 
-  /braces/2.3.2:
+  /braces@2.3.2:
     resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -3638,13 +3888,13 @@ packages:
       - supports-color
     dev: true
 
-  /braces/3.0.2:
+  /braces@3.0.2:
     resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
     engines: {node: '>=8'}
     dependencies:
       fill-range: 7.0.1
 
-  /broadcast-channel/4.19.1:
+  /broadcast-channel@4.19.1:
     resolution: {integrity: sha512-CroDV8L4QdMuCHtjs0AATaN2w1rA5e6ca9a3yZATmAs3lbFu3q3QkITkuMS4sQ/NjtZwkVANXLlhgyQfiukBuw==}
     dependencies:
       '@babel/runtime': 7.20.7
@@ -3654,11 +3904,11 @@ packages:
       unload: 2.4.1
     dev: true
 
-  /browser-stdout/1.3.1:
+  /browser-stdout@1.3.1:
     resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==}
     dev: true
 
-  /browserslist/1.7.7:
+  /browserslist@1.7.7:
     resolution: {integrity: sha512-qHJblDE2bXVRYzuDetv/wAeHOJyO97+9wxC1cdCtyzgNuSozOyRCiiLaCR1f71AN66lQdVVBipWm63V+a7bPOw==}
     deprecated: Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.
     hasBin: true
@@ -3667,7 +3917,7 @@ packages:
       electron-to-chromium: 1.4.284
     dev: true
 
-  /browserslist/4.21.4:
+  /browserslist@4.21.4:
     resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
@@ -3675,50 +3925,50 @@ packages:
       caniuse-lite: 1.0.30001443
       electron-to-chromium: 1.4.284
       node-releases: 2.0.8
-      update-browserslist-db: 1.0.10_browserslist@4.21.4
+      update-browserslist-db: 1.0.10(browserslist@4.21.4)
     dev: true
 
-  /buffer-alloc-unsafe/1.1.0:
+  /buffer-alloc-unsafe@1.1.0:
     resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==}
     dev: true
 
-  /buffer-alloc/1.2.0:
+  /buffer-alloc@1.2.0:
     resolution: {integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==}
     dependencies:
       buffer-alloc-unsafe: 1.1.0
       buffer-fill: 1.0.0
     dev: true
 
-  /buffer-crc32/0.2.13:
+  /buffer-crc32@0.2.13:
     resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
 
-  /buffer-equal-constant-time/1.0.1:
+  /buffer-equal-constant-time@1.0.1:
     resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
     dev: false
 
-  /buffer-equal/1.0.1:
+  /buffer-equal@1.0.1:
     resolution: {integrity: sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==}
     engines: {node: '>=0.4'}
     dev: true
 
-  /buffer-fill/1.0.0:
+  /buffer-fill@1.0.0:
     resolution: {integrity: sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==}
     dev: true
 
-  /buffer-from/1.1.2:
+  /buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
-  /buffer-indexof-polyfill/1.0.2:
+  /buffer-indexof-polyfill@1.0.2:
     resolution: {integrity: sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==}
     engines: {node: '>=0.10'}
     dev: false
 
-  /buffer-writer/2.0.0:
+  /buffer-writer@2.0.0:
     resolution: {integrity: sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==}
     engines: {node: '>=4'}
     dev: false
 
-  /buffer/4.9.2:
+  /buffer@4.9.2:
     resolution: {integrity: sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==}
     dependencies:
       base64-js: 1.5.1
@@ -3726,25 +3976,25 @@ packages:
       isarray: 1.0.0
     dev: false
 
-  /buffer/5.7.1:
+  /buffer@5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
 
-  /buffer/6.0.3:
+  /buffer@6.0.3:
     resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
     dev: false
 
-  /buffers/0.1.1:
+  /buffers@0.1.1:
     resolution: {integrity: sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==}
     engines: {node: '>=0.2.0'}
     dev: false
 
-  /bufferutil/4.0.7:
+  /bufferutil@4.0.7:
     resolution: {integrity: sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==}
     engines: {node: '>=6.14.2'}
     requiresBuild: true
@@ -3752,7 +4002,7 @@ packages:
       node-gyp-build: 4.6.0
     dev: false
 
-  /bull/4.10.2:
+  /bull@4.10.2:
     resolution: {integrity: sha512-xa65xtWjQsLqYU/eNaXxq9VRG8xd6qNsQEjR7yjYuae05xKrzbVMVj2QgrYsTMmSs/vsqJjHqHSRRiW1+IkGXQ==}
     engines: {node: '>=12'}
     dependencies:
@@ -3769,19 +4019,19 @@ packages:
       - supports-color
     dev: false
 
-  /busboy/1.6.0:
+  /busboy@1.6.0:
     resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
     engines: {node: '>=10.16.0'}
     dependencies:
       streamsearch: 1.1.0
     dev: false
 
-  /bytes/3.1.2:
+  /bytes@3.1.2:
     resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
     engines: {node: '>= 0.8'}
     dev: false
 
-  /cacache/16.1.3:
+  /cacache@16.1.3:
     resolution: {integrity: sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
@@ -3807,7 +4057,7 @@ packages:
       - bluebird
     dev: false
 
-  /cache-base/1.0.1:
+  /cache-base@1.0.1:
     resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -3822,7 +4072,7 @@ packages:
       unset-value: 1.0.0
     dev: true
 
-  /cache-content-type/1.0.1:
+  /cache-content-type@1.0.1:
     resolution: {integrity: sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==}
     engines: {node: '>= 6.0.0'}
     dependencies:
@@ -3830,17 +4080,17 @@ packages:
       ylru: 1.3.2
     dev: false
 
-  /cacheable-lookup/5.0.4:
+  /cacheable-lookup@5.0.4:
     resolution: {integrity: sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==}
     engines: {node: '>=10.6.0'}
     dev: false
 
-  /cacheable-lookup/7.0.0:
+  /cacheable-lookup@7.0.0:
     resolution: {integrity: sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==}
     engines: {node: '>=14.16'}
     dev: false
 
-  /cacheable-request/10.2.5:
+  /cacheable-request@10.2.5:
     resolution: {integrity: sha512-5RwYYCfzjNPsyJxb/QpaM0bfzx+kw5/YpDhZPm9oMIDntHFQ9YXeyV47ZvzlTE0XrrrbyO2UITJH4GF9eRLdXQ==}
     engines: {node: '>=14.16'}
     dependencies:
@@ -3853,7 +4103,7 @@ packages:
       responselike: 3.0.0
     dev: false
 
-  /cacheable-request/2.1.4:
+  /cacheable-request@2.1.4:
     resolution: {integrity: sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ==}
     dependencies:
       clone-response: 1.0.2
@@ -3865,7 +4115,7 @@ packages:
       responselike: 1.0.2
     dev: true
 
-  /cacheable-request/7.0.2:
+  /cacheable-request@7.0.2:
     resolution: {integrity: sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==}
     engines: {node: '>=8'}
     dependencies:
@@ -3878,12 +4128,12 @@ packages:
       responselike: 2.0.1
     dev: false
 
-  /cachedir/2.3.0:
+  /cachedir@2.3.0:
     resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==}
     engines: {node: '>=6'}
     dev: true
 
-  /calckey-js/0.0.22:
+  /calckey-js@0.0.22:
     resolution: {integrity: sha512-So4Jc3w5QiwNO+8yLomjgNvHR9luKZ5bGLqjIEzAMsD/bIvUqWvriQAyWHN4EweyQUJ8UZCXBG9iyVX8VjtiXw==}
     dependencies:
       autobind-decorator: 2.4.0
@@ -3891,32 +4141,32 @@ packages:
       reconnecting-websocket: 4.4.0
       semver: 7.3.8
 
-  /call-bind/1.0.2:
+  /call-bind@1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
       function-bind: 1.1.1
       get-intrinsic: 1.1.3
 
-  /callsites/3.1.0:
+  /callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
-  /camelcase/3.0.0:
+  /camelcase@3.0.0:
     resolution: {integrity: sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /camelcase/5.3.1:
+  /camelcase@5.3.1:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
     engines: {node: '>=6'}
     dev: false
 
-  /camelcase/6.3.0:
+  /camelcase@6.3.0:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
     engines: {node: '>=10'}
     dev: true
 
-  /caniuse-api/1.6.1:
+  /caniuse-api@1.6.1:
     resolution: {integrity: sha512-SBTl70K0PkDUIebbkXrxWqZlHNs0wRgRD6QZ8guctShjbh63gEPfF+Wj0Yw+75f5Y8tSzqAI/NcisYv/cCah2Q==}
     dependencies:
       browserslist: 1.7.7
@@ -3925,22 +4175,22 @@ packages:
       lodash.uniq: 4.5.0
     dev: true
 
-  /caniuse-db/1.0.30001443:
+  /caniuse-db@1.0.30001443:
     resolution: {integrity: sha512-4KKthVYyooNIOhO1w0OJ13EhEwOGECMrZdkeyDydhvYXaTDA3WdhR8amoJnAgpSgcCR26aOAWk6N9ANVYlv2oQ==}
     dev: true
 
-  /caniuse-lite/1.0.30001443:
+  /caniuse-lite@1.0.30001443:
     resolution: {integrity: sha512-jUo8svymO8+Mkj3qbUbVjR8zv8LUGpGkUM/jKvc9SO2BvjCI980dp9fQbf/dyLs6RascPzgR4nhAKFA4OHeSaA==}
     dev: true
 
-  /canonicalize/1.0.8:
+  /canonicalize@1.0.8:
     resolution: {integrity: sha512-0CNTVCLZggSh7bc5VkX5WWPWO+cyZbNd07IHIsSXLia/eAq+r836hgk+8BKoEh7949Mda87VUOitx5OddVj64A==}
     dev: false
 
-  /caseless/0.12.0:
+  /caseless@0.12.0:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
 
-  /caw/2.0.1:
+  /caw@2.0.1:
     resolution: {integrity: sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==}
     engines: {node: '>=4'}
     dependencies:
@@ -3950,26 +4200,26 @@ packages:
       url-to-options: 1.0.1
     dev: true
 
-  /cbor/8.1.0:
+  /cbor@8.1.0:
     resolution: {integrity: sha512-DwGjNW9omn6EwP70aXsn7FQJx5kO12tX0bZkaTjzdVFM6/7nhA4t0EENocKGx6D2Bch9PE2KzCUf5SceBdeijg==}
     engines: {node: '>=12.19'}
     dependencies:
       nofilter: 3.1.0
 
-  /chainsaw/0.1.0:
+  /chainsaw@0.1.0:
     resolution: {integrity: sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==}
     dependencies:
       traverse: 0.3.9
     dev: false
 
-  /chalk-template/0.4.0:
+  /chalk-template@0.4.0:
     resolution: {integrity: sha512-/ghrgmhfY8RaSdeo43hNXxpoHAtxdbskUHjPpfqUWGttFgycUhYPGx3YZBCnUCvOa7Doivn1IZec3DEGFoMgLg==}
     engines: {node: '>=12'}
     dependencies:
       chalk: 4.1.2
     dev: false
 
-  /chalk/1.1.3:
+  /chalk@1.1.3:
     resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -3980,7 +4230,7 @@ packages:
       supports-color: 2.0.0
     dev: true
 
-  /chalk/2.4.2:
+  /chalk@2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
     dependencies:
@@ -3989,46 +4239,46 @@ packages:
       supports-color: 5.5.0
     dev: false
 
-  /chalk/4.0.0:
+  /chalk@4.0.0:
     resolution: {integrity: sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==}
     engines: {node: '>=10'}
     dependencies:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
-  /chalk/4.1.2:
+  /chalk@4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
     dependencies:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
-  /chalk/5.2.0:
+  /chalk@5.2.0:
     resolution: {integrity: sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==}
     engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
     dev: false
 
-  /char-regex/1.0.2:
+  /char-regex@1.0.2:
     resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
     engines: {node: '>=10'}
 
-  /character-parser/2.2.0:
+  /character-parser@2.2.0:
     resolution: {integrity: sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==}
     dependencies:
       is-regex: 1.1.4
 
-  /charenc/0.0.2:
+  /charenc@0.0.2:
     resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
     dev: true
 
-  /chart.js/4.1.1:
+  /chart.js@4.1.1:
     resolution: {integrity: sha512-P0pCosNXp+LR8zO/QTkZKT6Hb7p0DPFtypEeVOf+6x06hX13NIb75R0DXUA4Ksx/+48chDQKtCCmRCviQRTqsA==}
     engines: {pnpm: ^7.0.0}
     dependencies:
       '@kurkle/color': 0.3.2
     dev: true
 
-  /chartjs-adapter-date-fns/2.0.1_chart.js@4.1.1:
+  /chartjs-adapter-date-fns@2.0.1(chart.js@4.1.1):
     resolution: {integrity: sha512-v3WV9rdnQ05ce3A0ZCjzUekJCAbfm6+3HqSoeY2BIkdMYZoYr/4T+ril1tZyDl869lz6xdNVMXejUFT9YKpw4A==}
     peerDependencies:
       chart.js: '>=2.8.0'
@@ -4036,7 +4286,7 @@ packages:
       chart.js: 4.1.1
     dev: true
 
-  /chartjs-chart-matrix/2.0.1_chart.js@4.1.1:
+  /chartjs-chart-matrix@2.0.1(chart.js@4.1.1):
     resolution: {integrity: sha512-BGfeY+/PHnITyDlc7WfnKJ1RyOfgOzIqWp/gxzzl7pUjyoGzHDcw51qd2xJF9gdT9Def7ZwOnOMm8GJUXDxI0w==}
     peerDependencies:
       chart.js: '>=3.0.0'
@@ -4044,7 +4294,7 @@ packages:
       chart.js: 4.1.1
     dev: true
 
-  /chartjs-plugin-gradient/0.5.1_chart.js@4.1.1:
+  /chartjs-plugin-gradient@0.5.1(chart.js@4.1.1):
     resolution: {integrity: sha512-vhwlYGZWan4MGZZ4Wj64Y4aIql1uCPCU1JcggLWn3cgYEv4G7pXp1YgM4XH5ugmyn6BVCgQqAhiJ2h6hppzHmQ==}
     peerDependencies:
       chart.js: '>=2.6.0'
@@ -4052,7 +4302,7 @@ packages:
       chart.js: 4.1.1
     dev: true
 
-  /chartjs-plugin-zoom/1.2.1_chart.js@4.1.1:
+  /chartjs-plugin-zoom@1.2.1(chart.js@4.1.1):
     resolution: {integrity: sha512-2zbWvw2pljrtMLMXkKw1uxYzAne5PtjJiOZftcut4Lo3Ee8qUt95RpMKDWrZ+pBZxZKQKOD/etdU4pN2jxZUmg==}
     peerDependencies:
       chart.js: ^3.2.0
@@ -4061,12 +4311,12 @@ packages:
       hammerjs: 2.0.8
     dev: true
 
-  /check-more-types/2.24.0:
+  /check-more-types@2.24.0:
     resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /cheerio/0.22.0:
+  /cheerio@0.22.0:
     resolution: {integrity: sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==}
     engines: {node: '>= 0.6'}
     dependencies:
@@ -4088,7 +4338,7 @@ packages:
       lodash.some: 4.6.0
     dev: false
 
-  /chokidar/3.5.3:
+  /chokidar@3.5.3:
     resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
     engines: {node: '>= 8.10.0'}
     dependencies:
@@ -4102,39 +4352,39 @@ packages:
     optionalDependencies:
       fsevents: 2.3.2
 
-  /chownr/1.1.4:
+  /chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
     dev: false
 
-  /chownr/2.0.0:
+  /chownr@2.0.0:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
     engines: {node: '>=10'}
     dev: false
 
-  /chrome-trace-event/1.0.3:
+  /chrome-trace-event@1.0.3:
     resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
     engines: {node: '>=6.0'}
     dev: true
 
-  /ci-info/3.7.1:
+  /ci-info@3.7.1:
     resolution: {integrity: sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==}
     engines: {node: '>=8'}
     dev: true
 
-  /city-timezones/1.2.1:
+  /city-timezones@1.2.1:
     resolution: {integrity: sha512-hruuB611QFoUFMsan7xd9B2VPMrA8XC716O/999WW34kmaJUT1hxKF2W8TSXAWkhSqgvbu70DjcDv7/wpM6vow==}
     dependencies:
       lodash: 4.17.21
     dev: true
 
-  /clap/1.2.3:
+  /clap@1.2.3:
     resolution: {integrity: sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       chalk: 1.1.3
     dev: true
 
-  /class-utils/0.3.6:
+  /class-utils@0.3.6:
     resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -4144,18 +4394,18 @@ packages:
       static-extend: 0.1.2
     dev: true
 
-  /clean-stack/2.2.0:
+  /clean-stack@2.2.0:
     resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
     engines: {node: '>=6'}
 
-  /cli-cursor/3.1.0:
+  /cli-cursor@3.1.0:
     resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
     engines: {node: '>=8'}
     dependencies:
       restore-cursor: 3.1.0
     dev: true
 
-  /cli-highlight/2.1.11:
+  /cli-highlight@2.1.11:
     resolution: {integrity: sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==}
     engines: {node: '>=8.0.0', npm: '>=5.0.0'}
     hasBin: true
@@ -4168,7 +4418,7 @@ packages:
       yargs: 16.2.0
     dev: false
 
-  /cli-table3/0.6.3:
+  /cli-table3@0.6.3:
     resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==}
     engines: {node: 10.* || >= 12.*}
     dependencies:
@@ -4177,7 +4427,7 @@ packages:
       '@colors/colors': 1.5.0
     dev: true
 
-  /cli-truncate/2.1.0:
+  /cli-truncate@2.1.0:
     resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
     engines: {node: '>=8'}
     dependencies:
@@ -4185,7 +4435,7 @@ packages:
       string-width: 4.2.3
     dev: true
 
-  /cliui/3.2.0:
+  /cliui@3.2.0:
     resolution: {integrity: sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==}
     dependencies:
       string-width: 1.0.2
@@ -4193,7 +4443,7 @@ packages:
       wrap-ansi: 2.1.0
     dev: true
 
-  /cliui/6.0.0:
+  /cliui@6.0.0:
     resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
     dependencies:
       string-width: 4.2.3
@@ -4201,14 +4451,14 @@ packages:
       wrap-ansi: 6.2.0
     dev: false
 
-  /cliui/7.0.4:
+  /cliui@7.0.4:
     resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
     dependencies:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
 
-  /cliui/8.0.1:
+  /cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
     dependencies:
@@ -4217,12 +4467,12 @@ packages:
       wrap-ansi: 7.0.0
     dev: false
 
-  /clone-buffer/1.0.0:
+  /clone-buffer@1.0.0:
     resolution: {integrity: sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==}
     engines: {node: '>= 0.10'}
     dev: true
 
-  /clone-deep/4.0.1:
+  /clone-deep@4.0.1:
     resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==}
     engines: {node: '>=6'}
     dependencies:
@@ -4231,33 +4481,33 @@ packages:
       shallow-clone: 3.0.1
     dev: true
 
-  /clone-response/1.0.2:
+  /clone-response@1.0.2:
     resolution: {integrity: sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==}
     dependencies:
       mimic-response: 1.0.1
     dev: true
 
-  /clone-response/1.0.3:
+  /clone-response@1.0.3:
     resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}
     dependencies:
       mimic-response: 1.0.1
     dev: false
 
-  /clone-stats/1.0.0:
+  /clone-stats@1.0.0:
     resolution: {integrity: sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==}
     dev: true
 
-  /clone/1.0.4:
+  /clone@1.0.4:
     resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
     engines: {node: '>=0.8'}
     dev: true
 
-  /clone/2.1.2:
+  /clone@2.1.2:
     resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}
     engines: {node: '>=0.8'}
     dev: true
 
-  /cloneable-readable/1.1.3:
+  /cloneable-readable@1.1.3:
     resolution: {integrity: sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==}
     dependencies:
       inherits: 2.0.4
@@ -4265,16 +4515,16 @@ packages:
       readable-stream: 2.3.7
     dev: true
 
-  /cluster-key-slot/1.1.1:
+  /cluster-key-slot@1.1.1:
     resolution: {integrity: sha512-rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /cluster-key-slot/1.1.2:
+  /cluster-key-slot@1.1.2:
     resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
     engines: {node: '>=0.10.0'}
 
-  /co-body/5.2.0:
+  /co-body@5.2.0:
     resolution: {integrity: sha512-sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ==}
     dependencies:
       inflation: 2.0.0
@@ -4283,7 +4533,7 @@ packages:
       type-is: 1.6.18
     dev: false
 
-  /co-body/6.1.0:
+  /co-body@6.1.0:
     resolution: {integrity: sha512-m7pOT6CdLN7FuXUcpuz/8lfQ/L77x8SchHCF4G0RBTJO20Wzmhn5Sp4/5WsKy8OSpifBSUrmg83qEqaDHdyFuQ==}
     dependencies:
       inflation: 2.0.0
@@ -4292,24 +4542,24 @@ packages:
       type-is: 1.6.18
     dev: false
 
-  /co/4.6.0:
+  /co@4.6.0:
     resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
     dev: false
 
-  /coa/1.0.4:
+  /coa@1.0.4:
     resolution: {integrity: sha512-KAGck/eNAmCL0dcT3BiuYwLbExK6lduR8DxM3C1TyDzaXhZHyZ8ooX5I5+na2e3dPFuibfxrGdorr0/Lr7RYCQ==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       q: 1.5.1
     dev: true
 
-  /code-point-at/1.1.0:
+  /code-point-at@1.1.0:
     resolution: {integrity: sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /collection-map/1.0.0:
+  /collection-map@1.0.0:
     resolution: {integrity: sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -4318,7 +4568,7 @@ packages:
       make-iterator: 1.0.1
     dev: true
 
-  /collection-visit/1.0.0:
+  /collection-visit@1.0.0:
     resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -4326,41 +4576,41 @@ packages:
       object-visit: 1.0.1
     dev: true
 
-  /color-convert/1.9.3:
+  /color-convert@1.9.3:
     resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
     dependencies:
       color-name: 1.1.3
 
-  /color-convert/2.0.1:
+  /color-convert@2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
     engines: {node: '>=7.0.0'}
     dependencies:
       color-name: 1.1.4
 
-  /color-name/1.1.3:
+  /color-name@1.1.3:
     resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
 
-  /color-name/1.1.4:
+  /color-name@1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
 
-  /color-string/0.3.0:
+  /color-string@0.3.0:
     resolution: {integrity: sha512-sz29j1bmSDfoAxKIEU6zwoIZXN6BrFbAMIhfYCNyiZXBDuU/aiHlN84lp/xDzL2ubyFhLDobHIlU1X70XRrMDA==}
     dependencies:
       color-name: 1.1.4
     dev: true
 
-  /color-string/1.9.1:
+  /color-string@1.9.1:
     resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==}
     dependencies:
       color-name: 1.1.4
       simple-swizzle: 0.2.2
     dev: false
 
-  /color-support/1.1.3:
+  /color-support@1.1.3:
     resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
     hasBin: true
 
-  /color/0.11.4:
+  /color@0.11.4:
     resolution: {integrity: sha512-Ajpjd8asqZ6EdxQeqGzU5WBhhTfJ/0cA4Wlbre7e5vXfmDSmda7Ov6jeKoru+b0vHcb1CqvuroTHp5zIWzhVMA==}
     dependencies:
       clone: 1.0.4
@@ -4368,7 +4618,7 @@ packages:
       color-string: 0.3.0
     dev: true
 
-  /color/4.2.3:
+  /color@4.2.3:
     resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==}
     engines: {node: '>=12.5.0'}
     dependencies:
@@ -4376,15 +4626,15 @@ packages:
       color-string: 1.9.1
     dev: false
 
-  /colorette/1.4.0:
+  /colorette@1.4.0:
     resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==}
     dev: false
 
-  /colorette/2.0.19:
+  /colorette@2.0.19:
     resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==}
     dev: true
 
-  /colormin/1.1.2:
+  /colormin@1.1.2:
     resolution: {integrity: sha512-XSEQUUQUR/lXqGyddiNH3XYFUPYlYr1vXy9rTFMsSOw+J7Q6EQkdlQIrTlYn4TccpsOaUE1PYQNjBn20gwCdgQ==}
     dependencies:
       color: 0.11.4
@@ -4392,54 +4642,54 @@ packages:
       has: 1.0.3
     dev: true
 
-  /colors/1.1.2:
+  /colors@1.1.2:
     resolution: {integrity: sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w==}
     engines: {node: '>=0.1.90'}
     dev: true
 
-  /combined-stream/1.0.8:
+  /combined-stream@1.0.8:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
     dependencies:
       delayed-stream: 1.0.0
 
-  /commander/2.20.3:
+  /commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
-  /commander/5.1.0:
+  /commander@5.1.0:
     resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
     engines: {node: '>= 6'}
     dev: true
 
-  /commander/7.2.0:
+  /commander@7.2.0:
     resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
     engines: {node: '>= 10'}
     dev: true
 
-  /commander/8.3.0:
+  /commander@8.3.0:
     resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
     engines: {node: '>= 12'}
     dev: true
 
-  /commander/9.5.0:
+  /commander@9.5.0:
     resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
     engines: {node: ^12.20.0 || >=14}
     dev: true
 
-  /common-tags/1.8.2:
+  /common-tags@1.8.2:
     resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
     engines: {node: '>=4.0.0'}
     dev: true
 
-  /compare-versions/5.0.3:
+  /compare-versions@5.0.3:
     resolution: {integrity: sha512-4UZlZP8Z99MGEY+Ovg/uJxJuvoXuN4M6B3hKaiackiHrgzQFEe3diJi1mf1PNHbFujM7FvLrK2bpgIaImbtZ1A==}
     dev: true
 
-  /component-emitter/1.3.0:
+  /component-emitter@1.3.0:
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
-  /compress-commons/4.1.1:
+  /compress-commons@4.1.1:
     resolution: {integrity: sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==}
     engines: {node: '>= 10'}
     dependencies:
@@ -4449,10 +4699,10 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /concat-map/0.0.1:
+  /concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
-  /concat-stream/1.6.2:
+  /concat-stream@1.6.2:
     resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==}
     engines: {'0': node >= 0.8}
     dependencies:
@@ -4461,7 +4711,7 @@ packages:
       readable-stream: 2.3.7
       typedarray: 0.0.6
 
-  /condense-newlines/0.2.1:
+  /condense-newlines@0.2.1:
     resolution: {integrity: sha512-P7X+QL9Hb9B/c8HI5BFFKmjgBu2XpQuF98WZ9XkO+dBGgk5XgwiQz7o1SmpglNWId3581UcS0SFAWfoIhMHPfg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -4469,17 +4719,17 @@ packages:
       is-whitespace: 0.3.0
       kind-of: 3.2.2
 
-  /config-chain/1.1.13:
+  /config-chain@1.1.13:
     resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
     dependencies:
       ini: 1.3.8
       proto-list: 1.2.4
 
-  /console-control-strings/1.1.0:
+  /console-control-strings@1.1.0:
     resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
     dev: false
 
-  /consolidate/0.16.0_ejs@3.1.8+pug@3.0.2:
+  /consolidate@0.16.0(ejs@3.1.8)(pug@3.0.2):
     resolution: {integrity: sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==}
     engines: {node: '>= 0.10.0'}
     peerDependencies:
@@ -4647,198 +4897,29 @@ packages:
       bluebird: 3.7.2
       ejs: 3.1.8
       pug: 3.0.2
-    dev: false
 
-  /consolidate/0.16.0_pug@3.0.2:
-    resolution: {integrity: sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==}
-    engines: {node: '>= 0.10.0'}
-    peerDependencies:
-      arc-templates: ^0.5.3
-      atpl: '>=0.7.6'
-      babel-core: ^6.26.3
-      bracket-template: ^1.1.5
-      coffee-script: ^1.12.7
-      dot: ^1.1.3
-      dust: ^0.3.0
-      dustjs-helpers: ^1.7.4
-      dustjs-linkedin: ^2.7.5
-      eco: ^1.1.0-rc-3
-      ect: ^0.5.9
-      ejs: ^3.1.5
-      haml-coffee: ^1.14.1
-      hamlet: ^0.3.3
-      hamljs: ^0.6.2
-      handlebars: ^4.7.6
-      hogan.js: ^3.0.2
-      htmling: ^0.0.8
-      jade: ^1.11.0
-      jazz: ^0.0.18
-      jqtpl: ~1.1.0
-      just: ^0.1.8
-      liquid-node: ^3.0.1
-      liquor: ^0.0.5
-      lodash: ^4.17.20
-      marko: ^3.14.4
-      mote: ^0.2.0
-      mustache: ^4.0.1
-      nunjucks: ^3.2.2
-      plates: ~0.4.11
-      pug: ^3.0.0
-      qejs: ^3.0.5
-      ractive: ^1.3.12
-      razor-tmpl: ^1.3.1
-      react: ^16.13.1
-      react-dom: ^16.13.1
-      slm: ^2.0.0
-      squirrelly: ^5.1.0
-      swig: ^1.4.2
-      swig-templates: ^2.0.3
-      teacup: ^2.0.0
-      templayed: '>=0.2.3'
-      then-jade: '*'
-      then-pug: '*'
-      tinyliquid: ^0.2.34
-      toffee: ^0.3.6
-      twig: ^1.15.2
-      twing: ^5.0.2
-      underscore: ^1.11.0
-      vash: ^0.13.0
-      velocityjs: ^2.0.1
-      walrus: ^0.10.1
-      whiskers: ^0.4.0
-    peerDependenciesMeta:
-      arc-templates:
-        optional: true
-      atpl:
-        optional: true
-      babel-core:
-        optional: true
-      bracket-template:
-        optional: true
-      coffee-script:
-        optional: true
-      dot:
-        optional: true
-      dust:
-        optional: true
-      dustjs-helpers:
-        optional: true
-      dustjs-linkedin:
-        optional: true
-      eco:
-        optional: true
-      ect:
-        optional: true
-      ejs:
-        optional: true
-      haml-coffee:
-        optional: true
-      hamlet:
-        optional: true
-      hamljs:
-        optional: true
-      handlebars:
-        optional: true
-      hogan.js:
-        optional: true
-      htmling:
-        optional: true
-      jade:
-        optional: true
-      jazz:
-        optional: true
-      jqtpl:
-        optional: true
-      just:
-        optional: true
-      liquid-node:
-        optional: true
-      liquor:
-        optional: true
-      lodash:
-        optional: true
-      marko:
-        optional: true
-      mote:
-        optional: true
-      mustache:
-        optional: true
-      nunjucks:
-        optional: true
-      plates:
-        optional: true
-      pug:
-        optional: true
-      qejs:
-        optional: true
-      ractive:
-        optional: true
-      razor-tmpl:
-        optional: true
-      react:
-        optional: true
-      react-dom:
-        optional: true
-      slm:
-        optional: true
-      squirrelly:
-        optional: true
-      swig:
-        optional: true
-      swig-templates:
-        optional: true
-      teacup:
-        optional: true
-      templayed:
-        optional: true
-      then-jade:
-        optional: true
-      then-pug:
-        optional: true
-      tinyliquid:
-        optional: true
-      toffee:
-        optional: true
-      twig:
-        optional: true
-      twing:
-        optional: true
-      underscore:
-        optional: true
-      vash:
-        optional: true
-      velocityjs:
-        optional: true
-      walrus:
-        optional: true
-      whiskers:
-        optional: true
-    dependencies:
-      bluebird: 3.7.2
-      pug: 3.0.2
-
-  /constantinople/4.0.1:
+  /constantinople@4.0.1:
     resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==}
     dependencies:
       '@babel/parser': 7.20.7
       '@babel/types': 7.20.7
 
-  /content-disposition/0.5.4:
+  /content-disposition@0.5.4:
     resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
     engines: {node: '>= 0.6'}
     dependencies:
       safe-buffer: 5.2.1
 
-  /content-type/1.0.4:
+  /content-type@1.0.4:
     resolution: {integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==}
     engines: {node: '>= 0.6'}
     dev: false
 
-  /convert-source-map/1.9.0:
+  /convert-source-map@1.9.0:
     resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
     dev: true
 
-  /cookies/0.8.0:
+  /cookies@0.8.0:
     resolution: {integrity: sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==}
     engines: {node: '>= 0.8'}
     dependencies:
@@ -4846,45 +4927,45 @@ packages:
       keygrip: 1.1.0
     dev: false
 
-  /copy-descriptor/0.1.1:
+  /copy-descriptor@0.1.1:
     resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /copy-props/2.0.5:
+  /copy-props@2.0.5:
     resolution: {integrity: sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==}
     dependencies:
       each-props: 1.3.2
       is-plain-object: 5.0.0
     dev: true
 
-  /copy-to/2.0.1:
+  /copy-to@2.0.1:
     resolution: {integrity: sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==}
     dev: false
 
-  /core-js/3.27.1:
+  /core-js@3.27.1:
     resolution: {integrity: sha512-GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww==}
     requiresBuild: true
     dev: false
 
-  /core-js/3.29.0:
+  /core-js@3.29.0:
     resolution: {integrity: sha512-VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg==}
     requiresBuild: true
     dev: true
 
-  /core-util-is/1.0.2:
+  /core-util-is@1.0.2:
     resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
 
-  /core-util-is/1.0.3:
+  /core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
-  /crc-32/1.2.2:
+  /crc-32@1.2.2:
     resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
     engines: {node: '>=0.8'}
     hasBin: true
     dev: false
 
-  /crc32-stream/4.0.2:
+  /crc32-stream@4.0.2:
     resolution: {integrity: sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==}
     engines: {node: '>= 10'}
     dependencies:
@@ -4892,24 +4973,24 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /create-require/1.1.1:
+  /create-require@1.1.1:
     resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
 
-  /cron-parser/4.7.1:
+  /cron-parser@4.7.1:
     resolution: {integrity: sha512-WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA==}
     engines: {node: '>=12.0.0'}
     dependencies:
       luxon: 3.2.1
     dev: false
 
-  /cropperjs/2.0.0-beta.2:
+  /cropperjs@2.0.0-beta.2:
     resolution: {integrity: sha512-jDRSODDGKmi9vp3p/+WXkxMqV/AE+GpSld1U3cHZDRdLy9UykRzurSe8k1dR0TExn45ygCMrv31qkg+K3EeXXw==}
     dependencies:
       '@cropper/elements': 2.0.0-beta.2
       '@cropper/utils': 2.0.0-beta.2
     dev: true
 
-  /cross-env/7.0.3:
+  /cross-env@7.0.3:
     resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
     engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
     hasBin: true
@@ -4917,7 +4998,7 @@ packages:
       cross-spawn: 7.0.3
     dev: true
 
-  /cross-spawn/5.1.0:
+  /cross-spawn@5.1.0:
     resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
     dependencies:
       lru-cache: 4.1.5
@@ -4925,7 +5006,7 @@ packages:
       which: 1.3.1
     dev: true
 
-  /cross-spawn/6.0.5:
+  /cross-spawn@6.0.5:
     resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
     engines: {node: '>=4.8'}
     dependencies:
@@ -4936,7 +5017,7 @@ packages:
       which: 1.3.1
     dev: true
 
-  /cross-spawn/7.0.3:
+  /cross-spawn@7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
     dependencies:
@@ -4944,15 +5025,15 @@ packages:
       shebang-command: 2.0.0
       which: 2.0.2
 
-  /crypt/0.0.2:
+  /crypt@0.0.2:
     resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
     dev: true
 
-  /css-color-names/0.0.4:
+  /css-color-names@0.0.4:
     resolution: {integrity: sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==}
     dev: true
 
-  /css-select/1.2.0:
+  /css-select@1.2.0:
     resolution: {integrity: sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==}
     dependencies:
       boolbase: 1.0.0
@@ -4961,11 +5042,11 @@ packages:
       nth-check: 1.0.2
     dev: false
 
-  /css-what/2.1.3:
+  /css-what@2.1.3:
     resolution: {integrity: sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==}
     dev: false
 
-  /cssnano/3.10.0:
+  /cssnano@3.10.0:
     resolution: {integrity: sha512-0o0IMQE0Ezo4b41Yrm8U6Rp9/Ag81vNXY1gZMnT1XhO4DpjEf2utKERqWJbOoz3g1Wdc1d3QSta/cIuJ1wSTEg==}
     dependencies:
       autoprefixer: 6.7.7
@@ -5002,7 +5083,7 @@ packages:
       postcss-zindex: 2.2.0
     dev: true
 
-  /csso/2.3.2:
+  /csso@2.3.2:
     resolution: {integrity: sha512-FmCI/hmqDeHHLaIQckMhMZneS84yzUZdrWDAvJVVxOwcKE1P1LF9FGmzr1ktIQSxOw6fl3PaQsmfg+GN+VvR3w==}
     engines: {node: '>=0.10.0'}
     hasBin: true
@@ -5011,47 +5092,47 @@ packages:
       source-map: 0.5.7
     dev: true
 
-  /cssom/0.3.8:
+  /cssom@0.3.8:
     resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
     dev: false
 
-  /cssom/0.5.0:
+  /cssom@0.5.0:
     resolution: {integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==}
     dev: false
 
-  /cssstyle/2.3.0:
+  /cssstyle@2.3.0:
     resolution: {integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==}
     engines: {node: '>=8'}
     dependencies:
       cssom: 0.3.8
     dev: false
 
-  /csstype/2.6.21:
+  /csstype@2.6.21:
     resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
     dev: true
 
-  /csstype/3.1.1:
+  /csstype@3.1.1:
     resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
     dev: true
 
-  /custom-event-polyfill/1.0.7:
+  /custom-event-polyfill@1.0.7:
     resolution: {integrity: sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w==}
     dev: true
 
-  /cwise-compiler/1.1.3:
+  /cwise-compiler@1.1.3:
     resolution: {integrity: sha512-WXlK/m+Di8DMMcCjcWr4i+XzcQra9eCdXIJrgh4TUgh0pIS/yJduLxS9JgefsHJ/YVLdgPtXm9r62W92MvanEQ==}
     dependencies:
       uniq: 1.0.1
     dev: false
 
-  /cypress/10.11.0:
+  /cypress@10.11.0:
     resolution: {integrity: sha512-lsaE7dprw5DoXM00skni6W5ElVVLGAdRUUdZjX2dYsGjbY/QnpzWZ95Zom1mkGg0hAaO/QVTZoFVS7Jgr/GUPA==}
     engines: {node: '>=12.0.0'}
     hasBin: true
     requiresBuild: true
     dependencies:
       '@cypress/request': 2.88.11
-      '@cypress/xvfb': 1.2.4_supports-color@8.1.1
+      '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
       '@types/node': 14.18.36
       '@types/sinonjs__fake-timers': 8.1.1
       '@types/sizzle': 2.3.3
@@ -5067,19 +5148,19 @@ packages:
       commander: 5.1.0
       common-tags: 1.8.2
       dayjs: 1.11.7
-      debug: 4.3.4_supports-color@8.1.1
+      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
+      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
+      listr2: 3.14.0(enquirer@2.3.6)
       lodash: 4.17.21
       log-symbols: 4.1.0
       minimist: 1.2.7
@@ -5094,27 +5175,27 @@ packages:
       yauzl: 2.10.0
     dev: true
 
-  /d/1.0.1:
+  /d@1.0.1:
     resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
     dependencies:
       es5-ext: 0.10.62
       type: 1.2.0
 
-  /dashdash/1.14.1:
+  /dashdash@1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
     dependencies:
       assert-plus: 1.0.0
 
-  /data-uri-to-buffer/0.0.3:
+  /data-uri-to-buffer@0.0.3:
     resolution: {integrity: sha512-Cp+jOa8QJef5nXS5hU7M1DWzXPEIoVR3kbV0dQuVGwROZg8bGf1DcCnkmajBTnvghTtSNMUdRrPjgaT6ZQucbw==}
     dev: false
 
-  /data-uri-to-buffer/4.0.1:
+  /data-uri-to-buffer@4.0.1:
     resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
     engines: {node: '>= 12'}
 
-  /data-urls/3.0.2:
+  /data-urls@3.0.2:
     resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==}
     engines: {node: '>=12'}
     dependencies:
@@ -5123,14 +5204,14 @@ packages:
       whatwg-url: 11.0.0
     dev: false
 
-  /date-fns/2.29.3:
+  /date-fns@2.29.3:
     resolution: {integrity: sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==}
     engines: {node: '>=0.11'}
 
-  /dayjs/1.11.7:
+  /dayjs@1.11.7:
     resolution: {integrity: sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==}
 
-  /debug/2.6.9:
+  /debug@2.6.9:
     resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
     peerDependencies:
       supports-color: '*'
@@ -5140,18 +5221,7 @@ packages:
     dependencies:
       ms: 2.0.0
 
-  /debug/3.2.7:
-    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.3
-    dev: false
-
-  /debug/3.2.7_supports-color@8.1.1:
+  /debug@3.2.7(supports-color@8.1.1):
     resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
     peerDependencies:
       supports-color: '*'
@@ -5161,9 +5231,8 @@ packages:
     dependencies:
       ms: 2.1.3
       supports-color: 8.1.1
-    dev: true
 
-  /debug/4.3.3:
+  /debug@4.3.3:
     resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==}
     engines: {node: '>=6.0'}
     peerDependencies:
@@ -5175,18 +5244,7 @@ packages:
       ms: 2.1.2
     dev: false
 
-  /debug/4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-
-  /debug/4.3.4_supports-color@8.1.1:
+  /debug@4.3.4(supports-color@8.1.1):
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
     peerDependencies:
@@ -5197,45 +5255,44 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 8.1.1
-    dev: true
 
-  /debuglog/1.0.1:
+  /debuglog@1.0.1:
     resolution: {integrity: sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==}
     dev: false
 
-  /decamelize/1.2.0:
+  /decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
 
-  /decamelize/4.0.0:
+  /decamelize@4.0.0:
     resolution: {integrity: sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==}
     engines: {node: '>=10'}
     dev: true
 
-  /decimal.js/10.4.3:
+  /decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
     dev: false
 
-  /decode-uri-component/0.2.2:
+  /decode-uri-component@0.2.2:
     resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
     engines: {node: '>=0.10'}
     dev: true
 
-  /decompress-response/3.3.0:
+  /decompress-response@3.3.0:
     resolution: {integrity: sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==}
     engines: {node: '>=4'}
     dependencies:
       mimic-response: 1.0.1
     dev: true
 
-  /decompress-response/6.0.0:
+  /decompress-response@6.0.0:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
     dependencies:
       mimic-response: 3.1.0
     dev: false
 
-  /decompress-tar/4.1.1:
+  /decompress-tar@4.1.1:
     resolution: {integrity: sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==}
     engines: {node: '>=4'}
     dependencies:
@@ -5244,7 +5301,7 @@ packages:
       tar-stream: 1.6.2
     dev: true
 
-  /decompress-tarbz2/4.1.1:
+  /decompress-tarbz2@4.1.1:
     resolution: {integrity: sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==}
     engines: {node: '>=4'}
     dependencies:
@@ -5255,7 +5312,7 @@ packages:
       unbzip2-stream: 1.4.3
     dev: true
 
-  /decompress-targz/4.1.1:
+  /decompress-targz@4.1.1:
     resolution: {integrity: sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==}
     engines: {node: '>=4'}
     dependencies:
@@ -5264,7 +5321,7 @@ packages:
       is-stream: 1.1.0
     dev: true
 
-  /decompress-unzip/4.0.1:
+  /decompress-unzip@4.0.1:
     resolution: {integrity: sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==}
     engines: {node: '>=4'}
     dependencies:
@@ -5274,7 +5331,7 @@ packages:
       yauzl: 2.10.0
     dev: true
 
-  /decompress/4.2.1:
+  /decompress@4.2.1:
     resolution: {integrity: sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==}
     engines: {node: '>=4'}
     dependencies:
@@ -5288,7 +5345,7 @@ packages:
       strip-dirs: 2.1.0
     dev: true
 
-  /deep-email-validator/0.1.21:
+  /deep-email-validator@0.1.21:
     resolution: {integrity: sha512-DBAmMzbr+MAubXQ+TS9tZuPwLcdKscb8YzKZiwoLqF3NmaeEgXvSSHhZ0EXOFeKFE2FNWC4mNXCyiQ/JdFXUwg==}
     dependencies:
       '@types/disposable-email-domains': 1.0.2
@@ -5299,41 +5356,41 @@ packages:
       - debug
     dev: false
 
-  /deep-equal/1.0.1:
+  /deep-equal@1.0.1:
     resolution: {integrity: sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==}
     dev: false
 
-  /deep-extend/0.6.0:
+  /deep-extend@0.6.0:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
     engines: {node: '>=4.0.0'}
     dev: false
 
-  /deep-is/0.1.4:
+  /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
-  /deepmerge/4.2.2:
+  /deepmerge@4.2.2:
     resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /default-compare/1.0.0:
+  /default-compare@1.0.0:
     resolution: {integrity: sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 5.1.0
     dev: true
 
-  /default-resolution/2.0.0:
+  /default-resolution@2.0.0:
     resolution: {integrity: sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==}
     engines: {node: '>= 0.10'}
     dev: true
 
-  /defer-to-connect/2.0.1:
+  /defer-to-connect@2.0.1:
     resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==}
     engines: {node: '>=10'}
     dev: false
 
-  /define-properties/1.1.4:
+  /define-properties@1.1.4:
     resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -5341,21 +5398,21 @@ packages:
       object-keys: 1.1.1
     dev: true
 
-  /define-property/0.2.5:
+  /define-property@0.2.5:
     resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-descriptor: 0.1.6
     dev: true
 
-  /define-property/1.0.0:
+  /define-property@1.0.0:
     resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-descriptor: 1.0.2
     dev: true
 
-  /define-property/2.0.2:
+  /define-property@2.0.2:
     resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -5363,159 +5420,159 @@ packages:
       isobject: 3.0.1
     dev: true
 
-  /defined/1.0.1:
+  /defined@1.0.1:
     resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==}
     dev: true
 
-  /delayed-stream/1.0.0:
+  /delayed-stream@1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
 
-  /delegates/1.0.0:
+  /delegates@1.0.0:
     resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
     dev: false
 
-  /denque/2.1.0:
+  /denque@2.1.0:
     resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==}
     engines: {node: '>=0.10'}
 
-  /depd/1.1.2:
+  /depd@1.1.2:
     resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==}
     engines: {node: '>= 0.6'}
 
-  /depd/2.0.0:
+  /depd@2.0.0:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
     engines: {node: '>= 0.8'}
     dev: false
 
-  /destroy/1.2.0:
+  /destroy@1.2.0:
     resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
     engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
     dev: false
 
-  /detect-file/1.0.0:
+  /detect-file@1.0.0:
     resolution: {integrity: sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /detect-libc/2.0.1:
+  /detect-libc@2.0.1:
     resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==}
     engines: {node: '>=8'}
     dev: false
 
-  /dezalgo/1.0.4:
+  /dezalgo@1.0.4:
     resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
     dependencies:
       asap: 2.0.6
       wrappy: 1.0.2
     dev: false
 
-  /diff/4.0.2:
+  /diff@4.0.2:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
 
-  /diff/5.0.0:
+  /diff@5.0.0:
     resolution: {integrity: sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==}
     engines: {node: '>=0.3.1'}
     dev: true
 
-  /dijkstrajs/1.0.2:
+  /dijkstrajs@1.0.2:
     resolution: {integrity: sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg==}
     dev: false
 
-  /dir-glob/3.0.1:
+  /dir-glob@3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
     dependencies:
       path-type: 4.0.0
     dev: true
 
-  /disposable-email-domains/1.0.62:
+  /disposable-email-domains@1.0.62:
     resolution: {integrity: sha512-LBQvhRw7mznQTPoyZbsmYeNOZt1pN5aCsx4BAU/3siVFuiM9f2oyKzUaB8v1jbxFjE3aYqYiMo63kAL4pHgfWQ==}
     dev: false
 
-  /doctrine/3.0.0:
+  /doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
     dependencies:
       esutils: 2.0.3
 
-  /doctypes/1.1.0:
+  /doctypes@1.1.0:
     resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==}
 
-  /dom-serializer/0.1.1:
+  /dom-serializer@0.1.1:
     resolution: {integrity: sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==}
     dependencies:
       domelementtype: 1.3.1
       entities: 1.1.2
     dev: false
 
-  /dom-serializer/2.0.0:
+  /dom-serializer@2.0.0:
     resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
     dependencies:
       domelementtype: 2.3.0
       domhandler: 5.0.3
       entities: 4.4.0
 
-  /dom7/4.0.4:
+  /dom7@4.0.4:
     resolution: {integrity: sha512-DSSgBzQ4rJWQp1u6o+3FVwMNnT5bzQbMb+o31TjYYeRi05uAcpF8koxdfzeoe5ElzPmua7W7N28YJhF7iEKqIw==}
     dependencies:
       ssr-window: 4.0.2
     dev: true
 
-  /domelementtype/1.3.1:
+  /domelementtype@1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: false
 
-  /domelementtype/2.3.0:
+  /domelementtype@2.3.0:
     resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
 
-  /domexception/4.0.0:
+  /domexception@4.0.0:
     resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==}
     engines: {node: '>=12'}
     dependencies:
       webidl-conversions: 7.0.0
     dev: false
 
-  /domhandler/2.4.2:
+  /domhandler@2.4.2:
     resolution: {integrity: sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==}
     dependencies:
       domelementtype: 1.3.1
     dev: false
 
-  /domhandler/5.0.3:
+  /domhandler@5.0.3:
     resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
     engines: {node: '>= 4'}
     dependencies:
       domelementtype: 2.3.0
 
-  /domutils/1.5.1:
+  /domutils@1.5.1:
     resolution: {integrity: sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==}
     dependencies:
       dom-serializer: 0.1.1
       domelementtype: 1.3.1
     dev: false
 
-  /domutils/1.7.0:
+  /domutils@1.7.0:
     resolution: {integrity: sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==}
     dependencies:
       dom-serializer: 0.1.1
       domelementtype: 1.3.1
     dev: false
 
-  /domutils/3.0.1:
+  /domutils@3.0.1:
     resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
     dependencies:
       dom-serializer: 2.0.0
       domelementtype: 2.3.0
       domhandler: 5.0.3
 
-  /dotenv/16.0.3:
+  /dotenv@16.0.3:
     resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
     engines: {node: '>=12'}
     dev: false
 
-  /download/7.1.0:
+  /download@7.1.0:
     resolution: {integrity: sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==}
     engines: {node: '>=6'}
     dependencies:
@@ -5533,21 +5590,21 @@ packages:
       pify: 3.0.0
     dev: true
 
-  /duplexer/0.1.2:
-    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
-    dev: true
-
-  /duplexer2/0.1.4:
+  /duplexer2@0.1.4:
     resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==}
     dependencies:
       readable-stream: 2.3.7
     dev: false
 
-  /duplexer3/0.1.5:
+  /duplexer3@0.1.5:
     resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==}
     dev: true
 
-  /duplexify/3.7.1:
+  /duplexer@0.1.2:
+    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
+    dev: true
+
+  /duplexify@3.7.1:
     resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==}
     dependencies:
       end-of-stream: 1.4.4
@@ -5556,26 +5613,26 @@ packages:
       stream-shift: 1.0.1
     dev: true
 
-  /each-props/1.3.2:
+  /each-props@1.3.2:
     resolution: {integrity: sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==}
     dependencies:
       is-plain-object: 2.0.4
       object.defaults: 1.1.0
     dev: true
 
-  /ecc-jsbn/0.1.2:
+  /ecc-jsbn@0.1.2:
     resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
     dependencies:
       jsbn: 0.1.1
       safer-buffer: 2.1.2
 
-  /ecdsa-sig-formatter/1.0.11:
+  /ecdsa-sig-formatter@1.0.11:
     resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
     dependencies:
       safe-buffer: 5.2.1
     dev: false
 
-  /editorconfig/0.15.3:
+  /editorconfig@0.15.3:
     resolution: {integrity: sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==}
     hasBin: true
     dependencies:
@@ -5584,40 +5641,39 @@ packages:
       semver: 5.7.1
       sigmund: 1.0.1
 
-  /ee-first/1.1.1:
+  /ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
     dev: false
 
-  /ejs/3.1.8:
+  /ejs@3.1.8:
     resolution: {integrity: sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==}
     engines: {node: '>=0.10.0'}
     hasBin: true
     dependencies:
       jake: 10.8.5
-    dev: false
 
-  /electron-to-chromium/1.4.284:
+  /electron-to-chromium@1.4.284:
     resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
     dev: true
 
-  /emoji-regex/8.0.0:
+  /emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
-  /emojis-list/3.0.0:
+  /emojis-list@3.0.0:
     resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==}
     engines: {node: '>= 4'}
     dev: true
 
-  /encode-utf8/1.0.3:
+  /encode-utf8@1.0.3:
     resolution: {integrity: sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==}
     dev: false
 
-  /encodeurl/1.0.2:
+  /encodeurl@1.0.2:
     resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}
     engines: {node: '>= 0.8'}
     dev: false
 
-  /encoding/0.1.13:
+  /encoding@0.1.13:
     resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
     requiresBuild: true
     dependencies:
@@ -5625,12 +5681,12 @@ packages:
     dev: false
     optional: true
 
-  /end-of-stream/1.4.4:
+  /end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
     dependencies:
       once: 1.4.0
 
-  /enhanced-resolve/5.12.0:
+  /enhanced-resolve@5.12.0:
     resolution: {integrity: sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==}
     engines: {node: '>=10.13.0'}
     dependencies:
@@ -5638,51 +5694,51 @@ packages:
       tapable: 2.2.1
     dev: true
 
-  /enquirer/2.3.6:
+  /enquirer@2.3.6:
     resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==}
     engines: {node: '>=8.6'}
     dependencies:
       ansi-colors: 4.1.3
     dev: true
 
-  /entities/1.1.2:
+  /entities@1.1.2:
     resolution: {integrity: sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==}
     dev: false
 
-  /entities/2.2.0:
+  /entities@2.2.0:
     resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
     dev: false
 
-  /entities/4.4.0:
+  /entities@4.4.0:
     resolution: {integrity: sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==}
     engines: {node: '>=0.12'}
 
-  /env-paths/2.2.1:
+  /env-paths@2.2.1:
     resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
     engines: {node: '>=6'}
     dev: false
 
-  /envinfo/7.8.1:
+  /envinfo@7.8.1:
     resolution: {integrity: sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==}
     engines: {node: '>=4'}
     hasBin: true
     dev: true
 
-  /err-code/2.0.3:
+  /err-code@2.0.3:
     resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
     dev: false
 
-  /error-ex/1.3.2:
+  /error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
       is-arrayish: 0.2.1
     dev: true
 
-  /es-module-lexer/0.9.3:
+  /es-module-lexer@0.9.3:
     resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
     dev: true
 
-  /es5-ext/0.10.62:
+  /es5-ext@0.10.62:
     resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
     engines: {node: '>=0.10'}
     requiresBuild: true
@@ -5691,32 +5747,32 @@ packages:
       es6-symbol: 3.1.3
       next-tick: 1.1.0
 
-  /es6-iterator/2.0.3:
+  /es6-iterator@2.0.3:
     resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
     dependencies:
       d: 1.0.1
       es5-ext: 0.10.62
       es6-symbol: 3.1.3
 
-  /es6-promise/4.2.8:
+  /es6-promise@4.2.8:
     resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==}
     dev: false
     optional: true
 
-  /es6-promisify/5.0.0:
+  /es6-promisify@5.0.0:
     resolution: {integrity: sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==}
     dependencies:
       es6-promise: 4.2.8
     dev: false
     optional: true
 
-  /es6-symbol/3.1.3:
+  /es6-symbol@3.1.3:
     resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
     dependencies:
       d: 1.0.1
       ext: 1.7.0
 
-  /es6-weak-map/2.0.3:
+  /es6-weak-map@2.0.3:
     resolution: {integrity: sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==}
     dependencies:
       d: 1.0.1
@@ -5725,7 +5781,7 @@ packages:
       es6-symbol: 3.1.3
     dev: true
 
-  /esbuild/0.16.17:
+  /esbuild@0.16.17:
     resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==}
     engines: {node: '>=12'}
     hasBin: true
@@ -5755,26 +5811,26 @@ packages:
       '@esbuild/win32-x64': 0.16.17
     dev: true
 
-  /escalade/3.1.1:
+  /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
 
-  /escape-html/1.0.3:
+  /escape-html@1.0.3:
     resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
     dev: false
 
-  /escape-regexp/0.0.1:
+  /escape-regexp@0.0.1:
     resolution: {integrity: sha512-jVgdsYRa7RKxTT6MKNC3gdT+BF0Gfhpel19+HMRZJC2L0PufB0XOBuXBoXj29NKHwuktnAXd1Z1lyiH/8vOTpw==}
 
-  /escape-string-regexp/1.0.5:
+  /escape-string-regexp@1.0.5:
     resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
     engines: {node: '>=0.8.0'}
 
-  /escape-string-regexp/4.0.0:
+  /escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
 
-  /escodegen/2.0.0:
+  /escodegen@2.0.0:
     resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==}
     engines: {node: '>=6.0'}
     hasBin: true
@@ -5787,7 +5843,7 @@ packages:
       source-map: 0.6.1
     dev: false
 
-  /eslint-scope/5.1.1:
+  /eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
     engines: {node: '>=8.0.0'}
     dependencies:
@@ -5795,14 +5851,14 @@ packages:
       estraverse: 4.3.0
     dev: true
 
-  /eslint-scope/7.1.1:
+  /eslint-scope@7.1.1:
     resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       esrecurse: 4.3.0
       estraverse: 5.3.0
 
-  /eslint-utils/3.0.0_eslint@8.31.0:
+  /eslint-utils@3.0.0(eslint@8.31.0):
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
@@ -5811,20 +5867,20 @@ packages:
       eslint: 8.31.0
       eslint-visitor-keys: 2.1.0
 
-  /eslint-visitor-keys/1.3.0:
+  /eslint-visitor-keys@1.3.0:
     resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==}
     engines: {node: '>=4'}
     dev: false
 
-  /eslint-visitor-keys/2.1.0:
+  /eslint-visitor-keys@2.1.0:
     resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
     engines: {node: '>=10'}
 
-  /eslint-visitor-keys/3.3.0:
+  /eslint-visitor-keys@3.3.0:
     resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  /eslint/8.31.0:
+  /eslint@8.31.0:
     resolution: {integrity: sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
@@ -5836,11 +5892,11 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.31.0
+      eslint-utils: 3.0.0(eslint@8.31.0)
       eslint-visitor-keys: 3.3.0
       espree: 9.4.1
       esquery: 1.4.0
@@ -5871,60 +5927,60 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /espree/9.4.1:
+  /espree@9.4.1:
     resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       acorn: 8.8.1
-      acorn-jsx: 5.3.2_acorn@8.8.1
+      acorn-jsx: 5.3.2(acorn@8.8.1)
       eslint-visitor-keys: 3.3.0
 
-  /esprima/2.7.3:
+  /esprima@2.7.3:
     resolution: {integrity: sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==}
     engines: {node: '>=0.10.0'}
     hasBin: true
     dev: true
 
-  /esprima/4.0.1:
+  /esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
     hasBin: true
     dev: false
 
-  /esquery/1.4.0:
+  /esquery@1.4.0:
     resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
     engines: {node: '>=0.10'}
     dependencies:
       estraverse: 5.3.0
 
-  /esrecurse/4.3.0:
+  /esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
     engines: {node: '>=4.0'}
     dependencies:
       estraverse: 5.3.0
 
-  /estraverse/4.3.0:
+  /estraverse@4.3.0:
     resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
     engines: {node: '>=4.0'}
     dev: true
 
-  /estraverse/5.3.0:
+  /estraverse@5.3.0:
     resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
     engines: {node: '>=4.0'}
 
-  /estree-walker/1.0.1:
+  /estree-walker@1.0.1:
     resolution: {integrity: sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==}
     dev: true
 
-  /estree-walker/2.0.2:
+  /estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
     dev: true
 
-  /esutils/2.0.3:
+  /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
 
-  /event-stream/3.3.4:
+  /event-stream@3.3.4:
     resolution: {integrity: sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==}
     dependencies:
       duplexer: 0.1.2
@@ -5936,29 +5992,29 @@ packages:
       through: 2.3.8
     dev: true
 
-  /event-target-shim/5.0.1:
+  /event-target-shim@5.0.1:
     resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
     engines: {node: '>=6'}
     dev: false
 
-  /eventemitter2/6.4.7:
+  /eventemitter2@6.4.7:
     resolution: {integrity: sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==}
     dev: true
 
-  /eventemitter3/4.0.7:
+  /eventemitter3@4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
 
-  /events/1.1.1:
+  /events@1.1.1:
     resolution: {integrity: sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==}
     engines: {node: '>=0.4.x'}
     dev: false
 
-  /events/3.3.0:
+  /events@3.3.0:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
     engines: {node: '>=0.8.x'}
     dev: true
 
-  /execa/0.7.0:
+  /execa@0.7.0:
     resolution: {integrity: sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==}
     engines: {node: '>=4'}
     dependencies:
@@ -5971,7 +6027,7 @@ packages:
       strip-eof: 1.0.0
     dev: true
 
-  /execa/1.0.0:
+  /execa@1.0.0:
     resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==}
     engines: {node: '>=6'}
     dependencies:
@@ -5984,7 +6040,7 @@ packages:
       strip-eof: 1.0.0
     dev: true
 
-  /execa/4.1.0:
+  /execa@4.1.0:
     resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
     engines: {node: '>=10'}
     dependencies:
@@ -5999,7 +6055,7 @@ packages:
       strip-final-newline: 2.0.0
     dev: true
 
-  /execa/5.1.1:
+  /execa@5.1.1:
     resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
     engines: {node: '>=10'}
     dependencies:
@@ -6014,7 +6070,7 @@ packages:
       strip-final-newline: 2.0.0
     dev: true
 
-  /execa/6.1.0:
+  /execa@6.1.0:
     resolution: {integrity: sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
@@ -6029,20 +6085,20 @@ packages:
       strip-final-newline: 3.0.0
     dev: true
 
-  /executable/4.1.1:
+  /executable@4.1.1:
     resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}
     engines: {node: '>=4'}
     dependencies:
       pify: 2.3.0
     dev: true
 
-  /executioner/2.0.1:
+  /executioner@2.0.1:
     resolution: {integrity: sha512-idZAlKsxEZASjaIqP4PQ1txyS1bOcDwWCHy/8p5oMmLGV0XNCQPD6WWAOwJCUVsWItWzAN2BEash5N78PliaIw==}
     dependencies:
       mixly: 1.0.0
     dev: true
 
-  /expand-brackets/2.1.4:
+  /expand-brackets@2.1.4:
     resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -6057,26 +6113,26 @@ packages:
       - supports-color
     dev: true
 
-  /expand-template/2.0.3:
+  /expand-template@2.0.3:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
     dev: false
 
-  /expand-tilde/2.0.2:
+  /expand-tilde@2.0.2:
     resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       homedir-polyfill: 1.0.3
     dev: true
 
-  /ext-list/2.2.2:
+  /ext-list@2.2.2:
     resolution: {integrity: sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       mime-db: 1.52.0
     dev: true
 
-  /ext-name/5.0.0:
+  /ext-name@5.0.0:
     resolution: {integrity: sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==}
     engines: {node: '>=4'}
     dependencies:
@@ -6084,18 +6140,18 @@ packages:
       sort-keys-length: 1.0.1
     dev: true
 
-  /ext/1.7.0:
+  /ext@1.7.0:
     resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
     dependencies:
       type: 2.7.2
 
-  /extend-shallow/2.0.1:
+  /extend-shallow@2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-extendable: 0.1.1
 
-  /extend-shallow/3.0.2:
+  /extend-shallow@3.0.2:
     resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -6103,10 +6159,10 @@ packages:
       is-extendable: 1.0.1
     dev: true
 
-  /extend/3.0.2:
+  /extend@3.0.2:
     resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
 
-  /extglob/2.0.4:
+  /extglob@2.0.4:
     resolution: {integrity: sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -6122,12 +6178,12 @@ packages:
       - supports-color
     dev: true
 
-  /extract-zip/2.0.1_supports-color@8.1.1:
+  /extract-zip@2.0.1(supports-color@8.1.1):
     resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
     engines: {node: '>= 10.17.0'}
     hasBin: true
     dependencies:
-      debug: 4.3.4_supports-color@8.1.1
+      debug: 4.3.4(supports-color@8.1.1)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
@@ -6136,11 +6192,11 @@ packages:
       - supports-color
     dev: true
 
-  /extsprintf/1.3.0:
+  /extsprintf@1.3.0:
     resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==}
     engines: {'0': node >=0.6.0}
 
-  /fancy-log/1.3.3:
+  /fancy-log@1.3.3:
     resolution: {integrity: sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -6150,10 +6206,10 @@ packages:
       time-stamp: 1.1.0
     dev: true
 
-  /fast-deep-equal/3.1.3:
+  /fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
-  /fast-glob/3.2.12:
+  /fast-glob@3.2.12:
     resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
     engines: {node: '>=8.6.0'}
     dependencies:
@@ -6164,72 +6220,72 @@ packages:
       micromatch: 4.0.5
     dev: true
 
-  /fast-json-stable-stringify/2.1.0:
+  /fast-json-stable-stringify@2.1.0:
     resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
 
-  /fast-levenshtein/1.1.4:
+  /fast-levenshtein@1.1.4:
     resolution: {integrity: sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==}
     dev: true
 
-  /fast-levenshtein/2.0.6:
+  /fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
-  /fast-xml-parser/3.21.1:
+  /fast-xml-parser@3.21.1:
     resolution: {integrity: sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg==}
     hasBin: true
     dependencies:
       strnum: 1.0.5
     dev: false
 
-  /fastest-levenshtein/1.0.16:
+  /fastest-levenshtein@1.0.16:
     resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
     engines: {node: '>= 4.9.1'}
     dev: true
 
-  /fastq/1.15.0:
+  /fastq@1.15.0:
     resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
     dependencies:
       reusify: 1.0.4
 
-  /fd-slicer/1.1.0:
+  /fd-slicer@1.1.0:
     resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
     dependencies:
       pend: 1.2.0
     dev: true
 
-  /feed/4.2.2:
+  /feed@4.2.2:
     resolution: {integrity: sha512-u5/sxGfiMfZNtJ3OvQpXcvotFpYkL0n9u9mM2vkui2nGo8b4wvDkJ8gAkYqbA8QpGyFCv3RK0Z+Iv+9veCS9bQ==}
     engines: {node: '>=0.4.0'}
     dependencies:
       xml-js: 1.6.11
     dev: false
 
-  /fetch-blob/3.2.0:
+  /fetch-blob@3.2.0:
     resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
     engines: {node: ^12.20 || >= 14.13}
     dependencies:
       node-domexception: 1.0.0
       web-streams-polyfill: 3.2.1
 
-  /figures/3.2.0:
+  /figures@3.2.0:
     resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
     engines: {node: '>=8'}
     dependencies:
       escape-string-regexp: 1.0.5
     dev: true
 
-  /file-entry-cache/6.0.1:
+  /file-entry-cache@6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
       flat-cache: 3.0.4
 
-  /file-type/12.4.2:
+  /file-type@12.4.2:
     resolution: {integrity: sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==}
     engines: {node: '>=8'}
     dev: false
 
-  /file-type/17.1.6:
+  /file-type@17.1.6:
     resolution: {integrity: sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
@@ -6238,43 +6294,42 @@ packages:
       token-types: 5.0.1
     dev: false
 
-  /file-type/3.9.0:
+  /file-type@3.9.0:
     resolution: {integrity: sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /file-type/4.4.0:
+  /file-type@4.4.0:
     resolution: {integrity: sha512-f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /file-type/5.2.0:
+  /file-type@5.2.0:
     resolution: {integrity: sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /file-type/6.2.0:
+  /file-type@6.2.0:
     resolution: {integrity: sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==}
     engines: {node: '>=4'}
     dev: true
 
-  /file-type/8.1.0:
+  /file-type@8.1.0:
     resolution: {integrity: sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==}
     engines: {node: '>=6'}
     dev: true
 
-  /filelist/1.0.4:
+  /filelist@1.0.4:
     resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
     dependencies:
       minimatch: 5.1.2
-    dev: false
 
-  /filename-reserved-regex/2.0.0:
+  /filename-reserved-regex@2.0.0:
     resolution: {integrity: sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /filenamify/2.1.0:
+  /filenamify@2.1.0:
     resolution: {integrity: sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==}
     engines: {node: '>=4'}
     dependencies:
@@ -6283,7 +6338,7 @@ packages:
       trim-repeated: 1.0.0
     dev: true
 
-  /fill-range/4.0.0:
+  /fill-range@4.0.0:
     resolution: {integrity: sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -6293,13 +6348,13 @@ packages:
       to-regex-range: 2.1.1
     dev: true
 
-  /fill-range/7.0.1:
+  /fill-range@7.0.1:
     resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
     engines: {node: '>=8'}
     dependencies:
       to-regex-range: 5.0.1
 
-  /find-up/1.1.2:
+  /find-up@1.1.2:
     resolution: {integrity: sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -6307,28 +6362,28 @@ packages:
       pinkie-promise: 2.0.1
     dev: true
 
-  /find-up/4.1.0:
+  /find-up@4.1.0:
     resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
     engines: {node: '>=8'}
     dependencies:
       locate-path: 5.0.0
       path-exists: 4.0.0
 
-  /find-up/5.0.0:
+  /find-up@5.0.0:
     resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
     engines: {node: '>=10'}
     dependencies:
       locate-path: 6.0.0
       path-exists: 4.0.0
 
-  /find-versions/3.2.0:
+  /find-versions@3.2.0:
     resolution: {integrity: sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==}
     engines: {node: '>=6'}
     dependencies:
       semver-regex: 2.0.0
     dev: true
 
-  /findup-sync/2.0.0:
+  /findup-sync@2.0.0:
     resolution: {integrity: sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -6340,7 +6395,7 @@ packages:
       - supports-color
     dev: true
 
-  /findup-sync/3.0.0:
+  /findup-sync@3.0.0:
     resolution: {integrity: sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -6352,7 +6407,7 @@ packages:
       - supports-color
     dev: true
 
-  /fined/1.2.0:
+  /fined@1.2.0:
     resolution: {integrity: sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -6363,32 +6418,32 @@ packages:
       parse-filepath: 1.0.2
     dev: true
 
-  /flagged-respawn/1.0.1:
+  /flagged-respawn@1.0.1:
     resolution: {integrity: sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==}
     engines: {node: '>= 0.10'}
     dev: true
 
-  /flat-cache/3.0.4:
+  /flat-cache@3.0.4:
     resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
     engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
       flatted: 3.2.7
       rimraf: 3.0.2
 
-  /flat/5.0.2:
+  /flat@5.0.2:
     resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
     hasBin: true
     dev: true
 
-  /flatted/3.2.7:
+  /flatted@3.2.7:
     resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
 
-  /flatten/1.0.3:
+  /flatten@1.0.3:
     resolution: {integrity: sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==}
     deprecated: flatten is deprecated in favor of utility frameworks such as lodash.
     dev: true
 
-  /fluent-ffmpeg/2.1.2:
+  /fluent-ffmpeg@2.1.2:
     resolution: {integrity: sha512-IZTB4kq5GK0DPp7sGQ0q/BWurGHffRtQQwVkiqDgeO6wYJLLV5ZhgNOQ65loZxxuPMKZKZcICCUnaGtlxBiR0Q==}
     engines: {node: '>=0.8.0'}
     dependencies:
@@ -6396,24 +6451,14 @@ packages:
       which: 1.3.1
     dev: false
 
-  /flush-write-stream/1.1.1:
+  /flush-write-stream@1.1.1:
     resolution: {integrity: sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==}
     dependencies:
       inherits: 2.0.4
       readable-stream: 2.3.7
     dev: true
 
-  /follow-redirects/1.15.2:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
-
-  /follow-redirects/1.15.2_debug@4.3.4:
+  /follow-redirects@1.15.2(debug@4.3.4):
     resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -6422,36 +6467,35 @@ packages:
       debug:
         optional: true
     dependencies:
-      debug: 4.3.4
-    dev: true
+      debug: 4.3.4(supports-color@8.1.1)
 
-  /for-each/0.3.3:
+  /for-each@0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
     dependencies:
       is-callable: 1.2.7
     dev: false
 
-  /for-in/1.0.2:
+  /for-in@1.0.2:
     resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /for-own/1.0.0:
+  /for-own@1.0.0:
     resolution: {integrity: sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       for-in: 1.0.2
     dev: true
 
-  /forever-agent/0.6.1:
+  /forever-agent@0.6.1:
     resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
 
-  /form-data-encoder/2.1.4:
+  /form-data-encoder@2.1.4:
     resolution: {integrity: sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==}
     engines: {node: '>= 14.17'}
     dev: false
 
-  /form-data/2.3.3:
+  /form-data@2.3.3:
     resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
     engines: {node: '>= 0.12'}
     dependencies:
@@ -6459,7 +6503,7 @@ packages:
       combined-stream: 1.0.8
       mime-types: 2.1.35
 
-  /form-data/3.0.1:
+  /form-data@3.0.1:
     resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
     engines: {node: '>= 6'}
     dependencies:
@@ -6468,7 +6512,7 @@ packages:
       mime-types: 2.1.35
     dev: false
 
-  /form-data/4.0.0:
+  /form-data@4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
     engines: {node: '>= 6'}
     dependencies:
@@ -6477,13 +6521,13 @@ packages:
       mime-types: 2.1.35
     dev: false
 
-  /formdata-polyfill/4.0.10:
+  /formdata-polyfill@4.0.10:
     resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
     engines: {node: '>=12.20.0'}
     dependencies:
       fetch-blob: 3.2.0
 
-  /formidable/2.1.1:
+  /formidable@2.1.1:
     resolution: {integrity: sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ==}
     dependencies:
       dezalgo: 1.0.4
@@ -6492,33 +6536,33 @@ packages:
       qs: 6.11.0
     dev: false
 
-  /fragment-cache/0.2.1:
+  /fragment-cache@0.2.1:
     resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       map-cache: 0.2.2
     dev: true
 
-  /fresh/0.5.2:
+  /fresh@0.5.2:
     resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
     engines: {node: '>= 0.6'}
     dev: false
 
-  /from/0.1.7:
-    resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==}
-    dev: true
-
-  /from2/2.3.0:
+  /from2@2.3.0:
     resolution: {integrity: sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==}
     dependencies:
       inherits: 2.0.4
       readable-stream: 2.3.7
     dev: true
 
-  /fs-constants/1.0.0:
+  /from@0.1.7:
+    resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==}
+    dev: true
+
+  /fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
-  /fs-extra/10.1.0:
+  /fs-extra@10.1.0:
     resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
     engines: {node: '>=12'}
     dependencies:
@@ -6527,7 +6571,7 @@ packages:
       universalify: 2.0.0
     dev: true
 
-  /fs-extra/8.1.0:
+  /fs-extra@8.1.0:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
     engines: {node: '>=6 <7 || >=8'}
     dependencies:
@@ -6535,7 +6579,7 @@ packages:
       jsonfile: 4.0.0
       universalify: 0.1.2
 
-  /fs-extra/9.1.0:
+  /fs-extra@9.1.0:
     resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
     engines: {node: '>=10'}
     dependencies:
@@ -6545,21 +6589,21 @@ packages:
       universalify: 2.0.0
     dev: true
 
-  /fs-minipass/1.2.7:
+  /fs-minipass@1.2.7:
     resolution: {integrity: sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==}
     dependencies:
       minipass: 2.9.0
     dev: false
     optional: true
 
-  /fs-minipass/2.1.0:
+  /fs-minipass@2.1.0:
     resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
     engines: {node: '>= 8'}
     dependencies:
       minipass: 3.3.6
     dev: false
 
-  /fs-mkdirp-stream/1.0.0:
+  /fs-mkdirp-stream@1.0.0:
     resolution: {integrity: sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -6567,17 +6611,17 @@ packages:
       through2: 2.0.5
     dev: true
 
-  /fs.realpath/1.0.0:
+  /fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
-  /fsevents/2.3.2:
+  /fsevents@2.3.2:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /fstream/1.0.12:
+  /fstream@1.0.12:
     resolution: {integrity: sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==}
     engines: {node: '>=0.6'}
     dependencies:
@@ -6587,15 +6631,15 @@ packages:
       rimraf: 2.7.1
     dev: false
 
-  /fulcon/1.0.2:
+  /fulcon@1.0.2:
     resolution: {integrity: sha512-vYwUBqbdo9XK0NmN7cFmURmy2T1YHpEsTCbxGO3aErxx6a0Z/HkWXcqcPkk7yOuJ74mSAHGWGBSBBd6v3GKebA==}
     engines: {node: '>= 0.10'}
     dev: true
 
-  /function-bind/1.1.1:
+  /function-bind@1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
 
-  /gauge/3.0.2:
+  /gauge@3.0.2:
     resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==}
     engines: {node: '>=10'}
     dependencies:
@@ -6611,7 +6655,7 @@ packages:
     dev: false
     optional: true
 
-  /gauge/4.0.4:
+  /gauge@4.0.4:
     resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
@@ -6625,33 +6669,33 @@ packages:
       wide-align: 1.1.5
     dev: false
 
-  /generic-pool/3.9.0:
+  /generic-pool@3.9.0:
     resolution: {integrity: sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==}
     engines: {node: '>= 4'}
     dev: true
 
-  /get-caller-file/1.0.3:
+  /get-caller-file@1.0.3:
     resolution: {integrity: sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==}
     dev: true
 
-  /get-caller-file/2.0.5:
+  /get-caller-file@2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
-  /get-intrinsic/1.1.3:
+  /get-intrinsic@1.1.3:
     resolution: {integrity: sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==}
     dependencies:
       function-bind: 1.1.1
       has: 1.0.3
       has-symbols: 1.0.3
 
-  /get-paths/0.0.7:
+  /get-paths@0.0.7:
     resolution: {integrity: sha512-0wdJt7C1XKQxuCgouqd+ZvLJ56FQixKoki9MrFaO4EriqzXOiH9gbukaDE1ou08S8Ns3/yDzoBAISNPqj6e6tA==}
     engines: {node: '>=6.4'}
     dependencies:
       pify: 4.0.1
 
-  /get-pixels-frame-info-update/3.3.2:
+  /get-pixels-frame-info-update@3.3.2:
     resolution: {integrity: sha512-LzVij57X/gK4Y6LpcDdqj+R9WCpD6Sv3ZH85GMA+S3xgPGCz81mHql4GiSnF4GijRjk7TE0ja2sDr8FFYKLe2g==}
     dependencies:
       data-uri-to-buffer: 0.0.3
@@ -6667,19 +6711,19 @@ packages:
       through: 2.3.8
     dev: false
 
-  /get-port/5.1.1:
+  /get-port@5.1.1:
     resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==}
     engines: {node: '>=8'}
     dev: false
 
-  /get-proxy/2.1.0:
+  /get-proxy@2.1.0:
     resolution: {integrity: sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==}
     engines: {node: '>=4'}
     dependencies:
       npm-conf: 1.1.3
     dev: true
 
-  /get-stream/2.3.1:
+  /get-stream@2.3.1:
     resolution: {integrity: sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -6687,75 +6731,75 @@ packages:
       pinkie-promise: 2.0.1
     dev: true
 
-  /get-stream/3.0.0:
+  /get-stream@3.0.0:
     resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /get-stream/4.1.0:
+  /get-stream@4.1.0:
     resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==}
     engines: {node: '>=6'}
     dependencies:
       pump: 3.0.0
     dev: true
 
-  /get-stream/5.2.0:
+  /get-stream@5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
     dependencies:
       pump: 3.0.0
 
-  /get-stream/6.0.1:
+  /get-stream@6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
 
-  /get-value/2.0.6:
+  /get-value@2.0.6:
     resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /getos/3.2.1:
+  /getos@3.2.1:
     resolution: {integrity: sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==}
     dependencies:
       async: 3.2.4
     dev: true
 
-  /getpass/0.1.7:
+  /getpass@0.1.7:
     resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
     dependencies:
       assert-plus: 1.0.0
 
-  /gif-encoder/0.4.1:
+  /gif-encoder@0.4.1:
     resolution: {integrity: sha512-++rNGpDBgWQ9eXj9JfTBLHMUEd7lDOdzIvFyHQM9yL8ffxkcg4G6jWmsgu/r59Uq6nHc3wcVwtgy3geLnIWunQ==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       readable-stream: 1.1.14
     dev: false
 
-  /github-from-package/0.0.0:
+  /github-from-package@0.0.0:
     resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
     dev: false
 
-  /glob-parent/3.1.0:
+  /glob-parent@3.1.0:
     resolution: {integrity: sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==}
     dependencies:
       is-glob: 3.1.0
       path-dirname: 1.0.2
     dev: true
 
-  /glob-parent/5.1.2:
+  /glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
     dependencies:
       is-glob: 4.0.3
 
-  /glob-parent/6.0.2:
+  /glob-parent@6.0.2:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
     dependencies:
       is-glob: 4.0.3
 
-  /glob-stream/6.1.0:
+  /glob-stream@6.1.0:
     resolution: {integrity: sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -6771,11 +6815,11 @@ packages:
       unique-stream: 2.3.1
     dev: true
 
-  /glob-to-regexp/0.4.1:
+  /glob-to-regexp@0.4.1:
     resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
     dev: true
 
-  /glob-watcher/5.0.5:
+  /glob-watcher@5.0.5:
     resolution: {integrity: sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -6790,7 +6834,7 @@ packages:
       - supports-color
     dev: true
 
-  /glob/7.2.0:
+  /glob@7.2.0:
     resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==}
     dependencies:
       fs.realpath: 1.0.0
@@ -6801,7 +6845,7 @@ packages:
       path-is-absolute: 1.0.1
     dev: true
 
-  /glob/7.2.3:
+  /glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     dependencies:
       fs.realpath: 1.0.0
@@ -6811,7 +6855,7 @@ packages:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
-  /glob/8.0.3:
+  /glob@8.0.3:
     resolution: {integrity: sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==}
     engines: {node: '>=12'}
     dependencies:
@@ -6821,14 +6865,14 @@ packages:
       minimatch: 5.1.2
       once: 1.4.0
 
-  /global-dirs/3.0.1:
+  /global-dirs@3.0.1:
     resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
     engines: {node: '>=10'}
     dependencies:
       ini: 2.0.0
     dev: true
 
-  /global-modules/1.0.0:
+  /global-modules@1.0.0:
     resolution: {integrity: sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -6837,7 +6881,7 @@ packages:
       resolve-dir: 1.0.1
     dev: true
 
-  /global-prefix/1.0.2:
+  /global-prefix@1.0.2:
     resolution: {integrity: sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -6848,18 +6892,18 @@ packages:
       which: 1.3.1
     dev: true
 
-  /globals/11.12.0:
+  /globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
     dev: false
 
-  /globals/13.19.0:
+  /globals@13.19.0:
     resolution: {integrity: sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
 
-  /globby/11.1.0:
+  /globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
     dependencies:
@@ -6871,25 +6915,25 @@ packages:
       slash: 3.0.0
     dev: true
 
-  /glogg/1.0.2:
+  /glogg@1.0.2:
     resolution: {integrity: sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==}
     engines: {node: '>= 0.10'}
     dependencies:
       sparkles: 1.0.1
     dev: true
 
-  /google-protobuf/3.21.2:
+  /google-protobuf@3.21.2:
     resolution: {integrity: sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==}
     dev: false
     optional: true
 
-  /gopd/1.0.1:
+  /gopd@1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
     dependencies:
       get-intrinsic: 1.1.3
     dev: false
 
-  /got/11.8.5:
+  /got@11.8.5:
     resolution: {integrity: sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==}
     engines: {node: '>=10.19.0'}
     dependencies:
@@ -6906,7 +6950,7 @@ packages:
       responselike: 2.0.1
     dev: false
 
-  /got/12.5.3:
+  /got@12.5.3:
     resolution: {integrity: sha512-8wKnb9MGU8IPGRIo+/ukTy9XLJBwDiCpIf5TVzQ9Cpol50eMTpBq2GAuDsuDIz7hTYmZgMgC1e9ydr6kSDWs3w==}
     engines: {node: '>=14.16'}
     dependencies:
@@ -6923,7 +6967,7 @@ packages:
       responselike: 3.0.0
     dev: false
 
-  /got/8.3.2:
+  /got@8.3.2:
     resolution: {integrity: sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==}
     engines: {node: '>=4'}
     dependencies:
@@ -6948,17 +6992,17 @@ packages:
       url-to-options: 1.0.1
     dev: true
 
-  /graceful-fs/4.2.10:
+  /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
-  /grapheme-splitter/1.0.4:
+  /grapheme-splitter@1.0.4:
     resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
 
-  /gsap/3.11.4:
+  /gsap@3.11.4:
     resolution: {integrity: sha512-McHhEguHyExMMnjqKA8G+7TvxmlKQGMbjgwAilnFe1e4id7V/tFveRQ2YMZhTYu0oxHGWvbPltdVYQOu3z1SCA==}
     dev: true
 
-  /gulp-cli/2.3.0:
+  /gulp-cli@2.3.0:
     resolution: {integrity: sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==}
     engines: {node: '>= 0.10'}
     hasBin: true
@@ -6985,7 +7029,7 @@ packages:
       - supports-color
     dev: true
 
-  /gulp-cssnano/2.1.3:
+  /gulp-cssnano@2.1.3:
     resolution: {integrity: sha512-r8qdX5pTXsBb/IRm9loE8Ijz8UiPW/URMC/bKJe4FPNHRaz4aEx8Bev03L0FYHd/7BSGu/ebmfumAkpGuTdenA==}
     dependencies:
       buffer-from: 1.1.2
@@ -6995,12 +7039,12 @@ packages:
       vinyl-sourcemaps-apply: 0.2.1
     dev: true
 
-  /gulp-rename/2.0.0:
+  /gulp-rename@2.0.0:
     resolution: {integrity: sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /gulp-replace/1.1.4:
+  /gulp-replace@1.1.4:
     resolution: {integrity: sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==}
     engines: {node: '>=10'}
     dependencies:
@@ -7011,7 +7055,7 @@ packages:
       yargs-parser: 21.1.1
     dev: true
 
-  /gulp-terser/2.1.0:
+  /gulp-terser@2.1.0:
     resolution: {integrity: sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==}
     engines: {node: '>=10'}
     dependencies:
@@ -7021,7 +7065,7 @@ packages:
       vinyl-sourcemaps-apply: 0.2.1
     dev: true
 
-  /gulp/4.0.2:
+  /gulp@4.0.2:
     resolution: {integrity: sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==}
     engines: {node: '>= 0.10'}
     hasBin: true
@@ -7034,24 +7078,24 @@ packages:
       - supports-color
     dev: true
 
-  /gulplog/1.0.0:
+  /gulplog@1.0.0:
     resolution: {integrity: sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==}
     engines: {node: '>= 0.10'}
     dependencies:
       glogg: 1.0.2
     dev: true
 
-  /hammerjs/2.0.8:
+  /hammerjs@2.0.8:
     resolution: {integrity: sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==}
     engines: {node: '>=0.8.0'}
     dev: true
 
-  /har-schema/2.0.0:
+  /har-schema@2.0.0:
     resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
     engines: {node: '>=4'}
     dev: false
 
-  /har-validator/5.1.5:
+  /har-validator@5.1.5:
     resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==}
     engines: {node: '>=6'}
     deprecated: this library is no longer supported
@@ -7060,58 +7104,58 @@ packages:
       har-schema: 2.0.0
     dev: false
 
-  /has-ansi/2.0.0:
+  /has-ansi@2.0.0:
     resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       ansi-regex: 2.1.1
     dev: true
 
-  /has-flag/1.0.0:
+  /has-flag@1.0.0:
     resolution: {integrity: sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /has-flag/3.0.0:
+  /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
     dev: false
 
-  /has-flag/4.0.0:
+  /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
 
-  /has-property-descriptors/1.0.0:
+  /has-property-descriptors@1.0.0:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
     dependencies:
       get-intrinsic: 1.1.3
     dev: true
 
-  /has-symbol-support-x/1.4.2:
+  /has-symbol-support-x@1.4.2:
     resolution: {integrity: sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==}
     dev: true
 
-  /has-symbols/1.0.3:
+  /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
 
-  /has-to-string-tag-x/1.4.1:
+  /has-to-string-tag-x@1.4.1:
     resolution: {integrity: sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==}
     dependencies:
       has-symbol-support-x: 1.4.2
     dev: true
 
-  /has-tostringtag/1.0.0:
+  /has-tostringtag@1.0.0:
     resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-symbols: 1.0.3
 
-  /has-unicode/2.0.1:
+  /has-unicode@2.0.1:
     resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
     dev: false
 
-  /has-value/0.3.1:
+  /has-value@0.3.1:
     resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -7120,7 +7164,7 @@ packages:
       isobject: 2.1.0
     dev: true
 
-  /has-value/1.0.0:
+  /has-value@1.0.0:
     resolution: {integrity: sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -7129,12 +7173,12 @@ packages:
       isobject: 3.0.1
     dev: true
 
-  /has-values/0.1.4:
+  /has-values@0.1.4:
     resolution: {integrity: sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /has-values/1.0.0:
+  /has-values@1.0.0:
     resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -7142,57 +7186,57 @@ packages:
       kind-of: 4.0.0
     dev: true
 
-  /has/1.0.3:
+  /has@1.0.3:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
     engines: {node: '>= 0.4.0'}
     dependencies:
       function-bind: 1.1.1
 
-  /he/1.2.0:
+  /he@1.2.0:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
     dev: true
 
-  /hexoid/1.0.0:
+  /hexoid@1.0.0:
     resolution: {integrity: sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==}
     engines: {node: '>=8'}
     dev: false
 
-  /highlight.js/10.7.3:
+  /highlight.js@10.7.3:
     resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
     dev: false
 
-  /homedir-polyfill/1.0.3:
+  /homedir-polyfill@1.0.3:
     resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       parse-passwd: 1.0.0
     dev: true
 
-  /hosted-git-info/2.8.9:
+  /hosted-git-info@2.8.9:
     resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
     dev: true
 
-  /hpagent/0.1.2:
+  /hpagent@0.1.2:
     resolution: {integrity: sha512-ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ==}
     dev: false
 
-  /html-comment-regex/1.1.2:
+  /html-comment-regex@1.1.2:
     resolution: {integrity: sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==}
     dev: true
 
-  /html-encoding-sniffer/3.0.0:
+  /html-encoding-sniffer@3.0.0:
     resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
     engines: {node: '>=12'}
     dependencies:
       whatwg-encoding: 2.0.0
     dev: false
 
-  /html-entities/2.3.2:
+  /html-entities@2.3.2:
     resolution: {integrity: sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==}
     dev: false
 
-  /htmlparser2/3.10.1:
+  /htmlparser2@3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
       domelementtype: 1.3.1
@@ -7203,7 +7247,7 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /htmlparser2/8.0.1:
+  /htmlparser2@8.0.1:
     resolution: {integrity: sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==}
     dependencies:
       domelementtype: 2.3.0
@@ -7211,7 +7255,7 @@ packages:
       domutils: 3.0.1
       entities: 4.4.0
 
-  /http-assert/1.5.0:
+  /http-assert@1.5.0:
     resolution: {integrity: sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==}
     engines: {node: '>= 0.8'}
     dependencies:
@@ -7219,15 +7263,15 @@ packages:
       http-errors: 1.8.1
     dev: false
 
-  /http-cache-semantics/3.8.1:
+  /http-cache-semantics@3.8.1:
     resolution: {integrity: sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==}
     dev: true
 
-  /http-cache-semantics/4.1.0:
+  /http-cache-semantics@4.1.0:
     resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==}
     dev: false
 
-  /http-errors/1.6.3:
+  /http-errors@1.6.3:
     resolution: {integrity: sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==}
     engines: {node: '>= 0.6'}
     dependencies:
@@ -7236,7 +7280,7 @@ packages:
       setprototypeof: 1.1.0
       statuses: 1.5.0
 
-  /http-errors/1.8.1:
+  /http-errors@1.8.1:
     resolution: {integrity: sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==}
     engines: {node: '>= 0.6'}
     dependencies:
@@ -7246,7 +7290,7 @@ packages:
       statuses: 1.5.0
       toidentifier: 1.0.1
 
-  /http-errors/2.0.0:
+  /http-errors@2.0.0:
     resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
     engines: {node: '>= 0.8'}
     dependencies:
@@ -7257,18 +7301,18 @@ packages:
       toidentifier: 1.0.1
     dev: false
 
-  /http-proxy-agent/5.0.0:
+  /http-proxy-agent@5.0.0:
     resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
     engines: {node: '>= 6'}
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /http-signature/1.2.0:
+  /http-signature@1.2.0:
     resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
     engines: {node: '>=0.8', npm: '>=1.3.7'}
     dependencies:
@@ -7277,7 +7321,7 @@ packages:
       sshpk: 1.17.0
     dev: false
 
-  /http-signature/1.3.6:
+  /http-signature@1.3.6:
     resolution: {integrity: sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==}
     engines: {node: '>=0.10'}
     dependencies:
@@ -7286,7 +7330,7 @@ packages:
       sshpk: 1.17.0
     dev: true
 
-  /http2-wrapper/1.0.3:
+  /http2-wrapper@1.0.3:
     resolution: {integrity: sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==}
     engines: {node: '>=10.19.0'}
     dependencies:
@@ -7294,7 +7338,7 @@ packages:
       resolve-alpn: 1.2.1
     dev: false
 
-  /http2-wrapper/2.2.0:
+  /http2-wrapper@2.2.0:
     resolution: {integrity: sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==}
     engines: {node: '>=10.19.0'}
     dependencies:
@@ -7302,111 +7346,111 @@ packages:
       resolve-alpn: 1.2.1
     dev: false
 
-  /http_ece/1.1.0:
+  /http_ece@1.1.0:
     resolution: {integrity: sha512-bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA==}
     engines: {node: '>=4'}
     dependencies:
       urlsafe-base64: 1.0.0
     dev: false
 
-  /https-proxy-agent/2.2.4:
+  /https-proxy-agent@2.2.4:
     resolution: {integrity: sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==}
     engines: {node: '>= 4.5.0'}
     dependencies:
       agent-base: 4.3.0
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: false
     optional: true
 
-  /https-proxy-agent/5.0.1:
+  /https-proxy-agent@5.0.1:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /human-signals/1.1.1:
+  /human-signals@1.1.1:
     resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
     engines: {node: '>=8.12.0'}
     dev: true
 
-  /human-signals/2.1.0:
+  /human-signals@2.1.0:
     resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
     engines: {node: '>=10.17.0'}
     dev: true
 
-  /human-signals/3.0.1:
+  /human-signals@3.0.1:
     resolution: {integrity: sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==}
     engines: {node: '>=12.20.0'}
     dev: true
 
-  /humanize-ms/1.2.1:
+  /humanize-ms@1.2.1:
     resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
     dependencies:
       ms: 2.1.3
     dev: false
 
-  /humanize-number/0.0.2:
+  /humanize-number@0.0.2:
     resolution: {integrity: sha512-un3ZAcNQGI7RzaWGZzQDH47HETM4Wrj6z6E4TId8Yeq9w5ZKUVB1nrT2jwFheTUjEmqcgTjXDc959jum+ai1kQ==}
     dev: false
 
-  /iconv-lite/0.4.24:
+  /iconv-lite@0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       safer-buffer: 2.1.2
     dev: false
 
-  /iconv-lite/0.6.3:
+  /iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       safer-buffer: 2.1.2
     dev: false
 
-  /idb-keyval/3.2.0:
+  /idb-keyval@3.2.0:
     resolution: {integrity: sha512-slx8Q6oywCCSfKgPgL0sEsXtPVnSbTLWpyiDcu6msHOyKOLari1TD1qocXVCft80umnkk3/Qqh3lwoFt8T/BPQ==}
     dev: false
 
-  /idb-keyval/6.2.0:
+  /idb-keyval@6.2.0:
     resolution: {integrity: sha512-uw+MIyQn2jl3+hroD7hF8J7PUviBU7BPKWw4f/ISf32D4LoGu98yHjrzWWJDASu9QNrX10tCJqk9YY0ClWm8Ng==}
     dependencies:
       safari-14-idb-fix: 3.0.0
     dev: true
 
-  /ieee754/1.1.13:
+  /ieee754@1.1.13:
     resolution: {integrity: sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==}
     dev: false
 
-  /ieee754/1.2.1:
+  /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
-  /ignore/5.2.4:
+  /ignore@5.2.4:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
 
-  /immutable/4.2.2:
+  /immutable@4.2.2:
     resolution: {integrity: sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==}
     dev: true
 
-  /import-fresh/3.3.0:
+  /import-fresh@3.3.0:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
     engines: {node: '>=6'}
     dependencies:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
-  /import-lazy/3.1.0:
+  /import-lazy@3.1.0:
     resolution: {integrity: sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==}
     engines: {node: '>=6'}
     dev: true
 
-  /import-local/3.1.0:
+  /import-local@3.1.0:
     resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
     engines: {node: '>=8'}
     hasBin: true
@@ -7415,74 +7459,74 @@ packages:
       resolve-cwd: 3.0.0
     dev: true
 
-  /imurmurhash/0.1.4:
+  /imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
 
-  /indent-string/4.0.0:
+  /indent-string@4.0.0:
     resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
     engines: {node: '>=8'}
 
-  /indexes-of/1.0.1:
+  /indexes-of@1.0.1:
     resolution: {integrity: sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==}
     dev: true
 
-  /infer-owner/1.0.4:
+  /infer-owner@1.0.4:
     resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==}
     dev: false
 
-  /inflation/2.0.0:
+  /inflation@2.0.0:
     resolution: {integrity: sha512-m3xv4hJYR2oXw4o4Y5l6P5P16WYmazYof+el6Al3f+YlggGj6qT9kImBAnzDelRALnP5d3h4jGBPKzYCizjZZw==}
     engines: {node: '>= 0.8.0'}
     dev: false
 
-  /inflight/1.0.6:
+  /inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
     dependencies:
       once: 1.4.0
       wrappy: 1.0.2
 
-  /inherits/2.0.3:
+  /inherits@2.0.3:
     resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==}
 
-  /inherits/2.0.4:
+  /inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
-  /ini/1.3.8:
+  /ini@1.3.8:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
 
-  /ini/2.0.0:
+  /ini@2.0.0:
     resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
     engines: {node: '>=10'}
     dev: true
 
-  /insert-text-at-cursor/0.3.0:
+  /insert-text-at-cursor@0.3.0:
     resolution: {integrity: sha512-/nPtyeX9xPUvxZf+r0518B7uqNKlP+LqNJqSiXFEaa2T71rWIwTVXGH7hB9xO/EVdwa5/pWlFCPwShOW81XIxQ==}
     dev: true
 
-  /install-artifact-from-github/1.3.2:
+  /install-artifact-from-github@1.3.2:
     resolution: {integrity: sha512-yCFcLvqk0yQdxx0uJz4t9Z3adDMLAYrcGYv546uRXCSvxE+GqNYhhz/KmrGcUKGI/gVLR9n/e/zM9jX/+ASMJQ==}
     hasBin: true
     dev: false
 
-  /install-peers/1.0.4:
+  /install-peers@1.0.4:
     resolution: {integrity: sha512-0POFG2zRn/rt0uO1tUekCDhq6t6l3HDjxR42+Hcbjmj75Gv4yuqEfMe63HC76piO1lsctAp/cQW+Ny+i/SxTlg==}
     requiresBuild: true
     dependencies:
       executioner: 2.0.1
     dev: true
 
-  /interpret/1.4.0:
+  /interpret@1.4.0:
     resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==}
     engines: {node: '>= 0.10'}
     dev: true
 
-  /interpret/3.1.1:
+  /interpret@3.1.1:
     resolution: {integrity: sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==}
     engines: {node: '>=10.13.0'}
     dev: true
 
-  /into-stream/3.1.0:
+  /into-stream@3.1.0:
     resolution: {integrity: sha512-TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ==}
     engines: {node: '>=4'}
     dependencies:
@@ -7490,18 +7534,18 @@ packages:
       p-is-promise: 1.1.0
     dev: true
 
-  /invert-kv/1.0.0:
+  /invert-kv@1.0.0:
     resolution: {integrity: sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /ioredis/5.2.4:
+  /ioredis@5.2.4:
     resolution: {integrity: sha512-qIpuAEt32lZJQ0XyrloCRdlEdUUNGG9i0UOk6zgzK6igyudNWqEBxfH6OlbnOOoBBvr1WB02mm8fR55CnikRng==}
     engines: {node: '>=12.22.0'}
     dependencies:
       '@ioredis/commands': 1.2.0
       cluster-key-slot: 1.1.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       denque: 2.1.0
       lodash.defaults: 4.2.0
       lodash.isarguments: 3.1.0
@@ -7511,11 +7555,11 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /iota-array/1.0.0:
+  /iota-array@1.0.0:
     resolution: {integrity: sha512-pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==}
     dev: false
 
-  /ip-address/7.1.0:
+  /ip-address@7.1.0:
     resolution: {integrity: sha512-V9pWC/VJf2lsXqP7IWJ+pe3P1/HCYGBMZrrnT62niLGjAfCbeiwXMUxaeHvnVlz19O27pvXP4azs+Pj/A0x+SQ==}
     engines: {node: '>= 10'}
     dependencies:
@@ -7523,7 +7567,7 @@ packages:
       sprintf-js: 1.1.2
     dev: false
 
-  /ip-cidr/3.0.11:
+  /ip-cidr@3.0.11:
     resolution: {integrity: sha512-6pf3APV0cRWy7vk0ealQt7UeWPqpT4RQM0bR0miVY/XRiBV8hIkPSkEHctv1+GAUPIwT9qpUL57deYlYca9UEA==}
     engines: {node: '>=10.0.0'}
     dependencies:
@@ -7531,26 +7575,26 @@ packages:
       jsbn: 1.1.0
     dev: false
 
-  /ip-regex/4.3.0:
+  /ip-regex@4.3.0:
     resolution: {integrity: sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==}
     engines: {node: '>=8'}
     dev: false
 
-  /ip/2.0.0:
+  /ip@2.0.0:
     resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==}
     dev: false
 
-  /ipaddr.js/2.0.1:
+  /ipaddr.js@2.0.1:
     resolution: {integrity: sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==}
     engines: {node: '>= 10'}
     dev: false
 
-  /is-absolute-url/2.1.0:
+  /is-absolute-url@2.1.0:
     resolution: {integrity: sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-absolute/1.0.0:
+  /is-absolute@1.0.0:
     resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -7558,21 +7602,21 @@ packages:
       is-windows: 1.0.2
     dev: true
 
-  /is-accessor-descriptor/0.1.6:
+  /is-accessor-descriptor@0.1.6:
     resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 3.2.2
     dev: true
 
-  /is-accessor-descriptor/1.0.0:
+  /is-accessor-descriptor@1.0.0:
     resolution: {integrity: sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 6.0.3
     dev: true
 
-  /is-arguments/1.1.1:
+  /is-arguments@1.1.1:
     resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -7580,55 +7624,55 @@ packages:
       has-tostringtag: 1.0.0
     dev: false
 
-  /is-arrayish/0.2.1:
+  /is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
     dev: true
 
-  /is-arrayish/0.3.2:
+  /is-arrayish@0.3.2:
     resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
     dev: false
 
-  /is-binary-path/2.1.0:
+  /is-binary-path@2.1.0:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
     engines: {node: '>=8'}
     dependencies:
       binary-extensions: 2.2.0
 
-  /is-buffer/1.1.6:
+  /is-buffer@1.1.6:
     resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
 
-  /is-callable/1.2.7:
+  /is-callable@1.2.7:
     resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
     engines: {node: '>= 0.4'}
     dev: false
 
-  /is-ci/3.0.1:
+  /is-ci@3.0.1:
     resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
     hasBin: true
     dependencies:
       ci-info: 3.7.1
     dev: true
 
-  /is-core-module/2.11.0:
+  /is-core-module@2.11.0:
     resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
     dependencies:
       has: 1.0.3
 
-  /is-data-descriptor/0.1.4:
+  /is-data-descriptor@0.1.4:
     resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 3.2.2
     dev: true
 
-  /is-data-descriptor/1.0.0:
+  /is-data-descriptor@1.0.0:
     resolution: {integrity: sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 6.0.3
     dev: true
 
-  /is-descriptor/0.1.6:
+  /is-descriptor@0.1.6:
     resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -7637,7 +7681,7 @@ packages:
       kind-of: 5.1.0
     dev: true
 
-  /is-descriptor/1.0.2:
+  /is-descriptor@1.0.2:
     resolution: {integrity: sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -7646,63 +7690,63 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /is-electron/2.2.1:
+  /is-electron@2.2.1:
     resolution: {integrity: sha512-r8EEQQsqT+Gn0aXFx7lTFygYQhILLCB+wn0WCDL5LZRINeLH/Rvw1j2oKodELLXYNImQ3CRlVsY8wW4cGOsyuw==}
     dev: false
 
-  /is-expression/4.0.0:
+  /is-expression@4.0.0:
     resolution: {integrity: sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==}
     dependencies:
       acorn: 7.4.1
       object-assign: 4.1.1
 
-  /is-extendable/0.1.1:
+  /is-extendable@0.1.1:
     resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
     engines: {node: '>=0.10.0'}
 
-  /is-extendable/1.0.1:
+  /is-extendable@1.0.1:
     resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-plain-object: 2.0.4
     dev: true
 
-  /is-extglob/2.1.1:
+  /is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
 
-  /is-fullwidth-code-point/1.0.0:
+  /is-fullwidth-code-point@1.0.0:
     resolution: {integrity: sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       number-is-nan: 1.0.1
     dev: true
 
-  /is-fullwidth-code-point/3.0.0:
+  /is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
-  /is-generator-function/1.0.10:
+  /is-generator-function@1.0.10:
     resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
     dev: false
 
-  /is-glob/3.1.0:
+  /is-glob@3.1.0:
     resolution: {integrity: sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-extglob: 2.1.1
     dev: true
 
-  /is-glob/4.0.3:
+  /is-glob@4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-extglob: 2.1.1
 
-  /is-installed-globally/0.4.0:
+  /is-installed-globally@0.4.0:
     resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==}
     engines: {node: '>=10'}
     dependencies:
@@ -7710,127 +7754,127 @@ packages:
       is-path-inside: 3.0.3
     dev: true
 
-  /is-ip/3.1.0:
+  /is-ip@3.1.0:
     resolution: {integrity: sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==}
     engines: {node: '>=8'}
     dependencies:
       ip-regex: 4.3.0
     dev: false
 
-  /is-lambda/1.0.1:
+  /is-lambda@1.0.1:
     resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
     dev: false
 
-  /is-natural-number/4.0.1:
+  /is-natural-number@4.0.1:
     resolution: {integrity: sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==}
     dev: true
 
-  /is-negated-glob/1.0.0:
+  /is-negated-glob@1.0.0:
     resolution: {integrity: sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-number/3.0.0:
+  /is-number@3.0.0:
     resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 3.2.2
     dev: true
 
-  /is-number/4.0.0:
+  /is-number@4.0.0:
     resolution: {integrity: sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-number/7.0.0:
+  /is-number@7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
-  /is-object/1.0.2:
+  /is-object@1.0.2:
     resolution: {integrity: sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==}
     dev: true
 
-  /is-path-inside/3.0.3:
+  /is-path-inside@3.0.3:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
 
-  /is-plain-obj/1.1.0:
+  /is-plain-obj@1.1.0:
     resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-plain-obj/2.1.0:
+  /is-plain-obj@2.1.0:
     resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
     engines: {node: '>=8'}
     dev: true
 
-  /is-plain-object/2.0.4:
+  /is-plain-object@2.0.4:
     resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
     engines: {node: '>=0.10.0'}
     dependencies:
       isobject: 3.0.1
     dev: true
 
-  /is-plain-object/5.0.0:
+  /is-plain-object@5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
 
-  /is-potential-custom-element-name/1.0.1:
+  /is-potential-custom-element-name@1.0.1:
     resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
     dev: false
 
-  /is-promise/2.2.2:
+  /is-promise@2.2.2:
     resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==}
 
-  /is-regex/1.1.4:
+  /is-regex@1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       has-tostringtag: 1.0.0
 
-  /is-relative/1.0.0:
+  /is-relative@1.0.0:
     resolution: {integrity: sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-unc-path: 1.0.0
     dev: true
 
-  /is-retry-allowed/1.2.0:
+  /is-retry-allowed@1.2.0:
     resolution: {integrity: sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-stream/1.1.0:
+  /is-stream@1.1.0:
     resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-stream/2.0.1:
+  /is-stream@2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
     dev: true
 
-  /is-stream/3.0.0:
+  /is-stream@3.0.0:
     resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: true
 
-  /is-svg/2.1.0:
+  /is-svg@2.1.0:
     resolution: {integrity: sha512-Ya1giYJUkcL/94quj0+XGcmts6cETPBW1MiFz1ReJrnDJ680F52qpAEGAEGU0nq96FRGIGPx6Yo1CyPXcOoyGw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       html-comment-regex: 1.1.2
     dev: true
 
-  /is-svg/4.3.2:
+  /is-svg@4.3.2:
     resolution: {integrity: sha512-mM90duy00JGMyjqIVHu9gNTjywdZV+8qNasX8cm/EEYZ53PHDgajvbBwNVvty5dwSAxLUD3p3bdo+7sR/UMrpw==}
     engines: {node: '>=6'}
     dependencies:
       fast-xml-parser: 3.21.1
     dev: false
 
-  /is-typed-array/1.1.10:
+  /is-typed-array@1.1.10:
     resolution: {integrity: sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -7841,69 +7885,69 @@ packages:
       has-tostringtag: 1.0.0
     dev: false
 
-  /is-typedarray/1.0.0:
+  /is-typedarray@1.0.0:
     resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
 
-  /is-unc-path/1.0.0:
+  /is-unc-path@1.0.0:
     resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       unc-path-regex: 0.1.2
     dev: true
 
-  /is-unicode-supported/0.1.0:
+  /is-unicode-supported@0.1.0:
     resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
     engines: {node: '>=10'}
     dev: true
 
-  /is-url/1.2.4:
+  /is-url@1.2.4:
     resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
     dev: false
 
-  /is-utf8/0.2.1:
+  /is-utf8@0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
 
-  /is-valid-glob/1.0.0:
+  /is-valid-glob@1.0.0:
     resolution: {integrity: sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-whitespace/0.3.0:
+  /is-whitespace@0.3.0:
     resolution: {integrity: sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==}
     engines: {node: '>=0.10.0'}
 
-  /is-windows/1.0.2:
+  /is-windows@1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /isarray/0.0.1:
+  /isarray@0.0.1:
     resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==}
     dev: false
 
-  /isarray/1.0.0:
+  /isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
 
-  /isexe/2.0.0:
+  /isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
-  /isobject/2.1.0:
+  /isobject@2.1.0:
     resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       isarray: 1.0.0
     dev: true
 
-  /isobject/3.0.1:
+  /isobject@3.0.1:
     resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /isstream/0.1.2:
+  /isstream@0.1.2:
     resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
 
-  /istextorbinary/3.3.0:
+  /istextorbinary@3.3.0:
     resolution: {integrity: sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==}
     engines: {node: '>=8'}
     dependencies:
@@ -7911,7 +7955,7 @@ packages:
       textextensions: 3.3.0
     dev: true
 
-  /isurl/1.0.0:
+  /isurl@1.0.0:
     resolution: {integrity: sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==}
     engines: {node: '>= 4'}
     dependencies:
@@ -7919,7 +7963,7 @@ packages:
       is-object: 1.0.2
     dev: true
 
-  /jake/10.8.5:
+  /jake@10.8.5:
     resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
     engines: {node: '>=10'}
     hasBin: true
@@ -7928,9 +7972,8 @@ packages:
       chalk: 4.1.2
       filelist: 1.0.4
       minimatch: 3.1.2
-    dev: false
 
-  /jest-worker/27.5.1:
+  /jest-worker@27.5.1:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
     dependencies:
@@ -7939,12 +7982,12 @@ packages:
       supports-color: 8.1.1
     dev: true
 
-  /jmespath/0.16.0:
+  /jmespath@0.16.0:
     resolution: {integrity: sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==}
     engines: {node: '>= 0.6.0'}
     dev: false
 
-  /joi/17.7.0:
+  /joi@17.7.0:
     resolution: {integrity: sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==}
     dependencies:
       '@hapi/hoek': 9.3.0
@@ -7954,19 +7997,19 @@ packages:
       '@sideway/pinpoint': 2.0.0
     dev: true
 
-  /jpeg-js/0.3.7:
+  /jpeg-js@0.3.7:
     resolution: {integrity: sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==}
     dev: false
 
-  /jpeg-js/0.4.4:
+  /jpeg-js@0.4.4:
     resolution: {integrity: sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==}
     dev: false
 
-  /js-base64/2.6.4:
+  /js-base64@2.6.4:
     resolution: {integrity: sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==}
     dev: true
 
-  /js-beautify/1.14.7:
+  /js-beautify@1.14.7:
     resolution: {integrity: sha512-5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A==}
     engines: {node: '>=10'}
     hasBin: true
@@ -7976,22 +8019,22 @@ packages:
       glob: 8.0.3
       nopt: 6.0.0
 
-  /js-levenshtein/1.1.6:
+  /js-levenshtein@1.1.6:
     resolution: {integrity: sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /js-sdsl/4.2.0:
+  /js-sdsl@4.2.0:
     resolution: {integrity: sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==}
 
-  /js-stringify/1.0.2:
+  /js-stringify@1.0.2:
     resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==}
 
-  /js-tokens/4.0.0:
+  /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: false
 
-  /js-yaml/3.7.0:
+  /js-yaml@3.7.0:
     resolution: {integrity: sha512-eIlkGty7HGmntbV6P/ZlAsoncFLGsNoM27lkTzS+oneY/EiNhj+geqD9ezg/ip+SW6Var0BJU2JtV0vEUZpWVQ==}
     hasBin: true
     dependencies:
@@ -7999,25 +8042,25 @@ packages:
       esprima: 2.7.3
     dev: true
 
-  /js-yaml/4.1.0:
+  /js-yaml@4.1.0:
     resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
     hasBin: true
     dependencies:
       argparse: 2.0.1
 
-  /jsbn/0.1.1:
+  /jsbn@0.1.1:
     resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
 
-  /jsbn/1.1.0:
+  /jsbn@1.1.0:
     resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}
     dev: false
 
-  /jschardet/3.0.0:
+  /jschardet@3.0.0:
     resolution: {integrity: sha512-lJH6tJ77V8Nzd5QWRkFYCLc13a3vADkh3r/Fi8HupZGWk2OVVDfnZP8V/VgQgZ+lzW0kG2UGb5hFgt3V3ndotQ==}
     engines: {node: '>=0.1.90'}
     dev: false
 
-  /jsdom/20.0.3:
+  /jsdom@20.0.3:
     resolution: {integrity: sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -8058,41 +8101,41 @@ packages:
       - utf-8-validate
     dev: false
 
-  /jsesc/2.5.2:
+  /jsesc@2.5.2:
     resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
     engines: {node: '>=4'}
     hasBin: true
     dev: false
 
-  /json-buffer/3.0.0:
+  /json-buffer@3.0.0:
     resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==}
     dev: true
 
-  /json-buffer/3.0.1:
+  /json-buffer@3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
     dev: false
 
-  /json-parse-even-better-errors/2.3.1:
+  /json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
     dev: true
 
-  /json-schema-traverse/0.4.1:
+  /json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
-  /json-schema-traverse/1.0.0:
+  /json-schema-traverse@1.0.0:
     resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
     dev: false
 
-  /json-schema/0.4.0:
+  /json-schema@0.4.0:
     resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
 
-  /json-stable-stringify-without-jsonify/1.0.1:
+  /json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
-  /json-stringify-safe/5.0.1:
+  /json-stringify-safe@5.0.1:
     resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
 
-  /json5-loader/4.0.1_webpack@5.75.0:
+  /json5-loader@4.0.1(webpack@5.75.0):
     resolution: {integrity: sha512-c9viNZlZTz0MTIcf/4qvek5Dz1/PU3DNCB4PwUhlEZIV3qb1bSD6vQQymlV17/Wm6ncra1aCvmIPsuRj+KfEEg==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -8101,28 +8144,28 @@ packages:
       json5: 2.2.3
       loader-utils: 2.0.4
       schema-utils: 3.1.1
-      webpack: 5.75.0_@swc+core@1.3.26
+      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
     dev: true
 
-  /json5/2.2.3:
+  /json5@2.2.3:
     resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
     engines: {node: '>=6'}
     hasBin: true
     dev: true
 
-  /jsonfile/4.0.0:
+  /jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
     optionalDependencies:
       graceful-fs: 4.2.10
 
-  /jsonfile/5.0.0:
+  /jsonfile@5.0.0:
     resolution: {integrity: sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==}
     dependencies:
       universalify: 0.1.2
     optionalDependencies:
       graceful-fs: 4.2.10
 
-  /jsonfile/6.1.0:
+  /jsonfile@6.1.0:
     resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
     dependencies:
       universalify: 2.0.0
@@ -8130,7 +8173,7 @@ packages:
       graceful-fs: 4.2.10
     dev: true
 
-  /jsonld/6.0.0:
+  /jsonld@6.0.0:
     resolution: {integrity: sha512-1SkN2RXhMCTCSkX+bzHvr9ycM2HTmjWyV41hn2xG7k6BqlCgRjw0zHmuqfphjBRPqi1gKMIqgBCe/0RZMcWrAA==}
     engines: {node: '>=14'}
     dependencies:
@@ -8142,7 +8185,7 @@ packages:
       - web-streams-polyfill
     dev: false
 
-  /jsprim/1.4.2:
+  /jsprim@1.4.2:
     resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
     engines: {node: '>=0.6.0'}
     dependencies:
@@ -8152,7 +8195,7 @@ packages:
       verror: 1.10.0
     dev: false
 
-  /jsprim/2.0.2:
+  /jsprim@2.0.2:
     resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
     engines: {'0': node >=0.6.0}
     dependencies:
@@ -8162,21 +8205,21 @@ packages:
       verror: 1.10.0
     dev: true
 
-  /jsrsasign/10.6.1:
+  /jsrsasign@10.6.1:
     resolution: {integrity: sha512-emiQ05haY9CRj1Ho/LiuCqr/+8RgJuWdiHYNglIg2Qjfz0n+pnUq9I2QHplXuOMO2EnAW1oCGC1++aU5VoWSlw==}
     dev: false
 
-  /jstransformer/1.0.0:
+  /jstransformer@1.0.0:
     resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==}
     dependencies:
       is-promise: 2.2.2
       promise: 7.3.1
 
-  /just-debounce/1.1.0:
+  /just-debounce@1.1.0:
     resolution: {integrity: sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==}
     dev: true
 
-  /jwa/2.0.0:
+  /jwa@2.0.0:
     resolution: {integrity: sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==}
     dependencies:
       buffer-equal-constant-time: 1.0.1
@@ -8184,63 +8227,63 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
-  /jws/4.0.0:
+  /jws@4.0.0:
     resolution: {integrity: sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==}
     dependencies:
       jwa: 2.0.0
       safe-buffer: 5.2.1
     dev: false
 
-  /katex/0.16.4:
+  /katex@0.16.4:
     resolution: {integrity: sha512-WudRKUj8yyBeVDI4aYMNxhx5Vhh2PjpzQw1GRu/LVGqL4m1AxwD1GcUp0IMbdJaf5zsjtj8ghP0DOQRYhroNkw==}
     hasBin: true
     dependencies:
       commander: 8.3.0
     dev: true
 
-  /keygrip/1.1.0:
+  /keygrip@1.1.0:
     resolution: {integrity: sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==}
     engines: {node: '>= 0.6'}
     dependencies:
       tsscmp: 1.0.6
     dev: false
 
-  /keyv/3.0.0:
+  /keyv@3.0.0:
     resolution: {integrity: sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==}
     dependencies:
       json-buffer: 3.0.0
     dev: true
 
-  /keyv/4.5.2:
+  /keyv@4.5.2:
     resolution: {integrity: sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==}
     dependencies:
       json-buffer: 3.0.1
     dev: false
 
-  /kind-of/3.2.2:
+  /kind-of@3.2.2:
     resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-buffer: 1.1.6
 
-  /kind-of/4.0.0:
+  /kind-of@4.0.0:
     resolution: {integrity: sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-buffer: 1.1.6
     dev: true
 
-  /kind-of/5.1.0:
+  /kind-of@5.1.0:
     resolution: {integrity: sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /kind-of/6.0.3:
+  /kind-of@6.0.3:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /koa-body/6.0.1:
+  /koa-body@6.0.1:
     resolution: {integrity: sha512-M8ZvMD8r+kPHy28aWP9VxL7kY8oPWA+C7ZgCljrCMeaU7uX6wsIQgDHskyrAr9sw+jqnIXyv4Mlxri5R4InIJg==}
     dependencies:
       '@types/co-body': 6.1.0
@@ -8251,7 +8294,7 @@ packages:
       zod: 3.20.3
     dev: false
 
-  /koa-bodyparser/4.3.0:
+  /koa-bodyparser@4.3.0:
     resolution: {integrity: sha512-uyV8G29KAGwZc4q/0WUAjH+Tsmuv9ImfBUF2oZVyZtaeo0husInagyn/JH85xMSxM0hEk/mbCII5ubLDuqW/Rw==}
     engines: {node: '>=8.0.0'}
     dependencies:
@@ -8259,11 +8302,11 @@ packages:
       copy-to: 2.0.1
     dev: false
 
-  /koa-compose/4.1.0:
+  /koa-compose@4.1.0:
     resolution: {integrity: sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==}
     dev: false
 
-  /koa-convert/2.0.0:
+  /koa-convert@2.0.0:
     resolution: {integrity: sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==}
     engines: {node: '>= 10'}
     dependencies:
@@ -8271,20 +8314,20 @@ packages:
       koa-compose: 4.1.0
     dev: false
 
-  /koa-favicon/2.1.0:
+  /koa-favicon@2.1.0:
     resolution: {integrity: sha512-LvukcooYjxKtnZq0RXdBup+JDhaHwLgnLlDHB/xvjwQEjbc4rbp/0WkmOzpOvaHujc+fIwPear0dpKX1V+dHVg==}
     dependencies:
       mz: 2.7.0
     dev: false
 
-  /koa-json-body/5.3.0:
+  /koa-json-body@5.3.0:
     resolution: {integrity: sha512-M2P3zLOs2XiYCpJLGSTXOKij4u5vJ8pbAMXXarXQnwsx4DwDav9qn081tYI2RdZ79B159Pdk4bRfvwl/sazL8A==}
     engines: {node: '>= 4.0.0'}
     dependencies:
       co-body: 5.2.0
     dev: false
 
-  /koa-logger/3.2.1:
+  /koa-logger@3.2.1:
     resolution: {integrity: sha512-MjlznhLLKy9+kG8nAXKJLM0/ClsQp/Or2vI3a5rbSQmgl8IJBQO0KI5FA70BvW+hqjtxjp49SpH2E7okS6NmHg==}
     engines: {node: '>= 7.6.0'}
     dependencies:
@@ -8294,25 +8337,25 @@ packages:
       passthrough-counter: 1.0.0
     dev: false
 
-  /koa-mount/4.0.0:
+  /koa-mount@4.0.0:
     resolution: {integrity: sha512-rm71jaA/P+6HeCpoRhmCv8KVBIi0tfGuO/dMKicbQnQW/YJntJ6MnnspkodoA4QstMVEZArsCphmd0bJEtoMjQ==}
     engines: {node: '>= 7.6.0'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       koa-compose: 4.1.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /koa-remove-trailing-slashes/2.0.3:
+  /koa-remove-trailing-slashes@2.0.3:
     resolution: {integrity: sha512-NFFF9Sl1wxFo5h0I3OzrHDINdFPaqG+Hx19590F7PNOcmm7yYeFW71p4XicVuSovbcx75GWGb3fi6N6kI6E/3g==}
     dev: false
 
-  /koa-router/10.1.1:
+  /koa-router@10.1.1:
     resolution: {integrity: sha512-z/OzxVjf5NyuNO3t9nJpx7e1oR3FSBAauiwXtMQu4ppcnuNZzTaQ4p21P8A6r2Es8uJJM339oc4oVW+qX7SqnQ==}
     engines: {node: '>= 8.0.0'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       http-errors: 1.8.1
       koa-compose: 4.1.0
       methods: 1.1.2
@@ -8321,17 +8364,17 @@ packages:
       - supports-color
     dev: false
 
-  /koa-send/5.0.1:
+  /koa-send@5.0.1:
     resolution: {integrity: sha512-tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==}
     engines: {node: '>= 8'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       http-errors: 1.8.1
       resolve-path: 1.4.0
     transitivePeerDependencies:
       - supports-color
 
-  /koa-slow/2.1.0:
+  /koa-slow@2.1.0:
     resolution: {integrity: sha512-ii6s1zuZ51p+SY7WIrwjRi1tmPrNpeHEaw5UYi4h1QzAPmIcNk16e9zwKd9+eNNzI9n+Q2LXHAvt1MCfs7j/8w==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
     dependencies:
@@ -8339,17 +8382,17 @@ packages:
       q: 1.4.1
     dev: false
 
-  /koa-static/5.0.0:
+  /koa-static@5.0.0:
     resolution: {integrity: sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==}
     engines: {node: '>= 7.6.0'}
     dependencies:
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@8.1.1)
       koa-send: 5.0.1
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /koa-views/7.0.2_6tybghmia4wsnt33xeid7y4rby:
+  /koa-views@7.0.2(@types/koa@2.13.5)(ejs@3.1.8)(pug@3.0.2):
     resolution: {integrity: sha512-dvx3mdVeSVuIPEaKAoGbxLcenudvhl821xxyuRbcoA+bOJ2dvN8wlGjkLu0ZFMlkCscXZV6lzxy28rafeazI/w==}
     peerDependencies:
       '@types/koa': ^2.13.1
@@ -8358,8 +8401,8 @@ packages:
         optional: true
     dependencies:
       '@types/koa': 2.13.5
-      consolidate: 0.16.0_pug@3.0.2
-      debug: 4.3.4
+      consolidate: 0.16.0(ejs@3.1.8)(pug@3.0.2)
+      debug: 4.3.4(supports-color@8.1.1)
       get-paths: 0.0.7
       koa-send: 5.0.1
       mz: 2.7.0
@@ -8421,80 +8464,7 @@ packages:
       - walrus
       - whiskers
 
-  /koa-views/7.0.2_no5ijl6tnlxntgm3uzzxedo2fe:
-    resolution: {integrity: sha512-dvx3mdVeSVuIPEaKAoGbxLcenudvhl821xxyuRbcoA+bOJ2dvN8wlGjkLu0ZFMlkCscXZV6lzxy28rafeazI/w==}
-    peerDependencies:
-      '@types/koa': ^2.13.1
-    peerDependenciesMeta:
-      '@types/koa':
-        optional: true
-    dependencies:
-      '@types/koa': 2.13.5
-      consolidate: 0.16.0_ejs@3.1.8+pug@3.0.2
-      debug: 4.3.4
-      get-paths: 0.0.7
-      koa-send: 5.0.1
-      mz: 2.7.0
-      pretty: 2.0.0
-      resolve-path: 1.4.0
-    transitivePeerDependencies:
-      - arc-templates
-      - atpl
-      - babel-core
-      - bracket-template
-      - coffee-script
-      - dot
-      - dust
-      - dustjs-helpers
-      - dustjs-linkedin
-      - eco
-      - ect
-      - ejs
-      - haml-coffee
-      - hamlet
-      - hamljs
-      - handlebars
-      - hogan.js
-      - htmling
-      - jade
-      - jazz
-      - jqtpl
-      - just
-      - liquid-node
-      - liquor
-      - lodash
-      - marko
-      - mote
-      - mustache
-      - nunjucks
-      - plates
-      - pug
-      - qejs
-      - ractive
-      - razor-tmpl
-      - react
-      - react-dom
-      - slm
-      - squirrelly
-      - supports-color
-      - swig
-      - swig-templates
-      - teacup
-      - templayed
-      - then-jade
-      - then-pug
-      - tinyliquid
-      - toffee
-      - twig
-      - twing
-      - underscore
-      - vash
-      - velocityjs
-      - walrus
-      - whiskers
-    dev: false
-
-  /koa/2.13.4:
+  /koa@2.13.4:
     resolution: {integrity: sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g==}
     engines: {node: ^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4}
     dependencies:
@@ -8503,7 +8473,7 @@ packages:
       content-disposition: 0.5.4
       content-type: 1.0.4
       cookies: 0.8.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       delegates: 1.0.0
       depd: 2.0.0
       destroy: 1.2.0
@@ -8525,7 +8495,7 @@ packages:
       - supports-color
     dev: false
 
-  /ky-universal/0.10.1_ky@0.30.0:
+  /ky-universal@0.10.1(ky@0.30.0):
     resolution: {integrity: sha512-r8909k+ELKZAxhVA5c440x22hqw5XcMRwLRbgpPQk4JHy3/ddJnvzcnSo5Ww3HdKdNeS3Y8dBgcIYyVahMa46g==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -8540,12 +8510,12 @@ packages:
       node-fetch: 3.3.0
     dev: false
 
-  /ky/0.30.0:
+  /ky@0.30.0:
     resolution: {integrity: sha512-X/u76z4JtDVq10u1JA5UQfatPxgPaVDMYTrgHyiTpGN2z4TMEJkIHsoSBBSg9SWZEIXTKsi9kHgiQ9o3Y/4yog==}
     engines: {node: '>=12'}
     dev: false
 
-  /last-run/1.1.1:
+  /last-run@1.1.1:
     resolution: {integrity: sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -8553,32 +8523,32 @@ packages:
       es6-weak-map: 2.0.3
     dev: true
 
-  /lazy-ass/1.6.0:
+  /lazy-ass@1.6.0:
     resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==}
     engines: {node: '> 0.8'}
     dev: true
 
-  /lazystream/1.0.1:
+  /lazystream@1.0.1:
     resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
     engines: {node: '>= 0.6.3'}
     dependencies:
       readable-stream: 2.3.7
 
-  /lcid/1.0.0:
+  /lcid@1.0.0:
     resolution: {integrity: sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       invert-kv: 1.0.0
     dev: true
 
-  /lead/1.0.0:
+  /lead@1.0.0:
     resolution: {integrity: sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==}
     engines: {node: '>= 0.10'}
     dependencies:
       flush-write-stream: 1.1.1
     dev: true
 
-  /levn/0.3.0:
+  /levn@0.3.0:
     resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -8586,14 +8556,14 @@ packages:
       type-check: 0.3.2
     dev: false
 
-  /levn/0.4.1:
+  /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
-  /liftoff/3.1.0:
+  /liftoff@3.1.0:
     resolution: {integrity: sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==}
     engines: {node: '>= 0.8'}
     dependencies:
@@ -8609,11 +8579,11 @@ packages:
       - supports-color
     dev: true
 
-  /listenercount/1.0.1:
+  /listenercount@1.0.1:
     resolution: {integrity: sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==}
     dev: false
 
-  /listr2/3.14.0_enquirer@2.3.6:
+  /listr2@3.14.0(enquirer@2.3.6):
     resolution: {integrity: sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
@@ -8633,20 +8603,20 @@ packages:
       wrap-ansi: 7.0.0
     dev: true
 
-  /lit-element/3.2.2:
+  /lit-element@3.2.2:
     resolution: {integrity: sha512-6ZgxBR9KNroqKb6+htkyBwD90XGRiqKDHVrW/Eh0EZ+l+iC+u+v+w3/BA5NGi4nizAVHGYvQBHUDuSmLjPp7NQ==}
     dependencies:
       '@lit/reactive-element': 1.6.1
       lit-html: 2.6.1
     dev: true
 
-  /lit-html/2.6.1:
+  /lit-html@2.6.1:
     resolution: {integrity: sha512-Z3iw+E+3KKFn9t2YKNjsXNEu/LRLI98mtH/C6lnFg7kvaqPIzPn124Yd4eT/43lyqrejpc5Wb6BHq3fdv4S8Rw==}
     dependencies:
       '@types/trusted-types': 2.0.2
     dev: true
 
-  /lit/2.6.1:
+  /lit@2.6.1:
     resolution: {integrity: sha512-DT87LD64f8acR7uVp7kZfhLRrHkfC/N4BVzAtnw9Yg8087mbBJ//qedwdwX0kzDbxgPccWRW6mFwGbRQIxy0pw==}
     dependencies:
       '@lit/reactive-element': 1.6.1
@@ -8654,7 +8624,7 @@ packages:
       lit-html: 2.6.1
     dev: true
 
-  /load-json-file/1.1.0:
+  /load-json-file@1.1.0:
     resolution: {integrity: sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -8665,12 +8635,12 @@ packages:
       strip-bom: 2.0.0
     dev: true
 
-  /loader-runner/4.3.0:
+  /loader-runner@4.3.0:
     resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
     engines: {node: '>=6.11.5'}
     dev: true
 
-  /loader-utils/2.0.4:
+  /loader-utils@2.0.4:
     resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==}
     engines: {node: '>=8.9.0'}
     dependencies:
@@ -8679,107 +8649,107 @@ packages:
       json5: 2.2.3
     dev: true
 
-  /loadjs/4.2.0:
+  /loadjs@4.2.0:
     resolution: {integrity: sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA==}
     dev: true
 
-  /locate-path/5.0.0:
+  /locate-path@5.0.0:
     resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
     engines: {node: '>=8'}
     dependencies:
       p-locate: 4.1.0
 
-  /locate-path/6.0.0:
+  /locate-path@6.0.0:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
     engines: {node: '>=10'}
     dependencies:
       p-locate: 5.0.0
 
-  /lodash.assignin/4.2.0:
+  /lodash.assignin@4.2.0:
     resolution: {integrity: sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==}
     dev: false
 
-  /lodash.bind/4.2.1:
+  /lodash.bind@4.2.1:
     resolution: {integrity: sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==}
     dev: false
 
-  /lodash.defaults/4.2.0:
+  /lodash.defaults@4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
 
-  /lodash.difference/4.5.0:
+  /lodash.difference@4.5.0:
     resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
     dev: false
 
-  /lodash.filter/4.6.0:
+  /lodash.filter@4.6.0:
     resolution: {integrity: sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==}
     dev: false
 
-  /lodash.flatten/4.4.0:
+  /lodash.flatten@4.4.0:
     resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
     dev: false
 
-  /lodash.foreach/4.5.0:
+  /lodash.foreach@4.5.0:
     resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
     dev: false
 
-  /lodash.isarguments/3.1.0:
+  /lodash.isarguments@3.1.0:
     resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
 
-  /lodash.isequal/4.5.0:
+  /lodash.isequal@4.5.0:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
     dev: false
 
-  /lodash.isplainobject/4.0.6:
+  /lodash.isplainobject@4.0.6:
     resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
     dev: false
 
-  /lodash.isregexp/3.0.5:
+  /lodash.isregexp@3.0.5:
     resolution: {integrity: sha512-VlV0abdYZs5asSYW1JW5W1f6gxf2SGQt90rzQp7UNTQ8KwcB3CprZe5crN1LIlCA/fB5R9xecrZijGSELJL8Yg==}
     dev: false
 
-  /lodash.map/4.6.0:
+  /lodash.map@4.6.0:
     resolution: {integrity: sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==}
     dev: false
 
-  /lodash.memoize/4.1.2:
+  /lodash.memoize@4.1.2:
     resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
     dev: true
 
-  /lodash.merge/4.6.2:
+  /lodash.merge@4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
 
-  /lodash.once/4.1.1:
+  /lodash.once@4.1.1:
     resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
     dev: true
 
-  /lodash.pick/4.4.0:
+  /lodash.pick@4.4.0:
     resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==}
     dev: false
 
-  /lodash.reduce/4.6.0:
+  /lodash.reduce@4.6.0:
     resolution: {integrity: sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==}
     dev: false
 
-  /lodash.reject/4.6.0:
+  /lodash.reject@4.6.0:
     resolution: {integrity: sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==}
     dev: false
 
-  /lodash.some/4.6.0:
+  /lodash.some@4.6.0:
     resolution: {integrity: sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==}
     dev: false
 
-  /lodash.union/4.6.0:
+  /lodash.union@4.6.0:
     resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
     dev: false
 
-  /lodash.uniq/4.5.0:
+  /lodash.uniq@4.5.0:
     resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
     dev: true
 
-  /lodash/4.17.21:
+  /lodash@4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
-  /log-symbols/4.1.0:
+  /log-symbols@4.1.0:
     resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
     engines: {node: '>=10'}
     dependencies:
@@ -8787,7 +8757,7 @@ packages:
       is-unicode-supported: 0.1.0
     dev: true
 
-  /log-update/4.0.0:
+  /log-update@4.0.0:
     resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
     engines: {node: '>=10'}
     dependencies:
@@ -8797,70 +8767,70 @@ packages:
       wrap-ansi: 6.2.0
     dev: true
 
-  /long/4.0.0:
+  /long@4.0.0:
     resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==}
     dev: false
 
-  /lowercase-keys/1.0.0:
+  /lowercase-keys@1.0.0:
     resolution: {integrity: sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /lowercase-keys/1.0.1:
+  /lowercase-keys@1.0.1:
     resolution: {integrity: sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /lowercase-keys/2.0.0:
+  /lowercase-keys@2.0.0:
     resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}
     engines: {node: '>=8'}
     dev: false
 
-  /lowercase-keys/3.0.0:
+  /lowercase-keys@3.0.0:
     resolution: {integrity: sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: false
 
-  /lru-cache/4.1.5:
+  /lru-cache@4.1.5:
     resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==}
     dependencies:
       pseudomap: 1.0.2
       yallist: 2.1.2
 
-  /lru-cache/6.0.0:
+  /lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
     dependencies:
       yallist: 4.0.0
 
-  /lru-cache/7.14.1:
+  /lru-cache@7.14.1:
     resolution: {integrity: sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==}
     engines: {node: '>=12'}
     dev: false
 
-  /luxon/3.2.1:
+  /luxon@3.2.1:
     resolution: {integrity: sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==}
     engines: {node: '>=12'}
     dev: false
 
-  /magic-string/0.25.9:
+  /magic-string@0.25.9:
     resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
     dependencies:
       sourcemap-codec: 1.4.8
     dev: true
 
-  /mailcheck/1.1.1:
+  /mailcheck@1.1.1:
     resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==}
     dev: false
 
-  /make-dir/1.3.0:
+  /make-dir@1.3.0:
     resolution: {integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==}
     engines: {node: '>=4'}
     dependencies:
       pify: 3.0.0
     dev: true
 
-  /make-dir/3.1.0:
+  /make-dir@3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
     dependencies:
@@ -8868,10 +8838,10 @@ packages:
     dev: false
     optional: true
 
-  /make-error/1.3.6:
+  /make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
 
-  /make-fetch-happen/10.2.1:
+  /make-fetch-happen@10.2.1:
     resolution: {integrity: sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
@@ -8896,30 +8866,30 @@ packages:
       - supports-color
     dev: false
 
-  /make-iterator/1.0.1:
+  /make-iterator@1.0.1:
     resolution: {integrity: sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 6.0.3
     dev: true
 
-  /map-cache/0.2.2:
+  /map-cache@0.2.2:
     resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /map-stream/0.1.0:
+  /map-stream@0.1.0:
     resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==}
     dev: true
 
-  /map-visit/1.0.0:
+  /map-visit@1.0.0:
     resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
     engines: {node: '>=0.10.0'}
     dependencies:
       object-visit: 1.0.1
     dev: true
 
-  /matchdep/2.0.0:
+  /matchdep@2.0.0:
     resolution: {integrity: sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==}
     engines: {node: '>= 0.10.0'}
     dependencies:
@@ -8931,39 +8901,39 @@ packages:
       - supports-color
     dev: true
 
-  /math-expression-evaluator/1.4.0:
+  /math-expression-evaluator@1.4.0:
     resolution: {integrity: sha512-4vRUvPyxdO8cWULGTh9dZWL2tZK6LDBvj+OGHBER7poH9Qdt7kXEoj20wiz4lQUbUXQZFjPbe5mVDo9nutizCw==}
     dev: true
 
-  /matter-js/0.18.0:
+  /matter-js@0.18.0:
     resolution: {integrity: sha512-/ZVem4WygUnbmo/iE4oHZpZS97btfBtYy5Iwn1396vUZU7YhgVEN8J4UWwfZwY1ZqoTYlPgjvSw9WXauuXL0mg==}
     dev: true
 
-  /media-typer/0.3.0:
+  /media-typer@0.3.0:
     resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
     engines: {node: '>= 0.6'}
     dev: false
 
-  /merge-stream/2.0.0:
+  /merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
     dev: true
 
-  /merge2/1.4.1:
+  /merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
     dev: true
 
-  /methods/1.1.2:
+  /methods@1.1.2:
     resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
     engines: {node: '>= 0.6'}
     dev: false
 
-  /mfm-js/0.23.2:
+  /mfm-js@0.23.2:
     resolution: {integrity: sha512-lfYvsMr6FIYbt0ZDL+nY+GWWqmcXpe9jrYLBLy5vvQHwGfPALpx43uNHj8hZsakgM82hPMo/zdx0e9tj+4Z4IA==}
     dependencies:
       twemoji-parser: 14.0.0
 
-  /micromatch/3.1.10:
+  /micromatch@3.1.10:
     resolution: {integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -8984,7 +8954,7 @@ packages:
       - supports-color
     dev: true
 
-  /micromatch/4.0.5:
+  /micromatch@4.0.5:
     resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
     engines: {node: '>=8.6'}
     dependencies:
@@ -8992,73 +8962,73 @@ packages:
       picomatch: 2.3.1
     dev: true
 
-  /mime-db/1.52.0:
+  /mime-db@1.52.0:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
-  /mime-types/2.1.35:
+  /mime-types@2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
     dependencies:
       mime-db: 1.52.0
 
-  /mimic-fn/2.1.0:
+  /mimic-fn@2.1.0:
     resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
     engines: {node: '>=6'}
     dev: true
 
-  /mimic-fn/4.0.0:
+  /mimic-fn@4.0.0:
     resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
     engines: {node: '>=12'}
     dev: true
 
-  /mimic-response/1.0.1:
+  /mimic-response@1.0.1:
     resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
     engines: {node: '>=4'}
 
-  /mimic-response/3.1.0:
+  /mimic-response@3.1.0:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
     engines: {node: '>=10'}
     dev: false
 
-  /mimic-response/4.0.0:
+  /mimic-response@4.0.0:
     resolution: {integrity: sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: false
 
-  /minimalistic-assert/1.0.1:
+  /minimalistic-assert@1.0.1:
     resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
     dev: false
 
-  /minimatch/3.1.2:
+  /minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:
       brace-expansion: 1.1.11
 
-  /minimatch/5.0.1:
+  /minimatch@5.0.1:
     resolution: {integrity: sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==}
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
     dev: true
 
-  /minimatch/5.1.2:
+  /minimatch@5.1.2:
     resolution: {integrity: sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg==}
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
 
-  /minimist/1.2.7:
+  /minimist@1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
 
-  /minipass-collect/1.0.2:
+  /minipass-collect@1.0.2:
     resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
     engines: {node: '>= 8'}
     dependencies:
       minipass: 3.3.6
     dev: false
 
-  /minipass-fetch/2.1.2:
+  /minipass-fetch@2.1.2:
     resolution: {integrity: sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
@@ -9069,28 +9039,28 @@ packages:
       encoding: 0.1.13
     dev: false
 
-  /minipass-flush/1.0.5:
+  /minipass-flush@1.0.5:
     resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==}
     engines: {node: '>= 8'}
     dependencies:
       minipass: 3.3.6
     dev: false
 
-  /minipass-pipeline/1.2.4:
+  /minipass-pipeline@1.2.4:
     resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
     engines: {node: '>=8'}
     dependencies:
       minipass: 3.3.6
     dev: false
 
-  /minipass-sized/1.0.3:
+  /minipass-sized@1.0.3:
     resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==}
     engines: {node: '>=8'}
     dependencies:
       minipass: 3.3.6
     dev: false
 
-  /minipass/2.9.0:
+  /minipass@2.9.0:
     resolution: {integrity: sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==}
     dependencies:
       safe-buffer: 5.2.1
@@ -9098,28 +9068,28 @@ packages:
     dev: false
     optional: true
 
-  /minipass/3.3.6:
+  /minipass@3.3.6:
     resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
     engines: {node: '>=8'}
     dependencies:
       yallist: 4.0.0
     dev: false
 
-  /minipass/4.0.0:
+  /minipass@4.0.0:
     resolution: {integrity: sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==}
     engines: {node: '>=8'}
     dependencies:
       yallist: 4.0.0
     dev: false
 
-  /minizlib/1.3.3:
+  /minizlib@1.3.3:
     resolution: {integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==}
     dependencies:
       minipass: 2.9.0
     dev: false
     optional: true
 
-  /minizlib/2.1.2:
+  /minizlib@2.1.2:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
     engines: {node: '>= 8'}
     dependencies:
@@ -9127,7 +9097,7 @@ packages:
       yallist: 4.0.0
     dev: false
 
-  /mixin-deep/1.3.2:
+  /mixin-deep@1.3.2:
     resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -9135,30 +9105,30 @@ packages:
       is-extendable: 1.0.1
     dev: true
 
-  /mixly/1.0.0:
+  /mixly@1.0.0:
     resolution: {integrity: sha512-ks+xIMVeIDwuYK4LnOMXTfmiEI8oo3tFNFirpHd60C4r2H0wMwKN5/qHCrFBKFK+BYx2Gp7qs+evUJw7QO9D2w==}
     engines: {node: '>= 0.10'}
     dependencies:
       fulcon: 1.0.2
     dev: true
 
-  /mkdirp-classic/0.5.3:
+  /mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
     dev: false
 
-  /mkdirp/0.5.6:
+  /mkdirp@0.5.6:
     resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
     hasBin: true
     dependencies:
       minimist: 1.2.7
 
-  /mkdirp/1.0.4:
+  /mkdirp@1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
     engines: {node: '>=10'}
     hasBin: true
     dev: false
 
-  /mocha/10.2.0:
+  /mocha@10.2.0:
     resolution: {integrity: sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==}
     engines: {node: '>= 14.0.0'}
     hasBin: true
@@ -9166,7 +9136,7 @@ packages:
       ansi-colors: 4.1.1
       browser-stdout: 1.3.1
       chokidar: 3.5.3
-      debug: 4.3.4_supports-color@8.1.1
+      debug: 4.3.4(supports-color@8.1.1)
       diff: 5.0.0
       escape-string-regexp: 4.0.0
       find-up: 5.0.0
@@ -9186,20 +9156,20 @@ packages:
       yargs-unparser: 2.0.0
     dev: true
 
-  /moment/2.29.4:
+  /moment@2.29.4:
     resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
     dev: false
 
-  /ms/2.0.0:
+  /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
-  /ms/2.1.2:
+  /ms@2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
 
-  /ms/2.1.3:
+  /ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
-  /msgpackr-extract/2.2.0:
+  /msgpackr-extract@2.2.0:
     resolution: {integrity: sha512-0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog==}
     hasBin: true
     requiresBuild: true
@@ -9215,13 +9185,13 @@ packages:
     dev: false
     optional: true
 
-  /msgpackr/1.8.1:
+  /msgpackr@1.8.1:
     resolution: {integrity: sha512-05fT4J8ZqjYlR4QcRDIhLCYKUOHXk7C/xa62GzMKj74l3up9k2QZ3LgFc6qWdsPHl91QA2WLWqWc8b8t7GLNNw==}
     optionalDependencies:
       msgpackr-extract: 2.2.0
     dev: false
 
-  /multer/1.4.4-lts.1:
+  /multer@1.4.4-lts.1:
     resolution: {integrity: sha512-WeSGziVj6+Z2/MwQo3GvqzgR+9Uc+qt8SwHKh3gvNPiISKfsMfG4SvCOFYlxxgkXt7yIV2i1yczehm0EOKIxIg==}
     engines: {node: '>= 6.0.0'}
     dependencies:
@@ -9234,43 +9204,43 @@ packages:
       xtend: 4.0.2
     dev: false
 
-  /multi-integer-range/3.0.0:
+  /multi-integer-range@3.0.0:
     resolution: {integrity: sha512-uQzynjVJ8F7x5wjaK0g4Ybhy2TvO/pk96+YHyS5g1W4GuUEV6HMebZ8HcRwWgKIRCUT2MLbM5uCKwYcAqkS+8Q==}
     dev: false
 
-  /mute-stdout/1.0.1:
+  /mute-stdout@1.0.1:
     resolution: {integrity: sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==}
     engines: {node: '>= 0.10'}
     dev: true
 
-  /mylas/2.1.13:
+  /mylas@2.1.13:
     resolution: {integrity: sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg==}
     engines: {node: '>=12.0.0'}
     dev: true
 
-  /mz/2.7.0:
+  /mz@2.7.0:
     resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
     dependencies:
       any-promise: 1.3.0
       object-assign: 4.1.1
       thenify-all: 1.6.0
 
-  /nan/2.17.0:
+  /nan@2.17.0:
     resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==}
     dev: false
 
-  /nanoid/3.3.3:
+  /nanoid@3.3.3:
     resolution: {integrity: sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
     dev: true
 
-  /nanoid/3.3.4:
+  /nanoid@3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
-  /nanomatch/1.2.13:
+  /nanomatch@1.2.13:
     resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -9289,98 +9259,98 @@ packages:
       - supports-color
     dev: true
 
-  /napi-build-utils/1.0.2:
+  /napi-build-utils@1.0.2:
     resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
     dev: false
 
-  /natural-compare/1.4.0:
+  /natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
-  /ndarray-ops/1.2.2:
+  /ndarray-ops@1.2.2:
     resolution: {integrity: sha512-BppWAFRjMYF7N/r6Ie51q6D4fs0iiGmeXIACKY66fLpnwIui3Wc3CXiD/30mgLbDjPpSLrsqcp3Z62+IcHZsDw==}
     dependencies:
       cwise-compiler: 1.1.3
     dev: false
 
-  /ndarray-pack/1.2.1:
+  /ndarray-pack@1.2.1:
     resolution: {integrity: sha512-51cECUJMT0rUZNQa09EoKsnFeDL4x2dHRT0VR5U2H5ZgEcm95ZDWcMA5JShroXjHOejmAD/fg8+H+OvUnVXz2g==}
     dependencies:
       cwise-compiler: 1.1.3
       ndarray: 1.0.19
     dev: false
 
-  /ndarray/1.0.18:
+  /ndarray@1.0.18:
     resolution: {integrity: sha512-jUz6G+CIsEsqs2VlB1EvaQSAA0Jkf8YKm7eFBleKyhiQjYWzTxXqHzWEOm3jFoGCpxGh4DnPUYHB4ECWE+n9SQ==}
     dependencies:
       iota-array: 1.0.0
       is-buffer: 1.1.6
     dev: false
 
-  /ndarray/1.0.19:
+  /ndarray@1.0.19:
     resolution: {integrity: sha512-B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ==}
     dependencies:
       iota-array: 1.0.0
       is-buffer: 1.1.6
     dev: false
 
-  /needle/2.9.1:
+  /needle@2.9.1:
     resolution: {integrity: sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==}
     engines: {node: '>= 4.4.x'}
     hasBin: true
     dependencies:
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@8.1.1)
       iconv-lite: 0.4.24
       sax: 1.2.4
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /negotiator/0.6.3:
+  /negotiator@0.6.3:
     resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
     engines: {node: '>= 0.6'}
     dev: false
 
-  /neo-async/2.6.2:
+  /neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
-  /nested-property/4.0.0:
+  /nested-property@4.0.0:
     resolution: {integrity: sha512-yFehXNWRs4cM0+dz7QxCd06hTbWbSkV0ISsqBfkntU6TOY4Qm3Q88fRRLOddkGh2Qq6dZvnKVAahfhjcUvLnyA==}
     dev: false
 
-  /netmask/2.0.2:
+  /netmask@2.0.2:
     resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==}
     engines: {node: '>= 0.4.0'}
     dev: false
 
-  /next-tick/1.1.0:
+  /next-tick@1.1.0:
     resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
 
-  /nice-try/1.0.5:
+  /nice-try@1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
 
-  /node-abi/3.31.0:
+  /node-abi@3.31.0:
     resolution: {integrity: sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==}
     engines: {node: '>=10'}
     dependencies:
       semver: 7.3.8
     dev: false
 
-  /node-addon-api/5.0.0:
+  /node-addon-api@5.0.0:
     resolution: {integrity: sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==}
     dev: false
 
-  /node-bitmap/0.0.1:
+  /node-bitmap@0.0.1:
     resolution: {integrity: sha512-Jx5lPaaLdIaOsj2mVLWMWulXF6GQVdyLvNSxmiYCvZ8Ma2hfKX0POoR2kgKOqz+oFsRreq0yYZjQ2wjE9VNzCA==}
     engines: {node: '>=v0.6.5'}
     dev: false
 
-  /node-domexception/1.0.0:
+  /node-domexception@1.0.0:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
     engines: {node: '>=10.5.0'}
 
-  /node-fetch/2.6.8:
+  /node-fetch@2.6.8:
     resolution: {integrity: sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==}
     engines: {node: 4.x || >=6.0.0}
     peerDependencies:
@@ -9392,7 +9362,7 @@ packages:
       whatwg-url: 5.0.0
     dev: false
 
-  /node-fetch/3.3.0:
+  /node-fetch@3.3.0:
     resolution: {integrity: sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
@@ -9400,18 +9370,18 @@ packages:
       fetch-blob: 3.2.0
       formdata-polyfill: 4.0.10
 
-  /node-gyp-build-optional-packages/5.0.3:
+  /node-gyp-build-optional-packages@5.0.3:
     resolution: {integrity: sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==}
     hasBin: true
     dev: false
     optional: true
 
-  /node-gyp-build/4.6.0:
+  /node-gyp-build@4.6.0:
     resolution: {integrity: sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==}
     hasBin: true
     dev: false
 
-  /node-gyp/9.3.1:
+  /node-gyp@9.3.1:
     resolution: {integrity: sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==}
     engines: {node: ^12.13 || ^14.13 || >=16}
     hasBin: true
@@ -9431,20 +9401,20 @@ packages:
       - supports-color
     dev: false
 
-  /node-releases/2.0.8:
+  /node-releases@2.0.8:
     resolution: {integrity: sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==}
     dev: true
 
-  /nodemailer/6.8.0:
+  /nodemailer@6.8.0:
     resolution: {integrity: sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==}
     engines: {node: '>=6.0.0'}
     dev: false
 
-  /nofilter/3.1.0:
+  /nofilter@3.1.0:
     resolution: {integrity: sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==}
     engines: {node: '>=12.19'}
 
-  /nopt/5.0.0:
+  /nopt@5.0.0:
     resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==}
     engines: {node: '>=6'}
     hasBin: true
@@ -9453,14 +9423,14 @@ packages:
     dev: false
     optional: true
 
-  /nopt/6.0.0:
+  /nopt@6.0.0:
     resolution: {integrity: sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     hasBin: true
     dependencies:
       abbrev: 1.1.1
 
-  /normalize-package-data/2.5.0:
+  /normalize-package-data@2.5.0:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
     dependencies:
       hosted-git-info: 2.8.9
@@ -9469,23 +9439,23 @@ packages:
       validate-npm-package-license: 3.0.4
     dev: true
 
-  /normalize-path/2.1.1:
+  /normalize-path@2.1.1:
     resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==}
     engines: {node: '>=0.10.0'}
     dependencies:
       remove-trailing-separator: 1.1.0
     dev: true
 
-  /normalize-path/3.0.0:
+  /normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
 
-  /normalize-range/0.1.2:
+  /normalize-range@0.1.2:
     resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /normalize-url/1.9.1:
+  /normalize-url@1.9.1:
     resolution: {integrity: sha512-A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ==}
     engines: {node: '>=4'}
     dependencies:
@@ -9495,7 +9465,7 @@ packages:
       sort-keys: 1.1.2
     dev: true
 
-  /normalize-url/2.0.1:
+  /normalize-url@2.0.1:
     resolution: {integrity: sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==}
     engines: {node: '>=4'}
     dependencies:
@@ -9504,24 +9474,24 @@ packages:
       sort-keys: 2.0.0
     dev: true
 
-  /normalize-url/6.1.0:
+  /normalize-url@6.1.0:
     resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==}
     engines: {node: '>=10'}
     dev: false
 
-  /normalize-url/8.0.0:
+  /normalize-url@8.0.0:
     resolution: {integrity: sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==}
     engines: {node: '>=14.16'}
     dev: false
 
-  /now-and-later/2.0.1:
+  /now-and-later@2.0.1:
     resolution: {integrity: sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==}
     engines: {node: '>= 0.10'}
     dependencies:
       once: 1.4.0
     dev: true
 
-  /npm-conf/1.1.3:
+  /npm-conf@1.1.3:
     resolution: {integrity: sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==}
     engines: {node: '>=4'}
     dependencies:
@@ -9529,28 +9499,28 @@ packages:
       pify: 3.0.0
     dev: true
 
-  /npm-run-path/2.0.2:
+  /npm-run-path@2.0.2:
     resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}
     engines: {node: '>=4'}
     dependencies:
       path-key: 2.0.1
     dev: true
 
-  /npm-run-path/4.0.1:
+  /npm-run-path@4.0.1:
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
     engines: {node: '>=8'}
     dependencies:
       path-key: 3.1.1
     dev: true
 
-  /npm-run-path/5.1.0:
+  /npm-run-path@5.1.0:
     resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
       path-key: 4.0.0
     dev: true
 
-  /npmlog/5.0.1:
+  /npmlog@5.0.1:
     resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==}
     dependencies:
       are-we-there-yet: 2.0.0
@@ -9560,7 +9530,7 @@ packages:
     dev: false
     optional: true
 
-  /npmlog/6.0.2:
+  /npmlog@6.0.2:
     resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
@@ -9570,56 +9540,56 @@ packages:
       set-blocking: 2.0.0
     dev: false
 
-  /nsfwjs/2.4.2_@tensorflow+tfjs@4.2.0:
+  /nsfwjs@2.4.2(@tensorflow/tfjs@4.2.0):
     resolution: {integrity: sha512-i4Pp2yt59qPQgeZFyg3wXFBX52uSeu/hkDoqdZfe+sILRxNBUu0VDogj7Lmqak0GlrXviS/wLiVeIx40IDUu7A==}
     peerDependencies:
       '@tensorflow/tfjs': ^3.18.0
     dependencies:
       '@nsfw-filter/gif-frames': 1.0.2
-      '@tensorflow/tfjs': 4.2.0_seedrandom@3.0.5
+      '@tensorflow/tfjs': 4.2.0(seedrandom@3.0.5)
     dev: false
 
-  /nth-check/1.0.2:
+  /nth-check@1.0.2:
     resolution: {integrity: sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==}
     dependencies:
       boolbase: 1.0.0
     dev: false
 
-  /num2fraction/1.2.2:
+  /num2fraction@1.2.2:
     resolution: {integrity: sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==}
     dev: true
 
-  /number-is-nan/1.0.1:
+  /number-is-nan@1.0.1:
     resolution: {integrity: sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /nwsapi/2.2.2:
+  /nwsapi@2.2.2:
     resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==}
     dev: false
 
-  /oauth-sign/0.9.0:
+  /oauth-sign@0.9.0:
     resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
     dev: false
 
-  /oauth/0.10.0:
+  /oauth@0.10.0:
     resolution: {integrity: sha512-1orQ9MT1vHFGQxhuy7E/0gECD3fd2fCC+PIX+/jgmU/gI3EpRocXtmtvxCO5x3WZ443FLTLFWNDjl5MPJf9u+Q==}
     dev: false
 
-  /oauth/0.9.15:
+  /oauth@0.9.15:
     resolution: {integrity: sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==}
     dev: false
 
-  /object-assign-deep/0.4.0:
+  /object-assign-deep@0.4.0:
     resolution: {integrity: sha512-54Uvn3s+4A/cMWx9tlRez1qtc7pN7pbQ+Yi7mjLjcBpWLlP+XbSHiHbQW6CElDiV4OvuzqnMrBdkgxI1mT8V/Q==}
     engines: {node: '>=6'}
     dev: false
 
-  /object-assign/4.1.1:
+  /object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
 
-  /object-copy/0.1.0:
+  /object-copy@0.1.0:
     resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -9628,22 +9598,22 @@ packages:
       kind-of: 3.2.2
     dev: true
 
-  /object-inspect/1.12.3:
+  /object-inspect@1.12.3:
     resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
 
-  /object-keys/1.1.1:
+  /object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /object-visit/1.0.1:
+  /object-visit@1.0.1:
     resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       isobject: 3.0.1
     dev: true
 
-  /object.assign/4.1.4:
+  /object.assign@4.1.4:
     resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -9653,7 +9623,7 @@ packages:
       object-keys: 1.1.1
     dev: true
 
-  /object.defaults/1.1.0:
+  /object.defaults@1.1.0:
     resolution: {integrity: sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -9663,7 +9633,7 @@ packages:
       isobject: 3.0.1
     dev: true
 
-  /object.map/1.0.1:
+  /object.map@1.0.1:
     resolution: {integrity: sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -9671,14 +9641,14 @@ packages:
       make-iterator: 1.0.1
     dev: true
 
-  /object.pick/1.3.0:
+  /object.pick@1.3.0:
     resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       isobject: 3.0.1
     dev: true
 
-  /object.reduce/1.0.1:
+  /object.reduce@1.0.1:
     resolution: {integrity: sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -9686,55 +9656,55 @@ packages:
       make-iterator: 1.0.1
     dev: true
 
-  /oblivious-set/1.1.1:
+  /oblivious-set@1.1.1:
     resolution: {integrity: sha512-Oh+8fK09mgGmAshFdH6hSVco6KZmd1tTwNFWj35OvzdmJTMZtAkbn05zar2iG3v6sDs1JLEtOiBGNb6BHwkb2w==}
     dev: true
 
-  /omggif/1.0.10:
+  /omggif@1.0.10:
     resolution: {integrity: sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==}
     dev: false
 
-  /on-finished/2.4.1:
+  /on-finished@2.4.1:
     resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
     engines: {node: '>= 0.8'}
     dependencies:
       ee-first: 1.1.1
     dev: false
 
-  /once/1.4.0:
+  /once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
       wrappy: 1.0.2
 
-  /onetime/5.1.2:
+  /onetime@5.1.2:
     resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
     engines: {node: '>=6'}
     dependencies:
       mimic-fn: 2.1.0
     dev: true
 
-  /onetime/6.0.0:
+  /onetime@6.0.0:
     resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
     engines: {node: '>=12'}
     dependencies:
       mimic-fn: 4.0.0
     dev: true
 
-  /only/0.0.2:
+  /only@0.0.2:
     resolution: {integrity: sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==}
     dev: false
 
-  /opencollective-postinstall/2.0.3:
+  /opencollective-postinstall@2.0.3:
     resolution: {integrity: sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==}
     hasBin: true
     dev: false
 
-  /opentype.js/0.4.11:
+  /opentype.js@0.4.11:
     resolution: {integrity: sha512-GthxucX/6aftfLdeU5Ho7o7zmQcC8uVtqdcelVq12X++ndxwBZG8Xb5rFEKT7nEcWDD2P1x+TNuJ70jtj1Mbpw==}
     hasBin: true
     dev: false
 
-  /optionator/0.8.3:
+  /optionator@0.8.3:
     resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -9746,7 +9716,7 @@ packages:
       word-wrap: 1.2.3
     dev: false
 
-  /optionator/0.9.1:
+  /optionator@0.9.1:
     resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -9757,96 +9727,96 @@ packages:
       type-check: 0.4.0
       word-wrap: 1.2.3
 
-  /ordered-read-streams/1.0.1:
+  /ordered-read-streams@1.0.1:
     resolution: {integrity: sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==}
     dependencies:
       readable-stream: 2.3.7
     dev: true
 
-  /os-filter-obj/2.0.0:
+  /os-filter-obj@2.0.0:
     resolution: {integrity: sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==}
     engines: {node: '>=4'}
     dependencies:
       arch: 2.2.0
     dev: true
 
-  /os-locale/1.4.0:
+  /os-locale@1.4.0:
     resolution: {integrity: sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==}
     engines: {node: '>=0.10.0'}
     dependencies:
       lcid: 1.0.0
     dev: true
 
-  /os-utils/0.0.14:
+  /os-utils@0.0.14:
     resolution: {integrity: sha512-ajB8csaHLBvJOYsHJkp8YdO2FvlBbf/ZxaYQwXXRDyQ84UoE+uTuLXxqd0shekXMX6Qr/pt/DDyLMRAMsgfWzg==}
     dev: false
 
-  /ospath/1.2.2:
+  /ospath@1.2.2:
     resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
     dev: true
 
-  /p-cancelable/0.4.1:
+  /p-cancelable@0.4.1:
     resolution: {integrity: sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /p-cancelable/2.1.1:
+  /p-cancelable@2.1.1:
     resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
     engines: {node: '>=8'}
     dev: false
 
-  /p-cancelable/3.0.0:
+  /p-cancelable@3.0.0:
     resolution: {integrity: sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==}
     engines: {node: '>=12.20'}
     dev: false
 
-  /p-event/2.3.1:
+  /p-event@2.3.1:
     resolution: {integrity: sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==}
     engines: {node: '>=6'}
     dependencies:
       p-timeout: 2.0.1
     dev: true
 
-  /p-finally/1.0.0:
+  /p-finally@1.0.0:
     resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
     engines: {node: '>=4'}
 
-  /p-is-promise/1.1.0:
+  /p-is-promise@1.1.0:
     resolution: {integrity: sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg==}
     engines: {node: '>=4'}
     dev: true
 
-  /p-limit/2.3.0:
+  /p-limit@2.3.0:
     resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
     engines: {node: '>=6'}
     dependencies:
       p-try: 2.2.0
 
-  /p-limit/3.1.0:
+  /p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
     dependencies:
       yocto-queue: 0.1.0
 
-  /p-locate/4.1.0:
+  /p-locate@4.1.0:
     resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
     engines: {node: '>=8'}
     dependencies:
       p-limit: 2.3.0
 
-  /p-locate/5.0.0:
+  /p-locate@5.0.0:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
     engines: {node: '>=10'}
     dependencies:
       p-limit: 3.1.0
 
-  /p-map/4.0.0:
+  /p-map@4.0.0:
     resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
     engines: {node: '>=10'}
     dependencies:
       aggregate-error: 3.1.0
 
-  /p-queue/6.6.2:
+  /p-queue@6.6.2:
     resolution: {integrity: sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==}
     engines: {node: '>=8'}
     dependencies:
@@ -9854,40 +9824,40 @@ packages:
       p-timeout: 3.2.0
     dev: true
 
-  /p-timeout/2.0.1:
+  /p-timeout@2.0.1:
     resolution: {integrity: sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==}
     engines: {node: '>=4'}
     dependencies:
       p-finally: 1.0.0
     dev: true
 
-  /p-timeout/3.2.0:
+  /p-timeout@3.2.0:
     resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
     engines: {node: '>=8'}
     dependencies:
       p-finally: 1.0.0
 
-  /p-try/2.2.0:
+  /p-try@2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
 
-  /packet-reader/1.0.0:
+  /packet-reader@1.0.0:
     resolution: {integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==}
     dev: false
 
-  /parent-module/1.0.1:
+  /parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
     dependencies:
       callsites: 3.1.0
 
-  /parse-data-uri/0.2.0:
+  /parse-data-uri@0.2.0:
     resolution: {integrity: sha512-uOtts8NqDcaCt1rIsO3VFDRsAfgE4c6osG4d9z3l4dCBlxYFzni6Di/oNU270SDrjkfZuUvLZx1rxMyqh46Y9w==}
     dependencies:
       data-uri-to-buffer: 0.0.3
     dev: false
 
-  /parse-filepath/1.0.2:
+  /parse-filepath@1.0.2:
     resolution: {integrity: sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==}
     engines: {node: '>=0.8'}
     dependencies:
@@ -9896,119 +9866,119 @@ packages:
       path-root: 0.1.1
     dev: true
 
-  /parse-json/2.2.0:
+  /parse-json@2.2.0:
     resolution: {integrity: sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       error-ex: 1.3.2
     dev: true
 
-  /parse-link-header/2.0.0:
+  /parse-link-header@2.0.0:
     resolution: {integrity: sha512-xjU87V0VyHZybn2RrCX5TIFGxTVZE6zqqZWMPlIKiSKuWh/X5WZdt+w1Ki1nXB+8L/KtL+nZ4iq+sfI6MrhhMw==}
     dependencies:
       xtend: 4.0.2
     dev: false
 
-  /parse-node-version/1.0.1:
+  /parse-node-version@1.0.1:
     resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}
     engines: {node: '>= 0.10'}
     dev: true
 
-  /parse-passwd/1.0.0:
+  /parse-passwd@1.0.0:
     resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /parse-srcset/1.0.2:
+  /parse-srcset@1.0.2:
     resolution: {integrity: sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==}
     dev: false
 
-  /parse5-htmlparser2-tree-adapter/6.0.1:
+  /parse5-htmlparser2-tree-adapter@6.0.1:
     resolution: {integrity: sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==}
     dependencies:
       parse5: 6.0.1
     dev: false
 
-  /parse5/5.1.1:
+  /parse5@5.1.1:
     resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==}
     dev: false
 
-  /parse5/6.0.1:
+  /parse5@6.0.1:
     resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
     dev: false
 
-  /parse5/7.1.2:
+  /parse5@7.1.2:
     resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
     dependencies:
       entities: 4.4.0
 
-  /parseurl/1.3.3:
+  /parseurl@1.3.3:
     resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
     engines: {node: '>= 0.8'}
     dev: false
 
-  /pascalcase/0.1.1:
+  /pascalcase@0.1.1:
     resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /passthrough-counter/1.0.0:
+  /passthrough-counter@1.0.0:
     resolution: {integrity: sha512-Wy8PXTLqPAN0oEgBrlnsXPMww3SYJ44tQ8aVrGAI4h4JZYCS0oYqsPqtPR8OhJpv6qFbpbB7XAn0liKV7EXubA==}
     dev: false
 
-  /path-dirname/1.0.2:
+  /path-dirname@1.0.2:
     resolution: {integrity: sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==}
     dev: true
 
-  /path-exists/2.1.0:
+  /path-exists@2.1.0:
     resolution: {integrity: sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       pinkie-promise: 2.0.1
     dev: true
 
-  /path-exists/4.0.0:
+  /path-exists@4.0.0:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
     engines: {node: '>=8'}
 
-  /path-is-absolute/1.0.1:
+  /path-is-absolute@1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
 
-  /path-key/2.0.1:
+  /path-key@2.0.1:
     resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
     engines: {node: '>=4'}
     dev: true
 
-  /path-key/3.1.1:
+  /path-key@3.1.1:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
 
-  /path-key/4.0.0:
+  /path-key@4.0.0:
     resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
     engines: {node: '>=12'}
     dev: true
 
-  /path-parse/1.0.7:
+  /path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
-  /path-root-regex/0.1.2:
+  /path-root-regex@0.1.2:
     resolution: {integrity: sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /path-root/0.1.1:
+  /path-root@0.1.1:
     resolution: {integrity: sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       path-root-regex: 0.1.2
     dev: true
 
-  /path-to-regexp/6.2.1:
+  /path-to-regexp@6.2.1:
     resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==}
     dev: false
 
-  /path-type/1.1.0:
+  /path-type@1.1.0:
     resolution: {integrity: sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -10017,39 +9987,39 @@ packages:
       pinkie-promise: 2.0.1
     dev: true
 
-  /path-type/4.0.0:
+  /path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
     dev: true
 
-  /pause-stream/0.0.11:
+  /pause-stream@0.0.11:
     resolution: {integrity: sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==}
     dependencies:
       through: 2.3.8
     dev: true
 
-  /peek-readable/5.0.0:
+  /peek-readable@5.0.0:
     resolution: {integrity: sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==}
     engines: {node: '>=14.16'}
     dev: false
 
-  /pend/1.2.0:
+  /pend@1.2.0:
     resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
     dev: true
 
-  /performance-now/2.1.0:
+  /performance-now@2.1.0:
     resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
 
-  /pg-connection-string/2.5.0:
+  /pg-connection-string@2.5.0:
     resolution: {integrity: sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==}
     dev: false
 
-  /pg-int8/1.0.1:
+  /pg-int8@1.0.1:
     resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
     engines: {node: '>=4.0.0'}
     dev: false
 
-  /pg-pool/3.5.2_pg@8.8.0:
+  /pg-pool@3.5.2(pg@8.8.0):
     resolution: {integrity: sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==}
     peerDependencies:
       pg: '>=8.0'
@@ -10057,11 +10027,11 @@ packages:
       pg: 8.8.0
     dev: false
 
-  /pg-protocol/1.5.0:
+  /pg-protocol@1.5.0:
     resolution: {integrity: sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==}
     dev: false
 
-  /pg-types/2.2.0:
+  /pg-types@2.2.0:
     resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
     engines: {node: '>=4'}
     dependencies:
@@ -10072,7 +10042,7 @@ packages:
       postgres-interval: 1.2.0
     dev: false
 
-  /pg/8.8.0:
+  /pg@8.8.0:
     resolution: {integrity: sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
@@ -10084,70 +10054,70 @@ packages:
       buffer-writer: 2.0.0
       packet-reader: 1.0.0
       pg-connection-string: 2.5.0
-      pg-pool: 3.5.2_pg@8.8.0
+      pg-pool: 3.5.2(pg@8.8.0)
       pg-protocol: 1.5.0
       pg-types: 2.2.0
       pgpass: 1.0.5
     dev: false
 
-  /pgpass/1.0.5:
+  /pgpass@1.0.5:
     resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}
     dependencies:
       split2: 4.1.0
     dev: false
 
-  /photoswipe/5.3.4:
+  /photoswipe@5.3.4:
     resolution: {integrity: sha512-SN+RWHqxJvdwzXJsh8KrG+ajjPpdTX5HpKglEd0k9o6o5fW+QHPkW8//Bo11MB+NQwTa/hFw8BDv2EdxiDXjNw==}
     engines: {node: '>= 0.12.0'}
     dev: true
 
-  /picocolors/1.0.0:
+  /picocolors@1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
 
-  /picomatch/2.3.1:
+  /picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
-  /pify/2.3.0:
+  /pify@2.3.0:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /pify/3.0.0:
+  /pify@3.0.0:
     resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
     engines: {node: '>=4'}
     dev: true
 
-  /pify/4.0.1:
+  /pify@4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
 
-  /pinkie-promise/2.0.1:
+  /pinkie-promise@2.0.1:
     resolution: {integrity: sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       pinkie: 2.0.4
     dev: true
 
-  /pinkie/2.0.4:
+  /pinkie@2.0.4:
     resolution: {integrity: sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /pkg-dir/4.2.0:
+  /pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
     dependencies:
       find-up: 4.1.0
     dev: true
 
-  /plimit-lit/1.5.0:
+  /plimit-lit@1.5.0:
     resolution: {integrity: sha512-Eb/MqCb1Iv/ok4m1FqIXqvUKPISufcjZ605hl3KM/n8GaX8zfhtgdLwZU3vKjuHGh2O9Rjog/bHTq8ofIShdng==}
     dependencies:
       queue-lit: 1.5.0
     dev: true
 
-  /plugin-error/1.0.1:
+  /plugin-error@1.0.1:
     resolution: {integrity: sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -10157,32 +10127,32 @@ packages:
       extend-shallow: 3.0.2
     dev: true
 
-  /pluralize/8.0.0:
+  /pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
     dev: false
 
-  /pngjs-nozlib/1.0.0:
+  /pngjs-nozlib@1.0.0:
     resolution: {integrity: sha512-N1PggqLp9xDqwAoKvGohmZ3m4/N9xpY0nDZivFqQLcpLHmliHnCp9BuNCsOeqHWMuEEgFjpEaq9dZq6RZyy0fA==}
     engines: {iojs: '>= 1.0.0', node: '>=0.10.0'}
     dev: false
 
-  /pngjs/3.4.0:
+  /pngjs@3.4.0:
     resolution: {integrity: sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==}
     engines: {node: '>=4.0.0'}
     dev: false
 
-  /pngjs/5.0.0:
+  /pngjs@5.0.0:
     resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==}
     engines: {node: '>=10.13.0'}
     dev: false
 
-  /posix-character-classes/0.1.1:
+  /posix-character-classes@0.1.1:
     resolution: {integrity: sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /postcss-calc/5.3.1:
+  /postcss-calc@5.3.1:
     resolution: {integrity: sha512-iBcptYFq+QUh9gzP7ta2btw50o40s4uLI4UDVgd5yRAZtUDWc5APdl5yQDd2h/TyiZNbJrv0HiYhT102CMgN7Q==}
     dependencies:
       postcss: 5.2.18
@@ -10190,7 +10160,7 @@ packages:
       reduce-css-calc: 1.3.0
     dev: true
 
-  /postcss-colormin/2.2.2:
+  /postcss-colormin@2.2.2:
     resolution: {integrity: sha512-XXitQe+jNNPf+vxvQXIQ1+pvdQKWKgkx8zlJNltcMEmLma1ypDRDQwlLt+6cP26fBreihNhZxohh1rcgCH2W5w==}
     dependencies:
       colormin: 1.1.2
@@ -10198,51 +10168,51 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-convert-values/2.6.1:
+  /postcss-convert-values@2.6.1:
     resolution: {integrity: sha512-SE7mf25D3ORUEXpu3WUqQqy0nCbMuM5BEny+ULE/FXdS/0UMA58OdzwvzuHJRpIFlk1uojt16JhaEogtP6W2oA==}
     dependencies:
       postcss: 5.2.18
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-discard-comments/2.0.4:
+  /postcss-discard-comments@2.0.4:
     resolution: {integrity: sha512-yGbyBDo5FxsImE90LD8C87vgnNlweQkODMkUZlDVM/CBgLr9C5RasLGJxxh9GjVOBeG8NcCMatoqI1pXg8JNXg==}
     dependencies:
       postcss: 5.2.18
     dev: true
 
-  /postcss-discard-duplicates/2.1.0:
+  /postcss-discard-duplicates@2.1.0:
     resolution: {integrity: sha512-+lk5W1uqO8qIUTET+UETgj9GWykLC3LOldr7EehmymV0Wu36kyoHimC4cILrAAYpHQ+fr4ypKcWcVNaGzm0reA==}
     dependencies:
       postcss: 5.2.18
     dev: true
 
-  /postcss-discard-empty/2.1.0:
+  /postcss-discard-empty@2.1.0:
     resolution: {integrity: sha512-IBFoyrwk52dhF+5z/ZAbzq5Jy7Wq0aLUsOn69JNS+7YeuyHaNzJwBIYE0QlUH/p5d3L+OON72Fsexyb7OK/3og==}
     dependencies:
       postcss: 5.2.18
     dev: true
 
-  /postcss-discard-overridden/0.1.1:
+  /postcss-discard-overridden@0.1.1:
     resolution: {integrity: sha512-IyKoDL8QNObOiUc6eBw8kMxBHCfxUaERYTUe2QF8k7j/xiirayDzzkmlR6lMQjrAM1p1DDRTvWrS7Aa8lp6/uA==}
     dependencies:
       postcss: 5.2.18
     dev: true
 
-  /postcss-discard-unused/2.2.3:
+  /postcss-discard-unused@2.2.3:
     resolution: {integrity: sha512-nCbFNfqYAbKCw9J6PSJubpN9asnrwVLkRDFc4KCwyUEdOtM5XDE/eTW3OpqHrYY1L4fZxgan7LLRAAYYBzwzrg==}
     dependencies:
       postcss: 5.2.18
       uniqs: 2.0.0
     dev: true
 
-  /postcss-filter-plugins/2.0.3:
+  /postcss-filter-plugins@2.0.3:
     resolution: {integrity: sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==}
     dependencies:
       postcss: 5.2.18
     dev: true
 
-  /postcss-merge-idents/2.1.7:
+  /postcss-merge-idents@2.1.7:
     resolution: {integrity: sha512-9DHmfCZ7/hNHhIKnNkz4CU0ejtGen5BbTRJc13Z2uHfCedeCUsK2WEQoAJRBL+phs68iWK6Qf8Jze71anuysWA==}
     dependencies:
       has: 1.0.3
@@ -10250,13 +10220,13 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-merge-longhand/2.0.2:
+  /postcss-merge-longhand@2.0.2:
     resolution: {integrity: sha512-ma7YvxjdLQdifnc1HFsW/AW6fVfubGyR+X4bE3FOSdBVMY9bZjKVdklHT+odknKBB7FSCfKIHC3yHK7RUAqRPg==}
     dependencies:
       postcss: 5.2.18
     dev: true
 
-  /postcss-merge-rules/2.1.2:
+  /postcss-merge-rules@2.1.2:
     resolution: {integrity: sha512-Wgg2FS6W3AYBl+5L9poL6ZUISi5YzL+sDCJfM7zNw/Q1qsyVQXXZ2cbVui6mu2cYJpt1hOKCGj1xA4mq/obz/Q==}
     dependencies:
       browserslist: 1.7.7
@@ -10266,11 +10236,11 @@ packages:
       vendors: 1.0.4
     dev: true
 
-  /postcss-message-helpers/2.0.0:
+  /postcss-message-helpers@2.0.0:
     resolution: {integrity: sha512-tPLZzVAiIJp46TBbpXtrUAKqedXSyW5xDEo1sikrfEfnTs+49SBZR/xDdqCiJvSSbtr615xDsaMF3RrxS2jZlA==}
     dev: true
 
-  /postcss-minify-font-values/1.0.5:
+  /postcss-minify-font-values@1.0.5:
     resolution: {integrity: sha512-vFSPzrJhNe6/8McOLU13XIsERohBJiIFFuC1PolgajOZdRWqRgKITP/A4Z/n4GQhEmtbxmO9NDw3QLaFfE1dFQ==}
     dependencies:
       object-assign: 4.1.1
@@ -10278,14 +10248,14 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-minify-gradients/1.0.5:
+  /postcss-minify-gradients@1.0.5:
     resolution: {integrity: sha512-DZhT0OE+RbVqVyGsTIKx84rU/5cury1jmwPa19bViqYPQu499ZU831yMzzsyC8EhiZVd73+h5Z9xb/DdaBpw7Q==}
     dependencies:
       postcss: 5.2.18
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-minify-params/1.2.2:
+  /postcss-minify-params@1.2.2:
     resolution: {integrity: sha512-hhJdMVgP8vasrHbkKAk+ab28vEmPYgyuDzRl31V3BEB3QOR3L5TTIVEWLDNnZZ3+fiTi9d6Ker8GM8S1h8p2Ow==}
     dependencies:
       alphanum-sort: 1.0.2
@@ -10294,7 +10264,7 @@ packages:
       uniqs: 2.0.0
     dev: true
 
-  /postcss-minify-selectors/2.1.1:
+  /postcss-minify-selectors@2.1.1:
     resolution: {integrity: sha512-e13vxPBSo3ZaPne43KVgM+UETkx3Bs4/Qvm6yXI9HQpQp4nyb7HZ0gKpkF+Wn2x+/dbQ+swNpCdZSbMOT7+TIA==}
     dependencies:
       alphanum-sort: 1.0.2
@@ -10303,13 +10273,13 @@ packages:
       postcss-selector-parser: 2.2.3
     dev: true
 
-  /postcss-normalize-charset/1.1.1:
+  /postcss-normalize-charset@1.1.1:
     resolution: {integrity: sha512-RKgjEks83l8w4yEhztOwNZ+nLSrJ+NvPNhpS+mVDzoaiRHZQVoG7NF2TP5qjwnaN9YswUhj6m1E0S0Z+WDCgEQ==}
     dependencies:
       postcss: 5.2.18
     dev: true
 
-  /postcss-normalize-url/3.0.8:
+  /postcss-normalize-url@3.0.8:
     resolution: {integrity: sha512-WqtWG6GV2nELsQEFES0RzfL2ebVwmGl/M8VmMbshKto/UClBo+mznX8Zi4/hkThdqx7ijwv+O8HWPdpK7nH/Ig==}
     dependencies:
       is-absolute-url: 2.1.0
@@ -10318,27 +10288,27 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-ordered-values/2.2.3:
+  /postcss-ordered-values@2.2.3:
     resolution: {integrity: sha512-5RB1IUZhkxDCfa5fx/ogp/A82mtq+r7USqS+7zt0e428HJ7+BHCxyeY39ClmkkUtxdOd3mk8gD6d9bjH2BECMg==}
     dependencies:
       postcss: 5.2.18
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-reduce-idents/2.4.0:
+  /postcss-reduce-idents@2.4.0:
     resolution: {integrity: sha512-0+Ow9e8JLtffjumJJFPqvN4qAvokVbdQPnijUDSOX8tfTwrILLP4ETvrZcXZxAtpFLh/U0c+q8oRMJLr1Kiu4w==}
     dependencies:
       postcss: 5.2.18
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-reduce-initial/1.0.1:
+  /postcss-reduce-initial@1.0.1:
     resolution: {integrity: sha512-jJFrV1vWOPCQsIVitawGesRgMgunbclERQ/IRGW7r93uHrVzNQQmHQ7znsOIjJPZ4yWMzs5A8NFhp3AkPHPbDA==}
     dependencies:
       postcss: 5.2.18
     dev: true
 
-  /postcss-reduce-transforms/1.0.4:
+  /postcss-reduce-transforms@1.0.4:
     resolution: {integrity: sha512-lGgRqnSuAR5i5uUg1TA33r9UngfTadWxOyL2qx1KuPoCQzfmtaHjp9PuwX7yVyRxG3BWBzeFUaS5uV9eVgnEgQ==}
     dependencies:
       has: 1.0.3
@@ -10346,7 +10316,7 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-selector-parser/2.2.3:
+  /postcss-selector-parser@2.2.3:
     resolution: {integrity: sha512-3pqyakeGhrO0BQ5+/tGTfvi5IAUAhHRayGK8WFSu06aEv2BmHoXw/Mhb+w7VY5HERIuC+QoUI7wgrCcq2hqCVA==}
     dependencies:
       flatten: 1.0.3
@@ -10354,7 +10324,7 @@ packages:
       uniq: 1.0.1
     dev: true
 
-  /postcss-svgo/2.1.6:
+  /postcss-svgo@2.1.6:
     resolution: {integrity: sha512-y5AdQdgBoF4rbpdbeWAJuxE953g/ylRfVNp6mvAi61VCN/Y25Tu9p5mh3CyI42WbTRIiwR9a1GdFtmDnNPeskQ==}
     dependencies:
       is-svg: 2.1.0
@@ -10363,7 +10333,7 @@ packages:
       svgo: 0.7.2
     dev: true
 
-  /postcss-unique-selectors/2.0.2:
+  /postcss-unique-selectors@2.0.2:
     resolution: {integrity: sha512-WZX8r1M0+IyljoJOJleg3kYm10hxNYF9scqAT7v/xeSX1IdehutOM85SNO0gP9K+bgs86XERr7Ud5u3ch4+D8g==}
     dependencies:
       alphanum-sort: 1.0.2
@@ -10371,11 +10341,11 @@ packages:
       uniqs: 2.0.0
     dev: true
 
-  /postcss-value-parser/3.3.1:
+  /postcss-value-parser@3.3.1:
     resolution: {integrity: sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==}
     dev: true
 
-  /postcss-zindex/2.2.0:
+  /postcss-zindex@2.2.0:
     resolution: {integrity: sha512-uhRZ2hRgj0lorxm9cr62B01YzpUe63h0RXMXQ4gWW3oa2rpJh+FJAiEAytaFCPU/VgaBS+uW2SJ1XKyDNz1h4w==}
     dependencies:
       has: 1.0.3
@@ -10383,7 +10353,7 @@ packages:
       uniqs: 2.0.0
     dev: true
 
-  /postcss/5.2.18:
+  /postcss@5.2.18:
     resolution: {integrity: sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==}
     engines: {node: '>=0.12'}
     dependencies:
@@ -10393,7 +10363,7 @@ packages:
       supports-color: 3.2.3
     dev: true
 
-  /postcss/8.4.21:
+  /postcss@8.4.21:
     resolution: {integrity: sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
@@ -10401,29 +10371,29 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
-  /postgres-array/2.0.0:
+  /postgres-array@2.0.0:
     resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
     engines: {node: '>=4'}
     dev: false
 
-  /postgres-bytea/1.0.0:
+  /postgres-bytea@1.0.0:
     resolution: {integrity: sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /postgres-date/1.0.7:
+  /postgres-date@1.0.7:
     resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /postgres-interval/1.2.0:
+  /postgres-interval@1.2.0:
     resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       xtend: 4.0.2
     dev: false
 
-  /prebuild-install/7.1.1:
+  /prebuild-install@7.1.1:
     resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==}
     engines: {node: '>=10'}
     hasBin: true
@@ -10442,36 +10412,36 @@ packages:
       tunnel-agent: 0.6.0
     dev: false
 
-  /prelude-ls/1.1.2:
+  /prelude-ls@1.1.2:
     resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
     engines: {node: '>= 0.8.0'}
     dev: false
 
-  /prelude-ls/1.2.1:
+  /prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
 
-  /prepend-http/1.0.4:
+  /prepend-http@1.0.4:
     resolution: {integrity: sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /prepend-http/2.0.0:
+  /prepend-http@2.0.0:
     resolution: {integrity: sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==}
     engines: {node: '>=4'}
     dev: true
 
-  /pretty-bytes/5.6.0:
+  /pretty-bytes@5.6.0:
     resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
     engines: {node: '>=6'}
     dev: true
 
-  /pretty-hrtime/1.0.3:
+  /pretty-hrtime@1.0.3:
     resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
     engines: {node: '>= 0.8'}
     dev: true
 
-  /pretty/2.0.0:
+  /pretty@2.0.0:
     resolution: {integrity: sha512-G9xUchgTEiNpormdYBl+Pha50gOUovT18IvAe7EYMZ1/f9W/WWMPRn+xI68yXNMUk3QXHDwo/1wV/4NejVNe1w==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -10479,12 +10449,12 @@ packages:
       extend-shallow: 2.0.1
       js-beautify: 1.14.7
 
-  /prismjs/1.29.0:
+  /prismjs@1.29.0:
     resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
     engines: {node: '>=6'}
     dev: true
 
-  /private-ip/2.3.3:
+  /private-ip@2.3.3:
     resolution: {integrity: sha512-5zyFfekIVUOTVbL92hc8LJOtE/gyGHeREHkJ2yTyByP8Q2YZVoBqLg3EfYLeF0oVvGqtaEX2t2Qovja0/gStXw==}
     dependencies:
       ip-regex: 4.3.0
@@ -10493,7 +10463,7 @@ packages:
       netmask: 2.0.2
     dev: false
 
-  /private-ip/2.3.4:
+  /private-ip@2.3.4:
     resolution: {integrity: sha512-ts/YFVwfBeLq61f9+KsOhXW6RH0wvY0gU50R6QZYzgFhggyyLK6WDFeYdjfi/HMnBm2hecLvsR3PB3JcRxDk+A==}
     dependencies:
       ip-regex: 4.3.0
@@ -10502,7 +10472,7 @@ packages:
       netmask: 2.0.2
     dev: false
 
-  /probe-image-size/7.2.3:
+  /probe-image-size@7.2.3:
     resolution: {integrity: sha512-HubhG4Rb2UH8YtV4ba0Vp5bQ7L78RTONYu/ujmCu5nBI8wGv24s4E9xSKBi0N1MowRpxk76pFCpJtW0KPzOK0w==}
     dependencies:
       lodash.merge: 4.6.2
@@ -10512,16 +10482,16 @@ packages:
       - supports-color
     dev: false
 
-  /process-nextick-args/2.0.1:
+  /process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
-  /progress/2.0.3:
+  /progress@2.0.3:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
     engines: {node: '>=0.4.0'}
     dev: false
     optional: true
 
-  /promise-inflight/1.0.1:
+  /promise-inflight@1.0.1:
     resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
     peerDependencies:
       bluebird: '*'
@@ -10530,11 +10500,11 @@ packages:
         optional: true
     dev: false
 
-  /promise-limit/2.7.0:
+  /promise-limit@2.7.0:
     resolution: {integrity: sha512-7nJ6v5lnJsXwGprnGXga4wx6d1POjvi5Qmf1ivTRxTjH4Z/9Czja/UCMLVmB9N93GeWOU93XaFaEt6jbuoagNw==}
     dev: false
 
-  /promise-retry/2.0.1:
+  /promise-retry@2.0.1:
     resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
     engines: {node: '>=10'}
     dependencies:
@@ -10542,23 +10512,23 @@ packages:
       retry: 0.12.0
     dev: false
 
-  /promise/7.3.1:
+  /promise@7.3.1:
     resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==}
     dependencies:
       asap: 2.0.6
 
-  /proto-list/1.2.4:
+  /proto-list@1.2.4:
     resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
 
-  /proxy-from-env/1.0.0:
+  /proxy-from-env@1.0.0:
     resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==}
     dev: true
 
-  /proxy-from-env/1.1.0:
+  /proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
     dev: false
 
-  /ps-tree/1.2.0:
+  /ps-tree@1.2.0:
     resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==}
     engines: {node: '>= 0.10'}
     hasBin: true
@@ -10566,20 +10536,20 @@ packages:
       event-stream: 3.3.4
     dev: true
 
-  /pseudomap/1.0.2:
+  /pseudomap@1.0.2:
     resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==}
 
-  /psl/1.9.0:
+  /psl@1.9.0:
     resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
 
-  /pug-attrs/3.0.0:
+  /pug-attrs@3.0.0:
     resolution: {integrity: sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==}
     dependencies:
       constantinople: 4.0.1
       js-stringify: 1.0.2
       pug-runtime: 3.0.1
 
-  /pug-code-gen/3.0.2:
+  /pug-code-gen@3.0.2:
     resolution: {integrity: sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==}
     dependencies:
       constantinople: 4.0.1
@@ -10591,10 +10561,10 @@ packages:
       void-elements: 3.1.0
       with: 7.0.2
 
-  /pug-error/2.0.0:
+  /pug-error@2.0.0:
     resolution: {integrity: sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==}
 
-  /pug-filters/4.0.0:
+  /pug-filters@4.0.0:
     resolution: {integrity: sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==}
     dependencies:
       constantinople: 4.0.1
@@ -10603,43 +10573,43 @@ packages:
       pug-walk: 2.0.0
       resolve: 1.22.1
 
-  /pug-lexer/5.0.1:
+  /pug-lexer@5.0.1:
     resolution: {integrity: sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==}
     dependencies:
       character-parser: 2.2.0
       is-expression: 4.0.0
       pug-error: 2.0.0
 
-  /pug-linker/4.0.0:
+  /pug-linker@4.0.0:
     resolution: {integrity: sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==}
     dependencies:
       pug-error: 2.0.0
       pug-walk: 2.0.0
 
-  /pug-load/3.0.0:
+  /pug-load@3.0.0:
     resolution: {integrity: sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==}
     dependencies:
       object-assign: 4.1.1
       pug-walk: 2.0.0
 
-  /pug-parser/6.0.0:
+  /pug-parser@6.0.0:
     resolution: {integrity: sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==}
     dependencies:
       pug-error: 2.0.0
       token-stream: 1.0.0
 
-  /pug-runtime/3.0.1:
+  /pug-runtime@3.0.1:
     resolution: {integrity: sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==}
 
-  /pug-strip-comments/2.0.0:
+  /pug-strip-comments@2.0.0:
     resolution: {integrity: sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==}
     dependencies:
       pug-error: 2.0.0
 
-  /pug-walk/2.0.0:
+  /pug-walk@2.0.0:
     resolution: {integrity: sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==}
 
-  /pug/3.0.2:
+  /pug@3.0.2:
     resolution: {integrity: sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==}
     dependencies:
       pug-code-gen: 3.0.2
@@ -10651,20 +10621,20 @@ packages:
       pug-runtime: 3.0.1
       pug-strip-comments: 2.0.0
 
-  /pump/2.0.1:
+  /pump@2.0.1:
     resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
     dev: true
 
-  /pump/3.0.0:
+  /pump@3.0.0:
     resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
 
-  /pumpify/1.5.1:
+  /pumpify@1.5.1:
     resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}
     dependencies:
       duplexify: 3.7.1
@@ -10672,19 +10642,19 @@ packages:
       pump: 2.0.1
     dev: true
 
-  /punycode/1.3.2:
+  /punycode@1.3.2:
     resolution: {integrity: sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==}
     dev: false
 
-  /punycode/2.1.1:
+  /punycode@2.1.1:
     resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
     engines: {node: '>=6'}
 
-  /punycode/2.2.0:
+  /punycode@2.2.0:
     resolution: {integrity: sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==}
     engines: {node: '>=6'}
 
-  /pureimage/0.3.15:
+  /pureimage@0.3.15:
     resolution: {integrity: sha512-QpQYEV8nxVb84en7D0nKXwG0bdmwmlsSg9QnqxpEOExvUXdbmo6Lw/UoxSXD9z+ryvWDkgWqZsIM3iPCAh4dXg==}
     engines: {node: '>=0.8'}
     dependencies:
@@ -10693,17 +10663,17 @@ packages:
       pngjs: 3.4.0
     dev: false
 
-  /q/1.4.1:
+  /q@1.4.1:
     resolution: {integrity: sha512-/CdEdaw49VZVmyIDGUQKDDT53c7qBkO6g5CefWz91Ae+l4+cRtcDYwMTXh6me4O8TMldeGHG3N2Bl84V78Ywbg==}
     engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
     dev: false
 
-  /q/1.5.1:
+  /q@1.5.1:
     resolution: {integrity: sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==}
     engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
     dev: true
 
-  /qrcode/1.5.1:
+  /qrcode@1.5.1:
     resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==}
     engines: {node: '>=10.13.0'}
     hasBin: true
@@ -10714,31 +10684,31 @@ packages:
       yargs: 15.4.1
     dev: false
 
-  /qs/6.10.4:
+  /qs@6.10.4:
     resolution: {integrity: sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==}
     engines: {node: '>=0.6'}
     dependencies:
       side-channel: 1.0.4
     dev: true
 
-  /qs/6.11.0:
+  /qs@6.11.0:
     resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
     engines: {node: '>=0.6'}
     dependencies:
       side-channel: 1.0.4
     dev: false
 
-  /qs/6.5.3:
+  /qs@6.5.3:
     resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
     engines: {node: '>=0.6'}
     dev: false
 
-  /qs/6.9.7:
+  /qs@6.9.7:
     resolution: {integrity: sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==}
     engines: {node: '>=0.6'}
     dev: false
 
-  /query-string/4.3.4:
+  /query-string@4.3.4:
     resolution: {integrity: sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -10746,7 +10716,7 @@ packages:
       strict-uri-encode: 1.1.0
     dev: true
 
-  /query-string/5.1.1:
+  /query-string@5.1.1:
     resolution: {integrity: sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -10755,59 +10725,59 @@ packages:
       strict-uri-encode: 1.1.0
     dev: true
 
-  /querystring/0.2.0:
+  /querystring@0.2.0:
     resolution: {integrity: sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==}
     engines: {node: '>=0.4.x'}
     deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
     dev: false
 
-  /querystring/0.2.1:
+  /querystring@0.2.1:
     resolution: {integrity: sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==}
     engines: {node: '>=0.4.x'}
     deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
     dev: true
 
-  /querystringify/2.2.0:
+  /querystringify@2.2.0:
     resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
     dev: false
 
-  /queue-lit/1.5.0:
+  /queue-lit@1.5.0:
     resolution: {integrity: sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA==}
     dev: true
 
-  /queue-microtask/1.2.3:
+  /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
-  /quick-lru/5.1.1:
+  /quick-lru@5.1.1:
     resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
     engines: {node: '>=10'}
     dev: false
 
-  /random-seed/0.3.0:
+  /random-seed@0.3.0:
     resolution: {integrity: sha512-y13xtn3kcTlLub3HKWXxJNeC2qK4mB59evwZ5EkeRlolx+Bp2ztF7LbcZmyCnOqlHQrLnfuNbi1sVmm9lPDlDA==}
     engines: {node: '>= 0.6.0'}
     dependencies:
       json-stringify-safe: 5.0.1
     dev: false
 
-  /randombytes/2.1.0:
+  /randombytes@2.1.0:
     resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
     dependencies:
       safe-buffer: 5.2.1
     dev: true
 
-  /rangestr/0.0.1:
+  /rangestr@0.0.1:
     resolution: {integrity: sha512-9CRCUX/w4+fNMzlYgA8GeJz7BZwBPwaGm3FhAm9Hi50k8wNy2CyiJQa8awygWJay87uVVCV0/FwbLcD6+/A9KQ==}
 
-  /rangetouch/2.0.1:
+  /rangetouch@2.0.1:
     resolution: {integrity: sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA==}
     dev: true
 
-  /ratelimiter/3.4.1:
+  /ratelimiter@3.4.1:
     resolution: {integrity: sha512-5FJbRW/Jkkdk29ksedAfWFkQkhbUrMx3QJGwMKAypeIiQf4yrLW+gtPKZiaWt4zPrtw1uGufOjGO7UGM6VllsQ==}
     dev: false
 
-  /raw-body/2.5.1:
+  /raw-body@2.5.1:
     resolution: {integrity: sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==}
     engines: {node: '>= 0.8'}
     dependencies:
@@ -10817,7 +10787,7 @@ packages:
       unpipe: 1.0.0
     dev: false
 
-  /rc/1.2.8:
+  /rc@1.2.8:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
     dependencies:
@@ -10827,14 +10797,14 @@ packages:
       strip-json-comments: 2.0.1
     dev: false
 
-  /rdf-canonize/3.3.0:
+  /rdf-canonize@3.3.0:
     resolution: {integrity: sha512-gfSNkMua/VWC1eYbSkVaL/9LQhFeOh0QULwv7Or0f+po8pMgQ1blYQFe1r9Mv2GJZXw88Cz/drnAnB9UlNnHfQ==}
     engines: {node: '>=12'}
     dependencies:
       setimmediate: 1.0.5
     dev: false
 
-  /re2/1.18.0:
+  /re2@1.18.0:
     resolution: {integrity: sha512-MoCYZlJ9YUgksND9asyNF2/x532daXU/ARp1UeJbQ5flMY6ryKNEhrWt85aw3YluzOJlC3vXpGgK2a1jb0b4GA==}
     requiresBuild: true
     dependencies:
@@ -10846,7 +10816,7 @@ packages:
       - supports-color
     dev: false
 
-  /read-pkg-up/1.0.1:
+  /read-pkg-up@1.0.1:
     resolution: {integrity: sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -10854,7 +10824,7 @@ packages:
       read-pkg: 1.1.0
     dev: true
 
-  /read-pkg/1.1.0:
+  /read-pkg@1.1.0:
     resolution: {integrity: sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -10863,7 +10833,7 @@ packages:
       path-type: 1.1.0
     dev: true
 
-  /readable-stream/1.1.14:
+  /readable-stream@1.1.14:
     resolution: {integrity: sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==}
     dependencies:
       core-util-is: 1.0.3
@@ -10872,7 +10842,7 @@ packages:
       string_decoder: 0.10.31
     dev: false
 
-  /readable-stream/2.3.7:
+  /readable-stream@2.3.7:
     resolution: {integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==}
     dependencies:
       core-util-is: 1.0.3
@@ -10883,7 +10853,7 @@ packages:
       string_decoder: 1.1.1
       util-deprecate: 1.0.2
 
-  /readable-stream/3.6.0:
+  /readable-stream@3.6.0:
     resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==}
     engines: {node: '>= 6'}
     dependencies:
@@ -10891,75 +10861,75 @@ packages:
       string_decoder: 1.3.0
       util-deprecate: 1.0.2
 
-  /readable-web-to-node-stream/3.0.2:
+  /readable-web-to-node-stream@3.0.2:
     resolution: {integrity: sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==}
     engines: {node: '>=8'}
     dependencies:
       readable-stream: 3.6.0
     dev: false
 
-  /readdir-glob/1.1.2:
+  /readdir-glob@1.1.2:
     resolution: {integrity: sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==}
     dependencies:
       minimatch: 5.1.2
     dev: false
 
-  /readdirp/3.6.0:
+  /readdirp@3.6.0:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
     dependencies:
       picomatch: 2.3.1
 
-  /rechoir/0.6.2:
+  /rechoir@0.6.2:
     resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
     engines: {node: '>= 0.10'}
     dependencies:
       resolve: 1.22.1
     dev: true
 
-  /rechoir/0.8.0:
+  /rechoir@0.8.0:
     resolution: {integrity: sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==}
     engines: {node: '>= 10.13.0'}
     dependencies:
       resolve: 1.22.1
     dev: true
 
-  /reconnecting-websocket/4.4.0:
+  /reconnecting-websocket@4.4.0:
     resolution: {integrity: sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==}
 
-  /redis-errors/1.2.0:
+  /redis-errors@1.2.0:
     resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
     engines: {node: '>=4'}
 
-  /redis-info/3.1.0:
+  /redis-info@3.1.0:
     resolution: {integrity: sha512-ER4L9Sh/vm63DkIE0bkSjxluQlioBiBgf5w1UuldaW/3vPcecdljVDisZhmnCMvsxHNiARTTDDHGg9cGwTfrKg==}
     dependencies:
       lodash: 4.17.21
     dev: false
 
-  /redis-lock/0.1.4:
+  /redis-lock@0.1.4:
     resolution: {integrity: sha512-7/+zu86XVQfJVx1nHTzux5reglDiyUCDwmW7TSlvVezfhH2YLc/Rc8NE0ejQG+8/0lwKzm29/u/4+ogKeLosiA==}
     engines: {node: '>=0.6'}
     dev: false
 
-  /redis-parser/3.0.0:
+  /redis-parser@3.0.0:
     resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==}
     engines: {node: '>=4'}
     dependencies:
       redis-errors: 1.2.0
 
-  /redis/4.5.1:
+  /redis@4.5.1:
     resolution: {integrity: sha512-oxXSoIqMJCQVBTfxP6BNTCtDMyh9G6Vi5wjdPdV/sRKkufyZslDqCScSGcOr6XGR/reAWZefz7E4leM31RgdBA==}
     dependencies:
-      '@redis/bloom': 1.1.0_@redis+client@1.4.2
+      '@redis/bloom': 1.1.0(@redis/client@1.4.2)
       '@redis/client': 1.4.2
-      '@redis/graph': 1.1.0_@redis+client@1.4.2
-      '@redis/json': 1.0.4_@redis+client@1.4.2
-      '@redis/search': 1.1.0_@redis+client@1.4.2
-      '@redis/time-series': 1.0.4_@redis+client@1.4.2
+      '@redis/graph': 1.1.0(@redis/client@1.4.2)
+      '@redis/json': 1.0.4(@redis/client@1.4.2)
+      '@redis/search': 1.1.0(@redis/client@1.4.2)
+      '@redis/time-series': 1.0.4(@redis/client@1.4.2)
     dev: true
 
-  /reduce-css-calc/1.3.0:
+  /reduce-css-calc@1.3.0:
     resolution: {integrity: sha512-0dVfwYVOlf/LBA2ec4OwQ6p3X9mYxn/wOl2xTcLwjnPYrkgEfPx3VI4eGCH3rQLlPISG5v9I9bkZosKsNRTRKA==}
     dependencies:
       balanced-match: 0.4.2
@@ -10967,20 +10937,20 @@ packages:
       reduce-function-call: 1.0.3
     dev: true
 
-  /reduce-function-call/1.0.3:
+  /reduce-function-call@1.0.3:
     resolution: {integrity: sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==}
     dependencies:
       balanced-match: 1.0.2
     dev: true
 
-  /reflect-metadata/0.1.13:
+  /reflect-metadata@0.1.13:
     resolution: {integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==}
     dev: false
 
-  /regenerator-runtime/0.13.11:
+  /regenerator-runtime@0.13.11:
     resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
 
-  /regex-not/1.0.2:
+  /regex-not@1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -10988,11 +10958,11 @@ packages:
       safe-regex: 1.1.0
     dev: true
 
-  /regexpp/3.2.0:
+  /regexpp@3.2.0:
     resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
     engines: {node: '>=8'}
 
-  /remove-bom-buffer/3.0.0:
+  /remove-bom-buffer@3.0.0:
     resolution: {integrity: sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -11000,7 +10970,7 @@ packages:
       is-utf8: 0.2.1
     dev: true
 
-  /remove-bom-stream/1.2.0:
+  /remove-bom-stream@1.2.0:
     resolution: {integrity: sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -11009,11 +10979,11 @@ packages:
       through2: 2.0.5
     dev: true
 
-  /remove-trailing-separator/1.1.0:
+  /remove-trailing-separator@1.1.0:
     resolution: {integrity: sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==}
     dev: true
 
-  /rename/1.0.4:
+  /rename@1.0.4:
     resolution: {integrity: sha512-YMM6Fn3lrFOCjhORKjj+z/yizj8WSzv3F3YUlpJA20fteWCb0HbJU19nvuRBPUM5dWgxJcHP+kix3M+5NowJyA==}
     dependencies:
       debug: 2.6.9
@@ -11021,22 +10991,22 @@ packages:
       - supports-color
     dev: false
 
-  /repeat-element/1.1.4:
+  /repeat-element@1.1.4:
     resolution: {integrity: sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /repeat-string/1.6.1:
+  /repeat-string@1.6.1:
     resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
     engines: {node: '>=0.10'}
     dev: true
 
-  /replace-ext/1.0.1:
+  /replace-ext@1.0.1:
     resolution: {integrity: sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==}
     engines: {node: '>= 0.10'}
     dev: true
 
-  /replace-homedir/1.0.0:
+  /replace-homedir@1.0.0:
     resolution: {integrity: sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -11045,7 +11015,7 @@ packages:
       remove-trailing-separator: 1.1.0
     dev: true
 
-  /replacestream/4.0.3:
+  /replacestream@4.0.3:
     resolution: {integrity: sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==}
     dependencies:
       escape-string-regexp: 1.0.5
@@ -11053,13 +11023,13 @@ packages:
       readable-stream: 2.3.7
     dev: true
 
-  /request-progress/3.0.0:
+  /request-progress@3.0.0:
     resolution: {integrity: sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==}
     dependencies:
       throttleit: 1.0.0
     dev: true
 
-  /request/2.88.2:
+  /request@2.88.2:
     resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
     engines: {node: '>= 6'}
     deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
@@ -11086,44 +11056,44 @@ packages:
       uuid: 3.4.0
     dev: false
 
-  /require-all/3.0.0:
+  /require-all@3.0.0:
     resolution: {integrity: sha512-jPGN876lc5exWYrMcgZSd7U42P0PmVQzxnQB13fCSzmyGnqQWW4WUz5DosZ/qe24hz+5o9lSvW2epBNZ1xa6Fw==}
     engines: {node: '>= 0.8'}
     dev: false
 
-  /require-directory/2.1.1:
+  /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
 
-  /require-from-string/2.0.2:
+  /require-from-string@2.0.2:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /require-main-filename/1.0.1:
+  /require-main-filename@1.0.1:
     resolution: {integrity: sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==}
     dev: true
 
-  /require-main-filename/2.0.0:
+  /require-main-filename@2.0.0:
     resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
     dev: false
 
-  /requires-port/1.0.0:
+  /requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
     dev: false
 
-  /resolve-alpn/1.2.1:
+  /resolve-alpn@1.2.1:
     resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
     dev: false
 
-  /resolve-cwd/3.0.0:
+  /resolve-cwd@3.0.0:
     resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
     engines: {node: '>=8'}
     dependencies:
       resolve-from: 5.0.0
     dev: true
 
-  /resolve-dir/1.0.1:
+  /resolve-dir@1.0.1:
     resolution: {integrity: sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -11131,34 +11101,34 @@ packages:
       global-modules: 1.0.0
     dev: true
 
-  /resolve-from/4.0.0:
+  /resolve-from@4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
 
-  /resolve-from/5.0.0:
+  /resolve-from@5.0.0:
     resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
     engines: {node: '>=8'}
     dev: true
 
-  /resolve-options/1.1.0:
+  /resolve-options@1.1.0:
     resolution: {integrity: sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==}
     engines: {node: '>= 0.10'}
     dependencies:
       value-or-function: 3.0.0
     dev: true
 
-  /resolve-path/1.4.0:
+  /resolve-path@1.4.0:
     resolution: {integrity: sha512-i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w==}
     engines: {node: '>= 0.8'}
     dependencies:
       http-errors: 1.6.3
       path-is-absolute: 1.0.1
 
-  /resolve-url/0.2.1:
+  /resolve-url@0.2.1:
     resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
     deprecated: https://github.com/lydell/resolve-url#deprecated
 
-  /resolve/1.22.1:
+  /resolve@1.22.1:
     resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
     hasBin: true
     dependencies:
@@ -11166,26 +11136,26 @@ packages:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  /responselike/1.0.2:
+  /responselike@1.0.2:
     resolution: {integrity: sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==}
     dependencies:
       lowercase-keys: 1.0.1
     dev: true
 
-  /responselike/2.0.1:
+  /responselike@2.0.1:
     resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}
     dependencies:
       lowercase-keys: 2.0.0
     dev: false
 
-  /responselike/3.0.0:
+  /responselike@3.0.0:
     resolution: {integrity: sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==}
     engines: {node: '>=14.16'}
     dependencies:
       lowercase-keys: 3.0.0
     dev: false
 
-  /restore-cursor/3.1.0:
+  /restore-cursor@3.1.0:
     resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
     engines: {node: '>=8'}
     dependencies:
@@ -11193,44 +11163,44 @@ packages:
       signal-exit: 3.0.7
     dev: true
 
-  /ret/0.1.15:
+  /ret@0.1.15:
     resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
     engines: {node: '>=0.12'}
     dev: true
 
-  /retry/0.12.0:
+  /retry@0.12.0:
     resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
     engines: {node: '>= 4'}
     dev: false
 
-  /reusify/1.0.4:
+  /reusify@1.0.4:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  /rfdc/1.3.0:
+  /rfdc@1.3.0:
     resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
     dev: true
 
-  /rimraf/2.7.1:
+  /rimraf@2.7.1:
     resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
     hasBin: true
     dependencies:
       glob: 7.2.3
     dev: false
 
-  /rimraf/3.0.2:
+  /rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
     hasBin: true
     dependencies:
       glob: 7.2.3
 
-  /rndstr/1.0.0:
+  /rndstr@1.0.0:
     resolution: {integrity: sha512-3KN+BHTiHcsyW1qjRw3Xhms8TQfTIN4fUVgqqJpj6FnmuCnto5/lLyppSmGfdTmOiKDWeuXU4XPp58I9fsoWFQ==}
     dependencies:
       rangestr: 0.0.1
       seedrandom: 2.4.2
 
-  /rollup/3.12.1:
+  /rollup@3.12.1:
     resolution: {integrity: sha512-t9elERrz2i4UU9z7AwISj3CQcXP39cWxgRWLdf4Tm6aKm1eYrqHIgjzXBgb67GNY1sZckTFFi0oMozh3/S++Ig==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
@@ -11238,7 +11208,7 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /rollup/3.9.1:
+  /rollup@3.9.1:
     resolution: {integrity: sha512-GswCYHXftN8ZKGVgQhTFUJB/NBXxrRGgO2NCy6E8s1rwEJ4Q9/VttNqcYfEvx4dTo4j58YqdC3OVztPzlKSX8w==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
@@ -11246,7 +11216,7 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /rome/11.0.0:
+  /rome@11.0.0:
     resolution: {integrity: sha512-rRo6JOwpMLc3OkeTDRXkrmrDqnxDvZ75GS4f0jLDBNmRgDXWbu0F8eVnJoRn+VbK2AE7vWvhVOMBjnWowcopkQ==}
     engines: {node: '>=14.*'}
     hasBin: true
@@ -11260,48 +11230,48 @@ packages:
       '@rometools/cli-win32-x64': 11.0.0
     dev: true
 
-  /rss-parser/3.12.0:
+  /rss-parser@3.12.0:
     resolution: {integrity: sha512-aqD3E8iavcCdkhVxNDIdg1nkBI17jgqF+9OqPS1orwNaOgySdpvq6B+DoONLhzjzwV8mWg37sb60e4bmLK117A==}
     dependencies:
       entities: 2.2.0
       xml2js: 0.4.23
     dev: false
 
-  /run-parallel/1.2.0:
+  /run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
     dependencies:
       queue-microtask: 1.2.3
 
-  /rxjs/7.8.0:
+  /rxjs@7.8.0:
     resolution: {integrity: sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==}
     dependencies:
       tslib: 2.4.1
     dev: true
 
-  /s-age/1.1.2:
+  /s-age@1.1.2:
     resolution: {integrity: sha512-aSN2TlF39WLoZA/6cgYSJZhKt63kJ4EaadejPWjWY9/h4rksIqvfWY3gfd+3uAegSM1IXsA9aWeEhJtkxkFQtA==}
     dev: true
 
-  /safari-14-idb-fix/3.0.0:
+  /safari-14-idb-fix@3.0.0:
     resolution: {integrity: sha512-eBNFLob4PMq8JA1dGyFn6G97q3/WzNtFK4RnzT1fnLq+9RyrGknzYiM/9B12MnKAxuj1IXr7UKYtTNtjyKMBog==}
     dev: true
 
-  /safe-buffer/5.1.2:
+  /safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
 
-  /safe-buffer/5.2.1:
+  /safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  /safe-regex/1.1.0:
+  /safe-regex@1.1.0:
     resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
     dependencies:
       ret: 0.1.15
     dev: true
 
-  /safer-buffer/2.1.2:
+  /safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
-  /sanitize-html/2.8.1:
+  /sanitize-html@2.8.1:
     resolution: {integrity: sha512-qK5neD0SaMxGwVv5txOYv05huC3o6ZAA4h5+7nJJgWMNFUNRjcjLO6FpwAtKzfKCZ0jrG6xTk6eVFskbvOGblg==}
     dependencies:
       deepmerge: 4.2.2
@@ -11312,7 +11282,7 @@ packages:
       postcss: 8.4.21
     dev: false
 
-  /sass/1.57.1:
+  /sass@1.57.1:
     resolution: {integrity: sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==}
     engines: {node: '>=12.0.0'}
     hasBin: true
@@ -11322,92 +11292,92 @@ packages:
       source-map-js: 1.0.2
     dev: true
 
-  /sax/1.2.1:
+  /sax@1.2.1:
     resolution: {integrity: sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==}
     dev: false
 
-  /sax/1.2.4:
+  /sax@1.2.4:
     resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
 
-  /saxes/6.0.0:
+  /saxes@6.0.0:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
     engines: {node: '>=v12.22.7'}
     dependencies:
       xmlchars: 2.2.0
     dev: false
 
-  /schema-utils/3.1.1:
+  /schema-utils@3.1.1:
     resolution: {integrity: sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==}
     engines: {node: '>= 10.13.0'}
     dependencies:
       '@types/json-schema': 7.0.11
       ajv: 6.12.6
-      ajv-keywords: 3.5.2_ajv@6.12.6
+      ajv-keywords: 3.5.2(ajv@6.12.6)
     dev: true
 
-  /secure-json-parse/2.7.0:
+  /secure-json-parse@2.7.0:
     resolution: {integrity: sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==}
     dev: false
 
-  /seedrandom/2.4.2:
+  /seedrandom@2.4.2:
     resolution: {integrity: sha512-uQ72txMoObtuJooiBLSVs5Yu2e9d/lHQz0boaqHjW8runXB9vR8nFtaZV54wYii613N0C8ZqTBLsfwDhAdpvqQ==}
 
-  /seedrandom/3.0.5:
+  /seedrandom@3.0.5:
     resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
 
-  /seek-bzip/1.0.6:
+  /seek-bzip@1.0.6:
     resolution: {integrity: sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==}
     hasBin: true
     dependencies:
       commander: 2.20.3
     dev: true
 
-  /semver-greatest-satisfied-range/1.1.0:
+  /semver-greatest-satisfied-range@1.1.0:
     resolution: {integrity: sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==}
     engines: {node: '>= 0.10'}
     dependencies:
       sver-compat: 1.5.0
     dev: true
 
-  /semver-regex/2.0.0:
+  /semver-regex@2.0.0:
     resolution: {integrity: sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==}
     engines: {node: '>=6'}
     dev: true
 
-  /semver-truncate/1.1.2:
+  /semver-truncate@1.1.2:
     resolution: {integrity: sha512-V1fGg9i4CL3qesB6U0L6XAm4xOJiHmt4QAacazumuasc03BvtFGIMCduv01JWQ69Nv+JST9TqhSCiJoxoY031w==}
     engines: {node: '>=0.10.0'}
     dependencies:
       semver: 5.7.1
     dev: true
 
-  /semver/5.7.1:
+  /semver@5.7.1:
     resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
     hasBin: true
 
-  /semver/6.3.0:
+  /semver@6.3.0:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
     dev: false
     optional: true
 
-  /semver/7.3.8:
+  /semver@7.3.8:
     resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
       lru-cache: 6.0.0
 
-  /serialize-javascript/6.0.0:
+  /serialize-javascript@6.0.0:
     resolution: {integrity: sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==}
     dependencies:
       randombytes: 2.1.0
     dev: true
 
-  /set-blocking/2.0.0:
+  /set-blocking@2.0.0:
     resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
 
-  /set-value/2.0.1:
+  /set-value@2.0.1:
     resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -11417,17 +11387,17 @@ packages:
       split-string: 3.1.0
     dev: true
 
-  /setimmediate/1.0.5:
+  /setimmediate@1.0.5:
     resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
     dev: false
 
-  /setprototypeof/1.1.0:
+  /setprototypeof@1.1.0:
     resolution: {integrity: sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==}
 
-  /setprototypeof/1.2.0:
+  /setprototypeof@1.2.0:
     resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
 
-  /sha.js/2.4.11:
+  /sha.js@2.4.11:
     resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
     hasBin: true
     dependencies:
@@ -11435,21 +11405,21 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
-  /sha1/1.1.1:
+  /sha1@1.1.1:
     resolution: {integrity: sha512-dZBS6OrMjtgVkopB1Gmo4RQCDKiZsqcpAQpkV/aaj+FCrCg8r4I4qMkDPQjBgLIxlmu9k4nUbWq6ohXahOneYA==}
     dependencies:
       charenc: 0.0.2
       crypt: 0.0.2
     dev: true
 
-  /shallow-clone/3.0.1:
+  /shallow-clone@3.0.1:
     resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}
     engines: {node: '>=8'}
     dependencies:
       kind-of: 6.0.3
     dev: true
 
-  /sharp/0.31.3:
+  /sharp@0.31.3:
     resolution: {integrity: sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==}
     engines: {node: '>=14.15.0'}
     requiresBuild: true
@@ -11464,46 +11434,46 @@ packages:
       tunnel-agent: 0.6.0
     dev: false
 
-  /shebang-command/1.2.0:
+  /shebang-command@1.2.0:
     resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       shebang-regex: 1.0.0
     dev: true
 
-  /shebang-command/2.0.0:
+  /shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
     dependencies:
       shebang-regex: 3.0.0
 
-  /shebang-regex/1.0.0:
+  /shebang-regex@1.0.0:
     resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /shebang-regex/3.0.0:
+  /shebang-regex@3.0.0:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
-  /side-channel/1.0.4:
+  /side-channel@1.0.4:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
       call-bind: 1.0.2
       get-intrinsic: 1.1.3
       object-inspect: 1.12.3
 
-  /sigmund/1.0.1:
+  /sigmund@1.0.1:
     resolution: {integrity: sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==}
 
-  /signal-exit/3.0.7:
+  /signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
-  /simple-concat/1.0.1:
+  /simple-concat@1.0.1:
     resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
     dev: false
 
-  /simple-get/4.0.1:
+  /simple-get@4.0.1:
     resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
     dependencies:
       decompress-response: 6.0.0
@@ -11511,18 +11481,18 @@ packages:
       simple-concat: 1.0.1
     dev: false
 
-  /simple-swizzle/0.2.2:
+  /simple-swizzle@0.2.2:
     resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
     dependencies:
       is-arrayish: 0.3.2
     dev: false
 
-  /slash/3.0.0:
+  /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
     dev: true
 
-  /slice-ansi/3.0.0:
+  /slice-ansi@3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
     dependencies:
@@ -11531,7 +11501,7 @@ packages:
       is-fullwidth-code-point: 3.0.0
     dev: true
 
-  /slice-ansi/4.0.0:
+  /slice-ansi@4.0.0:
     resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
     engines: {node: '>=10'}
     dependencies:
@@ -11540,12 +11510,12 @@ packages:
       is-fullwidth-code-point: 3.0.0
     dev: true
 
-  /smart-buffer/4.2.0:
+  /smart-buffer@4.2.0:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
     dev: false
 
-  /snapdragon-node/2.1.1:
+  /snapdragon-node@2.1.1:
     resolution: {integrity: sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -11554,14 +11524,14 @@ packages:
       snapdragon-util: 3.0.1
     dev: true
 
-  /snapdragon-util/3.0.1:
+  /snapdragon-util@3.0.1:
     resolution: {integrity: sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 3.2.2
     dev: true
 
-  /snapdragon/0.8.2:
+  /snapdragon@0.8.2:
     resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -11577,18 +11547,18 @@ packages:
       - supports-color
     dev: true
 
-  /socks-proxy-agent/7.0.0:
+  /socks-proxy-agent@7.0.0:
     resolution: {integrity: sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==}
     engines: {node: '>= 10'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /socks/2.7.1:
+  /socks@2.7.1:
     resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==}
     engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
     dependencies:
@@ -11596,41 +11566,41 @@ packages:
       smart-buffer: 4.2.0
     dev: false
 
-  /sonic-channel/1.3.1:
+  /sonic-channel@1.3.1:
     resolution: {integrity: sha512-+K4IZVFE7Tf2DB4EFZ23xo7a/+gJaiOHhFzXVZpzkX6Rs/rvf4YbSxnEGdYw8mrTcjtpG+jLVQEhP8sNTtN5VA==}
     engines: {node: '>= 6.0.0'}
     dev: false
 
-  /sort-keys-length/1.0.1:
+  /sort-keys-length@1.0.1:
     resolution: {integrity: sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       sort-keys: 1.1.2
     dev: true
 
-  /sort-keys/1.1.2:
+  /sort-keys@1.1.2:
     resolution: {integrity: sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-plain-obj: 1.1.0
     dev: true
 
-  /sort-keys/2.0.0:
+  /sort-keys@2.0.0:
     resolution: {integrity: sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==}
     engines: {node: '>=4'}
     dependencies:
       is-plain-obj: 1.1.0
     dev: true
 
-  /sortablejs/1.14.0:
+  /sortablejs@1.14.0:
     resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
     dev: true
 
-  /source-map-js/1.0.2:
+  /source-map-js@1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
 
-  /source-map-resolve/0.5.3:
+  /source-map-resolve@0.5.3:
     resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==}
     deprecated: See https://github.com/lydell/source-map-resolve#deprecated
     dependencies:
@@ -11641,97 +11611,97 @@ packages:
       urix: 0.1.0
     dev: true
 
-  /source-map-support/0.5.21:
+  /source-map-support@0.5.21:
     resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
     dependencies:
       buffer-from: 1.1.2
       source-map: 0.6.1
     dev: true
 
-  /source-map-url/0.4.1:
+  /source-map-url@0.4.1:
     resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
     deprecated: See https://github.com/lydell/source-map-url#deprecated
     dev: true
 
-  /source-map/0.5.7:
+  /source-map@0.5.7:
     resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /source-map/0.6.1:
+  /source-map@0.6.1:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
-  /source-map/0.7.4:
+  /source-map@0.7.4:
     resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
     engines: {node: '>= 8'}
     dev: true
 
-  /sourcemap-codec/1.4.8:
+  /sourcemap-codec@1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
     deprecated: Please use @jridgewell/sourcemap-codec instead
     dev: true
 
-  /sparkles/1.0.1:
+  /sparkles@1.0.1:
     resolution: {integrity: sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==}
     engines: {node: '>= 0.10'}
     dev: true
 
-  /spdx-correct/3.1.1:
+  /spdx-correct@3.1.1:
     resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==}
     dependencies:
       spdx-expression-parse: 3.0.1
       spdx-license-ids: 3.0.12
     dev: true
 
-  /spdx-exceptions/2.3.0:
+  /spdx-exceptions@2.3.0:
     resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
     dev: true
 
-  /spdx-expression-parse/3.0.1:
+  /spdx-expression-parse@3.0.1:
     resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
     dependencies:
       spdx-exceptions: 2.3.0
       spdx-license-ids: 3.0.12
     dev: true
 
-  /spdx-license-ids/3.0.12:
+  /spdx-license-ids@3.0.12:
     resolution: {integrity: sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==}
     dev: true
 
-  /speakeasy/2.0.0:
+  /speakeasy@2.0.0:
     resolution: {integrity: sha512-lW2A2s5LKi8rwu77ewisuUOtlCydF/hmQSOJjpTqTj1gZLkNgTaYnyvfxy2WBr4T/h+9c4g8HIITfj83OkFQFw==}
     engines: {node: '>= 0.10.0'}
     dependencies:
       base32.js: 0.0.1
     dev: false
 
-  /split-string/3.1.0:
+  /split-string@3.1.0:
     resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       extend-shallow: 3.0.2
     dev: true
 
-  /split/0.3.3:
+  /split2@4.1.0:
+    resolution: {integrity: sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==}
+    engines: {node: '>= 10.x'}
+    dev: false
+
+  /split@0.3.3:
     resolution: {integrity: sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==}
     dependencies:
       through: 2.3.8
     dev: true
 
-  /split2/4.1.0:
-    resolution: {integrity: sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==}
-    engines: {node: '>= 10.x'}
-    dev: false
-
-  /sprintf-js/1.0.3:
+  /sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
-  /sprintf-js/1.1.2:
+  /sprintf-js@1.1.2:
     resolution: {integrity: sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==}
     dev: false
 
-  /sshpk/1.17.0:
+  /sshpk@1.17.0:
     resolution: {integrity: sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==}
     engines: {node: '>=0.10.0'}
     hasBin: true
@@ -11746,25 +11716,25 @@ packages:
       safer-buffer: 2.1.2
       tweetnacl: 0.14.5
 
-  /ssr-window/4.0.2:
+  /ssr-window@4.0.2:
     resolution: {integrity: sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==}
     dev: true
 
-  /ssri/9.0.1:
+  /ssri@9.0.1:
     resolution: {integrity: sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
       minipass: 3.3.6
     dev: false
 
-  /stack-trace/0.0.10:
+  /stack-trace@0.0.10:
     resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}
     dev: true
 
-  /standard-as-callback/2.1.0:
+  /standard-as-callback@2.1.0:
     resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
 
-  /start-server-and-test/1.15.2:
+  /start-server-and-test@1.15.2:
     resolution: {integrity: sha512-t5xJX04Hg7hqxiKHMJBz/n4zIMsE6G7hpAcerFAH+4Vh9le/LeyFcJERJM7WLiPygWF9TOg33oroJF1XOzJtYQ==}
     engines: {node: '>=6'}
     hasBin: true
@@ -11772,16 +11742,16 @@ packages:
       arg: 5.0.2
       bluebird: 3.7.2
       check-more-types: 2.24.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       execa: 5.1.1
       lazy-ass: 1.6.0
       ps-tree: 1.2.0
-      wait-on: 6.0.1_debug@4.3.4
+      wait-on: 6.0.1(debug@4.3.4)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /static-extend/0.1.2:
+  /static-extend@0.1.2:
     resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -11789,26 +11759,26 @@ packages:
       object-copy: 0.1.0
     dev: true
 
-  /statuses/1.5.0:
+  /statuses@1.5.0:
     resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==}
     engines: {node: '>= 0.6'}
 
-  /statuses/2.0.1:
+  /statuses@2.0.1:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
     engines: {node: '>= 0.8'}
     dev: false
 
-  /stream-combiner/0.0.4:
+  /stream-combiner@0.0.4:
     resolution: {integrity: sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==}
     dependencies:
       duplexer: 0.1.2
     dev: true
 
-  /stream-exhaust/1.0.2:
+  /stream-exhaust@1.0.2:
     resolution: {integrity: sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==}
     dev: true
 
-  /stream-parser/0.3.1:
+  /stream-parser@0.3.1:
     resolution: {integrity: sha512-bJ/HgKq41nlKvlhccD5kaCr/P+Hu0wPNKPJOH7en+YrJu/9EgqUF+88w5Jb6KNcjOFMhfX4B2asfeAtIGuHObQ==}
     dependencies:
       debug: 2.6.9
@@ -11816,25 +11786,25 @@ packages:
       - supports-color
     dev: false
 
-  /stream-shift/1.0.1:
+  /stream-shift@1.0.1:
     resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==}
     dev: true
 
-  /streamsearch/1.1.0:
+  /streamsearch@1.1.0:
     resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
     engines: {node: '>=10.0.0'}
     dev: false
 
-  /strict-event-emitter-types/2.0.0:
+  /strict-event-emitter-types@2.0.0:
     resolution: {integrity: sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==}
     dev: true
 
-  /strict-uri-encode/1.1.0:
+  /strict-uri-encode@1.1.0:
     resolution: {integrity: sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /string-width/1.0.2:
+  /string-width@1.0.2:
     resolution: {integrity: sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -11843,7 +11813,7 @@ packages:
       strip-ansi: 3.0.1
     dev: true
 
-  /string-width/4.2.3:
+  /string-width@4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
     dependencies:
@@ -11851,92 +11821,92 @@ packages:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
-  /string_decoder/0.10.31:
+  /string_decoder@0.10.31:
     resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==}
     dev: false
 
-  /string_decoder/1.1.1:
+  /string_decoder@1.1.1:
     resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
     dependencies:
       safe-buffer: 5.1.2
 
-  /string_decoder/1.3.0:
+  /string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
     dependencies:
       safe-buffer: 5.2.1
 
-  /stringz/2.1.0:
+  /stringz@2.1.0:
     resolution: {integrity: sha512-KlywLT+MZ+v0IRepfMxRtnSvDCMc3nR1qqCs3m/qIbSOWkNZYT8XHQA31rS3TnKp0c5xjZu3M4GY/2aRKSi/6A==}
     dependencies:
       char-regex: 1.0.2
 
-  /strip-ansi/3.0.1:
+  /strip-ansi@3.0.1:
     resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       ansi-regex: 2.1.1
     dev: true
 
-  /strip-ansi/6.0.1:
+  /strip-ansi@6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
     dependencies:
       ansi-regex: 5.0.1
 
-  /strip-bom/2.0.0:
+  /strip-bom@2.0.0:
     resolution: {integrity: sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-utf8: 0.2.1
     dev: true
 
-  /strip-bom/3.0.0:
+  /strip-bom@3.0.0:
     resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
     engines: {node: '>=4'}
     dev: true
 
-  /strip-dirs/2.1.0:
+  /strip-dirs@2.1.0:
     resolution: {integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==}
     dependencies:
       is-natural-number: 4.0.1
     dev: true
 
-  /strip-eof/1.0.0:
+  /strip-eof@1.0.0:
     resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /strip-final-newline/2.0.0:
+  /strip-final-newline@2.0.0:
     resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
     engines: {node: '>=6'}
     dev: true
 
-  /strip-final-newline/3.0.0:
+  /strip-final-newline@3.0.0:
     resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
     engines: {node: '>=12'}
     dev: true
 
-  /strip-json-comments/2.0.1:
+  /strip-json-comments@2.0.1:
     resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /strip-json-comments/3.1.1:
+  /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
 
-  /strip-outer/1.0.1:
+  /strip-outer@1.0.1:
     resolution: {integrity: sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       escape-string-regexp: 1.0.5
     dev: true
 
-  /strnum/1.0.5:
+  /strnum@1.0.5:
     resolution: {integrity: sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==}
     dev: false
 
-  /strtok3/7.0.0:
+  /strtok3@7.0.0:
     resolution: {integrity: sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==}
     engines: {node: '>=14.16'}
     dependencies:
@@ -11944,7 +11914,7 @@ packages:
       peek-readable: 5.0.0
     dev: false
 
-  /summaly/2.7.0:
+  /summaly@2.7.0:
     resolution: {integrity: sha512-pEz9LL8Gp0oPIQfn6TrnBCcv/HkFE14hxhH3W6LPGdopXlPXjRcMlDMJaO+VupUNMOGaMjCsjq7+0rWnu8sp7w==}
     dependencies:
       cheerio: 0.22.0
@@ -11962,50 +11932,49 @@ packages:
       - supports-color
     dev: false
 
-  /supports-color/2.0.0:
+  /supports-color@2.0.0:
     resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}
     engines: {node: '>=0.8.0'}
     dev: true
 
-  /supports-color/3.2.3:
+  /supports-color@3.2.3:
     resolution: {integrity: sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==}
     engines: {node: '>=0.8.0'}
     dependencies:
       has-flag: 1.0.0
     dev: true
 
-  /supports-color/5.5.0:
+  /supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
     engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
     dev: false
 
-  /supports-color/7.2.0:
+  /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
     engines: {node: '>=8'}
     dependencies:
       has-flag: 4.0.0
 
-  /supports-color/8.1.1:
+  /supports-color@8.1.1:
     resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
     engines: {node: '>=10'}
     dependencies:
       has-flag: 4.0.0
-    dev: true
 
-  /supports-preserve-symlinks-flag/1.0.0:
+  /supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
-  /sver-compat/1.5.0:
+  /sver-compat@1.5.0:
     resolution: {integrity: sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==}
     dependencies:
       es6-iterator: 2.0.3
       es6-symbol: 3.1.3
     dev: true
 
-  /svgo/0.7.2:
+  /svgo@0.7.2:
     resolution: {integrity: sha512-jT/g9FFMoe9lu2IT6HtAxTA7RR2XOrmcrmCtGnyB/+GQnV6ZjNn+KOHZbZ35yL81+1F/aB6OeEsJztzBQ2EEwA==}
     engines: {node: '>=0.10.0'}
     deprecated: This SVGO version is no longer supported. Upgrade to v2.x.x.
@@ -12020,17 +11989,17 @@ packages:
       whet.extend: 0.9.9
     dev: true
 
-  /swc-loader/0.2.3_v4imsvpumnwpgduroyqmpcfjiy:
+  /swc-loader@0.2.3(@swc/core@1.3.26)(webpack@5.75.0):
     resolution: {integrity: sha512-D1p6XXURfSPleZZA/Lipb3A8pZ17fP4NObZvFCDjK/OKljroqDpPmsBdTraWhVBqUNpcWBQY1imWdoPScRlQ7A==}
     peerDependencies:
       '@swc/core': ^1.2.147
       webpack: '>=2'
     dependencies:
       '@swc/core': 1.3.26
-      webpack: 5.75.0_@swc+core@1.3.26
+      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
     dev: true
 
-  /swiper/8.4.5:
+  /swiper@8.4.5:
     resolution: {integrity: sha512-zveyEFBBv4q1sVkbJHnuH4xCtarKieavJ4SxP0QEHvdpPLJRuD7j/Xg38IVVLbp7Db6qrPsLUePvxohYx39Agw==}
     engines: {node: '>= 4.7.0'}
     requiresBuild: true
@@ -12039,34 +12008,34 @@ packages:
       ssr-window: 4.0.2
     dev: true
 
-  /symbol-tree/3.2.4:
+  /symbol-tree@3.2.4:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
     dev: false
 
-  /syslog-pro/1.0.0:
+  /syslog-pro@1.0.0:
     resolution: {integrity: sha512-7SNMJKtQBJlwBUp1jxFT7bXya71cnINXPCYJ2AVhlQE4MKL7o2QiPdAXbMdWRiLeykQ2rx+7TNrnoGzvzhO+eA==}
     engines: {node: '>=10.0.0'}
     dependencies:
       moment: 2.29.4
     dev: false
 
-  /systeminformation/5.16.9:
+  /systeminformation@5.16.9:
     resolution: {integrity: sha512-QTlv3GGSromPeLVW3pzM6uxU8RbkacW9e0+ZX23GAXaX+XE0UToSygAxCJDHSty6RB9lAFHCHg+FfiXFChi/+w==}
     engines: {node: '>=8.0.0'}
     os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android]
     hasBin: true
     dev: false
 
-  /syuilo-password-strength/0.0.1:
+  /syuilo-password-strength@0.0.1:
     resolution: {integrity: sha512-g9rPT3V1Q4WjWFZ/t5BdGC1mT/FpYnsLdBl+M5e6MlRkuE1RSR+R43wcY/3mKI59B9KEr+vxdWCuWNMD3oNHKA==}
     dev: true
 
-  /tapable/2.2.1:
+  /tapable@2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
     engines: {node: '>=6'}
     dev: true
 
-  /tar-fs/2.1.1:
+  /tar-fs@2.1.1:
     resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
     dependencies:
       chownr: 1.1.4
@@ -12075,7 +12044,7 @@ packages:
       tar-stream: 2.2.0
     dev: false
 
-  /tar-stream/1.6.2:
+  /tar-stream@1.6.2:
     resolution: {integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -12088,7 +12057,7 @@ packages:
       xtend: 4.0.2
     dev: true
 
-  /tar-stream/2.2.0:
+  /tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
     dependencies:
@@ -12099,7 +12068,7 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /tar/4.4.19:
+  /tar@4.4.19:
     resolution: {integrity: sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==}
     engines: {node: '>=4.5'}
     dependencies:
@@ -12113,7 +12082,7 @@ packages:
     dev: false
     optional: true
 
-  /tar/6.1.13:
+  /tar@6.1.13:
     resolution: {integrity: sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==}
     engines: {node: '>=10'}
     dependencies:
@@ -12125,7 +12094,7 @@ packages:
       yallist: 4.0.0
     dev: false
 
-  /terser-webpack-plugin/5.3.6_v4imsvpumnwpgduroyqmpcfjiy:
+  /terser-webpack-plugin@5.3.6(@swc/core@1.3.26)(webpack@5.75.0):
     resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -12147,10 +12116,10 @@ packages:
       schema-utils: 3.1.1
       serialize-javascript: 6.0.0
       terser: 5.16.1
-      webpack: 5.75.0_@swc+core@1.3.26
+      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
     dev: true
 
-  /terser/5.16.1:
+  /terser@5.16.1:
     resolution: {integrity: sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==}
     engines: {node: '>=10'}
     hasBin: true
@@ -12161,15 +12130,15 @@ packages:
       source-map-support: 0.5.21
     dev: true
 
-  /tesseract.js-core/3.0.2:
+  /tesseract.js-core@3.0.2:
     resolution: {integrity: sha512-2fD76ka9nO/C616R0fq+M9Zu91DA3vEfyozp0jlxaJOBmpfeprtgRP3cqVweZh2darE1kK/DazoxZ65g7WU99Q==}
     dev: false
 
-  /tesseract.js/3.0.3_eslint@8.31.0:
+  /tesseract.js@3.0.3(eslint@8.31.0):
     resolution: {integrity: sha512-eZ1+OGWvF5IMExAzIwnDf3S3kf2FeC+i4qrMTRvBSlZeHc3ONy0vCmaKmBQz6scjB6C1W2w2x0r4lCEh95qBnw==}
     requiresBuild: true
     dependencies:
-      babel-eslint: 10.1.0_eslint@8.31.0
+      babel-eslint: 10.1.0(eslint@8.31.0)
       bmp-js: 0.1.0
       file-type: 12.4.2
       idb-keyval: 3.2.0
@@ -12188,89 +12157,89 @@ packages:
       - supports-color
     dev: false
 
-  /text-table/0.2.0:
+  /text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
 
-  /textarea-caret/3.1.0:
+  /textarea-caret@3.1.0:
     resolution: {integrity: sha512-cXAvzO9pP5CGa6NKx0WYHl+8CHKZs8byMkt3PCJBCmq2a34YA9pO1NrQET5pzeqnBjBdToF5No4rrmkDUgQC2Q==}
     dev: true
 
-  /textextensions/3.3.0:
+  /textextensions@3.3.0:
     resolution: {integrity: sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==}
     engines: {node: '>=8'}
     dev: true
 
-  /thenify-all/1.6.0:
+  /thenify-all@1.6.0:
     resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
     engines: {node: '>=0.8'}
     dependencies:
       thenify: 3.3.1
 
-  /thenify/3.3.1:
+  /thenify@3.3.1:
     resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
     dependencies:
       any-promise: 1.3.0
 
-  /three/0.146.0:
+  /three@0.146.0:
     resolution: {integrity: sha512-1lvNfLezN6OJ9NaFAhfX4sm5e9YCzHtaRgZ1+B4C+Hv6TibRMsuBAM5/wVKzxjpYIlMymvgsHEFrrigEfXnb2A==}
     dev: true
 
-  /throttle-debounce/5.0.0:
+  /throttle-debounce@5.0.0:
     resolution: {integrity: sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==}
     engines: {node: '>=12.22'}
     dev: true
 
-  /throttleit/1.0.0:
+  /throttleit@1.0.0:
     resolution: {integrity: sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==}
     dev: true
 
-  /through/2.3.4:
-    resolution: {integrity: sha512-DwbmSAcABsMazNkLOJJSLRC3gfh4cPxUxJCn9npmvbcI6undhgoJ2ShvEOgZrW8BH62Gyr9jKboGbfFcmY5VsQ==}
-    dev: false
-
-  /through/2.3.8:
-    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
-
-  /through2-filter/3.0.0:
+  /through2-filter@3.0.0:
     resolution: {integrity: sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==}
     dependencies:
       through2: 2.0.5
       xtend: 4.0.2
     dev: true
 
-  /through2/2.0.5:
+  /through2@2.0.5:
     resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
     dependencies:
       readable-stream: 2.3.7
       xtend: 4.0.2
     dev: true
 
-  /through2/4.0.2:
+  /through2@4.0.2:
     resolution: {integrity: sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==}
     dependencies:
       readable-stream: 3.6.0
     dev: true
 
-  /time-stamp/1.1.0:
+  /through@2.3.4:
+    resolution: {integrity: sha512-DwbmSAcABsMazNkLOJJSLRC3gfh4cPxUxJCn9npmvbcI6undhgoJ2ShvEOgZrW8BH62Gyr9jKboGbfFcmY5VsQ==}
+    dev: false
+
+  /through@2.3.8:
+    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
+
+  /time-stamp@1.1.0:
     resolution: {integrity: sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /timed-out/4.0.1:
+  /timed-out@4.0.1:
     resolution: {integrity: sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /tinycolor2/1.5.2:
+  /tinycolor2@1.5.2:
     resolution: {integrity: sha512-h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg==}
 
-  /tmp/0.2.1:
+  /tmp@0.2.1:
     resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==}
     engines: {node: '>=8.17.0'}
     dependencies:
       rimraf: 3.0.2
 
-  /to-absolute-glob/2.0.2:
+  /to-absolute-glob@2.0.2:
     resolution: {integrity: sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -12278,22 +12247,22 @@ packages:
       is-negated-glob: 1.0.0
     dev: true
 
-  /to-buffer/1.1.1:
+  /to-buffer@1.1.1:
     resolution: {integrity: sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==}
     dev: true
 
-  /to-fast-properties/2.0.0:
+  /to-fast-properties@2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
     engines: {node: '>=4'}
 
-  /to-object-path/0.3.0:
+  /to-object-path@0.3.0:
     resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 3.2.2
     dev: true
 
-  /to-regex-range/2.1.1:
+  /to-regex-range@2.1.1:
     resolution: {integrity: sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -12301,13 +12270,13 @@ packages:
       repeat-string: 1.6.1
     dev: true
 
-  /to-regex-range/5.0.1:
+  /to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
     dependencies:
       is-number: 7.0.0
 
-  /to-regex/3.0.2:
+  /to-regex@3.0.2:
     resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -12317,21 +12286,21 @@ packages:
       safe-regex: 1.1.0
     dev: true
 
-  /to-through/2.0.0:
+  /to-through@2.0.0:
     resolution: {integrity: sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==}
     engines: {node: '>= 0.10'}
     dependencies:
       through2: 2.0.5
     dev: true
 
-  /toidentifier/1.0.1:
+  /toidentifier@1.0.1:
     resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
     engines: {node: '>=0.6'}
 
-  /token-stream/1.0.0:
+  /token-stream@1.0.0:
     resolution: {integrity: sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==}
 
-  /token-types/5.0.1:
+  /token-types@5.0.1:
     resolution: {integrity: sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==}
     engines: {node: '>=14.16'}
     dependencies:
@@ -12339,14 +12308,14 @@ packages:
       ieee754: 1.2.1
     dev: false
 
-  /tough-cookie/2.5.0:
+  /tough-cookie@2.5.0:
     resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
     engines: {node: '>=0.8'}
     dependencies:
       psl: 1.9.0
       punycode: 2.2.0
 
-  /tough-cookie/4.1.2:
+  /tough-cookie@4.1.2:
     resolution: {integrity: sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==}
     engines: {node: '>=6'}
     dependencies:
@@ -12356,33 +12325,33 @@ packages:
       url-parse: 1.5.10
     dev: false
 
-  /tr46/0.0.3:
+  /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
     dev: false
 
-  /tr46/3.0.0:
+  /tr46@3.0.0:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
     dependencies:
       punycode: 2.2.0
     dev: false
 
-  /trace-redirect/1.0.6:
+  /trace-redirect@1.0.6:
     resolution: {integrity: sha512-UUfa1DjjU5flcjMdaFIiIEGDTyu2y/IiMjOX4uGXa7meKBS4vD4f2Uy/tken9Qkd4Jsm4sRsfZcIIPqrRVF3Mg==}
     dev: false
 
-  /traverse/0.3.9:
+  /traverse@0.3.9:
     resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==}
     dev: false
 
-  /trim-repeated/1.0.0:
+  /trim-repeated@1.0.0:
     resolution: {integrity: sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       escape-string-regexp: 1.0.5
     dev: true
 
-  /ts-loader/9.4.2_3fkjkrd3audxnith3e7fo4fnxi:
+  /ts-loader@9.4.2(typescript@4.9.4)(webpack@5.75.0):
     resolution: {integrity: sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -12394,10 +12363,10 @@ packages:
       micromatch: 4.0.5
       semver: 7.3.8
       typescript: 4.9.4
-      webpack: 5.75.0_@swc+core@1.3.26
+      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
     dev: true
 
-  /ts-node/10.9.1_fodzh64fuekdilycyvke2qmf2e:
+  /ts-node@10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
@@ -12428,7 +12397,7 @@ packages:
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
-  /tsc-alias/1.8.2:
+  /tsc-alias@1.8.2:
     resolution: {integrity: sha512-ukBkcNekOgwtnSWYLD5QsMX3yQWg7JviAs8zg3qJGgu4LGtY3tsV4G6vnqvOXIDkbC+XL9vbhObWSpRA5/6wbg==}
     hasBin: true
     dependencies:
@@ -12440,7 +12409,7 @@ packages:
       plimit-lit: 1.5.0
     dev: true
 
-  /tsconfig-paths/4.1.2:
+  /tsconfig-paths@4.1.2:
     resolution: {integrity: sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==}
     engines: {node: '>=6'}
     dependencies:
@@ -12449,53 +12418,53 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
-  /tslib/2.4.1:
+  /tslib@2.4.1:
     resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
 
-  /tsscmp/1.0.6:
+  /tsscmp@1.0.6:
     resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
     engines: {node: '>=0.6.x'}
     dev: false
 
-  /tunnel-agent/0.6.0:
+  /tunnel-agent@0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
     dependencies:
       safe-buffer: 5.2.1
 
-  /tweetnacl/0.14.5:
+  /tweetnacl@0.14.5:
     resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
 
-  /twemoji-parser/14.0.0:
+  /twemoji-parser@14.0.0:
     resolution: {integrity: sha512-9DUOTGLOWs0pFWnh1p6NF+C3CkQ96PWmEFwhOVmT3WbecRC+68AIqpsnJXygfkFcp4aXbOp8Dwbhh/HQgvoRxA==}
 
-  /type-check/0.3.2:
+  /type-check@0.3.2:
     resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.1.2
     dev: false
 
-  /type-check/0.4.0:
+  /type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.2.1
 
-  /type-detect/4.0.8:
+  /type-detect@4.0.8:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
     engines: {node: '>=4'}
     dev: false
 
-  /type-fest/0.20.2:
+  /type-fest@0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
     engines: {node: '>=10'}
 
-  /type-fest/0.21.3:
+  /type-fest@0.21.3:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
     dev: true
 
-  /type-is/1.6.18:
+  /type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}
     dependencies:
@@ -12503,22 +12472,22 @@ packages:
       mime-types: 2.1.35
     dev: false
 
-  /type/1.2.0:
+  /type@1.2.0:
     resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
 
-  /type/2.7.2:
+  /type@2.7.2:
     resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
 
-  /typedarray-to-buffer/3.1.5:
+  /typedarray-to-buffer@3.1.5:
     resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
     dependencies:
       is-typedarray: 1.0.0
     dev: false
 
-  /typedarray/0.0.6:
+  /typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
-  /typeorm/0.3.11_zfbzyadn2rnu3hf3pysto5crhm:
+  /typeorm@0.3.11(ioredis@5.2.4)(pg@8.8.0)(ts-node@10.9.1):
     resolution: {integrity: sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==}
     engines: {node: '>= 12.9.0'}
     hasBin: true
@@ -12582,7 +12551,7 @@ packages:
       chalk: 4.1.2
       cli-highlight: 2.1.11
       date-fns: 2.29.3
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       dotenv: 16.0.3
       glob: 7.2.3
       ioredis: 5.2.4
@@ -12591,7 +12560,7 @@ packages:
       pg: 8.8.0
       reflect-metadata: 0.1.13
       sha.js: 2.4.11
-      ts-node: 10.9.1_fodzh64fuekdilycyvke2qmf2e
+      ts-node: 10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4)
       tslib: 2.4.1
       uuid: 8.3.2
       xml2js: 0.4.23
@@ -12600,34 +12569,34 @@ packages:
       - supports-color
     dev: false
 
-  /typescript/4.9.4:
+  /typescript@4.9.4:
     resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==}
     engines: {node: '>=4.2.0'}
     hasBin: true
 
-  /ulid/2.3.0:
+  /ulid@2.3.0:
     resolution: {integrity: sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==}
     hasBin: true
     dev: false
 
-  /unbzip2-stream/1.4.3:
+  /unbzip2-stream@1.4.3:
     resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
     dependencies:
       buffer: 5.7.1
       through: 2.3.8
     dev: true
 
-  /unc-path-regex/0.1.2:
+  /unc-path-regex@0.1.2:
     resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /undertaker-registry/1.0.1:
+  /undertaker-registry@1.0.1:
     resolution: {integrity: sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==}
     engines: {node: '>= 0.10'}
     dev: true
 
-  /undertaker/1.3.0:
+  /undertaker@1.3.0:
     resolution: {integrity: sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -12643,14 +12612,14 @@ packages:
       undertaker-registry: 1.0.1
     dev: true
 
-  /undici/5.15.0:
+  /undici@5.15.0:
     resolution: {integrity: sha512-wCAZJDyjw9Myv+Ay62LAoB+hZLPW9SmKbQkbHIhMw/acKSlpn7WohdMUc/Vd4j1iSMBO0hWwU8mjB7a5p5bl8g==}
     engines: {node: '>=12.18'}
     dependencies:
       busboy: 1.6.0
     dev: false
 
-  /union-value/1.0.1:
+  /union-value@1.0.1:
     resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -12660,58 +12629,58 @@ packages:
       set-value: 2.0.1
     dev: true
 
-  /uniq/1.0.1:
+  /uniq@1.0.1:
     resolution: {integrity: sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==}
 
-  /uniqs/2.0.0:
+  /uniqs@2.0.0:
     resolution: {integrity: sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ==}
     dev: true
 
-  /unique-filename/2.0.1:
+  /unique-filename@2.0.1:
     resolution: {integrity: sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
       unique-slug: 3.0.0
     dev: false
 
-  /unique-slug/3.0.0:
+  /unique-slug@3.0.0:
     resolution: {integrity: sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
       imurmurhash: 0.1.4
     dev: false
 
-  /unique-stream/2.3.1:
+  /unique-stream@2.3.1:
     resolution: {integrity: sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==}
     dependencies:
       json-stable-stringify-without-jsonify: 1.0.1
       through2-filter: 3.0.0
     dev: true
 
-  /universalify/0.1.2:
+  /universalify@0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
     engines: {node: '>= 4.0.0'}
 
-  /universalify/0.2.0:
+  /universalify@0.2.0:
     resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
     engines: {node: '>= 4.0.0'}
     dev: false
 
-  /universalify/2.0.0:
+  /universalify@2.0.0:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
     engines: {node: '>= 10.0.0'}
     dev: true
 
-  /unload/2.4.1:
+  /unload@2.4.1:
     resolution: {integrity: sha512-IViSAm8Z3sRBYA+9wc0fLQmU9Nrxb16rcDmIiR6Y9LJSZzI7QY5QsDhqPpKOjAn0O9/kfK1TfNEMMAGPTIraPw==}
     dev: true
 
-  /unpipe/1.0.0:
+  /unpipe@1.0.0:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
     dev: false
 
-  /unset-value/1.0.0:
+  /unset-value@1.0.0:
     resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -12719,12 +12688,12 @@ packages:
       isobject: 3.0.1
     dev: true
 
-  /untildify/4.0.0:
+  /untildify@4.0.0:
     resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
     engines: {node: '>=8'}
     dev: true
 
-  /unzipper/0.10.11:
+  /unzipper@0.10.11:
     resolution: {integrity: sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==}
     dependencies:
       big-integer: 1.6.51
@@ -12739,7 +12708,7 @@ packages:
       setimmediate: 1.0.5
     dev: false
 
-  /update-browserslist-db/1.0.10_browserslist@4.21.4:
+  /update-browserslist-db@1.0.10(browserslist@4.21.4):
     resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==}
     hasBin: true
     peerDependencies:
@@ -12750,56 +12719,56 @@ packages:
       picocolors: 1.0.0
     dev: true
 
-  /uri-js/4.4.1:
+  /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
       punycode: 2.2.0
 
-  /urix/0.1.0:
+  /urix@0.1.0:
     resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
     deprecated: Please see https://github.com/lydell/urix#deprecated
     dev: true
 
-  /url-parse-lax/3.0.0:
+  /url-parse-lax@3.0.0:
     resolution: {integrity: sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==}
     engines: {node: '>=4'}
     dependencies:
       prepend-http: 2.0.0
     dev: true
 
-  /url-parse/1.5.10:
+  /url-parse@1.5.10:
     resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
     dependencies:
       querystringify: 2.2.0
       requires-port: 1.0.0
     dev: false
 
-  /url-polyfill/1.1.12:
+  /url-polyfill@1.1.12:
     resolution: {integrity: sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==}
     dev: true
 
-  /url-to-options/1.0.1:
+  /url-to-options@1.0.1:
     resolution: {integrity: sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==}
     engines: {node: '>= 4'}
     dev: true
 
-  /url/0.10.3:
+  /url@0.10.3:
     resolution: {integrity: sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==}
     dependencies:
       punycode: 1.3.2
       querystring: 0.2.0
     dev: false
 
-  /urlsafe-base64/1.0.0:
+  /urlsafe-base64@1.0.0:
     resolution: {integrity: sha512-RtuPeMy7c1UrHwproMZN9gN6kiZ0SvJwRaEzwZY0j9MypEkFqyBaKv176jvlPtg58Zh36bOkS0NFABXMHvvGCA==}
     dev: false
 
-  /use/3.1.1:
+  /use@3.1.1:
     resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /utf-8-validate/5.0.10:
+  /utf-8-validate@5.0.10:
     resolution: {integrity: sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==}
     engines: {node: '>=6.14.2'}
     requiresBuild: true
@@ -12807,10 +12776,10 @@ packages:
       node-gyp-build: 4.6.0
     dev: false
 
-  /util-deprecate/1.0.2:
+  /util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  /util/0.12.5:
+  /util@0.12.5:
     resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==}
     dependencies:
       inherits: 2.0.4
@@ -12820,65 +12789,65 @@ packages:
       which-typed-array: 1.1.9
     dev: false
 
-  /uuid/3.4.0:
+  /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.
     hasBin: true
     dev: false
 
-  /uuid/7.0.3:
+  /uuid@7.0.3:
     resolution: {integrity: sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==}
     hasBin: true
 
-  /uuid/8.0.0:
+  /uuid@8.0.0:
     resolution: {integrity: sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==}
     hasBin: true
     dev: false
 
-  /uuid/8.3.2:
+  /uuid@8.3.2:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
     hasBin: true
 
-  /uuid/9.0.0:
+  /uuid@9.0.0:
     resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
     hasBin: true
 
-  /v8-compile-cache-lib/3.0.1:
+  /v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
-  /v8flags/3.2.0:
+  /v8flags@3.2.0:
     resolution: {integrity: sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==}
     engines: {node: '>= 0.10'}
     dependencies:
       homedir-polyfill: 1.0.3
     dev: true
 
-  /validate-npm-package-license/3.0.4:
+  /validate-npm-package-license@3.0.4:
     resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
     dependencies:
       spdx-correct: 3.1.1
       spdx-expression-parse: 3.0.1
     dev: true
 
-  /value-or-function/3.0.0:
+  /value-or-function@3.0.0:
     resolution: {integrity: sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==}
     engines: {node: '>= 0.10'}
     dev: true
 
-  /vanilla-tilt/1.8.0:
+  /vanilla-tilt@1.8.0:
     resolution: {integrity: sha512-wVCHyyfRuiRdKhDTNxKPb60lkagmywDSqLgFETEr71Sm646AvGxuf/14Kx9A8FaISyYvMoKQHk6FTqt+YLGhEw==}
     dev: true
 
-  /vary/1.1.2:
+  /vary@1.1.2:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
     engines: {node: '>= 0.8'}
     dev: false
 
-  /vendors/1.0.4:
+  /vendors@1.0.4:
     resolution: {integrity: sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==}
     dev: true
 
-  /verror/1.10.0:
+  /verror@1.10.0:
     resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
     engines: {'0': node >=0.6.0}
     dependencies:
@@ -12886,7 +12855,7 @@ packages:
       core-util-is: 1.0.2
       extsprintf: 1.3.0
 
-  /vinyl-fs/3.0.3:
+  /vinyl-fs@3.0.3:
     resolution: {integrity: sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -12909,7 +12878,7 @@ packages:
       vinyl-sourcemap: 1.1.0
     dev: true
 
-  /vinyl-sourcemap/1.1.0:
+  /vinyl-sourcemap@1.1.0:
     resolution: {integrity: sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -12922,13 +12891,13 @@ packages:
       vinyl: 2.2.1
     dev: true
 
-  /vinyl-sourcemaps-apply/0.2.1:
+  /vinyl-sourcemaps-apply@0.2.1:
     resolution: {integrity: sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==}
     dependencies:
       source-map: 0.5.7
     dev: true
 
-  /vinyl/2.2.1:
+  /vinyl@2.2.1:
     resolution: {integrity: sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -12940,20 +12909,20 @@ packages:
       replace-ext: 1.0.1
     dev: true
 
-  /vite-plugin-compression/0.5.1_vite@4.1.1:
+  /vite-plugin-compression@0.5.1(vite@4.1.1):
     resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
     peerDependencies:
       vite: '>=2.0.0'
     dependencies:
       chalk: 4.1.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       fs-extra: 10.1.0
-      vite: 4.1.1_sass@1.57.1
+      vite: 4.1.1(sass@1.57.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite/4.1.1_sass@1.57.1:
+  /vite@4.1.1(sass@1.57.1):
     resolution: {integrity: sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -12987,24 +12956,24 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /void-elements/3.1.0:
+  /void-elements@3.1.0:
     resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
     engines: {node: '>=0.10.0'}
 
-  /vue-isyourpasswordsafe/2.0.0:
+  /vue-isyourpasswordsafe@2.0.0:
     resolution: {integrity: sha512-j3ORj18R9AgFiP2UOM35KuZbSeJAUiwCSyeRBFN3CGFYTJSKsxqU9qGqOHOz6OhLAYKMTin8JOmqugAbF9O+Bg==}
     dependencies:
       sha1: 1.1.1
     dev: true
 
-  /vue-plyr/7.0.0:
+  /vue-plyr@7.0.0:
     resolution: {integrity: sha512-NvbO/ZzV1IxlBQQbQlon5Sk8hKuGAj3k4k0XVdi7gM4oSqu8mZMhJ3WM3FfAtNfV790jbLnb8P3dHYqaBqIv6g==}
     dependencies:
       plyr: github.com/sampotts/plyr/d434c9af16e641400aaee93188594208d88f2658
       vue: 2.7.14
     dev: true
 
-  /vue-prism-editor/2.0.0-alpha.2_vue@3.2.45:
+  /vue-prism-editor@2.0.0-alpha.2(vue@3.2.45):
     resolution: {integrity: sha512-Gu42ba9nosrE+gJpnAEuEkDMqG9zSUysIR8SdXUw8MQKDjBnnNR9lHC18uOr/ICz7yrA/5c7jHJr9lpElODC7w==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -13013,24 +12982,24 @@ packages:
       vue: 3.2.45
     dev: true
 
-  /vue/2.7.14:
+  /vue@2.7.14:
     resolution: {integrity: sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==}
     dependencies:
       '@vue/compiler-sfc': 2.7.14
       csstype: 3.1.1
     dev: true
 
-  /vue/3.2.45:
+  /vue@3.2.45:
     resolution: {integrity: sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==}
     dependencies:
       '@vue/compiler-dom': 3.2.45
       '@vue/compiler-sfc': 3.2.45
       '@vue/runtime-dom': 3.2.45
-      '@vue/server-renderer': 3.2.45_vue@3.2.45
+      '@vue/server-renderer': 3.2.45(vue@3.2.45)
       '@vue/shared': 3.2.45
     dev: true
 
-  /vuedraggable/4.1.0_vue@3.2.45:
+  /vuedraggable@4.1.0(vue@3.2.45):
     resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
     peerDependencies:
       vue: ^3.0.1
@@ -13039,19 +13008,19 @@ packages:
       vue: 3.2.45
     dev: true
 
-  /w3c-xmlserializer/4.0.0:
+  /w3c-xmlserializer@4.0.0:
     resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==}
     engines: {node: '>=14'}
     dependencies:
       xml-name-validator: 4.0.0
     dev: false
 
-  /wait-on/6.0.1_debug@4.3.4:
+  /wait-on@6.0.1(debug@4.3.4):
     resolution: {integrity: sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==}
     engines: {node: '>=10.0.0'}
     hasBin: true
     dependencies:
-      axios: 0.25.0_debug@4.3.4
+      axios: 0.25.0(debug@4.3.4)
       joi: 17.7.0
       lodash: 4.17.21
       minimist: 1.2.7
@@ -13060,11 +13029,11 @@ packages:
       - debug
     dev: true
 
-  /wasm-feature-detect/1.4.0:
+  /wasm-feature-detect@1.4.0:
     resolution: {integrity: sha512-9z4Yk3SeHQdb7E4g6ywQYcUt1CHr9HFiCIA5h29rv0gmW4lCE5dnDhheiJI5qzVPSDnXHyXQPLGPyucsuIzacw==}
     dev: false
 
-  /watchpack/2.4.0:
+  /watchpack@2.4.0:
     resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==}
     engines: {node: '>=10.13.0'}
     dependencies:
@@ -13072,7 +13041,7 @@ packages:
       graceful-fs: 4.2.10
     dev: true
 
-  /web-push/3.5.0:
+  /web-push@3.5.0:
     resolution: {integrity: sha512-JC0V9hzKTqlDYJ+LTZUXtW7B175qwwaqzbbMSWDxHWxZvd3xY0C2rcotMGDavub2nAAFw+sXTsqR65/KY2A5AQ==}
     engines: {node: '>= 6'}
     hasBin: true
@@ -13087,20 +13056,20 @@ packages:
       - supports-color
     dev: false
 
-  /web-streams-polyfill/3.2.1:
+  /web-streams-polyfill@3.2.1:
     resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
     engines: {node: '>= 8'}
 
-  /webidl-conversions/3.0.1:
+  /webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
     dev: false
 
-  /webidl-conversions/7.0.0:
+  /webidl-conversions@7.0.0:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
     engines: {node: '>=12'}
     dev: false
 
-  /webpack-cli/5.0.1_webpack@5.75.0:
+  /webpack-cli@5.0.1(webpack@5.75.0):
     resolution: {integrity: sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==}
     engines: {node: '>=14.15.0'}
     hasBin: true
@@ -13118,9 +13087,9 @@ packages:
         optional: true
     dependencies:
       '@discoveryjs/json-ext': 0.5.7
-      '@webpack-cli/configtest': 2.0.1_rjsyjcrmk25kqsjzwkvj3a2evq
-      '@webpack-cli/info': 2.0.1_rjsyjcrmk25kqsjzwkvj3a2evq
-      '@webpack-cli/serve': 2.0.1_rjsyjcrmk25kqsjzwkvj3a2evq
+      '@webpack-cli/configtest': 2.0.1(webpack-cli@5.0.1)(webpack@5.75.0)
+      '@webpack-cli/info': 2.0.1(webpack-cli@5.0.1)(webpack@5.75.0)
+      '@webpack-cli/serve': 2.0.1(webpack-cli@5.0.1)(webpack@5.75.0)
       colorette: 2.0.19
       commander: 9.5.0
       cross-spawn: 7.0.3
@@ -13129,11 +13098,11 @@ packages:
       import-local: 3.1.0
       interpret: 3.1.1
       rechoir: 0.8.0
-      webpack: 5.75.0_bix6ghzcb3jjkfxenpixt6qrpa
+      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
       webpack-merge: 5.8.0
     dev: true
 
-  /webpack-merge/5.8.0:
+  /webpack-merge@5.8.0:
     resolution: {integrity: sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==}
     engines: {node: '>=10.0.0'}
     dependencies:
@@ -13141,12 +13110,12 @@ packages:
       wildcard: 2.0.0
     dev: true
 
-  /webpack-sources/3.2.3:
+  /webpack-sources@3.2.3:
     resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
     engines: {node: '>=10.13.0'}
     dev: true
 
-  /webpack/5.75.0_@swc+core@1.3.26:
+  /webpack@5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1):
     resolution: {integrity: sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==}
     engines: {node: '>=10.13.0'}
     hasBin: true
@@ -13162,7 +13131,7 @@ packages:
       '@webassemblyjs/wasm-edit': 1.11.1
       '@webassemblyjs/wasm-parser': 1.11.1
       acorn: 8.8.1
-      acorn-import-assertions: 1.8.0_acorn@8.8.1
+      acorn-import-assertions: 1.8.0(acorn@8.8.1)
       browserslist: 4.21.4
       chrome-trace-event: 1.0.3
       enhanced-resolve: 5.12.0
@@ -13177,8 +13146,9 @@ packages:
       neo-async: 2.6.2
       schema-utils: 3.1.1
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.6_v4imsvpumnwpgduroyqmpcfjiy
+      terser-webpack-plugin: 5.3.6(@swc/core@1.3.26)(webpack@5.75.0)
       watchpack: 2.4.0
+      webpack-cli: 5.0.1(webpack@5.75.0)
       webpack-sources: 3.2.3
     transitivePeerDependencies:
       - '@swc/core'
@@ -13186,48 +13156,7 @@ packages:
       - uglify-js
     dev: true
 
-  /webpack/5.75.0_bix6ghzcb3jjkfxenpixt6qrpa:
-    resolution: {integrity: sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    peerDependencies:
-      webpack-cli: '*'
-    peerDependenciesMeta:
-      webpack-cli:
-        optional: true
-    dependencies:
-      '@types/eslint-scope': 3.7.4
-      '@types/estree': 0.0.51
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/wasm-edit': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
-      acorn: 8.8.1
-      acorn-import-assertions: 1.8.0_acorn@8.8.1
-      browserslist: 4.21.4
-      chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.12.0
-      es-module-lexer: 0.9.3
-      eslint-scope: 5.1.1
-      events: 3.3.0
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.10
-      json-parse-even-better-errors: 2.3.1
-      loader-runner: 4.3.0
-      mime-types: 2.1.35
-      neo-async: 2.6.2
-      schema-utils: 3.1.1
-      tapable: 2.2.1
-      terser-webpack-plugin: 5.3.6_v4imsvpumnwpgduroyqmpcfjiy
-      watchpack: 2.4.0
-      webpack-cli: 5.0.1_webpack@5.75.0
-      webpack-sources: 3.2.3
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - uglify-js
-    dev: true
-
-  /websocket/1.0.34:
+  /websocket@1.0.34:
     resolution: {integrity: sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==}
     engines: {node: '>=4.0.0'}
     dependencies:
@@ -13241,19 +13170,19 @@ packages:
       - supports-color
     dev: false
 
-  /whatwg-encoding/2.0.0:
+  /whatwg-encoding@2.0.0:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
     engines: {node: '>=12'}
     dependencies:
       iconv-lite: 0.6.3
     dev: false
 
-  /whatwg-mimetype/3.0.0:
+  /whatwg-mimetype@3.0.0:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
     engines: {node: '>=12'}
     dev: false
 
-  /whatwg-url/11.0.0:
+  /whatwg-url@11.0.0:
     resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==}
     engines: {node: '>=12'}
     dependencies:
@@ -13261,27 +13190,27 @@ packages:
       webidl-conversions: 7.0.0
     dev: false
 
-  /whatwg-url/5.0.0:
+  /whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
     dev: false
 
-  /whet.extend/0.9.9:
+  /whet.extend@0.9.9:
     resolution: {integrity: sha512-mmIPAft2vTgEILgPeZFqE/wWh24SEsR/k+N9fJ3Jxrz44iDFy9aemCxdksfURSHYFCLmvs/d/7Iso5XjPpNfrA==}
     engines: {node: '>=0.6.0'}
     dev: true
 
-  /which-module/1.0.0:
+  /which-module@1.0.0:
     resolution: {integrity: sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==}
     dev: true
 
-  /which-module/2.0.0:
+  /which-module@2.0.0:
     resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}
     dev: false
 
-  /which-typed-array/1.1.9:
+  /which-typed-array@1.1.9:
     resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -13293,30 +13222,30 @@ packages:
       is-typed-array: 1.1.10
     dev: false
 
-  /which/1.3.1:
+  /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
     dependencies:
       isexe: 2.0.0
 
-  /which/2.0.2:
+  /which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
     hasBin: true
     dependencies:
       isexe: 2.0.0
 
-  /wide-align/1.1.5:
+  /wide-align@1.1.5:
     resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
     dependencies:
       string-width: 4.2.3
     dev: false
 
-  /wildcard/2.0.0:
+  /wildcard@2.0.0:
     resolution: {integrity: sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==}
     dev: true
 
-  /with/7.0.2:
+  /with@7.0.2:
     resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==}
     engines: {node: '>= 10.0.0'}
     dependencies:
@@ -13325,15 +13254,15 @@ packages:
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
 
-  /word-wrap/1.2.3:
+  /word-wrap@1.2.3:
     resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
     engines: {node: '>=0.10.0'}
 
-  /workerpool/6.2.1:
+  /workerpool@6.2.1:
     resolution: {integrity: sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==}
     dev: true
 
-  /wrap-ansi/2.1.0:
+  /wrap-ansi@2.1.0:
     resolution: {integrity: sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -13341,7 +13270,7 @@ packages:
       strip-ansi: 3.0.1
     dev: true
 
-  /wrap-ansi/6.2.0:
+  /wrap-ansi@6.2.0:
     resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
     engines: {node: '>=8'}
     dependencies:
@@ -13349,7 +13278,7 @@ packages:
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
-  /wrap-ansi/7.0.0:
+  /wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
     dependencies:
@@ -13357,10 +13286,10 @@ packages:
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
-  /wrappy/1.0.2:
+  /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  /ws/8.11.0:
+  /ws@8.11.0:
     resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
@@ -13372,7 +13301,7 @@ packages:
       utf-8-validate:
         optional: true
 
-  /ws/8.12.0:
+  /ws@8.12.0:
     resolution: {integrity: sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
@@ -13385,30 +13314,30 @@ packages:
         optional: true
     dev: false
 
-  /xev/3.0.2:
+  /xev@3.0.2:
     resolution: {integrity: sha512-8kxuH95iMXzHZj+fwqfA4UrPcYOy6bGIgfWzo9Ji23JoEc30ge/Z++Ubkiuy8c0+M64nXmmxrmJ7C8wnuBhluw==}
     dev: false
 
-  /xml-js/1.6.11:
+  /xml-js@1.6.11:
     resolution: {integrity: sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==}
     hasBin: true
     dependencies:
       sax: 1.2.4
     dev: false
 
-  /xml-name-validator/4.0.0:
+  /xml-name-validator@4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
     engines: {node: '>=12'}
     dev: false
 
-  /xml2js/0.4.19:
+  /xml2js@0.4.19:
     resolution: {integrity: sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==}
     dependencies:
       sax: 1.2.4
       xmlbuilder: 9.0.7
     dev: false
 
-  /xml2js/0.4.23:
+  /xml2js@0.4.23:
     resolution: {integrity: sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==}
     engines: {node: '>=4.0.0'}
     dependencies:
@@ -13416,57 +13345,57 @@ packages:
       xmlbuilder: 11.0.1
     dev: false
 
-  /xmlbuilder/11.0.1:
+  /xmlbuilder@11.0.1:
     resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==}
     engines: {node: '>=4.0'}
     dev: false
 
-  /xmlbuilder/9.0.7:
+  /xmlbuilder@9.0.7:
     resolution: {integrity: sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==}
     engines: {node: '>=4.0'}
     dev: false
 
-  /xmlchars/2.2.0:
+  /xmlchars@2.2.0:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
     dev: false
 
-  /xtend/4.0.2:
+  /xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
     engines: {node: '>=0.4'}
 
-  /y18n/3.2.2:
+  /y18n@3.2.2:
     resolution: {integrity: sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==}
     dev: true
 
-  /y18n/4.0.3:
+  /y18n@4.0.3:
     resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
     dev: false
 
-  /y18n/5.0.8:
+  /y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
 
-  /yaeti/0.0.6:
+  /yaeti@0.0.6:
     resolution: {integrity: sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==}
     engines: {node: '>=0.10.32'}
     dev: false
 
-  /yallist/2.1.2:
+  /yallist@2.1.2:
     resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==}
 
-  /yallist/3.1.1:
+  /yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
     dev: false
     optional: true
 
-  /yallist/4.0.0:
+  /yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
 
-  /yaml-ast-parser/0.0.43:
+  /yaml-ast-parser@0.0.43:
     resolution: {integrity: sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==}
     dev: false
 
-  /yargs-parser/18.1.3:
+  /yargs-parser@18.1.3:
     resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
     engines: {node: '>=6'}
     dependencies:
@@ -13474,27 +13403,27 @@ packages:
       decamelize: 1.2.0
     dev: false
 
-  /yargs-parser/20.2.4:
+  /yargs-parser@20.2.4:
     resolution: {integrity: sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==}
     engines: {node: '>=10'}
     dev: true
 
-  /yargs-parser/20.2.9:
+  /yargs-parser@20.2.9:
     resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
     engines: {node: '>=10'}
 
-  /yargs-parser/21.1.1:
+  /yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
 
-  /yargs-parser/5.0.1:
+  /yargs-parser@5.0.1:
     resolution: {integrity: sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==}
     dependencies:
       camelcase: 3.0.0
       object.assign: 4.1.4
     dev: true
 
-  /yargs-unparser/2.0.0:
+  /yargs-unparser@2.0.0:
     resolution: {integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==}
     engines: {node: '>=10'}
     dependencies:
@@ -13504,7 +13433,7 @@ packages:
       is-plain-obj: 2.1.0
     dev: true
 
-  /yargs/15.4.1:
+  /yargs@15.4.1:
     resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
     engines: {node: '>=8'}
     dependencies:
@@ -13521,7 +13450,7 @@ packages:
       yargs-parser: 18.1.3
     dev: false
 
-  /yargs/16.2.0:
+  /yargs@16.2.0:
     resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
     engines: {node: '>=10'}
     dependencies:
@@ -13533,7 +13462,7 @@ packages:
       y18n: 5.0.8
       yargs-parser: 20.2.9
 
-  /yargs/17.6.2:
+  /yargs@17.6.2:
     resolution: {integrity: sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==}
     engines: {node: '>=12'}
     dependencies:
@@ -13546,7 +13475,7 @@ packages:
       yargs-parser: 21.1.1
     dev: false
 
-  /yargs/7.1.2:
+  /yargs@7.1.2:
     resolution: {integrity: sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==}
     dependencies:
       camelcase: 3.0.0
@@ -13564,27 +13493,27 @@ packages:
       yargs-parser: 5.0.1
     dev: true
 
-  /yauzl/2.10.0:
+  /yauzl@2.10.0:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
     dependencies:
       buffer-crc32: 0.2.13
       fd-slicer: 1.1.0
     dev: true
 
-  /ylru/1.3.2:
+  /ylru@1.3.2:
     resolution: {integrity: sha512-RXRJzMiK6U2ye0BlGGZnmpwJDPgakn6aNQ0A7gHRbD4I0uvK4TW6UqkK1V0pp9jskjJBAXd3dRrbzWkqJ+6cxA==}
     engines: {node: '>= 4.0.0'}
     dev: false
 
-  /yn/3.1.1:
+  /yn@3.1.1:
     resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
     engines: {node: '>=6'}
 
-  /yocto-queue/0.1.0:
+  /yocto-queue@0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
-  /zip-stream/4.1.0:
+  /zip-stream@4.1.0:
     resolution: {integrity: sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==}
     engines: {node: '>= 10'}
     dependencies:
@@ -13593,11 +13522,11 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /zlibjs/0.3.1:
+  /zlibjs@0.3.1:
     resolution: {integrity: sha512-+J9RrgTKOmlxFSDHo0pI1xM6BLVUv+o0ZT9ANtCxGkjIVCCUdx9alUF8Gm+dGLKbkkkidWIHFDZHDMpfITt4+w==}
     dev: false
 
-  /zod/3.20.3:
+  /zod@3.20.3:
     resolution: {integrity: sha512-+MLeeUcLTlnzVo5xDn9+LVN9oX4esvgZ7qfZczBN+YVUvZBafIrPPVyG2WdjMWU2Qkb2ZAh2M8lpqf1wIoGqJQ==}
     dev: false
 

From 2eaece9778bdb7ce72791021a15fd9e3a2576c9c Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 26 Mar 2023 19:22:56 +0900
Subject: [PATCH 284/582] Try to fix calckey/calckey#9770

---
 packages/client/src/pages/admin/index.vue | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 81a27cf38..3633bef98 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, inject, nextTick, onMounted, onUnmounted, provide, watch } from 'vue';
+import { defineAsyncComponent, inject, nextTick, onMounted, onUnmounted, onActivated, provide, watch, ref } from 'vue';
 import { i18n } from '@/i18n';
 import MkSuperMenu from '@/components/MkSuperMenu.vue';
 import MkInfo from '@/components/MkInfo.vue';
@@ -39,7 +39,7 @@ import { useRouter } from '@/router';
 import { definePageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
 
 const isEmpty = (x: string | null) => x == null || x === '';
-
+const el = ref<HTMLElement | null>(null);
 const router = useRouter();
 
 const indexInfo = {
@@ -54,7 +54,6 @@ let INFO = $ref(indexInfo);
 let childInfo = $ref(null);
 let narrow = $ref(false);
 let view = $ref(null);
-let el = $ref(null);
 let pageProps = $ref({});
 let noMaintainerInformation = isEmpty(instance.maintainerName) || isEmpty(instance.maintainerEmail);
 let noBotProtection = !instance.disableRegistration && !instance.enableHcaptcha && !instance.enableRecaptcha;
@@ -207,14 +206,22 @@ watch(narrow, () => {
 });
 
 onMounted(() => {
-	ro.observe(el);
+	ro.observe(el.value);
 
-	narrow = el.offsetWidth < NARROW_THRESHOLD;
+	narrow = el.value.offsetWidth < NARROW_THRESHOLD;
 	if (currentPage?.route.name == null && !narrow) {
 		router.push('/admin/overview');
 	}
 });
 
+onActivated(() => {
+	narrow = el.value.offsetWidth < NARROW_THRESHOLD;
+
+	if (!narrow && currentPage?.route.name == null) {
+		router.replace('/admin/overview');
+	}
+});
+
 onUnmounted(() => {
 	ro.disconnect();
 });

From 4e78a4e0b00e208b59420e82596686b4989c2ec3 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Sun, 12 Mar 2023 04:11:37 +0100
Subject: [PATCH 285/582] fix: allow announces with followers visibility

---
 packages/backend/src/remote/activitypub/renderer/announce.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/backend/src/remote/activitypub/renderer/announce.ts b/packages/backend/src/remote/activitypub/renderer/announce.ts
index cff79a3f7..bb04a7f3d 100644
--- a/packages/backend/src/remote/activitypub/renderer/announce.ts
+++ b/packages/backend/src/remote/activitypub/renderer/announce.ts
@@ -13,6 +13,9 @@ export default (object: any, note: Note) => {
 	} else if (note.visibility === "home") {
 		to = [`${attributedTo}/followers`];
 		cc = ["https://www.w3.org/ns/activitystreams#Public"];
+	} else if (note.visibility === 'followers') {
+		to = [`${attributedTo}/followers`];
+		cc = [];
 	} else {
 		return null;
 	}

From 624f305d9c293d46553c75c5eb1d39e03f520233 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Tue, 28 Mar 2023 23:29:47 +0200
Subject: [PATCH 286/582] feat: experimental post import

---
 packages/backend/src/misc/post.ts             | 14 ++++++
 packages/backend/src/queue/index.ts           | 17 ++++++++
 .../backend/src/queue/processors/db/index.ts  |  2 +
 packages/backend/src/server/api/endpoints.ts  |  2 +
 .../server/api/endpoints/i/import-posts.ts    | 43 +++++++++++++++++++
 .../src/pages/settings/import-export.vue      | 10 +++++
 6 files changed, 88 insertions(+)
 create mode 100644 packages/backend/src/misc/post.ts
 create mode 100644 packages/backend/src/server/api/endpoints/i/import-posts.ts

diff --git a/packages/backend/src/misc/post.ts b/packages/backend/src/misc/post.ts
new file mode 100644
index 000000000..e14aa3444
--- /dev/null
+++ b/packages/backend/src/misc/post.ts
@@ -0,0 +1,14 @@
+export type Post = {
+	text: string | null;
+	cw: string | null;
+	localOnly: boolean;
+	createdAt: Date;
+};
+
+export function parse(acct: any): Post {
+	return { text: acct.text, cw: acct.cw, localOnly: acct.localOnly, createdAt: new Date(acct.createdAt) };
+}
+
+export function toJson(acct: Post): string {
+	return { text: acct.text, cw: acct.cw, localOnly: acct.localOnly }.toString();
+}
diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts
index c387efe92..d5b42d637 100644
--- a/packages/backend/src/queue/index.ts
+++ b/packages/backend/src/queue/index.ts
@@ -314,6 +314,23 @@ export function createImportFollowingJob(
 	);
 }
 
+export function createImportPostsJob(
+	user: ThinUser,
+	fileId: DriveFile["id"],
+) {
+	return dbQueue.add(
+		"importPosts",
+		{
+			user: user,
+			fileId: fileId,
+		},
+		{
+			removeOnComplete: true,
+			removeOnFail: true,
+		},
+	);
+}
+
 export function createImportMutingJob(user: ThinUser, fileId: DriveFile["id"]) {
 	return dbQueue.add(
 		"importMuting",
diff --git a/packages/backend/src/queue/processors/db/index.ts b/packages/backend/src/queue/processors/db/index.ts
index 90173053f..22b55a368 100644
--- a/packages/backend/src/queue/processors/db/index.ts
+++ b/packages/backend/src/queue/processors/db/index.ts
@@ -11,6 +11,7 @@ import { importFollowing } from "./import-following.js";
 import { importUserLists } from "./import-user-lists.js";
 import { deleteAccount } from "./delete-account.js";
 import { importMuting } from "./import-muting.js";
+import { importPosts } from "./import-posts.js";
 import { importBlocking } from "./import-blocking.js";
 import { importCustomEmojis } from "./import-custom-emojis.js";
 
@@ -26,6 +27,7 @@ const jobs = {
 	importMuting,
 	importBlocking,
 	importUserLists,
+	importPosts,
 	importCustomEmojis,
 	deleteAccount,
 } as Record<
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index ba0e721b9..920f87199 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -182,6 +182,7 @@ import * as ep___i_exportBlocking from "./endpoints/i/export-blocking.js";
 import * as ep___i_exportFollowing from "./endpoints/i/export-following.js";
 import * as ep___i_exportMute from "./endpoints/i/export-mute.js";
 import * as ep___i_exportNotes from "./endpoints/i/export-notes.js";
+import * as ep___i_importPosts from "./endpoints/i/import-posts.js";
 import * as ep___i_exportUserLists from "./endpoints/i/export-user-lists.js";
 import * as ep___i_favorites from "./endpoints/i/favorites.js";
 import * as ep___i_gallery_likes from "./endpoints/i/gallery/likes.js";
@@ -527,6 +528,7 @@ const eps = [
 	["i/export-following", ep___i_exportFollowing],
 	["i/export-mute", ep___i_exportMute],
 	["i/export-notes", ep___i_exportNotes],
+	["i/import-posts", ep___i_importPosts],
 	["i/export-user-lists", ep___i_exportUserLists],
 	["i/favorites", ep___i_favorites],
 	["i/gallery/likes", ep___i_gallery_likes],
diff --git a/packages/backend/src/server/api/endpoints/i/import-posts.ts b/packages/backend/src/server/api/endpoints/i/import-posts.ts
new file mode 100644
index 000000000..254e37d8a
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/i/import-posts.ts
@@ -0,0 +1,43 @@
+import define from "../../define.js";
+import { createImportPostsJob } from "@/queue/index.js";
+import { ApiError } from "../../error.js";
+import { DriveFiles } from "@/models/index.js";
+import { DAY } from "@/const.js";
+
+export const meta = {
+	secure: true,
+	requireCredential: true,
+	limit: {
+		duration: DAY,
+		max: 1,
+	},
+	errors: {
+		noSuchFile: {
+			message: "No such file.",
+			code: "NO_SUCH_FILE",
+			id: "e674141e-bd2a-ba85-e616-aefb187c9c2a",
+		},
+
+		emptyFile: {
+			message: "That file is empty.",
+			code: "EMPTY_FILE",
+			id: "d2f12af1-e7b4-feac-86a3-519548f2728e",
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: "object",
+	properties: {
+		fileId: { type: "string", format: "misskey:id" },
+	},
+	required: ["fileId"],
+} as const;
+
+export default define(meta, paramDef, async (ps, user) => {
+	const file = await DriveFiles.findOneBy({ id: ps.fileId });
+
+	if (file == null) throw new ApiError(meta.errors.noSuchFile);
+	if (file.size === 0) throw new ApiError(meta.errors.emptyFile);
+	createImportPostsJob(user, file.id);
+});
diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index 64c3cb4f9..4822ccff0 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -7,6 +7,11 @@
 			<template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>
 			<MkButton primary :class="$style.button" inline @click="exportNotes()"><i class="ph-download-simple ph-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
 		</FormFolder>
+		<FormFolder class="_formBlock">
+			<template #label>{{ i18n.ts.import }}</template>
+			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
+			<MkButton primary :class="$style.button" inline @click="importPosts($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
+		</FormFolder>
 	</FormSection>
 	<FormSection>
 		<template #label>{{ i18n.ts._exportOrImport.followingList }}</template>
@@ -108,6 +113,11 @@ const exportNotes = () => {
 	os.api('i/export-notes', {}).then(onExportSuccess).catch(onError);
 };
 
+const importPosts = async (ev) => {
+	const file = await selectFile(ev.currentTarget ?? ev.target);
+	os.api('i/import-posts', { fileId: file.id }).then(onImportSuccess).catch(onError);
+};
+
 const exportFollowing = () => {
 	os.api('i/export-following', {
 		excludeMuting: excludeMutingUsers.value,

From c05703001c9bc9808bbc7994ffb97e77a4b389c3 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Tue, 28 Mar 2023 23:48:27 +0200
Subject: [PATCH 287/582] why is this git ignored?

---
 .../src/queue/processors/db/import-posts.ts   | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 packages/backend/src/queue/processors/db/import-posts.ts

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
new file mode 100644
index 000000000..a5c5c3692
--- /dev/null
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -0,0 +1,76 @@
+import { IsNull } from "typeorm";
+import follow from "@/services/following/create.js";
+
+import * as Post from "@/misc/posts.js";
+import create from "@/services/note/create.js";
+import { downloadTextFile } from "@/misc/download-text-file.js";
+import { Users, DriveFiles } from "@/models/index.js";
+import type { DbUserImportJobData } from "@/queue/types.js";
+import { queueLogger } from "../../logger.js";
+import type Bull from "bull";
+
+const logger = queueLogger.createSubLogger("import-posts");
+
+export async function importPosts(
+	job: Bull.Job<DbUserImportJobData>,
+	done: any,
+): Promise<void> {
+	logger.info(`Importing following of ${job.data.user.id} ...`);
+
+	const user = await Users.findOneBy({ id: job.data.user.id });
+	if (user == null) {
+		done();
+		return;
+	}
+
+	const file = await DriveFiles.findOneBy({
+		id: job.data.fileId,
+	});
+	if (file == null) {
+		done();
+		return;
+	}
+
+	const csv = await downloadTextFile(file.url);
+
+	let linenum = 0;
+
+	if (file.type.endsWith("json")) {
+		for (const post of JSON.parse(csv)) {
+			try {
+				if (post.replyId != null) {
+					continue;
+				}
+				if (post.renoteId != null) {
+					continue;
+				}
+				if (post.visibility !== "public") continue;
+				const { text, cw, localOnly, createdAt } = Post.parse(post);
+
+				logger.info(`Posting[${linenum}] ...`);
+
+				const note = await create(user, {
+					createdAt: createdAt,
+					files: undefined,
+					poll: undefined,
+					text: text || undefined,
+					reply: null,
+					renote: null,
+					cw: cw,
+					localOnly,
+					visibility: "public",
+					visibleUsers: [],
+					channel: null,
+					apMentions: undefined,
+					apHashtags: undefined,
+					apEmojis: undefined,
+				});
+			} catch (e) {
+				logger.warn(`Error in line:${linenum} ${e}`);
+			}
+		}
+	}
+
+	logger.succ("Imported");
+	done();
+}

From 86e02468ce888ee34e6ebea94376a326f5c3b3a9 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Tue, 28 Mar 2023 23:48:27 +0200
Subject: [PATCH 288/582] why is this git ignored?

---
 packages/backend/src/queue/processors/db/import-posts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index a5c5c3692..a28350c75 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -1,7 +1,7 @@
 import { IsNull } from "typeorm";
 import follow from "@/services/following/create.js";
 
-import * as Post from "@/misc/posts.js";
+import * as Post from "@/misc/post.js";
 import create from "@/services/note/create.js";
 import { downloadTextFile } from "@/misc/download-text-file.js";
 import { Users, DriveFiles } from "@/models/index.js";

From b9b693c233e753091bfc77615627172025ab5495 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 29 Mar 2023 19:16:25 +0200
Subject: [PATCH 289/582] temporary set import limit to infinity for debug

---
 packages/backend/src/server/api/endpoints/i/import-posts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/i/import-posts.ts b/packages/backend/src/server/api/endpoints/i/import-posts.ts
index 254e37d8a..16517960f 100644
--- a/packages/backend/src/server/api/endpoints/i/import-posts.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-posts.ts
@@ -9,7 +9,7 @@ export const meta = {
 	requireCredential: true,
 	limit: {
 		duration: DAY,
-		max: 1,
+		max: 9999999,
 	},
 	errors: {
 		noSuchFile: {

From d0f2cbd664d5fb9ba395186c54d8d01b55f9a166 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 29 Mar 2023 19:23:37 +0200
Subject: [PATCH 290/582] note import debug logs

---
 packages/backend/src/queue/processors/db/import-posts.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index a28350c75..48ef6371e 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -15,7 +15,7 @@ export async function importPosts(
 	job: Bull.Job<DbUserImportJobData>,
 	done: any,
 ): Promise<void> {
-	logger.info(`Importing following of ${job.data.user.id} ...`);
+	logger.info(`Importing posts of ${job.data.user.id} ...`);
 
 	const user = await Users.findOneBy({ id: job.data.user.id });
 	if (user == null) {
@@ -39,12 +39,17 @@ export async function importPosts(
 		for (const post of JSON.parse(csv)) {
 			try {
 				if (post.replyId != null) {
+					logger.info(`Is reply, skip [${linenum}] ...`);
 					continue;
 				}
 				if (post.renoteId != null) {
+					logger.info(`Is boost, skip [${linenum}] ...`);
+					continue;
+				}
+				if (post.visibility !== "public") {
+					logger.info(`Is non-public, skip [${linenum}] ...`);
 					continue;
 				}
-				if (post.visibility !== "public") continue;
 				const { text, cw, localOnly, createdAt } = Post.parse(post);
 
 				logger.info(`Posting[${linenum}] ...`);

From f43b5a25376581a839d6771bdeec01a0d9c7b1f5 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 29 Mar 2023 19:36:23 +0200
Subject: [PATCH 291/582] update post job

---
 packages/backend/src/queue/processors/db/import-posts.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index 48ef6371e..f4868ebbc 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -31,12 +31,12 @@ export async function importPosts(
 		return;
 	}
 
-	const csv = await downloadTextFile(file.url);
+	const json = await downloadTextFile(file.url);
 
 	let linenum = 0;
 
-	if (file.type.endsWith("json")) {
-		for (const post of JSON.parse(csv)) {
+	try {
+		for (const post of JSON.parse(json)) {
 			try {
 				if (post.replyId != null) {
 					logger.info(`Is reply, skip [${linenum}] ...`);
@@ -74,6 +74,9 @@ export async function importPosts(
 				logger.warn(`Error in line:${linenum} ${e}`);
 			}
 		}
+	} catch (e) {
+		// handle error
+		logger.warn(`Error reading: ${e}`);
 	}
 
 	logger.succ("Imported");

From dfb6178ddfc53041660cb155bd5fc7e561911f49 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 29 Mar 2023 19:37:31 +0200
Subject: [PATCH 292/582] actually increase line num

---
 packages/backend/src/queue/processors/db/import-posts.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index f4868ebbc..b7e6b87d3 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -70,6 +70,7 @@ export async function importPosts(
 					apHashtags: undefined,
 					apEmojis: undefined,
 				});
+				linenum++;
 			} catch (e) {
 				logger.warn(`Error in line:${linenum} ${e}`);
 			}

From 365d9bc40a13f48b62d5068aa41c8183db69dbcd Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 29 Mar 2023 20:01:56 +0200
Subject: [PATCH 293/582] dont ping users

---
 packages/backend/src/queue/processors/db/import-posts.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index b7e6b87d3..36e183c1e 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -38,6 +38,7 @@ export async function importPosts(
 	try {
 		for (const post of JSON.parse(json)) {
 			try {
+				linenum++;
 				if (post.replyId != null) {
 					logger.info(`Is reply, skip [${linenum}] ...`);
 					continue;
@@ -66,11 +67,10 @@ export async function importPosts(
 					visibility: "public",
 					visibleUsers: [],
 					channel: null,
-					apMentions: undefined,
+					apMentions: null,
 					apHashtags: undefined,
 					apEmojis: undefined,
 				});
-				linenum++;
 			} catch (e) {
 				logger.warn(`Error in line:${linenum} ${e}`);
 			}

From d640af971451c8bfb62ed5500db8d434bd2ea4d5 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 29 Mar 2023 21:10:01 +0200
Subject: [PATCH 294/582] handle mastodon style posts

---
 .../src/queue/processors/db/import-posts.ts   | 67 ++++++++++++++-----
 .../src/remote/activitypub/models/note.ts     |  4 +-
 2 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index 36e183c1e..a1cfab735 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -8,6 +8,7 @@ import { Users, DriveFiles } from "@/models/index.js";
 import type { DbUserImportJobData } from "@/queue/types.js";
 import { queueLogger } from "../../logger.js";
 import type Bull from "bull";
+import { htmlToMfm } from "@/remote/activitypub/misc/html-to-mfm.js";
 
 const logger = queueLogger.createSubLogger("import-posts");
 
@@ -36,34 +37,70 @@ export async function importPosts(
 	let linenum = 0;
 
 	try {
-		for (const post of JSON.parse(json)) {
-			try {
+		const parsed = JSON.parse(json);
+		if (parsed instanceof Array) {
+			for (const post of JSON.parse(json)) {
+				try {
+					linenum++;
+					if (post.replyId != null) {
+						logger.info(`Is reply, skip [${linenum}] ...`);
+						continue;
+					}
+					if (post.renoteId != null) {
+						logger.info(`Is boost, skip [${linenum}] ...`);
+						continue;
+					}
+					if (post.visibility !== "public") {
+						logger.info(`Is non-public, skip [${linenum}] ...`);
+						continue;
+					}
+					const { text, cw, localOnly, createdAt } = Post.parse(post);
+
+					logger.info(`Posting[${linenum}] ...`);
+
+					const note = await create(user, {
+						createdAt: createdAt,
+						files: undefined,
+						poll: undefined,
+						text: text || undefined,
+						reply: null,
+						renote: null,
+						cw: cw,
+						localOnly,
+						visibility: "public",
+						visibleUsers: [],
+						channel: null,
+						apMentions: null,
+						apHashtags: undefined,
+						apEmojis: undefined,
+					});
+				} catch (e) {
+					logger.warn(`Error in line:${linenum} ${e}`);
+				}
+			}
+		} else {
+			for (const post of parsed.orderedItems) {
 				linenum++;
-				if (post.replyId != null) {
+				if (post.inReplyTo != null) {
 					logger.info(`Is reply, skip [${linenum}] ...`);
 					continue;
 				}
-				if (post.renoteId != null) {
-					logger.info(`Is boost, skip [${linenum}] ...`);
+				if (post.directMessage) {
+					logger.info(`Is dm, skip [${linenum}] ...`);
 					continue;
 				}
-				if (post.visibility !== "public") {
-					logger.info(`Is non-public, skip [${linenum}] ...`);
-					continue;
-				}
-				const { text, cw, localOnly, createdAt } = Post.parse(post);
-
+				const text = htmlToMfm(post.content, post.tag);
 				logger.info(`Posting[${linenum}] ...`);
 
 				const note = await create(user, {
-					createdAt: createdAt,
+					createdAt: new Date(post.published),
 					files: undefined,
 					poll: undefined,
 					text: text || undefined,
 					reply: null,
 					renote: null,
-					cw: cw,
-					localOnly,
+					cw: post.sensitive,
+					localOnly: false,
 					visibility: "public",
 					visibleUsers: [],
 					channel: null,
@@ -71,8 +108,6 @@ export async function importPosts(
 					apHashtags: undefined,
 					apEmojis: undefined,
 				});
-			} catch (e) {
-				logger.warn(`Error in line:${linenum} ${e}`);
 			}
 		}
 	} catch (e) {
diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index a0945ae7b..033157b08 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -112,13 +112,13 @@ export async function createNote(
 	const note: IPost = object;
 
 	if (note.id && !note.id.startsWith("https://")) {
-		throw new Error(`unexpected shcema of note.id: ${note.id}`);
+		throw new Error(`unexpected schema of note.id: ${note.id}`);
 	}
 
 	const url = getOneApHrefNullable(note.url);
 
 	if (url && !url.startsWith("https://")) {
-		throw new Error(`unexpected shcema of note url: ${url}`);
+		throw new Error(`unexpected schema of note url: ${url}`);
 	}
 
 	logger.debug(`Note fetched: ${JSON.stringify(note, null, 2)}`);

From da322a086b099b4c7c39d98b5958e5575c85774b Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 29 Mar 2023 21:15:06 +0200
Subject: [PATCH 295/582] catch errors

---
 .../src/queue/processors/db/import-posts.ts   | 59 ++++++++++---------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index a1cfab735..19576a97f 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -80,34 +80,39 @@ export async function importPosts(
 			}
 		} else {
 			for (const post of parsed.orderedItems) {
-				linenum++;
-				if (post.inReplyTo != null) {
-					logger.info(`Is reply, skip [${linenum}] ...`);
-					continue;
+				try {
+					linenum++;
+					if (post.inReplyTo != null) {
+						logger.info(`Is reply, skip [${linenum}] ...`);
+						continue;
+					}
+					if (post.directMessage) {
+						logger.info(`Is dm, skip [${linenum}] ...`);
+						continue;
+					}
+					const text = htmlToMfm(post.content, post.tag);
+					logger.info(`Posting[${linenum}] ...`);
+	
+					const note = await create(user, {
+						createdAt: new Date(post.published),
+						files: undefined,
+						poll: undefined,
+						text: text || undefined,
+						reply: null,
+						renote: null,
+						cw: post.sensitive,
+						localOnly: false,
+						visibility: "public",
+						visibleUsers: [],
+						channel: null,
+						apMentions: null,
+						apHashtags: undefined,
+						apEmojis: undefined,
+					});
+				} catch (e) {
+					logger.warn(`Error in line:${linenum} ${e}`);
 				}
-				if (post.directMessage) {
-					logger.info(`Is dm, skip [${linenum}] ...`);
-					continue;
-				}
-				const text = htmlToMfm(post.content, post.tag);
-				logger.info(`Posting[${linenum}] ...`);
-
-				const note = await create(user, {
-					createdAt: new Date(post.published),
-					files: undefined,
-					poll: undefined,
-					text: text || undefined,
-					reply: null,
-					renote: null,
-					cw: post.sensitive,
-					localOnly: false,
-					visibility: "public",
-					visibleUsers: [],
-					channel: null,
-					apMentions: null,
-					apHashtags: undefined,
-					apEmojis: undefined,
-				});
+				
 			}
 		}
 	} catch (e) {

From 41c7dfe208b4635daef113e2e7e2ffff146f223b Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 29 Mar 2023 21:16:45 +0200
Subject: [PATCH 296/582] add info

---
 packages/backend/src/queue/processors/db/import-posts.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index 19576a97f..f1e1a232f 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -39,6 +39,7 @@ export async function importPosts(
 	try {
 		const parsed = JSON.parse(json);
 		if (parsed instanceof Array) {
+			logger.info("Parsing key style posts");
 			for (const post of JSON.parse(json)) {
 				try {
 					linenum++;
@@ -78,7 +79,8 @@ export async function importPosts(
 					logger.warn(`Error in line:${linenum} ${e}`);
 				}
 			}
-		} else {
+		} else if (parsed instanceof Object) {
+			logger.info("Parsing animal style posts");
 			for (const post of parsed.orderedItems) {
 				try {
 					linenum++;
@@ -112,7 +114,6 @@ export async function importPosts(
 				} catch (e) {
 					logger.warn(`Error in line:${linenum} ${e}`);
 				}
-				
 			}
 		}
 	} catch (e) {

From db392efae8316c8e7cafc8a86e5b272fb0d0fa0a Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 29 Mar 2023 21:25:28 +0200
Subject: [PATCH 297/582] catch text parsing error

---
 packages/backend/src/queue/processors/db/import-posts.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index f1e1a232f..f4948269c 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -92,7 +92,13 @@ export async function importPosts(
 						logger.info(`Is dm, skip [${linenum}] ...`);
 						continue;
 					}
-					const text = htmlToMfm(post.content, post.tag);
+					let text;
+					try {
+						text = htmlToMfm(post.content, post.tag);
+					} catch (e) {
+						logger.warn(`Error while parsing text in line ${linenum}: ${e}`);
+						continue;
+					}
 					logger.info(`Posting[${linenum}] ...`);
 	
 					const note = await create(user, {

From 5317c9aca8add5e809817a941d33438c3e17cbdd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 29 Mar 2023 12:38:38 -0700
Subject: [PATCH 298/582] header icon for queue page

---
 locales/en-US.yml                         | 2 +-
 packages/client/src/pages/admin/queue.vue | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index ee0025cb9..5bc3e01e8 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -323,7 +323,7 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Pages"
-integration: "Integration"
+integration: "Integrations"
 connectService: "Connect"
 disconnectService: "Disconnect"
 enableLocalTimeline: "Enable local timeline"
diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue
index 30fe3fb16..121b1f739 100644
--- a/packages/client/src/pages/admin/queue.vue
+++ b/packages/client/src/pages/admin/queue.vue
@@ -43,9 +43,11 @@ const headerActions = $computed(() => [{
 const headerTabs = $computed(() => [{
 	key: 'deliver',
 	title: 'Deliver',
+	icon: 'ph-arrow-square-down ph-bold ph-lg',
 }, {
 	key: 'inbox',
 	title: 'Inbox',
+	icon: 'ph-arrow-square-up ph-bold ph-lg',
 }]);
 
 definePageMetadata({

From 4df655126d83546c79441441a4065673ffd10bfd Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Wed, 29 Mar 2023 21:38:52 +0200
Subject: [PATCH 299/582] get post details from object

---
 packages/backend/src/queue/processors/db/import-posts.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index f4948269c..6215af707 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -84,7 +84,7 @@ export async function importPosts(
 			for (const post of parsed.orderedItems) {
 				try {
 					linenum++;
-					if (post.inReplyTo != null) {
+					if (post.object.inReplyTo != null) {
 						logger.info(`Is reply, skip [${linenum}] ...`);
 						continue;
 					}
@@ -94,7 +94,7 @@ export async function importPosts(
 					}
 					let text;
 					try {
-						text = htmlToMfm(post.content, post.tag);
+						text = htmlToMfm(post.object.content, post.object.tag);
 					} catch (e) {
 						logger.warn(`Error while parsing text in line ${linenum}: ${e}`);
 						continue;
@@ -102,7 +102,7 @@ export async function importPosts(
 					logger.info(`Posting[${linenum}] ...`);
 	
 					const note = await create(user, {
-						createdAt: new Date(post.published),
+						createdAt: new Date(post.object.published),
 						files: undefined,
 						poll: undefined,
 						text: text || undefined,

From e4602d1e209bbf4f93067b118ec7e9fe182a8135 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 29 Mar 2023 12:39:48 -0700
Subject: [PATCH 300/582] dev16

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

diff --git a/package.json b/package.json
index b110cfd68..4d8706d52 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev15",
+	"version": "13.2.0-dev16",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 34157eba5ddc7189d78b10e2af951aa2af1bfc63 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 29 Mar 2023 12:40:50 -0700
Subject: [PATCH 301/582] pnpm 8

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

diff --git a/package.json b/package.json
index 4d8706d52..27ee14962 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@8.0.0-rc.1",
+	"packageManager": "pnpm@8.0.0",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",

From e80578e911160f4d73508902b2ae8aa21fb2cffd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 29 Mar 2023 12:47:25 -0700
Subject: [PATCH 302/582] better icons

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

diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue
index 121b1f739..4eaabeeea 100644
--- a/packages/client/src/pages/admin/queue.vue
+++ b/packages/client/src/pages/admin/queue.vue
@@ -43,11 +43,11 @@ const headerActions = $computed(() => [{
 const headerTabs = $computed(() => [{
 	key: 'deliver',
 	title: 'Deliver',
-	icon: 'ph-arrow-square-down ph-bold ph-lg',
+	icon: 'ph-upload ph-bold ph-lg',
 }, {
 	key: 'inbox',
 	title: 'Inbox',
-	icon: 'ph-arrow-square-up ph-bold ph-lg',
+	icon: 'ph-download ph-bold ph-lg',
 }]);
 
 definePageMetadata({

From 806f2bb8cfda0948c12586fd19eed40bd6d4db1c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 29 Mar 2023 12:53:07 -0700
Subject: [PATCH 303/582] fix: :bug: formlink -> button

fixes notifications and drive in settings
---
 package.json                                         | 2 +-
 packages/client/src/pages/settings/drive.vue         | 5 +++--
 packages/client/src/pages/settings/notifications.vue | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 27ee14962..79ac4993e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev16",
+	"version": "13.2.0-dev17",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/settings/drive.vue b/packages/client/src/pages/settings/drive.vue
index cff31e45a..a0c944dcc 100644
--- a/packages/client/src/pages/settings/drive.vue
+++ b/packages/client/src/pages/settings/drive.vue
@@ -23,11 +23,11 @@
 	</FormSection>
 
 	<FormSection>
-		<FormLink @click="chooseUploadFolder()">
+		<FormButton @click="chooseUploadFolder()">
 			{{ i18n.ts.uploadFolder }}
 			<template #suffix>{{ uploadFolder ? uploadFolder.name : '-' }}</template>
 			<template #suffixIcon><i class="ph-folder-notch-open ph-bold ph-lg"></i></template>
-		</FormLink>
+		</FormButton>
 		<FormSwitch v-model="keepOriginalUploading" class="_formBlock">
 			<template #label>{{ i18n.ts.keepOriginalUploading }}</template>
 			<template #caption>{{ i18n.ts.keepOriginalUploadingDescription }}</template>
@@ -47,6 +47,7 @@
 import { computed, ref } from 'vue';
 import tinycolor from 'tinycolor2';
 import FormLink from '@/components/form/link.vue';
+import FormButton from '@/components/MkButton.vue';
 import FormSwitch from '@/components/form/switch.vue';
 import FormSection from '@/components/form/section.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
diff --git a/packages/client/src/pages/settings/notifications.vue b/packages/client/src/pages/settings/notifications.vue
index 324d93ab9..b0bf970bc 100644
--- a/packages/client/src/pages/settings/notifications.vue
+++ b/packages/client/src/pages/settings/notifications.vue
@@ -1,10 +1,10 @@
 <template>
 <div class="_formRoot">
-	<FormLink class="_formBlock" @click="configure"><template #icon><i class="ph-gear-six ph-bold ph-lg"></i></template>{{ i18n.ts.notificationSetting }}</FormLink>
+	<FormButton class="_formBlock" @click="configure"><template #icon><i class="ph-gear-six ph-bold ph-lg"></i></template>{{ i18n.ts.notificationSetting }}</FormButton>
 	<FormSection>
-		<FormLink class="_formBlock" @click="readAllNotifications">{{ i18n.ts.markAsReadAllNotifications }}</FormLink>
-		<FormLink class="_formBlock" @click="readAllUnreadNotes">{{ i18n.ts.markAsReadAllUnreadNotes }}</FormLink>
-		<FormLink class="_formBlock" @click="readAllMessagingMessages">{{ i18n.ts.markAsReadAllTalkMessages }}</FormLink>
+		<ForFormButtonmLink class="_formBlock" @click="readAllNotifications">{{ i18n.ts.markAsReadAllNotifications }}</ForFormButtonmLink>
+		<FormButton class="_formBlock" @click="readAllUnreadNotes">{{ i18n.ts.markAsReadAllUnreadNotes }}</FormButton>
+		<FormButton class="_formBlock" @click="readAllMessagingMessages">{{ i18n.ts.markAsReadAllTalkMessages }}</FormButton>
 	</FormSection>
 </div>
 </template>

From 203eccaa876c27fa36b9a3cb15a67f49cb762422 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 29 Mar 2023 13:30:02 -0700
Subject: [PATCH 304/582] feat: :sparkles: button in admin dash to index posts

---
 locales/en-US.yml                            |  3 +++
 packages/client/src/pages/admin/database.vue | 26 ++++++++++++++++++++
 packages/client/src/pages/admin/index.vue    |  8 +++---
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 5bc3e01e8..e6650da39 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -939,6 +939,9 @@ moveFromDescription: "This will set an alias of your old account so that you can
 migrationConfirm: "Are you absolutely sure you want to migrate your acccount to {account}? Once you do this, you won't be able to reverse it, and you won't be able to use your account normally again.\nAlso, please ensure that you've set this current account as the account you're moving from."
 defaultReaction: "Default emoji reaction for outgoing and incoming posts"
 license: "License"
+indexPost: "Index posts"
+indexFrom: "Index from Post ID onwards (leave blank to index every post)"
+indexNotice: "Now indexing. This will probably take a while, please don't restart your server for at least an hour."
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."
diff --git a/packages/client/src/pages/admin/database.vue b/packages/client/src/pages/admin/database.vue
index f0b3f5cc8..25221a0c0 100644
--- a/packages/client/src/pages/admin/database.vue
+++ b/packages/client/src/pages/admin/database.vue
@@ -1,6 +1,7 @@
 <template><MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 		<MkSpacer :content-max="800" :margin-min="16" :margin-max="32">
+	<FormButton primary @click="indexPosts">{{ i18n.ts.indexNotes }}</FormButton>
 	<FormSuspense v-slot="{ result: database }" :p="databasePromiseFactory">
 		<MkKeyValue v-for="table in database" :key="table[0]" oneline style="margin: 1em 0;">
 			<template #key>{{ table[0] }}</template>
@@ -13,6 +14,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import FormSuspense from '@/components/form/suspense.vue';
+import FormButton from '@/components/MkButton.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
 import * as os from '@/os';
 import bytes from '@/filters/bytes';
@@ -20,6 +22,30 @@ import number from '@/filters/number';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 
+async function indexPosts() {
+	const { canceled, result: index } = await os.inputText({
+		title: i18n.ts.indexFrom,
+	});
+	if (canceled) return;
+
+	if (index == null || index === "") {
+		await os.api('admin/search/index-all');
+		await os.alert({
+			type: 'info',
+			text: i18n.ts.indexNotice
+		});
+	}
+	else {
+		await os.api('admin/search/index-all', {
+			cursor: index
+		});
+		await os.alert({
+			type: 'info',
+			text: i18n.ts.indexNotice
+		});
+	}
+}
+
 const databasePromiseFactory = () => os.api('admin/get-table-stats').then(res => Object.entries(res).sort((a, b) => b[1].size - a[1].size));
 
 const headerActions = $computed(() => []);
diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 3633bef98..cbab4a640 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -188,16 +188,14 @@ const menuDef = $computed(() => [{
 		text: i18n.ts.proxyAccount,
 		to: '/admin/proxy-account',
 		active: currentPage?.route.name === 'proxy-account',
-	}],
-}] : []), {
-	title: i18n.ts.info,
-	items: [{
+	},
+	{
 		icon: 'ph-database ph-bold ph-lg',
 		text: i18n.ts.database,
 		to: '/admin/database',
 		active: currentPage?.route.name === 'database',
 	}],
-}]);
+}] : [])]);
 
 watch(narrow, () => {
 	if (currentPage?.route.name == null && !narrow) {

From ec599f2eeb94eae835847bb4039488d9c524a3d3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 29 Mar 2023 13:35:10 -0700
Subject: [PATCH 305/582] typo

---
 locales/en-US.yml                            | 2 +-
 packages/client/src/pages/admin/database.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index e6650da39..bf02155fd 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -939,7 +939,7 @@ moveFromDescription: "This will set an alias of your old account so that you can
 migrationConfirm: "Are you absolutely sure you want to migrate your acccount to {account}? Once you do this, you won't be able to reverse it, and you won't be able to use your account normally again.\nAlso, please ensure that you've set this current account as the account you're moving from."
 defaultReaction: "Default emoji reaction for outgoing and incoming posts"
 license: "License"
-indexPost: "Index posts"
+indexPosts: "Index posts"
 indexFrom: "Index from Post ID onwards (leave blank to index every post)"
 indexNotice: "Now indexing. This will probably take a while, please don't restart your server for at least an hour."
 
diff --git a/packages/client/src/pages/admin/database.vue b/packages/client/src/pages/admin/database.vue
index 25221a0c0..fc4800894 100644
--- a/packages/client/src/pages/admin/database.vue
+++ b/packages/client/src/pages/admin/database.vue
@@ -1,7 +1,7 @@
 <template><MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 		<MkSpacer :content-max="800" :margin-min="16" :margin-max="32">
-	<FormButton primary @click="indexPosts">{{ i18n.ts.indexNotes }}</FormButton>
+	<FormButton primary @click="indexPosts">{{ i18n.ts.indexPosts }}</FormButton>
 	<FormSuspense v-slot="{ result: database }" :p="databasePromiseFactory">
 		<MkKeyValue v-for="table in database" :key="table[0]" oneline style="margin: 1em 0;">
 			<template #key>{{ table[0] }}</template>

From 6aa4a43ca1ba19ed9833c85405d3e9aa82fe0b88 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 29 Mar 2023 13:38:59 -0700
Subject: [PATCH 306/582] fix sounds settings

---
 custom/assets/sounds/None.mp3                 | 3 ---
 packages/client/src/pages/settings/sounds.vue | 5 ++---
 packages/client/src/store.ts                  | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 custom/assets/sounds/None.mp3

diff --git a/custom/assets/sounds/None.mp3 b/custom/assets/sounds/None.mp3
deleted file mode 100644
index 3754e0e0a..000000000
--- a/custom/assets/sounds/None.mp3
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f54c2bc32ad7db09212b58ea11369b925ec1acf51c300ec7000156178dedd7af
-size 1551
diff --git a/packages/client/src/pages/settings/sounds.vue b/packages/client/src/pages/settings/sounds.vue
index 13ebfcee3..afacf770b 100644
--- a/packages/client/src/pages/settings/sounds.vue
+++ b/packages/client/src/pages/settings/sounds.vue
@@ -6,11 +6,11 @@
 
 	<FormSection>
 		<template #label>{{ i18n.ts.sounds }}</template>
-		<FormLink v-for="type in Object.keys(sounds)" :key="type" style="margin-bottom: 8px;" @click="edit(type)">
+		<FormButton v-for="type in Object.keys(sounds)" :key="type" style="margin-bottom: 8px;" @click="edit(type)">
 			{{ i18n.t('_sfx.' + type) }}
 			<template #suffix>{{ sounds[type].type || i18n.ts.none }}</template>
 			<template #suffixIcon><i class="ph-caret-down ph-bold ph-lg"></i></template>
-		</FormLink>
+		</FormButton>
 	</FormSection>
 
 	<FormButton danger class="_formBlock" @click="reset()"><i class="ph-arrow-clockwise ph-bold ph-lg"></i> {{ i18n.ts.default }}</FormButton>
@@ -21,7 +21,6 @@
 import { computed, ref } from 'vue';
 import FormRange from '@/components/form/range.vue';
 import FormButton from '@/components/MkButton.vue';
-import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
 import * as os from '@/os';
 import { ColdDeviceStorage } from '@/store';
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 6c0398ac4..ec171ab69 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -319,7 +319,7 @@ export class ColdDeviceStorage {
 		plugins: [] as Plugin[],
 		mediaVolume: 0.5,
 		sound_masterVolume: 0.3,
-		sound_note: { type: "None", volume: 0 },
+		sound_note: { type: "none", volume: 0 },
 		sound_noteMy: { type: "syuilo/up", volume: 1 },
 		sound_notification: { type: "syuilo/pope2", volume: 1 },
 		sound_chat: { type: "syuilo/pope1", volume: 1 },

From 2293c21d64bd247dc381d5eb8549f83fcf88d6ba Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Wed, 29 Mar 2023 21:10:00 +0000
Subject: [PATCH 307/582] Update 'docs/migrate.md'

---
 docs/migrate.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/migrate.md b/docs/migrate.md
index cdb59951f..b7cc606d0 100644
--- a/docs/migrate.md
+++ b/docs/migrate.md
@@ -24,6 +24,24 @@ NODE_ENV=production pnpm run migrate
 # build using prefered method
 ```
 
+Depending on the version you're migrating from, you may have to open Postgres with `psql -d your_database` and run the following commands:
+
+```sql
+ALTER TABLE "meta" ADD COLUMN "disableLocalTimeline" boolean DEFAULT false;
+ALTER TABLE "meta" ADD COLUMN "disableGlobalTimeline" boolean DEFAULT false;
+ALTER TABLE "meta" ADD COLUMN "localDriveCapacityMb" integer DEFAULT 512;
+ALTER TABLE "meta" ADD COLUMN "remoteDriveCapacityMb" integer DEFAULT 128;
+ALTER TABLE "user" ADD COLUMN "isSilenced" boolean DEFAULT false;
+ALTER TABLE "user" ADD COLUMN "isAdmin" boolean DEFAULT false;
+ALTER TABLE "user" ADD COLUMN "isModerator" boolean DEFAULT false;
+ALTER TABLE "user" ADD COLUMN "remoteDriveCapacityMb" integer DEFAULT 128;
+ALTER TABLE "user" ADD COLUMN "driveCapacityOverrideMb" integer DEFAULT 128;
+ALTER TABLE "instance" ADD COLUMN "caughtAt" date;
+ALTER TABLE "instance" ADD COLUMN "latestRequestSentAt" date;
+ALTER TABLE "instance" ADD COLUMN "latestStatus" character varying(512);
+ALTER TABLE "instance" ADD COLUMN "lastCommunicatedAt" date;
+```
+
 ## Misskey v12.119 and before
 
 ```sh

From 1e54d3ed2c146242b5723b1016a50eaf6d643f79 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Wed, 29 Mar 2023 21:11:01 +0000
Subject: [PATCH 308/582] Update 'docs/migrate.md'

---
 docs/migrate.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/migrate.md b/docs/migrate.md
index b7cc606d0..fa16bbe68 100644
--- a/docs/migrate.md
+++ b/docs/migrate.md
@@ -42,6 +42,8 @@ ALTER TABLE "instance" ADD COLUMN "latestStatus" character varying(512);
 ALTER TABLE "instance" ADD COLUMN "lastCommunicatedAt" date;
 ```
 
+then quit with `\q`, and restart Calckey.
+
 ## Misskey v12.119 and before
 
 ```sh

From 2f47d41b001f225ae5b7f6a6712002c1715f6022 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Thu, 30 Mar 2023 03:11:57 +0000
Subject: [PATCH 309/582] feat: custom KaTeX macro (#9779)

Closes: #9759
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9779
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 locales/en-US.yml                             |   3 +
 locales/ja-JP.yml                             |   3 +
 locales/zh-CN.yml                             |   3 +
 locales/zh-TW.yml                             |   3 +
 .../client/src/components/MkNotePreview.vue   |   3 +-
 packages/client/src/components/MkPostForm.vue |   7 +-
 .../src/pages/settings/custom-katex-macro.vue |  53 ++++
 .../client/src/pages/settings/general.vue     |   2 +
 .../pages/settings/preferences-backups.vue    |   1 +
 packages/client/src/router.ts                 |  10 +
 packages/client/src/scripts/katex-macro.ts    | 295 ++++++++++++++++++
 packages/client/src/scripts/preprocess.ts     |  23 ++
 packages/client/src/store.ts                  |   4 +
 13 files changed, 407 insertions(+), 3 deletions(-)
 create mode 100644 packages/client/src/pages/settings/custom-katex-macro.vue
 create mode 100644 packages/client/src/scripts/katex-macro.ts
 create mode 100644 packages/client/src/scripts/preprocess.ts

diff --git a/locales/en-US.yml b/locales/en-US.yml
index bf02155fd..d70ceda46 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -942,6 +942,9 @@ license: "License"
 indexPosts: "Index posts"
 indexFrom: "Index from Post ID onwards (leave blank to index every post)"
 indexNotice: "Now indexing. This will probably take a while, please don't restart your server for at least an hour."
+customKaTeXMacro: "Custom KaTeX Macro"
+customKaTeXMacroDescription: "Set up macros to write mathematical expressions easily! The notation conforms to the LaTeX command definitions and is written as \\newcommand{\\name}{content} or \\newcommand{\\name}[number of arguments]{content}. For example, \\newcommand{\\add}[2]{#1 + #2} will expand \\add{3}{foo} to 3 + foo. The curly brackets surrounding the macro name can be changed to round or square brackets. This affects the brackets used for arguments. One (and only one) macro can be defined per line, and you can't break the line in the middle of the definition. Invalid lines are simply ignored. Only simple string substitution functions are supported; advanced syntax, such as conditional branching, cannot be used here."
+enableCustomKaTeXMacro: "Enable custom KaTeX macro"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 67bf18b56..b7ead22e8 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -939,6 +939,9 @@ moveFromDescription: "別のアカウントからこのアカウントにフォ
 migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用することはできません。\nまた、引っ越し先のアカウントでエイリアスを作成したことを確認してください。"
 defaultReaction: "リモートとローカルの投稿に対するデフォルトの絵文字リアクション"
 license: "ライセンス"
+customKaTeXMacro: "カスタムKaTeXマクロ"
+customKaTeXMacroDescription: "数式入力を楽にするためのマクロを設定しましょう！記法はLaTeXにおけるコマンドの定義と同様に \\newcommand{\\name}{content} または \\newcommand{\\add}[2]{#1 + #2} のように記述します。後者の例では \\add{3}{foo} が 3 + foo に展開されます。また、マクロの名前を囲む波括弧を丸括弧 () および角括弧 [] に変更した場合、マクロの引数に使用する括弧が変更されます。マクロの定義は一行に一つのみで、途中で改行はできません。マクロの定義が無効な行は無視されます。文字列を単純に置換する機能のみに対応していて、条件分岐などの高度な構文は使用できません。"
+enableCustomKaTeXMacro: "カスタムKaTeXマクロを有効にする"
 
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 310121c5a..aa2700c57 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -892,6 +892,9 @@ navbar: "导航栏"
 shuffle: "随机"
 account: "账户"
 move: "移动"
+customKaTeXMacro: "自定义 KaTeX 宏"
+customKaTeXMacroDescription: "使用宏来轻松的输入数学表达式吧！宏的用法与 LaTeX 中的命令定义相同。你可以使用 \\newcommand{\\name}{content} 或 \\newcommand{\\name}[number of arguments]{content} 来输入数学表达式。举个例子，\\newcommand{\\add}[2]{#1 + #2} 会将 \\add{3}{foo} 展开为 3 + foo。此外，宏名称外的花括号 {} 可以被替换为圆括号 () 和方括号 []，这会影响用于参数的括号。每行只能够定义一个宏，无法在中间换行，且无效的行将被忽略。只支持简单字符串替换功能，不支持高级语法，如条件分支等。"
+enableCustomKaTeXMacro: "启用自定义 KaTeX 宏"
 _sensitiveMediaDetection:
   description: "可以使用机器学习技术自动检测敏感媒体，以便进行审核。服务器负载将略微增加。"
   sensitivity: "检测敏感度"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index e7528f9a2..46be6f8e1 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -892,6 +892,9 @@ navbar: "導覽列"
 shuffle: "隨機"
 account: "帳戶"
 move: "移動 "
+customKaTeXMacro: "自定義 KaTeX 宏"
+customKaTeXMacroDescription: "使用宏來輕鬆的輸入數學表達式吧！宏的用法與 LaTeX 中的命令定義相同。你可以使用 \\newcommand{\\name}{content} 或 \\newcommand{\\name}[number of arguments]{content} 來輸入數學表達式。舉個例子，\\newcommand{\\add}[2]{#1 + #2} 會將 \\add{3}{foo} 展開為 3 + foo。此外，宏名稱外的花括號 {} 可以被替換為圓括號 () 和方括號 []，這會影響用於參數的括號。每行只能夠定義一個宏，無法在中間換行，且無效的行將被忽略。只支持簡單字符串替換功能，不支持高級語法，如條件分支等。"
+enableCustomKaTeXMacro: "啟用自定義 KaTeX 宏"
 _sensitiveMediaDetection:
   description: "您可以使用機器學習自動檢測敏感媒體並將其用於審核。 伺服器的負荷會稍微增加。"
   sensitivity: "檢測敏感度"
diff --git a/packages/client/src/components/MkNotePreview.vue b/packages/client/src/components/MkNotePreview.vue
index a78b49965..18d21ca61 100644
--- a/packages/client/src/components/MkNotePreview.vue
+++ b/packages/client/src/components/MkNotePreview.vue
@@ -7,7 +7,7 @@
 		</div>
 		<div class="body">
 			<div class="content">
-				<Mfm :text="text.trim()" :author="$i" :i="$i"/>
+				<Mfm :text="preprocess(text).trim()" :author="$i" :i="$i"/>
 			</div>
 		</div>
 	</div>
@@ -16,6 +16,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
+import { preprocess } from '@/scripts/preprocess';
 
 const props = defineProps<{
 	text: string;
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 7ce990b21..cf22fc0a6 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -92,6 +92,7 @@ import { $i, getAccounts, openAccountMenu as openAccountMenu_ } from '@/account'
 import { uploadFile } from '@/scripts/upload';
 import { deepClone } from '@/scripts/clone';
 import XCheatSheet from '@/components/MkCheatSheetDialog.vue';
+import { preprocess } from '@/scripts/preprocess';
 
 const modal = inject('modal');
 
@@ -200,7 +201,7 @@ const submitText = $computed((): string => {
 });
 
 const textLength = $computed((): number => {
-	return length((text + imeText).trim());
+	return length((preprocess(text) + imeText).trim());
 });
 
 const maxTextLength = $computed((): number => {
@@ -557,8 +558,10 @@ function deleteDraft() {
 }
 
 async function post() {
+	const processedText = preprocess(text);
+
 	let postData = {
-		text: text === '' ? undefined : text,
+		text: processedText === '' ? undefined : processedText,
 		fileIds: files.length > 0 ? files.map(f => f.id) : undefined,
 		replyId: props.reply ? props.reply.id : undefined,
 		renoteId: props.renote ? props.renote.id : quoteId ? quoteId : undefined,
diff --git a/packages/client/src/pages/settings/custom-katex-macro.vue b/packages/client/src/pages/settings/custom-katex-macro.vue
new file mode 100644
index 000000000..e572ab6a7
--- /dev/null
+++ b/packages/client/src/pages/settings/custom-katex-macro.vue
@@ -0,0 +1,53 @@
+<template>
+<div class="_formRoot">
+	<FormInfo class="_formBlock">{{ i18n.ts.customKaTeXMacroDescription }}</FormInfo>
+
+	<FormTextarea v-model="localCustomKaTeXMacro" manual-save tall class="_monospace _formBlock" style="tab-size: 2;">
+		<template #label>{{ i18n.ts.customKaTeXMacro }}</template>
+	</FormTextarea>
+
+	<FormSwitch v-model="enableCustomKaTeXMacro" class="_formBlock">{{ i18n.ts.enableCustomKaTeXMacro }}</FormSwitch>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { ref, watch, computed } from 'vue';
+import FormTextarea from '@/components/form/textarea.vue';
+import FormInfo from '@/components/MkInfo.vue';
+import FormSwitch from '@/components/form/switch.vue';
+import * as os from '@/os';
+import { unisonReload } from '@/scripts/unison-reload';
+import { i18n } from '@/i18n';
+import { definePageMetadata } from '@/scripts/page-metadata';
+import { parseKaTeXMacros } from '@/scripts/katex-macro';
+import { defaultStore } from '@/store';
+
+const localCustomKaTeXMacro = ref(localStorage.getItem('customKaTeXMacro') ?? '');
+const enableCustomKaTeXMacro = computed(defaultStore.makeGetterSetter('enableCustomKaTeXMacro'));
+
+async function apply() {
+	localStorage.setItem('customKaTeXMacro', localCustomKaTeXMacro.value);
+	localStorage.setItem('customKaTeXMacroParsed', parseKaTeXMacros(localCustomKaTeXMacro.value));
+
+	const { canceled } = await os.confirm({
+		type: 'info',
+		text: i18n.ts.reloadToApplySetting,
+	});
+	if (canceled) return;
+
+	unisonReload();
+}
+
+watch(localCustomKaTeXMacro, async () => {
+	await apply();
+});
+
+const headerActions = $computed(() => []);
+
+const headerTabs = $computed(() => []);
+
+definePageMetadata({
+	title: i18n.ts.customKaTeXMacro,
+	icon: 'ph-radical ph-bold ph-lg',
+});
+</script>
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 1e18b7aa6..bef23a15e 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -98,6 +98,8 @@
 	<FormLink to="/settings/deck" class="_formBlock">{{ i18n.ts.deck }}</FormLink>
 
 	<FormLink to="/settings/custom-css" class="_formBlock"><template #icon><i class="ph-code ph-bold ph-lg"></i></template>{{ i18n.ts.customCss }}</FormLink>
+
+	<FormLink to="/settings/custom-katex-macro" class="_formBlock"><template #icon><i class="ph-radical ph-bold ph-lg"></i></template>{{ i18n.ts.customKaTeXMacro }}</FormLink>
 </div>
 </template>
 
diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index 62ad029f3..b9bc979f7 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -87,6 +87,7 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'showUpdates',
 	'swipeOnDesktop',
 	'showAdminUpdates',
+	'enableCustomKaTeXMacro',
 ];
 const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [
 	'lightTheme',
diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts
index 48aad0820..3529032b2 100644
--- a/packages/client/src/router.ts
+++ b/packages/client/src/router.ts
@@ -133,6 +133,11 @@ export const routes = [
 				name: "custom-css",
 				component: page(() => import("./pages/settings/custom-css.vue")),
 			},
+			{
+				path: "/custom-katex-macro",
+				name: "custom-katex-macro",
+				component: page(() => import("./pages/settings/custom-katex-macro.vue")),
+			},
 			{
 				path: "/account-info",
 				name: "account-info",
@@ -235,6 +240,11 @@ export const routes = [
 				name: "general",
 				component: page(() => import("./pages/settings/custom-css.vue")),
 			},
+			{
+				path: "/custom-katex-macro",
+				name: "general",
+				component: page(() => import("./pages/settings/custom-katex-macro.vue")),
+			},
 			{
 				path: "/accounts",
 				name: "profile",
diff --git a/packages/client/src/scripts/katex-macro.ts b/packages/client/src/scripts/katex-macro.ts
new file mode 100644
index 000000000..cd240fff9
--- /dev/null
+++ b/packages/client/src/scripts/katex-macro.ts
@@ -0,0 +1,295 @@
+type KaTeXMacro = {
+  args: number;
+  rule: (string | number)[];
+};
+
+function parseSingleKaTeXMacro(src: string): [string, KaTeXMacro] {
+	const invalid: [string, KaTeXMacro] = ["", { args: 0, rule: [] }];
+
+	const skipSpaces = (pos: number): number => {
+		while (src[pos] === " ")
+			++pos;
+		return pos;
+	};
+
+	if (!src.startsWith("\\newcommand") || src.slice(-1) !== "}")
+		return invalid;
+
+	// current index we are checking (= "\\newcommand".length)
+	let currentPos: number = 11;
+	currentPos = skipSpaces(currentPos);
+
+	// parse {\name}, (\name), or [\name]
+	let bracket: string;
+	if (src[currentPos] === "{")
+		bracket = "{}";
+	else if (src[currentPos] === "(")
+		bracket = "()";
+	else if (src[currentPos] === "[")
+		bracket = "[]";
+	else
+		return invalid;
+
+	++currentPos;
+	currentPos = skipSpaces(currentPos);
+
+	if (src[currentPos] !== "\\")
+		return invalid;
+
+	const closeNameBracketPos: number = src.indexOf(bracket[1], currentPos);
+	if (closeNameBracketPos === -1)
+		return invalid;
+
+	const name: string = src.slice(currentPos + 1, closeNameBracketPos).trim();
+	if (!/^[a-zA-Z]+$/.test(name))
+		return invalid;
+
+	currentPos = skipSpaces(closeNameBracketPos + 1);
+
+	let macro: KaTeXMacro = { args: 0, rule: [] };
+
+	// parse [number of arguments] (optional)
+	if (src[currentPos] === "[") {
+		const closeArgsBracketPos: number = src.indexOf("]", currentPos);
+		macro.args = Number(src.slice(currentPos + 1, closeArgsBracketPos).trim());
+		currentPos = closeArgsBracketPos + 1;
+
+		if (Number.isNaN(macro.args) || macro.args < 0)
+			return invalid;
+	} else if (src[currentPos] === "{") {
+		macro.args = 0;
+	} else {
+		return invalid;
+	}
+
+	currentPos = skipSpaces(currentPos);
+
+	// parse {rule}
+	if (src[currentPos] !== "{")
+		return invalid;
+
+	++currentPos;
+	currentPos = skipSpaces(currentPos);
+
+	while (currentPos < src.length - 1) {
+		let numbersignPos: number = -1;
+		let isEscaped: boolean = false;
+
+		for (let i = currentPos; i < src.length - 1; ++i) {
+			if (src[i] !== "\\" && src[i] !== "#") {
+				isEscaped = false;
+				continue;
+			}
+			if (src[i] === "\\") {
+				isEscaped = !isEscaped;
+				continue;
+			}
+			if (!isEscaped && src[i] === "#") {
+				numbersignPos = i;
+				break;
+			}
+		}
+		if (numbersignPos === -1) {
+			macro.rule.push(src.slice(currentPos, -1));
+			break;
+		}
+
+		const argIndexEndPos = src.slice(numbersignPos + 1).search(/[^\d]/) + numbersignPos;
+		const argIndex: number = Number(src.slice(numbersignPos + 1, argIndexEndPos + 1));
+
+		if (Number.isNaN(argIndex) || argIndex < 1 || macro.args < argIndex)
+			return invalid;
+
+		if (currentPos !== numbersignPos)
+			macro.rule.push(src.slice(currentPos, numbersignPos));
+		macro.rule.push(argIndex);
+
+		currentPos = argIndexEndPos + 1;
+	}
+
+	if (macro.args === 0)
+		return [name, macro];
+	else
+		return [name + bracket[0], macro];
+}
+
+export function parseKaTeXMacros(src: string): string {
+	let result: { [name: string]: KaTeXMacro } = {};
+
+	for (const s of src.split("\n")) {
+		const [name, macro]: [string, KaTeXMacro] = parseSingleKaTeXMacro(s.trim());
+		if (name !== "")
+			result[name] = macro;
+	}
+
+	return JSON.stringify(result);
+}
+
+// returns [expanded text, whether something is expanded, how many times we can expand more]
+// the boolean value is used for multi-pass expansions (macros can expand to other macros)
+function expandKaTeXMacroOnce(src: string, macros: { [name: string]: KaTeXMacro }, maxNumberOfExpansions: number)
+	: [string, boolean, number] {
+	const bracketKinds = 3;
+	const openBracketId: { [bracket: string]: number } = {"(": 0, "{": 1, "[": 2};
+	const closeBracketId: { [bracket: string]: number } = {")": 0, "}": 1, "]": 2};
+	const openBracketFromId = ["(", "{", "["];
+	const closeBracketFromId = [")", "}", "]"];
+
+	// mappings from open brackets to their corresponding close brackets
+	type BracketMapping = { [openBracketPos: number]: number };
+
+	const bracketMapping = ((): BracketMapping => {
+		let result: BracketMapping = {};
+		const n = src.length;
+
+		let depths = new Array<number>(bracketKinds).fill(0);  // current bracket depth for "()", "{}", and "[]"
+		let buffer = Array.from(Array<number[]>(bracketKinds), () => Array<number>(n));
+
+		let isEscaped = false;
+
+		for (let i = 0; i < n; ++i) {
+			if (!isEscaped && src[i] === "\\" && i + 1 < n && ["{", "}", "\\"].includes(src[i+1])) {
+				isEscaped = true;
+				continue;
+			}
+			if (isEscaped
+				|| (src[i] !== "\\"
+							&& !openBracketFromId.includes(src[i])
+							&& !closeBracketFromId.includes(src[i])))
+			{
+				isEscaped = false;
+				continue;
+			}
+			isEscaped = false;
+
+			if (openBracketFromId.includes(src[i])) {
+				const id: number = openBracketId[src[i]];
+				buffer[id][depths[id]] = i;
+				++depths[id];
+			} else if (closeBracketFromId.includes(src[i])) {
+				const id: number = closeBracketId[src[i]];
+				if (depths[id] > 0) {
+					--depths[id];
+					result[buffer[id][depths[id]]] = i;
+				}
+			}
+		}
+
+		return result;
+	})();
+
+	function expandSingleKaTeXMacro(expandedArgs: string[], macroName: string): string {
+		let result = "";
+		for (const block of macros[macroName].rule) {
+			if (typeof block === "string")
+				result += block;
+			else
+				result += expandedArgs[block - 1];
+		}
+		return result;
+	}
+
+	// only expand src.slice(beginPos, endPos)
+	function expandKaTeXMacroImpl(beginPos: number, endPos: number): [string, boolean] {
+		if (endPos <= beginPos)
+			return ["", false];
+
+		const raw: string = src.slice(beginPos, endPos);
+		const fallback: string = raw;  // returned for invalid inputs or too many expansions
+
+		if (maxNumberOfExpansions <= 0)
+			return [fallback, false];
+		--maxNumberOfExpansions;
+
+		// search for a custom macro
+		let checkedPos = beginPos - 1;
+		let macroName = "";
+		let macroBackslashPos = 0;
+
+		// for macros w/o args: unused
+		//            w/  args: the first open bracket ("(", "{", or "[") after cmd name
+		let macroArgBeginPos = 0;
+
+		// for macros w/o args: the end of cmd name
+		//            w/  args: the closing bracket of the last arg
+		let macroArgEndPos = 0;
+
+		while (checkedPos < endPos) {
+			checkedPos = src.indexOf("\\", checkedPos + 1);
+
+			// there is no macro to expand
+			if (checkedPos === -1)
+				return [raw, false];
+
+			// is it a custom macro?
+			let nonAlphaPos = src.slice(checkedPos + 1).search(/[^A-Za-z]/) + checkedPos + 1;
+
+			if (nonAlphaPos === checkedPos)
+				nonAlphaPos = endPos;
+
+			let macroNameCandidate = src.slice(checkedPos + 1, nonAlphaPos);
+			if (macros.hasOwnProperty(macroNameCandidate)) {
+				// this is a custom macro without args
+				macroBackslashPos = checkedPos;
+				macroArgEndPos = nonAlphaPos - 1;
+				macroName = macroNameCandidate;
+				break;
+			}
+
+			let nextOpenBracketPos = endPos;
+			for (let i = 0; i < bracketKinds; ++i) {
+				const pos = src.indexOf(openBracketFromId[i], checkedPos + 1);
+				if (pos !== -1 && pos < nextOpenBracketPos)
+					nextOpenBracketPos = pos;
+			}
+
+			if (nextOpenBracketPos === endPos)
+				return [fallback, false];  // there is no open bracket
+
+			macroNameCandidate += src[nextOpenBracketPos];
+
+			if (macros.hasOwnProperty(macroNameCandidate)) {
+				macroBackslashPos = checkedPos;
+				macroArgBeginPos = nextOpenBracketPos;
+				macroArgEndPos = nextOpenBracketPos;  // to search the first arg from here
+				macroName = macroNameCandidate;
+				break;
+			}
+		}
+
+		const numArgs: number = macros[macroName].args;
+		const openBracket: string = macroName.slice(-1);
+
+		let expandedArgs = new Array<string>(numArgs);
+
+		for (let i = 0; i < numArgs; ++i) {
+			// find the first open bracket after what we've searched
+			const nextOpenBracketPos = src.indexOf(openBracket, macroArgEndPos);
+			if (nextOpenBracketPos === -1)
+				return [fallback, false];  // not enough arguments are provided
+			if (!bracketMapping[nextOpenBracketPos])
+				return [fallback, false];  // found open bracket doesn't correspond to any close bracket
+
+			macroArgEndPos = bracketMapping[nextOpenBracketPos];
+			expandedArgs[i] = expandKaTeXMacroImpl(nextOpenBracketPos + 1, macroArgEndPos)[0];
+		}
+
+		return [src.slice(beginPos, macroBackslashPos)
+						+ expandSingleKaTeXMacro(expandedArgs, macroName)
+						+ expandKaTeXMacroImpl(macroArgEndPos + 1, endPos)[0], true];
+	}
+
+	const [expandedText, expandedFlag]: [string, boolean] = expandKaTeXMacroImpl(0, src.length);
+	return [expandedText, expandedFlag, maxNumberOfExpansions];
+}
+
+export function expandKaTeXMacro(src: string, macrosAsJSONString: string, maxNumberOfExpansions: number): string {
+	const macros = JSON.parse(macrosAsJSONString);
+
+	let expandMore = true;
+
+	while (expandMore && (0 < maxNumberOfExpansions))
+		[src, expandMore, maxNumberOfExpansions] = expandKaTeXMacroOnce(src, macros, maxNumberOfExpansions);
+
+	return src;
+}
diff --git a/packages/client/src/scripts/preprocess.ts b/packages/client/src/scripts/preprocess.ts
new file mode 100644
index 000000000..da163b261
--- /dev/null
+++ b/packages/client/src/scripts/preprocess.ts
@@ -0,0 +1,23 @@
+import * as mfm from "mfm-js";
+import { defaultStore } from "@/store";
+import { expandKaTeXMacro } from "@/scripts/katex-macro";
+
+export function preprocess(text: string): string {
+	if (defaultStore.state.enableCustomKaTeXMacro) {
+		const parsedKaTeXMacro = localStorage.getItem("customKaTeXMacroParsed") ?? "{}";
+		const maxNumberOfExpansions = 200;  // to prevent infinite expansion loops
+
+		let nodes = mfm.parse(text);
+
+		for (let node of nodes) {
+			if (node["type"] === "mathInline" || node["type"] === "mathBlock") {
+				node["props"]["formula"]
+					= expandKaTeXMacro(node["props"]["formula"], parsedKaTeXMacro, maxNumberOfExpansions);
+			}
+		}
+
+		text = mfm.toString(nodes);
+	}
+
+	return text;
+}
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index ec171ab69..b918d7ac7 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -289,6 +289,10 @@ export const defaultStore = markRaw(
 			where: "device",
 			default: false,
 		},
+		enableCustomKaTeXMacro: {
+			where: "device",
+			default: false,
+		},
 	}),
 );
 

From f3465bed94490d66fa43b32fd40b4a99698cc63d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 29 Mar 2023 20:13:31 -0700
Subject: [PATCH 310/582] chore: :globe_with_meridians: locale changes

Closes #9781 #9773
---
 locales/en-US.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index d70ceda46..9f675778a 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1379,7 +1379,7 @@ _poll:
 _visibility:
   public: "Public"
   publicDescription: "Your post will be visible for all users"
-  home: "Home"
+  home: "Unlisted"
   homeDescription: "Post to home timeline only"
   followers: "Followers"
   followersDescription: "Make visible to your followers only"
@@ -1788,9 +1788,9 @@ _deck:
   swapDown: "Swap with the below column"
   stackLeft: "Stack with the left column"
   popRight: "Pop column to the right"
-  profile: "Profile"
-  newProfile: "New profile"
-  deleteProfile: "Delete profile"
+  profile: "Workspace"
+  newProfile: "New workspace"
+  deleteProfile: "Delete workspace"
   introduction: "Create the perfect interface for you by arranging columns freely!"
   introduction2: "Click on the + on the right of the screen to add new colums whenever you want."
   widgetsIntroduction: "Please select \"Edit widgets\" in the column menu and add a widget."

From c2883ea95bc4e736a169922a36e87b0ca6f8f431 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Thu, 30 Mar 2023 03:15:06 +0000
Subject: [PATCH 311/582] fix: direct boost (#9783)

Sorry to create PR multiple times. I should have included this in #9778.

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9783
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 .../backend/src/remote/activitypub/renderer/announce.ts  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/renderer/announce.ts b/packages/backend/src/remote/activitypub/renderer/announce.ts
index bb04a7f3d..1fd1842ac 100644
--- a/packages/backend/src/remote/activitypub/renderer/announce.ts
+++ b/packages/backend/src/remote/activitypub/renderer/announce.ts
@@ -4,6 +4,10 @@ import type { Note } from "@/models/entities/note.js";
 export default (object: any, note: Note) => {
 	const attributedTo = `${config.url}/users/${note.userId}`;
 
+	const mentions = (
+		JSON.parse(note.mentionedRemoteUsers) as IMentionedRemoteUsers
+	).map((x) => x.uri);
+
 	let to: string[] = [];
 	let cc: string[] = [];
 
@@ -13,9 +17,10 @@ export default (object: any, note: Note) => {
 	} else if (note.visibility === "home") {
 		to = [`${attributedTo}/followers`];
 		cc = ["https://www.w3.org/ns/activitystreams#Public"];
-	} else if (note.visibility === 'followers') {
+	} else if (note.visibility === "followers") {
 		to = [`${attributedTo}/followers`];
-		cc = [];
+	} else if (note.visibility === "specified") {
+		to = mentions;
 	} else {
 		return null;
 	}

From fcbdde47d034466aedc0cee96ba884567d63615b Mon Sep 17 00:00:00 2001
From: Cleo <cutestnekoaqua@noreply.codeberg.org>
Date: Thu, 30 Mar 2023 08:40:20 +0000
Subject: [PATCH 312/582] Yeet mentions

---
 packages/backend/src/queue/processors/db/import-posts.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index 6215af707..e9e781c43 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -71,7 +71,7 @@ export async function importPosts(
 						visibility: "public",
 						visibleUsers: [],
 						channel: null,
-						apMentions: null,
+						apMentions: new Array(0),
 						apHashtags: undefined,
 						apEmojis: undefined,
 					});
@@ -113,7 +113,7 @@ export async function importPosts(
 						visibility: "public",
 						visibleUsers: [],
 						channel: null,
-						apMentions: null,
+						apMentions: new Array(0),
 						apHashtags: undefined,
 						apEmojis: undefined,
 					});

From 69daa494039df4ec0a3df4fb1c7f921e1a77ff6d Mon Sep 17 00:00:00 2001
From: Cleo <cutestnekoaqua@noreply.codeberg.org>
Date: Thu, 30 Mar 2023 09:12:51 +0000
Subject: [PATCH 313/582] =?UTF-8?q?=E2=80=9Epackages/backend/src/server/ap?=
 =?UTF-8?q?i/endpoints/i/import-posts.ts=E2=80=9C=20=C3=A4ndern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Cleo <cutestnekoaqua@noreply.codeberg.org>
---
 packages/backend/src/server/api/endpoints/i/import-posts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/i/import-posts.ts b/packages/backend/src/server/api/endpoints/i/import-posts.ts
index 16517960f..254e37d8a 100644
--- a/packages/backend/src/server/api/endpoints/i/import-posts.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-posts.ts
@@ -9,7 +9,7 @@ export const meta = {
 	requireCredential: true,
 	limit: {
 		duration: DAY,
-		max: 9999999,
+		max: 1,
 	},
 	errors: {
 		noSuchFile: {

From 7a31740e20d480fc095efb4ead17b23683648030 Mon Sep 17 00:00:00 2001
From: Cleo <cutestnekoaqua@noreply.codeberg.org>
Date: Thu, 30 Mar 2023 09:30:38 +0000
Subject: [PATCH 314/582] remove debug msgs

---
 packages/backend/src/queue/processors/db/import-posts.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index e9e781c43..3bfb3acca 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -44,15 +44,12 @@ export async function importPosts(
 				try {
 					linenum++;
 					if (post.replyId != null) {
-						logger.info(`Is reply, skip [${linenum}] ...`);
 						continue;
 					}
 					if (post.renoteId != null) {
-						logger.info(`Is boost, skip [${linenum}] ...`);
 						continue;
 					}
 					if (post.visibility !== "public") {
-						logger.info(`Is non-public, skip [${linenum}] ...`);
 						continue;
 					}
 					const { text, cw, localOnly, createdAt } = Post.parse(post);
@@ -85,18 +82,15 @@ export async function importPosts(
 				try {
 					linenum++;
 					if (post.object.inReplyTo != null) {
-						logger.info(`Is reply, skip [${linenum}] ...`);
 						continue;
 					}
 					if (post.directMessage) {
-						logger.info(`Is dm, skip [${linenum}] ...`);
 						continue;
 					}
 					let text;
 					try {
 						text = htmlToMfm(post.object.content, post.object.tag);
 					} catch (e) {
-						logger.warn(`Error while parsing text in line ${linenum}: ${e}`);
 						continue;
 					}
 					logger.info(`Posting[${linenum}] ...`);

From cf5671cb05d662fad7bee2d42120238d17376016 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 30 Mar 2023 17:31:29 +0200
Subject: [PATCH 315/582] nyaa

---
 packages/backend/src/queue/index.ts                        | 2 ++
 packages/backend/src/queue/processors/db/import-posts.ts   | 4 ++--
 packages/backend/src/queue/types.ts                        | 7 +++++++
 .../backend/src/server/api/endpoints/i/import-posts.ts     | 3 ++-
 packages/client/src/pages/settings/import-export.vue       | 6 +++++-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts
index d5b42d637..1327853d0 100644
--- a/packages/backend/src/queue/index.ts
+++ b/packages/backend/src/queue/index.ts
@@ -317,12 +317,14 @@ export function createImportFollowingJob(
 export function createImportPostsJob(
 	user: ThinUser,
 	fileId: DriveFile["id"],
+	signatureCheck: boolean,
 ) {
 	return dbQueue.add(
 		"importPosts",
 		{
 			user: user,
 			fileId: fileId,
+			signatureCheck: signatureCheck,
 		},
 		{
 			removeOnComplete: true,
diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index 3bfb3acca..cbeb33335 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -5,7 +5,7 @@ import * as Post from "@/misc/post.js";
 import create from "@/services/note/create.js";
 import { downloadTextFile } from "@/misc/download-text-file.js";
 import { Users, DriveFiles } from "@/models/index.js";
-import type { DbUserImportJobData } from "@/queue/types.js";
+import type { DbUserImportPostsJobData } from "@/queue/types.js";
 import { queueLogger } from "../../logger.js";
 import type Bull from "bull";
 import { htmlToMfm } from "@/remote/activitypub/misc/html-to-mfm.js";
@@ -13,7 +13,7 @@ import { htmlToMfm } from "@/remote/activitypub/misc/html-to-mfm.js";
 const logger = queueLogger.createSubLogger("import-posts");
 
 export async function importPosts(
-	job: Bull.Job<DbUserImportJobData>,
+	job: Bull.Job<DbUserImportPostsJobData>,
 	done: any,
 ): Promise<void> {
 	logger.info(`Importing posts of ${job.data.user.id} ...`);
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index 90e88f736..e31619ff2 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -21,6 +21,7 @@ export type InboxJobData = {
 
 export type DbJobData =
 	| DbUserJobData
+	| DbUserImportPostsJobData
 	| DbUserImportJobData
 	| DbUserDeleteJobData;
 
@@ -40,6 +41,12 @@ export type DbUserImportJobData = {
 	fileId: DriveFile["id"];
 };
 
+export type DbUserImportPostsJobData = {
+	user: ThinUser;
+	fileId: DriveFile["id"];
+	signatureCheck: boolean;
+};
+
 export type ObjectStorageJobData =
 	| ObjectStorageFileJobData
 	| Record<string, unknown>;
diff --git a/packages/backend/src/server/api/endpoints/i/import-posts.ts b/packages/backend/src/server/api/endpoints/i/import-posts.ts
index 254e37d8a..6fdf562fd 100644
--- a/packages/backend/src/server/api/endpoints/i/import-posts.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-posts.ts
@@ -30,6 +30,7 @@ export const paramDef = {
 	type: "object",
 	properties: {
 		fileId: { type: "string", format: "misskey:id" },
+		signatureCheck: { type: "boolean" },
 	},
 	required: ["fileId"],
 } as const;
@@ -39,5 +40,5 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	if (file == null) throw new ApiError(meta.errors.noSuchFile);
 	if (file.size === 0) throw new ApiError(meta.errors.emptyFile);
-	createImportPostsJob(user, file.id);
+	createImportPostsJob(user, file.id, ps.signatureCheck);
 });
diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index 4822ccff0..4222c6fa0 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -10,6 +10,9 @@
 		<FormFolder class="_formBlock">
 			<template #label>{{ i18n.ts.import }}</template>
 			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
+			<FormSwitch v-model="signatureCheck" class="_formBlock">
+				Mastodon import?
+			</FormSwitch>
 			<MkButton primary :class="$style.button" inline @click="importPosts($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
 		</FormFolder>
 	</FormSection>
@@ -86,6 +89,7 @@ import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 
 const excludeMutingUsers = ref(false);
+const signatureCheck = ref(false);
 const excludeInactiveUsers = ref(false);
 
 const onExportSuccess = () => {
@@ -115,7 +119,7 @@ const exportNotes = () => {
 
 const importPosts = async (ev) => {
 	const file = await selectFile(ev.currentTarget ?? ev.target);
-	os.api('i/import-posts', { fileId: file.id }).then(onImportSuccess).catch(onError);
+	os.api('i/import-posts', { fileId: file.id, signatureCheck: signatureCheck }).then(onImportSuccess).catch(onError);
 };
 
 const exportFollowing = () => {

From 1b61d1a58de838399caec102c0c9b70af9bc7de9 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 30 Mar 2023 17:52:17 +0200
Subject: [PATCH 316/582] check for signatures while post import

---
 packages/backend/src/queue/processors/db/import-posts.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index cbeb33335..561aeaa7a 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -87,6 +87,11 @@ export async function importPosts(
 					if (post.directMessage) {
 						continue;
 					}
+					if (job.data.signatureCheck) {
+						if(!post.signature) {
+							continue;
+						}
+					}
 					let text;
 					try {
 						text = htmlToMfm(post.object.content, post.object.tag);

From fd05f18c40260fc344c4aef8131a362348043f14 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 30 Mar 2023 17:52:38 +0200
Subject: [PATCH 317/582] make sure its not checked for akkoma

---
 packages/client/src/pages/settings/import-export.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index 4222c6fa0..dd4512ab7 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -11,7 +11,7 @@
 			<template #label>{{ i18n.ts.import }}</template>
 			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
 			<FormSwitch v-model="signatureCheck" class="_formBlock">
-				Mastodon import?
+				Mastodon import? (not Akkoma!)
 			</FormSwitch>
 			<MkButton primary :class="$style.button" inline @click="importPosts($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
 		</FormFolder>

From 3b7b0f333977691f3f0bebc70c9bf627bb3deb62 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 30 Mar 2023 18:05:39 +0200
Subject: [PATCH 318/582] send vlaue

---
 packages/client/src/pages/settings/import-export.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index dd4512ab7..93acb131a 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -119,7 +119,7 @@ const exportNotes = () => {
 
 const importPosts = async (ev) => {
 	const file = await selectFile(ev.currentTarget ?? ev.target);
-	os.api('i/import-posts', { fileId: file.id, signatureCheck: signatureCheck }).then(onImportSuccess).catch(onError);
+	os.api('i/import-posts', { fileId: file.id, signatureCheck: signatureCheck.value }).then(onImportSuccess).catch(onError);
 };
 
 const exportFollowing = () => {

From ecb17b9eaf32b7f1cc2afd915101aaf62c2a4cf2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 30 Mar 2023 11:29:47 -0700
Subject: [PATCH 319/582] chore: update patron list

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

diff --git a/patrons.json b/patrons.json
index d12f5af12..ea481f6fd 100644
--- a/patrons.json
+++ b/patrons.json
@@ -19,6 +19,8 @@
 		"@hanicef@stop.voring.me",
 		"@nmkj@calckey.jp",
 		"@trapezial@calckey.jp",
+		"@unattributed@calckey.social",
+		"@cody@mk.codingneko.com",
 		"Interkosmos Link"
 	]
 }

From 7c568eefffa4edb13c360b8797d0d7774817d08e Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 31 Mar 2023 06:31:18 +0900
Subject: [PATCH 320/582] Fix a bug in the macro expander

---
 packages/client/src/scripts/katex-macro.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/scripts/katex-macro.ts b/packages/client/src/scripts/katex-macro.ts
index cd240fff9..bede1c5f6 100644
--- a/packages/client/src/scripts/katex-macro.ts
+++ b/packages/client/src/scripts/katex-macro.ts
@@ -244,7 +244,7 @@ function expandKaTeXMacroOnce(src: string, macros: { [name: string]: KaTeXMacro
 			}
 
 			if (nextOpenBracketPos === endPos)
-				return [fallback, false];  // there is no open bracket
+				continue;  // there is no open bracket
 
 			macroNameCandidate += src[nextOpenBracketPos];
 

From 0f9f6ee619ba909913235c5e9f963387da504242 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 30 Mar 2023 15:09:55 -0700
Subject: [PATCH 321/582] chore: up pnpm

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

diff --git a/package.json b/package.json
index 79ac4993e..42579d772 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@8.0.0",
+	"packageManager": "pnpm@8.1.0",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",

From 981d3ee7258fe18733625a46dd79a387027b355b Mon Sep 17 00:00:00 2001
From: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
Date: Fri, 31 Mar 2023 01:58:28 +0000
Subject: [PATCH 322/582] Refactor: use rust for native mastodon id conversion
 (#9786)

This uses [napi-rs](https://napi.rs/) to allow for automatic generation of node bindings for the native code.

I also changed the `isolatedModules` TS flag to false to allow for `static enum` to be shared across modules. It doesn't seem to be necessary for the build system that CK uses.

Currently this method does not work with ID generators with longer IDs. Likely the best solution is to add another key in the database.

Some benchmarks for 1 million conversions:

```
	node, x1_000_000: 2.847s
	rust, x1_000_000: 1.265s
```

There are still optimizations that can be made, but I think this is a good starting point and a good way to bring rust into the CK stack.

Co-authored-by: s1idewhist1e <trombonedude05@gmail.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9786
Co-authored-by: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
Co-committed-by: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
---
 README.md                                     |   1 +
 package.json                                  |   1 +
 .../backend/native-utils/.cargo/config.toml   |   3 +
 packages/backend/native-utils/.gitignore      | 200 ++++++++++++++++++
 packages/backend/native-utils/.npmignore      |  13 ++
 packages/backend/native-utils/Cargo.toml      |  18 ++
 .../native-utils/__test__/index.spec.mjs      |   7 +
 packages/backend/native-utils/build.rs        |   5 +
 .../npm/android-arm-eabi/README.md            |   3 +
 .../npm/android-arm-eabi/package.json         |  18 ++
 .../native-utils/npm/android-arm64/README.md  |   3 +
 .../npm/android-arm64/package.json            |  18 ++
 .../native-utils/npm/darwin-arm64/README.md   |   3 +
 .../npm/darwin-arm64/package.json             |  18 ++
 .../npm/darwin-universal/README.md            |   3 +
 .../npm/darwin-universal/package.json         |  15 ++
 .../native-utils/npm/darwin-x64/README.md     |   3 +
 .../native-utils/npm/darwin-x64/package.json  |  18 ++
 .../native-utils/npm/freebsd-x64/README.md    |   3 +
 .../native-utils/npm/freebsd-x64/package.json |  18 ++
 .../npm/linux-arm-gnueabihf/README.md         |   3 +
 .../npm/linux-arm-gnueabihf/package.json      |  18 ++
 .../npm/linux-arm64-gnu/README.md             |   3 +
 .../npm/linux-arm64-gnu/package.json          |  21 ++
 .../npm/linux-arm64-musl/README.md            |   3 +
 .../npm/linux-arm64-musl/package.json         |  21 ++
 .../native-utils/npm/linux-x64-gnu/README.md  |   3 +
 .../npm/linux-x64-gnu/package.json            |  21 ++
 .../native-utils/npm/linux-x64-musl/README.md |   3 +
 .../npm/linux-x64-musl/package.json           |  21 ++
 .../npm/win32-arm64-msvc/README.md            |   3 +
 .../npm/win32-arm64-msvc/package.json         |  18 ++
 .../npm/win32-ia32-msvc/README.md             |   3 +
 .../npm/win32-ia32-msvc/package.json          |  18 ++
 .../native-utils/npm/win32-x64-msvc/README.md |   3 +
 .../npm/win32-x64-msvc/package.json           |  18 ++
 packages/backend/native-utils/package.json    |  44 ++++
 packages/backend/native-utils/rustfmt.toml    |   2 +
 packages/backend/native-utils/src/lib.rs      |   2 +
 .../backend/native-utils/src/mastodon_api.rs  |  70 ++++++
 packages/backend/package.json                 |  10 +-
 packages/backend/src/server/api/index.ts      |  31 +--
 .../server/api/mastodon/endpoints/account.ts  |   2 +-
 packages/backend/tsconfig.json                |   2 +-
 pnpm-lock.yaml                                |  12 ++
 45 files changed, 692 insertions(+), 34 deletions(-)
 create mode 100644 packages/backend/native-utils/.cargo/config.toml
 create mode 100644 packages/backend/native-utils/.gitignore
 create mode 100644 packages/backend/native-utils/.npmignore
 create mode 100644 packages/backend/native-utils/Cargo.toml
 create mode 100644 packages/backend/native-utils/__test__/index.spec.mjs
 create mode 100644 packages/backend/native-utils/build.rs
 create mode 100644 packages/backend/native-utils/npm/android-arm-eabi/README.md
 create mode 100644 packages/backend/native-utils/npm/android-arm-eabi/package.json
 create mode 100644 packages/backend/native-utils/npm/android-arm64/README.md
 create mode 100644 packages/backend/native-utils/npm/android-arm64/package.json
 create mode 100644 packages/backend/native-utils/npm/darwin-arm64/README.md
 create mode 100644 packages/backend/native-utils/npm/darwin-arm64/package.json
 create mode 100644 packages/backend/native-utils/npm/darwin-universal/README.md
 create mode 100644 packages/backend/native-utils/npm/darwin-universal/package.json
 create mode 100644 packages/backend/native-utils/npm/darwin-x64/README.md
 create mode 100644 packages/backend/native-utils/npm/darwin-x64/package.json
 create mode 100644 packages/backend/native-utils/npm/freebsd-x64/README.md
 create mode 100644 packages/backend/native-utils/npm/freebsd-x64/package.json
 create mode 100644 packages/backend/native-utils/npm/linux-arm-gnueabihf/README.md
 create mode 100644 packages/backend/native-utils/npm/linux-arm-gnueabihf/package.json
 create mode 100644 packages/backend/native-utils/npm/linux-arm64-gnu/README.md
 create mode 100644 packages/backend/native-utils/npm/linux-arm64-gnu/package.json
 create mode 100644 packages/backend/native-utils/npm/linux-arm64-musl/README.md
 create mode 100644 packages/backend/native-utils/npm/linux-arm64-musl/package.json
 create mode 100644 packages/backend/native-utils/npm/linux-x64-gnu/README.md
 create mode 100644 packages/backend/native-utils/npm/linux-x64-gnu/package.json
 create mode 100644 packages/backend/native-utils/npm/linux-x64-musl/README.md
 create mode 100644 packages/backend/native-utils/npm/linux-x64-musl/package.json
 create mode 100644 packages/backend/native-utils/npm/win32-arm64-msvc/README.md
 create mode 100644 packages/backend/native-utils/npm/win32-arm64-msvc/package.json
 create mode 100644 packages/backend/native-utils/npm/win32-ia32-msvc/README.md
 create mode 100644 packages/backend/native-utils/npm/win32-ia32-msvc/package.json
 create mode 100644 packages/backend/native-utils/npm/win32-x64-msvc/README.md
 create mode 100644 packages/backend/native-utils/npm/win32-x64-msvc/package.json
 create mode 100644 packages/backend/native-utils/package.json
 create mode 100644 packages/backend/native-utils/rustfmt.toml
 create mode 100644 packages/backend/native-utils/src/lib.rs
 create mode 100644 packages/backend/native-utils/src/mastodon_api.rs

diff --git a/README.md b/README.md
index 551210676..af117ac4a 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,7 @@ If you have access to a server that supports one of the sources below, I recomme
 
 ### 🏗️ Build dependencies
 
+- 🦀 [Rust toolchain](https://www.rust-lang.org/)
 - 🦬 C/C++ compiler & build tools
   - `build-essential` on Debian/Ubuntu Linux
   - `base-devel` on Arch Linux
diff --git a/package.json b/package.json
index 42579d772..1c25acdc2 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
 	"dependencies": {
 		"@bull-board/api": "^4.10.2",
 		"@bull-board/ui": "^4.10.2",
+		"@napi-rs/cli": "^2.15.0",
 		"@tensorflow/tfjs": "^3.21.0",
 		"calckey-js": "^0.0.22",
 		"js-yaml": "4.1.0",
diff --git a/packages/backend/native-utils/.cargo/config.toml b/packages/backend/native-utils/.cargo/config.toml
new file mode 100644
index 000000000..7ede30ee0
--- /dev/null
+++ b/packages/backend/native-utils/.cargo/config.toml
@@ -0,0 +1,3 @@
+[target.aarch64-unknown-linux-musl]
+linker = "aarch64-linux-musl-gcc"
+rustflags = ["-C", "target-feature=-crt-static"]
\ No newline at end of file
diff --git a/packages/backend/native-utils/.gitignore b/packages/backend/native-utils/.gitignore
new file mode 100644
index 000000000..78b75d55a
--- /dev/null
+++ b/packages/backend/native-utils/.gitignore
@@ -0,0 +1,200 @@
+# Created by https://www.toptal.com/developers/gitignore/api/node
+# Edit at https://www.toptal.com/developers/gitignore?templates=node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# Next.js build output
+.next
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# End of https://www.toptal.com/developers/gitignore/api/node
+
+# Created by https://www.toptal.com/developers/gitignore/api/macos
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two 
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+# End of https://www.toptal.com/developers/gitignore/api/macos
+
+# Created by https://www.toptal.com/developers/gitignore/api/windows
+# Edit at https://www.toptal.com/developers/gitignore?templates=windows
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.toptal.com/developers/gitignore/api/windows
+
+# napi-rs generated files
+built/
+
+#Added by cargo
+
+/target
+Cargo.lock
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+*.node
diff --git a/packages/backend/native-utils/.npmignore b/packages/backend/native-utils/.npmignore
new file mode 100644
index 000000000..ec144db2a
--- /dev/null
+++ b/packages/backend/native-utils/.npmignore
@@ -0,0 +1,13 @@
+target
+Cargo.lock
+.cargo
+.github
+npm
+.eslintrc
+.prettierignore
+rustfmt.toml
+yarn.lock
+*.node
+.yarn
+__test__
+renovate.json
diff --git a/packages/backend/native-utils/Cargo.toml b/packages/backend/native-utils/Cargo.toml
new file mode 100644
index 000000000..4f7fb4c39
--- /dev/null
+++ b/packages/backend/native-utils/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+edition = "2021"
+name = "native-utils"
+version = "0.0.0"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
+napi = { version = "2.12.0", default-features = false, features = ["napi4"] }
+napi-derive = "2.12.0"
+
+[build-dependencies]
+napi-build = "2.0.1"
+
+[profile.release]
+lto = true
diff --git a/packages/backend/native-utils/__test__/index.spec.mjs b/packages/backend/native-utils/__test__/index.spec.mjs
new file mode 100644
index 000000000..1ade4cafe
--- /dev/null
+++ b/packages/backend/native-utils/__test__/index.spec.mjs
@@ -0,0 +1,7 @@
+import test from 'ava'
+
+import { sum } from '../index.js'
+
+test('sum from native', (t) => {
+  t.is(sum(1, 2), 3)
+})
diff --git a/packages/backend/native-utils/build.rs b/packages/backend/native-utils/build.rs
new file mode 100644
index 000000000..1f866b6a3
--- /dev/null
+++ b/packages/backend/native-utils/build.rs
@@ -0,0 +1,5 @@
+extern crate napi_build;
+
+fn main() {
+  napi_build::setup();
+}
diff --git a/packages/backend/native-utils/npm/android-arm-eabi/README.md b/packages/backend/native-utils/npm/android-arm-eabi/README.md
new file mode 100644
index 000000000..10199cb8e
--- /dev/null
+++ b/packages/backend/native-utils/npm/android-arm-eabi/README.md
@@ -0,0 +1,3 @@
+# `native-utils-android-arm-eabi`
+
+This is the **armv7-linux-androideabi** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/android-arm-eabi/package.json b/packages/backend/native-utils/npm/android-arm-eabi/package.json
new file mode 100644
index 000000000..b4404c410
--- /dev/null
+++ b/packages/backend/native-utils/npm/android-arm-eabi/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "native-utils-android-arm-eabi",
+  "version": "0.0.0",
+  "os": [
+    "android"
+  ],
+  "cpu": [
+    "arm"
+  ],
+  "main": "native-utils.android-arm-eabi.node",
+  "files": [
+    "native-utils.android-arm-eabi.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/android-arm64/README.md b/packages/backend/native-utils/npm/android-arm64/README.md
new file mode 100644
index 000000000..c32c2fe71
--- /dev/null
+++ b/packages/backend/native-utils/npm/android-arm64/README.md
@@ -0,0 +1,3 @@
+# `native-utils-android-arm64`
+
+This is the **aarch64-linux-android** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/android-arm64/package.json b/packages/backend/native-utils/npm/android-arm64/package.json
new file mode 100644
index 000000000..9050ef37b
--- /dev/null
+++ b/packages/backend/native-utils/npm/android-arm64/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "native-utils-android-arm64",
+  "version": "0.0.0",
+  "os": [
+    "android"
+  ],
+  "cpu": [
+    "arm64"
+  ],
+  "main": "native-utils.android-arm64.node",
+  "files": [
+    "native-utils.android-arm64.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/darwin-arm64/README.md b/packages/backend/native-utils/npm/darwin-arm64/README.md
new file mode 100644
index 000000000..870390222
--- /dev/null
+++ b/packages/backend/native-utils/npm/darwin-arm64/README.md
@@ -0,0 +1,3 @@
+# `native-utils-darwin-arm64`
+
+This is the **aarch64-apple-darwin** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/darwin-arm64/package.json b/packages/backend/native-utils/npm/darwin-arm64/package.json
new file mode 100644
index 000000000..a7fcef289
--- /dev/null
+++ b/packages/backend/native-utils/npm/darwin-arm64/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "native-utils-darwin-arm64",
+  "version": "0.0.0",
+  "os": [
+    "darwin"
+  ],
+  "cpu": [
+    "arm64"
+  ],
+  "main": "native-utils.darwin-arm64.node",
+  "files": [
+    "native-utils.darwin-arm64.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/darwin-universal/README.md b/packages/backend/native-utils/npm/darwin-universal/README.md
new file mode 100644
index 000000000..098bb3590
--- /dev/null
+++ b/packages/backend/native-utils/npm/darwin-universal/README.md
@@ -0,0 +1,3 @@
+# `native-utils-darwin-universal`
+
+This is the **universal-apple-darwin** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/darwin-universal/package.json b/packages/backend/native-utils/npm/darwin-universal/package.json
new file mode 100644
index 000000000..a46061d42
--- /dev/null
+++ b/packages/backend/native-utils/npm/darwin-universal/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "native-utils-darwin-universal",
+  "version": "0.0.0",
+  "os": [
+    "darwin"
+  ],
+  "main": "native-utils.darwin-universal.node",
+  "files": [
+    "native-utils.darwin-universal.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/darwin-x64/README.md b/packages/backend/native-utils/npm/darwin-x64/README.md
new file mode 100644
index 000000000..0acf36335
--- /dev/null
+++ b/packages/backend/native-utils/npm/darwin-x64/README.md
@@ -0,0 +1,3 @@
+# `native-utils-darwin-x64`
+
+This is the **x86_64-apple-darwin** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/darwin-x64/package.json b/packages/backend/native-utils/npm/darwin-x64/package.json
new file mode 100644
index 000000000..6bbcf1d23
--- /dev/null
+++ b/packages/backend/native-utils/npm/darwin-x64/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "native-utils-darwin-x64",
+  "version": "0.0.0",
+  "os": [
+    "darwin"
+  ],
+  "cpu": [
+    "x64"
+  ],
+  "main": "native-utils.darwin-x64.node",
+  "files": [
+    "native-utils.darwin-x64.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/freebsd-x64/README.md b/packages/backend/native-utils/npm/freebsd-x64/README.md
new file mode 100644
index 000000000..2b74996de
--- /dev/null
+++ b/packages/backend/native-utils/npm/freebsd-x64/README.md
@@ -0,0 +1,3 @@
+# `native-utils-freebsd-x64`
+
+This is the **x86_64-unknown-freebsd** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/freebsd-x64/package.json b/packages/backend/native-utils/npm/freebsd-x64/package.json
new file mode 100644
index 000000000..654b8abf3
--- /dev/null
+++ b/packages/backend/native-utils/npm/freebsd-x64/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "native-utils-freebsd-x64",
+  "version": "0.0.0",
+  "os": [
+    "freebsd"
+  ],
+  "cpu": [
+    "x64"
+  ],
+  "main": "native-utils.freebsd-x64.node",
+  "files": [
+    "native-utils.freebsd-x64.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/linux-arm-gnueabihf/README.md b/packages/backend/native-utils/npm/linux-arm-gnueabihf/README.md
new file mode 100644
index 000000000..2203036de
--- /dev/null
+++ b/packages/backend/native-utils/npm/linux-arm-gnueabihf/README.md
@@ -0,0 +1,3 @@
+# `native-utils-linux-arm-gnueabihf`
+
+This is the **armv7-unknown-linux-gnueabihf** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/linux-arm-gnueabihf/package.json b/packages/backend/native-utils/npm/linux-arm-gnueabihf/package.json
new file mode 100644
index 000000000..1e206c078
--- /dev/null
+++ b/packages/backend/native-utils/npm/linux-arm-gnueabihf/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "native-utils-linux-arm-gnueabihf",
+  "version": "0.0.0",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "arm"
+  ],
+  "main": "native-utils.linux-arm-gnueabihf.node",
+  "files": [
+    "native-utils.linux-arm-gnueabihf.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/linux-arm64-gnu/README.md b/packages/backend/native-utils/npm/linux-arm64-gnu/README.md
new file mode 100644
index 000000000..ad3a9333f
--- /dev/null
+++ b/packages/backend/native-utils/npm/linux-arm64-gnu/README.md
@@ -0,0 +1,3 @@
+# `native-utils-linux-arm64-gnu`
+
+This is the **aarch64-unknown-linux-gnu** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/linux-arm64-gnu/package.json b/packages/backend/native-utils/npm/linux-arm64-gnu/package.json
new file mode 100644
index 000000000..aa0b2a805
--- /dev/null
+++ b/packages/backend/native-utils/npm/linux-arm64-gnu/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "native-utils-linux-arm64-gnu",
+  "version": "0.0.0",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "arm64"
+  ],
+  "main": "native-utils.linux-arm64-gnu.node",
+  "files": [
+    "native-utils.linux-arm64-gnu.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  },
+  "libc": [
+    "glibc"
+  ]
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/linux-arm64-musl/README.md b/packages/backend/native-utils/npm/linux-arm64-musl/README.md
new file mode 100644
index 000000000..df282532f
--- /dev/null
+++ b/packages/backend/native-utils/npm/linux-arm64-musl/README.md
@@ -0,0 +1,3 @@
+# `native-utils-linux-arm64-musl`
+
+This is the **aarch64-unknown-linux-musl** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/linux-arm64-musl/package.json b/packages/backend/native-utils/npm/linux-arm64-musl/package.json
new file mode 100644
index 000000000..99e9387ee
--- /dev/null
+++ b/packages/backend/native-utils/npm/linux-arm64-musl/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "native-utils-linux-arm64-musl",
+  "version": "0.0.0",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "arm64"
+  ],
+  "main": "native-utils.linux-arm64-musl.node",
+  "files": [
+    "native-utils.linux-arm64-musl.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  },
+  "libc": [
+    "musl"
+  ]
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/linux-x64-gnu/README.md b/packages/backend/native-utils/npm/linux-x64-gnu/README.md
new file mode 100644
index 000000000..52eea85aa
--- /dev/null
+++ b/packages/backend/native-utils/npm/linux-x64-gnu/README.md
@@ -0,0 +1,3 @@
+# `native-utils-linux-x64-gnu`
+
+This is the **x86_64-unknown-linux-gnu** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/linux-x64-gnu/package.json b/packages/backend/native-utils/npm/linux-x64-gnu/package.json
new file mode 100644
index 000000000..f99a5f664
--- /dev/null
+++ b/packages/backend/native-utils/npm/linux-x64-gnu/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "native-utils-linux-x64-gnu",
+  "version": "0.0.0",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "x64"
+  ],
+  "main": "native-utils.linux-x64-gnu.node",
+  "files": [
+    "native-utils.linux-x64-gnu.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  },
+  "libc": [
+    "glibc"
+  ]
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/linux-x64-musl/README.md b/packages/backend/native-utils/npm/linux-x64-musl/README.md
new file mode 100644
index 000000000..6664b2378
--- /dev/null
+++ b/packages/backend/native-utils/npm/linux-x64-musl/README.md
@@ -0,0 +1,3 @@
+# `native-utils-linux-x64-musl`
+
+This is the **x86_64-unknown-linux-musl** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/linux-x64-musl/package.json b/packages/backend/native-utils/npm/linux-x64-musl/package.json
new file mode 100644
index 000000000..56b520fff
--- /dev/null
+++ b/packages/backend/native-utils/npm/linux-x64-musl/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "native-utils-linux-x64-musl",
+  "version": "0.0.0",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "x64"
+  ],
+  "main": "native-utils.linux-x64-musl.node",
+  "files": [
+    "native-utils.linux-x64-musl.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  },
+  "libc": [
+    "musl"
+  ]
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/win32-arm64-msvc/README.md b/packages/backend/native-utils/npm/win32-arm64-msvc/README.md
new file mode 100644
index 000000000..7aec7e0a5
--- /dev/null
+++ b/packages/backend/native-utils/npm/win32-arm64-msvc/README.md
@@ -0,0 +1,3 @@
+# `native-utils-win32-arm64-msvc`
+
+This is the **aarch64-pc-windows-msvc** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/win32-arm64-msvc/package.json b/packages/backend/native-utils/npm/win32-arm64-msvc/package.json
new file mode 100644
index 000000000..865a77105
--- /dev/null
+++ b/packages/backend/native-utils/npm/win32-arm64-msvc/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "native-utils-win32-arm64-msvc",
+  "version": "0.0.0",
+  "os": [
+    "win32"
+  ],
+  "cpu": [
+    "arm64"
+  ],
+  "main": "native-utils.win32-arm64-msvc.node",
+  "files": [
+    "native-utils.win32-arm64-msvc.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/win32-ia32-msvc/README.md b/packages/backend/native-utils/npm/win32-ia32-msvc/README.md
new file mode 100644
index 000000000..690de1975
--- /dev/null
+++ b/packages/backend/native-utils/npm/win32-ia32-msvc/README.md
@@ -0,0 +1,3 @@
+# `native-utils-win32-ia32-msvc`
+
+This is the **i686-pc-windows-msvc** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/win32-ia32-msvc/package.json b/packages/backend/native-utils/npm/win32-ia32-msvc/package.json
new file mode 100644
index 000000000..994eff12f
--- /dev/null
+++ b/packages/backend/native-utils/npm/win32-ia32-msvc/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "native-utils-win32-ia32-msvc",
+  "version": "0.0.0",
+  "os": [
+    "win32"
+  ],
+  "cpu": [
+    "ia32"
+  ],
+  "main": "native-utils.win32-ia32-msvc.node",
+  "files": [
+    "native-utils.win32-ia32-msvc.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/npm/win32-x64-msvc/README.md b/packages/backend/native-utils/npm/win32-x64-msvc/README.md
new file mode 100644
index 000000000..e34a5ff17
--- /dev/null
+++ b/packages/backend/native-utils/npm/win32-x64-msvc/README.md
@@ -0,0 +1,3 @@
+# `native-utils-win32-x64-msvc`
+
+This is the **x86_64-pc-windows-msvc** binary for `native-utils`
diff --git a/packages/backend/native-utils/npm/win32-x64-msvc/package.json b/packages/backend/native-utils/npm/win32-x64-msvc/package.json
new file mode 100644
index 000000000..33b259b13
--- /dev/null
+++ b/packages/backend/native-utils/npm/win32-x64-msvc/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "native-utils-win32-x64-msvc",
+  "version": "0.0.0",
+  "os": [
+    "win32"
+  ],
+  "cpu": [
+    "x64"
+  ],
+  "main": "native-utils.win32-x64-msvc.node",
+  "files": [
+    "native-utils.win32-x64-msvc.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}
\ No newline at end of file
diff --git a/packages/backend/native-utils/package.json b/packages/backend/native-utils/package.json
new file mode 100644
index 000000000..787d1bd89
--- /dev/null
+++ b/packages/backend/native-utils/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "native-utils",
+  "version": "0.0.0",
+  "main": "built/index.js",
+  "types": "built/index.d.ts",
+  "napi": {
+    "name": "native-utils",
+    "triples": {
+      "additional": [
+        "aarch64-apple-darwin",
+        "aarch64-linux-android",
+        "aarch64-unknown-linux-gnu",
+        "aarch64-unknown-linux-musl",
+        "aarch64-pc-windows-msvc",
+        "armv7-unknown-linux-gnueabihf",
+        "x86_64-unknown-linux-musl",
+        "x86_64-unknown-freebsd",
+        "i686-pc-windows-msvc",
+        "armv7-linux-androideabi",
+        "universal-apple-darwin"
+      ]
+    }
+  },
+  "license": "MIT",
+  "devDependencies": {
+    "@napi-rs/cli": "^2.15.0",
+    "ava": "^5.1.1"
+  },
+  "ava": {
+    "timeout": "3m"
+  },
+  "engines": {
+    "node": ">= 10"
+  },
+  "scripts": {
+    "artifacts": "napi artifacts",
+    "build": "napi build --platform --release ./built/",
+    "build:debug": "napi build --platform",
+    "prepublishOnly": "napi prepublish -t npm",
+    "test": "ava",
+    "universal": "napi universal",
+    "version": "napi version"
+  }
+}
diff --git a/packages/backend/native-utils/rustfmt.toml b/packages/backend/native-utils/rustfmt.toml
new file mode 100644
index 000000000..cab5731ed
--- /dev/null
+++ b/packages/backend/native-utils/rustfmt.toml
@@ -0,0 +1,2 @@
+tab_spaces = 2
+edition = "2021"
diff --git a/packages/backend/native-utils/src/lib.rs b/packages/backend/native-utils/src/lib.rs
new file mode 100644
index 000000000..bc5b9fc7c
--- /dev/null
+++ b/packages/backend/native-utils/src/lib.rs
@@ -0,0 +1,2 @@
+
+pub mod mastodon_api;
diff --git a/packages/backend/native-utils/src/mastodon_api.rs b/packages/backend/native-utils/src/mastodon_api.rs
new file mode 100644
index 000000000..36b4eb984
--- /dev/null
+++ b/packages/backend/native-utils/src/mastodon_api.rs
@@ -0,0 +1,70 @@
+use napi::{bindgen_prelude::*, Error, Status};
+use napi_derive::napi;
+
+static CHAR_COLLECTION: &str = "0123456789abcdefghijklmnopqrstuvwxyz";
+
+// -- NAPI exports --
+
+#[napi]
+pub enum IdConvertType {
+  MastodonId,
+  CalckeyId,
+}
+
+#[napi]
+pub fn convert_id(in_id: String, id_convert_type: IdConvertType) -> napi::Result<String> {
+  use IdConvertType::*;
+  match id_convert_type {
+    MastodonId => {
+      let mut out: i64 = 0;
+      for (i, c) in in_id.to_lowercase().chars().rev().enumerate() {
+        out += num_from_char(c)? as i64 * 36_i64.pow(i as u32);
+      }
+
+      Ok(out.to_string())
+    }
+    CalckeyId => {
+      let mut input: i64 = match in_id.parse() {
+        Ok(s) => s,
+        Err(_) => {
+          return Err(Error::new(
+            Status::InvalidArg,
+            "Unable to parse ID as MasstodonId",
+          ))
+        }
+      };
+      let mut out = String::new();
+
+      while input != 0 {
+        out.insert(0, char_from_num((input % 36) as u8)?);
+        input /= 36;
+      }
+
+      Ok(out)
+    }
+  }
+}
+
+// -- end --
+
+#[inline(always)]
+fn num_from_char(character: char) -> napi::Result<u8> {
+  for (i, c) in CHAR_COLLECTION.chars().enumerate() {
+    if c == character {
+      return Ok(i as u8);
+    }
+  }
+
+  Err(Error::new(
+    Status::InvalidArg,
+    "Invalid character in parsed base36 id",
+  ))
+}
+
+#[inline(always)]
+fn char_from_num(number: u8) -> napi::Result<char> {
+  CHAR_COLLECTION
+    .chars()
+    .nth(number as usize)
+    .ok_or(Error::from_status(Status::Unknown))
+}
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 1c26d32c3..beea30a8a 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -9,7 +9,7 @@
 		"migrate": "typeorm migration:run -d ormconfig.js",
 		"revertmigration": "typeorm migration:revert -d ormconfig.js",
 		"check:connect": "node ./check_connect.js",
-		"build": "pnpm swc src -d built -D",
+		"build": "napi build --platform --release --cargo-cwd native-utils ./native-utils/built/ && pnpm swc src -d built -D",
 		"watch": "pnpm swc src -d built -D -w",
 		"lint": "pnpm rome check \"src/**/*.ts\"",
 		"mocha": "cross-env NODE_ENV=test TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" mocha",
@@ -26,6 +26,7 @@
 		"@bull-board/api": "^4.6.4",
 		"@bull-board/koa": "^4.6.4",
 		"@bull-board/ui": "^4.6.4",
+		"@calckey/megalodon": "5.1.21",
 		"@discordapp/twemoji": "14.0.2",
 		"@elastic/elasticsearch": "7.17.0",
 		"@koa/cors": "3.4.3",
@@ -38,12 +39,11 @@
 		"@tensorflow/tfjs": "^4.2.0",
 		"ajv": "8.11.2",
 		"archiver": "5.3.1",
-		"koa-body": "^6.0.1",
 		"autobind-decorator": "2.4.0",
 		"autolinker": "4.0.0",
-		"axios": "^1.3.2",
 		"autwh": "0.1.0",
 		"aws-sdk": "2.1277.0",
+		"axios": "^1.3.2",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
 		"bull": "4.10.2",
@@ -72,12 +72,13 @@
 		"jsonld": "6.0.0",
 		"jsrsasign": "10.6.1",
 		"koa": "2.13.4",
-		"koa-remove-trailing-slashes": "2.0.3",
+		"koa-body": "^6.0.1",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
 		"koa-json-body": "5.3.0",
 		"koa-logger": "3.2.1",
 		"koa-mount": "4.0.0",
+		"koa-remove-trailing-slashes": "2.0.3",
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
@@ -85,6 +86,7 @@
 		"mfm-js": "0.23.2",
 		"mime-types": "2.1.35",
 		"multer": "1.4.4-lts.1",
+		"native-utils": "link:native-utils",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.0",
 		"nodemailer": "6.8.0",
diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index 4eb87a614..a0833eb3e 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -21,35 +21,10 @@ import discord from "./service/discord.js";
 import github from "./service/github.js";
 import twitter from "./service/twitter.js";
 import { koaBody } from "koa-body";
+import { convertId, IdConvertType as IdType } from "native-utils"
 
-export enum IdType {
-	CalckeyId,
-	MastodonId
-};
-
-export function convertId(idIn: string, idConvertTo: IdType ) {
-	let idArray = []
-	switch (idConvertTo) {
-		case IdType.MastodonId:
-			idArray = [...idIn].map(item => item.charCodeAt(0));
-			idArray = idArray.map(item => {
-				if (item.toString().length < 3) {
-					return `0${item.toString()}`
-				}
-				else return item.toString()
-			});
-			return idArray.join('');
-		case IdType.CalckeyId:
-			for (let i = 0; i < idIn.length; i += 3) {
-				if ((idIn.length % 3) !== 0) {
-					idIn = `0${idIn}`
-				}
-				idArray.push(idIn.slice(i, i+3));
-			}
-			idArray = idArray.map(item => String.fromCharCode(item));
-			return idArray.join('');
-	}
-};
+// re-export native rust id conversion (function and enum)
+export  { IdType, convertId };
 
 // Init app
 const app = new Koa();
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 9f4070f2d..fa218305c 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -89,7 +89,7 @@ export function apiAccountMastodon(router: Router): void {
 		}
 	});
 	router.get<{ Params: { id: string } }>(
-		"/v1/accounts/:id(^.*\\d.*$)",
+		"/v1/accounts/:id",
 		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
diff --git a/packages/backend/tsconfig.json b/packages/backend/tsconfig.json
index dea4eb27d..692d7b95b 100644
--- a/packages/backend/tsconfig.json
+++ b/packages/backend/tsconfig.json
@@ -21,7 +21,7 @@
 		"experimentalDecorators": true,
 		"emitDecoratorMetadata": true,
 		"resolveJsonModule": true,
-		"isolatedModules": true,
+		"isolatedModules": false,
 		"rootDir": "./src",
 		"baseUrl": "./",
 		"paths": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c817abb81..945197b4f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,6 +13,9 @@ importers:
       '@bull-board/ui':
         specifier: ^4.10.2
         version: 4.10.2
+      '@napi-rs/cli':
+        specifier: ^2.15.0
+        version: 2.15.0
       '@tensorflow/tfjs':
         specifier: ^3.21.0
         version: 3.21.0(seedrandom@3.0.5)
@@ -257,6 +260,9 @@ importers:
       multer:
         specifier: 1.4.4-lts.1
         version: 1.4.4-lts.1
+      native-utils:
+        specifier: link:native-utils
+        version: link:native-utils
       nested-property:
         specifier: 4.0.0
         version: 4.0.0
@@ -1637,6 +1643,12 @@ packages:
     dev: false
     optional: true
 
+  /@napi-rs/cli@2.15.0:
+    resolution: {integrity: sha512-RDDr7ZF0cgbd37+NBGeQOjP7Tm/iNM+y3FmrT5bVQBXLePOTuKVC/dBsdN5UZv3Sl2XAwEvBfaGR90E0d8AA6g==}
+    engines: {node: '>= 10'}
+    hasBin: true
+    dev: false
+
   /@nodelib/fs.scandir@2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}

From c4e681339e3d5e7deba3d49299033408cef5d72b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 30 Mar 2023 18:58:54 -0700
Subject: [PATCH 323/582] dev 18

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

diff --git a/package.json b/package.json
index 1c25acdc2..57e1cf647 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev17",
+	"version": "13.2.0-dev18",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 53955ae42f00e9b064d60033ff1b381313203069 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 30 Mar 2023 19:02:23 -0700
Subject: [PATCH 324/582] add rust to docker

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a0325265f..118bf7cd4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM node:19-alpine as build
 WORKDIR /calckey
 
 # Install compilation dependencies
-RUN apk add --no-cache --no-progress git alpine-sdk python3
+RUN apk add --no-cache --no-progress git alpine-sdk python3 rust
 
 # Copy only the dependency-related files first, to cache efficiently
 COPY package.json pnpm*.yaml ./

From 5be627b869ad46435abbfd18700dc79c1f918c3f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 30 Mar 2023 19:09:44 -0700
Subject: [PATCH 325/582] feat: :lock: add argon2 support

Passwords will be automatically re-hashed on sign-in. All new password hashes will be argon2 by default.  This uses argon2id and is not configurable. In the very unlikely case someone has more specific needs, a fork is recommended.  ChangeLog: Added  Co-authored-by: Chloe Kudryavtsev <code@toast.bunkerlabs.net>

Breaks Calckey -> Misskey migration, but fixes Foundkey -> Calckey migration
---
 packages/backend/src/misc/password.ts         | 20 +++++++++++++++++++
 .../backend/src/server/api/private/signin.ts  |  8 +++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 packages/backend/src/misc/password.ts

diff --git a/packages/backend/src/misc/password.ts b/packages/backend/src/misc/password.ts
new file mode 100644
index 000000000..c63f89f5c
--- /dev/null
+++ b/packages/backend/src/misc/password.ts
@@ -0,0 +1,20 @@
+import bcrypt from "bcryptjs";
+import * as argon2 from "argon2";
+
+export async function hashPassword(password: string): Promise<string> {
+	return argon2.hash(password);
+}
+
+export async function comparePassword(
+	password: string,
+	hash: string,
+): Promise<boolean> {
+	if (isOldAlgorithm(hash)) return bcrypt.compare(password, hash);
+
+	return argon2.verify(hash, password);
+}
+
+export function isOldAlgorithm(hash: string): boolean {
+	// bcrypt hashes start with $2[ab]$
+	return hash.startsWith("$2");
+}
diff --git a/packages/backend/src/server/api/private/signin.ts b/packages/backend/src/server/api/private/signin.ts
index b06f47ed4..c8cd5fb2c 100644
--- a/packages/backend/src/server/api/private/signin.ts
+++ b/packages/backend/src/server/api/private/signin.ts
@@ -12,6 +12,7 @@ import {
 } from "@/models/index.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 import { genId } from "@/misc/gen-id.js";
+import { comparePassword, hashPassword, isOldAlgorithm } from '@/misc/password.js';
 import { verifyLogin, hash } from "../2fa.js";
 import { randomBytes } from "node:crypto";
 import { IsNull } from "typeorm";
@@ -88,7 +89,12 @@ export default async (ctx: Koa.Context) => {
 	const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
 
 	// Compare password
-	const same = await bcrypt.compare(password, profile.password!);
+	const same = await comparePassword(password, profile.password!);
+
+	if (same && isOldAlgorithm(profile.password!)) {
+		profile.password = await hashPassword(password);
+		await UserProfiles.save(profile);
+	}
 
 	async function fail(status?: number, failure?: { id: string }) {
 		// Append signin history

From 19c4a59513fa5ae79aa81c8d3f9d122d5ce0d25c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 30 Mar 2023 19:10:03 -0700
Subject: [PATCH 326/582] formatting

---
 .../koa-remove-trailing-slashes/index.d.ts    |   2 +-
 packages/backend/src/db/sonic.ts              |  52 +++--
 packages/backend/src/misc/post.ts             |   7 +-
 packages/backend/src/queue/index.ts           |  12 +-
 .../processors/background/index-all-notes.ts  |  33 ++--
 .../src/queue/processors/background/index.ts  |   5 +-
 .../src/queue/processors/db/import-posts.ts   |   4 +-
 .../src/queue/processors/webhook-deliver.ts   |   2 +-
 .../src/remote/activitypub/models/person.ts   |  54 ++++--
 .../api/endpoints/drive/files/update.ts       |   6 +-
 .../backend/src/server/api/endpoints/emoji.ts |   3 +-
 .../endpoints/messaging/messages/create.ts    |   2 +-
 .../src/server/api/endpoints/notes/search.ts  |   4 +-
 packages/backend/src/server/api/index.ts      |  10 +-
 .../server/api/mastodon/endpoints/account.ts  | 124 ++++++++----
 .../src/server/api/mastodon/endpoints/auth.ts |   6 +-
 .../src/server/api/mastodon/endpoints/meta.ts |  15 +-
 .../server/api/mastodon/endpoints/search.ts   |  12 +-
 .../server/api/mastodon/endpoints/status.ts   | 182 +++++++++---------
 .../server/api/mastodon/endpoints/timeline.ts |  58 +++---
 .../backend/src/server/api/private/signin.ts  |   6 +-
 .../backend/src/server/api/stream/index.ts    |   2 +-
 packages/backend/src/server/index.ts          |  28 +--
 packages/client/src/router.ts                 |   8 +-
 packages/client/src/scripts/get-user-menu.ts  |   4 +-
 packages/client/src/scripts/katex-macro.ts    | 176 +++++++++--------
 packages/client/src/scripts/preprocess.ts     |  12 +-
 27 files changed, 463 insertions(+), 366 deletions(-)

diff --git a/packages/backend/src/@types/koa-remove-trailing-slashes/index.d.ts b/packages/backend/src/@types/koa-remove-trailing-slashes/index.d.ts
index eda0cf142..429d1d53e 100644
--- a/packages/backend/src/@types/koa-remove-trailing-slashes/index.d.ts
+++ b/packages/backend/src/@types/koa-remove-trailing-slashes/index.d.ts
@@ -1 +1 @@
-declare module 'koa-remove-trailing-slashes';
+declare module "koa-remove-trailing-slashes";
diff --git a/packages/backend/src/db/sonic.ts b/packages/backend/src/db/sonic.ts
index 6c4d28f70..590c47924 100644
--- a/packages/backend/src/db/sonic.ts
+++ b/packages/backend/src/db/sonic.ts
@@ -7,32 +7,26 @@ const logger = dbLogger.createSubLogger("sonic", "gray", false);
 
 logger.info("Connecting to Sonic");
 
-const handlers = (type: string): SonicChannel.Handlers => (
-	{
-		connected: () => {
-			logger.succ(`Connected to Sonic ${type}`);
-		},
-		disconnected: (error) => {
-			logger.warn(`Disconnected from Sonic ${type}, error: ${error}`);
-		},
-		error: (error) => {
-			logger.warn(`Sonic ${type} error: ${error}`);
-		},
-		retrying: () => {
-			logger.info(`Sonic ${type} retrying`);
-		},
-		timeout: () => {
-			logger.warn(`Sonic ${type} timeout`);
-		},
-	}
-)
+const handlers = (type: string): SonicChannel.Handlers => ({
+	connected: () => {
+		logger.succ(`Connected to Sonic ${type}`);
+	},
+	disconnected: (error) => {
+		logger.warn(`Disconnected from Sonic ${type}, error: ${error}`);
+	},
+	error: (error) => {
+		logger.warn(`Sonic ${type} error: ${error}`);
+	},
+	retrying: () => {
+		logger.info(`Sonic ${type} retrying`);
+	},
+	timeout: () => {
+		logger.warn(`Sonic ${type} timeout`);
+	},
+});
 
 const hasConfig =
-	config.sonic
-	&& ( config.sonic.host
-		|| config.sonic.port
-		|| config.sonic.auth
-	)
+	config.sonic && (config.sonic.host || config.sonic.port || config.sonic.auth);
 
 const host = hasConfig ? config.sonic.host ?? "localhost" : "";
 const port = hasConfig ? config.sonic.port ?? 1491 : 0;
@@ -42,10 +36,14 @@ const bucket = hasConfig ? config.sonic.bucket ?? "default" : "";
 
 export default hasConfig
 	? {
-			search: new SonicChannel.Search({host, port, auth}).connect(handlers("search")),
-			ingest: new SonicChannel.Ingest({host, port, auth}).connect(handlers("ingest")),
+			search: new SonicChannel.Search({ host, port, auth }).connect(
+				handlers("search"),
+			),
+			ingest: new SonicChannel.Ingest({ host, port, auth }).connect(
+				handlers("ingest"),
+			),
 
 			collection,
 			bucket,
-		}
+	  }
 	: null;
diff --git a/packages/backend/src/misc/post.ts b/packages/backend/src/misc/post.ts
index e14aa3444..90f4f7528 100644
--- a/packages/backend/src/misc/post.ts
+++ b/packages/backend/src/misc/post.ts
@@ -6,7 +6,12 @@ export type Post = {
 };
 
 export function parse(acct: any): Post {
-	return { text: acct.text, cw: acct.cw, localOnly: acct.localOnly, createdAt: new Date(acct.createdAt) };
+	return {
+		text: acct.text,
+		cw: acct.cw,
+		localOnly: acct.localOnly,
+		createdAt: new Date(acct.createdAt),
+	};
 }
 
 export function toJson(acct: Post): string {
diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts
index 1327853d0..035556e48 100644
--- a/packages/backend/src/queue/index.ts
+++ b/packages/backend/src/queue/index.ts
@@ -440,14 +440,10 @@ export function createCleanRemoteFilesJob() {
 }
 
 export function createIndexAllNotesJob(data = {}) {
-	return backgroundQueue.add(
-		"indexAllNotes",
-		data,
-		{
-			removeOnComplete: true,
-			removeOnFail: true,
-		},
-	);
+	return backgroundQueue.add("indexAllNotes", data, {
+		removeOnComplete: true,
+		removeOnFail: true,
+	});
 }
 
 export function webhookDeliver(
diff --git a/packages/backend/src/queue/processors/background/index-all-notes.ts b/packages/backend/src/queue/processors/background/index-all-notes.ts
index f03275886..03219199d 100644
--- a/packages/backend/src/queue/processors/background/index-all-notes.ts
+++ b/packages/backend/src/queue/processors/background/index-all-notes.ts
@@ -3,26 +3,30 @@ import type Bull from "bull";
 import { queueLogger } from "../../logger.js";
 import { Notes } from "@/models/index.js";
 import { MoreThan } from "typeorm";
-import { index } from "@/services/note/create.js"
+import { index } from "@/services/note/create.js";
 import { Note } from "@/models/entities/note.js";
 
 const logger = queueLogger.createSubLogger("index-all-notes");
 
 export default async function indexAllNotes(
 	job: Bull.Job<Record<string, unknown>>,
-	done: ()=>void,
+	done: () => void,
 ): Promise<void> {
 	logger.info("Indexing all notes...");
 
-	let cursor: string|null = job.data.cursor as string ?? null;
-	let indexedCount: number = job.data.indexedCount as number ?? 0;
-	let total: number = job.data.total as number ?? 0;
+	let cursor: string | null = (job.data.cursor as string) ?? null;
+	let indexedCount: number = (job.data.indexedCount as number) ?? 0;
+	let total: number = (job.data.total as number) ?? 0;
 
 	let running = true;
 	const take = 50000;
 	const batch = 100;
 	while (running) {
-		logger.info(`Querying for ${take} notes ${indexedCount}/${total ? total : '?'} at ${cursor}`);
+		logger.info(
+			`Querying for ${take} notes ${indexedCount}/${
+				total ? total : "?"
+			} at ${cursor}`,
+		);
 
 		let notes: Note[] = [];
 		try {
@@ -49,22 +53,21 @@ export default async function indexAllNotes(
 		try {
 			const count = await Notes.count();
 			total = count;
-			job.update({ indexedCount, cursor, total })
-		} catch (e) {
-		}
+			job.update({ indexedCount, cursor, total });
+		} catch (e) {}
 
 		for (let i = 0; i < notes.length; i += batch) {
 			const chunk = notes.slice(i, i + batch);
-			await Promise.all(chunk.map(note => index(note)));
+			await Promise.all(chunk.map((note) => index(note)));
 
 			indexedCount += chunk.length;
-			const pct = (indexedCount / total)*100;
-			job.update({ indexedCount, cursor, total })
-			job.progress(+(pct.toFixed(1)));
-			logger.info(`Indexed notes ${indexedCount}/${total ? total : '?'}`);
+			const pct = (indexedCount / total) * 100;
+			job.update({ indexedCount, cursor, total });
+			job.progress(+pct.toFixed(1));
+			logger.info(`Indexed notes ${indexedCount}/${total ? total : "?"}`);
 		}
 		cursor = notes[notes.length - 1].id;
-		job.update({ indexedCount, cursor, total })
+		job.update({ indexedCount, cursor, total });
 
 		if (notes.length < take) {
 			running = false;
diff --git a/packages/backend/src/queue/processors/background/index.ts b/packages/backend/src/queue/processors/background/index.ts
index cf96b67ef..6674f954b 100644
--- a/packages/backend/src/queue/processors/background/index.ts
+++ b/packages/backend/src/queue/processors/background/index.ts
@@ -3,10 +3,7 @@ import indexAllNotes from "./index-all-notes.js";
 
 const jobs = {
 	indexAllNotes,
-} as Record<
-	string,
-	Bull.ProcessCallbackFunction<Record<string, unknown>>
->;
+} as Record<string, Bull.ProcessCallbackFunction<Record<string, unknown>>>;
 
 export default function (q: Bull.Queue) {
 	for (const [k, v] of Object.entries(jobs)) {
diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts
index 561aeaa7a..20ef3a518 100644
--- a/packages/backend/src/queue/processors/db/import-posts.ts
+++ b/packages/backend/src/queue/processors/db/import-posts.ts
@@ -88,7 +88,7 @@ export async function importPosts(
 						continue;
 					}
 					if (job.data.signatureCheck) {
-						if(!post.signature) {
+						if (!post.signature) {
 							continue;
 						}
 					}
@@ -99,7 +99,7 @@ export async function importPosts(
 						continue;
 					}
 					logger.info(`Posting[${linenum}] ...`);
-	
+
 					const note = await create(user, {
 						createdAt: new Date(post.object.published),
 						files: undefined,
diff --git a/packages/backend/src/queue/processors/webhook-deliver.ts b/packages/backend/src/queue/processors/webhook-deliver.ts
index 2edf4f696..0a54ae7d8 100644
--- a/packages/backend/src/queue/processors/webhook-deliver.ts
+++ b/packages/backend/src/queue/processors/webhook-deliver.ts
@@ -20,7 +20,7 @@ export default async (job: Bull.Job<WebhookDeliverJobData>) => {
 				"X-Calckey-Host": config.host,
 				"X-Calckey-Hook-Id": job.data.webhookId,
 				"X-Calckey-Hook-Secret": job.data.secret,
-				'Content-Type': 'application/json'
+				"Content-Type": "application/json",
 			},
 			body: JSON.stringify({
 				hookId: job.data.webhookId,
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index f4f792df1..877f5f332 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -205,7 +205,9 @@ export async function createPerson(
 
 	if (typeof person.followers === "string") {
 		try {
-			let data = await fetch(person.followers, { headers: { "Accept": "application/json" } });
+			let data = await fetch(person.followers, {
+				headers: { Accept: "application/json" },
+			});
 			let json_data = JSON.parse(await data.text());
 
 			followersCount = json_data.totalItems;
@@ -218,7 +220,9 @@ export async function createPerson(
 
 	if (typeof person.following === "string") {
 		try {
-			let data = await fetch(person.following, { headers: { "Accept": "application/json" } });
+			let data = await fetch(person.following, {
+				headers: { Accept: "application/json" },
+			});
 			let json_data = JSON.parse(await data.text());
 
 			followingCount = json_data.totalItems;
@@ -227,7 +231,6 @@ export async function createPerson(
 		}
 	}
 
-
 	// Create user
 	let user: IRemoteUser;
 	try {
@@ -255,14 +258,20 @@ export async function createPerson(
 					followersUri: person.followers
 						? getApId(person.followers)
 						: undefined,
-					followersCount: followersCount !== undefined
-						? followersCount
-						: person.followers && typeof person.followers !== "string" && isCollectionOrOrderedCollection(person.followers)
+					followersCount:
+						followersCount !== undefined
+							? followersCount
+							: person.followers &&
+							  typeof person.followers !== "string" &&
+							  isCollectionOrOrderedCollection(person.followers)
 							? person.followers.totalItems
 							: undefined,
-					followingCount: followingCount !== undefined
-						? followingCount
-						: person.following && typeof person.following !== "string" && isCollectionOrOrderedCollection(person.following)
+					followingCount:
+						followingCount !== undefined
+							? followingCount
+							: person.following &&
+							  typeof person.following !== "string" &&
+							  isCollectionOrOrderedCollection(person.following)
 							? person.following.totalItems
 							: undefined,
 					featured: person.featured ? getApId(person.featured) : undefined,
@@ -440,7 +449,9 @@ export async function updatePerson(
 
 	if (typeof person.followers === "string") {
 		try {
-			let data = await fetch(person.followers, { headers: { "Accept": "application/json" } } );
+			let data = await fetch(person.followers, {
+				headers: { Accept: "application/json" },
+			});
 			let json_data = JSON.parse(await data.text());
 
 			followersCount = json_data.totalItems;
@@ -449,12 +460,13 @@ export async function updatePerson(
 		}
 	}
 
-
 	let followingCount: number | undefined;
 
 	if (typeof person.following === "string") {
 		try {
-			let data = await fetch(person.following, { headers: { "Accept": "application/json" } } );
+			let data = await fetch(person.following, {
+				headers: { Accept: "application/json" },
+			});
 			let json_data = JSON.parse(await data.text());
 
 			followingCount = json_data.totalItems;
@@ -470,14 +482,20 @@ export async function updatePerson(
 			person.sharedInbox ||
 			(person.endpoints ? person.endpoints.sharedInbox : undefined),
 		followersUri: person.followers ? getApId(person.followers) : undefined,
-		followersCount: followersCount !== undefined
-			? followersCount
-			: person.followers && typeof person.followers !== "string" && isCollectionOrOrderedCollection(person.followers)
+		followersCount:
+			followersCount !== undefined
+				? followersCount
+				: person.followers &&
+				  typeof person.followers !== "string" &&
+				  isCollectionOrOrderedCollection(person.followers)
 				? person.followers.totalItems
 				: undefined,
-		followingCount: followingCount !== undefined
-			? followingCount
-			: person.following && typeof person.following !== "string" && isCollectionOrOrderedCollection(person.following)
+		followingCount:
+			followingCount !== undefined
+				? followingCount
+				: person.following &&
+				  typeof person.following !== "string" &&
+				  isCollectionOrOrderedCollection(person.following)
 				? person.following.totalItems
 				: undefined,
 		featured: person.featured,
diff --git a/packages/backend/src/server/api/endpoints/drive/files/update.ts b/packages/backend/src/server/api/endpoints/drive/files/update.ts
index e681f1294..e833fddb5 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/update.ts
@@ -54,7 +54,11 @@ export const paramDef = {
 		folderId: { type: "string", format: "misskey:id", nullable: true },
 		name: { type: "string" },
 		isSensitive: { type: "boolean" },
-		comment: { type: "string", nullable: true, maxLength: DB_MAX_IMAGE_COMMENT_LENGTH },
+		comment: {
+			type: "string",
+			nullable: true,
+			maxLength: DB_MAX_IMAGE_COMMENT_LENGTH,
+		},
 	},
 	required: ["fileId"],
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/emoji.ts b/packages/backend/src/server/api/endpoints/emoji.ts
index 5d3c77e5e..ddfad7737 100644
--- a/packages/backend/src/server/api/endpoints/emoji.ts
+++ b/packages/backend/src/server/api/endpoints/emoji.ts
@@ -11,7 +11,8 @@ export const meta = {
 
 	res: {
 		type: "object",
-		optional: false, nullable: false,
+		optional: false,
+		nullable: false,
 		ref: "Emoji",
 	},
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
index 03d762e97..ed9ae16df 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
@@ -151,7 +151,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// テキストが無いかつ添付ファイルも無かったらエラー
-	if ((ps.text == null || ps.text.trim() === '') && file == null) {
+	if ((ps.text == null || ps.text.trim() === "") && file == null) {
 		throw new ApiError(meta.errors.contentRequired);
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index 5e431d4f7..8f563c384 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -139,7 +139,7 @@ export default define(meta, paramDef, async (ps, me) => {
 				})
 				.map((key) => key.id);
 
-				ids.push(...res);
+			ids.push(...res);
 		}
 
 		// Sort all the results by note id DESC (newest first)
@@ -160,7 +160,7 @@ export default define(meta, paramDef, async (ps, me) => {
 			});
 
 			// The notes are checked for visibility and muted/blocked users when packed
-			found.push(...await Notes.packMany(notes, me));
+			found.push(...(await Notes.packMany(notes, me)));
 			start += chunkSize;
 		}
 
diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index a0833eb3e..529f09bd5 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -7,7 +7,10 @@ import Router from "@koa/router";
 import multer from "@koa/multer";
 import bodyParser from "koa-bodyparser";
 import cors from "@koa/cors";
-import { apiMastodonCompatible, getClient } from "./mastodon/ApiMastodonCompatibleService.js";
+import {
+	apiMastodonCompatible,
+	getClient,
+} from "./mastodon/ApiMastodonCompatibleService.js";
 import { Instances, AccessTokens, Users } from "@/models/index.js";
 import config from "@/config/index.js";
 import fs from "fs";
@@ -21,10 +24,10 @@ import discord from "./service/discord.js";
 import github from "./service/github.js";
 import twitter from "./service/twitter.js";
 import { koaBody } from "koa-body";
-import { convertId, IdConvertType as IdType } from "native-utils"
+import { convertId, IdConvertType as IdType } from "native-utils";
 
 // re-export native rust id conversion (function and enum)
-export  { IdType, convertId };
+export { IdType, convertId };
 
 // Init app
 const app = new Koa();
@@ -74,7 +77,6 @@ mastoRouter.use(
 	}),
 );
 
-
 mastoFileRouter.post("/v1/media", upload.single("file"), async (ctx) => {
 	const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 	const accessTokens = ctx.headers.authorization;
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index fa218305c..70bdb74f3 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -77,7 +77,10 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.search((ctx.request.query as any).acct, 'accounts');
+			const data = await client.search(
+				(ctx.request.query as any).acct,
+				"accounts",
+			);
 			let resp = data.data.accounts[0];
 			resp.id = convertId(resp.id, IdType.MastodonId);
 			ctx.body = resp;
@@ -88,26 +91,23 @@ export function apiAccountMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
-	router.get<{ Params: { id: string } }>(
-		"/v1/accounts/:id",
-		async (ctx) => {
-			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-			const accessTokens = ctx.headers.authorization;
-			const client = getClient(BASE_URL, accessTokens);
-			try {
-				const calcId = convertId(ctx.params.id, IdType.CalckeyId);
-				const data = await client.getAccount(calcId);
-				let resp = data.data;
-				resp.id = convertId(resp.id, IdType.MastodonId);
-				ctx.body = resp;
-			} catch (e: any) {
-				console.error(e);
-				console.error(e.response.data);
-				ctx.status = 401;
-				ctx.body = e.response.data;
-			}
-		},
-	);
+	router.get<{ Params: { id: string } }>("/v1/accounts/:id", async (ctx) => {
+		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
+		const accessTokens = ctx.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens);
+		try {
+			const calcId = convertId(ctx.params.id, IdType.CalckeyId);
+			const data = await client.getAccount(calcId);
+			let resp = data.data;
+			resp.id = convertId(resp.id, IdType.MastodonId);
+			ctx.body = resp;
+		} catch (e: any) {
+			console.error(e);
+			console.error(e.response.data);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
 	router.get<{ Params: { id: string } }>(
 		"/v1/accounts/:id/statuses",
 		async (ctx) => {
@@ -122,11 +122,19 @@ export function apiAccountMastodon(router: Router): void {
 				let resp = data.data;
 				for (let statIdx = 0; statIdx < resp.length; statIdx++) {
 					resp[statIdx].id = convertId(resp[statIdx].id, IdType.MastodonId);
-					resp[statIdx].in_reply_to_account_id = resp[statIdx].in_reply_to_account_id ? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId) : null;
-					resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id ? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId) : null;
-					let mentions = resp[statIdx].mentions
+					resp[statIdx].in_reply_to_account_id = resp[statIdx]
+						.in_reply_to_account_id
+						? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId)
+						: null;
+					resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id
+						? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId)
+						: null;
+					let mentions = resp[statIdx].mentions;
 					for (let mtnIdx = 0; mtnIdx < mentions.length; mtnIdx++) {
-						resp[statIdx].mentions[mtnIdx].id = convertId(mentions[mtnIdx].id, IdType.MastodonId);
+						resp[statIdx].mentions[mtnIdx].id = convertId(
+							mentions[mtnIdx].id,
+							IdType.MastodonId,
+						);
 					}
 				}
 				ctx.body = resp;
@@ -210,7 +218,9 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.followAccount(convertId(ctx.params.id, IdType.CalckeyId));
+				const data = await client.followAccount(
+					convertId(ctx.params.id, IdType.CalckeyId),
+				);
 				let acct = data.data;
 				acct.following = true;
 				acct.id = convertId(acct.id, IdType.MastodonId);
@@ -230,7 +240,9 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.unfollowAccount(convertId(ctx.params.id, IdType.CalckeyId));
+				const data = await client.unfollowAccount(
+					convertId(ctx.params.id, IdType.CalckeyId),
+				);
 				let acct = data.data;
 				acct.id = convertId(acct.id, IdType.MastodonId);
 				acct.following = false;
@@ -250,7 +262,9 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.blockAccount(convertId(ctx.params.id, IdType.CalckeyId));
+				const data = await client.blockAccount(
+					convertId(ctx.params.id, IdType.CalckeyId),
+				);
 				let resp = data.data;
 				resp.id = convertId(resp.id, IdType.MastodonId);
 				ctx.body = resp;
@@ -269,7 +283,9 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.unblockAccount(convertId(ctx.params.id, IdType.MastodonId));
+				const data = await client.unblockAccount(
+					convertId(ctx.params.id, IdType.MastodonId),
+				);
 				let resp = data.data;
 				resp.id = convertId(resp.id, IdType.MastodonId);
 				ctx.body = resp;
@@ -310,7 +326,9 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.unmuteAccount(convertId(ctx.params.id, IdType.CalckeyId));
+				const data = await client.unmuteAccount(
+					convertId(ctx.params.id, IdType.CalckeyId),
+				);
 				let resp = data.data;
 				resp.id = convertId(resp.id, IdType.MastodonId);
 				ctx.body = resp;
@@ -344,7 +362,7 @@ export function apiAccountMastodon(router: Router): void {
 			for (let i = 0; i < ids.length; i++) {
 				reqIds.push(convertId(ids[i], IdType.CalckeyId));
 			}
-			
+
 			const data = await client.getRelationships(reqIds);
 			let resp = data.data;
 			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
@@ -365,15 +383,25 @@ export function apiAccountMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = (await client.getBookmarks(limitToInt(ctx.query as any))) as any;
+			const data = (await client.getBookmarks(
+				limitToInt(ctx.query as any),
+			)) as any;
 			let resp = data.data;
 			for (let statIdx = 0; statIdx < resp.length; statIdx++) {
 				resp[statIdx].id = convertId(resp[statIdx].id, IdType.MastodonId);
-				resp[statIdx].in_reply_to_account_id = resp[statIdx].in_reply_to_account_id ? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId) : null;
-				resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id ? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId) : null;
-				let mentions = resp[statIdx].mentions
+				resp[statIdx].in_reply_to_account_id = resp[statIdx]
+					.in_reply_to_account_id
+					? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId)
+					: null;
+				resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id
+					? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId)
+					: null;
+				let mentions = resp[statIdx].mentions;
 				for (let mtnIdx = 0; mtnIdx < mentions.length; mtnIdx++) {
-					resp[statIdx].mentions[mtnIdx].id = convertId(mentions[mtnIdx].id, IdType.MastodonId);
+					resp[statIdx].mentions[mtnIdx].id = convertId(
+						mentions[mtnIdx].id,
+						IdType.MastodonId,
+					);
 				}
 			}
 			ctx.body = resp;
@@ -393,11 +421,19 @@ export function apiAccountMastodon(router: Router): void {
 			let resp = data.data;
 			for (let statIdx = 0; statIdx < resp.length; statIdx++) {
 				resp[statIdx].id = convertId(resp[statIdx].id, IdType.MastodonId);
-				resp[statIdx].in_reply_to_account_id = resp[statIdx].in_reply_to_account_id ? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId) : null;
-				resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id ? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId) : null;
-				let mentions = resp[statIdx].mentions
+				resp[statIdx].in_reply_to_account_id = resp[statIdx]
+					.in_reply_to_account_id
+					? convertId(resp[statIdx].in_reply_to_account_id, IdType.MastodonId)
+					: null;
+				resp[statIdx].in_reply_to_id = resp[statIdx].in_reply_to_id
+					? convertId(resp[statIdx].in_reply_to_id, IdType.MastodonId)
+					: null;
+				let mentions = resp[statIdx].mentions;
 				for (let mtnIdx = 0; mtnIdx < mentions.length; mtnIdx++) {
-					resp[statIdx].mentions[mtnIdx].id = convertId(mentions[mtnIdx].id, IdType.MastodonId);
+					resp[statIdx].mentions[mtnIdx].id = convertId(
+						mentions[mtnIdx].id,
+						IdType.MastodonId,
+					);
 				}
 			}
 			ctx.body = resp;
@@ -471,7 +507,9 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.acceptFollowRequest(convertId(ctx.params.id, IdType.CalckeyId));
+				const data = await client.acceptFollowRequest(
+					convertId(ctx.params.id, IdType.CalckeyId),
+				);
 				let resp = data.data;
 				resp.id = convertId(resp.id, IdType.MastodonId);
 				ctx.body = resp;
@@ -490,7 +528,9 @@ export function apiAccountMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.rejectFollowRequest(convertId(ctx.params.id, IdType.CalckeyId));
+				const data = await client.rejectFollowRequest(
+					convertId(ctx.params.id, IdType.CalckeyId),
+				);
 				let resp = data.data;
 				resp.id = convertId(resp.id, IdType.MastodonId);
 				ctx.body = resp;
diff --git a/packages/backend/src/server/api/mastodon/endpoints/auth.ts b/packages/backend/src/server/api/mastodon/endpoints/auth.ts
index f1c54be0a..e2cfc47af 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/auth.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/auth.ts
@@ -44,7 +44,7 @@ const writeScope = [
 export function apiAuthMastodon(router: Router): void {
 	router.post("/v1/apps", async (ctx) => {
 		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
-		const client = getClient(BASE_URL, '');
+		const client = getClient(BASE_URL, "");
 		const body: any = ctx.request.body || ctx.request.query;
 		try {
 			let scope = body.scopes;
@@ -68,9 +68,9 @@ export function apiAuthMastodon(router: Router): void {
 				website: body.website,
 				redirect_uri: red,
 				client_id: Buffer.from(appData.url || "").toString("base64"),
-				client_secret: appData.clientSecret
+				client_secret: appData.clientSecret,
 			};
-			console.log(returns)
+			console.log(returns);
 			ctx.body = returns;
 		} catch (e: any) {
 			console.error(e);
diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
index e5e0f2622..d362d1b9e 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/meta.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
@@ -11,17 +11,20 @@ export async function getInstance(response: Entity.Instance) {
 	return {
 		uri: response.uri,
 		title: response.title || "Calckey",
-		short_description: response.description.substring(0, 50) || "See real server website",
-		description: response.description || "This is a vanilla Calckey Instance. It doesnt seem to have a description. BTW you are using the Mastodon api to access this server :)",
+		short_description:
+			response.description.substring(0, 50) || "See real server website",
+		description:
+			response.description ||
+			"This is a vanilla Calckey Instance. It doesnt seem to have a description. BTW you are using the Mastodon api to access this server :)",
 		email: response.email || "",
 		version: "3.0.0 compatible (3.5+ Calckey)", //I hope this version string is correct, we will need to test it.
 		urls: response.urls,
 		stats: {
-			user_count: (await totalUsers),
-			status_count: (await totalStatuses),
-			domain_count: response.stats.domain_count
+			user_count: await totalUsers,
+			status_count: await totalStatuses,
+			domain_count: response.stats.domain_count,
 		},
-		thumbnail: response.thumbnail || 'https://http.cat/404',
+		thumbnail: response.thumbnail || "https://http.cat/404",
 		languages: meta.langs,
 		registrations: !meta.disableRegistration || response.registrations,
 		approval_required: !response.registrations,
diff --git a/packages/backend/src/server/api/mastodon/endpoints/search.ts b/packages/backend/src/server/api/mastodon/endpoints/search.ts
index b610e784d..e4990811a 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/search.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/search.ts
@@ -44,7 +44,7 @@ export function apiSearchMastodon(router: Router): void {
 			}
 		} catch (e: any) {
 			console.error(e);
-			ctx.status = (401);
+			ctx.status = 401;
 			ctx.body = e.response.data;
 		}
 	});
@@ -52,11 +52,15 @@ export function apiSearchMastodon(router: Router): void {
 		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
 		const accessTokens = ctx.headers.authorization;
 		try {
-			const data = await getHighlight(BASE_URL, ctx.request.hostname, accessTokens);
+			const data = await getHighlight(
+				BASE_URL,
+				ctx.request.hostname,
+				accessTokens,
+			);
 			ctx.body = data;
 		} catch (e: any) {
 			console.error(e);
-			ctx.status = (401);
+			ctx.status = 401;
 			ctx.body = e.response.data;
 		}
 	});
@@ -75,7 +79,7 @@ export function apiSearchMastodon(router: Router): void {
 			ctx.body = data;
 		} catch (e: any) {
 			console.error(e);
-			ctx.status = (401);
+			ctx.status = 401;
 			ctx.body = e.response.data;
 		}
 	});
diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index 6494ad5a6..fcfbd6aaa 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -2,13 +2,13 @@ import Router from "@koa/router";
 import { getClient } from "../ApiMastodonCompatibleService.js";
 import { emojiRegexAtStartToEnd } from "@/misc/emoji-regex.js";
 import axios from "axios";
-import querystring from 'node:querystring'
-import qs from 'qs'
+import querystring from "node:querystring";
+import qs from "qs";
 import { limitToInt } from "./timeline.js";
 
 function normalizeQuery(data: any) {
-    const str = querystring.stringify(data);
-    return qs.parse(str);
+	const str = querystring.stringify(data);
+	return qs.parse(str);
 }
 
 export function apiStatusMastodon(router: Router): void {
@@ -18,11 +18,14 @@ export function apiStatusMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		try {
 			let body: any = ctx.request.body;
-			if ((!body.poll && body['poll[options][]']) || (!body.media_ids && body['media_ids[]'])) {
-				body = normalizeQuery(body)
+			if (
+				(!body.poll && body["poll[options][]"]) ||
+				(!body.media_ids && body["media_ids[]"])
+			) {
+				body = normalizeQuery(body);
 			}
 			const text = body.status;
-			const removed = text.replace(/@\S+/g, "").replace(/\s|​/g, '')
+			const removed = text.replace(/@\S+/g, "").replace(/\s|​/g, "");
 			const isDefaultEmoji = emojiRegexAtStartToEnd.test(removed);
 			const isCustomEmoji = /^:[a-zA-Z0-9@_]+:$/.test(removed);
 			if ((body.in_reply_to_id && isDefaultEmoji) || isCustomEmoji) {
@@ -47,8 +50,9 @@ export function apiStatusMastodon(router: Router): void {
 			}
 			if (!body.media_ids) body.media_ids = undefined;
 			if (body.media_ids && !body.media_ids.length) body.media_ids = undefined;
-			const { sensitive } = body
-			body.sensitive = typeof sensitive === 'string' ? sensitive === 'true' : sensitive
+			const { sensitive } = body;
+			body.sensitive =
+				typeof sensitive === "string" ? sensitive === "true" : sensitive;
 			const data = await client.postStatus(text, body);
 			ctx.body = data.data;
 		} catch (e: any) {
@@ -57,38 +61,32 @@ export function apiStatusMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
-	router.get<{ Params: { id: string } }>(
-		"/v1/statuses/:id",
-		async (ctx) => {
-			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-			const accessTokens = ctx.headers.authorization;
-			const client = getClient(BASE_URL, accessTokens);
-			try {
-				const data = await client.getStatus(ctx.params.id);
-				ctx.body = data.data;
-			} catch (e: any) {
-				console.error(e);
-				ctx.status = 401;
-				ctx.body = e.response.data;
-			}
-		},
-	);
-	router.delete<{ Params: { id: string } }>(
-		"/v1/statuses/:id",
-		async (ctx) => {
-			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-			const accessTokens = ctx.headers.authorization;
-			const client = getClient(BASE_URL, accessTokens);
-			try {
-				const data = await client.deleteStatus(ctx.params.id);
-				ctx.body = data.data;
-			} catch (e: any) {
-				console.error(e.response.data, request.params.id);
-				ctx.status = 401;
-				ctx.body = e.response.data;
-			}
-		},
-	);
+	router.get<{ Params: { id: string } }>("/v1/statuses/:id", async (ctx) => {
+		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
+		const accessTokens = ctx.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens);
+		try {
+			const data = await client.getStatus(ctx.params.id);
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
+	router.delete<{ Params: { id: string } }>("/v1/statuses/:id", async (ctx) => {
+		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
+		const accessTokens = ctx.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens);
+		try {
+			const data = await client.deleteStatus(ctx.params.id);
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e.response.data, request.params.id);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
 	interface IReaction {
 		id: string;
 		createdAt: string;
@@ -103,12 +101,15 @@ export function apiStatusMastodon(router: Router): void {
 			const client = getClient(BASE_URL, accessTokens);
 			try {
 				const id = ctx.params.id;
-				const data = await client.getStatusContext(id, limitToInt(ctx.query as any));
+				const data = await client.getStatusContext(
+					id,
+					limitToInt(ctx.query as any),
+				);
 				const status = await client.getStatus(id);
 				let reqInstance = axios.create({
 					headers: {
-						Authorization : ctx.headers.authorization
-					}
+						Authorization: ctx.headers.authorization,
+					},
 				});
 				const reactionsAxios = await reqInstance.get(
 					`${BASE_URL}/api/notes/reactions?noteId=${id}`,
@@ -296,57 +297,48 @@ export function apiStatusMastodon(router: Router): void {
 			}
 		},
 	);
-	router.get<{ Params: { id: string } }>(
-		"/v1/media/:id",
-		async (ctx) => {
-			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-			const accessTokens = ctx.headers.authorization;
-			const client = getClient(BASE_URL, accessTokens);
-			try {
-				const data = await client.getMedia(ctx.params.id);
-				ctx.body = data.data;
-			} catch (e: any) {
-				console.error(e);
-				ctx.status = 401;
-				ctx.body = e.response.data;
-			}
-		},
-	);
-	router.put<{ Params: { id: string } }>(
-		"/v1/media/:id",
-		async (ctx) => {
-			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-			const accessTokens = ctx.headers.authorization;
-			const client = getClient(BASE_URL, accessTokens);
-			try {
-				const data = await client.updateMedia(
-					ctx.params.id,
-					ctx.request.body as any,
-				);
-				ctx.body = data.data;
-			} catch (e: any) {
-				console.error(e);
-				ctx.status = 401;
-				ctx.body = e.response.data;
-			}
-		},
-	);
-	router.get<{ Params: { id: string } }>(
-		"/v1/polls/:id",
-		async (ctx) => {
-			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-			const accessTokens = ctx.headers.authorization;
-			const client = getClient(BASE_URL, accessTokens);
-			try {
-				const data = await client.getPoll(ctx.params.id);
-				ctx.body = data.data;
-			} catch (e: any) {
-				console.error(e);
-				ctx.status = 401;
-				ctx.body = e.response.data;
-			}
-		},
-	);
+	router.get<{ Params: { id: string } }>("/v1/media/:id", async (ctx) => {
+		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
+		const accessTokens = ctx.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens);
+		try {
+			const data = await client.getMedia(ctx.params.id);
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
+	router.put<{ Params: { id: string } }>("/v1/media/:id", async (ctx) => {
+		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
+		const accessTokens = ctx.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens);
+		try {
+			const data = await client.updateMedia(
+				ctx.params.id,
+				ctx.request.body as any,
+			);
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
+	router.get<{ Params: { id: string } }>("/v1/polls/:id", async (ctx) => {
+		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
+		const accessTokens = ctx.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens);
+		try {
+			const data = await client.getPoll(ctx.params.id);
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
 	router.post<{ Params: { id: string } }>(
 		"/v1/polls/:id/votes",
 		async (ctx) => {
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index 0393a206c..ce3a4dc95 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -16,7 +16,8 @@ export function limitToInt(q: ParsedUrlQuery) {
 
 export function argsToBools(q: ParsedUrlQuery) {
 	// Values taken from https://docs.joinmastodon.org/client/intro/#boolean
-	const toBoolean = (value: string) => !['0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF'].includes(value);
+	const toBoolean = (value: string) =>
+		!["0", "f", "F", "false", "FALSE", "off", "OFF"].includes(value);
 
 	let object: any = q;
 	if (q.only_media)
@@ -35,26 +36,26 @@ export function toTextWithReaction(status: Entity.Status[], host: string) {
 		if (!t.emoji_reactions) return t;
 		if (t.reblog) t.reblog = toTextWithReaction([t.reblog], host)[0];
 		const reactions = t.emoji_reactions.map((r) => {
-			const emojiNotation = r.url ? `:${r.name.replace('@.', '')}:` : r.name
-			return `${emojiNotation} (${r.count}${r.me ? `* ` : ''})`
+			const emojiNotation = r.url ? `:${r.name.replace("@.", "")}:` : r.name;
+			return `${emojiNotation} (${r.count}${r.me ? `* ` : ""})`;
 		});
 		const reaction = t.emoji_reactions as Entity.Reaction[];
-		const emoji = t.emojis || []
+		const emoji = t.emojis || [];
 		for (const r of reaction) {
-				if (!r.url) continue
-				emoji.push({
-					'shortcode': r.name,
-					'url': r.url,
-					'static_url': r.url,
-					'visible_in_picker': true,
-					category: ""
-				},)
+			if (!r.url) continue;
+			emoji.push({
+				shortcode: r.name,
+				url: r.url,
+				static_url: r.url,
+				visible_in_picker: true,
+				category: "",
+			});
 		}
 		const isMe = reaction.findIndex((r) => r.me) > -1;
 		const total = reaction.reduce((sum, reaction) => sum + reaction.count, 0);
 		t.favourited = isMe;
 		t.favourites_count = total;
-		t.emojis = emoji
+		t.emojis = emoji;
 		t.content = `<p>${autoLinker(t.content, host)}</p><p>${reactions.join(
 			", ",
 		)}</p>`;
@@ -126,23 +127,20 @@ export function apiTimelineMastodon(router: Router): void {
 			}
 		},
 	);
-	router.get(
-		"/v1/timelines/home",
-		async (ctx, reply) => {
-			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-			const accessTokens = ctx.headers.authorization;
-			const client = getClient(BASE_URL, accessTokens);
-			try {
-				const data = await client.getHomeTimeline(limitToInt(ctx.query));
-				ctx.body = toTextWithReaction(data.data, ctx.hostname);
-			} catch (e: any) {
-				console.error(e);
-				console.error(e.response.data);
-				ctx.status = 401;
-				ctx.body = e.response.data;
-			}
-		},
-	);
+	router.get("/v1/timelines/home", async (ctx, reply) => {
+		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
+		const accessTokens = ctx.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens);
+		try {
+			const data = await client.getHomeTimeline(limitToInt(ctx.query));
+			ctx.body = toTextWithReaction(data.data, ctx.hostname);
+		} catch (e: any) {
+			console.error(e);
+			console.error(e.response.data);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
 	router.get<{ Params: { listId: string } }>(
 		"/v1/timelines/list/:listId",
 		async (ctx, reply) => {
diff --git a/packages/backend/src/server/api/private/signin.ts b/packages/backend/src/server/api/private/signin.ts
index c8cd5fb2c..7c4b511a2 100644
--- a/packages/backend/src/server/api/private/signin.ts
+++ b/packages/backend/src/server/api/private/signin.ts
@@ -12,7 +12,11 @@ import {
 } from "@/models/index.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 import { genId } from "@/misc/gen-id.js";
-import { comparePassword, hashPassword, isOldAlgorithm } from '@/misc/password.js';
+import {
+	comparePassword,
+	hashPassword,
+	isOldAlgorithm,
+} from "@/misc/password.js";
 import { verifyLogin, hash } from "../2fa.js";
 import { randomBytes } from "node:crypto";
 import { IsNull } from "typeorm";
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index f285b2f5b..061a17be2 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -414,7 +414,7 @@ export default class Connection {
 				const client = getClient(this.host, this.accessToken);
 				client.getStatus(payload.id).then((data) => {
 					const newPost = toTextWithReaction([data.data], this.host);
-					const targetPost = newPost[0]
+					const targetPost = newPost[0];
 					for (const stream of this.currentSubscribe) {
 						this.wsConnection.send(
 							JSON.stringify({
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 3f7f7c03c..be1f71a7a 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -31,7 +31,7 @@ import webServer from "./web/index.js";
 import { initializeStreamingServer } from "./api/streaming.js";
 import { koaBody } from "koa-body";
 import removeTrailingSlash from "koa-remove-trailing-slashes";
-import {v4 as uuid} from "uuid";
+import { v4 as uuid } from "uuid";
 
 export const serverLogger = new Logger("server", "gray", false);
 
@@ -162,19 +162,19 @@ mastoRouter.get("/oauth/authorize", async (ctx) => {
 	const { client_id, state, redirect_uri } = ctx.request.query;
 	console.log(ctx.request.req);
 	let param = "mastodon=true";
-	if (state)
-		param += `&state=${state}`;
-	if (redirect_uri)
-		param += `&redirect_uri=${redirect_uri}`;
-	const client = client_id? client_id : "";
-	ctx.redirect(`${Buffer.from(client.toString(), 'base64').toString()}?${param}`);
+	if (state) param += `&state=${state}`;
+	if (redirect_uri) param += `&redirect_uri=${redirect_uri}`;
+	const client = client_id ? client_id : "";
+	ctx.redirect(
+		`${Buffer.from(client.toString(), "base64").toString()}?${param}`,
+	);
 });
 
 mastoRouter.post("/oauth/token", async (ctx) => {
 	const body: any = ctx.request.body || ctx.request.query;
-	console.log('token-request', body);
-	console.log('token-query', ctx.request.query);
-	if (body.grant_type === 'client_credentials') {
+	console.log("token-request", body);
+	console.log("token-query", ctx.request.query);
+	if (body.grant_type === "client_credentials") {
 		const ret = {
 			access_token: uuid(),
 			token_type: "Bearer",
@@ -197,8 +197,8 @@ mastoRouter.post("/oauth/token", async (ctx) => {
 		//	return;
 		//}
 		//token = `${m[1]}-${m[2]}-${m[3]}-${m[4]}-${m[5]}`
-		console.log(body.code, token)
-		token = body.code
+		console.log(body.code, token);
+		token = body.code;
 	}
 	if (client_id instanceof Array) {
 		client_id = client_id.toString();
@@ -214,10 +214,10 @@ mastoRouter.post("/oauth/token", async (ctx) => {
 		const ret = {
 			access_token: atData.accessToken,
 			token_type: "Bearer",
-			scope: body.scope || 'read write follow push',
+			scope: body.scope || "read write follow push",
 			created_at: Math.floor(new Date().getTime() / 1000),
 		};
-		console.log('token-response', ret)
+		console.log("token-response", ret);
 		ctx.body = ret;
 	} catch (err: any) {
 		console.error(err);
diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts
index 3529032b2..8276e891c 100644
--- a/packages/client/src/router.ts
+++ b/packages/client/src/router.ts
@@ -136,7 +136,9 @@ export const routes = [
 			{
 				path: "/custom-katex-macro",
 				name: "custom-katex-macro",
-				component: page(() => import("./pages/settings/custom-katex-macro.vue")),
+				component: page(
+					() => import("./pages/settings/custom-katex-macro.vue"),
+				),
 			},
 			{
 				path: "/account-info",
@@ -243,7 +245,9 @@ export const routes = [
 			{
 				path: "/custom-katex-macro",
 				name: "general",
-				component: page(() => import("./pages/settings/custom-katex-macro.vue")),
+				component: page(
+					() => import("./pages/settings/custom-katex-macro.vue"),
+				),
 			},
 			{
 				path: "/accounts",
diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts
index d5ec5e0d5..44dbac961 100644
--- a/packages/client/src/scripts/get-user-menu.ts
+++ b/packages/client/src/scripts/get-user-menu.ts
@@ -262,7 +262,9 @@ export function getUserMenu(user, router: Router = mainRouter) {
 		menu = menu.concat([
 			null,
 			{
-				icon: user.isMuted ? "ph-eye ph-bold ph-lg" : "ph-eye-slash ph-bold ph-lg",
+				icon: user.isMuted
+					? "ph-eye ph-bold ph-lg"
+					: "ph-eye-slash ph-bold ph-lg",
 				text: user.isMuted ? i18n.ts.unmute : i18n.ts.mute,
 				hidden: user.isBlocking === true,
 				action: toggleMute,
diff --git a/packages/client/src/scripts/katex-macro.ts b/packages/client/src/scripts/katex-macro.ts
index bede1c5f6..4368095be 100644
--- a/packages/client/src/scripts/katex-macro.ts
+++ b/packages/client/src/scripts/katex-macro.ts
@@ -1,19 +1,17 @@
 type KaTeXMacro = {
-  args: number;
-  rule: (string | number)[];
+	args: number;
+	rule: (string | number)[];
 };
 
 function parseSingleKaTeXMacro(src: string): [string, KaTeXMacro] {
 	const invalid: [string, KaTeXMacro] = ["", { args: 0, rule: [] }];
 
 	const skipSpaces = (pos: number): number => {
-		while (src[pos] === " ")
-			++pos;
+		while (src[pos] === " ") ++pos;
 		return pos;
 	};
 
-	if (!src.startsWith("\\newcommand") || src.slice(-1) !== "}")
-		return invalid;
+	if (!src.startsWith("\\newcommand") || src.slice(-1) !== "}") return invalid;
 
 	// current index we are checking (= "\\newcommand".length)
 	let currentPos: number = 11;
@@ -21,28 +19,21 @@ function parseSingleKaTeXMacro(src: string): [string, KaTeXMacro] {
 
 	// parse {\name}, (\name), or [\name]
 	let bracket: string;
-	if (src[currentPos] === "{")
-		bracket = "{}";
-	else if (src[currentPos] === "(")
-		bracket = "()";
-	else if (src[currentPos] === "[")
-		bracket = "[]";
-	else
-		return invalid;
+	if (src[currentPos] === "{") bracket = "{}";
+	else if (src[currentPos] === "(") bracket = "()";
+	else if (src[currentPos] === "[") bracket = "[]";
+	else return invalid;
 
 	++currentPos;
 	currentPos = skipSpaces(currentPos);
 
-	if (src[currentPos] !== "\\")
-		return invalid;
+	if (src[currentPos] !== "\\") return invalid;
 
 	const closeNameBracketPos: number = src.indexOf(bracket[1], currentPos);
-	if (closeNameBracketPos === -1)
-		return invalid;
+	if (closeNameBracketPos === -1) return invalid;
 
 	const name: string = src.slice(currentPos + 1, closeNameBracketPos).trim();
-	if (!/^[a-zA-Z]+$/.test(name))
-		return invalid;
+	if (!/^[a-zA-Z]+$/.test(name)) return invalid;
 
 	currentPos = skipSpaces(closeNameBracketPos + 1);
 
@@ -54,8 +45,7 @@ function parseSingleKaTeXMacro(src: string): [string, KaTeXMacro] {
 		macro.args = Number(src.slice(currentPos + 1, closeArgsBracketPos).trim());
 		currentPos = closeArgsBracketPos + 1;
 
-		if (Number.isNaN(macro.args) || macro.args < 0)
-			return invalid;
+		if (Number.isNaN(macro.args) || macro.args < 0) return invalid;
 	} else if (src[currentPos] === "{") {
 		macro.args = 0;
 	} else {
@@ -65,8 +55,7 @@ function parseSingleKaTeXMacro(src: string): [string, KaTeXMacro] {
 	currentPos = skipSpaces(currentPos);
 
 	// parse {rule}
-	if (src[currentPos] !== "{")
-		return invalid;
+	if (src[currentPos] !== "{") return invalid;
 
 	++currentPos;
 	currentPos = skipSpaces(currentPos);
@@ -94,8 +83,11 @@ function parseSingleKaTeXMacro(src: string): [string, KaTeXMacro] {
 			break;
 		}
 
-		const argIndexEndPos = src.slice(numbersignPos + 1).search(/[^\d]/) + numbersignPos;
-		const argIndex: number = Number(src.slice(numbersignPos + 1, argIndexEndPos + 1));
+		const argIndexEndPos =
+			src.slice(numbersignPos + 1).search(/[^\d]/) + numbersignPos;
+		const argIndex: number = Number(
+			src.slice(numbersignPos + 1, argIndexEndPos + 1),
+		);
 
 		if (Number.isNaN(argIndex) || argIndex < 1 || macro.args < argIndex)
 			return invalid;
@@ -107,10 +99,8 @@ function parseSingleKaTeXMacro(src: string): [string, KaTeXMacro] {
 		currentPos = argIndexEndPos + 1;
 	}
 
-	if (macro.args === 0)
-		return [name, macro];
-	else
-		return [name + bracket[0], macro];
+	if (macro.args === 0) return [name, macro];
+	else return [name + bracket[0], macro];
 }
 
 export function parseKaTeXMacros(src: string): string {
@@ -118,8 +108,7 @@ export function parseKaTeXMacros(src: string): string {
 
 	for (const s of src.split("\n")) {
 		const [name, macro]: [string, KaTeXMacro] = parseSingleKaTeXMacro(s.trim());
-		if (name !== "")
-			result[name] = macro;
+		if (name !== "") result[name] = macro;
 	}
 
 	return JSON.stringify(result);
@@ -127,11 +116,22 @@ export function parseKaTeXMacros(src: string): string {
 
 // returns [expanded text, whether something is expanded, how many times we can expand more]
 // the boolean value is used for multi-pass expansions (macros can expand to other macros)
-function expandKaTeXMacroOnce(src: string, macros: { [name: string]: KaTeXMacro }, maxNumberOfExpansions: number)
-	: [string, boolean, number] {
+function expandKaTeXMacroOnce(
+	src: string,
+	macros: { [name: string]: KaTeXMacro },
+	maxNumberOfExpansions: number,
+): [string, boolean, number] {
 	const bracketKinds = 3;
-	const openBracketId: { [bracket: string]: number } = {"(": 0, "{": 1, "[": 2};
-	const closeBracketId: { [bracket: string]: number } = {")": 0, "}": 1, "]": 2};
+	const openBracketId: { [bracket: string]: number } = {
+		"(": 0,
+		"{": 1,
+		"[": 2,
+	};
+	const closeBracketId: { [bracket: string]: number } = {
+		")": 0,
+		"}": 1,
+		"]": 2,
+	};
 	const openBracketFromId = ["(", "{", "["];
 	const closeBracketFromId = [")", "}", "]"];
 
@@ -142,21 +142,29 @@ function expandKaTeXMacroOnce(src: string, macros: { [name: string]: KaTeXMacro
 		let result: BracketMapping = {};
 		const n = src.length;
 
-		let depths = new Array<number>(bracketKinds).fill(0);  // current bracket depth for "()", "{}", and "[]"
-		let buffer = Array.from(Array<number[]>(bracketKinds), () => Array<number>(n));
+		let depths = new Array<number>(bracketKinds).fill(0); // current bracket depth for "()", "{}", and "[]"
+		let buffer = Array.from(Array<number[]>(bracketKinds), () =>
+			Array<number>(n),
+		);
 
 		let isEscaped = false;
 
 		for (let i = 0; i < n; ++i) {
-			if (!isEscaped && src[i] === "\\" && i + 1 < n && ["{", "}", "\\"].includes(src[i+1])) {
+			if (
+				!isEscaped &&
+				src[i] === "\\" &&
+				i + 1 < n &&
+				["{", "}", "\\"].includes(src[i + 1])
+			) {
 				isEscaped = true;
 				continue;
 			}
-			if (isEscaped
-				|| (src[i] !== "\\"
-							&& !openBracketFromId.includes(src[i])
-							&& !closeBracketFromId.includes(src[i])))
-			{
+			if (
+				isEscaped ||
+				(src[i] !== "\\" &&
+					!openBracketFromId.includes(src[i]) &&
+					!closeBracketFromId.includes(src[i]))
+			) {
 				isEscaped = false;
 				continue;
 			}
@@ -178,27 +186,29 @@ function expandKaTeXMacroOnce(src: string, macros: { [name: string]: KaTeXMacro
 		return result;
 	})();
 
-	function expandSingleKaTeXMacro(expandedArgs: string[], macroName: string): string {
+	function expandSingleKaTeXMacro(
+		expandedArgs: string[],
+		macroName: string,
+	): string {
 		let result = "";
 		for (const block of macros[macroName].rule) {
-			if (typeof block === "string")
-				result += block;
-			else
-				result += expandedArgs[block - 1];
+			if (typeof block === "string") result += block;
+			else result += expandedArgs[block - 1];
 		}
 		return result;
 	}
 
 	// only expand src.slice(beginPos, endPos)
-	function expandKaTeXMacroImpl(beginPos: number, endPos: number): [string, boolean] {
-		if (endPos <= beginPos)
-			return ["", false];
+	function expandKaTeXMacroImpl(
+		beginPos: number,
+		endPos: number,
+	): [string, boolean] {
+		if (endPos <= beginPos) return ["", false];
 
 		const raw: string = src.slice(beginPos, endPos);
-		const fallback: string = raw;  // returned for invalid inputs or too many expansions
+		const fallback: string = raw; // returned for invalid inputs or too many expansions
 
-		if (maxNumberOfExpansions <= 0)
-			return [fallback, false];
+		if (maxNumberOfExpansions <= 0) return [fallback, false];
 		--maxNumberOfExpansions;
 
 		// search for a custom macro
@@ -218,14 +228,13 @@ function expandKaTeXMacroOnce(src: string, macros: { [name: string]: KaTeXMacro
 			checkedPos = src.indexOf("\\", checkedPos + 1);
 
 			// there is no macro to expand
-			if (checkedPos === -1)
-				return [raw, false];
+			if (checkedPos === -1) return [raw, false];
 
 			// is it a custom macro?
-			let nonAlphaPos = src.slice(checkedPos + 1).search(/[^A-Za-z]/) + checkedPos + 1;
+			let nonAlphaPos =
+				src.slice(checkedPos + 1).search(/[^A-Za-z]/) + checkedPos + 1;
 
-			if (nonAlphaPos === checkedPos)
-				nonAlphaPos = endPos;
+			if (nonAlphaPos === checkedPos) nonAlphaPos = endPos;
 
 			let macroNameCandidate = src.slice(checkedPos + 1, nonAlphaPos);
 			if (macros.hasOwnProperty(macroNameCandidate)) {
@@ -239,19 +248,17 @@ function expandKaTeXMacroOnce(src: string, macros: { [name: string]: KaTeXMacro
 			let nextOpenBracketPos = endPos;
 			for (let i = 0; i < bracketKinds; ++i) {
 				const pos = src.indexOf(openBracketFromId[i], checkedPos + 1);
-				if (pos !== -1 && pos < nextOpenBracketPos)
-					nextOpenBracketPos = pos;
+				if (pos !== -1 && pos < nextOpenBracketPos) nextOpenBracketPos = pos;
 			}
 
-			if (nextOpenBracketPos === endPos)
-				continue;  // there is no open bracket
+			if (nextOpenBracketPos === endPos) continue; // there is no open bracket
 
 			macroNameCandidate += src[nextOpenBracketPos];
 
 			if (macros.hasOwnProperty(macroNameCandidate)) {
 				macroBackslashPos = checkedPos;
 				macroArgBeginPos = nextOpenBracketPos;
-				macroArgEndPos = nextOpenBracketPos;  // to search the first arg from here
+				macroArgEndPos = nextOpenBracketPos; // to search the first arg from here
 				macroName = macroNameCandidate;
 				break;
 			}
@@ -265,31 +272,46 @@ function expandKaTeXMacroOnce(src: string, macros: { [name: string]: KaTeXMacro
 		for (let i = 0; i < numArgs; ++i) {
 			// find the first open bracket after what we've searched
 			const nextOpenBracketPos = src.indexOf(openBracket, macroArgEndPos);
-			if (nextOpenBracketPos === -1)
-				return [fallback, false];  // not enough arguments are provided
-			if (!bracketMapping[nextOpenBracketPos])
-				return [fallback, false];  // found open bracket doesn't correspond to any close bracket
+			if (nextOpenBracketPos === -1) return [fallback, false]; // not enough arguments are provided
+			if (!bracketMapping[nextOpenBracketPos]) return [fallback, false]; // found open bracket doesn't correspond to any close bracket
 
 			macroArgEndPos = bracketMapping[nextOpenBracketPos];
-			expandedArgs[i] = expandKaTeXMacroImpl(nextOpenBracketPos + 1, macroArgEndPos)[0];
+			expandedArgs[i] = expandKaTeXMacroImpl(
+				nextOpenBracketPos + 1,
+				macroArgEndPos,
+			)[0];
 		}
 
-		return [src.slice(beginPos, macroBackslashPos)
-						+ expandSingleKaTeXMacro(expandedArgs, macroName)
-						+ expandKaTeXMacroImpl(macroArgEndPos + 1, endPos)[0], true];
+		return [
+			src.slice(beginPos, macroBackslashPos) +
+				expandSingleKaTeXMacro(expandedArgs, macroName) +
+				expandKaTeXMacroImpl(macroArgEndPos + 1, endPos)[0],
+			true,
+		];
 	}
 
-	const [expandedText, expandedFlag]: [string, boolean] = expandKaTeXMacroImpl(0, src.length);
+	const [expandedText, expandedFlag]: [string, boolean] = expandKaTeXMacroImpl(
+		0,
+		src.length,
+	);
 	return [expandedText, expandedFlag, maxNumberOfExpansions];
 }
 
-export function expandKaTeXMacro(src: string, macrosAsJSONString: string, maxNumberOfExpansions: number): string {
+export function expandKaTeXMacro(
+	src: string,
+	macrosAsJSONString: string,
+	maxNumberOfExpansions: number,
+): string {
 	const macros = JSON.parse(macrosAsJSONString);
 
 	let expandMore = true;
 
-	while (expandMore && (0 < maxNumberOfExpansions))
-		[src, expandMore, maxNumberOfExpansions] = expandKaTeXMacroOnce(src, macros, maxNumberOfExpansions);
+	while (expandMore && 0 < maxNumberOfExpansions)
+		[src, expandMore, maxNumberOfExpansions] = expandKaTeXMacroOnce(
+			src,
+			macros,
+			maxNumberOfExpansions,
+		);
 
 	return src;
 }
diff --git a/packages/client/src/scripts/preprocess.ts b/packages/client/src/scripts/preprocess.ts
index da163b261..438a44d30 100644
--- a/packages/client/src/scripts/preprocess.ts
+++ b/packages/client/src/scripts/preprocess.ts
@@ -4,15 +4,19 @@ import { expandKaTeXMacro } from "@/scripts/katex-macro";
 
 export function preprocess(text: string): string {
 	if (defaultStore.state.enableCustomKaTeXMacro) {
-		const parsedKaTeXMacro = localStorage.getItem("customKaTeXMacroParsed") ?? "{}";
-		const maxNumberOfExpansions = 200;  // to prevent infinite expansion loops
+		const parsedKaTeXMacro =
+			localStorage.getItem("customKaTeXMacroParsed") ?? "{}";
+		const maxNumberOfExpansions = 200; // to prevent infinite expansion loops
 
 		let nodes = mfm.parse(text);
 
 		for (let node of nodes) {
 			if (node["type"] === "mathInline" || node["type"] === "mathBlock") {
-				node["props"]["formula"]
-					= expandKaTeXMacro(node["props"]["formula"], parsedKaTeXMacro, maxNumberOfExpansions);
+				node["props"]["formula"] = expandKaTeXMacro(
+					node["props"]["formula"],
+					parsedKaTeXMacro,
+					maxNumberOfExpansions,
+				);
 			}
 		}
 

From df83d4c21187e9239c1ab7ab2881459128707fa9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 30 Mar 2023 19:19:09 -0700
Subject: [PATCH 327/582] add argon

---
 packages/backend/package.json |  4 ++--
 pnpm-lock.yaml                | 45 ++++++++++++++++++++++++++++++-----
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index beea30a8a..61ba601cd 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -26,7 +26,7 @@
 		"@bull-board/api": "^4.6.4",
 		"@bull-board/koa": "^4.6.4",
 		"@bull-board/ui": "^4.6.4",
-		"@calckey/megalodon": "5.1.21",
+		"@calckey/megalodon": "5.1.23",
 		"@discordapp/twemoji": "14.0.2",
 		"@elastic/elasticsearch": "7.17.0",
 		"@koa/cors": "3.4.3",
@@ -39,6 +39,7 @@
 		"@tensorflow/tfjs": "^4.2.0",
 		"ajv": "8.11.2",
 		"archiver": "5.3.1",
+		"argon2": "^0.30.3",
 		"autobind-decorator": "2.4.0",
 		"autolinker": "4.0.0",
 		"autwh": "0.1.0",
@@ -82,7 +83,6 @@
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
-		"@calckey/megalodon": "5.1.23",
 		"mfm-js": "0.23.2",
 		"mime-types": "2.1.35",
 		"multer": "1.4.4-lts.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 945197b4f..1446d8df6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -122,6 +122,9 @@ importers:
       archiver:
         specifier: 5.3.1
         version: 5.3.1
+      argon2:
+        specifier: ^0.30.3
+        version: 0.30.3
       autobind-decorator:
         specifier: 2.4.0
         version: 2.4.0
@@ -1576,6 +1579,24 @@ packages:
       '@lit-labs/ssr-dom-shim': 1.0.0
     dev: true
 
+  /@mapbox/node-pre-gyp@1.0.10:
+    resolution: {integrity: sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==}
+    hasBin: true
+    dependencies:
+      detect-libc: 2.0.1
+      https-proxy-agent: 5.0.1
+      make-dir: 3.1.0
+      node-fetch: 2.6.8
+      nopt: 5.0.0
+      npmlog: 5.0.1
+      rimraf: 3.0.2
+      semver: 7.3.8
+      tar: 6.1.13
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
   /@mapbox/node-pre-gyp@1.0.9:
     resolution: {integrity: sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==}
     hasBin: true
@@ -1711,6 +1732,11 @@ packages:
       sshpk: 1.17.0
     dev: false
 
+  /@phc/format@1.0.0:
+    resolution: {integrity: sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==}
+    engines: {node: '>=10'}
+    dev: false
+
   /@phosphor-icons/web@2.0.3:
     resolution: {integrity: sha512-9oYmohi2fo87w3DbtfjBoJxrklVojgXq2wuGcqxKccj2TxMq7UIusKDrGUZYOQHM9pUKkh+kvfmutETMGDR6gg==}
     dev: true
@@ -3433,7 +3459,6 @@ packages:
       delegates: 1.0.0
       readable-stream: 3.6.0
     dev: false
-    optional: true
 
   /are-we-there-yet@3.0.1:
     resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==}
@@ -3450,6 +3475,19 @@ packages:
     resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
     dev: true
 
+  /argon2@0.30.3:
+    resolution: {integrity: sha512-DoH/kv8c9127ueJSBxAVJXinW9+EuPA3EMUxoV2sAY1qDE5H9BjTyVF/aD2XyHqbqUWabgBkIfcP3ZZuGhbJdg==}
+    engines: {node: '>=14.0.0'}
+    requiresBuild: true
+    dependencies:
+      '@mapbox/node-pre-gyp': 1.0.10
+      '@phc/format': 1.0.0
+      node-addon-api: 5.0.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
   /argparse@1.0.10:
     resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
     dependencies:
@@ -6665,7 +6703,6 @@ packages:
       strip-ansi: 6.0.1
       wide-align: 1.1.5
     dev: false
-    optional: true
 
   /gauge@4.0.4:
     resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==}
@@ -8848,7 +8885,6 @@ packages:
     dependencies:
       semver: 6.3.0
     dev: false
-    optional: true
 
   /make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
@@ -9433,7 +9469,6 @@ packages:
     dependencies:
       abbrev: 1.1.1
     dev: false
-    optional: true
 
   /nopt@6.0.0:
     resolution: {integrity: sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==}
@@ -9540,7 +9575,6 @@ packages:
       gauge: 3.0.2
       set-blocking: 2.0.0
     dev: false
-    optional: true
 
   /npmlog@6.0.2:
     resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==}
@@ -11371,7 +11405,6 @@ packages:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
     dev: false
-    optional: true
 
   /semver@7.3.8:
     resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}

From d5161ad8608703999630fe7f3ded2e78fd074ed3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 30 Mar 2023 19:34:42 -0700
Subject: [PATCH 328/582] docs: add note about reverse  migration

---
 docs/migrate.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/migrate.md b/docs/migrate.md
index fa16bbe68..1a8dfbf37 100644
--- a/docs/migrate.md
+++ b/docs/migrate.md
@@ -76,3 +76,7 @@ git pull --ff
 NODE_ENV=production pnpm run migrate
 # build using prefered method
 ```
+
+## Reverse
+
+You ***cannot*** migrate back to Misskey from Calckey due to re-hashing passwords on signin with argon2. You can migrate from to Calckey to Foundkey, though.

From 021f66797689e1a6d20acfcce87af0be76411671 Mon Sep 17 00:00:00 2001
From: kabo2468 <28654659+kabo2468@users.noreply.github.com>
Date: Thu, 17 Nov 2022 09:34:23 +0900
Subject: [PATCH 329/582] fix: don't nyaize quoted text

---
 .../backend/src/models/repositories/note.ts    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index 882cfdd31..ce589e173 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -265,12 +265,22 @@ export const NoteRepository = db.getRepository(Note).extend({
 
 		if (packed.user.isCat && packed.text) {
 			const tokens = packed.text ? mfm.parse(packed.text) : [];
-			mfm.inspect(tokens, (node) => {
-				if (node.type === "text") {
-					// TODO: quoteなtextはskip
+			function nyaizeNode(node: mfm.MfmNode) {
+				if (node.type === "quote")
+					return;
+				if (node.type === "text")
 					node.props.text = nyaize(node.props.text);
+
+				if (node.children) {
+					for (const child of node.children) {
+						nyaizeNode(child);
+					}
 				}
-			});
+			}
+
+			for (const node of tokens)
+				nyaizeNode(node);
+
 			packed.text = mfm.toString(tokens);
 		}
 

From 1f6fcdad69f2195bcd52c39c4659cb57563b7b75 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 31 Mar 2023 22:06:12 -0700
Subject: [PATCH 330/582] audio on mobile fix

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

diff --git a/packages/client/src/scripts/sound.ts b/packages/client/src/scripts/sound.ts
index 29dd181e9..07d543a33 100644
--- a/packages/client/src/scripts/sound.ts
+++ b/packages/client/src/scripts/sound.ts
@@ -30,7 +30,7 @@ export function play(type: string) {
 
 export function playFile(file: string, volume: number) {
 	const masterVolume = ColdDeviceStorage.get("sound_masterVolume");
-	if (masterVolume === 0) return;
+	if (masterVolume === 0 || volume === 0 || file.toLowerCase().includes("none")) return;
 
 	const audio = setVolume(getAudio(file), volume);
 	audio.play();

From 55cf59667bd9e0d1d8c408d4d3713ccb67b83960 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Sat, 1 Apr 2023 06:53:29 +0000
Subject: [PATCH 331/582] feat: add option to boost with Home and
 Followers-only visibility (#9788)

Closes: #9777

This pull request includes UI changes (please check the attached images).

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9788
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 locales/en-US.yml                             |   3 +
 locales/ja-JP.yml                             |   3 +
 packages/client/src/components/MkMenu.vue     |  24 +++-
 .../client/src/components/MkRenoteButton.vue  | 103 +++++++++++++++---
 packages/client/src/types/menu.ts             |  27 ++++-
 5 files changed, 134 insertions(+), 26 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 9f675778a..880203922 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -96,6 +96,9 @@ unfollow: "Unfollow"
 followRequestPending: "Follow request pending"
 enterEmoji: "Enter an emoji"
 renote: "Boost"
+renoteAsUnlisted: "Boost (Unlisted)"
+renoteToFollowers: "Boost (Followers)"
+renoteToRecipients: "Boost (Recipients)"
 unrenote: "Take back boost"
 renoted: "Boosted."
 cantRenote: "This post can't be boosted."
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b7ead22e8..0bdc4af1d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -96,6 +96,9 @@ unfollow: "フォロー解除"
 followRequestPending: "フォロー許可待ち"
 enterEmoji: "絵文字を入力"
 renote: "ブースト"
+renoteAsUnlisted: "ホームにブースト"
+renoteToFollowers: "フォロワー限定でブースト"
+renoteToRecipients: "宛先のユーザーにブースト"
 unrenote: "ブースト解除"
 renoted: "ブーストしました。"
 cantRenote: "この投稿はブーストできません。"
diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index 1b8a609c9..c0502387a 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -10,20 +10,26 @@
 		<template v-for="(item, i) in items2">
 			<div v-if="item === null" class="divider"></div>
 			<span v-else-if="item.type === 'label'" class="label item">
-				<span>{{ item.text }}</span>
+				<span :style="item.textStyle || ''">{{ item.text }}</span>
 			</span>
 			<span v-else-if="item.type === 'pending'" :tabindex="i" class="pending item">
 				<span><MkEllipsis/></span>
 			</span>
 			<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="i" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
+				<span v-else-if="item.icons">
+					<i v-for="icon in item.icons" class="ph-fw ph-lg" :class="icon"></i>
+				</span>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
-				<span>{{ item.text }}</span>
+				<span :style="item.textStyle || ''">{{ item.text }}</span>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</MkA>
 			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="i" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
-				<span>{{ item.text }}</span>
+				<span v-else-if="item.icons">
+					<i v-for="icon in item.icons" class="ph-fw ph-lg" :class="icon"></i>
+				</span>
+				<span :style="item.textStyle || ''">{{ item.text }}</span>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</a>
 			<button v-else-if="item.type === 'user' && !items.hidden" :tabindex="i" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
@@ -31,17 +37,23 @@
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</button>
 			<span v-else-if="item.type === 'switch'" :tabindex="i" class="item" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch">{{ item.text }}</FormSwitch>
+				<FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch" :style="item.textStyle || ''">{{ item.text }}</FormSwitch>
 			</span>
 			<button v-else-if="item.type === 'parent'" :tabindex="i" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
-				<span>{{ item.text }}</span>
+				<span v-else-if="item.icons">
+					<i v-for="icon in item.icons" class="ph-fw ph-lg" :class="icon"></i>
+				</span>
+				<span :style="item.textStyle || ''">{{ item.text }}</span>
 				<span class="caret"><i class="ph-caret-right ph-bold ph-lg ph-fw ph-lg"></i></span>
 			</button>
 			<button v-else-if="!item.hidden" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
 				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
+				<span v-else-if="item.icons">
+					<i v-for="icon in item.icons" class="ph-fw ph-lg" :class="icon"></i>
+				</span>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
-				<span>{{ item.text }}</span>
+				<span :style="item.textStyle || ''">{{ item.text }}</span>
 				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
 			</button>
 		</template>
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index 5a9369a90..11bcd8bd5 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -64,24 +64,91 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 	const users = renotes.map(x => x.user.id);
 	const hasRenotedBefore = users.includes($i.id);
 
-	let buttonActions = [{
-		text: i18n.ts.renote,
-		icon: 'ph-repeat ph-bold ph-lg',
-		danger: false,
-		action: () => {
-			os.api('notes/create', {
-				renoteId: props.note.id,
-				visibility: props.note.visibility,
-			});
-			const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
-			if (el) {
-				const rect = el.getBoundingClientRect();
-				const x = rect.left + (el.offsetWidth / 2);
-				const y = rect.top + (el.offsetHeight / 2);
-				os.popup(Ripple, { x, y }, {}, 'end');
-			}
-		},
-	}];
+	let buttonActions = [];
+
+	if (props.note.visibility === 'public') {
+		buttonActions.push({
+			text: i18n.ts.renote,
+			textStyle: 'font-weight: bold',
+			icon: 'ph-repeat ph-bold ph-lg',
+			danger: false,
+			action: () => {
+				os.api('notes/create', {
+					renoteId: props.note.id,
+					visibility: 'public',
+				});
+				const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
+				if (el) {
+					const rect = el.getBoundingClientRect();
+					const x = rect.left + (el.offsetWidth / 2);
+					const y = rect.top + (el.offsetHeight / 2);
+					os.popup(Ripple, { x, y }, {}, 'end');
+				}
+			},
+		});
+	}
+
+	if (['public', 'home'].includes(props.note.visibility)) {
+		buttonActions.push({
+			text: i18n.ts.renoteAsUnlisted,
+			icons: ['ph-repeat ph-bold ph-lg', 'ph-house ph-bold ph-lg'],
+			danger: false,
+			action: () => {
+				os.api('notes/create', {
+					renoteId: props.note.id,
+					visibility: 'home',
+				});
+				const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
+				if (el) {
+					const rect = el.getBoundingClientRect();
+					const x = rect.left + (el.offsetWidth / 2);
+					const y = rect.top + (el.offsetHeight / 2);
+					os.popup(Ripple, { x, y }, {}, 'end');
+				}
+			},
+		});
+	}
+
+	if (props.note.visibility === 'specified') {
+		buttonActions.push({
+			text: i18n.ts.renoteToRecipients,
+			icons: ['ph-repeat ph-bold ph-lg', 'ph-envelope-simple-open ph-bold ph-lg'],
+			danger: false,
+			action: () => {
+				os.api('notes/create', {
+					renoteId: props.note.id,
+					visibility: 'specified',
+					visibleUserIds: props.note.visibleUserIds,
+				});
+				const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
+				if (el) {
+					const rect = el.getBoundingClientRect();
+					const x = rect.left + (el.offsetWidth / 2);
+					const y = rect.top + (el.offsetHeight / 2);
+					os.popup(Ripple, { x, y }, {}, 'end');
+				}
+			},
+		});
+	} else {
+		buttonActions.push({
+			text: i18n.ts.renoteToFollowers,
+			icons: ['ph-repeat ph-bold ph-lg', 'ph-lock-simple-open ph-bold ph-lg'],
+			danger: false,
+			action: () => {
+				os.api('notes/create', {
+					renoteId: props.note.id,
+					visibility: 'followers',
+				});
+				const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
+				if (el) {
+					const rect = el.getBoundingClientRect();
+					const x = rect.left + (el.offsetWidth / 2);
+					const y = rect.top + (el.offsetHeight / 2);
+					os.popup(Ripple, { x, y }, {}, 'end');
+				}
+			},
+		});
+	}
 
 	if (!defaultStore.state.seperateRenoteQuote) {
 		buttonActions.push({
diff --git a/packages/client/src/types/menu.ts b/packages/client/src/types/menu.ts
index e1bfc20a3..a7ce81c71 100644
--- a/packages/client/src/types/menu.ts
+++ b/packages/client/src/types/menu.ts
@@ -5,11 +5,16 @@ export type MenuAction = (ev: MouseEvent) => void;
 
 export type MenuDivider = null;
 export type MenuNull = undefined;
-export type MenuLabel = { type: "label"; text: string };
+export type MenuLabel = {
+	type: "label";
+	text: string;
+	textStyle?: string;
+};
 export type MenuLink = {
 	type: "link";
 	to: string;
 	text: string;
+	textStyle?: string;
 	icon?: string;
 	indicate?: boolean;
 	avatar?: Misskey.entities.User;
@@ -20,6 +25,7 @@ export type MenuA = {
 	target?: string;
 	download?: string;
 	text: string;
+	textStyle?: string;
 	icon?: string;
 	indicate?: boolean;
 };
@@ -35,11 +41,13 @@ export type MenuSwitch = {
 	type: "switch";
 	ref: Ref<boolean>;
 	text: string;
+	textStyle?: string;
 	disabled?: boolean;
 };
 export type MenuButton = {
 	type?: "button";
 	text: string;
+	textStyle?: string;
 	icon?: string;
 	indicate?: boolean;
 	danger?: boolean;
@@ -48,9 +56,22 @@ export type MenuButton = {
 	avatar?: Misskey.entities.User;
 	action: MenuAction;
 };
+export type MenuButtonMultipleIcons = {
+	type?: "button";
+	text: string;
+	textStyle?: string;
+	icons: string[];
+	indicate?: boolean;
+	danger?: boolean;
+	active?: boolean;
+	hidden?: boolean;
+	avatar?: Misskey.entities.User;
+	action: MenuAction;
+};
 export type MenuParent = {
 	type: "parent";
 	text: string;
+	textStyle?: string;
 	icon?: string;
 	children: OuterMenuItem[];
 };
@@ -66,9 +87,10 @@ type OuterMenuItem =
 	| MenuUser
 	| MenuSwitch
 	| MenuButton
+	| MenuButtonMultipleIcons
 	| MenuParent;
 type OuterPromiseMenuItem = Promise<
-	MenuLabel | MenuLink | MenuA | MenuUser | MenuSwitch | MenuButton | MenuParent
+	MenuLabel | MenuLink | MenuA | MenuUser | MenuSwitch | MenuButton | MenuButtonMultipleIcons | MenuParent
 >;
 export type MenuItem = OuterMenuItem | OuterPromiseMenuItem;
 export type InnerMenuItem =
@@ -80,4 +102,5 @@ export type InnerMenuItem =
 	| MenuUser
 	| MenuSwitch
 	| MenuButton
+	| MenuButtonMultipleIcons
 	| MenuParent;

From a86f8d49112c808629d13b35da156b99a32293f3 Mon Sep 17 00:00:00 2001
From: Kaitlyn Allan <kaitlyn.allan@enlabs.cloud>
Date: Sat, 1 Apr 2023 21:42:03 +1000
Subject: [PATCH 332/582] Improve performance of charts Fix some undefined !==
 deleted issues

---
 .../src/server/api/stream/channels/channel.ts | 11 +++---
 .../server/api/stream/channels/messaging.ts   | 13 +++----
 .../backend/src/server/api/stream/index.ts    | 19 +++++------
 packages/backend/src/services/chart/core.ts   | 34 ++++++++++++++-----
 4 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index 841c84af8..5d2bb24f5 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -10,7 +10,7 @@ export default class extends Channel {
 	public static shouldShare = false;
 	public static requireCredential = false;
 	private channelId: string;
-	private typers: Record<User["id"], Date> = {};
+	private typers: Map<User["id"], Date> = new Map();
 	private emitTypersIntervalId: ReturnType<typeof setInterval>;
 
 	constructor(id: string, connection: Channel["connection"]) {
@@ -44,8 +44,8 @@ export default class extends Channel {
 	private onEvent(data: StreamMessages["channel"]["payload"]) {
 		if (data.type === "typing") {
 			const id = data.body;
-			const begin = this.typers[id] == null;
-			this.typers[id] = new Date();
+			const begin = !this.typers.has(id);
+			this.typers.set(id, new Date());
 			if (begin) {
 				this.emitTypers();
 			}
@@ -58,10 +58,11 @@ export default class extends Channel {
 		// Remove not typing users
 		for (const [userId, date] of Object.entries(this.typers)) {
 			if (now.getTime() - date.getTime() > 5000)
-				this.typers[userId] = undefined;
+				this.typers.delete(userId);
 		}
 
-		const users = await Users.packMany(Object.keys(this.typers), null, {
+		const keys = Array.from(this.typers.keys());
+		const users = await Users.packMany(keys, null, {
 			detail: false,
 		});
 
diff --git a/packages/backend/src/server/api/stream/channels/messaging.ts b/packages/backend/src/server/api/stream/channels/messaging.ts
index dc1825059..ec477e9b2 100644
--- a/packages/backend/src/server/api/stream/channels/messaging.ts
+++ b/packages/backend/src/server/api/stream/channels/messaging.ts
@@ -20,7 +20,7 @@ export default class extends Channel {
 	private subCh:
 		| `messagingStream:${User["id"]}-${User["id"]}`
 		| `messagingStream:${UserGroup["id"]}`;
-	private typers: Record<User["id"], Date> = {};
+	private typers: Map<User["id"], Date> = new Map();
 	private emitTypersIntervalId: ReturnType<typeof setInterval>;
 
 	constructor(id: string, connection: Channel["connection"]) {
@@ -66,8 +66,8 @@ export default class extends Channel {
 	) {
 		if (data.type === "typing") {
 			const id = data.body;
-			const begin = this.typers[id] == null;
-			this.typers[id] = new Date();
+			const begin = !this.typers.has(id);
+			this.typers.set(id, new Date());
 			if (begin) {
 				this.emitTypers();
 			}
@@ -107,12 +107,13 @@ export default class extends Channel {
 		const now = new Date();
 
 		// Remove not typing users
-		for (const [userId, date] of Object.entries(this.typers)) {
+		for (const [userId, date] of this.typers.entries()) {
 			if (now.getTime() - date.getTime() > 5000)
-				this.typers[userId] = undefined;
+				this.typers.delete(userId);
 		}
 
-		const users = await Users.packMany(Object.keys(this.typers), null, {
+		const ids = Array.from(this.typers.keys());
+		const users = await Users.packMany(ids, null, {
 			detail: false,
 		});
 
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index 061a17be2..a34b1e9aa 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -42,7 +42,7 @@ export default class Connection {
 	private wsConnection: websocket.connection;
 	public subscriber: StreamEventEmitter;
 	private channels: Channel[] = [];
-	private subscribingNotes: any = {};
+	private subscribingNotes: Map<string, number> = new Map();
 	private cachedNotes: Packed<"Note">[] = [];
 	private isMastodonCompatible: boolean = false;
 	private host: string;
@@ -339,13 +339,10 @@ export default class Connection {
 	private onSubscribeNote(payload: any) {
 		if (!payload.id) return;
 
-		if (this.subscribingNotes[payload.id] == null) {
-			this.subscribingNotes[payload.id] = 0;
-		}
+		const c = this.subscribingNotes.get(payload.id) || 0;
+		this.subscribingNotes.set(payload.id, c + 1);
 
-		this.subscribingNotes[payload.id]++;
-
-		if (this.subscribingNotes[payload.id] === 1) {
+		if (!c) {
 			this.subscriber.on(`noteStream:${payload.id}`, this.onNoteStreamMessage);
 		}
 	}
@@ -356,11 +353,13 @@ export default class Connection {
 	private onUnsubscribeNote(payload: any) {
 		if (!payload.id) return;
 
-		this.subscribingNotes[payload.id]--;
-		if (this.subscribingNotes[payload.id] <= 0) {
-			this.subscribingNotes[payload.id] = undefined;
+		const c = this.subscribingNotes.get(payload.id) || 0;
+		if (c <= 1) {
+			this.subscribingNotes.delete(payload.id);
 			this.subscriber.off(`noteStream:${payload.id}`, this.onNoteStreamMessage);
+			return;
 		}
+		this.subscribingNotes.set(payload.id, c - 1);
 	}
 
 	private async onNoteStreamMessage(data: StreamMessages["note"]["payload"]) {
diff --git a/packages/backend/src/services/chart/core.ts b/packages/backend/src/services/chart/core.ts
index 750a6e0ad..207d8a93c 100644
--- a/packages/backend/src/services/chart/core.ts
+++ b/packages/backend/src/services/chart/core.ts
@@ -17,6 +17,7 @@ import {
 } from "@/prelude/time.js";
 import { getChartInsertLock } from "@/misc/app-lock.js";
 import { db } from "@/db/postgre.js";
+import promiseLimit from "promise-limit";
 
 const logger = new Logger("chart", "white", process.env.NODE_ENV !== "test");
 
@@ -472,7 +473,8 @@ export default abstract class Chart<T extends Schema> {
 	protected commit(diff: Commit<T>, group: string | null = null): void {
 		for (const [k, v] of Object.entries(diff)) {
 			if (v == null || v === 0 || (Array.isArray(v) && v.length === 0))
-				diff[k] = undefined;
+				// rome-ignore lint/performance/noDelete: needs to be deleted not just set to undefined
+				delete diff[k];
 		}
 		this.buffer.push({
 			diff,
@@ -554,7 +556,7 @@ export default abstract class Chart<T extends Schema> {
 
 			// bake unique count
 			for (const [k, v] of Object.entries(finalDiffs)) {
-				if (this.schema[k].uniqueIncrement) {
+				if (this.schema[k].uniqueIncrement && Array.isArray(v) && v.length > 0) {
 					const name = (columnPrefix +
 						k.replaceAll(".", columnDot)) as keyof Columns<T>;
 					const tempColumnName = (uniqueTempColumnPrefix +
@@ -646,16 +648,32 @@ export default abstract class Chart<T extends Schema> {
 			);
 		};
 
-		const groups = removeDuplicates(this.buffer.map((log) => log.group));
+		const startCount = this.buffer.length;
 
+		const groups = removeDuplicates(this.buffer.map((log) => log.group));
+		const groupCount = groups.length;
+
+		// Limit the number of concurrent chart update queries executed on the database
+		// to 25 at a time, so as avoid excessive IO spinlocks like when 8k queries are
+		// sent out at once.
+		const limit = promiseLimit(25);
+
+		const startTime = Date.now();
 		await Promise.all(
-			groups.map((group) =>
-				Promise.all([
-					this.claimCurrentLog(group, "hour"),
-					this.claimCurrentLog(group, "day"),
-				]).then(([logHour, logDay]) => update(logHour, logDay)),
+			groups.map((group) => 
+				limit(() =>
+					Promise.all([
+						this.claimCurrentLog(group, "hour"),
+						this.claimCurrentLog(group, "day"),
+					]).then(([logHour, logDay]) => update(logHour, logDay)),
+				),
 			),
 		);
+
+		const duration = Date.now() - startTime;
+		logger.info(
+			`Saved ${startCount} (${groupCount} unique) ${this.name} items in ${duration}ms (${this.buffer.length} remaining)`,
+		);
 	}
 
 	public async tick(

From 928c539440fbe2646a9032d81d64beb71e8ba543 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 1 Apr 2023 21:18:55 +0900
Subject: [PATCH 333/582] Fix a bug in macro expander

---
 packages/client/src/scripts/katex-macro.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/client/src/scripts/katex-macro.ts b/packages/client/src/scripts/katex-macro.ts
index 4368095be..4c176b296 100644
--- a/packages/client/src/scripts/katex-macro.ts
+++ b/packages/client/src/scripts/katex-macro.ts
@@ -264,6 +264,8 @@ function expandKaTeXMacroOnce(
 			}
 		}
 
+		if (!macros.hasOwnProperty(macroName)) return [fallback, false];
+
 		const numArgs: number = macros[macroName].args;
 		const openBracket: string = macroName.slice(-1);
 

From 52f06a2e146d302140c4c3e66f272ff1256b1b45 Mon Sep 17 00:00:00 2001
From: Kaitlyn Allan <kaitlyn.allan@enlabs.cloud>
Date: Sat, 1 Apr 2023 22:49:14 +1000
Subject: [PATCH 334/582] Clarify variable names

---
 .../src/server/api/stream/channels/channel.ts        |  4 ++--
 .../src/server/api/stream/channels/messaging.ts      |  4 ++--
 packages/backend/src/server/api/stream/index.ts      | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index 5d2bb24f5..5a0f70981 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -61,8 +61,8 @@ export default class extends Channel {
 				this.typers.delete(userId);
 		}
 
-		const keys = Array.from(this.typers.keys());
-		const users = await Users.packMany(keys, null, {
+		const userIds = Array.from(this.typers.keys());
+		const users = await Users.packMany(userIds, null, {
 			detail: false,
 		});
 
diff --git a/packages/backend/src/server/api/stream/channels/messaging.ts b/packages/backend/src/server/api/stream/channels/messaging.ts
index ec477e9b2..f20b1ead1 100644
--- a/packages/backend/src/server/api/stream/channels/messaging.ts
+++ b/packages/backend/src/server/api/stream/channels/messaging.ts
@@ -112,8 +112,8 @@ export default class extends Channel {
 				this.typers.delete(userId);
 		}
 
-		const ids = Array.from(this.typers.keys());
-		const users = await Users.packMany(ids, null, {
+		const userIds = Array.from(this.typers.keys());
+		const users = await Users.packMany(userIds, null, {
 			detail: false,
 		});
 
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index a34b1e9aa..03cecf542 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -339,10 +339,10 @@ export default class Connection {
 	private onSubscribeNote(payload: any) {
 		if (!payload.id) return;
 
-		const c = this.subscribingNotes.get(payload.id) || 0;
-		this.subscribingNotes.set(payload.id, c + 1);
+		const current = this.subscribingNotes.get(payload.id) || 0;
+		this.subscribingNotes.set(payload.id, current + 1);
 
-		if (!c) {
+		if (!current) {
 			this.subscriber.on(`noteStream:${payload.id}`, this.onNoteStreamMessage);
 		}
 	}
@@ -353,13 +353,13 @@ export default class Connection {
 	private onUnsubscribeNote(payload: any) {
 		if (!payload.id) return;
 
-		const c = this.subscribingNotes.get(payload.id) || 0;
-		if (c <= 1) {
+		const current = this.subscribingNotes.get(payload.id) || 0;
+		if (current <= 1) {
 			this.subscribingNotes.delete(payload.id);
 			this.subscriber.off(`noteStream:${payload.id}`, this.onNoteStreamMessage);
 			return;
 		}
-		this.subscribingNotes.set(payload.id, c - 1);
+		this.subscribingNotes.set(payload.id, current - 1);
 	}
 
 	private async onNoteStreamMessage(data: StreamMessages["note"]["payload"]) {

From f07bcf2c5a8f099a8a45afa8d73cc07645eb8358 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 11:28:34 -0700
Subject: [PATCH 335/582] feat: :sparkles: search now searches posts and users

---
 packages/client/src/pages/explore.vue | 34 +------------
 packages/client/src/pages/search.vue  | 69 +++++++++++++++++++++++++--
 2 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 8865a6466..cbc53f066 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -17,20 +17,6 @@
 				<swiper-slide>
 					<XUsers/>
 				</swiper-slide>
-				<swiper-slide>
-					<div>
-						<MkInput v-model="searchQuery" :debounce="true" type="search" class="_formBlock">
-							<template #prefix><i class="ph-magnifying-glass ph-bold ph-lg"></i></template>
-							<template #label>{{ i18n.ts.searchUser }}</template>
-						</MkInput>
-						<MkRadios v-model="searchOrigin" class="_formBlock">
-							<option value="combined">{{ i18n.ts.all }}</option>
-							<option value="local">{{ i18n.ts.local }}</option>
-							<option value="remote">{{ i18n.ts.remote }}</option>
-						</MkRadios>
-					</div>
-					<XUserList v-if="searchQuery" ref="searchEl" class="_gap" :pagination="searchPagination"/>
-				</swiper-slide>
 			</swiper>
 		</MkSpacer>
 	</div>
@@ -44,12 +30,9 @@ import { Swiper, SwiperSlide } from 'swiper/vue';
 import XFeatured from './explore.featured.vue';
 import XUsers from './explore.users.vue';
 import type MkFolder from '@/components/MkFolder.vue';
-import MkInput from '@/components/form/input.vue';
-import MkRadios from '@/components/form/radios.vue';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
 import { i18n } from '@/i18n';
-import XUserList from '@/components/MkUserList.vue';
 import { defaultStore } from '@/store';
 import 'swiper/scss';
 import 'swiper/scss/virtual';
@@ -58,27 +41,16 @@ const props = defineProps<{
 	tag?: string;
 }>();
 
-const tabs = ['featured', 'users', 'search'];
+const tabs = ['featured', 'users'];
 let tab = $ref(tabs[0]);
 watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
 
 let tagsEl = $ref<InstanceType<typeof MkFolder>>();
-let searchQuery = $ref(null);
-let searchOrigin = $ref('combined');
 
 watch(() => props.tag, () => {
 	if (tagsEl) tagsEl.toggleContent(props.tag == null);
 });
 
-const searchPagination = {
-	endpoint: 'users/search' as const,
-	limit: 10,
-	params: computed(() => (searchQuery && searchQuery !== '') ? {
-		query: searchQuery,
-		origin: searchOrigin,
-	} : null),
-};
-
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => [{
@@ -89,10 +61,6 @@ const headerTabs = $computed(() => [{
 	key: 'users',
 	icon: 'ph-users ph-bold ph-lg',
 	title: i18n.ts.users,
-}, {
-	key: 'search',
-	icon: 'ph-magnifying-glass ph-bold ph-lg',
-	title: i18n.ts.search,
 }]);
 
 definePageMetadata(computed(() => ({
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index c2a1d2af6..791e89a7f 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -1,24 +1,43 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :content-max="800">
-		<XNotes ref="notes" :pagination="pagination"/>
+		<swiper
+				:modules="[Virtual]"
+				:space-between="20"
+				:virtual="true"
+				:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
+				@swiper="setSwiperRef"
+				@slide-change="onSlideChange"
+			>
+				<swiper-slide>
+					<XNotes ref="notes" :pagination="notesPagination"/>
+				</swiper-slide>
+				<swiper-slide>
+					<XUserList ref="searchEl" class="_gap" :pagination="usersPagination"/>
+				</swiper-slide>
+			</swiper>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
+import { computed, watch, onMounted } from 'vue';
+import { Virtual } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/vue';
 import XNotes from '@/components/MkNotes.vue';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import { defaultStore } from '@/store';
+import 'swiper/scss';
+import 'swiper/scss/virtual';
 
 const props = defineProps<{
 	query: string;
 	channel?: string;
 }>();
 
-const pagination = {
+const notesPagination = {
 	endpoint: 'notes/search' as const,
 	limit: 10,
 	params: computed(() => ({
@@ -27,9 +46,49 @@ const pagination = {
 	})),
 };
 
+const usersPagination = {
+	endpoint: 'users/search' as const,
+	limit: 10,
+	params: computed(() => ({
+		query: props.query,
+		origin: 'combined',
+	})),
+};
+
+const tabs = ['search', 'users'];
+let tab = $ref(tabs[0]);
+watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+
 const headerActions = $computed(() => []);
 
-const headerTabs = $computed(() => []);
+const headerTabs = $computed(() => [ {
+	key: 'search',
+	icon: 'ph-magnifying-glass ph-bold ph-lg',
+	title: i18n.ts.search,
+}, {
+	key: 'users',
+	icon: 'ph-users ph-bold ph-lg',
+	title: i18n.ts.users,
+}]);
+
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
+
+onMounted(() => {
+	syncSlide(tabs.indexOf(swiperRef.activeIndex));
+});
 
 definePageMetadata(computed(() => ({
 	title: i18n.t('searchWith', { q: props.query }),

From e5d501ff959d21ae0e0565c888288a4928a40d7b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 11:29:01 -0700
Subject: [PATCH 336/582] dev19

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

diff --git a/package.json b/package.json
index 57e1cf647..7f5d569d9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev18",
+	"version": "13.2.0-dev19",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 58afaee6308063e06e1c1267f12decba18a1b1ba Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 11:39:27 -0700
Subject: [PATCH 337/582] fix search import

---
 packages/client/src/pages/search.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index 791e89a7f..580281dbe 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -14,7 +14,7 @@
 					<XNotes ref="notes" :pagination="notesPagination"/>
 				</swiper-slide>
 				<swiper-slide>
-					<XUserList ref="searchEl" class="_gap" :pagination="usersPagination"/>
+					<XUserList ref="users" class="_gap" :pagination="usersPagination"/>
 				</swiper-slide>
 			</swiper>
 	</MkSpacer>
@@ -26,6 +26,7 @@ import { computed, watch, onMounted } from 'vue';
 import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
 import XNotes from '@/components/MkNotes.vue';
+import XUserList from '@/components/MkUserList.vue';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { defaultStore } from '@/store';
@@ -55,16 +56,16 @@ const usersPagination = {
 	})),
 };
 
-const tabs = ['search', 'users'];
+const tabs = ['notes', 'users'];
 let tab = $ref(tabs[0]);
 watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
 
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => [ {
-	key: 'search',
+	key: 'notes',
 	icon: 'ph-magnifying-glass ph-bold ph-lg',
-	title: i18n.ts.search,
+	title: i18n.ts.notes,
 }, {
 	key: 'users',
 	icon: 'ph-users ph-bold ph-lg',

From 711ef03f39247d4f109cfb8efe4cba4df0d30048 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 11:56:43 -0700
Subject: [PATCH 338/582] feat: :sparkles: help menu in navbar

---
 package.json                                  |  2 +-
 packages/client/src/navbar.ts                 | 69 ------------------
 packages/client/src/scripts/helpMenu.ts       | 72 +++++++++++++++++++
 packages/client/src/store.ts                  |  1 +
 .../src/ui/_common_/navbar-for-mobile.vue     | 21 ++++++
 packages/client/src/ui/_common_/navbar.vue    | 25 ++++---
 6 files changed, 109 insertions(+), 81 deletions(-)
 create mode 100644 packages/client/src/scripts/helpMenu.ts

diff --git a/package.json b/package.json
index 7f5d569d9..914ca8938 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev19",
+	"version": "13.2.0-dev20",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts
index 256d9bd85..3f1ae2824 100644
--- a/packages/client/src/navbar.ts
+++ b/packages/client/src/navbar.ts
@@ -148,73 +148,4 @@ export const navbarItemDef = reactive({
 			location.reload();
 		},
 	},
-	help: {
-		title: "help",
-		icon: "ph-question ph-bold ph-lg",
-		action: (ev) => {
-			os.popupMenu(
-				[
-					{
-						text: instance.name ?? host,
-						type: "label",
-					},
-					{
-						type: "link",
-						text: i18n.ts.instanceInfo,
-						icon: "ph-info ph-bold ph-lg",
-						to: "/about",
-					},
-					{
-						type: "link",
-						text: i18n.ts.aboutMisskey,
-						icon: "ph-lightbulb ph-bold ph-lg",
-						to: "/about-calckey",
-					},
-					{
-						type: "link",
-						text: i18n.ts._apps.apps,
-						icon: "ph-device-mobile ph-bold ph-lg",
-						to: "/apps",
-					},
-					{
-						type: "button",
-						action: async () => {
-							defaultStore.set("tutorial", 0);
-							os.popup(XTutorial, {}, {}, "closed");
-						},
-						text: i18n.ts.replayTutorial,
-						icon: "ph-circle-wavy-question ph-bold ph-lg",
-					},
-					null,
-					{
-						type: "parent",
-						text: i18n.ts.developer,
-						icon: "ph-code ph-bold ph-lg",
-						children: [
-							{
-								type: "link",
-								to: "/api-console",
-								text: "API Console",
-								icon: "ph-terminal-window ph-bold ph-lg",
-							},
-							{
-								text: i18n.ts.document,
-								icon: "ph-file-doc ph-bold ph-lg",
-								action: () => {
-									window.open("/api-doc", "_blank");
-								},
-							},
-							{
-								type: "link",
-								to: "/scratchpad",
-								text: "AiScript Scratchpad",
-								icon: "ph-scribble-loop ph-bold ph-lg",
-							},
-						],
-					},
-				],
-				ev.currentTarget ?? ev.target,
-			);
-		},
-	},
 });
diff --git a/packages/client/src/scripts/helpMenu.ts b/packages/client/src/scripts/helpMenu.ts
new file mode 100644
index 000000000..56d3658e2
--- /dev/null
+++ b/packages/client/src/scripts/helpMenu.ts
@@ -0,0 +1,72 @@
+import { defaultStore } from "@/store";
+import { instance } from "@/instance";
+import { host } from "@/config";
+import * as os from "@/os";
+import XTutorial from "../components/MkTutorialDialog.vue";
+import { i18n } from "@/i18n";
+
+export function openHelpMenu_(ev: MouseEvent) {
+	os.popupMenu(
+		[
+			{
+				text: instance.name ?? host,
+				type: "label",
+			},
+			{
+				type: "link",
+				text: i18n.ts.instanceInfo,
+				icon: "ph-info ph-bold ph-lg",
+				to: "/about",
+			},
+			{
+				type: "link",
+				text: i18n.ts.aboutMisskey,
+				icon: "ph-lightbulb ph-bold ph-lg",
+				to: "/about-calckey",
+			},
+			{
+				type: "link",
+				text: i18n.ts._apps.apps,
+				icon: "ph-device-mobile ph-bold ph-lg",
+				to: "/apps",
+			},
+			{
+				type: "button",
+				action: async () => {
+					defaultStore.set("tutorial", 0);
+					os.popup(XTutorial, {}, {}, "closed");
+				},
+				text: i18n.ts.replayTutorial,
+				icon: "ph-circle-wavy-question ph-bold ph-lg",
+			},
+			null,
+			{
+				type: "parent",
+				text: i18n.ts.developer,
+				icon: "ph-code ph-bold ph-lg",
+				children: [
+					{
+						type: "link",
+						to: "/api-console",
+						text: "API Console",
+						icon: "ph-terminal-window ph-bold ph-lg",
+					},
+					{
+						text: i18n.ts.document,
+						icon: "ph-file-doc ph-bold ph-lg",
+						action: () => {
+							window.open("/api-doc", "_blank");
+						},
+					},
+					{
+						type: "link",
+						to: "/scratchpad",
+						text: "AiScript Scratchpad",
+						icon: "ph-scribble-loop ph-bold ph-lg",
+					},
+				],
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
+}
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index b918d7ac7..d2350e2ed 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -91,6 +91,7 @@ export const defaultStore = markRaw(
 				"favorites",
 				"channels",
 				"search",
+				"ui",
 			],
 		},
 		visibility: {
diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index c41e5276b..8ca760aa3 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -34,6 +34,9 @@
 			<button class="item _button post" data-cy-open-post-form @click="os.post">
 				<i class="icon ph-pencil ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.note }}</span>
 			</button>
+			<button v-tooltip.noDelay.right="i18n.ts.help" class="item _button help" @click="openHelpMenu">
+				<i class="help icon ph-info ph-bold ph-xl ph-fw"></i>
+			</button>
 		</div>
 	</div>
 </div>
@@ -44,6 +47,7 @@ import { computed, defineAsyncComponent, defineComponent, ref, toRef, watch } fr
 import * as os from '@/os';
 import { navbarItemDef } from '@/navbar';
 import { openAccountMenu as openAccountMenu_ } from '@/account';
+import { openHelpMenu_ } from '@/scripts/helpMenu'
 import { defaultStore } from '@/store';
 import { i18n } from '@/i18n';
 
@@ -62,6 +66,10 @@ function openAccountMenu(ev: MouseEvent) {
 	}, ev);
 }
 
+function openHelpMenu(ev: MouseEvent) {
+	openHelpMenu_(ev);
+}
+
 function more() {
 	os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {}, {
 	}, 'closed');
@@ -160,6 +168,19 @@ function more() {
 				}
 			}
 
+			> .help {
+					position: relative;
+					display: block;
+					text-align: center;
+					width: 100%;
+
+					> .icon {
+						display: inline-block;
+						width: 38px;
+						aspect-ratio: 1;
+					}
+				}
+
 			> .instance {
 				position: relative;
 				display: flex;
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 56817a0bf..4fea2b660 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -9,7 +9,7 @@
 		</div>
 		<div class="middle">
 			<MkA v-click-anime v-tooltip.noDelay.right="i18n.ts.timeline" class="item index" active-class="active" to="/" exact>
-				<i class="icon ph-house ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.timeline }}</span>
+				<i class="icon ph-house ph-bold ph-fw ph-lg"></i><span class="text">{{ i18n.ts.timeline }}</span>
 			</MkA>
 			<template v-for="item in menu">
 				<div v-if="item === '-'" class="divider"></div>
@@ -30,25 +30,23 @@
 			</template>
 			<div class="divider"></div>
 			<MkA v-if="$i.isAdmin || $i.isModerator" v-click-anime v-tooltip.noDelay.right="i18n.ts.controlPanel" class="item _button" active-class="active" to="/admin">
-				<span v-if="thereIsUnresolvedAbuseReport || noMaintainerInformation || noBotProtection || noEmailServer || updateAvailable" class="indicator"></span><i class="icon ph-door ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
+				<span v-if="thereIsUnresolvedAbuseReport || noMaintainerInformation || noBotProtection || noEmailServer || updateAvailable" class="indicator"></span><i class="icon ph-door ph-bold ph-fw ph-lg"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
 			</MkA>
 			<button v-click-anime class="item _button" @click="more">
-				<i class="icon ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
+				<i class="icon ph-dots-three-outline ph-bold ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
 				<span v-if="otherMenuItemIndicated" class="indicator"><i class="icon ph-circle ph-fill"></i></span>
 			</button>
 			<MkA v-click-anime v-tooltip.noDelay.right="i18n.ts.settings" class="item _button" active-class="active" to="/settings">
-				<i class="icon ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
+				<i class="icon ph-gear-six ph-bold ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
 			</MkA>
 		</div>
 		<div class="bottom">
 			<button v-tooltip.noDelay.right="i18n.ts.note" class="item _button post" data-cy-open-post-form @click="os.post">
-				<i class="icon ph-pencil ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.note }}</span>
+				<i class="icon ph-pencil ph-bold ph-fw ph-lg"></i><span class="text">{{ i18n.ts.note }}</span>
+			</button>
+			<button v-tooltip.noDelay.right="i18n.ts.help" class="item _button help" @click="openHelpMenu">
+				<i class="help icon ph-info ph-bold ph-xl ph-fw"></i>
 			</button>
-			<!-- <div class="help">
-				<button v-tooltip.noDelay.right="i18n.ts.help" class="item _button" @click="openHelpMenu">
-					<i class="icon ph-info ph-bold ph-xl ph-fw ph-lg"></i>
-				</button>
-			</div> -->
 			<!-- <button v-click-anime v-tooltip.noDelay.right="$instance.name ?? i18n.ts.instance" class="item _button instance" @click="openInstanceMenu">
 				<img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" alt="" class="icon"/>
 			</button> -->
@@ -65,6 +63,7 @@ import { computed, defineAsyncComponent, ref, watch } from 'vue';
 import * as os from '@/os';
 import { navbarItemDef } from '@/navbar';
 import { $i, openAccountMenu as openAccountMenu_ } from '@/account';
+import { openHelpMenu_ } from '@/scripts/helpMenu'
 import { defaultStore } from '@/store';
 import { i18n } from '@/i18n';
 import { instance } from '@/instance';
@@ -126,6 +125,10 @@ function openAccountMenu(ev: MouseEvent) {
 	}, ev);
 }
 
+function openHelpMenu(ev: MouseEvent) {
+	openHelpMenu_(ev);
+}
+
 function more(ev: MouseEvent) {
 	os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
 		src: ev.currentTarget ?? ev.target,
@@ -265,7 +268,7 @@ function more(ev: MouseEvent) {
 					}
 				}
 
-				> .account {
+				> .help {
 					position: relative;
 					display: block;
 					text-align: center;

From 64d6b987ab5fa25e0193821b6fe5f2b4d8f5baa6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 12:03:49 -0700
Subject: [PATCH 339/582] chore: add cleanup migration

---
 .../migration/1680375641101-clean-charts.js       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/backend/migration/1680375641101-clean-charts.js

diff --git a/packages/backend/migration/1680375641101-clean-charts.js b/packages/backend/migration/1680375641101-clean-charts.js
new file mode 100644
index 000000000..3fec0fef2
--- /dev/null
+++ b/packages/backend/migration/1680375641101-clean-charts.js
@@ -0,0 +1,15 @@
+export class CleanCharts1680375641101 {
+    constructor() {
+        this.name = 'CleanCharts1680375641101';
+    }
+    async up(queryRunner) {
+        await queryRunner.query(`delete from __chart__hashtag where ___local_users = 0 and ___remote_users = 0;`);
+				await queryRunner.query(`delete from __chart_day__hashtag where ___local_users = 0 and ___remote_users = 0;`);
+				await queryRunner.query(`vacuum __chart__hashtag;`);
+				await queryRunner.query(`vacuum __chart_day__hashtag;`);
+    }
+    async down(queryRunner) {
+			await queryRunner.query(`vacuum __chart__hashtag;`);
+			await queryRunner.query(`vacuum __chart_day__hashtag;`);
+    }
+}

From cc02298f8e576a2951ad7ffae5f03ae0e212a3f8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 12:05:27 -0700
Subject: [PATCH 340/582] add top margin to help button

---
 package.json                                          | 2 +-
 packages/client/src/ui/_common_/navbar-for-mobile.vue | 1 +
 packages/client/src/ui/_common_/navbar.vue            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 914ca8938..e5eca77f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev20",
+	"version": "13.2.0-dev21",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index 8ca760aa3..da0aa68de 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -173,6 +173,7 @@ function more() {
 					display: block;
 					text-align: center;
 					width: 100%;
+					margin-top: 1rem;
 
 					> .icon {
 						display: inline-block;
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 4fea2b660..c08f42641 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -273,6 +273,7 @@ function more(ev: MouseEvent) {
 					display: block;
 					text-align: center;
 					width: 100%;
+					margin-top: 1rem;
 
 					> .icon {
 						display: inline-block;

From 7522cdf445e423604d53b7234e6242e2aec25274 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 12:14:54 -0700
Subject: [PATCH 341/582] fix migration

---
 .../migration/1680375641101-clean-charts.js   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/backend/migration/1680375641101-clean-charts.js b/packages/backend/migration/1680375641101-clean-charts.js
index 3fec0fef2..c125f43a3 100644
--- a/packages/backend/migration/1680375641101-clean-charts.js
+++ b/packages/backend/migration/1680375641101-clean-charts.js
@@ -1,15 +1,17 @@
 export class CleanCharts1680375641101 {
-    constructor() {
-        this.name = 'CleanCharts1680375641101';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`delete from __chart__hashtag where ___local_users = 0 and ___remote_users = 0;`);
+		constructor() {
+				this.name = 'CleanCharts1680375641101';
+		}
+		async up(queryRunner) {
+				await queryRunner.query(`delete from __chart__hashtag where ___local_users = 0 and ___remote_users = 0;`);
 				await queryRunner.query(`delete from __chart_day__hashtag where ___local_users = 0 and ___remote_users = 0;`);
+				await queryRunner.query(`COMMIT;`);
 				await queryRunner.query(`vacuum __chart__hashtag;`);
 				await queryRunner.query(`vacuum __chart_day__hashtag;`);
-    }
-    async down(queryRunner) {
-			await queryRunner.query(`vacuum __chart__hashtag;`);
-			await queryRunner.query(`vacuum __chart_day__hashtag;`);
-    }
+				await queryRunner.query(`COMMIT;`);
+		}
+		async down(queryRunner) {
+			await queryRunner.query(`delete from __chart__hashtag where ___local_users = 0 and ___remote_users = 0;`);
+			await queryRunner.query(`delete from __chart_day__hashtag where ___local_users = 0 and ___remote_users = 0;`);
+		}
 }

From cab3a19d0a29d627153304abc791ae616d238b84 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 12:19:27 -0700
Subject: [PATCH 342/582] fix: :bug: make recently used group

Closes #9784
---
 .../client/src/components/MkEmojiPicker.vue   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index 7daf2dabf..b45a72e44 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -46,16 +46,18 @@
 			</section>
 
 			<section>
-				<header><i class="ph-alarm ph-bold ph-fw ph-lg"></i> {{ i18n.ts.recentUsed }}</header>
-				<div class="body">
-					<button
-						v-for="emoji in recentlyUsedEmojis"
-						:key="emoji"
-						class="_button item"
-						@click="chosen(emoji, $event)"
-					>
-						<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
-					</button>
+				<div v-once class="group">
+					<header><i class="ph-alarm ph-bold ph-fw ph-lg"></i> {{ i18n.ts.recentUsed }}</header>
+					<div class="body">
+						<button
+							v-for="emoji in recentlyUsedEmojis"
+							:key="emoji"
+							class="_button item"
+							@click="chosen(emoji, $event)"
+						>
+							<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
+						</button>
+					</div>
 				</div>
 			</section>
 		</div>

From 3b726e73b4fa3b2fe257b5071f3a78a2c6726f15 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 12:22:46 -0700
Subject: [PATCH 343/582] Revert "fix: :bug: make recently used group"

This reverts commit 806591cb35d3155177ed86883a7412dfd08c3141.
---
 .../client/src/components/MkEmojiPicker.vue   | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index b45a72e44..7daf2dabf 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -46,18 +46,16 @@
 			</section>
 
 			<section>
-				<div v-once class="group">
-					<header><i class="ph-alarm ph-bold ph-fw ph-lg"></i> {{ i18n.ts.recentUsed }}</header>
-					<div class="body">
-						<button
-							v-for="emoji in recentlyUsedEmojis"
-							:key="emoji"
-							class="_button item"
-							@click="chosen(emoji, $event)"
-						>
-							<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
-						</button>
-					</div>
+				<header><i class="ph-alarm ph-bold ph-fw ph-lg"></i> {{ i18n.ts.recentUsed }}</header>
+				<div class="body">
+					<button
+						v-for="emoji in recentlyUsedEmojis"
+						:key="emoji"
+						class="_button item"
+						@click="chosen(emoji, $event)"
+					>
+						<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
+					</button>
 				</div>
 			</section>
 		</div>

From cada8687bdb71028dd95b1ec383a0c11cb94335a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 13:24:25 -0700
Subject: [PATCH 344/582] fix: add cargo to DOCKERFILE

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 118bf7cd4..c599f8751 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM node:19-alpine as build
 WORKDIR /calckey
 
 # Install compilation dependencies
-RUN apk add --no-cache --no-progress git alpine-sdk python3 rust
+RUN apk add --no-cache --no-progress git alpine-sdk python3 rust cargo
 
 # Copy only the dependency-related files first, to cache efficiently
 COPY package.json pnpm*.yaml ./

From 0ac52ebe0dce5cacb9fcb860a0eaf35003f17eb0 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.a-ef.org>
Date: Sat, 1 Apr 2023 16:40:28 -0400
Subject: [PATCH 345/582] following en-US

---
 locales/ja-JP.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 0bdc4af1d..c2171c383 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -96,7 +96,7 @@ unfollow: "フォロー解除"
 followRequestPending: "フォロー許可待ち"
 enterEmoji: "絵文字を入力"
 renote: "ブースト"
-renoteAsUnlisted: "ホームにブースト"
+renoteAsUnlisted: "未収載でブースト"
 renoteToFollowers: "フォロワー限定でブースト"
 renoteToRecipients: "宛先のユーザーにブースト"
 unrenote: "ブースト解除"
@@ -800,6 +800,7 @@ previewNoteText: "本文をプレビュー"
 customCss: "カスタムCSS"
 customCssWarn: "この設定は必ず知識のある方が行ってください。不適切な設定を行うとクライアントが正常に使用できなくなる恐れがあります。"
 global: "グローバル"
+recommended: "推奨"
 squareAvatars: "アイコンを四角形で表示"
 seperateRenoteQuote: "ブーストと引用ボタンを分ける"
 sent: "送信"
@@ -878,7 +879,6 @@ recentNHours: "直近{n}時間"
 recentNDays: "直近{n}日"
 noEmailServerWarning: "メールサーバーの設定がされていません。"
 thereIsUnresolvedAbuseReportWarning: "未対応の通報があります。"
-recommended: "推奨"
 check: "チェック"
 driveCapOverrideLabel: "このユーザーのドライブ容量上限を変更"
 driveCapOverrideCaption: "0以下を指定すると解除されます。"
@@ -942,6 +942,9 @@ moveFromDescription: "別のアカウントからこのアカウントにフォ
 migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用することはできません。\nまた、引っ越し先のアカウントでエイリアスを作成したことを確認してください。"
 defaultReaction: "リモートとローカルの投稿に対するデフォルトの絵文字リアクション"
 license: "ライセンス"
+indexPosts: "投稿をインデックス"
+indexFrom: "この投稿ID以降をインデックスする（空白で全ての投稿を指定します）"
+indexNotice: "インデックス中です。完了まで時間がかかる可能性があるため、少なくとも一時間はサーバーを再起動しないでください。"
 customKaTeXMacro: "カスタムKaTeXマクロ"
 customKaTeXMacroDescription: "数式入力を楽にするためのマクロを設定しましょう！記法はLaTeXにおけるコマンドの定義と同様に \\newcommand{\\name}{content} または \\newcommand{\\add}[2]{#1 + #2} のように記述します。後者の例では \\add{3}{foo} が 3 + foo に展開されます。また、マクロの名前を囲む波括弧を丸括弧 () および角括弧 [] に変更した場合、マクロの引数に使用する括弧が変更されます。マクロの定義は一行に一つのみで、途中で改行はできません。マクロの定義が無効な行は無視されます。文字列を単純に置換する機能のみに対応していて、条件分岐などの高度な構文は使用できません。"
 enableCustomKaTeXMacro: "カスタムKaTeXマクロを有効にする"
@@ -1119,7 +1122,7 @@ _channel:
   usersCount: "{n}人が参加中"
   notesCount: "{n}投稿があります"
 _messaging:
-  dms: "ディーエム"
+  dms: "プライベート"
   groups: "グループ"
 _menuDisplay:
   sideFull: "横"
@@ -1379,7 +1382,7 @@ _poll:
 _visibility:
   public: "パブリック"
   publicDescription: "全てのユーザーに公開"
-  home: "ホーム"
+  home: "未収載"
   homeDescription: "ホームタイムラインのみに公開"
   followers: "フォロワー"
   followersDescription: "自分のフォロワーのみに公開"
@@ -1788,9 +1791,9 @@ _deck:
   swapDown: "下に移動"
   stackLeft: "左に重ねる"
   popRight: "右に出す"
-  profile: "プロファイル"
-  newProfile: "新規プロファイル"
-  deleteProfile: "プロファイルを削除"
+  profile: "ワークスペース"
+  newProfile: "新規ワークスペース"
+  deleteProfile: "ワークスペースを削除"
   introduction: "カラムを組み合わせて自分だけのインターフェイスを作りましょう！"
   introduction2: "画面の右にある + を押して、いつでもカラムを追加できます。"
   widgetsIntroduction: "カラムのメニューから、「ウィジェットの編集」を選択してウィジェットを追加してください"

From c901802ae94ae9f66374419af787b46dba1c9294 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 2 Apr 2023 07:34:59 +0900
Subject: [PATCH 346/582] Update Japanese locale

---
 locales/ja-JP.yml | 82 +++++++++++++++++++++++------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index c2171c383..5c12b17b5 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1,14 +1,14 @@
 ---
 _lang_: "日本語"
 headlineMisskey: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム🚀"
-introMisskey: "ようこそ！Calckeyは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しよう📡\n「リアクション」機能で、皆の投稿に素早く反応を追加することもできます👍\n新しい世界を探検しよう🚀"
+introMisskey: "ようこそ！Calckeyは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しましょう📡\n「リアクション」機能で、皆の投稿に素早く反応を追加できます👍\n新しい世界を探検しよう🚀"
 monthAndDay: "{month}月 {day}日"
 search: "検索"
 notifications: "通知"
 username: "ユーザー名"
 password: "パスワード"
-forgotPassword: "パスワードを忘れた"
-fetchingAsApObject: "連合に照会中"
+forgotPassword: "パスワードを忘れました"
+fetchingAsApObject: "連合宇宙から取得中"
 ok: "OK"
 gotIt: "わかった！"
 cancel: "キャンセル"
@@ -45,7 +45,7 @@ copyContent: "内容をコピー"
 copyLink: "リンクをコピー"
 delete: "削除"
 deleteAndEdit: "削除して編集"
-deleteAndEditConfirm: "この投稿を削除してもう一度編集しますか？この投稿へのリアクション、ブースト、返信も全て削除されます。"
+deleteAndEditConfirm: "この投稿を削除してもう一度編集しますか？この投稿へのリアクション、ブースト、返信は全て失われます。"
 addToList: "リストに追加"
 sendMessage: "メッセージを送信"
 copyUsername: "ユーザー名をコピー"
@@ -141,14 +141,14 @@ emojiUrl: "絵文字画像URL"
 addEmoji: "絵文字を追加"
 settingGuide: "おすすめ設定"
 cacheRemoteFiles: "リモートのファイルをキャッシュする"
-cacheRemoteFilesDescription: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクするようになります。サーバーのストレージを節約できますが、サムネイルが生成されないので通信量が増加します。"
+cacheRemoteFilesDescription: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクします。サーバーのストレージを節約できますが、サムネイルが生成されないので通信量が増加します。"
 flagAsBot: "Botとして設定"
-flagAsBotDescription: "このアカウントがプログラムによって運用される場合は、このフラグをオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Calckeyのシステム上での扱いがBotに合ったものになります。"
+flagAsBotDescription: "このアカウントがBotである場合は、この設定をオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Calckeyのシステム上での扱いがBotに合ったものになります。"
 flagAsCat: "あなたは…猫？😺"
 flagAsCatDescription: "このアカウントが猫であることを示す場合は、このフラグをオンにします。"
 flagShowTimelineReplies: "タイムラインに投稿の返信を表示する"
-flagShowTimelineRepliesDescription: "オンにすると、タイムラインにユーザーの投稿以外にもそのユーザーの他の投稿への返信を表示します。"
-autoAcceptFollowed: "フォロー中ユーザーからのフォロリクを自動承認"
+flagShowTimelineRepliesDescription: "オンにすると、タイムラインにユーザーの他の投稿への返信も表示されます。"
+autoAcceptFollowed: "フォローしているユーザーからのフォロー申請を自動承認"
 addAccount: "アカウントを追加"
 loginFailed: "ログインに失敗しました"
 showOnRemote: "リモートで表示"
@@ -295,7 +295,7 @@ emptyDrive: "ドライブは空です"
 emptyFolder: "フォルダーは空です"
 unableToDelete: "削除できません"
 inputNewFileName: "新しいファイル名を入力してください"
-inputNewDescription: "新しいキャプションを入力してください"
+inputNewDescription: "新しい説明を入力してください"
 inputNewFolderName: "新しいフォルダ名を入力してください"
 circularReferenceFolder: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
 hasChildFilesOrFolders: "このフォルダは空でないため、削除できません。"
@@ -332,7 +332,7 @@ disconnectService: "切断する"
 enableLocalTimeline: "ローカルタイムラインを有効にする"
 enableGlobalTimeline: "グローバルタイムラインを有効にする"
 enableRecommendedTimeline: "おすすめタイムラインを有効にする"
-disablingTimelinesInfo: "これらのタイムラインを無効化しても、利便性のため管理者およびモデレーターは引き続き利用することができます。"
+disablingTimelinesInfo: "これらのタイムラインを無効化しても、利便性のため管理者およびモデレーターは引き続き利用できます。"
 registration: "登録"
 enableRegistration: "誰でも新規登録できるようにする"
 invite: "招待"
@@ -566,8 +566,8 @@ disablePlayer: "プレイヤーを閉じる"
 expandTweet: "ツイートを展開する"
 themeEditor: "テーマエディター"
 description: "説明"
-describeFile: "キャプションを付ける"
-enterFileDescription: "キャプションを入力"
+describeFile: "説明を付ける"
+enterFileDescription: "説明を入力"
 author: "作者"
 leaveConfirm: "未保存の変更があります。破棄しますか？"
 manage: "管理"
@@ -679,7 +679,7 @@ driveFilesCount: "ドライブのファイル数"
 driveUsage: "ドライブ使用量"
 noCrawle: "クローラーによるインデックスを拒否"
 noCrawleDescription: "検索エンジンにあなたのプロフィールや投稿、ページなどのコンテンツを登録(インデックス)しないよう要請します。"
-lockedAccountInfo: "フォローを承認制にしても、投稿の公開範囲を「フォロワー」にしない限り、誰でもあなたの投稿を見ることができます。"
+lockedAccountInfo: "フォローを承認制にしても、投稿の公開範囲を「フォロワー」にしない限り、誰でもあなたの投稿を見られます。"
 alwaysMarkSensitive: "デフォルトでメディアを閲覧注意にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
 disableShowingAnimatedImages: "アニメーション画像を再生しない"
@@ -710,7 +710,7 @@ onlineUsersCount: "{n}人がオンライン"
 nUsers: "{n}ユーザー"
 nNotes: "{n}投稿"
 sendErrorReports: "エラーリポートを送信"
-sendErrorReportsDescription: "オンにすると、問題が発生したときにエラーの詳細情報がCalckeyに共有され、ソフトウェアの品質向上に役立てることができます。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれます。"
+sendErrorReportsDescription: "オンにすると、問題が発生したときにエラーの詳細情報がCalckeyに共有され、ソフトウェアの品質向上に役立てられます。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれます。"
 myTheme: "マイテーマ"
 backgroundColor: "背景"
 accentColor: "アクセント"
@@ -749,7 +749,7 @@ unlikeConfirm: "いいね解除しますか？"
 fullView: "フルビュー"
 quitFullView: "フルビュー解除"
 addDescription: "説明を追加"
-userPagePinTip: "個々の投稿のメニューから「ピン留め」を選択することで、ここに投稿を表示しておくことができます。"
+userPagePinTip: "個々の投稿のメニューから「ピン留め」を選択することで、ここに投稿を表示できます。"
 notSpecifiedMentionWarning: "宛先に含まれていないメンションがあります"
 info: "情報"
 userInfo: "ユーザー情報"
@@ -793,7 +793,7 @@ secureMode: "セキュアモード (Authorized Fetch)"
 instanceSecurity: "インスタンスのセキュリティー"
 secureModeInfo: "他のインスタンスからリクエストするときに、証明を付けなければ返送しません。他のインスタンスの設定ファイルでsignToActivityPubGetはtrueにしてください。"
 privateMode: "非公開モード"
-privateModeInfo: "有効にして、許可されているインスタンスのみがリクエストできます。すべての投稿が公開に非表示にします。"
+privateModeInfo: "有効にすると、許可したインスタンスのみからリクエストを受け付けます。"
 allowedInstances: "許可されたインスタンス"
 allowedInstancesDescription: "許可したいインスタンスのホストを改行で区切って設定します。非公開モードだけで有効です。"
 previewNoteText: "本文をプレビュー"
@@ -815,7 +815,7 @@ whatIsNew: "更新情報を見る"
 translate: "翻訳"
 translatedFrom: "{x}から翻訳"
 accountDeletionInProgress: "アカウントの削除が進行中です"
-usernameInfo: "サーバー上であなたのアカウントを一意に識別するための名前。アルファベット(a~z, A~Z)、数字(0~9)、およびアンダーバー(_)が使用できます。ユーザー名は後から変更することは出来ません。"
+usernameInfo: "サーバー上であなたのアカウントを一意に識別するための名前です。アルファベット(a~z, A~Z)、数字(0~9)、およびアンダーバー(_)が使用できます。ユーザー名は後から変更できません。"
 aiChanMode: "藍モード（クラシックUI）"
 enterSendsMessage: "メッセージングでReturnキーを押すと、メッセージが送信されます（デフォルトはCtrl + Returnです）"
 keepCw: "CWを維持する"
@@ -929,7 +929,7 @@ splash: "スプラッシュスクリーン"
 updateAvailable: "アップデートがありますよ！"
 swipeOnDesktop: "デスクトップでモバイルスタイルのスワイプを可能にする"
 logoImageUrl: "ロゴのURL"
-showAdminUpdates: "新しいCalckeyのバージョンが利用可能であることを示す(管理者のみ)"
+showAdminUpdates: "新しいCalckeyのバージョンが利用可能なときに通知する(管理者のみ)"
 replayTutorial: "もう一度チュートリアルを見る"
 migration: "アカウントの引っ越し"
 moveTo: "このアカウントを新しいアカウントに引っ越す"
@@ -939,7 +939,7 @@ moveAccountDescription: "この操作は取り消せません。まずは引っ
 moveFrom: "別のアカウントからこのアカウントに引っ越す"
 moveFromLabel: "引っ越し元のアカウント："
 moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。必ず引っ越しを実行する前に作成してください！引っ越し元のアカウントをこのように入力してください：@person@instance.com"
-migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用することはできません。\nまた、引っ越し先のアカウントでエイリアスを作成したことを確認してください。"
+migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用できなくなります。\nまた、引っ越し先のアカウントでエイリアスを作成したことを確認してください。"
 defaultReaction: "リモートとローカルの投稿に対するデフォルトの絵文字リアクション"
 license: "ライセンス"
 indexPosts: "投稿をインデックス"
@@ -950,7 +950,7 @@ customKaTeXMacroDescription: "数式入力を楽にするためのマクロを
 enableCustomKaTeXMacro: "カスタムKaTeXマクロを有効にする"
 
 _sensitiveMediaDetection:
-  description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。"
+  description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てられます。サーバーの負荷が少し増えます。"
   sensitivity: "検出感度"
   sensitivityDescription: "感度を低くすると、誤検知(偽陽性)が減ります。感度を高くすると、検知漏れ(偽陰性)が減ります。"
   setSensitiveFlagAutomatically: "NSFWフラグを設定する"
@@ -974,9 +974,9 @@ _signup:
 _accountDelete:
   accountDelete: "アカウントの削除"
   mayTakeTime: "アカウントの削除は負荷のかかる処理であるため、作成したコンテンツの数やアップロードしたファイルの数が多いと完了までに時間がかかることがあります。"
-  sendEmail: "アカウントの削除が完了する際は、登録してあったメールアドレス宛に通知を送信します。"
+  sendEmail: "アカウントの削除が完了した際に、登録されていたメールアドレス宛に通知を送信します。"
   requestAccountDelete: "アカウント削除をリクエスト"
-  started: "削除処理が開始されました。"
+  started: "削除処理を開始しました。"
   inProgress: "削除が進行中"
 _ad:
   back: "戻る"
@@ -1015,7 +1015,7 @@ _preferencesBackups:
   noBackups: "バックアップはありません。「新規保存」で現在のクライアント設定をサーバーに保存できます。"
   createdAt: "作成日時: {date} {time}"
   updatedAt: "更新日時: {date} {time}"
-  cannotLoad: "読み込みできません"
+  cannotLoad: "読み込めません。"
   invalidFile: "ファイル形式が違います。"
 _registry:
   scope: "スコープ"
@@ -1041,19 +1041,19 @@ _mfm:
   intro: "MFMは、MisskeyやCalckey、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
   dummy: "CalckeyでFediverseの世界が広がります"
   mention: "メンション"
-  mentionDescription: "アットマーク + ユーザー名で、特定のユーザーを示すことができます。"
+  mentionDescription: "アットマーク + ユーザー名で、特定のユーザーを示せます。"
   hashtag: "ハッシュタグ"
-  hashtagDescription: "ナンバーサイン + タグで、ハッシュタグを示すことができます。"
+  hashtagDescription: "ナンバーサイン + タグで、ハッシュタグを示せます。"
   url: "URL"
-  urlDescription: "URLを示すことができます。"
+  urlDescription: "URLを示せます。"
   link: "リンク"
-  linkDescription: "文章の特定の範囲を、URLに紐づけることができます。"
+  linkDescription: "文章の特定の範囲を、URLに紐づけられます。"
   bold: "太字"
-  boldDescription: "文字を太く表示して強調することができます。"
+  boldDescription: "文字を太く表示して強調できます。"
   small: "目立たなく"
-  smallDescription: "内容を小さく・薄く表示させることができます。"
+  smallDescription: "内容を小さく・薄く表示させられます。"
   center: "中央寄せ"
-  centerDescription: "内容を中央寄せで表示させることができます。"
+  centerDescription: "内容を中央寄せで表示させられます。"
   inlineCode: "コード(インライン)"
   inlineCodeDescription: "プログラムなどのコードをインラインでシンタックスハイライトします。"
   blockCode: "コード(ブロック)"
@@ -1063,11 +1063,11 @@ _mfm:
   blockMath: "数式(ブロック)"
   blockMathDescription: "複数行の数式(KaTeX)をブロックで表示します。"
   quote: "引用"
-  quoteDescription: "内容が引用であることを示すことができます。"
+  quoteDescription: "内容が引用であることを示せます。"
   emoji: "カスタム絵文字"
-  emojiDescription: "コロンでカスタム絵文字名を囲むと、カスタム絵文字を表示させることができます。"
+  emojiDescription: "コロンでカスタム絵文字名を囲むと、カスタム絵文字を表示させられます。"
   search: "検索"
-  searchDescription: "入力済み検索ボックスを表示させることができます。"
+  searchDescription: "検索ボックスを表示させられます。"
   flip: "反転"
   flipDescription: "内容を上下または左右に反転させます。"
   jelly: "アニメーション(びよんびよん)"
@@ -1093,7 +1093,7 @@ _mfm:
   blur: "ぼかし"
   blurDescription: "内容をぼかすことができます。ポインターを上に乗せるとはっきり見えるようになります。"
   font: "フォント"
-  fontDescription: "内容のフォントを指定することができます。"
+  fontDescription: "内容のフォントを指定できます。"
   rainbow: "レインボー"
   rainbowDescription: "内容をレインボーにします。"
   sparkle: "キラキラ"
@@ -1252,11 +1252,11 @@ _tutorial:
   step4_2: "最初は{introduction}に投稿したり、シンプルに「こんにちは、アカウント作ってみました！」などの投稿をする人もいます。"
   step5_1: "タイムライン、タイムラインだらけ！"
   step5_2: "あなたのインスタンスでは{timelines}種類のタイムラインが有効になっています。"
-  step5_3: "ホーム{icon}タイムラインでは、あなたがフォローしているアカウントとこのインスタンスのみんなの投稿を見ることができます。もしフォローしているアカウントの投稿だけ見たい場合は、設定から変更できます。"
-  step5_4: "ローカル{icon}タイムラインでは、このインスタンスのみんなの投稿を見ることができます。"
-  step5_5: "ソーシャル{icon}タイムラインでは、あなたがフォローしているアカウントの投稿を見ることができます。"
-  step5_6: "おすすめ{icon}タイムラインでは、管理人がおすすめするインスタンスの投稿を見ることができます。"
-  step5_7: "グローバル{icon}タイムラインでは、接続している他のすべてのインスタンスからの投稿を見ることができます。"
+  step5_3: "ホーム{icon}タイムラインでは、あなたがフォローしているアカウントとこのインスタンスのみんなの投稿を見られます。もしフォローしているアカウントの投稿だけ見たい場合は、設定から変更できます。"
+  step5_4: "ローカル{icon}タイムラインでは、このインスタンスにいるみんなの投稿を見られます。"
+  step5_5: "ソーシャル{icon}タイムラインでは、あなたがフォローしているアカウントの投稿を見られます。"
+  step5_6: "おすすめ{icon}タイムラインでは、管理人がおすすめするインスタンスの投稿を見られます。"
+  step5_7: "グローバル{icon}タイムラインでは、接続している他のすべてのインスタンスからの投稿を見られます。"
   step6_1: "じゃあ、ここはどんな場所なの？"
   step6_2: "実は、あなたはただCalckeyに参加しただけではありません。ここは、何千もの相互接続されたサーバーが構成する Fediverse への入口です。各サーバーは「インスタンス」と呼ばれます。"
   step6_3: "それぞれのサーバーでは必ずしもCalckeyが使われているわけではなく、異なる動作をするサーバーもあります。しかし、あなたは他のサーバーのアカウントもフォローしたり、返信・ブーストができます。一見難しそうですが大丈夫！すぐ慣れます。"
@@ -1405,10 +1405,10 @@ _profile:
   name: "名前"
   username: "ユーザー名"
   description: "自己紹介"
-  youCanIncludeHashtags: "ハッシュタグを含めることができます。"
+  youCanIncludeHashtags: "ハッシュタグを含められます。"
   metadata: "追加情報"
   metadataEdit: "追加情報を編集"
-  metadataDescription: "プロフィールに表として追加情報を表示することができます。"
+  metadataDescription: "プロフィールに表として追加情報を表示できます。"
   metadataLabel: "ラベル"
   metadataContent: "内容"
   changeAvatar: "アバター画像を変更"

From d13dbe060d2178bb63ebafc33d0fac2c58ff762d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 16:13:17 -0700
Subject: [PATCH 347/582] fix #9784

---
 packages/client/src/components/MkEmojiPicker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index 7daf2dabf..2790965db 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -46,7 +46,7 @@
 			</section>
 
 			<section>
-				<header><i class="ph-alarm ph-bold ph-fw ph-lg"></i> {{ i18n.ts.recentUsed }}</header>
+				<header class="_acrylic"><i class="ph-alarm ph-bold ph-fw ph-lg"></i> {{ i18n.ts.recentUsed }}</header>
 				<div class="body">
 					<button
 						v-for="emoji in recentlyUsedEmojis"

From 6f79abbcfc964acbbd198b7b667004171eac253c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 16:18:01 -0700
Subject: [PATCH 348/582] fix help button alignment iconsOnly

---
 packages/client/src/ui/_common_/navbar.vue | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index c08f42641..06f878964 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -439,6 +439,20 @@ function more(ev: MouseEvent) {
 					}
 				}
 
+				> .help {
+					position: relative;
+					display: block;
+					text-align: center;
+					width: 100%;
+					margin-top: 1rem;
+
+					> .icon {
+						display: inline-block;
+						width: 38px;
+						aspect-ratio: 1;
+					}
+				}
+
 				> .instance {
 					position: relative;
 					display: block;

From d2cc0484d887c00ee510b1235c6228b53809933c Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.a-ef.org>
Date: Sat, 1 Apr 2023 19:20:39 -0400
Subject: [PATCH 349/582] change "quote attached" to "quote"

---
 locales/ja-JP.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 5c12b17b5..fe2eb6f4d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -433,7 +433,7 @@ next: "次へ"
 retype: "再入力"
 noteOf: "{user}の投稿"
 inviteToGroup: "グループに招待"
-quoteAttached: "引用付き"
+quoteAttached: "引用"
 quoteQuestion: "引用として添付しますか？"
 noMessagesYet: "まだチャットはありません"
 newMessageExists: "新しいメッセージがあります"

From 38a62794a14e66a429dca2acdaad3aae9517134d Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.a-ef.org>
Date: Sat, 1 Apr 2023 19:43:32 -0400
Subject: [PATCH 350/582] follow mastodon translation

---
 locales/ja-JP.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index fe2eb6f4d..0494c777c 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -658,7 +658,7 @@ optional: "任意"
 createNewClip: "新しいクリップを作成"
 unclip: "クリップ解除"
 confirmToUnclipAlreadyClippedNote: "この投稿はすでにクリップ「{name}」に含まれています。投稿をこのクリップから除外しますか？"
-public: "パブリック"
+public: "公開"
 i18nInfo: "Calckeyは有志によって様々な言語に翻訳されています。{link}で翻訳に協力できます。"
 manageAccessTokens: "アクセストークンの管理"
 accountInfo: "アカウント情報"
@@ -1380,7 +1380,7 @@ _poll:
   remainingMinutes: "終了まであと{m}分{s}秒"
   remainingSeconds: "終了まであと{s}秒"
 _visibility:
-  public: "パブリック"
+  public: "公開"
   publicDescription: "全てのユーザーに公開"
   home: "未収載"
   homeDescription: "ホームタイムラインのみに公開"

From 0e74dd3fb41ebe52ed3a9030673bac66f3d07f39 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.a-ef.org>
Date: Sat, 1 Apr 2023 19:56:21 -0400
Subject: [PATCH 351/582] fix indexing description

---
 locales/ja-JP.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 0494c777c..34dc97489 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -944,7 +944,7 @@ defaultReaction: "リモートとローカルの投稿に対するデフォル
 license: "ライセンス"
 indexPosts: "投稿をインデックス"
 indexFrom: "この投稿ID以降をインデックスする（空白で全ての投稿を指定します）"
-indexNotice: "インデックス中です。完了まで時間がかかる可能性があるため、少なくとも一時間はサーバーを再起動しないでください。"
+indexNotice: "インデックスを開始しました。完了まで時間がかかる場合があるため、少なくとも1時間はサーバーを再起動しないでください。"
 customKaTeXMacro: "カスタムKaTeXマクロ"
 customKaTeXMacroDescription: "数式入力を楽にするためのマクロを設定しましょう！記法はLaTeXにおけるコマンドの定義と同様に \\newcommand{\\name}{content} または \\newcommand{\\add}[2]{#1 + #2} のように記述します。後者の例では \\add{3}{foo} が 3 + foo に展開されます。また、マクロの名前を囲む波括弧を丸括弧 () および角括弧 [] に変更した場合、マクロの引数に使用する括弧が変更されます。マクロの定義は一行に一つのみで、途中で改行はできません。マクロの定義が無効な行は無視されます。文字列を単純に置換する機能のみに対応していて、条件分岐などの高度な構文は使用できません。"
 enableCustomKaTeXMacro: "カスタムKaTeXマクロを有効にする"

From cb1b13e8795b0a9687e244da46038e2ba9429271 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 21:04:15 -0700
Subject: [PATCH 352/582] fix: :passport_control: no longer need 2fa for
 webauthn

---
 .../src/server/api/endpoints/i/2fa/register-key.ts        | 6 +++---
 packages/client/src/components/MkDialog.vue               | 1 +
 packages/client/src/pages/settings/2fa.vue                | 8 +++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
index 8c0af28ee..96239b56d 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
@@ -32,9 +32,9 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw new Error("incorrect password");
 	}
 
-	if (!profile.twoFactorEnabled) {
-		throw new Error("2fa not enabled");
-	}
+	// if (!profile.twoFactorEnabled) {
+	// 	throw new Error("2fa not enabled");
+	// }
 
 	// 32 byte challenge
 	const entropy = await randomBytes(32);
diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue
index 5d5ca1e8d..708db22ef 100644
--- a/packages/client/src/components/MkDialog.vue
+++ b/packages/client/src/components/MkDialog.vue
@@ -13,6 +13,7 @@
 				<MkLoading v-else-if="type === 'waiting'" :class="$style.iconInner" :em="true"/>
 			</div>
 			<header v-if="title" :class="$style.title"><Mfm :text="title"/></header>
+			<header v-if="title == null && input.type === 'password'" :class="$style.title"><Mfm :text="i18n.ts.password"/></header>
 			<div v-if="text" :class="$style.text"><Mfm :text="text"/></div>
 			<MkInput v-if="input && input.type !== 'paragraph'" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" @keydown="onInputKeydown">
 				<template v-if="input.type === 'password'" #prefix><i class="ph-password ph-bold ph-lg"></i></template>
diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue
index 71a76c716..bb3862b4b 100644
--- a/packages/client/src/pages/settings/2fa.vue
+++ b/packages/client/src/pages/settings/2fa.vue
@@ -4,7 +4,9 @@
 	<template v-if="$i.twoFactorEnabled">
 		<p>{{ i18n.ts._2fa.alreadyRegistered }}</p>
 		<MkButton @click="unregister">{{ i18n.ts.unregister }}</MkButton>
+	</template>
 
+	<template>
 		<template v-if="supportsCredentials">
 			<hr class="totp-method-sep">
 
@@ -20,7 +22,7 @@
 
 			<MkSwitch v-if="$i.securityKeysList.length > 0" v-model="usePasswordLessLogin" @update:modelValue="updatePasswordLessLogin">{{ i18n.ts.passwordLessLogin }}</MkSwitch>
 
-			<MkInfo v-if="registration && registration.error" warn>{{ i18n.ts.error }} {{ registration.error }}</MkInfo>
+			<MkInfo v-if="registration && registration.error" style="margin-bottom: 1rem;" warn>{{ i18n.ts.error }}: {{ registration.error }}</MkInfo>
 			<MkButton v-if="!registration || registration.error" @click="addSecurityKey">{{ i18n.ts._2fa.registerKey }}</MkButton>
 
 			<ol v-if="registration && !registration.error">
@@ -45,7 +47,7 @@
 			<li>
 				<I18n :src="i18n.ts._2fa.step1" tag="span">
 					<template #a>
-						<a href="https://authy.com/" rel="noopener" target="_blank" class="_link">Authy</a>
+						<a href="https://authpass.app/" rel="noopener" target="_blank" class="_link">AuthPass</a>
 					</template>
 					<template #b>
 						<a href="https://support.google.com/accounts/answer/1066447" rel="noopener" target="_blank" class="_link">Google Authenticator</a>
@@ -140,7 +142,7 @@ function registerKey() {
 		attestationObject: hexify(registration.value.credential.response.attestationObject)
 	}).then(key => {
 		registration.value = null;
-		key.lastUsed = new Date();
+		key!.lastUsed = new Date();
 		os.success();
 	});
 }

From f988ba7530012b601428dd862639732068bfba78 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 21:06:10 -0700
Subject: [PATCH 353/582] dev22

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

diff --git a/package.json b/package.json
index e5eca77f5..0cbc31e7c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev21",
+	"version": "13.2.0-dev22",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 33718bdd5d37d4a0c4cf78e2be6baa0d564eb64b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 21:10:31 -0700
Subject: [PATCH 354/582] chore: :art: format

---
 packages/backend/src/models/repositories/note.ts         | 9 +++------
 .../backend/src/server/api/stream/channels/channel.ts    | 3 +--
 .../backend/src/server/api/stream/channels/messaging.ts  | 3 +--
 packages/backend/src/server/web/cli.js                   | 6 +++---
 packages/backend/src/services/chart/core.ts              | 8 ++++++--
 packages/client/src/scripts/helpMenu.ts                  | 2 +-
 packages/client/src/scripts/sound.ts                     | 3 ++-
 packages/client/src/types/menu.ts                        | 9 ++++++++-
 8 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index ce589e173..b99ce1635 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -266,10 +266,8 @@ export const NoteRepository = db.getRepository(Note).extend({
 		if (packed.user.isCat && packed.text) {
 			const tokens = packed.text ? mfm.parse(packed.text) : [];
 			function nyaizeNode(node: mfm.MfmNode) {
-				if (node.type === "quote")
-					return;
-				if (node.type === "text")
-					node.props.text = nyaize(node.props.text);
+				if (node.type === "quote") return;
+				if (node.type === "text") node.props.text = nyaize(node.props.text);
 
 				if (node.children) {
 					for (const child of node.children) {
@@ -278,8 +276,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 				}
 			}
 
-			for (const node of tokens)
-				nyaizeNode(node);
+			for (const node of tokens) nyaizeNode(node);
 
 			packed.text = mfm.toString(tokens);
 		}
diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index 5a0f70981..d2a2269a4 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -57,8 +57,7 @@ export default class extends Channel {
 
 		// Remove not typing users
 		for (const [userId, date] of Object.entries(this.typers)) {
-			if (now.getTime() - date.getTime() > 5000)
-				this.typers.delete(userId);
+			if (now.getTime() - date.getTime() > 5000) this.typers.delete(userId);
 		}
 
 		const userIds = Array.from(this.typers.keys());
diff --git a/packages/backend/src/server/api/stream/channels/messaging.ts b/packages/backend/src/server/api/stream/channels/messaging.ts
index f20b1ead1..0622bd464 100644
--- a/packages/backend/src/server/api/stream/channels/messaging.ts
+++ b/packages/backend/src/server/api/stream/channels/messaging.ts
@@ -108,8 +108,7 @@ export default class extends Channel {
 
 		// Remove not typing users
 		for (const [userId, date] of this.typers.entries()) {
-			if (now.getTime() - date.getTime() > 5000)
-				this.typers.delete(userId);
+			if (now.getTime() - date.getTime() > 5000) this.typers.delete(userId);
 		}
 
 		const userIds = Array.from(this.typers.keys());
diff --git a/packages/backend/src/server/web/cli.js b/packages/backend/src/server/web/cli.js
index ca1c23375..85a61a244 100644
--- a/packages/backend/src/server/web/cli.js
+++ b/packages/backend/src/server/web/cli.js
@@ -47,10 +47,10 @@ window.onload = async () => {
 			const el = document.createElement("div");
 			const header = document.createElement("header");
 			const name = document.createElement("p");
-			const avatar = document.createElement("img")
+			const avatar = document.createElement("img");
 			name.textContent = `${note.user.name} @${note.user.username}`;
 			avatar.src = note.user.avatarUrl;
-			avatar.style = 'height: 40px'
+			avatar.style = "height: 40px";
 			const text = document.createElement("div");
 			text.textContent = `${note.text}`;
 			el.appendChild(header);
@@ -63,7 +63,7 @@ window.onload = async () => {
 				for (const file of note.files) {
 					const img = document.createElement("img");
 					img.src = file.properties.thumbnailUrl;
-					el.appendChild(img)
+					el.appendChild(img);
 				}
 			}
 			tl.appendChild(el);
diff --git a/packages/backend/src/services/chart/core.ts b/packages/backend/src/services/chart/core.ts
index 207d8a93c..36fe37326 100644
--- a/packages/backend/src/services/chart/core.ts
+++ b/packages/backend/src/services/chart/core.ts
@@ -556,7 +556,11 @@ export default abstract class Chart<T extends Schema> {
 
 			// bake unique count
 			for (const [k, v] of Object.entries(finalDiffs)) {
-				if (this.schema[k].uniqueIncrement && Array.isArray(v) && v.length > 0) {
+				if (
+					this.schema[k].uniqueIncrement &&
+					Array.isArray(v) &&
+					v.length > 0
+				) {
 					const name = (columnPrefix +
 						k.replaceAll(".", columnDot)) as keyof Columns<T>;
 					const tempColumnName = (uniqueTempColumnPrefix +
@@ -660,7 +664,7 @@ export default abstract class Chart<T extends Schema> {
 
 		const startTime = Date.now();
 		await Promise.all(
-			groups.map((group) => 
+			groups.map((group) =>
 				limit(() =>
 					Promise.all([
 						this.claimCurrentLog(group, "hour"),
diff --git a/packages/client/src/scripts/helpMenu.ts b/packages/client/src/scripts/helpMenu.ts
index 56d3658e2..aca9d6e70 100644
--- a/packages/client/src/scripts/helpMenu.ts
+++ b/packages/client/src/scripts/helpMenu.ts
@@ -67,6 +67,6 @@ export function openHelpMenu_(ev: MouseEvent) {
 				],
 			},
 		],
-		ev.currentTarget ?? ev.target
+		ev.currentTarget ?? ev.target,
 	);
 }
diff --git a/packages/client/src/scripts/sound.ts b/packages/client/src/scripts/sound.ts
index 07d543a33..84388b81c 100644
--- a/packages/client/src/scripts/sound.ts
+++ b/packages/client/src/scripts/sound.ts
@@ -30,7 +30,8 @@ export function play(type: string) {
 
 export function playFile(file: string, volume: number) {
 	const masterVolume = ColdDeviceStorage.get("sound_masterVolume");
-	if (masterVolume === 0 || volume === 0 || file.toLowerCase().includes("none")) return;
+	if (masterVolume === 0 || volume === 0 || file.toLowerCase().includes("none"))
+		return;
 
 	const audio = setVolume(getAudio(file), volume);
 	audio.play();
diff --git a/packages/client/src/types/menu.ts b/packages/client/src/types/menu.ts
index a7ce81c71..4a0a9061e 100644
--- a/packages/client/src/types/menu.ts
+++ b/packages/client/src/types/menu.ts
@@ -90,7 +90,14 @@ type OuterMenuItem =
 	| MenuButtonMultipleIcons
 	| MenuParent;
 type OuterPromiseMenuItem = Promise<
-	MenuLabel | MenuLink | MenuA | MenuUser | MenuSwitch | MenuButton | MenuButtonMultipleIcons | MenuParent
+	| MenuLabel
+	| MenuLink
+	| MenuA
+	| MenuUser
+	| MenuSwitch
+	| MenuButton
+	| MenuButtonMultipleIcons
+	| MenuParent
 >;
 export type MenuItem = OuterMenuItem | OuterPromiseMenuItem;
 export type InnerMenuItem =

From 03c282ff0087326078a72337cae5f61d4947d8b5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 21:18:23 -0700
Subject: [PATCH 355/582] chore: remove okteto

---
 .okteto/okteto-pipeline.yml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 .okteto/okteto-pipeline.yml

diff --git a/.okteto/okteto-pipeline.yml b/.okteto/okteto-pipeline.yml
deleted file mode 100644
index e2996fbbc..000000000
--- a/.okteto/okteto-pipeline.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-build:
-  misskey:
-    args:
-      - NODE_ENV=development
-deploy:
-  - helm upgrade --install misskey chart --set image=${OKTETO_BUILD_MISSKEY_IMAGE} --set url="https://misskey-$(kubectl config view --minify -o jsonpath='{..namespace}').cloud.okteto.net" --set environment=development

From 2947ee55c7c1ada089d7cd1e082935d38ee3946a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 21:37:47 -0700
Subject: [PATCH 356/582] plans

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

diff --git a/CALCKEY.md b/CALCKEY.md
index 525bccf28..6121323ec 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -6,6 +6,7 @@
   - [DragonflyDB](https://dragonflydb.io/) support as a Redis alternative
   - Optionally use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes
   - Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum)
+  - Use [Magic ReGeXP](https://regexp.dev/) for ReGeX 🦄
 - Function
   - Federate with note edits
   - User "choices" (recommended users) like Mastodon and Soapbox

From a4540eb708231395a6053791ec80dd4aa9381a78 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 21:39:48 -0700
Subject: [PATCH 357/582] don't need extra template

---
 packages/client/src/pages/settings/2fa.vue | 58 +++++++++++-----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue
index bb3862b4b..acbd17480 100644
--- a/packages/client/src/pages/settings/2fa.vue
+++ b/packages/client/src/pages/settings/2fa.vue
@@ -6,41 +6,39 @@
 		<MkButton @click="unregister">{{ i18n.ts.unregister }}</MkButton>
 	</template>
 
-	<template>
-		<template v-if="supportsCredentials">
-			<hr class="totp-method-sep">
+	<template v-if="supportsCredentials">
+		<hr class="totp-method-sep">
 
-			<h2 class="heading">{{ i18n.ts.securityKey }}</h2>
-			<p>{{ i18n.ts._2fa.securityKeyInfo }}</p>
-			<div class="key-list">
-				<div v-for="key in $i.securityKeysList" class="key">
-					<h3>{{ key.name }}</h3>
-					<div class="last-used">{{ i18n.ts.lastUsed }}<MkTime :time="key.lastUsed"/></div>
-					<MkButton @click="unregisterKey(key)">{{ i18n.ts.unregister }}</MkButton>
-				</div>
+		<h2 class="heading">{{ i18n.ts.securityKey }}</h2>
+		<p>{{ i18n.ts._2fa.securityKeyInfo }}</p>
+		<div class="key-list">
+			<div v-for="key in $i.securityKeysList" class="key">
+				<h3>{{ key.name }}</h3>
+				<div class="last-used">{{ i18n.ts.lastUsed }}<MkTime :time="key.lastUsed"/></div>
+				<MkButton @click="unregisterKey(key)">{{ i18n.ts.unregister }}</MkButton>
 			</div>
+		</div>
 
-			<MkSwitch v-if="$i.securityKeysList.length > 0" v-model="usePasswordLessLogin" @update:modelValue="updatePasswordLessLogin">{{ i18n.ts.passwordLessLogin }}</MkSwitch>
+		<MkSwitch v-if="$i.securityKeysList.length > 0" v-model="usePasswordLessLogin" @update:modelValue="updatePasswordLessLogin">{{ i18n.ts.passwordLessLogin }}</MkSwitch>
 
-			<MkInfo v-if="registration && registration.error" style="margin-bottom: 1rem;" warn>{{ i18n.ts.error }}: {{ registration.error }}</MkInfo>
-			<MkButton v-if="!registration || registration.error" @click="addSecurityKey">{{ i18n.ts._2fa.registerKey }}</MkButton>
+		<MkInfo v-if="registration && registration.error" style="margin-bottom: 1rem;" warn>{{ i18n.ts.error }}: {{ registration.error }}</MkInfo>
+		<MkButton v-if="!registration || registration.error" @click="addSecurityKey">{{ i18n.ts._2fa.registerKey }}</MkButton>
 
-			<ol v-if="registration && !registration.error">
-				<li v-if="registration.stage >= 0">
-					{{ i18n.ts.tapSecurityKey }}
-					<i v-if="registration.saving && registration.stage == 0" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
-				</li>
-				<li v-if="registration.stage >= 1">
-					<MkForm :disabled="registration.stage != 1 || registration.saving">
-						<MkInput v-model="keyName" :max="30">
-							<template #label>{{ i18n.ts.securityKeyName }}</template>
-						</MkInput>
-						<MkButton :disabled="keyName.length == 0" @click="registerKey">{{ i18n.ts.registerSecurityKey }}</MkButton>
-						<i v-if="registration.saving && registration.stage == 1" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
-					</MkForm>
-				</li>
-			</ol>
-		</template>
+		<ol v-if="registration && !registration.error">
+			<li v-if="registration.stage >= 0">
+				{{ i18n.ts.tapSecurityKey }}
+				<i v-if="registration.saving && registration.stage == 0" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
+			</li>
+			<li v-if="registration.stage >= 1">
+				<MkForm :disabled="registration.stage != 1 || registration.saving">
+					<MkInput v-model="keyName" :max="30">
+						<template #label>{{ i18n.ts.securityKeyName }}</template>
+					</MkInput>
+					<MkButton :disabled="keyName.length == 0" @click="registerKey">{{ i18n.ts.registerSecurityKey }}</MkButton>
+					<i v-if="registration.saving && registration.stage == 1" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
+				</MkForm>
+			</li>
+		</ol>
 	</template>
 	<div v-if="twoFactorData && !$i.twoFactorEnabled">
 		<ol style="margin: 0; padding: 0 0 0 1em;">

From 158d85fea48e8a76e25959f754c0e922f3fdd175 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 21:44:19 -0700
Subject: [PATCH 358/582] attempt to fix #9797

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

diff --git a/Dockerfile b/Dockerfile
index c599f8751..53734b069 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,8 @@ COPY package.json pnpm*.yaml ./
 COPY packages/backend/package.json packages/backend/package.json
 COPY packages/client/package.json packages/client/package.json
 COPY packages/sw/package.json packages/sw/package.json
+COPY packages/backend/native-utils/package.json packages/backend/native-utils/package.json
+COPY packages/backend/native-utils/**/*/package.json packages/backend/native-utils/**/*/package.json
 
 # Configure corepack and pnpm
 RUN corepack enable

From c5522d020797e7d4a6daf412419b7ead40d23c57 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 23:28:55 -0700
Subject: [PATCH 359/582] fix import

---
 packages/backend/src/server/api/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index 529f09bd5..bfc373e58 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -24,7 +24,7 @@ import discord from "./service/discord.js";
 import github from "./service/github.js";
 import twitter from "./service/twitter.js";
 import { koaBody } from "koa-body";
-import { convertId, IdConvertType as IdType } from "native-utils";
+import { convertId, IdConvertType as IdType } from "../../../native-utils/built/index.js";
 
 // re-export native rust id conversion (function and enum)
 export { IdType, convertId };

From 261b71dac5d6e5249c58590198cacf743a4235b5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 23:34:02 -0700
Subject: [PATCH 360/582] style

---
 packages/client/src/components/MkSignin.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkSignin.vue b/packages/client/src/components/MkSignin.vue
index 63a5bf10e..d03341e56 100644
--- a/packages/client/src/components/MkSignin.vue
+++ b/packages/client/src/components/MkSignin.vue
@@ -14,7 +14,7 @@
 				<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
 				<template #caption><button class="_textButton" type="button" @click="resetPassword">{{ i18n.ts.forgotPassword }}</button></template>
 			</MkInput>
-			<MkButton class="_formBlock" type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? i18n.ts.loggingIn : i18n.ts.login }}</MkButton>
+			<MkButton class="_formBlock" type="submit" primary :disabled="signing" style="margin: 1rem auto;">{{ signing ? i18n.ts.loggingIn : i18n.ts.login }}</MkButton>
 		</div>
 		<div v-if="totpLogin" class="2fa-signin" :class="{ securityKeys: user && user.securityKeys }">
 			<div v-if="user && user.securityKeys" class="twofa-group tap-group">

From db77425eac289dfd1d58ac621575a1c1502c643a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 23:44:59 -0700
Subject: [PATCH 361/582] don't show delete button if profile is default

---
 packages/client/src/ui/deck.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index 5cb8e36c3..84f6ace6a 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -35,7 +35,7 @@
 			<div class="sideMenu">
 				<div class="top">
 					<button v-tooltip.noDelay.left="`${i18n.ts._deck.profile}: ${deckStore.state.profile}`" class="_button button" @click="changeProfile"><i class="ph-caret-down ph-bold ph-lg"></i></button>
-					<button v-tooltip.noDelay.left="i18n.ts._deck.deleteProfile" class="_button button" @click="deleteProfile"><i class="ph-trash ph-bold ph-lg"></i></button>
+					<button v-if="deckStore.state.profile !== 'default'" v-tooltip.noDelay.left="i18n.ts._deck.deleteProfile" class="_button button" @click="deleteProfile"><i class="ph-trash ph-bold ph-lg"></i></button>
 				</div>
 				<div class="middle">
 					<button v-tooltip.noDelay.left="i18n.ts._deck.addColumn" class="_button button new" @click="addColumn"><i class="ph-plus ph-bold ph-lg"></i></button>

From b98c8c526c41d29de870e193a69e0aa44732c44e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 23:53:31 -0700
Subject: [PATCH 362/582] fix button alignments

---
 packages/client/src/components/MkFollowButton.vue | 4 +++-
 packages/client/src/ui/deck.vue                   | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index 48fe686b1..37c48261f 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -141,7 +141,9 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .kpoogebi {
 	position: relative;
-	display: inline-block;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 	font-weight: bold;
 	color: var(--accent);
 	border: solid 1px var(--accent);
diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index 84f6ace6a..a052c5d94 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -343,6 +343,11 @@ async function deleteProfile() {
 					> .new {
 						font-size: 20px;
 						background-color: var(--accentedBg);
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						border-radius: 10px;
+						margin: -0.5rem;
 					}
 				}
 

From 1576c4ff6458a9227dd1b652f4f46150d38b27b8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 2 Apr 2023 00:07:48 -0700
Subject: [PATCH 363/582] fix: dialogs not coming up

---
 package.json                                | 2 +-
 packages/client/src/components/MkDialog.vue | 2 +-
 packages/client/src/os.ts                   | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0cbc31e7c..3fe277aea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev22",
+	"version": "13.2.0-dev23",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue
index 708db22ef..de9cbe810 100644
--- a/packages/client/src/components/MkDialog.vue
+++ b/packages/client/src/components/MkDialog.vue
@@ -13,7 +13,7 @@
 				<MkLoading v-else-if="type === 'waiting'" :class="$style.iconInner" :em="true"/>
 			</div>
 			<header v-if="title" :class="$style.title"><Mfm :text="title"/></header>
-			<header v-if="title == null && input.type === 'password'" :class="$style.title"><Mfm :text="i18n.ts.password"/></header>
+			<header v-if="title == null && (input && input.type === 'password')" :class="$style.title"><Mfm :text="i18n.ts.password"/></header>
 			<div v-if="text" :class="$style.text"><Mfm :text="text"/></div>
 			<MkInput v-if="input && input.type !== 'paragraph'" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" @keydown="onInputKeydown">
 				<template v-if="input.type === 'password'" #prefix><i class="ph-password ph-bold ph-lg"></i></template>
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index ae2fc23a2..ae78a73a4 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -715,9 +715,7 @@ export async function openEmojiPicker(
 			for (const node of Array.from(record.addedNodes).filter(
 				(node) => node instanceof HTMLElement,
 			) as HTMLElement[]) {
-				const textareas = node.querySelectorAll(
-					"textarea, input",
-				) as NodeListOf<NonNullable<typeof activeTextarea>>;
+				const textareas = node.querySelectorAll("textarea, input");
 				for (const textarea of Array.from(textareas).filter(
 					(textarea) => textarea.dataset.preventEmojiInsert == null,
 				)) {

From eb6b4b83fd5530af4c46fcc5792dc15b57fff375 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 2 Apr 2023 00:13:26 -0700
Subject: [PATCH 364/582] correct color for help button

---
 packages/client/src/ui/_common_/navbar-for-mobile.vue | 1 +
 packages/client/src/ui/_common_/navbar.vue            | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index da0aa68de..71bf05b66 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -174,6 +174,7 @@ function more() {
 					text-align: center;
 					width: 100%;
 					margin-top: 1rem;
+					color: var(--navFg);
 
 					> .icon {
 						display: inline-block;
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 06f878964..589868699 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -274,6 +274,7 @@ function more(ev: MouseEvent) {
 					text-align: center;
 					width: 100%;
 					margin-top: 1rem;
+					color: var(--navFg);
 
 					> .icon {
 						display: inline-block;
@@ -445,6 +446,7 @@ function more(ev: MouseEvent) {
 					text-align: center;
 					width: 100%;
 					margin-top: 1rem;
+					color: var(--navFg);
 
 					> .icon {
 						display: inline-block;

From de75999833ff79c3b1761f60dfa7353c90ca2647 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 2 Apr 2023 00:21:43 -0700
Subject: [PATCH 365/582] attempt fix

---
 packages/client/src/ui/deck.vue           | 4 +++-
 packages/client/src/ui/deck/deck-store.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index a052c5d94..e3af9aa6f 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -211,6 +211,7 @@ function changeProfile(ev: MouseEvent) {
 }
 
 async function deleteProfile() {
+	console.log(deckStore.state.profile)
 	const { canceled } = await os.confirm({
 		type: 'warning',
 		text: i18n.t('deleteAreYouSure', { x: deckStore.state.profile }),
@@ -347,7 +348,8 @@ async function deleteProfile() {
 						align-items: center;
 						justify-content: center;
 						border-radius: 10px;
-						margin: -0.5rem;
+						margin: -0.35rem;
+						transform: scale(0.8);
 					}
 				}
 
diff --git a/packages/client/src/ui/deck/deck-store.ts b/packages/client/src/ui/deck/deck-store.ts
index 075cc5cea..4c9df3559 100644
--- a/packages/client/src/ui/deck/deck-store.ts
+++ b/packages/client/src/ui/deck/deck-store.ts
@@ -108,7 +108,7 @@ export async function getProfiles(): Promise<string[]> {
 	});
 }
 
-export async function deleteProfile(key: string): Promise<void> {
+export async function deleteProfile(key: string): Promise<any> {
 	return await api("i/registry/remove", {
 		scope: ["client", "deck", "profiles"],
 		key: key,

From 4b770363f5c7ec253df169bc023e30ae607ad067 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 2 Apr 2023 00:42:35 -0700
Subject: [PATCH 366/582] remove console.log

---
 packages/client/src/ui/deck.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index e3af9aa6f..137496c8e 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -211,7 +211,6 @@ function changeProfile(ev: MouseEvent) {
 }
 
 async function deleteProfile() {
-	console.log(deckStore.state.profile)
 	const { canceled } = await os.confirm({
 		type: 'warning',
 		text: i18n.t('deleteAreYouSure', { x: deckStore.state.profile }),

From 461678394ece7daa121559057332e577be79cc9f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 2 Apr 2023 01:00:40 -0700
Subject: [PATCH 367/582] styling

---
 packages/client/src/pages/page-editor/page-editor.vue | 10 ----------
 packages/client/src/pages/page.vue                    |  4 ++--
 packages/client/src/pages/scratchpad.vue              |  2 +-
 packages/client/src/style.scss                        |  4 ++++
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/pages/page-editor/page-editor.vue b/packages/client/src/pages/page-editor/page-editor.vue
index 89af1a63e..185b4347a 100644
--- a/packages/client/src/pages/page-editor/page-editor.vue
+++ b/packages/client/src/pages/page-editor/page-editor.vue
@@ -83,12 +83,6 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, provide, watch } from 'vue';
-import 'prismjs';
-import { highlight, languages } from 'prismjs/components/prism-core';
-import 'prismjs/components/prism-clike';
-import 'prismjs/components/prism-javascript';
-import 'prismjs/themes/prism-okaidia.css';
-import 'vue-prism-editor/dist/prismeditor.min.css';
 import { v4 as uuid } from 'uuid';
 import XVariable from './page-editor.script-block.vue';
 import XBlocks from './page-editor.blocks.vue';
@@ -357,10 +351,6 @@ function removeEyeCatchingImage() {
 	eyeCatchingImageId = null;
 }
 
-function highlighter(code) {
-	return highlight(code, languages.js, 'javascript');
-}
-
 async function init() {
 	hpml = new HpmlTypeChecker();
 
diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue
index f1a967c4a..26887e4df 100644
--- a/packages/client/src/pages/page.vue
+++ b/packages/client/src/pages/page.vue
@@ -16,9 +16,9 @@
 							</div>
 							<div class="menu-actions">
 								<button v-tooltip="i18n.ts.copyUrl" @click="copyUrl" class="menu _button"><i class="ph-link-simple ph-bold ph-lg"/></button>
-								<MkA v-tooltip="i18n.ts._pages.viewSource" :to="`/@${username}/pages/${pageName}/view-source`" class="menu _button"><i class="ph-code ph-bold ph-lg"/></MkA>
+								<MkA v-tooltip="i18n.ts._pages.viewSource" :to="`/@${username}/pages/${pageName}/view-source`" class="menu _button" style="transform: translateY(2px);"><i class="ph-code ph-bold ph-lg"/></MkA>
 								<template v-if="$i && $i.id === page.userId">
-									<MkA v-tooltip="i18n.ts._pages.editPage" class="menu _button" :to="`/pages/edit/${page.id}`"><i class="ph-pencil ph-bold ph-lg"/></MkA>
+									<MkA v-tooltip="i18n.ts._pages.editPage" class="menu _button" :to="`/pages/edit/${page.id}`" style="transform: translateY(2px);"><i class="ph-pencil ph-bold ph-lg"/></MkA>
 									<button v-if="$i.pinnedPageId === page.id" v-tooltip="i18n.ts.unpin" class="menu _button" @click="pin(false)"><i class="ph-push-pin-slash ph-bold ph-lg"/></button>
 									<button v-else v-tooltip="i18n.ts.pin" class="menu _button" @click="pin(true)"><i class="ph-push-pin ph-bold ph-lg"/></button>
 								</template>
diff --git a/packages/client/src/pages/scratchpad.vue b/packages/client/src/pages/scratchpad.vue
index c448986a5..7d423e7dd 100644
--- a/packages/client/src/pages/scratchpad.vue
+++ b/packages/client/src/pages/scratchpad.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="iltifgqe">
 	<div class="editor _panel _gap">
-		<PrismEditor v-model="code" class="_code code" :highlight="highlighter" :line-numbers="false"/>
+		<PrismEditor v-model="code" class="_code code" style="height: 30vh" :highlight="highlighter" :line-numbers="false"/>
 		<MkButton style="position: absolute; top: 8px; right: 8px;" primary @click="run()"><i class="ph-play ph-bold ph-lg"></i></MkButton>
 	</div>
 
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 0176f7c80..7a8a78f00 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -518,6 +518,10 @@ hr {
 	padding: 5px;
 }
 
+.prism-editor__container {
+	height: 100%;
+}
+
 .prism-editor__textarea:focus {
 	outline: none;
 }

From 34865c1af3bcbe69f8965b768b052e4ee02670e3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 2 Apr 2023 01:59:18 -0700
Subject: [PATCH 368/582] fix: dockerfile

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 53734b069..c0a654654 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,8 @@ COPY packages/backend/package.json packages/backend/package.json
 COPY packages/client/package.json packages/client/package.json
 COPY packages/sw/package.json packages/sw/package.json
 COPY packages/backend/native-utils/package.json packages/backend/native-utils/package.json
-COPY packages/backend/native-utils/**/*/package.json packages/backend/native-utils/**/*/package.json
+COPY packages/backend/native-utils/npm/linux-x64-musl/package.json packages/backend/native-utils/npm/linux-x64-musl/package.json
+COPY packages/backend/native-utils/npm/linux-arm64-musl/package.json packages/backend/native-utils/npm/linux-arm64-musl/package.json
 
 # Configure corepack and pnpm
 RUN corepack enable

From c35d716ebb62384cc1c5ce368b19eaac455b0964 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 2 Apr 2023 02:07:02 -0700
Subject: [PATCH 369/582] fix: add copy for build from native-utils

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

diff --git a/Dockerfile b/Dockerfile
index c0a654654..3378f1e61 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,8 @@ COPY --from=build /calckey/packages/client/node_modules /calckey/packages/client
 COPY --from=build /calckey/built /calckey/built
 COPY --from=build /calckey/packages/backend/built /calckey/packages/backend/built
 COPY --from=build /calckey/packages/backend/assets/instance.css /calckey/packages/backend/assets/instance.css
+COPY --from=build /calckey/packages/backend/native-utils/built /calckey/packages/backend/native-utils/built
+COPY --from=build /calckey/packages/backend/native-utils/target /calckey/packages/backend/native-utils/target
 
 RUN corepack enable
 ENTRYPOINT [ "/sbin/tini", "--" ]

From f8565b226a0909b9eb36ccc10c1c0ece5a0cce6a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 2 Apr 2023 02:09:49 -0700
Subject: [PATCH 370/582] add VIPS to dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3378f1e61..1a1a0aac6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM node:19-alpine as build
 WORKDIR /calckey
 
 # Install compilation dependencies
-RUN apk add --no-cache --no-progress git alpine-sdk python3 rust cargo
+RUN apk add --no-cache --no-progress git alpine-sdk python3 rust cargo vips
 
 # Copy only the dependency-related files first, to cache efficiently
 COPY package.json pnpm*.yaml ./

From ae8590432213a4d73392b881b4bf1ec934a7dcde Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 2 Apr 2023 02:17:54 -0700
Subject: [PATCH 371/582] ci: :construction_worker: add beta to commit

---
 .woodpecker/commit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker/commit.yml b/.woodpecker/commit.yml
index 386484ce2..6bb1b2d81 100644
--- a/.woodpecker/commit.yml
+++ b/.woodpecker/commit.yml
@@ -18,4 +18,4 @@ services:
     image: redis
 
 branches:
-  include: [ main, develop, feature/* ]
+  include: [ main, beta, develop, feature/* ]

From eaa6bc2da37e34ec924cc2684e7a427b7ab5765b Mon Sep 17 00:00:00 2001
From: Kaity A <kaity@theallans.com.au>
Date: Sun, 2 Apr 2023 21:24:12 +1000
Subject: [PATCH 372/582] Separate cat-avatar mode and speak-as-cat
 nyanification

---
 locales/en-US.yml                             |  2 ++
 .../migration/1680426269172-SpeakAsCat.js     | 20 +++++++++++++++++++
 packages/backend/src/models/entities/user.ts  |  6 ++++++
 .../backend/src/models/repositories/note.ts   |  2 +-
 .../backend/src/models/repositories/user.ts   |  1 +
 packages/backend/src/models/schema/user.ts    |  5 +++++
 .../src/server/api/endpoints/i/update.ts      |  2 ++
 .../client/src/pages/settings/profile.vue     |  3 +++
 8 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 packages/backend/migration/1680426269172-SpeakAsCat.js

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 880203922..3649e9701 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -146,6 +146,8 @@ flagAsBot: "Mark this account as a bot"
 flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Calckey's internal systems to treat this account as a bot."
 flagAsCat: "Are you a cat? 😺"
 flagAsCatDescription: "You'll get cat ears and speak like a cat!"
+flagSpeakAsCat: "Speak as a cat"
+flagSpeakAsCatDescription: "Your posts will get nyanified when in cat mode"
 flagShowTimelineReplies: "Show replies in timeline"
 flagShowTimelineRepliesDescription: "Shows replies of users to posts of other users in the timeline if turned on."
 autoAcceptFollowed: "Automatically approve follow requests from users you're following"
diff --git a/packages/backend/migration/1680426269172-SpeakAsCat.js b/packages/backend/migration/1680426269172-SpeakAsCat.js
new file mode 100644
index 000000000..3655e2726
--- /dev/null
+++ b/packages/backend/migration/1680426269172-SpeakAsCat.js
@@ -0,0 +1,20 @@
+export class SpeakAsCat1680426269172 {
+    name = 'SpeakAsCat1680426269172'
+
+    async up(queryRunner) {
+        await queryRunner.query(`
+            ALTER TABLE "user"
+            ADD "speakAsCat" boolean NOT NULL DEFAULT true
+        `);
+        await queryRunner.query(`
+            COMMENT ON COLUMN "user"."speakAsCat"
+						IS 'Whether to speak as a cat if isCat.'
+        `);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`
+            ALTER TABLE "user" DROP COLUMN "speakAsCat"
+        `);
+    }
+}
diff --git a/packages/backend/src/models/entities/user.ts b/packages/backend/src/models/entities/user.ts
index c57ad916c..c23f4f28d 100644
--- a/packages/backend/src/models/entities/user.ts
+++ b/packages/backend/src/models/entities/user.ts
@@ -156,6 +156,12 @@ export class User {
 	})
 	public isCat: boolean;
 
+	@Column('boolean', {
+		default: true,
+		comment: 'Whether to speak as a cat if isCat.',
+	})
+	public speakAsCat: boolean;
+
 	@Column('boolean', {
 		default: false,
 		comment: 'Whether the User is the admin.',
diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index b99ce1635..5e56a817b 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -263,7 +263,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 				: {}),
 		});
 
-		if (packed.user.isCat && packed.text) {
+		if (packed.user.isCat && packed.user.speakAsCat && packed.text) {
 			const tokens = packed.text ? mfm.parse(packed.text) : [];
 			function nyaizeNode(node: mfm.MfmNode) {
 				if (node.type === "quote") return;
diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 0bf31b1b3..27b0c78d6 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -438,6 +438,7 @@ export const UserRepository = db.getRepository(User).extend({
 			isModerator: user.isModerator || falsy,
 			isBot: user.isBot || falsy,
 			isCat: user.isCat || falsy,
+			speakAsCat: user.speakAsCat || falsy,
 			instance: user.host
 				? userInstanceCache
 						.fetch(
diff --git a/packages/backend/src/models/schema/user.ts b/packages/backend/src/models/schema/user.ts
index 9fb5aa8f3..7f7689165 100644
--- a/packages/backend/src/models/schema/user.ts
+++ b/packages/backend/src/models/schema/user.ts
@@ -66,6 +66,11 @@ export const packedUserLiteSchema = {
 			nullable: false,
 			optional: true,
 		},
+		speakAsCat: {
+			type: "boolean",
+			nullable: false,
+			optional: true,
+		},
 		emojis: {
 			type: "array",
 			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 48868de37..56ed64296 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -104,6 +104,7 @@ export const paramDef = {
 		noCrawle: { type: "boolean" },
 		isBot: { type: "boolean" },
 		isCat: { type: "boolean" },
+		speakAsCat: { type: "boolean" },
 		showTimelineReplies: { type: "boolean" },
 		injectFeaturedNote: { type: "boolean" },
 		receiveAnnouncementEmail: { type: "boolean" },
@@ -191,6 +192,7 @@ export default define(meta, paramDef, async (ps, _user, token) => {
 		profileUpdates.autoAcceptFollowed = ps.autoAcceptFollowed;
 	if (typeof ps.noCrawle === "boolean") profileUpdates.noCrawle = ps.noCrawle;
 	if (typeof ps.isCat === "boolean") updates.isCat = ps.isCat;
+	if (typeof ps.speakAsCat === "boolean") updates.speakAsCat = ps.speakAsCat;
 	if (typeof ps.injectFeaturedNote === "boolean")
 		profileUpdates.injectFeaturedNote = ps.injectFeaturedNote;
 	if (typeof ps.receiveAnnouncementEmail === "boolean")
diff --git a/packages/client/src/pages/settings/profile.vue b/packages/client/src/pages/settings/profile.vue
index a2ed6fd41..4e51a339b 100644
--- a/packages/client/src/pages/settings/profile.vue
+++ b/packages/client/src/pages/settings/profile.vue
@@ -59,6 +59,7 @@
 	</FormSlot>
 
 	<FormSwitch v-model="profile.isCat" class="_formBlock">{{ i18n.ts.flagAsCat }}<template #caption>{{ i18n.ts.flagAsCatDescription }}</template></FormSwitch>
+	<FormSwitch v-if="profile.isCat" v-model="profile.speakAsCat" class="_formBlock">{{ i18n.ts.flagSpeakAsCat }}<template #caption>{{ i18n.ts.flagSpeakAsCatDescription }}</template></FormSwitch>
 	<FormSwitch v-model="profile.showTimelineReplies" class="_formBlock">{{ i18n.ts.flagShowTimelineReplies }}<template #caption>{{ i18n.ts.flagShowTimelineRepliesDescription }} {{ i18n.ts.reflectMayTakeTime }}</template></FormSwitch>
 	<FormSwitch v-model="profile.isBot" class="_formBlock">{{ i18n.ts.flagAsBot }}<template #caption>{{ i18n.ts.flagAsBotDescription }}</template></FormSwitch>
 	<div v-if="saveButton == true">
@@ -92,6 +93,7 @@ const profile = reactive({
 	lang: $i?.lang,
 	isBot: $i?.isBot,
 	isCat: $i?.isCat,
+	speakAsCat: $i?.speakAsCat,
 	showTimelineReplies: $i?.showTimelineReplies,
 });
 
@@ -135,6 +137,7 @@ function save() {
 		lang: profile.lang || null,
 		isBot: !!profile.isBot,
 		isCat: !!profile.isCat,
+		speakAsCat: !!profile.speakAsCat,
 		showTimelineReplies: !!profile.showTimelineReplies,
 	});
 }

From 6d8d5bc5aa2fa25fbe6bdf060c1f0902a54b5521 Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Sun, 2 Apr 2023 21:39:25 +0000
Subject: [PATCH 373/582] note-improvements (#9799)

Boop!

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9799
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 locales/en-US.yml                             | 14 +++----
 packages/client/src/components/MkNote.vue     | 14 ++++---
 .../client/src/components/MkNoteDetailed.vue  |  3 +-
 packages/client/src/components/MkNoteSub.vue  | 39 ++++++++++++++-----
 .../src/components/MkSubNoteContent.vue       |  2 +-
 packages/client/src/ui/universal.vue          |  8 +++-
 6 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 3649e9701..f4913e904 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1230,13 +1230,13 @@ _sfx:
 _ago:
   future: "Future"
   justNow: "Just now"
-  secondsAgo: "{n} second(s) ago"
-  minutesAgo: "{n} minute(s) ago"
-  hoursAgo: "{n} hour(s) ago"
-  daysAgo: "{n} day(s) ago"
-  weeksAgo: "{n} week(s) ago"
-  monthsAgo: "{n} month(s) ago"
-  yearsAgo: "{n} year(s) ago"
+  secondsAgo: "{n}s ago"
+  minutesAgo: "{n}m ago"
+  hoursAgo: "{n}h ago"
+  daysAgo: "{n}d ago"
+  weeksAgo: "{n}w ago"
+  monthsAgo: "{n}mo ago"
+  yearsAgo: "{n}y ago"
 _time:
   second: "Second(s)"
   minute: "Minute(s)"
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index c02e79d00..f80aabbc9 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -10,16 +10,16 @@
 	:class="{ renote: isRenote }"
 >
 	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to"/>
-	<div class="note-context">
+	<div class="note-context" @click="noteClick">
 		<div class="line"></div>
-		<div v-if="appearNote._prId_" class="info"><i class="ph-megaphone-simple-bold ph-lg"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ph-x ph-bold ph-lg"></i></button></div>
+		<div v-if="appearNote._prId_" class="info"><i class="ph-megaphone-simple-bold ph-lg"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click.stop="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ph-x ph-bold ph-lg"></i></button></div>
 		<div v-if="appearNote._featuredId_" class="info"><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts.featured }}</div>
 		<div v-if="pinned" class="info"><i class="ph-push-pin ph-bold ph-lg"></i>{{ i18n.ts.pinnedNote }}</div>
 		<div v-if="isRenote" class="renote">
 			<i class="ph-repeat ph-bold ph-lg"></i>
 			<I18n :src="i18n.ts.renotedBy" tag="span">
 				<template #user>
-					<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)">
+					<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)" @click.stop>
 						<MkUserName :user="note.user"/>
 					</MkA>
 				</template>
@@ -93,7 +93,6 @@
 					<i class="ph-dots-three-outline ph-bold ph-lg"></i>
 				</button>
 			</footer>
-			<!-- <MkNoteFooter :note="appearNote"></MkNoteFooter> -->
 		</div>
 	</article>
 </div>
@@ -418,8 +417,8 @@ function readPromo() {
 			align-items: center;
 			white-space: pre;
 			color: var(--renote);
+			cursor: pointer;
 
-			
 			> i {
 				margin-right: 4px;
 			}
@@ -504,7 +503,7 @@ function readPromo() {
 							width: 100%;
 							margin-top: 1em;
 							position: sticky;
-							bottom: 1em;
+							bottom: var(--stickyBottom);
 
 							> span {
 								display: inline-block;
@@ -663,6 +662,9 @@ function readPromo() {
 			}
 			> .line {
 				margin-right: 10px;
+				&::before {
+					margin-top: 8px;
+				}
 			}
 		}
 		> .article {
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index a06bac370..4eed184e2 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -352,6 +352,7 @@ onUnmounted(() => {
 
 <style lang="scss" scoped>
 .lxwezrsl {
+	font-size: 1.05em;
 	position: relative;
 	transition: box-shadow 0.1s ease;
 	contain: content;
@@ -451,7 +452,7 @@ onUnmounted(() => {
 		&:last-child {
 			padding-bottom: 24px;
 		}
-		font-size: 1.2em;
+		font-size: 1.1em;
 		overflow: clip;
 		outline: none;
 		scroll-margin-top: calc(var(--stickyTop) + 20vh);
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 401d33ca8..4f172fb0d 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -7,25 +7,25 @@
 	<div v-if="conversation && depth > 1" class="line"></div>
 	<div class="main" @click="noteClick">
 		<div class="avatar-container">
-			<MkAvatar class="avatar" :user="note.user"/>
+			<MkAvatar class="avatar" :user="appearNote.user"/>
 			<div v-if="(!conversation) || replies.length > 0" class="line"></div>
 		</div>
 		<div class="body">
 			<XNoteHeader class="header" :note="note" :mini="true"/>
 			<div class="body">
-				<p v-if="note.cw != null" class="cw">
-					<MkA v-if="note.replyId"  :to="`/notes/${note.replyId}`" class="reply-icon" @click.stop>
+				<p v-if="appearNote.cw != null" class="cw">
+					<MkA v-if="appearNote.replyId"  :to="`/notes/${appearNote.replyId}`" class="reply-icon" @click.stop>
 						<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
 					</MkA>
-					<MkA v-if="conversation && note.renoteId && note.renoteId != parentId && !note.replyId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
+					<MkA v-if="conversation && appearNote.renoteId && appearNote.renoteId != parentId && !appearNote.replyId" :to="`/notes/${appearNote.renoteId}`" class="reply-icon" @click.stop>
 						<i class="ph-quotes ph-bold ph-lg"></i>
 					</MkA>
-					<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
+					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 					<br/>
 					<XCwButton v-model="showContent" :note="note"/>
 				</p>
-				<div v-show="note.cw == null || showContent" class="content">
-					<MkSubNoteContent class="text" :note="note" :detailed="true" :parentId="note.parentId" :conversation="conversation"/>
+				<div v-show="appearNote.cw == null || showContent" class="content">
+					<MkSubNoteContent class="text" :note="note" :detailed="true" :parentId="appearNote.parentId" :conversation="conversation"/>
 				</div>
 				<div v-if="translating || translation" class="translation">
 					<MkLoading v-if="translating" mini/>
@@ -56,15 +56,14 @@
 					<i class="ph-dots-three-outline ph-bold ph-lg"></i>
 				</button>
 			</footer>
-			<!-- <MkNoteFooter :note="note" :directReplies="replies.length"></MkNoteFooter> -->
 		</div>
 	</div>
 	<template v-if="conversation">
 		<template v-if="replies.length == 1">
-			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply single" :conversation="conversation" :depth="depth" :parentId="note.replyId"/>
+			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply single" :conversation="conversation" :depth="depth" :parentId="appearNote.replyId"/>
 		</template>
 		<template v-else-if="depth < 5">
-			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply" :conversation="conversation" :depth="depth + 1" :parentId="note.replyId"/>
+			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply" :conversation="conversation" :depth="depth + 1" :parentId="appearNote.replyId"/>
 		</template>
 		<div v-else-if="replies.length > 0" class="more">
 			<div class="line"></div>
@@ -457,6 +456,26 @@ function noteClick(e) {
 			-webkit-mask: linear-gradient(to right, transparent 2px, black 2px);
 		}
 	}
+	// End Reply Divider
+	.children > .main:last-child {
+		padding-bottom: 1em;
+		&::before {
+			bottom: 1em;
+		}
+		// &::after {
+		// 	content: "";
+		// 	border-top: 1px solid var(--X13);
+		// 	position: absolute;
+		// 	bottom: 0;
+		// 	margin-left: calc(var(--avatarSize) + 12px);
+		// 	inset-inline: 0;
+		// }
+	}
+	&.firstColumn > .children:last-child > .main {
+		padding-bottom: 0 !important;
+		&::before { bottom: 0 !important }
+		// &::after { content: unset }
+	}
 
 	&.max-width_500px {
 		:not(.reply) > & {
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index f58e9b763..fa421d10f 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -130,7 +130,7 @@ const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : n
 			width: 100%;
 			margin-top: 1em;
 			position: sticky;
-			bottom: 1em;
+			bottom: var(--stickyBottom);
 
 			> span {
 				display: inline-block;
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index bd95f7131..391234097 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="dkgtipfy" :class="{ wallpaper }">
+<div class="dkgtipfy" :class="{ wallpaper, isMobile }">
 	<XSidebar v-if="!isMobile" class="sidebar"/>
 
 	<MkStickyContainer class="contents">
@@ -319,6 +319,10 @@ console.log(mainRouter.currentRoute.value.name);
 	box-sizing: border-box;
 	display: flex;
 
+	--stickyBottom: 1em;
+	&.isMobile {
+		--stickyBottom: 6rem;
+	}
 	&.wallpaper {
 		background: var(--wallpaperOverlay);
 		//backdrop-filter: var(--blur, blur(4px));
@@ -363,7 +367,7 @@ console.log(mainRouter.currentRoute.value.name);
 	}
 
 	> .postButton, .widgetButton {
-		bottom: 6rem;
+		bottom: var(--stickyBottom);
 		right: 1.5rem;
 		height: 4rem;
 		width: 4rem;

From 361ad26278f18b9a876b407ccfb0c458e82f9375 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.a-ef.org>
Date: Mon, 3 Apr 2023 00:17:51 -0400
Subject: [PATCH 374/582] add "speak as cat" setting to ja-jp

---
 locales/ja-JP.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 34dc97489..64d804928 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -145,7 +145,9 @@ cacheRemoteFilesDescription: "この設定を無効にすると、リモート
 flagAsBot: "Botとして設定"
 flagAsBotDescription: "このアカウントがBotである場合は、この設定をオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Calckeyのシステム上での扱いがBotに合ったものになります。"
 flagAsCat: "あなたは…猫？😺"
-flagAsCatDescription: "このアカウントが猫であることを示す場合は、このフラグをオンにします。"
+flagAsCatDescription: "このアカウントが猫であることを示す猫モードを有効にするには、このフラグをオンにします。"
+flagSpeakAsCat: "猫語で話す"
+flagSpeakAsCatDescription: "猫モードが有効の場合にオンにすると、あなたの投稿の「な」を「にゃ」に変換します。"
 flagShowTimelineReplies: "タイムラインに投稿の返信を表示する"
 flagShowTimelineRepliesDescription: "オンにすると、タイムラインにユーザーの他の投稿への返信も表示されます。"
 autoAcceptFollowed: "フォローしているユーザーからのフォロー申請を自動承認"

From 3f3bf0a9e74f3e2041316b5230ddc6c18a0d883f Mon Sep 17 00:00:00 2001
From: amy bones <amy@spookygirl.boo>
Date: Mon, 3 Apr 2023 02:23:51 -0700
Subject: [PATCH 375/582] fix: changing passwords, 2fa, and password resets.

The argon2 usage was only implemented for sign-ins which broke a bunch of other
endpoints and features.
---
 packages/backend/src/server/api/common/signup.ts           | 5 ++---
 .../src/server/api/endpoints/admin/reset-password.ts       | 6 ++++--
 .../backend/src/server/api/endpoints/i/2fa/key-done.ts     | 4 ++--
 .../backend/src/server/api/endpoints/i/2fa/register-key.ts | 4 ++--
 .../backend/src/server/api/endpoints/i/2fa/register.ts     | 4 ++--
 .../backend/src/server/api/endpoints/i/2fa/remove-key.ts   | 4 ++--
 .../backend/src/server/api/endpoints/i/2fa/unregister.ts   | 4 ++--
 .../backend/src/server/api/endpoints/i/change-password.ts  | 7 +++----
 .../backend/src/server/api/endpoints/i/delete-account.ts   | 4 ++--
 .../backend/src/server/api/endpoints/i/regenerate-token.ts | 4 ++--
 .../backend/src/server/api/endpoints/i/update-email.ts     | 4 ++--
 .../backend/src/server/api/endpoints/reset-password.ts     | 5 ++---
 packages/backend/src/server/api/private/signin.ts          | 1 -
 packages/backend/src/server/api/private/signup.ts          | 5 ++---
 packages/backend/src/services/create-system-user.ts        | 5 ++---
 15 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/packages/backend/src/server/api/common/signup.ts b/packages/backend/src/server/api/common/signup.ts
index bb178506b..6beae2c78 100644
--- a/packages/backend/src/server/api/common/signup.ts
+++ b/packages/backend/src/server/api/common/signup.ts
@@ -1,4 +1,3 @@
-import bcrypt from "bcryptjs";
 import { generateKeyPair } from "node:crypto";
 import generateUserToken from "./generate-native-user-token.js";
 import { User } from "@/models/entities/user.js";
@@ -12,6 +11,7 @@ import { usersChart } from "@/services/chart/index.js";
 import { UsedUsername } from "@/models/entities/used-username.js";
 import { db } from "@/db/postgre.js";
 import config from "@/config/index.js";
+import { hashPassword } from "@/misc/password.js";
 
 export async function signup(opts: {
 	username: User["username"];
@@ -42,8 +42,7 @@ export async function signup(opts: {
 		}
 
 		// Generate hash of password
-		const salt = await bcrypt.genSalt(8);
-		hash = await bcrypt.hash(password, salt);
+		hash = await hashPassword(password);
 	}
 
 	// Generate secret
diff --git a/packages/backend/src/server/api/endpoints/admin/reset-password.ts b/packages/backend/src/server/api/endpoints/admin/reset-password.ts
index dd3f258f7..cbe6735ce 100644
--- a/packages/backend/src/server/api/endpoints/admin/reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/admin/reset-password.ts
@@ -1,7 +1,8 @@
 import define from "../../define.js";
-import bcrypt from "bcryptjs";
+// import bcrypt from "bcryptjs";
 import rndstr from "rndstr";
 import { Users, UserProfiles } from "@/models/index.js";
+import { hashPassword } from "@/misc/password.js";
 
 export const meta = {
 	tags: ["admin"],
@@ -47,7 +48,8 @@ export default define(meta, paramDef, async (ps) => {
 	const passwd = rndstr("a-zA-Z0-9", 8);
 
 	// Generate hash of password
-	const hash = bcrypt.hashSync(passwd);
+	// const hash = bcrypt.hashSync(passwd);
+	const hash = await hashPassword(passwd);
 
 	await UserProfiles.update(
 		{
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
index e80dc4d71..f0581de4b 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
@@ -1,4 +1,3 @@
-import bcrypt from "bcryptjs";
 import { promisify } from "node:util";
 import * as cbor from "cbor";
 import define from "../../../define.js";
@@ -11,6 +10,7 @@ import {
 import config from "@/config/index.js";
 import { procedures, hash } from "../../../2fa.js";
 import { publishMainStream } from "@/services/stream.js";
+import { comparePassword } from "@/misc/password.js";
 
 const cborDecodeFirst = promisify(cbor.decodeFirst) as any;
 const rpIdHashReal = hash(Buffer.from(config.hostname, "utf-8"));
@@ -43,7 +43,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password!);
+	const same = await comparePassword(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error("incorrect password");
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
index 96239b56d..a10dc9b25 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
@@ -1,10 +1,10 @@
-import bcrypt from "bcryptjs";
 import define from "../../../define.js";
 import { UserProfiles, AttestationChallenges } from "@/models/index.js";
 import { promisify } from "node:util";
 import * as crypto from "node:crypto";
 import { genId } from "@/misc/gen-id.js";
 import { hash } from "../../../2fa.js";
+import { comparePassword } from "@/misc/password.js";
 
 const randomBytes = promisify(crypto.randomBytes);
 
@@ -26,7 +26,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password!);
+	const same = await comparePassword(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error("incorrect password");
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register.ts b/packages/backend/src/server/api/endpoints/i/2fa/register.ts
index 9019787f2..533035bc9 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/register.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/register.ts
@@ -1,9 +1,9 @@
-import bcrypt from "bcryptjs";
 import * as speakeasy from "speakeasy";
 import * as QRCode from "qrcode";
 import config from "@/config/index.js";
 import { UserProfiles } from "@/models/index.js";
 import define from "../../../define.js";
+import { comparePassword } from "@/misc/password.js";
 
 export const meta = {
 	requireCredential: true,
@@ -23,7 +23,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password!);
+	const same = await comparePassword(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error("incorrect password");
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts
index d491f0a6e..862c971e7 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts
@@ -1,4 +1,4 @@
-import bcrypt from "bcryptjs";
+import { comparePassword } from "@/misc/password.js";
 import define from "../../../define.js";
 import { UserProfiles, UserSecurityKeys, Users } from "@/models/index.js";
 import { publishMainStream } from "@/services/stream.js";
@@ -22,7 +22,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password!);
+	const same = await comparePassword(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error("incorrect password");
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts
index 9bb1538b0..57d57ff65 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts
@@ -1,6 +1,6 @@
-import bcrypt from "bcryptjs";
 import define from "../../../define.js";
 import { UserProfiles } from "@/models/index.js";
+import { comparePassword } from "@/misc/password.js";
 
 export const meta = {
 	requireCredential: true,
@@ -20,7 +20,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password!);
+	const same = await comparePassword(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error("incorrect password");
diff --git a/packages/backend/src/server/api/endpoints/i/change-password.ts b/packages/backend/src/server/api/endpoints/i/change-password.ts
index fcfc38bd1..8bbb3ad93 100644
--- a/packages/backend/src/server/api/endpoints/i/change-password.ts
+++ b/packages/backend/src/server/api/endpoints/i/change-password.ts
@@ -1,6 +1,6 @@
-import bcrypt from "bcryptjs";
 import define from "../../define.js";
 import { UserProfiles } from "@/models/index.js";
+import { hashPassword, comparePassword } from "@/misc/password.js";
 
 export const meta = {
 	requireCredential: true,
@@ -21,15 +21,14 @@ export default define(meta, paramDef, async (ps, user) => {
 	const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
 
 	// Compare password
-	const same = await bcrypt.compare(ps.currentPassword, profile.password!);
+	const same = await comparePassword(ps.currentPassword, profile.password!);
 
 	if (!same) {
 		throw new Error("incorrect password");
 	}
 
 	// Generate hash of password
-	const salt = await bcrypt.genSalt(8);
-	const hash = await bcrypt.hash(ps.newPassword, salt);
+	const hash = await hashPassword(ps.newPassword);
 
 	await UserProfiles.update(user.id, {
 		password: hash,
diff --git a/packages/backend/src/server/api/endpoints/i/delete-account.ts b/packages/backend/src/server/api/endpoints/i/delete-account.ts
index 81aee9a41..781abe0b3 100644
--- a/packages/backend/src/server/api/endpoints/i/delete-account.ts
+++ b/packages/backend/src/server/api/endpoints/i/delete-account.ts
@@ -1,7 +1,7 @@
-import bcrypt from "bcryptjs";
 import { UserProfiles, Users } from "@/models/index.js";
 import { deleteAccount } from "@/services/delete-account.js";
 import define from "../../define.js";
+import { comparePassword } from "@/misc/password.js";
 
 export const meta = {
 	requireCredential: true,
@@ -25,7 +25,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password!);
+	const same = await comparePassword(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error("incorrect password");
diff --git a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts
index dff37cf3d..b5b34c090 100644
--- a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts
+++ b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts
@@ -1,4 +1,3 @@
-import bcrypt from "bcryptjs";
 import {
 	publishInternalEvent,
 	publishMainStream,
@@ -7,6 +6,7 @@ import {
 import generateUserToken from "../../common/generate-native-user-token.js";
 import define from "../../define.js";
 import { Users, UserProfiles } from "@/models/index.js";
+import { comparePassword } from "@/misc/password.js";
 
 export const meta = {
 	requireCredential: true,
@@ -29,7 +29,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password!);
+	const same = await comparePassword(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error("incorrect password");
diff --git a/packages/backend/src/server/api/endpoints/i/update-email.ts b/packages/backend/src/server/api/endpoints/i/update-email.ts
index c3c24d4d3..94ad6b3c7 100644
--- a/packages/backend/src/server/api/endpoints/i/update-email.ts
+++ b/packages/backend/src/server/api/endpoints/i/update-email.ts
@@ -2,12 +2,12 @@ import { publishMainStream } from "@/services/stream.js";
 import define from "../../define.js";
 import rndstr from "rndstr";
 import config from "@/config/index.js";
-import bcrypt from "bcryptjs";
 import { Users, UserProfiles } from "@/models/index.js";
 import { sendEmail } from "@/services/send-email.js";
 import { ApiError } from "../../error.js";
 import { validateEmailForAccount } from "@/services/validate-email-for-account.js";
 import { HOUR } from "@/const.js";
+import { comparePassword } from "@/misc/password.js";
 
 export const meta = {
 	requireCredential: true,
@@ -47,7 +47,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password!);
+	const same = await comparePassword(ps.password, profile.password!);
 
 	if (!same) {
 		throw new ApiError(meta.errors.incorrectPassword);
diff --git a/packages/backend/src/server/api/endpoints/reset-password.ts b/packages/backend/src/server/api/endpoints/reset-password.ts
index 51755727a..f695ae41f 100644
--- a/packages/backend/src/server/api/endpoints/reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/reset-password.ts
@@ -1,8 +1,8 @@
-import bcrypt from "bcryptjs";
 import { publishMainStream } from "@/services/stream.js";
 import { Users, UserProfiles, PasswordResetRequests } from "@/models/index.js";
 import define from "../define.js";
 import { ApiError } from "../error.js";
+import { hashPassword } from "@/misc/password.js";
 
 export const meta = {
 	tags: ["reset password"],
@@ -34,8 +34,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// Generate hash of password
-	const salt = await bcrypt.genSalt(8);
-	const hash = await bcrypt.hash(ps.password, salt);
+	const hash = await hashPassword(ps.password);
 
 	await UserProfiles.update(req.userId, {
 		password: hash,
diff --git a/packages/backend/src/server/api/private/signin.ts b/packages/backend/src/server/api/private/signin.ts
index 7c4b511a2..ef5b13781 100644
--- a/packages/backend/src/server/api/private/signin.ts
+++ b/packages/backend/src/server/api/private/signin.ts
@@ -1,5 +1,4 @@
 import type Koa from "koa";
-import bcrypt from "bcryptjs";
 import * as speakeasy from "speakeasy";
 import signin from "../common/signin.js";
 import config from "@/config/index.js";
diff --git a/packages/backend/src/server/api/private/signup.ts b/packages/backend/src/server/api/private/signup.ts
index dc5eb2316..754d86c3b 100644
--- a/packages/backend/src/server/api/private/signup.ts
+++ b/packages/backend/src/server/api/private/signup.ts
@@ -1,6 +1,5 @@
 import type Koa from "koa";
 import rndstr from "rndstr";
-import bcrypt from "bcryptjs";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 import { verifyHcaptcha, verifyRecaptcha } from "@/misc/captcha.js";
 import { Users, RegistrationTickets, UserPendings } from "@/models/index.js";
@@ -9,6 +8,7 @@ import config from "@/config/index.js";
 import { sendEmail } from "@/services/send-email.js";
 import { genId } from "@/misc/gen-id.js";
 import { validateEmailForAccount } from "@/services/validate-email-for-account.js";
+import { hashPassword } from "@/misc/password.js";
 
 export default async (ctx: Koa.Context) => {
 	const body = ctx.request.body;
@@ -79,8 +79,7 @@ export default async (ctx: Koa.Context) => {
 		const code = rndstr("a-z0-9", 16);
 
 		// Generate hash of password
-		const salt = await bcrypt.genSalt(8);
-		const hash = await bcrypt.hash(password, salt);
+		const hash = await hashPassword(password);
 
 		await UserPendings.insert({
 			id: genId(),
diff --git a/packages/backend/src/services/create-system-user.ts b/packages/backend/src/services/create-system-user.ts
index def3ee98f..24536090a 100644
--- a/packages/backend/src/services/create-system-user.ts
+++ b/packages/backend/src/services/create-system-user.ts
@@ -1,4 +1,3 @@
-import bcrypt from "bcryptjs";
 import { v4 as uuid } from "uuid";
 import generateNativeUserToken from "../server/api/common/generate-native-user-token.js";
 import { genRsaKeyPair } from "@/misc/gen-key-pair.js";
@@ -9,13 +8,13 @@ import { genId } from "@/misc/gen-id.js";
 import { UserKeypair } from "@/models/entities/user-keypair.js";
 import { UsedUsername } from "@/models/entities/used-username.js";
 import { db } from "@/db/postgre.js";
+import { hashPassword } from "@/misc/password.js";
 
 export async function createSystemUser(username: string) {
 	const password = uuid();
 
 	// Generate hash of password
-	const salt = await bcrypt.genSalt(8);
-	const hash = await bcrypt.hash(password, salt);
+	const hash = await hashPassword(password);
 
 	// Generate secret
 	const secret = generateNativeUserToken();

From 44b35d27ed7c48e0808b4699dcd273af548221cd Mon Sep 17 00:00:00 2001
From: Kaity A <kaity@theallans.com.au>
Date: Tue, 4 Apr 2023 02:46:06 +1000
Subject: [PATCH 376/582] Requested limit to be fulfilled if possible

---
 .../api/endpoints/notes/global-timeline.ts    | 20 +++++++++++++---
 .../api/endpoints/notes/hybrid-timeline.ts    | 20 +++++++++++++---
 .../api/endpoints/notes/local-timeline.ts     | 20 +++++++++++++---
 .../server/api/endpoints/notes/mentions.ts    | 21 +++++++++++++---
 .../endpoints/notes/recommended-timeline.ts   | 20 +++++++++++++---
 .../src/server/api/endpoints/notes/renotes.ts | 18 ++++++++++++--
 .../src/server/api/endpoints/notes/replies.ts | 18 ++++++++++++--
 .../api/endpoints/notes/search-by-tag.ts      | 19 ++++++++++++---
 .../server/api/endpoints/notes/timeline.ts    | 20 +++++++++++++---
 .../api/endpoints/notes/user-list-timeline.ts | 24 ++++++++++++++++---
 10 files changed, 172 insertions(+), 28 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
index e4a38cffb..bf4f0dcf2 100644
--- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -93,13 +93,27 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
-
 	process.nextTick(() => {
 		if (user) {
 			activeUsersChart.read(user);
 		}
 	});
+	
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops. But if there's more nobody cares.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(timeline, user);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
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 3d6103da8..fcd1aa3b5 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -151,11 +151,25 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
-
 	process.nextTick(() => {
 		activeUsersChart.read(user);
 	});
 
-	return await Notes.packMany(timeline, user);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops. But if there's more nobody cares.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
+
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index 22e5965fc..a1bc4a4eb 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -123,13 +123,27 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
-
 	process.nextTick(() => {
 		if (user) {
 			activeUsersChart.read(user);
 		}
 	});
 
-	return await Notes.packMany(timeline, user);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops. But if there's more nobody cares.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
+
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts
index 3e5c4f18b..9bd691c5f 100644
--- a/packages/backend/src/server/api/endpoints/notes/mentions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts
@@ -86,9 +86,24 @@ export default define(meta, paramDef, async (ps, user) => {
 		query.setParameters(followingQuery.getParameters());
 	}
 
-	const mentions = await query.take(ps.limit).getMany();
 
-	read(user.id, mentions);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops. But if there's more nobody cares.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(mentions, user);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	read(user.id, found);
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
index 6dacadec2..1e637978e 100644
--- a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
@@ -126,13 +126,27 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
-
 	process.nextTick(() => {
 		if (user) {
 			activeUsersChart.read(user);
 		}
 	});
 
-	return await Notes.packMany(timeline, user);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops. But if there's more nobody cares.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
+
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index b09243e7e..5ac0e47c1 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -74,7 +74,21 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (user) generateMutedUserQuery(query, user);
 	if (user) generateBlockedUserQuery(query, user);
 
-	const renotes = await query.take(ps.limit).getMany();
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops. But if there's more nobody cares.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(renotes, user);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/replies.ts b/packages/backend/src/server/api/endpoints/notes/replies.ts
index 0a8e90949..0cabc9400 100644
--- a/packages/backend/src/server/api/endpoints/notes/replies.ts
+++ b/packages/backend/src/server/api/endpoints/notes/replies.ts
@@ -58,7 +58,21 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (user) generateMutedUserQuery(query, user);
 	if (user) generateBlockedUserQuery(query, user);
 
-	const timeline = await query.take(ps.limit).getMany();
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops. But if there's more nobody cares.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(timeline, user);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
index d8d0dbbf7..5e232e4d5 100644
--- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
@@ -145,8 +145,21 @@ export default define(meta, paramDef, async (ps, me) => {
 		}
 	}
 
-	// Search notes
-	const notes = await query.take(ps.limit).getMany();
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops. But if there's more nobody cares.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, me))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(notes, me);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index 083f41365..0bb53fd4a 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -143,11 +143,25 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
-
 	process.nextTick(() => {
 		activeUsersChart.read(user);
 	});
 
-	return await Notes.packMany(timeline, user);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops. But if there's more nobody cares.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
+
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index c1e535722..bc75954c8 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -138,9 +138,27 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
+	process.nextTick(() => {
+		if (user) {
+			activeUsersChart.read(user);
+		}
+	});
 
-	activeUsersChart.read(user);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops. But if there's more nobody cares.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(timeline, user);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });

From d7e253eb6298c0d6ec7d1380e794b6187aab6fc1 Mon Sep 17 00:00:00 2001
From: Kaity A <kaity@theallans.com.au>
Date: Tue, 4 Apr 2023 02:46:06 +1000
Subject: [PATCH 377/582] Requested limit to be fulfilled if possible

---
 .../api/endpoints/notes/global-timeline.ts    | 20 +++++++++++++---
 .../api/endpoints/notes/hybrid-timeline.ts    | 20 +++++++++++++---
 .../api/endpoints/notes/local-timeline.ts     | 20 +++++++++++++---
 .../server/api/endpoints/notes/mentions.ts    | 21 +++++++++++++---
 .../endpoints/notes/recommended-timeline.ts   | 20 +++++++++++++---
 .../src/server/api/endpoints/notes/renotes.ts | 18 ++++++++++++--
 .../src/server/api/endpoints/notes/replies.ts | 18 ++++++++++++--
 .../api/endpoints/notes/search-by-tag.ts      | 19 ++++++++++++---
 .../server/api/endpoints/notes/timeline.ts    | 20 +++++++++++++---
 .../api/endpoints/notes/user-list-timeline.ts | 24 ++++++++++++++++---
 10 files changed, 172 insertions(+), 28 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
index e4a38cffb..584a6ce02 100644
--- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -93,13 +93,27 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
-
 	process.nextTick(() => {
 		if (user) {
 			activeUsersChart.read(user);
 		}
 	});
+	
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(timeline, user);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
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 3d6103da8..78846861a 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -151,11 +151,25 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
-
 	process.nextTick(() => {
 		activeUsersChart.read(user);
 	});
 
-	return await Notes.packMany(timeline, user);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
+
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index 22e5965fc..fead87738 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -123,13 +123,27 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
-
 	process.nextTick(() => {
 		if (user) {
 			activeUsersChart.read(user);
 		}
 	});
 
-	return await Notes.packMany(timeline, user);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
+
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts
index 3e5c4f18b..7ffe83e5c 100644
--- a/packages/backend/src/server/api/endpoints/notes/mentions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts
@@ -86,9 +86,24 @@ export default define(meta, paramDef, async (ps, user) => {
 		query.setParameters(followingQuery.getParameters());
 	}
 
-	const mentions = await query.take(ps.limit).getMany();
 
-	read(user.id, mentions);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(mentions, user);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	read(user.id, found);
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
index 6dacadec2..c73114de6 100644
--- a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
@@ -126,13 +126,27 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
-
 	process.nextTick(() => {
 		if (user) {
 			activeUsersChart.read(user);
 		}
 	});
 
-	return await Notes.packMany(timeline, user);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
+
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index b09243e7e..60d398088 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -74,7 +74,21 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (user) generateMutedUserQuery(query, user);
 	if (user) generateBlockedUserQuery(query, user);
 
-	const renotes = await query.take(ps.limit).getMany();
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(renotes, user);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/replies.ts b/packages/backend/src/server/api/endpoints/notes/replies.ts
index 0a8e90949..94a752a64 100644
--- a/packages/backend/src/server/api/endpoints/notes/replies.ts
+++ b/packages/backend/src/server/api/endpoints/notes/replies.ts
@@ -58,7 +58,21 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (user) generateMutedUserQuery(query, user);
 	if (user) generateBlockedUserQuery(query, user);
 
-	const timeline = await query.take(ps.limit).getMany();
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(timeline, user);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
index d8d0dbbf7..f1cae78ba 100644
--- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
@@ -145,8 +145,21 @@ export default define(meta, paramDef, async (ps, me) => {
 		}
 	}
 
-	// Search notes
-	const notes = await query.take(ps.limit).getMany();
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, me))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(notes, me);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index 083f41365..e79f6b589 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -143,11 +143,25 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
-
 	process.nextTick(() => {
 		activeUsersChart.read(user);
 	});
 
-	return await Notes.packMany(timeline, user);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
+
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index c1e535722..1123a33ae 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -138,9 +138,27 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 	//#endregion
 
-	const timeline = await query.take(ps.limit).getMany();
+	process.nextTick(() => {
+		if (user) {
+			activeUsersChart.read(user);
+		}
+	});
 
-	activeUsersChart.read(user);
+	// We fetch more than requested because some may be filtered out, and if there's less than
+	// requested, the pagination stops.
+	const found = [];
+	const take = Math.floor(ps.limit * 1.5);
+	let skip = 0;
+	while (found.length < ps.limit) {
+		const notes = await query.take(take).skip(skip).getMany();
+		found.push(...await Notes.packMany(notes, user))
+		skip += take;
+		if (notes.length < take) break;
+	}
 
-	return await Notes.packMany(timeline, user);
+	if (found.length > ps.limit) {
+		found.length = ps.limit;
+	}
+
+	return found;
 });

From 3bf522db1e160b6ba974bc85495fa199f3fbac62 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 3 Apr 2023 10:03:35 -0700
Subject: [PATCH 378/582] fix: buttons not showing

---
 packages/client/src/components/MkFollowButton.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index 37c48261f..ba8c8170e 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -141,7 +141,7 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .kpoogebi {
 	position: relative;
-	display: flex;
+	display: inline-flex;
 	align-items: center;
 	justify-content: center;
 	font-weight: bold;

From aab919897b8e41966d6330ad9663c0ae40531def Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 3 Apr 2023 10:10:12 -0700
Subject: [PATCH 379/582] dev24

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

diff --git a/package.json b/package.json
index 3fe277aea..077def577 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev23",
+	"version": "13.2.0-dev24",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From bcc03979165333723355a661ab902c2facdf3d64 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Mon, 3 Apr 2023 17:17:08 +0000
Subject: [PATCH 380/582] chore: update patrons

---
 patrons.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/patrons.json b/patrons.json
index ea481f6fd..917451983 100644
--- a/patrons.json
+++ b/patrons.json
@@ -21,6 +21,7 @@
 		"@trapezial@calckey.jp",
 		"@unattributed@calckey.social",
 		"@cody@mk.codingneko.com",
+		"@kate@blahaj.zone",
 		"Interkosmos Link"
 	]
 }

From 13bae2e165cfd0cb0b95bfadb7ac27bda31c8cae Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 3 Apr 2023 16:02:09 -0700
Subject: [PATCH 381/582] fix: :bug: go to last timeline selected

---
 packages/client/src/pages/timeline.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 5a5e51ec6..9c326ad05 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -336,7 +336,7 @@ function syncSlide(index) {
 }
 
 onMounted(() => {
-	syncSlide(timelines.indexOf(swiperRef.activeIndex));
+	syncSlide(timelines.indexOf(defaultStore.state.tl?.src || swiperRef.activeIndex));
 });
 
 </script>

From 3e7d64ac4ba6f23aeaf28774aa00bf1ba0c2f753 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 3 Apr 2023 20:36:59 -0700
Subject: [PATCH 382/582] feat: :sparkles: push notifs button

Co-authored-by: Tamania <tamaina@hotmail.co.jp>
---
 locales/en-US.yml                             |   1 +
 locales/ja-JP.yml                             |   1 +
 ...6634-whetherPushNotifyToSendReadMessage.js |  11 ++
 .../src/models/entities/sw-subscription.ts    |   5 +
 packages/backend/src/server/api/endpoints.ts  |   4 +
 .../src/server/api/endpoints/sw/register.ts   |  26 ++-
 .../api/endpoints/sw/show-registration.ts     |  55 ++++++
 .../src/server/api/endpoints/sw/unregister.ts |   6 +-
 .../api/endpoints/sw/update-registration.ts   |  44 +++++
 .../backend/src/services/push-notification.ts |   7 +
 .../MkPushNotificationAllowButton.vue         | 171 ++++++++++++++++++
 .../src/components/MkTutorialDialog.vue       |   2 +
 .../src/pages/settings/notifications.vue      |  32 ++++
 packages/client/src/scripts/initialize-sw.ts  |  56 ------
 14 files changed, 359 insertions(+), 62 deletions(-)
 create mode 100644 packages/backend/migration/1669138716634-whetherPushNotifyToSendReadMessage.js
 create mode 100644 packages/backend/src/server/api/endpoints/sw/show-registration.ts
 create mode 100644 packages/backend/src/server/api/endpoints/sw/update-registration.ts
 create mode 100644 packages/client/src/components/MkPushNotificationAllowButton.vue

diff --git a/locales/en-US.yml b/locales/en-US.yml
index f4913e904..0a0f86a10 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -12,6 +12,7 @@ fetchingAsApObject: "Fetching from the Fediverse"
 ok: "OK"
 gotIt: "Got it!"
 cancel: "Cancel"
+noThankYou: "No thank you"
 enterUsername: "Enter username"
 renotedBy: "Boosted by {user}"
 noNotes: "No posts"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 64d804928..29e241622 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -12,6 +12,7 @@ fetchingAsApObject: "連合宇宙から取得中"
 ok: "OK"
 gotIt: "わかった！"
 cancel: "キャンセル"
+noThankYou: "やめておく"
 enterUsername: "ユーザー名を入力"
 renotedBy: "{user}がブースト"
 noNotes: "投稿はありません"
diff --git a/packages/backend/migration/1669138716634-whetherPushNotifyToSendReadMessage.js b/packages/backend/migration/1669138716634-whetherPushNotifyToSendReadMessage.js
new file mode 100644
index 000000000..2265b0061
--- /dev/null
+++ b/packages/backend/migration/1669138716634-whetherPushNotifyToSendReadMessage.js
@@ -0,0 +1,11 @@
+export class whetherPushNotifyToSendReadMessage1669138716634 {
+    name = 'whetherPushNotifyToSendReadMessage1669138716634'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "sw_subscription" ADD "sendReadMessage" boolean NOT NULL DEFAULT false`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "sw_subscription" DROP COLUMN "sendReadMessage"`);
+    }
+}
diff --git a/packages/backend/src/models/entities/sw-subscription.ts b/packages/backend/src/models/entities/sw-subscription.ts
index 26891c1ce..8f18688ea 100644
--- a/packages/backend/src/models/entities/sw-subscription.ts
+++ b/packages/backend/src/models/entities/sw-subscription.ts
@@ -41,4 +41,9 @@ export class SwSubscription {
 		length: 128,
 	})
 	public publickey: string;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public sendReadMessage: boolean;
 }
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 920f87199..57a3ce4dc 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -290,6 +290,8 @@ import * as ep___resetDb from "./endpoints/reset-db.js";
 import * as ep___resetPassword from "./endpoints/reset-password.js";
 import * as ep___serverInfo from "./endpoints/server-info.js";
 import * as ep___stats from "./endpoints/stats.js";
+import * as ep___sw_show_registration from './endpoints/sw/show-registration.js';
+import * as ep___sw_update_registration from './endpoints/sw/update-registration.js';
 import * as ep___sw_register from "./endpoints/sw/register.js";
 import * as ep___sw_unregister from "./endpoints/sw/unregister.js";
 import * as ep___test from "./endpoints/test.js";
@@ -637,6 +639,8 @@ const eps = [
 	["stats", ep___stats],
 	["sw/register", ep___sw_register],
 	["sw/unregister", ep___sw_unregister],
+	['sw/show-registration', ep___sw_show_registration],
+	['sw/update-registration', ep___sw_update_registration],
 	["test", ep___test],
 	["username/available", ep___username_available],
 	["users", ep___users],
diff --git a/packages/backend/src/server/api/endpoints/sw/register.ts b/packages/backend/src/server/api/endpoints/sw/register.ts
index 7218b0d50..d2b805d97 100644
--- a/packages/backend/src/server/api/endpoints/sw/register.ts
+++ b/packages/backend/src/server/api/endpoints/sw/register.ts
@@ -26,6 +26,18 @@ export const meta = {
 				optional: false,
 				nullable: true,
 			},
+			userId: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+			endpoint: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+			sendReadMessage: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
 		},
 	},
 } as const;
@@ -36,14 +48,15 @@ export const paramDef = {
 		endpoint: { type: "string" },
 		auth: { type: "string" },
 		publickey: { type: "string" },
+		sendReadMessage: { type: 'boolean', default: false },
 	},
 	required: ["endpoint", "auth", "publickey"],
 } as const;
 
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async (ps, me) => {
 	// if already subscribed
 	const exist = await SwSubscriptions.findOneBy({
-		userId: user.id,
+		userId: me.id,
 		endpoint: ps.endpoint,
 		auth: ps.auth,
 		publickey: ps.publickey,
@@ -55,20 +68,27 @@ export default define(meta, paramDef, async (ps, user) => {
 		return {
 			state: "already-subscribed" as const,
 			key: instance.swPublicKey,
+			userId: me.id,
+			endpoint: exist.endpoint,
+			sendReadMessage: exist.sendReadMessage,
 		};
 	}
 
 	await SwSubscriptions.insert({
 		id: genId(),
 		createdAt: new Date(),
-		userId: user.id,
+		userId: me.id,
 		endpoint: ps.endpoint,
 		auth: ps.auth,
 		publickey: ps.publickey,
+		sendReadMessage: ps.sendReadMessage,
 	});
 
 	return {
 		state: "subscribed" as const,
 		key: instance.swPublicKey,
+		userId: me.id,
+		endpoint: ps.endpoint,
+		sendReadMessage: ps.sendReadMessage,
 	};
 });
diff --git a/packages/backend/src/server/api/endpoints/sw/show-registration.ts b/packages/backend/src/server/api/endpoints/sw/show-registration.ts
new file mode 100644
index 000000000..25eb53f52
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/sw/show-registration.ts
@@ -0,0 +1,55 @@
+import { SwSubscriptions } from '@/models/index.js';
+import define from "../../define.js";
+
+export const meta = {
+	tags: ['account'],
+
+	requireCredential: true,
+
+	description: 'Check push notification registration exists.',
+
+	res: {
+		type: 'object',
+		optional: false, nullable: true,
+		properties: {
+			userId: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+			endpoint: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+			sendReadMessage: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		endpoint: { type: 'string' },
+	},
+	required: ['endpoint'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+export default define(meta, paramDef, async (ps, me) => {
+	const exist = await SwSubscriptions.findOneBy({
+		userId: me.id,
+		endpoint: ps.endpoint,
+	});
+
+	if (exist != null) {
+		return {
+			userId: exist.userId,
+			endpoint: exist.endpoint,
+			sendReadMessage: exist.sendReadMessage,
+		};
+	}
+
+	return null;
+});
diff --git a/packages/backend/src/server/api/endpoints/sw/unregister.ts b/packages/backend/src/server/api/endpoints/sw/unregister.ts
index b025630e4..e2a40f51c 100644
--- a/packages/backend/src/server/api/endpoints/sw/unregister.ts
+++ b/packages/backend/src/server/api/endpoints/sw/unregister.ts
@@ -4,7 +4,7 @@ import define from "../../define.js";
 export const meta = {
 	tags: ["account"],
 
-	requireCredential: true,
+	requireCredential: false,
 
 	description: "Unregister from receiving push notifications.",
 } as const;
@@ -17,9 +17,9 @@ export const paramDef = {
 	required: ["endpoint"],
 } as const;
 
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async (ps, me) => {
 	await SwSubscriptions.delete({
-		userId: user.id,
+		...(me ? { userId: me.id } : {}),
 		endpoint: ps.endpoint,
 	});
 });
diff --git a/packages/backend/src/server/api/endpoints/sw/update-registration.ts b/packages/backend/src/server/api/endpoints/sw/update-registration.ts
new file mode 100644
index 000000000..0b0a56d49
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/sw/update-registration.ts
@@ -0,0 +1,44 @@
+import { SwSubscriptions } from "@/models/index.js";
+import define from "../../define.js";
+
+export const meta = {
+	tags: ["account"],
+
+	requireCredential: true,
+
+	description: "Unregister from receiving push notifications.",
+} as const;
+
+export const paramDef = {
+	type: "object",
+	properties: {
+		endpoint: { type: "string" },
+		sendReadMessage: { type: 'boolean' },
+	},
+	required: ["endpoint"],
+} as const;
+
+export default define(meta, paramDef, async (ps, me) => {
+	const swSubscription = await SwSubscriptions.findOneBy({
+		userId: me.id,
+		endpoint: ps.endpoint,
+	});
+
+	if (swSubscription === null) {
+		throw new Error("No such registration");
+	}
+
+	if (ps.sendReadMessage !== undefined) {
+		swSubscription.sendReadMessage = ps.sendReadMessage;
+	}
+
+	await SwSubscriptions.update(swSubscription.id, {
+		sendReadMessage: swSubscription.sendReadMessage,
+	});
+
+	return {
+		userId: swSubscription.userId,
+		endpoint: swSubscription.endpoint,
+		sendReadMessage: swSubscription.sendReadMessage,
+	};
+});
diff --git a/packages/backend/src/services/push-notification.ts b/packages/backend/src/services/push-notification.ts
index 0e51ad967..a3abaf769 100644
--- a/packages/backend/src/services/push-notification.ts
+++ b/packages/backend/src/services/push-notification.ts
@@ -63,6 +63,13 @@ export async function pushNotification<T extends keyof pushNotificationsTypes>(
 	});
 
 	for (const subscription of subscriptions) {
+		if ([
+			'readNotifications',
+			'readAllNotifications',
+			'readAllMessagingMessages',
+			'readAllMessagingMessagesOfARoom',
+		].includes(type) && !subscription.sendReadMessage) continue;
+
 		const pushSubscription = {
 			endpoint: subscription.endpoint,
 			keys: {
diff --git a/packages/client/src/components/MkPushNotificationAllowButton.vue b/packages/client/src/components/MkPushNotificationAllowButton.vue
new file mode 100644
index 000000000..b98c814f2
--- /dev/null
+++ b/packages/client/src/components/MkPushNotificationAllowButton.vue
@@ -0,0 +1,171 @@
+<template>
+<MkButton
+	v-if="supported && !pushRegistrationInServer"
+	type="button"
+	primary
+	:gradate="gradate"
+	:rounded="rounded"
+	:inline="inline"
+	:autofocus="autofocus"
+	:wait="wait"
+	:full="full"
+	@click="subscribe"
+>
+	{{ i18n.ts.subscribePushNotification }}
+</MkButton>
+<MkButton
+	v-else-if="!showOnlyToRegister && ($i ? pushRegistrationInServer : pushSubscription)"
+	type="button"
+	:primary="false"
+	:gradate="gradate"
+	:rounded="rounded"
+	:inline="inline"
+	:autofocus="autofocus"
+	:wait="wait"
+	:full="full"
+	@click="unsubscribe"
+>
+	{{ i18n.ts.unsubscribePushNotification }}
+</MkButton>
+<MkButton v-else-if="$i && pushRegistrationInServer" disabled :rounded="rounded" :inline="inline" :wait="wait" :full="full">
+	{{ i18n.ts.pushNotificationAlreadySubscribed }}
+</MkButton>
+<MkButton v-else-if="!supported" disabled :rounded="rounded" :inline="inline" :wait="wait" :full="full">
+	{{ i18n.ts.pushNotificationNotSupported }}
+</MkButton>
+</template>
+
+<script setup lang="ts">
+import { $i, getAccounts } from '@/account';
+import MkButton from '@/components/MkButton.vue';
+import { instance } from '@/instance';
+import { api, apiWithDialog, promiseDialog } from '@/os';
+import { i18n } from '@/i18n';
+
+defineProps<{
+	primary?: boolean;
+	gradate?: boolean;
+	rounded?: boolean;
+	inline?: boolean;
+	link?: boolean;
+	to?: string;
+	autofocus?: boolean;
+	wait?: boolean;
+	danger?: boolean;
+	full?: boolean;
+	showOnlyToRegister?: boolean;
+}>();
+
+// ServiceWorker registration
+let registration = $ref<ServiceWorkerRegistration | undefined>();
+// If this browser supports push notification
+let supported = $ref(false);
+// If this browser has already subscribed to push notification
+let pushSubscription = $ref<PushSubscription | null>(null);
+let pushRegistrationInServer = $ref<{ state?: string; key?: string; userId: string; endpoint: string; sendReadMessage: boolean; } | undefined>();
+
+function subscribe() {
+	if (!registration || !supported || !instance.swPublickey) return;
+
+	// SEE: https://developer.mozilla.org/en-US/docs/Web/API/PushManager/subscribe#Parameters
+	return promiseDialog(registration.pushManager.subscribe({
+		userVisibleOnly: true,
+		applicationServerKey: urlBase64ToUint8Array(instance.swPublickey),
+	})
+	.then(async subscription => {
+		pushSubscription = subscription;
+
+		// Register
+		pushRegistrationInServer = await api('sw/register', {
+			endpoint: subscription.endpoint,
+			auth: encode(subscription.getKey('auth')),
+			publickey: encode(subscription.getKey('p256dh')),
+		});
+	}, async err => { // When subscribe failed
+		// 通知が許可されていなかったとき
+		if (err?.name === 'NotAllowedError') {
+			console.info('User denied the notification permission request.');
+			return;
+		}
+
+		// 違うapplicationServerKey (または gcm_sender_id)のサブスクリプションが
+		// 既に存在していることが原因でエラーになった可能性があるので、
+		// そのサブスクリプションを解除しておく
+		// （これは実行されなさそうだけど、おまじない的に古い実装から残してある）
+		await unsubscribe();
+	}), null, null);
+}
+
+async function unsubscribe() {
+	if (!pushSubscription) return;
+
+	const endpoint = pushSubscription.endpoint;
+	const accounts = await getAccounts();
+
+	pushRegistrationInServer = undefined;
+
+	if ($i && accounts.length >= 2) {
+		apiWithDialog('sw/unregister', {
+			i: $i.token,
+			endpoint,
+		});
+	} else {
+		pushSubscription.unsubscribe();
+		apiWithDialog('sw/unregister', {
+			endpoint,
+		});
+		pushSubscription = null;
+	}
+}
+
+function encode(buffer: ArrayBuffer | null) {
+	return btoa(String.fromCharCode.apply(null, new Uint8Array(buffer)));
+}
+
+/**
+ * Convert the URL safe base64 string to a Uint8Array
+ * @param base64String base64 string
+ */
+function urlBase64ToUint8Array(base64String: string): Uint8Array {
+	const padding = '='.repeat((4 - base64String.length % 4) % 4);
+	const base64 = (base64String + padding)
+		.replace(/-/g, '+')
+		.replace(/_/g, '/');
+
+	const rawData = window.atob(base64);
+	const outputArray = new Uint8Array(rawData.length);
+
+	for (let i = 0; i < rawData.length; ++i) {
+		outputArray[i] = rawData.charCodeAt(i);
+	}
+	return outputArray;
+}
+
+if (navigator.serviceWorker == null) {
+	// TODO: よしなに？
+} else {
+	navigator.serviceWorker.ready.then(async swr => {
+		registration = swr;
+
+		pushSubscription = await registration.pushManager.getSubscription();
+
+		if (instance.swPublickey && ('PushManager' in window) && $i && $i.token) {
+			supported = true;
+
+			if (pushSubscription) {
+				const res = await api('sw/show-registration', {
+					endpoint: pushSubscription.endpoint,
+				});
+
+				if (res) {
+					pushRegistrationInServer = res;
+				}
+			}
+		}
+	});
+}
+
+defineExpose({
+	pushRegistrationInServer: $$(pushRegistrationInServer),
+});
+</script>
diff --git a/packages/client/src/components/MkTutorialDialog.vue b/packages/client/src/components/MkTutorialDialog.vue
index c077d3fc5..77cc4de6f 100644
--- a/packages/client/src/components/MkTutorialDialog.vue
+++ b/packages/client/src/components/MkTutorialDialog.vue
@@ -106,6 +106,7 @@
 						<MkSparkle>
 							<h3>{{ i18n.ts._tutorial.step6_4 }} <Mfm text="$[shake 🚀]"></Mfm></h3>
 						</MkSparkle>
+						<MkPushNotificationAllowButton primary show-only-to-register/>
 					</div>
 				</Transition>
 			</div>
@@ -122,6 +123,7 @@ import MkButton from '@/components/MkButton.vue';
 import XFeaturedUsers from '@/pages/explore.users.vue';
 import XPostForm from '@/components/MkPostForm.vue';
 import MkSparkle from '@/components/MkSparkle.vue';
+import MkPushNotificationAllowButton from '@/components/MkPushNotificationAllowButton.vue';
 import { defaultStore } from '@/store';
 import { i18n } from '@/i18n';
 import { $i } from '@/account';
diff --git a/packages/client/src/pages/settings/notifications.vue b/packages/client/src/pages/settings/notifications.vue
index b0bf970bc..586da9e15 100644
--- a/packages/client/src/pages/settings/notifications.vue
+++ b/packages/client/src/pages/settings/notifications.vue
@@ -6,6 +6,21 @@
 		<FormButton class="_formBlock" @click="readAllUnreadNotes">{{ i18n.ts.markAsReadAllUnreadNotes }}</FormButton>
 		<FormButton class="_formBlock" @click="readAllMessagingMessages">{{ i18n.ts.markAsReadAllTalkMessages }}</FormButton>
 	</FormSection>
+	<FormSection>
+		<template #label>{{ i18n.ts.pushNotification }}</template>
+
+		<div class="_gaps_m">
+			<MkPushNotificationAllowButton ref="allowButton"/>
+			<MkSwitch :disabled="!pushRegistrationInServer" :model-value="sendReadMessage" @update:model-value="onChangeSendReadMessage">
+				<template #label>{{ i18n.ts.sendPushNotificationReadMessage }}</template>
+				<template #caption>
+					<I18n :src="i18n.ts.sendPushNotificationReadMessageCaption">
+						<template #emptyPushNotificationMessage>{{ i18n.ts._notification.emptyPushNotificationMessage }}</template>
+					</I18n>
+				</template>
+			</MkSwitch>
+		</div>
+	</FormSection>
 </div>
 </template>
 
@@ -19,6 +34,11 @@ import * as os from '@/os';
 import { $i } from '@/account';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import MkPushNotificationAllowButton from '@/components/MkPushNotificationAllowButton.vue';
+
+let allowButton = $shallowRef<InstanceType<typeof MkPushNotificationAllowButton>>();
+let pushRegistrationInServer = $computed(() => allowButton?.pushRegistrationInServer);
+let sendReadMessage = $computed(() => pushRegistrationInServer?.sendReadMessage || false);
 
 async function readAllUnreadNotes() {
 	await os.api('i/read-all-unread-notes');
@@ -49,6 +69,18 @@ function configure() {
 	}, 'closed');
 }
 
+function onChangeSendReadMessage(v: boolean) {
+	if (!pushRegistrationInServer) return;
+
+	os.apiWithDialog('sw/update-registration', {
+		endpoint: pushRegistrationInServer.endpoint,
+		sendReadMessage: v,
+	}).then(res => {
+		if (!allowButton)	return;
+		allowButton.pushRegistrationInServer = res;
+	});
+}
+
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
diff --git a/packages/client/src/scripts/initialize-sw.ts b/packages/client/src/scripts/initialize-sw.ts
index 74f0e9b44..737f86515 100644
--- a/packages/client/src/scripts/initialize-sw.ts
+++ b/packages/client/src/scripts/initialize-sw.ts
@@ -1,6 +1,3 @@
-import { instance } from "@/instance";
-import { $i } from "@/account";
-import { api } from "@/os";
 import { lang } from "@/config";
 
 export async function initializeSw() {
@@ -12,58 +9,5 @@ export async function initializeSw() {
 			msg: "initialize",
 			lang,
 		});
-
-		if (instance.swPublickey && "PushManager" in window && $i && $i.token) {
-			// SEE: https://developer.mozilla.org/en-US/docs/Web/API/PushManager/subscribe#Parameters
-			registration.pushManager
-				.subscribe({
-					userVisibleOnly: true,
-					applicationServerKey: urlBase64ToUint8Array(instance.swPublickey),
-				})
-				.then((subscription) => {
-					function encode(buffer: ArrayBuffer | null) {
-						return btoa(
-							String.fromCharCode.apply(null, new Uint8Array(buffer)),
-						);
-					}
-
-					// Register
-					api("sw/register", {
-						endpoint: subscription.endpoint,
-						auth: encode(subscription.getKey("auth")),
-						publickey: encode(subscription.getKey("p256dh")),
-					});
-				})
-				// When subscribe failed
-				.catch(async (err: Error) => {
-					// 通知が許可されていなかったとき
-					if (err.name === "NotAllowedError") {
-						return;
-					}
-
-					// 違うapplicationServerKey (または gcm_sender_id)のサブスクリプションが
-					// 既に存在していることが原因でエラーになった可能性があるので、
-					// そのサブスクリプションを解除しておく
-					const subscription = await registration.pushManager.getSubscription();
-					if (subscription) subscription.unsubscribe();
-				});
-		}
 	});
 }
-
-/**
- * Convert the URL safe base64 string to a Uint8Array
- * @param base64String base64 string
- */
-function urlBase64ToUint8Array(base64String: string): Uint8Array {
-	const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
-	const base64 = (base64String + padding).replace(/-/g, "+").replace(/_/g, "/");
-
-	const rawData = window.atob(base64);
-	const outputArray = new Uint8Array(rawData.length);
-
-	for (let i = 0; i < rawData.length; ++i) {
-		outputArray[i] = rawData.charCodeAt(i);
-	}
-	return outputArray;
-}

From 6d5c47ce3b0ce1235dbf8d5830b0edb252f9af88 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 3 Apr 2023 20:37:07 -0700
Subject: [PATCH 383/582] dev25

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

diff --git a/package.json b/package.json
index 077def577..c937e64c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev24",
+	"version": "13.2.0-dev25",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From d7aad8f6245978e7abc0749709a1e357c1827578 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 3 Apr 2023 20:38:29 -0700
Subject: [PATCH 384/582] chore: pnpm 8.1.1

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

diff --git a/package.json b/package.json
index c937e64c3..8878ba67d 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@8.1.0",
+	"packageManager": "pnpm@8.1.1",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",

From bfa1550a2e9007acf2adce7afca5845815e51c08 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 3 Apr 2023 20:44:52 -0700
Subject: [PATCH 385/582] locales

---
 locales/en-US.yml | 7 +++++++
 locales/ja-JP.yml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 0a0f86a10..1bdf57fae 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -917,6 +917,13 @@ navbar: "Navigation bar"
 shuffle: "Shuffle"
 account: "Account"
 move: "Move"
+pushNotification: "Push notifications"
+subscribePushNotification: "Enable push notifications"
+unsubscribePushNotification: "Disable push notifications"
+pushNotificationAlreadySubscribed: "Push notifications are already enabled"
+pushNotificationNotSupported: "Your browser or instance does not support push notifications"
+sendPushNotificationReadMessage: "Delete push notifications once the relevant notifications or messages have been read"
+sendPushNotificationReadMessageCaption: "A notification containing the text \"{emptyPushNotificationMessage}\" will be displayed for a short time. This may increase the battery usage of your device, if applicable."
 showAds: "Show ads"
 enterSendsMessage: "Press Return in Messaging to send message (off is Ctrl + Return)"
 adminCustomCssWarn: "This setting should only be used if you know what it does. Entering improper values may cause EVERYONE'S clients to stop functioning normally. Please ensure your CSS works properly by testing it in your user settings."
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 29e241622..26971184c 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -919,6 +919,13 @@ navbar: "ナビゲーションバー"
 shuffle: "シャッフル"
 account: "アカウント"
 move: "移動"
+pushNotification: "プッシュ通知"
+subscribePushNotification: "プッシュ通知を有効化"
+unsubscribePushNotification: "プッシュ通知を停止する"
+pushNotificationAlreadySubscribed: "プッシュ通知は有効です"
+pushNotificationNotSupported: "ブラウザかサーバーがプッシュ通知に非対応"
+sendPushNotificationReadMessage: "通知やメッセージが既読になったらプッシュ通知を削除する"
+sendPushNotificationReadMessageCaption: "「{emptyPushNotificationMessage}」という通知が一瞬表示されるようになります。端末の電池消費量が増加する可能性があります。"
 adminCustomCssWarn: "この設定は、それが何をするものであるかを知っている場合のみ使用してください。不適切な値を入力すると、クライアントが正常に動作しなくなる可能性があります。ユーザー設定でCSSをテストし、正しく動作することを確認してください。"
 customMOTD: "カスタムMOTD(スプラッシュスクリーンメッセージ)"
 customMOTDDescription: "ユーザがページをロード/リロードするたびにランダムに表示される、改行で区切られたMOTD(スプラッシュスクリーン)用のカスタムメッセージ"

From 89e27d8418f89cc65fe58b584aa5484487bc3d35 Mon Sep 17 00:00:00 2001
From: amybones <amybones@noreply.codeberg.org>
Date: Tue, 4 Apr 2023 03:46:23 +0000
Subject: [PATCH 386/582] fix: toggling the blocking state from the
 instance-info admin view (#9809)

Because the admin meta information was never loaded on this page, no amount of toggling the block or suspend sliders on the instance-info page (e.g. `https://calckey.example.com/instance-info/instance.tld`) will result in the instance actually being added to the blocklist. You could still do it from the bulk blocklist management page, but that can get unwieldy quickly if you just want to do a quick block of an instance.

Co-authored-by: amy bones <amy@spookygirl.boo>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9809
Co-authored-by: amybones <amybones@noreply.codeberg.org>
Co-committed-by: amybones <amybones@noreply.codeberg.org>
---
 .../server/api/endpoints/admin/update-meta.ts |  7 ++-
 packages/client/src/pages/instance-info.vue   | 50 ++++++++++++++-----
 2 files changed, 43 insertions(+), 14 deletions(-)

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 28aac4a4d..d3a39acd2 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -209,7 +209,12 @@ export default define(meta, paramDef, async (ps, me) => {
 	}
 
 	if (Array.isArray(ps.blockedHosts)) {
-		set.blockedHosts = ps.blockedHosts.filter(Boolean);
+		let lastValue = '';
+		set.blockedHosts = ps.blockedHosts.sort().filter(h => {
+			const lv = lastValue;
+			lastValue = h;
+			return h !== '' && h !== lv;
+		});
 	}
 
 	if (ps.themeColor !== undefined) {
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index 15c9a7cd8..f84e3b014 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -35,8 +35,10 @@
 
 					<FormSection v-if="iAmModerator">
 						<template #label>Moderation</template>
-						<FormSwitch v-model="suspended" class="_formBlock" @update:modelValue="toggleSuspend">{{ i18n.ts.stopActivityDelivery }}</FormSwitch>
-						<FormSwitch v-model="isBlocked" class="_formBlock" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</FormSwitch>
+						<FormSuspense :p="init">
+							<FormSwitch v-model="suspended" class="_formBlock" @update:modelValue="toggleSuspend">{{ i18n.ts.stopActivityDelivery }}</FormSwitch>
+							<FormSwitch v-model="isBlocked" class="_formBlock" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</FormSwitch>
+						</FormSuspense>
 						<MkButton @click="refreshMetadata"><i class="ph-arrows-clockwise ph-bold ph-lg"></i> Refresh metadata</MkButton>
 					</FormSection>
 
@@ -158,6 +160,13 @@ import 'swiper/scss';
 import 'swiper/scss/virtual';
 import { getProxiedImageUrlNullable } from '@/scripts/media-proxy';
 
+type AugmentedInstanceMetadata = misskey.entities.DetailedInstanceMetadata & {
+	blockedHosts: string[];
+};
+type AugmentedInstance = misskey.entities.Instance & {
+	isBlocked: boolean;
+};
+
 const props = defineProps<{
 	host: string;
 }>();
@@ -168,8 +177,8 @@ let tab = $ref(tabs[0]);
 watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
 
 let chartSrc = $ref('instance-requests');
-let meta = $ref<misskey.entities.DetailedInstanceMetadata | null>(null);
-let instance = $ref<misskey.entities.Instance | null>(null);
+let meta = $ref<AugmentedInstanceMetadata | null>(null);
+let instance = $ref<AugmentedInstance | null>(null);
 let suspended = $ref(false);
 let isBlocked = $ref(false);
 let faviconUrl = $ref(null);
@@ -185,19 +194,34 @@ const usersPagination = {
 	offsetMode: true,
 };
 
-async function fetch() {
-	instance = await os.api('federation/show-instance', {
-		host: props.host,
-	});
-	suspended = instance.isSuspended;
-	isBlocked = instance.isBlocked;
-	faviconUrl = getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.iconUrl, 'preview');
+async function init() {
+	meta = await os.api('admin/meta');
 }
 
-async function toggleBlock(ev) {
+async function fetch() {
+	instance = (await os.api('federation/show-instance', {
+		host: props.host,
+	})) as AugmentedInstance;
+	suspended = instance.isSuspended;
+	isBlocked = instance.isBlocked;
+	faviconUrl =
+		getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ??
+		getProxiedImageUrlNullable(instance.iconUrl, 'preview');
+}
+
+async function toggleBlock() {
 	if (meta == null) return;
+	if (!instance) {
+		throw new Error(`Instance info not loaded`);
+	}
+	let blockedHosts: string[];
+	if (isBlocked) {
+		blockedHosts = meta.blockedHosts.concat([instance.host]);
+	} else {
+		blockedHosts = meta.blockedHosts.filter((x) => x !== instance!.host);
+	}
 	await os.api('admin/update-meta', {
-		blockedHosts: isBlocked ? meta.blockedHosts.concat([instance.host]) : meta.blockedHosts.filter(x => x !== instance.host),
+		blockedHosts,
 	});
 }
 

From 6e5c008ae5afef521a0ef1331364f52580c28423 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 3 Apr 2023 20:46:54 -0700
Subject: [PATCH 387/582] dev 26

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

diff --git a/package.json b/package.json
index 8878ba67d..938afafbc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev25",
+	"version": "13.2.0-dev26",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 6c2bafe0628625886f2714b13a7a6d6f24301d4c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 21:47:30 -0700
Subject: [PATCH 388/582] mkv13 media list

---
 .../client/src/components/MkMediaList.vue     | 238 +++++++++---------
 1 file changed, 115 insertions(+), 123 deletions(-)

diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue
index 8b6d2c2c9..9a1d1f170 100644
--- a/packages/client/src/components/MkMediaList.vue
+++ b/packages/client/src/components/MkMediaList.vue
@@ -1,19 +1,19 @@
 <template>
-<div class="hoawjimk">
-	<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
-	<div v-if="mediaList.filter(media => previewable(media)).length > 0" class="gird-container" :class="{ dmWidth: inDm }">
-		<div ref="gallery" :data-count="mediaList.filter(media => previewable(media)).length" @click.stop>
-			<template v-for="media in mediaList.filter(media => previewable(media))">
-				<XVideo v-if="media.type.startsWith('video')" :key="media.id" :video="media"/>
-				<XImage v-else-if="media.type.startsWith('image')" :key="media.id" class="image" :data-id="media.id" :image="media" :raw="raw"/>
-			</template>
+	<div>
+		<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
+		<div v-if="mediaList.filter(media => previewable(media)).length > 0" :class="$style.container, { dmWidth: inDm }">
+			<div ref="gallery" :class="[$style.medias, count <= 4 ? $style['n' + count] : $style.nMany]">
+				<template v-for="media in mediaList.filter(media => previewable(media))">
+					<XVideo v-if="media.type.startsWith('video')" :key="media.id" :class="$style.media" :video="media"/>
+					<XImage v-else-if="media.type.startsWith('image')" :key="media.id" :class="$style.media" class="image" :data-id="media.id" :image="media" :raw="raw"/>
+				</template>
+			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, useCssModule } from 'vue';
 import * as misskey from 'calckey-js';
 import PhotoSwipeLightbox from 'photoswipe/lightbox';
 import PhotoSwipe from 'photoswipe';
@@ -23,7 +23,6 @@ import XImage from '@/components/MkMediaImage.vue';
 import XVideo from '@/components/MkMediaVideo.vue';
 import * as os from '@/os';
 import { FILE_TYPE_BROWSERSAFE } from '@/const';
-import { defaultStore } from '@/store';
 
 const props = defineProps<{
 	mediaList: misskey.entities.DriveFile[];
@@ -31,8 +30,12 @@ const props = defineProps<{
 	inDm?: boolean;
 }>();
 
+const $style = useCssModule();
+
 const gallery = ref(null);
 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);
 
 onMounted(() => {
 	const lightbox = new PhotoSwipeLightbox({
@@ -46,7 +49,8 @@ onMounted(() => {
 					src: media.url,
 					w: media.properties.width,
 					h: media.properties.height,
-					alt: media.comment,
+					alt: media.comment ?? media.name,
+					comment: media.comment ?? media.name,
 				};
 				if (media.properties.orientation != null && media.properties.orientation >= 5) {
 					[item.w, item.h] = [item.h, item.w];
@@ -54,22 +58,24 @@ onMounted(() => {
 				return item;
 			}),
 		gallery: gallery.value,
+		mainClass: $style.pswp,
 		children: '.image',
 		thumbSelector: '.image',
 		loop: false,
 		padding: window.innerWidth > 500 ? {
 			top: 32,
-			bottom: 32,
+			bottom: 90,
 			left: 32,
 			right: 32,
 		} : {
 			top: 0,
-			bottom: 0,
+			bottom: 78,
 			left: 0,
 			right: 0,
 		},
 		imageClickAction: 'close',
 		tapAction: 'toggle-controls',
+		bgOpacity: 1,
 		pswpModule: PhotoSwipe,
 	});
 
@@ -81,6 +87,7 @@ onMounted(() => {
 
 		const id = element.dataset.id;
 		const file = props.mediaList.find(media => media.id === id);
+		if (!file) return;
 
 		itemData.src = file.url;
 		itemData.w = Number(file.properties.width);
@@ -89,7 +96,8 @@ onMounted(() => {
 			[itemData.w, itemData.h] = [itemData.h, itemData.w];
 		}
 		itemData.msrc = file.thumbnailUrl;
-		itemData.alt = file.comment;
+		itemData.alt = file.comment ?? file.name;
+		itemData.comment = file.comment ?? file.name;
 		itemData.thumbCropped = true;
 	});
 
@@ -100,28 +108,34 @@ onMounted(() => {
 			appendTo: 'wrapper',
 			onInit: (el, pwsp) => {
 				let textBox = document.createElement('p');
-				textBox.className = 'pwsp__alt-text';
+				textBox.className = 'pwsp__alt-text _acrylic';
 				el.appendChild(textBox);
 
-				let preventProp = function(ev: Event): void {
-					ev.stopPropagation();
-				};
-
-				// Allow scrolling/text selection
-				el.onwheel = preventProp;
-				el.onclick = preventProp;
-				el.onpointerdown = preventProp;
-				el.onpointercancel = preventProp;
-				el.onpointermove = preventProp;
-
-				pwsp.on('change', () => {
-					textBox.textContent = pwsp.currSlide.data.alt?.trim();
+				pwsp.on('change', (a) => {
+					textBox.textContent = pwsp.currSlide.data.comment;
 				});
 			},
 		});
 	});
 
 	lightbox.init();
+
+	window.addEventListener('popstate', () => {
+		if (lightbox.pswp && lightbox.pswp.isOpen === true) {
+			lightbox.pswp.close();
+			return;
+		}
+	});
+
+	lightbox.on('beforeOpen', () => {
+		history.pushState(null, '', '#pswp');
+	});
+
+	lightbox.on('close', () => {
+		if (window.location.hash === '#pswp') {
+			history.back();
+		}
+	});
 });
 
 const previewable = (file: misskey.entities.DriveFile): boolean => {
@@ -131,128 +145,106 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 };
 </script>
 
-<style lang="scss" scoped>
-.hoawjimk {
+<style lang="scss" module>
+.dmWidth {
+	min-width: 20rem;
+	max-width: 40rem;
+}
 
-	> .dmWidth {
-		min-width: 20rem;
-		max-width: 40rem;
+.container {
+	position: relative;
+	width: 100%;
+	margin-top: 4px;
+}
+
+.medias {
+	display: grid;
+	grid-gap: 8px;
+
+	// for webkit
+	height: 100%;
+
+	&.n1 {
+		aspect-ratio: 16/9;
+		grid-template-rows: 1fr;
 	}
 
-	> .gird-container {
-		position: relative;
-		width: 100%;
-		margin-top: 4px;
-		border-radius: var(--radius);
-		overflow: hidden;
+	&.n2 {
+		aspect-ratio: 16/9;
+		grid-template-columns: 1fr 1fr;
+		grid-template-rows: 1fr;
+	}
 
-		&:before {
-			content: '';
-			display: block;
-			padding-top: 56.25% // 16:9;
+	&.n3 {
+		aspect-ratio: 16/9;
+		grid-template-columns: 1fr 0.5fr;
+		grid-template-rows: 1fr 1fr;
+
+		> .media:nth-child(1) {
+			grid-row: 1 / 3;
 		}
 
-		> div {
-			position: absolute;
-			top: 0;
-			right: 0;
-			bottom: 0;
-			left: 0;
-			display: grid;
-			grid-gap: 8px;
-
-			> * {
-				overflow: hidden;
-				border-radius: 6px;
-			}
-
-			&[data-count="1"] {
-				grid-template-rows: 1fr;
-			}
-
-			&[data-count="2"] {
-				grid-template-columns: 1fr 1fr;
-				grid-template-rows: 1fr;
-			}
-
-			&[data-count="3"] {
-				grid-template-columns: 1fr 0.5fr;
-				grid-template-rows: 1fr 1fr;
-
-				> *:nth-child(1) {
-					grid-row: 1 / 3;
-				}
-
-				> *:nth-child(3) {
-					grid-column: 2 / 3;
-					grid-row: 2 / 3;
-				}
-			}
-
-			&[data-count="4"] {
-				grid-template-columns: 1fr 1fr;
-				grid-template-rows: 1fr 1fr;
-			}
-
-			> *:nth-child(1) {
-				grid-column: 1 / 2;
-				grid-row: 1 / 2;
-			}
-
-			> *:nth-child(2) {
-				grid-column: 2 / 3;
-				grid-row: 1 / 2;
-			}
-
-			> *:nth-child(3) {
-				grid-column: 1 / 2;
-				grid-row: 2 / 3;
-			}
-
-			> *:nth-child(4) {
-				grid-column: 2 / 3;
-				grid-row: 2 / 3;
-			}
+		> .media:nth-child(3) {
+			grid-column: 2 / 3;
+			grid-row: 2 / 3;
 		}
 	}
+
+	&.n4 {
+		aspect-ratio: 16/9;
+		grid-template-columns: 1fr 1fr;
+		grid-template-rows: 1fr 1fr;
+	}
+
+	&.nMany {
+		grid-template-columns: 1fr 1fr;
+
+		> .media {
+			aspect-ratio: 16/9;
+		}
+	}
+}
+
+.media {
+	overflow: hidden; // clipにするとバグる
+	border-radius: 8px;
+}
+
+.pswp {
+	--pswp-root-z-index: var(--mk-pswp-root-z-index, 2000700) !important;
+	--pswp-bg: var(--modalBg) !important;
 }
 </style>
 
 <style lang="scss">
-.pswp {
-	// なぜか機能しない
-  //z-index: v-bind(pswpZIndex);
-	z-index: 2000000;
+.pswp__bg {
+	background: var(--modalBg);
+	backdrop-filter: var(--modalBgFilter);
 }
+
 .pwsp__alt-text-container {
 	display: flex;
 	flex-direction: row;
 	align-items: center;
 
 	position: absolute;
-	bottom: 30px;
+	bottom: 20px;
 	left: 50%;
 	transform: translateX(-50%);
 
 	width: 75%;
+	max-width: 800px;
 }
 
 .pwsp__alt-text {
-	color: white;
+	color: var(--fg);
 	margin: 0 auto;
 	text-align: center;
-	padding: 10px;
-	background: rgba(0, 0, 0, 0.5);
-	border-radius: 5px;
-
-	max-height: 10vh;
-	overflow-x: clip;
+	padding: var(--margin);
+	border-radius: var(--radius);
+	max-height: 8em;
 	overflow-y: auto;
-	overscroll-behavior: contain;
+	text-shadow: var(--bg) 0 0 10px, var(--bg) 0 0 3px, var(--bg) 0 0 3px;
+	white-space: pre-line;
 }
-
-.pwsp__alt-text:empty {
-	display: none;
-}
-
 </style>

From 2f4e3cdce0af883cc0a5cfe59f09d635638ba613 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 21:47:38 -0700
Subject: [PATCH 389/582] dev27

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

diff --git a/package.json b/package.json
index 938afafbc..bffbba626 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev26",
+	"version": "13.2.0-dev27",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From c030a227e55f8c72583d95fcb666e0e40cbbbd1e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 21:53:17 -0700
Subject: [PATCH 390/582] dont change state

---
 packages/client/src/components/MkMediaList.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue
index 9a1d1f170..6dd0dea27 100644
--- a/packages/client/src/components/MkMediaList.vue
+++ b/packages/client/src/components/MkMediaList.vue
@@ -126,16 +126,6 @@ onMounted(() => {
 			return;
 		}
 	});
-
-	lightbox.on('beforeOpen', () => {
-		history.pushState(null, '', '#pswp');
-	});
-
-	lightbox.on('close', () => {
-		if (window.location.hash === '#pswp') {
-			history.back();
-		}
-	});
 });
 
 const previewable = (file: misskey.entities.DriveFile): boolean => {

From 29799e36aaf6440f6c0bd12562b932dae4f73898 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 21:59:11 -0700
Subject: [PATCH 391/582] back button in settings

---
 packages/client/src/components/global/MkPageHeader.vue | 2 ++
 packages/client/src/pages/settings/index.vue           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index a6f71d967..8293f10e2 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -1,6 +1,7 @@
 <template>
 	<div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
 		<div v-if="narrow" class="buttons left" @click="openAccountMenu">
+		<i @click="history.back()" v-if="props.displayBackButton" class="icon ph-caret-left ph-bold ph-lg"></i>
 		<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
 	</div>
 	<template v-if="metadata">
@@ -59,6 +60,7 @@ const props = defineProps<{
 	}[];
 	thin?: boolean;
 	displayMyAvatar?: boolean;
+	displayBackButton?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue
index ef9ae91b9..b672b7011 100644
--- a/packages/client/src/pages/settings/index.vue
+++ b/packages/client/src/pages/settings/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="900" :margin-min="20" :margin-max="32">
 		<div ref="el" class="vvcocwet" :class="{ wide: !narrow }">
 			<div class="body">

From 45b64491067d7adadd3f19df7ba9c93e4d06c768 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 21:59:35 -0700
Subject: [PATCH 392/582] display back button in note

---
 packages/client/src/pages/note.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index 5298194a6..cff6b252b 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="800" :marginMin="6">
 		<div class="fcuexfpr">
 			<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">

From 4d04fc68e58e3536853ad4e01c792e15c09ae791 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:03:24 -0700
Subject: [PATCH 393/582] fix

---
 packages/client/src/components/global/MkPageHeader.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 8293f10e2..1b6b197a8 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -1,9 +1,9 @@
 <template>
 	<div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
-		<div v-if="narrow" class="buttons left" @click="openAccountMenu">
 		<i @click="history.back()" v-if="props.displayBackButton" class="icon ph-caret-left ph-bold ph-lg"></i>
-		<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
-	</div>
+		<div v-if="narrow" class="buttons left" @click="openAccountMenu">
+			<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
+		</div>
 	<template v-if="metadata">
 		<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
 			<MkAvatar v-if="metadata.avatar" class="avatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true"/>

From f730145d215fe887355a032c2d91a00d17e140e4 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:03:38 -0700
Subject: [PATCH 394/582] dev28

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

diff --git a/package.json b/package.json
index bffbba626..41793af47 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev27",
+	"version": "13.2.0-dev28",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 6ce03980c0f44790263020cefc42f0a42a2bd390 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:12:55 -0700
Subject: [PATCH 395/582] more fix

---
 package.json                                           | 2 +-
 packages/client/src/components/global/MkPageHeader.vue | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 41793af47..bb544b62b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev28",
+	"version": "13.2.0-dev29",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 1b6b197a8..01f6aa35d 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
-		<i @click="history.back()" v-if="props.displayBackButton" class="icon ph-caret-left ph-bold ph-lg"></i>
+		<i @click="window.history.back()" v-if="props.displayBackButton" v-tooltip.noDelay="i18n.ts.goBack" class="icon backButton ph-caret-left ph-bold ph-lg"></i>
 		<div v-if="narrow" class="buttons left" @click="openAccountMenu">
 			<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
 		</div>
@@ -296,6 +296,13 @@ onUnmounted(() => {
 		}
 	}
 
+	> .backButton {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-left: 1rem;
+	}
+
 	> .titleContainer {
 		display: flex;
 		align-items: center;

From 20c33e9cdf1b44d8a83d972ab763e5832d27af70 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:22:35 -0700
Subject: [PATCH 396/582] import i18n

---
 packages/client/src/components/global/MkPageHeader.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 01f6aa35d..3cd01f260 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -41,6 +41,7 @@ import { scrollToTop } from '@/scripts/scroll';
 import { globalEvents } from '@/events';
 import { injectPageMetadata } from '@/scripts/page-metadata';
 import { $i, openAccountMenu as openAccountMenu_ } from '@/account';
+import { i18n } from '@/i18n';
 
 type Tab = {
 	key?: string | null;

From b2055907c72a697e74a856bc9aea687f5d6978c1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:24:30 -0700
Subject: [PATCH 397/582] dev 30

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

diff --git a/package.json b/package.json
index bb544b62b..1d9b4dabc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev29",
+	"version": "13.2.0-dev30",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From a47a8afa567c52edb938dcffc45d2e756117ce0d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:41:57 -0700
Subject: [PATCH 398/582] final fix?

---
 package.json                                           | 2 +-
 packages/client/src/components/global/MkPageHeader.vue | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1d9b4dabc..a22468d4a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev30",
+	"version": "13.2.0-dev31",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 3cd01f260..ccfe5b95c 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
-		<i @click="window.history.back()" v-if="props.displayBackButton" v-tooltip.noDelay="i18n.ts.goBack" class="icon backButton ph-caret-left ph-bold ph-lg"></i>
+		<i @click="goBack()" v-if="props.displayBackButton" v-tooltip.noDelay="i18n.ts.goBack" class="icon backButton ph-caret-left ph-bold ph-lg"></i>
 		<div v-if="narrow" class="buttons left" @click="openAccountMenu">
 			<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
 		</div>
@@ -134,6 +134,10 @@ function onTabClick(tab: Tab, ev: MouseEvent): void {
 	}
 }
 
+function goBack(): void {
+	window.history.back();
+}
+
 const calcBg = () => {
 	const rawBg = metadata?.bg || 'var(--bg)';
 	const tinyBg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);

From 0c44ffcca2379e46bf6b85896acec56a2e8e14cf Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:49:17 -0700
Subject: [PATCH 399/582] chore: back button in control panel

---
 packages/client/src/pages/admin/abuses.vue               | 2 +-
 packages/client/src/pages/admin/announcements.vue        | 2 +-
 packages/client/src/pages/admin/database.vue             | 2 +-
 packages/client/src/pages/admin/email-settings.vue       | 2 +-
 packages/client/src/pages/admin/emojis.vue               | 2 +-
 packages/client/src/pages/admin/federation.vue           | 2 +-
 packages/client/src/pages/admin/instance-block.vue       | 2 +-
 packages/client/src/pages/admin/integrations.discord.vue | 2 +-
 packages/client/src/pages/admin/integrations.vue         | 2 +-
 packages/client/src/pages/admin/object-storage.vue       | 2 +-
 packages/client/src/pages/admin/other-settings.vue       | 2 +-
 packages/client/src/pages/admin/promotions.vue           | 2 +-
 packages/client/src/pages/admin/proxy-account.vue        | 2 +-
 packages/client/src/pages/admin/queue.vue                | 2 +-
 packages/client/src/pages/admin/relays.vue               | 2 +-
 packages/client/src/pages/admin/security.vue             | 2 +-
 packages/client/src/pages/admin/settings.vue             | 2 +-
 packages/client/src/pages/admin/users.vue                | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/pages/admin/abuses.vue b/packages/client/src/pages/admin/abuses.vue
index 27ea13de8..a34049a64 100644
--- a/packages/client/src/pages/admin/abuses.vue
+++ b/packages/client/src/pages/admin/abuses.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="900">
 		<div class="lcixvhis">
 			<div class="_section reports">
diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue
index 08038eca7..e9abff49f 100644
--- a/packages/client/src/pages/admin/announcements.vue
+++ b/packages/client/src/pages/admin/announcements.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="900">
 		<div class="ztgjmzrw">
 			<section v-for="announcement in announcements" class="_card _gap announcements">
diff --git a/packages/client/src/pages/admin/database.vue b/packages/client/src/pages/admin/database.vue
index fc4800894..be8272818 100644
--- a/packages/client/src/pages/admin/database.vue
+++ b/packages/client/src/pages/admin/database.vue
@@ -1,5 +1,5 @@
 <template><MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 		<MkSpacer :content-max="800" :margin-min="16" :margin-max="32">
 	<FormButton primary @click="indexPosts">{{ i18n.ts.indexPosts }}</FormButton>
 	<FormSuspense v-slot="{ result: database }" :p="databasePromiseFactory">
diff --git a/packages/client/src/pages/admin/email-settings.vue b/packages/client/src/pages/admin/email-settings.vue
index 0663f205c..15cce5525 100644
--- a/packages/client/src/pages/admin/email-settings.vue
+++ b/packages/client/src/pages/admin/email-settings.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<div class="_formRoot">
diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue
index cfacd5855..517e32fa5 100644
--- a/packages/client/src/pages/admin/emojis.vue
+++ b/packages/client/src/pages/admin/emojis.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 	<MkStickyContainer>
-		<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
+		<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 		<MkSpacer :content-max="900">
 			<div class="ogwlenmc">
 				<div v-if="tab === 'local'" class="local">
diff --git a/packages/client/src/pages/admin/federation.vue b/packages/client/src/pages/admin/federation.vue
index 2faeec624..fdf2fec63 100644
--- a/packages/client/src/pages/admin/federation.vue
+++ b/packages/client/src/pages/admin/federation.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 	<MkStickyContainer>
-		<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
+		<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 		<MkSpacer :content-max="900">
 			<XFederation/>
 		</MkSpacer>
diff --git a/packages/client/src/pages/admin/instance-block.vue b/packages/client/src/pages/admin/instance-block.vue
index 6e4e1d893..818e60261 100644
--- a/packages/client/src/pages/admin/instance-block.vue
+++ b/packages/client/src/pages/admin/instance-block.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<FormTextarea v-model="blockedHosts" class="_formBlock">
diff --git a/packages/client/src/pages/admin/integrations.discord.vue b/packages/client/src/pages/admin/integrations.discord.vue
index dd932eb95..3f16c92c9 100644
--- a/packages/client/src/pages/admin/integrations.discord.vue
+++ b/packages/client/src/pages/admin/integrations.discord.vue
@@ -7,7 +7,7 @@
 
 		<template v-if="enableDiscordIntegration">
 			<FormInfo class="_formBlock">Callback URL: {{ `${uri}/api/dc/cb` }}</FormInfo>
-		
+
 			<FormInput v-model="discordClientId" class="_formBlock">
 				<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 				<template #label>Client ID</template>
diff --git a/packages/client/src/pages/admin/integrations.vue b/packages/client/src/pages/admin/integrations.vue
index f241baf66..0f4bc7faa 100644
--- a/packages/client/src/pages/admin/integrations.vue
+++ b/packages/client/src/pages/admin/integrations.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<FormFolder class="_formBlock">
diff --git a/packages/client/src/pages/admin/object-storage.vue b/packages/client/src/pages/admin/object-storage.vue
index d23f94837..94b616bf4 100644
--- a/packages/client/src/pages/admin/object-storage.vue
+++ b/packages/client/src/pages/admin/object-storage.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<div class="_formRoot">
diff --git a/packages/client/src/pages/admin/other-settings.vue b/packages/client/src/pages/admin/other-settings.vue
index abeee11ac..9de7a1b21 100644
--- a/packages/client/src/pages/admin/other-settings.vue
+++ b/packages/client/src/pages/admin/other-settings.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			none
diff --git a/packages/client/src/pages/admin/promotions.vue b/packages/client/src/pages/admin/promotions.vue
index 3b725c8fc..10a20eb29 100644
--- a/packages/client/src/pages/admin/promotions.vue
+++ b/packages/client/src/pages/admin/promotions.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="900">
 		<div class="uqshojas">
 			<div v-for="ad in ads" class="_panel _formRoot ad">
diff --git a/packages/client/src/pages/admin/proxy-account.vue b/packages/client/src/pages/admin/proxy-account.vue
index 7992620ae..41a62505f 100644
--- a/packages/client/src/pages/admin/proxy-account.vue
+++ b/packages/client/src/pages/admin/proxy-account.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<MkInfo class="_formBlock">{{ i18n.ts.proxyAccountDescription }}</MkInfo>
diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue
index 4eaabeeea..92cc3c24d 100644
--- a/packages/client/src/pages/admin/queue.vue
+++ b/packages/client/src/pages/admin/queue.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="800">
 		<XQueue v-if="tab === 'deliver'" domain="deliver"/>
 		<XQueue v-else-if="tab === 'inbox'" domain="inbox"/>
diff --git a/packages/client/src/pages/admin/relays.vue b/packages/client/src/pages/admin/relays.vue
index b3f8307cf..247d1f09e 100644
--- a/packages/client/src/pages/admin/relays.vue
+++ b/packages/client/src/pages/admin/relays.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="800">
 		<div v-for="relay in relays" :key="relay.inbox" class="relaycxt _panel _block" style="padding: 16px;">
 			<div>{{ relay.inbox }}</div>
diff --git a/packages/client/src/pages/admin/security.vue b/packages/client/src/pages/admin/security.vue
index d1828a449..9af1b8c63 100644
--- a/packages/client/src/pages/admin/security.vue
+++ b/packages/client/src/pages/admin/security.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<div class="_formRoot">
diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue
index 1a4589ab3..a765f32d2 100644
--- a/packages/client/src/pages/admin/settings.vue
+++ b/packages/client/src/pages/admin/settings.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 	<MkStickyContainer>
-		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 			<FormSuspense :p="init">
 				<div class="_formRoot">
diff --git a/packages/client/src/pages/admin/users.vue b/packages/client/src/pages/admin/users.vue
index 4a26ed07c..6a1f24d71 100644
--- a/packages/client/src/pages/admin/users.vue
+++ b/packages/client/src/pages/admin/users.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 	<MkStickyContainer>
-		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true" :show-back-button="true"/></template>
 		<MkSpacer :content-max="900">
 			<div class="lknzcolw">
 				<div class="users">

From 6d247bbdacc5f6bf504cc97d0d7b9bcb3f25b2d8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:52:41 -0700
Subject: [PATCH 400/582] chore: back button in more places

---
 packages/client/src/pages/admin/announcements.vue | 2 +-
 packages/client/src/pages/channel.vue             | 2 +-
 packages/client/src/pages/gallery/index.vue       | 2 +-
 packages/client/src/pages/my-antennas/index.vue   | 2 +-
 packages/client/src/pages/my-clips/index.vue      | 2 +-
 packages/client/src/pages/my-groups/index.vue     | 2 +-
 packages/client/src/pages/my-lists/index.vue      | 2 +-
 packages/client/src/pages/page.vue                | 2 +-
 packages/client/src/pages/search.vue              | 2 +-
 packages/client/src/pages/user/index.vue          | 1 +
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue
index e9abff49f..eea1d38bc 100644
--- a/packages/client/src/pages/admin/announcements.vue
+++ b/packages/client/src/pages/admin/announcements.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true" :show-back-button="true"/></template>
 	<MkSpacer :content-max="900">
 		<div class="ztgjmzrw">
 			<section v-for="announcement in announcements" class="_card _gap announcements">
diff --git a/packages/client/src/pages/channel.vue b/packages/client/src/pages/channel.vue
index 003986ac8..fc0e25b27 100644
--- a/packages/client/src/pages/channel.vue
+++ b/packages/client/src/pages/channel.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="700">
 		<div v-if="channel">
 			<div class="wpgynlbz _panel _gap" :class="{ hide: !showBanner }">
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index 3bc7da22e..452811bcd 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="1200">
 		<swiper
 			:modules="[Virtual]"
diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue
index 1104a8179..400a8e259 100644
--- a/packages/client/src/pages/my-antennas/index.vue
+++ b/packages/client/src/pages/my-antennas/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="700">
 		<div class="ieepwinx">
 			<MkButton :link="true" to="/my/antennas/create" primary class="add"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue
index e19cdfc62..da39ca3b2 100644
--- a/packages/client/src/pages/my-clips/index.vue
+++ b/packages/client/src/pages/my-clips/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="700">
 		<div class="qtcaoidl">
 			<MkButton primary class="add" @click="create"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index 2f01ab541..58368a33f 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :show-back-button="true"/></template>
 	<MkSpacer :content-max="800" :margin-min="20">
 		<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.createGroup }}</MkButton>
 		<MkPagination v-slot="{items}" ref="owned" :pagination="ownedPagination">
diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue
index 4f1b63fff..c3bc6a59a 100644
--- a/packages/client/src/pages/my-lists/index.vue
+++ b/packages/client/src/pages/my-lists/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="700">
 		<div class="qkcjvfiv">
 			<div class="buttonWrapper">
diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue
index 26887e4df..35d2e634a 100644
--- a/packages/client/src/pages/page.vue
+++ b/packages/client/src/pages/page.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="800">
 		<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
 			<div v-if="page" :key="page.id" v-size="{ max: [450] }" class="xcukqgmh">
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index 580281dbe..6133fdbfb 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="800">
 		<swiper
 				:modules="[Virtual]"
diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue
index 2e0efffb4..1ff948fbd 100644
--- a/packages/client/src/pages/user/index.vue
+++ b/packages/client/src/pages/user/index.vue
@@ -5,6 +5,7 @@
 			v-model:tab="tab"
 			:actions="headerActions"
 			:tabs="headerTabs"
+			:show-back-button="true"
 		/>
 	</template>
 	<div>

From a76cff2dce8ca51163d2fc3cda5d2caf35356da8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:54:03 -0700
Subject: [PATCH 401/582] dev32

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

diff --git a/package.json b/package.json
index a22468d4a..a65608586 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev31",
+	"version": "13.2.0-dev32",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 6e032b5203173b2c1943698bedb4680ba6fef8e2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:55:36 -0700
Subject: [PATCH 402/582] oops

---
 packages/client/src/pages/admin/announcements.vue | 2 +-
 packages/client/src/pages/admin/users.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue
index eea1d38bc..e9abff49f 100644
--- a/packages/client/src/pages/admin/announcements.vue
+++ b/packages/client/src/pages/admin/announcements.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 	<MkSpacer :content-max="900">
 		<div class="ztgjmzrw">
 			<section v-for="announcement in announcements" class="_card _gap announcements">
diff --git a/packages/client/src/pages/admin/users.vue b/packages/client/src/pages/admin/users.vue
index 6a1f24d71..c5c3db827 100644
--- a/packages/client/src/pages/admin/users.vue
+++ b/packages/client/src/pages/admin/users.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 	<MkStickyContainer>
-		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true" :show-back-button="true"/></template>
+		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
 		<MkSpacer :content-max="900">
 			<div class="lknzcolw">
 				<div class="users">

From 6718b7e26b0614677ab6c7c288277af4085cf2d2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:59:41 -0700
Subject: [PATCH 403/582] typo

---
 packages/client/src/pages/admin/abuses.vue         | 2 +-
 packages/client/src/pages/admin/announcements.vue  | 2 +-
 packages/client/src/pages/admin/database.vue       | 2 +-
 packages/client/src/pages/admin/email-settings.vue | 2 +-
 packages/client/src/pages/admin/emojis.vue         | 2 +-
 packages/client/src/pages/admin/federation.vue     | 2 +-
 packages/client/src/pages/admin/instance-block.vue | 2 +-
 packages/client/src/pages/admin/integrations.vue   | 2 +-
 packages/client/src/pages/admin/object-storage.vue | 2 +-
 packages/client/src/pages/admin/other-settings.vue | 2 +-
 packages/client/src/pages/admin/promotions.vue     | 2 +-
 packages/client/src/pages/admin/proxy-account.vue  | 2 +-
 packages/client/src/pages/admin/queue.vue          | 2 +-
 packages/client/src/pages/admin/relays.vue         | 2 +-
 packages/client/src/pages/admin/security.vue       | 2 +-
 packages/client/src/pages/admin/settings.vue       | 2 +-
 packages/client/src/pages/admin/users.vue          | 2 +-
 packages/client/src/pages/channel.vue              | 2 +-
 packages/client/src/pages/gallery/index.vue        | 2 +-
 packages/client/src/pages/my-antennas/index.vue    | 2 +-
 packages/client/src/pages/my-clips/index.vue       | 2 +-
 packages/client/src/pages/my-groups/index.vue      | 2 +-
 packages/client/src/pages/my-lists/index.vue       | 2 +-
 packages/client/src/pages/page.vue                 | 2 +-
 packages/client/src/pages/search.vue               | 2 +-
 packages/client/src/pages/user/index.vue           | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/client/src/pages/admin/abuses.vue b/packages/client/src/pages/admin/abuses.vue
index a34049a64..5d11120a1 100644
--- a/packages/client/src/pages/admin/abuses.vue
+++ b/packages/client/src/pages/admin/abuses.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="900">
 		<div class="lcixvhis">
 			<div class="_section reports">
diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue
index e9abff49f..6bc0069fa 100644
--- a/packages/client/src/pages/admin/announcements.vue
+++ b/packages/client/src/pages/admin/announcements.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="900">
 		<div class="ztgjmzrw">
 			<section v-for="announcement in announcements" class="_card _gap announcements">
diff --git a/packages/client/src/pages/admin/database.vue b/packages/client/src/pages/admin/database.vue
index be8272818..f8d49d829 100644
--- a/packages/client/src/pages/admin/database.vue
+++ b/packages/client/src/pages/admin/database.vue
@@ -1,5 +1,5 @@
 <template><MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 		<MkSpacer :content-max="800" :margin-min="16" :margin-max="32">
 	<FormButton primary @click="indexPosts">{{ i18n.ts.indexPosts }}</FormButton>
 	<FormSuspense v-slot="{ result: database }" :p="databasePromiseFactory">
diff --git a/packages/client/src/pages/admin/email-settings.vue b/packages/client/src/pages/admin/email-settings.vue
index 15cce5525..00116238b 100644
--- a/packages/client/src/pages/admin/email-settings.vue
+++ b/packages/client/src/pages/admin/email-settings.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<div class="_formRoot">
diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue
index 517e32fa5..766fc8b49 100644
--- a/packages/client/src/pages/admin/emojis.vue
+++ b/packages/client/src/pages/admin/emojis.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 	<MkStickyContainer>
-		<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+		<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 		<MkSpacer :content-max="900">
 			<div class="ogwlenmc">
 				<div v-if="tab === 'local'" class="local">
diff --git a/packages/client/src/pages/admin/federation.vue b/packages/client/src/pages/admin/federation.vue
index fdf2fec63..04294740c 100644
--- a/packages/client/src/pages/admin/federation.vue
+++ b/packages/client/src/pages/admin/federation.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 	<MkStickyContainer>
-		<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+		<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 		<MkSpacer :content-max="900">
 			<XFederation/>
 		</MkSpacer>
diff --git a/packages/client/src/pages/admin/instance-block.vue b/packages/client/src/pages/admin/instance-block.vue
index 818e60261..70edf5ce0 100644
--- a/packages/client/src/pages/admin/instance-block.vue
+++ b/packages/client/src/pages/admin/instance-block.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<FormTextarea v-model="blockedHosts" class="_formBlock">
diff --git a/packages/client/src/pages/admin/integrations.vue b/packages/client/src/pages/admin/integrations.vue
index 0f4bc7faa..a4d786b6f 100644
--- a/packages/client/src/pages/admin/integrations.vue
+++ b/packages/client/src/pages/admin/integrations.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<FormFolder class="_formBlock">
diff --git a/packages/client/src/pages/admin/object-storage.vue b/packages/client/src/pages/admin/object-storage.vue
index 94b616bf4..2847b10a6 100644
--- a/packages/client/src/pages/admin/object-storage.vue
+++ b/packages/client/src/pages/admin/object-storage.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<div class="_formRoot">
diff --git a/packages/client/src/pages/admin/other-settings.vue b/packages/client/src/pages/admin/other-settings.vue
index 9de7a1b21..140ca4f55 100644
--- a/packages/client/src/pages/admin/other-settings.vue
+++ b/packages/client/src/pages/admin/other-settings.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			none
diff --git a/packages/client/src/pages/admin/promotions.vue b/packages/client/src/pages/admin/promotions.vue
index 10a20eb29..97d5f0e2f 100644
--- a/packages/client/src/pages/admin/promotions.vue
+++ b/packages/client/src/pages/admin/promotions.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="900">
 		<div class="uqshojas">
 			<div v-for="ad in ads" class="_panel _formRoot ad">
diff --git a/packages/client/src/pages/admin/proxy-account.vue b/packages/client/src/pages/admin/proxy-account.vue
index 41a62505f..aeec71d37 100644
--- a/packages/client/src/pages/admin/proxy-account.vue
+++ b/packages/client/src/pages/admin/proxy-account.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<MkInfo class="_formBlock">{{ i18n.ts.proxyAccountDescription }}</MkInfo>
diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue
index 92cc3c24d..f4c74b706 100644
--- a/packages/client/src/pages/admin/queue.vue
+++ b/packages/client/src/pages/admin/queue.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="800">
 		<XQueue v-if="tab === 'deliver'" domain="deliver"/>
 		<XQueue v-else-if="tab === 'inbox'" domain="inbox"/>
diff --git a/packages/client/src/pages/admin/relays.vue b/packages/client/src/pages/admin/relays.vue
index 247d1f09e..232faefac 100644
--- a/packages/client/src/pages/admin/relays.vue
+++ b/packages/client/src/pages/admin/relays.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="800">
 		<div v-for="relay in relays" :key="relay.inbox" class="relaycxt _panel _block" style="padding: 16px;">
 			<div>{{ relay.inbox }}</div>
diff --git a/packages/client/src/pages/admin/security.vue b/packages/client/src/pages/admin/security.vue
index 9af1b8c63..60079c8eb 100644
--- a/packages/client/src/pages/admin/security.vue
+++ b/packages/client/src/pages/admin/security.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 		<FormSuspense :p="init">
 			<div class="_formRoot">
diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue
index a765f32d2..9716b4f9b 100644
--- a/packages/client/src/pages/admin/settings.vue
+++ b/packages/client/src/pages/admin/settings.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 	<MkStickyContainer>
-		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 			<FormSuspense :p="init">
 				<div class="_formRoot">
diff --git a/packages/client/src/pages/admin/users.vue b/packages/client/src/pages/admin/users.vue
index c5c3db827..96da80fcf 100644
--- a/packages/client/src/pages/admin/users.vue
+++ b/packages/client/src/pages/admin/users.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 	<MkStickyContainer>
-		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 		<MkSpacer :content-max="900">
 			<div class="lknzcolw">
 				<div class="users">
diff --git a/packages/client/src/pages/channel.vue b/packages/client/src/pages/channel.vue
index fc0e25b27..e1524974d 100644
--- a/packages/client/src/pages/channel.vue
+++ b/packages/client/src/pages/channel.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="700">
 		<div v-if="channel">
 			<div class="wpgynlbz _panel _gap" :class="{ hide: !showBanner }">
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index 452811bcd..2845ce957 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="1200">
 		<swiper
 			:modules="[Virtual]"
diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue
index 400a8e259..8339f2bcc 100644
--- a/packages/client/src/pages/my-antennas/index.vue
+++ b/packages/client/src/pages/my-antennas/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="700">
 		<div class="ieepwinx">
 			<MkButton :link="true" to="/my/antennas/create" primary class="add"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue
index da39ca3b2..4fa6d6bdc 100644
--- a/packages/client/src/pages/my-clips/index.vue
+++ b/packages/client/src/pages/my-clips/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="700">
 		<div class="qtcaoidl">
 			<MkButton primary class="add" @click="create"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index 58368a33f..6ecb70bb6 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :display-back-button="true"/></template>
 	<MkSpacer :content-max="800" :margin-min="20">
 		<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.createGroup }}</MkButton>
 		<MkPagination v-slot="{items}" ref="owned" :pagination="ownedPagination">
diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue
index c3bc6a59a..995682019 100644
--- a/packages/client/src/pages/my-lists/index.vue
+++ b/packages/client/src/pages/my-lists/index.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="700">
 		<div class="qkcjvfiv">
 			<div class="buttonWrapper">
diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue
index 35d2e634a..1c5c7f1f7 100644
--- a/packages/client/src/pages/page.vue
+++ b/packages/client/src/pages/page.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="800">
 		<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
 			<div v-if="page" :key="page.id" v-size="{ max: [450] }" class="xcukqgmh">
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index 6133fdbfb..6213d0d78 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -1,6 +1,6 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :show-back-button="true"/></template>
+	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
 	<MkSpacer :content-max="800">
 		<swiper
 				:modules="[Virtual]"
diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue
index 1ff948fbd..32369c63d 100644
--- a/packages/client/src/pages/user/index.vue
+++ b/packages/client/src/pages/user/index.vue
@@ -5,7 +5,7 @@
 			v-model:tab="tab"
 			:actions="headerActions"
 			:tabs="headerTabs"
-			:show-back-button="true"
+			:display-back-button="true"
 		/>
 	</template>
 	<div>

From 49b0d2f09ac2f941fd2a6cd197da5c428458b93f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 22:59:53 -0700
Subject: [PATCH 404/582] 33

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

diff --git a/package.json b/package.json
index a65608586..3af5dc01d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev32",
+	"version": "13.2.0-dev33",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From ada9d8206c862b87b406c1ac3376b1e89e772bab Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 4 Apr 2023 23:58:55 -0700
Subject: [PATCH 405/582] Revert "mkv13 media list"

This reverts commit c2ac53c66b5cade26afd5622ad800bec7edffa92.
---
 .../client/src/components/MkMediaList.vue     | 228 ++++++++++--------
 1 file changed, 123 insertions(+), 105 deletions(-)

diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue
index 6dd0dea27..8b6d2c2c9 100644
--- a/packages/client/src/components/MkMediaList.vue
+++ b/packages/client/src/components/MkMediaList.vue
@@ -1,19 +1,19 @@
 <template>
-	<div>
-		<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
-		<div v-if="mediaList.filter(media => previewable(media)).length > 0" :class="$style.container, { dmWidth: inDm }">
-			<div ref="gallery" :class="[$style.medias, count <= 4 ? $style['n' + count] : $style.nMany]">
-				<template v-for="media in mediaList.filter(media => previewable(media))">
-					<XVideo v-if="media.type.startsWith('video')" :key="media.id" :class="$style.media" :video="media"/>
-					<XImage v-else-if="media.type.startsWith('image')" :key="media.id" :class="$style.media" class="image" :data-id="media.id" :image="media" :raw="raw"/>
-				</template>
-			</div>
+<div class="hoawjimk">
+	<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
+	<div v-if="mediaList.filter(media => previewable(media)).length > 0" class="gird-container" :class="{ dmWidth: inDm }">
+		<div ref="gallery" :data-count="mediaList.filter(media => previewable(media)).length" @click.stop>
+			<template v-for="media in mediaList.filter(media => previewable(media))">
+				<XVideo v-if="media.type.startsWith('video')" :key="media.id" :video="media"/>
+				<XImage v-else-if="media.type.startsWith('image')" :key="media.id" class="image" :data-id="media.id" :image="media" :raw="raw"/>
+			</template>
 		</div>
 	</div>
+</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, useCssModule } from 'vue';
+import { onMounted, ref } from 'vue';
 import * as misskey from 'calckey-js';
 import PhotoSwipeLightbox from 'photoswipe/lightbox';
 import PhotoSwipe from 'photoswipe';
@@ -23,6 +23,7 @@ import XImage from '@/components/MkMediaImage.vue';
 import XVideo from '@/components/MkMediaVideo.vue';
 import * as os from '@/os';
 import { FILE_TYPE_BROWSERSAFE } from '@/const';
+import { defaultStore } from '@/store';
 
 const props = defineProps<{
 	mediaList: misskey.entities.DriveFile[];
@@ -30,12 +31,8 @@ const props = defineProps<{
 	inDm?: boolean;
 }>();
 
-const $style = useCssModule();
-
 const gallery = ref(null);
 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);
 
 onMounted(() => {
 	const lightbox = new PhotoSwipeLightbox({
@@ -49,8 +46,7 @@ onMounted(() => {
 					src: media.url,
 					w: media.properties.width,
 					h: media.properties.height,
-					alt: media.comment ?? media.name,
-					comment: media.comment ?? media.name,
+					alt: media.comment,
 				};
 				if (media.properties.orientation != null && media.properties.orientation >= 5) {
 					[item.w, item.h] = [item.h, item.w];
@@ -58,24 +54,22 @@ onMounted(() => {
 				return item;
 			}),
 		gallery: gallery.value,
-		mainClass: $style.pswp,
 		children: '.image',
 		thumbSelector: '.image',
 		loop: false,
 		padding: window.innerWidth > 500 ? {
 			top: 32,
-			bottom: 90,
+			bottom: 32,
 			left: 32,
 			right: 32,
 		} : {
 			top: 0,
-			bottom: 78,
+			bottom: 0,
 			left: 0,
 			right: 0,
 		},
 		imageClickAction: 'close',
 		tapAction: 'toggle-controls',
-		bgOpacity: 1,
 		pswpModule: PhotoSwipe,
 	});
 
@@ -87,7 +81,6 @@ onMounted(() => {
 
 		const id = element.dataset.id;
 		const file = props.mediaList.find(media => media.id === id);
-		if (!file) return;
 
 		itemData.src = file.url;
 		itemData.w = Number(file.properties.width);
@@ -96,8 +89,7 @@ onMounted(() => {
 			[itemData.w, itemData.h] = [itemData.h, itemData.w];
 		}
 		itemData.msrc = file.thumbnailUrl;
-		itemData.alt = file.comment ?? file.name;
-		itemData.comment = file.comment ?? file.name;
+		itemData.alt = file.comment;
 		itemData.thumbCropped = true;
 	});
 
@@ -108,24 +100,28 @@ onMounted(() => {
 			appendTo: 'wrapper',
 			onInit: (el, pwsp) => {
 				let textBox = document.createElement('p');
-				textBox.className = 'pwsp__alt-text _acrylic';
+				textBox.className = 'pwsp__alt-text';
 				el.appendChild(textBox);
 
-				pwsp.on('change', (a) => {
-					textBox.textContent = pwsp.currSlide.data.comment;
+				let preventProp = function(ev: Event): void {
+					ev.stopPropagation();
+				};
+
+				// Allow scrolling/text selection
+				el.onwheel = preventProp;
+				el.onclick = preventProp;
+				el.onpointerdown = preventProp;
+				el.onpointercancel = preventProp;
+				el.onpointermove = preventProp;
+
+				pwsp.on('change', () => {
+					textBox.textContent = pwsp.currSlide.data.alt?.trim();
 				});
 			},
 		});
 	});
 
 	lightbox.init();
-
-	window.addEventListener('popstate', () => {
-		if (lightbox.pswp && lightbox.pswp.isOpen === true) {
-			lightbox.pswp.close();
-			return;
-		}
-	});
 });
 
 const previewable = (file: misskey.entities.DriveFile): boolean => {
@@ -135,106 +131,128 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 };
 </script>
 
-<style lang="scss" module>
-.dmWidth {
-	min-width: 20rem;
-	max-width: 40rem;
-}
+<style lang="scss" scoped>
+.hoawjimk {
 
-.container {
-	position: relative;
-	width: 100%;
-	margin-top: 4px;
-}
-
-.medias {
-	display: grid;
-	grid-gap: 8px;
-
-	// for webkit
-	height: 100%;
-
-	&.n1 {
-		aspect-ratio: 16/9;
-		grid-template-rows: 1fr;
+	> .dmWidth {
+		min-width: 20rem;
+		max-width: 40rem;
 	}
 
-	&.n2 {
-		aspect-ratio: 16/9;
-		grid-template-columns: 1fr 1fr;
-		grid-template-rows: 1fr;
-	}
+	> .gird-container {
+		position: relative;
+		width: 100%;
+		margin-top: 4px;
+		border-radius: var(--radius);
+		overflow: hidden;
 
-	&.n3 {
-		aspect-ratio: 16/9;
-		grid-template-columns: 1fr 0.5fr;
-		grid-template-rows: 1fr 1fr;
-
-		> .media:nth-child(1) {
-			grid-row: 1 / 3;
+		&:before {
+			content: '';
+			display: block;
+			padding-top: 56.25% // 16:9;
 		}
 
-		> .media:nth-child(3) {
-			grid-column: 2 / 3;
-			grid-row: 2 / 3;
+		> div {
+			position: absolute;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			display: grid;
+			grid-gap: 8px;
+
+			> * {
+				overflow: hidden;
+				border-radius: 6px;
+			}
+
+			&[data-count="1"] {
+				grid-template-rows: 1fr;
+			}
+
+			&[data-count="2"] {
+				grid-template-columns: 1fr 1fr;
+				grid-template-rows: 1fr;
+			}
+
+			&[data-count="3"] {
+				grid-template-columns: 1fr 0.5fr;
+				grid-template-rows: 1fr 1fr;
+
+				> *:nth-child(1) {
+					grid-row: 1 / 3;
+				}
+
+				> *:nth-child(3) {
+					grid-column: 2 / 3;
+					grid-row: 2 / 3;
+				}
+			}
+
+			&[data-count="4"] {
+				grid-template-columns: 1fr 1fr;
+				grid-template-rows: 1fr 1fr;
+			}
+
+			> *:nth-child(1) {
+				grid-column: 1 / 2;
+				grid-row: 1 / 2;
+			}
+
+			> *:nth-child(2) {
+				grid-column: 2 / 3;
+				grid-row: 1 / 2;
+			}
+
+			> *:nth-child(3) {
+				grid-column: 1 / 2;
+				grid-row: 2 / 3;
+			}
+
+			> *:nth-child(4) {
+				grid-column: 2 / 3;
+				grid-row: 2 / 3;
+			}
 		}
 	}
-
-	&.n4 {
-		aspect-ratio: 16/9;
-		grid-template-columns: 1fr 1fr;
-		grid-template-rows: 1fr 1fr;
-	}
-
-	&.nMany {
-		grid-template-columns: 1fr 1fr;
-
-		> .media {
-			aspect-ratio: 16/9;
-		}
-	}
-}
-
-.media {
-	overflow: hidden; // clipにするとバグる
-	border-radius: 8px;
-}
-
-.pswp {
-	--pswp-root-z-index: var(--mk-pswp-root-z-index, 2000700) !important;
-	--pswp-bg: var(--modalBg) !important;
 }
 </style>
 
 <style lang="scss">
-.pswp__bg {
-	background: var(--modalBg);
-	backdrop-filter: var(--modalBgFilter);
+.pswp {
+	// なぜか機能しない
+  //z-index: v-bind(pswpZIndex);
+	z-index: 2000000;
 }
-
 .pwsp__alt-text-container {
 	display: flex;
 	flex-direction: row;
 	align-items: center;
 
 	position: absolute;
-	bottom: 20px;
+	bottom: 30px;
 	left: 50%;
 	transform: translateX(-50%);
 
 	width: 75%;
-	max-width: 800px;
 }
 
 .pwsp__alt-text {
-	color: var(--fg);
+	color: white;
 	margin: 0 auto;
 	text-align: center;
-	padding: var(--margin);
-	border-radius: var(--radius);
-	max-height: 8em;
+	padding: 10px;
+	background: rgba(0, 0, 0, 0.5);
+	border-radius: 5px;
+
+	max-height: 10vh;
+	overflow-x: clip;
 	overflow-y: auto;
-	text-shadow: var(--bg) 0 0 10px, var(--bg) 0 0 3px, var(--bg) 0 0 3px;
-	white-space: pre-line;
+	overscroll-behavior: contain;
 }
+
+.pwsp__alt-text:empty {
+	display: none;
+}
+
 </style>

From 98e95d79b7217870d6b21d9a145e6436561607e6 Mon Sep 17 00:00:00 2001
From: Nya Candy <dev@candinya.com>
Date: Tue, 27 Dec 2022 13:19:43 +0800
Subject: [PATCH 406/582] fix(client): userpage ui (#9179)

* fix(unverified): clip pages ui

* fix(unverified): user page width

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 packages/client/src/pages/user/clips.vue     | 29 ++++++++++++++------
 packages/client/src/pages/user/gallery.vue   | 16 +++++------
 packages/client/src/pages/user/pages.vue     | 12 ++++----
 packages/client/src/pages/user/reactions.vue | 24 ++++++++--------
 4 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/packages/client/src/pages/user/clips.vue b/packages/client/src/pages/user/clips.vue
index 8da81eb8d..7c8925962 100644
--- a/packages/client/src/pages/user/clips.vue
+++ b/packages/client/src/pages/user/clips.vue
@@ -1,16 +1,14 @@
 <template>
-<div>
-	<MkSpacer :content-max="800">
-		<MkPagination v-slot="{items}" ref="list" :pagination="pagination">
+<MkSpacer :content-max="800">
+	<div class="pages-user-clips">
+		<MkPagination v-slot="{items}" ref="list" :pagination="pagination" class="list">
 			<MkA v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap">
-				<div class="_panel">
-					<b>{{ item.name }}</b>
-					<Mfm v-if="item.description" class="description" :text="item.description"/>
-				</div>
+				<b>{{ item.name }}</b>
+				<div v-if="item.description" class="description">{{ item.description }}</div>
 			</MkA>
 		</MkPagination>
-	</MkSpacer>
-</div>
+	</div>
+</MkSpacer>
 </template>
 
 <script lang="ts" setup>
@@ -32,5 +30,18 @@ const pagination = {
 </script>
 
 <style lang="scss" scoped>
+.pages-user-clips {
+	> .list {
+		> .item {
+			display: block;
+			padding: 16px;
 
+			> .description {
+				margin-top: 8px;
+				padding-top: 8px;
+				border-top: solid 0.5px var(--divider);
+			}
+		}
+	}
+}
 </style>
diff --git a/packages/client/src/pages/user/gallery.vue b/packages/client/src/pages/user/gallery.vue
index 8b1e358ef..f8ad1340f 100644
--- a/packages/client/src/pages/user/gallery.vue
+++ b/packages/client/src/pages/user/gallery.vue
@@ -1,13 +1,11 @@
 <template>
-<div>
-	<MkSpacer :content-max="800">
-		<MkPagination v-slot="{items}" :pagination="pagination">
-			<div class="jrnovfpt">
-				<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
-			</div>
-		</MkPagination>
-	</MkSpacer>
-</div>
+<MkSpacer :content-max="800">
+	<MkPagination v-slot="{items}" :pagination="pagination">
+		<div class="jrnovfpt">
+			<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
+		</div>
+	</MkPagination>
+</MkSpacer>
 </template>
 
 <script lang="ts" setup>
diff --git a/packages/client/src/pages/user/pages.vue b/packages/client/src/pages/user/pages.vue
index e55c9fac8..89aa63f1b 100644
--- a/packages/client/src/pages/user/pages.vue
+++ b/packages/client/src/pages/user/pages.vue
@@ -1,11 +1,9 @@
 <template>
-<div>
-	<MkSpacer :content-max="800">
-		<MkPagination v-slot="{items}" ref="list" :pagination="pagination">
-			<MkPagePreview v-for="page in items" :key="page.id" :page="page" class="_gap"/>
-		</MkPagination>
-	</MkSpacer>
-</div>
+<MkSpacer :content-max="800">
+	<MkPagination v-slot="{items}" ref="list" :pagination="pagination">
+		<MkPagePreview v-for="page in items" :key="page.id" :page="page" class="_gap"/>
+	</MkPagination>
+</MkSpacer>
 </template>
 
 <script lang="ts" setup>
diff --git a/packages/client/src/pages/user/reactions.vue b/packages/client/src/pages/user/reactions.vue
index b54341f65..1a6568a9d 100644
--- a/packages/client/src/pages/user/reactions.vue
+++ b/packages/client/src/pages/user/reactions.vue
@@ -1,18 +1,16 @@
 <template>
-<div>
-	<MkSpacer :content-max="800">
-		<MkPagination v-slot="{items}" ref="list" :pagination="pagination">
-			<div v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap afdcfbfb">
-				<div class="header">
-					<MkAvatar class="avatar" :user="user"/>
-					<MkReactionIcon class="reaction" :reaction="item.type" :custom-emojis="item.note.emojis" :no-style="true"/>
-					<MkTime :time="item.createdAt" class="createdAt"/>
-				</div>
-				<MkNote :key="item.id" :note="item.note"/>
+<MkSpacer :content-max="800">
+	<MkPagination v-slot="{items}" ref="list" :pagination="pagination">
+		<div v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap afdcfbfb">
+			<div class="header">
+				<MkAvatar class="avatar" :user="user"/>
+				<MkReactionIcon class="reaction" :reaction="item.type" :custom-emojis="item.note.emojis" :no-style="true"/>
+				<MkTime :time="item.createdAt" class="createdAt"/>
 			</div>
-		</MkPagination>
-	</MkSpacer>
-</div>
+			<MkNote :key="item.id" :note="item.note"/>
+		</div>
+	</MkPagination>
+</MkSpacer>
 </template>
 
 <script lang="ts" setup>

From 3819e921cc5c21688bc7ddb5625a27154734a6f1 Mon Sep 17 00:00:00 2001
From: amy bones <amy@spookygirl.boo>
Date: Thu, 19 Jan 2023 18:11:27 -0800
Subject: [PATCH 407/582] feat: give reason for soft mutes

Bad UX when a post is muted and it just says "Some chick said something". Now
provide some context too to help people decide if they want to view something
potentially triggering.
---
 locales/en-US.yml                             |  1 +
 locales/ja-JP.yml                             |  1 +
 packages/backend/src/misc/check-word-mute.ts  | 70 ++++++++++++------
 .../api/stream/channels/global-timeline.ts    |  6 +-
 .../api/stream/channels/home-timeline.ts      |  6 +-
 .../api/stream/channels/hybrid-timeline.ts    |  6 +-
 .../api/stream/channels/local-timeline.ts     |  6 +-
 .../stream/channels/recommended-timeline.ts   |  6 +-
 packages/backend/src/services/note/create.ts  |  6 +-
 packages/client/src/components/MkNote.vue     | 13 ++--
 .../client/src/components/MkNoteDetailed.vue  | 13 ++--
 .../client/src/scripts/check-word-mute.ts     | 73 ++++++++++++-------
 12 files changed, 133 insertions(+), 74 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 1bdf57fae..3f3ab32b2 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -612,6 +612,7 @@ regexpError: "Regular Expression error"
 regexpErrorDescription: "An error occurred in the regular expression on line {line} of your {tab} word mutes:"
 instanceMute: "Instance Mutes"
 userSaysSomething: "{name} said something"
+userSaysSomethingReason: "{name} said {reason}"
 makeActive: "Activate"
 display: "Display"
 copy: "Copy"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 26971184c..6af0d7fc6 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -612,6 +612,7 @@ regexpError: "正規表現エラー"
 regexpErrorDescription: "{tab}ワードミュートの{line}行目の正規表現にエラーが発生しました:"
 instanceMute: "インスタンスミュート"
 userSaysSomething: "{name}が何かを言いました"
+userSaysSomethingReason: "{name}前記{reason}"
 makeActive: "アクティブにする"
 display: "表示"
 copy: "コピー"
diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index ffdf3caf8..53193d851 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -5,46 +5,74 @@ import type { User } from "@/models/entities/user.js";
 type NoteLike = {
 	userId: Note["userId"];
 	text: Note["text"];
+	cw?: Note["cw"];
 };
 
 type UserLike = {
 	id: User["id"];
 };
 
-export async function checkWordMute(
+export type Muted = {
+	muted: boolean;
+	matched: string[];
+};
+
+const NotMuted = { muted: false, matched: [] };
+
+function escapeRegExp(x: string) {
+	return x.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
+}
+
+export async function getWordMute(
 	note: NoteLike,
 	me: UserLike | null | undefined,
 	mutedWords: Array<string | string[]>,
-): Promise<boolean> {
+): Promise<Muted> {
 	// 自分自身
-	if (me && note.userId === me.id) return false;
+	if (me && note.userId === me.id) {
+		return NotMuted;
+	}
 
 	if (mutedWords.length > 0) {
 		const text = ((note.cw ?? "") + "\n" + (note.text ?? "")).trim();
 
-		if (text === "") return false;
+		if (text === "") {
+			return NotMuted;
+		}
 
-		const matched = mutedWords.some((filter) => {
-			if (Array.isArray(filter)) {
-				return filter.every((keyword) => text.includes(keyword));
-			} else {
-				// represents RegExp
-				const regexp = filter.match(/^\/(.+)\/(.*)$/);
+		for (const mutePattern of mutedWords) {
+			let mute: RE2;
+			let matched: string[];
+			if (Array.isArray(mutePattern)) {
+				matched = mutePattern.filter((keyword) => keyword !== "");
 
-				// This should never happen due to input sanitisation.
-				if (!regexp) return false;
-
-				try {
-					return new RE2(regexp[1], regexp[2]).test(text);
-				} catch (err) {
-					// This should never happen due to input sanitisation.
-					return false;
+				if (matched.length === 0) {
+					continue;
 				}
+				mute = new RE2(
+					`\\b${matched.map(escapeRegExp).join("\\b.*\\b")}\\b`,
+					"g",
+				);
+			} else {
+				const regexp = mutePattern.match(/^\/(.+)\/(.*)$/);
+				// This should never happen due to input sanitisation.
+				if (!regexp) {
+					console.warn(`Found invalid regex in word mutes: ${mutePattern}`);
+					continue;
+				}
+				mute = new RE2(regexp[1], regexp[2]);
+				matched = [mutePattern];
 			}
-		});
 
-		if (matched) return true;
+			try {
+				if (mute.test(text)) {
+					return { muted: true, matched };
+				}
+			} catch (err) {
+				// This should never happen due to input sanitisation.
+			}
+		}
 	}
 
-	return false;
+	return NotMuted;
 }
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 bea201088..a99b3cbc1 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -1,6 +1,6 @@
 import Channel from "../channel.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
-import { checkWordMute } from "@/misc/check-word-mute.js";
+import { getWordMute } from "@/misc/check-word-mute.js";
 import { isInstanceMuted } from "@/misc/is-instance-muted.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import type { Packed } from "@/misc/schema.js";
@@ -60,10 +60,10 @@ export default class extends Channel {
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
 		// レコードが追加されるNoteでも追加されるより先にここのストリーミングの処理に到達することが起こる。
-		// そのためレコードが存在するかのチェックでは不十分なので、改めてcheckWordMuteを呼んでいる
+		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await checkWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordMute(note, this.user, this.userProfile.mutedWords)).muted
 		)
 			return;
 
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 47d773638..c51a0fc2b 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -1,5 +1,5 @@
 import Channel from "../channel.js";
-import { checkWordMute } from "@/misc/check-word-mute.js";
+import { getWordMute } from "@/misc/check-word-mute.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import { isInstanceMuted } from "@/misc/is-instance-muted.js";
 import type { Packed } from "@/misc/schema.js";
@@ -58,10 +58,10 @@ export default class extends Channel {
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
 		// レコードが追加されるNoteでも追加されるより先にここのストリーミングの処理に到達することが起こる。
-		// そのためレコードが存在するかのチェックでは不十分なので、改めてcheckWordMuteを呼んでいる
+		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await checkWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordMute(note, this.user, this.userProfile.mutedWords)).muted
 		)
 			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 398127c40..3e4a8a4e1 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -1,6 +1,6 @@
 import Channel from "../channel.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
-import { checkWordMute } from "@/misc/check-word-mute.js";
+import { getWordMute } from "@/misc/check-word-mute.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import { isInstanceMuted } from "@/misc/is-instance-muted.js";
 import type { Packed } from "@/misc/schema.js";
@@ -75,10 +75,10 @@ export default class extends Channel {
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
 		// レコードが追加されるNoteでも追加されるより先にここのストリーミングの処理に到達することが起こる。
-		// そのためレコードが存在するかのチェックでは不十分なので、改めてcheckWordMuteを呼んでいる
+		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await checkWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordMute(note, this.user, this.userProfile.mutedWords)).muted
 		)
 			return;
 
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 6f8075b7a..56689aae9 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -1,6 +1,6 @@
 import Channel from "../channel.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
-import { checkWordMute } from "@/misc/check-word-mute.js";
+import { getWordMute } from "@/misc/check-word-mute.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import type { Packed } from "@/misc/schema.js";
 
@@ -52,10 +52,10 @@ export default class extends Channel {
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
 		// レコードが追加されるNoteでも追加されるより先にここのストリーミングの処理に到達することが起こる。
-		// そのためレコードが存在するかのチェックでは不十分なので、改めてcheckWordMuteを呼んでいる
+		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await checkWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordMute(note, this.user, this.userProfile.mutedWords)).muted
 		)
 			return;
 
diff --git a/packages/backend/src/server/api/stream/channels/recommended-timeline.ts b/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
index a2a03fca1..28e57ef53 100644
--- a/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
@@ -1,6 +1,6 @@
 import Channel from "../channel.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
-import { checkWordMute } from "@/misc/check-word-mute.js";
+import { getWordMute } from "@/misc/check-word-mute.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import { isInstanceMuted } from "@/misc/is-instance-muted.js";
 import type { Packed } from "@/misc/schema.js";
@@ -73,10 +73,10 @@ export default class extends Channel {
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
 		// レコードが追加されるNoteでも追加されるより先にここのストリーミングの処理に到達することが起こる。
-		// そのためレコードが存在するかのチェックでは不十分なので、改めてcheckWordMuteを呼んでいる
+		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await checkWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordMute(note, this.user, this.userProfile.mutedWords)).muted
 		)
 			return;
 
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 6c7fd9ad5..5dd324d89 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -53,7 +53,7 @@ import { Poll } from "@/models/entities/poll.js";
 import { createNotification } from "../create-notification.js";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
 import { checkHitAntenna } from "@/misc/check-hit-antenna.js";
-import { checkWordMute } from "@/misc/check-word-mute.js";
+import { getWordMute } from "@/misc/check-word-mute.js";
 import { addNoteToAntenna } from "../add-note-to-antenna.js";
 import { countSameRenotes } from "@/misc/count-same-renotes.js";
 import { deliverToRelays } from "../relay.js";
@@ -343,9 +343,9 @@ export default async (
 			)
 			.then((us) => {
 				for (const u of us) {
-					checkWordMute(note, { id: u.userId }, u.mutedWords).then(
+					getWordMute(note, { id: u.userId }, u.mutedWords).then(
 						(shouldMute) => {
-							if (shouldMute) {
+							if (shouldMute.muted) {
 								MutedNotes.insert({
 									id: genId(),
 									userId: u.userId,
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index f80aabbc9..a0c4edda7 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -1,6 +1,6 @@
 <template>
 <div
-	v-if="!muted"
+	v-if="!muted.muted"
 	v-show="!isDeleted"
 	ref="el"
 	v-hotkey="keymap"
@@ -96,13 +96,16 @@
 		</div>
 	</article>
 </div>
-<div v-else class="muted" @click="muted = false">
-	<I18n :src="i18n.ts.userSaysSomething" tag="small">
+<div v-else class="muted" @click="muted.muted = false">
+	<I18n :src="i18n.ts.userSaysSomethingReason" tag="small">
 		<template #name>
 			<MkA v-user-preview="appearNote.userId" class="name" :to="userPage(appearNote.user)">
 				<MkUserName :user="appearNote.user"/>
 			</MkA>
 		</template>
+		<template #reason>
+			<b>{{ muted.matched.join(", ") }}</b>
+		</template>
 	</I18n>
 </div>
 </template>
@@ -126,7 +129,7 @@ import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkVisibility from '@/components/MkVisibility.vue';
 import { pleaseLogin } from '@/scripts/please-login';
 import { focusPrev, focusNext } from '@/scripts/focus';
-import { checkWordMute } from '@/scripts/check-word-mute';
+import { getWordMute } from '@/scripts/check-word-mute';
 import { useRouter } from '@/router';
 import { userPage } from '@/filters/user';
 import * as os from '@/os';
@@ -184,7 +187,7 @@ const isLong = (appearNote.cw == null && appearNote.text != null && (
 ));
 const collapsed = ref(appearNote.cw == null && isLong);
 const isDeleted = ref(false);
-const muted = ref(checkWordMute(appearNote, $i, defaultStore.state.mutedWords));
+const muted = ref(getWordMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5) : null;
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 4eed184e2..66ad47484 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -1,6 +1,6 @@
 <template>
 <div
-	v-if="!muted"
+	v-if="!muted.muted"
 	v-show="!isDeleted"
 	ref="el"
 	v-hotkey="keymap"
@@ -102,13 +102,16 @@
 	</article>
 	<MkNoteSub v-for="note in directReplies" :key="note.id" :note="note" class="reply" :conversation="replies"/>
 </div>
-<div v-else class="_panel muted" @click="muted = false">
-	<I18n :src="i18n.ts.userSaysSomething" tag="small">
+<div v-else class="_panel muted" @click="muted.muted = false">
+	<I18n :src="i18n.ts.userSaysSomethingReason" tag="small">
 		<template #name>
 			<MkA v-user-preview="appearNote.userId" class="name" :to="userPage(appearNote.user)">
 				<MkUserName :user="appearNote.user"/>
 			</MkA>
 		</template>
+		<template #reason>
+			<b>{{ muted.matched.join(", ") }}</b>
+		</template>
 	</I18n>
 </div>
 </template>
@@ -130,7 +133,7 @@ import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
 import MkVisibility from '@/components/MkVisibility.vue';
 import { pleaseLogin } from '@/scripts/please-login';
-import { checkWordMute } from '@/scripts/check-word-mute';
+import { getWordMute } from '@/scripts/check-word-mute';
 import { userPage } from '@/filters/user';
 import { notePage } from '@/filters/note';
 import { useRouter } from '@/router';
@@ -186,7 +189,7 @@ let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note
 const isMyRenote = $i && ($i.id === note.userId);
 const showContent = ref(false);
 const isDeleted = ref(false);
-const muted = ref(checkWordMute(appearNote, $i, defaultStore.state.mutedWords));
+const muted = ref(getWordMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5) : null;
diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts
index 7053c658b..a189a6d3a 100644
--- a/packages/client/src/scripts/check-word-mute.ts
+++ b/packages/client/src/scripts/check-word-mute.ts
@@ -1,41 +1,64 @@
-export function checkWordMute(
+export type Muted = {
+	muted: boolean;
+	matched: string[];
+};
+
+const NotMuted = { muted: false, matched: [] };
+
+function escapeRegExp(x: string) {
+	return x.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
+}
+
+export function getWordMute(
 	note: Record<string, any>,
 	me: Record<string, any> | null | undefined,
 	mutedWords: Array<string | string[]>,
-): boolean {
+): Muted {
 	// 自分自身
-	if (me && note.userId === me.id) return false;
+	if (me && note.userId === me.id) {
+		return NotMuted;
+	}
 
 	if (mutedWords.length > 0) {
 		const text = ((note.cw ?? "") + "\n" + (note.text ?? "")).trim();
 
-		if (text === "") return false;
+		if (text === "") {
+			return NotMuted;
+		}
 
-		const matched = mutedWords.some((filter) => {
-			if (Array.isArray(filter)) {
-				// Clean up
-				const filteredFilter = filter.filter((keyword) => keyword !== "");
-				if (filteredFilter.length === 0) return false;
+		for (const mutePattern of mutedWords) {
+			let mute: RegExp;
+			let matched: string[];
+			if (Array.isArray(mutePattern)) {
+				matched = mutePattern.filter((keyword) => keyword !== "");
 
-				return filteredFilter.every((keyword) => text.includes(keyword));
-			} else {
-				// represents RegExp
-				const regexp = filter.match(/^\/(.+)\/(.*)$/);
-
-				// This should never happen due to input sanitisation.
-				if (!regexp) return false;
-
-				try {
-					return new RegExp(regexp[1], regexp[2]).test(text);
-				} catch (err) {
-					// This should never happen due to input sanitisation.
-					return false;
+				if (matched.length === 0) {
+					continue;
 				}
+				mute = new RegExp(
+					`\\b${matched.map(escapeRegExp).join("\\b.*\\b")}\\b`,
+					"g",
+				);
+			} else {
+				const regexp = mutePattern.match(/^\/(.+)\/(.*)$/);
+				// This should never happen due to input sanitisation.
+				if (!regexp) {
+					console.warn(`Found invalid regex in word mutes: ${mutePattern}`);
+					continue;
+				}
+				mute = new RegExp(regexp[1], regexp[2]);
+				matched = [mutePattern];
 			}
-		});
 
-		if (matched) return true;
+			try {
+				if (mute.test(text)) {
+					return { muted: true, matched };
+				}
+			} catch (err) {
+				// This should never happen due to input sanitisation.
+			}
+		}
 	}
 
-	return false;
+	return NotMuted;
 }

From d92cfb8cdfbbb821e9a2c9477757bd98c22c009a Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Thu, 6 Apr 2023 18:56:46 -0700
Subject: [PATCH 408/582] formatting

---
 packages/backend/check_connect.js             |   10 +-
 .../backend/migration/1000000000000-Init.js   | 1546 ++++++----
 .../backend/migration/1556348509290-Pages.js  |   74 +-
 .../migration/1556746559567-UserProfile.js    |   30 +-
 .../migration/1557476068003-PinnedUsers.js    |   16 +-
 .../migration/1557761316509-AddSomeUrls.js    |   28 +-
 .../1557932705754-ObjectStorageSetting.js     |   90 +-
 .../migration/1558072954435-PageLike.js       |   50 +-
 .../migration/1558103093633-UserGroup.js      |  116 +-
 .../1558257926829-UserGroupInvite.js          |   56 +-
 .../1558266512381-UserListJoining.js          |   16 +-
 .../migration/1561706992953-webauthn.js       |   70 +-
 .../migration/1561873850023-ChartIndexes.js   |  570 ++--
 .../1562422242907-PasswordLessLogin.js        |   18 +-
 .../migration/1562444565093-PinnedPage.js     |   34 +-
 .../1562448332510-PageTitleHideOption.js      |   18 +-
 .../migration/1562869971568-ModerationLog.js  |   30 +-
 .../migration/1563757595828-UsedUsername.js   |   16 +-
 .../backend/migration/1565634203341-room.js   |   16 +-
 .../1571220798684-CustomEmojiCategory.js      |   20 +-
 .../migration/1572760203493-nodeinfo.js       |  100 +-
 .../1576269851876-TalkFederationId.js         |   26 +-
 .../1576869585998-ProxyRemoteFiles.js         |   26 +-
 .../backend/migration/1579267006611-v12.js    |  120 +-
 .../backend/migration/1579270193251-v12-2.js  |   26 +-
 .../backend/migration/1579282808087-v12-3.js  |   26 +-
 .../backend/migration/1579544426412-v12-4.js  |   36 +-
 .../backend/migration/1579977526288-v12-5.js  |  205 +-
 .../backend/migration/1579993013959-v12-6.js  |   46 +-
 .../backend/migration/1580069531114-v12-7.js  |   70 +-
 .../backend/migration/1580148575182-v12-8.js  |   36 +-
 .../backend/migration/1580154400017-v12-9.js  |   26 +-
 .../backend/migration/1580276619901-v12-10.js |   45 +-
 .../backend/migration/1580331224276-v12-11.js |   46 +-
 .../backend/migration/1580508795118-v12-12.js |  186 +-
 .../backend/migration/1580543501339-v12-13.js |   23 +-
 .../backend/migration/1580864313253-v12-14.js |   56 +-
 .../1581526429287-user-group-invitation.js    |  140 +-
 .../1581695816408-user-group-antenna.js       |   90 +-
 ...581708415836-drive-user-folder-id-index.js |   26 +-
 .../backend/migration/1581979837262-promo.js  |   90 +-
 .../1582019042083-featured-injecttion.js      |   26 +-
 .../1582210532752-antenna-exclude.js          |   26 +-
 .../1582875306439-note-reaction-length.js     |   26 +-
 .../backend/migration/1585361548360-miauth.js |  136 +-
 .../1585385921215-custom-notification.js      |  193 +-
 .../backend/migration/1585772678853-ap-url.js |   23 +-
 .../1586624197029-AddObjectStorageUseProxy.js |   26 +-
 .../1586641139527-remote-reaction.js          |   26 +-
 .../migration/1586708940386-pageAiScript.js   |   26 +-
 .../migration/1588044505511-hCaptcha.js       |   46 +-
 .../migration/1589023282116-pubRelay.js       |   40 +-
 .../migration/1595075960584-blurhash.js       |   22 +-
 ...595077605646-blurhash-for-avatar-banner.js |   40 +-
 .../1595676934834-instance-icon-url.js        |   22 +-
 .../migration/1595771249699-word-mute.js      |   78 +-
 .../migration/1595782306083-word-mute2.js     |   34 +-
 .../migration/1596548170836-channel.js        |  168 +-
 .../migration/1596786425167-channel2.js       |   24 +-
 ...597230137744-objectStorageSetPublicRead.js |   24 +-
 ...597236229720-IncludingNotificationTypes.js |   32 +-
 .../1597385880794-add-sensitive-index.js      |   22 +-
 .../migration/1597459042300-channel-unread.js |   66 +-
 .../1597893996136-ChannelNoteIdDescIndex.js   |   28 +-
 .../1600353287890-mutingNotificationTypes.js  |   48 +-
 .../1603094348345-refine-abuse-user-report.js |   90 +-
 ...1603095701770-refine-abuse-user-report2.js |   44 +-
 .../1603776877564-instance-theme-color.js     |   22 +-
 .../1603781553011-instance-favicon.js         |   22 +-
 .../1604821689616-delete-auto-watch.js        |   24 +-
 .../1605408848373-clip-description.js         |   22 +-
 .../migration/1605408971051-comments.js       | 1496 +++++++---
 .../1605585339718-instance-pinned-pages.js    |   22 +-
 .../1605965516823-instance-images.js          |   30 +-
 .../migration/1606191203881-no-crawle.js      |   32 +-
 .../1607151207216-instance-pinned-clip.js     |   22 +-
 .../migration/1607353487793-isExplorable.js   |   36 +-
 .../migration/1610277136869-registry.js       |   48 +-
 .../migration/1610277585759-registry2.js      |   30 +-
 .../migration/1610283021566-registry3.js      |   24 +-
 .../migration/1611354329133-followersUri.js   |   30 +-
 .../migration/1611397665007-gallery.js        |  106 +-
 ...547387175-objectStorageS3ForcePathStyle.js |   24 +-
 .../1612619156584-announcement-email.js       |   24 +-
 .../1613155914446-emailNotificationTypes.js   |   24 +-
 .../migration/1613181457597-user-lang.js      |   22 +-
 ...1613503367223-use-bigint-for-driveUsage.js |   26 +-
 .../migration/1615965918224-chart-v2.js       |  720 +++--
 .../migration/1615966519402-chart-v2-2.js     |   56 +-
 .../1618637372000-user-last-active-date.js    |   28 +-
 .../1618639857000-user-hide-online-status.js  |   24 +-
 .../migration/1619942102890-password-reset.js |   42 +-
 .../backend/migration/1620019354680-ad.js     |   34 +-
 .../backend/migration/1620364649428-ad2.js    |   22 +-
 .../1621479946000-add-note-indexes.js         |   33 +-
 ...9304522-user-profile-description-length.js |   26 +-
 .../1622681548499-log-message-length.js       |   26 +-
 .../1626509500668-fix-remote-file-proxy.js    |   49 +-
 .../1626733991004-allowlist-secure-mode.js    |   19 +-
 .../migration/1629004542760-chart-reindex.js  |  534 ++--
 .../1629024377804-deepl-integration.js        |   22 +-
 .../1629288472000-fix-channel-userId.js       |   24 +-
 .../1629512953000-user-is-deleted.js          |   26 +-
 .../1629778475000-deepl-integration2.js       |   22 +-
 .../1629833361000-AddShowTLReplies.js         |   16 +-
 .../1629968054000_userInstanceBlocks.js       |   16 +-
 ...1633068642000-email-required-for-signup.js |   24 +-
 .../migration/1633071909016-user-pending.js   |   28 +-
 .../1634486652000-user-public-reactions.js    |   24 +-
 .../migration/1634902659689-delete-log.js     |   17 +-
 .../1635500777168-note-thread-mute.js         |   68 +-
 .../migration/1636197624383-ff-visibility.js  |   32 +-
 .../1636697408073-remove-via-mobile.js        |   18 +-
 .../1637320813000-forwarded-report.js         |   14 +-
 .../migration/1639325650583-chart-v3.js       |  690 +++--
 .../migration/1642611822809-emoji-url.js      |   26 +-
 ...1642613870898-drive-file-webpublic-type.js |   20 +-
 .../migration/1643963705770-chart-v4.js       |  220 +-
 .../migration/1643966656277-chart-v5.js       |   76 +-
 .../migration/1643967331284-chart-v6.js       | 1340 ++++++---
 .../1644010796173-convert-hard-mutes.js       |  121 +-
 .../migration/1644058404077-chart-v7.js       | 1949 +++++++++----
 .../migration/1644059847460-chart-v8.js       |   63 +-
 .../migration/1644060125705-chart-v9.js       |   63 +-
 .../migration/1644073149413-chart-v10.js      |  104 +-
 .../migration/1644095659741-chart-v11.js      |  332 ++-
 .../migration/1644328606241-chart-v12.js      |   76 +-
 .../migration/1644331238153-chart-v13.js      |   44 +-
 .../migration/1644344266289-chart-v14.js      |  156 +-
 .../1644395759931-instance-theme-color.js     |   18 +-
 .../migration/1644481657998-chart-v15.js      |   92 +-
 .../1644551208096-following-indexes.js        |   28 +-
 ...45340161439-remove-max-note-text-length.js |   20 +-
 .../1645599900873-federation-chart-pubsub.js  |   28 +-
 .../1646143552768-instance-default-theme.js   |   26 +-
 .../1646387162108-mute-expires-at.js          |   24 +-
 .../1646549089451-poll-ended-notification.js  |   39 +-
 .../1646633030285-chart-federation-active.js  |   26 +-
 ...655454495-remove-instance-drive-columns.js |   22 +-
 ...2390560-chart-federation-active-sub-pub.js |   58 +-
 .../migration/1648548247382-webhook.js        |   42 +-
 .../migration/1648816172177-webhook-2.js      |   21 +-
 .../migration/1651224615271-foreign-key.js    |  242 +-
 .../1652859567549-uniform-themecolor.js       |   43 +-
 .../migration/1655368940105-nsfw-detection.js |   66 +-
 .../1655371960534-nsfw-detection-2.js         |   34 +-
 .../1655388169582-nsfw-detection-3.js         |   58 +-
 .../1655393015659-nsfw-detection-4.js         |   74 +-
 .../1655813815729-driveCapacityOverrideMb.js  |   26 +-
 .../migration/1655918165614-user-ip.js        |   40 +-
 .../migration/1656122560740-file-ip.js        |   24 +-
 .../1656251734807-nsfw-detection-5.js         |  104 +-
 .../backend/migration/1656328812281-ip-2.js   |   24 +-
 .../1656408772602-nsfw-detection-6.js         |   18 +-
 .../1656772790599-user-moderation-note.js     |   18 +-
 .../1657346559800-active-email-validation.js  |   18 +-
 .../backend/migration/1658203170545calckey.js |   34 +-
 .../1658656633972-note-replies-function.js    |    2 +-
 .../migration/1658939464003CustomMOTD.js      |   14 +-
 .../1658941974648CustomSplashIcons.js         |   16 +-
 .../migration/1658981842728FixCalckey.js      |   28 +-
 .../1659042130648RecommendedTimeline.js       |   26 +-
 .../migration/1660068273737GuestTimeline.js   |   18 +-
 .../migration/1668828368510PageDraft.js       |    6 +-
 .../migration/1668831378728FixCalckeyAgain.js |   10 +-
 ...6634-whetherPushNotifyToSendReadMessage.js |   18 +-
 .../1669288094000-AddMovedToAndKnownAs.js     |   21 +-
 ...ddFkAbuseUserReportTargetUserIdToUserId.js |   14 +-
 .../1671388343000-CalckeyRepoMove.js          |   18 +-
 .../1672882664294-DefaultReaction.js          |   10 +-
 .../1673336077243-PollChoiceLength.js         |   10 +-
 .../1676093997212-AntennaInstances.js         |   36 +-
 .../migration/1677935903517-DriveComment.js   |   18 +-
 ...678945242650-add-props-for-custom-emoji.js |   16 +-
 .../migration/1679269929000-fix-repo.js       |   18 +-
 .../migration/1680375641101-clean-charts.js   |   38 +-
 .../migration/1680426269172-SpeakAsCat.js     |   16 +-
 .../native-utils/__test__/index.spec.mjs      |   10 +-
 packages/backend/ormconfig.js                 |   10 +-
 packages/backend/src/server/api/endpoints.ts  |    8 +-
 .../server/api/endpoints/admin/update-meta.ts |    6 +-
 .../api/endpoints/notes/global-timeline.ts    |    4 +-
 .../api/endpoints/notes/hybrid-timeline.ts    |    2 +-
 .../api/endpoints/notes/local-timeline.ts     |    2 +-
 .../server/api/endpoints/notes/mentions.ts    |    3 +-
 .../endpoints/notes/recommended-timeline.ts   |    2 +-
 .../src/server/api/endpoints/notes/renotes.ts |    2 +-
 .../src/server/api/endpoints/notes/replies.ts |    2 +-
 .../api/endpoints/notes/search-by-tag.ts      |    2 +-
 .../server/api/endpoints/notes/timeline.ts    |    2 +-
 .../api/endpoints/notes/user-list-timeline.ts |    2 +-
 .../src/server/api/endpoints/sw/register.ts   |   17 +-
 .../api/endpoints/sw/show-registration.ts     |   32 +-
 .../api/endpoints/sw/update-registration.ts   |    2 +-
 packages/backend/src/server/api/index.ts      |    5 +-
 .../backend/src/services/push-notification.ts |   16 +-
 packages/backend/test/activitypub.ts          |   70 +-
 packages/backend/test/ap-request.ts           |   62 +-
 packages/backend/test/api-visibility.ts       |  361 ++-
 packages/backend/test/api.ts                  |   67 +-
 packages/backend/test/block.ts                |  108 +-
 packages/backend/test/chart.ts                |  226 +-
 packages/backend/test/extract-mentions.ts     |   76 +-
 packages/backend/test/fetch-resource.ts       |  132 +-
 packages/backend/test/ff-visibility.ts        |  382 ++-
 packages/backend/test/get-file-info.ts        |  116 +-
 packages/backend/test/loader.js               |   13 +-
 packages/backend/test/mfm.ts                  |  130 +-
 packages/backend/test/misc/mock-resolver.ts   |   18 +-
 packages/backend/test/mute.ts                 |  147 +-
 packages/backend/test/note.ts                 |  497 ++--
 packages/backend/test/prelude/maybe.ts        |   14 +-
 packages/backend/test/prelude/url.ts          |   14 +-
 packages/backend/test/streaming.ts            |  843 +++---
 packages/backend/test/thread-mute.ts          |  166 +-
 packages/backend/test/user-notes.ts           |   85 +-
 packages/backend/test/utils.ts                |  335 ++-
 packages/client/@types/theme.d.ts             |    2 +-
 packages/client/@types/vue.d.ts               |    4 +-
 packages/client/assets/tagcanvas.min.js       | 2536 ++++++++++++++++-
 packages/client/vite.config.ts                |   80 +-
 packages/client/vite.json5.ts                 |   24 +-
 packages/sw/webpack.config.js                 |   88 +-
 223 files changed, 16494 insertions(+), 6786 deletions(-)

diff --git a/packages/backend/check_connect.js b/packages/backend/check_connect.js
index 8bf134a10..7c1e716b3 100644
--- a/packages/backend/check_connect.js
+++ b/packages/backend/check_connect.js
@@ -1,10 +1,10 @@
-import {loadConfig} from './built/config.js';
-import {createRedisConnection} from "./built/redis.js";
+import { loadConfig } from "./built/config.js";
+import { createRedisConnection } from "./built/redis.js";
 
 const config = loadConfig();
 const redis = createRedisConnection(config);
 
-redis.on('connect', () => redis.disconnect());
-redis.on('error', (e) => {
-    throw e;
+redis.on("connect", () => redis.disconnect());
+redis.on("error", (e) => {
+	throw e;
 });
diff --git a/packages/backend/migration/1000000000000-Init.js b/packages/backend/migration/1000000000000-Init.js
index 1140be7e8..c07500e35 100644
--- a/packages/backend/migration/1000000000000-Init.js
+++ b/packages/backend/migration/1000000000000-Init.js
@@ -1,482 +1,1068 @@
-
-
 export class Init1000000000000 {
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "log_level_enum" AS ENUM('error', 'warning', 'info', 'success', 'debug')`);
-        await queryRunner.query(`CREATE TABLE "log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "domain" character varying(64) array NOT NULL DEFAULT '{}'::varchar[], "level" "log_level_enum" NOT NULL, "worker" character varying(8) NOT NULL, "machine" character varying(128) NOT NULL, "message" character varying(1024) NOT NULL, "data" jsonb NOT NULL DEFAULT '{}', CONSTRAINT "PK_350604cbdf991d5930d9e618fbd" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_8e4eb51a35d81b64dda28eed0a" ON "log" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_8cb40cfc8f3c28261e6f887b03" ON "log" ("domain") `);
-        await queryRunner.query(`CREATE INDEX "IDX_584b536b49e53ac81beb39a177" ON "log" ("level") `);
-        await queryRunner.query(`CREATE TABLE "drive_folder" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(128) NOT NULL, "userId" character varying(32), "parentId" character varying(32), CONSTRAINT "PK_7a0c089191f5ebdc214e0af808a" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_02878d441ceae15ce060b73daf" ON "drive_folder" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f4fc06e49c0171c85f1c48060d" ON "drive_folder" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_00ceffb0cdc238b3233294f08f" ON "drive_folder" ("parentId") `);
-        await queryRunner.query(`CREATE TABLE "drive_file" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32), "userHost" character varying(128), "md5" character varying(32) NOT NULL, "name" character varying(256) NOT NULL, "type" character varying(128) NOT NULL, "size" integer NOT NULL, "comment" character varying(512), "properties" jsonb NOT NULL DEFAULT '{}', "storedInternal" boolean NOT NULL, "url" character varying(512) NOT NULL, "thumbnailUrl" character varying(512), "webpublicUrl" character varying(512), "accessKey" character varying(256), "thumbnailAccessKey" character varying(256), "webpublicAccessKey" character varying(256), "uri" character varying(512), "src" character varying(512), "folderId" character varying(32), "isSensitive" boolean NOT NULL DEFAULT false, "isLink" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_43ddaaaf18c9e68029b7cbb032e" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_c8dfad3b72196dd1d6b5db168a" ON "drive_file" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_860fa6f6c7df5bb887249fba22" ON "drive_file" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_92779627994ac79277f070c91e" ON "drive_file" ("userHost") `);
-        await queryRunner.query(`CREATE INDEX "IDX_37bb9a1b4585f8a3beb24c62d6" ON "drive_file" ("md5") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a40b8df8c989d7db937ea27cf6" ON "drive_file" ("type") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d85a184c2540d2deba33daf642" ON "drive_file" ("accessKey") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e74022ce9a074b3866f70e0d27" ON "drive_file" ("thumbnailAccessKey") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_c55b2b7c284d9fef98026fc88e" ON "drive_file" ("webpublicAccessKey") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e5848eac4940934e23dbc17581" ON "drive_file" ("uri") `);
-        await queryRunner.query(`CREATE INDEX "IDX_bb90d1956dafc4068c28aa7560" ON "drive_file" ("folderId") `);
-        await queryRunner.query(`CREATE TABLE "user" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE, "lastFetchedAt" TIMESTAMP WITH TIME ZONE, "username" character varying(128) NOT NULL, "usernameLower" character varying(128) NOT NULL, "name" character varying(128), "followersCount" integer NOT NULL DEFAULT 0, "followingCount" integer NOT NULL DEFAULT 0, "notesCount" integer NOT NULL DEFAULT 0, "avatarId" character varying(32), "bannerId" character varying(32), "tags" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "avatarUrl" character varying(512), "bannerUrl" character varying(512), "avatarColor" character varying(32), "bannerColor" character varying(32), "isSuspended" boolean NOT NULL DEFAULT false, "isSilenced" boolean NOT NULL DEFAULT false, "isLocked" boolean NOT NULL DEFAULT false, "isBot" boolean NOT NULL DEFAULT false, "isCat" boolean NOT NULL DEFAULT false, "isAdmin" boolean NOT NULL DEFAULT false, "isModerator" boolean NOT NULL DEFAULT false, "isVerified" boolean NOT NULL DEFAULT false, "emojis" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "host" character varying(128), "inbox" character varying(512), "sharedInbox" character varying(512), "featured" character varying(512), "uri" character varying(512), "token" character(16), CONSTRAINT "UQ_a854e557b1b14814750c7c7b0c9" UNIQUE ("token"), CONSTRAINT "REL_58f5c71eaab331645112cf8cfa" UNIQUE ("avatarId"), CONSTRAINT "REL_afc64b53f8db3707ceb34eb28e" UNIQUE ("bannerId"), CONSTRAINT "PK_cace4a159ff9f2512dd42373760" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_e11e649824a45d8ed01d597fd9" ON "user" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_80ca6e6ef65fb9ef34ea8c90f4" ON "user" ("updatedAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a27b942a0d6dcff90e3ee9b5e8" ON "user" ("usernameLower") `);
-        await queryRunner.query(`CREATE INDEX "IDX_fa99d777623947a5b05f394cae" ON "user" ("tags") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3252a5df8d5bbd16b281f7799e" ON "user" ("host") `);
-        await queryRunner.query(`CREATE INDEX "IDX_be623adaa4c566baf5d29ce0c8" ON "user" ("uri") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a854e557b1b14814750c7c7b0c" ON "user" ("token") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5deb01ae162d1d70b80d064c27" ON "user" ("usernameLower", "host") `);
-        await queryRunner.query(`CREATE TABLE "app" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32), "secret" character varying(64) NOT NULL, "name" character varying(128) NOT NULL, "description" character varying(512) NOT NULL, "permission" character varying(64) array NOT NULL, "callbackUrl" character varying(512), CONSTRAINT "PK_9478629fc093d229df09e560aea" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_048a757923ed8b157e9895da53" ON "app" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3f5b0899ef90527a3462d7c2cb" ON "app" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f49922d511d666848f250663c4" ON "app" ("secret") `);
-        await queryRunner.query(`CREATE TABLE "access_token" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "token" character varying(128) NOT NULL, "hash" character varying(128) NOT NULL, "userId" character varying(32) NOT NULL, "appId" character varying(32) NOT NULL, CONSTRAINT "PK_f20f028607b2603deabd8182d12" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_70ba8f6af34bc924fc9e12adb8" ON "access_token" ("token") `);
-        await queryRunner.query(`CREATE INDEX "IDX_64c327441248bae40f7d92f34f" ON "access_token" ("hash") `);
-        await queryRunner.query(`CREATE INDEX "IDX_9949557d0e1b2c19e5344c171e" ON "access_token" ("userId") `);
-        await queryRunner.query(`CREATE TYPE "note_visibility_enum" AS ENUM('public', 'home', 'followers', 'specified')`);
-        await queryRunner.query(`CREATE TABLE "note" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "replyId" character varying(32), "renoteId" character varying(32), "text" text, "name" character varying(256), "cw" character varying(512), "appId" character varying(32), "userId" character varying(32) NOT NULL, "viaMobile" boolean NOT NULL DEFAULT false, "localOnly" boolean NOT NULL DEFAULT false, "renoteCount" smallint NOT NULL DEFAULT 0, "repliesCount" smallint NOT NULL DEFAULT 0, "reactions" jsonb NOT NULL DEFAULT '{}', "visibility" "note_visibility_enum" NOT NULL, "uri" character varying(512), "score" integer NOT NULL DEFAULT 0, "fileIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "attachedFileTypes" character varying(256) array NOT NULL DEFAULT '{}'::varchar[], "visibleUserIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "mentions" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "mentionedRemoteUsers" text NOT NULL DEFAULT '[]', "emojis" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "tags" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "hasPoll" boolean NOT NULL DEFAULT false, "geo" jsonb DEFAULT null, "userHost" character varying(128), "replyUserId" character varying(32), "replyUserHost" character varying(128), "renoteUserId" character varying(32), "renoteUserHost" character varying(128), CONSTRAINT "PK_96d0c172a4fba276b1bbed43058" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_e7c0567f5261063592f022e9b5" ON "note" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_17cb3553c700a4985dff5a30ff" ON "note" ("replyId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_52ccc804d7c69037d558bac4c9" ON "note" ("renoteId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5b87d9d19127bd5d92026017a7" ON "note" ("userId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_153536c67d05e9adb24e99fc2b" ON "note" ("uri") `);
-        await queryRunner.query(`CREATE INDEX "IDX_51c063b6a133a9cb87145450f5" ON "note" ("fileIds") `);
-        await queryRunner.query(`CREATE INDEX "IDX_25dfc71b0369b003a4cd434d0b" ON "note" ("attachedFileTypes") `);
-        await queryRunner.query(`CREATE INDEX "IDX_796a8c03959361f97dc2be1d5c" ON "note" ("visibleUserIds") `);
-        await queryRunner.query(`CREATE INDEX "IDX_54ebcb6d27222913b908d56fd8" ON "note" ("mentions") `);
-        await queryRunner.query(`CREATE INDEX "IDX_88937d94d7443d9a99a76fa5c0" ON "note" ("tags") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7125a826ab192eb27e11d358a5" ON "note" ("userHost") `);
-        await queryRunner.query(`CREATE TABLE "poll_vote" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "choice" integer NOT NULL, CONSTRAINT "PK_fd002d371201c472490ba89c6a0" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_0fb627e1c2f753262a74f0562d" ON "poll_vote" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_66d2bd2ee31d14bcc23069a89f" ON "poll_vote" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_aecfbd5ef60374918e63ee95fa" ON "poll_vote" ("noteId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_50bd7164c5b78f1f4a42c4d21f" ON "poll_vote" ("userId", "noteId", "choice") `);
-        await queryRunner.query(`CREATE TABLE "note_reaction" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "reaction" character varying(128) NOT NULL, CONSTRAINT "PK_767ec729b108799b587a3fcc9cf" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_01f4581f114e0ebd2bbb876f0b" ON "note_reaction" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_13761f64257f40c5636d0ff95e" ON "note_reaction" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_45145e4953780f3cd5656f0ea6" ON "note_reaction" ("noteId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_ad0c221b25672daf2df320a817" ON "note_reaction" ("userId", "noteId") `);
-        await queryRunner.query(`CREATE TABLE "note_watching" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "noteUserId" character varying(32) NOT NULL, CONSTRAINT "PK_49286fdb23725945a74aa27d757" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_318cdf42a9cfc11f479bd802bb" ON "note_watching" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b0134ec406e8d09a540f818288" ON "note_watching" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_03e7028ab8388a3f5e3ce2a861" ON "note_watching" ("noteId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_44499765eec6b5489d72c4253b" ON "note_watching" ("noteUserId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a42c93c69989ce1d09959df4cf" ON "note_watching" ("userId", "noteId") `);
-        await queryRunner.query(`CREATE TABLE "note_unread" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "noteUserId" character varying(32) NOT NULL, "isSpecified" boolean NOT NULL, CONSTRAINT "PK_1904eda61a784f57e6e51fa9c1f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_56b0166d34ddae49d8ef7610bb" ON "note_unread" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e637cba4dc4410218c4251260e" ON "note_unread" ("noteId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d908433a4953cc13216cd9c274" ON "note_unread" ("userId", "noteId") `);
-        await queryRunner.query(`CREATE TABLE "notification" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "notifieeId" character varying(32) NOT NULL, "notifierId" character varying(32) NOT NULL, "type" character varying(32) NOT NULL, "isRead" boolean NOT NULL DEFAULT false, "noteId" character varying(32), "reaction" character varying(128), "choice" integer, CONSTRAINT "PK_705b6c7cdf9b2c2ff7ac7872cb7" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b11a5e627c41d4dc3170f1d370" ON "notification" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3c601b70a1066d2c8b517094cb" ON "notification" ("notifieeId") `);
-        await queryRunner.query(`CREATE TABLE "meta" ("id" character varying(32) NOT NULL, "name" character varying(128), "description" character varying(1024), "maintainerName" character varying(128), "maintainerEmail" character varying(128), "announcements" jsonb NOT NULL DEFAULT '[]', "disableRegistration" boolean NOT NULL DEFAULT false, "disableLocalTimeline" boolean NOT NULL DEFAULT false, "disableGlobalTimeline" boolean NOT NULL DEFAULT false, "enableEmojiReaction" boolean NOT NULL DEFAULT true, "useStarForReactionFallback" boolean NOT NULL DEFAULT false, "langs" character varying(64) array NOT NULL DEFAULT '{}'::varchar[], "hiddenTags" character varying(256) array NOT NULL DEFAULT '{}'::varchar[], "blockedHosts" character varying(256) array NOT NULL DEFAULT '{}'::varchar[], "mascotImageUrl" character varying(512) DEFAULT '/assets/ai.png', "bannerUrl" character varying(512), "errorImageUrl" character varying(512) DEFAULT 'https://xn--931a.moe/aiart/yubitun.png', "iconUrl" character varying(512), "cacheRemoteFiles" boolean NOT NULL DEFAULT true, "proxyAccount" character varying(128), "enableRecaptcha" boolean NOT NULL DEFAULT false, "recaptchaSiteKey" character varying(64), "recaptchaSecretKey" character varying(64), "localDriveCapacityMb" integer NOT NULL DEFAULT 1024, "remoteDriveCapacityMb" integer NOT NULL DEFAULT 32, "maxNoteTextLength" integer NOT NULL DEFAULT 500, "summalyProxy" character varying(128), "enableEmail" boolean NOT NULL DEFAULT false, "email" character varying(128), "smtpSecure" boolean NOT NULL DEFAULT false, "smtpHost" character varying(128), "smtpPort" integer, "smtpUser" character varying(128), "smtpPass" character varying(128), "enableServiceWorker" boolean NOT NULL DEFAULT false, "swPublicKey" character varying(128), "swPrivateKey" character varying(128), "enableTwitterIntegration" boolean NOT NULL DEFAULT false, "twitterConsumerKey" character varying(128), "twitterConsumerSecret" character varying(128), "enableGithubIntegration" boolean NOT NULL DEFAULT false, "githubClientId" character varying(128), "githubClientSecret" character varying(128), "enableDiscordIntegration" boolean NOT NULL DEFAULT false, "discordClientId" character varying(128), "discordClientSecret" character varying(128), CONSTRAINT "PK_c4c17a6c2bd7651338b60fc590b" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TABLE "following" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "followeeId" character varying(32) NOT NULL, "followerId" character varying(32) NOT NULL, "followerHost" character varying(128), "followerInbox" character varying(512), "followerSharedInbox" character varying(512), "followeeHost" character varying(128), "followeeInbox" character varying(512), "followeeSharedInbox" character varying(512), CONSTRAINT "PK_c76c6e044bdf76ecf8bfb82a645" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_582f8fab771a9040a12961f3e7" ON "following" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_24e0042143a18157b234df186c" ON "following" ("followeeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6516c5a6f3c015b4eed39978be" ON "following" ("followerId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_307be5f1d1252e0388662acb96" ON "following" ("followerId", "followeeId") `);
-        await queryRunner.query(`CREATE TABLE "instance" ("id" character varying(32) NOT NULL, "caughtAt" TIMESTAMP WITH TIME ZONE NOT NULL, "host" character varying(128) NOT NULL, "system" character varying(64), "usersCount" integer NOT NULL DEFAULT 0, "notesCount" integer NOT NULL DEFAULT 0, "followingCount" integer NOT NULL DEFAULT 0, "followersCount" integer NOT NULL DEFAULT 0, "driveUsage" integer NOT NULL DEFAULT 0, "driveFiles" integer NOT NULL DEFAULT 0, "latestRequestSentAt" TIMESTAMP WITH TIME ZONE, "latestStatus" integer, "latestRequestReceivedAt" TIMESTAMP WITH TIME ZONE, "lastCommunicatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "isNotResponding" boolean NOT NULL DEFAULT false, "isMarkedAsClosed" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_eaf60e4a0c399c9935413e06474" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_2cd3b2a6b4cf0b910b260afe08" ON "instance" ("caughtAt") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_8d5afc98982185799b160e10eb" ON "instance" ("host") `);
-        await queryRunner.query(`CREATE TABLE "muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "muteeId" character varying(32) NOT NULL, "muterId" character varying(32) NOT NULL, CONSTRAINT "PK_2e92d06c8b5c602eeb27ca9ba48" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_f86d57fbca33c7a4e6897490cc" ON "muting" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_ec96b4fed9dae517e0dbbe0675" ON "muting" ("muteeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_93060675b4a79a577f31d260c6" ON "muting" ("muterId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_1eb9d9824a630321a29fd3b290" ON "muting" ("muterId", "muteeId") `);
-        await queryRunner.query(`CREATE TABLE "sw_subscription" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "endpoint" character varying(512) NOT NULL, "auth" character varying(256) NOT NULL, "publickey" character varying(128) NOT NULL, CONSTRAINT "PK_e8f763631530051b95eb6279b91" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_97754ca6f2baff9b4abb7f853d" ON "sw_subscription" ("userId") `);
-        await queryRunner.query(`CREATE TABLE "blocking" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "blockeeId" character varying(32) NOT NULL, "blockerId" character varying(32) NOT NULL, CONSTRAINT "PK_e5d9a541cc1965ee7e048ea09dd" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b9a354f7941c1e779f3b33aea6" ON "blocking" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2cd4a2743a99671308f5417759" ON "blocking" ("blockeeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0627125f1a8a42c9a1929edb55" ON "blocking" ("blockerId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_98a1bc5cb30dfd159de056549f" ON "blocking" ("blockerId", "blockeeId") `);
-        await queryRunner.query(`CREATE TABLE "user_list" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, CONSTRAINT "PK_87bab75775fd9b1ff822b656402" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b7fcefbdd1c18dce86687531f9" ON "user_list" ("userId") `);
-        await queryRunner.query(`CREATE TABLE "user_list_joining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userListId" character varying(32) NOT NULL, CONSTRAINT "PK_11abb3768da1c5f8de101c9df45" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_d844bfc6f3f523a05189076efa" ON "user_list_joining" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_605472305f26818cc93d1baaa7" ON "user_list_joining" ("userListId") `);
-        await queryRunner.query(`CREATE TABLE "hashtag" ("id" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "mentionedUserIds" character varying(32) array NOT NULL, "mentionedUsersCount" integer NOT NULL DEFAULT 0, "mentionedLocalUserIds" character varying(32) array NOT NULL, "mentionedLocalUsersCount" integer NOT NULL DEFAULT 0, "mentionedRemoteUserIds" character varying(32) array NOT NULL, "mentionedRemoteUsersCount" integer NOT NULL DEFAULT 0, "attachedUserIds" character varying(32) array NOT NULL, "attachedUsersCount" integer NOT NULL DEFAULT 0, "attachedLocalUserIds" character varying(32) array NOT NULL, "attachedLocalUsersCount" integer NOT NULL DEFAULT 0, "attachedRemoteUserIds" character varying(32) array NOT NULL, "attachedRemoteUsersCount" integer NOT NULL DEFAULT 0, CONSTRAINT "PK_cb36eb8af8412bfa978f1165d78" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_347fec870eafea7b26c8a73bac" ON "hashtag" ("name") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2710a55f826ee236ea1a62698f" ON "hashtag" ("mentionedUsersCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0e206cec573f1edff4a3062923" ON "hashtag" ("mentionedLocalUsersCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_4c02d38a976c3ae132228c6fce" ON "hashtag" ("mentionedRemoteUsersCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d57f9030cd3af7f63ffb1c267c" ON "hashtag" ("attachedUsersCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0c44bf4f680964145f2a68a341" ON "hashtag" ("attachedLocalUsersCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0b03cbcd7e6a7ce068efa8ecc2" ON "hashtag" ("attachedRemoteUsersCount") `);
-        await queryRunner.query(`CREATE TABLE "note_favorite" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, CONSTRAINT "PK_af0da35a60b9fa4463a62082b36" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_47f4b1892f5d6ba8efb3057d81" ON "note_favorite" ("userId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0f4fb9ad355f3effff221ef245" ON "note_favorite" ("userId", "noteId") `);
-        await queryRunner.query(`CREATE TABLE "abuse_user_report" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "reporterId" character varying(32) NOT NULL, "comment" character varying(512) NOT NULL, CONSTRAINT "PK_87873f5f5cc5c321a1306b2d18c" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_db2098070b2b5a523c58181f74" ON "abuse_user_report" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d049123c413e68ca52abe73420" ON "abuse_user_report" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_04cc96756f89d0b7f9473e8cdf" ON "abuse_user_report" ("reporterId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5cd442c3b2e74fdd99dae20243" ON "abuse_user_report" ("userId", "reporterId") `);
-        await queryRunner.query(`CREATE TABLE "registration_ticket" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "code" character varying(64) NOT NULL, CONSTRAINT "PK_f11696b6fafcf3662d4292734f8" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0ff69e8dfa9fe31bb4a4660f59" ON "registration_ticket" ("code") `);
-        await queryRunner.query(`CREATE TABLE "messaging_message" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "recipientId" character varying(32) NOT NULL, "text" character varying(4096), "isRead" boolean NOT NULL DEFAULT false, "fileId" character varying(32), CONSTRAINT "PK_db398fd79dc95d0eb8c30456eaa" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_e21cd3646e52ef9c94aaf17c2e" ON "messaging_message" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5377c307783fce2b6d352e1203" ON "messaging_message" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_cac14a4e3944454a5ce7daa514" ON "messaging_message" ("recipientId") `);
-        await queryRunner.query(`CREATE TABLE "signin" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "ip" character varying(128) NOT NULL, "headers" jsonb NOT NULL, "success" boolean NOT NULL, CONSTRAINT "PK_9e96ddc025712616fc492b3b588" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_2c308dbdc50d94dc625670055f" ON "signin" ("userId") `);
-        await queryRunner.query(`CREATE TABLE "auth_session" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "token" character varying(128) NOT NULL, "userId" character varying(32), "appId" character varying(32) NOT NULL, CONSTRAINT "PK_19354ed146424a728c1112a8cbf" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_62cb09e1129f6ec024ef66e183" ON "auth_session" ("token") `);
-        await queryRunner.query(`CREATE TABLE "follow_request" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "followeeId" character varying(32) NOT NULL, "followerId" character varying(32) NOT NULL, "requestId" character varying(128), "followerHost" character varying(128), "followerInbox" character varying(512), "followerSharedInbox" character varying(512), "followeeHost" character varying(128), "followeeInbox" character varying(512), "followeeSharedInbox" character varying(512), CONSTRAINT "PK_53a9aa3725f7a3deb150b39dbfc" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_12c01c0d1a79f77d9f6c15fadd" ON "follow_request" ("followeeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a7fd92dd6dc519e6fb435dd108" ON "follow_request" ("followerId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d54a512b822fac7ed52800f6b4" ON "follow_request" ("followerId", "followeeId") `);
-        await queryRunner.query(`CREATE TABLE "emoji" ("id" character varying(32) NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE, "name" character varying(128) NOT NULL, "host" character varying(128), "url" character varying(512) NOT NULL, "uri" character varying(512), "type" character varying(64), "aliases" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], CONSTRAINT "PK_df74ce05e24999ee01ea0bc50a3" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b37dafc86e9af007e3295c2781" ON "emoji" ("name") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5900e907bb46516ddf2871327c" ON "emoji" ("host") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_4f4d35e1256c84ae3d1f0eab10" ON "emoji" ("name", "host") `);
-        await queryRunner.query(`CREATE TABLE "reversi_game" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "startedAt" TIMESTAMP WITH TIME ZONE, "user1Id" character varying(32) NOT NULL, "user2Id" character varying(32) NOT NULL, "user1Accepted" boolean NOT NULL DEFAULT false, "user2Accepted" boolean NOT NULL DEFAULT false, "black" integer, "isStarted" boolean NOT NULL DEFAULT false, "isEnded" boolean NOT NULL DEFAULT false, "winnerId" character varying(32), "surrendered" character varying(32), "logs" jsonb NOT NULL DEFAULT '[]', "map" character varying(64) array NOT NULL, "bw" character varying(32) NOT NULL, "isLlotheo" boolean NOT NULL DEFAULT false, "canPutEverywhere" boolean NOT NULL DEFAULT false, "loopedBoard" boolean NOT NULL DEFAULT false, "form1" jsonb DEFAULT null, "form2" jsonb DEFAULT null, "crc32" character varying(32), CONSTRAINT "PK_76b30eeba71b1193ad7c5311c3f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b46ec40746efceac604142be1c" ON "reversi_game" ("createdAt") `);
-        await queryRunner.query(`CREATE TABLE "reversi_matching" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "parentId" character varying(32) NOT NULL, "childId" character varying(32) NOT NULL, CONSTRAINT "PK_880bd0afbab232f21c8b9d146cf" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_b604d92d6c7aec38627f6eaf16" ON "reversi_matching" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3b25402709dd9882048c2bbade" ON "reversi_matching" ("parentId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e247b23a3c9b45f89ec1299d06" ON "reversi_matching" ("childId") `);
-        await queryRunner.query(`CREATE TABLE "user_note_pining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, CONSTRAINT "PK_a6a2dad4ae000abce2ea9d9b103" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_bfbc6f79ba4007b4ce5097f08d" ON "user_note_pining" ("userId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_410cd649884b501c02d6e72738" ON "user_note_pining" ("userId", "noteId") `);
-        await queryRunner.query(`CREATE TYPE "poll_notevisibility_enum" AS ENUM('public', 'home', 'followers', 'specified')`);
-        await queryRunner.query(`CREATE TABLE "poll" ("noteId" character varying(32) NOT NULL, "expiresAt" TIMESTAMP WITH TIME ZONE, "multiple" boolean NOT NULL, "choices" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "votes" integer array NOT NULL, "noteVisibility" "poll_notevisibility_enum" NOT NULL, "userId" character varying(32) NOT NULL, "userHost" character varying(128), CONSTRAINT "REL_da851e06d0dfe2ef397d8b1bf1" UNIQUE ("noteId"), CONSTRAINT "PK_da851e06d0dfe2ef397d8b1bf1b" PRIMARY KEY ("noteId"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_0610ebcfcfb4a18441a9bcdab2" ON "poll" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7fa20a12319c7f6dc3aed98c0a" ON "poll" ("userHost") `);
-        await queryRunner.query(`CREATE TABLE "user_keypair" ("userId" character varying(32) NOT NULL, "publicKey" character varying(4096) NOT NULL, "privateKey" character varying(4096) NOT NULL, CONSTRAINT "REL_f4853eb41ab722fe05f81cedeb" UNIQUE ("userId"), CONSTRAINT "PK_f4853eb41ab722fe05f81cedeb6" PRIMARY KEY ("userId"))`);
-        await queryRunner.query(`CREATE TABLE "user_publickey" ("userId" character varying(32) NOT NULL, "keyId" character varying(256) NOT NULL, "keyPem" character varying(4096) NOT NULL, CONSTRAINT "REL_10c146e4b39b443ede016f6736" UNIQUE ("userId"), CONSTRAINT "PK_10c146e4b39b443ede016f6736d" PRIMARY KEY ("userId"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_171e64971c780ebd23fae140bb" ON "user_publickey" ("keyId") `);
-        await queryRunner.query(`CREATE TABLE "user_profile" ("userId" character varying(32) NOT NULL, "location" character varying(128), "birthday" character(10), "description" character varying(1024), "fields" jsonb NOT NULL DEFAULT '[]', "url" character varying(512), "email" character varying(128), "emailVerifyCode" character varying(128), "emailVerified" boolean NOT NULL DEFAULT false, "twoFactorTempSecret" character varying(128), "twoFactorSecret" character varying(128), "twoFactorEnabled" boolean NOT NULL DEFAULT false, "password" character varying(128), "clientData" jsonb NOT NULL DEFAULT '{}', "autoWatch" boolean NOT NULL DEFAULT false, "autoAcceptFollowed" boolean NOT NULL DEFAULT false, "alwaysMarkNsfw" boolean NOT NULL DEFAULT false, "carefulBot" boolean NOT NULL DEFAULT false, "twitter" boolean NOT NULL DEFAULT false, "twitterAccessToken" character varying(64) DEFAULT null, "twitterAccessTokenSecret" character varying(64) DEFAULT null, "twitterUserId" character varying(64) DEFAULT null, "twitterScreenName" character varying(64) DEFAULT null, "github" boolean NOT NULL DEFAULT false, "githubAccessToken" character varying(64) DEFAULT null, "githubId" integer DEFAULT null, "githubLogin" character varying(64) DEFAULT null, "discord" boolean NOT NULL DEFAULT false, "discordAccessToken" character varying(64) DEFAULT null, "discordRefreshToken" character varying(64) DEFAULT null, "discordExpiresDate" integer DEFAULT null, "discordId" character varying(64) DEFAULT null, "discordUsername" character varying(64) DEFAULT null, "discordDiscriminator" character varying(64) DEFAULT null, "userHost" character varying(128), CONSTRAINT "REL_51cb79b5555effaf7d69ba1cff" UNIQUE ("userId"), CONSTRAINT "PK_51cb79b5555effaf7d69ba1cff9" PRIMARY KEY ("userId"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_dce530b98e454793dac5ec2f5a" ON "user_profile" ("userHost") `);
-        await queryRunner.query(`CREATE TYPE "__chart__active_users_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__active_users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__active_users_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "PK_317237a9f733b970604a11e314f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__drive_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__drive_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_totalCount" bigint NOT NULL, "___local_totalSize" bigint NOT NULL, "___local_incCount" bigint NOT NULL, "___local_incSize" bigint NOT NULL, "___local_decCount" bigint NOT NULL, "___local_decSize" bigint NOT NULL, "___remote_totalCount" bigint NOT NULL, "___remote_totalSize" bigint NOT NULL, "___remote_incCount" bigint NOT NULL, "___remote_incSize" bigint NOT NULL, "___remote_decCount" bigint NOT NULL, "___remote_decSize" bigint NOT NULL, CONSTRAINT "PK_f96bc548a765cd4b3b354221ce7" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__federation_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__federation" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__federation_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___instance_total" bigint NOT NULL, "___instance_inc" bigint NOT NULL, "___instance_dec" bigint NOT NULL, CONSTRAINT "PK_b39dcd31a0fe1a7757e348e85fd" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__hashtag_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__hashtag" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__hashtag_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "PK_c32f1ea2b44a5d2f7881e37f8f9" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__instance_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__instance" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__instance_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___requests_failed" bigint NOT NULL, "___requests_succeeded" bigint NOT NULL, "___requests_received" bigint NOT NULL, "___notes_total" bigint NOT NULL, "___notes_inc" bigint NOT NULL, "___notes_dec" bigint NOT NULL, "___notes_diffs_normal" bigint NOT NULL, "___notes_diffs_reply" bigint NOT NULL, "___notes_diffs_renote" bigint NOT NULL, "___users_total" bigint NOT NULL, "___users_inc" bigint NOT NULL, "___users_dec" bigint NOT NULL, "___following_total" bigint NOT NULL, "___following_inc" bigint NOT NULL, "___following_dec" bigint NOT NULL, "___followers_total" bigint NOT NULL, "___followers_inc" bigint NOT NULL, "___followers_dec" bigint NOT NULL, "___drive_totalFiles" bigint NOT NULL, "___drive_totalUsage" bigint NOT NULL, "___drive_incFiles" bigint NOT NULL, "___drive_incUsage" bigint NOT NULL, "___drive_decFiles" bigint NOT NULL, "___drive_decUsage" bigint NOT NULL, CONSTRAINT "PK_1267c67c7c2d47b4903975f2c00" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__network_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__network" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__network_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___incomingRequests" bigint NOT NULL, "___outgoingRequests" bigint NOT NULL, "___totalTime" bigint NOT NULL, "___incomingBytes" bigint NOT NULL, "___outgoingBytes" bigint NOT NULL, CONSTRAINT "PK_bc4290c2e27fad14ef0c1ca93f3" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__notes_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__notes_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___local_diffs_normal" bigint NOT NULL, "___local_diffs_reply" bigint NOT NULL, "___local_diffs_renote" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, "___remote_diffs_normal" bigint NOT NULL, "___remote_diffs_reply" bigint NOT NULL, "___remote_diffs_renote" bigint NOT NULL, CONSTRAINT "PK_0aec823fa85c7f901bdb3863b14" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__per_user_drive_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__per_user_drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_drive_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___totalCount" bigint NOT NULL, "___totalSize" bigint NOT NULL, "___incCount" bigint NOT NULL, "___incSize" bigint NOT NULL, "___decCount" bigint NOT NULL, "___decSize" bigint NOT NULL, CONSTRAINT "PK_d0ef23d24d666e1a44a0cd3d208" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__per_user_following_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__per_user_following" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_following_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_followings_total" bigint NOT NULL, "___local_followings_inc" bigint NOT NULL, "___local_followings_dec" bigint NOT NULL, "___local_followers_total" bigint NOT NULL, "___local_followers_inc" bigint NOT NULL, "___local_followers_dec" bigint NOT NULL, "___remote_followings_total" bigint NOT NULL, "___remote_followings_inc" bigint NOT NULL, "___remote_followings_dec" bigint NOT NULL, "___remote_followers_total" bigint NOT NULL, "___remote_followers_inc" bigint NOT NULL, "___remote_followers_dec" bigint NOT NULL, CONSTRAINT "PK_85bb1b540363a29c2fec83bd907" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__per_user_notes_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__per_user_notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_notes_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___total" bigint NOT NULL, "___inc" bigint NOT NULL, "___dec" bigint NOT NULL, "___diffs_normal" bigint NOT NULL, "___diffs_reply" bigint NOT NULL, "___diffs_renote" bigint NOT NULL, CONSTRAINT "PK_334acf6e915af2f29edc11b8e50" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__per_user_reaction_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__per_user_reaction" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_reaction_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "PK_984f54dae441e65b633e8d27a7f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__test_grouped_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__test_grouped" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__test_grouped_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___foo_total" bigint NOT NULL, "___foo_inc" bigint NOT NULL, "___foo_dec" bigint NOT NULL, CONSTRAINT "PK_f4a2b175d308695af30d4293272" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__test_unique_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__test_unique" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__test_unique_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___foo" bigint NOT NULL, CONSTRAINT "PK_409bac9c97cc612d8500012319d" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__test_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__test" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__test_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___foo_total" bigint NOT NULL, "___foo_inc" bigint NOT NULL, "___foo_dec" bigint NOT NULL, CONSTRAINT "PK_b4bc31dffbd1b785276a3ecfc1e" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TYPE "__chart__users_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`CREATE TABLE "__chart__users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__users_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, CONSTRAINT "PK_4dfcf2c78d03524b9eb2c99d328" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" ADD CONSTRAINT "FK_f4fc06e49c0171c85f1c48060d2" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" ADD CONSTRAINT "FK_00ceffb0cdc238b3233294f08f2" FOREIGN KEY ("parentId") REFERENCES "drive_folder"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD CONSTRAINT "FK_860fa6f6c7df5bb887249fba22e" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD CONSTRAINT "FK_bb90d1956dafc4068c28aa7560a" FOREIGN KEY ("folderId") REFERENCES "drive_folder"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user" ADD CONSTRAINT "FK_58f5c71eaab331645112cf8cfa5" FOREIGN KEY ("avatarId") REFERENCES "drive_file"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user" ADD CONSTRAINT "FK_afc64b53f8db3707ceb34eb28e2" FOREIGN KEY ("bannerId") REFERENCES "drive_file"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "app" ADD CONSTRAINT "FK_3f5b0899ef90527a3462d7c2cb3" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD CONSTRAINT "FK_9949557d0e1b2c19e5344c171e9" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_17cb3553c700a4985dff5a30ff5" FOREIGN KEY ("replyId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_52ccc804d7c69037d558bac4c96" FOREIGN KEY ("renoteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_ec5c201576192ba8904c345c5cc" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_5b87d9d19127bd5d92026017a7b" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" ADD CONSTRAINT "FK_66d2bd2ee31d14bcc23069a89f8" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" ADD CONSTRAINT "FK_aecfbd5ef60374918e63ee95fa7" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" ADD CONSTRAINT "FK_13761f64257f40c5636d0ff95ee" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" ADD CONSTRAINT "FK_45145e4953780f3cd5656f0ea6a" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_watching" ADD CONSTRAINT "FK_b0134ec406e8d09a540f8182888" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_watching" ADD CONSTRAINT "FK_03e7028ab8388a3f5e3ce2a8619" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_unread" ADD CONSTRAINT "FK_56b0166d34ddae49d8ef7610bb9" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_unread" ADD CONSTRAINT "FK_e637cba4dc4410218c4251260e4" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_3c601b70a1066d2c8b517094cb9" FOREIGN KEY ("notifieeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710" FOREIGN KEY ("notifierId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_769cb6b73a1efe22ddf733ac453" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "following" ADD CONSTRAINT "FK_24e0042143a18157b234df186c3" FOREIGN KEY ("followeeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "following" ADD CONSTRAINT "FK_6516c5a6f3c015b4eed39978be5" FOREIGN KEY ("followerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "muting" ADD CONSTRAINT "FK_ec96b4fed9dae517e0dbbe0675c" FOREIGN KEY ("muteeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "muting" ADD CONSTRAINT "FK_93060675b4a79a577f31d260c67" FOREIGN KEY ("muterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "sw_subscription" ADD CONSTRAINT "FK_97754ca6f2baff9b4abb7f853dd" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "blocking" ADD CONSTRAINT "FK_2cd4a2743a99671308f5417759e" FOREIGN KEY ("blockeeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "blocking" ADD CONSTRAINT "FK_0627125f1a8a42c9a1929edb552" FOREIGN KEY ("blockerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_list" ADD CONSTRAINT "FK_b7fcefbdd1c18dce86687531f99" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" ADD CONSTRAINT "FK_d844bfc6f3f523a05189076efaa" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" ADD CONSTRAINT "FK_605472305f26818cc93d1baaa74" FOREIGN KEY ("userListId") REFERENCES "user_list"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" ADD CONSTRAINT "FK_47f4b1892f5d6ba8efb3057d81a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" ADD CONSTRAINT "FK_0e00498f180193423c992bc4370" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_d049123c413e68ca52abe734203" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_04cc96756f89d0b7f9473e8cdf3" FOREIGN KEY ("reporterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_5377c307783fce2b6d352e1203b" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_cac14a4e3944454a5ce7daa5142" FOREIGN KEY ("recipientId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_535def119223ac05ad3fa9ef64b" FOREIGN KEY ("fileId") REFERENCES "drive_file"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "signin" ADD CONSTRAINT "FK_2c308dbdc50d94dc625670055f7" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "auth_session" ADD CONSTRAINT "FK_c072b729d71697f959bde66ade0" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "auth_session" ADD CONSTRAINT "FK_dbe037d4bddd17b03a1dc778dee" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "follow_request" ADD CONSTRAINT "FK_12c01c0d1a79f77d9f6c15fadd2" FOREIGN KEY ("followeeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "follow_request" ADD CONSTRAINT "FK_a7fd92dd6dc519e6fb435dd108f" FOREIGN KEY ("followerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "reversi_game" ADD CONSTRAINT "FK_f7467510c60a45ce5aca6292743" FOREIGN KEY ("user1Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "reversi_game" ADD CONSTRAINT "FK_6649a4e8c5d5cf32fb03b5da9f6" FOREIGN KEY ("user2Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "reversi_matching" ADD CONSTRAINT "FK_3b25402709dd9882048c2bbade0" FOREIGN KEY ("parentId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "reversi_matching" ADD CONSTRAINT "FK_e247b23a3c9b45f89ec1299d066" FOREIGN KEY ("childId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" ADD CONSTRAINT "FK_bfbc6f79ba4007b4ce5097f08d6" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" ADD CONSTRAINT "FK_68881008f7c3588ad7ecae471cf" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "poll" ADD CONSTRAINT "FK_da851e06d0dfe2ef397d8b1bf1b" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_keypair" ADD CONSTRAINT "FK_f4853eb41ab722fe05f81cedeb6" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        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" ADD CONSTRAINT "FK_51cb79b5555effaf7d69ba1cff9" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "FK_51cb79b5555effaf7d69ba1cff9"`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "FK_10c146e4b39b443ede016f6736d"`);
-        await queryRunner.query(`ALTER TABLE "user_keypair" DROP CONSTRAINT "FK_f4853eb41ab722fe05f81cedeb6"`);
-        await queryRunner.query(`ALTER TABLE "poll" DROP CONSTRAINT "FK_da851e06d0dfe2ef397d8b1bf1b"`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" DROP CONSTRAINT "FK_68881008f7c3588ad7ecae471cf"`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" DROP CONSTRAINT "FK_bfbc6f79ba4007b4ce5097f08d6"`);
-        await queryRunner.query(`ALTER TABLE "reversi_matching" DROP CONSTRAINT "FK_e247b23a3c9b45f89ec1299d066"`);
-        await queryRunner.query(`ALTER TABLE "reversi_matching" DROP CONSTRAINT "FK_3b25402709dd9882048c2bbade0"`);
-        await queryRunner.query(`ALTER TABLE "reversi_game" DROP CONSTRAINT "FK_6649a4e8c5d5cf32fb03b5da9f6"`);
-        await queryRunner.query(`ALTER TABLE "reversi_game" DROP CONSTRAINT "FK_f7467510c60a45ce5aca6292743"`);
-        await queryRunner.query(`ALTER TABLE "follow_request" DROP CONSTRAINT "FK_a7fd92dd6dc519e6fb435dd108f"`);
-        await queryRunner.query(`ALTER TABLE "follow_request" DROP CONSTRAINT "FK_12c01c0d1a79f77d9f6c15fadd2"`);
-        await queryRunner.query(`ALTER TABLE "auth_session" DROP CONSTRAINT "FK_dbe037d4bddd17b03a1dc778dee"`);
-        await queryRunner.query(`ALTER TABLE "auth_session" DROP CONSTRAINT "FK_c072b729d71697f959bde66ade0"`);
-        await queryRunner.query(`ALTER TABLE "signin" DROP CONSTRAINT "FK_2c308dbdc50d94dc625670055f7"`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_535def119223ac05ad3fa9ef64b"`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_cac14a4e3944454a5ce7daa5142"`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_5377c307783fce2b6d352e1203b"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_04cc96756f89d0b7f9473e8cdf3"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_d049123c413e68ca52abe734203"`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" DROP CONSTRAINT "FK_0e00498f180193423c992bc4370"`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" DROP CONSTRAINT "FK_47f4b1892f5d6ba8efb3057d81a"`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" DROP CONSTRAINT "FK_605472305f26818cc93d1baaa74"`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" DROP CONSTRAINT "FK_d844bfc6f3f523a05189076efaa"`);
-        await queryRunner.query(`ALTER TABLE "user_list" DROP CONSTRAINT "FK_b7fcefbdd1c18dce86687531f99"`);
-        await queryRunner.query(`ALTER TABLE "blocking" DROP CONSTRAINT "FK_0627125f1a8a42c9a1929edb552"`);
-        await queryRunner.query(`ALTER TABLE "blocking" DROP CONSTRAINT "FK_2cd4a2743a99671308f5417759e"`);
-        await queryRunner.query(`ALTER TABLE "sw_subscription" DROP CONSTRAINT "FK_97754ca6f2baff9b4abb7f853dd"`);
-        await queryRunner.query(`ALTER TABLE "muting" DROP CONSTRAINT "FK_93060675b4a79a577f31d260c67"`);
-        await queryRunner.query(`ALTER TABLE "muting" DROP CONSTRAINT "FK_ec96b4fed9dae517e0dbbe0675c"`);
-        await queryRunner.query(`ALTER TABLE "following" DROP CONSTRAINT "FK_6516c5a6f3c015b4eed39978be5"`);
-        await queryRunner.query(`ALTER TABLE "following" DROP CONSTRAINT "FK_24e0042143a18157b234df186c3"`);
-        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_769cb6b73a1efe22ddf733ac453"`);
-        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710"`);
-        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_3c601b70a1066d2c8b517094cb9"`);
-        await queryRunner.query(`ALTER TABLE "note_unread" DROP CONSTRAINT "FK_e637cba4dc4410218c4251260e4"`);
-        await queryRunner.query(`ALTER TABLE "note_unread" DROP CONSTRAINT "FK_56b0166d34ddae49d8ef7610bb9"`);
-        await queryRunner.query(`ALTER TABLE "note_watching" DROP CONSTRAINT "FK_03e7028ab8388a3f5e3ce2a8619"`);
-        await queryRunner.query(`ALTER TABLE "note_watching" DROP CONSTRAINT "FK_b0134ec406e8d09a540f8182888"`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" DROP CONSTRAINT "FK_45145e4953780f3cd5656f0ea6a"`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" DROP CONSTRAINT "FK_13761f64257f40c5636d0ff95ee"`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" DROP CONSTRAINT "FK_aecfbd5ef60374918e63ee95fa7"`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" DROP CONSTRAINT "FK_66d2bd2ee31d14bcc23069a89f8"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_5b87d9d19127bd5d92026017a7b"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_ec5c201576192ba8904c345c5cc"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_52ccc804d7c69037d558bac4c96"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_17cb3553c700a4985dff5a30ff5"`);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560"`);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP CONSTRAINT "FK_9949557d0e1b2c19e5344c171e9"`);
-        await queryRunner.query(`ALTER TABLE "app" DROP CONSTRAINT "FK_3f5b0899ef90527a3462d7c2cb3"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP CONSTRAINT "FK_afc64b53f8db3707ceb34eb28e2"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP CONSTRAINT "FK_58f5c71eaab331645112cf8cfa5"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP CONSTRAINT "FK_bb90d1956dafc4068c28aa7560a"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP CONSTRAINT "FK_860fa6f6c7df5bb887249fba22e"`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" DROP CONSTRAINT "FK_00ceffb0cdc238b3233294f08f2"`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" DROP CONSTRAINT "FK_f4fc06e49c0171c85f1c48060d2"`);
-        await queryRunner.query(`DROP TABLE "__chart__users"`);
-        await queryRunner.query(`DROP TYPE "__chart__users_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__test"`);
-        await queryRunner.query(`DROP TYPE "__chart__test_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__test_unique"`);
-        await queryRunner.query(`DROP TYPE "__chart__test_unique_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__test_grouped"`);
-        await queryRunner.query(`DROP TYPE "__chart__test_grouped_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__per_user_reaction"`);
-        await queryRunner.query(`DROP TYPE "__chart__per_user_reaction_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__per_user_notes"`);
-        await queryRunner.query(`DROP TYPE "__chart__per_user_notes_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__per_user_following"`);
-        await queryRunner.query(`DROP TYPE "__chart__per_user_following_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__per_user_drive"`);
-        await queryRunner.query(`DROP TYPE "__chart__per_user_drive_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__notes"`);
-        await queryRunner.query(`DROP TYPE "__chart__notes_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__network"`);
-        await queryRunner.query(`DROP TYPE "__chart__network_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__instance"`);
-        await queryRunner.query(`DROP TYPE "__chart__instance_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__hashtag"`);
-        await queryRunner.query(`DROP TYPE "__chart__hashtag_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__federation"`);
-        await queryRunner.query(`DROP TYPE "__chart__federation_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__drive"`);
-        await queryRunner.query(`DROP TYPE "__chart__drive_span_enum"`);
-        await queryRunner.query(`DROP TABLE "__chart__active_users"`);
-        await queryRunner.query(`DROP TYPE "__chart__active_users_span_enum"`);
-        await queryRunner.query(`DROP INDEX "IDX_dce530b98e454793dac5ec2f5a"`);
-        await queryRunner.query(`DROP TABLE "user_profile"`);
-        await queryRunner.query(`DROP INDEX "IDX_171e64971c780ebd23fae140bb"`);
-        await queryRunner.query(`DROP TABLE "user_publickey"`);
-        await queryRunner.query(`DROP TABLE "user_keypair"`);
-        await queryRunner.query(`DROP INDEX "IDX_7fa20a12319c7f6dc3aed98c0a"`);
-        await queryRunner.query(`DROP INDEX "IDX_0610ebcfcfb4a18441a9bcdab2"`);
-        await queryRunner.query(`DROP TABLE "poll"`);
-        await queryRunner.query(`DROP TYPE "poll_notevisibility_enum"`);
-        await queryRunner.query(`DROP INDEX "IDX_410cd649884b501c02d6e72738"`);
-        await queryRunner.query(`DROP INDEX "IDX_bfbc6f79ba4007b4ce5097f08d"`);
-        await queryRunner.query(`DROP TABLE "user_note_pining"`);
-        await queryRunner.query(`DROP INDEX "IDX_e247b23a3c9b45f89ec1299d06"`);
-        await queryRunner.query(`DROP INDEX "IDX_3b25402709dd9882048c2bbade"`);
-        await queryRunner.query(`DROP INDEX "IDX_b604d92d6c7aec38627f6eaf16"`);
-        await queryRunner.query(`DROP TABLE "reversi_matching"`);
-        await queryRunner.query(`DROP INDEX "IDX_b46ec40746efceac604142be1c"`);
-        await queryRunner.query(`DROP TABLE "reversi_game"`);
-        await queryRunner.query(`DROP INDEX "IDX_4f4d35e1256c84ae3d1f0eab10"`);
-        await queryRunner.query(`DROP INDEX "IDX_5900e907bb46516ddf2871327c"`);
-        await queryRunner.query(`DROP INDEX "IDX_b37dafc86e9af007e3295c2781"`);
-        await queryRunner.query(`DROP TABLE "emoji"`);
-        await queryRunner.query(`DROP INDEX "IDX_d54a512b822fac7ed52800f6b4"`);
-        await queryRunner.query(`DROP INDEX "IDX_a7fd92dd6dc519e6fb435dd108"`);
-        await queryRunner.query(`DROP INDEX "IDX_12c01c0d1a79f77d9f6c15fadd"`);
-        await queryRunner.query(`DROP TABLE "follow_request"`);
-        await queryRunner.query(`DROP INDEX "IDX_62cb09e1129f6ec024ef66e183"`);
-        await queryRunner.query(`DROP TABLE "auth_session"`);
-        await queryRunner.query(`DROP INDEX "IDX_2c308dbdc50d94dc625670055f"`);
-        await queryRunner.query(`DROP TABLE "signin"`);
-        await queryRunner.query(`DROP INDEX "IDX_cac14a4e3944454a5ce7daa514"`);
-        await queryRunner.query(`DROP INDEX "IDX_5377c307783fce2b6d352e1203"`);
-        await queryRunner.query(`DROP INDEX "IDX_e21cd3646e52ef9c94aaf17c2e"`);
-        await queryRunner.query(`DROP TABLE "messaging_message"`);
-        await queryRunner.query(`DROP INDEX "IDX_0ff69e8dfa9fe31bb4a4660f59"`);
-        await queryRunner.query(`DROP TABLE "registration_ticket"`);
-        await queryRunner.query(`DROP INDEX "IDX_5cd442c3b2e74fdd99dae20243"`);
-        await queryRunner.query(`DROP INDEX "IDX_04cc96756f89d0b7f9473e8cdf"`);
-        await queryRunner.query(`DROP INDEX "IDX_d049123c413e68ca52abe73420"`);
-        await queryRunner.query(`DROP INDEX "IDX_db2098070b2b5a523c58181f74"`);
-        await queryRunner.query(`DROP TABLE "abuse_user_report"`);
-        await queryRunner.query(`DROP INDEX "IDX_0f4fb9ad355f3effff221ef245"`);
-        await queryRunner.query(`DROP INDEX "IDX_47f4b1892f5d6ba8efb3057d81"`);
-        await queryRunner.query(`DROP TABLE "note_favorite"`);
-        await queryRunner.query(`DROP INDEX "IDX_0b03cbcd7e6a7ce068efa8ecc2"`);
-        await queryRunner.query(`DROP INDEX "IDX_0c44bf4f680964145f2a68a341"`);
-        await queryRunner.query(`DROP INDEX "IDX_d57f9030cd3af7f63ffb1c267c"`);
-        await queryRunner.query(`DROP INDEX "IDX_4c02d38a976c3ae132228c6fce"`);
-        await queryRunner.query(`DROP INDEX "IDX_0e206cec573f1edff4a3062923"`);
-        await queryRunner.query(`DROP INDEX "IDX_2710a55f826ee236ea1a62698f"`);
-        await queryRunner.query(`DROP INDEX "IDX_347fec870eafea7b26c8a73bac"`);
-        await queryRunner.query(`DROP TABLE "hashtag"`);
-        await queryRunner.query(`DROP INDEX "IDX_605472305f26818cc93d1baaa7"`);
-        await queryRunner.query(`DROP INDEX "IDX_d844bfc6f3f523a05189076efa"`);
-        await queryRunner.query(`DROP TABLE "user_list_joining"`);
-        await queryRunner.query(`DROP INDEX "IDX_b7fcefbdd1c18dce86687531f9"`);
-        await queryRunner.query(`DROP TABLE "user_list"`);
-        await queryRunner.query(`DROP INDEX "IDX_98a1bc5cb30dfd159de056549f"`);
-        await queryRunner.query(`DROP INDEX "IDX_0627125f1a8a42c9a1929edb55"`);
-        await queryRunner.query(`DROP INDEX "IDX_2cd4a2743a99671308f5417759"`);
-        await queryRunner.query(`DROP INDEX "IDX_b9a354f7941c1e779f3b33aea6"`);
-        await queryRunner.query(`DROP TABLE "blocking"`);
-        await queryRunner.query(`DROP INDEX "IDX_97754ca6f2baff9b4abb7f853d"`);
-        await queryRunner.query(`DROP TABLE "sw_subscription"`);
-        await queryRunner.query(`DROP INDEX "IDX_1eb9d9824a630321a29fd3b290"`);
-        await queryRunner.query(`DROP INDEX "IDX_93060675b4a79a577f31d260c6"`);
-        await queryRunner.query(`DROP INDEX "IDX_ec96b4fed9dae517e0dbbe0675"`);
-        await queryRunner.query(`DROP INDEX "IDX_f86d57fbca33c7a4e6897490cc"`);
-        await queryRunner.query(`DROP TABLE "muting"`);
-        await queryRunner.query(`DROP INDEX "IDX_8d5afc98982185799b160e10eb"`);
-        await queryRunner.query(`DROP INDEX "IDX_2cd3b2a6b4cf0b910b260afe08"`);
-        await queryRunner.query(`DROP TABLE "instance"`);
-        await queryRunner.query(`DROP INDEX "IDX_307be5f1d1252e0388662acb96"`);
-        await queryRunner.query(`DROP INDEX "IDX_6516c5a6f3c015b4eed39978be"`);
-        await queryRunner.query(`DROP INDEX "IDX_24e0042143a18157b234df186c"`);
-        await queryRunner.query(`DROP INDEX "IDX_582f8fab771a9040a12961f3e7"`);
-        await queryRunner.query(`DROP TABLE "following"`);
-        await queryRunner.query(`DROP TABLE "meta"`);
-        await queryRunner.query(`DROP INDEX "IDX_3c601b70a1066d2c8b517094cb"`);
-        await queryRunner.query(`DROP INDEX "IDX_b11a5e627c41d4dc3170f1d370"`);
-        await queryRunner.query(`DROP TABLE "notification"`);
-        await queryRunner.query(`DROP INDEX "IDX_d908433a4953cc13216cd9c274"`);
-        await queryRunner.query(`DROP INDEX "IDX_e637cba4dc4410218c4251260e"`);
-        await queryRunner.query(`DROP INDEX "IDX_56b0166d34ddae49d8ef7610bb"`);
-        await queryRunner.query(`DROP TABLE "note_unread"`);
-        await queryRunner.query(`DROP INDEX "IDX_a42c93c69989ce1d09959df4cf"`);
-        await queryRunner.query(`DROP INDEX "IDX_44499765eec6b5489d72c4253b"`);
-        await queryRunner.query(`DROP INDEX "IDX_03e7028ab8388a3f5e3ce2a861"`);
-        await queryRunner.query(`DROP INDEX "IDX_b0134ec406e8d09a540f818288"`);
-        await queryRunner.query(`DROP INDEX "IDX_318cdf42a9cfc11f479bd802bb"`);
-        await queryRunner.query(`DROP TABLE "note_watching"`);
-        await queryRunner.query(`DROP INDEX "IDX_ad0c221b25672daf2df320a817"`);
-        await queryRunner.query(`DROP INDEX "IDX_45145e4953780f3cd5656f0ea6"`);
-        await queryRunner.query(`DROP INDEX "IDX_13761f64257f40c5636d0ff95e"`);
-        await queryRunner.query(`DROP INDEX "IDX_01f4581f114e0ebd2bbb876f0b"`);
-        await queryRunner.query(`DROP TABLE "note_reaction"`);
-        await queryRunner.query(`DROP INDEX "IDX_50bd7164c5b78f1f4a42c4d21f"`);
-        await queryRunner.query(`DROP INDEX "IDX_aecfbd5ef60374918e63ee95fa"`);
-        await queryRunner.query(`DROP INDEX "IDX_66d2bd2ee31d14bcc23069a89f"`);
-        await queryRunner.query(`DROP INDEX "IDX_0fb627e1c2f753262a74f0562d"`);
-        await queryRunner.query(`DROP TABLE "poll_vote"`);
-        await queryRunner.query(`DROP INDEX "IDX_7125a826ab192eb27e11d358a5"`);
-        await queryRunner.query(`DROP INDEX "IDX_88937d94d7443d9a99a76fa5c0"`);
-        await queryRunner.query(`DROP INDEX "IDX_54ebcb6d27222913b908d56fd8"`);
-        await queryRunner.query(`DROP INDEX "IDX_796a8c03959361f97dc2be1d5c"`);
-        await queryRunner.query(`DROP INDEX "IDX_25dfc71b0369b003a4cd434d0b"`);
-        await queryRunner.query(`DROP INDEX "IDX_51c063b6a133a9cb87145450f5"`);
-        await queryRunner.query(`DROP INDEX "IDX_153536c67d05e9adb24e99fc2b"`);
-        await queryRunner.query(`DROP INDEX "IDX_5b87d9d19127bd5d92026017a7"`);
-        await queryRunner.query(`DROP INDEX "IDX_52ccc804d7c69037d558bac4c9"`);
-        await queryRunner.query(`DROP INDEX "IDX_17cb3553c700a4985dff5a30ff"`);
-        await queryRunner.query(`DROP INDEX "IDX_e7c0567f5261063592f022e9b5"`);
-        await queryRunner.query(`DROP TABLE "note"`);
-        await queryRunner.query(`DROP TYPE "note_visibility_enum"`);
-        await queryRunner.query(`DROP INDEX "IDX_9949557d0e1b2c19e5344c171e"`);
-        await queryRunner.query(`DROP INDEX "IDX_64c327441248bae40f7d92f34f"`);
-        await queryRunner.query(`DROP INDEX "IDX_70ba8f6af34bc924fc9e12adb8"`);
-        await queryRunner.query(`DROP TABLE "access_token"`);
-        await queryRunner.query(`DROP INDEX "IDX_f49922d511d666848f250663c4"`);
-        await queryRunner.query(`DROP INDEX "IDX_3f5b0899ef90527a3462d7c2cb"`);
-        await queryRunner.query(`DROP INDEX "IDX_048a757923ed8b157e9895da53"`);
-        await queryRunner.query(`DROP TABLE "app"`);
-        await queryRunner.query(`DROP INDEX "IDX_5deb01ae162d1d70b80d064c27"`);
-        await queryRunner.query(`DROP INDEX "IDX_a854e557b1b14814750c7c7b0c"`);
-        await queryRunner.query(`DROP INDEX "IDX_be623adaa4c566baf5d29ce0c8"`);
-        await queryRunner.query(`DROP INDEX "IDX_3252a5df8d5bbd16b281f7799e"`);
-        await queryRunner.query(`DROP INDEX "IDX_fa99d777623947a5b05f394cae"`);
-        await queryRunner.query(`DROP INDEX "IDX_a27b942a0d6dcff90e3ee9b5e8"`);
-        await queryRunner.query(`DROP INDEX "IDX_80ca6e6ef65fb9ef34ea8c90f4"`);
-        await queryRunner.query(`DROP INDEX "IDX_e11e649824a45d8ed01d597fd9"`);
-        await queryRunner.query(`DROP TABLE "user"`);
-        await queryRunner.query(`DROP INDEX "IDX_bb90d1956dafc4068c28aa7560"`);
-        await queryRunner.query(`DROP INDEX "IDX_e5848eac4940934e23dbc17581"`);
-        await queryRunner.query(`DROP INDEX "IDX_c55b2b7c284d9fef98026fc88e"`);
-        await queryRunner.query(`DROP INDEX "IDX_e74022ce9a074b3866f70e0d27"`);
-        await queryRunner.query(`DROP INDEX "IDX_d85a184c2540d2deba33daf642"`);
-        await queryRunner.query(`DROP INDEX "IDX_a40b8df8c989d7db937ea27cf6"`);
-        await queryRunner.query(`DROP INDEX "IDX_37bb9a1b4585f8a3beb24c62d6"`);
-        await queryRunner.query(`DROP INDEX "IDX_92779627994ac79277f070c91e"`);
-        await queryRunner.query(`DROP INDEX "IDX_860fa6f6c7df5bb887249fba22"`);
-        await queryRunner.query(`DROP INDEX "IDX_c8dfad3b72196dd1d6b5db168a"`);
-        await queryRunner.query(`DROP TABLE "drive_file"`);
-        await queryRunner.query(`DROP INDEX "IDX_00ceffb0cdc238b3233294f08f"`);
-        await queryRunner.query(`DROP INDEX "IDX_f4fc06e49c0171c85f1c48060d"`);
-        await queryRunner.query(`DROP INDEX "IDX_02878d441ceae15ce060b73daf"`);
-        await queryRunner.query(`DROP TABLE "drive_folder"`);
-        await queryRunner.query(`DROP INDEX "IDX_584b536b49e53ac81beb39a177"`);
-        await queryRunner.query(`DROP INDEX "IDX_8cb40cfc8f3c28261e6f887b03"`);
-        await queryRunner.query(`DROP INDEX "IDX_8e4eb51a35d81b64dda28eed0a"`);
-        await queryRunner.query(`DROP TABLE "log"`);
-        await queryRunner.query(`DROP TYPE "log_level_enum"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TYPE "log_level_enum" AS ENUM('error', 'warning', 'info', 'success', 'debug')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "domain" character varying(64) array NOT NULL DEFAULT '{}'::varchar[], "level" "log_level_enum" NOT NULL, "worker" character varying(8) NOT NULL, "machine" character varying(128) NOT NULL, "message" character varying(1024) NOT NULL, "data" jsonb NOT NULL DEFAULT '{}', CONSTRAINT "PK_350604cbdf991d5930d9e618fbd" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8e4eb51a35d81b64dda28eed0a" ON "log" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8cb40cfc8f3c28261e6f887b03" ON "log" ("domain") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_584b536b49e53ac81beb39a177" ON "log" ("level") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "drive_folder" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(128) NOT NULL, "userId" character varying(32), "parentId" character varying(32), CONSTRAINT "PK_7a0c089191f5ebdc214e0af808a" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_02878d441ceae15ce060b73daf" ON "drive_folder" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f4fc06e49c0171c85f1c48060d" ON "drive_folder" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_00ceffb0cdc238b3233294f08f" ON "drive_folder" ("parentId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "drive_file" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32), "userHost" character varying(128), "md5" character varying(32) NOT NULL, "name" character varying(256) NOT NULL, "type" character varying(128) NOT NULL, "size" integer NOT NULL, "comment" character varying(512), "properties" jsonb NOT NULL DEFAULT '{}', "storedInternal" boolean NOT NULL, "url" character varying(512) NOT NULL, "thumbnailUrl" character varying(512), "webpublicUrl" character varying(512), "accessKey" character varying(256), "thumbnailAccessKey" character varying(256), "webpublicAccessKey" character varying(256), "uri" character varying(512), "src" character varying(512), "folderId" character varying(32), "isSensitive" boolean NOT NULL DEFAULT false, "isLink" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_43ddaaaf18c9e68029b7cbb032e" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_c8dfad3b72196dd1d6b5db168a" ON "drive_file" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_860fa6f6c7df5bb887249fba22" ON "drive_file" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_92779627994ac79277f070c91e" ON "drive_file" ("userHost") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_37bb9a1b4585f8a3beb24c62d6" ON "drive_file" ("md5") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a40b8df8c989d7db937ea27cf6" ON "drive_file" ("type") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_d85a184c2540d2deba33daf642" ON "drive_file" ("accessKey") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_e74022ce9a074b3866f70e0d27" ON "drive_file" ("thumbnailAccessKey") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_c55b2b7c284d9fef98026fc88e" ON "drive_file" ("webpublicAccessKey") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e5848eac4940934e23dbc17581" ON "drive_file" ("uri") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_bb90d1956dafc4068c28aa7560" ON "drive_file" ("folderId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "user" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE, "lastFetchedAt" TIMESTAMP WITH TIME ZONE, "username" character varying(128) NOT NULL, "usernameLower" character varying(128) NOT NULL, "name" character varying(128), "followersCount" integer NOT NULL DEFAULT 0, "followingCount" integer NOT NULL DEFAULT 0, "notesCount" integer NOT NULL DEFAULT 0, "avatarId" character varying(32), "bannerId" character varying(32), "tags" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "avatarUrl" character varying(512), "bannerUrl" character varying(512), "avatarColor" character varying(32), "bannerColor" character varying(32), "isSuspended" boolean NOT NULL DEFAULT false, "isSilenced" boolean NOT NULL DEFAULT false, "isLocked" boolean NOT NULL DEFAULT false, "isBot" boolean NOT NULL DEFAULT false, "isCat" boolean NOT NULL DEFAULT false, "isAdmin" boolean NOT NULL DEFAULT false, "isModerator" boolean NOT NULL DEFAULT false, "isVerified" boolean NOT NULL DEFAULT false, "emojis" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "host" character varying(128), "inbox" character varying(512), "sharedInbox" character varying(512), "featured" character varying(512), "uri" character varying(512), "token" character(16), CONSTRAINT "UQ_a854e557b1b14814750c7c7b0c9" UNIQUE ("token"), CONSTRAINT "REL_58f5c71eaab331645112cf8cfa" UNIQUE ("avatarId"), CONSTRAINT "REL_afc64b53f8db3707ceb34eb28e" UNIQUE ("bannerId"), CONSTRAINT "PK_cace4a159ff9f2512dd42373760" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e11e649824a45d8ed01d597fd9" ON "user" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_80ca6e6ef65fb9ef34ea8c90f4" ON "user" ("updatedAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a27b942a0d6dcff90e3ee9b5e8" ON "user" ("usernameLower") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_fa99d777623947a5b05f394cae" ON "user" ("tags") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3252a5df8d5bbd16b281f7799e" ON "user" ("host") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_be623adaa4c566baf5d29ce0c8" ON "user" ("uri") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_a854e557b1b14814750c7c7b0c" ON "user" ("token") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_5deb01ae162d1d70b80d064c27" ON "user" ("usernameLower", "host") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "app" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32), "secret" character varying(64) NOT NULL, "name" character varying(128) NOT NULL, "description" character varying(512) NOT NULL, "permission" character varying(64) array NOT NULL, "callbackUrl" character varying(512), CONSTRAINT "PK_9478629fc093d229df09e560aea" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_048a757923ed8b157e9895da53" ON "app" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3f5b0899ef90527a3462d7c2cb" ON "app" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f49922d511d666848f250663c4" ON "app" ("secret") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "access_token" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "token" character varying(128) NOT NULL, "hash" character varying(128) NOT NULL, "userId" character varying(32) NOT NULL, "appId" character varying(32) NOT NULL, CONSTRAINT "PK_f20f028607b2603deabd8182d12" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_70ba8f6af34bc924fc9e12adb8" ON "access_token" ("token") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_64c327441248bae40f7d92f34f" ON "access_token" ("hash") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_9949557d0e1b2c19e5344c171e" ON "access_token" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "note_visibility_enum" AS ENUM('public', 'home', 'followers', 'specified')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "note" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "replyId" character varying(32), "renoteId" character varying(32), "text" text, "name" character varying(256), "cw" character varying(512), "appId" character varying(32), "userId" character varying(32) NOT NULL, "viaMobile" boolean NOT NULL DEFAULT false, "localOnly" boolean NOT NULL DEFAULT false, "renoteCount" smallint NOT NULL DEFAULT 0, "repliesCount" smallint NOT NULL DEFAULT 0, "reactions" jsonb NOT NULL DEFAULT '{}', "visibility" "note_visibility_enum" NOT NULL, "uri" character varying(512), "score" integer NOT NULL DEFAULT 0, "fileIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "attachedFileTypes" character varying(256) array NOT NULL DEFAULT '{}'::varchar[], "visibleUserIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "mentions" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "mentionedRemoteUsers" text NOT NULL DEFAULT '[]', "emojis" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "tags" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "hasPoll" boolean NOT NULL DEFAULT false, "geo" jsonb DEFAULT null, "userHost" character varying(128), "replyUserId" character varying(32), "replyUserHost" character varying(128), "renoteUserId" character varying(32), "renoteUserHost" character varying(128), CONSTRAINT "PK_96d0c172a4fba276b1bbed43058" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e7c0567f5261063592f022e9b5" ON "note" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_17cb3553c700a4985dff5a30ff" ON "note" ("replyId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_52ccc804d7c69037d558bac4c9" ON "note" ("renoteId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_5b87d9d19127bd5d92026017a7" ON "note" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_153536c67d05e9adb24e99fc2b" ON "note" ("uri") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_51c063b6a133a9cb87145450f5" ON "note" ("fileIds") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_25dfc71b0369b003a4cd434d0b" ON "note" ("attachedFileTypes") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_796a8c03959361f97dc2be1d5c" ON "note" ("visibleUserIds") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_54ebcb6d27222913b908d56fd8" ON "note" ("mentions") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_88937d94d7443d9a99a76fa5c0" ON "note" ("tags") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7125a826ab192eb27e11d358a5" ON "note" ("userHost") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "poll_vote" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "choice" integer NOT NULL, CONSTRAINT "PK_fd002d371201c472490ba89c6a0" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0fb627e1c2f753262a74f0562d" ON "poll_vote" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_66d2bd2ee31d14bcc23069a89f" ON "poll_vote" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_aecfbd5ef60374918e63ee95fa" ON "poll_vote" ("noteId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_50bd7164c5b78f1f4a42c4d21f" ON "poll_vote" ("userId", "noteId", "choice") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "note_reaction" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "reaction" character varying(128) NOT NULL, CONSTRAINT "PK_767ec729b108799b587a3fcc9cf" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_01f4581f114e0ebd2bbb876f0b" ON "note_reaction" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_13761f64257f40c5636d0ff95e" ON "note_reaction" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_45145e4953780f3cd5656f0ea6" ON "note_reaction" ("noteId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_ad0c221b25672daf2df320a817" ON "note_reaction" ("userId", "noteId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "note_watching" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "noteUserId" character varying(32) NOT NULL, CONSTRAINT "PK_49286fdb23725945a74aa27d757" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_318cdf42a9cfc11f479bd802bb" ON "note_watching" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b0134ec406e8d09a540f818288" ON "note_watching" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_03e7028ab8388a3f5e3ce2a861" ON "note_watching" ("noteId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_44499765eec6b5489d72c4253b" ON "note_watching" ("noteUserId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_a42c93c69989ce1d09959df4cf" ON "note_watching" ("userId", "noteId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "note_unread" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "noteUserId" character varying(32) NOT NULL, "isSpecified" boolean NOT NULL, CONSTRAINT "PK_1904eda61a784f57e6e51fa9c1f" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_56b0166d34ddae49d8ef7610bb" ON "note_unread" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e637cba4dc4410218c4251260e" ON "note_unread" ("noteId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_d908433a4953cc13216cd9c274" ON "note_unread" ("userId", "noteId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "notification" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "notifieeId" character varying(32) NOT NULL, "notifierId" character varying(32) NOT NULL, "type" character varying(32) NOT NULL, "isRead" boolean NOT NULL DEFAULT false, "noteId" character varying(32), "reaction" character varying(128), "choice" integer, CONSTRAINT "PK_705b6c7cdf9b2c2ff7ac7872cb7" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b11a5e627c41d4dc3170f1d370" ON "notification" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3c601b70a1066d2c8b517094cb" ON "notification" ("notifieeId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "meta" ("id" character varying(32) NOT NULL, "name" character varying(128), "description" character varying(1024), "maintainerName" character varying(128), "maintainerEmail" character varying(128), "announcements" jsonb NOT NULL DEFAULT '[]', "disableRegistration" boolean NOT NULL DEFAULT false, "disableLocalTimeline" boolean NOT NULL DEFAULT false, "disableGlobalTimeline" boolean NOT NULL DEFAULT false, "enableEmojiReaction" boolean NOT NULL DEFAULT true, "useStarForReactionFallback" boolean NOT NULL DEFAULT false, "langs" character varying(64) array NOT NULL DEFAULT '{}'::varchar[], "hiddenTags" character varying(256) array NOT NULL DEFAULT '{}'::varchar[], "blockedHosts" character varying(256) array NOT NULL DEFAULT '{}'::varchar[], "mascotImageUrl" character varying(512) DEFAULT '/assets/ai.png', "bannerUrl" character varying(512), "errorImageUrl" character varying(512) DEFAULT 'https://xn--931a.moe/aiart/yubitun.png', "iconUrl" character varying(512), "cacheRemoteFiles" boolean NOT NULL DEFAULT true, "proxyAccount" character varying(128), "enableRecaptcha" boolean NOT NULL DEFAULT false, "recaptchaSiteKey" character varying(64), "recaptchaSecretKey" character varying(64), "localDriveCapacityMb" integer NOT NULL DEFAULT 1024, "remoteDriveCapacityMb" integer NOT NULL DEFAULT 32, "maxNoteTextLength" integer NOT NULL DEFAULT 500, "summalyProxy" character varying(128), "enableEmail" boolean NOT NULL DEFAULT false, "email" character varying(128), "smtpSecure" boolean NOT NULL DEFAULT false, "smtpHost" character varying(128), "smtpPort" integer, "smtpUser" character varying(128), "smtpPass" character varying(128), "enableServiceWorker" boolean NOT NULL DEFAULT false, "swPublicKey" character varying(128), "swPrivateKey" character varying(128), "enableTwitterIntegration" boolean NOT NULL DEFAULT false, "twitterConsumerKey" character varying(128), "twitterConsumerSecret" character varying(128), "enableGithubIntegration" boolean NOT NULL DEFAULT false, "githubClientId" character varying(128), "githubClientSecret" character varying(128), "enableDiscordIntegration" boolean NOT NULL DEFAULT false, "discordClientId" character varying(128), "discordClientSecret" character varying(128), CONSTRAINT "PK_c4c17a6c2bd7651338b60fc590b" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "following" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "followeeId" character varying(32) NOT NULL, "followerId" character varying(32) NOT NULL, "followerHost" character varying(128), "followerInbox" character varying(512), "followerSharedInbox" character varying(512), "followeeHost" character varying(128), "followeeInbox" character varying(512), "followeeSharedInbox" character varying(512), CONSTRAINT "PK_c76c6e044bdf76ecf8bfb82a645" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_582f8fab771a9040a12961f3e7" ON "following" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_24e0042143a18157b234df186c" ON "following" ("followeeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_6516c5a6f3c015b4eed39978be" ON "following" ("followerId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_307be5f1d1252e0388662acb96" ON "following" ("followerId", "followeeId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "instance" ("id" character varying(32) NOT NULL, "caughtAt" TIMESTAMP WITH TIME ZONE NOT NULL, "host" character varying(128) NOT NULL, "system" character varying(64), "usersCount" integer NOT NULL DEFAULT 0, "notesCount" integer NOT NULL DEFAULT 0, "followingCount" integer NOT NULL DEFAULT 0, "followersCount" integer NOT NULL DEFAULT 0, "driveUsage" integer NOT NULL DEFAULT 0, "driveFiles" integer NOT NULL DEFAULT 0, "latestRequestSentAt" TIMESTAMP WITH TIME ZONE, "latestStatus" integer, "latestRequestReceivedAt" TIMESTAMP WITH TIME ZONE, "lastCommunicatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "isNotResponding" boolean NOT NULL DEFAULT false, "isMarkedAsClosed" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_eaf60e4a0c399c9935413e06474" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2cd3b2a6b4cf0b910b260afe08" ON "instance" ("caughtAt") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_8d5afc98982185799b160e10eb" ON "instance" ("host") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "muteeId" character varying(32) NOT NULL, "muterId" character varying(32) NOT NULL, CONSTRAINT "PK_2e92d06c8b5c602eeb27ca9ba48" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f86d57fbca33c7a4e6897490cc" ON "muting" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_ec96b4fed9dae517e0dbbe0675" ON "muting" ("muteeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_93060675b4a79a577f31d260c6" ON "muting" ("muterId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_1eb9d9824a630321a29fd3b290" ON "muting" ("muterId", "muteeId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "sw_subscription" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "endpoint" character varying(512) NOT NULL, "auth" character varying(256) NOT NULL, "publickey" character varying(128) NOT NULL, CONSTRAINT "PK_e8f763631530051b95eb6279b91" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_97754ca6f2baff9b4abb7f853d" ON "sw_subscription" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "blocking" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "blockeeId" character varying(32) NOT NULL, "blockerId" character varying(32) NOT NULL, CONSTRAINT "PK_e5d9a541cc1965ee7e048ea09dd" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b9a354f7941c1e779f3b33aea6" ON "blocking" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2cd4a2743a99671308f5417759" ON "blocking" ("blockeeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0627125f1a8a42c9a1929edb55" ON "blocking" ("blockerId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_98a1bc5cb30dfd159de056549f" ON "blocking" ("blockerId", "blockeeId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "user_list" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, CONSTRAINT "PK_87bab75775fd9b1ff822b656402" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b7fcefbdd1c18dce86687531f9" ON "user_list" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "user_list_joining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userListId" character varying(32) NOT NULL, CONSTRAINT "PK_11abb3768da1c5f8de101c9df45" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d844bfc6f3f523a05189076efa" ON "user_list_joining" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_605472305f26818cc93d1baaa7" ON "user_list_joining" ("userListId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "hashtag" ("id" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "mentionedUserIds" character varying(32) array NOT NULL, "mentionedUsersCount" integer NOT NULL DEFAULT 0, "mentionedLocalUserIds" character varying(32) array NOT NULL, "mentionedLocalUsersCount" integer NOT NULL DEFAULT 0, "mentionedRemoteUserIds" character varying(32) array NOT NULL, "mentionedRemoteUsersCount" integer NOT NULL DEFAULT 0, "attachedUserIds" character varying(32) array NOT NULL, "attachedUsersCount" integer NOT NULL DEFAULT 0, "attachedLocalUserIds" character varying(32) array NOT NULL, "attachedLocalUsersCount" integer NOT NULL DEFAULT 0, "attachedRemoteUserIds" character varying(32) array NOT NULL, "attachedRemoteUsersCount" integer NOT NULL DEFAULT 0, CONSTRAINT "PK_cb36eb8af8412bfa978f1165d78" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_347fec870eafea7b26c8a73bac" ON "hashtag" ("name") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2710a55f826ee236ea1a62698f" ON "hashtag" ("mentionedUsersCount") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0e206cec573f1edff4a3062923" ON "hashtag" ("mentionedLocalUsersCount") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_4c02d38a976c3ae132228c6fce" ON "hashtag" ("mentionedRemoteUsersCount") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d57f9030cd3af7f63ffb1c267c" ON "hashtag" ("attachedUsersCount") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0c44bf4f680964145f2a68a341" ON "hashtag" ("attachedLocalUsersCount") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0b03cbcd7e6a7ce068efa8ecc2" ON "hashtag" ("attachedRemoteUsersCount") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "note_favorite" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, CONSTRAINT "PK_af0da35a60b9fa4463a62082b36" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_47f4b1892f5d6ba8efb3057d81" ON "note_favorite" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_0f4fb9ad355f3effff221ef245" ON "note_favorite" ("userId", "noteId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "abuse_user_report" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "reporterId" character varying(32) NOT NULL, "comment" character varying(512) NOT NULL, CONSTRAINT "PK_87873f5f5cc5c321a1306b2d18c" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_db2098070b2b5a523c58181f74" ON "abuse_user_report" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d049123c413e68ca52abe73420" ON "abuse_user_report" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_04cc96756f89d0b7f9473e8cdf" ON "abuse_user_report" ("reporterId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_5cd442c3b2e74fdd99dae20243" ON "abuse_user_report" ("userId", "reporterId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "registration_ticket" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "code" character varying(64) NOT NULL, CONSTRAINT "PK_f11696b6fafcf3662d4292734f8" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_0ff69e8dfa9fe31bb4a4660f59" ON "registration_ticket" ("code") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "messaging_message" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "recipientId" character varying(32) NOT NULL, "text" character varying(4096), "isRead" boolean NOT NULL DEFAULT false, "fileId" character varying(32), CONSTRAINT "PK_db398fd79dc95d0eb8c30456eaa" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e21cd3646e52ef9c94aaf17c2e" ON "messaging_message" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_5377c307783fce2b6d352e1203" ON "messaging_message" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_cac14a4e3944454a5ce7daa514" ON "messaging_message" ("recipientId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "signin" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "ip" character varying(128) NOT NULL, "headers" jsonb NOT NULL, "success" boolean NOT NULL, CONSTRAINT "PK_9e96ddc025712616fc492b3b588" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2c308dbdc50d94dc625670055f" ON "signin" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "auth_session" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "token" character varying(128) NOT NULL, "userId" character varying(32), "appId" character varying(32) NOT NULL, CONSTRAINT "PK_19354ed146424a728c1112a8cbf" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_62cb09e1129f6ec024ef66e183" ON "auth_session" ("token") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "follow_request" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "followeeId" character varying(32) NOT NULL, "followerId" character varying(32) NOT NULL, "requestId" character varying(128), "followerHost" character varying(128), "followerInbox" character varying(512), "followerSharedInbox" character varying(512), "followeeHost" character varying(128), "followeeInbox" character varying(512), "followeeSharedInbox" character varying(512), CONSTRAINT "PK_53a9aa3725f7a3deb150b39dbfc" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_12c01c0d1a79f77d9f6c15fadd" ON "follow_request" ("followeeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a7fd92dd6dc519e6fb435dd108" ON "follow_request" ("followerId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_d54a512b822fac7ed52800f6b4" ON "follow_request" ("followerId", "followeeId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "emoji" ("id" character varying(32) NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE, "name" character varying(128) NOT NULL, "host" character varying(128), "url" character varying(512) NOT NULL, "uri" character varying(512), "type" character varying(64), "aliases" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], CONSTRAINT "PK_df74ce05e24999ee01ea0bc50a3" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b37dafc86e9af007e3295c2781" ON "emoji" ("name") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_5900e907bb46516ddf2871327c" ON "emoji" ("host") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_4f4d35e1256c84ae3d1f0eab10" ON "emoji" ("name", "host") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "reversi_game" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "startedAt" TIMESTAMP WITH TIME ZONE, "user1Id" character varying(32) NOT NULL, "user2Id" character varying(32) NOT NULL, "user1Accepted" boolean NOT NULL DEFAULT false, "user2Accepted" boolean NOT NULL DEFAULT false, "black" integer, "isStarted" boolean NOT NULL DEFAULT false, "isEnded" boolean NOT NULL DEFAULT false, "winnerId" character varying(32), "surrendered" character varying(32), "logs" jsonb NOT NULL DEFAULT '[]', "map" character varying(64) array NOT NULL, "bw" character varying(32) NOT NULL, "isLlotheo" boolean NOT NULL DEFAULT false, "canPutEverywhere" boolean NOT NULL DEFAULT false, "loopedBoard" boolean NOT NULL DEFAULT false, "form1" jsonb DEFAULT null, "form2" jsonb DEFAULT null, "crc32" character varying(32), CONSTRAINT "PK_76b30eeba71b1193ad7c5311c3f" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b46ec40746efceac604142be1c" ON "reversi_game" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "reversi_matching" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "parentId" character varying(32) NOT NULL, "childId" character varying(32) NOT NULL, CONSTRAINT "PK_880bd0afbab232f21c8b9d146cf" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b604d92d6c7aec38627f6eaf16" ON "reversi_matching" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3b25402709dd9882048c2bbade" ON "reversi_matching" ("parentId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e247b23a3c9b45f89ec1299d06" ON "reversi_matching" ("childId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "user_note_pining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, CONSTRAINT "PK_a6a2dad4ae000abce2ea9d9b103" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_bfbc6f79ba4007b4ce5097f08d" ON "user_note_pining" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_410cd649884b501c02d6e72738" ON "user_note_pining" ("userId", "noteId") `,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "poll_notevisibility_enum" AS ENUM('public', 'home', 'followers', 'specified')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "poll" ("noteId" character varying(32) NOT NULL, "expiresAt" TIMESTAMP WITH TIME ZONE, "multiple" boolean NOT NULL, "choices" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], "votes" integer array NOT NULL, "noteVisibility" "poll_notevisibility_enum" NOT NULL, "userId" character varying(32) NOT NULL, "userHost" character varying(128), CONSTRAINT "REL_da851e06d0dfe2ef397d8b1bf1" UNIQUE ("noteId"), CONSTRAINT "PK_da851e06d0dfe2ef397d8b1bf1b" PRIMARY KEY ("noteId"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0610ebcfcfb4a18441a9bcdab2" ON "poll" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7fa20a12319c7f6dc3aed98c0a" ON "poll" ("userHost") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "user_keypair" ("userId" character varying(32) NOT NULL, "publicKey" character varying(4096) NOT NULL, "privateKey" character varying(4096) NOT NULL, CONSTRAINT "REL_f4853eb41ab722fe05f81cedeb" UNIQUE ("userId"), CONSTRAINT "PK_f4853eb41ab722fe05f81cedeb6" PRIMARY KEY ("userId"))`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "user_publickey" ("userId" character varying(32) NOT NULL, "keyId" character varying(256) NOT NULL, "keyPem" character varying(4096) NOT NULL, CONSTRAINT "REL_10c146e4b39b443ede016f6736" UNIQUE ("userId"), CONSTRAINT "PK_10c146e4b39b443ede016f6736d" PRIMARY KEY ("userId"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_171e64971c780ebd23fae140bb" ON "user_publickey" ("keyId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "user_profile" ("userId" character varying(32) NOT NULL, "location" character varying(128), "birthday" character(10), "description" character varying(1024), "fields" jsonb NOT NULL DEFAULT '[]', "url" character varying(512), "email" character varying(128), "emailVerifyCode" character varying(128), "emailVerified" boolean NOT NULL DEFAULT false, "twoFactorTempSecret" character varying(128), "twoFactorSecret" character varying(128), "twoFactorEnabled" boolean NOT NULL DEFAULT false, "password" character varying(128), "clientData" jsonb NOT NULL DEFAULT '{}', "autoWatch" boolean NOT NULL DEFAULT false, "autoAcceptFollowed" boolean NOT NULL DEFAULT false, "alwaysMarkNsfw" boolean NOT NULL DEFAULT false, "carefulBot" boolean NOT NULL DEFAULT false, "twitter" boolean NOT NULL DEFAULT false, "twitterAccessToken" character varying(64) DEFAULT null, "twitterAccessTokenSecret" character varying(64) DEFAULT null, "twitterUserId" character varying(64) DEFAULT null, "twitterScreenName" character varying(64) DEFAULT null, "github" boolean NOT NULL DEFAULT false, "githubAccessToken" character varying(64) DEFAULT null, "githubId" integer DEFAULT null, "githubLogin" character varying(64) DEFAULT null, "discord" boolean NOT NULL DEFAULT false, "discordAccessToken" character varying(64) DEFAULT null, "discordRefreshToken" character varying(64) DEFAULT null, "discordExpiresDate" integer DEFAULT null, "discordId" character varying(64) DEFAULT null, "discordUsername" character varying(64) DEFAULT null, "discordDiscriminator" character varying(64) DEFAULT null, "userHost" character varying(128), CONSTRAINT "REL_51cb79b5555effaf7d69ba1cff" UNIQUE ("userId"), CONSTRAINT "PK_51cb79b5555effaf7d69ba1cff9" PRIMARY KEY ("userId"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_dce530b98e454793dac5ec2f5a" ON "user_profile" ("userHost") `,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__active_users_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__active_users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__active_users_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "PK_317237a9f733b970604a11e314f" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__drive_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__drive_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_totalCount" bigint NOT NULL, "___local_totalSize" bigint NOT NULL, "___local_incCount" bigint NOT NULL, "___local_incSize" bigint NOT NULL, "___local_decCount" bigint NOT NULL, "___local_decSize" bigint NOT NULL, "___remote_totalCount" bigint NOT NULL, "___remote_totalSize" bigint NOT NULL, "___remote_incCount" bigint NOT NULL, "___remote_incSize" bigint NOT NULL, "___remote_decCount" bigint NOT NULL, "___remote_decSize" bigint NOT NULL, CONSTRAINT "PK_f96bc548a765cd4b3b354221ce7" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__federation_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__federation" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__federation_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___instance_total" bigint NOT NULL, "___instance_inc" bigint NOT NULL, "___instance_dec" bigint NOT NULL, CONSTRAINT "PK_b39dcd31a0fe1a7757e348e85fd" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__hashtag_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__hashtag" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__hashtag_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "PK_c32f1ea2b44a5d2f7881e37f8f9" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__instance_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__instance" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__instance_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___requests_failed" bigint NOT NULL, "___requests_succeeded" bigint NOT NULL, "___requests_received" bigint NOT NULL, "___notes_total" bigint NOT NULL, "___notes_inc" bigint NOT NULL, "___notes_dec" bigint NOT NULL, "___notes_diffs_normal" bigint NOT NULL, "___notes_diffs_reply" bigint NOT NULL, "___notes_diffs_renote" bigint NOT NULL, "___users_total" bigint NOT NULL, "___users_inc" bigint NOT NULL, "___users_dec" bigint NOT NULL, "___following_total" bigint NOT NULL, "___following_inc" bigint NOT NULL, "___following_dec" bigint NOT NULL, "___followers_total" bigint NOT NULL, "___followers_inc" bigint NOT NULL, "___followers_dec" bigint NOT NULL, "___drive_totalFiles" bigint NOT NULL, "___drive_totalUsage" bigint NOT NULL, "___drive_incFiles" bigint NOT NULL, "___drive_incUsage" bigint NOT NULL, "___drive_decFiles" bigint NOT NULL, "___drive_decUsage" bigint NOT NULL, CONSTRAINT "PK_1267c67c7c2d47b4903975f2c00" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__network_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__network" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__network_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___incomingRequests" bigint NOT NULL, "___outgoingRequests" bigint NOT NULL, "___totalTime" bigint NOT NULL, "___incomingBytes" bigint NOT NULL, "___outgoingBytes" bigint NOT NULL, CONSTRAINT "PK_bc4290c2e27fad14ef0c1ca93f3" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__notes_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__notes_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___local_diffs_normal" bigint NOT NULL, "___local_diffs_reply" bigint NOT NULL, "___local_diffs_renote" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, "___remote_diffs_normal" bigint NOT NULL, "___remote_diffs_reply" bigint NOT NULL, "___remote_diffs_renote" bigint NOT NULL, CONSTRAINT "PK_0aec823fa85c7f901bdb3863b14" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__per_user_drive_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__per_user_drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_drive_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___totalCount" bigint NOT NULL, "___totalSize" bigint NOT NULL, "___incCount" bigint NOT NULL, "___incSize" bigint NOT NULL, "___decCount" bigint NOT NULL, "___decSize" bigint NOT NULL, CONSTRAINT "PK_d0ef23d24d666e1a44a0cd3d208" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__per_user_following_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__per_user_following" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_following_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_followings_total" bigint NOT NULL, "___local_followings_inc" bigint NOT NULL, "___local_followings_dec" bigint NOT NULL, "___local_followers_total" bigint NOT NULL, "___local_followers_inc" bigint NOT NULL, "___local_followers_dec" bigint NOT NULL, "___remote_followings_total" bigint NOT NULL, "___remote_followings_inc" bigint NOT NULL, "___remote_followings_dec" bigint NOT NULL, "___remote_followers_total" bigint NOT NULL, "___remote_followers_inc" bigint NOT NULL, "___remote_followers_dec" bigint NOT NULL, CONSTRAINT "PK_85bb1b540363a29c2fec83bd907" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__per_user_notes_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__per_user_notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_notes_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___total" bigint NOT NULL, "___inc" bigint NOT NULL, "___dec" bigint NOT NULL, "___diffs_normal" bigint NOT NULL, "___diffs_reply" bigint NOT NULL, "___diffs_renote" bigint NOT NULL, CONSTRAINT "PK_334acf6e915af2f29edc11b8e50" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__per_user_reaction_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__per_user_reaction" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__per_user_reaction_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "PK_984f54dae441e65b633e8d27a7f" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__test_grouped_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__test_grouped" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__test_grouped_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___foo_total" bigint NOT NULL, "___foo_inc" bigint NOT NULL, "___foo_dec" bigint NOT NULL, CONSTRAINT "PK_f4a2b175d308695af30d4293272" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__test_unique_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__test_unique" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__test_unique_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___foo" bigint NOT NULL, CONSTRAINT "PK_409bac9c97cc612d8500012319d" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__test_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__test" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__test_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___foo_total" bigint NOT NULL, "___foo_inc" bigint NOT NULL, "___foo_dec" bigint NOT NULL, CONSTRAINT "PK_b4bc31dffbd1b785276a3ecfc1e" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "__chart__users_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart__users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128), "span" "__chart__users_span_enum" NOT NULL, "unique" jsonb NOT NULL DEFAULT '{}', "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, CONSTRAINT "PK_4dfcf2c78d03524b9eb2c99d328" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_folder" ADD CONSTRAINT "FK_f4fc06e49c0171c85f1c48060d2" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_folder" ADD CONSTRAINT "FK_00ceffb0cdc238b3233294f08f2" FOREIGN KEY ("parentId") REFERENCES "drive_folder"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD CONSTRAINT "FK_860fa6f6c7df5bb887249fba22e" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD CONSTRAINT "FK_bb90d1956dafc4068c28aa7560a" FOREIGN KEY ("folderId") REFERENCES "drive_folder"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD CONSTRAINT "FK_58f5c71eaab331645112cf8cfa5" FOREIGN KEY ("avatarId") REFERENCES "drive_file"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD CONSTRAINT "FK_afc64b53f8db3707ceb34eb28e2" FOREIGN KEY ("bannerId") REFERENCES "drive_file"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "app" ADD CONSTRAINT "FK_3f5b0899ef90527a3462d7c2cb3" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ADD CONSTRAINT "FK_9949557d0e1b2c19e5344c171e9" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ADD CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" ADD CONSTRAINT "FK_17cb3553c700a4985dff5a30ff5" FOREIGN KEY ("replyId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" ADD CONSTRAINT "FK_52ccc804d7c69037d558bac4c96" FOREIGN KEY ("renoteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" ADD CONSTRAINT "FK_ec5c201576192ba8904c345c5cc" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" ADD CONSTRAINT "FK_5b87d9d19127bd5d92026017a7b" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "poll_vote" ADD CONSTRAINT "FK_66d2bd2ee31d14bcc23069a89f8" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "poll_vote" ADD CONSTRAINT "FK_aecfbd5ef60374918e63ee95fa7" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_reaction" ADD CONSTRAINT "FK_13761f64257f40c5636d0ff95ee" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_reaction" ADD CONSTRAINT "FK_45145e4953780f3cd5656f0ea6a" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_watching" ADD CONSTRAINT "FK_b0134ec406e8d09a540f8182888" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_watching" ADD CONSTRAINT "FK_03e7028ab8388a3f5e3ce2a8619" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_unread" ADD CONSTRAINT "FK_56b0166d34ddae49d8ef7610bb9" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_unread" ADD CONSTRAINT "FK_e637cba4dc4410218c4251260e4" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD CONSTRAINT "FK_3c601b70a1066d2c8b517094cb9" FOREIGN KEY ("notifieeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710" FOREIGN KEY ("notifierId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD CONSTRAINT "FK_769cb6b73a1efe22ddf733ac453" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "following" ADD CONSTRAINT "FK_24e0042143a18157b234df186c3" FOREIGN KEY ("followeeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "following" ADD CONSTRAINT "FK_6516c5a6f3c015b4eed39978be5" FOREIGN KEY ("followerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "muting" ADD CONSTRAINT "FK_ec96b4fed9dae517e0dbbe0675c" FOREIGN KEY ("muteeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "muting" ADD CONSTRAINT "FK_93060675b4a79a577f31d260c67" FOREIGN KEY ("muterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "sw_subscription" ADD CONSTRAINT "FK_97754ca6f2baff9b4abb7f853dd" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "blocking" ADD CONSTRAINT "FK_2cd4a2743a99671308f5417759e" FOREIGN KEY ("blockeeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "blocking" ADD CONSTRAINT "FK_0627125f1a8a42c9a1929edb552" FOREIGN KEY ("blockerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_list" ADD CONSTRAINT "FK_b7fcefbdd1c18dce86687531f99" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_list_joining" ADD CONSTRAINT "FK_d844bfc6f3f523a05189076efaa" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_list_joining" ADD CONSTRAINT "FK_605472305f26818cc93d1baaa74" FOREIGN KEY ("userListId") REFERENCES "user_list"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_favorite" ADD CONSTRAINT "FK_47f4b1892f5d6ba8efb3057d81a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_favorite" ADD CONSTRAINT "FK_0e00498f180193423c992bc4370" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_d049123c413e68ca52abe734203" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_04cc96756f89d0b7f9473e8cdf3" FOREIGN KEY ("reporterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_5377c307783fce2b6d352e1203b" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_cac14a4e3944454a5ce7daa5142" FOREIGN KEY ("recipientId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_535def119223ac05ad3fa9ef64b" FOREIGN KEY ("fileId") REFERENCES "drive_file"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "signin" ADD CONSTRAINT "FK_2c308dbdc50d94dc625670055f7" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "auth_session" ADD CONSTRAINT "FK_c072b729d71697f959bde66ade0" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "auth_session" ADD CONSTRAINT "FK_dbe037d4bddd17b03a1dc778dee" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "follow_request" ADD CONSTRAINT "FK_12c01c0d1a79f77d9f6c15fadd2" FOREIGN KEY ("followeeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "follow_request" ADD CONSTRAINT "FK_a7fd92dd6dc519e6fb435dd108f" FOREIGN KEY ("followerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "reversi_game" ADD CONSTRAINT "FK_f7467510c60a45ce5aca6292743" FOREIGN KEY ("user1Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "reversi_game" ADD CONSTRAINT "FK_6649a4e8c5d5cf32fb03b5da9f6" FOREIGN KEY ("user2Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "reversi_matching" ADD CONSTRAINT "FK_3b25402709dd9882048c2bbade0" FOREIGN KEY ("parentId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "reversi_matching" ADD CONSTRAINT "FK_e247b23a3c9b45f89ec1299d066" FOREIGN KEY ("childId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_note_pining" ADD CONSTRAINT "FK_bfbc6f79ba4007b4ce5097f08d6" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_note_pining" ADD CONSTRAINT "FK_68881008f7c3588ad7ecae471cf" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "poll" ADD CONSTRAINT "FK_da851e06d0dfe2ef397d8b1bf1b" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_keypair" ADD CONSTRAINT "FK_f4853eb41ab722fe05f81cedeb6" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		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" ADD CONSTRAINT "FK_51cb79b5555effaf7d69ba1cff9" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP CONSTRAINT "FK_51cb79b5555effaf7d69ba1cff9"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_publickey" DROP CONSTRAINT "FK_10c146e4b39b443ede016f6736d"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_keypair" DROP CONSTRAINT "FK_f4853eb41ab722fe05f81cedeb6"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "poll" DROP CONSTRAINT "FK_da851e06d0dfe2ef397d8b1bf1b"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_note_pining" DROP CONSTRAINT "FK_68881008f7c3588ad7ecae471cf"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_note_pining" DROP CONSTRAINT "FK_bfbc6f79ba4007b4ce5097f08d6"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "reversi_matching" DROP CONSTRAINT "FK_e247b23a3c9b45f89ec1299d066"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "reversi_matching" DROP CONSTRAINT "FK_3b25402709dd9882048c2bbade0"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "reversi_game" DROP CONSTRAINT "FK_6649a4e8c5d5cf32fb03b5da9f6"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "reversi_game" DROP CONSTRAINT "FK_f7467510c60a45ce5aca6292743"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "follow_request" DROP CONSTRAINT "FK_a7fd92dd6dc519e6fb435dd108f"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "follow_request" DROP CONSTRAINT "FK_12c01c0d1a79f77d9f6c15fadd2"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "auth_session" DROP CONSTRAINT "FK_dbe037d4bddd17b03a1dc778dee"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "auth_session" DROP CONSTRAINT "FK_c072b729d71697f959bde66ade0"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "signin" DROP CONSTRAINT "FK_2c308dbdc50d94dc625670055f7"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_535def119223ac05ad3fa9ef64b"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_cac14a4e3944454a5ce7daa5142"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_5377c307783fce2b6d352e1203b"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_04cc96756f89d0b7f9473e8cdf3"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_d049123c413e68ca52abe734203"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_favorite" DROP CONSTRAINT "FK_0e00498f180193423c992bc4370"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_favorite" DROP CONSTRAINT "FK_47f4b1892f5d6ba8efb3057d81a"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_list_joining" DROP CONSTRAINT "FK_605472305f26818cc93d1baaa74"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_list_joining" DROP CONSTRAINT "FK_d844bfc6f3f523a05189076efaa"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_list" DROP CONSTRAINT "FK_b7fcefbdd1c18dce86687531f99"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "blocking" DROP CONSTRAINT "FK_0627125f1a8a42c9a1929edb552"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "blocking" DROP CONSTRAINT "FK_2cd4a2743a99671308f5417759e"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "sw_subscription" DROP CONSTRAINT "FK_97754ca6f2baff9b4abb7f853dd"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "muting" DROP CONSTRAINT "FK_93060675b4a79a577f31d260c67"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "muting" DROP CONSTRAINT "FK_ec96b4fed9dae517e0dbbe0675c"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "following" DROP CONSTRAINT "FK_6516c5a6f3c015b4eed39978be5"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "following" DROP CONSTRAINT "FK_24e0042143a18157b234df186c3"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP CONSTRAINT "FK_769cb6b73a1efe22ddf733ac453"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP CONSTRAINT "FK_3c601b70a1066d2c8b517094cb9"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_unread" DROP CONSTRAINT "FK_e637cba4dc4410218c4251260e4"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_unread" DROP CONSTRAINT "FK_56b0166d34ddae49d8ef7610bb9"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_watching" DROP CONSTRAINT "FK_03e7028ab8388a3f5e3ce2a8619"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_watching" DROP CONSTRAINT "FK_b0134ec406e8d09a540f8182888"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_reaction" DROP CONSTRAINT "FK_45145e4953780f3cd5656f0ea6a"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_reaction" DROP CONSTRAINT "FK_13761f64257f40c5636d0ff95ee"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "poll_vote" DROP CONSTRAINT "FK_aecfbd5ef60374918e63ee95fa7"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "poll_vote" DROP CONSTRAINT "FK_66d2bd2ee31d14bcc23069a89f8"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" DROP CONSTRAINT "FK_5b87d9d19127bd5d92026017a7b"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" DROP CONSTRAINT "FK_ec5c201576192ba8904c345c5cc"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" DROP CONSTRAINT "FK_52ccc804d7c69037d558bac4c96"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" DROP CONSTRAINT "FK_17cb3553c700a4985dff5a30ff5"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" DROP CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" DROP CONSTRAINT "FK_9949557d0e1b2c19e5344c171e9"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "app" DROP CONSTRAINT "FK_3f5b0899ef90527a3462d7c2cb3"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" DROP CONSTRAINT "FK_afc64b53f8db3707ceb34eb28e2"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" DROP CONSTRAINT "FK_58f5c71eaab331645112cf8cfa5"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" DROP CONSTRAINT "FK_bb90d1956dafc4068c28aa7560a"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" DROP CONSTRAINT "FK_860fa6f6c7df5bb887249fba22e"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_folder" DROP CONSTRAINT "FK_00ceffb0cdc238b3233294f08f2"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_folder" DROP CONSTRAINT "FK_f4fc06e49c0171c85f1c48060d2"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart__users"`);
+		await queryRunner.query(`DROP TYPE "__chart__users_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__test"`);
+		await queryRunner.query(`DROP TYPE "__chart__test_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__test_unique"`);
+		await queryRunner.query(`DROP TYPE "__chart__test_unique_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__test_grouped"`);
+		await queryRunner.query(`DROP TYPE "__chart__test_grouped_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__per_user_reaction"`);
+		await queryRunner.query(`DROP TYPE "__chart__per_user_reaction_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__per_user_notes"`);
+		await queryRunner.query(`DROP TYPE "__chart__per_user_notes_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__per_user_following"`);
+		await queryRunner.query(
+			`DROP TYPE "__chart__per_user_following_span_enum"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart__per_user_drive"`);
+		await queryRunner.query(`DROP TYPE "__chart__per_user_drive_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__notes"`);
+		await queryRunner.query(`DROP TYPE "__chart__notes_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__network"`);
+		await queryRunner.query(`DROP TYPE "__chart__network_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__instance"`);
+		await queryRunner.query(`DROP TYPE "__chart__instance_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__hashtag"`);
+		await queryRunner.query(`DROP TYPE "__chart__hashtag_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__federation"`);
+		await queryRunner.query(`DROP TYPE "__chart__federation_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__drive"`);
+		await queryRunner.query(`DROP TYPE "__chart__drive_span_enum"`);
+		await queryRunner.query(`DROP TABLE "__chart__active_users"`);
+		await queryRunner.query(`DROP TYPE "__chart__active_users_span_enum"`);
+		await queryRunner.query(`DROP INDEX "IDX_dce530b98e454793dac5ec2f5a"`);
+		await queryRunner.query(`DROP TABLE "user_profile"`);
+		await queryRunner.query(`DROP INDEX "IDX_171e64971c780ebd23fae140bb"`);
+		await queryRunner.query(`DROP TABLE "user_publickey"`);
+		await queryRunner.query(`DROP TABLE "user_keypair"`);
+		await queryRunner.query(`DROP INDEX "IDX_7fa20a12319c7f6dc3aed98c0a"`);
+		await queryRunner.query(`DROP INDEX "IDX_0610ebcfcfb4a18441a9bcdab2"`);
+		await queryRunner.query(`DROP TABLE "poll"`);
+		await queryRunner.query(`DROP TYPE "poll_notevisibility_enum"`);
+		await queryRunner.query(`DROP INDEX "IDX_410cd649884b501c02d6e72738"`);
+		await queryRunner.query(`DROP INDEX "IDX_bfbc6f79ba4007b4ce5097f08d"`);
+		await queryRunner.query(`DROP TABLE "user_note_pining"`);
+		await queryRunner.query(`DROP INDEX "IDX_e247b23a3c9b45f89ec1299d06"`);
+		await queryRunner.query(`DROP INDEX "IDX_3b25402709dd9882048c2bbade"`);
+		await queryRunner.query(`DROP INDEX "IDX_b604d92d6c7aec38627f6eaf16"`);
+		await queryRunner.query(`DROP TABLE "reversi_matching"`);
+		await queryRunner.query(`DROP INDEX "IDX_b46ec40746efceac604142be1c"`);
+		await queryRunner.query(`DROP TABLE "reversi_game"`);
+		await queryRunner.query(`DROP INDEX "IDX_4f4d35e1256c84ae3d1f0eab10"`);
+		await queryRunner.query(`DROP INDEX "IDX_5900e907bb46516ddf2871327c"`);
+		await queryRunner.query(`DROP INDEX "IDX_b37dafc86e9af007e3295c2781"`);
+		await queryRunner.query(`DROP TABLE "emoji"`);
+		await queryRunner.query(`DROP INDEX "IDX_d54a512b822fac7ed52800f6b4"`);
+		await queryRunner.query(`DROP INDEX "IDX_a7fd92dd6dc519e6fb435dd108"`);
+		await queryRunner.query(`DROP INDEX "IDX_12c01c0d1a79f77d9f6c15fadd"`);
+		await queryRunner.query(`DROP TABLE "follow_request"`);
+		await queryRunner.query(`DROP INDEX "IDX_62cb09e1129f6ec024ef66e183"`);
+		await queryRunner.query(`DROP TABLE "auth_session"`);
+		await queryRunner.query(`DROP INDEX "IDX_2c308dbdc50d94dc625670055f"`);
+		await queryRunner.query(`DROP TABLE "signin"`);
+		await queryRunner.query(`DROP INDEX "IDX_cac14a4e3944454a5ce7daa514"`);
+		await queryRunner.query(`DROP INDEX "IDX_5377c307783fce2b6d352e1203"`);
+		await queryRunner.query(`DROP INDEX "IDX_e21cd3646e52ef9c94aaf17c2e"`);
+		await queryRunner.query(`DROP TABLE "messaging_message"`);
+		await queryRunner.query(`DROP INDEX "IDX_0ff69e8dfa9fe31bb4a4660f59"`);
+		await queryRunner.query(`DROP TABLE "registration_ticket"`);
+		await queryRunner.query(`DROP INDEX "IDX_5cd442c3b2e74fdd99dae20243"`);
+		await queryRunner.query(`DROP INDEX "IDX_04cc96756f89d0b7f9473e8cdf"`);
+		await queryRunner.query(`DROP INDEX "IDX_d049123c413e68ca52abe73420"`);
+		await queryRunner.query(`DROP INDEX "IDX_db2098070b2b5a523c58181f74"`);
+		await queryRunner.query(`DROP TABLE "abuse_user_report"`);
+		await queryRunner.query(`DROP INDEX "IDX_0f4fb9ad355f3effff221ef245"`);
+		await queryRunner.query(`DROP INDEX "IDX_47f4b1892f5d6ba8efb3057d81"`);
+		await queryRunner.query(`DROP TABLE "note_favorite"`);
+		await queryRunner.query(`DROP INDEX "IDX_0b03cbcd7e6a7ce068efa8ecc2"`);
+		await queryRunner.query(`DROP INDEX "IDX_0c44bf4f680964145f2a68a341"`);
+		await queryRunner.query(`DROP INDEX "IDX_d57f9030cd3af7f63ffb1c267c"`);
+		await queryRunner.query(`DROP INDEX "IDX_4c02d38a976c3ae132228c6fce"`);
+		await queryRunner.query(`DROP INDEX "IDX_0e206cec573f1edff4a3062923"`);
+		await queryRunner.query(`DROP INDEX "IDX_2710a55f826ee236ea1a62698f"`);
+		await queryRunner.query(`DROP INDEX "IDX_347fec870eafea7b26c8a73bac"`);
+		await queryRunner.query(`DROP TABLE "hashtag"`);
+		await queryRunner.query(`DROP INDEX "IDX_605472305f26818cc93d1baaa7"`);
+		await queryRunner.query(`DROP INDEX "IDX_d844bfc6f3f523a05189076efa"`);
+		await queryRunner.query(`DROP TABLE "user_list_joining"`);
+		await queryRunner.query(`DROP INDEX "IDX_b7fcefbdd1c18dce86687531f9"`);
+		await queryRunner.query(`DROP TABLE "user_list"`);
+		await queryRunner.query(`DROP INDEX "IDX_98a1bc5cb30dfd159de056549f"`);
+		await queryRunner.query(`DROP INDEX "IDX_0627125f1a8a42c9a1929edb55"`);
+		await queryRunner.query(`DROP INDEX "IDX_2cd4a2743a99671308f5417759"`);
+		await queryRunner.query(`DROP INDEX "IDX_b9a354f7941c1e779f3b33aea6"`);
+		await queryRunner.query(`DROP TABLE "blocking"`);
+		await queryRunner.query(`DROP INDEX "IDX_97754ca6f2baff9b4abb7f853d"`);
+		await queryRunner.query(`DROP TABLE "sw_subscription"`);
+		await queryRunner.query(`DROP INDEX "IDX_1eb9d9824a630321a29fd3b290"`);
+		await queryRunner.query(`DROP INDEX "IDX_93060675b4a79a577f31d260c6"`);
+		await queryRunner.query(`DROP INDEX "IDX_ec96b4fed9dae517e0dbbe0675"`);
+		await queryRunner.query(`DROP INDEX "IDX_f86d57fbca33c7a4e6897490cc"`);
+		await queryRunner.query(`DROP TABLE "muting"`);
+		await queryRunner.query(`DROP INDEX "IDX_8d5afc98982185799b160e10eb"`);
+		await queryRunner.query(`DROP INDEX "IDX_2cd3b2a6b4cf0b910b260afe08"`);
+		await queryRunner.query(`DROP TABLE "instance"`);
+		await queryRunner.query(`DROP INDEX "IDX_307be5f1d1252e0388662acb96"`);
+		await queryRunner.query(`DROP INDEX "IDX_6516c5a6f3c015b4eed39978be"`);
+		await queryRunner.query(`DROP INDEX "IDX_24e0042143a18157b234df186c"`);
+		await queryRunner.query(`DROP INDEX "IDX_582f8fab771a9040a12961f3e7"`);
+		await queryRunner.query(`DROP TABLE "following"`);
+		await queryRunner.query(`DROP TABLE "meta"`);
+		await queryRunner.query(`DROP INDEX "IDX_3c601b70a1066d2c8b517094cb"`);
+		await queryRunner.query(`DROP INDEX "IDX_b11a5e627c41d4dc3170f1d370"`);
+		await queryRunner.query(`DROP TABLE "notification"`);
+		await queryRunner.query(`DROP INDEX "IDX_d908433a4953cc13216cd9c274"`);
+		await queryRunner.query(`DROP INDEX "IDX_e637cba4dc4410218c4251260e"`);
+		await queryRunner.query(`DROP INDEX "IDX_56b0166d34ddae49d8ef7610bb"`);
+		await queryRunner.query(`DROP TABLE "note_unread"`);
+		await queryRunner.query(`DROP INDEX "IDX_a42c93c69989ce1d09959df4cf"`);
+		await queryRunner.query(`DROP INDEX "IDX_44499765eec6b5489d72c4253b"`);
+		await queryRunner.query(`DROP INDEX "IDX_03e7028ab8388a3f5e3ce2a861"`);
+		await queryRunner.query(`DROP INDEX "IDX_b0134ec406e8d09a540f818288"`);
+		await queryRunner.query(`DROP INDEX "IDX_318cdf42a9cfc11f479bd802bb"`);
+		await queryRunner.query(`DROP TABLE "note_watching"`);
+		await queryRunner.query(`DROP INDEX "IDX_ad0c221b25672daf2df320a817"`);
+		await queryRunner.query(`DROP INDEX "IDX_45145e4953780f3cd5656f0ea6"`);
+		await queryRunner.query(`DROP INDEX "IDX_13761f64257f40c5636d0ff95e"`);
+		await queryRunner.query(`DROP INDEX "IDX_01f4581f114e0ebd2bbb876f0b"`);
+		await queryRunner.query(`DROP TABLE "note_reaction"`);
+		await queryRunner.query(`DROP INDEX "IDX_50bd7164c5b78f1f4a42c4d21f"`);
+		await queryRunner.query(`DROP INDEX "IDX_aecfbd5ef60374918e63ee95fa"`);
+		await queryRunner.query(`DROP INDEX "IDX_66d2bd2ee31d14bcc23069a89f"`);
+		await queryRunner.query(`DROP INDEX "IDX_0fb627e1c2f753262a74f0562d"`);
+		await queryRunner.query(`DROP TABLE "poll_vote"`);
+		await queryRunner.query(`DROP INDEX "IDX_7125a826ab192eb27e11d358a5"`);
+		await queryRunner.query(`DROP INDEX "IDX_88937d94d7443d9a99a76fa5c0"`);
+		await queryRunner.query(`DROP INDEX "IDX_54ebcb6d27222913b908d56fd8"`);
+		await queryRunner.query(`DROP INDEX "IDX_796a8c03959361f97dc2be1d5c"`);
+		await queryRunner.query(`DROP INDEX "IDX_25dfc71b0369b003a4cd434d0b"`);
+		await queryRunner.query(`DROP INDEX "IDX_51c063b6a133a9cb87145450f5"`);
+		await queryRunner.query(`DROP INDEX "IDX_153536c67d05e9adb24e99fc2b"`);
+		await queryRunner.query(`DROP INDEX "IDX_5b87d9d19127bd5d92026017a7"`);
+		await queryRunner.query(`DROP INDEX "IDX_52ccc804d7c69037d558bac4c9"`);
+		await queryRunner.query(`DROP INDEX "IDX_17cb3553c700a4985dff5a30ff"`);
+		await queryRunner.query(`DROP INDEX "IDX_e7c0567f5261063592f022e9b5"`);
+		await queryRunner.query(`DROP TABLE "note"`);
+		await queryRunner.query(`DROP TYPE "note_visibility_enum"`);
+		await queryRunner.query(`DROP INDEX "IDX_9949557d0e1b2c19e5344c171e"`);
+		await queryRunner.query(`DROP INDEX "IDX_64c327441248bae40f7d92f34f"`);
+		await queryRunner.query(`DROP INDEX "IDX_70ba8f6af34bc924fc9e12adb8"`);
+		await queryRunner.query(`DROP TABLE "access_token"`);
+		await queryRunner.query(`DROP INDEX "IDX_f49922d511d666848f250663c4"`);
+		await queryRunner.query(`DROP INDEX "IDX_3f5b0899ef90527a3462d7c2cb"`);
+		await queryRunner.query(`DROP INDEX "IDX_048a757923ed8b157e9895da53"`);
+		await queryRunner.query(`DROP TABLE "app"`);
+		await queryRunner.query(`DROP INDEX "IDX_5deb01ae162d1d70b80d064c27"`);
+		await queryRunner.query(`DROP INDEX "IDX_a854e557b1b14814750c7c7b0c"`);
+		await queryRunner.query(`DROP INDEX "IDX_be623adaa4c566baf5d29ce0c8"`);
+		await queryRunner.query(`DROP INDEX "IDX_3252a5df8d5bbd16b281f7799e"`);
+		await queryRunner.query(`DROP INDEX "IDX_fa99d777623947a5b05f394cae"`);
+		await queryRunner.query(`DROP INDEX "IDX_a27b942a0d6dcff90e3ee9b5e8"`);
+		await queryRunner.query(`DROP INDEX "IDX_80ca6e6ef65fb9ef34ea8c90f4"`);
+		await queryRunner.query(`DROP INDEX "IDX_e11e649824a45d8ed01d597fd9"`);
+		await queryRunner.query(`DROP TABLE "user"`);
+		await queryRunner.query(`DROP INDEX "IDX_bb90d1956dafc4068c28aa7560"`);
+		await queryRunner.query(`DROP INDEX "IDX_e5848eac4940934e23dbc17581"`);
+		await queryRunner.query(`DROP INDEX "IDX_c55b2b7c284d9fef98026fc88e"`);
+		await queryRunner.query(`DROP INDEX "IDX_e74022ce9a074b3866f70e0d27"`);
+		await queryRunner.query(`DROP INDEX "IDX_d85a184c2540d2deba33daf642"`);
+		await queryRunner.query(`DROP INDEX "IDX_a40b8df8c989d7db937ea27cf6"`);
+		await queryRunner.query(`DROP INDEX "IDX_37bb9a1b4585f8a3beb24c62d6"`);
+		await queryRunner.query(`DROP INDEX "IDX_92779627994ac79277f070c91e"`);
+		await queryRunner.query(`DROP INDEX "IDX_860fa6f6c7df5bb887249fba22"`);
+		await queryRunner.query(`DROP INDEX "IDX_c8dfad3b72196dd1d6b5db168a"`);
+		await queryRunner.query(`DROP TABLE "drive_file"`);
+		await queryRunner.query(`DROP INDEX "IDX_00ceffb0cdc238b3233294f08f"`);
+		await queryRunner.query(`DROP INDEX "IDX_f4fc06e49c0171c85f1c48060d"`);
+		await queryRunner.query(`DROP INDEX "IDX_02878d441ceae15ce060b73daf"`);
+		await queryRunner.query(`DROP TABLE "drive_folder"`);
+		await queryRunner.query(`DROP INDEX "IDX_584b536b49e53ac81beb39a177"`);
+		await queryRunner.query(`DROP INDEX "IDX_8cb40cfc8f3c28261e6f887b03"`);
+		await queryRunner.query(`DROP INDEX "IDX_8e4eb51a35d81b64dda28eed0a"`);
+		await queryRunner.query(`DROP TABLE "log"`);
+		await queryRunner.query(`DROP TYPE "log_level_enum"`);
+	}
 }
diff --git a/packages/backend/migration/1556348509290-Pages.js b/packages/backend/migration/1556348509290-Pages.js
index 50caa2ce9..696b2acbe 100644
--- a/packages/backend/migration/1556348509290-Pages.js
+++ b/packages/backend/migration/1556348509290-Pages.js
@@ -1,28 +1,50 @@
-
-
 export class Pages1556348509290 {
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "page_visibility_enum" AS ENUM('public', 'followers', 'specified')`);
-        await queryRunner.query(`CREATE TABLE "page" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "title" character varying(256) NOT NULL, "name" character varying(256) NOT NULL, "summary" character varying(256), "alignCenter" boolean NOT NULL, "font" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "eyeCatchingImageId" character varying(32), "content" jsonb NOT NULL DEFAULT '[]', "variables" jsonb NOT NULL DEFAULT '[]', "visibility" "page_visibility_enum" NOT NULL, "visibleUserIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], CONSTRAINT "PK_742f4117e065c5b6ad21b37ba1f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_fbb4297c927a9b85e9cefa2eb1" ON "page" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_af639b066dfbca78b01a920f8a" ON "page" ("updatedAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b82c19c08afb292de4600d99e4" ON "page" ("name") `);
-        await queryRunner.query(`CREATE INDEX "IDX_ae1d917992dd0c9d9bbdad06c4" ON "page" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_90148bbc2bf0854428786bfc15" ON "page" ("visibleUserIds") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_2133ef8317e4bdb839c0dcbf13" ON "page" ("userId", "name") `);
-        await queryRunner.query(`ALTER TABLE "page" ADD CONSTRAINT "FK_ae1d917992dd0c9d9bbdad06c4a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "page" ADD CONSTRAINT "FK_3126dd7c502c9e4d7597ef7ef10" FOREIGN KEY ("eyeCatchingImageId") REFERENCES "drive_file"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "page" DROP CONSTRAINT "FK_3126dd7c502c9e4d7597ef7ef10"`);
-        await queryRunner.query(`ALTER TABLE "page" DROP CONSTRAINT "FK_ae1d917992dd0c9d9bbdad06c4a"`);
-        await queryRunner.query(`DROP INDEX "IDX_2133ef8317e4bdb839c0dcbf13"`);
-        await queryRunner.query(`DROP INDEX "IDX_90148bbc2bf0854428786bfc15"`);
-        await queryRunner.query(`DROP INDEX "IDX_ae1d917992dd0c9d9bbdad06c4"`);
-        await queryRunner.query(`DROP INDEX "IDX_b82c19c08afb292de4600d99e4"`);
-        await queryRunner.query(`DROP INDEX "IDX_af639b066dfbca78b01a920f8a"`);
-        await queryRunner.query(`DROP INDEX "IDX_fbb4297c927a9b85e9cefa2eb1"`);
-        await queryRunner.query(`DROP TABLE "page"`);
-        await queryRunner.query(`DROP TYPE "page_visibility_enum"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TYPE "page_visibility_enum" AS ENUM('public', 'followers', 'specified')`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "page" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "title" character varying(256) NOT NULL, "name" character varying(256) NOT NULL, "summary" character varying(256), "alignCenter" boolean NOT NULL, "font" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "eyeCatchingImageId" character varying(32), "content" jsonb NOT NULL DEFAULT '[]', "variables" jsonb NOT NULL DEFAULT '[]', "visibility" "page_visibility_enum" NOT NULL, "visibleUserIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], CONSTRAINT "PK_742f4117e065c5b6ad21b37ba1f" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_fbb4297c927a9b85e9cefa2eb1" ON "page" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_af639b066dfbca78b01a920f8a" ON "page" ("updatedAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b82c19c08afb292de4600d99e4" ON "page" ("name") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_ae1d917992dd0c9d9bbdad06c4" ON "page" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_90148bbc2bf0854428786bfc15" ON "page" ("visibleUserIds") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_2133ef8317e4bdb839c0dcbf13" ON "page" ("userId", "name") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "page" ADD CONSTRAINT "FK_ae1d917992dd0c9d9bbdad06c4a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "page" ADD CONSTRAINT "FK_3126dd7c502c9e4d7597ef7ef10" FOREIGN KEY ("eyeCatchingImageId") REFERENCES "drive_file"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "page" DROP CONSTRAINT "FK_3126dd7c502c9e4d7597ef7ef10"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "page" DROP CONSTRAINT "FK_ae1d917992dd0c9d9bbdad06c4a"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_2133ef8317e4bdb839c0dcbf13"`);
+		await queryRunner.query(`DROP INDEX "IDX_90148bbc2bf0854428786bfc15"`);
+		await queryRunner.query(`DROP INDEX "IDX_ae1d917992dd0c9d9bbdad06c4"`);
+		await queryRunner.query(`DROP INDEX "IDX_b82c19c08afb292de4600d99e4"`);
+		await queryRunner.query(`DROP INDEX "IDX_af639b066dfbca78b01a920f8a"`);
+		await queryRunner.query(`DROP INDEX "IDX_fbb4297c927a9b85e9cefa2eb1"`);
+		await queryRunner.query(`DROP TABLE "page"`);
+		await queryRunner.query(`DROP TYPE "page_visibility_enum"`);
+	}
 }
diff --git a/packages/backend/migration/1556746559567-UserProfile.js b/packages/backend/migration/1556746559567-UserProfile.js
index 50a9d1a8b..d229ec519 100644
--- a/packages/backend/migration/1556746559567-UserProfile.js
+++ b/packages/backend/migration/1556746559567-UserProfile.js
@@ -1,13 +1,21 @@
-
-
 export class UserProfile1556746559567 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "githubId" TYPE VARCHAR(64) USING "githubId"::VARCHAR(64)`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE VARCHAR(64) USING "discordExpiresDate"::VARCHAR(64)`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`UPDATE "user_profile" SET github = FALSE, discord = FALSE`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "githubId" TYPE INTEGER USING NULL`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE INTEGER USING NULL`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ALTER COLUMN "githubId" TYPE VARCHAR(64) USING "githubId"::VARCHAR(64)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE VARCHAR(64) USING "discordExpiresDate"::VARCHAR(64)`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`UPDATE "user_profile" SET github = FALSE, discord = FALSE`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ALTER COLUMN "githubId" TYPE INTEGER USING NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE INTEGER USING NULL`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1557476068003-PinnedUsers.js b/packages/backend/migration/1557476068003-PinnedUsers.js
index d9cce2543..6f348836a 100644
--- a/packages/backend/migration/1557476068003-PinnedUsers.js
+++ b/packages/backend/migration/1557476068003-PinnedUsers.js
@@ -1,10 +1,10 @@
-
-
 export class PinnedUsers1557476068003 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedUsers" character varying(256) array NOT NULL DEFAULT '{}'::varchar[]`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedUsers"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "pinnedUsers" character varying(256) array NOT NULL DEFAULT '{}'::varchar[]`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedUsers"`);
+	}
 }
diff --git a/packages/backend/migration/1557761316509-AddSomeUrls.js b/packages/backend/migration/1557761316509-AddSomeUrls.js
index ab8736f7c..0734e14e9 100644
--- a/packages/backend/migration/1557761316509-AddSomeUrls.js
+++ b/packages/backend/migration/1557761316509-AddSomeUrls.js
@@ -1,14 +1,18 @@
-
-
 export class AddSomeUrls1557761316509 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "ToSUrl" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://github.com/misskey-dev/misskey'`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "feedbackUrl"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "repositoryUrl"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "ToSUrl"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "ToSUrl" character varying(512)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://github.com/misskey-dev/misskey'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "feedbackUrl"`);
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "repositoryUrl"`);
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "ToSUrl"`);
+	}
 }
diff --git a/packages/backend/migration/1557932705754-ObjectStorageSetting.js b/packages/backend/migration/1557932705754-ObjectStorageSetting.js
index 19a0b9d5c..5fcc98fe1 100644
--- a/packages/backend/migration/1557932705754-ObjectStorageSetting.js
+++ b/packages/backend/migration/1557932705754-ObjectStorageSetting.js
@@ -1,28 +1,66 @@
-
-
 export class ObjectStorageSetting1557932705754 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "useObjectStorage" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageBucket" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStoragePrefix" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageBaseUrl" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageEndpoint" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageRegion" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageAccessKey" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageSecretKey" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStoragePort" integer`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageUseSSL" boolean NOT NULL DEFAULT true`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageUseSSL"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStoragePort"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageSecretKey"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageAccessKey"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageRegion"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageEndpoint"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageBaseUrl"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStoragePrefix"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageBucket"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "useObjectStorage"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "useObjectStorage" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStorageBucket" character varying(512)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStoragePrefix" character varying(512)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStorageBaseUrl" character varying(512)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStorageEndpoint" character varying(512)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStorageRegion" character varying(512)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStorageAccessKey" character varying(512)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStorageSecretKey" character varying(512)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStoragePort" integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStorageUseSSL" boolean NOT NULL DEFAULT true`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStorageUseSSL"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStoragePort"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStorageSecretKey"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStorageAccessKey"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStorageRegion"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStorageEndpoint"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStorageBaseUrl"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStoragePrefix"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStorageBucket"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "useObjectStorage"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1558072954435-PageLike.js b/packages/backend/migration/1558072954435-PageLike.js
index 31b08418a..e919e02dd 100644
--- a/packages/backend/migration/1558072954435-PageLike.js
+++ b/packages/backend/migration/1558072954435-PageLike.js
@@ -1,20 +1,34 @@
-
-
 export class PageLike1558072954435 {
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "page_like" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "pageId" character varying(32) NOT NULL, CONSTRAINT "PK_813f034843af992d3ae0f43c64c" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_0e61efab7f88dbb79c9166dbb4" ON "page_like" ("userId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_4ce6fb9c70529b4c8ac46c9bfa" ON "page_like" ("userId", "pageId") `);
-        await queryRunner.query(`ALTER TABLE "page" ADD "likedCount" integer NOT NULL DEFAULT 0`);
-        await queryRunner.query(`ALTER TABLE "page_like" ADD CONSTRAINT "FK_0e61efab7f88dbb79c9166dbb48" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "page_like" ADD CONSTRAINT "FK_cf8782626dced3176038176a847" FOREIGN KEY ("pageId") REFERENCES "page"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "page_like" DROP CONSTRAINT "FK_cf8782626dced3176038176a847"`);
-        await queryRunner.query(`ALTER TABLE "page_like" DROP CONSTRAINT "FK_0e61efab7f88dbb79c9166dbb48"`);
-        await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "likedCount"`);
-        await queryRunner.query(`DROP INDEX "IDX_4ce6fb9c70529b4c8ac46c9bfa"`);
-        await queryRunner.query(`DROP INDEX "IDX_0e61efab7f88dbb79c9166dbb4"`);
-        await queryRunner.query(`DROP TABLE "page_like"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "page_like" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "pageId" character varying(32) NOT NULL, CONSTRAINT "PK_813f034843af992d3ae0f43c64c" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0e61efab7f88dbb79c9166dbb4" ON "page_like" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_4ce6fb9c70529b4c8ac46c9bfa" ON "page_like" ("userId", "pageId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "page" ADD "likedCount" integer NOT NULL DEFAULT 0`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "page_like" ADD CONSTRAINT "FK_0e61efab7f88dbb79c9166dbb48" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "page_like" ADD CONSTRAINT "FK_cf8782626dced3176038176a847" FOREIGN KEY ("pageId") REFERENCES "page"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "page_like" DROP CONSTRAINT "FK_cf8782626dced3176038176a847"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "page_like" DROP CONSTRAINT "FK_0e61efab7f88dbb79c9166dbb48"`,
+		);
+		await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "likedCount"`);
+		await queryRunner.query(`DROP INDEX "IDX_4ce6fb9c70529b4c8ac46c9bfa"`);
+		await queryRunner.query(`DROP INDEX "IDX_0e61efab7f88dbb79c9166dbb4"`);
+		await queryRunner.query(`DROP TABLE "page_like"`);
+	}
 }
diff --git a/packages/backend/migration/1558103093633-UserGroup.js b/packages/backend/migration/1558103093633-UserGroup.js
index b670b31c3..dc581a24e 100644
--- a/packages/backend/migration/1558103093633-UserGroup.js
+++ b/packages/backend/migration/1558103093633-UserGroup.js
@@ -1,38 +1,82 @@
-
-
 export class UserGroup1558103093633 {
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "user_group" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(256) NOT NULL, "userId" character varying(32) NOT NULL, "isPrivate" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_3c29fba6fe013ec8724378ce7c9" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_20e30aa35180e317e133d75316" ON "user_group" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3d6b372788ab01be58853003c9" ON "user_group" ("userId") `);
-        await queryRunner.query(`CREATE TABLE "user_group_joining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_15f2425885253c5507e1599cfe7" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_f3a1b4bd0c7cabba958a0c0b23" ON "user_group_joining" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_67dc758bc0566985d1b3d39986" ON "user_group_joining" ("userGroupId") `);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD "groupId" character varying(32)`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD "reads" character varying(32) array NOT NULL DEFAULT '{}'::varchar[]`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ALTER COLUMN "recipientId" DROP NOT NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."recipientId" IS 'The recipient user ID.'`);
-        await queryRunner.query(`CREATE INDEX "IDX_2c4be03b446884f9e9c502135b" ON "messaging_message" ("groupId") `);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_2c4be03b446884f9e9c502135be" FOREIGN KEY ("groupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_group" ADD CONSTRAINT "FK_3d6b372788ab01be58853003c93" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_group_joining" ADD CONSTRAINT "FK_f3a1b4bd0c7cabba958a0c0b231" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_group_joining" ADD CONSTRAINT "FK_67dc758bc0566985d1b3d399865" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_group_joining" DROP CONSTRAINT "FK_67dc758bc0566985d1b3d399865"`);
-        await queryRunner.query(`ALTER TABLE "user_group_joining" DROP CONSTRAINT "FK_f3a1b4bd0c7cabba958a0c0b231"`);
-        await queryRunner.query(`ALTER TABLE "user_group" DROP CONSTRAINT "FK_3d6b372788ab01be58853003c93"`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_2c4be03b446884f9e9c502135be"`);
-        await queryRunner.query(`DROP INDEX "IDX_2c4be03b446884f9e9c502135b"`);
-        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."recipientId" IS ''`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" ALTER COLUMN "recipientId" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP COLUMN "reads"`);
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP COLUMN "groupId"`);
-        await queryRunner.query(`DROP INDEX "IDX_67dc758bc0566985d1b3d39986"`);
-        await queryRunner.query(`DROP INDEX "IDX_f3a1b4bd0c7cabba958a0c0b23"`);
-        await queryRunner.query(`DROP TABLE "user_group_joining"`);
-        await queryRunner.query(`DROP INDEX "IDX_3d6b372788ab01be58853003c9"`);
-        await queryRunner.query(`DROP INDEX "IDX_20e30aa35180e317e133d75316"`);
-        await queryRunner.query(`DROP TABLE "user_group"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "user_group" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(256) NOT NULL, "userId" character varying(32) NOT NULL, "isPrivate" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_3c29fba6fe013ec8724378ce7c9" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_20e30aa35180e317e133d75316" ON "user_group" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3d6b372788ab01be58853003c9" ON "user_group" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "user_group_joining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_15f2425885253c5507e1599cfe7" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f3a1b4bd0c7cabba958a0c0b23" ON "user_group_joining" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_67dc758bc0566985d1b3d39986" ON "user_group_joining" ("userGroupId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" ADD "groupId" character varying(32)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" ADD "reads" character varying(32) array NOT NULL DEFAULT '{}'::varchar[]`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" ALTER COLUMN "recipientId" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "messaging_message"."recipientId" IS 'The recipient user ID.'`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2c4be03b446884f9e9c502135b" ON "messaging_message" ("groupId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_2c4be03b446884f9e9c502135be" FOREIGN KEY ("groupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group" ADD CONSTRAINT "FK_3d6b372788ab01be58853003c93" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group_joining" ADD CONSTRAINT "FK_f3a1b4bd0c7cabba958a0c0b231" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group_joining" ADD CONSTRAINT "FK_67dc758bc0566985d1b3d399865" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_group_joining" DROP CONSTRAINT "FK_67dc758bc0566985d1b3d399865"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group_joining" DROP CONSTRAINT "FK_f3a1b4bd0c7cabba958a0c0b231"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group" DROP CONSTRAINT "FK_3d6b372788ab01be58853003c93"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_2c4be03b446884f9e9c502135be"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_2c4be03b446884f9e9c502135b"`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "messaging_message"."recipientId" IS ''`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" ALTER COLUMN "recipientId" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" DROP COLUMN "reads"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" DROP COLUMN "groupId"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_67dc758bc0566985d1b3d39986"`);
+		await queryRunner.query(`DROP INDEX "IDX_f3a1b4bd0c7cabba958a0c0b23"`);
+		await queryRunner.query(`DROP TABLE "user_group_joining"`);
+		await queryRunner.query(`DROP INDEX "IDX_3d6b372788ab01be58853003c9"`);
+		await queryRunner.query(`DROP INDEX "IDX_20e30aa35180e317e133d75316"`);
+		await queryRunner.query(`DROP TABLE "user_group"`);
+	}
 }
diff --git a/packages/backend/migration/1558257926829-UserGroupInvite.js b/packages/backend/migration/1558257926829-UserGroupInvite.js
index e48bd3a7f..ed137fdb2 100644
--- a/packages/backend/migration/1558257926829-UserGroupInvite.js
+++ b/packages/backend/migration/1558257926829-UserGroupInvite.js
@@ -1,22 +1,38 @@
-
-
 export class UserGroupInvite1558257926829 {
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "user_group_invite" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_3893884af0d3a5f4d01e7921a97" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_1039988afa3bf991185b277fe0" ON "user_group_invite" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e10924607d058004304611a436" ON "user_group_invite" ("userGroupId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_78787741f9010886796f2320a4" ON "user_group_invite" ("userId", "userGroupId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d9ecaed8c6dc43f3592c229282" ON "user_group_joining" ("userId", "userGroupId") `);
-        await queryRunner.query(`ALTER TABLE "user_group_invite" ADD CONSTRAINT "FK_1039988afa3bf991185b277fe03" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_group_invite" ADD CONSTRAINT "FK_e10924607d058004304611a436a" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_group_invite" DROP CONSTRAINT "FK_e10924607d058004304611a436a"`);
-        await queryRunner.query(`ALTER TABLE "user_group_invite" DROP CONSTRAINT "FK_1039988afa3bf991185b277fe03"`);
-        await queryRunner.query(`DROP INDEX "IDX_d9ecaed8c6dc43f3592c229282"`);
-        await queryRunner.query(`DROP INDEX "IDX_78787741f9010886796f2320a4"`);
-        await queryRunner.query(`DROP INDEX "IDX_e10924607d058004304611a436"`);
-        await queryRunner.query(`DROP INDEX "IDX_1039988afa3bf991185b277fe0"`);
-        await queryRunner.query(`DROP TABLE "user_group_invite"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "user_group_invite" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_3893884af0d3a5f4d01e7921a97" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_1039988afa3bf991185b277fe0" ON "user_group_invite" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e10924607d058004304611a436" ON "user_group_invite" ("userGroupId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_78787741f9010886796f2320a4" ON "user_group_invite" ("userId", "userGroupId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_d9ecaed8c6dc43f3592c229282" ON "user_group_joining" ("userId", "userGroupId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group_invite" ADD CONSTRAINT "FK_1039988afa3bf991185b277fe03" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group_invite" ADD CONSTRAINT "FK_e10924607d058004304611a436a" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_group_invite" DROP CONSTRAINT "FK_e10924607d058004304611a436a"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group_invite" DROP CONSTRAINT "FK_1039988afa3bf991185b277fe03"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_d9ecaed8c6dc43f3592c229282"`);
+		await queryRunner.query(`DROP INDEX "IDX_78787741f9010886796f2320a4"`);
+		await queryRunner.query(`DROP INDEX "IDX_e10924607d058004304611a436"`);
+		await queryRunner.query(`DROP INDEX "IDX_1039988afa3bf991185b277fe0"`);
+		await queryRunner.query(`DROP TABLE "user_group_invite"`);
+	}
 }
diff --git a/packages/backend/migration/1558266512381-UserListJoining.js b/packages/backend/migration/1558266512381-UserListJoining.js
index 3398aed13..3597e51f7 100644
--- a/packages/backend/migration/1558266512381-UserListJoining.js
+++ b/packages/backend/migration/1558266512381-UserListJoining.js
@@ -1,10 +1,10 @@
-
-
 export class UserListJoining1558266512381 {
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_90f7da835e4c10aca6853621e1" ON "user_list_joining" ("userId", "userListId") `);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_90f7da835e4c10aca6853621e1"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_90f7da835e4c10aca6853621e1" ON "user_list_joining" ("userId", "userListId") `,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_90f7da835e4c10aca6853621e1"`);
+	}
 }
diff --git a/packages/backend/migration/1561706992953-webauthn.js b/packages/backend/migration/1561706992953-webauthn.js
index b007ffef1..f860d2c11 100644
--- a/packages/backend/migration/1561706992953-webauthn.js
+++ b/packages/backend/migration/1561706992953-webauthn.js
@@ -1,26 +1,48 @@
-
-
 export class webauthn1561706992953 {
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "attestation_challenge" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "challenge" character varying(64) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "registrationChallenge" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_d0ba6786e093f1bcb497572a6b5" PRIMARY KEY ("id", "userId"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_f1a461a618fa1755692d0e0d59" ON "attestation_challenge" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_47efb914aed1f72dd39a306c7b" ON "attestation_challenge" ("challenge") `);
-        await queryRunner.query(`CREATE TABLE "user_security_key" ("id" character varying NOT NULL, "userId" character varying(32) NOT NULL, "publicKey" character varying NOT NULL, "lastUsed" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(30) NOT NULL, CONSTRAINT "PK_3e508571121ab39c5f85d10c166" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_ff9ca3b5f3ee3d0681367a9b44" ON "user_security_key" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0d7718e562dcedd0aa5cf2c9f7" ON "user_security_key" ("publicKey") `);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "securityKeysAvailable" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "attestation_challenge" ADD CONSTRAINT "FK_f1a461a618fa1755692d0e0d592" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_security_key" ADD CONSTRAINT "FK_ff9ca3b5f3ee3d0681367a9b447" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_security_key" DROP CONSTRAINT "FK_ff9ca3b5f3ee3d0681367a9b447"`);
-        await queryRunner.query(`ALTER TABLE "attestation_challenge" DROP CONSTRAINT "FK_f1a461a618fa1755692d0e0d592"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "securityKeysAvailable"`);
-        await queryRunner.query(`DROP INDEX "IDX_0d7718e562dcedd0aa5cf2c9f7"`);
-        await queryRunner.query(`DROP INDEX "IDX_ff9ca3b5f3ee3d0681367a9b44"`);
-        await queryRunner.query(`DROP TABLE "user_security_key"`);
-        await queryRunner.query(`DROP INDEX "IDX_47efb914aed1f72dd39a306c7b"`);
-        await queryRunner.query(`DROP INDEX "IDX_f1a461a618fa1755692d0e0d59"`);
-        await queryRunner.query(`DROP TABLE "attestation_challenge"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "attestation_challenge" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "challenge" character varying(64) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "registrationChallenge" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_d0ba6786e093f1bcb497572a6b5" PRIMARY KEY ("id", "userId"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f1a461a618fa1755692d0e0d59" ON "attestation_challenge" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_47efb914aed1f72dd39a306c7b" ON "attestation_challenge" ("challenge") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "user_security_key" ("id" character varying NOT NULL, "userId" character varying(32) NOT NULL, "publicKey" character varying NOT NULL, "lastUsed" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(30) NOT NULL, CONSTRAINT "PK_3e508571121ab39c5f85d10c166" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_ff9ca3b5f3ee3d0681367a9b44" ON "user_security_key" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0d7718e562dcedd0aa5cf2c9f7" ON "user_security_key" ("publicKey") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "securityKeysAvailable" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "attestation_challenge" ADD CONSTRAINT "FK_f1a461a618fa1755692d0e0d592" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_security_key" ADD CONSTRAINT "FK_ff9ca3b5f3ee3d0681367a9b447" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_security_key" DROP CONSTRAINT "FK_ff9ca3b5f3ee3d0681367a9b447"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "attestation_challenge" DROP CONSTRAINT "FK_f1a461a618fa1755692d0e0d592"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "securityKeysAvailable"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_0d7718e562dcedd0aa5cf2c9f7"`);
+		await queryRunner.query(`DROP INDEX "IDX_ff9ca3b5f3ee3d0681367a9b44"`);
+		await queryRunner.query(`DROP TABLE "user_security_key"`);
+		await queryRunner.query(`DROP INDEX "IDX_47efb914aed1f72dd39a306c7b"`);
+		await queryRunner.query(`DROP INDEX "IDX_f1a461a618fa1755692d0e0d59"`);
+		await queryRunner.query(`DROP TABLE "attestation_challenge"`);
+	}
 }
diff --git a/packages/backend/migration/1561873850023-ChartIndexes.js b/packages/backend/migration/1561873850023-ChartIndexes.js
index 3ce53567f..ba46da1e4 100644
--- a/packages/backend/migration/1561873850023-ChartIndexes.js
+++ b/packages/backend/migration/1561873850023-ChartIndexes.js
@@ -1,198 +1,376 @@
-
-
 export class ChartIndexes1561873850023 {
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc" ON "__chart__active_users" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_15e91a03aeeac9dbccdf43fc06" ON "__chart__active_users" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_00ed5f86db1f7efafb1978bf21" ON "__chart__active_users" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_20f57cc8f142c131340ee16742" ON "__chart__active_users" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_9a3ed15a30ab7e3a37702e6e08" ON "__chart__active_users" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c26e2c1cbb6e911e0554b27416" ON "__chart__active_users" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_13565815f618a1ff53886c5b28" ON "__chart__drive" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3fa0d0f17ca72e3dc80999a032" ON "__chart__drive" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7a170f67425e62a8fabb76c872" ON "__chart__drive" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6e1df243476e20cbf86572ecc0" ON "__chart__drive" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3313d7288855ec105b5bbf6c21" ON "__chart__drive" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_06690fc959f1c9fdaf21928222" ON "__chart__drive" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_36cb699c49580d4e6c2e6159f9" ON "__chart__federation" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e447064455928cf627590ef527" ON "__chart__federation" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_76e87c7bfc5d925fcbba405d84" ON "__chart__federation" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2d416e6af791a82e338c79d480" ON "__chart__federation" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_dd907becf76104e4b656659e6b" ON "__chart__federation" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e9cd07672b37d8966cf3709283" ON "__chart__federation" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_07747a1038c05f532a718fe1de" ON "__chart__hashtag" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_fcc181fb8283009c61cc4083ef" ON "__chart__hashtag" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_99a7d2faaef84a6f728d714ad6" ON "__chart__hashtag" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_49975586f50ed7b800fdd88fbd" ON "__chart__hashtag" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6d6f156ceefc6bc5f273a0e370" ON "__chart__hashtag" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6b8f34a1a64b06014b6fb66824" ON "__chart__instance" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c12f0af4a66cdd30c2287ce8aa" ON "__chart__instance" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_da8a46ba84ca1d8bb5a29bfb63" ON "__chart__instance" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d0a4f79af5a97b08f37b547197" ON "__chart__instance" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f5448d9633cff74208d850aabe" ON "__chart__instance" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a1efd3e0048a5f2793a47360dc" ON "__chart__network" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f8dd01baeded2ffa833e0a610a" ON "__chart__network" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7b5da130992ec9df96712d4290" ON "__chart__network" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_08fac0eb3b11f04c200c0b40dd" ON "__chart__network" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0a905b992fecd2b5c3fb98759e" ON "__chart__network" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_9ff6944f01acb756fdc92d7563" ON "__chart__network" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_42eb716a37d381cdf566192b2b" ON "__chart__notes" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e69096589f11e3baa98ddd64d0" ON "__chart__notes" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7036f2957151588b813185c794" ON "__chart__notes" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0c9a159c5082cbeef3ca6706b5" ON "__chart__notes" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f09d543e3acb16c5976bdb31fa" ON "__chart__notes" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_924fc196c80ca24bae01dd37e4" ON "__chart__notes" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5f86db6492274e07c1a3cdf286" ON "__chart__per_user_drive" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_328f259961e60c4fa0bfcf55ca" ON "__chart__per_user_drive" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e496ca8096d28f6b9b509264dc" ON "__chart__per_user_drive" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_42ea9381f0fda8dfe0fa1c8b53" ON "__chart__per_user_drive" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f2aeafde2ae6fbad38e857631b" ON "__chart__per_user_drive" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7af07790712aa3438ff6773f3b" ON "__chart__per_user_following" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f92dd6d03f8d994f29987f6214" ON "__chart__per_user_following" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_4b3593098b6edc9c5afe36b18b" ON "__chart__per_user_following" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_57b5458d0d3d6d1e7f13d4e57f" ON "__chart__per_user_following" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_4db3b84c7be0d3464714f3e0b1" ON "__chart__per_user_following" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_84234bd1abb873f07329681c83" ON "__chart__per_user_notes" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_8d2cbbc8114d90d19b44d626b6" ON "__chart__per_user_notes" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_55bf20f366979f2436de99206b" ON "__chart__per_user_notes" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_046feeb12e9ef5f783f409866a" ON "__chart__per_user_notes" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f68a5ab958f9f5fa17a32ac23b" ON "__chart__per_user_notes" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f7bf4c62059764c2c2bb40fdab" ON "__chart__per_user_reaction" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_65633a106bce43fc7c5c30a5c7" ON "__chart__per_user_reaction" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_8cf3156fd7a6b15c43459c6e3b" ON "__chart__per_user_reaction" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_edeb73c09c3143a81bcb34d569" ON "__chart__per_user_reaction" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e316f01a6d24eb31db27f88262" ON "__chart__per_user_reaction" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0c641990ecf47d2545df4edb75" ON "__chart__test_grouped" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2be7ec6cebddc14dc11e206686" ON "__chart__test_grouped" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_234dff3c0b56a6150b95431ab9" ON "__chart__test_grouped" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a5133470f4825902e170328ca5" ON "__chart__test_grouped" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b14489029e4b3aaf4bba5fb524" ON "__chart__test_grouped" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_84e661abb7bd1e51b690d4b017" ON "__chart__test_grouped" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_437bab3c6061d90f6bb65fd2cc" ON "__chart__test_unique" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5c73bf61da4f6e6f15bae88ed1" ON "__chart__test_unique" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_bbfa573a8181018851ed0b6357" ON "__chart__test_unique" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d70c86baedc68326be11f9c0ce" ON "__chart__test_unique" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a0cd75442dd10d0643a17c4a49" ON "__chart__test_unique" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_66e1e1ecd2f29e57778af35b59" ON "__chart__test_unique" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b070a906db04b44c67c6c2144d" ON "__chart__test" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_92255988735563f0fe4aba1f05" ON "__chart__test" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d41cce6aee1a50bfc062038f9b" ON "__chart__test" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c5870993e25c3d5771f91f5003" ON "__chart__test" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a319e5dbf47e8a17497623beae" ON "__chart__test" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f170de677ea75ad4533de2723e" ON "__chart__test" ("span", "date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_845254b3eaf708ae8a6cac3026" ON "__chart__users" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7c184198ecf66a8d3ecb253ab3" ON "__chart__users" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_ed9b95919c672a13008e9487ee" ON "__chart__users" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f091abb24193d50c653c6b77fc" ON "__chart__users" ("span", "date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_337e9599f278bd7537fe30876f" ON "__chart__users" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a770a57c70e668cc61590c9161" ON "__chart__users" ("span", "date", "group") `);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_a770a57c70e668cc61590c9161"`);
-        await queryRunner.query(`DROP INDEX "IDX_337e9599f278bd7537fe30876f"`);
-        await queryRunner.query(`DROP INDEX "IDX_f091abb24193d50c653c6b77fc"`);
-        await queryRunner.query(`DROP INDEX "IDX_ed9b95919c672a13008e9487ee"`);
-        await queryRunner.query(`DROP INDEX "IDX_7c184198ecf66a8d3ecb253ab3"`);
-        await queryRunner.query(`DROP INDEX "IDX_845254b3eaf708ae8a6cac3026"`);
-        await queryRunner.query(`DROP INDEX "IDX_f170de677ea75ad4533de2723e"`);
-        await queryRunner.query(`DROP INDEX "IDX_a319e5dbf47e8a17497623beae"`);
-        await queryRunner.query(`DROP INDEX "IDX_c5870993e25c3d5771f91f5003"`);
-        await queryRunner.query(`DROP INDEX "IDX_d41cce6aee1a50bfc062038f9b"`);
-        await queryRunner.query(`DROP INDEX "IDX_92255988735563f0fe4aba1f05"`);
-        await queryRunner.query(`DROP INDEX "IDX_b070a906db04b44c67c6c2144d"`);
-        await queryRunner.query(`DROP INDEX "IDX_66e1e1ecd2f29e57778af35b59"`);
-        await queryRunner.query(`DROP INDEX "IDX_a0cd75442dd10d0643a17c4a49"`);
-        await queryRunner.query(`DROP INDEX "IDX_d70c86baedc68326be11f9c0ce"`);
-        await queryRunner.query(`DROP INDEX "IDX_bbfa573a8181018851ed0b6357"`);
-        await queryRunner.query(`DROP INDEX "IDX_5c73bf61da4f6e6f15bae88ed1"`);
-        await queryRunner.query(`DROP INDEX "IDX_437bab3c6061d90f6bb65fd2cc"`);
-        await queryRunner.query(`DROP INDEX "IDX_84e661abb7bd1e51b690d4b017"`);
-        await queryRunner.query(`DROP INDEX "IDX_b14489029e4b3aaf4bba5fb524"`);
-        await queryRunner.query(`DROP INDEX "IDX_a5133470f4825902e170328ca5"`);
-        await queryRunner.query(`DROP INDEX "IDX_234dff3c0b56a6150b95431ab9"`);
-        await queryRunner.query(`DROP INDEX "IDX_2be7ec6cebddc14dc11e206686"`);
-        await queryRunner.query(`DROP INDEX "IDX_0c641990ecf47d2545df4edb75"`);
-        await queryRunner.query(`DROP INDEX "IDX_e316f01a6d24eb31db27f88262"`);
-        await queryRunner.query(`DROP INDEX "IDX_229a41ad465f9205f1f5703291"`);
-        await queryRunner.query(`DROP INDEX "IDX_edeb73c09c3143a81bcb34d569"`);
-        await queryRunner.query(`DROP INDEX "IDX_8cf3156fd7a6b15c43459c6e3b"`);
-        await queryRunner.query(`DROP INDEX "IDX_65633a106bce43fc7c5c30a5c7"`);
-        await queryRunner.query(`DROP INDEX "IDX_f7bf4c62059764c2c2bb40fdab"`);
-        await queryRunner.query(`DROP INDEX "IDX_f68a5ab958f9f5fa17a32ac23b"`);
-        await queryRunner.query(`DROP INDEX "IDX_5048e9daccbbbc6d567bb142d3"`);
-        await queryRunner.query(`DROP INDEX "IDX_046feeb12e9ef5f783f409866a"`);
-        await queryRunner.query(`DROP INDEX "IDX_55bf20f366979f2436de99206b"`);
-        await queryRunner.query(`DROP INDEX "IDX_8d2cbbc8114d90d19b44d626b6"`);
-        await queryRunner.query(`DROP INDEX "IDX_84234bd1abb873f07329681c83"`);
-        await queryRunner.query(`DROP INDEX "IDX_4db3b84c7be0d3464714f3e0b1"`);
-        await queryRunner.query(`DROP INDEX "IDX_b77d4dd9562c3a899d9a286fcd"`);
-        await queryRunner.query(`DROP INDEX "IDX_57b5458d0d3d6d1e7f13d4e57f"`);
-        await queryRunner.query(`DROP INDEX "IDX_4b3593098b6edc9c5afe36b18b"`);
-        await queryRunner.query(`DROP INDEX "IDX_f92dd6d03f8d994f29987f6214"`);
-        await queryRunner.query(`DROP INDEX "IDX_7af07790712aa3438ff6773f3b"`);
-        await queryRunner.query(`DROP INDEX "IDX_f2aeafde2ae6fbad38e857631b"`);
-        await queryRunner.query(`DROP INDEX "IDX_30bf67687f483ace115c5ca642"`);
-        await queryRunner.query(`DROP INDEX "IDX_42ea9381f0fda8dfe0fa1c8b53"`);
-        await queryRunner.query(`DROP INDEX "IDX_e496ca8096d28f6b9b509264dc"`);
-        await queryRunner.query(`DROP INDEX "IDX_328f259961e60c4fa0bfcf55ca"`);
-        await queryRunner.query(`DROP INDEX "IDX_5f86db6492274e07c1a3cdf286"`);
-        await queryRunner.query(`DROP INDEX "IDX_924fc196c80ca24bae01dd37e4"`);
-        await queryRunner.query(`DROP INDEX "IDX_f09d543e3acb16c5976bdb31fa"`);
-        await queryRunner.query(`DROP INDEX "IDX_0c9a159c5082cbeef3ca6706b5"`);
-        await queryRunner.query(`DROP INDEX "IDX_7036f2957151588b813185c794"`);
-        await queryRunner.query(`DROP INDEX "IDX_e69096589f11e3baa98ddd64d0"`);
-        await queryRunner.query(`DROP INDEX "IDX_42eb716a37d381cdf566192b2b"`);
-        await queryRunner.query(`DROP INDEX "IDX_9ff6944f01acb756fdc92d7563"`);
-        await queryRunner.query(`DROP INDEX "IDX_0a905b992fecd2b5c3fb98759e"`);
-        await queryRunner.query(`DROP INDEX "IDX_08fac0eb3b11f04c200c0b40dd"`);
-        await queryRunner.query(`DROP INDEX "IDX_7b5da130992ec9df96712d4290"`);
-        await queryRunner.query(`DROP INDEX "IDX_f8dd01baeded2ffa833e0a610a"`);
-        await queryRunner.query(`DROP INDEX "IDX_a1efd3e0048a5f2793a47360dc"`);
-        await queryRunner.query(`DROP INDEX "IDX_f5448d9633cff74208d850aabe"`);
-        await queryRunner.query(`DROP INDEX "IDX_39ee857ab2f23493037c6b6631"`);
-        await queryRunner.query(`DROP INDEX "IDX_d0a4f79af5a97b08f37b547197"`);
-        await queryRunner.query(`DROP INDEX "IDX_da8a46ba84ca1d8bb5a29bfb63"`);
-        await queryRunner.query(`DROP INDEX "IDX_c12f0af4a66cdd30c2287ce8aa"`);
-        await queryRunner.query(`DROP INDEX "IDX_6b8f34a1a64b06014b6fb66824"`);
-        await queryRunner.query(`DROP INDEX "IDX_6d6f156ceefc6bc5f273a0e370"`);
-        await queryRunner.query(`DROP INDEX "IDX_25a97c02003338124b2b75fdbc"`);
-        await queryRunner.query(`DROP INDEX "IDX_49975586f50ed7b800fdd88fbd"`);
-        await queryRunner.query(`DROP INDEX "IDX_99a7d2faaef84a6f728d714ad6"`);
-        await queryRunner.query(`DROP INDEX "IDX_fcc181fb8283009c61cc4083ef"`);
-        await queryRunner.query(`DROP INDEX "IDX_07747a1038c05f532a718fe1de"`);
-        await queryRunner.query(`DROP INDEX "IDX_e9cd07672b37d8966cf3709283"`);
-        await queryRunner.query(`DROP INDEX "IDX_dd907becf76104e4b656659e6b"`);
-        await queryRunner.query(`DROP INDEX "IDX_2d416e6af791a82e338c79d480"`);
-        await queryRunner.query(`DROP INDEX "IDX_76e87c7bfc5d925fcbba405d84"`);
-        await queryRunner.query(`DROP INDEX "IDX_e447064455928cf627590ef527"`);
-        await queryRunner.query(`DROP INDEX "IDX_36cb699c49580d4e6c2e6159f9"`);
-        await queryRunner.query(`DROP INDEX "IDX_06690fc959f1c9fdaf21928222"`);
-        await queryRunner.query(`DROP INDEX "IDX_3313d7288855ec105b5bbf6c21"`);
-        await queryRunner.query(`DROP INDEX "IDX_6e1df243476e20cbf86572ecc0"`);
-        await queryRunner.query(`DROP INDEX "IDX_7a170f67425e62a8fabb76c872"`);
-        await queryRunner.query(`DROP INDEX "IDX_3fa0d0f17ca72e3dc80999a032"`);
-        await queryRunner.query(`DROP INDEX "IDX_13565815f618a1ff53886c5b28"`);
-        await queryRunner.query(`DROP INDEX "IDX_c26e2c1cbb6e911e0554b27416"`);
-        await queryRunner.query(`DROP INDEX "IDX_9a3ed15a30ab7e3a37702e6e08"`);
-        await queryRunner.query(`DROP INDEX "IDX_20f57cc8f142c131340ee16742"`);
-        await queryRunner.query(`DROP INDEX "IDX_00ed5f86db1f7efafb1978bf21"`);
-        await queryRunner.query(`DROP INDEX "IDX_15e91a03aeeac9dbccdf43fc06"`);
-        await queryRunner.query(`DROP INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc"`);
-        await queryRunner.query(`DROP INDEX "IDX_90148bbc2bf0854428786bfc15"`);
-        await queryRunner.query(`DROP INDEX "IDX_88937d94d7443d9a99a76fa5c0"`);
-        await queryRunner.query(`DROP INDEX "IDX_54ebcb6d27222913b908d56fd8"`);
-        await queryRunner.query(`DROP INDEX "IDX_796a8c03959361f97dc2be1d5c"`);
-        await queryRunner.query(`DROP INDEX "IDX_25dfc71b0369b003a4cd434d0b"`);
-        await queryRunner.query(`DROP INDEX "IDX_51c063b6a133a9cb87145450f5"`);
-        await queryRunner.query(`DROP INDEX "IDX_fa99d777623947a5b05f394cae"`);
-        await queryRunner.query(`DROP INDEX "IDX_315c779174fe8247ab324f036e"`);
-        await queryRunner.query(`DROP INDEX "IDX_c5d46cbfda48b1c33ed852e21b"`);
-        await queryRunner.query(`DROP INDEX "IDX_8cb40cfc8f3c28261e6f887b03"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc" ON "__chart__active_users" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_15e91a03aeeac9dbccdf43fc06" ON "__chart__active_users" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_00ed5f86db1f7efafb1978bf21" ON "__chart__active_users" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_20f57cc8f142c131340ee16742" ON "__chart__active_users" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_9a3ed15a30ab7e3a37702e6e08" ON "__chart__active_users" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_c26e2c1cbb6e911e0554b27416" ON "__chart__active_users" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_13565815f618a1ff53886c5b28" ON "__chart__drive" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3fa0d0f17ca72e3dc80999a032" ON "__chart__drive" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7a170f67425e62a8fabb76c872" ON "__chart__drive" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_6e1df243476e20cbf86572ecc0" ON "__chart__drive" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3313d7288855ec105b5bbf6c21" ON "__chart__drive" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_06690fc959f1c9fdaf21928222" ON "__chart__drive" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_36cb699c49580d4e6c2e6159f9" ON "__chart__federation" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e447064455928cf627590ef527" ON "__chart__federation" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_76e87c7bfc5d925fcbba405d84" ON "__chart__federation" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2d416e6af791a82e338c79d480" ON "__chart__federation" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_dd907becf76104e4b656659e6b" ON "__chart__federation" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e9cd07672b37d8966cf3709283" ON "__chart__federation" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_07747a1038c05f532a718fe1de" ON "__chart__hashtag" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_fcc181fb8283009c61cc4083ef" ON "__chart__hashtag" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_99a7d2faaef84a6f728d714ad6" ON "__chart__hashtag" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_49975586f50ed7b800fdd88fbd" ON "__chart__hashtag" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_6d6f156ceefc6bc5f273a0e370" ON "__chart__hashtag" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_6b8f34a1a64b06014b6fb66824" ON "__chart__instance" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_c12f0af4a66cdd30c2287ce8aa" ON "__chart__instance" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_da8a46ba84ca1d8bb5a29bfb63" ON "__chart__instance" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d0a4f79af5a97b08f37b547197" ON "__chart__instance" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f5448d9633cff74208d850aabe" ON "__chart__instance" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a1efd3e0048a5f2793a47360dc" ON "__chart__network" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f8dd01baeded2ffa833e0a610a" ON "__chart__network" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7b5da130992ec9df96712d4290" ON "__chart__network" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_08fac0eb3b11f04c200c0b40dd" ON "__chart__network" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0a905b992fecd2b5c3fb98759e" ON "__chart__network" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_9ff6944f01acb756fdc92d7563" ON "__chart__network" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_42eb716a37d381cdf566192b2b" ON "__chart__notes" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e69096589f11e3baa98ddd64d0" ON "__chart__notes" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7036f2957151588b813185c794" ON "__chart__notes" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0c9a159c5082cbeef3ca6706b5" ON "__chart__notes" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f09d543e3acb16c5976bdb31fa" ON "__chart__notes" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_924fc196c80ca24bae01dd37e4" ON "__chart__notes" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_5f86db6492274e07c1a3cdf286" ON "__chart__per_user_drive" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_328f259961e60c4fa0bfcf55ca" ON "__chart__per_user_drive" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e496ca8096d28f6b9b509264dc" ON "__chart__per_user_drive" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_42ea9381f0fda8dfe0fa1c8b53" ON "__chart__per_user_drive" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f2aeafde2ae6fbad38e857631b" ON "__chart__per_user_drive" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7af07790712aa3438ff6773f3b" ON "__chart__per_user_following" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f92dd6d03f8d994f29987f6214" ON "__chart__per_user_following" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_4b3593098b6edc9c5afe36b18b" ON "__chart__per_user_following" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_57b5458d0d3d6d1e7f13d4e57f" ON "__chart__per_user_following" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_4db3b84c7be0d3464714f3e0b1" ON "__chart__per_user_following" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_84234bd1abb873f07329681c83" ON "__chart__per_user_notes" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8d2cbbc8114d90d19b44d626b6" ON "__chart__per_user_notes" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_55bf20f366979f2436de99206b" ON "__chart__per_user_notes" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_046feeb12e9ef5f783f409866a" ON "__chart__per_user_notes" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f68a5ab958f9f5fa17a32ac23b" ON "__chart__per_user_notes" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f7bf4c62059764c2c2bb40fdab" ON "__chart__per_user_reaction" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_65633a106bce43fc7c5c30a5c7" ON "__chart__per_user_reaction" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8cf3156fd7a6b15c43459c6e3b" ON "__chart__per_user_reaction" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_edeb73c09c3143a81bcb34d569" ON "__chart__per_user_reaction" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e316f01a6d24eb31db27f88262" ON "__chart__per_user_reaction" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0c641990ecf47d2545df4edb75" ON "__chart__test_grouped" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2be7ec6cebddc14dc11e206686" ON "__chart__test_grouped" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_234dff3c0b56a6150b95431ab9" ON "__chart__test_grouped" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a5133470f4825902e170328ca5" ON "__chart__test_grouped" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b14489029e4b3aaf4bba5fb524" ON "__chart__test_grouped" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_84e661abb7bd1e51b690d4b017" ON "__chart__test_grouped" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_437bab3c6061d90f6bb65fd2cc" ON "__chart__test_unique" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_5c73bf61da4f6e6f15bae88ed1" ON "__chart__test_unique" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_bbfa573a8181018851ed0b6357" ON "__chart__test_unique" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d70c86baedc68326be11f9c0ce" ON "__chart__test_unique" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a0cd75442dd10d0643a17c4a49" ON "__chart__test_unique" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_66e1e1ecd2f29e57778af35b59" ON "__chart__test_unique" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b070a906db04b44c67c6c2144d" ON "__chart__test" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_92255988735563f0fe4aba1f05" ON "__chart__test" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d41cce6aee1a50bfc062038f9b" ON "__chart__test" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_c5870993e25c3d5771f91f5003" ON "__chart__test" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a319e5dbf47e8a17497623beae" ON "__chart__test" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f170de677ea75ad4533de2723e" ON "__chart__test" ("span", "date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_845254b3eaf708ae8a6cac3026" ON "__chart__users" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7c184198ecf66a8d3ecb253ab3" ON "__chart__users" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_ed9b95919c672a13008e9487ee" ON "__chart__users" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f091abb24193d50c653c6b77fc" ON "__chart__users" ("span", "date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_337e9599f278bd7537fe30876f" ON "__chart__users" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a770a57c70e668cc61590c9161" ON "__chart__users" ("span", "date", "group") `,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_a770a57c70e668cc61590c9161"`);
+		await queryRunner.query(`DROP INDEX "IDX_337e9599f278bd7537fe30876f"`);
+		await queryRunner.query(`DROP INDEX "IDX_f091abb24193d50c653c6b77fc"`);
+		await queryRunner.query(`DROP INDEX "IDX_ed9b95919c672a13008e9487ee"`);
+		await queryRunner.query(`DROP INDEX "IDX_7c184198ecf66a8d3ecb253ab3"`);
+		await queryRunner.query(`DROP INDEX "IDX_845254b3eaf708ae8a6cac3026"`);
+		await queryRunner.query(`DROP INDEX "IDX_f170de677ea75ad4533de2723e"`);
+		await queryRunner.query(`DROP INDEX "IDX_a319e5dbf47e8a17497623beae"`);
+		await queryRunner.query(`DROP INDEX "IDX_c5870993e25c3d5771f91f5003"`);
+		await queryRunner.query(`DROP INDEX "IDX_d41cce6aee1a50bfc062038f9b"`);
+		await queryRunner.query(`DROP INDEX "IDX_92255988735563f0fe4aba1f05"`);
+		await queryRunner.query(`DROP INDEX "IDX_b070a906db04b44c67c6c2144d"`);
+		await queryRunner.query(`DROP INDEX "IDX_66e1e1ecd2f29e57778af35b59"`);
+		await queryRunner.query(`DROP INDEX "IDX_a0cd75442dd10d0643a17c4a49"`);
+		await queryRunner.query(`DROP INDEX "IDX_d70c86baedc68326be11f9c0ce"`);
+		await queryRunner.query(`DROP INDEX "IDX_bbfa573a8181018851ed0b6357"`);
+		await queryRunner.query(`DROP INDEX "IDX_5c73bf61da4f6e6f15bae88ed1"`);
+		await queryRunner.query(`DROP INDEX "IDX_437bab3c6061d90f6bb65fd2cc"`);
+		await queryRunner.query(`DROP INDEX "IDX_84e661abb7bd1e51b690d4b017"`);
+		await queryRunner.query(`DROP INDEX "IDX_b14489029e4b3aaf4bba5fb524"`);
+		await queryRunner.query(`DROP INDEX "IDX_a5133470f4825902e170328ca5"`);
+		await queryRunner.query(`DROP INDEX "IDX_234dff3c0b56a6150b95431ab9"`);
+		await queryRunner.query(`DROP INDEX "IDX_2be7ec6cebddc14dc11e206686"`);
+		await queryRunner.query(`DROP INDEX "IDX_0c641990ecf47d2545df4edb75"`);
+		await queryRunner.query(`DROP INDEX "IDX_e316f01a6d24eb31db27f88262"`);
+		await queryRunner.query(`DROP INDEX "IDX_229a41ad465f9205f1f5703291"`);
+		await queryRunner.query(`DROP INDEX "IDX_edeb73c09c3143a81bcb34d569"`);
+		await queryRunner.query(`DROP INDEX "IDX_8cf3156fd7a6b15c43459c6e3b"`);
+		await queryRunner.query(`DROP INDEX "IDX_65633a106bce43fc7c5c30a5c7"`);
+		await queryRunner.query(`DROP INDEX "IDX_f7bf4c62059764c2c2bb40fdab"`);
+		await queryRunner.query(`DROP INDEX "IDX_f68a5ab958f9f5fa17a32ac23b"`);
+		await queryRunner.query(`DROP INDEX "IDX_5048e9daccbbbc6d567bb142d3"`);
+		await queryRunner.query(`DROP INDEX "IDX_046feeb12e9ef5f783f409866a"`);
+		await queryRunner.query(`DROP INDEX "IDX_55bf20f366979f2436de99206b"`);
+		await queryRunner.query(`DROP INDEX "IDX_8d2cbbc8114d90d19b44d626b6"`);
+		await queryRunner.query(`DROP INDEX "IDX_84234bd1abb873f07329681c83"`);
+		await queryRunner.query(`DROP INDEX "IDX_4db3b84c7be0d3464714f3e0b1"`);
+		await queryRunner.query(`DROP INDEX "IDX_b77d4dd9562c3a899d9a286fcd"`);
+		await queryRunner.query(`DROP INDEX "IDX_57b5458d0d3d6d1e7f13d4e57f"`);
+		await queryRunner.query(`DROP INDEX "IDX_4b3593098b6edc9c5afe36b18b"`);
+		await queryRunner.query(`DROP INDEX "IDX_f92dd6d03f8d994f29987f6214"`);
+		await queryRunner.query(`DROP INDEX "IDX_7af07790712aa3438ff6773f3b"`);
+		await queryRunner.query(`DROP INDEX "IDX_f2aeafde2ae6fbad38e857631b"`);
+		await queryRunner.query(`DROP INDEX "IDX_30bf67687f483ace115c5ca642"`);
+		await queryRunner.query(`DROP INDEX "IDX_42ea9381f0fda8dfe0fa1c8b53"`);
+		await queryRunner.query(`DROP INDEX "IDX_e496ca8096d28f6b9b509264dc"`);
+		await queryRunner.query(`DROP INDEX "IDX_328f259961e60c4fa0bfcf55ca"`);
+		await queryRunner.query(`DROP INDEX "IDX_5f86db6492274e07c1a3cdf286"`);
+		await queryRunner.query(`DROP INDEX "IDX_924fc196c80ca24bae01dd37e4"`);
+		await queryRunner.query(`DROP INDEX "IDX_f09d543e3acb16c5976bdb31fa"`);
+		await queryRunner.query(`DROP INDEX "IDX_0c9a159c5082cbeef3ca6706b5"`);
+		await queryRunner.query(`DROP INDEX "IDX_7036f2957151588b813185c794"`);
+		await queryRunner.query(`DROP INDEX "IDX_e69096589f11e3baa98ddd64d0"`);
+		await queryRunner.query(`DROP INDEX "IDX_42eb716a37d381cdf566192b2b"`);
+		await queryRunner.query(`DROP INDEX "IDX_9ff6944f01acb756fdc92d7563"`);
+		await queryRunner.query(`DROP INDEX "IDX_0a905b992fecd2b5c3fb98759e"`);
+		await queryRunner.query(`DROP INDEX "IDX_08fac0eb3b11f04c200c0b40dd"`);
+		await queryRunner.query(`DROP INDEX "IDX_7b5da130992ec9df96712d4290"`);
+		await queryRunner.query(`DROP INDEX "IDX_f8dd01baeded2ffa833e0a610a"`);
+		await queryRunner.query(`DROP INDEX "IDX_a1efd3e0048a5f2793a47360dc"`);
+		await queryRunner.query(`DROP INDEX "IDX_f5448d9633cff74208d850aabe"`);
+		await queryRunner.query(`DROP INDEX "IDX_39ee857ab2f23493037c6b6631"`);
+		await queryRunner.query(`DROP INDEX "IDX_d0a4f79af5a97b08f37b547197"`);
+		await queryRunner.query(`DROP INDEX "IDX_da8a46ba84ca1d8bb5a29bfb63"`);
+		await queryRunner.query(`DROP INDEX "IDX_c12f0af4a66cdd30c2287ce8aa"`);
+		await queryRunner.query(`DROP INDEX "IDX_6b8f34a1a64b06014b6fb66824"`);
+		await queryRunner.query(`DROP INDEX "IDX_6d6f156ceefc6bc5f273a0e370"`);
+		await queryRunner.query(`DROP INDEX "IDX_25a97c02003338124b2b75fdbc"`);
+		await queryRunner.query(`DROP INDEX "IDX_49975586f50ed7b800fdd88fbd"`);
+		await queryRunner.query(`DROP INDEX "IDX_99a7d2faaef84a6f728d714ad6"`);
+		await queryRunner.query(`DROP INDEX "IDX_fcc181fb8283009c61cc4083ef"`);
+		await queryRunner.query(`DROP INDEX "IDX_07747a1038c05f532a718fe1de"`);
+		await queryRunner.query(`DROP INDEX "IDX_e9cd07672b37d8966cf3709283"`);
+		await queryRunner.query(`DROP INDEX "IDX_dd907becf76104e4b656659e6b"`);
+		await queryRunner.query(`DROP INDEX "IDX_2d416e6af791a82e338c79d480"`);
+		await queryRunner.query(`DROP INDEX "IDX_76e87c7bfc5d925fcbba405d84"`);
+		await queryRunner.query(`DROP INDEX "IDX_e447064455928cf627590ef527"`);
+		await queryRunner.query(`DROP INDEX "IDX_36cb699c49580d4e6c2e6159f9"`);
+		await queryRunner.query(`DROP INDEX "IDX_06690fc959f1c9fdaf21928222"`);
+		await queryRunner.query(`DROP INDEX "IDX_3313d7288855ec105b5bbf6c21"`);
+		await queryRunner.query(`DROP INDEX "IDX_6e1df243476e20cbf86572ecc0"`);
+		await queryRunner.query(`DROP INDEX "IDX_7a170f67425e62a8fabb76c872"`);
+		await queryRunner.query(`DROP INDEX "IDX_3fa0d0f17ca72e3dc80999a032"`);
+		await queryRunner.query(`DROP INDEX "IDX_13565815f618a1ff53886c5b28"`);
+		await queryRunner.query(`DROP INDEX "IDX_c26e2c1cbb6e911e0554b27416"`);
+		await queryRunner.query(`DROP INDEX "IDX_9a3ed15a30ab7e3a37702e6e08"`);
+		await queryRunner.query(`DROP INDEX "IDX_20f57cc8f142c131340ee16742"`);
+		await queryRunner.query(`DROP INDEX "IDX_00ed5f86db1f7efafb1978bf21"`);
+		await queryRunner.query(`DROP INDEX "IDX_15e91a03aeeac9dbccdf43fc06"`);
+		await queryRunner.query(`DROP INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc"`);
+		await queryRunner.query(`DROP INDEX "IDX_90148bbc2bf0854428786bfc15"`);
+		await queryRunner.query(`DROP INDEX "IDX_88937d94d7443d9a99a76fa5c0"`);
+		await queryRunner.query(`DROP INDEX "IDX_54ebcb6d27222913b908d56fd8"`);
+		await queryRunner.query(`DROP INDEX "IDX_796a8c03959361f97dc2be1d5c"`);
+		await queryRunner.query(`DROP INDEX "IDX_25dfc71b0369b003a4cd434d0b"`);
+		await queryRunner.query(`DROP INDEX "IDX_51c063b6a133a9cb87145450f5"`);
+		await queryRunner.query(`DROP INDEX "IDX_fa99d777623947a5b05f394cae"`);
+		await queryRunner.query(`DROP INDEX "IDX_315c779174fe8247ab324f036e"`);
+		await queryRunner.query(`DROP INDEX "IDX_c5d46cbfda48b1c33ed852e21b"`);
+		await queryRunner.query(`DROP INDEX "IDX_8cb40cfc8f3c28261e6f887b03"`);
+	}
 }
diff --git a/packages/backend/migration/1562422242907-PasswordLessLogin.js b/packages/backend/migration/1562422242907-PasswordLessLogin.js
index b73c7db4d..8e1280830 100644
--- a/packages/backend/migration/1562422242907-PasswordLessLogin.js
+++ b/packages/backend/migration/1562422242907-PasswordLessLogin.js
@@ -1,10 +1,12 @@
-
-
 export class PasswordLessLogin1562422242907 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "usePasswordLessLogin" boolean DEFAULT false NOT NULL`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "usePasswordLessLogin"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD COLUMN "usePasswordLessLogin" boolean DEFAULT false NOT NULL`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "usePasswordLessLogin"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1562444565093-PinnedPage.js b/packages/backend/migration/1562444565093-PinnedPage.js
index 9a999a915..dcb342d3f 100644
--- a/packages/backend/migration/1562444565093-PinnedPage.js
+++ b/packages/backend/migration/1562444565093-PinnedPage.js
@@ -1,14 +1,24 @@
-
-
 export class PinnedPage1562444565093 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "pinnedPageId" character varying(32)`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "UQ_6dc44f1ceb65b1e72bacef2ca27" UNIQUE ("pinnedPageId")`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "FK_6dc44f1ceb65b1e72bacef2ca27" FOREIGN KEY ("pinnedPageId") REFERENCES "page"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "FK_6dc44f1ceb65b1e72bacef2ca27"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "UQ_6dc44f1ceb65b1e72bacef2ca27"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "pinnedPageId"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "pinnedPageId" character varying(32)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD CONSTRAINT "UQ_6dc44f1ceb65b1e72bacef2ca27" UNIQUE ("pinnedPageId")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD CONSTRAINT "FK_6dc44f1ceb65b1e72bacef2ca27" FOREIGN KEY ("pinnedPageId") REFERENCES "page"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP CONSTRAINT "FK_6dc44f1ceb65b1e72bacef2ca27"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP CONSTRAINT "UQ_6dc44f1ceb65b1e72bacef2ca27"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "pinnedPageId"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1562448332510-PageTitleHideOption.js b/packages/backend/migration/1562448332510-PageTitleHideOption.js
index 8fc78d202..9a1b42f4b 100644
--- a/packages/backend/migration/1562448332510-PageTitleHideOption.js
+++ b/packages/backend/migration/1562448332510-PageTitleHideOption.js
@@ -1,10 +1,12 @@
-
-
 export class PageTitleHideOption1562448332510 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "page" ADD "hideTitleWhenPinned" boolean NOT NULL DEFAULT false`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "hideTitleWhenPinned"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "page" ADD "hideTitleWhenPinned" boolean NOT NULL DEFAULT false`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "page" DROP COLUMN "hideTitleWhenPinned"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1562869971568-ModerationLog.js b/packages/backend/migration/1562869971568-ModerationLog.js
index dd66d16ee..f652b067b 100644
--- a/packages/backend/migration/1562869971568-ModerationLog.js
+++ b/packages/backend/migration/1562869971568-ModerationLog.js
@@ -1,14 +1,20 @@
-
-
 export class ModerationLog1562869971568 {
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "moderation_log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "type" character varying(128) NOT NULL, "info" jsonb NOT NULL, CONSTRAINT "PK_d0adca6ecfd068db83e4526cc26" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_a08ad074601d204e0f69da9a95" ON "moderation_log" ("userId") `);
-        await queryRunner.query(`ALTER TABLE "moderation_log" ADD CONSTRAINT "FK_a08ad074601d204e0f69da9a954" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "moderation_log" DROP CONSTRAINT "FK_a08ad074601d204e0f69da9a954"`);
-        await queryRunner.query(`DROP INDEX "IDX_a08ad074601d204e0f69da9a95"`);
-        await queryRunner.query(`DROP TABLE "moderation_log"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "moderation_log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "type" character varying(128) NOT NULL, "info" jsonb NOT NULL, CONSTRAINT "PK_d0adca6ecfd068db83e4526cc26" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a08ad074601d204e0f69da9a95" ON "moderation_log" ("userId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "moderation_log" ADD CONSTRAINT "FK_a08ad074601d204e0f69da9a954" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "moderation_log" DROP CONSTRAINT "FK_a08ad074601d204e0f69da9a954"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_a08ad074601d204e0f69da9a95"`);
+		await queryRunner.query(`DROP TABLE "moderation_log"`);
+	}
 }
diff --git a/packages/backend/migration/1563757595828-UsedUsername.js b/packages/backend/migration/1563757595828-UsedUsername.js
index 8972df297..2cf5d8c74 100644
--- a/packages/backend/migration/1563757595828-UsedUsername.js
+++ b/packages/backend/migration/1563757595828-UsedUsername.js
@@ -1,10 +1,10 @@
-
-
 export class UsedUsername1563757595828 {
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "used_username" ("username" character varying(128) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, CONSTRAINT "PK_78fd79d2d24c6ac2f4cc9a31a5d" PRIMARY KEY ("username"))`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP TABLE "used_username"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "used_username" ("username" character varying(128) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, CONSTRAINT "PK_78fd79d2d24c6ac2f4cc9a31a5d" PRIMARY KEY ("username"))`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP TABLE "used_username"`);
+	}
 }
diff --git a/packages/backend/migration/1565634203341-room.js b/packages/backend/migration/1565634203341-room.js
index 679940f24..1023c0a31 100644
--- a/packages/backend/migration/1565634203341-room.js
+++ b/packages/backend/migration/1565634203341-room.js
@@ -1,10 +1,10 @@
-
-
 export class room1565634203341 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "room" jsonb NOT NULL DEFAULT '{}'`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "room"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "room" jsonb NOT NULL DEFAULT '{}'`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "room"`);
+	}
 }
diff --git a/packages/backend/migration/1571220798684-CustomEmojiCategory.js b/packages/backend/migration/1571220798684-CustomEmojiCategory.js
index 37c07366e..4d7531332 100644
--- a/packages/backend/migration/1571220798684-CustomEmojiCategory.js
+++ b/packages/backend/migration/1571220798684-CustomEmojiCategory.js
@@ -1,10 +1,14 @@
-
-
 export class CustomEmojiCategory1571220798684 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "emoji" ADD "category" character varying(128)`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "category"`, undefined);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "emoji" ADD "category" character varying(128)`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "emoji" DROP COLUMN "category"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1572760203493-nodeinfo.js b/packages/backend/migration/1572760203493-nodeinfo.js
index 54d5f914a..eea87c82c 100644
--- a/packages/backend/migration/1572760203493-nodeinfo.js
+++ b/packages/backend/migration/1572760203493-nodeinfo.js
@@ -1,26 +1,78 @@
-
-
 export class nodeinfo1572760203493 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "system"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "softwareName" character varying(64) DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "softwareVersion" character varying(64) DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "openRegistrations" boolean DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "name" character varying(256) DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "description" character varying(4096) DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "maintainerName" character varying(128) DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "maintainerEmail" character varying(256) DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "infoUpdatedAt" TIMESTAMP WITH TIME ZONE`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "infoUpdatedAt"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "maintainerEmail"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "maintainerName"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "description"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "name"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "openRegistrations"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "softwareVersion"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "softwareName"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "system" character varying(64)`, undefined);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "instance" DROP COLUMN "system"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "softwareName" character varying(64) DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "softwareVersion" character varying(64) DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "openRegistrations" boolean DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "name" character varying(256) DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "description" character varying(4096) DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "maintainerName" character varying(128) DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "maintainerEmail" character varying(256) DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "infoUpdatedAt" TIMESTAMP WITH TIME ZONE`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "instance" DROP COLUMN "infoUpdatedAt"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" DROP COLUMN "maintainerEmail"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" DROP COLUMN "maintainerName"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" DROP COLUMN "description"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" DROP COLUMN "name"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" DROP COLUMN "openRegistrations"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" DROP COLUMN "softwareVersion"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" DROP COLUMN "softwareName"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "system" character varying(64)`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1576269851876-TalkFederationId.js b/packages/backend/migration/1576269851876-TalkFederationId.js
index 35861d571..f0aed7dd8 100644
--- a/packages/backend/migration/1576269851876-TalkFederationId.js
+++ b/packages/backend/migration/1576269851876-TalkFederationId.js
@@ -1,13 +1,17 @@
-
-
 export class TalkFederationId1576269851876 {
-    constructor() {
-        this.name = 'TalkFederationId1576269851876';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "messaging_message" ADD "uri" character varying(512)`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "messaging_message" DROP COLUMN "uri"`, undefined);
-    }
+	constructor() {
+		this.name = "TalkFederationId1576269851876";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" ADD "uri" character varying(512)`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "messaging_message" DROP COLUMN "uri"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1576869585998-ProxyRemoteFiles.js b/packages/backend/migration/1576869585998-ProxyRemoteFiles.js
index d6d134be4..5565f64b6 100644
--- a/packages/backend/migration/1576869585998-ProxyRemoteFiles.js
+++ b/packages/backend/migration/1576869585998-ProxyRemoteFiles.js
@@ -1,13 +1,17 @@
-
-
 export class ProxyRemoteFiles1576869585998 {
-    constructor() {
-        this.name = 'ProxyRemoteFiles1576869585998';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "proxyRemoteFiles" boolean NOT NULL DEFAULT false`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "proxyRemoteFiles"`, undefined);
-    }
+	constructor() {
+		this.name = "ProxyRemoteFiles1576869585998";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "proxyRemoteFiles" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "proxyRemoteFiles"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1579267006611-v12.js b/packages/backend/migration/1579267006611-v12.js
index 7f6318a19..f1d906465 100644
--- a/packages/backend/migration/1579267006611-v12.js
+++ b/packages/backend/migration/1579267006611-v12.js
@@ -1,33 +1,91 @@
-
-
 export class v121579267006611 {
-    constructor() {
-        this.name = 'v121579267006611';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "announcement" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "text" character varying(8192) NOT NULL, "title" character varying(256) NOT NULL, "imageUrl" character varying(1024), CONSTRAINT "PK_e0ef0550174fd1099a308fd18a0" PRIMARY KEY ("id"))`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_118ec703e596086fc4515acb39" ON "announcement" ("createdAt") `, undefined);
-        await queryRunner.query(`CREATE TABLE "announcement_read" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "announcementId" character varying(32) NOT NULL, CONSTRAINT "PK_4b90ad1f42681d97b2683890c5e" PRIMARY KEY ("id"))`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_8288151386172b8109f7239ab2" ON "announcement_read" ("userId") `, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_603a7b1e7aa0533c6c88e9bfaf" ON "announcement_read" ("announcementId") `, undefined);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_924fa71815cfa3941d003702a0" ON "announcement_read" ("userId", "announcementId") `, undefined);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isVerified"`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "announcements"`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableEmojiReaction"`, undefined);
-        await queryRunner.query(`ALTER TABLE "announcement_read" ADD CONSTRAINT "FK_8288151386172b8109f7239ab28" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "announcement_read" ADD CONSTRAINT "FK_603a7b1e7aa0533c6c88e9bfafe" FOREIGN KEY ("announcementId") REFERENCES "announcement"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "announcement_read" DROP CONSTRAINT "FK_603a7b1e7aa0533c6c88e9bfafe"`, undefined);
-        await queryRunner.query(`ALTER TABLE "announcement_read" DROP CONSTRAINT "FK_8288151386172b8109f7239ab28"`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "enableEmojiReaction" boolean NOT NULL DEFAULT true`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "announcements" jsonb NOT NULL DEFAULT '[]'`, undefined);
-        await queryRunner.query(`ALTER TABLE "user" ADD "isVerified" boolean NOT NULL DEFAULT false`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_924fa71815cfa3941d003702a0"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_603a7b1e7aa0533c6c88e9bfaf"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_8288151386172b8109f7239ab2"`, undefined);
-        await queryRunner.query(`DROP TABLE "announcement_read"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_118ec703e596086fc4515acb39"`, undefined);
-        await queryRunner.query(`DROP TABLE "announcement"`, undefined);
-    }
+	constructor() {
+		this.name = "v121579267006611";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "announcement" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "text" character varying(8192) NOT NULL, "title" character varying(256) NOT NULL, "imageUrl" character varying(1024), CONSTRAINT "PK_e0ef0550174fd1099a308fd18a0" PRIMARY KEY ("id"))`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_118ec703e596086fc4515acb39" ON "announcement" ("createdAt") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "announcement_read" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "announcementId" character varying(32) NOT NULL, CONSTRAINT "PK_4b90ad1f42681d97b2683890c5e" PRIMARY KEY ("id"))`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8288151386172b8109f7239ab2" ON "announcement_read" ("userId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_603a7b1e7aa0533c6c88e9bfaf" ON "announcement_read" ("announcementId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_924fa71815cfa3941d003702a0" ON "announcement_read" ("userId", "announcementId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" DROP COLUMN "isVerified"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "announcements"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "enableEmojiReaction"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "announcement_read" ADD CONSTRAINT "FK_8288151386172b8109f7239ab28" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "announcement_read" ADD CONSTRAINT "FK_603a7b1e7aa0533c6c88e9bfafe" FOREIGN KEY ("announcementId") REFERENCES "announcement"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "announcement_read" DROP CONSTRAINT "FK_603a7b1e7aa0533c6c88e9bfafe"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "announcement_read" DROP CONSTRAINT "FK_8288151386172b8109f7239ab28"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "enableEmojiReaction" boolean NOT NULL DEFAULT true`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "announcements" jsonb NOT NULL DEFAULT '[]'`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "isVerified" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_924fa71815cfa3941d003702a0"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_603a7b1e7aa0533c6c88e9bfaf"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_8288151386172b8109f7239ab2"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TABLE "announcement_read"`, undefined);
+		await queryRunner.query(
+			`DROP INDEX "IDX_118ec703e596086fc4515acb39"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TABLE "announcement"`, undefined);
+	}
 }
diff --git a/packages/backend/migration/1579270193251-v12-2.js b/packages/backend/migration/1579270193251-v12-2.js
index c51ce6306..6bbcdcc15 100644
--- a/packages/backend/migration/1579270193251-v12-2.js
+++ b/packages/backend/migration/1579270193251-v12-2.js
@@ -1,13 +1,17 @@
-
-
 export class v1221579270193251 {
-    constructor() {
-        this.name = 'v1221579270193251';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "announcement_read" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "announcement_read" DROP COLUMN "createdAt"`, undefined);
-    }
+	constructor() {
+		this.name = "v1221579270193251";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "announcement_read" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "announcement_read" DROP COLUMN "createdAt"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1579282808087-v12-3.js b/packages/backend/migration/1579282808087-v12-3.js
index aeb4f5a87..d5a9a86b5 100644
--- a/packages/backend/migration/1579282808087-v12-3.js
+++ b/packages/backend/migration/1579282808087-v12-3.js
@@ -1,13 +1,17 @@
-
-
 export class v1231579282808087 {
-    constructor() {
-        this.name = 'v1231579282808087';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "announcement" ADD "updatedAt" TIMESTAMP WITH TIME ZONE`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "announcement" DROP COLUMN "updatedAt"`, undefined);
-    }
+	constructor() {
+		this.name = "v1231579282808087";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "announcement" ADD "updatedAt" TIMESTAMP WITH TIME ZONE`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "announcement" DROP COLUMN "updatedAt"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1579544426412-v12-4.js b/packages/backend/migration/1579544426412-v12-4.js
index f1e093413..efd6ee61b 100644
--- a/packages/backend/migration/1579544426412-v12-4.js
+++ b/packages/backend/migration/1579544426412-v12-4.js
@@ -1,15 +1,25 @@
-
-
 export class v1241579544426412 {
-    constructor() {
-        this.name = 'v1241579544426412';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "notification" ADD "followRequestId" character varying(32)`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_bd7fab507621e635b32cd31892c" FOREIGN KEY ("followRequestId") REFERENCES "follow_request"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_bd7fab507621e635b32cd31892c"`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "followRequestId"`, undefined);
-    }
+	constructor() {
+		this.name = "v1241579544426412";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD "followRequestId" character varying(32)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD CONSTRAINT "FK_bd7fab507621e635b32cd31892c" FOREIGN KEY ("followRequestId") REFERENCES "follow_request"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP CONSTRAINT "FK_bd7fab507621e635b32cd31892c"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP COLUMN "followRequestId"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1579977526288-v12-5.js b/packages/backend/migration/1579977526288-v12-5.js
index 6d2b5c584..f71c28755 100644
--- a/packages/backend/migration/1579977526288-v12-5.js
+++ b/packages/backend/migration/1579977526288-v12-5.js
@@ -1,53 +1,156 @@
-
-
 export class v1251579977526288 {
-    constructor() {
-        this.name = 'v1251579977526288';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "clip" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "isPublic" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_f0685dac8d4dd056d7255670b75" PRIMARY KEY ("id"))`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_2b5ec6c574d6802c94c80313fb" ON "clip" ("userId") `, undefined);
-        await queryRunner.query(`CREATE TABLE "clip_note" ("id" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "clipId" character varying(32) NOT NULL, CONSTRAINT "PK_e94cda2f40a99b57e032a1a738b" PRIMARY KEY ("id"))`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_a012eaf5c87c65da1deb5fdbfa" ON "clip_note" ("noteId") `, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_ebe99317bbbe9968a0c6f579ad" ON "clip_note" ("clipId") `, undefined);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_6fc0ec357d55a18646262fdfff" ON "clip_note" ("noteId", "clipId") `, undefined);
-        await queryRunner.query(`CREATE TYPE "antenna_src_enum" AS ENUM('home', 'all', 'list')`, undefined);
-        await queryRunner.query(`CREATE TABLE "antenna" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "src" "antenna_src_enum" NOT NULL, "userListId" character varying(32), "keywords" jsonb NOT NULL DEFAULT '[]', "withFile" boolean NOT NULL, "expression" character varying(2048), "notify" boolean NOT NULL, "hasNewNote" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_c170b99775e1dccca947c9f2d5f" PRIMARY KEY ("id"))`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_6446c571a0e8d0f05f01c78909" ON "antenna" ("userId") `, undefined);
-        await queryRunner.query(`CREATE TABLE "antenna_note" ("id" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "antennaId" character varying(32) NOT NULL, CONSTRAINT "PK_fb28d94d0989a3872df19fd6ef8" PRIMARY KEY ("id"))`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_bd0397be22147e17210940e125" ON "antenna_note" ("noteId") `, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_0d775946662d2575dfd2068a5f" ON "antenna_note" ("antennaId") `, undefined);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_335a0bf3f904406f9ef3dd51c2" ON "antenna_note" ("noteId", "antennaId") `, undefined);
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "geo"`, undefined);
-        await queryRunner.query(`ALTER TABLE "clip" ADD CONSTRAINT "FK_2b5ec6c574d6802c94c80313fb2" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "clip_note" ADD CONSTRAINT "FK_a012eaf5c87c65da1deb5fdbfa3" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "clip_note" ADD CONSTRAINT "FK_ebe99317bbbe9968a0c6f579adf" FOREIGN KEY ("clipId") REFERENCES "clip"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" ADD CONSTRAINT "FK_6446c571a0e8d0f05f01c789096" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" ADD CONSTRAINT "FK_709d7d32053d0dd7620f678eeb9" FOREIGN KEY ("userListId") REFERENCES "user_list"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna_note" ADD CONSTRAINT "FK_bd0397be22147e17210940e125b" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna_note" ADD CONSTRAINT "FK_0d775946662d2575dfd2068a5f5" FOREIGN KEY ("antennaId") REFERENCES "antenna"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "antenna_note" DROP CONSTRAINT "FK_0d775946662d2575dfd2068a5f5"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna_note" DROP CONSTRAINT "FK_bd0397be22147e17210940e125b"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" DROP CONSTRAINT "FK_709d7d32053d0dd7620f678eeb9"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" DROP CONSTRAINT "FK_6446c571a0e8d0f05f01c789096"`, undefined);
-        await queryRunner.query(`ALTER TABLE "clip_note" DROP CONSTRAINT "FK_ebe99317bbbe9968a0c6f579adf"`, undefined);
-        await queryRunner.query(`ALTER TABLE "clip_note" DROP CONSTRAINT "FK_a012eaf5c87c65da1deb5fdbfa3"`, undefined);
-        await queryRunner.query(`ALTER TABLE "clip" DROP CONSTRAINT "FK_2b5ec6c574d6802c94c80313fb2"`, undefined);
-        await queryRunner.query(`ALTER TABLE "note" ADD "geo" jsonb`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_335a0bf3f904406f9ef3dd51c2"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_0d775946662d2575dfd2068a5f"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_bd0397be22147e17210940e125"`, undefined);
-        await queryRunner.query(`DROP TABLE "antenna_note"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_6446c571a0e8d0f05f01c78909"`, undefined);
-        await queryRunner.query(`DROP TABLE "antenna"`, undefined);
-        await queryRunner.query(`DROP TYPE "antenna_src_enum"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_6fc0ec357d55a18646262fdfff"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_ebe99317bbbe9968a0c6f579ad"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_a012eaf5c87c65da1deb5fdbfa"`, undefined);
-        await queryRunner.query(`DROP TABLE "clip_note"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_2b5ec6c574d6802c94c80313fb"`, undefined);
-        await queryRunner.query(`DROP TABLE "clip"`, undefined);
-    }
+	constructor() {
+		this.name = "v1251579977526288";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "clip" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "isPublic" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_f0685dac8d4dd056d7255670b75" PRIMARY KEY ("id"))`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2b5ec6c574d6802c94c80313fb" ON "clip" ("userId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "clip_note" ("id" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "clipId" character varying(32) NOT NULL, CONSTRAINT "PK_e94cda2f40a99b57e032a1a738b" PRIMARY KEY ("id"))`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a012eaf5c87c65da1deb5fdbfa" ON "clip_note" ("noteId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_ebe99317bbbe9968a0c6f579ad" ON "clip_note" ("clipId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_6fc0ec357d55a18646262fdfff" ON "clip_note" ("noteId", "clipId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "antenna_src_enum" AS ENUM('home', 'all', 'list')`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "antenna" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "src" "antenna_src_enum" NOT NULL, "userListId" character varying(32), "keywords" jsonb NOT NULL DEFAULT '[]', "withFile" boolean NOT NULL, "expression" character varying(2048), "notify" boolean NOT NULL, "hasNewNote" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_c170b99775e1dccca947c9f2d5f" PRIMARY KEY ("id"))`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_6446c571a0e8d0f05f01c78909" ON "antenna" ("userId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "antenna_note" ("id" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "antennaId" character varying(32) NOT NULL, CONSTRAINT "PK_fb28d94d0989a3872df19fd6ef8" PRIMARY KEY ("id"))`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_bd0397be22147e17210940e125" ON "antenna_note" ("noteId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0d775946662d2575dfd2068a5f" ON "antenna_note" ("antennaId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_335a0bf3f904406f9ef3dd51c2" ON "antenna_note" ("noteId", "antennaId") `,
+			undefined,
+		);
+		await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "geo"`, undefined);
+		await queryRunner.query(
+			`ALTER TABLE "clip" ADD CONSTRAINT "FK_2b5ec6c574d6802c94c80313fb2" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "clip_note" ADD CONSTRAINT "FK_a012eaf5c87c65da1deb5fdbfa3" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "clip_note" ADD CONSTRAINT "FK_ebe99317bbbe9968a0c6f579adf" FOREIGN KEY ("clipId") REFERENCES "clip"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD CONSTRAINT "FK_6446c571a0e8d0f05f01c789096" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD CONSTRAINT "FK_709d7d32053d0dd7620f678eeb9" FOREIGN KEY ("userListId") REFERENCES "user_list"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna_note" ADD CONSTRAINT "FK_bd0397be22147e17210940e125b" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna_note" ADD CONSTRAINT "FK_0d775946662d2575dfd2068a5f5" FOREIGN KEY ("antennaId") REFERENCES "antenna"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "antenna_note" DROP CONSTRAINT "FK_0d775946662d2575dfd2068a5f5"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna_note" DROP CONSTRAINT "FK_bd0397be22147e17210940e125b"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" DROP CONSTRAINT "FK_709d7d32053d0dd7620f678eeb9"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" DROP CONSTRAINT "FK_6446c571a0e8d0f05f01c789096"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "clip_note" DROP CONSTRAINT "FK_ebe99317bbbe9968a0c6f579adf"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "clip_note" DROP CONSTRAINT "FK_a012eaf5c87c65da1deb5fdbfa3"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "clip" DROP CONSTRAINT "FK_2b5ec6c574d6802c94c80313fb2"`,
+			undefined,
+		);
+		await queryRunner.query(`ALTER TABLE "note" ADD "geo" jsonb`, undefined);
+		await queryRunner.query(
+			`DROP INDEX "IDX_335a0bf3f904406f9ef3dd51c2"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_0d775946662d2575dfd2068a5f"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_bd0397be22147e17210940e125"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TABLE "antenna_note"`, undefined);
+		await queryRunner.query(
+			`DROP INDEX "IDX_6446c571a0e8d0f05f01c78909"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TABLE "antenna"`, undefined);
+		await queryRunner.query(`DROP TYPE "antenna_src_enum"`, undefined);
+		await queryRunner.query(
+			`DROP INDEX "IDX_6fc0ec357d55a18646262fdfff"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_ebe99317bbbe9968a0c6f579ad"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_a012eaf5c87c65da1deb5fdbfa"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TABLE "clip_note"`, undefined);
+		await queryRunner.query(
+			`DROP INDEX "IDX_2b5ec6c574d6802c94c80313fb"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TABLE "clip"`, undefined);
+	}
 }
diff --git a/packages/backend/migration/1579993013959-v12-6.js b/packages/backend/migration/1579993013959-v12-6.js
index 3941c1391..fc954c361 100644
--- a/packages/backend/migration/1579993013959-v12-6.js
+++ b/packages/backend/migration/1579993013959-v12-6.js
@@ -1,17 +1,33 @@
-
-
 export class v1261579993013959 {
-    constructor() {
-        this.name = 'v1261579993013959';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "hasNewNote"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna_note" ADD "read" boolean NOT NULL DEFAULT false`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_9937ea48d7ae97ffb4f3f063a4" ON "antenna_note" ("read") `, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_9937ea48d7ae97ffb4f3f063a4"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna_note" DROP COLUMN "read"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "hasNewNote" boolean NOT NULL DEFAULT false`, undefined);
-    }
+	constructor() {
+		this.name = "v1261579993013959";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "antenna" DROP COLUMN "hasNewNote"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna_note" ADD "read" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_9937ea48d7ae97ffb4f3f063a4" ON "antenna_note" ("read") `,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`DROP INDEX "IDX_9937ea48d7ae97ffb4f3f063a4"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna_note" DROP COLUMN "read"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD "hasNewNote" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1580069531114-v12-7.js b/packages/backend/migration/1580069531114-v12-7.js
index 4b4790cb7..c4214ddf1 100644
--- a/packages/backend/migration/1580069531114-v12-7.js
+++ b/packages/backend/migration/1580069531114-v12-7.js
@@ -1,23 +1,51 @@
-
-
 export class v1271580069531114 {
-    constructor() {
-        this.name = 'v1271580069531114';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "users" character varying(1024) array NOT NULL DEFAULT '{}'::varchar[]`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "caseSensitive" boolean NOT NULL DEFAULT false`, undefined);
-        await queryRunner.query(`ALTER TYPE "public"."antenna_src_enum" RENAME TO "antenna_src_enum_old"`, undefined);
-        await queryRunner.query(`CREATE TYPE "antenna_src_enum" AS ENUM('home', 'all', 'users', 'list')`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum" USING "src"::"text"::"antenna_src_enum"`, undefined);
-        await queryRunner.query(`DROP TYPE "antenna_src_enum_old"`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "antenna_src_enum_old" AS ENUM('home', 'all', 'list')`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum_old" USING "src"::"text"::"antenna_src_enum_old"`, undefined);
-        await queryRunner.query(`DROP TYPE "antenna_src_enum"`, undefined);
-        await queryRunner.query(`ALTER TYPE "antenna_src_enum_old" RENAME TO  "antenna_src_enum"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "caseSensitive"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "users"`, undefined);
-    }
+	constructor() {
+		this.name = "v1271580069531114";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD "users" character varying(1024) array NOT NULL DEFAULT '{}'::varchar[]`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD "caseSensitive" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TYPE "public"."antenna_src_enum" RENAME TO "antenna_src_enum_old"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "antenna_src_enum" AS ENUM('home', 'all', 'users', 'list')`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum" USING "src"::"text"::"antenna_src_enum"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TYPE "antenna_src_enum_old"`, undefined);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`CREATE TYPE "antenna_src_enum_old" AS ENUM('home', 'all', 'list')`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum_old" USING "src"::"text"::"antenna_src_enum_old"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TYPE "antenna_src_enum"`, undefined);
+		await queryRunner.query(
+			`ALTER TYPE "antenna_src_enum_old" RENAME TO  "antenna_src_enum"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" DROP COLUMN "caseSensitive"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" DROP COLUMN "users"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1580148575182-v12-8.js b/packages/backend/migration/1580148575182-v12-8.js
index cc30200c1..11b792b7e 100644
--- a/packages/backend/migration/1580148575182-v12-8.js
+++ b/packages/backend/migration/1580148575182-v12-8.js
@@ -1,15 +1,25 @@
-
-
 export class v1281580148575182 {
-    constructor() {
-        this.name = 'v1281580148575182';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_ec5c201576192ba8904c345c5cc"`, undefined);
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "appId"`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "appId" character varying(32)`, undefined);
-        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_ec5c201576192ba8904c345c5cc" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE SET NULL ON UPDATE NO ACTION`, undefined);
-    }
+	constructor() {
+		this.name = "v1281580148575182";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "note" DROP CONSTRAINT "FK_ec5c201576192ba8904c345c5cc"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" DROP COLUMN "appId"`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "note" ADD "appId" character varying(32)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" ADD CONSTRAINT "FK_ec5c201576192ba8904c345c5cc" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1580154400017-v12-9.js b/packages/backend/migration/1580154400017-v12-9.js
index 3715798f1..19f8be095 100644
--- a/packages/backend/migration/1580154400017-v12-9.js
+++ b/packages/backend/migration/1580154400017-v12-9.js
@@ -1,13 +1,17 @@
-
-
 export class v1291580154400017 {
-    constructor() {
-        this.name = 'v1291580154400017';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "withReplies" boolean NOT NULL DEFAULT false`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "withReplies"`, undefined);
-    }
+	constructor() {
+		this.name = "v1291580154400017";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD "withReplies" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "antenna" DROP COLUMN "withReplies"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1580276619901-v12-10.js b/packages/backend/migration/1580276619901-v12-10.js
index d5decb882..e5dd1db5e 100644
--- a/packages/backend/migration/1580276619901-v12-10.js
+++ b/packages/backend/migration/1580276619901-v12-10.js
@@ -1,18 +1,31 @@
-
-
 export class v12101580276619901 {
-    constructor() {
-        this.name = 'v12101580276619901';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`TRUNCATE TABLE "notification"`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "type"`, undefined);
-        await queryRunner.query(`CREATE TYPE "notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted')`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ADD "type" "notification_type_enum" NOT NULL`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "type"`, undefined);
-        await queryRunner.query(`DROP TYPE "notification_type_enum"`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ADD "type" character varying(32) NOT NULL`, undefined);
-    }
+	constructor() {
+		this.name = "v12101580276619901";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(`TRUNCATE TABLE "notification"`, undefined);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP COLUMN "type"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted')`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD "type" "notification_type_enum" NOT NULL`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP COLUMN "type"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TYPE "notification_type_enum"`, undefined);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD "type" character varying(32) NOT NULL`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1580331224276-v12-11.js b/packages/backend/migration/1580331224276-v12-11.js
index 129720adb..c31dca175 100644
--- a/packages/backend/migration/1580331224276-v12-11.js
+++ b/packages/backend/migration/1580331224276-v12-11.js
@@ -1,17 +1,33 @@
-
-
 export class v12111580331224276 {
-    constructor() {
-        this.name = 'v12111580331224276';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "isMarkedAsClosed"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "isSuspended" boolean NOT NULL DEFAULT false`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_34500da2e38ac393f7bb6b299c" ON "instance" ("isSuspended") `, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_34500da2e38ac393f7bb6b299c"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "isSuspended"`, undefined);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "isMarkedAsClosed" boolean NOT NULL DEFAULT false`, undefined);
-    }
+	constructor() {
+		this.name = "v12111580331224276";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "instance" DROP COLUMN "isMarkedAsClosed"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "isSuspended" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_34500da2e38ac393f7bb6b299c" ON "instance" ("isSuspended") `,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`DROP INDEX "IDX_34500da2e38ac393f7bb6b299c"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" DROP COLUMN "isSuspended"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "isMarkedAsClosed" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1580508795118-v12-12.js b/packages/backend/migration/1580508795118-v12-12.js
index c5cec23a3..6df1b8f8a 100644
--- a/packages/backend/migration/1580508795118-v12-12.js
+++ b/packages/backend/migration/1580508795118-v12-12.js
@@ -1,45 +1,145 @@
-
-
 export class v12121580508795118 {
-    constructor() {
-        this.name = 'v12121580508795118';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "twitter"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "twitterAccessToken"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "twitterAccessTokenSecret"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "twitterUserId"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "twitterScreenName"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "github"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubAccessToken"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubLogin"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discord"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordAccessToken"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordRefreshToken"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordId"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordUsername"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordDiscriminator"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "integrations" jsonb NOT NULL DEFAULT '{}'`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "integrations"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordDiscriminator" character varying(64) DEFAULT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordUsername" character varying(64) DEFAULT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordId" character varying(64) DEFAULT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordExpiresDate" character varying(64)`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordRefreshToken" character varying(64) DEFAULT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordAccessToken" character varying(64) DEFAULT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discord" boolean NOT NULL DEFAULT false`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "githubLogin" character varying(64) DEFAULT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "githubId" character varying(64)`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "githubAccessToken" character varying(64) DEFAULT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "github" boolean NOT NULL DEFAULT false`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "twitterScreenName" character varying(64) DEFAULT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "twitterUserId" character varying(64) DEFAULT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "twitterAccessTokenSecret" character varying(64) DEFAULT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "twitterAccessToken" character varying(64) DEFAULT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "twitter" boolean NOT NULL DEFAULT false`, undefined);
-    }
+	constructor() {
+		this.name = "v12121580508795118";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "twitter"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "twitterAccessToken"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "twitterAccessTokenSecret"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "twitterUserId"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "twitterScreenName"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "github"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "githubAccessToken"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "githubId"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "githubLogin"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "discord"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "discordAccessToken"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "discordRefreshToken"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "discordId"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "discordUsername"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "discordDiscriminator"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "integrations" jsonb NOT NULL DEFAULT '{}'`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "integrations"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "discordDiscriminator" character varying(64) DEFAULT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "discordUsername" character varying(64) DEFAULT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "discordId" character varying(64) DEFAULT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "discordExpiresDate" character varying(64)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "discordRefreshToken" character varying(64) DEFAULT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "discordAccessToken" character varying(64) DEFAULT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "discord" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "githubLogin" character varying(64) DEFAULT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "githubId" character varying(64)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "githubAccessToken" character varying(64) DEFAULT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "github" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "twitterScreenName" character varying(64) DEFAULT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "twitterUserId" character varying(64) DEFAULT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "twitterAccessTokenSecret" character varying(64) DEFAULT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "twitterAccessToken" character varying(64) DEFAULT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "twitter" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1580543501339-v12-13.js b/packages/backend/migration/1580543501339-v12-13.js
index 2fa490392..fd4d13151 100644
--- a/packages/backend/migration/1580543501339-v12-13.js
+++ b/packages/backend/migration/1580543501339-v12-13.js
@@ -1,13 +1,14 @@
-
-
 export class v12131580543501339 {
-    constructor() {
-        this.name = 'v12131580543501339';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE INDEX "IDX_NOTE_TAGS" ON "note" USING gin ("tags")`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_NOTE_TAGS"`, undefined);
-    }
+	constructor() {
+		this.name = "v12131580543501339";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE INDEX "IDX_NOTE_TAGS" ON "note" USING gin ("tags")`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_NOTE_TAGS"`, undefined);
+	}
 }
diff --git a/packages/backend/migration/1580864313253-v12-14.js b/packages/backend/migration/1580864313253-v12-14.js
index a3756ad02..47f778e1d 100644
--- a/packages/backend/migration/1580864313253-v12-14.js
+++ b/packages/backend/migration/1580864313253-v12-14.js
@@ -1,19 +1,41 @@
-
-
 export class v12141580864313253 {
-    constructor() {
-        this.name = 'v12141580864313253';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" RENAME COLUMN "proxyAccount" TO "proxyAccountId"`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "proxyAccountId"`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "proxyAccountId" character varying(32)`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" ADD CONSTRAINT "FK_ab1bc0c1e209daa77b8e8d212ad" FOREIGN KEY ("proxyAccountId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP CONSTRAINT "FK_ab1bc0c1e209daa77b8e8d212ad"`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "proxyAccountId"`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "proxyAccountId" character varying(128)`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" RENAME COLUMN "proxyAccountId" TO "proxyAccount"`, undefined);
-    }
+	constructor() {
+		this.name = "v12141580864313253";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" RENAME COLUMN "proxyAccount" TO "proxyAccountId"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "proxyAccountId"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "proxyAccountId" character varying(32)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD CONSTRAINT "FK_ab1bc0c1e209daa77b8e8d212ad" FOREIGN KEY ("proxyAccountId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP CONSTRAINT "FK_ab1bc0c1e209daa77b8e8d212ad"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "proxyAccountId"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "proxyAccountId" character varying(128)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" RENAME COLUMN "proxyAccountId" TO "proxyAccount"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1581526429287-user-group-invitation.js b/packages/backend/migration/1581526429287-user-group-invitation.js
index 181b0aba8..e327816ea 100644
--- a/packages/backend/migration/1581526429287-user-group-invitation.js
+++ b/packages/backend/migration/1581526429287-user-group-invitation.js
@@ -1,37 +1,107 @@
-
-
 export class userGroupInvitation1581526429287 {
-    constructor() {
-        this.name = 'userGroupInvitation1581526429287';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "user_group_invitation" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_160c63ec02bf23f6a5c5e8140d6" PRIMARY KEY ("id"))`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_bfbc6305547539369fe73eb144" ON "user_group_invitation" ("userId") `, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_5cc8c468090e129857e9fecce5" ON "user_group_invitation" ("userGroupId") `, undefined);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e9793f65f504e5a31fbaedbf2f" ON "user_group_invitation" ("userId", "userGroupId") `, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ADD "userGroupInvitationId" character varying(32)`, undefined);
-        await queryRunner.query(`ALTER TYPE "public"."notification_type_enum" RENAME TO "notification_type_enum_old"`, undefined);
-        await queryRunner.query(`CREATE TYPE "notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited')`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum" USING "type"::"text"::"notification_type_enum"`, undefined);
-        await queryRunner.query(`DROP TYPE "notification_type_enum_old"`, undefined);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."type" IS 'The type of the Notification.'`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_group_invitation" ADD CONSTRAINT "FK_bfbc6305547539369fe73eb144a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_group_invitation" ADD CONSTRAINT "FK_5cc8c468090e129857e9fecce5a" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_8fe87814e978053a53b1beb7e98" FOREIGN KEY ("userGroupInvitationId") REFERENCES "user_group_invitation"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_8fe87814e978053a53b1beb7e98"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_group_invitation" DROP CONSTRAINT "FK_5cc8c468090e129857e9fecce5a"`, undefined);
-        await queryRunner.query(`ALTER TABLE "user_group_invitation" DROP CONSTRAINT "FK_bfbc6305547539369fe73eb144a"`, undefined);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."type" IS ''`, undefined);
-        await queryRunner.query(`CREATE TYPE "notification_type_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted')`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum_old" USING "type"::"text"::"notification_type_enum_old"`, undefined);
-        await queryRunner.query(`DROP TYPE "notification_type_enum"`, undefined);
-        await queryRunner.query(`ALTER TYPE "notification_type_enum_old" RENAME TO  "notification_type_enum"`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "userGroupInvitationId"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_e9793f65f504e5a31fbaedbf2f"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_5cc8c468090e129857e9fecce5"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_bfbc6305547539369fe73eb144"`, undefined);
-        await queryRunner.query(`DROP TABLE "user_group_invitation"`, undefined);
-    }
+	constructor() {
+		this.name = "userGroupInvitation1581526429287";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "user_group_invitation" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_160c63ec02bf23f6a5c5e8140d6" PRIMARY KEY ("id"))`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_bfbc6305547539369fe73eb144" ON "user_group_invitation" ("userId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_5cc8c468090e129857e9fecce5" ON "user_group_invitation" ("userGroupId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_e9793f65f504e5a31fbaedbf2f" ON "user_group_invitation" ("userId", "userGroupId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD "userGroupInvitationId" character varying(32)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TYPE "public"."notification_type_enum" RENAME TO "notification_type_enum_old"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited')`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum" USING "type"::"text"::"notification_type_enum"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP TYPE "notification_type_enum_old"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."type" IS 'The type of the Notification.'`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group_invitation" ADD CONSTRAINT "FK_bfbc6305547539369fe73eb144a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group_invitation" ADD CONSTRAINT "FK_5cc8c468090e129857e9fecce5a" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD CONSTRAINT "FK_8fe87814e978053a53b1beb7e98" FOREIGN KEY ("userGroupInvitationId") REFERENCES "user_group_invitation"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP CONSTRAINT "FK_8fe87814e978053a53b1beb7e98"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group_invitation" DROP CONSTRAINT "FK_5cc8c468090e129857e9fecce5a"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_group_invitation" DROP CONSTRAINT "FK_bfbc6305547539369fe73eb144a"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."type" IS ''`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "notification_type_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted')`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum_old" USING "type"::"text"::"notification_type_enum_old"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TYPE "notification_type_enum"`, undefined);
+		await queryRunner.query(
+			`ALTER TYPE "notification_type_enum_old" RENAME TO  "notification_type_enum"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP COLUMN "userGroupInvitationId"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_e9793f65f504e5a31fbaedbf2f"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_5cc8c468090e129857e9fecce5"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_bfbc6305547539369fe73eb144"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TABLE "user_group_invitation"`, undefined);
+	}
 }
diff --git a/packages/backend/migration/1581695816408-user-group-antenna.js b/packages/backend/migration/1581695816408-user-group-antenna.js
index 267b58cd9..28112767e 100644
--- a/packages/backend/migration/1581695816408-user-group-antenna.js
+++ b/packages/backend/migration/1581695816408-user-group-antenna.js
@@ -1,27 +1,67 @@
-
-
 export class userGroupAntenna1581695816408 {
-    constructor() {
-        this.name = 'userGroupAntenna1581695816408';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "userGroupJoiningId" character varying(32)`, undefined);
-        await queryRunner.query(`ALTER TYPE "public"."antenna_src_enum" RENAME TO "antenna_src_enum_old"`, undefined);
-        await queryRunner.query(`CREATE TYPE "antenna_src_enum" AS ENUM('home', 'all', 'users', 'list', 'group')`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum" USING "src"::"text"::"antenna_src_enum"`, undefined);
-        await queryRunner.query(`DROP TYPE "antenna_src_enum_old"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "users"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "users" character varying(1024) array NOT NULL DEFAULT '{}'::varchar[]`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" ADD CONSTRAINT "FK_ccbf5a8c0be4511133dcc50ddeb" FOREIGN KEY ("userGroupJoiningId") REFERENCES "user_group_joining"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "antenna" DROP CONSTRAINT "FK_ccbf5a8c0be4511133dcc50ddeb"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "users"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "users" character varying array NOT NULL DEFAULT '{}'`, undefined);
-        await queryRunner.query(`CREATE TYPE "antenna_src_enum_old" AS ENUM('home', 'all', 'users', 'list')`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum_old" USING "src"::"text"::"antenna_src_enum_old"`, undefined);
-        await queryRunner.query(`DROP TYPE "antenna_src_enum"`, undefined);
-        await queryRunner.query(`ALTER TYPE "antenna_src_enum_old" RENAME TO  "antenna_src_enum"`, undefined);
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "userGroupJoiningId"`, undefined);
-    }
+	constructor() {
+		this.name = "userGroupAntenna1581695816408";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD "userGroupJoiningId" character varying(32)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TYPE "public"."antenna_src_enum" RENAME TO "antenna_src_enum_old"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "antenna_src_enum" AS ENUM('home', 'all', 'users', 'list', 'group')`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum" USING "src"::"text"::"antenna_src_enum"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TYPE "antenna_src_enum_old"`, undefined);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" DROP COLUMN "users"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD "users" character varying(1024) array NOT NULL DEFAULT '{}'::varchar[]`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD CONSTRAINT "FK_ccbf5a8c0be4511133dcc50ddeb" FOREIGN KEY ("userGroupJoiningId") REFERENCES "user_group_joining"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "antenna" DROP CONSTRAINT "FK_ccbf5a8c0be4511133dcc50ddeb"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" DROP COLUMN "users"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD "users" character varying array NOT NULL DEFAULT '{}'`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "antenna_src_enum_old" AS ENUM('home', 'all', 'users', 'list')`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum_old" USING "src"::"text"::"antenna_src_enum_old"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TYPE "antenna_src_enum"`, undefined);
+		await queryRunner.query(
+			`ALTER TYPE "antenna_src_enum_old" RENAME TO  "antenna_src_enum"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" DROP COLUMN "userGroupJoiningId"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1581708415836-drive-user-folder-id-index.js b/packages/backend/migration/1581708415836-drive-user-folder-id-index.js
index 43c2ce6ce..41902dc53 100644
--- a/packages/backend/migration/1581708415836-drive-user-folder-id-index.js
+++ b/packages/backend/migration/1581708415836-drive-user-folder-id-index.js
@@ -1,13 +1,17 @@
-
-
 export class driveUserFolderIdIndex1581708415836 {
-    constructor() {
-        this.name = 'driveUserFolderIdIndex1581708415836';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE INDEX "IDX_55720b33a61a7c806a8215b825" ON "drive_file" ("userId", "folderId", "id") `, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_55720b33a61a7c806a8215b825"`, undefined);
-    }
+	constructor() {
+		this.name = "driveUserFolderIdIndex1581708415836";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE INDEX "IDX_55720b33a61a7c806a8215b825" ON "drive_file" ("userId", "folderId", "id") `,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`DROP INDEX "IDX_55720b33a61a7c806a8215b825"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1581979837262-promo.js b/packages/backend/migration/1581979837262-promo.js
index 4813a5f48..39e79965b 100644
--- a/packages/backend/migration/1581979837262-promo.js
+++ b/packages/backend/migration/1581979837262-promo.js
@@ -1,27 +1,67 @@
-
-
 export class promo1581979837262 {
-    constructor() {
-        this.name = 'promo1581979837262';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "promo_note" ("noteId" character varying(32) NOT NULL, "expiresAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, CONSTRAINT "REL_e263909ca4fe5d57f8d4230dd5" UNIQUE ("noteId"), CONSTRAINT "PK_e263909ca4fe5d57f8d4230dd5c" PRIMARY KEY ("noteId"))`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_83f0862e9bae44af52ced7099e" ON "promo_note" ("userId") `, undefined);
-        await queryRunner.query(`CREATE TABLE "promo_read" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, CONSTRAINT "PK_61917c1541002422b703318b7c9" PRIMARY KEY ("id"))`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_9657d55550c3d37bfafaf7d4b0" ON "promo_read" ("userId") `, undefined);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_2882b8a1a07c7d281a98b6db16" ON "promo_read" ("userId", "noteId") `, undefined);
-        await queryRunner.query(`ALTER TABLE "promo_note" ADD CONSTRAINT "FK_e263909ca4fe5d57f8d4230dd5c" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "promo_read" ADD CONSTRAINT "FK_9657d55550c3d37bfafaf7d4b05" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "promo_read" ADD CONSTRAINT "FK_a46a1a603ecee695d7db26da5f4" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "promo_read" DROP CONSTRAINT "FK_a46a1a603ecee695d7db26da5f4"`, undefined);
-        await queryRunner.query(`ALTER TABLE "promo_read" DROP CONSTRAINT "FK_9657d55550c3d37bfafaf7d4b05"`, undefined);
-        await queryRunner.query(`ALTER TABLE "promo_note" DROP CONSTRAINT "FK_e263909ca4fe5d57f8d4230dd5c"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_2882b8a1a07c7d281a98b6db16"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_9657d55550c3d37bfafaf7d4b0"`, undefined);
-        await queryRunner.query(`DROP TABLE "promo_read"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_83f0862e9bae44af52ced7099e"`, undefined);
-        await queryRunner.query(`DROP TABLE "promo_note"`, undefined);
-    }
+	constructor() {
+		this.name = "promo1581979837262";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "promo_note" ("noteId" character varying(32) NOT NULL, "expiresAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, CONSTRAINT "REL_e263909ca4fe5d57f8d4230dd5" UNIQUE ("noteId"), CONSTRAINT "PK_e263909ca4fe5d57f8d4230dd5c" PRIMARY KEY ("noteId"))`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_83f0862e9bae44af52ced7099e" ON "promo_note" ("userId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "promo_read" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, CONSTRAINT "PK_61917c1541002422b703318b7c9" PRIMARY KEY ("id"))`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_9657d55550c3d37bfafaf7d4b0" ON "promo_read" ("userId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_2882b8a1a07c7d281a98b6db16" ON "promo_read" ("userId", "noteId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "promo_note" ADD CONSTRAINT "FK_e263909ca4fe5d57f8d4230dd5c" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "promo_read" ADD CONSTRAINT "FK_9657d55550c3d37bfafaf7d4b05" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "promo_read" ADD CONSTRAINT "FK_a46a1a603ecee695d7db26da5f4" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "promo_read" DROP CONSTRAINT "FK_a46a1a603ecee695d7db26da5f4"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "promo_read" DROP CONSTRAINT "FK_9657d55550c3d37bfafaf7d4b05"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "promo_note" DROP CONSTRAINT "FK_e263909ca4fe5d57f8d4230dd5c"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_2882b8a1a07c7d281a98b6db16"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_9657d55550c3d37bfafaf7d4b0"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TABLE "promo_read"`, undefined);
+		await queryRunner.query(
+			`DROP INDEX "IDX_83f0862e9bae44af52ced7099e"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TABLE "promo_note"`, undefined);
+	}
 }
diff --git a/packages/backend/migration/1582019042083-featured-injecttion.js b/packages/backend/migration/1582019042083-featured-injecttion.js
index 7f8790b01..61b7d0c27 100644
--- a/packages/backend/migration/1582019042083-featured-injecttion.js
+++ b/packages/backend/migration/1582019042083-featured-injecttion.js
@@ -1,13 +1,17 @@
-
-
 export class featuredInjecttion1582019042083 {
-    constructor() {
-        this.name = 'featuredInjecttion1582019042083';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "injectFeaturedNote" boolean NOT NULL DEFAULT true`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "injectFeaturedNote"`, undefined);
-    }
+	constructor() {
+		this.name = "featuredInjecttion1582019042083";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "injectFeaturedNote" boolean NOT NULL DEFAULT true`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "injectFeaturedNote"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1582210532752-antenna-exclude.js b/packages/backend/migration/1582210532752-antenna-exclude.js
index ff8d7b80d..5a394270e 100644
--- a/packages/backend/migration/1582210532752-antenna-exclude.js
+++ b/packages/backend/migration/1582210532752-antenna-exclude.js
@@ -1,13 +1,17 @@
-
-
 export class antennaExclude1582210532752 {
-    constructor() {
-        this.name = 'antennaExclude1582210532752';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "excludeKeywords" jsonb NOT NULL DEFAULT '[]'`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "excludeKeywords"`, undefined);
-    }
+	constructor() {
+		this.name = "antennaExclude1582210532752";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD "excludeKeywords" jsonb NOT NULL DEFAULT '[]'`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "antenna" DROP COLUMN "excludeKeywords"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1582875306439-note-reaction-length.js b/packages/backend/migration/1582875306439-note-reaction-length.js
index e99501f01..2c9b72673 100644
--- a/packages/backend/migration/1582875306439-note-reaction-length.js
+++ b/packages/backend/migration/1582875306439-note-reaction-length.js
@@ -1,13 +1,17 @@
-
-
 export class noteReactionLength1582875306439 {
-    constructor() {
-        this.name = 'noteReactionLength1582875306439';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note_reaction" ALTER COLUMN "reaction" TYPE character varying(130)`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note_reaction" ALTER COLUMN "reaction" TYPE character varying(128)`, undefined);
-    }
+	constructor() {
+		this.name = "noteReactionLength1582875306439";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "note_reaction" ALTER COLUMN "reaction" TYPE character varying(130)`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "note_reaction" ALTER COLUMN "reaction" TYPE character varying(128)`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1585361548360-miauth.js b/packages/backend/migration/1585361548360-miauth.js
index e59aa3b6e..2e052cb89 100644
--- a/packages/backend/migration/1585361548360-miauth.js
+++ b/packages/backend/migration/1585361548360-miauth.js
@@ -1,35 +1,105 @@
-
-
 export class miauth1585361548360 {
-    constructor() {
-        this.name = 'miauth1585361548360';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "access_token" ADD "lastUsedAt" TIMESTAMP WITH TIME ZONE DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD "session" character varying(128) DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD "name" character varying(128) DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD "description" character varying(512) DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD "iconUrl" character varying(512) DEFAULT null`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD "permission" character varying(64) array NOT NULL DEFAULT '{}'::varchar[]`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD "fetched" boolean NOT NULL DEFAULT false`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560"`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "appId" DROP NOT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "appId" SET DEFAULT null`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_bf3a053c07d9fb5d87317c56ee" ON "access_token" ("session") `, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "access_token" DROP CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_bf3a053c07d9fb5d87317c56ee"`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "appId" DROP DEFAULT`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "appId" SET NOT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP COLUMN "fetched"`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP COLUMN "permission"`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP COLUMN "iconUrl"`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP COLUMN "description"`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP COLUMN "name"`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP COLUMN "session"`, undefined);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP COLUMN "lastUsedAt"`, undefined);
-    }
+	constructor() {
+		this.name = "miauth1585361548360";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ADD "lastUsedAt" TIMESTAMP WITH TIME ZONE DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ADD "session" character varying(128) DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ADD "name" character varying(128) DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ADD "description" character varying(512) DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ADD "iconUrl" character varying(512) DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ADD "permission" character varying(64) array NOT NULL DEFAULT '{}'::varchar[]`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ADD "fetched" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" DROP CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ALTER COLUMN "appId" DROP NOT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ALTER COLUMN "appId" SET DEFAULT null`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_bf3a053c07d9fb5d87317c56ee" ON "access_token" ("session") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ADD CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "access_token" DROP CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_bf3a053c07d9fb5d87317c56ee"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ALTER COLUMN "appId" DROP DEFAULT`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ALTER COLUMN "appId" SET NOT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" ADD CONSTRAINT "FK_a3ff16c90cc87a82a0b5959e560" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" DROP COLUMN "fetched"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" DROP COLUMN "permission"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" DROP COLUMN "iconUrl"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" DROP COLUMN "description"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" DROP COLUMN "name"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" DROP COLUMN "session"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "access_token" DROP COLUMN "lastUsedAt"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1585385921215-custom-notification.js b/packages/backend/migration/1585385921215-custom-notification.js
index c3ddb2be1..23142cd3a 100644
--- a/packages/backend/migration/1585385921215-custom-notification.js
+++ b/packages/backend/migration/1585385921215-custom-notification.js
@@ -1,47 +1,150 @@
-
-
 export class customNotification1585385921215 {
-    constructor() {
-        this.name = 'customNotification1585385921215';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "notification" ADD "customBody" character varying(2048)`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ADD "customHeader" character varying(256)`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ADD "customIcon" character varying(1024)`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ADD "appAccessTokenId" character varying(32)`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710"`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "notifierId" DROP NOT NULL`, undefined);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."notifierId" IS 'The ID of sender user of the Notification.'`, undefined);
-        await queryRunner.query(`ALTER TYPE "public"."notification_type_enum" RENAME TO "notification_type_enum_old"`, undefined);
-        await queryRunner.query(`CREATE TYPE "notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum" USING "type"::"text"::"notification_type_enum"`, undefined);
-        await queryRunner.query(`DROP TYPE "notification_type_enum_old"`, undefined);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."type" IS 'The type of the Notification.'`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_3b4e96eec8d36a8bbb9d02aa71" ON "notification" ("notifierId") `, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_33f33cc8ef29d805a97ff4628b" ON "notification" ("type") `, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_080ab397c379af09b9d2169e5b" ON "notification" ("isRead") `, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_e22bf6bda77b6adc1fd9e75c8c" ON "notification" ("appAccessTokenId") `, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710" FOREIGN KEY ("notifierId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_e22bf6bda77b6adc1fd9e75c8c9" FOREIGN KEY ("appAccessTokenId") REFERENCES "access_token"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_e22bf6bda77b6adc1fd9e75c8c9"`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_e22bf6bda77b6adc1fd9e75c8c"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_080ab397c379af09b9d2169e5b"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_33f33cc8ef29d805a97ff4628b"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_3b4e96eec8d36a8bbb9d02aa71"`, undefined);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."type" IS ''`, undefined);
-        await queryRunner.query(`CREATE TYPE "notification_type_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited')`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum_old" USING "type"::"text"::"notification_type_enum_old"`, undefined);
-        await queryRunner.query(`DROP TYPE "notification_type_enum"`, undefined);
-        await queryRunner.query(`ALTER TYPE "notification_type_enum_old" RENAME TO  "notification_type_enum"`, undefined);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."notifierId" IS ''`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "notifierId" SET NOT NULL`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710" FOREIGN KEY ("notifierId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "appAccessTokenId"`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "customIcon"`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "customHeader"`, undefined);
-        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "customBody"`, undefined);
-    }
+	constructor() {
+		this.name = "customNotification1585385921215";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD "customBody" character varying(2048)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD "customHeader" character varying(256)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD "customIcon" character varying(1024)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD "appAccessTokenId" character varying(32)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ALTER COLUMN "notifierId" DROP NOT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."notifierId" IS 'The ID of sender user of the Notification.'`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TYPE "public"."notification_type_enum" RENAME TO "notification_type_enum_old"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum" USING "type"::"text"::"notification_type_enum"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP TYPE "notification_type_enum_old"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."type" IS 'The type of the Notification.'`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3b4e96eec8d36a8bbb9d02aa71" ON "notification" ("notifierId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_33f33cc8ef29d805a97ff4628b" ON "notification" ("type") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_080ab397c379af09b9d2169e5b" ON "notification" ("isRead") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e22bf6bda77b6adc1fd9e75c8c" ON "notification" ("appAccessTokenId") `,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710" FOREIGN KEY ("notifierId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD CONSTRAINT "FK_e22bf6bda77b6adc1fd9e75c8c9" FOREIGN KEY ("appAccessTokenId") REFERENCES "access_token"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP CONSTRAINT "FK_e22bf6bda77b6adc1fd9e75c8c9"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_e22bf6bda77b6adc1fd9e75c8c"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_080ab397c379af09b9d2169e5b"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_33f33cc8ef29d805a97ff4628b"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`DROP INDEX "IDX_3b4e96eec8d36a8bbb9d02aa71"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."type" IS ''`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "notification_type_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited')`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum_old" USING "type"::"text"::"notification_type_enum_old"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TYPE "notification_type_enum"`, undefined);
+		await queryRunner.query(
+			`ALTER TYPE "notification_type_enum_old" RENAME TO  "notification_type_enum"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."notifierId" IS ''`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ALTER COLUMN "notifierId" SET NOT NULL`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ADD CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710" FOREIGN KEY ("notifierId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP COLUMN "appAccessTokenId"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP COLUMN "customIcon"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP COLUMN "customHeader"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" DROP COLUMN "customBody"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1585772678853-ap-url.js b/packages/backend/migration/1585772678853-ap-url.js
index 5fb809ff5..18cc4588e 100644
--- a/packages/backend/migration/1585772678853-ap-url.js
+++ b/packages/backend/migration/1585772678853-ap-url.js
@@ -1,13 +1,14 @@
-
-
 export class apUrl1585772678853 {
-    constructor() {
-        this.name = 'apUrl1585772678853';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "url" character varying(512)`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "url"`, undefined);
-    }
+	constructor() {
+		this.name = "apUrl1585772678853";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "note" ADD "url" character varying(512)`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "url"`, undefined);
+	}
 }
diff --git a/packages/backend/migration/1586624197029-AddObjectStorageUseProxy.js b/packages/backend/migration/1586624197029-AddObjectStorageUseProxy.js
index e13bb217e..89694f84b 100644
--- a/packages/backend/migration/1586624197029-AddObjectStorageUseProxy.js
+++ b/packages/backend/migration/1586624197029-AddObjectStorageUseProxy.js
@@ -1,13 +1,17 @@
-
-
 export class AddObjectStorageUseProxy1586624197029 {
-    constructor() {
-        this.name = 'AddObjectStorageUseProxy1586624197029';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageUseProxy" boolean NOT NULL DEFAULT true`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageUseProxy"`, undefined);
-    }
+	constructor() {
+		this.name = "AddObjectStorageUseProxy1586624197029";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStorageUseProxy" boolean NOT NULL DEFAULT true`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStorageUseProxy"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1586641139527-remote-reaction.js b/packages/backend/migration/1586641139527-remote-reaction.js
index 5b23103a1..d7390544c 100644
--- a/packages/backend/migration/1586641139527-remote-reaction.js
+++ b/packages/backend/migration/1586641139527-remote-reaction.js
@@ -1,13 +1,17 @@
-
-
 export class remoteReaction1586641139527 {
-    constructor() {
-        this.name = 'remoteReaction1586641139527';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note_reaction" ALTER COLUMN "reaction" TYPE character varying(260)`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note_reaction" ALTER COLUMN "reaction" TYPE character varying(130)`, undefined);
-    }
+	constructor() {
+		this.name = "remoteReaction1586641139527";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "note_reaction" ALTER COLUMN "reaction" TYPE character varying(260)`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "note_reaction" ALTER COLUMN "reaction" TYPE character varying(130)`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1586708940386-pageAiScript.js b/packages/backend/migration/1586708940386-pageAiScript.js
index eed616c11..25eb71098 100644
--- a/packages/backend/migration/1586708940386-pageAiScript.js
+++ b/packages/backend/migration/1586708940386-pageAiScript.js
@@ -1,13 +1,17 @@
-
-
 export class pageAiScript1586708940386 {
-    constructor() {
-        this.name = 'pageAiScript1586708940386';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "page" ADD "script" character varying(16384) NOT NULL DEFAULT ''`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "script"`, undefined);
-    }
+	constructor() {
+		this.name = "pageAiScript1586708940386";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "page" ADD "script" character varying(16384) NOT NULL DEFAULT ''`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "page" DROP COLUMN "script"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1588044505511-hCaptcha.js b/packages/backend/migration/1588044505511-hCaptcha.js
index a33dbd713..29ba87370 100644
--- a/packages/backend/migration/1588044505511-hCaptcha.js
+++ b/packages/backend/migration/1588044505511-hCaptcha.js
@@ -1,17 +1,33 @@
-
-
 export class hCaptcha1588044505511 {
-    constructor() {
-        this.name = 'hCaptcha1588044505511';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "enableHcaptcha" boolean NOT NULL DEFAULT false`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "hcaptchaSiteKey" character varying(64)`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "hcaptchaSecretKey" character varying(64)`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "hcaptchaSecretKey"`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "hcaptchaSiteKey"`, undefined);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableHcaptcha"`, undefined);
-    }
+	constructor() {
+		this.name = "hCaptcha1588044505511";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "enableHcaptcha" boolean NOT NULL DEFAULT false`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "hcaptchaSiteKey" character varying(64)`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "hcaptchaSecretKey" character varying(64)`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "hcaptchaSecretKey"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "hcaptchaSiteKey"`,
+			undefined,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "enableHcaptcha"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1589023282116-pubRelay.js b/packages/backend/migration/1589023282116-pubRelay.js
index 48a1028d3..a1a229919 100644
--- a/packages/backend/migration/1589023282116-pubRelay.js
+++ b/packages/backend/migration/1589023282116-pubRelay.js
@@ -1,17 +1,27 @@
-
-
 export class pubRelay1589023282116 {
-    constructor() {
-        this.name = 'pubRelay1589023282116';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "relay_status_enum" AS ENUM('requesting', 'accepted', 'rejected')`, undefined);
-        await queryRunner.query(`CREATE TABLE "relay" ("id" character varying(32) NOT NULL, "inbox" character varying(512) NOT NULL, "status" "relay_status_enum" NOT NULL, CONSTRAINT "PK_78ebc9cfddf4292633b7ba57aee" PRIMARY KEY ("id"))`, undefined);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0d9a1738f2cf7f3b1c3334dfab" ON "relay" ("inbox") `, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_0d9a1738f2cf7f3b1c3334dfab"`, undefined);
-        await queryRunner.query(`DROP TABLE "relay"`, undefined);
-        await queryRunner.query(`DROP TYPE "relay_status_enum"`, undefined);
-    }
+	constructor() {
+		this.name = "pubRelay1589023282116";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TYPE "relay_status_enum" AS ENUM('requesting', 'accepted', 'rejected')`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "relay" ("id" character varying(32) NOT NULL, "inbox" character varying(512) NOT NULL, "status" "relay_status_enum" NOT NULL, CONSTRAINT "PK_78ebc9cfddf4292633b7ba57aee" PRIMARY KEY ("id"))`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_0d9a1738f2cf7f3b1c3334dfab" ON "relay" ("inbox") `,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`DROP INDEX "IDX_0d9a1738f2cf7f3b1c3334dfab"`,
+			undefined,
+		);
+		await queryRunner.query(`DROP TABLE "relay"`, undefined);
+		await queryRunner.query(`DROP TYPE "relay_status_enum"`, undefined);
+	}
 }
diff --git a/packages/backend/migration/1595075960584-blurhash.js b/packages/backend/migration/1595075960584-blurhash.js
index f24d3722c..50660cd05 100644
--- a/packages/backend/migration/1595075960584-blurhash.js
+++ b/packages/backend/migration/1595075960584-blurhash.js
@@ -1,13 +1,13 @@
-
-
 export class blurhash1595075960584 {
-    constructor() {
-        this.name = 'blurhash1595075960584';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "blurhash" character varying(128)`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "blurhash"`);
-    }
+	constructor() {
+		this.name = "blurhash1595075960584";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "blurhash" character varying(128)`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "blurhash"`);
+	}
 }
diff --git a/packages/backend/migration/1595077605646-blurhash-for-avatar-banner.js b/packages/backend/migration/1595077605646-blurhash-for-avatar-banner.js
index f18f6f972..612ab648c 100644
--- a/packages/backend/migration/1595077605646-blurhash-for-avatar-banner.js
+++ b/packages/backend/migration/1595077605646-blurhash-for-avatar-banner.js
@@ -1,19 +1,25 @@
-
-
 export class blurhashForAvatarBanner1595077605646 {
-    constructor() {
-        this.name = 'blurhashForAvatarBanner1595077605646';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarColor"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "bannerColor"`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "avatarBlurhash" character varying(128)`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "bannerBlurhash" character varying(128)`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "bannerBlurhash"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarBlurhash"`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "bannerColor" character varying(32)`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "avatarColor" character varying(32)`);
-    }
+	constructor() {
+		this.name = "blurhashForAvatarBanner1595077605646";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarColor"`);
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "bannerColor"`);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "avatarBlurhash" character varying(128)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "bannerBlurhash" character varying(128)`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "bannerBlurhash"`);
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarBlurhash"`);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "bannerColor" character varying(32)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "avatarColor" character varying(32)`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1595676934834-instance-icon-url.js b/packages/backend/migration/1595676934834-instance-icon-url.js
index df9d8199b..c228b14b6 100644
--- a/packages/backend/migration/1595676934834-instance-icon-url.js
+++ b/packages/backend/migration/1595676934834-instance-icon-url.js
@@ -1,13 +1,13 @@
-
-
 export class instanceIconUrl1595676934834 {
-    constructor() {
-        this.name = 'instanceIconUrl1595676934834';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" ADD "iconUrl" character varying(256) DEFAULT null`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "iconUrl"`);
-    }
+	constructor() {
+		this.name = "instanceIconUrl1595676934834";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "iconUrl" character varying(256) DEFAULT null`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "iconUrl"`);
+	}
 }
diff --git a/packages/backend/migration/1595771249699-word-mute.js b/packages/backend/migration/1595771249699-word-mute.js
index e8e4ac838..0a8a63294 100644
--- a/packages/backend/migration/1595771249699-word-mute.js
+++ b/packages/backend/migration/1595771249699-word-mute.js
@@ -1,29 +1,53 @@
-
-
 export class wordMute1595771249699 {
-    constructor() {
-        this.name = 'wordMute1595771249699';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "muted_note" ("id" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, CONSTRAINT "PK_897e2eff1c0b9b64e55ca1418a4" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_70ab9786313d78e4201d81cdb8" ON "muted_note" ("noteId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d8e07aa18c2d64e86201601aec" ON "muted_note" ("userId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a8c6bfd637d3f1d67a27c48e27" ON "muted_note" ("noteId", "userId") `);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "enableWordMute" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "mutedWords" jsonb NOT NULL DEFAULT '[]'`);
-        await queryRunner.query(`CREATE INDEX "IDX_3befe6f999c86aff06eb0257b4" ON "user_profile" ("enableWordMute") `);
-        await queryRunner.query(`ALTER TABLE "muted_note" ADD CONSTRAINT "FK_70ab9786313d78e4201d81cdb89" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "muted_note" ADD CONSTRAINT "FK_d8e07aa18c2d64e86201601aec1" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "muted_note" DROP CONSTRAINT "FK_d8e07aa18c2d64e86201601aec1"`);
-        await queryRunner.query(`ALTER TABLE "muted_note" DROP CONSTRAINT "FK_70ab9786313d78e4201d81cdb89"`);
-        await queryRunner.query(`DROP INDEX "IDX_3befe6f999c86aff06eb0257b4"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "mutedWords"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "enableWordMute"`);
-        await queryRunner.query(`DROP INDEX "IDX_a8c6bfd637d3f1d67a27c48e27"`);
-        await queryRunner.query(`DROP INDEX "IDX_d8e07aa18c2d64e86201601aec"`);
-        await queryRunner.query(`DROP INDEX "IDX_70ab9786313d78e4201d81cdb8"`);
-        await queryRunner.query(`DROP TABLE "muted_note"`);
-    }
+	constructor() {
+		this.name = "wordMute1595771249699";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "muted_note" ("id" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, CONSTRAINT "PK_897e2eff1c0b9b64e55ca1418a4" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_70ab9786313d78e4201d81cdb8" ON "muted_note" ("noteId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d8e07aa18c2d64e86201601aec" ON "muted_note" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_a8c6bfd637d3f1d67a27c48e27" ON "muted_note" ("noteId", "userId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "enableWordMute" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "mutedWords" jsonb NOT NULL DEFAULT '[]'`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3befe6f999c86aff06eb0257b4" ON "user_profile" ("enableWordMute") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "muted_note" ADD CONSTRAINT "FK_70ab9786313d78e4201d81cdb89" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "muted_note" ADD CONSTRAINT "FK_d8e07aa18c2d64e86201601aec1" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "muted_note" DROP CONSTRAINT "FK_d8e07aa18c2d64e86201601aec1"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "muted_note" DROP CONSTRAINT "FK_70ab9786313d78e4201d81cdb89"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_3befe6f999c86aff06eb0257b4"`);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "mutedWords"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "enableWordMute"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_a8c6bfd637d3f1d67a27c48e27"`);
+		await queryRunner.query(`DROP INDEX "IDX_d8e07aa18c2d64e86201601aec"`);
+		await queryRunner.query(`DROP INDEX "IDX_70ab9786313d78e4201d81cdb8"`);
+		await queryRunner.query(`DROP TABLE "muted_note"`);
+	}
 }
diff --git a/packages/backend/migration/1595782306083-word-mute2.js b/packages/backend/migration/1595782306083-word-mute2.js
index ab1e40a04..61f06b347 100644
--- a/packages/backend/migration/1595782306083-word-mute2.js
+++ b/packages/backend/migration/1595782306083-word-mute2.js
@@ -1,17 +1,21 @@
-
-
 export class wordMute21595782306083 {
-    constructor() {
-        this.name = 'wordMute21595782306083';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "muted_note_reason_enum" AS ENUM('word', 'manual', 'spam', 'other')`);
-        await queryRunner.query(`ALTER TABLE "muted_note" ADD "reason" "muted_note_reason_enum" NOT NULL`);
-        await queryRunner.query(`CREATE INDEX "IDX_636e977ff90b23676fb5624b25" ON "muted_note" ("reason") `);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_636e977ff90b23676fb5624b25"`);
-        await queryRunner.query(`ALTER TABLE "muted_note" DROP COLUMN "reason"`);
-        await queryRunner.query(`DROP TYPE "muted_note_reason_enum"`);
-    }
+	constructor() {
+		this.name = "wordMute21595782306083";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TYPE "muted_note_reason_enum" AS ENUM('word', 'manual', 'spam', 'other')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "muted_note" ADD "reason" "muted_note_reason_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_636e977ff90b23676fb5624b25" ON "muted_note" ("reason") `,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_636e977ff90b23676fb5624b25"`);
+		await queryRunner.query(`ALTER TABLE "muted_note" DROP COLUMN "reason"`);
+		await queryRunner.query(`DROP TYPE "muted_note_reason_enum"`);
+	}
 }
diff --git a/packages/backend/migration/1596548170836-channel.js b/packages/backend/migration/1596548170836-channel.js
index 242db7d45..2aaaf9550 100644
--- a/packages/backend/migration/1596548170836-channel.js
+++ b/packages/backend/migration/1596548170836-channel.js
@@ -1,57 +1,115 @@
-
-
 export class channel1596548170836 {
-    constructor() {
-        this.name = 'channel1596548170836';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "channel" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "lastNotedAt" TIMESTAMP WITH TIME ZONE, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "description" character varying(2048), "bannerId" character varying(32), "notesCount" integer NOT NULL DEFAULT 0, "usersCount" integer NOT NULL DEFAULT 0, CONSTRAINT "PK_590f33ee6ee7d76437acf362e39" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_71cb7b435b7c0d4843317e7e16" ON "channel" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_29ef80c6f13bcea998447fce43" ON "channel" ("lastNotedAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_823bae55bd81b3be6e05cff438" ON "channel" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0f58c11241e649d2a638a8de94" ON "channel" ("notesCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_094b86cd36bb805d1aa1e8cc9a" ON "channel" ("usersCount") `);
-        await queryRunner.query(`CREATE TABLE "channel_following" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "followeeId" character varying(32) NOT NULL, "followerId" character varying(32) NOT NULL, CONSTRAINT "PK_8b104be7f7415113f2a02cd5bdd" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_11e71f2511589dcc8a4d3214f9" ON "channel_following" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0e43068c3f92cab197c3d3cd86" ON "channel_following" ("followeeId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6d8084ec9496e7334a4602707e" ON "channel_following" ("followerId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_2e230dd45a10e671d781d99f3e" ON "channel_following" ("followerId", "followeeId") `);
-        await queryRunner.query(`CREATE TABLE "channel_note_pining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "channelId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, CONSTRAINT "PK_44f7474496bcf2e4b741681146d" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_8125f950afd3093acb10d2db8a" ON "channel_note_pining" ("channelId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_f36fed37d6d4cdcc68c803cd9c" ON "channel_note_pining" ("channelId", "noteId") `);
-        await queryRunner.query(`ALTER TABLE "note" ADD "channelId" character varying(32) DEFAULT null`);
-        await queryRunner.query(`CREATE INDEX "IDX_f22169eb10657bded6d875ac8f" ON "note" ("channelId") `);
-        await queryRunner.query(`ALTER TABLE "channel" ADD CONSTRAINT "FK_823bae55bd81b3be6e05cff4383" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "channel" ADD CONSTRAINT "FK_999da2bcc7efadbfe0e92d3bc19" FOREIGN KEY ("bannerId") REFERENCES "drive_file"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_f22169eb10657bded6d875ac8f9" FOREIGN KEY ("channelId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "channel_following" ADD CONSTRAINT "FK_0e43068c3f92cab197c3d3cd86e" FOREIGN KEY ("followeeId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "channel_following" ADD CONSTRAINT "FK_6d8084ec9496e7334a4602707e1" FOREIGN KEY ("followerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "channel_note_pining" ADD CONSTRAINT "FK_8125f950afd3093acb10d2db8a8" FOREIGN KEY ("channelId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "channel_note_pining" ADD CONSTRAINT "FK_10b19ef67d297ea9de325cd4502" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "channel_note_pining" DROP CONSTRAINT "FK_10b19ef67d297ea9de325cd4502"`);
-        await queryRunner.query(`ALTER TABLE "channel_note_pining" DROP CONSTRAINT "FK_8125f950afd3093acb10d2db8a8"`);
-        await queryRunner.query(`ALTER TABLE "channel_following" DROP CONSTRAINT "FK_6d8084ec9496e7334a4602707e1"`);
-        await queryRunner.query(`ALTER TABLE "channel_following" DROP CONSTRAINT "FK_0e43068c3f92cab197c3d3cd86e"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_f22169eb10657bded6d875ac8f9"`);
-        await queryRunner.query(`ALTER TABLE "channel" DROP CONSTRAINT "FK_999da2bcc7efadbfe0e92d3bc19"`);
-        await queryRunner.query(`ALTER TABLE "channel" DROP CONSTRAINT "FK_823bae55bd81b3be6e05cff4383"`);
-        await queryRunner.query(`DROP INDEX "IDX_f22169eb10657bded6d875ac8f"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "channelId"`);
-        await queryRunner.query(`DROP INDEX "IDX_f36fed37d6d4cdcc68c803cd9c"`);
-        await queryRunner.query(`DROP INDEX "IDX_8125f950afd3093acb10d2db8a"`);
-        await queryRunner.query(`DROP TABLE "channel_note_pining"`);
-        await queryRunner.query(`DROP INDEX "IDX_2e230dd45a10e671d781d99f3e"`);
-        await queryRunner.query(`DROP INDEX "IDX_6d8084ec9496e7334a4602707e"`);
-        await queryRunner.query(`DROP INDEX "IDX_0e43068c3f92cab197c3d3cd86"`);
-        await queryRunner.query(`DROP INDEX "IDX_11e71f2511589dcc8a4d3214f9"`);
-        await queryRunner.query(`DROP TABLE "channel_following"`);
-        await queryRunner.query(`DROP INDEX "IDX_094b86cd36bb805d1aa1e8cc9a"`);
-        await queryRunner.query(`DROP INDEX "IDX_0f58c11241e649d2a638a8de94"`);
-        await queryRunner.query(`DROP INDEX "IDX_823bae55bd81b3be6e05cff438"`);
-        await queryRunner.query(`DROP INDEX "IDX_29ef80c6f13bcea998447fce43"`);
-        await queryRunner.query(`DROP INDEX "IDX_71cb7b435b7c0d4843317e7e16"`);
-        await queryRunner.query(`DROP TABLE "channel"`);
-    }
+	constructor() {
+		this.name = "channel1596548170836";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "channel" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "lastNotedAt" TIMESTAMP WITH TIME ZONE, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "description" character varying(2048), "bannerId" character varying(32), "notesCount" integer NOT NULL DEFAULT 0, "usersCount" integer NOT NULL DEFAULT 0, CONSTRAINT "PK_590f33ee6ee7d76437acf362e39" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_71cb7b435b7c0d4843317e7e16" ON "channel" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_29ef80c6f13bcea998447fce43" ON "channel" ("lastNotedAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_823bae55bd81b3be6e05cff438" ON "channel" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0f58c11241e649d2a638a8de94" ON "channel" ("notesCount") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_094b86cd36bb805d1aa1e8cc9a" ON "channel" ("usersCount") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "channel_following" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "followeeId" character varying(32) NOT NULL, "followerId" character varying(32) NOT NULL, CONSTRAINT "PK_8b104be7f7415113f2a02cd5bdd" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_11e71f2511589dcc8a4d3214f9" ON "channel_following" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0e43068c3f92cab197c3d3cd86" ON "channel_following" ("followeeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_6d8084ec9496e7334a4602707e" ON "channel_following" ("followerId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_2e230dd45a10e671d781d99f3e" ON "channel_following" ("followerId", "followeeId") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "channel_note_pining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "channelId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, CONSTRAINT "PK_44f7474496bcf2e4b741681146d" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8125f950afd3093acb10d2db8a" ON "channel_note_pining" ("channelId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_f36fed37d6d4cdcc68c803cd9c" ON "channel_note_pining" ("channelId", "noteId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" ADD "channelId" character varying(32) DEFAULT null`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f22169eb10657bded6d875ac8f" ON "note" ("channelId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel" ADD CONSTRAINT "FK_823bae55bd81b3be6e05cff4383" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel" ADD CONSTRAINT "FK_999da2bcc7efadbfe0e92d3bc19" FOREIGN KEY ("bannerId") REFERENCES "drive_file"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" ADD CONSTRAINT "FK_f22169eb10657bded6d875ac8f9" FOREIGN KEY ("channelId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel_following" ADD CONSTRAINT "FK_0e43068c3f92cab197c3d3cd86e" FOREIGN KEY ("followeeId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel_following" ADD CONSTRAINT "FK_6d8084ec9496e7334a4602707e1" FOREIGN KEY ("followerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel_note_pining" ADD CONSTRAINT "FK_8125f950afd3093acb10d2db8a8" FOREIGN KEY ("channelId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel_note_pining" ADD CONSTRAINT "FK_10b19ef67d297ea9de325cd4502" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "channel_note_pining" DROP CONSTRAINT "FK_10b19ef67d297ea9de325cd4502"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel_note_pining" DROP CONSTRAINT "FK_8125f950afd3093acb10d2db8a8"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel_following" DROP CONSTRAINT "FK_6d8084ec9496e7334a4602707e1"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel_following" DROP CONSTRAINT "FK_0e43068c3f92cab197c3d3cd86e"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" DROP CONSTRAINT "FK_f22169eb10657bded6d875ac8f9"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel" DROP CONSTRAINT "FK_999da2bcc7efadbfe0e92d3bc19"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel" DROP CONSTRAINT "FK_823bae55bd81b3be6e05cff4383"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_f22169eb10657bded6d875ac8f"`);
+		await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "channelId"`);
+		await queryRunner.query(`DROP INDEX "IDX_f36fed37d6d4cdcc68c803cd9c"`);
+		await queryRunner.query(`DROP INDEX "IDX_8125f950afd3093acb10d2db8a"`);
+		await queryRunner.query(`DROP TABLE "channel_note_pining"`);
+		await queryRunner.query(`DROP INDEX "IDX_2e230dd45a10e671d781d99f3e"`);
+		await queryRunner.query(`DROP INDEX "IDX_6d8084ec9496e7334a4602707e"`);
+		await queryRunner.query(`DROP INDEX "IDX_0e43068c3f92cab197c3d3cd86"`);
+		await queryRunner.query(`DROP INDEX "IDX_11e71f2511589dcc8a4d3214f9"`);
+		await queryRunner.query(`DROP TABLE "channel_following"`);
+		await queryRunner.query(`DROP INDEX "IDX_094b86cd36bb805d1aa1e8cc9a"`);
+		await queryRunner.query(`DROP INDEX "IDX_0f58c11241e649d2a638a8de94"`);
+		await queryRunner.query(`DROP INDEX "IDX_823bae55bd81b3be6e05cff438"`);
+		await queryRunner.query(`DROP INDEX "IDX_29ef80c6f13bcea998447fce43"`);
+		await queryRunner.query(`DROP INDEX "IDX_71cb7b435b7c0d4843317e7e16"`);
+		await queryRunner.query(`DROP TABLE "channel"`);
+	}
 }
diff --git a/packages/backend/migration/1596786425167-channel2.js b/packages/backend/migration/1596786425167-channel2.js
index 4b17048fe..ae871f5ff 100644
--- a/packages/backend/migration/1596786425167-channel2.js
+++ b/packages/backend/migration/1596786425167-channel2.js
@@ -1,13 +1,15 @@
-
-
 export class channel21596786425167 {
-    constructor() {
-        this.name = 'channel21596786425167';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "channel_following" ADD "readCursor" TIMESTAMP WITH TIME ZONE NOT NULL`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "channel_following" DROP COLUMN "readCursor"`);
-    }
+	constructor() {
+		this.name = "channel21596786425167";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "channel_following" ADD "readCursor" TIMESTAMP WITH TIME ZONE NOT NULL`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "channel_following" DROP COLUMN "readCursor"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1597230137744-objectStorageSetPublicRead.js b/packages/backend/migration/1597230137744-objectStorageSetPublicRead.js
index 07283e31d..81540d5e8 100644
--- a/packages/backend/migration/1597230137744-objectStorageSetPublicRead.js
+++ b/packages/backend/migration/1597230137744-objectStorageSetPublicRead.js
@@ -1,13 +1,15 @@
-
-
 export class objectStorageSetPublicRead1597230137744 {
-    constructor() {
-        this.name = 'objectStorageSetPublicRead1597230137744';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageSetPublicRead" boolean NOT NULL DEFAULT false`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageSetPublicRead"`);
-    }
+	constructor() {
+		this.name = "objectStorageSetPublicRead1597230137744";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStorageSetPublicRead" boolean NOT NULL DEFAULT false`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStorageSetPublicRead"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1597236229720-IncludingNotificationTypes.js b/packages/backend/migration/1597236229720-IncludingNotificationTypes.js
index f498fa7d9..ce02148d2 100644
--- a/packages/backend/migration/1597236229720-IncludingNotificationTypes.js
+++ b/packages/backend/migration/1597236229720-IncludingNotificationTypes.js
@@ -1,15 +1,21 @@
-
-
 export class IncludingNotificationTypes1597236229720 {
-    constructor() {
-        this.name = 'IncludingNotificationTypes1597236229720';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "user_profile_includingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "includingNotificationTypes" "user_profile_includingnotificationtypes_enum" array`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "includingNotificationTypes"`);
-        await queryRunner.query(`DROP TYPE "user_profile_includingnotificationtypes_enum"`);
-    }
+	constructor() {
+		this.name = "IncludingNotificationTypes1597236229720";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TYPE "user_profile_includingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "includingNotificationTypes" "user_profile_includingnotificationtypes_enum" array`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "includingNotificationTypes"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "user_profile_includingnotificationtypes_enum"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1597385880794-add-sensitive-index.js b/packages/backend/migration/1597385880794-add-sensitive-index.js
index 8c5c040ba..d7c818bbf 100644
--- a/packages/backend/migration/1597385880794-add-sensitive-index.js
+++ b/packages/backend/migration/1597385880794-add-sensitive-index.js
@@ -1,13 +1,13 @@
-
-
 export class addSensitiveIndex1597385880794 {
-    constructor() {
-        this.name = 'addSensitiveIndex1597385880794';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE INDEX "IDX_a7eba67f8b3fa27271e85d2e26" ON "drive_file" ("isSensitive") `);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_a7eba67f8b3fa27271e85d2e26"`);
-    }
+	constructor() {
+		this.name = "addSensitiveIndex1597385880794";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a7eba67f8b3fa27271e85d2e26" ON "drive_file" ("isSensitive") `,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_a7eba67f8b3fa27271e85d2e26"`);
+	}
 }
diff --git a/packages/backend/migration/1597459042300-channel-unread.js b/packages/backend/migration/1597459042300-channel-unread.js
index 3157ab779..4975a84f9 100644
--- a/packages/backend/migration/1597459042300-channel-unread.js
+++ b/packages/backend/migration/1597459042300-channel-unread.js
@@ -1,26 +1,44 @@
-
-
 export class channelUnread1597459042300 {
-    constructor() {
-        this.name = 'channelUnread1597459042300';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`TRUNCATE TABLE "note_unread"`, undefined);
-        await queryRunner.query(`ALTER TABLE "channel_following" DROP COLUMN "readCursor"`);
-        await queryRunner.query(`ALTER TABLE "note_unread" ADD "isMentioned" boolean NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "note_unread" ADD "noteChannelId" character varying(32)`);
-        await queryRunner.query(`CREATE INDEX "IDX_25b1dd384bec391b07b74b861c" ON "note_unread" ("isMentioned") `);
-        await queryRunner.query(`CREATE INDEX "IDX_89a29c9237b8c3b6b3cbb4cb30" ON "note_unread" ("isSpecified") `);
-        await queryRunner.query(`CREATE INDEX "IDX_29e8c1d579af54d4232939f994" ON "note_unread" ("noteUserId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6a57f051d82c6d4036c141e107" ON "note_unread" ("noteChannelId") `);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_6a57f051d82c6d4036c141e107"`);
-        await queryRunner.query(`DROP INDEX "IDX_29e8c1d579af54d4232939f994"`);
-        await queryRunner.query(`DROP INDEX "IDX_89a29c9237b8c3b6b3cbb4cb30"`);
-        await queryRunner.query(`DROP INDEX "IDX_25b1dd384bec391b07b74b861c"`);
-        await queryRunner.query(`ALTER TABLE "note_unread" DROP COLUMN "noteChannelId"`);
-        await queryRunner.query(`ALTER TABLE "note_unread" DROP COLUMN "isMentioned"`);
-        await queryRunner.query(`ALTER TABLE "channel_following" ADD "readCursor" TIMESTAMP WITH TIME ZONE NOT NULL`);
-    }
+	constructor() {
+		this.name = "channelUnread1597459042300";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(`TRUNCATE TABLE "note_unread"`, undefined);
+		await queryRunner.query(
+			`ALTER TABLE "channel_following" DROP COLUMN "readCursor"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_unread" ADD "isMentioned" boolean NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_unread" ADD "noteChannelId" character varying(32)`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_25b1dd384bec391b07b74b861c" ON "note_unread" ("isMentioned") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_89a29c9237b8c3b6b3cbb4cb30" ON "note_unread" ("isSpecified") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_29e8c1d579af54d4232939f994" ON "note_unread" ("noteUserId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_6a57f051d82c6d4036c141e107" ON "note_unread" ("noteChannelId") `,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_6a57f051d82c6d4036c141e107"`);
+		await queryRunner.query(`DROP INDEX "IDX_29e8c1d579af54d4232939f994"`);
+		await queryRunner.query(`DROP INDEX "IDX_89a29c9237b8c3b6b3cbb4cb30"`);
+		await queryRunner.query(`DROP INDEX "IDX_25b1dd384bec391b07b74b861c"`);
+		await queryRunner.query(
+			`ALTER TABLE "note_unread" DROP COLUMN "noteChannelId"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_unread" DROP COLUMN "isMentioned"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "channel_following" ADD "readCursor" TIMESTAMP WITH TIME ZONE NOT NULL`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1597893996136-ChannelNoteIdDescIndex.js b/packages/backend/migration/1597893996136-ChannelNoteIdDescIndex.js
index 2bd8aee35..5a31d51e8 100644
--- a/packages/backend/migration/1597893996136-ChannelNoteIdDescIndex.js
+++ b/packages/backend/migration/1597893996136-ChannelNoteIdDescIndex.js
@@ -1,15 +1,17 @@
-
-
 export class ChannelNoteIdDescIndex1597893996136 {
-    constructor() {
-        this.name = 'ChannelNoteIdDescIndex1597893996136';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_f22169eb10657bded6d875ac8f"`);
-        await queryRunner.query(`CREATE INDEX "IDX_note_on_channelId_and_id_desc" ON "note" ("channelId", "id" desc)`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_note_on_channelId_and_id_desc"`);
-        await queryRunner.query(`CREATE INDEX "IDX_f22169eb10657bded6d875ac8f" ON "note" ("channelId") `);
-    }
+	constructor() {
+		this.name = "ChannelNoteIdDescIndex1597893996136";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_f22169eb10657bded6d875ac8f"`);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_note_on_channelId_and_id_desc" ON "note" ("channelId", "id" desc)`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_note_on_channelId_and_id_desc"`);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f22169eb10657bded6d875ac8f" ON "note" ("channelId") `,
+		);
+	}
 }
diff --git a/packages/backend/migration/1600353287890-mutingNotificationTypes.js b/packages/backend/migration/1600353287890-mutingNotificationTypes.js
index ed3eb7d14..2a317b3f9 100644
--- a/packages/backend/migration/1600353287890-mutingNotificationTypes.js
+++ b/packages/backend/migration/1600353287890-mutingNotificationTypes.js
@@ -1,19 +1,33 @@
-
-
 export class mutingNotificationTypes1600353287890 {
-    constructor() {
-        this.name = 'mutingNotificationTypes1600353287890';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "includingNotificationTypes"`);
-        await queryRunner.query(`DROP TYPE "public"."user_profile_includingnotificationtypes_enum"`);
-        await queryRunner.query(`CREATE TYPE "user_profile_mutingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "mutingNotificationTypes" "user_profile_mutingnotificationtypes_enum" array NOT NULL DEFAULT '{}'`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "mutingNotificationTypes"`);
-        await queryRunner.query(`DROP TYPE "user_profile_mutingnotificationtypes_enum"`);
-        await queryRunner.query(`CREATE TYPE "public"."user_profile_includingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "includingNotificationTypes" "user_profile_includingnotificationtypes_enum" array`);
-    }
+	constructor() {
+		this.name = "mutingNotificationTypes1600353287890";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "includingNotificationTypes"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."user_profile_includingnotificationtypes_enum"`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "user_profile_mutingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "mutingNotificationTypes" "user_profile_mutingnotificationtypes_enum" array NOT NULL DEFAULT '{}'`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "mutingNotificationTypes"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "user_profile_mutingnotificationtypes_enum"`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."user_profile_includingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "includingNotificationTypes" "user_profile_includingnotificationtypes_enum" array`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1603094348345-refine-abuse-user-report.js b/packages/backend/migration/1603094348345-refine-abuse-user-report.js
index 4918032a2..1aaf2685e 100644
--- a/packages/backend/migration/1603094348345-refine-abuse-user-report.js
+++ b/packages/backend/migration/1603094348345-refine-abuse-user-report.js
@@ -1,31 +1,63 @@
-
-
 export class refineAbuseUserReport1603094348345 {
-    constructor() {
-        this.name = 'refineAbuseUserReport1603094348345';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_d049123c413e68ca52abe734203"`);
-        await queryRunner.query(`DROP INDEX "IDX_d049123c413e68ca52abe73420"`);
-        await queryRunner.query(`DROP INDEX "IDX_5cd442c3b2e74fdd99dae20243"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" RENAME COLUMN "userId" TO "targetUserId"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "assigneeId" character varying(32)`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "resolved" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "comment"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "comment" character varying(2048) NOT NULL DEFAULT '{}'::varchar[]`);
-        await queryRunner.query(`CREATE INDEX "IDX_2b15aaf4a0dc5be3499af7ab6a" ON "abuse_user_report" ("resolved") `);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_08b883dd5fdd6f9c4c1572b36de" FOREIGN KEY ("assigneeId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_08b883dd5fdd6f9c4c1572b36de"`);
-        await queryRunner.query(`DROP INDEX "IDX_2b15aaf4a0dc5be3499af7ab6a"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "comment"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "comment" character varying(512) NOT NULL DEFAULT '{}'::varchar[]`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "resolved"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "assigneeId"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" RENAME COLUMN "targetUserId" TO "userId"`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5cd442c3b2e74fdd99dae20243" ON "abuse_user_report" ("userId", "reporterId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d049123c413e68ca52abe73420" ON "abuse_user_report" ("userId") `);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_d049123c413e68ca52abe734203" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
+	constructor() {
+		this.name = "refineAbuseUserReport1603094348345";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_d049123c413e68ca52abe734203"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_d049123c413e68ca52abe73420"`);
+		await queryRunner.query(`DROP INDEX "IDX_5cd442c3b2e74fdd99dae20243"`);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" RENAME COLUMN "userId" TO "targetUserId"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD "assigneeId" character varying(32)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD "resolved" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP COLUMN "comment"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD "comment" character varying(2048) NOT NULL DEFAULT '{}'::varchar[]`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2b15aaf4a0dc5be3499af7ab6a" ON "abuse_user_report" ("resolved") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_08b883dd5fdd6f9c4c1572b36de" FOREIGN KEY ("assigneeId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_08b883dd5fdd6f9c4c1572b36de"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_2b15aaf4a0dc5be3499af7ab6a"`);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP COLUMN "comment"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD "comment" character varying(512) NOT NULL DEFAULT '{}'::varchar[]`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP COLUMN "resolved"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP COLUMN "assigneeId"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" RENAME COLUMN "targetUserId" TO "userId"`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_5cd442c3b2e74fdd99dae20243" ON "abuse_user_report" ("userId", "reporterId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d049123c413e68ca52abe73420" ON "abuse_user_report" ("userId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_d049123c413e68ca52abe734203" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1603095701770-refine-abuse-user-report2.js b/packages/backend/migration/1603095701770-refine-abuse-user-report2.js
index 64e92672f..301a8e538 100644
--- a/packages/backend/migration/1603095701770-refine-abuse-user-report2.js
+++ b/packages/backend/migration/1603095701770-refine-abuse-user-report2.js
@@ -1,19 +1,29 @@
-
-
 export class refineAbuseUserReport21603095701770 {
-    constructor() {
-        this.name = 'refineAbuseUserReport21603095701770';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "targetUserHost" character varying(128)`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "reporterHost" character varying(128)`);
-        await queryRunner.query(`CREATE INDEX "IDX_4ebbf7f93cdc10e8d1ef2fc6cd" ON "abuse_user_report" ("targetUserHost") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f8d8b93740ad12c4ce8213a199" ON "abuse_user_report" ("reporterHost") `);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_f8d8b93740ad12c4ce8213a199"`);
-        await queryRunner.query(`DROP INDEX "IDX_4ebbf7f93cdc10e8d1ef2fc6cd"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "reporterHost"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "targetUserHost"`);
-    }
+	constructor() {
+		this.name = "refineAbuseUserReport21603095701770";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD "targetUserHost" character varying(128)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD "reporterHost" character varying(128)`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_4ebbf7f93cdc10e8d1ef2fc6cd" ON "abuse_user_report" ("targetUserHost") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f8d8b93740ad12c4ce8213a199" ON "abuse_user_report" ("reporterHost") `,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_f8d8b93740ad12c4ce8213a199"`);
+		await queryRunner.query(`DROP INDEX "IDX_4ebbf7f93cdc10e8d1ef2fc6cd"`);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP COLUMN "reporterHost"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP COLUMN "targetUserHost"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1603776877564-instance-theme-color.js b/packages/backend/migration/1603776877564-instance-theme-color.js
index 92440d3f6..9bb3d65c0 100644
--- a/packages/backend/migration/1603776877564-instance-theme-color.js
+++ b/packages/backend/migration/1603776877564-instance-theme-color.js
@@ -1,13 +1,13 @@
-
-
 export class instanceThemeColor1603776877564 {
-    constructor() {
-        this.name = 'instanceThemeColor1603776877564';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" ADD "themeColor" character varying(64) DEFAULT null`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "themeColor"`);
-    }
+	constructor() {
+		this.name = "instanceThemeColor1603776877564";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "themeColor" character varying(64) DEFAULT null`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "themeColor"`);
+	}
 }
diff --git a/packages/backend/migration/1603781553011-instance-favicon.js b/packages/backend/migration/1603781553011-instance-favicon.js
index f607c49ff..4b2442692 100644
--- a/packages/backend/migration/1603781553011-instance-favicon.js
+++ b/packages/backend/migration/1603781553011-instance-favicon.js
@@ -1,13 +1,13 @@
-
-
 export class instanceFavicon1603781553011 {
-    constructor() {
-        this.name = 'instanceFavicon1603781553011';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" ADD "faviconUrl" character varying(256) DEFAULT null`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "faviconUrl"`);
-    }
+	constructor() {
+		this.name = "instanceFavicon1603781553011";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "faviconUrl" character varying(256) DEFAULT null`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "faviconUrl"`);
+	}
 }
diff --git a/packages/backend/migration/1604821689616-delete-auto-watch.js b/packages/backend/migration/1604821689616-delete-auto-watch.js
index 4706e8bae..6a8333ce1 100644
--- a/packages/backend/migration/1604821689616-delete-auto-watch.js
+++ b/packages/backend/migration/1604821689616-delete-auto-watch.js
@@ -1,13 +1,15 @@
-
-
 export class deleteAutoWatch1604821689616 {
-    constructor() {
-        this.name = 'deleteAutoWatch1604821689616';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "autoWatch"`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "autoWatch" boolean NOT NULL DEFAULT false`);
-    }
+	constructor() {
+		this.name = "deleteAutoWatch1604821689616";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "autoWatch"`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "autoWatch" boolean NOT NULL DEFAULT false`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1605408848373-clip-description.js b/packages/backend/migration/1605408848373-clip-description.js
index edd5505b3..99cda6534 100644
--- a/packages/backend/migration/1605408848373-clip-description.js
+++ b/packages/backend/migration/1605408848373-clip-description.js
@@ -1,13 +1,13 @@
-
-
 export class clipDescription1605408848373 {
-    constructor() {
-        this.name = 'clipDescription1605408848373';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "clip" ADD "description" character varying(2048) DEFAULT null`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "clip" DROP COLUMN "description"`);
-    }
+	constructor() {
+		this.name = "clipDescription1605408848373";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "clip" ADD "description" character varying(2048) DEFAULT null`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "clip" DROP COLUMN "description"`);
+	}
 }
diff --git a/packages/backend/migration/1605408971051-comments.js b/packages/backend/migration/1605408971051-comments.js
index 400efd5e7..363fec5cd 100644
--- a/packages/backend/migration/1605408971051-comments.js
+++ b/packages/backend/migration/1605408971051-comments.js
@@ -1,433 +1,1067 @@
-
-
 export class comments1605408971051 {
-    constructor() {
-        this.name = 'comments1605408971051';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`COMMENT ON COLUMN "log"."createdAt" IS 'The created date of the Log.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."createdAt" IS 'The created date of the DriveFolder.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."name" IS 'The name of the DriveFolder.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."userId" IS 'The owner ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."parentId" IS 'The parent folder ID. If null, it means the DriveFolder is located in root.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."createdAt" IS 'The created date of the DriveFile.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."userId" IS 'The owner ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."userHost" IS 'The host of owner. It will be null if the user in local.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."md5" IS 'The MD5 hash of the DriveFile.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."name" IS 'The file name of the DriveFile.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."type" IS 'The content type (MIME) of the DriveFile.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."size" IS 'The file size (bytes) of the DriveFile.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."comment" IS 'The comment of the DriveFile.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."blurhash" IS 'The BlurHash string.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."properties" IS 'The any properties of the DriveFile. For example, it includes image width/height.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."url" IS 'The URL of the DriveFile.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."thumbnailUrl" IS 'The URL of the thumbnail of the DriveFile.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."webpublicUrl" IS 'The URL of the webpublic of the DriveFile.'`);
-        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(`COMMENT ON COLUMN "drive_file"."folderId" IS 'The parent folder ID. If null, it means the DriveFile is located in root.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."isSensitive" IS 'Whether the DriveFile is NSFW.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."isLink" IS 'Whether the DriveFile is direct link to remote server.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."createdAt" IS 'The created date of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."updatedAt" IS 'The updated date of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."username" IS 'The username of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."usernameLower" IS 'The username (lowercased) of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."name" IS 'The name of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."followersCount" IS 'The count of followers.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."followingCount" IS 'The count of following.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."notesCount" IS 'The count of notes.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."avatarId" IS 'The ID of avatar DriveFile.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."bannerId" IS 'The ID of banner DriveFile.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isSuspended" IS 'Whether the User is suspended.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isSilenced" IS 'Whether the User is silenced.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isLocked" IS 'Whether the User is locked.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isBot" IS 'Whether the User is a bot.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isCat" IS 'Whether the User is a cat.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isAdmin" IS 'Whether the User is the admin.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isModerator" IS 'Whether the User is a moderator.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."host" IS 'The host of the User. It will be null if the origin of the user is local.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."inbox" IS 'The inbox URL of the User. It will be null if the origin of the user is local.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."sharedInbox" IS 'The sharedInbox URL of the User. It will be null if the origin of the user is local.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."featured" IS 'The featured URL of the User. It will be null if the origin of the user is local.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."uri" IS 'The URI of the User. It will be null if the origin of the user is local.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."token" IS 'The native access token of the User. It will be null if the origin of the user is local.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."createdAt" IS 'The created date of the App.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."userId" IS 'The owner ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."secret" IS 'The secret key of the App.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."name" IS 'The name of the App.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."description" IS 'The description of the App.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."permission" IS 'The permission of the App.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."callbackUrl" IS 'The callbackUrl of the App.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."createdAt" IS 'The created date of the AccessToken.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."lastUsedAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."session" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."appId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."description" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."iconUrl" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."createdAt" IS 'The created date of the Channel.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."userId" IS 'The owner ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."name" IS 'The name of the Channel.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."description" IS 'The description of the Channel.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."bannerId" IS 'The ID of banner Channel.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."notesCount" IS 'The count of notes.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."usersCount" IS 'The count of users.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."createdAt" IS 'The created date of the Note.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."replyId" IS 'The ID of reply target.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteId" IS 'The ID of renote target.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."userId" IS 'The ID of author.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."uri" IS 'The URI of a note. it will be null when the note is local.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."url" IS 'The human readable url of a note. it will be null when the note is local.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."channelId" IS 'The ID of source channel.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."userHost" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."replyUserId" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."replyUserHost" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteUserId" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteUserHost" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "poll_vote"."createdAt" IS 'The created date of the PollVote.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_reaction"."createdAt" IS 'The created date of the NoteReaction.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."createdAt" IS 'The created date of the NoteWatching.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."userId" IS 'The watcher ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."noteId" IS 'The target Note ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."noteUserId" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_unread"."noteUserId" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_unread"."noteChannelId" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."createdAt" IS 'The created date of the FollowRequest.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeId" IS 'The followee user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerId" IS 'The follower user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."requestId" IS 'id of Follow Activity.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerHost" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerInbox" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerSharedInbox" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeHost" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeInbox" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeSharedInbox" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group"."createdAt" IS 'The created date of the UserGroup.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group"."userId" IS 'The ID of owner.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."createdAt" IS 'The created date of the UserGroupInvitation.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."userId" IS 'The user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."userGroupId" IS 'The group ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."createdAt" IS 'The created date of the Notification.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."notifieeId" IS 'The ID of recipient user of the Notification.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the Notification is read.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "meta"."localDriveCapacityMb" IS 'Drive capacity of a local user (MB)'`);
-        await queryRunner.query(`COMMENT ON COLUMN "meta"."remoteDriveCapacityMb" IS 'Drive capacity of a remote user (MB)'`);
-        await queryRunner.query(`COMMENT ON COLUMN "meta"."maxNoteTextLength" IS 'Max allowed note text length in characters'`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."createdAt" IS 'The created date of the Following.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeId" IS 'The followee user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followerId" IS 'The follower user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followerHost" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followerInbox" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followerSharedInbox" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeHost" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeInbox" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeSharedInbox" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."caughtAt" IS 'The caught date of the Instance.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."host" IS 'The host of the Instance.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."usersCount" IS 'The count of the users of the Instance.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."notesCount" IS 'The count of the notes of the Instance.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."softwareName" IS 'The software of the Instance.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."softwareVersion" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."openRegistrations" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."description" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."maintainerName" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."maintainerEmail" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."iconUrl" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."faviconUrl" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."themeColor" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "muting"."createdAt" IS 'The created date of the Muting.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "muting"."muteeId" IS 'The mutee user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "muting"."muterId" IS 'The muter user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "blocking"."createdAt" IS 'The created date of the Blocking.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "blocking"."blockeeId" IS 'The blockee user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "blocking"."blockerId" IS 'The blocker user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list"."createdAt" IS 'The created date of the UserList.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list"."userId" IS 'The owner ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list"."name" IS 'The name of the UserList.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."createdAt" IS 'The created date of the UserListJoining.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."userId" IS 'The user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."userListId" IS 'The list ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."createdAt" IS 'The created date of the UserGroupJoining.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."userId" IS 'The user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."userGroupId" IS 'The group ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_favorite"."createdAt" IS 'The created date of the NoteFavorite.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."createdAt" IS 'The created date of the AbuseUserReport.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."targetUserHost" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."reporterHost" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."createdAt" IS 'The created date of the MessagingMessage.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."userId" IS 'The sender user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."groupId" IS 'The recipient group ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "signin"."createdAt" IS 'The created date of the Signin.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "auth_session"."createdAt" IS 'The created date of the AuthSession.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."createdAt" IS 'The created date of the ReversiGame.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."startedAt" IS 'The started date of the ReversiGame.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form1" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form2" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "reversi_matching"."createdAt" IS 'The created date of the ReversiMatching.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_note_pining"."createdAt" IS 'The created date of the UserNotePinings.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "poll"."noteId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "poll"."noteVisibility" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "poll"."userId" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "poll"."userHost" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_keypair"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_publickey"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "page"."createdAt" IS 'The created date of the Page.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "page"."updatedAt" IS 'The updated date of the Page.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "page"."userId" IS 'The ID of author.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."location" IS 'The location of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."birthday" IS 'The birthday (YYYY-MM-DD) of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."description" IS 'The description (bio) of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."url" IS 'Remote URL of the user.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."email" IS 'The email address of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."password" IS 'The password hash of the User. It will be null if the origin of the user is local.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."clientData" IS 'The client-specific data of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."room" IS 'The room data of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."userHost" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."id" IS 'Variable-length id given to navigator.credentials.get()'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."publicKey" IS 'Variable-length public key used to verify attestations (hex-encoded).'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."lastUsed" IS 'The date of the last time the UserSecurityKey was successfully validated.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."name" IS 'User-defined name for this key'`);
-        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."challenge" IS 'Hex-encoded sha256 hash of the challenge.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."createdAt" IS 'The date challenge was created for expiry purposes.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."registrationChallenge" IS 'Indicates that the challenge is only for registration purposes if true to prevent the challenge for being used as authentication.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "moderation_log"."createdAt" IS 'The created date of the ModerationLog.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "announcement"."createdAt" IS 'The created date of the Announcement.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "announcement"."updatedAt" IS 'The updated date of the Announcement.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "announcement_read"."createdAt" IS 'The created date of the AnnouncementRead.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip"."createdAt" IS 'The created date of the Clip.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip"."userId" IS 'The owner ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip"."name" IS 'The name of the Clip.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip"."description" IS 'The description of the Clip.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip_note"."noteId" IS 'The note ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip_note"."clipId" IS 'The clip ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "antenna"."createdAt" IS 'The created date of the Antenna.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "antenna"."userId" IS 'The owner ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "antenna"."name" IS 'The name of the Antenna.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "antenna_note"."noteId" IS 'The note ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "antenna_note"."antennaId" IS 'The antenna ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "promo_note"."noteId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "promo_note"."userId" IS '[Denormalized]'`);
-        await queryRunner.query(`COMMENT ON COLUMN "promo_read"."createdAt" IS 'The created date of the PromoRead.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."noteId" IS 'The note ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."userId" IS 'The user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."reason" IS 'The reason of the MutedNote.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."createdAt" IS 'The created date of the ChannelFollowing.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."followeeId" IS 'The followee channel ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."followerId" IS 'The follower user ID.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel_note_pining"."createdAt" IS 'The created date of the ChannelNotePining.'`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`COMMENT ON COLUMN "channel_note_pining"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."followerId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."followeeId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."reason" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."noteId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "promo_read"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "promo_note"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "promo_note"."noteId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "antenna_note"."antennaId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "antenna_note"."noteId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "antenna"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "antenna"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "antenna"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip_note"."clipId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip_note"."noteId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip"."description" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "clip"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "announcement_read"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "announcement"."updatedAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "announcement"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "moderation_log"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."registrationChallenge" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."challenge" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."lastUsed" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."publicKey" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."id" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."userHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."room" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."clientData" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."password" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."email" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."url" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."description" IS 'The description (bio) of the User.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."birthday" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."location" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "page"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "page"."updatedAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "page"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_publickey"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_keypair"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "poll"."userHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "poll"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "poll"."noteVisibility" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "poll"."noteId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_note_pining"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "reversi_matching"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form2" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form1" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."startedAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "auth_session"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "signin"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."groupId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."reporterHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."targetUserHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_favorite"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."userGroupId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."userListId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "blocking"."blockerId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "blocking"."blockeeId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "blocking"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "muting"."muterId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "muting"."muteeId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "muting"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."themeColor" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."faviconUrl" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."iconUrl" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."maintainerEmail" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."maintainerName" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."description" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."openRegistrations" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."softwareVersion" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."softwareName" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."notesCount" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."usersCount" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."host" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "instance"."caughtAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeSharedInbox" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeInbox" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followerSharedInbox" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followerInbox" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followerHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followerId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "following"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "meta"."maxNoteTextLength" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "meta"."remoteDriveCapacityMb" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "meta"."localDriveCapacityMb" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."notifieeId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "notification"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."userGroupId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_group"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeSharedInbox" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeInbox" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerSharedInbox" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerInbox" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."requestId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_unread"."noteChannelId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_unread"."noteUserId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."noteUserId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."noteId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note_reaction"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "poll_vote"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteUserHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteUserId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."replyUserHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."replyUserId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."userHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."channelId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."url" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."uri" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."replyId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "note"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."usersCount" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."notesCount" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."bannerId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."description" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "channel"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."iconUrl" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."description" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."appId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."session" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."lastUsedAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "access_token"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."callbackUrl" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."permission" IS 'The permission of the App.'`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."description" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."secret" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "app"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."token" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."uri" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."featured" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."sharedInbox" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."inbox" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."host" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isModerator" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isAdmin" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isCat" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isBot" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isLocked" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isSilenced" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isSuspended" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."bannerId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."avatarId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."notesCount" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."followingCount" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."followersCount" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."usernameLower" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."username" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."updatedAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."isLink" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."isSensitive" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."folderId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."uri" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."webpublicUrl" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."thumbnailUrl" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."url" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."properties" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."blurhash" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."comment" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."size" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."type" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."md5" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."userHost" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."parentId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."userId" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."name" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."createdAt" IS NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "log"."createdAt" IS NULL`);
-    }
+	constructor() {
+		this.name = "comments1605408971051";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`COMMENT ON COLUMN "log"."createdAt" IS 'The created date of the Log.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_folder"."createdAt" IS 'The created date of the DriveFolder.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_folder"."name" IS 'The name of the DriveFolder.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_folder"."userId" IS 'The owner ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_folder"."parentId" IS 'The parent folder ID. If null, it means the DriveFolder is located in root.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."createdAt" IS 'The created date of the DriveFile.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."userId" IS 'The owner ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."userHost" IS 'The host of owner. It will be null if the user in local.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."md5" IS 'The MD5 hash of the DriveFile.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."name" IS 'The file name of the DriveFile.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."type" IS 'The content type (MIME) of the DriveFile.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."size" IS 'The file size (bytes) of the DriveFile.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."comment" IS 'The comment of the DriveFile.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."blurhash" IS 'The BlurHash string.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."properties" IS 'The any properties of the DriveFile. For example, it includes image width/height.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."url" IS 'The URL of the DriveFile.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."thumbnailUrl" IS 'The URL of the thumbnail of the DriveFile.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."webpublicUrl" IS 'The URL of the webpublic of the DriveFile.'`,
+		);
+		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(
+			`COMMENT ON COLUMN "drive_file"."folderId" IS 'The parent folder ID. If null, it means the DriveFile is located in root.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."isSensitive" IS 'Whether the DriveFile is NSFW.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."isLink" IS 'Whether the DriveFile is direct link to remote server.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."createdAt" IS 'The created date of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."updatedAt" IS 'The updated date of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."username" IS 'The username of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."usernameLower" IS 'The username (lowercased) of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."name" IS 'The name of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."followersCount" IS 'The count of followers.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."followingCount" IS 'The count of following.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."notesCount" IS 'The count of notes.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."avatarId" IS 'The ID of avatar DriveFile.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."bannerId" IS 'The ID of banner DriveFile.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."isSuspended" IS 'Whether the User is suspended.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."isSilenced" IS 'Whether the User is silenced.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."isLocked" IS 'Whether the User is locked.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."isBot" IS 'Whether the User is a bot.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."isCat" IS 'Whether the User is a cat.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."isAdmin" IS 'Whether the User is the admin.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."isModerator" IS 'Whether the User is a moderator.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."host" IS 'The host of the User. It will be null if the origin of the user is local.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."inbox" IS 'The inbox URL of the User. It will be null if the origin of the user is local.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."sharedInbox" IS 'The sharedInbox URL of the User. It will be null if the origin of the user is local.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."featured" IS 'The featured URL of the User. It will be null if the origin of the user is local.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."uri" IS 'The URI of the User. It will be null if the origin of the user is local.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."token" IS 'The native access token of the User. It will be null if the origin of the user is local.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "app"."createdAt" IS 'The created date of the App.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "app"."userId" IS 'The owner ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "app"."secret" IS 'The secret key of the App.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "app"."name" IS 'The name of the App.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "app"."description" IS 'The description of the App.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "app"."permission" IS 'The permission of the App.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "app"."callbackUrl" IS 'The callbackUrl of the App.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "access_token"."createdAt" IS 'The created date of the AccessToken.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "access_token"."lastUsedAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "access_token"."session" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "access_token"."appId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "access_token"."name" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "access_token"."description" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "access_token"."iconUrl" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel"."createdAt" IS 'The created date of the Channel.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel"."userId" IS 'The owner ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel"."name" IS 'The name of the Channel.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel"."description" IS 'The description of the Channel.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel"."bannerId" IS 'The ID of banner Channel.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel"."notesCount" IS 'The count of notes.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel"."usersCount" IS 'The count of users.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."createdAt" IS 'The created date of the Note.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."replyId" IS 'The ID of reply target.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."renoteId" IS 'The ID of renote target.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."userId" IS 'The ID of author.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."uri" IS 'The URI of a note. it will be null when the note is local.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."url" IS 'The human readable url of a note. it will be null when the note is local.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."channelId" IS 'The ID of source channel.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."userHost" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."replyUserId" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."replyUserHost" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."renoteUserId" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."renoteUserHost" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "poll_vote"."createdAt" IS 'The created date of the PollVote.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_reaction"."createdAt" IS 'The created date of the NoteReaction.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_watching"."createdAt" IS 'The created date of the NoteWatching.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_watching"."userId" IS 'The watcher ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_watching"."noteId" IS 'The target Note ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_watching"."noteUserId" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_unread"."noteUserId" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_unread"."noteChannelId" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."createdAt" IS 'The created date of the FollowRequest.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followeeId" IS 'The followee user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followerId" IS 'The follower user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."requestId" IS 'id of Follow Activity.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followerHost" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followerInbox" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followerSharedInbox" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followeeHost" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followeeInbox" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followeeSharedInbox" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group"."createdAt" IS 'The created date of the UserGroup.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group"."userId" IS 'The ID of owner.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_invitation"."createdAt" IS 'The created date of the UserGroupInvitation.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_invitation"."userId" IS 'The user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_invitation"."userGroupId" IS 'The group ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."createdAt" IS 'The created date of the Notification.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."notifieeId" IS 'The ID of recipient user of the Notification.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the Notification is read.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."localDriveCapacityMb" IS 'Drive capacity of a local user (MB)'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."remoteDriveCapacityMb" IS 'Drive capacity of a remote user (MB)'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."maxNoteTextLength" IS 'Max allowed note text length in characters'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."createdAt" IS 'The created date of the Following.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followeeId" IS 'The followee user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followerId" IS 'The follower user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followerHost" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followerInbox" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followerSharedInbox" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followeeHost" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followeeInbox" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followeeSharedInbox" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."caughtAt" IS 'The caught date of the Instance.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."host" IS 'The host of the Instance.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."usersCount" IS 'The count of the users of the Instance.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."notesCount" IS 'The count of the notes of the Instance.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."softwareName" IS 'The software of the Instance.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."softwareVersion" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."openRegistrations" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "instance"."name" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."description" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."maintainerName" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."maintainerEmail" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "instance"."iconUrl" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."faviconUrl" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."themeColor" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "muting"."createdAt" IS 'The created date of the Muting.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "muting"."muteeId" IS 'The mutee user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "muting"."muterId" IS 'The muter user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "blocking"."createdAt" IS 'The created date of the Blocking.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "blocking"."blockeeId" IS 'The blockee user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "blocking"."blockerId" IS 'The blocker user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_list"."createdAt" IS 'The created date of the UserList.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_list"."userId" IS 'The owner ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_list"."name" IS 'The name of the UserList.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_list_joining"."createdAt" IS 'The created date of the UserListJoining.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_list_joining"."userId" IS 'The user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_list_joining"."userListId" IS 'The list ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_joining"."createdAt" IS 'The created date of the UserGroupJoining.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_joining"."userId" IS 'The user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_joining"."userGroupId" IS 'The group ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_favorite"."createdAt" IS 'The created date of the NoteFavorite.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "abuse_user_report"."createdAt" IS 'The created date of the AbuseUserReport.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "abuse_user_report"."targetUserHost" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "abuse_user_report"."reporterHost" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "messaging_message"."createdAt" IS 'The created date of the MessagingMessage.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "messaging_message"."userId" IS 'The sender user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "messaging_message"."groupId" IS 'The recipient group ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "signin"."createdAt" IS 'The created date of the Signin.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "auth_session"."createdAt" IS 'The created date of the AuthSession.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "reversi_game"."createdAt" IS 'The created date of the ReversiGame.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "reversi_game"."startedAt" IS 'The started date of the ReversiGame.'`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form1" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form2" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "reversi_matching"."createdAt" IS 'The created date of the ReversiMatching.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_note_pining"."createdAt" IS 'The created date of the UserNotePinings.'`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "poll"."noteId" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "poll"."noteVisibility" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "poll"."userId" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "poll"."userHost" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_keypair"."userId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_publickey"."userId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "page"."createdAt" IS 'The created date of the Page.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "page"."updatedAt" IS 'The updated date of the Page.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "page"."userId" IS 'The ID of author.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."userId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."location" IS 'The location of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."birthday" IS 'The birthday (YYYY-MM-DD) of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."description" IS 'The description (bio) of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."url" IS 'Remote URL of the user.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."email" IS 'The email address of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."password" IS 'The password hash of the User. It will be null if the origin of the user is local.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."clientData" IS 'The client-specific data of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."room" IS 'The room data of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."userHost" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_security_key"."id" IS 'Variable-length id given to navigator.credentials.get()'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_security_key"."publicKey" IS 'Variable-length public key used to verify attestations (hex-encoded).'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_security_key"."lastUsed" IS 'The date of the last time the UserSecurityKey was successfully validated.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_security_key"."name" IS 'User-defined name for this key'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "attestation_challenge"."challenge" IS 'Hex-encoded sha256 hash of the challenge.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "attestation_challenge"."createdAt" IS 'The date challenge was created for expiry purposes.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "attestation_challenge"."registrationChallenge" IS 'Indicates that the challenge is only for registration purposes if true to prevent the challenge for being used as authentication.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "moderation_log"."createdAt" IS 'The created date of the ModerationLog.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "announcement"."createdAt" IS 'The created date of the Announcement.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "announcement"."updatedAt" IS 'The updated date of the Announcement.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "announcement_read"."createdAt" IS 'The created date of the AnnouncementRead.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "clip"."createdAt" IS 'The created date of the Clip.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "clip"."userId" IS 'The owner ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "clip"."name" IS 'The name of the Clip.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "clip"."description" IS 'The description of the Clip.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "clip_note"."noteId" IS 'The note ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "clip_note"."clipId" IS 'The clip ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "antenna"."createdAt" IS 'The created date of the Antenna.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "antenna"."userId" IS 'The owner ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "antenna"."name" IS 'The name of the Antenna.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "antenna_note"."noteId" IS 'The note ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "antenna_note"."antennaId" IS 'The antenna ID.'`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "promo_note"."noteId" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "promo_note"."userId" IS '[Denormalized]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "promo_read"."createdAt" IS 'The created date of the PromoRead.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "muted_note"."noteId" IS 'The note ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "muted_note"."userId" IS 'The user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "muted_note"."reason" IS 'The reason of the MutedNote.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel_following"."createdAt" IS 'The created date of the ChannelFollowing.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel_following"."followeeId" IS 'The followee channel ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel_following"."followerId" IS 'The follower user ID.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel_note_pining"."createdAt" IS 'The created date of the ChannelNotePining.'`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel_note_pining"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel_following"."followerId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel_following"."followeeId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel_following"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "muted_note"."reason" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "muted_note"."userId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "muted_note"."noteId" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "promo_read"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "promo_note"."userId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "promo_note"."noteId" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "antenna_note"."antennaId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "antenna_note"."noteId" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "antenna"."name" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "antenna"."userId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "antenna"."createdAt" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "clip_note"."clipId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "clip_note"."noteId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "clip"."description" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "clip"."name" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "clip"."userId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "clip"."createdAt" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "announcement_read"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "announcement"."updatedAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "announcement"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "moderation_log"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "attestation_challenge"."registrationChallenge" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "attestation_challenge"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "attestation_challenge"."challenge" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_security_key"."name" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_security_key"."lastUsed" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_security_key"."publicKey" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_security_key"."id" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."userHost" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "user_profile"."room" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."clientData" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."password" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "user_profile"."email" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user_profile"."url" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."description" IS 'The description (bio) of the User.'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."birthday" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."location" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."userId" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "page"."userId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "page"."updatedAt" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "page"."createdAt" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_publickey"."userId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_keypair"."userId" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "poll"."userHost" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "poll"."userId" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "poll"."noteVisibility" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "poll"."noteId" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_note_pining"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "reversi_matching"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form2" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form1" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "reversi_game"."startedAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "reversi_game"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "auth_session"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "signin"."createdAt" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "messaging_message"."groupId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "messaging_message"."userId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "messaging_message"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "abuse_user_report"."reporterHost" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "abuse_user_report"."targetUserHost" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "abuse_user_report"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_favorite"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_joining"."userGroupId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_joining"."userId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_joining"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_list_joining"."userListId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_list_joining"."userId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_list_joining"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "user_list"."name" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user_list"."userId" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_list"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "blocking"."blockerId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "blocking"."blockeeId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "blocking"."createdAt" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "muting"."muterId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "muting"."muteeId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "muting"."createdAt" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."themeColor" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."faviconUrl" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "instance"."iconUrl" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."maintainerEmail" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."maintainerName" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."description" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "instance"."name" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."openRegistrations" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."softwareVersion" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."softwareName" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."notesCount" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "instance"."usersCount" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "instance"."host" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "instance"."caughtAt" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followeeSharedInbox" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followeeInbox" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followeeHost" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followerSharedInbox" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followerInbox" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followerHost" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followerId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."followeeId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "following"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."maxNoteTextLength" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."remoteDriveCapacityMb" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."localDriveCapacityMb" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."isRead" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."notifieeId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "notification"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_invitation"."userGroupId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_invitation"."userId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group_invitation"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "user_group"."userId" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_group"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followeeSharedInbox" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followeeInbox" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followeeHost" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followerSharedInbox" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followerInbox" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followerHost" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."requestId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followerId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."followeeId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "follow_request"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_unread"."noteChannelId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_unread"."noteUserId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_watching"."noteUserId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_watching"."noteId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_watching"."userId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_watching"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note_reaction"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "poll_vote"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "note"."renoteUserHost" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "note"."renoteUserId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "note"."replyUserHost" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "note"."replyUserId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "note"."userHost" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "note"."channelId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "note"."url" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "note"."uri" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "note"."userId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "note"."renoteId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "note"."replyId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "note"."createdAt" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "channel"."usersCount" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "channel"."notesCount" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "channel"."bannerId" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "channel"."description" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "channel"."name" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "channel"."userId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "channel"."createdAt" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "access_token"."iconUrl" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "access_token"."description" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "access_token"."name" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "access_token"."appId" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "access_token"."session" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "access_token"."lastUsedAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "access_token"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "app"."callbackUrl" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "app"."permission" IS 'The permission of the App.'`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "app"."description" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "app"."name" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "app"."secret" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "app"."userId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "app"."createdAt" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."token" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."uri" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."featured" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."sharedInbox" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."inbox" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."host" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."isModerator" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."isAdmin" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."isCat" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."isBot" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."isLocked" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."isSilenced" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."isSuspended" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."bannerId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."avatarId" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."notesCount" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."followingCount" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."followersCount" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."name" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."usernameLower" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."username" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."updatedAt" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."createdAt" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "drive_file"."isLink" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."isSensitive" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."folderId" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "drive_file"."uri" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."webpublicUrl" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."thumbnailUrl" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "drive_file"."url" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."properties" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."blurhash" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "drive_file"."comment" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "drive_file"."size" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "drive_file"."type" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "drive_file"."name" IS NULL`);
+		await queryRunner.query(`COMMENT ON COLUMN "drive_file"."md5" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."userHost" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "drive_file"."userId" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_folder"."parentId" IS NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_folder"."userId" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."name" IS NULL`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_folder"."createdAt" IS NULL`,
+		);
+		await queryRunner.query(`COMMENT ON COLUMN "log"."createdAt" IS NULL`);
+	}
 }
diff --git a/packages/backend/migration/1605585339718-instance-pinned-pages.js b/packages/backend/migration/1605585339718-instance-pinned-pages.js
index 56ccd44c8..09e161764 100644
--- a/packages/backend/migration/1605585339718-instance-pinned-pages.js
+++ b/packages/backend/migration/1605585339718-instance-pinned-pages.js
@@ -1,13 +1,13 @@
-
-
 export class instancePinnedPages1605585339718 {
-    constructor() {
-        this.name = 'instancePinnedPages1605585339718';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{"/featured", "/channels", "/explore", "/pages", "/about-misskey"}'::varchar[]`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedPages"`);
-    }
+	constructor() {
+		this.name = "instancePinnedPages1605585339718";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{"/featured", "/channels", "/explore", "/pages", "/about-misskey"}'::varchar[]`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedPages"`);
+	}
 }
diff --git a/packages/backend/migration/1605965516823-instance-images.js b/packages/backend/migration/1605965516823-instance-images.js
index 710c75981..ed9a26a65 100644
--- a/packages/backend/migration/1605965516823-instance-images.js
+++ b/packages/backend/migration/1605965516823-instance-images.js
@@ -1,15 +1,19 @@
-
-
 export class instanceImages1605965516823 {
-    constructor() {
-        this.name = 'instanceImages1605965516823';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "backgroundImageUrl" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "logoImageUrl" character varying(512)`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "logoImageUrl"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "backgroundImageUrl"`);
-    }
+	constructor() {
+		this.name = "instanceImages1605965516823";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "backgroundImageUrl" character varying(512)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "logoImageUrl" character varying(512)`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "logoImageUrl"`);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "backgroundImageUrl"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1606191203881-no-crawle.js b/packages/backend/migration/1606191203881-no-crawle.js
index b9ada4354..4e7e82277 100644
--- a/packages/backend/migration/1606191203881-no-crawle.js
+++ b/packages/backend/migration/1606191203881-no-crawle.js
@@ -1,15 +1,21 @@
-
-
 export class noCrawle1606191203881 {
-    constructor() {
-        this.name = 'noCrawle1606191203881';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "noCrawle" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."noCrawle" IS 'Whether reject index by crawler.'`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."noCrawle" IS 'Whether reject index by crawler.'`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "noCrawle"`);
-    }
+	constructor() {
+		this.name = "noCrawle1606191203881";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "noCrawle" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."noCrawle" IS 'Whether reject index by crawler.'`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."noCrawle" IS 'Whether reject index by crawler.'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "noCrawle"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1607151207216-instance-pinned-clip.js b/packages/backend/migration/1607151207216-instance-pinned-clip.js
index 9a4195e74..655b4c7fb 100644
--- a/packages/backend/migration/1607151207216-instance-pinned-clip.js
+++ b/packages/backend/migration/1607151207216-instance-pinned-clip.js
@@ -1,13 +1,13 @@
-
-
 export class instancePinnedClip1607151207216 {
-    constructor() {
-        this.name = 'instancePinnedClip1607151207216';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedClipId" character varying(32)`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedClipId"`);
-    }
+	constructor() {
+		this.name = "instancePinnedClip1607151207216";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "pinnedClipId" character varying(32)`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedClipId"`);
+	}
 }
diff --git a/packages/backend/migration/1607353487793-isExplorable.js b/packages/backend/migration/1607353487793-isExplorable.js
index d9f1ff4c6..d654ee121 100644
--- a/packages/backend/migration/1607353487793-isExplorable.js
+++ b/packages/backend/migration/1607353487793-isExplorable.js
@@ -1,17 +1,23 @@
-
-
 export class isExplorable1607353487793 {
-    constructor() {
-        this.name = 'isExplorable1607353487793';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" ADD "isExplorable" boolean NOT NULL DEFAULT true`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isExplorable" IS 'Whether the User is explorable.'`);
-        await queryRunner.query(`CREATE INDEX "IDX_d5a1b83c7cab66f167e6888188" ON "user" ("isExplorable") `);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_d5a1b83c7cab66f167e6888188"`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isExplorable" IS 'Whether the User is explorable.'`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isExplorable"`);
-    }
+	constructor() {
+		this.name = "isExplorable1607353487793";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "isExplorable" boolean NOT NULL DEFAULT true`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."isExplorable" IS 'Whether the User is explorable.'`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d5a1b83c7cab66f167e6888188" ON "user" ("isExplorable") `,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_d5a1b83c7cab66f167e6888188"`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."isExplorable" IS 'Whether the User is explorable.'`,
+		);
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isExplorable"`);
+	}
 }
diff --git a/packages/backend/migration/1610277136869-registry.js b/packages/backend/migration/1610277136869-registry.js
index 184c062dd..023519302 100644
--- a/packages/backend/migration/1610277136869-registry.js
+++ b/packages/backend/migration/1610277136869-registry.js
@@ -1,21 +1,31 @@
-
-
 export class registry1610277136869 {
-    constructor() {
-        this.name = 'registry1610277136869';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "registry_item" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "key" character varying(1024) NOT NULL, "scope" character varying(1024) array NOT NULL DEFAULT '{}'::varchar[], "domain" character varying(512), CONSTRAINT "PK_64b3f7e6008b4d89b826cd3af95" PRIMARY KEY ("id")); COMMENT ON COLUMN "registry_item"."createdAt" IS 'The created date of the RegistryItem.'; COMMENT ON COLUMN "registry_item"."updatedAt" IS 'The updated date of the RegistryItem.'; COMMENT ON COLUMN "registry_item"."userId" IS 'The owner ID.'; COMMENT ON COLUMN "registry_item"."key" IS 'The key of the RegistryItem.'`);
-        await queryRunner.query(`CREATE INDEX "IDX_fb9d21ba0abb83223263df6bcb" ON "registry_item" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_22baca135bb8a3ea1a83d13df3" ON "registry_item" ("scope") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0a72bdfcdb97c0eca11fe7ecad" ON "registry_item" ("domain") `);
-        await queryRunner.query(`ALTER TABLE "registry_item" ADD CONSTRAINT "FK_fb9d21ba0abb83223263df6bcb3" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "registry_item" DROP CONSTRAINT "FK_fb9d21ba0abb83223263df6bcb3"`);
-        await queryRunner.query(`DROP INDEX "IDX_0a72bdfcdb97c0eca11fe7ecad"`);
-        await queryRunner.query(`DROP INDEX "IDX_22baca135bb8a3ea1a83d13df3"`);
-        await queryRunner.query(`DROP INDEX "IDX_fb9d21ba0abb83223263df6bcb"`);
-        await queryRunner.query(`DROP TABLE "registry_item"`);
-    }
+	constructor() {
+		this.name = "registry1610277136869";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "registry_item" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "key" character varying(1024) NOT NULL, "scope" character varying(1024) array NOT NULL DEFAULT '{}'::varchar[], "domain" character varying(512), CONSTRAINT "PK_64b3f7e6008b4d89b826cd3af95" PRIMARY KEY ("id")); COMMENT ON COLUMN "registry_item"."createdAt" IS 'The created date of the RegistryItem.'; COMMENT ON COLUMN "registry_item"."updatedAt" IS 'The updated date of the RegistryItem.'; COMMENT ON COLUMN "registry_item"."userId" IS 'The owner ID.'; COMMENT ON COLUMN "registry_item"."key" IS 'The key of the RegistryItem.'`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_fb9d21ba0abb83223263df6bcb" ON "registry_item" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_22baca135bb8a3ea1a83d13df3" ON "registry_item" ("scope") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0a72bdfcdb97c0eca11fe7ecad" ON "registry_item" ("domain") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "registry_item" ADD CONSTRAINT "FK_fb9d21ba0abb83223263df6bcb3" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "registry_item" DROP CONSTRAINT "FK_fb9d21ba0abb83223263df6bcb3"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_0a72bdfcdb97c0eca11fe7ecad"`);
+		await queryRunner.query(`DROP INDEX "IDX_22baca135bb8a3ea1a83d13df3"`);
+		await queryRunner.query(`DROP INDEX "IDX_fb9d21ba0abb83223263df6bcb"`);
+		await queryRunner.query(`DROP TABLE "registry_item"`);
+	}
 }
diff --git a/packages/backend/migration/1610277585759-registry2.js b/packages/backend/migration/1610277585759-registry2.js
index 591bafae3..a2c1fb01b 100644
--- a/packages/backend/migration/1610277585759-registry2.js
+++ b/packages/backend/migration/1610277585759-registry2.js
@@ -1,15 +1,19 @@
-
-
 export class registry21610277585759 {
-    constructor() {
-        this.name = 'registry21610277585759';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "registry_item" ADD "value" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`COMMENT ON COLUMN "registry_item"."value" IS 'The value of the RegistryItem.'`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`COMMENT ON COLUMN "registry_item"."value" IS 'The value of the RegistryItem.'`);
-        await queryRunner.query(`ALTER TABLE "registry_item" DROP COLUMN "value"`);
-    }
+	constructor() {
+		this.name = "registry21610277585759";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "registry_item" ADD "value" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "registry_item"."value" IS 'The value of the RegistryItem.'`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`COMMENT ON COLUMN "registry_item"."value" IS 'The value of the RegistryItem.'`,
+		);
+		await queryRunner.query(`ALTER TABLE "registry_item" DROP COLUMN "value"`);
+	}
 }
diff --git a/packages/backend/migration/1610283021566-registry3.js b/packages/backend/migration/1610283021566-registry3.js
index e0289f17e..a1d55b2dc 100644
--- a/packages/backend/migration/1610283021566-registry3.js
+++ b/packages/backend/migration/1610283021566-registry3.js
@@ -1,13 +1,15 @@
-
-
 export class registry31610283021566 {
-    constructor() {
-        this.name = 'registry31610283021566';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "registry_item" ALTER COLUMN "value" DROP NOT NULL`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "registry_item" ALTER COLUMN "value" SET NOT NULL`);
-    }
+	constructor() {
+		this.name = "registry31610283021566";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "registry_item" ALTER COLUMN "value" DROP NOT NULL`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "registry_item" ALTER COLUMN "value" SET NOT NULL`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1611354329133-followersUri.js b/packages/backend/migration/1611354329133-followersUri.js
index 669ddb480..c7ca5c895 100644
--- a/packages/backend/migration/1611354329133-followersUri.js
+++ b/packages/backend/migration/1611354329133-followersUri.js
@@ -1,15 +1,19 @@
-
-
 export class followersUri1611354329133 {
-    constructor() {
-        this.name = 'followersUri1611354329133';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" ADD "followersUri" varchar(512) DEFAULT NULL`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."followersUri" IS 'The URI of the user Follower Collection. It will be null if the origin of the user is local.'`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`COMMENT ON COLUMN "user"."followersUri" IS 'The URI of the user Follower Collection. It will be null if the origin of the user is local.'`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "followersUri"`);
-    }
+	constructor() {
+		this.name = "followersUri1611354329133";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "followersUri" varchar(512) DEFAULT NULL`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."followersUri" IS 'The URI of the user Follower Collection. It will be null if the origin of the user is local.'`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."followersUri" IS 'The URI of the user Follower Collection. It will be null if the origin of the user is local.'`,
+		);
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "followersUri"`);
+	}
 }
diff --git a/packages/backend/migration/1611397665007-gallery.js b/packages/backend/migration/1611397665007-gallery.js
index f49b2df46..1f36acbc1 100644
--- a/packages/backend/migration/1611397665007-gallery.js
+++ b/packages/backend/migration/1611397665007-gallery.js
@@ -1,39 +1,71 @@
-
-
 export class gallery1611397665007 {
-    constructor() {
-        this.name = 'gallery1611397665007';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "gallery_post" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "title" character varying(256) NOT NULL, "description" character varying(2048), "userId" character varying(32) NOT NULL, "fileIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "isSensitive" boolean NOT NULL DEFAULT false, "likedCount" integer NOT NULL DEFAULT '0', "tags" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], CONSTRAINT "PK_8e90d7b6015f2c4518881b14753" PRIMARY KEY ("id")); COMMENT ON COLUMN "gallery_post"."createdAt" IS 'The created date of the GalleryPost.'; COMMENT ON COLUMN "gallery_post"."updatedAt" IS 'The updated date of the GalleryPost.'; COMMENT ON COLUMN "gallery_post"."userId" IS 'The ID of author.'; COMMENT ON COLUMN "gallery_post"."isSensitive" IS 'Whether the post is sensitive.'`);
-        await queryRunner.query(`CREATE INDEX "IDX_8f1a239bd077c8864a20c62c2c" ON "gallery_post" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f631d37835adb04792e361807c" ON "gallery_post" ("updatedAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_985b836dddd8615e432d7043dd" ON "gallery_post" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3ca50563facd913c425e7a89ee" ON "gallery_post" ("fileIds") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f2d744d9a14d0dfb8b96cb7fc5" ON "gallery_post" ("isSensitive") `);
-        await queryRunner.query(`CREATE INDEX "IDX_1a165c68a49d08f11caffbd206" ON "gallery_post" ("likedCount") `);
-        await queryRunner.query(`CREATE INDEX "IDX_05cca34b985d1b8edc1d1e28df" ON "gallery_post" ("tags") `);
-        await queryRunner.query(`CREATE TABLE "gallery_like" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "postId" character varying(32) NOT NULL, CONSTRAINT "PK_853ab02be39b8de45cd720cc15f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_8fd5215095473061855ceb948c" ON "gallery_like" ("userId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_df1b5f4099e99fb0bc5eae53b6" ON "gallery_like" ("userId", "postId") `);
-        await queryRunner.query(`ALTER TABLE "gallery_post" ADD CONSTRAINT "FK_985b836dddd8615e432d7043ddb" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "gallery_like" ADD CONSTRAINT "FK_8fd5215095473061855ceb948cf" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "gallery_like" ADD CONSTRAINT "FK_b1cb568bfe569e47b7051699fc8" FOREIGN KEY ("postId") REFERENCES "gallery_post"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "gallery_like" DROP CONSTRAINT "FK_b1cb568bfe569e47b7051699fc8"`);
-        await queryRunner.query(`ALTER TABLE "gallery_like" DROP CONSTRAINT "FK_8fd5215095473061855ceb948cf"`);
-        await queryRunner.query(`ALTER TABLE "gallery_post" DROP CONSTRAINT "FK_985b836dddd8615e432d7043ddb"`);
-        await queryRunner.query(`DROP INDEX "IDX_df1b5f4099e99fb0bc5eae53b6"`);
-        await queryRunner.query(`DROP INDEX "IDX_8fd5215095473061855ceb948c"`);
-        await queryRunner.query(`DROP TABLE "gallery_like"`);
-        await queryRunner.query(`DROP INDEX "IDX_05cca34b985d1b8edc1d1e28df"`);
-        await queryRunner.query(`DROP INDEX "IDX_1a165c68a49d08f11caffbd206"`);
-        await queryRunner.query(`DROP INDEX "IDX_f2d744d9a14d0dfb8b96cb7fc5"`);
-        await queryRunner.query(`DROP INDEX "IDX_3ca50563facd913c425e7a89ee"`);
-        await queryRunner.query(`DROP INDEX "IDX_985b836dddd8615e432d7043dd"`);
-        await queryRunner.query(`DROP INDEX "IDX_f631d37835adb04792e361807c"`);
-        await queryRunner.query(`DROP INDEX "IDX_8f1a239bd077c8864a20c62c2c"`);
-        await queryRunner.query(`DROP TABLE "gallery_post"`);
-    }
+	constructor() {
+		this.name = "gallery1611397665007";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "gallery_post" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "title" character varying(256) NOT NULL, "description" character varying(2048), "userId" character varying(32) NOT NULL, "fileIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "isSensitive" boolean NOT NULL DEFAULT false, "likedCount" integer NOT NULL DEFAULT '0', "tags" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], CONSTRAINT "PK_8e90d7b6015f2c4518881b14753" PRIMARY KEY ("id")); COMMENT ON COLUMN "gallery_post"."createdAt" IS 'The created date of the GalleryPost.'; COMMENT ON COLUMN "gallery_post"."updatedAt" IS 'The updated date of the GalleryPost.'; COMMENT ON COLUMN "gallery_post"."userId" IS 'The ID of author.'; COMMENT ON COLUMN "gallery_post"."isSensitive" IS 'Whether the post is sensitive.'`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8f1a239bd077c8864a20c62c2c" ON "gallery_post" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f631d37835adb04792e361807c" ON "gallery_post" ("updatedAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_985b836dddd8615e432d7043dd" ON "gallery_post" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3ca50563facd913c425e7a89ee" ON "gallery_post" ("fileIds") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f2d744d9a14d0dfb8b96cb7fc5" ON "gallery_post" ("isSensitive") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_1a165c68a49d08f11caffbd206" ON "gallery_post" ("likedCount") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_05cca34b985d1b8edc1d1e28df" ON "gallery_post" ("tags") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "gallery_like" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "postId" character varying(32) NOT NULL, CONSTRAINT "PK_853ab02be39b8de45cd720cc15f" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8fd5215095473061855ceb948c" ON "gallery_like" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_df1b5f4099e99fb0bc5eae53b6" ON "gallery_like" ("userId", "postId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "gallery_post" ADD CONSTRAINT "FK_985b836dddd8615e432d7043ddb" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "gallery_like" ADD CONSTRAINT "FK_8fd5215095473061855ceb948cf" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "gallery_like" ADD CONSTRAINT "FK_b1cb568bfe569e47b7051699fc8" FOREIGN KEY ("postId") REFERENCES "gallery_post"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "gallery_like" DROP CONSTRAINT "FK_b1cb568bfe569e47b7051699fc8"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "gallery_like" DROP CONSTRAINT "FK_8fd5215095473061855ceb948cf"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "gallery_post" DROP CONSTRAINT "FK_985b836dddd8615e432d7043ddb"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_df1b5f4099e99fb0bc5eae53b6"`);
+		await queryRunner.query(`DROP INDEX "IDX_8fd5215095473061855ceb948c"`);
+		await queryRunner.query(`DROP TABLE "gallery_like"`);
+		await queryRunner.query(`DROP INDEX "IDX_05cca34b985d1b8edc1d1e28df"`);
+		await queryRunner.query(`DROP INDEX "IDX_1a165c68a49d08f11caffbd206"`);
+		await queryRunner.query(`DROP INDEX "IDX_f2d744d9a14d0dfb8b96cb7fc5"`);
+		await queryRunner.query(`DROP INDEX "IDX_3ca50563facd913c425e7a89ee"`);
+		await queryRunner.query(`DROP INDEX "IDX_985b836dddd8615e432d7043dd"`);
+		await queryRunner.query(`DROP INDEX "IDX_f631d37835adb04792e361807c"`);
+		await queryRunner.query(`DROP INDEX "IDX_8f1a239bd077c8864a20c62c2c"`);
+		await queryRunner.query(`DROP TABLE "gallery_post"`);
+	}
 }
diff --git a/packages/backend/migration/1611547387175-objectStorageS3ForcePathStyle.js b/packages/backend/migration/1611547387175-objectStorageS3ForcePathStyle.js
index e4d3c0e8e..b65ca2a57 100644
--- a/packages/backend/migration/1611547387175-objectStorageS3ForcePathStyle.js
+++ b/packages/backend/migration/1611547387175-objectStorageS3ForcePathStyle.js
@@ -1,13 +1,15 @@
-
-
 export class objectStorageS3ForcePathStyle1611547387175 {
-    constructor() {
-        this.name = 'objectStorageS3ForcePathStyle1611547387175';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageS3ForcePathStyle" boolean NOT NULL DEFAULT true`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageS3ForcePathStyle"`);
-    }
+	constructor() {
+		this.name = "objectStorageS3ForcePathStyle1611547387175";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "objectStorageS3ForcePathStyle" boolean NOT NULL DEFAULT true`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "objectStorageS3ForcePathStyle"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1612619156584-announcement-email.js b/packages/backend/migration/1612619156584-announcement-email.js
index bcc718d1c..a3b7292f8 100644
--- a/packages/backend/migration/1612619156584-announcement-email.js
+++ b/packages/backend/migration/1612619156584-announcement-email.js
@@ -1,13 +1,15 @@
-
-
 export class announcementEmail1612619156584 {
-    constructor() {
-        this.name = 'announcementEmail1612619156584';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "receiveAnnouncementEmail" boolean NOT NULL DEFAULT true`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "receiveAnnouncementEmail"`);
-    }
+	constructor() {
+		this.name = "announcementEmail1612619156584";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "receiveAnnouncementEmail" boolean NOT NULL DEFAULT true`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "receiveAnnouncementEmail"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1613155914446-emailNotificationTypes.js b/packages/backend/migration/1613155914446-emailNotificationTypes.js
index cd49924d2..e64aada7b 100644
--- a/packages/backend/migration/1613155914446-emailNotificationTypes.js
+++ b/packages/backend/migration/1613155914446-emailNotificationTypes.js
@@ -1,13 +1,15 @@
-
-
 export class emailNotificationTypes1613155914446 {
-    constructor() {
-        this.name = 'emailNotificationTypes1613155914446';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "emailNotificationTypes" jsonb NOT NULL DEFAULT '["follow","receiveFollowRequest","groupInvited"]'`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "emailNotificationTypes"`);
-    }
+	constructor() {
+		this.name = "emailNotificationTypes1613155914446";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "emailNotificationTypes" jsonb NOT NULL DEFAULT '["follow","receiveFollowRequest","groupInvited"]'`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "emailNotificationTypes"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1613181457597-user-lang.js b/packages/backend/migration/1613181457597-user-lang.js
index d2cd06848..aa5bf7de8 100644
--- a/packages/backend/migration/1613181457597-user-lang.js
+++ b/packages/backend/migration/1613181457597-user-lang.js
@@ -1,13 +1,13 @@
-
-
 export class userLang1613181457597 {
-    constructor() {
-        this.name = 'userLang1613181457597';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "lang" character varying(32)`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "lang"`);
-    }
+	constructor() {
+		this.name = "userLang1613181457597";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "lang" character varying(32)`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "lang"`);
+	}
 }
diff --git a/packages/backend/migration/1613503367223-use-bigint-for-driveUsage.js b/packages/backend/migration/1613503367223-use-bigint-for-driveUsage.js
index f2e2c5d35..a8f1e33bf 100644
--- a/packages/backend/migration/1613503367223-use-bigint-for-driveUsage.js
+++ b/packages/backend/migration/1613503367223-use-bigint-for-driveUsage.js
@@ -1,14 +1,16 @@
-
-
 export class useBigintForDriveUsage1613503367223 {
-    constructor() {
-        this.name = 'useBigintForDriveUsage1613503367223';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "driveUsage" TYPE bigint`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "driveUsage"`);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "driveUsage" integer NOT NULL DEFAULT 0`);
-    }
+	constructor() {
+		this.name = "useBigintForDriveUsage1613503367223";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "instance" ALTER COLUMN "driveUsage" TYPE bigint`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "driveUsage"`);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "driveUsage" integer NOT NULL DEFAULT 0`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1615965918224-chart-v2.js b/packages/backend/migration/1615965918224-chart-v2.js
index 86fa5b0c0..0460a57f5 100644
--- a/packages/backend/migration/1615965918224-chart-v2.js
+++ b/packages/backend/migration/1615965918224-chart-v2.js
@@ -1,216 +1,508 @@
-
-
 export class chartV21615965918224 {
-    constructor() {
-        this.name = 'chartV21615965918224';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`DELETE FROM "__chart__active_users" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__drive" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__federation" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__hashtag" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__instance" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__network" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__notes" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__per_user_drive" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__per_user_following" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__per_user_notes" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__per_user_reaction" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__test" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__test_grouped" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__test_unique" WHERE "span" = 'day'`);
-        await queryRunner.query(`DELETE FROM "__chart__users" WHERE "span" = 'day'`);
-        await queryRunner.query(`DROP INDEX "IDX_15e91a03aeeac9dbccdf43fc06"`);
-        await queryRunner.query(`DROP INDEX "IDX_20f57cc8f142c131340ee16742"`);
-        await queryRunner.query(`DROP INDEX "IDX_c26e2c1cbb6e911e0554b27416"`);
-        await queryRunner.query(`DROP INDEX "IDX_3fa0d0f17ca72e3dc80999a032"`);
-        await queryRunner.query(`DROP INDEX "IDX_6e1df243476e20cbf86572ecc0"`);
-        await queryRunner.query(`DROP INDEX "IDX_06690fc959f1c9fdaf21928222"`);
-        await queryRunner.query(`DROP INDEX "IDX_e447064455928cf627590ef527"`);
-        await queryRunner.query(`DROP INDEX "IDX_2d416e6af791a82e338c79d480"`);
-        await queryRunner.query(`DROP INDEX "IDX_e9cd07672b37d8966cf3709283"`);
-        await queryRunner.query(`DROP INDEX "IDX_fcc181fb8283009c61cc4083ef"`);
-        await queryRunner.query(`DROP INDEX "IDX_49975586f50ed7b800fdd88fbd"`);
-        await queryRunner.query(`DROP INDEX "IDX_6d6f156ceefc6bc5f273a0e370"`);
-        await queryRunner.query(`DROP INDEX "IDX_c12f0af4a66cdd30c2287ce8aa"`);
-        await queryRunner.query(`DROP INDEX "IDX_d0a4f79af5a97b08f37b547197"`);
-        await queryRunner.query(`DROP INDEX "IDX_f5448d9633cff74208d850aabe"`);
-        await queryRunner.query(`DROP INDEX "IDX_f8dd01baeded2ffa833e0a610a"`);
-        await queryRunner.query(`DROP INDEX "IDX_08fac0eb3b11f04c200c0b40dd"`);
-        await queryRunner.query(`DROP INDEX "IDX_9ff6944f01acb756fdc92d7563"`);
-        await queryRunner.query(`DROP INDEX "IDX_e69096589f11e3baa98ddd64d0"`);
-        await queryRunner.query(`DROP INDEX "IDX_0c9a159c5082cbeef3ca6706b5"`);
-        await queryRunner.query(`DROP INDEX "IDX_924fc196c80ca24bae01dd37e4"`);
-        await queryRunner.query(`DROP INDEX "IDX_328f259961e60c4fa0bfcf55ca"`);
-        await queryRunner.query(`DROP INDEX "IDX_42ea9381f0fda8dfe0fa1c8b53"`);
-        await queryRunner.query(`DROP INDEX "IDX_f2aeafde2ae6fbad38e857631b"`);
-        await queryRunner.query(`DROP INDEX "IDX_f92dd6d03f8d994f29987f6214"`);
-        await queryRunner.query(`DROP INDEX "IDX_57b5458d0d3d6d1e7f13d4e57f"`);
-        await queryRunner.query(`DROP INDEX "IDX_4db3b84c7be0d3464714f3e0b1"`);
-        await queryRunner.query(`DROP INDEX "IDX_8d2cbbc8114d90d19b44d626b6"`);
-        await queryRunner.query(`DROP INDEX "IDX_046feeb12e9ef5f783f409866a"`);
-        await queryRunner.query(`DROP INDEX "IDX_f68a5ab958f9f5fa17a32ac23b"`);
-        await queryRunner.query(`DROP INDEX "IDX_65633a106bce43fc7c5c30a5c7"`);
-        await queryRunner.query(`DROP INDEX "IDX_edeb73c09c3143a81bcb34d569"`);
-        await queryRunner.query(`DROP INDEX "IDX_e316f01a6d24eb31db27f88262"`);
-        await queryRunner.query(`DROP INDEX "IDX_2be7ec6cebddc14dc11e206686"`);
-        await queryRunner.query(`DROP INDEX "IDX_a5133470f4825902e170328ca5"`);
-        await queryRunner.query(`DROP INDEX "IDX_84e661abb7bd1e51b690d4b017"`);
-        await queryRunner.query(`DROP INDEX "IDX_5c73bf61da4f6e6f15bae88ed1"`);
-        await queryRunner.query(`DROP INDEX "IDX_d70c86baedc68326be11f9c0ce"`);
-        await queryRunner.query(`DROP INDEX "IDX_66e1e1ecd2f29e57778af35b59"`);
-        await queryRunner.query(`DROP INDEX "IDX_92255988735563f0fe4aba1f05"`);
-        await queryRunner.query(`DROP INDEX "IDX_c5870993e25c3d5771f91f5003"`);
-        await queryRunner.query(`DROP INDEX "IDX_f170de677ea75ad4533de2723e"`);
-        await queryRunner.query(`DROP INDEX "IDX_7c184198ecf66a8d3ecb253ab3"`);
-        await queryRunner.query(`DROP INDEX "IDX_f091abb24193d50c653c6b77fc"`);
-        await queryRunner.query(`DROP INDEX "IDX_a770a57c70e668cc61590c9161"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__active_users_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_count"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_count"`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__drive_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__federation_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__hashtag_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___local_count"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___remote_count"`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__instance_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__network_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__notes_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__per_user_drive_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__per_user_following_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__per_user_notes_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__per_user_reaction_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__test_grouped" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__test_grouped_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__test_grouped" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__test_unique" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__test_unique_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__test_unique" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__test_unique" DROP COLUMN "___foo"`);
-        await queryRunner.query(`ALTER TABLE "__chart__test" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__test_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__test" DROP COLUMN "unique"`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" DROP COLUMN "span"`);
-        await queryRunner.query(`DROP TYPE "public"."__chart__users_span_enum"`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" DROP COLUMN "unique"`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__users" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__users_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ADD "span" "__chart__users_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__test" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__test_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__test" ADD "span" "__chart__test_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__test_unique" ADD "___foo" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__test_unique" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__test_unique_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__test_unique" ADD "span" "__chart__test_unique_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__test_grouped" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__test_grouped_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__test_grouped" ADD "span" "__chart__test_grouped_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__per_user_reaction_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ADD "span" "__chart__per_user_reaction_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__per_user_notes_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ADD "span" "__chart__per_user_notes_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__per_user_following_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ADD "span" "__chart__per_user_following_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__per_user_drive_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ADD "span" "__chart__per_user_drive_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__notes_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ADD "span" "__chart__notes_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__network_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ADD "span" "__chart__network_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__instance_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ADD "span" "__chart__instance_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___remote_count" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___local_count" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__hashtag_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "span" "__chart__hashtag_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__federation_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "span" "__chart__federation_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__drive_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "span" "__chart__drive_span_enum" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___remote_count" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___local_count" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique" jsonb NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`CREATE TYPE "public"."__chart__active_users_span_enum" AS ENUM('hour', 'day')`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "span" "__chart__active_users_span_enum" NOT NULL`);
-        await queryRunner.query(`CREATE INDEX "IDX_a770a57c70e668cc61590c9161" ON "__chart__users" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f091abb24193d50c653c6b77fc" ON "__chart__users" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7c184198ecf66a8d3ecb253ab3" ON "__chart__users" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f170de677ea75ad4533de2723e" ON "__chart__test" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c5870993e25c3d5771f91f5003" ON "__chart__test" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_92255988735563f0fe4aba1f05" ON "__chart__test" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_66e1e1ecd2f29e57778af35b59" ON "__chart__test_unique" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d70c86baedc68326be11f9c0ce" ON "__chart__test_unique" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5c73bf61da4f6e6f15bae88ed1" ON "__chart__test_unique" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_84e661abb7bd1e51b690d4b017" ON "__chart__test_grouped" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a5133470f4825902e170328ca5" ON "__chart__test_grouped" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2be7ec6cebddc14dc11e206686" ON "__chart__test_grouped" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e316f01a6d24eb31db27f88262" ON "__chart__per_user_reaction" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_edeb73c09c3143a81bcb34d569" ON "__chart__per_user_reaction" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_65633a106bce43fc7c5c30a5c7" ON "__chart__per_user_reaction" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f68a5ab958f9f5fa17a32ac23b" ON "__chart__per_user_notes" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_046feeb12e9ef5f783f409866a" ON "__chart__per_user_notes" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_8d2cbbc8114d90d19b44d626b6" ON "__chart__per_user_notes" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_4db3b84c7be0d3464714f3e0b1" ON "__chart__per_user_following" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_57b5458d0d3d6d1e7f13d4e57f" ON "__chart__per_user_following" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f92dd6d03f8d994f29987f6214" ON "__chart__per_user_following" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f2aeafde2ae6fbad38e857631b" ON "__chart__per_user_drive" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_42ea9381f0fda8dfe0fa1c8b53" ON "__chart__per_user_drive" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_328f259961e60c4fa0bfcf55ca" ON "__chart__per_user_drive" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_924fc196c80ca24bae01dd37e4" ON "__chart__notes" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0c9a159c5082cbeef3ca6706b5" ON "__chart__notes" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e69096589f11e3baa98ddd64d0" ON "__chart__notes" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_9ff6944f01acb756fdc92d7563" ON "__chart__network" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_08fac0eb3b11f04c200c0b40dd" ON "__chart__network" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f8dd01baeded2ffa833e0a610a" ON "__chart__network" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f5448d9633cff74208d850aabe" ON "__chart__instance" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d0a4f79af5a97b08f37b547197" ON "__chart__instance" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c12f0af4a66cdd30c2287ce8aa" ON "__chart__instance" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6d6f156ceefc6bc5f273a0e370" ON "__chart__hashtag" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_49975586f50ed7b800fdd88fbd" ON "__chart__hashtag" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_fcc181fb8283009c61cc4083ef" ON "__chart__hashtag" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e9cd07672b37d8966cf3709283" ON "__chart__federation" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2d416e6af791a82e338c79d480" ON "__chart__federation" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e447064455928cf627590ef527" ON "__chart__federation" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_06690fc959f1c9fdaf21928222" ON "__chart__drive" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6e1df243476e20cbf86572ecc0" ON "__chart__drive" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3fa0d0f17ca72e3dc80999a032" ON "__chart__drive" ("span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c26e2c1cbb6e911e0554b27416" ON "__chart__active_users" ("date", "group", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_20f57cc8f142c131340ee16742" ON "__chart__active_users" ("date", "span") `);
-        await queryRunner.query(`CREATE INDEX "IDX_15e91a03aeeac9dbccdf43fc06" ON "__chart__active_users" ("span") `);
-    }
+	constructor() {
+		this.name = "chartV21615965918224";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`DELETE FROM "__chart__active_users" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__drive" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__federation" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__hashtag" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__instance" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__network" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__notes" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__per_user_drive" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__per_user_following" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__per_user_notes" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__per_user_reaction" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(`DELETE FROM "__chart__test" WHERE "span" = 'day'`);
+		await queryRunner.query(
+			`DELETE FROM "__chart__test_grouped" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__test_unique" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__users" WHERE "span" = 'day'`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_15e91a03aeeac9dbccdf43fc06"`);
+		await queryRunner.query(`DROP INDEX "IDX_20f57cc8f142c131340ee16742"`);
+		await queryRunner.query(`DROP INDEX "IDX_c26e2c1cbb6e911e0554b27416"`);
+		await queryRunner.query(`DROP INDEX "IDX_3fa0d0f17ca72e3dc80999a032"`);
+		await queryRunner.query(`DROP INDEX "IDX_6e1df243476e20cbf86572ecc0"`);
+		await queryRunner.query(`DROP INDEX "IDX_06690fc959f1c9fdaf21928222"`);
+		await queryRunner.query(`DROP INDEX "IDX_e447064455928cf627590ef527"`);
+		await queryRunner.query(`DROP INDEX "IDX_2d416e6af791a82e338c79d480"`);
+		await queryRunner.query(`DROP INDEX "IDX_e9cd07672b37d8966cf3709283"`);
+		await queryRunner.query(`DROP INDEX "IDX_fcc181fb8283009c61cc4083ef"`);
+		await queryRunner.query(`DROP INDEX "IDX_49975586f50ed7b800fdd88fbd"`);
+		await queryRunner.query(`DROP INDEX "IDX_6d6f156ceefc6bc5f273a0e370"`);
+		await queryRunner.query(`DROP INDEX "IDX_c12f0af4a66cdd30c2287ce8aa"`);
+		await queryRunner.query(`DROP INDEX "IDX_d0a4f79af5a97b08f37b547197"`);
+		await queryRunner.query(`DROP INDEX "IDX_f5448d9633cff74208d850aabe"`);
+		await queryRunner.query(`DROP INDEX "IDX_f8dd01baeded2ffa833e0a610a"`);
+		await queryRunner.query(`DROP INDEX "IDX_08fac0eb3b11f04c200c0b40dd"`);
+		await queryRunner.query(`DROP INDEX "IDX_9ff6944f01acb756fdc92d7563"`);
+		await queryRunner.query(`DROP INDEX "IDX_e69096589f11e3baa98ddd64d0"`);
+		await queryRunner.query(`DROP INDEX "IDX_0c9a159c5082cbeef3ca6706b5"`);
+		await queryRunner.query(`DROP INDEX "IDX_924fc196c80ca24bae01dd37e4"`);
+		await queryRunner.query(`DROP INDEX "IDX_328f259961e60c4fa0bfcf55ca"`);
+		await queryRunner.query(`DROP INDEX "IDX_42ea9381f0fda8dfe0fa1c8b53"`);
+		await queryRunner.query(`DROP INDEX "IDX_f2aeafde2ae6fbad38e857631b"`);
+		await queryRunner.query(`DROP INDEX "IDX_f92dd6d03f8d994f29987f6214"`);
+		await queryRunner.query(`DROP INDEX "IDX_57b5458d0d3d6d1e7f13d4e57f"`);
+		await queryRunner.query(`DROP INDEX "IDX_4db3b84c7be0d3464714f3e0b1"`);
+		await queryRunner.query(`DROP INDEX "IDX_8d2cbbc8114d90d19b44d626b6"`);
+		await queryRunner.query(`DROP INDEX "IDX_046feeb12e9ef5f783f409866a"`);
+		await queryRunner.query(`DROP INDEX "IDX_f68a5ab958f9f5fa17a32ac23b"`);
+		await queryRunner.query(`DROP INDEX "IDX_65633a106bce43fc7c5c30a5c7"`);
+		await queryRunner.query(`DROP INDEX "IDX_edeb73c09c3143a81bcb34d569"`);
+		await queryRunner.query(`DROP INDEX "IDX_e316f01a6d24eb31db27f88262"`);
+		await queryRunner.query(`DROP INDEX "IDX_2be7ec6cebddc14dc11e206686"`);
+		await queryRunner.query(`DROP INDEX "IDX_a5133470f4825902e170328ca5"`);
+		await queryRunner.query(`DROP INDEX "IDX_84e661abb7bd1e51b690d4b017"`);
+		await queryRunner.query(`DROP INDEX "IDX_5c73bf61da4f6e6f15bae88ed1"`);
+		await queryRunner.query(`DROP INDEX "IDX_d70c86baedc68326be11f9c0ce"`);
+		await queryRunner.query(`DROP INDEX "IDX_66e1e1ecd2f29e57778af35b59"`);
+		await queryRunner.query(`DROP INDEX "IDX_92255988735563f0fe4aba1f05"`);
+		await queryRunner.query(`DROP INDEX "IDX_c5870993e25c3d5771f91f5003"`);
+		await queryRunner.query(`DROP INDEX "IDX_f170de677ea75ad4533de2723e"`);
+		await queryRunner.query(`DROP INDEX "IDX_7c184198ecf66a8d3ecb253ab3"`);
+		await queryRunner.query(`DROP INDEX "IDX_f091abb24193d50c653c6b77fc"`);
+		await queryRunner.query(`DROP INDEX "IDX_a770a57c70e668cc61590c9161"`);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "span"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."__chart__active_users_span_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_count"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_count"`,
+		);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "span"`);
+		await queryRunner.query(`DROP TYPE "public"."__chart__drive_span_enum"`);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "span"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."__chart__federation_span_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "span"`,
+		);
+		await queryRunner.query(`DROP TYPE "public"."__chart__hashtag_span_enum"`);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "___local_count"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "___remote_count"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" DROP COLUMN "span"`,
+		);
+		await queryRunner.query(`DROP TYPE "public"."__chart__instance_span_enum"`);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" DROP COLUMN "span"`,
+		);
+		await queryRunner.query(`DROP TYPE "public"."__chart__network_span_enum"`);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" DROP COLUMN "span"`);
+		await queryRunner.query(`DROP TYPE "public"."__chart__notes_span_enum"`);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" DROP COLUMN "span"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."__chart__per_user_drive_span_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" DROP COLUMN "span"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."__chart__per_user_following_span_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" DROP COLUMN "span"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."__chart__per_user_notes_span_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" DROP COLUMN "span"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."__chart__per_user_reaction_span_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_grouped" DROP COLUMN "span"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."__chart__test_grouped_span_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_grouped" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_unique" DROP COLUMN "span"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."__chart__test_unique_span_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_unique" DROP COLUMN "unique"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_unique" DROP COLUMN "___foo"`,
+		);
+		await queryRunner.query(`ALTER TABLE "__chart__test" DROP COLUMN "span"`);
+		await queryRunner.query(`DROP TYPE "public"."__chart__test_span_enum"`);
+		await queryRunner.query(`ALTER TABLE "__chart__test" DROP COLUMN "unique"`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" DROP COLUMN "span"`);
+		await queryRunner.query(`DROP TYPE "public"."__chart__users_span_enum"`);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" DROP COLUMN "unique"`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__users_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ADD "span" "__chart__users_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__test_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test" ADD "span" "__chart__test_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_unique" ADD "___foo" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_unique" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__test_unique_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_unique" ADD "span" "__chart__test_unique_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_grouped" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__test_grouped_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_grouped" ADD "span" "__chart__test_grouped_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__per_user_reaction_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ADD "span" "__chart__per_user_reaction_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__per_user_notes_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ADD "span" "__chart__per_user_notes_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__per_user_following_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ADD "span" "__chart__per_user_following_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__per_user_drive_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ADD "span" "__chart__per_user_drive_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__notes_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ADD "span" "__chart__notes_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__network_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ADD "span" "__chart__network_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__instance_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ADD "span" "__chart__instance_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "___remote_count" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "___local_count" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__hashtag_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "span" "__chart__hashtag_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__federation_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "span" "__chart__federation_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__drive_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ADD "span" "__chart__drive_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___remote_count" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___local_count" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique" jsonb NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."__chart__active_users_span_enum" AS ENUM('hour', 'day')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "span" "__chart__active_users_span_enum" NOT NULL`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a770a57c70e668cc61590c9161" ON "__chart__users" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f091abb24193d50c653c6b77fc" ON "__chart__users" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7c184198ecf66a8d3ecb253ab3" ON "__chart__users" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f170de677ea75ad4533de2723e" ON "__chart__test" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_c5870993e25c3d5771f91f5003" ON "__chart__test" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_92255988735563f0fe4aba1f05" ON "__chart__test" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_66e1e1ecd2f29e57778af35b59" ON "__chart__test_unique" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d70c86baedc68326be11f9c0ce" ON "__chart__test_unique" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_5c73bf61da4f6e6f15bae88ed1" ON "__chart__test_unique" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_84e661abb7bd1e51b690d4b017" ON "__chart__test_grouped" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a5133470f4825902e170328ca5" ON "__chart__test_grouped" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2be7ec6cebddc14dc11e206686" ON "__chart__test_grouped" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e316f01a6d24eb31db27f88262" ON "__chart__per_user_reaction" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_edeb73c09c3143a81bcb34d569" ON "__chart__per_user_reaction" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_65633a106bce43fc7c5c30a5c7" ON "__chart__per_user_reaction" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f68a5ab958f9f5fa17a32ac23b" ON "__chart__per_user_notes" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_046feeb12e9ef5f783f409866a" ON "__chart__per_user_notes" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8d2cbbc8114d90d19b44d626b6" ON "__chart__per_user_notes" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_4db3b84c7be0d3464714f3e0b1" ON "__chart__per_user_following" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_57b5458d0d3d6d1e7f13d4e57f" ON "__chart__per_user_following" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f92dd6d03f8d994f29987f6214" ON "__chart__per_user_following" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f2aeafde2ae6fbad38e857631b" ON "__chart__per_user_drive" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_42ea9381f0fda8dfe0fa1c8b53" ON "__chart__per_user_drive" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_328f259961e60c4fa0bfcf55ca" ON "__chart__per_user_drive" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_924fc196c80ca24bae01dd37e4" ON "__chart__notes" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0c9a159c5082cbeef3ca6706b5" ON "__chart__notes" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e69096589f11e3baa98ddd64d0" ON "__chart__notes" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_9ff6944f01acb756fdc92d7563" ON "__chart__network" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_08fac0eb3b11f04c200c0b40dd" ON "__chart__network" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f8dd01baeded2ffa833e0a610a" ON "__chart__network" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f5448d9633cff74208d850aabe" ON "__chart__instance" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d0a4f79af5a97b08f37b547197" ON "__chart__instance" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_c12f0af4a66cdd30c2287ce8aa" ON "__chart__instance" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_6d6f156ceefc6bc5f273a0e370" ON "__chart__hashtag" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_49975586f50ed7b800fdd88fbd" ON "__chart__hashtag" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_fcc181fb8283009c61cc4083ef" ON "__chart__hashtag" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e9cd07672b37d8966cf3709283" ON "__chart__federation" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2d416e6af791a82e338c79d480" ON "__chart__federation" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e447064455928cf627590ef527" ON "__chart__federation" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_06690fc959f1c9fdaf21928222" ON "__chart__drive" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_6e1df243476e20cbf86572ecc0" ON "__chart__drive" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3fa0d0f17ca72e3dc80999a032" ON "__chart__drive" ("span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_c26e2c1cbb6e911e0554b27416" ON "__chart__active_users" ("date", "group", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_20f57cc8f142c131340ee16742" ON "__chart__active_users" ("date", "span") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_15e91a03aeeac9dbccdf43fc06" ON "__chart__active_users" ("span") `,
+		);
+	}
 }
diff --git a/packages/backend/migration/1615966519402-chart-v2-2.js b/packages/backend/migration/1615966519402-chart-v2-2.js
index c62f1b875..ce7596103 100644
--- a/packages/backend/migration/1615966519402-chart-v2-2.js
+++ b/packages/backend/migration/1615966519402-chart-v2-2.js
@@ -1,21 +1,39 @@
-
-
 export class chartV221615966519402 {
-    constructor() {
-        this.name = 'chartV221615966519402';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___local_users" character varying array NOT NULL DEFAULT '{}'::varchar[]`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___remote_users" character varying array NOT NULL DEFAULT '{}'::varchar[]`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___local_users" character varying array NOT NULL DEFAULT '{}'::varchar[]`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___remote_users" character varying array NOT NULL DEFAULT '{}'::varchar[]`);
-        await queryRunner.query(`ALTER TABLE "__chart__test_unique" ADD "___foo" character varying array NOT NULL DEFAULT '{}'::varchar[]`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__test_unique" DROP COLUMN "___foo"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_users"`);
-    }
+	constructor() {
+		this.name = "chartV221615966519402";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___local_users" character varying array NOT NULL DEFAULT '{}'::varchar[]`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___remote_users" character varying array NOT NULL DEFAULT '{}'::varchar[]`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "___local_users" character varying array NOT NULL DEFAULT '{}'::varchar[]`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "___remote_users" character varying array NOT NULL DEFAULT '{}'::varchar[]`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_unique" ADD "___foo" character varying array NOT NULL DEFAULT '{}'::varchar[]`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__test_unique" DROP COLUMN "___foo"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_users"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1618637372000-user-last-active-date.js b/packages/backend/migration/1618637372000-user-last-active-date.js
index 6c77ace46..0211c256b 100644
--- a/packages/backend/migration/1618637372000-user-last-active-date.js
+++ b/packages/backend/migration/1618637372000-user-last-active-date.js
@@ -1,15 +1,17 @@
-
-
 export class userLastActiveDate1618637372000 {
-    constructor() {
-        this.name = 'userLastActiveDate1618637372000';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" ADD "lastActiveDate" TIMESTAMP WITH TIME ZONE DEFAULT NULL`);
-        await queryRunner.query(`CREATE INDEX "IDX_seoignmeoprigmkpodgrjmkpormg" ON "user" ("lastActiveDate") `);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_seoignmeoprigmkpodgrjmkpormg"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "lastActiveDate"`);
-    }
+	constructor() {
+		this.name = "userLastActiveDate1618637372000";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "lastActiveDate" TIMESTAMP WITH TIME ZONE DEFAULT NULL`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_seoignmeoprigmkpodgrjmkpormg" ON "user" ("lastActiveDate") `,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_seoignmeoprigmkpodgrjmkpormg"`);
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "lastActiveDate"`);
+	}
 }
diff --git a/packages/backend/migration/1618639857000-user-hide-online-status.js b/packages/backend/migration/1618639857000-user-hide-online-status.js
index e63c8ae11..8d7632608 100644
--- a/packages/backend/migration/1618639857000-user-hide-online-status.js
+++ b/packages/backend/migration/1618639857000-user-hide-online-status.js
@@ -1,13 +1,15 @@
-
-
 export class userHideOnlineStatus1618639857000 {
-    constructor() {
-        this.name = 'userHideOnlineStatus1618639857000';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" ADD "hideOnlineStatus" boolean NOT NULL DEFAULT false`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "hideOnlineStatus"`);
-    }
+	constructor() {
+		this.name = "userHideOnlineStatus1618639857000";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "hideOnlineStatus" boolean NOT NULL DEFAULT false`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user" DROP COLUMN "hideOnlineStatus"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1619942102890-password-reset.js b/packages/backend/migration/1619942102890-password-reset.js
index 922d225dc..e3adeb95e 100644
--- a/packages/backend/migration/1619942102890-password-reset.js
+++ b/packages/backend/migration/1619942102890-password-reset.js
@@ -1,19 +1,27 @@
-
-
 export class passwordReset1619942102890 {
-    constructor() {
-        this.name = 'passwordReset1619942102890';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "password_reset_request" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "token" character varying(256) NOT NULL, "userId" character varying(32) NOT NULL, CONSTRAINT "PK_fcf4b02eae1403a2edaf87fd074" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0b575fa9a4cfe638a925949285" ON "password_reset_request" ("token") `);
-        await queryRunner.query(`CREATE INDEX "IDX_4bb7fd4a34492ae0e6cc8d30ac" ON "password_reset_request" ("userId") `);
-        await queryRunner.query(`ALTER TABLE "password_reset_request" ADD CONSTRAINT "FK_4bb7fd4a34492ae0e6cc8d30ac8" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "password_reset_request" DROP CONSTRAINT "FK_4bb7fd4a34492ae0e6cc8d30ac8"`);
-        await queryRunner.query(`DROP INDEX "IDX_4bb7fd4a34492ae0e6cc8d30ac"`);
-        await queryRunner.query(`DROP INDEX "IDX_0b575fa9a4cfe638a925949285"`);
-        await queryRunner.query(`DROP TABLE "password_reset_request"`);
-    }
+	constructor() {
+		this.name = "passwordReset1619942102890";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "password_reset_request" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "token" character varying(256) NOT NULL, "userId" character varying(32) NOT NULL, CONSTRAINT "PK_fcf4b02eae1403a2edaf87fd074" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_0b575fa9a4cfe638a925949285" ON "password_reset_request" ("token") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_4bb7fd4a34492ae0e6cc8d30ac" ON "password_reset_request" ("userId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "password_reset_request" ADD CONSTRAINT "FK_4bb7fd4a34492ae0e6cc8d30ac8" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "password_reset_request" DROP CONSTRAINT "FK_4bb7fd4a34492ae0e6cc8d30ac8"`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_4bb7fd4a34492ae0e6cc8d30ac"`);
+		await queryRunner.query(`DROP INDEX "IDX_0b575fa9a4cfe638a925949285"`);
+		await queryRunner.query(`DROP TABLE "password_reset_request"`);
+	}
 }
diff --git a/packages/backend/migration/1620019354680-ad.js b/packages/backend/migration/1620019354680-ad.js
index c96d2bfb3..e39b38101 100644
--- a/packages/backend/migration/1620019354680-ad.js
+++ b/packages/backend/migration/1620019354680-ad.js
@@ -1,17 +1,21 @@
-
-
 export class ad1620019354680 {
-    constructor() {
-        this.name = 'ad1620019354680';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "ad" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "expiresAt" TIMESTAMP WITH TIME ZONE NOT NULL, "place" character varying(32) NOT NULL, "priority" character varying(32) NOT NULL, "url" character varying(1024) NOT NULL, "imageUrl" character varying(1024) NOT NULL, "memo" character varying(8192) NOT NULL, CONSTRAINT "PK_0193d5ef09746e88e9ea92c634d" PRIMARY KEY ("id")); COMMENT ON COLUMN "ad"."createdAt" IS 'The created date of the Ad.'; COMMENT ON COLUMN "ad"."expiresAt" IS 'The expired date of the Ad.'`);
-        await queryRunner.query(`CREATE INDEX "IDX_1129c2ef687fc272df040bafaa" ON "ad" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2da24ce20ad209f1d9dc032457" ON "ad" ("expiresAt") `);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_2da24ce20ad209f1d9dc032457"`);
-        await queryRunner.query(`DROP INDEX "IDX_1129c2ef687fc272df040bafaa"`);
-        await queryRunner.query(`DROP TABLE "ad"`);
-    }
+	constructor() {
+		this.name = "ad1620019354680";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "ad" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "expiresAt" TIMESTAMP WITH TIME ZONE NOT NULL, "place" character varying(32) NOT NULL, "priority" character varying(32) NOT NULL, "url" character varying(1024) NOT NULL, "imageUrl" character varying(1024) NOT NULL, "memo" character varying(8192) NOT NULL, CONSTRAINT "PK_0193d5ef09746e88e9ea92c634d" PRIMARY KEY ("id")); COMMENT ON COLUMN "ad"."createdAt" IS 'The created date of the Ad.'; COMMENT ON COLUMN "ad"."expiresAt" IS 'The expired date of the Ad.'`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_1129c2ef687fc272df040bafaa" ON "ad" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_2da24ce20ad209f1d9dc032457" ON "ad" ("expiresAt") `,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_2da24ce20ad209f1d9dc032457"`);
+		await queryRunner.query(`DROP INDEX "IDX_1129c2ef687fc272df040bafaa"`);
+		await queryRunner.query(`DROP TABLE "ad"`);
+	}
 }
diff --git a/packages/backend/migration/1620364649428-ad2.js b/packages/backend/migration/1620364649428-ad2.js
index db1c3e1de..a61c3ef08 100644
--- a/packages/backend/migration/1620364649428-ad2.js
+++ b/packages/backend/migration/1620364649428-ad2.js
@@ -1,13 +1,13 @@
-
-
 export class ad21620364649428 {
-    constructor() {
-        this.name = 'ad21620364649428';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "ad" ADD "ratio" integer NOT NULL DEFAULT '1'`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "ad" DROP COLUMN "ratio"`);
-    }
+	constructor() {
+		this.name = "ad21620364649428";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "ad" ADD "ratio" integer NOT NULL DEFAULT '1'`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "ad" DROP COLUMN "ratio"`);
+	}
 }
diff --git a/packages/backend/migration/1621479946000-add-note-indexes.js b/packages/backend/migration/1621479946000-add-note-indexes.js
index dcf97fa4d..f9ffbbff1 100644
--- a/packages/backend/migration/1621479946000-add-note-indexes.js
+++ b/packages/backend/migration/1621479946000-add-note-indexes.js
@@ -1,15 +1,22 @@
-
-
 export class addNoteIndexes1621479946000 {
-    constructor() {
-        this.name = 'addNoteIndexes1621479946000';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE INDEX "IDX_NOTE_MENTIONS" ON "note" USING gin ("mentions")`, undefined);
-        await queryRunner.query(`CREATE INDEX "IDX_NOTE_VISIBLE_USER_IDS" ON "note" USING gin ("visibleUserIds")`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_NOTE_MENTIONS"`, undefined);
-        await queryRunner.query(`DROP INDEX "IDX_NOTE_VISIBLE_USER_IDS"`, undefined);
-    }
+	constructor() {
+		this.name = "addNoteIndexes1621479946000";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE INDEX "IDX_NOTE_MENTIONS" ON "note" USING gin ("mentions")`,
+			undefined,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_NOTE_VISIBLE_USER_IDS" ON "note" USING gin ("visibleUserIds")`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_NOTE_MENTIONS"`, undefined);
+		await queryRunner.query(
+			`DROP INDEX "IDX_NOTE_VISIBLE_USER_IDS"`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1622679304522-user-profile-description-length.js b/packages/backend/migration/1622679304522-user-profile-description-length.js
index 22f6c1c5d..7c761c92a 100644
--- a/packages/backend/migration/1622679304522-user-profile-description-length.js
+++ b/packages/backend/migration/1622679304522-user-profile-description-length.js
@@ -1,13 +1,17 @@
-
-
 export class userProfileDescriptionLength1622679304522 {
-    constructor() {
-        this.name = 'userProfileDescriptionLength1622679304522';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "description" TYPE character varying(2048)`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "description" TYPE character varying(1024)`, undefined);
-    }
+	constructor() {
+		this.name = "userProfileDescriptionLength1622679304522";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ALTER COLUMN "description" TYPE character varying(2048)`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ALTER COLUMN "description" TYPE character varying(1024)`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1622681548499-log-message-length.js b/packages/backend/migration/1622681548499-log-message-length.js
index ac16c0e1b..9dfb7ed3d 100644
--- a/packages/backend/migration/1622681548499-log-message-length.js
+++ b/packages/backend/migration/1622681548499-log-message-length.js
@@ -1,13 +1,17 @@
-
-
 export class logMessageLength1622681548499 {
-    constructor() {
-        this.name = 'logMessageLength1622681548499';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "log" ALTER COLUMN "message" TYPE character varying(2048)`, undefined);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "log" ALTER COLUMN "message" TYPE character varying(1024)`, undefined);
-    }
+	constructor() {
+		this.name = "logMessageLength1622681548499";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "log" ALTER COLUMN "message" TYPE character varying(2048)`,
+			undefined,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "log" ALTER COLUMN "message" TYPE character varying(1024)`,
+			undefined,
+		);
+	}
 }
diff --git a/packages/backend/migration/1626509500668-fix-remote-file-proxy.js b/packages/backend/migration/1626509500668-fix-remote-file-proxy.js
index 30c562007..f79cfb006 100644
--- a/packages/backend/migration/1626509500668-fix-remote-file-proxy.js
+++ b/packages/backend/migration/1626509500668-fix-remote-file-proxy.js
@@ -1,22 +1,31 @@
-
-
 export class fixRemoteFileProxy1626509500668 {
-    constructor() {
-        this.name = 'fixRemoteFileProxy1626509500668';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarUrl"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "bannerUrl"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarBlurhash"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "bannerBlurhash"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "proxyRemoteFiles"`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "proxyRemoteFiles" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "bannerBlurhash" character varying(128)`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "avatarBlurhash" character varying(128)`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "bannerUrl" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "avatarUrl" character varying(512)`);
-    }
+	constructor() {
+		this.name = "fixRemoteFileProxy1626509500668";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarUrl"`);
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "bannerUrl"`);
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarBlurhash"`);
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "bannerBlurhash"`);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "proxyRemoteFiles"`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "proxyRemoteFiles" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "bannerBlurhash" character varying(128)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "avatarBlurhash" character varying(128)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "bannerUrl" character varying(512)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "avatarUrl" character varying(512)`,
+		);
+	}
 }
-
diff --git a/packages/backend/migration/1626733991004-allowlist-secure-mode.js b/packages/backend/migration/1626733991004-allowlist-secure-mode.js
index aa3fcf875..6d2dd6842 100644
--- a/packages/backend/migration/1626733991004-allowlist-secure-mode.js
+++ b/packages/backend/migration/1626733991004-allowlist-secure-mode.js
@@ -1,11 +1,15 @@
-
-
-export class allowlistSecureMode1626733991004  {
-	name = 'allowlistSecureMode1626733991004';
+export class allowlistSecureMode1626733991004 {
+	name = "allowlistSecureMode1626733991004";
 	async up(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "meta" ADD "allowedHosts" character varying(256) [] default '{}'`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "secureMode" bool default false`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "privateMode" bool default false`);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "allowedHosts" character varying(256) [] default '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "secureMode" bool default false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "privateMode" bool default false`,
+		);
 	}
 
 	async down(queryRunner) {
@@ -14,4 +18,3 @@ export class allowlistSecureMode1626733991004  {
 		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "privateMode"`);
 	}
 }
-
diff --git a/packages/backend/migration/1629004542760-chart-reindex.js b/packages/backend/migration/1629004542760-chart-reindex.js
index a7d459276..8cc564b32 100644
--- a/packages/backend/migration/1629004542760-chart-reindex.js
+++ b/packages/backend/migration/1629004542760-chart-reindex.js
@@ -1,181 +1,357 @@
-
-
 export class chartReindex1629004542760 {
-    constructor() {
-        this.name = 'chartReindex1629004542760';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`DELETE FROM "__chart__active_users" a USING "__chart__active_users" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__drive" a USING "__chart__drive" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__federation" a USING "__chart__federation" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__hashtag" a USING "__chart__hashtag" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__instance" a USING "__chart__instance" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__network" a USING "__chart__network" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__notes" a USING "__chart__notes" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__per_user_drive" a USING "__chart__per_user_drive" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__per_user_following" a USING "__chart__per_user_following" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__per_user_notes" a USING "__chart__per_user_notes" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__per_user_reaction" a USING "__chart__per_user_reaction" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__test_grouped" a USING "__chart__test_grouped" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__test_unique" a USING "__chart__test_unique" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DELETE FROM "__chart__users" a USING "__chart__users" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`);
-        await queryRunner.query(`DROP INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc"`);
-        await queryRunner.query(`DROP INDEX "IDX_00ed5f86db1f7efafb1978bf21"`);
-        await queryRunner.query(`DROP INDEX "IDX_9a3ed15a30ab7e3a37702e6e08"`);
-        await queryRunner.query(`DROP INDEX "IDX_13565815f618a1ff53886c5b28"`);
-        await queryRunner.query(`DROP INDEX "IDX_7a170f67425e62a8fabb76c872"`);
-        await queryRunner.query(`DROP INDEX "IDX_3313d7288855ec105b5bbf6c21"`);
-        await queryRunner.query(`DROP INDEX "IDX_36cb699c49580d4e6c2e6159f9"`);
-        await queryRunner.query(`DROP INDEX "IDX_76e87c7bfc5d925fcbba405d84"`);
-        await queryRunner.query(`DROP INDEX "IDX_dd907becf76104e4b656659e6b"`);
-        await queryRunner.query(`DROP INDEX "IDX_07747a1038c05f532a718fe1de"`);
-        await queryRunner.query(`DROP INDEX "IDX_99a7d2faaef84a6f728d714ad6"`);
-        await queryRunner.query(`DROP INDEX "IDX_25a97c02003338124b2b75fdbc"`);
-        await queryRunner.query(`DROP INDEX "IDX_6b8f34a1a64b06014b6fb66824"`);
-        await queryRunner.query(`DROP INDEX "IDX_da8a46ba84ca1d8bb5a29bfb63"`);
-        await queryRunner.query(`DROP INDEX "IDX_39ee857ab2f23493037c6b6631"`);
-        await queryRunner.query(`DROP INDEX "IDX_a1efd3e0048a5f2793a47360dc"`);
-        await queryRunner.query(`DROP INDEX "IDX_7b5da130992ec9df96712d4290"`);
-        await queryRunner.query(`DROP INDEX "IDX_0a905b992fecd2b5c3fb98759e"`);
-        await queryRunner.query(`DROP INDEX "IDX_42eb716a37d381cdf566192b2b"`);
-        await queryRunner.query(`DROP INDEX "IDX_7036f2957151588b813185c794"`);
-        await queryRunner.query(`DROP INDEX "IDX_f09d543e3acb16c5976bdb31fa"`);
-        await queryRunner.query(`DROP INDEX "IDX_5f86db6492274e07c1a3cdf286"`);
-        await queryRunner.query(`DROP INDEX "IDX_e496ca8096d28f6b9b509264dc"`);
-        await queryRunner.query(`DROP INDEX "IDX_30bf67687f483ace115c5ca642"`);
-        await queryRunner.query(`DROP INDEX "IDX_7af07790712aa3438ff6773f3b"`);
-        await queryRunner.query(`DROP INDEX "IDX_4b3593098b6edc9c5afe36b18b"`);
-        await queryRunner.query(`DROP INDEX "IDX_b77d4dd9562c3a899d9a286fcd"`);
-        await queryRunner.query(`DROP INDEX "IDX_84234bd1abb873f07329681c83"`);
-        await queryRunner.query(`DROP INDEX "IDX_55bf20f366979f2436de99206b"`);
-        await queryRunner.query(`DROP INDEX "IDX_5048e9daccbbbc6d567bb142d3"`);
-        await queryRunner.query(`DROP INDEX "IDX_f7bf4c62059764c2c2bb40fdab"`);
-        await queryRunner.query(`DROP INDEX "IDX_8cf3156fd7a6b15c43459c6e3b"`);
-        await queryRunner.query(`DROP INDEX "IDX_229a41ad465f9205f1f5703291"`);
-        await queryRunner.query(`DROP INDEX "IDX_0c641990ecf47d2545df4edb75"`);
-        await queryRunner.query(`DROP INDEX "IDX_234dff3c0b56a6150b95431ab9"`);
-        await queryRunner.query(`DROP INDEX "IDX_b14489029e4b3aaf4bba5fb524"`);
-        await queryRunner.query(`DROP INDEX "IDX_437bab3c6061d90f6bb65fd2cc"`);
-        await queryRunner.query(`DROP INDEX "IDX_bbfa573a8181018851ed0b6357"`);
-        await queryRunner.query(`DROP INDEX "IDX_a0cd75442dd10d0643a17c4a49"`);
-        await queryRunner.query(`DROP INDEX "IDX_b070a906db04b44c67c6c2144d"`);
-        await queryRunner.query(`DROP INDEX "IDX_d41cce6aee1a50bfc062038f9b"`);
-        await queryRunner.query(`DROP INDEX "IDX_a319e5dbf47e8a17497623beae"`);
-        await queryRunner.query(`DROP INDEX "IDX_845254b3eaf708ae8a6cac3026"`);
-        await queryRunner.query(`DROP INDEX "IDX_ed9b95919c672a13008e9487ee"`);
-        await queryRunner.query(`DROP INDEX "IDX_337e9599f278bd7537fe30876f"`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_9a3ed15a30ab7e3a37702e6e08" ON "__chart__active_users" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_60c5c6e7e538c09aa274ecd1cf" ON "__chart__active_users" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_3313d7288855ec105b5bbf6c21" ON "__chart__drive" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_ceab80a6729f8e2e6f5b8a1a3d" ON "__chart__drive" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_dd907becf76104e4b656659e6b" ON "__chart__federation" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_eddfed8fb40305a04c6f941050" ON "__chart__federation" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_53a3604b939e2b479eb2cfaac8" ON "__chart__hashtag" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_8111b817b9818c04d7eb8475b1" ON "__chart__instance" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0a905b992fecd2b5c3fb98759e" ON "__chart__network" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_2082327b2699ce924fa654afc5" ON "__chart__network" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_f09d543e3acb16c5976bdb31fa" ON "__chart__notes" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e60c358aaced5aab8900a4af31" ON "__chart__notes" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a9a806d466b314f253a1a611c4" ON "__chart__per_user_drive" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_dabbb38a51ab86ee3cab291326" ON "__chart__per_user_following" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_583a157ed0cf0ed1b5ec2a833f" ON "__chart__per_user_notes" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_3b7697a96f522d0478972e6d6f" ON "__chart__per_user_reaction" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_b14489029e4b3aaf4bba5fb524" ON "__chart__test_grouped" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_da522b4008a9f5d7743b87ad55" ON "__chart__test_grouped" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a0cd75442dd10d0643a17c4a49" ON "__chart__test_unique" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_16effb2e888f6763673b579f80" ON "__chart__test_unique" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a319e5dbf47e8a17497623beae" ON "__chart__test" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_dab383a36f3c9db4a0c9b02cf3" ON "__chart__test" ("date") WHERE "group" IS NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_337e9599f278bd7537fe30876f" ON "__chart__users" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_66feba81e1795d176d06c0b1e6" ON "__chart__users" ("date") WHERE "group" IS NULL`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_66feba81e1795d176d06c0b1e6"`);
-        await queryRunner.query(`DROP INDEX "IDX_337e9599f278bd7537fe30876f"`);
-        await queryRunner.query(`DROP INDEX "IDX_dab383a36f3c9db4a0c9b02cf3"`);
-        await queryRunner.query(`DROP INDEX "IDX_a319e5dbf47e8a17497623beae"`);
-        await queryRunner.query(`DROP INDEX "IDX_16effb2e888f6763673b579f80"`);
-        await queryRunner.query(`DROP INDEX "IDX_a0cd75442dd10d0643a17c4a49"`);
-        await queryRunner.query(`DROP INDEX "IDX_da522b4008a9f5d7743b87ad55"`);
-        await queryRunner.query(`DROP INDEX "IDX_b14489029e4b3aaf4bba5fb524"`);
-        await queryRunner.query(`DROP INDEX "IDX_3b7697a96f522d0478972e6d6f"`);
-        await queryRunner.query(`DROP INDEX "IDX_229a41ad465f9205f1f5703291"`);
-        await queryRunner.query(`DROP INDEX "IDX_583a157ed0cf0ed1b5ec2a833f"`);
-        await queryRunner.query(`DROP INDEX "IDX_5048e9daccbbbc6d567bb142d3"`);
-        await queryRunner.query(`DROP INDEX "IDX_dabbb38a51ab86ee3cab291326"`);
-        await queryRunner.query(`DROP INDEX "IDX_b77d4dd9562c3a899d9a286fcd"`);
-        await queryRunner.query(`DROP INDEX "IDX_a9a806d466b314f253a1a611c4"`);
-        await queryRunner.query(`DROP INDEX "IDX_30bf67687f483ace115c5ca642"`);
-        await queryRunner.query(`DROP INDEX "IDX_e60c358aaced5aab8900a4af31"`);
-        await queryRunner.query(`DROP INDEX "IDX_f09d543e3acb16c5976bdb31fa"`);
-        await queryRunner.query(`DROP INDEX "IDX_2082327b2699ce924fa654afc5"`);
-        await queryRunner.query(`DROP INDEX "IDX_0a905b992fecd2b5c3fb98759e"`);
-        await queryRunner.query(`DROP INDEX "IDX_8111b817b9818c04d7eb8475b1"`);
-        await queryRunner.query(`DROP INDEX "IDX_39ee857ab2f23493037c6b6631"`);
-        await queryRunner.query(`DROP INDEX "IDX_53a3604b939e2b479eb2cfaac8"`);
-        await queryRunner.query(`DROP INDEX "IDX_25a97c02003338124b2b75fdbc"`);
-        await queryRunner.query(`DROP INDEX "IDX_eddfed8fb40305a04c6f941050"`);
-        await queryRunner.query(`DROP INDEX "IDX_dd907becf76104e4b656659e6b"`);
-        await queryRunner.query(`DROP INDEX "IDX_ceab80a6729f8e2e6f5b8a1a3d"`);
-        await queryRunner.query(`DROP INDEX "IDX_3313d7288855ec105b5bbf6c21"`);
-        await queryRunner.query(`DROP INDEX "IDX_60c5c6e7e538c09aa274ecd1cf"`);
-        await queryRunner.query(`DROP INDEX "IDX_9a3ed15a30ab7e3a37702e6e08"`);
-        await queryRunner.query(`DROP INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5"`);
-        await queryRunner.query(`DROP INDEX "IDX_f22169eb10657bded6d875ac8f"`);
-        await queryRunner.query(`DROP INDEX "IDX_c8cc87bd0f2f4487d17c651fbf"`);
-        await queryRunner.query(`DROP INDEX "IDX_754499f9b2642336433769518d"`);
-        await queryRunner.query(`DROP INDEX "IDX_315c779174fe8247ab324f036e"`);
-        await queryRunner.query(`DROP INDEX "IDX_c5d46cbfda48b1c33ed852e21b"`);
-        await queryRunner.query(`CREATE INDEX "IDX_337e9599f278bd7537fe30876f" ON "__chart__users" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_ed9b95919c672a13008e9487ee" ON "__chart__users" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_845254b3eaf708ae8a6cac3026" ON "__chart__users" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a319e5dbf47e8a17497623beae" ON "__chart__test" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d41cce6aee1a50bfc062038f9b" ON "__chart__test" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b070a906db04b44c67c6c2144d" ON "__chart__test" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a0cd75442dd10d0643a17c4a49" ON "__chart__test_unique" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_bbfa573a8181018851ed0b6357" ON "__chart__test_unique" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_437bab3c6061d90f6bb65fd2cc" ON "__chart__test_unique" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b14489029e4b3aaf4bba5fb524" ON "__chart__test_grouped" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_234dff3c0b56a6150b95431ab9" ON "__chart__test_grouped" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0c641990ecf47d2545df4edb75" ON "__chart__test_grouped" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_8cf3156fd7a6b15c43459c6e3b" ON "__chart__per_user_reaction" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f7bf4c62059764c2c2bb40fdab" ON "__chart__per_user_reaction" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_55bf20f366979f2436de99206b" ON "__chart__per_user_notes" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_84234bd1abb873f07329681c83" ON "__chart__per_user_notes" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_4b3593098b6edc9c5afe36b18b" ON "__chart__per_user_following" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7af07790712aa3438ff6773f3b" ON "__chart__per_user_following" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e496ca8096d28f6b9b509264dc" ON "__chart__per_user_drive" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5f86db6492274e07c1a3cdf286" ON "__chart__per_user_drive" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f09d543e3acb16c5976bdb31fa" ON "__chart__notes" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7036f2957151588b813185c794" ON "__chart__notes" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_42eb716a37d381cdf566192b2b" ON "__chart__notes" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0a905b992fecd2b5c3fb98759e" ON "__chart__network" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7b5da130992ec9df96712d4290" ON "__chart__network" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_a1efd3e0048a5f2793a47360dc" ON "__chart__network" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_da8a46ba84ca1d8bb5a29bfb63" ON "__chart__instance" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_6b8f34a1a64b06014b6fb66824" ON "__chart__instance" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_99a7d2faaef84a6f728d714ad6" ON "__chart__hashtag" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_07747a1038c05f532a718fe1de" ON "__chart__hashtag" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_dd907becf76104e4b656659e6b" ON "__chart__federation" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_76e87c7bfc5d925fcbba405d84" ON "__chart__federation" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_36cb699c49580d4e6c2e6159f9" ON "__chart__federation" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_3313d7288855ec105b5bbf6c21" ON "__chart__drive" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_7a170f67425e62a8fabb76c872" ON "__chart__drive" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_13565815f618a1ff53886c5b28" ON "__chart__drive" ("date") `);
-        await queryRunner.query(`CREATE INDEX "IDX_9a3ed15a30ab7e3a37702e6e08" ON "__chart__active_users" ("date", "group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_00ed5f86db1f7efafb1978bf21" ON "__chart__active_users" ("group") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc" ON "__chart__active_users" ("date") `);
-    }
+	constructor() {
+		this.name = "chartReindex1629004542760";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`DELETE FROM "__chart__active_users" a USING "__chart__active_users" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__drive" a USING "__chart__drive" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__federation" a USING "__chart__federation" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__hashtag" a USING "__chart__hashtag" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__instance" a USING "__chart__instance" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__network" a USING "__chart__network" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__notes" a USING "__chart__notes" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__per_user_drive" a USING "__chart__per_user_drive" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__per_user_following" a USING "__chart__per_user_following" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__per_user_notes" a USING "__chart__per_user_notes" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__per_user_reaction" a USING "__chart__per_user_reaction" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__test_grouped" a USING "__chart__test_grouped" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__test_unique" a USING "__chart__test_unique" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(
+			`DELETE FROM "__chart__users" a USING "__chart__users" b WHERE a.id < b.id AND ((a.group IS NULL AND b.group IS NULL) OR a.group = b.group) AND a.date = b.date;`,
+		);
+		await queryRunner.query(`DROP INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc"`);
+		await queryRunner.query(`DROP INDEX "IDX_00ed5f86db1f7efafb1978bf21"`);
+		await queryRunner.query(`DROP INDEX "IDX_9a3ed15a30ab7e3a37702e6e08"`);
+		await queryRunner.query(`DROP INDEX "IDX_13565815f618a1ff53886c5b28"`);
+		await queryRunner.query(`DROP INDEX "IDX_7a170f67425e62a8fabb76c872"`);
+		await queryRunner.query(`DROP INDEX "IDX_3313d7288855ec105b5bbf6c21"`);
+		await queryRunner.query(`DROP INDEX "IDX_36cb699c49580d4e6c2e6159f9"`);
+		await queryRunner.query(`DROP INDEX "IDX_76e87c7bfc5d925fcbba405d84"`);
+		await queryRunner.query(`DROP INDEX "IDX_dd907becf76104e4b656659e6b"`);
+		await queryRunner.query(`DROP INDEX "IDX_07747a1038c05f532a718fe1de"`);
+		await queryRunner.query(`DROP INDEX "IDX_99a7d2faaef84a6f728d714ad6"`);
+		await queryRunner.query(`DROP INDEX "IDX_25a97c02003338124b2b75fdbc"`);
+		await queryRunner.query(`DROP INDEX "IDX_6b8f34a1a64b06014b6fb66824"`);
+		await queryRunner.query(`DROP INDEX "IDX_da8a46ba84ca1d8bb5a29bfb63"`);
+		await queryRunner.query(`DROP INDEX "IDX_39ee857ab2f23493037c6b6631"`);
+		await queryRunner.query(`DROP INDEX "IDX_a1efd3e0048a5f2793a47360dc"`);
+		await queryRunner.query(`DROP INDEX "IDX_7b5da130992ec9df96712d4290"`);
+		await queryRunner.query(`DROP INDEX "IDX_0a905b992fecd2b5c3fb98759e"`);
+		await queryRunner.query(`DROP INDEX "IDX_42eb716a37d381cdf566192b2b"`);
+		await queryRunner.query(`DROP INDEX "IDX_7036f2957151588b813185c794"`);
+		await queryRunner.query(`DROP INDEX "IDX_f09d543e3acb16c5976bdb31fa"`);
+		await queryRunner.query(`DROP INDEX "IDX_5f86db6492274e07c1a3cdf286"`);
+		await queryRunner.query(`DROP INDEX "IDX_e496ca8096d28f6b9b509264dc"`);
+		await queryRunner.query(`DROP INDEX "IDX_30bf67687f483ace115c5ca642"`);
+		await queryRunner.query(`DROP INDEX "IDX_7af07790712aa3438ff6773f3b"`);
+		await queryRunner.query(`DROP INDEX "IDX_4b3593098b6edc9c5afe36b18b"`);
+		await queryRunner.query(`DROP INDEX "IDX_b77d4dd9562c3a899d9a286fcd"`);
+		await queryRunner.query(`DROP INDEX "IDX_84234bd1abb873f07329681c83"`);
+		await queryRunner.query(`DROP INDEX "IDX_55bf20f366979f2436de99206b"`);
+		await queryRunner.query(`DROP INDEX "IDX_5048e9daccbbbc6d567bb142d3"`);
+		await queryRunner.query(`DROP INDEX "IDX_f7bf4c62059764c2c2bb40fdab"`);
+		await queryRunner.query(`DROP INDEX "IDX_8cf3156fd7a6b15c43459c6e3b"`);
+		await queryRunner.query(`DROP INDEX "IDX_229a41ad465f9205f1f5703291"`);
+		await queryRunner.query(`DROP INDEX "IDX_0c641990ecf47d2545df4edb75"`);
+		await queryRunner.query(`DROP INDEX "IDX_234dff3c0b56a6150b95431ab9"`);
+		await queryRunner.query(`DROP INDEX "IDX_b14489029e4b3aaf4bba5fb524"`);
+		await queryRunner.query(`DROP INDEX "IDX_437bab3c6061d90f6bb65fd2cc"`);
+		await queryRunner.query(`DROP INDEX "IDX_bbfa573a8181018851ed0b6357"`);
+		await queryRunner.query(`DROP INDEX "IDX_a0cd75442dd10d0643a17c4a49"`);
+		await queryRunner.query(`DROP INDEX "IDX_b070a906db04b44c67c6c2144d"`);
+		await queryRunner.query(`DROP INDEX "IDX_d41cce6aee1a50bfc062038f9b"`);
+		await queryRunner.query(`DROP INDEX "IDX_a319e5dbf47e8a17497623beae"`);
+		await queryRunner.query(`DROP INDEX "IDX_845254b3eaf708ae8a6cac3026"`);
+		await queryRunner.query(`DROP INDEX "IDX_ed9b95919c672a13008e9487ee"`);
+		await queryRunner.query(`DROP INDEX "IDX_337e9599f278bd7537fe30876f"`);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_9a3ed15a30ab7e3a37702e6e08" ON "__chart__active_users" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_60c5c6e7e538c09aa274ecd1cf" ON "__chart__active_users" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_3313d7288855ec105b5bbf6c21" ON "__chart__drive" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_ceab80a6729f8e2e6f5b8a1a3d" ON "__chart__drive" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_dd907becf76104e4b656659e6b" ON "__chart__federation" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_eddfed8fb40305a04c6f941050" ON "__chart__federation" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_53a3604b939e2b479eb2cfaac8" ON "__chart__hashtag" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_8111b817b9818c04d7eb8475b1" ON "__chart__instance" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_0a905b992fecd2b5c3fb98759e" ON "__chart__network" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_2082327b2699ce924fa654afc5" ON "__chart__network" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_f09d543e3acb16c5976bdb31fa" ON "__chart__notes" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_e60c358aaced5aab8900a4af31" ON "__chart__notes" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_a9a806d466b314f253a1a611c4" ON "__chart__per_user_drive" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_dabbb38a51ab86ee3cab291326" ON "__chart__per_user_following" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_583a157ed0cf0ed1b5ec2a833f" ON "__chart__per_user_notes" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_3b7697a96f522d0478972e6d6f" ON "__chart__per_user_reaction" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_b14489029e4b3aaf4bba5fb524" ON "__chart__test_grouped" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_da522b4008a9f5d7743b87ad55" ON "__chart__test_grouped" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_a0cd75442dd10d0643a17c4a49" ON "__chart__test_unique" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_16effb2e888f6763673b579f80" ON "__chart__test_unique" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_a319e5dbf47e8a17497623beae" ON "__chart__test" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_dab383a36f3c9db4a0c9b02cf3" ON "__chart__test" ("date") WHERE "group" IS NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_337e9599f278bd7537fe30876f" ON "__chart__users" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_66feba81e1795d176d06c0b1e6" ON "__chart__users" ("date") WHERE "group" IS NULL`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_66feba81e1795d176d06c0b1e6"`);
+		await queryRunner.query(`DROP INDEX "IDX_337e9599f278bd7537fe30876f"`);
+		await queryRunner.query(`DROP INDEX "IDX_dab383a36f3c9db4a0c9b02cf3"`);
+		await queryRunner.query(`DROP INDEX "IDX_a319e5dbf47e8a17497623beae"`);
+		await queryRunner.query(`DROP INDEX "IDX_16effb2e888f6763673b579f80"`);
+		await queryRunner.query(`DROP INDEX "IDX_a0cd75442dd10d0643a17c4a49"`);
+		await queryRunner.query(`DROP INDEX "IDX_da522b4008a9f5d7743b87ad55"`);
+		await queryRunner.query(`DROP INDEX "IDX_b14489029e4b3aaf4bba5fb524"`);
+		await queryRunner.query(`DROP INDEX "IDX_3b7697a96f522d0478972e6d6f"`);
+		await queryRunner.query(`DROP INDEX "IDX_229a41ad465f9205f1f5703291"`);
+		await queryRunner.query(`DROP INDEX "IDX_583a157ed0cf0ed1b5ec2a833f"`);
+		await queryRunner.query(`DROP INDEX "IDX_5048e9daccbbbc6d567bb142d3"`);
+		await queryRunner.query(`DROP INDEX "IDX_dabbb38a51ab86ee3cab291326"`);
+		await queryRunner.query(`DROP INDEX "IDX_b77d4dd9562c3a899d9a286fcd"`);
+		await queryRunner.query(`DROP INDEX "IDX_a9a806d466b314f253a1a611c4"`);
+		await queryRunner.query(`DROP INDEX "IDX_30bf67687f483ace115c5ca642"`);
+		await queryRunner.query(`DROP INDEX "IDX_e60c358aaced5aab8900a4af31"`);
+		await queryRunner.query(`DROP INDEX "IDX_f09d543e3acb16c5976bdb31fa"`);
+		await queryRunner.query(`DROP INDEX "IDX_2082327b2699ce924fa654afc5"`);
+		await queryRunner.query(`DROP INDEX "IDX_0a905b992fecd2b5c3fb98759e"`);
+		await queryRunner.query(`DROP INDEX "IDX_8111b817b9818c04d7eb8475b1"`);
+		await queryRunner.query(`DROP INDEX "IDX_39ee857ab2f23493037c6b6631"`);
+		await queryRunner.query(`DROP INDEX "IDX_53a3604b939e2b479eb2cfaac8"`);
+		await queryRunner.query(`DROP INDEX "IDX_25a97c02003338124b2b75fdbc"`);
+		await queryRunner.query(`DROP INDEX "IDX_eddfed8fb40305a04c6f941050"`);
+		await queryRunner.query(`DROP INDEX "IDX_dd907becf76104e4b656659e6b"`);
+		await queryRunner.query(`DROP INDEX "IDX_ceab80a6729f8e2e6f5b8a1a3d"`);
+		await queryRunner.query(`DROP INDEX "IDX_3313d7288855ec105b5bbf6c21"`);
+		await queryRunner.query(`DROP INDEX "IDX_60c5c6e7e538c09aa274ecd1cf"`);
+		await queryRunner.query(`DROP INDEX "IDX_9a3ed15a30ab7e3a37702e6e08"`);
+		await queryRunner.query(`DROP INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5"`);
+		await queryRunner.query(`DROP INDEX "IDX_f22169eb10657bded6d875ac8f"`);
+		await queryRunner.query(`DROP INDEX "IDX_c8cc87bd0f2f4487d17c651fbf"`);
+		await queryRunner.query(`DROP INDEX "IDX_754499f9b2642336433769518d"`);
+		await queryRunner.query(`DROP INDEX "IDX_315c779174fe8247ab324f036e"`);
+		await queryRunner.query(`DROP INDEX "IDX_c5d46cbfda48b1c33ed852e21b"`);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_337e9599f278bd7537fe30876f" ON "__chart__users" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_ed9b95919c672a13008e9487ee" ON "__chart__users" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_845254b3eaf708ae8a6cac3026" ON "__chart__users" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a319e5dbf47e8a17497623beae" ON "__chart__test" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d41cce6aee1a50bfc062038f9b" ON "__chart__test" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b070a906db04b44c67c6c2144d" ON "__chart__test" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a0cd75442dd10d0643a17c4a49" ON "__chart__test_unique" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_bbfa573a8181018851ed0b6357" ON "__chart__test_unique" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_437bab3c6061d90f6bb65fd2cc" ON "__chart__test_unique" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b14489029e4b3aaf4bba5fb524" ON "__chart__test_grouped" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_234dff3c0b56a6150b95431ab9" ON "__chart__test_grouped" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0c641990ecf47d2545df4edb75" ON "__chart__test_grouped" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8cf3156fd7a6b15c43459c6e3b" ON "__chart__per_user_reaction" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f7bf4c62059764c2c2bb40fdab" ON "__chart__per_user_reaction" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_55bf20f366979f2436de99206b" ON "__chart__per_user_notes" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_84234bd1abb873f07329681c83" ON "__chart__per_user_notes" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_4b3593098b6edc9c5afe36b18b" ON "__chart__per_user_following" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7af07790712aa3438ff6773f3b" ON "__chart__per_user_following" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_e496ca8096d28f6b9b509264dc" ON "__chart__per_user_drive" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_5f86db6492274e07c1a3cdf286" ON "__chart__per_user_drive" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f09d543e3acb16c5976bdb31fa" ON "__chart__notes" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7036f2957151588b813185c794" ON "__chart__notes" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_42eb716a37d381cdf566192b2b" ON "__chart__notes" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0a905b992fecd2b5c3fb98759e" ON "__chart__network" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7b5da130992ec9df96712d4290" ON "__chart__network" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_a1efd3e0048a5f2793a47360dc" ON "__chart__network" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_da8a46ba84ca1d8bb5a29bfb63" ON "__chart__instance" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_6b8f34a1a64b06014b6fb66824" ON "__chart__instance" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_99a7d2faaef84a6f728d714ad6" ON "__chart__hashtag" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_07747a1038c05f532a718fe1de" ON "__chart__hashtag" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_dd907becf76104e4b656659e6b" ON "__chart__federation" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_76e87c7bfc5d925fcbba405d84" ON "__chart__federation" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_36cb699c49580d4e6c2e6159f9" ON "__chart__federation" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3313d7288855ec105b5bbf6c21" ON "__chart__drive" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7a170f67425e62a8fabb76c872" ON "__chart__drive" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_13565815f618a1ff53886c5b28" ON "__chart__drive" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_9a3ed15a30ab7e3a37702e6e08" ON "__chart__active_users" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_00ed5f86db1f7efafb1978bf21" ON "__chart__active_users" ("group") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc" ON "__chart__active_users" ("date") `,
+		);
+	}
 }
diff --git a/packages/backend/migration/1629024377804-deepl-integration.js b/packages/backend/migration/1629024377804-deepl-integration.js
index 19c49ffcd..1dd5465fb 100644
--- a/packages/backend/migration/1629024377804-deepl-integration.js
+++ b/packages/backend/migration/1629024377804-deepl-integration.js
@@ -1,13 +1,13 @@
-
-
 export class deeplIntegration1629024377804 {
-    constructor() {
-        this.name = 'deeplIntegration1629024377804';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "deeplAuthKey" character varying(128)`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "deeplAuthKey"`);
-    }
+	constructor() {
+		this.name = "deeplIntegration1629024377804";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "deeplAuthKey" character varying(128)`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "deeplAuthKey"`);
+	}
 }
diff --git a/packages/backend/migration/1629288472000-fix-channel-userId.js b/packages/backend/migration/1629288472000-fix-channel-userId.js
index 02a1199b0..e02549b11 100644
--- a/packages/backend/migration/1629288472000-fix-channel-userId.js
+++ b/packages/backend/migration/1629288472000-fix-channel-userId.js
@@ -1,13 +1,15 @@
-
-
 export class fixChannelUserId1629288472000 {
-    constructor() {
-        this.name = 'fixChannelUserId1629288472000';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "channel" ALTER COLUMN "userId" DROP NOT NULL;`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "channel" ALTER COLUMN "userId" SET NOT NULL;`);
-    }
+	constructor() {
+		this.name = "fixChannelUserId1629288472000";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "channel" ALTER COLUMN "userId" DROP NOT NULL;`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "channel" ALTER COLUMN "userId" SET NOT NULL;`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1629512953000-user-is-deleted.js b/packages/backend/migration/1629512953000-user-is-deleted.js
index a7848d569..448535276 100644
--- a/packages/backend/migration/1629512953000-user-is-deleted.js
+++ b/packages/backend/migration/1629512953000-user-is-deleted.js
@@ -1,14 +1,16 @@
-
-
 export class isUserDeleted1629512953000 {
-    constructor() {
-        this.name = 'isUserDeleted1629512953000';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" ADD "isDeleted" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."isDeleted" IS 'Whether the User is deleted.'`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isDeleted"`);
-    }
+	constructor() {
+		this.name = "isUserDeleted1629512953000";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "isDeleted" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."isDeleted" IS 'Whether the User is deleted.'`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isDeleted"`);
+	}
 }
diff --git a/packages/backend/migration/1629778475000-deepl-integration2.js b/packages/backend/migration/1629778475000-deepl-integration2.js
index 699f06c76..138e00d24 100644
--- a/packages/backend/migration/1629778475000-deepl-integration2.js
+++ b/packages/backend/migration/1629778475000-deepl-integration2.js
@@ -1,13 +1,13 @@
-
-
 export class deeplIntegration21629778475000 {
-    constructor() {
-        this.name = 'deeplIntegration21629778475000';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "deeplIsPro" boolean NOT NULL DEFAULT false`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "deeplIsPro"`);
-    }
+	constructor() {
+		this.name = "deeplIntegration21629778475000";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "deeplIsPro" boolean NOT NULL DEFAULT false`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "deeplIsPro"`);
+	}
 }
diff --git a/packages/backend/migration/1629833361000-AddShowTLReplies.js b/packages/backend/migration/1629833361000-AddShowTLReplies.js
index 5d4c938a7..78e9f417b 100644
--- a/packages/backend/migration/1629833361000-AddShowTLReplies.js
+++ b/packages/backend/migration/1629833361000-AddShowTLReplies.js
@@ -1,14 +1,18 @@
-
-
 export class addShowTLReplies1629833361000 {
 	constructor() {
-		this.name = 'addShowTLReplies1629833361000';
+		this.name = "addShowTLReplies1629833361000";
 	}
 	async up(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "user" ADD "showTimelineReplies" boolean NOT NULL DEFAULT false`);
-		await queryRunner.query(`COMMENT ON COLUMN "user"."showTimelineReplies" IS 'Whether to show users replying to other users in the timeline.'`);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "showTimelineReplies" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."showTimelineReplies" IS 'Whether to show users replying to other users in the timeline.'`,
+		);
 	}
 	async down(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "showTimelineReplies"`);
+		await queryRunner.query(
+			`ALTER TABLE "user" DROP COLUMN "showTimelineReplies"`,
+		);
 	}
 }
diff --git a/packages/backend/migration/1629968054000_userInstanceBlocks.js b/packages/backend/migration/1629968054000_userInstanceBlocks.js
index 1f202d9f6..666aaba28 100644
--- a/packages/backend/migration/1629968054000_userInstanceBlocks.js
+++ b/packages/backend/migration/1629968054000_userInstanceBlocks.js
@@ -1,14 +1,18 @@
-
-
 export class userInstanceBlocks1629968054000 {
 	constructor() {
-		this.name = 'userInstanceBlocks1629968054000';
+		this.name = "userInstanceBlocks1629968054000";
 	}
 	async up(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "user_profile" ADD "mutedInstances" jsonb NOT NULL DEFAULT '[]'`);
-		await queryRunner.query(`COMMENT ON COLUMN "user_profile"."mutedInstances" IS 'List of instances muted by the user.'`);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "mutedInstances" jsonb NOT NULL DEFAULT '[]'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user_profile"."mutedInstances" IS 'List of instances muted by the user.'`,
+		);
 	}
 	async down(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "mutedInstances"`);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "mutedInstances"`,
+		);
 	}
 }
diff --git a/packages/backend/migration/1633068642000-email-required-for-signup.js b/packages/backend/migration/1633068642000-email-required-for-signup.js
index d592f3ca2..45c0894a7 100644
--- a/packages/backend/migration/1633068642000-email-required-for-signup.js
+++ b/packages/backend/migration/1633068642000-email-required-for-signup.js
@@ -1,13 +1,15 @@
-
-
 export class emailRequiredForSignup1633068642000 {
-    constructor() {
-        this.name = 'emailRequiredForSignup1633068642000';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "emailRequiredForSignup" boolean NOT NULL DEFAULT false`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "emailRequiredForSignup"`);
-    }
+	constructor() {
+		this.name = "emailRequiredForSignup1633068642000";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "emailRequiredForSignup" boolean NOT NULL DEFAULT false`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "emailRequiredForSignup"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1633071909016-user-pending.js b/packages/backend/migration/1633071909016-user-pending.js
index 17cf5c11b..b37e51629 100644
--- a/packages/backend/migration/1633071909016-user-pending.js
+++ b/packages/backend/migration/1633071909016-user-pending.js
@@ -1,15 +1,17 @@
-
-
 export class userPending1633071909016 {
-    constructor() {
-        this.name = 'userPending1633071909016';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "user_pending" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "code" character varying(128) NOT NULL, "username" character varying(128) NOT NULL, "email" character varying(128) NOT NULL, "password" character varying(128) NOT NULL, CONSTRAINT "PK_d4c84e013c98ec02d19b8fbbafa" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_4e5c4c99175638ec0761714ab0" ON "user_pending" ("code") `);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "IDX_4e5c4c99175638ec0761714ab0"`);
-        await queryRunner.query(`DROP TABLE "user_pending"`);
-    }
+	constructor() {
+		this.name = "userPending1633071909016";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "user_pending" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "code" character varying(128) NOT NULL, "username" character varying(128) NOT NULL, "email" character varying(128) NOT NULL, "password" character varying(128) NOT NULL, CONSTRAINT "PK_d4c84e013c98ec02d19b8fbbafa" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_4e5c4c99175638ec0761714ab0" ON "user_pending" ("code") `,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_4e5c4c99175638ec0761714ab0"`);
+		await queryRunner.query(`DROP TABLE "user_pending"`);
+	}
 }
diff --git a/packages/backend/migration/1634486652000-user-public-reactions.js b/packages/backend/migration/1634486652000-user-public-reactions.js
index e74112249..95b957f11 100644
--- a/packages/backend/migration/1634486652000-user-public-reactions.js
+++ b/packages/backend/migration/1634486652000-user-public-reactions.js
@@ -1,13 +1,15 @@
-
-
 export class userPublicReactions1634486652000 {
-    constructor() {
-        this.name = 'userPublicReactions1634486652000';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "publicReactions" boolean NOT NULL DEFAULT false`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "publicReactions"`);
-    }
+	constructor() {
+		this.name = "userPublicReactions1634486652000";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "publicReactions" boolean NOT NULL DEFAULT false`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "publicReactions"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1634902659689-delete-log.js b/packages/backend/migration/1634902659689-delete-log.js
index 555a0020c..fc148f098 100644
--- a/packages/backend/migration/1634902659689-delete-log.js
+++ b/packages/backend/migration/1634902659689-delete-log.js
@@ -1,12 +1,9 @@
-
-
 export class deleteLog1634902659689 {
-    constructor() {
-        this.name = 'deleteLog1634902659689';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`DROP TABLE "log"`);
-    }
-    async down(queryRunner) {
-    }
+	constructor() {
+		this.name = "deleteLog1634902659689";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(`DROP TABLE "log"`);
+	}
+	async down(queryRunner) {}
 }
diff --git a/packages/backend/migration/1635500777168-note-thread-mute.js b/packages/backend/migration/1635500777168-note-thread-mute.js
index a790cace3..5fcfa40c0 100644
--- a/packages/backend/migration/1635500777168-note-thread-mute.js
+++ b/packages/backend/migration/1635500777168-note-thread-mute.js
@@ -1,25 +1,47 @@
-
-
 export class noteThreadMute1635500777168 {
-    constructor() {
-        this.name = 'noteThreadMute1635500777168';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "note_thread_muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "threadId" character varying(256) NOT NULL, CONSTRAINT "PK_ec5936d94d1a0369646d12a3a47" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_29c11c7deb06615076f8c95b80" ON "note_thread_muting" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c426394644267453e76f036926" ON "note_thread_muting" ("threadId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_ae7aab18a2641d3e5f25e0c4ea" ON "note_thread_muting" ("userId", "threadId") `);
-        await queryRunner.query(`ALTER TABLE "note" ADD "threadId" character varying(256)`);
-        await queryRunner.query(`CREATE INDEX "IDX_d4ebdef929896d6dc4a3c5bb48" ON "note" ("threadId") `);
-        await queryRunner.query(`ALTER TABLE "note_thread_muting" ADD CONSTRAINT "FK_29c11c7deb06615076f8c95b80a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note_thread_muting" DROP CONSTRAINT "FK_29c11c7deb06615076f8c95b80a"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_d4ebdef929896d6dc4a3c5bb48"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "threadId"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_ae7aab18a2641d3e5f25e0c4ea"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_c426394644267453e76f036926"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_29c11c7deb06615076f8c95b80"`);
-        await queryRunner.query(`DROP TABLE "note_thread_muting"`);
-    }
+	constructor() {
+		this.name = "noteThreadMute1635500777168";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "note_thread_muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "threadId" character varying(256) NOT NULL, CONSTRAINT "PK_ec5936d94d1a0369646d12a3a47" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_29c11c7deb06615076f8c95b80" ON "note_thread_muting" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_c426394644267453e76f036926" ON "note_thread_muting" ("threadId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_ae7aab18a2641d3e5f25e0c4ea" ON "note_thread_muting" ("userId", "threadId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note" ADD "threadId" character varying(256)`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_d4ebdef929896d6dc4a3c5bb48" ON "note" ("threadId") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "note_thread_muting" ADD CONSTRAINT "FK_29c11c7deb06615076f8c95b80a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "note_thread_muting" DROP CONSTRAINT "FK_29c11c7deb06615076f8c95b80a"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_d4ebdef929896d6dc4a3c5bb48"`,
+		);
+		await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "threadId"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_ae7aab18a2641d3e5f25e0c4ea"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_c426394644267453e76f036926"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_29c11c7deb06615076f8c95b80"`,
+		);
+		await queryRunner.query(`DROP TABLE "note_thread_muting"`);
+	}
 }
diff --git a/packages/backend/migration/1636197624383-ff-visibility.js b/packages/backend/migration/1636197624383-ff-visibility.js
index 89028f3c2..a3af8f718 100644
--- a/packages/backend/migration/1636197624383-ff-visibility.js
+++ b/packages/backend/migration/1636197624383-ff-visibility.js
@@ -1,15 +1,21 @@
-
-
 export class ffVisibility1636197624383 {
-    constructor() {
-        this.name = 'ffVisibility1636197624383';
-    }
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "public"."user_profile_ffvisibility_enum" AS ENUM('public', 'followers', 'private')`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "ffVisibility" "public"."user_profile_ffvisibility_enum" NOT NULL DEFAULT 'public'`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "ffVisibility"`);
-        await queryRunner.query(`DROP TYPE "public"."user_profile_ffvisibility_enum"`);
-    }
+	constructor() {
+		this.name = "ffVisibility1636197624383";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TYPE "public"."user_profile_ffvisibility_enum" AS ENUM('public', 'followers', 'private')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "ffVisibility" "public"."user_profile_ffvisibility_enum" NOT NULL DEFAULT 'public'`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "ffVisibility"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."user_profile_ffvisibility_enum"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1636697408073-remove-via-mobile.js b/packages/backend/migration/1636697408073-remove-via-mobile.js
index 36e96fd21..f86276024 100644
--- a/packages/backend/migration/1636697408073-remove-via-mobile.js
+++ b/packages/backend/migration/1636697408073-remove-via-mobile.js
@@ -1,13 +1,13 @@
-
-
 export class removeViaMobile1636697408073 {
-    name = 'removeViaMobile1636697408073'
+	name = "removeViaMobile1636697408073";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "viaMobile"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "viaMobile"`);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "viaMobile" boolean NOT NULL DEFAULT false`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "note" ADD "viaMobile" boolean NOT NULL DEFAULT false`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1637320813000-forwarded-report.js b/packages/backend/migration/1637320813000-forwarded-report.js
index 1e39bd5c3..18ec17206 100644
--- a/packages/backend/migration/1637320813000-forwarded-report.js
+++ b/packages/backend/migration/1637320813000-forwarded-report.js
@@ -1,13 +1,15 @@
-
-
 export class forwardedReport1637320813000 {
-	name = 'forwardedReport1637320813000';
+	name = "forwardedReport1637320813000";
 
 	async up(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "forwarded" boolean NOT NULL DEFAULT false`);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" ADD "forwarded" boolean NOT NULL DEFAULT false`,
+		);
 	}
 
 	async down(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "forwarded"`);
+		await queryRunner.query(
+			`ALTER TABLE "abuse_user_report" DROP COLUMN "forwarded"`,
+		);
 	}
-};
+}
diff --git a/packages/backend/migration/1639325650583-chart-v3.js b/packages/backend/migration/1639325650583-chart-v3.js
index e2a4e920c..011708c0f 100644
--- a/packages/backend/migration/1639325650583-chart-v3.js
+++ b/packages/backend/migration/1639325650583-chart-v3.js
@@ -1,189 +1,511 @@
-
-
 export class chartV31639325650583 {
-    name = 'chartV31639325650583'
+	name = "chartV31639325650583";
 
-    async up(queryRunner) {
-			await queryRunner.query(`DELETE FROM "__chart__per_user_drive" WHERE "group" IS NULL`);
+	async up(queryRunner) {
+		await queryRunner.query(
+			`DELETE FROM "__chart__per_user_drive" WHERE "group" IS NULL`,
+		);
 
-        await queryRunner.query(`DROP INDEX "public"."IDX_dd907becf76104e4b656659e6b"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_eddfed8fb40305a04c6f941050"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_f09d543e3acb16c5976bdb31fa"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_e60c358aaced5aab8900a4af31"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_337e9599f278bd7537fe30876f"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_66feba81e1795d176d06c0b1e6"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_0a905b992fecd2b5c3fb98759e"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_2082327b2699ce924fa654afc5"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_9a3ed15a30ab7e3a37702e6e08"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_60c5c6e7e538c09aa274ecd1cf"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_8111b817b9818c04d7eb8475b1"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_583a157ed0cf0ed1b5ec2a833f"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_3313d7288855ec105b5bbf6c21"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_ceab80a6729f8e2e6f5b8a1a3d"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_3b7697a96f522d0478972e6d6f"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_53a3604b939e2b479eb2cfaac8"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_dabbb38a51ab86ee3cab291326"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_a9a806d466b314f253a1a611c4"`);
-        await queryRunner.query(`CREATE TABLE "__chart_day__federation" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___instance_total" bigint NOT NULL, "___instance_inc" bigint NOT NULL, "___instance_dec" bigint NOT NULL, CONSTRAINT "UQ_617a8fe225a6e701d89e02d2c74" UNIQUE ("date"), CONSTRAINT "PK_7ca721c769f31698e0e1331e8e6" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_617a8fe225a6e701d89e02d2c7" ON "__chart_day__federation" ("date") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___local_diffs_normal" bigint NOT NULL, "___local_diffs_reply" bigint NOT NULL, "___local_diffs_renote" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, "___remote_diffs_normal" bigint NOT NULL, "___remote_diffs_reply" bigint NOT NULL, "___remote_diffs_renote" bigint NOT NULL, CONSTRAINT "UQ_1a527b423ad0858a1af5a056d43" UNIQUE ("date"), CONSTRAINT "PK_1fa4139e1f338272b758d05e090" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_1a527b423ad0858a1af5a056d4" ON "__chart_day__notes" ("date") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, CONSTRAINT "UQ_cad6e07c20037f31cdba8a350c3" UNIQUE ("date"), CONSTRAINT "PK_d7f7185abb9851f70c4726c54bd" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_cad6e07c20037f31cdba8a350c" ON "__chart_day__users" ("date") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__network" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___incomingRequests" bigint NOT NULL, "___outgoingRequests" bigint NOT NULL, "___totalTime" bigint NOT NULL, "___incomingBytes" bigint NOT NULL, "___outgoingBytes" bigint NOT NULL, CONSTRAINT "UQ_8bfa548c2b31f9e07db113773ee" UNIQUE ("date"), CONSTRAINT "PK_cac499d6f471042dfed1e7e0132" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_8bfa548c2b31f9e07db113773e" ON "__chart_day__network" ("date") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__active_users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_users" character varying array NOT NULL, "___remote_users" character varying array NOT NULL, CONSTRAINT "UQ_d5954f3df5e5e3bdfc3c03f3906" UNIQUE ("date"), CONSTRAINT "PK_b1790489b14f005ae8f404f5795" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d5954f3df5e5e3bdfc3c03f390" ON "__chart_day__active_users" ("date") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__instance" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___requests_failed" bigint NOT NULL, "___requests_succeeded" bigint NOT NULL, "___requests_received" bigint NOT NULL, "___notes_total" bigint NOT NULL, "___notes_inc" bigint NOT NULL, "___notes_dec" bigint NOT NULL, "___notes_diffs_normal" bigint NOT NULL, "___notes_diffs_reply" bigint NOT NULL, "___notes_diffs_renote" bigint NOT NULL, "___users_total" bigint NOT NULL, "___users_inc" bigint NOT NULL, "___users_dec" bigint NOT NULL, "___following_total" bigint NOT NULL, "___following_inc" bigint NOT NULL, "___following_dec" bigint NOT NULL, "___followers_total" bigint NOT NULL, "___followers_inc" bigint NOT NULL, "___followers_dec" bigint NOT NULL, "___drive_totalFiles" bigint NOT NULL, "___drive_totalUsage" bigint NOT NULL, "___drive_incFiles" bigint NOT NULL, "___drive_incUsage" bigint NOT NULL, "___drive_decFiles" bigint NOT NULL, "___drive_decUsage" bigint NOT NULL, CONSTRAINT "UQ_fea7c0278325a1a2492f2d6acbf" UNIQUE ("date", "group"), CONSTRAINT "PK_479a8ff9d959274981087043023" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_fea7c0278325a1a2492f2d6acb" ON "__chart_day__instance" ("date", "group") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__per_user_notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___total" bigint NOT NULL, "___inc" bigint NOT NULL, "___dec" bigint NOT NULL, "___diffs_normal" bigint NOT NULL, "___diffs_reply" bigint NOT NULL, "___diffs_renote" bigint NOT NULL, CONSTRAINT "UQ_c5545d4b31cdc684034e33b81c3" UNIQUE ("date", "group"), CONSTRAINT "PK_58bab6b6d3ad9310cbc7460fd28" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_c5545d4b31cdc684034e33b81c" ON "__chart_day__per_user_notes" ("date", "group") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_totalCount" bigint NOT NULL, "___local_totalSize" bigint NOT NULL, "___local_incCount" bigint NOT NULL, "___local_incSize" bigint NOT NULL, "___local_decCount" bigint NOT NULL, "___local_decSize" bigint NOT NULL, "___remote_totalCount" bigint NOT NULL, "___remote_totalSize" bigint NOT NULL, "___remote_incCount" bigint NOT NULL, "___remote_incSize" bigint NOT NULL, "___remote_decCount" bigint NOT NULL, "___remote_decSize" bigint NOT NULL, CONSTRAINT "UQ_0b60ebb3aa0065f10b0616c1171" UNIQUE ("date"), CONSTRAINT "PK_e7ec0de057c77c40fc8d8b62151" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0b60ebb3aa0065f10b0616c117" ON "__chart_day__drive" ("date") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__per_user_reaction" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "UQ_d54b653660d808b118e36c184c0" UNIQUE ("date", "group"), CONSTRAINT "PK_8af24e2d51ff781a354fe595eda" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d54b653660d808b118e36c184c" ON "__chart_day__per_user_reaction" ("date", "group") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__hashtag" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___local_users" character varying array NOT NULL, "___remote_users" character varying array NOT NULL, CONSTRAINT "UQ_8f589cf056ff51f09d6096f6450" UNIQUE ("date", "group"), CONSTRAINT "PK_13d5a3b089344e5557f8e0980b4" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_8f589cf056ff51f09d6096f645" ON "__chart_day__hashtag" ("date", "group") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__per_user_following" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___local_followings_total" bigint NOT NULL, "___local_followings_inc" bigint NOT NULL, "___local_followings_dec" bigint NOT NULL, "___local_followers_total" bigint NOT NULL, "___local_followers_inc" bigint NOT NULL, "___local_followers_dec" bigint NOT NULL, "___remote_followings_total" bigint NOT NULL, "___remote_followings_inc" bigint NOT NULL, "___remote_followings_dec" bigint NOT NULL, "___remote_followers_total" bigint NOT NULL, "___remote_followers_inc" bigint NOT NULL, "___remote_followers_dec" bigint NOT NULL, CONSTRAINT "UQ_e4849a3231f38281280ea4c0eee" UNIQUE ("date", "group"), CONSTRAINT "PK_68ce6b67da57166da66fc8fb27e" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e4849a3231f38281280ea4c0ee" ON "__chart_day__per_user_following" ("date", "group") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__per_user_drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___totalCount" bigint NOT NULL, "___totalSize" bigint NOT NULL, "___incCount" bigint NOT NULL, "___incSize" bigint NOT NULL, "___decCount" bigint NOT NULL, "___decSize" bigint NOT NULL, CONSTRAINT "UQ_62aa5047b5aec92524f24c701d7" UNIQUE ("date", "group"), CONSTRAINT "PK_1ae135254c137011645da7f4045" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_62aa5047b5aec92524f24c701d" ON "__chart_day__per_user_drive" ("date", "group") `);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "group"`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" DROP COLUMN "group"`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" DROP COLUMN "group"`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" DROP COLUMN "group"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "group"`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "group"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD CONSTRAINT "UQ_36cb699c49580d4e6c2e6159f97" UNIQUE ("date")`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ADD CONSTRAINT "UQ_42eb716a37d381cdf566192b2be" UNIQUE ("date")`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ADD CONSTRAINT "UQ_845254b3eaf708ae8a6cac30265" UNIQUE ("date")`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ADD CONSTRAINT "UQ_a1efd3e0048a5f2793a47360dc6" UNIQUE ("date")`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD CONSTRAINT "UQ_0ad37b7ef50f4ddc84363d7ccca" UNIQUE ("date")`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" DROP DEFAULT`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_39ee857ab2f23493037c6b6631"`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "group" SET NOT NULL`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_5048e9daccbbbc6d567bb142d3"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "group" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD CONSTRAINT "UQ_13565815f618a1ff53886c5b28a" UNIQUE ("date")`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_229a41ad465f9205f1f5703291"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "group" SET NOT NULL`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_25a97c02003338124b2b75fdbc"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "group" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" DROP DEFAULT`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_b77d4dd9562c3a899d9a286fcd"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "group" SET NOT NULL`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_30bf67687f483ace115c5ca642"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "group" SET NOT NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_36cb699c49580d4e6c2e6159f9" ON "__chart__federation" ("date") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_42eb716a37d381cdf566192b2b" ON "__chart__notes" ("date") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_845254b3eaf708ae8a6cac3026" ON "__chart__users" ("date") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a1efd3e0048a5f2793a47360dc" ON "__chart__network" ("date") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc" ON "__chart__active_users" ("date") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_13565815f618a1ff53886c5b28" ON "__chart__drive" ("date") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ADD CONSTRAINT "UQ_39ee857ab2f23493037c6b66311" UNIQUE ("date", "group")`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ADD CONSTRAINT "UQ_5048e9daccbbbc6d567bb142d34" UNIQUE ("date", "group")`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ADD CONSTRAINT "UQ_229a41ad465f9205f1f57032910" UNIQUE ("date", "group")`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD CONSTRAINT "UQ_25a97c02003338124b2b75fdbc8" UNIQUE ("date", "group")`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ADD CONSTRAINT "UQ_b77d4dd9562c3a899d9a286fcd7" UNIQUE ("date", "group")`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ADD CONSTRAINT "UQ_30bf67687f483ace115c5ca6429" UNIQUE ("date", "group")`);
-    }
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_dd907becf76104e4b656659e6b"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_eddfed8fb40305a04c6f941050"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_f09d543e3acb16c5976bdb31fa"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_e60c358aaced5aab8900a4af31"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_337e9599f278bd7537fe30876f"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_66feba81e1795d176d06c0b1e6"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_0a905b992fecd2b5c3fb98759e"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_2082327b2699ce924fa654afc5"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_9a3ed15a30ab7e3a37702e6e08"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_60c5c6e7e538c09aa274ecd1cf"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_8111b817b9818c04d7eb8475b1"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_583a157ed0cf0ed1b5ec2a833f"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_3313d7288855ec105b5bbf6c21"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_ceab80a6729f8e2e6f5b8a1a3d"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_3b7697a96f522d0478972e6d6f"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_53a3604b939e2b479eb2cfaac8"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_dabbb38a51ab86ee3cab291326"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_a9a806d466b314f253a1a611c4"`,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__federation" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___instance_total" bigint NOT NULL, "___instance_inc" bigint NOT NULL, "___instance_dec" bigint NOT NULL, CONSTRAINT "UQ_617a8fe225a6e701d89e02d2c74" UNIQUE ("date"), CONSTRAINT "PK_7ca721c769f31698e0e1331e8e6" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_617a8fe225a6e701d89e02d2c7" ON "__chart_day__federation" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___local_diffs_normal" bigint NOT NULL, "___local_diffs_reply" bigint NOT NULL, "___local_diffs_renote" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, "___remote_diffs_normal" bigint NOT NULL, "___remote_diffs_reply" bigint NOT NULL, "___remote_diffs_renote" bigint NOT NULL, CONSTRAINT "UQ_1a527b423ad0858a1af5a056d43" UNIQUE ("date"), CONSTRAINT "PK_1fa4139e1f338272b758d05e090" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_1a527b423ad0858a1af5a056d4" ON "__chart_day__notes" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_total" bigint NOT NULL, "___local_inc" bigint NOT NULL, "___local_dec" bigint NOT NULL, "___remote_total" bigint NOT NULL, "___remote_inc" bigint NOT NULL, "___remote_dec" bigint NOT NULL, CONSTRAINT "UQ_cad6e07c20037f31cdba8a350c3" UNIQUE ("date"), CONSTRAINT "PK_d7f7185abb9851f70c4726c54bd" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_cad6e07c20037f31cdba8a350c" ON "__chart_day__users" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__network" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___incomingRequests" bigint NOT NULL, "___outgoingRequests" bigint NOT NULL, "___totalTime" bigint NOT NULL, "___incomingBytes" bigint NOT NULL, "___outgoingBytes" bigint NOT NULL, CONSTRAINT "UQ_8bfa548c2b31f9e07db113773ee" UNIQUE ("date"), CONSTRAINT "PK_cac499d6f471042dfed1e7e0132" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_8bfa548c2b31f9e07db113773e" ON "__chart_day__network" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__active_users" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_users" character varying array NOT NULL, "___remote_users" character varying array NOT NULL, CONSTRAINT "UQ_d5954f3df5e5e3bdfc3c03f3906" UNIQUE ("date"), CONSTRAINT "PK_b1790489b14f005ae8f404f5795" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_d5954f3df5e5e3bdfc3c03f390" ON "__chart_day__active_users" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__instance" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___requests_failed" bigint NOT NULL, "___requests_succeeded" bigint NOT NULL, "___requests_received" bigint NOT NULL, "___notes_total" bigint NOT NULL, "___notes_inc" bigint NOT NULL, "___notes_dec" bigint NOT NULL, "___notes_diffs_normal" bigint NOT NULL, "___notes_diffs_reply" bigint NOT NULL, "___notes_diffs_renote" bigint NOT NULL, "___users_total" bigint NOT NULL, "___users_inc" bigint NOT NULL, "___users_dec" bigint NOT NULL, "___following_total" bigint NOT NULL, "___following_inc" bigint NOT NULL, "___following_dec" bigint NOT NULL, "___followers_total" bigint NOT NULL, "___followers_inc" bigint NOT NULL, "___followers_dec" bigint NOT NULL, "___drive_totalFiles" bigint NOT NULL, "___drive_totalUsage" bigint NOT NULL, "___drive_incFiles" bigint NOT NULL, "___drive_incUsage" bigint NOT NULL, "___drive_decFiles" bigint NOT NULL, "___drive_decUsage" bigint NOT NULL, CONSTRAINT "UQ_fea7c0278325a1a2492f2d6acbf" UNIQUE ("date", "group"), CONSTRAINT "PK_479a8ff9d959274981087043023" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_fea7c0278325a1a2492f2d6acb" ON "__chart_day__instance" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__per_user_notes" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___total" bigint NOT NULL, "___inc" bigint NOT NULL, "___dec" bigint NOT NULL, "___diffs_normal" bigint NOT NULL, "___diffs_reply" bigint NOT NULL, "___diffs_renote" bigint NOT NULL, CONSTRAINT "UQ_c5545d4b31cdc684034e33b81c3" UNIQUE ("date", "group"), CONSTRAINT "PK_58bab6b6d3ad9310cbc7460fd28" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_c5545d4b31cdc684034e33b81c" ON "__chart_day__per_user_notes" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___local_totalCount" bigint NOT NULL, "___local_totalSize" bigint NOT NULL, "___local_incCount" bigint NOT NULL, "___local_incSize" bigint NOT NULL, "___local_decCount" bigint NOT NULL, "___local_decSize" bigint NOT NULL, "___remote_totalCount" bigint NOT NULL, "___remote_totalSize" bigint NOT NULL, "___remote_incCount" bigint NOT NULL, "___remote_incSize" bigint NOT NULL, "___remote_decCount" bigint NOT NULL, "___remote_decSize" bigint NOT NULL, CONSTRAINT "UQ_0b60ebb3aa0065f10b0616c1171" UNIQUE ("date"), CONSTRAINT "PK_e7ec0de057c77c40fc8d8b62151" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_0b60ebb3aa0065f10b0616c117" ON "__chart_day__drive" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__per_user_reaction" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___local_count" bigint NOT NULL, "___remote_count" bigint NOT NULL, CONSTRAINT "UQ_d54b653660d808b118e36c184c0" UNIQUE ("date", "group"), CONSTRAINT "PK_8af24e2d51ff781a354fe595eda" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_d54b653660d808b118e36c184c" ON "__chart_day__per_user_reaction" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__hashtag" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___local_users" character varying array NOT NULL, "___remote_users" character varying array NOT NULL, CONSTRAINT "UQ_8f589cf056ff51f09d6096f6450" UNIQUE ("date", "group"), CONSTRAINT "PK_13d5a3b089344e5557f8e0980b4" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_8f589cf056ff51f09d6096f645" ON "__chart_day__hashtag" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__per_user_following" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___local_followings_total" bigint NOT NULL, "___local_followings_inc" bigint NOT NULL, "___local_followings_dec" bigint NOT NULL, "___local_followers_total" bigint NOT NULL, "___local_followers_inc" bigint NOT NULL, "___local_followers_dec" bigint NOT NULL, "___remote_followings_total" bigint NOT NULL, "___remote_followings_inc" bigint NOT NULL, "___remote_followings_dec" bigint NOT NULL, "___remote_followers_total" bigint NOT NULL, "___remote_followers_inc" bigint NOT NULL, "___remote_followers_dec" bigint NOT NULL, CONSTRAINT "UQ_e4849a3231f38281280ea4c0eee" UNIQUE ("date", "group"), CONSTRAINT "PK_68ce6b67da57166da66fc8fb27e" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_e4849a3231f38281280ea4c0ee" ON "__chart_day__per_user_following" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__per_user_drive" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "group" character varying(128) NOT NULL, "___totalCount" bigint NOT NULL, "___totalSize" bigint NOT NULL, "___incCount" bigint NOT NULL, "___incSize" bigint NOT NULL, "___decCount" bigint NOT NULL, "___decSize" bigint NOT NULL, CONSTRAINT "UQ_62aa5047b5aec92524f24c701d7" UNIQUE ("date", "group"), CONSTRAINT "PK_1ae135254c137011645da7f4045" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_62aa5047b5aec92524f24c701d" ON "__chart_day__per_user_drive" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "group"`,
+		);
+		await queryRunner.query(`ALTER TABLE "__chart__notes" DROP COLUMN "group"`);
+		await queryRunner.query(`ALTER TABLE "__chart__users" DROP COLUMN "group"`);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" DROP COLUMN "group"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "group"`,
+		);
+		await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "group"`);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD CONSTRAINT "UQ_36cb699c49580d4e6c2e6159f97" UNIQUE ("date")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ADD CONSTRAINT "UQ_42eb716a37d381cdf566192b2be" UNIQUE ("date")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ADD CONSTRAINT "UQ_845254b3eaf708ae8a6cac30265" UNIQUE ("date")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ADD CONSTRAINT "UQ_a1efd3e0048a5f2793a47360dc6" UNIQUE ("date")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD CONSTRAINT "UQ_0ad37b7ef50f4ddc84363d7ccca" UNIQUE ("date")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_39ee857ab2f23493037c6b6631"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "group" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_5048e9daccbbbc6d567bb142d3"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "group" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ADD CONSTRAINT "UQ_13565815f618a1ff53886c5b28a" UNIQUE ("date")`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_229a41ad465f9205f1f5703291"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "group" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_25a97c02003338124b2b75fdbc"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ALTER COLUMN "group" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_b77d4dd9562c3a899d9a286fcd"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "group" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_30bf67687f483ace115c5ca642"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "group" SET NOT NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_36cb699c49580d4e6c2e6159f9" ON "__chart__federation" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_42eb716a37d381cdf566192b2b" ON "__chart__notes" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_845254b3eaf708ae8a6cac3026" ON "__chart__users" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_a1efd3e0048a5f2793a47360dc" ON "__chart__network" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_0ad37b7ef50f4ddc84363d7ccc" ON "__chart__active_users" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_13565815f618a1ff53886c5b28" ON "__chart__drive" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ADD CONSTRAINT "UQ_39ee857ab2f23493037c6b66311" UNIQUE ("date", "group")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ADD CONSTRAINT "UQ_5048e9daccbbbc6d567bb142d34" UNIQUE ("date", "group")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ADD CONSTRAINT "UQ_229a41ad465f9205f1f57032910" UNIQUE ("date", "group")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD CONSTRAINT "UQ_25a97c02003338124b2b75fdbc8" UNIQUE ("date", "group")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ADD CONSTRAINT "UQ_b77d4dd9562c3a899d9a286fcd7" UNIQUE ("date", "group")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ADD CONSTRAINT "UQ_30bf67687f483ace115c5ca6429" UNIQUE ("date", "group")`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" DROP CONSTRAINT "UQ_30bf67687f483ace115c5ca6429"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" DROP CONSTRAINT "UQ_b77d4dd9562c3a899d9a286fcd7"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP CONSTRAINT "UQ_25a97c02003338124b2b75fdbc8"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" DROP CONSTRAINT "UQ_229a41ad465f9205f1f57032910"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" DROP CONSTRAINT "UQ_5048e9daccbbbc6d567bb142d34"`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" DROP CONSTRAINT "UQ_39ee857ab2f23493037c6b66311"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_30bf67687f483ace115c5ca642"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_b77d4dd9562c3a899d9a286fcd"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_25a97c02003338124b2b75fdbc"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_229a41ad465f9205f1f5703291"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_13565815f618a1ff53886c5b28"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_5048e9daccbbbc6d567bb142d3"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_39ee857ab2f23493037c6b6631"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_0ad37b7ef50f4ddc84363d7ccc"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_a1efd3e0048a5f2793a47360dc"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_845254b3eaf708ae8a6cac3026"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_42eb716a37d381cdf566192b2b"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_36cb699c49580d4e6c2e6159f9"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "group" DROP NOT NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "group" DROP NOT NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" SET DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" SET DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "group" DROP NOT NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "group" DROP NOT NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP CONSTRAINT "UQ_13565815f618a1ff53886c5b28a"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "group" DROP NOT NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "group" DROP NOT NULL`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" SET DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" SET DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP CONSTRAINT "UQ_0ad37b7ef50f4ddc84363d7ccca"`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" DROP CONSTRAINT "UQ_a1efd3e0048a5f2793a47360dc6"`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" DROP CONSTRAINT "UQ_845254b3eaf708ae8a6cac30265"`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" DROP CONSTRAINT "UQ_42eb716a37d381cdf566192b2be"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP CONSTRAINT "UQ_36cb699c49580d4e6c2e6159f97"`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "group" character varying(128)`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "group" character varying(128)`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ADD "group" character varying(128)`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ADD "group" character varying(128)`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ADD "group" character varying(128)`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "group" character varying(128)`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_62aa5047b5aec92524f24c701d"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__per_user_drive"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_e4849a3231f38281280ea4c0ee"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__per_user_following"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_8f589cf056ff51f09d6096f645"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__hashtag"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_d54b653660d808b118e36c184c"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__per_user_reaction"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_0b60ebb3aa0065f10b0616c117"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__drive"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_c5545d4b31cdc684034e33b81c"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__per_user_notes"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_fea7c0278325a1a2492f2d6acb"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__instance"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_d5954f3df5e5e3bdfc3c03f390"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__active_users"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_8bfa548c2b31f9e07db113773e"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__network"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_cad6e07c20037f31cdba8a350c"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__users"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_1a527b423ad0858a1af5a056d4"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__notes"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_617a8fe225a6e701d89e02d2c7"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__federation"`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a9a806d466b314f253a1a611c4" ON "__chart__per_user_drive" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_dabbb38a51ab86ee3cab291326" ON "__chart__per_user_following" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_53a3604b939e2b479eb2cfaac8" ON "__chart__hashtag" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_3b7697a96f522d0478972e6d6f" ON "__chart__per_user_reaction" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_ceab80a6729f8e2e6f5b8a1a3d" ON "__chart__drive" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_3313d7288855ec105b5bbf6c21" ON "__chart__drive" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_583a157ed0cf0ed1b5ec2a833f" ON "__chart__per_user_notes" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_8111b817b9818c04d7eb8475b1" ON "__chart__instance" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_60c5c6e7e538c09aa274ecd1cf" ON "__chart__active_users" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_9a3ed15a30ab7e3a37702e6e08" ON "__chart__active_users" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_2082327b2699ce924fa654afc5" ON "__chart__network" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0a905b992fecd2b5c3fb98759e" ON "__chart__network" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_66feba81e1795d176d06c0b1e6" ON "__chart__users" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_337e9599f278bd7537fe30876f" ON "__chart__users" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e60c358aaced5aab8900a4af31" ON "__chart__notes" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_f09d543e3acb16c5976bdb31fa" ON "__chart__notes" ("date", "group") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_eddfed8fb40305a04c6f941050" ON "__chart__federation" ("date") WHERE ("group" IS NULL)`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_dd907becf76104e4b656659e6b" ON "__chart__federation" ("date", "group") `);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" DROP CONSTRAINT "UQ_30bf67687f483ace115c5ca6429"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" DROP CONSTRAINT "UQ_b77d4dd9562c3a899d9a286fcd7"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP CONSTRAINT "UQ_25a97c02003338124b2b75fdbc8"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" DROP CONSTRAINT "UQ_229a41ad465f9205f1f57032910"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" DROP CONSTRAINT "UQ_5048e9daccbbbc6d567bb142d34"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" DROP CONSTRAINT "UQ_39ee857ab2f23493037c6b66311"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_30bf67687f483ace115c5ca642"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_b77d4dd9562c3a899d9a286fcd"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_25a97c02003338124b2b75fdbc"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_229a41ad465f9205f1f5703291"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_13565815f618a1ff53886c5b28"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_5048e9daccbbbc6d567bb142d3"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_39ee857ab2f23493037c6b6631"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_0ad37b7ef50f4ddc84363d7ccc"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_a1efd3e0048a5f2793a47360dc"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_845254b3eaf708ae8a6cac3026"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_42eb716a37d381cdf566192b2b"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_36cb699c49580d4e6c2e6159f9"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "group" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_30bf67687f483ace115c5ca642" ON "__chart__per_user_drive" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "group" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_b77d4dd9562c3a899d9a286fcd" ON "__chart__per_user_following" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" SET DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" SET DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ALTER COLUMN "group" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_25a97c02003338124b2b75fdbc" ON "__chart__hashtag" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "group" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_229a41ad465f9205f1f5703291" ON "__chart__per_user_reaction" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" DROP CONSTRAINT "UQ_13565815f618a1ff53886c5b28a"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "group" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_5048e9daccbbbc6d567bb142d3" ON "__chart__per_user_notes" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "group" DROP NOT NULL`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_39ee857ab2f23493037c6b6631" ON "__chart__instance" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" SET DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" SET DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP CONSTRAINT "UQ_0ad37b7ef50f4ddc84363d7ccca"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" DROP CONSTRAINT "UQ_a1efd3e0048a5f2793a47360dc6"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" DROP CONSTRAINT "UQ_845254b3eaf708ae8a6cac30265"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" DROP CONSTRAINT "UQ_42eb716a37d381cdf566192b2be"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP CONSTRAINT "UQ_36cb699c49580d4e6c2e6159f97"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ADD "group" character varying(128)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "group" character varying(128)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ADD "group" character varying(128)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ADD "group" character varying(128)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ADD "group" character varying(128)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "group" character varying(128)`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_62aa5047b5aec92524f24c701d"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__per_user_drive"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_e4849a3231f38281280ea4c0ee"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__per_user_following"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_8f589cf056ff51f09d6096f645"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__hashtag"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_d54b653660d808b118e36c184c"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__per_user_reaction"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_0b60ebb3aa0065f10b0616c117"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__drive"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_c5545d4b31cdc684034e33b81c"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__per_user_notes"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_fea7c0278325a1a2492f2d6acb"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__instance"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_d5954f3df5e5e3bdfc3c03f390"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__active_users"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_8bfa548c2b31f9e07db113773e"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__network"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_cad6e07c20037f31cdba8a350c"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__users"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_1a527b423ad0858a1af5a056d4"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__notes"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_617a8fe225a6e701d89e02d2c7"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__federation"`);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_a9a806d466b314f253a1a611c4" ON "__chart__per_user_drive" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_dabbb38a51ab86ee3cab291326" ON "__chart__per_user_following" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_53a3604b939e2b479eb2cfaac8" ON "__chart__hashtag" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_3b7697a96f522d0478972e6d6f" ON "__chart__per_user_reaction" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_ceab80a6729f8e2e6f5b8a1a3d" ON "__chart__drive" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_3313d7288855ec105b5bbf6c21" ON "__chart__drive" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_583a157ed0cf0ed1b5ec2a833f" ON "__chart__per_user_notes" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_8111b817b9818c04d7eb8475b1" ON "__chart__instance" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_60c5c6e7e538c09aa274ecd1cf" ON "__chart__active_users" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_9a3ed15a30ab7e3a37702e6e08" ON "__chart__active_users" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_2082327b2699ce924fa654afc5" ON "__chart__network" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_0a905b992fecd2b5c3fb98759e" ON "__chart__network" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_66feba81e1795d176d06c0b1e6" ON "__chart__users" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_337e9599f278bd7537fe30876f" ON "__chart__users" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_e60c358aaced5aab8900a4af31" ON "__chart__notes" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_f09d543e3acb16c5976bdb31fa" ON "__chart__notes" ("date", "group") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_eddfed8fb40305a04c6f941050" ON "__chart__federation" ("date") WHERE ("group" IS NULL)`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_dd907becf76104e4b656659e6b" ON "__chart__federation" ("date", "group") `,
+		);
+	}
 }
diff --git a/packages/backend/migration/1642611822809-emoji-url.js b/packages/backend/migration/1642611822809-emoji-url.js
index d38f8cc08..e1852c002 100644
--- a/packages/backend/migration/1642611822809-emoji-url.js
+++ b/packages/backend/migration/1642611822809-emoji-url.js
@@ -1,15 +1,19 @@
-
-
 export class emojiUrl1642611822809 {
-		name = 'emojiUrl1642611822809'
+	name = "emojiUrl1642611822809";
 
-		async up(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "emoji" RENAME COLUMN "url" TO "originalUrl"`);
-			await queryRunner.query(`ALTER TABLE "emoji" ADD "publicUrl" character varying(512) NOT NULL DEFAULT ''`);
-		}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "emoji" RENAME COLUMN "url" TO "originalUrl"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "emoji" ADD "publicUrl" character varying(512) NOT NULL DEFAULT ''`,
+		);
+	}
 
-		async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "publicUrl"`);
-			await queryRunner.query(`ALTER TABLE "emoji" RENAME COLUMN "originalUrl" TO "url"`);
-		}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "publicUrl"`);
+		await queryRunner.query(
+			`ALTER TABLE "emoji" RENAME COLUMN "originalUrl" TO "url"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1642613870898-drive-file-webpublic-type.js b/packages/backend/migration/1642613870898-drive-file-webpublic-type.js
index 15434f7d0..df5ab7899 100644
--- a/packages/backend/migration/1642613870898-drive-file-webpublic-type.js
+++ b/packages/backend/migration/1642613870898-drive-file-webpublic-type.js
@@ -1,13 +1,15 @@
-
-
 export class driveFileWebpublicType1642613870898 {
-    name = 'driveFileWebpublicType1642613870898'
+	name = "driveFileWebpublicType1642613870898";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "webpublicType" character varying(128)`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "webpublicType" character varying(128)`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "webpublicType"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" DROP COLUMN "webpublicType"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1643963705770-chart-v4.js b/packages/backend/migration/1643963705770-chart-v4.js
index 8b320c2b4..1e7233cc7 100644
--- a/packages/backend/migration/1643963705770-chart-v4.js
+++ b/packages/backend/migration/1643963705770-chart-v4.js
@@ -1,63 +1,165 @@
-
-
 export class chartV41643963705770 {
-    name = 'chartV41643963705770'
+	name = "chartV41643963705770";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__instance" DROP COLUMN "___drive_totalUsage"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" DROP COLUMN "___drive_totalUsage"`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "___local_totalCount"`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "___local_totalSize"`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "___remote_totalCount"`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" DROP COLUMN "___remote_totalSize"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" DROP COLUMN "___local_totalCount"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" DROP COLUMN "___local_totalSize"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" DROP COLUMN "___remote_totalCount"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" DROP COLUMN "___remote_totalSize"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___local_users" bigint NOT NULL DEFAULT 0`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___remote_users" bigint NOT NULL DEFAULT 0`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___local_users" bigint NOT NULL DEFAULT 0`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___remote_users" bigint NOT NULL DEFAULT 0`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___local_users" bigint NOT NULL DEFAULT 0`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___remote_users" bigint NOT NULL DEFAULT 0`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "___local_users" bigint NOT NULL DEFAULT 0`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "___remote_users" bigint NOT NULL DEFAULT 0`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" DROP COLUMN "___drive_totalUsage"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" DROP COLUMN "___drive_totalUsage"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" DROP COLUMN "___local_totalCount"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" DROP COLUMN "___local_totalSize"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" DROP COLUMN "___remote_totalCount"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" DROP COLUMN "___remote_totalSize"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" DROP COLUMN "___local_totalCount"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" DROP COLUMN "___local_totalSize"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" DROP COLUMN "___remote_totalCount"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" DROP COLUMN "___remote_totalSize"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___local_users" bigint NOT NULL DEFAULT 0`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___remote_users" bigint NOT NULL DEFAULT 0`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___local_users" bigint NOT NULL DEFAULT 0`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___remote_users" bigint NOT NULL DEFAULT 0`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "___local_users" bigint NOT NULL DEFAULT 0`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "___remote_users" bigint NOT NULL DEFAULT 0`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" ADD "___local_users" bigint NOT NULL DEFAULT 0`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" ADD "___remote_users" bigint NOT NULL DEFAULT 0`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "___remote_users" character varying array NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "___local_users" character varying array NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___remote_users" character varying array NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "___local_users" character varying array NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___remote_users" character varying array NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___local_users" character varying array NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___remote_users" character varying array NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___local_users" character varying array NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ADD "___remote_totalSize" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ADD "___remote_totalCount" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ADD "___local_totalSize" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ADD "___local_totalCount" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "___remote_totalSize" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "___remote_totalCount" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "___local_totalSize" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ADD "___local_totalCount" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ADD "___drive_totalUsage" bigint NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ADD "___drive_totalUsage" bigint NOT NULL`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" ADD "___remote_users" character varying array NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" ADD "___local_users" character varying array NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "___remote_users" character varying array NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "___local_users" character varying array NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___remote_users" character varying array NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___local_users" character varying array NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___remote_users" character varying array NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___local_users" character varying array NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ADD "___remote_totalSize" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ADD "___remote_totalCount" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ADD "___local_totalSize" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ADD "___local_totalCount" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ADD "___remote_totalSize" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ADD "___remote_totalCount" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ADD "___local_totalSize" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ADD "___local_totalCount" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ADD "___drive_totalUsage" bigint NOT NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ADD "___drive_totalUsage" bigint NOT NULL`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1643966656277-chart-v5.js b/packages/backend/migration/1643966656277-chart-v5.js
index df84002f7..826f28ee3 100644
--- a/packages/backend/migration/1643966656277-chart-v5.js
+++ b/packages/backend/migration/1643966656277-chart-v5.js
@@ -1,27 +1,57 @@
-
-
 export class chartV51643966656277 {
-    name = 'chartV51643966656277'
+	name = "chartV51643966656277";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "unique_temp___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "unique_temp___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "unique_temp___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__hashtag" DROP COLUMN "unique_temp___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___local_users"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "unique_temp___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" DROP COLUMN "unique_temp___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "unique_temp___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" DROP COLUMN "unique_temp___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___local_users"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1643967331284-chart-v6.js b/packages/backend/migration/1643967331284-chart-v6.js
index 119198f4a..9dfbf24be 100644
--- a/packages/backend/migration/1643967331284-chart-v6.js
+++ b/packages/backend/migration/1643967331284-chart-v6.js
@@ -1,343 +1,1005 @@
-
-
 export class chartV61643967331284 {
-    name = 'chartV61643967331284'
+	name = "chartV61643967331284";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" SET DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" SET DEFAULT '0'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" SET DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" SET DEFAULT '0'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" DROP DEFAULT`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" DROP DEFAULT`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1644010796173-convert-hard-mutes.js b/packages/backend/migration/1644010796173-convert-hard-mutes.js
index 207a759b8..39c5b080f 100644
--- a/packages/backend/migration/1644010796173-convert-hard-mutes.js
+++ b/packages/backend/migration/1644010796173-convert-hard-mutes.js
@@ -1,65 +1,70 @@
-import RE2 from 're2';
-
+import RE2 from "re2";
 
 export class convertHardMutes1644010796173 {
-    name = 'convertHardMutes1644010796173'
+	name = "convertHardMutes1644010796173";
 
-    async up(queryRunner) {
-        let entries = await queryRunner.query(`SELECT "userId", "mutedWords" FROM "user_profile" WHERE "userHost" IS NULL`);
-        for(let i = 0; i < entries.length; i++) {
-            let words = entries[i].mutedWords
-                .map(line => {
-										if (typeof line === 'string') return [];
-                    const regexp = line.join(" ").match(/^\/(.+)\/(.*)$/);
-                    if (regexp) {
-                        // convert regexp's
-                        try {
-                            new RE2(regexp[1], regexp[2]);
-                            return `/${regexp[1]}/${regexp[2]}`;
-                        } catch (err) {
-                            // invalid regex, ignore it
-                            return [];
-                        }
-                    } else {
-                        // remove empty segments
-                        return line.filter(x => x !== '');
-                    }
-                })
-                // remove empty lines
-                .filter(x => !(Array.isArray(x) && x.length === 0));
+	async up(queryRunner) {
+		let entries = await queryRunner.query(
+			`SELECT "userId", "mutedWords" FROM "user_profile" WHERE "userHost" IS NULL`,
+		);
+		for (let i = 0; i < entries.length; i++) {
+			let words = entries[i].mutedWords
+				.map((line) => {
+					if (typeof line === "string") return [];
+					const regexp = line.join(" ").match(/^\/(.+)\/(.*)$/);
+					if (regexp) {
+						// convert regexp's
+						try {
+							new RE2(regexp[1], regexp[2]);
+							return `/${regexp[1]}/${regexp[2]}`;
+						} catch (err) {
+							// invalid regex, ignore it
+							return [];
+						}
+					} else {
+						// remove empty segments
+						return line.filter((x) => x !== "");
+					}
+				})
+				// remove empty lines
+				.filter((x) => !(Array.isArray(x) && x.length === 0));
 
-            await queryRunner.connection.createQueryBuilder()
-                .update('user_profile')
-                .set({
-                    mutedWords: words
-                })
-                .where('userId = :id', { id: entries[i].userId })
-                .execute();
-        }
-    }
+			await queryRunner.connection
+				.createQueryBuilder()
+				.update("user_profile")
+				.set({
+					mutedWords: words,
+				})
+				.where("userId = :id", { id: entries[i].userId })
+				.execute();
+		}
+	}
 
-    async down(queryRunner) {
-        let entries = await queryRunner.query(`SELECT "userId", "mutedWords" FROM "user_profile"`);
-        for(let i = 0; i < entries.length; i++) {
-            let words = entries[i].mutedWords
-                .map(line => {
-                    if (Array.isArray(line)) {
-                        return line;
-                    } else {
-                    	// do not split regex at spaces again
-                        return [line];
-                    }
-                })
-                // remove empty lines
-                .filter(x => !(Array.isArray(x) && x.length === 0));
+	async down(queryRunner) {
+		let entries = await queryRunner.query(
+			`SELECT "userId", "mutedWords" FROM "user_profile"`,
+		);
+		for (let i = 0; i < entries.length; i++) {
+			let words = entries[i].mutedWords
+				.map((line) => {
+					if (Array.isArray(line)) {
+						return line;
+					} else {
+						// do not split regex at spaces again
+						return [line];
+					}
+				})
+				// remove empty lines
+				.filter((x) => !(Array.isArray(x) && x.length === 0));
 
-            await queryRunner.connection.createQueryBuilder()
-                .update('user_profile')
-                .set({
-                    mutedWords: words
-                })
-                .where('userId = :id', { id: entries[i].userId })
-                .execute();
-        }
-    }
+			await queryRunner.connection
+				.createQueryBuilder()
+				.update("user_profile")
+				.set({
+					mutedWords: words,
+				})
+				.where("userId = :id", { id: entries[i].userId })
+				.execute();
+		}
+	}
 }
diff --git a/packages/backend/migration/1644058404077-chart-v7.js b/packages/backend/migration/1644058404077-chart-v7.js
index f05ad003d..ab48c9ab3 100644
--- a/packages/backend/migration/1644058404077-chart-v7.js
+++ b/packages/backend/migration/1644058404077-chart-v7.js
@@ -1,501 +1,1470 @@
-
-
 export class chartV71644058404077 {
-    name = 'chartV71644058404077'
+	name = "chartV71644058404077";
 
 	async up(queryRunner) {
-		await queryRunner.query(`UPDATE "__chart__federation" SET "___instance_total"=2147483647 WHERE "___instance_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__federation" SET "___instance_inc"=32767 WHERE "___instance_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__federation" SET "___instance_dec"=32767 WHERE "___instance_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__federation" SET "___instance_total"=2147483647 WHERE "___instance_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__federation" SET "___instance_inc"=32767 WHERE "___instance_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__federation" SET "___instance_dec"=32767 WHERE "___instance_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_inc"=2147483647 WHERE "___local_inc" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_dec"=2147483647 WHERE "___local_dec" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_diffs_normal"=2147483647 WHERE "___local_diffs_normal" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_diffs_reply"=2147483647 WHERE "___local_diffs_reply" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___local_diffs_renote"=2147483647 WHERE "___local_diffs_renote" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_inc"=2147483647 WHERE "___remote_inc" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_dec"=2147483647 WHERE "___remote_dec" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_diffs_normal"=2147483647 WHERE "___remote_diffs_normal" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_diffs_reply"=2147483647 WHERE "___remote_diffs_reply" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__notes" SET "___remote_diffs_renote"=2147483647 WHERE "___remote_diffs_renote" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_inc"=2147483647 WHERE "___local_inc" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_dec"=2147483647 WHERE "___local_dec" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_diffs_normal"=2147483647 WHERE "___local_diffs_normal" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_diffs_reply"=2147483647 WHERE "___local_diffs_reply" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___local_diffs_renote"=2147483647 WHERE "___local_diffs_renote" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_inc"=2147483647 WHERE "___remote_inc" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_dec"=2147483647 WHERE "___remote_dec" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_diffs_normal"=2147483647 WHERE "___remote_diffs_normal" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_diffs_reply"=2147483647 WHERE "___remote_diffs_reply" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__notes" SET "___remote_diffs_renote"=2147483647 WHERE "___remote_diffs_renote" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__users" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__users" SET "___local_inc"=32767 WHERE "___local_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__users" SET "___local_dec"=32767 WHERE "___local_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__users" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__users" SET "___remote_inc"=32767 WHERE "___remote_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__users" SET "___remote_dec"=32767 WHERE "___remote_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__users" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__users" SET "___local_inc"=32767 WHERE "___local_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__users" SET "___local_dec"=32767 WHERE "___local_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__users" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__users" SET "___remote_inc"=32767 WHERE "___remote_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__users" SET "___remote_dec"=32767 WHERE "___remote_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__network" SET "___incomingRequests"=2147483647 WHERE "___incomingRequests" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__network" SET "___outgoingRequests"=2147483647 WHERE "___outgoingRequests" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__network" SET "___totalTime"=2147483647 WHERE "___totalTime" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__network" SET "___incomingBytes"=2147483647 WHERE "___incomingBytes" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__network" SET "___outgoingBytes"=2147483647 WHERE "___outgoingBytes" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__network" SET "___incomingRequests"=2147483647 WHERE "___incomingRequests" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__network" SET "___outgoingRequests"=2147483647 WHERE "___outgoingRequests" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__network" SET "___totalTime"=2147483647 WHERE "___totalTime" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__network" SET "___incomingBytes"=2147483647 WHERE "___incomingBytes" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__network" SET "___outgoingBytes"=2147483647 WHERE "___outgoingBytes" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___requests_failed"=32767 WHERE "___requests_failed" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___requests_succeeded"=32767 WHERE "___requests_succeeded" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___requests_received"=32767 WHERE "___requests_received" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_total"=2147483647 WHERE "___notes_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_inc"=2147483647 WHERE "___notes_inc" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_dec"=2147483647 WHERE "___notes_dec" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_diffs_normal"=2147483647 WHERE "___notes_diffs_normal" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_diffs_reply"=2147483647 WHERE "___notes_diffs_reply" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___notes_diffs_renote"=2147483647 WHERE "___notes_diffs_renote" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___users_total"=2147483647 WHERE "___users_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___users_inc"=32767 WHERE "___users_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___users_dec"=32767 WHERE "___users_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___following_total"=2147483647 WHERE "___following_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___following_inc"=32767 WHERE "___following_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___following_dec"=32767 WHERE "___following_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___followers_total"=2147483647 WHERE "___followers_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___followers_inc"=32767 WHERE "___followers_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___followers_dec"=32767 WHERE "___followers_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___drive_totalFiles"=2147483647 WHERE "___drive_totalFiles" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___drive_incFiles"=2147483647 WHERE "___drive_incFiles" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___drive_decFiles"=2147483647 WHERE "___drive_decFiles" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___drive_incUsage"=2147483647 WHERE "___drive_incUsage" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__instance" SET "___drive_decUsage"=2147483647 WHERE "___drive_decUsage" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___requests_failed"=32767 WHERE "___requests_failed" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___requests_succeeded"=32767 WHERE "___requests_succeeded" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___requests_received"=32767 WHERE "___requests_received" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_total"=2147483647 WHERE "___notes_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_inc"=2147483647 WHERE "___notes_inc" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_dec"=2147483647 WHERE "___notes_dec" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_diffs_normal"=2147483647 WHERE "___notes_diffs_normal" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_diffs_reply"=2147483647 WHERE "___notes_diffs_reply" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___notes_diffs_renote"=2147483647 WHERE "___notes_diffs_renote" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___users_total"=2147483647 WHERE "___users_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___users_inc"=32767 WHERE "___users_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___users_dec"=32767 WHERE "___users_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___following_total"=2147483647 WHERE "___following_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___following_inc"=32767 WHERE "___following_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___following_dec"=32767 WHERE "___following_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___followers_total"=2147483647 WHERE "___followers_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___followers_inc"=32767 WHERE "___followers_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___followers_dec"=32767 WHERE "___followers_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___drive_totalFiles"=2147483647 WHERE "___drive_totalFiles" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___drive_incFiles"=2147483647 WHERE "___drive_incFiles" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___drive_decFiles"=2147483647 WHERE "___drive_decFiles" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___drive_incUsage"=2147483647 WHERE "___drive_incUsage" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__instance" SET "___drive_decUsage"=2147483647 WHERE "___drive_decUsage" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___total"=2147483647 WHERE "___total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___inc"=32767 WHERE "___inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___dec"=32767 WHERE "___dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___diffs_normal"=32767 WHERE "___diffs_normal" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___diffs_reply"=32767 WHERE "___diffs_reply" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_notes" SET "___diffs_renote"=32767 WHERE "___diffs_renote" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___total"=2147483647 WHERE "___total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___inc"=32767 WHERE "___inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___dec"=32767 WHERE "___dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___diffs_normal"=32767 WHERE "___diffs_normal" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___diffs_reply"=32767 WHERE "___diffs_reply" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_notes" SET "___diffs_renote"=32767 WHERE "___diffs_renote" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__drive" SET "___local_incCount"=2147483647 WHERE "___local_incCount" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__drive" SET "___local_incSize"=2147483647 WHERE "___local_incSize" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__drive" SET "___local_decCount"=2147483647 WHERE "___local_decCount" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__drive" SET "___local_decSize"=2147483647 WHERE "___local_decSize" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__drive" SET "___remote_incCount"=2147483647 WHERE "___remote_incCount" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__drive" SET "___remote_incSize"=2147483647 WHERE "___remote_incSize" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__drive" SET "___remote_decCount"=2147483647 WHERE "___remote_decCount" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__drive" SET "___remote_decSize"=2147483647 WHERE "___remote_decSize" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___local_incCount"=2147483647 WHERE "___local_incCount" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___local_incSize"=2147483647 WHERE "___local_incSize" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___local_decCount"=2147483647 WHERE "___local_decCount" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___local_decSize"=2147483647 WHERE "___local_decSize" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___remote_incCount"=2147483647 WHERE "___remote_incCount" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___remote_incSize"=2147483647 WHERE "___remote_incSize" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___remote_decCount"=2147483647 WHERE "___remote_decCount" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__drive" SET "___remote_decSize"=2147483647 WHERE "___remote_decSize" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__per_user_reaction" SET "___local_count"=32767 WHERE "___local_count" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_reaction" SET "___remote_count"=32767 WHERE "___remote_count" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_reaction" SET "___local_count"=32767 WHERE "___local_count" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_reaction" SET "___remote_count"=32767 WHERE "___remote_count" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followings_total"=2147483647 WHERE "___local_followings_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followings_inc"=32767 WHERE "___local_followings_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followings_dec"=32767 WHERE "___local_followings_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followers_total"=2147483647 WHERE "___local_followers_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followers_inc"=32767 WHERE "___local_followers_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___local_followers_dec"=32767 WHERE "___local_followers_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followings_total"=2147483647 WHERE "___remote_followings_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followings_inc"=32767 WHERE "___remote_followings_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followings_dec"=32767 WHERE "___remote_followings_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followers_total"=2147483647 WHERE "___remote_followers_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followers_inc"=32767 WHERE "___remote_followers_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart__per_user_following" SET "___remote_followers_dec"=32767 WHERE "___remote_followers_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followings_total"=2147483647 WHERE "___local_followings_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followings_inc"=32767 WHERE "___local_followings_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followings_dec"=32767 WHERE "___local_followings_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followers_total"=2147483647 WHERE "___local_followers_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followers_inc"=32767 WHERE "___local_followers_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___local_followers_dec"=32767 WHERE "___local_followers_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followings_total"=2147483647 WHERE "___remote_followings_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followings_inc"=32767 WHERE "___remote_followings_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followings_dec"=32767 WHERE "___remote_followings_dec" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followers_total"=2147483647 WHERE "___remote_followers_total" > 2147483647`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followers_inc"=32767 WHERE "___remote_followers_inc" > 32767`);
-		await queryRunner.query(`UPDATE "__chart_day__per_user_following" SET "___remote_followers_dec"=32767 WHERE "___remote_followers_dec" > 32767`);
+		await queryRunner.query(
+			`UPDATE "__chart__federation" SET "___instance_total"=2147483647 WHERE "___instance_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__federation" SET "___instance_inc"=32767 WHERE "___instance_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__federation" SET "___instance_dec"=32767 WHERE "___instance_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__federation" SET "___instance_total"=2147483647 WHERE "___instance_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__federation" SET "___instance_inc"=32767 WHERE "___instance_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__federation" SET "___instance_dec"=32767 WHERE "___instance_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___local_inc"=2147483647 WHERE "___local_inc" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___local_dec"=2147483647 WHERE "___local_dec" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___local_diffs_normal"=2147483647 WHERE "___local_diffs_normal" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___local_diffs_reply"=2147483647 WHERE "___local_diffs_reply" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___local_diffs_renote"=2147483647 WHERE "___local_diffs_renote" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___remote_inc"=2147483647 WHERE "___remote_inc" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___remote_dec"=2147483647 WHERE "___remote_dec" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___remote_diffs_normal"=2147483647 WHERE "___remote_diffs_normal" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___remote_diffs_reply"=2147483647 WHERE "___remote_diffs_reply" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__notes" SET "___remote_diffs_renote"=2147483647 WHERE "___remote_diffs_renote" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___local_inc"=2147483647 WHERE "___local_inc" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___local_dec"=2147483647 WHERE "___local_dec" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___local_diffs_normal"=2147483647 WHERE "___local_diffs_normal" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___local_diffs_reply"=2147483647 WHERE "___local_diffs_reply" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___local_diffs_renote"=2147483647 WHERE "___local_diffs_renote" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___remote_inc"=2147483647 WHERE "___remote_inc" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___remote_dec"=2147483647 WHERE "___remote_dec" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___remote_diffs_normal"=2147483647 WHERE "___remote_diffs_normal" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___remote_diffs_reply"=2147483647 WHERE "___remote_diffs_reply" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__notes" SET "___remote_diffs_renote"=2147483647 WHERE "___remote_diffs_renote" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__users" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__users" SET "___local_inc"=32767 WHERE "___local_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__users" SET "___local_dec"=32767 WHERE "___local_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__users" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__users" SET "___remote_inc"=32767 WHERE "___remote_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__users" SET "___remote_dec"=32767 WHERE "___remote_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__users" SET "___local_total"=2147483647 WHERE "___local_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__users" SET "___local_inc"=32767 WHERE "___local_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__users" SET "___local_dec"=32767 WHERE "___local_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__users" SET "___remote_total"=2147483647 WHERE "___remote_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__users" SET "___remote_inc"=32767 WHERE "___remote_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__users" SET "___remote_dec"=32767 WHERE "___remote_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__network" SET "___incomingRequests"=2147483647 WHERE "___incomingRequests" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__network" SET "___outgoingRequests"=2147483647 WHERE "___outgoingRequests" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__network" SET "___totalTime"=2147483647 WHERE "___totalTime" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__network" SET "___incomingBytes"=2147483647 WHERE "___incomingBytes" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__network" SET "___outgoingBytes"=2147483647 WHERE "___outgoingBytes" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__network" SET "___incomingRequests"=2147483647 WHERE "___incomingRequests" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__network" SET "___outgoingRequests"=2147483647 WHERE "___outgoingRequests" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__network" SET "___totalTime"=2147483647 WHERE "___totalTime" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__network" SET "___incomingBytes"=2147483647 WHERE "___incomingBytes" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__network" SET "___outgoingBytes"=2147483647 WHERE "___outgoingBytes" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___requests_failed"=32767 WHERE "___requests_failed" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___requests_succeeded"=32767 WHERE "___requests_succeeded" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___requests_received"=32767 WHERE "___requests_received" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___notes_total"=2147483647 WHERE "___notes_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___notes_inc"=2147483647 WHERE "___notes_inc" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___notes_dec"=2147483647 WHERE "___notes_dec" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___notes_diffs_normal"=2147483647 WHERE "___notes_diffs_normal" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___notes_diffs_reply"=2147483647 WHERE "___notes_diffs_reply" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___notes_diffs_renote"=2147483647 WHERE "___notes_diffs_renote" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___users_total"=2147483647 WHERE "___users_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___users_inc"=32767 WHERE "___users_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___users_dec"=32767 WHERE "___users_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___following_total"=2147483647 WHERE "___following_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___following_inc"=32767 WHERE "___following_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___following_dec"=32767 WHERE "___following_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___followers_total"=2147483647 WHERE "___followers_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___followers_inc"=32767 WHERE "___followers_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___followers_dec"=32767 WHERE "___followers_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___drive_totalFiles"=2147483647 WHERE "___drive_totalFiles" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___drive_incFiles"=2147483647 WHERE "___drive_incFiles" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___drive_decFiles"=2147483647 WHERE "___drive_decFiles" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___drive_incUsage"=2147483647 WHERE "___drive_incUsage" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__instance" SET "___drive_decUsage"=2147483647 WHERE "___drive_decUsage" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___requests_failed"=32767 WHERE "___requests_failed" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___requests_succeeded"=32767 WHERE "___requests_succeeded" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___requests_received"=32767 WHERE "___requests_received" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___notes_total"=2147483647 WHERE "___notes_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___notes_inc"=2147483647 WHERE "___notes_inc" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___notes_dec"=2147483647 WHERE "___notes_dec" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___notes_diffs_normal"=2147483647 WHERE "___notes_diffs_normal" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___notes_diffs_reply"=2147483647 WHERE "___notes_diffs_reply" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___notes_diffs_renote"=2147483647 WHERE "___notes_diffs_renote" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___users_total"=2147483647 WHERE "___users_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___users_inc"=32767 WHERE "___users_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___users_dec"=32767 WHERE "___users_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___following_total"=2147483647 WHERE "___following_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___following_inc"=32767 WHERE "___following_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___following_dec"=32767 WHERE "___following_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___followers_total"=2147483647 WHERE "___followers_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___followers_inc"=32767 WHERE "___followers_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___followers_dec"=32767 WHERE "___followers_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___drive_totalFiles"=2147483647 WHERE "___drive_totalFiles" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___drive_incFiles"=2147483647 WHERE "___drive_incFiles" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___drive_decFiles"=2147483647 WHERE "___drive_decFiles" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___drive_incUsage"=2147483647 WHERE "___drive_incUsage" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__instance" SET "___drive_decUsage"=2147483647 WHERE "___drive_decUsage" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_notes" SET "___total"=2147483647 WHERE "___total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_notes" SET "___inc"=32767 WHERE "___inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_notes" SET "___dec"=32767 WHERE "___dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_notes" SET "___diffs_normal"=32767 WHERE "___diffs_normal" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_notes" SET "___diffs_reply"=32767 WHERE "___diffs_reply" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_notes" SET "___diffs_renote"=32767 WHERE "___diffs_renote" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_notes" SET "___total"=2147483647 WHERE "___total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_notes" SET "___inc"=32767 WHERE "___inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_notes" SET "___dec"=32767 WHERE "___dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_notes" SET "___diffs_normal"=32767 WHERE "___diffs_normal" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_notes" SET "___diffs_reply"=32767 WHERE "___diffs_reply" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_notes" SET "___diffs_renote"=32767 WHERE "___diffs_renote" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__drive" SET "___local_incCount"=2147483647 WHERE "___local_incCount" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__drive" SET "___local_incSize"=2147483647 WHERE "___local_incSize" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__drive" SET "___local_decCount"=2147483647 WHERE "___local_decCount" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__drive" SET "___local_decSize"=2147483647 WHERE "___local_decSize" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__drive" SET "___remote_incCount"=2147483647 WHERE "___remote_incCount" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__drive" SET "___remote_incSize"=2147483647 WHERE "___remote_incSize" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__drive" SET "___remote_decCount"=2147483647 WHERE "___remote_decCount" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__drive" SET "___remote_decSize"=2147483647 WHERE "___remote_decSize" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__drive" SET "___local_incCount"=2147483647 WHERE "___local_incCount" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__drive" SET "___local_incSize"=2147483647 WHERE "___local_incSize" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__drive" SET "___local_decCount"=2147483647 WHERE "___local_decCount" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__drive" SET "___local_decSize"=2147483647 WHERE "___local_decSize" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__drive" SET "___remote_incCount"=2147483647 WHERE "___remote_incCount" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__drive" SET "___remote_incSize"=2147483647 WHERE "___remote_incSize" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__drive" SET "___remote_decCount"=2147483647 WHERE "___remote_decCount" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__drive" SET "___remote_decSize"=2147483647 WHERE "___remote_decSize" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_reaction" SET "___local_count"=32767 WHERE "___local_count" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_reaction" SET "___remote_count"=32767 WHERE "___remote_count" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_reaction" SET "___local_count"=32767 WHERE "___local_count" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_reaction" SET "___remote_count"=32767 WHERE "___remote_count" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___local_followings_total"=2147483647 WHERE "___local_followings_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___local_followings_inc"=32767 WHERE "___local_followings_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___local_followings_dec"=32767 WHERE "___local_followings_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___local_followers_total"=2147483647 WHERE "___local_followers_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___local_followers_inc"=32767 WHERE "___local_followers_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___local_followers_dec"=32767 WHERE "___local_followers_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___remote_followings_total"=2147483647 WHERE "___remote_followings_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___remote_followings_inc"=32767 WHERE "___remote_followings_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___remote_followings_dec"=32767 WHERE "___remote_followings_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___remote_followers_total"=2147483647 WHERE "___remote_followers_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___remote_followers_inc"=32767 WHERE "___remote_followers_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__per_user_following" SET "___remote_followers_dec"=32767 WHERE "___remote_followers_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___local_followings_total"=2147483647 WHERE "___local_followings_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___local_followings_inc"=32767 WHERE "___local_followings_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___local_followings_dec"=32767 WHERE "___local_followings_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___local_followers_total"=2147483647 WHERE "___local_followers_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___local_followers_inc"=32767 WHERE "___local_followers_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___local_followers_dec"=32767 WHERE "___local_followers_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___remote_followings_total"=2147483647 WHERE "___remote_followings_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___remote_followings_inc"=32767 WHERE "___remote_followings_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___remote_followings_dec"=32767 WHERE "___remote_followings_dec" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___remote_followers_total"=2147483647 WHERE "___remote_followers_total" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___remote_followers_inc"=32767 WHERE "___remote_followers_inc" > 32767`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__per_user_following" SET "___remote_followers_dec"=32767 WHERE "___remote_followers_dec" > 32767`,
+		);
 		await queryRunner.query(`TRUNCATE TABLE "__chart__per_user_drive"`);
 		await queryRunner.query(`TRUNCATE TABLE "__chart_day__per_user_drive"`);
 
-		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" TYPE integer USING "___instance_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" TYPE smallint USING "___instance_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" TYPE smallint USING "___instance_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" TYPE integer USING "___instance_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" TYPE smallint USING "___instance_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" TYPE smallint USING "___instance_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" TYPE integer USING "___local_inc"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" TYPE integer USING "___local_dec"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" TYPE integer USING "___local_diffs_normal"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" TYPE integer USING "___local_diffs_reply"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" TYPE integer USING "___local_diffs_renote"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" TYPE integer USING "___remote_inc"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" TYPE integer USING "___remote_dec"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" TYPE integer USING "___remote_diffs_normal"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" TYPE integer USING "___remote_diffs_reply"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" TYPE integer USING "___remote_diffs_renote"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" TYPE integer USING "___local_inc"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" TYPE integer USING "___local_dec"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" TYPE integer USING "___local_diffs_normal"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" TYPE integer USING "___local_diffs_reply"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" TYPE integer USING "___local_diffs_renote"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" TYPE integer USING "___remote_inc"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" TYPE integer USING "___remote_dec"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" TYPE integer USING "___remote_diffs_normal"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" TYPE integer USING "___remote_diffs_reply"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" TYPE integer USING "___remote_diffs_renote"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" TYPE smallint USING "___local_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" TYPE smallint USING "___local_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" TYPE smallint USING "___remote_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" TYPE smallint USING "___remote_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" TYPE smallint USING "___local_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" TYPE smallint USING "___local_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" TYPE smallint USING "___remote_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" TYPE smallint USING "___remote_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" TYPE integer USING "___incomingRequests"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" TYPE integer USING "___outgoingRequests"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" TYPE integer USING "___totalTime"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" TYPE integer USING "___incomingBytes"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" TYPE integer USING "___outgoingBytes"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" TYPE integer USING "___incomingRequests"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" TYPE integer USING "___outgoingRequests"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" TYPE integer USING "___totalTime"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" TYPE integer USING "___incomingBytes"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" TYPE integer USING "___outgoingBytes"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" TYPE smallint USING "___requests_failed"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" TYPE smallint USING "___requests_succeeded"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" TYPE smallint USING "___requests_received"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" TYPE integer USING "___notes_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" TYPE integer USING "___notes_inc"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" TYPE integer USING "___notes_dec"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" TYPE integer USING "___notes_diffs_normal"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" TYPE integer USING "___notes_diffs_reply"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" TYPE integer USING "___notes_diffs_renote"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" TYPE integer USING "___users_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" TYPE smallint USING "___users_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" TYPE smallint USING "___users_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" TYPE integer USING "___following_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" TYPE smallint USING "___following_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" TYPE smallint USING "___following_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" TYPE integer USING "___followers_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" TYPE smallint USING "___followers_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" TYPE smallint USING "___followers_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" TYPE integer USING "___drive_totalFiles"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" TYPE integer USING "___drive_incFiles"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" TYPE integer USING "___drive_decFiles"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" TYPE integer USING "___drive_incUsage"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" TYPE integer USING "___drive_decUsage"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" TYPE smallint USING "___requests_failed"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" TYPE smallint USING "___requests_succeeded"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" TYPE smallint USING "___requests_received"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" TYPE integer USING "___notes_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" TYPE integer USING "___notes_inc"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" TYPE integer USING "___notes_dec"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" TYPE integer USING "___notes_diffs_normal"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" TYPE integer USING "___notes_diffs_reply"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" TYPE integer USING "___notes_diffs_renote"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" TYPE integer USING "___users_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" TYPE smallint USING "___users_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" TYPE smallint USING "___users_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" TYPE integer USING "___following_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" TYPE smallint USING "___following_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" TYPE smallint USING "___following_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" TYPE integer USING "___followers_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" TYPE smallint USING "___followers_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" TYPE smallint USING "___followers_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" TYPE integer USING "___drive_totalFiles"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" TYPE integer USING "___drive_incFiles"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" TYPE integer USING "___drive_decFiles"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" TYPE integer USING "___drive_incUsage"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" TYPE integer USING "___drive_decUsage"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" TYPE integer USING "___total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" TYPE smallint USING "___inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" TYPE smallint USING "___dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE smallint USING "___diffs_normal"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE smallint USING "___diffs_reply"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE smallint USING "___diffs_renote"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" TYPE integer USING "___total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" TYPE smallint USING "___inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" TYPE smallint USING "___dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE smallint USING "___diffs_normal"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE smallint USING "___diffs_reply"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE smallint USING "___diffs_renote"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" TYPE integer USING "___local_incCount"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" TYPE integer USING "___local_incSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" TYPE integer USING "___local_decCount"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" TYPE integer USING "___local_decSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" TYPE integer USING "___remote_incCount"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" TYPE integer USING "___remote_incSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" TYPE integer USING "___remote_decCount"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" TYPE integer USING "___remote_decSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" TYPE integer USING "___local_incCount"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" TYPE integer USING "___local_incSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" TYPE integer USING "___local_decCount"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" TYPE integer USING "___local_decSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" TYPE integer USING "___remote_incCount"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" TYPE integer USING "___remote_incSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" TYPE integer USING "___remote_decCount"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" TYPE integer USING "___remote_decSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" TYPE smallint USING "___local_count"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" TYPE smallint USING "___remote_count"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" TYPE smallint USING "___local_count"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" TYPE smallint USING "___remote_count"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" TYPE integer USING "___local_followings_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE smallint USING "___local_followings_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE smallint USING "___local_followings_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" TYPE integer USING "___local_followers_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE smallint USING "___local_followers_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE smallint USING "___local_followers_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE integer USING "___remote_followings_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE smallint USING "___remote_followings_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE smallint USING "___remote_followings_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE integer USING "___remote_followers_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE smallint USING "___remote_followers_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE smallint USING "___remote_followers_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" TYPE integer USING "___local_followings_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE smallint USING "___local_followings_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE smallint USING "___local_followings_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" TYPE integer USING "___local_followers_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE smallint USING "___local_followers_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE smallint USING "___local_followers_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE integer USING "___remote_followings_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE smallint USING "___remote_followings_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE smallint USING "___remote_followings_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE integer USING "___remote_followers_total"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE smallint USING "___remote_followers_inc"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE smallint USING "___remote_followers_dec"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" TYPE integer USING "___totalCount"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" TYPE integer USING "___totalSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" TYPE smallint USING "___incCount"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" TYPE integer USING "___incSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" TYPE smallint USING "___decCount"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" TYPE integer USING "___decSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" TYPE integer USING "___totalCount"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" TYPE integer USING "___totalSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" TYPE smallint USING "___incCount"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" TYPE integer USING "___incSize"::integer`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" TYPE smallint USING "___decCount"::smallint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" TYPE integer USING "___decSize"::integer`);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" TYPE integer USING "___instance_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" TYPE smallint USING "___instance_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" TYPE smallint USING "___instance_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" TYPE integer USING "___instance_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" TYPE smallint USING "___instance_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" TYPE smallint USING "___instance_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" TYPE integer USING "___local_inc"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" TYPE integer USING "___local_dec"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" TYPE integer USING "___local_diffs_normal"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" TYPE integer USING "___local_diffs_reply"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" TYPE integer USING "___local_diffs_renote"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" TYPE integer USING "___remote_inc"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" TYPE integer USING "___remote_dec"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" TYPE integer USING "___remote_diffs_normal"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" TYPE integer USING "___remote_diffs_reply"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" TYPE integer USING "___remote_diffs_renote"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" TYPE integer USING "___local_inc"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" TYPE integer USING "___local_dec"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" TYPE integer USING "___local_diffs_normal"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" TYPE integer USING "___local_diffs_reply"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" TYPE integer USING "___local_diffs_renote"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" TYPE integer USING "___remote_inc"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" TYPE integer USING "___remote_dec"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" TYPE integer USING "___remote_diffs_normal"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" TYPE integer USING "___remote_diffs_reply"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" TYPE integer USING "___remote_diffs_renote"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" TYPE smallint USING "___local_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" TYPE smallint USING "___local_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" TYPE smallint USING "___remote_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" TYPE smallint USING "___remote_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" TYPE integer USING "___local_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" TYPE smallint USING "___local_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" TYPE smallint USING "___local_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" TYPE integer USING "___remote_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" TYPE smallint USING "___remote_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" TYPE smallint USING "___remote_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" TYPE integer USING "___incomingRequests"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" TYPE integer USING "___outgoingRequests"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" TYPE integer USING "___totalTime"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" TYPE integer USING "___incomingBytes"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" TYPE integer USING "___outgoingBytes"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" TYPE integer USING "___incomingRequests"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" TYPE integer USING "___outgoingRequests"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" TYPE integer USING "___totalTime"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" TYPE integer USING "___incomingBytes"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" TYPE integer USING "___outgoingBytes"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" TYPE smallint USING "___requests_failed"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" TYPE smallint USING "___requests_succeeded"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" TYPE smallint USING "___requests_received"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" TYPE integer USING "___notes_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" TYPE integer USING "___notes_inc"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" TYPE integer USING "___notes_dec"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" TYPE integer USING "___notes_diffs_normal"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" TYPE integer USING "___notes_diffs_reply"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" TYPE integer USING "___notes_diffs_renote"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" TYPE integer USING "___users_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" TYPE smallint USING "___users_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" TYPE smallint USING "___users_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" TYPE integer USING "___following_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" TYPE smallint USING "___following_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" TYPE smallint USING "___following_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" TYPE integer USING "___followers_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" TYPE smallint USING "___followers_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" TYPE smallint USING "___followers_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" TYPE integer USING "___drive_totalFiles"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" TYPE integer USING "___drive_incFiles"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" TYPE integer USING "___drive_decFiles"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" TYPE integer USING "___drive_incUsage"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" TYPE integer USING "___drive_decUsage"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" TYPE smallint USING "___requests_failed"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" TYPE smallint USING "___requests_succeeded"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" TYPE smallint USING "___requests_received"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" TYPE integer USING "___notes_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" TYPE integer USING "___notes_inc"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" TYPE integer USING "___notes_dec"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" TYPE integer USING "___notes_diffs_normal"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" TYPE integer USING "___notes_diffs_reply"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" TYPE integer USING "___notes_diffs_renote"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" TYPE integer USING "___users_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" TYPE smallint USING "___users_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" TYPE smallint USING "___users_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" TYPE integer USING "___following_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" TYPE smallint USING "___following_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" TYPE smallint USING "___following_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" TYPE integer USING "___followers_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" TYPE smallint USING "___followers_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" TYPE smallint USING "___followers_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" TYPE integer USING "___drive_totalFiles"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" TYPE integer USING "___drive_incFiles"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" TYPE integer USING "___drive_decFiles"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" TYPE integer USING "___drive_incUsage"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" TYPE integer USING "___drive_decUsage"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" TYPE integer USING "___total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" TYPE smallint USING "___inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" TYPE smallint USING "___dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE smallint USING "___diffs_normal"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE smallint USING "___diffs_reply"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE smallint USING "___diffs_renote"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" TYPE integer USING "___total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" TYPE smallint USING "___inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" TYPE smallint USING "___dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE smallint USING "___diffs_normal"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE smallint USING "___diffs_reply"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE smallint USING "___diffs_renote"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" TYPE integer USING "___local_incCount"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" TYPE integer USING "___local_incSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" TYPE integer USING "___local_decCount"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" TYPE integer USING "___local_decSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" TYPE integer USING "___remote_incCount"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" TYPE integer USING "___remote_incSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" TYPE integer USING "___remote_decCount"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" TYPE integer USING "___remote_decSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" TYPE integer USING "___local_incCount"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" TYPE integer USING "___local_incSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" TYPE integer USING "___local_decCount"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" TYPE integer USING "___local_decSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" TYPE integer USING "___remote_incCount"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" TYPE integer USING "___remote_incSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" TYPE integer USING "___remote_decCount"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" TYPE integer USING "___remote_decSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" TYPE smallint USING "___local_count"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" TYPE smallint USING "___remote_count"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" TYPE smallint USING "___local_count"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" TYPE smallint USING "___remote_count"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" TYPE integer USING "___local_followings_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE smallint USING "___local_followings_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE smallint USING "___local_followings_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" TYPE integer USING "___local_followers_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE smallint USING "___local_followers_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE smallint USING "___local_followers_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE integer USING "___remote_followings_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE smallint USING "___remote_followings_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE smallint USING "___remote_followings_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE integer USING "___remote_followers_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE smallint USING "___remote_followers_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE smallint USING "___remote_followers_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" TYPE integer USING "___local_followings_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE smallint USING "___local_followings_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE smallint USING "___local_followings_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" TYPE integer USING "___local_followers_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE smallint USING "___local_followers_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE smallint USING "___local_followers_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE integer USING "___remote_followings_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE smallint USING "___remote_followings_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE smallint USING "___remote_followings_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE integer USING "___remote_followers_total"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE smallint USING "___remote_followers_inc"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE smallint USING "___remote_followers_dec"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" TYPE integer USING "___totalCount"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" TYPE integer USING "___totalSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" TYPE smallint USING "___incCount"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" TYPE integer USING "___incSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" TYPE smallint USING "___decCount"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" TYPE integer USING "___decSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" TYPE integer USING "___totalCount"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" TYPE integer USING "___totalSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" TYPE smallint USING "___incCount"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" TYPE integer USING "___incSize"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" TYPE smallint USING "___decCount"::smallint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" TYPE integer USING "___decSize"::integer`,
+		);
 	}
 
 	async down(queryRunner) {
-
-		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" TYPE bigint USING "___instance_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" TYPE bigint USING "___instance_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" TYPE bigint USING "___instance_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" TYPE bigint USING "___instance_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" TYPE bigint USING "___instance_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" TYPE bigint USING "___instance_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" TYPE bigint USING "___local_diffs_normal"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" TYPE bigint USING "___local_diffs_reply"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" TYPE bigint USING "___local_diffs_renote"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" TYPE bigint USING "___remote_diffs_normal"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" TYPE bigint USING "___remote_diffs_reply"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" TYPE bigint USING "___remote_diffs_renote"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" TYPE bigint USING "___local_diffs_normal"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" TYPE bigint USING "___local_diffs_reply"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" TYPE bigint USING "___local_diffs_renote"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" TYPE bigint USING "___remote_diffs_normal"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" TYPE bigint USING "___remote_diffs_reply"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" TYPE bigint USING "___remote_diffs_renote"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" TYPE bigint USING "___incomingRequests"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" TYPE bigint USING "___outgoingRequests"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" TYPE bigint USING "___totalTime"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" TYPE bigint USING "___incomingBytes"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" TYPE bigint USING "___outgoingBytes"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" TYPE bigint USING "___incomingRequests"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" TYPE bigint USING "___outgoingRequests"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" TYPE bigint USING "___totalTime"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" TYPE bigint USING "___incomingBytes"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" TYPE bigint USING "___outgoingBytes"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" TYPE bigint USING "___requests_failed"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" TYPE bigint USING "___requests_succeeded"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" TYPE bigint USING "___requests_received"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" TYPE bigint USING "___notes_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" TYPE bigint USING "___notes_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" TYPE bigint USING "___notes_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" TYPE bigint USING "___notes_diffs_normal"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" TYPE bigint USING "___notes_diffs_reply"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" TYPE bigint USING "___notes_diffs_renote"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" TYPE bigint USING "___users_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" TYPE bigint USING "___users_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" TYPE bigint USING "___users_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" TYPE bigint USING "___following_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" TYPE bigint USING "___following_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" TYPE bigint USING "___following_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" TYPE bigint USING "___followers_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" TYPE bigint USING "___followers_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" TYPE bigint USING "___followers_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" TYPE bigint USING "___drive_totalFiles"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" TYPE bigint USING "___drive_incFiles"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" TYPE bigint USING "___drive_decFiles"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" TYPE bigint USING "___drive_incUsage"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" TYPE bigint USING "___drive_decUsage"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" TYPE bigint USING "___requests_failed"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" TYPE bigint USING "___requests_succeeded"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" TYPE bigint USING "___requests_received"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" TYPE bigint USING "___notes_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" TYPE bigint USING "___notes_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" TYPE bigint USING "___notes_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" TYPE bigint USING "___notes_diffs_normal"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" TYPE bigint USING "___notes_diffs_reply"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" TYPE bigint USING "___notes_diffs_renote"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" TYPE bigint USING "___users_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" TYPE bigint USING "___users_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" TYPE bigint USING "___users_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" TYPE bigint USING "___following_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" TYPE bigint USING "___following_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" TYPE bigint USING "___following_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" TYPE bigint USING "___followers_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" TYPE bigint USING "___followers_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" TYPE bigint USING "___followers_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" TYPE bigint USING "___drive_totalFiles"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" TYPE bigint USING "___drive_incFiles"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" TYPE bigint USING "___drive_decFiles"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" TYPE bigint USING "___drive_incUsage"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" TYPE bigint USING "___drive_decUsage"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" TYPE bigint USING "___total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" TYPE bigint USING "___inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" TYPE bigint USING "___dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE bigint USING "___diffs_normal"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE bigint USING "___diffs_reply"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE bigint USING "___diffs_renote"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" TYPE bigint USING "___total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" TYPE bigint USING "___inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" TYPE bigint USING "___dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE bigint USING "___diffs_normal"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE bigint USING "___diffs_reply"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE bigint USING "___diffs_renote"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" TYPE bigint USING "___local_incCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" TYPE bigint USING "___local_incSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" TYPE bigint USING "___local_decCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" TYPE bigint USING "___local_decSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" TYPE bigint USING "___remote_incCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" TYPE bigint USING "___remote_incSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" TYPE bigint USING "___remote_decCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" TYPE bigint USING "___remote_decSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" TYPE bigint USING "___local_incCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" TYPE bigint USING "___local_incSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" TYPE bigint USING "___local_decCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" TYPE bigint USING "___local_decSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" TYPE bigint USING "___remote_incCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" TYPE bigint USING "___remote_incSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" TYPE bigint USING "___remote_decCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" TYPE bigint USING "___remote_decSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" TYPE bigint USING "___local_count"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" TYPE bigint USING "___remote_count"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" TYPE bigint USING "___local_count"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" TYPE bigint USING "___remote_count"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" TYPE bigint USING "___local_followings_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE bigint USING "___local_followings_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE bigint USING "___local_followings_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" TYPE bigint USING "___local_followers_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE bigint USING "___local_followers_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE bigint USING "___local_followers_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE bigint USING "___remote_followings_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE bigint USING "___remote_followings_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE bigint USING "___remote_followings_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE bigint USING "___remote_followers_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE bigint USING "___remote_followers_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE bigint USING "___remote_followers_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" TYPE bigint USING "___local_followings_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE bigint USING "___local_followings_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE bigint USING "___local_followings_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" TYPE bigint USING "___local_followers_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE bigint USING "___local_followers_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE bigint USING "___local_followers_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE bigint USING "___remote_followings_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE bigint USING "___remote_followings_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE bigint USING "___remote_followings_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE bigint USING "___remote_followers_total"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE bigint USING "___remote_followers_inc"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE bigint USING "___remote_followers_dec"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" TYPE bigint USING "___totalCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" TYPE bigint USING "___totalSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" TYPE bigint USING "___incCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" TYPE bigint USING "___incSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" TYPE bigint USING "___decCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" TYPE bigint USING "___decSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" TYPE bigint USING "___totalCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" TYPE bigint USING "___totalSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" TYPE bigint USING "___incCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" TYPE bigint USING "___incSize"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" TYPE bigint USING "___decCount"::bigint`);
-		await queryRunner.query(`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" TYPE bigint USING "___decSize"::bigint`);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_total" TYPE bigint USING "___instance_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_inc" TYPE bigint USING "___instance_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ALTER COLUMN "___instance_dec" TYPE bigint USING "___instance_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_total" TYPE bigint USING "___instance_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_inc" TYPE bigint USING "___instance_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ALTER COLUMN "___instance_dec" TYPE bigint USING "___instance_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_normal" TYPE bigint USING "___local_diffs_normal"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_reply" TYPE bigint USING "___local_diffs_reply"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___local_diffs_renote" TYPE bigint USING "___local_diffs_renote"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_normal" TYPE bigint USING "___remote_diffs_normal"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_reply" TYPE bigint USING "___remote_diffs_reply"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ALTER COLUMN "___remote_diffs_renote" TYPE bigint USING "___remote_diffs_renote"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_normal" TYPE bigint USING "___local_diffs_normal"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_reply" TYPE bigint USING "___local_diffs_reply"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___local_diffs_renote" TYPE bigint USING "___local_diffs_renote"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_normal" TYPE bigint USING "___remote_diffs_normal"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_reply" TYPE bigint USING "___remote_diffs_reply"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ALTER COLUMN "___remote_diffs_renote" TYPE bigint USING "___remote_diffs_renote"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__users" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_total" TYPE bigint USING "___local_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_inc" TYPE bigint USING "___local_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___local_dec" TYPE bigint USING "___local_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_total" TYPE bigint USING "___remote_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_inc" TYPE bigint USING "___remote_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__users" ALTER COLUMN "___remote_dec" TYPE bigint USING "___remote_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingRequests" TYPE bigint USING "___incomingRequests"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingRequests" TYPE bigint USING "___outgoingRequests"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___totalTime" TYPE bigint USING "___totalTime"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___incomingBytes" TYPE bigint USING "___incomingBytes"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__network" ALTER COLUMN "___outgoingBytes" TYPE bigint USING "___outgoingBytes"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingRequests" TYPE bigint USING "___incomingRequests"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingRequests" TYPE bigint USING "___outgoingRequests"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___totalTime" TYPE bigint USING "___totalTime"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___incomingBytes" TYPE bigint USING "___incomingBytes"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__network" ALTER COLUMN "___outgoingBytes" TYPE bigint USING "___outgoingBytes"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_failed" TYPE bigint USING "___requests_failed"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_succeeded" TYPE bigint USING "___requests_succeeded"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___requests_received" TYPE bigint USING "___requests_received"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_total" TYPE bigint USING "___notes_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_inc" TYPE bigint USING "___notes_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_dec" TYPE bigint USING "___notes_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_normal" TYPE bigint USING "___notes_diffs_normal"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_reply" TYPE bigint USING "___notes_diffs_reply"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___notes_diffs_renote" TYPE bigint USING "___notes_diffs_renote"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_total" TYPE bigint USING "___users_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_inc" TYPE bigint USING "___users_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___users_dec" TYPE bigint USING "___users_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_total" TYPE bigint USING "___following_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_inc" TYPE bigint USING "___following_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___following_dec" TYPE bigint USING "___following_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_total" TYPE bigint USING "___followers_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_inc" TYPE bigint USING "___followers_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___followers_dec" TYPE bigint USING "___followers_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_totalFiles" TYPE bigint USING "___drive_totalFiles"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incFiles" TYPE bigint USING "___drive_incFiles"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decFiles" TYPE bigint USING "___drive_decFiles"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_incUsage" TYPE bigint USING "___drive_incUsage"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ALTER COLUMN "___drive_decUsage" TYPE bigint USING "___drive_decUsage"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_failed" TYPE bigint USING "___requests_failed"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_succeeded" TYPE bigint USING "___requests_succeeded"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___requests_received" TYPE bigint USING "___requests_received"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_total" TYPE bigint USING "___notes_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_inc" TYPE bigint USING "___notes_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_dec" TYPE bigint USING "___notes_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_normal" TYPE bigint USING "___notes_diffs_normal"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_reply" TYPE bigint USING "___notes_diffs_reply"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___notes_diffs_renote" TYPE bigint USING "___notes_diffs_renote"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_total" TYPE bigint USING "___users_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_inc" TYPE bigint USING "___users_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___users_dec" TYPE bigint USING "___users_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_total" TYPE bigint USING "___following_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_inc" TYPE bigint USING "___following_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___following_dec" TYPE bigint USING "___following_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_total" TYPE bigint USING "___followers_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_inc" TYPE bigint USING "___followers_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___followers_dec" TYPE bigint USING "___followers_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_totalFiles" TYPE bigint USING "___drive_totalFiles"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incFiles" TYPE bigint USING "___drive_incFiles"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decFiles" TYPE bigint USING "___drive_decFiles"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_incUsage" TYPE bigint USING "___drive_incUsage"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ALTER COLUMN "___drive_decUsage" TYPE bigint USING "___drive_decUsage"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___total" TYPE bigint USING "___total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___inc" TYPE bigint USING "___inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___dec" TYPE bigint USING "___dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE bigint USING "___diffs_normal"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE bigint USING "___diffs_reply"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE bigint USING "___diffs_renote"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___total" TYPE bigint USING "___total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___inc" TYPE bigint USING "___inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___dec" TYPE bigint USING "___dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_normal" TYPE bigint USING "___diffs_normal"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_reply" TYPE bigint USING "___diffs_reply"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ALTER COLUMN "___diffs_renote" TYPE bigint USING "___diffs_renote"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incCount" TYPE bigint USING "___local_incCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_incSize" TYPE bigint USING "___local_incSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decCount" TYPE bigint USING "___local_decCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___local_decSize" TYPE bigint USING "___local_decSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incCount" TYPE bigint USING "___remote_incCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_incSize" TYPE bigint USING "___remote_incSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decCount" TYPE bigint USING "___remote_decCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__drive" ALTER COLUMN "___remote_decSize" TYPE bigint USING "___remote_decSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incCount" TYPE bigint USING "___local_incCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_incSize" TYPE bigint USING "___local_incSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decCount" TYPE bigint USING "___local_decCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___local_decSize" TYPE bigint USING "___local_decSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incCount" TYPE bigint USING "___remote_incCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_incSize" TYPE bigint USING "___remote_incSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decCount" TYPE bigint USING "___remote_decCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__drive" ALTER COLUMN "___remote_decSize" TYPE bigint USING "___remote_decSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___local_count" TYPE bigint USING "___local_count"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_reaction" ALTER COLUMN "___remote_count" TYPE bigint USING "___remote_count"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___local_count" TYPE bigint USING "___local_count"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_reaction" ALTER COLUMN "___remote_count" TYPE bigint USING "___remote_count"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_total" TYPE bigint USING "___local_followings_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE bigint USING "___local_followings_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE bigint USING "___local_followings_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_total" TYPE bigint USING "___local_followers_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE bigint USING "___local_followers_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE bigint USING "___local_followers_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE bigint USING "___remote_followings_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE bigint USING "___remote_followings_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE bigint USING "___remote_followings_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE bigint USING "___remote_followers_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE bigint USING "___remote_followers_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE bigint USING "___remote_followers_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_total" TYPE bigint USING "___local_followings_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_inc" TYPE bigint USING "___local_followings_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followings_dec" TYPE bigint USING "___local_followings_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_total" TYPE bigint USING "___local_followers_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_inc" TYPE bigint USING "___local_followers_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___local_followers_dec" TYPE bigint USING "___local_followers_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_total" TYPE bigint USING "___remote_followings_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_inc" TYPE bigint USING "___remote_followings_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followings_dec" TYPE bigint USING "___remote_followings_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_total" TYPE bigint USING "___remote_followers_total"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_inc" TYPE bigint USING "___remote_followers_inc"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_following" ALTER COLUMN "___remote_followers_dec" TYPE bigint USING "___remote_followers_dec"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalCount" TYPE bigint USING "___totalCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___totalSize" TYPE bigint USING "___totalSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incCount" TYPE bigint USING "___incCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___incSize" TYPE bigint USING "___incSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decCount" TYPE bigint USING "___decCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_drive" ALTER COLUMN "___decSize" TYPE bigint USING "___decSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalCount" TYPE bigint USING "___totalCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___totalSize" TYPE bigint USING "___totalSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incCount" TYPE bigint USING "___incCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___incSize" TYPE bigint USING "___incSize"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decCount" TYPE bigint USING "___decCount"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_drive" ALTER COLUMN "___decSize" TYPE bigint USING "___decSize"::bigint`,
+		);
 	}
 }
diff --git a/packages/backend/migration/1644059847460-chart-v8.js b/packages/backend/migration/1644059847460-chart-v8.js
index a5339c0eb..f9357c8ca 100644
--- a/packages/backend/migration/1644059847460-chart-v8.js
+++ b/packages/backend/migration/1644059847460-chart-v8.js
@@ -1,25 +1,46 @@
-
-
 export class chartV81644059847460 {
-    name = 'chartV81644059847460'
+	name = "chartV81644059847460";
 
-		async up(queryRunner) {
-			await queryRunner.query(`UPDATE "__chart__active_users" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`);
-			await queryRunner.query(`UPDATE "__chart__active_users" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`);
-			await queryRunner.query(`UPDATE "__chart_day__active_users" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`);
-			await queryRunner.query(`UPDATE "__chart_day__active_users" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`);
+	async up(queryRunner) {
+		await queryRunner.query(
+			`UPDATE "__chart__active_users" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__active_users" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__active_users" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__active_users" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`,
+		);
 
-			await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`);
-			await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`);
-			await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`);
-			await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`);
-		}
-	
-		async down(queryRunner) {
-	
-			await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`);
-			await queryRunner.query(`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`);
-			await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`);
-			await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`);
-		}
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`,
+		);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1644060125705-chart-v9.js b/packages/backend/migration/1644060125705-chart-v9.js
index da35d4231..7d7934e31 100644
--- a/packages/backend/migration/1644060125705-chart-v9.js
+++ b/packages/backend/migration/1644060125705-chart-v9.js
@@ -1,25 +1,46 @@
-
-
 export class chartV91644060125705 {
-    name = 'chartV91644060125705'
+	name = "chartV91644060125705";
 
-		async up(queryRunner) {
-			await queryRunner.query(`UPDATE "__chart__hashtag" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`);
-			await queryRunner.query(`UPDATE "__chart__hashtag" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`);
-			await queryRunner.query(`UPDATE "__chart_day__hashtag" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`);
-			await queryRunner.query(`UPDATE "__chart_day__hashtag" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`);
+	async up(queryRunner) {
+		await queryRunner.query(
+			`UPDATE "__chart__hashtag" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart__hashtag" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__hashtag" SET "___local_users"=2147483647 WHERE "___local_users" > 2147483647`,
+		);
+		await queryRunner.query(
+			`UPDATE "__chart_day__hashtag" SET "___remote_users"=2147483647 WHERE "___remote_users" > 2147483647`,
+		);
 
-			await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`);
-			await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`);
-			await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`);
-			await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`);
-		}
-	
-		async down(queryRunner) {
-	
-			await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`);
-			await queryRunner.query(`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`);
-			await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`);
-			await queryRunner.query(`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`);
-		}
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___local_users" TYPE integer USING "___local_users"::integer`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___remote_users" TYPE integer USING "___remote_users"::integer`,
+		);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__hashtag" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___local_users" TYPE bigint USING "___local_users"::bigint`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__hashtag" ALTER COLUMN "___remote_users" TYPE bigint USING "___remote_users"::bigint`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1644073149413-chart-v10.js b/packages/backend/migration/1644073149413-chart-v10.js
index 7260bbeca..8038dad15 100644
--- a/packages/backend/migration/1644073149413-chart-v10.js
+++ b/packages/backend/migration/1644073149413-chart-v10.js
@@ -1,35 +1,77 @@
-
-
 export class chartV101644073149413 {
-    name = 'chartV101644073149413'
+	name = "chartV101644073149413";
 
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "__chart__ap_request" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___deliverFailed" integer NOT NULL DEFAULT '0', "___deliverSucceeded" integer NOT NULL DEFAULT '0', "___inboxReceived" integer NOT NULL DEFAULT '0', CONSTRAINT "UQ_e56f4beac5746d44bc3e19c80d0" UNIQUE ("date"), CONSTRAINT "PK_56a25cd447c7ee08876b3baf8d8" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e56f4beac5746d44bc3e19c80d" ON "__chart__ap_request" ("date") `);
-        await queryRunner.query(`CREATE TABLE "__chart_day__ap_request" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___deliverFailed" integer NOT NULL DEFAULT '0', "___deliverSucceeded" integer NOT NULL DEFAULT '0', "___inboxReceived" integer NOT NULL DEFAULT '0', CONSTRAINT "UQ_a848f66d6cec11980a5dd595822" UNIQUE ("date"), CONSTRAINT "PK_9318b49daee320194e23f712e69" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a848f66d6cec11980a5dd59582" ON "__chart_day__ap_request" ("date") `);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "unique_temp___deliveredInstances" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___deliveredInstances" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "unique_temp___inboxInstances" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___inboxInstances" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "unique_temp___deliveredInstances" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___deliveredInstances" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "unique_temp___inboxInstances" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___inboxInstances" smallint NOT NULL DEFAULT '0'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "__chart__ap_request" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___deliverFailed" integer NOT NULL DEFAULT '0', "___deliverSucceeded" integer NOT NULL DEFAULT '0', "___inboxReceived" integer NOT NULL DEFAULT '0', CONSTRAINT "UQ_e56f4beac5746d44bc3e19c80d0" UNIQUE ("date"), CONSTRAINT "PK_56a25cd447c7ee08876b3baf8d8" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_e56f4beac5746d44bc3e19c80d" ON "__chart__ap_request" ("date") `,
+		);
+		await queryRunner.query(
+			`CREATE TABLE "__chart_day__ap_request" ("id" SERIAL NOT NULL, "date" integer NOT NULL, "___deliverFailed" integer NOT NULL DEFAULT '0', "___deliverSucceeded" integer NOT NULL DEFAULT '0', "___inboxReceived" integer NOT NULL DEFAULT '0', CONSTRAINT "UQ_a848f66d6cec11980a5dd595822" UNIQUE ("date"), CONSTRAINT "PK_9318b49daee320194e23f712e69" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_a848f66d6cec11980a5dd59582" ON "__chart_day__ap_request" ("date") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "unique_temp___deliveredInstances" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___deliveredInstances" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "unique_temp___inboxInstances" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___inboxInstances" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "unique_temp___deliveredInstances" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___deliveredInstances" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "unique_temp___inboxInstances" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___inboxInstances" smallint NOT NULL DEFAULT '0'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___inboxInstances"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "unique_temp___inboxInstances"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___deliveredInstances"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "unique_temp___deliveredInstances"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___inboxInstances"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "unique_temp___inboxInstances"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___deliveredInstances"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "unique_temp___deliveredInstances"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_a848f66d6cec11980a5dd59582"`);
-        await queryRunner.query(`DROP TABLE "__chart_day__ap_request"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_e56f4beac5746d44bc3e19c80d"`);
-        await queryRunner.query(`DROP TABLE "__chart__ap_request"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___inboxInstances"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "unique_temp___inboxInstances"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___deliveredInstances"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "unique_temp___deliveredInstances"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___inboxInstances"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "unique_temp___inboxInstances"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___deliveredInstances"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "unique_temp___deliveredInstances"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_a848f66d6cec11980a5dd59582"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart_day__ap_request"`);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_e56f4beac5746d44bc3e19c80d"`,
+		);
+		await queryRunner.query(`DROP TABLE "__chart__ap_request"`);
+	}
 }
diff --git a/packages/backend/migration/1644095659741-chart-v11.js b/packages/backend/migration/1644095659741-chart-v11.js
index 309fff1d9..8db122d4f 100644
--- a/packages/backend/migration/1644095659741-chart-v11.js
+++ b/packages/backend/migration/1644095659741-chart-v11.js
@@ -1,91 +1,249 @@
-
-
 export class chartV111644095659741 {
-    name = 'chartV111644095659741'
+	name = "chartV111644095659741";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___local_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___remote_users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredWithinWeek" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredWithinWeek" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredWithinMonth" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredWithinMonth" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredWithinYear" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredWithinYear" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredOutsideWeek" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredOutsideWeek" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredOutsideMonth" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredOutsideMonth" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredOutsideYear" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___registeredOutsideYear" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredWithinWeek" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredWithinWeek" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredWithinMonth" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredWithinMonth" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredWithinYear" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredWithinYear" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredOutsideWeek" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredOutsideWeek" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredOutsideMonth" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredOutsideMonth" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredOutsideYear" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___registeredOutsideYear" smallint NOT NULL DEFAULT '0'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___local_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___remote_users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredWithinWeek" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___registeredWithinWeek" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredWithinMonth" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___registeredWithinMonth" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredWithinYear" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___registeredWithinYear" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredOutsideWeek" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___registeredOutsideWeek" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredOutsideMonth" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___registeredOutsideMonth" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___registeredOutsideYear" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___registeredOutsideYear" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredWithinWeek" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___registeredWithinWeek" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredWithinMonth" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___registeredWithinMonth" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredWithinYear" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___registeredWithinYear" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredOutsideWeek" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___registeredOutsideWeek" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredOutsideMonth" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___registeredOutsideMonth" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___registeredOutsideYear" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___registeredOutsideYear" smallint NOT NULL DEFAULT '0'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredOutsideYear"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredOutsideYear"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredOutsideMonth"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredOutsideMonth"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredOutsideWeek"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredOutsideWeek"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredWithinYear"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredWithinYear"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredWithinMonth"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredWithinMonth"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredWithinWeek"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredWithinWeek"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___notedUsers"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___notedUsers"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredOutsideYear"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredOutsideYear"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredOutsideMonth"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredOutsideMonth"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredOutsideWeek"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredOutsideWeek"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredWithinYear"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredWithinYear"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredWithinMonth"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredWithinMonth"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredWithinWeek"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredWithinWeek"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___notedUsers"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___notedUsers"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___remote_users" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___local_users" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___remote_users" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___local_users" integer NOT NULL DEFAULT '0'`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredOutsideYear"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredOutsideYear"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredOutsideMonth"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredOutsideMonth"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredOutsideWeek"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredOutsideWeek"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredWithinYear"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredWithinYear"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredWithinMonth"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredWithinMonth"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___registeredWithinWeek"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___registeredWithinWeek"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___notedUsers"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___notedUsers"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredOutsideYear"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredOutsideYear"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredOutsideMonth"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredOutsideMonth"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredOutsideWeek"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredOutsideWeek"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredWithinYear"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredWithinYear"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredWithinMonth"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredWithinMonth"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___registeredWithinWeek"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___registeredWithinWeek"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___notedUsers"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___notedUsers"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___remote_users" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___local_users" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___remote_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___local_users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___remote_users" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___local_users" integer NOT NULL DEFAULT '0'`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1644328606241-chart-v12.js b/packages/backend/migration/1644328606241-chart-v12.js
index c3c7e44f9..ea363e12f 100644
--- a/packages/backend/migration/1644328606241-chart-v12.js
+++ b/packages/backend/migration/1644328606241-chart-v12.js
@@ -1,27 +1,57 @@
-
-
 export class chartV121644328606241 {
-    name = 'chartV121644328606241'
+	name = "chartV121644328606241";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ADD "___local_diffs_withFile" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" ADD "___remote_diffs_withFile" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ADD "___local_diffs_withFile" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" ADD "___remote_diffs_withFile" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" ADD "___notes_diffs_withFile" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" ADD "___notes_diffs_withFile" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" ADD "___diffs_withFile" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" ADD "___diffs_withFile" smallint NOT NULL DEFAULT '0'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ADD "___local_diffs_withFile" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" ADD "___remote_diffs_withFile" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ADD "___local_diffs_withFile" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" ADD "___remote_diffs_withFile" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" ADD "___notes_diffs_withFile" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" ADD "___notes_diffs_withFile" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" ADD "___diffs_withFile" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" ADD "___diffs_withFile" smallint NOT NULL DEFAULT '0'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__per_user_notes" DROP COLUMN "___diffs_withFile"`);
-        await queryRunner.query(`ALTER TABLE "__chart__per_user_notes" DROP COLUMN "___diffs_withFile"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__instance" DROP COLUMN "___notes_diffs_withFile"`);
-        await queryRunner.query(`ALTER TABLE "__chart__instance" DROP COLUMN "___notes_diffs_withFile"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" DROP COLUMN "___remote_diffs_withFile"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__notes" DROP COLUMN "___local_diffs_withFile"`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" DROP COLUMN "___remote_diffs_withFile"`);
-        await queryRunner.query(`ALTER TABLE "__chart__notes" DROP COLUMN "___local_diffs_withFile"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__per_user_notes" DROP COLUMN "___diffs_withFile"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__per_user_notes" DROP COLUMN "___diffs_withFile"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__instance" DROP COLUMN "___notes_diffs_withFile"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__instance" DROP COLUMN "___notes_diffs_withFile"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" DROP COLUMN "___remote_diffs_withFile"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__notes" DROP COLUMN "___local_diffs_withFile"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" DROP COLUMN "___remote_diffs_withFile"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__notes" DROP COLUMN "___local_diffs_withFile"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1644331238153-chart-v13.js b/packages/backend/migration/1644331238153-chart-v13.js
index 639f7b4e2..cbb1830f5 100644
--- a/packages/backend/migration/1644331238153-chart-v13.js
+++ b/packages/backend/migration/1644331238153-chart-v13.js
@@ -1,19 +1,33 @@
-
-
 export class chartV131644331238153 {
-    name = 'chartV131644331238153'
+	name = "chartV131644331238153";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "unique_temp___stalled" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___stalled" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "unique_temp___stalled" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___stalled" smallint NOT NULL DEFAULT '0'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "unique_temp___stalled" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___stalled" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "unique_temp___stalled" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___stalled" smallint NOT NULL DEFAULT '0'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___stalled"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "unique_temp___stalled"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___stalled"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "unique_temp___stalled"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___stalled"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "unique_temp___stalled"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___stalled"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "unique_temp___stalled"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1644344266289-chart-v14.js b/packages/backend/migration/1644344266289-chart-v14.js
index a0d9cfc38..6e6c03083 100644
--- a/packages/backend/migration/1644344266289-chart-v14.js
+++ b/packages/backend/migration/1644344266289-chart-v14.js
@@ -1,47 +1,117 @@
-
-
 export class chartV141644344266289 {
-    name = 'chartV141644344266289'
+	name = "chartV141644344266289";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___users"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___notedUsers"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___notedUsers"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___users"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___notedUsers"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___notedUsers"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___readWrite" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___read" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___read" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___write" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___write" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___readWrite" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___read" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___read" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___write" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___write" smallint NOT NULL DEFAULT '0'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___notedUsers"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___notedUsers"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___users"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___notedUsers"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___notedUsers"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___readWrite" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___read" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___read" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___write" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___write" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___readWrite" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___read" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___read" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___write" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___write" smallint NOT NULL DEFAULT '0'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___write"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___write"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___read"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___read"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___readWrite"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___write"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___write"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___read"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___read"`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" DROP COLUMN "___readWrite"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___write"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___write"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___read"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "unique_temp___read"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" DROP COLUMN "___readWrite"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___write"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___write"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___read"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "unique_temp___read"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" DROP COLUMN "___readWrite"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___notedUsers" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___notedUsers" character varying array NOT NULL DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "___users" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__active_users" ADD "unique_temp___users" character varying array NOT NULL DEFAULT '{}'`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1644395759931-instance-theme-color.js b/packages/backend/migration/1644395759931-instance-theme-color.js
index 8f335ad21..1e0ee04bc 100644
--- a/packages/backend/migration/1644395759931-instance-theme-color.js
+++ b/packages/backend/migration/1644395759931-instance-theme-color.js
@@ -1,13 +1,13 @@
-
-
 export class instanceThemeColor1644395759931 {
-    name = 'instanceThemeColor1644395759931'
+	name = "instanceThemeColor1644395759931";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "themeColor" character varying(512)`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "themeColor" character varying(512)`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "themeColor"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "themeColor"`);
+	}
 }
diff --git a/packages/backend/migration/1644481657998-chart-v15.js b/packages/backend/migration/1644481657998-chart-v15.js
index b50ca87c4..a8e1b89cb 100644
--- a/packages/backend/migration/1644481657998-chart-v15.js
+++ b/packages/backend/migration/1644481657998-chart-v15.js
@@ -1,31 +1,69 @@
-
-
 export class chartV151644481657998 {
-    name = 'chartV151644481657998'
+	name = "chartV151644481657998";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_total"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_inc"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_dec"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_total"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_inc"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_dec"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___sub" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___pub" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___sub" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___pub" smallint NOT NULL DEFAULT '0'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_total"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_inc"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_dec"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_total"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_inc"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_dec"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___sub" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___pub" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___sub" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___pub" smallint NOT NULL DEFAULT '0'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___pub"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___sub"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___pub"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___sub"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___instance_dec" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___instance_inc" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___instance_total" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___instance_dec" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___instance_inc" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___instance_total" integer NOT NULL DEFAULT '0'`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___pub"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___sub"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___pub"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___sub"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___instance_dec" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___instance_inc" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___instance_total" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___instance_dec" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___instance_inc" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___instance_total" integer NOT NULL DEFAULT '0'`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1644551208096-following-indexes.js b/packages/backend/migration/1644551208096-following-indexes.js
index 276473ff6..b06f764e5 100644
--- a/packages/backend/migration/1644551208096-following-indexes.js
+++ b/packages/backend/migration/1644551208096-following-indexes.js
@@ -1,15 +1,21 @@
-
-
 export class followingIndexes1644551208096 {
-    name = 'followingIndexes1644551208096'
+	name = "followingIndexes1644551208096";
 
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE INDEX "IDX_4ccd2239268ebbd1b35e318754" ON "following" ("followerHost") `);
-        await queryRunner.query(`CREATE INDEX "IDX_fcdafee716dfe9c3b5fde90f30" ON "following" ("followeeHost") `);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE INDEX "IDX_4ccd2239268ebbd1b35e318754" ON "following" ("followerHost") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_fcdafee716dfe9c3b5fde90f30" ON "following" ("followeeHost") `,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_fcdafee716dfe9c3b5fde90f30"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_4ccd2239268ebbd1b35e318754"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_fcdafee716dfe9c3b5fde90f30"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_4ccd2239268ebbd1b35e318754"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1645340161439-remove-max-note-text-length.js b/packages/backend/migration/1645340161439-remove-max-note-text-length.js
index c88cb70bf..d17ef8c12 100644
--- a/packages/backend/migration/1645340161439-remove-max-note-text-length.js
+++ b/packages/backend/migration/1645340161439-remove-max-note-text-length.js
@@ -1,13 +1,15 @@
-
-
 export class removeMaxNoteTextLength1645340161439 {
-    name = 'removeMaxNoteTextLength1645340161439'
+	name = "removeMaxNoteTextLength1645340161439";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "maxNoteTextLength"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "maxNoteTextLength"`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "maxNoteTextLength" integer NOT NULL DEFAULT '500'`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "maxNoteTextLength" integer NOT NULL DEFAULT '500'`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1645599900873-federation-chart-pubsub.js b/packages/backend/migration/1645599900873-federation-chart-pubsub.js
index fd7cb6d5a..58e2b4c00 100644
--- a/packages/backend/migration/1645599900873-federation-chart-pubsub.js
+++ b/packages/backend/migration/1645599900873-federation-chart-pubsub.js
@@ -1,15 +1,21 @@
-
-
 export class federationChartPubsub1645599900873 {
-    name = 'federationChartPubsub1645599900873'
+	name = "federationChartPubsub1645599900873";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___pubsub" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___pubsub" smallint NOT NULL DEFAULT '0'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___pubsub" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___pubsub" smallint NOT NULL DEFAULT '0'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___pubsub"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___pubsub"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___pubsub"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___pubsub"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1646143552768-instance-default-theme.js b/packages/backend/migration/1646143552768-instance-default-theme.js
index 029354fd9..d97efcaa6 100644
--- a/packages/backend/migration/1646143552768-instance-default-theme.js
+++ b/packages/backend/migration/1646143552768-instance-default-theme.js
@@ -1,13 +1,21 @@
 export class instanceDefaultTheme1646143552768 {
-    name = 'instanceDefaultTheme1646143552768'
+	name = "instanceDefaultTheme1646143552768";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "defaultLightTheme" character varying(8192)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "defaultDarkTheme" character varying(8192)`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "defaultLightTheme" character varying(8192)`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "defaultDarkTheme" character varying(8192)`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "defaultDarkTheme"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "defaultLightTheme"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "defaultDarkTheme"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "defaultLightTheme"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1646387162108-mute-expires-at.js b/packages/backend/migration/1646387162108-mute-expires-at.js
index c8be8f3c5..52fe101bd 100644
--- a/packages/backend/migration/1646387162108-mute-expires-at.js
+++ b/packages/backend/migration/1646387162108-mute-expires-at.js
@@ -1,13 +1,19 @@
 export class muteExpiresAt1646387162108 {
-    name = 'muteExpiresAt1646387162108'
+	name = "muteExpiresAt1646387162108";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "muting" ADD "expiresAt" TIMESTAMP WITH TIME ZONE`);
-        await queryRunner.query(`CREATE INDEX "IDX_c1fd1c3dfb0627aa36c253fd14" ON "muting" ("expiresAt") `);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "muting" ADD "expiresAt" TIMESTAMP WITH TIME ZONE`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_c1fd1c3dfb0627aa36c253fd14" ON "muting" ("expiresAt") `,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_c1fd1c3dfb0627aa36c253fd14"`);
-        await queryRunner.query(`ALTER TABLE "muting" DROP COLUMN "expiresAt"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_c1fd1c3dfb0627aa36c253fd14"`,
+		);
+		await queryRunner.query(`ALTER TABLE "muting" DROP COLUMN "expiresAt"`);
+	}
 }
diff --git a/packages/backend/migration/1646549089451-poll-ended-notification.js b/packages/backend/migration/1646549089451-poll-ended-notification.js
index 38a38ce64..cc96a62a7 100644
--- a/packages/backend/migration/1646549089451-poll-ended-notification.js
+++ b/packages/backend/migration/1646549089451-poll-ended-notification.js
@@ -1,18 +1,29 @@
-
 export class pollEndedNotification1646549089451 {
-    name = 'pollEndedNotification1646549089451'
+	name = "pollEndedNotification1646549089451";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TYPE "public"."notification_type_enum" RENAME TO "notification_type_enum_old"`);
-        await queryRunner.query(`CREATE TYPE "public"."notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
-        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "public"."notification_type_enum" USING "type"::"text"::"public"."notification_type_enum"`);
-        await queryRunner.query(`DROP TYPE "public"."notification_type_enum_old"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TYPE "public"."notification_type_enum" RENAME TO "notification_type_enum_old"`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "public"."notification_type_enum" USING "type"::"text"::"public"."notification_type_enum"`,
+		);
+		await queryRunner.query(`DROP TYPE "public"."notification_type_enum_old"`);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "public"."notification_type_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
-        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "public"."notification_type_enum_old" USING "type"::"text"::"public"."notification_type_enum_old"`);
-        await queryRunner.query(`DROP TYPE "public"."notification_type_enum"`);
-        await queryRunner.query(`ALTER TYPE "public"."notification_type_enum_old" RENAME TO "notification_type_enum"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`CREATE TYPE "public"."notification_type_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "public"."notification_type_enum_old" USING "type"::"text"::"public"."notification_type_enum_old"`,
+		);
+		await queryRunner.query(`DROP TYPE "public"."notification_type_enum"`);
+		await queryRunner.query(
+			`ALTER TYPE "public"."notification_type_enum_old" RENAME TO "notification_type_enum"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1646633030285-chart-federation-active.js b/packages/backend/migration/1646633030285-chart-federation-active.js
index 952289c8f..3cb2dffe3 100644
--- a/packages/backend/migration/1646633030285-chart-federation-active.js
+++ b/packages/backend/migration/1646633030285-chart-federation-active.js
@@ -1,13 +1,21 @@
 export class chartFederationActive1646633030285 {
-    name = 'chartFederationActive1646633030285'
+	name = "chartFederationActive1646633030285";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___active"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___active"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___active"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___active"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1646655454495-remove-instance-drive-columns.js b/packages/backend/migration/1646655454495-remove-instance-drive-columns.js
index a0ee1b2c4..12f56bc2d 100644
--- a/packages/backend/migration/1646655454495-remove-instance-drive-columns.js
+++ b/packages/backend/migration/1646655454495-remove-instance-drive-columns.js
@@ -1,13 +1,17 @@
 export class removeInstanceDriveColumns1646655454495 {
-    name = 'removeInstanceDriveColumns1646655454495'
+	name = "removeInstanceDriveColumns1646655454495";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "driveUsage"`);
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "driveFiles"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "driveUsage"`);
+		await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "driveFiles"`);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" ADD "driveFiles" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "instance" ADD "driveUsage" bigint NOT NULL DEFAULT '0'`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "driveFiles" integer NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "instance" ADD "driveUsage" bigint NOT NULL DEFAULT '0'`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1646732390560-chart-federation-active-sub-pub.js b/packages/backend/migration/1646732390560-chart-federation-active-sub-pub.js
index c9a847cbc..e34b9a22e 100644
--- a/packages/backend/migration/1646732390560-chart-federation-active-sub-pub.js
+++ b/packages/backend/migration/1646732390560-chart-federation-active-sub-pub.js
@@ -1,21 +1,45 @@
 export class chartFederationActiveSubPub1646732390560 {
-    name = 'chartFederationActiveSubPub1646732390560'
+	name = "chartFederationActiveSubPub1646732390560";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___active"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___active"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___subActive" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___pubActive" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___subActive" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___pubActive" smallint NOT NULL DEFAULT '0'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___active"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___active"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___subActive" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___pubActive" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___subActive" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___pubActive" smallint NOT NULL DEFAULT '0'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___pubActive"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___subActive"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___pubActive"`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___subActive"`);
-        await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___pubActive"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" DROP COLUMN "___subActive"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___pubActive"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" DROP COLUMN "___subActive"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart_day__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "__chart__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1648548247382-webhook.js b/packages/backend/migration/1648548247382-webhook.js
index aea369a5c..3e7160e2b 100644
--- a/packages/backend/migration/1648548247382-webhook.js
+++ b/packages/backend/migration/1648548247382-webhook.js
@@ -1,19 +1,37 @@
 export class webhook1648548247382 {
-    name = 'webhook1648548247382'
+	name = "webhook1648548247382";
 
-    async up(queryRunner) {
-			await queryRunner.query(`CREATE TABLE "webhook" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "on" character varying(128) array NOT NULL DEFAULT '{}', "url" character varying(1024) NOT NULL, "secret" character varying(1024) NOT NULL, "active" boolean NOT NULL DEFAULT true, CONSTRAINT "PK_e6765510c2d078db49632b59020" PRIMARY KEY ("id")); COMMENT ON COLUMN "webhook"."createdAt" IS 'The created date of the Antenna.'; COMMENT ON COLUMN "webhook"."userId" IS 'The owner ID.'; COMMENT ON COLUMN "webhook"."name" IS 'The name of the Antenna.'`);
-			await queryRunner.query(`CREATE INDEX "IDX_f272c8c8805969e6a6449c77b3" ON "webhook" ("userId") `);
-			await queryRunner.query(`CREATE INDEX "IDX_8063a0586ed1dfbe86e982d961" ON "webhook" ("on") `);
-			await queryRunner.query(`CREATE INDEX "IDX_5a056076f76b2efe08216ba655" ON "webhook" ("active") `);
-			await queryRunner.query(`ALTER TABLE "webhook" ADD CONSTRAINT "FK_f272c8c8805969e6a6449c77b3c" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "webhook" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "on" character varying(128) array NOT NULL DEFAULT '{}', "url" character varying(1024) NOT NULL, "secret" character varying(1024) NOT NULL, "active" boolean NOT NULL DEFAULT true, CONSTRAINT "PK_e6765510c2d078db49632b59020" PRIMARY KEY ("id")); COMMENT ON COLUMN "webhook"."createdAt" IS 'The created date of the Antenna.'; COMMENT ON COLUMN "webhook"."userId" IS 'The owner ID.'; COMMENT ON COLUMN "webhook"."name" IS 'The name of the Antenna.'`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f272c8c8805969e6a6449c77b3" ON "webhook" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8063a0586ed1dfbe86e982d961" ON "webhook" ("on") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_5a056076f76b2efe08216ba655" ON "webhook" ("active") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "webhook" ADD CONSTRAINT "FK_f272c8c8805969e6a6449c77b3c" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+		);
 	}
 
 	async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "webhook" DROP CONSTRAINT "FK_f272c8c8805969e6a6449c77b3c"`);
-			await queryRunner.query(`DROP INDEX "public"."IDX_5a056076f76b2efe08216ba655"`);
-			await queryRunner.query(`DROP INDEX "public"."IDX_8063a0586ed1dfbe86e982d961"`);
-			await queryRunner.query(`DROP INDEX "public"."IDX_f272c8c8805969e6a6449c77b3"`);
-			await queryRunner.query(`DROP TABLE "webhook"`);
+		await queryRunner.query(
+			`ALTER TABLE "webhook" DROP CONSTRAINT "FK_f272c8c8805969e6a6449c77b3c"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_5a056076f76b2efe08216ba655"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_8063a0586ed1dfbe86e982d961"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_f272c8c8805969e6a6449c77b3"`,
+		);
+		await queryRunner.query(`DROP TABLE "webhook"`);
 	}
 }
diff --git a/packages/backend/migration/1648816172177-webhook-2.js b/packages/backend/migration/1648816172177-webhook-2.js
index 2feb68d61..a4ab4ef8f 100644
--- a/packages/backend/migration/1648816172177-webhook-2.js
+++ b/packages/backend/migration/1648816172177-webhook-2.js
@@ -1,14 +1,15 @@
-
 export class webhook21648816172177 {
-    name = 'webhook21648816172177'
+	name = "webhook21648816172177";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "webhook" ADD "latestSentAt" TIMESTAMP WITH TIME ZONE`);
-        await queryRunner.query(`ALTER TABLE "webhook" ADD "latestStatus" integer`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "webhook" ADD "latestSentAt" TIMESTAMP WITH TIME ZONE`,
+		);
+		await queryRunner.query(`ALTER TABLE "webhook" ADD "latestStatus" integer`);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "webhook" DROP COLUMN "latestStatus"`);
-        await queryRunner.query(`ALTER TABLE "webhook" DROP COLUMN "latestSentAt"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "webhook" DROP COLUMN "latestStatus"`);
+		await queryRunner.query(`ALTER TABLE "webhook" DROP COLUMN "latestSentAt"`);
+	}
 }
diff --git a/packages/backend/migration/1651224615271-foreign-key.js b/packages/backend/migration/1651224615271-foreign-key.js
index 535d21731..7e6bc7962 100644
--- a/packages/backend/migration/1651224615271-foreign-key.js
+++ b/packages/backend/migration/1651224615271-foreign-key.js
@@ -1,89 +1,187 @@
 export class foreignKeyReports1651224615271 {
-    name = 'foreignKeyReports1651224615271'
+	name = "foreignKeyReports1651224615271";
 
-    async up(queryRunner) {
-        await Promise.all([
-            queryRunner.query(`ALTER INDEX "public"."IDX_seoignmeoprigmkpodgrjmkpormg" RENAME TO "IDX_c8cc87bd0f2f4487d17c651fbf"`),
-            queryRunner.query(`DROP INDEX "public"."IDX_note_on_channelId_and_id_desc"`),
+	async up(queryRunner) {
+		await Promise.all([
+			queryRunner.query(
+				`ALTER INDEX "public"."IDX_seoignmeoprigmkpodgrjmkpormg" RENAME TO "IDX_c8cc87bd0f2f4487d17c651fbf"`,
+			),
+			queryRunner.query(
+				`DROP INDEX "public"."IDX_note_on_channelId_and_id_desc"`,
+			),
 
-            // remove unnecessary default null, see also down
-            queryRunner.query(`ALTER TABLE "user" ALTER COLUMN "followersUri" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "session" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "appId" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "name" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "description" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "access_token" ALTER COLUMN "iconUrl" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "softwareName" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "softwareVersion" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "name" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "description" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "maintainerName" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "maintainerEmail" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "iconUrl" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "faviconUrl" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "instance" ALTER COLUMN "themeColor" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "clip" ALTER COLUMN "description" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "note" ALTER COLUMN "channelId" DROP DEFAULT`),
-            queryRunner.query(`ALTER TABLE "abuse_user_report" ALTER COLUMN "comment" DROP DEFAULT`),
+			// remove unnecessary default null, see also down
+			queryRunner.query(
+				`ALTER TABLE "user" ALTER COLUMN "followersUri" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "access_token" ALTER COLUMN "session" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "access_token" ALTER COLUMN "appId" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "access_token" ALTER COLUMN "name" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "access_token" ALTER COLUMN "description" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "access_token" ALTER COLUMN "iconUrl" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "instance" ALTER COLUMN "softwareName" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "instance" ALTER COLUMN "softwareVersion" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "instance" ALTER COLUMN "name" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "instance" ALTER COLUMN "description" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "instance" ALTER COLUMN "maintainerName" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "instance" ALTER COLUMN "maintainerEmail" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "instance" ALTER COLUMN "iconUrl" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "instance" ALTER COLUMN "faviconUrl" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "instance" ALTER COLUMN "themeColor" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "clip" ALTER COLUMN "description" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "note" ALTER COLUMN "channelId" DROP DEFAULT`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "abuse_user_report" ALTER COLUMN "comment" DROP DEFAULT`,
+			),
 
-            queryRunner.query(`CREATE INDEX "IDX_315c779174fe8247ab324f036e" ON "drive_file" ("isLink")`),
-            queryRunner.query(`CREATE INDEX "IDX_f22169eb10657bded6d875ac8f" ON "note" ("channelId")`),
-            //queryRunner.query(`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId")`),
+			queryRunner.query(
+				`CREATE INDEX "IDX_315c779174fe8247ab324f036e" ON "drive_file" ("isLink")`,
+			),
+			queryRunner.query(
+				`CREATE INDEX "IDX_f22169eb10657bded6d875ac8f" ON "note" ("channelId")`,
+			),
+			//queryRunner.query(`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId")`),
 
-            //queryRunner.query(`DELETE FROM "abuse_user_report" WHERE "targetUserId" NOT IN (SELECT "id" FROM "user")`).then(() => {
-            //    queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-            //}),
+			//queryRunner.query(`DELETE FROM "abuse_user_report" WHERE "targetUserId" NOT IN (SELECT "id" FROM "user")`).then(() => {
+			//    queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+			//}),
 
-            queryRunner.query(`ALTER TABLE "poll" ADD CONSTRAINT "UQ_da851e06d0dfe2ef397d8b1bf1b" UNIQUE ("noteId")`),
-            queryRunner.query(`ALTER TABLE "user_keypair" ADD CONSTRAINT "UQ_f4853eb41ab722fe05f81cedeb6" UNIQUE ("userId")`),
-            queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "UQ_51cb79b5555effaf7d69ba1cff9" UNIQUE ("userId")`),
-            queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "UQ_10c146e4b39b443ede016f6736d" UNIQUE ("userId")`),
-            queryRunner.query(`ALTER TABLE "promo_note" ADD CONSTRAINT "UQ_e263909ca4fe5d57f8d4230dd5c" UNIQUE ("noteId")`),
+			queryRunner.query(
+				`ALTER TABLE "poll" ADD CONSTRAINT "UQ_da851e06d0dfe2ef397d8b1bf1b" UNIQUE ("noteId")`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "user_keypair" ADD CONSTRAINT "UQ_f4853eb41ab722fe05f81cedeb6" UNIQUE ("userId")`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "user_profile" ADD CONSTRAINT "UQ_51cb79b5555effaf7d69ba1cff9" UNIQUE ("userId")`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "user_publickey" ADD CONSTRAINT "UQ_10c146e4b39b443ede016f6736d" UNIQUE ("userId")`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "promo_note" ADD CONSTRAINT "UQ_e263909ca4fe5d57f8d4230dd5c" UNIQUE ("noteId")`,
+			),
 
-            queryRunner.query(`ALTER TABLE "page" RENAME CONSTRAINT "FK_3126dd7c502c9e4d7597ef7ef10" TO "FK_a9ca79ad939bf06066b81c9d3aa"`),
+			queryRunner.query(
+				`ALTER TABLE "page" RENAME CONSTRAINT "FK_3126dd7c502c9e4d7597ef7ef10" TO "FK_a9ca79ad939bf06066b81c9d3aa"`,
+			),
 
-            queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum" ADD VALUE 'pollEnded' AFTER 'pollVote'`),
-        ]);
-    }
+			queryRunner.query(
+				`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum" ADD VALUE 'pollEnded' AFTER 'pollVote'`,
+			),
+		]);
+	}
 
-    async down(queryRunner) {
-        await Promise.all([
-            // There is no ALTER TYPE REMOVE VALUE query, so the reverse operation is a bit more complex
-            queryRunner.query(`UPDATE "user_profile" SET "mutingNotificationTypes" = array_remove("mutingNotificationTypes", 'pollEnded')`)
-            .then(() =>
-                queryRunner.query(`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`)
-            ).then(() =>
-                queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`)
-            ).then(() =>
-                queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum_old"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum_old"[]`)
-            ).then(() =>
-                queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`)
-            ).then(() =>
-                queryRunner.query(`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum"`)
-            ).then(() =>
-                queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum_old" RENAME TO "user_profile_mutingnotificationtypes_enum"`)
-            ),
+	async down(queryRunner) {
+		await Promise.all([
+			// There is no ALTER TYPE REMOVE VALUE query, so the reverse operation is a bit more complex
+			queryRunner
+				.query(
+					`UPDATE "user_profile" SET "mutingNotificationTypes" = array_remove("mutingNotificationTypes", 'pollEnded')`,
+				)
+				.then(() =>
+					queryRunner.query(
+						`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`,
+					),
+				)
+				.then(() =>
+					queryRunner.query(
+						`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`,
+					),
+				)
+				.then(() =>
+					queryRunner.query(
+						`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum_old"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum_old"[]`,
+					),
+				)
+				.then(() =>
+					queryRunner.query(
+						`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`,
+					),
+				)
+				.then(() =>
+					queryRunner.query(
+						`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum"`,
+					),
+				)
+				.then(() =>
+					queryRunner.query(
+						`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum_old" RENAME TO "user_profile_mutingnotificationtypes_enum"`,
+					),
+				),
 
-            queryRunner.query(`ALTER TABLE "page" RENAME CONSTRAINT "FK_a9ca79ad939bf06066b81c9d3aa" TO "FK_3126dd7c502c9e4d7597ef7ef10"`),
+			queryRunner.query(
+				`ALTER TABLE "page" RENAME CONSTRAINT "FK_a9ca79ad939bf06066b81c9d3aa" TO "FK_3126dd7c502c9e4d7597ef7ef10"`,
+			),
 
-            queryRunner.query(`ALTER TABLE "promo_note" DROP CONSTRAINT "UQ_e263909ca4fe5d57f8d4230dd5c"`),
-            queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "UQ_10c146e4b39b443ede016f6736d"`),
-            queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "UQ_51cb79b5555effaf7d69ba1cff9"`),
-            queryRunner.query(`ALTER TABLE "user_keypair" DROP CONSTRAINT "UQ_f4853eb41ab722fe05f81cedeb6"`),
-            queryRunner.query(`ALTER TABLE "poll" DROP CONSTRAINT "UQ_da851e06d0dfe2ef397d8b1bf1b"`),
+			queryRunner.query(
+				`ALTER TABLE "promo_note" DROP CONSTRAINT "UQ_e263909ca4fe5d57f8d4230dd5c"`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "user_publickey" DROP CONSTRAINT "UQ_10c146e4b39b443ede016f6736d"`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "user_profile" DROP CONSTRAINT "UQ_51cb79b5555effaf7d69ba1cff9"`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "user_keypair" DROP CONSTRAINT "UQ_f4853eb41ab722fe05f81cedeb6"`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "poll" DROP CONSTRAINT "UQ_da851e06d0dfe2ef397d8b1bf1b"`,
+			),
 
-            queryRunner.query(`ALTER TABLE "abuse_user_report" ALTER COLUMN "comment" SET DEFAULT '{}'`),
-            queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f"`),
+			queryRunner.query(
+				`ALTER TABLE "abuse_user_report" ALTER COLUMN "comment" SET DEFAULT '{}'`,
+			),
+			queryRunner.query(
+				`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f"`,
+			),
 
-            queryRunner.query(`DROP INDEX "public"."IDX_a9021cc2e1feb5f72d3db6e9f5"`),
-            queryRunner.query(`DROP INDEX "public"."IDX_f22169eb10657bded6d875ac8f"`),
-            queryRunner.query(`DROP INDEX "public"."IDX_315c779174fe8247ab324f036e"`),
+			queryRunner.query(`DROP INDEX "public"."IDX_a9021cc2e1feb5f72d3db6e9f5"`),
+			queryRunner.query(`DROP INDEX "public"."IDX_f22169eb10657bded6d875ac8f"`),
+			queryRunner.query(`DROP INDEX "public"."IDX_315c779174fe8247ab324f036e"`),
 
-            /* DEFAULT's are not set again because if the column can be NULL, then DEFAULT NULL is not necessary.
+			/* DEFAULT's are not set again because if the column can be NULL, then DEFAULT NULL is not necessary.
             see also https://github.com/typeorm/typeorm/issues/7579#issuecomment-835423615 */
 
-            queryRunner.query(`CREATE INDEX "IDX_note_on_channelId_and_id_desc" ON "note" ("id", "channelId") `),
-            queryRunner.query(`ALTER INDEX "public"."IDX_c8cc87bd0f2f4487d17c651fbf" RENAME TO "IDX_seoignmeoprigmkpodgrjmkpormg"`),
-        ]);
-    }
+			queryRunner.query(
+				`CREATE INDEX "IDX_note_on_channelId_and_id_desc" ON "note" ("id", "channelId") `,
+			),
+			queryRunner.query(
+				`ALTER INDEX "public"."IDX_c8cc87bd0f2f4487d17c651fbf" RENAME TO "IDX_seoignmeoprigmkpodgrjmkpormg"`,
+			),
+		]);
+	}
 }
diff --git a/packages/backend/migration/1652859567549-uniform-themecolor.js b/packages/backend/migration/1652859567549-uniform-themecolor.js
index 8da1fd7fb..8c91854d5 100644
--- a/packages/backend/migration/1652859567549-uniform-themecolor.js
+++ b/packages/backend/migration/1652859567549-uniform-themecolor.js
@@ -1,7 +1,7 @@
-import tinycolor from 'tinycolor2';
+import tinycolor from "tinycolor2";
 
 export class uniformThemecolor1652859567549 {
-	name = 'uniformThemecolor1652859567549'
+	name = "uniformThemecolor1652859567549";
 
 	async up(queryRunner) {
 		const formatColor = (color) => {
@@ -13,20 +13,35 @@ export class uniformThemecolor1652859567549 {
 			}
 		};
 
-		await queryRunner.query('SELECT "id", "themeColor" FROM "instance" WHERE "themeColor" IS NOT NULL')
-		.then(instances => Promise.all(instances.map(instance => {
-			// update theme color to uniform format, e.g. #00ff00
-			// invalid theme colors get set to null
-			return queryRunner.query('UPDATE "instance" SET "themeColor" = $1 WHERE "id" = $2', [formatColor(instance.themeColor), instance.id]);
-		})));
+		await queryRunner
+			.query(
+				'SELECT "id", "themeColor" FROM "instance" WHERE "themeColor" IS NOT NULL',
+			)
+			.then((instances) =>
+				Promise.all(
+					instances.map((instance) => {
+						// update theme color to uniform format, e.g. #00ff00
+						// invalid theme colors get set to null
+						return queryRunner.query(
+							'UPDATE "instance" SET "themeColor" = $1 WHERE "id" = $2',
+							[formatColor(instance.themeColor), instance.id],
+						);
+					}),
+				),
+			);
 
 		// also fix own theme color
-		await queryRunner.query('SELECT "themeColor" FROM "meta" WHERE "themeColor" IS NOT NULL LIMIT 1')
-		.then(metas => {
-			if (metas.length > 0) {
-				return queryRunner.query('UPDATE "meta" SET "themeColor" = $1', [formatColor(metas[0].themeColor)]);
-			}
-		});
+		await queryRunner
+			.query(
+				'SELECT "themeColor" FROM "meta" WHERE "themeColor" IS NOT NULL LIMIT 1',
+			)
+			.then((metas) => {
+				if (metas.length > 0) {
+					return queryRunner.query('UPDATE "meta" SET "themeColor" = $1', [
+						formatColor(metas[0].themeColor),
+					]);
+				}
+			});
 	}
 
 	async down(queryRunner) {
diff --git a/packages/backend/migration/1655368940105-nsfw-detection.js b/packages/backend/migration/1655368940105-nsfw-detection.js
index 9268f4340..f1bcda50e 100644
--- a/packages/backend/migration/1655368940105-nsfw-detection.js
+++ b/packages/backend/migration/1655368940105-nsfw-detection.js
@@ -1,23 +1,51 @@
 export class nsfwDetection1655368940105 {
-    name = 'nsfwDetection1655368940105'
+	name = "nsfwDetection1655368940105";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "forceIsSensitive" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "predictedIsSensitive" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."predictedIsSensitive" IS 'Whether the DriveFile is NSFW. (predict)'`);
-        await queryRunner.query(`CREATE TYPE "public"."meta_sensitiveimagedetection_enum" AS ENUM('none', 'all', 'local', 'remote')`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "sensitiveImageDetection" "public"."meta_sensitiveimagedetection_enum" NOT NULL DEFAULT 'none'`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "forceIsSensitiveWhenPredicted" boolean NOT NULL DEFAULT true`);
-        await queryRunner.query(`CREATE INDEX "IDX_fc2d74a6d7d8b11292a851d8f8" ON "drive_file" ("predictedIsSensitive") `);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "forceIsSensitive" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "predictedIsSensitive" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."predictedIsSensitive" IS 'Whether the DriveFile is NSFW. (predict)'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."meta_sensitiveimagedetection_enum" AS ENUM('none', 'all', 'local', 'remote')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "sensitiveImageDetection" "public"."meta_sensitiveimagedetection_enum" NOT NULL DEFAULT 'none'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "forceIsSensitiveWhenPredicted" boolean NOT NULL DEFAULT true`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_fc2d74a6d7d8b11292a851d8f8" ON "drive_file" ("predictedIsSensitive") `,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_fc2d74a6d7d8b11292a851d8f8"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "forceIsSensitiveWhenPredicted"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sensitiveImageDetection"`);
-        await queryRunner.query(`DROP TYPE "public"."meta_sensitiveimagedetection_enum"`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."predictedIsSensitive" IS 'Whether the DriveFile is NSFW. (predict)'`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "predictedIsSensitive"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "forceIsSensitive"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_fc2d74a6d7d8b11292a851d8f8"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "forceIsSensitiveWhenPredicted"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "sensitiveImageDetection"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."meta_sensitiveimagedetection_enum"`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."predictedIsSensitive" IS 'Whether the DriveFile is NSFW. (predict)'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" DROP COLUMN "predictedIsSensitive"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" DROP COLUMN "forceIsSensitive"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1655371960534-nsfw-detection-2.js b/packages/backend/migration/1655371960534-nsfw-detection-2.js
index aac6f37da..236cd7091 100644
--- a/packages/backend/migration/1655371960534-nsfw-detection-2.js
+++ b/packages/backend/migration/1655371960534-nsfw-detection-2.js
@@ -1,15 +1,27 @@
 export class nsfwDetection21655371960534 {
-    name = 'nsfwDetection21655371960534'
+	name = "nsfwDetection21655371960534";
 
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum" AS ENUM('medium', 'low', 'high')`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "sensitiveImageDetectionSensitivity" "public"."meta_sensitiveimagedetectionsensitivity_enum" NOT NULL DEFAULT 'medium'`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "disallowUploadWhenPredictedAsPorn" boolean NOT NULL DEFAULT false`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum" AS ENUM('medium', 'low', 'high')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "sensitiveImageDetectionSensitivity" "public"."meta_sensitiveimagedetectionsensitivity_enum" NOT NULL DEFAULT 'medium'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "disallowUploadWhenPredictedAsPorn" boolean NOT NULL DEFAULT false`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "disallowUploadWhenPredictedAsPorn"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sensitiveImageDetectionSensitivity"`);
-        await queryRunner.query(`DROP TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "disallowUploadWhenPredictedAsPorn"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "sensitiveImageDetectionSensitivity"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1655388169582-nsfw-detection-3.js b/packages/backend/migration/1655388169582-nsfw-detection-3.js
index a5c80cf96..6a6ceeafb 100644
--- a/packages/backend/migration/1655388169582-nsfw-detection-3.js
+++ b/packages/backend/migration/1655388169582-nsfw-detection-3.js
@@ -1,21 +1,45 @@
 export class nsfwDetection31655388169582 {
-    name = 'nsfwDetection31655388169582'
+	name = "nsfwDetection31655388169582";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum" RENAME TO "meta_sensitiveimagedetectionsensitivity_enum_old"`);
-        await queryRunner.query(`CREATE TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum" AS ENUM('medium', 'low', 'high', 'veryLow', 'veryHigh')`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum" USING "sensitiveImageDetectionSensitivity"::"text"::"public"."meta_sensitiveimagedetectionsensitivity_enum"`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" SET DEFAULT 'medium'`);
-        await queryRunner.query(`DROP TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum_old"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum" RENAME TO "meta_sensitiveimagedetectionsensitivity_enum_old"`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum" AS ENUM('medium', 'low', 'high', 'veryLow', 'veryHigh')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum" USING "sensitiveImageDetectionSensitivity"::"text"::"public"."meta_sensitiveimagedetectionsensitivity_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" SET DEFAULT 'medium'`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum_old"`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum_old" AS ENUM('medium', 'low', 'high')`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum_old" USING "sensitiveImageDetectionSensitivity"::"text"::"public"."meta_sensitiveimagedetectionsensitivity_enum_old"`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" SET DEFAULT 'medium'`);
-        await queryRunner.query(`DROP TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum"`);
-        await queryRunner.query(`ALTER TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum_old" RENAME TO "meta_sensitiveimagedetectionsensitivity_enum"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`CREATE TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum_old" AS ENUM('medium', 'low', 'high')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" DROP DEFAULT`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum_old" USING "sensitiveImageDetectionSensitivity"::"text"::"public"."meta_sensitiveimagedetectionsensitivity_enum_old"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ALTER COLUMN "sensitiveImageDetectionSensitivity" SET DEFAULT 'medium'`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum_old" RENAME TO "meta_sensitiveimagedetectionsensitivity_enum"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1655393015659-nsfw-detection-4.js b/packages/backend/migration/1655393015659-nsfw-detection-4.js
index e78073262..3e4589732 100644
--- a/packages/backend/migration/1655393015659-nsfw-detection-4.js
+++ b/packages/backend/migration/1655393015659-nsfw-detection-4.js
@@ -1,25 +1,57 @@
 export class nsfwDetection41655393015659 {
-    name = 'nsfwDetection41655393015659'
+	name = "nsfwDetection41655393015659";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sensitiveImageDetection"`);
-        await queryRunner.query(`DROP TYPE "public"."meta_sensitiveimagedetection_enum"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sensitiveImageDetectionSensitivity"`);
-        await queryRunner.query(`DROP TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum"`);
-        await queryRunner.query(`CREATE TYPE "public"."meta_sensitivemediadetection_enum" AS ENUM('none', 'all', 'local', 'remote')`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "sensitiveMediaDetection" "public"."meta_sensitivemediadetection_enum" NOT NULL DEFAULT 'none'`);
-        await queryRunner.query(`CREATE TYPE "public"."meta_sensitivemediadetectionsensitivity_enum" AS ENUM('medium', 'low', 'high', 'veryLow', 'veryHigh')`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "sensitiveMediaDetectionSensitivity" "public"."meta_sensitivemediadetectionsensitivity_enum" NOT NULL DEFAULT 'medium'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "sensitiveImageDetection"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."meta_sensitiveimagedetection_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "sensitiveImageDetectionSensitivity"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum"`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."meta_sensitivemediadetection_enum" AS ENUM('none', 'all', 'local', 'remote')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "sensitiveMediaDetection" "public"."meta_sensitivemediadetection_enum" NOT NULL DEFAULT 'none'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."meta_sensitivemediadetectionsensitivity_enum" AS ENUM('medium', 'low', 'high', 'veryLow', 'veryHigh')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "sensitiveMediaDetectionSensitivity" "public"."meta_sensitivemediadetectionsensitivity_enum" NOT NULL DEFAULT 'medium'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sensitiveMediaDetectionSensitivity"`);
-        await queryRunner.query(`DROP TYPE "public"."meta_sensitivemediadetectionsensitivity_enum"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sensitiveMediaDetection"`);
-        await queryRunner.query(`DROP TYPE "public"."meta_sensitivemediadetection_enum"`);
-        await queryRunner.query(`CREATE TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum" AS ENUM('medium', 'low', 'high', 'veryLow', 'veryHigh')`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "sensitiveImageDetectionSensitivity" "public"."meta_sensitiveimagedetectionsensitivity_enum" NOT NULL DEFAULT 'medium'`);
-        await queryRunner.query(`CREATE TYPE "public"."meta_sensitiveimagedetection_enum" AS ENUM('none', 'all', 'local', 'remote')`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "sensitiveImageDetection" "public"."meta_sensitiveimagedetection_enum" NOT NULL DEFAULT 'none'`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "sensitiveMediaDetectionSensitivity"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."meta_sensitivemediadetectionsensitivity_enum"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "sensitiveMediaDetection"`,
+		);
+		await queryRunner.query(
+			`DROP TYPE "public"."meta_sensitivemediadetection_enum"`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."meta_sensitiveimagedetectionsensitivity_enum" AS ENUM('medium', 'low', 'high', 'veryLow', 'veryHigh')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "sensitiveImageDetectionSensitivity" "public"."meta_sensitiveimagedetectionsensitivity_enum" NOT NULL DEFAULT 'medium'`,
+		);
+		await queryRunner.query(
+			`CREATE TYPE "public"."meta_sensitiveimagedetection_enum" AS ENUM('none', 'all', 'local', 'remote')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "sensitiveImageDetection" "public"."meta_sensitiveimagedetection_enum" NOT NULL DEFAULT 'none'`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1655813815729-driveCapacityOverrideMb.js b/packages/backend/migration/1655813815729-driveCapacityOverrideMb.js
index f257cd112..e43f0af5c 100644
--- a/packages/backend/migration/1655813815729-driveCapacityOverrideMb.js
+++ b/packages/backend/migration/1655813815729-driveCapacityOverrideMb.js
@@ -1,13 +1,21 @@
 export class driveCapacityOverrideMb1655813815729 {
-    name = 'driveCapacityOverrideMb1655813815729'
+	name = "driveCapacityOverrideMb1655813815729";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" ADD "driveCapacityOverrideMb" integer`);
-        await queryRunner.query(`COMMENT ON COLUMN "user"."driveCapacityOverrideMb" IS 'Overrides user drive capacity limit'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "driveCapacityOverrideMb" integer`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."driveCapacityOverrideMb" IS 'Overrides user drive capacity limit'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`COMMENT ON COLUMN "user"."driveCapacityOverrideMb" IS 'Overrides user drive capacity limit'`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "driveCapacityOverrideMb"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."driveCapacityOverrideMb" IS 'Overrides user drive capacity limit'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user" DROP COLUMN "driveCapacityOverrideMb"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1655918165614-user-ip.js b/packages/backend/migration/1655918165614-user-ip.js
index 2294fbaf1..2c5dc1c82 100644
--- a/packages/backend/migration/1655918165614-user-ip.js
+++ b/packages/backend/migration/1655918165614-user-ip.js
@@ -1,17 +1,31 @@
 export class userIp1655918165614 {
-    name = 'userIp1655918165614'
+	name = "userIp1655918165614";
 
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "user_ip" ("id" SERIAL NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "ip" character varying(128) NOT NULL, CONSTRAINT "PK_2c44ddfbf7c0464d028dcef325e" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_7f7f1c66f48e9a8e18a33bc515" ON "user_ip" ("userId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_361b500e06721013c124b7b6c5" ON "user_ip" ("userId", "ip") `);
-        await queryRunner.query(`ALTER TABLE "user_ip" ADD CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE TABLE "user_ip" ("id" SERIAL NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "ip" character varying(128) NOT NULL, CONSTRAINT "PK_2c44ddfbf7c0464d028dcef325e" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_7f7f1c66f48e9a8e18a33bc515" ON "user_ip" ("userId") `,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_361b500e06721013c124b7b6c5" ON "user_ip" ("userId", "ip") `,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_ip" ADD CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_ip" DROP CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_361b500e06721013c124b7b6c5"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_7f7f1c66f48e9a8e18a33bc515"`);
-        await queryRunner.query(`DROP TABLE "user_ip"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_ip" DROP CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_361b500e06721013c124b7b6c5"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_7f7f1c66f48e9a8e18a33bc515"`,
+		);
+		await queryRunner.query(`DROP TABLE "user_ip"`);
+	}
 }
diff --git a/packages/backend/migration/1656122560740-file-ip.js b/packages/backend/migration/1656122560740-file-ip.js
index b59e7a911..534097adb 100644
--- a/packages/backend/migration/1656122560740-file-ip.js
+++ b/packages/backend/migration/1656122560740-file-ip.js
@@ -1,13 +1,19 @@
 export class fileIp1656122560740 {
-    name = 'fileIp1656122560740'
+	name = "fileIp1656122560740";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "requestHeaders" jsonb DEFAULT '{}'`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "requestIp" character varying(128)`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "requestHeaders" jsonb DEFAULT '{}'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "requestIp" character varying(128)`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "requestIp"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "requestHeaders"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "requestIp"`);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" DROP COLUMN "requestHeaders"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1656251734807-nsfw-detection-5.js b/packages/backend/migration/1656251734807-nsfw-detection-5.js
index 6f0c53690..7a2206e01 100644
--- a/packages/backend/migration/1656251734807-nsfw-detection-5.js
+++ b/packages/backend/migration/1656251734807-nsfw-detection-5.js
@@ -1,33 +1,79 @@
 export class nsfwDetection51656251734807 {
-    name = 'nsfwDetection51656251734807'
+	name = "nsfwDetection51656251734807";
 
-    async up(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_fc2d74a6d7d8b11292a851d8f8"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "forceIsSensitive"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "predictedIsSensitive"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "forceIsSensitiveWhenPredicted"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "disallowUploadWhenPredictedAsPorn"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "maybeSensitive" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."maybeSensitive" IS 'Whether the DriveFile is NSFW. (predict)'`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "maybePorn" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "setSensitiveFlagAutomatically" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "autoSensitive" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`CREATE INDEX "IDX_3b33dff77bb64b23c88151d23e" ON "drive_file" ("maybeSensitive") `);
-        await queryRunner.query(`CREATE INDEX "IDX_8bdcd3dd2bddb78014999a16ce" ON "drive_file" ("maybePorn") `);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_fc2d74a6d7d8b11292a851d8f8"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" DROP COLUMN "forceIsSensitive"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" DROP COLUMN "predictedIsSensitive"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "forceIsSensitiveWhenPredicted"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "disallowUploadWhenPredictedAsPorn"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "maybeSensitive" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."maybeSensitive" IS 'Whether the DriveFile is NSFW. (predict)'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "maybePorn" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "setSensitiveFlagAutomatically" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "autoSensitive" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_3b33dff77bb64b23c88151d23e" ON "drive_file" ("maybeSensitive") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8bdcd3dd2bddb78014999a16ce" ON "drive_file" ("maybePorn") `,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_8bdcd3dd2bddb78014999a16ce"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_3b33dff77bb64b23c88151d23e"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "autoSensitive"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "setSensitiveFlagAutomatically"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "maybePorn"`);
-        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."maybeSensitive" IS 'Whether the DriveFile is NSFW. (predict)'`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "maybeSensitive"`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "disallowUploadWhenPredictedAsPorn" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "forceIsSensitiveWhenPredicted" boolean NOT NULL DEFAULT true`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "predictedIsSensitive" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "forceIsSensitive" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`CREATE INDEX "IDX_fc2d74a6d7d8b11292a851d8f8" ON "drive_file" ("predictedIsSensitive") `);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_8bdcd3dd2bddb78014999a16ce"`,
+		);
+		await queryRunner.query(
+			`DROP INDEX "public"."IDX_3b33dff77bb64b23c88151d23e"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "autoSensitive"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "setSensitiveFlagAutomatically"`,
+		);
+		await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "maybePorn"`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "drive_file"."maybeSensitive" IS 'Whether the DriveFile is NSFW. (predict)'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" DROP COLUMN "maybeSensitive"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "disallowUploadWhenPredictedAsPorn" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "forceIsSensitiveWhenPredicted" boolean NOT NULL DEFAULT true`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "predictedIsSensitive" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "forceIsSensitive" boolean NOT NULL DEFAULT false`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_fc2d74a6d7d8b11292a851d8f8" ON "drive_file" ("predictedIsSensitive") `,
+		);
+	}
 }
diff --git a/packages/backend/migration/1656328812281-ip-2.js b/packages/backend/migration/1656328812281-ip-2.js
index b0ee1ebfc..ab4096e9c 100644
--- a/packages/backend/migration/1656328812281-ip-2.js
+++ b/packages/backend/migration/1656328812281-ip-2.js
@@ -1,13 +1,19 @@
 export class ip21656328812281 {
-    name = 'ip21656328812281'
+	name = "ip21656328812281";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_ip" DROP CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150"`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "enableIpLogging" boolean NOT NULL DEFAULT false`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_ip" DROP CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "enableIpLogging" boolean NOT NULL DEFAULT false`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableIpLogging"`);
-        await queryRunner.query(`ALTER TABLE "user_ip" ADD CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableIpLogging"`);
+		await queryRunner.query(
+			`ALTER TABLE "user_ip" ADD CONSTRAINT "FK_7f7f1c66f48e9a8e18a33bc5150" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1656408772602-nsfw-detection-6.js b/packages/backend/migration/1656408772602-nsfw-detection-6.js
index 7ef223a4c..4ef237308 100644
--- a/packages/backend/migration/1656408772602-nsfw-detection-6.js
+++ b/packages/backend/migration/1656408772602-nsfw-detection-6.js
@@ -1,11 +1,15 @@
 export class nsfwDetection61656408772602 {
-    name = 'nsfwDetection61656408772602'
+	name = "nsfwDetection61656408772602";
 
-    async up(queryRunner) {
-				await queryRunner.query(`ALTER TABLE "meta" ADD "enableSensitiveMediaDetectionForVideos" boolean NOT NULL DEFAULT false`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "enableSensitiveMediaDetectionForVideos" boolean NOT NULL DEFAULT false`,
+		);
+	}
 
-    async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableSensitiveMediaDetectionForVideos"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "enableSensitiveMediaDetectionForVideos"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1656772790599-user-moderation-note.js b/packages/backend/migration/1656772790599-user-moderation-note.js
index 133bcffe1..11d3124ae 100644
--- a/packages/backend/migration/1656772790599-user-moderation-note.js
+++ b/packages/backend/migration/1656772790599-user-moderation-note.js
@@ -1,11 +1,15 @@
 export class userModerationNote1656772790599 {
-    name = 'userModerationNote1656772790599'
+	name = "userModerationNote1656772790599";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "moderationNote" character varying(8192) NOT NULL DEFAULT ''`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" ADD "moderationNote" character varying(8192) NOT NULL DEFAULT ''`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "moderationNote"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "user_profile" DROP COLUMN "moderationNote"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1657346559800-active-email-validation.js b/packages/backend/migration/1657346559800-active-email-validation.js
index f8e03eeb0..4e3fd3f82 100644
--- a/packages/backend/migration/1657346559800-active-email-validation.js
+++ b/packages/backend/migration/1657346559800-active-email-validation.js
@@ -1,11 +1,15 @@
 export class activeEmailValidation1657346559800 {
-    name = 'activeEmailValidation1657346559800'
+	name = "activeEmailValidation1657346559800";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "enableActiveEmailValidation" boolean NOT NULL DEFAULT true`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "enableActiveEmailValidation" boolean NOT NULL DEFAULT true`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableActiveEmailValidation"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "enableActiveEmailValidation"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1658203170545calckey.js b/packages/backend/migration/1658203170545calckey.js
index eb5913e81..95c3f05d3 100644
--- a/packages/backend/migration/1658203170545calckey.js
+++ b/packages/backend/migration/1658203170545calckey.js
@@ -1,15 +1,27 @@
 export class calckey1658203170545 {
-		name = 'calckey1658203170545'
+	name = "calckey1658203170545";
 
-		async up(queryRunner) {
-				await queryRunner.query(`UPDATE meta SET "useStarForReactionFallback" = TRUE;`);
-				await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`);
-				await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`);
-		}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`UPDATE meta SET "useStarForReactionFallback" = TRUE;`,
+		);
+		await queryRunner.query(
+			`UPDATE meta SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`,
+		);
+		await queryRunner.query(
+			`UPDATE meta SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`,
+		);
+	}
 
-		async down(queryRunner) {
-				await queryRunner.query(`UPDATE meta SET "useStarForReactionFallback" = FALSE;`);
-				await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`);
-				await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`);
-		}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`UPDATE meta SET "useStarForReactionFallback" = FALSE;`,
+		);
+		await queryRunner.query(
+			`UPDATE meta SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`,
+		);
+		await queryRunner.query(
+			`UPDATE meta SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1658656633972-note-replies-function.js b/packages/backend/migration/1658656633972-note-replies-function.js
index de2e28c6f..810e23843 100644
--- a/packages/backend/migration/1658656633972-note-replies-function.js
+++ b/packages/backend/migration/1658656633972-note-replies-function.js
@@ -1,5 +1,5 @@
 export class noteRepliesFunction1658656633972 {
-	name = 'noteRepliesFunction1658656633972'
+	name = "noteRepliesFunction1658656633972";
 
 	async up(queryRunner) {
 		await queryRunner.query(`
diff --git a/packages/backend/migration/1658939464003CustomMOTD.js b/packages/backend/migration/1658939464003CustomMOTD.js
index eac03451d..ee1b182e5 100644
--- a/packages/backend/migration/1658939464003CustomMOTD.js
+++ b/packages/backend/migration/1658939464003CustomMOTD.js
@@ -1,8 +1,10 @@
 export class CustomMOTD1658939464003 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "customMOTD" character varying(256) array NOT NULL DEFAULT '{}'::varchar[]`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "customMOTD"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "customMOTD" character varying(256) array NOT NULL DEFAULT '{}'::varchar[]`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "customMOTD"`);
+	}
 }
diff --git a/packages/backend/migration/1658941974648CustomSplashIcons.js b/packages/backend/migration/1658941974648CustomSplashIcons.js
index fce5eb767..5c6a874d0 100644
--- a/packages/backend/migration/1658941974648CustomSplashIcons.js
+++ b/packages/backend/migration/1658941974648CustomSplashIcons.js
@@ -1,8 +1,12 @@
 export class CustomSplashIcons1658941974648 {
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "customSplashIcons" character varying(256) array NOT NULL DEFAULT '{}'::varchar[]`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "customSplashIcons"`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "customSplashIcons" character varying(256) array NOT NULL DEFAULT '{}'::varchar[]`,
+		);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "customSplashIcons"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1658981842728FixCalckey.js b/packages/backend/migration/1658981842728FixCalckey.js
index 7d8750634..1a0305538 100644
--- a/packages/backend/migration/1658981842728FixCalckey.js
+++ b/packages/backend/migration/1658981842728FixCalckey.js
@@ -1,15 +1,27 @@
 export class FixCalckey1658981842728 {
-		name = 'FixCalckey1658981842728'
+	name = "FixCalckey1658981842728";
 
-		async up(queryRunner) {
-			await queryRunner.query(`UPDATE "meta" SET "useStarForReactionFallback" = TRUE;`);
-			await queryRunner.query(`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`);
-			await queryRunner.query(`UPDATE "meta" SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`);
+	async up(queryRunner) {
+		await queryRunner.query(
+			`UPDATE "meta" SET "useStarForReactionFallback" = TRUE;`,
+		);
+		await queryRunner.query(
+			`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`,
+		);
+		await queryRunner.query(
+			`UPDATE "meta" SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`,
+		);
 	}
 
 	async down(queryRunner) {
-			await queryRunner.query(`UPDATE "meta" SET "useStarForReactionFallback" = FALSE;`);
-			await queryRunner.query(`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`);
-			await queryRunner.query(`UPDATE "meta" SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`);
+		await queryRunner.query(
+			`UPDATE "meta" SET "useStarForReactionFallback" = FALSE;`,
+		);
+		await queryRunner.query(
+			`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`,
+		);
+		await queryRunner.query(
+			`UPDATE "meta" SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`,
+		);
 	}
 }
diff --git a/packages/backend/migration/1659042130648RecommendedTimeline.js b/packages/backend/migration/1659042130648RecommendedTimeline.js
index 39c9b4163..01d28b2f3 100644
--- a/packages/backend/migration/1659042130648RecommendedTimeline.js
+++ b/packages/backend/migration/1659042130648RecommendedTimeline.js
@@ -1,11 +1,19 @@
 export class RecommendedTimeline1659042130648 {
-		name = 'RecommendedTimeline1659042130648'
-		async up(queryRunner) {
-				await queryRunner.query(`ALTER TABLE "meta" ADD "disableRecommendedTimeline" boolean NOT NULL DEFAULT true`);
-				await queryRunner.query(`ALTER TABLE "meta" ADD "recommendedInstances" character varying(256) array NOT NULL DEFAULT '{}'::varchar[]`);
-		}
-		async down(queryRunner) {
-				await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "disableRecommendedTimeline"`);
-				await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "recommendedInstances"`);
-		}
+	name = "RecommendedTimeline1659042130648";
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "disableRecommendedTimeline" boolean NOT NULL DEFAULT true`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "recommendedInstances" character varying(256) array NOT NULL DEFAULT '{}'::varchar[]`,
+		);
 	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "disableRecommendedTimeline"`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "recommendedInstances"`,
+		);
+	}
+}
diff --git a/packages/backend/migration/1660068273737GuestTimeline.js b/packages/backend/migration/1660068273737GuestTimeline.js
index 23d3bc51b..9a42f602d 100644
--- a/packages/backend/migration/1660068273737GuestTimeline.js
+++ b/packages/backend/migration/1660068273737GuestTimeline.js
@@ -1,9 +1,13 @@
 export class GuestTimeline1660068273737 {
-		name = 'GuestTimeline1660068273737'
-		async up(queryRunner) {
-				await queryRunner.query(`ALTER TABLE "meta" ADD "enableGuestTimeline" boolean NOT NULL DEFAULT false`);
-		}
-		async down(queryRunner) {
-				await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableGuestTimeline"`);
-		}
+	name = "GuestTimeline1660068273737";
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "enableGuestTimeline" boolean NOT NULL DEFAULT false`,
+		);
 	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "enableGuestTimeline"`,
+		);
+	}
+}
diff --git a/packages/backend/migration/1668828368510PageDraft.js b/packages/backend/migration/1668828368510PageDraft.js
index 4a6818912..a5cc88b26 100644
--- a/packages/backend/migration/1668828368510PageDraft.js
+++ b/packages/backend/migration/1668828368510PageDraft.js
@@ -1,8 +1,10 @@
 export class Page1668828368510 {
 	async up(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "page" ADD "isPublic" boolean NOT NULL DEFAULT true`);
+		await queryRunner.query(
+			`ALTER TABLE "page" ADD "isPublic" boolean NOT NULL DEFAULT true`,
+		);
 	}
 	async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "isPublic"`);
+		await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "isPublic"`);
 	}
 }
diff --git a/packages/backend/migration/1668831378728FixCalckeyAgain.js b/packages/backend/migration/1668831378728FixCalckeyAgain.js
index d5e67a48c..c65dd54cd 100644
--- a/packages/backend/migration/1668831378728FixCalckeyAgain.js
+++ b/packages/backend/migration/1668831378728FixCalckeyAgain.js
@@ -1,11 +1,15 @@
 export class FixCalckeyAgain1668831378728 {
-		name = 'FixCalckeyAgain1668831378728'
+	name = "FixCalckeyAgain1668831378728";
 
 	async up(queryRunner) {
-		await queryRunner.query(`UPDATE "meta" SET "useStarForReactionFallback" = TRUE`);
+		await queryRunner.query(
+			`UPDATE "meta" SET "useStarForReactionFallback" = TRUE`,
+		);
 	}
 
 	async down(queryRunner) {
-		await queryRunner.query(`UPDATE "meta" SET "useStarForReactionFallback" = FALSE`);
+		await queryRunner.query(
+			`UPDATE "meta" SET "useStarForReactionFallback" = FALSE`,
+		);
 	}
 }
diff --git a/packages/backend/migration/1669138716634-whetherPushNotifyToSendReadMessage.js b/packages/backend/migration/1669138716634-whetherPushNotifyToSendReadMessage.js
index 2265b0061..101972a68 100644
--- a/packages/backend/migration/1669138716634-whetherPushNotifyToSendReadMessage.js
+++ b/packages/backend/migration/1669138716634-whetherPushNotifyToSendReadMessage.js
@@ -1,11 +1,15 @@
 export class whetherPushNotifyToSendReadMessage1669138716634 {
-    name = 'whetherPushNotifyToSendReadMessage1669138716634'
+	name = "whetherPushNotifyToSendReadMessage1669138716634";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "sw_subscription" ADD "sendReadMessage" boolean NOT NULL DEFAULT false`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "sw_subscription" ADD "sendReadMessage" boolean NOT NULL DEFAULT false`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "sw_subscription" DROP COLUMN "sendReadMessage"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "sw_subscription" DROP COLUMN "sendReadMessage"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1669288094000-AddMovedToAndKnownAs.js b/packages/backend/migration/1669288094000-AddMovedToAndKnownAs.js
index 8b3c770ac..c34764e0b 100644
--- a/packages/backend/migration/1669288094000-AddMovedToAndKnownAs.js
+++ b/packages/backend/migration/1669288094000-AddMovedToAndKnownAs.js
@@ -1,16 +1,21 @@
 export class addMovedToAndKnownAs1669288094000 {
-	name = 'addMovedToAndKnownAs1669288094000'
+	name = "addMovedToAndKnownAs1669288094000";
 
 	async up(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "user" ADD "movedToUri" character varying(512)`);
-			await queryRunner.query(`ALTER TABLE "user" ADD "alsoKnownAs" TEXT`);
-			await queryRunner.query(`COMMENT ON COLUMN "user"."movedToUri" IS 'The URI of the new account of the User'`);
-			await queryRunner.query(`COMMENT ON COLUMN "user"."alsoKnownAs" IS 'URIs the user is known as too'`);
+		await queryRunner.query(
+			`ALTER TABLE "user" ADD "movedToUri" character varying(512)`,
+		);
+		await queryRunner.query(`ALTER TABLE "user" ADD "alsoKnownAs" TEXT`);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."movedToUri" IS 'The URI of the new account of the User'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "user"."alsoKnownAs" IS 'URIs the user is known as too'`,
+		);
 	}
 
 	async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "movedToUri"`);
-			await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "alsoKnownAs"`);
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "movedToUri"`);
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "alsoKnownAs"`);
 	}
-
 }
diff --git a/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js b/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js
index 68f560b47..96ed8e1d6 100644
--- a/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js
+++ b/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js
@@ -1,12 +1,18 @@
 export class addFkAbuseUserReportTargetUserIdToUserId1671199573000 {
-	name = 'addFkAbuseUserReportTargetUserIdToUserId1671199573000'
+	name = "addFkAbuseUserReportTargetUserIdToUserId1671199573000";
 
 	async up(queryRunner) {
-			await queryRunner.query(`DELETE FROM abuse_user_report WHERE NOT EXISTS (SELECT 1 FROM "user" WHERE "user"."id" = "abuse_user_report"."targetUserId")`);
-			await queryRunner.query(`ALTER TABLE abuse_user_report ADD CONSTRAINT fk_7f4e851a35d81b64dda28eee0 FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE`);
+		await queryRunner.query(
+			`DELETE FROM abuse_user_report WHERE NOT EXISTS (SELECT 1 FROM "user" WHERE "user"."id" = "abuse_user_report"."targetUserId")`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE abuse_user_report ADD CONSTRAINT fk_7f4e851a35d81b64dda28eee0 FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE`,
+		);
 	}
 
 	async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE abuse_user_report DROP CONSTRAINT fk_7f4e851a35d81b64dda28eee0`);
+		await queryRunner.query(
+			`ALTER TABLE abuse_user_report DROP CONSTRAINT fk_7f4e851a35d81b64dda28eee0`,
+		);
 	}
 }
diff --git a/packages/backend/migration/1671388343000-CalckeyRepoMove.js b/packages/backend/migration/1671388343000-CalckeyRepoMove.js
index df933bcb9..60550f044 100644
--- a/packages/backend/migration/1671388343000-CalckeyRepoMove.js
+++ b/packages/backend/migration/1671388343000-CalckeyRepoMove.js
@@ -1,15 +1,23 @@
 /* "CalckeyRepoMove1671388343000" is a class that updates the "useStarForReactionFallback" column in
 the "meta" table to TRUE */
 export class CalckeyRepoMove1671388343000 {
-	name = 'CalckeyRepoMove1671388343000'
+	name = "CalckeyRepoMove1671388343000";
 
 	async up(queryRunner) {
-		await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`);
-		await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`);
+		await queryRunner.query(
+			`UPDATE meta SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`,
+		);
+		await queryRunner.query(
+			`UPDATE meta SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`,
+		);
 	}
 
 	async down(queryRunner) {
-		await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`);
-		await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`);
+		await queryRunner.query(
+			`UPDATE meta SET "repositoryUrl" = 'https://codeberg/calckey/calckey'`,
+		);
+		await queryRunner.query(
+			`UPDATE meta SET "feedbackUrl" = 'https://codeberg/calckey/calckey/issues'`,
+		);
 	}
 }
diff --git a/packages/backend/migration/1672882664294-DefaultReaction.js b/packages/backend/migration/1672882664294-DefaultReaction.js
index 498a1810d..6ce1146ec 100644
--- a/packages/backend/migration/1672882664294-DefaultReaction.js
+++ b/packages/backend/migration/1672882664294-DefaultReaction.js
@@ -1,9 +1,13 @@
 export class DefaultReaction1672882664294 {
-	name = 'DefaultReaction1672882664294'
+	name = "DefaultReaction1672882664294";
 
 	async up(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "meta" ADD "defaultReaction" character varying(256) NOT NULL DEFAULT '⭐'`);
-		await queryRunner.query(`COMMENT ON COLUMN "meta"."defaultReaction" IS 'The fallback reaction for emoji reacts'`);
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "defaultReaction" character varying(256) NOT NULL DEFAULT '⭐'`,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."defaultReaction" IS 'The fallback reaction for emoji reacts'`,
+		);
 	}
 
 	async down(queryRunner) {
diff --git a/packages/backend/migration/1673336077243-PollChoiceLength.js b/packages/backend/migration/1673336077243-PollChoiceLength.js
index 13db7dd96..a0e335016 100644
--- a/packages/backend/migration/1673336077243-PollChoiceLength.js
+++ b/packages/backend/migration/1673336077243-PollChoiceLength.js
@@ -1,11 +1,15 @@
 export class PollChoiceLength1673336077243 {
-	name = 'PollChoiceLength1673336077243'
+	name = "PollChoiceLength1673336077243";
 
 	async up(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "poll" ALTER COLUMN "choices" TYPE character varying(256) array`);
+		await queryRunner.query(
+			`ALTER TABLE "poll" ALTER COLUMN "choices" TYPE character varying(256) array`,
+		);
 	}
 
 	async down(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "poll" ALTER COLUMN "choices" TYPE character varying(128) array`);
+		await queryRunner.query(
+			`ALTER TABLE "poll" ALTER COLUMN "choices" TYPE character varying(128) array`,
+		);
 	}
 }
diff --git a/packages/backend/migration/1676093997212-AntennaInstances.js b/packages/backend/migration/1676093997212-AntennaInstances.js
index 7553e1255..ffd428f7d 100644
--- a/packages/backend/migration/1676093997212-AntennaInstances.js
+++ b/packages/backend/migration/1676093997212-AntennaInstances.js
@@ -1,17 +1,27 @@
 export class AntennaInstances1676093997212 {
-    name = 'AntennaInstances1676093997212'
+	name = "AntennaInstances1676093997212";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TYPE "antenna_src_enum" ADD VALUE 'instances'`);
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "instances" jsonb NOT NULL DEFAULT '[]'`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TYPE "antenna_src_enum" ADD VALUE 'instances'`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ADD "instances" jsonb NOT NULL DEFAULT '[]'`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`DELETE FROM "antenna" WHERE "src" = 'instances'`);
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "instances"`);
-        await queryRunner.query(`CREATE TYPE "public"."antenna_src_enum_old" AS ENUM('home', 'all', 'users', 'list', 'group')`);
-        await queryRunner.query(`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "public"."antenna_src_enum_old" USING "src"::"text"::"public"."antenna_src_enum_old"`);
-        await queryRunner.query(`DROP TYPE "public"."antenna_src_enum"`);
-        await queryRunner.query(`ALTER TYPE "public"."antenna_src_enum_old" RENAME TO "antenna_src_enum"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(`DELETE FROM "antenna" WHERE "src" = 'instances'`);
+		await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "instances"`);
+		await queryRunner.query(
+			`CREATE TYPE "public"."antenna_src_enum_old" AS ENUM('home', 'all', 'users', 'list', 'group')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "public"."antenna_src_enum_old" USING "src"::"text"::"public"."antenna_src_enum_old"`,
+		);
+		await queryRunner.query(`DROP TYPE "public"."antenna_src_enum"`);
+		await queryRunner.query(
+			`ALTER TYPE "public"."antenna_src_enum_old" RENAME TO "antenna_src_enum"`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1677935903517-DriveComment.js b/packages/backend/migration/1677935903517-DriveComment.js
index 41c7556f0..571958f29 100644
--- a/packages/backend/migration/1677935903517-DriveComment.js
+++ b/packages/backend/migration/1677935903517-DriveComment.js
@@ -1,11 +1,15 @@
 export class DriveComment1677935903517 {
-    name = 'DriveComment1677935903517'
+	name = "DriveComment1677935903517";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "drive_file" ALTER "comment" TYPE character varying(8192)`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ALTER "comment" TYPE character varying(8192)`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "drive_file" ALTER "comment" TYPE character varying(512)`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ALTER "comment" TYPE character varying(512)`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1678945242650-add-props-for-custom-emoji.js b/packages/backend/migration/1678945242650-add-props-for-custom-emoji.js
index 656a92177..f3de7ce27 100644
--- a/packages/backend/migration/1678945242650-add-props-for-custom-emoji.js
+++ b/packages/backend/migration/1678945242650-add-props-for-custom-emoji.js
@@ -1,11 +1,13 @@
 export class addPropsForCustomEmoji1678945242650 {
-    name = 'addPropsForCustomEmoji1678945242650'
+	name = "addPropsForCustomEmoji1678945242650";
 
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "emoji" ADD "license" character varying(1024)`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(
+			`ALTER TABLE "emoji" ADD "license" character varying(1024)`,
+		);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "license"`);
-    }
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "license"`);
+	}
 }
diff --git a/packages/backend/migration/1679269929000-fix-repo.js b/packages/backend/migration/1679269929000-fix-repo.js
index 6784b3793..3571da4f5 100644
--- a/packages/backend/migration/1679269929000-fix-repo.js
+++ b/packages/backend/migration/1679269929000-fix-repo.js
@@ -1,13 +1,21 @@
 export class FixRepo1679269929000 {
-	name = 'FixRepo1679269929000'
+	name = "FixRepo1679269929000";
 
 	async up(queryRunner) {
-		await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/calckey/calckey'`);
-		await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/calckey/calckey/issues'`);
+		await queryRunner.query(
+			`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/calckey/calckey'`,
+		);
+		await queryRunner.query(
+			`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/calckey/calckey/issues'`,
+		);
 	}
 
 	async down(queryRunner) {
-		await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/calckey/calckey'`);
-		await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/calckey/calckey/issues'`);
+		await queryRunner.query(
+			`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/calckey/calckey'`,
+		);
+		await queryRunner.query(
+			`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/calckey/calckey/issues'`,
+		);
 	}
 }
diff --git a/packages/backend/migration/1680375641101-clean-charts.js b/packages/backend/migration/1680375641101-clean-charts.js
index c125f43a3..bfb8aa9d9 100644
--- a/packages/backend/migration/1680375641101-clean-charts.js
+++ b/packages/backend/migration/1680375641101-clean-charts.js
@@ -1,17 +1,25 @@
 export class CleanCharts1680375641101 {
-		constructor() {
-				this.name = 'CleanCharts1680375641101';
-		}
-		async up(queryRunner) {
-				await queryRunner.query(`delete from __chart__hashtag where ___local_users = 0 and ___remote_users = 0;`);
-				await queryRunner.query(`delete from __chart_day__hashtag where ___local_users = 0 and ___remote_users = 0;`);
-				await queryRunner.query(`COMMIT;`);
-				await queryRunner.query(`vacuum __chart__hashtag;`);
-				await queryRunner.query(`vacuum __chart_day__hashtag;`);
-				await queryRunner.query(`COMMIT;`);
-		}
-		async down(queryRunner) {
-			await queryRunner.query(`delete from __chart__hashtag where ___local_users = 0 and ___remote_users = 0;`);
-			await queryRunner.query(`delete from __chart_day__hashtag where ___local_users = 0 and ___remote_users = 0;`);
-		}
+	constructor() {
+		this.name = "CleanCharts1680375641101";
+	}
+	async up(queryRunner) {
+		await queryRunner.query(
+			`delete from __chart__hashtag where ___local_users = 0 and ___remote_users = 0;`,
+		);
+		await queryRunner.query(
+			`delete from __chart_day__hashtag where ___local_users = 0 and ___remote_users = 0;`,
+		);
+		await queryRunner.query(`COMMIT;`);
+		await queryRunner.query(`vacuum __chart__hashtag;`);
+		await queryRunner.query(`vacuum __chart_day__hashtag;`);
+		await queryRunner.query(`COMMIT;`);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(
+			`delete from __chart__hashtag where ___local_users = 0 and ___remote_users = 0;`,
+		);
+		await queryRunner.query(
+			`delete from __chart_day__hashtag where ___local_users = 0 and ___remote_users = 0;`,
+		);
+	}
 }
diff --git a/packages/backend/migration/1680426269172-SpeakAsCat.js b/packages/backend/migration/1680426269172-SpeakAsCat.js
index 3655e2726..375098542 100644
--- a/packages/backend/migration/1680426269172-SpeakAsCat.js
+++ b/packages/backend/migration/1680426269172-SpeakAsCat.js
@@ -1,20 +1,20 @@
 export class SpeakAsCat1680426269172 {
-    name = 'SpeakAsCat1680426269172'
+	name = "SpeakAsCat1680426269172";
 
-    async up(queryRunner) {
-        await queryRunner.query(`
+	async up(queryRunner) {
+		await queryRunner.query(`
             ALTER TABLE "user"
             ADD "speakAsCat" boolean NOT NULL DEFAULT true
         `);
-        await queryRunner.query(`
+		await queryRunner.query(`
             COMMENT ON COLUMN "user"."speakAsCat"
 						IS 'Whether to speak as a cat if isCat.'
         `);
-    }
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`
+	async down(queryRunner) {
+		await queryRunner.query(`
             ALTER TABLE "user" DROP COLUMN "speakAsCat"
         `);
-    }
+	}
 }
diff --git a/packages/backend/native-utils/__test__/index.spec.mjs b/packages/backend/native-utils/__test__/index.spec.mjs
index 1ade4cafe..0d41e012d 100644
--- a/packages/backend/native-utils/__test__/index.spec.mjs
+++ b/packages/backend/native-utils/__test__/index.spec.mjs
@@ -1,7 +1,7 @@
-import test from 'ava'
+import test from "ava";
 
-import { sum } from '../index.js'
+import { sum } from "../index.js";
 
-test('sum from native', (t) => {
-  t.is(sum(1, 2), 3)
-})
+test("sum from native", (t) => {
+	t.is(sum(1, 2), 3);
+});
diff --git a/packages/backend/ormconfig.js b/packages/backend/ormconfig.js
index a4e903aba..5f85cead8 100644
--- a/packages/backend/ormconfig.js
+++ b/packages/backend/ormconfig.js
@@ -1,9 +1,9 @@
-import { DataSource } from 'typeorm';
-import config from './built/config/index.js';
-import { entities } from './built/db/postgre.js';
+import { DataSource } from "typeorm";
+import config from "./built/config/index.js";
+import { entities } from "./built/db/postgre.js";
 
 export default new DataSource({
-	type: 'postgres',
+	type: "postgres",
 	host: config.db.host,
 	port: config.db.port,
 	username: config.db.user,
@@ -11,5 +11,5 @@ export default new DataSource({
 	database: config.db.db,
 	extra: config.db.extra,
 	entities: entities,
-	migrations: ['migration/*.js'],
+	migrations: ["migration/*.js"],
 });
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 57a3ce4dc..3bedd1af3 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -290,8 +290,8 @@ import * as ep___resetDb from "./endpoints/reset-db.js";
 import * as ep___resetPassword from "./endpoints/reset-password.js";
 import * as ep___serverInfo from "./endpoints/server-info.js";
 import * as ep___stats from "./endpoints/stats.js";
-import * as ep___sw_show_registration from './endpoints/sw/show-registration.js';
-import * as ep___sw_update_registration from './endpoints/sw/update-registration.js';
+import * as ep___sw_show_registration from "./endpoints/sw/show-registration.js";
+import * as ep___sw_update_registration from "./endpoints/sw/update-registration.js";
 import * as ep___sw_register from "./endpoints/sw/register.js";
 import * as ep___sw_unregister from "./endpoints/sw/unregister.js";
 import * as ep___test from "./endpoints/test.js";
@@ -639,8 +639,8 @@ const eps = [
 	["stats", ep___stats],
 	["sw/register", ep___sw_register],
 	["sw/unregister", ep___sw_unregister],
-	['sw/show-registration', ep___sw_show_registration],
-	['sw/update-registration', ep___sw_update_registration],
+	["sw/show-registration", ep___sw_show_registration],
+	["sw/update-registration", ep___sw_update_registration],
 	["test", ep___test],
 	["username/available", ep___username_available],
 	["users", ep___users],
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 d3a39acd2..f7e79b64b 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -209,11 +209,11 @@ export default define(meta, paramDef, async (ps, me) => {
 	}
 
 	if (Array.isArray(ps.blockedHosts)) {
-		let lastValue = '';
-		set.blockedHosts = ps.blockedHosts.sort().filter(h => {
+		let lastValue = "";
+		set.blockedHosts = ps.blockedHosts.sort().filter((h) => {
 			const lv = lastValue;
 			lastValue = h;
-			return h !== '' && h !== lv;
+			return h !== "" && h !== lv;
 		});
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
index 584a6ce02..a7aaf9b8f 100644
--- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -98,7 +98,7 @@ export default define(meta, paramDef, async (ps, user) => {
 			activeUsersChart.read(user);
 		}
 	});
-	
+
 	// We fetch more than requested because some may be filtered out, and if there's less than
 	// requested, the pagination stops.
 	const found = [];
@@ -106,7 +106,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	let skip = 0;
 	while (found.length < ps.limit) {
 		const notes = await query.take(take).skip(skip).getMany();
-		found.push(...await Notes.packMany(notes, user))
+		found.push(...(await Notes.packMany(notes, user)));
 		skip += take;
 		if (notes.length < take) break;
 	}
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 78846861a..af9f670d9 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -162,7 +162,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	let skip = 0;
 	while (found.length < ps.limit) {
 		const notes = await query.take(take).skip(skip).getMany();
-		found.push(...await Notes.packMany(notes, user))
+		found.push(...(await Notes.packMany(notes, user)));
 		skip += take;
 		if (notes.length < take) break;
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index fead87738..e1e8a9ae2 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -136,7 +136,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	let skip = 0;
 	while (found.length < ps.limit) {
 		const notes = await query.take(take).skip(skip).getMany();
-		found.push(...await Notes.packMany(notes, user))
+		found.push(...(await Notes.packMany(notes, user)));
 		skip += take;
 		if (notes.length < take) break;
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts
index 7ffe83e5c..68688b504 100644
--- a/packages/backend/src/server/api/endpoints/notes/mentions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts
@@ -86,7 +86,6 @@ export default define(meta, paramDef, async (ps, user) => {
 		query.setParameters(followingQuery.getParameters());
 	}
 
-
 	// We fetch more than requested because some may be filtered out, and if there's less than
 	// requested, the pagination stops.
 	const found = [];
@@ -94,7 +93,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	let skip = 0;
 	while (found.length < ps.limit) {
 		const notes = await query.take(take).skip(skip).getMany();
-		found.push(...await Notes.packMany(notes, user))
+		found.push(...(await Notes.packMany(notes, user)));
 		skip += take;
 		if (notes.length < take) break;
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
index c73114de6..e009233c4 100644
--- a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
@@ -139,7 +139,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	let skip = 0;
 	while (found.length < ps.limit) {
 		const notes = await query.take(take).skip(skip).getMany();
-		found.push(...await Notes.packMany(notes, user))
+		found.push(...(await Notes.packMany(notes, user)));
 		skip += take;
 		if (notes.length < take) break;
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index 60d398088..f313616be 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -81,7 +81,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	let skip = 0;
 	while (found.length < ps.limit) {
 		const notes = await query.take(take).skip(skip).getMany();
-		found.push(...await Notes.packMany(notes, user))
+		found.push(...(await Notes.packMany(notes, user)));
 		skip += take;
 		if (notes.length < take) break;
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/replies.ts b/packages/backend/src/server/api/endpoints/notes/replies.ts
index 94a752a64..5ea4d479c 100644
--- a/packages/backend/src/server/api/endpoints/notes/replies.ts
+++ b/packages/backend/src/server/api/endpoints/notes/replies.ts
@@ -65,7 +65,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	let skip = 0;
 	while (found.length < ps.limit) {
 		const notes = await query.take(take).skip(skip).getMany();
-		found.push(...await Notes.packMany(notes, user))
+		found.push(...(await Notes.packMany(notes, user)));
 		skip += take;
 		if (notes.length < take) break;
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
index f1cae78ba..f988acaa5 100644
--- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
@@ -152,7 +152,7 @@ export default define(meta, paramDef, async (ps, me) => {
 	let skip = 0;
 	while (found.length < ps.limit) {
 		const notes = await query.take(take).skip(skip).getMany();
-		found.push(...await Notes.packMany(notes, me))
+		found.push(...(await Notes.packMany(notes, me)));
 		skip += take;
 		if (notes.length < take) break;
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index e79f6b589..0d6ec2f46 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -154,7 +154,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	let skip = 0;
 	while (found.length < ps.limit) {
 		const notes = await query.take(take).skip(skip).getMany();
-		found.push(...await Notes.packMany(notes, user))
+		found.push(...(await Notes.packMany(notes, user)));
 		skip += take;
 		if (notes.length < take) break;
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index 1123a33ae..03f5cee3f 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -151,7 +151,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	let skip = 0;
 	while (found.length < ps.limit) {
 		const notes = await query.take(take).skip(skip).getMany();
-		found.push(...await Notes.packMany(notes, user))
+		found.push(...(await Notes.packMany(notes, user)));
 		skip += take;
 		if (notes.length < take) break;
 	}
diff --git a/packages/backend/src/server/api/endpoints/sw/register.ts b/packages/backend/src/server/api/endpoints/sw/register.ts
index d2b805d97..42a35fb68 100644
--- a/packages/backend/src/server/api/endpoints/sw/register.ts
+++ b/packages/backend/src/server/api/endpoints/sw/register.ts
@@ -27,16 +27,19 @@ export const meta = {
 				nullable: true,
 			},
 			userId: {
-				type: 'string',
-				optional: false, nullable: false,
+				type: "string",
+				optional: false,
+				nullable: false,
 			},
 			endpoint: {
-				type: 'string',
-				optional: false, nullable: false,
+				type: "string",
+				optional: false,
+				nullable: false,
 			},
 			sendReadMessage: {
-				type: 'boolean',
-				optional: false, nullable: false,
+				type: "boolean",
+				optional: false,
+				nullable: false,
 			},
 		},
 	},
@@ -48,7 +51,7 @@ export const paramDef = {
 		endpoint: { type: "string" },
 		auth: { type: "string" },
 		publickey: { type: "string" },
-		sendReadMessage: { type: 'boolean', default: false },
+		sendReadMessage: { type: "boolean", default: false },
 	},
 	required: ["endpoint", "auth", "publickey"],
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/sw/show-registration.ts b/packages/backend/src/server/api/endpoints/sw/show-registration.ts
index 25eb53f52..c7a9609cf 100644
--- a/packages/backend/src/server/api/endpoints/sw/show-registration.ts
+++ b/packages/backend/src/server/api/endpoints/sw/show-registration.ts
@@ -1,39 +1,43 @@
-import { SwSubscriptions } from '@/models/index.js';
+import { SwSubscriptions } from "@/models/index.js";
 import define from "../../define.js";
 
 export const meta = {
-	tags: ['account'],
+	tags: ["account"],
 
 	requireCredential: true,
 
-	description: 'Check push notification registration exists.',
+	description: "Check push notification registration exists.",
 
 	res: {
-		type: 'object',
-		optional: false, nullable: true,
+		type: "object",
+		optional: false,
+		nullable: true,
 		properties: {
 			userId: {
-				type: 'string',
-				optional: false, nullable: false,
+				type: "string",
+				optional: false,
+				nullable: false,
 			},
 			endpoint: {
-				type: 'string',
-				optional: false, nullable: false,
+				type: "string",
+				optional: false,
+				nullable: false,
 			},
 			sendReadMessage: {
-				type: 'boolean',
-				optional: false, nullable: false,
+				type: "boolean",
+				optional: false,
+				nullable: false,
 			},
 		},
 	},
 } as const;
 
 export const paramDef = {
-	type: 'object',
+	type: "object",
 	properties: {
-		endpoint: { type: 'string' },
+		endpoint: { type: "string" },
 	},
-	required: ['endpoint'],
+	required: ["endpoint"],
 } as const;
 
 // eslint-disable-next-line import/no-default-export
diff --git a/packages/backend/src/server/api/endpoints/sw/update-registration.ts b/packages/backend/src/server/api/endpoints/sw/update-registration.ts
index 0b0a56d49..5ba53ee8a 100644
--- a/packages/backend/src/server/api/endpoints/sw/update-registration.ts
+++ b/packages/backend/src/server/api/endpoints/sw/update-registration.ts
@@ -13,7 +13,7 @@ export const paramDef = {
 	type: "object",
 	properties: {
 		endpoint: { type: "string" },
-		sendReadMessage: { type: 'boolean' },
+		sendReadMessage: { type: "boolean" },
 	},
 	required: ["endpoint"],
 } as const;
diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index bfc373e58..b8e423165 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -24,7 +24,10 @@ import discord from "./service/discord.js";
 import github from "./service/github.js";
 import twitter from "./service/twitter.js";
 import { koaBody } from "koa-body";
-import { convertId, IdConvertType as IdType } from "../../../native-utils/built/index.js";
+import {
+	convertId,
+	IdConvertType as IdType,
+} from "../../../native-utils/built/index.js";
 
 // re-export native rust id conversion (function and enum)
 export { IdType, convertId };
diff --git a/packages/backend/src/services/push-notification.ts b/packages/backend/src/services/push-notification.ts
index a3abaf769..a207fae39 100644
--- a/packages/backend/src/services/push-notification.ts
+++ b/packages/backend/src/services/push-notification.ts
@@ -63,12 +63,16 @@ export async function pushNotification<T extends keyof pushNotificationsTypes>(
 	});
 
 	for (const subscription of subscriptions) {
-		if ([
-			'readNotifications',
-			'readAllNotifications',
-			'readAllMessagingMessages',
-			'readAllMessagingMessagesOfARoom',
-		].includes(type) && !subscription.sendReadMessage) continue;
+		if (
+			[
+				"readNotifications",
+				"readAllNotifications",
+				"readAllMessagingMessages",
+				"readAllMessagingMessagesOfARoom",
+			].includes(type) &&
+			!subscription.sendReadMessage
+		)
+			continue;
 
 		const pushSubscription = {
 			endpoint: subscription.endpoint,
diff --git a/packages/backend/test/activitypub.ts b/packages/backend/test/activitypub.ts
index f4ae27e5e..7b6f85f5a 100644
--- a/packages/backend/test/activitypub.ts
+++ b/packages/backend/test/activitypub.ts
@@ -1,42 +1,44 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import rndstr from 'rndstr';
-import { initDb } from '../src/db/postgre.js';
-import { initTestDb } from './utils.js';
+import * as assert from "assert";
+import rndstr from "rndstr";
+import { initDb } from "../src/db/postgre.js";
+import { initTestDb } from "./utils.js";
 
-describe('ActivityPub', () => {
+describe("ActivityPub", () => {
 	before(async () => {
 		//await initTestDb();
 		await initDb();
 	});
 
-	describe('Parse minimum object', () => {
-		const host = 'https://host1.test';
-		const preferredUsername = `${rndstr('A-Z', 4)}${rndstr('a-z', 4)}`;
+	describe("Parse minimum object", () => {
+		const host = "https://host1.test";
+		const preferredUsername = `${rndstr("A-Z", 4)}${rndstr("a-z", 4)}`;
 		const actorId = `${host}/users/${preferredUsername.toLowerCase()}`;
 
 		const actor = {
-			'@context': 'https://www.w3.org/ns/activitystreams',
+			"@context": "https://www.w3.org/ns/activitystreams",
 			id: actorId,
-			type: 'Person',
+			type: "Person",
 			preferredUsername,
 			inbox: `${actorId}/inbox`,
 			outbox: `${actorId}/outbox`,
 		};
 
 		const post = {
-			'@context': 'https://www.w3.org/ns/activitystreams',
-			id: `${host}/users/${rndstr('0-9a-z', 8)}`,
-			type: 'Note',
+			"@context": "https://www.w3.org/ns/activitystreams",
+			id: `${host}/users/${rndstr("0-9a-z", 8)}`,
+			type: "Note",
 			attributedTo: actor.id,
-			to: 'https://www.w3.org/ns/activitystreams#Public',
-			content: 'あ',
+			to: "https://www.w3.org/ns/activitystreams#Public",
+			content: "あ",
 		};
 
-		it('Minimum Actor', async () => {
-			const { MockResolver } = await import('./misc/mock-resolver.js');
-			const { createPerson } = await import('../src/remote/activitypub/models/person.js');
+		it("Minimum Actor", async () => {
+			const { MockResolver } = await import("./misc/mock-resolver.js");
+			const { createPerson } = await import(
+				"../src/remote/activitypub/models/person.js"
+			);
 
 			const resolver = new MockResolver();
 			resolver._register(actor.id, actor);
@@ -48,9 +50,11 @@ describe('ActivityPub', () => {
 			assert.deepStrictEqual(user.inbox, actor.inbox);
 		});
 
-		it('Minimum Note', async () => {
-			const { MockResolver } = await import('./misc/mock-resolver.js');
-			const { createNote } = await import('../src/remote/activitypub/models/note.js');
+		it("Minimum Note", async () => {
+			const { MockResolver } = await import("./misc/mock-resolver.js");
+			const { createNote } = await import(
+				"../src/remote/activitypub/models/note.js"
+			);
 
 			const resolver = new MockResolver();
 			resolver._register(actor.id, actor);
@@ -59,31 +63,33 @@ describe('ActivityPub', () => {
 			const note = await createNote(post.id, resolver, true);
 
 			assert.deepStrictEqual(note?.uri, post.id);
-			assert.deepStrictEqual(note.visibility, 'public');
+			assert.deepStrictEqual(note.visibility, "public");
 			assert.deepStrictEqual(note.text, post.content);
 		});
 	});
 
-	describe('Truncate long name', () => {
-		const host = 'https://host1.test';
-		const preferredUsername = `${rndstr('A-Z', 4)}${rndstr('a-z', 4)}`;
+	describe("Truncate long name", () => {
+		const host = "https://host1.test";
+		const preferredUsername = `${rndstr("A-Z", 4)}${rndstr("a-z", 4)}`;
 		const actorId = `${host}/users/${preferredUsername.toLowerCase()}`;
 
-		const name = rndstr('0-9a-z', 129);
+		const name = rndstr("0-9a-z", 129);
 
 		const actor = {
-			'@context': 'https://www.w3.org/ns/activitystreams',
+			"@context": "https://www.w3.org/ns/activitystreams",
 			id: actorId,
-			type: 'Person',
+			type: "Person",
 			preferredUsername,
 			name,
 			inbox: `${actorId}/inbox`,
 			outbox: `${actorId}/outbox`,
 		};
 
-		it('Actor', async () => {
-			const { MockResolver } = await import('./misc/mock-resolver.js');
-			const { createPerson } = await import('../src/remote/activitypub/models/person.js');
+		it("Actor", async () => {
+			const { MockResolver } = await import("./misc/mock-resolver.js");
+			const { createPerson } = await import(
+				"../src/remote/activitypub/models/person.js"
+			);
 
 			const resolver = new MockResolver();
 			resolver._register(actor.id, actor);
diff --git a/packages/backend/test/ap-request.ts b/packages/backend/test/ap-request.ts
index 744b2f2c9..bf77a3853 100644
--- a/packages/backend/test/ap-request.ts
+++ b/packages/backend/test/ap-request.ts
@@ -1,53 +1,73 @@
-import * as assert from 'assert';
-import httpSignature from '@peertube/http-signature';
-import { genRsaKeyPair } from '../src/misc/gen-key-pair.js';
-import { createSignedPost, createSignedGet } from '../src/remote/activitypub/ap-request.js';
+import * as assert from "assert";
+import httpSignature from "@peertube/http-signature";
+import { genRsaKeyPair } from "../src/misc/gen-key-pair.js";
+import {
+	createSignedPost,
+	createSignedGet,
+} from "../src/remote/activitypub/ap-request.js";
 
-export const buildParsedSignature = (signingString: string, signature: string, algorithm: string) => {
+export const buildParsedSignature = (
+	signingString: string,
+	signature: string,
+	algorithm: string,
+) => {
 	return {
-		scheme: 'Signature',
+		scheme: "Signature",
 		params: {
-			keyId: 'KeyID',	// dummy, not used for verify
+			keyId: "KeyID", // dummy, not used for verify
 			algorithm: algorithm,
-			headers: [ '(request-target)', 'date', 'host', 'digest' ],	// dummy, not used for verify
+			headers: ["(request-target)", "date", "host", "digest"], // dummy, not used for verify
 			signature: signature,
 		},
 		signingString: signingString,
 		algorithm: algorithm.toUpperCase(),
-		keyId: 'KeyID',	// dummy, not used for verify
+		keyId: "KeyID", // dummy, not used for verify
 	};
 };
 
-describe('ap-request', () => {
-	it('createSignedPost with verify', async () => {
+describe("ap-request", () => {
+	it("createSignedPost with verify", async () => {
 		const keypair = await genRsaKeyPair();
-		const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
-		const url = 'https://example.com/inbox';
+		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',
+			"User-Agent": "UA",
 		};
 
-		const req = createSignedPost({ key, url, body, additionalHeaders: headers });
+		const req = createSignedPost({
+			key,
+			url,
+			body,
+			additionalHeaders: headers,
+		});
 
-		const parsed = buildParsedSignature(req.signingString, req.signature, 'rsa-sha256');
+		const parsed = buildParsedSignature(
+			req.signingString,
+			req.signature,
+			"rsa-sha256",
+		);
 
 		const result = httpSignature.verifySignature(parsed, keypair.publicKey);
 		assert.deepStrictEqual(result, true);
 	});
 
-	it('createSignedGet with verify', async () => {
+	it("createSignedGet with verify", async () => {
 		const keypair = await genRsaKeyPair();
-		const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
-		const url = 'https://example.com/outbox';
+		const key = { keyId: "x", privateKeyPem: keypair.privateKey };
+		const url = "https://example.com/outbox";
 		const headers = {
-			'User-Agent': 'UA',
+			"User-Agent": "UA",
 		};
 
 		const req = createSignedGet({ key, url, additionalHeaders: headers });
 
-		const parsed = buildParsedSignature(req.signingString, req.signature, 'rsa-sha256');
+		const parsed = buildParsedSignature(
+			req.signingString,
+			req.signature,
+			"rsa-sha256",
+		);
 
 		const result = httpSignature.verifySignature(parsed, keypair.publicKey);
 		assert.deepStrictEqual(result, true);
diff --git a/packages/backend/test/api-visibility.ts b/packages/backend/test/api-visibility.ts
index cde3cd2d0..0ee4a4d33 100644
--- a/packages/backend/test/api-visibility.ts
+++ b/packages/backend/test/api-visibility.ts
@@ -1,10 +1,17 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import * as childProcess from 'child_process';
-import { async, signup, request, post, startServer, shutdownServer } from './utils.js';
+import * as assert from "assert";
+import * as childProcess from "child_process";
+import {
+	async,
+	signup,
+	request,
+	post,
+	startServer,
+	shutdownServer,
+} from "./utils.js";
 
-describe('API visibility', () => {
+describe("API visibility", () => {
 	let p: childProcess.ChildProcess;
 
 	before(async () => {
@@ -15,7 +22,7 @@ describe('API visibility', () => {
 		await shutdownServer(p);
 	});
 
-	describe('Note visibility', async () => {
+	describe("Note visibility", async () => {
 		//#region vars
 		/** ヒロイン */
 		let alice: any;
@@ -60,130 +67,170 @@ describe('API visibility', () => {
 		//#endregion
 
 		const show = async (noteId: any, by: any) => {
-			return await request('/notes/show', {
-				noteId,
-			}, by);
+			return await request(
+				"/notes/show",
+				{
+					noteId,
+				},
+				by,
+			);
 		};
 
 		before(async () => {
 			//#region prepare
 			// signup
-			alice = await signup({ username: 'alice' });
-			follower = await signup({ username: 'follower' });
-			other = await signup({ username: 'other' });
-			target = await signup({ username: 'target' });
-			target2 = await signup({ username: 'target2' });
+			alice = await signup({ username: "alice" });
+			follower = await signup({ username: "follower" });
+			other = await signup({ username: "other" });
+			target = await signup({ username: "target" });
+			target2 = await signup({ username: "target2" });
 
 			// follow alice <= follower
-			await request('/following/create', { userId: alice.id }, follower);
+			await request("/following/create", { userId: alice.id }, follower);
 
 			// normal posts
-			pub = await post(alice, { text: 'x', visibility: 'public' });
-			home = await post(alice, { text: 'x', visibility: 'home' });
-			fol = await post(alice, { text: 'x', visibility: 'followers' });
-			spe = await post(alice, { text: 'x', visibility: 'specified', visibleUserIds: [target.id] });
+			pub = await post(alice, { text: "x", visibility: "public" });
+			home = await post(alice, { text: "x", visibility: "home" });
+			fol = await post(alice, { text: "x", visibility: "followers" });
+			spe = await post(alice, {
+				text: "x",
+				visibility: "specified",
+				visibleUserIds: [target.id],
+			});
 
 			// replies
-			tgt = await post(target, { text: 'y', visibility: 'public' });
-			pubR = await post(alice, { text: 'x', replyId: tgt.id, visibility: 'public' });
-			homeR = await post(alice, { text: 'x', replyId: tgt.id, visibility: 'home' });
-			folR = await post(alice, { text: 'x', replyId: tgt.id, visibility: 'followers' });
-			speR = await post(alice, { text: 'x', replyId: tgt.id, visibility: 'specified' });
+			tgt = await post(target, { text: "y", visibility: "public" });
+			pubR = await post(alice, {
+				text: "x",
+				replyId: tgt.id,
+				visibility: "public",
+			});
+			homeR = await post(alice, {
+				text: "x",
+				replyId: tgt.id,
+				visibility: "home",
+			});
+			folR = await post(alice, {
+				text: "x",
+				replyId: tgt.id,
+				visibility: "followers",
+			});
+			speR = await post(alice, {
+				text: "x",
+				replyId: tgt.id,
+				visibility: "specified",
+			});
 
 			// mentions
-			pubM = await post(alice, { text: '@target x', replyId: tgt.id, visibility: 'public' });
-			homeM = await post(alice, { text: '@target x', replyId: tgt.id, visibility: 'home' });
-			folM = await post(alice, { text: '@target x', replyId: tgt.id, visibility: 'followers' });
-			speM = await post(alice, { text: '@target2 x', replyId: tgt.id, visibility: 'specified' });
+			pubM = await post(alice, {
+				text: "@target x",
+				replyId: tgt.id,
+				visibility: "public",
+			});
+			homeM = await post(alice, {
+				text: "@target x",
+				replyId: tgt.id,
+				visibility: "home",
+			});
+			folM = await post(alice, {
+				text: "@target x",
+				replyId: tgt.id,
+				visibility: "followers",
+			});
+			speM = await post(alice, {
+				text: "@target2 x",
+				replyId: tgt.id,
+				visibility: "specified",
+			});
 			//#endregion
 		});
 
 		//#region show post
 		// public
-		it('[show] public-postを自分が見れる', async(async () => {
+		it("[show] public-postを自分が見れる", async(async () => {
 			const res = await show(pub.id, alice);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] public-postをフォロワーが見れる', async(async () => {
+		it("[show] public-postをフォロワーが見れる", async(async () => {
 			const res = await show(pub.id, follower);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] public-postを非フォロワーが見れる', async(async () => {
+		it("[show] public-postを非フォロワーが見れる", async(async () => {
 			const res = await show(pub.id, other);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] public-postを未認証が見れる', async(async () => {
+		it("[show] public-postを未認証が見れる", async(async () => {
 			const res = await show(pub.id, null);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
 		// home
-		it('[show] home-postを自分が見れる', async(async () => {
+		it("[show] home-postを自分が見れる", async(async () => {
 			const res = await show(home.id, alice);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] home-postをフォロワーが見れる', async(async () => {
+		it("[show] home-postをフォロワーが見れる", async(async () => {
 			const res = await show(home.id, follower);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] home-postを非フォロワーが見れる', async(async () => {
+		it("[show] home-postを非フォロワーが見れる", async(async () => {
 			const res = await show(home.id, other);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] home-postを未認証が見れる', async(async () => {
+		it("[show] home-postを未認証が見れる", async(async () => {
 			const res = await show(home.id, null);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
 		// followers
-		it('[show] followers-postを自分が見れる', async(async () => {
+		it("[show] followers-postを自分が見れる", async(async () => {
 			const res = await show(fol.id, alice);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] followers-postをフォロワーが見れる', async(async () => {
+		it("[show] followers-postをフォロワーが見れる", async(async () => {
 			const res = await show(fol.id, follower);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] followers-postを非フォロワーが見れない', async(async () => {
+		it("[show] followers-postを非フォロワーが見れない", async(async () => {
 			const res = await show(fol.id, other);
 			assert.strictEqual(res.status, 404);
 		}));
 
-		it('[show] followers-postを未認証が見れない', async(async () => {
+		it("[show] followers-postを未認証が見れない", async(async () => {
 			const res = await show(fol.id, null);
 			assert.strictEqual(res.status, 404);
 		}));
 
 		// specified
-		it('[show] specified-postを自分が見れる', async(async () => {
+		it("[show] specified-postを自分が見れる", async(async () => {
 			const res = await show(spe.id, alice);
 			assert.strictEqual(res.status, 404);
 		}));
 
-		it('[show] specified-postを指定ユーザーが見れる', async(async () => {
+		it("[show] specified-postを指定ユーザーが見れる", async(async () => {
 			const res = await show(spe.id, target);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] specified-postをフォロワーが見れない', async(async () => {
+		it("[show] specified-postをフォロワーが見れない", async(async () => {
 			const res = await show(spe.id, follower);
 			assert.strictEqual(res.status, 404);
 		}));
 
-		it('[show] specified-postを非フォロワーが見れない', async(async () => {
+		it("[show] specified-postを非フォロワーが見れない", async(async () => {
 			const res = await show(spe.id, other);
 			assert.strictEqual(res.status, 404);
 		}));
 
-		it('[show] specified-postを未認証が見れない', async(async () => {
+		it("[show] specified-postを未認証が見れない", async(async () => {
 			const res = await show(spe.id, null);
 			assert.strictEqual(res.status, 404);
 		}));
@@ -191,110 +238,110 @@ describe('API visibility', () => {
 
 		//#region show reply
 		// public
-		it('[show] public-replyを自分が見れる', async(async () => {
+		it("[show] public-replyを自分が見れる", async(async () => {
 			const res = await show(pubR.id, alice);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] public-replyをされた人が見れる', async(async () => {
+		it("[show] public-replyをされた人が見れる", async(async () => {
 			const res = await show(pubR.id, target);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] public-replyをフォロワーが見れる', async(async () => {
+		it("[show] public-replyをフォロワーが見れる", async(async () => {
 			const res = await show(pubR.id, follower);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] public-replyを非フォロワーが見れる', async(async () => {
+		it("[show] public-replyを非フォロワーが見れる", async(async () => {
 			const res = await show(pubR.id, other);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] public-replyを未認証が見れる', async(async () => {
+		it("[show] public-replyを未認証が見れる", async(async () => {
 			const res = await show(pubR.id, null);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
 		// home
-		it('[show] home-replyを自分が見れる', async(async () => {
+		it("[show] home-replyを自分が見れる", async(async () => {
 			const res = await show(homeR.id, alice);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] home-replyをされた人が見れる', async(async () => {
+		it("[show] home-replyをされた人が見れる", async(async () => {
 			const res = await show(homeR.id, target);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] home-replyをフォロワーが見れる', async(async () => {
+		it("[show] home-replyをフォロワーが見れる", async(async () => {
 			const res = await show(homeR.id, follower);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] home-replyを非フォロワーが見れる', async(async () => {
+		it("[show] home-replyを非フォロワーが見れる", async(async () => {
 			const res = await show(homeR.id, other);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] home-replyを未認証が見れる', async(async () => {
+		it("[show] home-replyを未認証が見れる", async(async () => {
 			const res = await show(homeR.id, null);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
 		// followers
-		it('[show] followers-replyを自分が見れる', async(async () => {
+		it("[show] followers-replyを自分が見れる", async(async () => {
 			const res = await show(folR.id, alice);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] followers-replyを非フォロワーでもリプライされていれば見れる', async(async () => {
+		it("[show] followers-replyを非フォロワーでもリプライされていれば見れる", async(async () => {
 			const res = await show(folR.id, target);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] followers-replyをフォロワーが見れる', async(async () => {
+		it("[show] followers-replyをフォロワーが見れる", async(async () => {
 			const res = await show(folR.id, follower);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] followers-replyを非フォロワーが見れない', async(async () => {
+		it("[show] followers-replyを非フォロワーが見れない", async(async () => {
 			const res = await show(folR.id, other);
 			assert.strictEqual(res.status, 404);
 		}));
 
-		it('[show] followers-replyを未認証が見れない', async(async () => {
+		it("[show] followers-replyを未認証が見れない", async(async () => {
 			const res = await show(folR.id, null);
 			assert.strictEqual(res.status, 404);
 		}));
 
 		// specified
-		it('[show] specified-replyを自分が見れる', async(async () => {
+		it("[show] specified-replyを自分が見れる", async(async () => {
 			const res = await show(speR.id, alice);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] specified-replyを指定ユーザーが見れる', async(async () => {
+		it("[show] specified-replyを指定ユーザーが見れる", async(async () => {
 			const res = await show(speR.id, target);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] specified-replyをされた人が指定されてなくても見れる', async(async () => {
+		it("[show] specified-replyをされた人が指定されてなくても見れる", async(async () => {
 			const res = await show(speR.id, target);
-			assert.strictEqual(res.body.text, 'x');
+			assert.strictEqual(res.body.text, "x");
 		}));
 
-		it('[show] specified-replyをフォロワーが見れない', async(async () => {
+		it("[show] specified-replyをフォロワーが見れない", async(async () => {
 			const res = await show(speR.id, follower);
 			assert.strictEqual(res.status, 404);
 		}));
 
-		it('[show] specified-replyを非フォロワーが見れない', async(async () => {
+		it("[show] specified-replyを非フォロワーが見れない", async(async () => {
 			const res = await show(speR.id, other);
 			assert.strictEqual(res.status, 404);
 		}));
 
-		it('[show] specified-replyを未認証が見れない', async(async () => {
+		it("[show] specified-replyを未認証が見れない", async(async () => {
 			const res = await show(speR.id, null);
 			assert.strictEqual(res.status, 404);
 		}));
@@ -302,174 +349,186 @@ describe('API visibility', () => {
 
 		//#region show mention
 		// public
-		it('[show] public-mentionを自分が見れる', async(async () => {
+		it("[show] public-mentionを自分が見れる", async(async () => {
 			const res = await show(pubM.id, alice);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
-		it('[show] public-mentionをされた人が見れる', async(async () => {
+		it("[show] public-mentionをされた人が見れる", async(async () => {
 			const res = await show(pubM.id, target);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
-		it('[show] public-mentionをフォロワーが見れる', async(async () => {
+		it("[show] public-mentionをフォロワーが見れる", async(async () => {
 			const res = await show(pubM.id, follower);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
-		it('[show] public-mentionを非フォロワーが見れる', async(async () => {
+		it("[show] public-mentionを非フォロワーが見れる", async(async () => {
 			const res = await show(pubM.id, other);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
-		it('[show] public-mentionを未認証が見れる', async(async () => {
+		it("[show] public-mentionを未認証が見れる", async(async () => {
 			const res = await show(pubM.id, null);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
 		// home
-		it('[show] home-mentionを自分が見れる', async(async () => {
+		it("[show] home-mentionを自分が見れる", async(async () => {
 			const res = await show(homeM.id, alice);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
-		it('[show] home-mentionをされた人が見れる', async(async () => {
+		it("[show] home-mentionをされた人が見れる", async(async () => {
 			const res = await show(homeM.id, target);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
-		it('[show] home-mentionをフォロワーが見れる', async(async () => {
+		it("[show] home-mentionをフォロワーが見れる", async(async () => {
 			const res = await show(homeM.id, follower);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
-		it('[show] home-mentionを非フォロワーが見れる', async(async () => {
+		it("[show] home-mentionを非フォロワーが見れる", async(async () => {
 			const res = await show(homeM.id, other);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
-		it('[show] home-mentionを未認証が見れる', async(async () => {
+		it("[show] home-mentionを未認証が見れる", async(async () => {
 			const res = await show(homeM.id, null);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
 		// followers
-		it('[show] followers-mentionを自分が見れる', async(async () => {
+		it("[show] followers-mentionを自分が見れる", async(async () => {
 			const res = await show(folM.id, alice);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
-		it('[show] followers-mentionをメンションされていれば非フォロワーでも見れる', async(async () => {
+		it("[show] followers-mentionをメンションされていれば非フォロワーでも見れる", async(async () => {
 			const res = await show(folM.id, target);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
-		it('[show] followers-mentionをフォロワーが見れる', async(async () => {
+		it("[show] followers-mentionをフォロワーが見れる", async(async () => {
 			const res = await show(folM.id, follower);
-			assert.strictEqual(res.body.text, '@target x');
+			assert.strictEqual(res.body.text, "@target x");
 		}));
 
-		it('[show] followers-mentionを非フォロワーが見れない', async(async () => {
+		it("[show] followers-mentionを非フォロワーが見れない", async(async () => {
 			const res = await show(folM.id, other);
 			assert.strictEqual(res.status, 404);
 		}));
 
-		it('[show] followers-mentionを未認証が見れない', async(async () => {
+		it("[show] followers-mentionを未認証が見れない", async(async () => {
 			const res = await show(folM.id, null);
 			assert.strictEqual(res.status, 404);
 		}));
 
 		// specified
-		it('[show] specified-mentionを自分が見れる', async(async () => {
+		it("[show] specified-mentionを自分が見れる", async(async () => {
 			const res = await show(speM.id, alice);
-			assert.strictEqual(res.body.text, '@target2 x');
+			assert.strictEqual(res.body.text, "@target2 x");
 		}));
 
-		it('[show] specified-mentionを指定ユーザーが見れる', async(async () => {
+		it("[show] specified-mentionを指定ユーザーが見れる", async(async () => {
 			const res = await show(speM.id, target);
-			assert.strictEqual(res.body.text, '@target2 x');
+			assert.strictEqual(res.body.text, "@target2 x");
 		}));
 
-		it('[show] specified-mentionをされた人が指定されてなかったら見れない', async(async () => {
+		it("[show] specified-mentionをされた人が指定されてなかったら見れない", async(async () => {
 			const res = await show(speM.id, target2);
 			assert.strictEqual(res.status, 404);
 		}));
 
-		it('[show] specified-mentionをフォロワーが見れない', async(async () => {
+		it("[show] specified-mentionをフォロワーが見れない", async(async () => {
 			const res = await show(speM.id, follower);
 			assert.strictEqual(res.status, 404);
 		}));
 
-		it('[show] specified-mentionを非フォロワーが見れない', async(async () => {
+		it("[show] specified-mentionを非フォロワーが見れない", async(async () => {
 			const res = await show(speM.id, other);
 			assert.strictEqual(res.status, 404);
 		}));
 
-		it('[show] specified-mentionを未認証が見れない', async(async () => {
+		it("[show] specified-mentionを未認証が見れない", async(async () => {
 			const res = await show(speM.id, null);
 			assert.strictEqual(res.status, 404);
 		}));
 		//#endregion
 
 		//#region HTL
-		it('[HTL] public-post が 自分が見れる', async(async () => {
-			const res = await request('/notes/timeline', { limit: 100 }, alice);
+		it("[HTL] public-post が 自分が見れる", async(async () => {
+			const res = await request("/notes/timeline", { limit: 100 }, alice);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id == pub.id);
-			assert.strictEqual(notes[0].text, 'x');
+			assert.strictEqual(notes[0].text, "x");
 		}));
 
-		it('[HTL] public-post が 非フォロワーから見れない', async(async () => {
-			const res = await request('/notes/timeline', { limit: 100 }, other);
+		it("[HTL] public-post が 非フォロワーから見れない", async(async () => {
+			const res = await request("/notes/timeline", { limit: 100 }, other);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id == pub.id);
 			assert.strictEqual(notes.length, 0);
 		}));
 
-		it('[HTL] followers-post が フォロワーから見れる', async(async () => {
-			const res = await request('/notes/timeline', { limit: 100 }, follower);
+		it("[HTL] followers-post が フォロワーから見れる", async(async () => {
+			const res = await request("/notes/timeline", { limit: 100 }, follower);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id == fol.id);
-			assert.strictEqual(notes[0].text, 'x');
+			assert.strictEqual(notes[0].text, "x");
 		}));
 		//#endregion
 
 		//#region RTL
-		it('[replies] followers-reply が フォロワーから見れる', async(async () => {
-			const res = await request('/notes/replies', { noteId: tgt.id, limit: 100 }, follower);
+		it("[replies] followers-reply が フォロワーから見れる", async(async () => {
+			const res = await request(
+				"/notes/replies",
+				{ noteId: tgt.id, limit: 100 },
+				follower,
+			);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id == folR.id);
-			assert.strictEqual(notes[0].text, 'x');
+			assert.strictEqual(notes[0].text, "x");
 		}));
 
-		it('[replies] followers-reply が 非フォロワー (リプライ先ではない) から見れない', async(async () => {
-			const res = await request('/notes/replies', { noteId: tgt.id, limit: 100 }, other);
+		it("[replies] followers-reply が 非フォロワー (リプライ先ではない) から見れない", async(async () => {
+			const res = await request(
+				"/notes/replies",
+				{ noteId: tgt.id, limit: 100 },
+				other,
+			);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id == folR.id);
 			assert.strictEqual(notes.length, 0);
 		}));
 
-		it('[replies] followers-reply が 非フォロワー (リプライ先である) から見れる', async(async () => {
-			const res = await request('/notes/replies', { noteId: tgt.id, limit: 100 }, target);
+		it("[replies] followers-reply が 非フォロワー (リプライ先である) から見れる", async(async () => {
+			const res = await request(
+				"/notes/replies",
+				{ noteId: tgt.id, limit: 100 },
+				target,
+			);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id == folR.id);
-			assert.strictEqual(notes[0].text, 'x');
+			assert.strictEqual(notes[0].text, "x");
 		}));
 		//#endregion
 
 		//#region MTL
-		it('[mentions] followers-reply が 非フォロワー (リプライ先である) から見れる', async(async () => {
-			const res = await request('/notes/mentions', { limit: 100 }, target);
+		it("[mentions] followers-reply が 非フォロワー (リプライ先である) から見れる", async(async () => {
+			const res = await request("/notes/mentions", { limit: 100 }, target);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id == folR.id);
-			assert.strictEqual(notes[0].text, 'x');
+			assert.strictEqual(notes[0].text, "x");
 		}));
 
-		it('[mentions] followers-mention が 非フォロワー (メンション先である) から見れる', async(async () => {
-			const res = await request('/notes/mentions', { limit: 100 }, target);
+		it("[mentions] followers-mention が 非フォロワー (メンション先である) から見れる", async(async () => {
+			const res = await request("/notes/mentions", { limit: 100 }, target);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id == folM.id);
-			assert.strictEqual(notes[0].text, '@target x');
+			assert.strictEqual(notes[0].text, "@target x");
 		}));
 		//#endregion
 	});
diff --git a/packages/backend/test/api.ts b/packages/backend/test/api.ts
index b1b2ecafc..19a754552 100644
--- a/packages/backend/test/api.ts
+++ b/packages/backend/test/api.ts
@@ -1,10 +1,19 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import * as childProcess from 'child_process';
-import { async, signup, request, post, react, uploadFile, startServer, shutdownServer } from './utils.js';
+import * as assert from "assert";
+import * as childProcess from "child_process";
+import {
+	async,
+	signup,
+	request,
+	post,
+	react,
+	uploadFile,
+	startServer,
+	shutdownServer,
+} from "./utils.js";
 
-describe('API', () => {
+describe("API", () => {
 	let p: childProcess.ChildProcess;
 	let alice: any;
 	let bob: any;
@@ -12,58 +21,58 @@ describe('API', () => {
 
 	before(async () => {
 		p = await startServer();
-		alice = await signup({ username: 'alice' });
-		bob = await signup({ username: 'bob' });
-		carol = await signup({ username: 'carol' });
+		alice = await signup({ username: "alice" });
+		bob = await signup({ username: "bob" });
+		carol = await signup({ username: "carol" });
 	});
 
 	after(async () => {
 		await shutdownServer(p);
 	});
 
-	describe('General validation', () => {
-		it('wrong type', async(async () => {
-			const res = await request('/test', {
+	describe("General validation", () => {
+		it("wrong type", async(async () => {
+			const res = await request("/test", {
 				required: true,
 				string: 42,
 			});
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('missing require param', async(async () => {
-			const res = await request('/test', {
-				string: 'a',
+		it("missing require param", async(async () => {
+			const res = await request("/test", {
+				string: "a",
 			});
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('invalid misskey:id (empty string)', async(async () => {
-			const res = await request('/test', {
+		it("invalid misskey:id (empty string)", async(async () => {
+			const res = await request("/test", {
 				required: true,
-				id: '',
+				id: "",
 			});
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('valid misskey:id', async(async () => {
-			const res = await request('/test', {
+		it("valid misskey:id", async(async () => {
+			const res = await request("/test", {
 				required: true,
-				id: '8wvhjghbxu',
+				id: "8wvhjghbxu",
 			});
 			assert.strictEqual(res.status, 200);
 		}));
 
-		it('default value', async(async () => {
-			const res = await request('/test', {
+		it("default value", async(async () => {
+			const res = await request("/test", {
 				required: true,
-				string: 'a',
+				string: "a",
 			});
 			assert.strictEqual(res.status, 200);
-			assert.strictEqual(res.body.default, 'hello');
+			assert.strictEqual(res.body.default, "hello");
 		}));
 
-		it('can set null even if it has default value', async(async () => {
-			const res = await request('/test', {
+		it("can set null even if it has default value", async(async () => {
+			const res = await request("/test", {
 				required: true,
 				nullableDefault: null,
 			});
@@ -71,13 +80,13 @@ describe('API', () => {
 			assert.strictEqual(res.body.nullableDefault, null);
 		}));
 
-		it('cannot set undefined if it has default value', async(async () => {
-			const res = await request('/test', {
+		it("cannot set undefined if it has default value", async(async () => {
+			const res = await request("/test", {
 				required: true,
 				nullableDefault: undefined,
 			});
 			assert.strictEqual(res.status, 200);
-			assert.strictEqual(res.body.nullableDefault, 'hello');
+			assert.strictEqual(res.body.nullableDefault, "hello");
 		}));
 	});
 });
diff --git a/packages/backend/test/block.ts b/packages/backend/test/block.ts
index b3343813c..08192e486 100644
--- a/packages/backend/test/block.ts
+++ b/packages/backend/test/block.ts
@@ -1,10 +1,17 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import * as childProcess from 'child_process';
-import { async, signup, request, post, startServer, shutdownServer } from './utils.js';
+import * as assert from "assert";
+import * as childProcess from "child_process";
+import {
+	async,
+	signup,
+	request,
+	post,
+	startServer,
+	shutdownServer,
+} from "./utils.js";
 
-describe('Block', () => {
+describe("Block", () => {
 	let p: childProcess.ChildProcess;
 
 	// alice blocks bob
@@ -14,72 +21,109 @@ describe('Block', () => {
 
 	before(async () => {
 		p = await startServer();
-		alice = await signup({ username: 'alice' });
-		bob = await signup({ username: 'bob' });
-		carol = await signup({ username: 'carol' });
+		alice = await signup({ username: "alice" });
+		bob = await signup({ username: "bob" });
+		carol = await signup({ username: "carol" });
 	});
 
 	after(async () => {
 		await shutdownServer(p);
 	});
 
-	it('Block作成', async(async () => {
-		const res = await request('/blocking/create', {
-			userId: bob.id,
-		}, alice);
+	it("Block作成", async(async () => {
+		const res = await request(
+			"/blocking/create",
+			{
+				userId: bob.id,
+			},
+			alice,
+		);
 
 		assert.strictEqual(res.status, 200);
 	}));
 
-	it('ブロックされているユーザーをフォローできない', async(async () => {
-		const res = await request('/following/create', { userId: alice.id }, bob);
+	it("ブロックされているユーザーをフォローできない", async(async () => {
+		const res = await request("/following/create", { userId: alice.id }, bob);
 
 		assert.strictEqual(res.status, 400);
-		assert.strictEqual(res.body.error.id, 'c4ab57cc-4e41-45e9-bfd9-584f61e35ce0');
+		assert.strictEqual(
+			res.body.error.id,
+			"c4ab57cc-4e41-45e9-bfd9-584f61e35ce0",
+		);
 	}));
 
-	it('ブロックされているユーザーにリアクションできない', async(async () => {
-		const note = await post(alice, { text: 'hello' });
+	it("ブロックされているユーザーにリアクションできない", async(async () => {
+		const note = await post(alice, { text: "hello" });
 
-		const res = await request('/notes/reactions/create', { noteId: note.id, reaction: '👍' }, bob);
+		const res = await request(
+			"/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.strictEqual(
+			res.body.error.id,
+			"20ef5475-9f38-4e4c-bd33-de6d979498ec",
+		);
 	}));
 
-	it('ブロックされているユーザーに返信できない', async(async () => {
-		const note = await post(alice, { text: 'hello' });
+	it("ブロックされているユーザーに返信できない", async(async () => {
+		const note = await post(alice, { text: "hello" });
 
-		const res = await request('/notes/create', { replyId: note.id, text: 'yo' }, bob);
+		const res = await request(
+			"/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.strictEqual(
+			res.body.error.id,
+			"b390d7e1-8a5e-46ed-b625-06271cafd3d3",
+		);
 	}));
 
-	it('ブロックされているユーザーのノートをRenoteできない', async(async () => {
-		const note = await post(alice, { text: 'hello' });
+	it("ブロックされているユーザーのノートをRenoteできない", async(async () => {
+		const note = await post(alice, { text: "hello" });
 
-		const res = await request('/notes/create', { renoteId: note.id, text: 'yo' }, bob);
+		const res = await request(
+			"/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(
+			res.body.error.id,
+			"b390d7e1-8a5e-46ed-b625-06271cafd3d3",
+		);
 	}));
 
 	// TODO: ユーザーリストに入れられないテスト
 
 	// TODO: ユーザーリストから除外されるテスト
 
-	it('タイムライン(LTL)にブロックされているユーザーの投稿が含まれない', async(async () => {
+	it("タイムライン(LTL)にブロックされているユーザーの投稿が含まれない", async(async () => {
 		const aliceNote = await post(alice);
 		const bobNote = await post(bob);
 		const carolNote = await post(carol);
 
-		const res = await request('/notes/local-timeline', {}, bob);
+		const res = await request("/notes/local-timeline", {}, bob);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), false);
-		assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
+		assert.strictEqual(
+			res.body.some((note: any) => note.id === aliceNote.id),
+			false,
+		);
+		assert.strictEqual(
+			res.body.some((note: any) => note.id === bobNote.id),
+			true,
+		);
+		assert.strictEqual(
+			res.body.some((note: any) => note.id === carolNote.id),
+			true,
+		);
 	}));
 });
diff --git a/packages/backend/test/chart.ts b/packages/backend/test/chart.ts
index ac0844679..e194c6c19 100644
--- a/packages/backend/test/chart.ts
+++ b/packages/backend/test/chart.ts
@@ -1,14 +1,14 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import * as lolex from '@sinonjs/fake-timers';
-import TestChart from '../src/services/chart/charts/test.js';
-import TestGroupedChart from '../src/services/chart/charts/test-grouped.js';
-import TestUniqueChart from '../src/services/chart/charts/test-unique.js';
-import TestIntersectionChart from '../src/services/chart/charts/test-intersection.js';
-import { initDb } from '../src/db/postgre.js';
+import * as assert from "assert";
+import * as lolex from "@sinonjs/fake-timers";
+import TestChart from "../src/services/chart/charts/test.js";
+import TestGroupedChart from "../src/services/chart/charts/test-grouped.js";
+import TestUniqueChart from "../src/services/chart/charts/test-unique.js";
+import TestIntersectionChart from "../src/services/chart/charts/test-intersection.js";
+import { initDb } from "../src/db/postgre.js";
 
-describe('Chart', () => {
+describe("Chart", () => {
 	let testChart: TestChart;
 	let testGroupedChart: TestGroupedChart;
 	let testUniqueChart: TestUniqueChart;
@@ -33,12 +33,12 @@ describe('Chart', () => {
 		clock.uninstall();
 	});
 
-	it('Can updates', async () => {
+	it("Can updates", async () => {
 		await testChart.increment();
 		await testChart.save();
 
-		const chartHours = await testChart.getChart('hour', 3, null);
-		const chartDays = await testChart.getChart('day', 3, null);
+		const chartHours = await testChart.getChart("hour", 3, null);
+		const chartDays = await testChart.getChart("day", 3, null);
 
 		assert.deepStrictEqual(chartHours, {
 			foo: {
@@ -57,12 +57,12 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Can updates (dec)', async () => {
+	it("Can updates (dec)", async () => {
 		await testChart.decrement();
 		await testChart.save();
 
-		const chartHours = await testChart.getChart('hour', 3, null);
-		const chartDays = await testChart.getChart('day', 3, null);
+		const chartHours = await testChart.getChart("hour", 3, null);
+		const chartDays = await testChart.getChart("day", 3, null);
 
 		assert.deepStrictEqual(chartHours, {
 			foo: {
@@ -81,9 +81,9 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Empty chart', async () => {
-		const chartHours = await testChart.getChart('hour', 3, null);
-		const chartDays = await testChart.getChart('day', 3, null);
+	it("Empty chart", async () => {
+		const chartHours = await testChart.getChart("hour", 3, null);
+		const chartDays = await testChart.getChart("day", 3, null);
 
 		assert.deepStrictEqual(chartHours, {
 			foo: {
@@ -102,14 +102,14 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Can updates at multiple times at same time', async () => {
+	it("Can updates at multiple times at same time", async () => {
 		await testChart.increment();
 		await testChart.increment();
 		await testChart.increment();
 		await testChart.save();
 
-		const chartHours = await testChart.getChart('hour', 3, null);
-		const chartDays = await testChart.getChart('day', 3, null);
+		const chartHours = await testChart.getChart("hour", 3, null);
+		const chartDays = await testChart.getChart("day", 3, null);
 
 		assert.deepStrictEqual(chartHours, {
 			foo: {
@@ -128,14 +128,14 @@ describe('Chart', () => {
 		});
 	});
 
-	it('複数回saveされてもデータの更新は一度だけ', async () => {
+	it("複数回saveされてもデータの更新は一度だけ", async () => {
 		await testChart.increment();
 		await testChart.save();
 		await testChart.save();
 		await testChart.save();
 
-		const chartHours = await testChart.getChart('hour', 3, null);
-		const chartDays = await testChart.getChart('day', 3, null);
+		const chartHours = await testChart.getChart("hour", 3, null);
+		const chartDays = await testChart.getChart("day", 3, null);
 
 		assert.deepStrictEqual(chartHours, {
 			foo: {
@@ -154,17 +154,17 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Can updates at different times', async () => {
+	it("Can updates at different times", async () => {
 		await testChart.increment();
 		await testChart.save();
 
-		clock.tick('01:00:00');
+		clock.tick("01:00:00");
 
 		await testChart.increment();
 		await testChart.save();
 
-		const chartHours = await testChart.getChart('hour', 3, null);
-		const chartDays = await testChart.getChart('day', 3, null);
+		const chartHours = await testChart.getChart("hour", 3, null);
+		const chartDays = await testChart.getChart("day", 3, null);
 
 		assert.deepStrictEqual(chartHours, {
 			foo: {
@@ -214,17 +214,17 @@ describe('Chart', () => {
 	});
 	*/
 
-	it('Can padding', async () => {
+	it("Can padding", async () => {
 		await testChart.increment();
 		await testChart.save();
 
-		clock.tick('02:00:00');
+		clock.tick("02:00:00");
 
 		await testChart.increment();
 		await testChart.save();
 
-		const chartHours = await testChart.getChart('hour', 3, null);
-		const chartDays = await testChart.getChart('day', 3, null);
+		const chartHours = await testChart.getChart("hour", 3, null);
+		const chartDays = await testChart.getChart("day", 3, null);
 
 		assert.deepStrictEqual(chartHours, {
 			foo: {
@@ -244,14 +244,14 @@ describe('Chart', () => {
 	});
 
 	// 要求された範囲にログがひとつもない場合でもパディングできる
-	it('Can padding from past range', async () => {
+	it("Can padding from past range", async () => {
 		await testChart.increment();
 		await testChart.save();
 
-		clock.tick('05:00:00');
+		clock.tick("05:00:00");
 
-		const chartHours = await testChart.getChart('hour', 3, null);
-		const chartDays = await testChart.getChart('day', 3, null);
+		const chartHours = await testChart.getChart("hour", 3, null);
+		const chartDays = await testChart.getChart("day", 3, null);
 
 		assert.deepStrictEqual(chartHours, {
 			foo: {
@@ -272,17 +272,17 @@ describe('Chart', () => {
 
 	// 要求された範囲の最も古い箇所に位置するログが存在しない場合でもパディングできる
 	// Issue #3190
-	it('Can padding from past range 2', async () => {
+	it("Can padding from past range 2", async () => {
 		await testChart.increment();
 		await testChart.save();
 
-		clock.tick('05:00:00');
+		clock.tick("05:00:00");
 
 		await testChart.increment();
 		await testChart.save();
 
-		const chartHours = await testChart.getChart('hour', 3, null);
-		const chartDays = await testChart.getChart('day', 3, null);
+		const chartHours = await testChart.getChart("hour", 3, null);
+		const chartDays = await testChart.getChart("day", 3, null);
 
 		assert.deepStrictEqual(chartHours, {
 			foo: {
@@ -301,17 +301,25 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Can specify offset', async () => {
+	it("Can specify offset", async () => {
 		await testChart.increment();
 		await testChart.save();
 
-		clock.tick('01:00:00');
+		clock.tick("01:00:00");
 
 		await testChart.increment();
 		await testChart.save();
 
-		const chartHours = await testChart.getChart('hour', 3, new Date(Date.UTC(2000, 0, 1, 0, 0, 0)));
-		const chartDays = await testChart.getChart('day', 3, new Date(Date.UTC(2000, 0, 1, 0, 0, 0)));
+		const chartHours = await testChart.getChart(
+			"hour",
+			3,
+			new Date(Date.UTC(2000, 0, 1, 0, 0, 0)),
+		);
+		const chartDays = await testChart.getChart(
+			"day",
+			3,
+			new Date(Date.UTC(2000, 0, 1, 0, 0, 0)),
+		);
 
 		assert.deepStrictEqual(chartHours, {
 			foo: {
@@ -330,19 +338,27 @@ describe('Chart', () => {
 		});
 	});
 
-	it('Can specify offset (floor time)', async () => {
-		clock.tick('00:30:00');
+	it("Can specify offset (floor time)", async () => {
+		clock.tick("00:30:00");
 
 		await testChart.increment();
 		await testChart.save();
 
-		clock.tick('01:30:00');
+		clock.tick("01:30:00");
 
 		await testChart.increment();
 		await testChart.save();
 
-		const chartHours = await testChart.getChart('hour', 3, new Date(Date.UTC(2000, 0, 1, 0, 0, 0)));
-		const chartDays = await testChart.getChart('day', 3, new Date(Date.UTC(2000, 0, 1, 0, 0, 0)));
+		const chartHours = await testChart.getChart(
+			"hour",
+			3,
+			new Date(Date.UTC(2000, 0, 1, 0, 0, 0)),
+		);
+		const chartDays = await testChart.getChart(
+			"day",
+			3,
+			new Date(Date.UTC(2000, 0, 1, 0, 0, 0)),
+		);
 
 		assert.deepStrictEqual(chartHours, {
 			foo: {
@@ -361,15 +377,35 @@ describe('Chart', () => {
 		});
 	});
 
-	describe('Grouped', () => {
-		it('Can updates', async () => {
-			await testGroupedChart.increment('alice');
+	describe("Grouped", () => {
+		it("Can updates", async () => {
+			await testGroupedChart.increment("alice");
 			await testGroupedChart.save();
 
-			const aliceChartHours = await testGroupedChart.getChart('hour', 3, null, 'alice');
-			const aliceChartDays = await testGroupedChart.getChart('day', 3, null, 'alice');
-			const bobChartHours = await testGroupedChart.getChart('hour', 3, null, 'bob');
-			const bobChartDays = await testGroupedChart.getChart('day', 3, null, 'bob');
+			const aliceChartHours = await testGroupedChart.getChart(
+				"hour",
+				3,
+				null,
+				"alice",
+			);
+			const aliceChartDays = await testGroupedChart.getChart(
+				"day",
+				3,
+				null,
+				"alice",
+			);
+			const bobChartHours = await testGroupedChart.getChart(
+				"hour",
+				3,
+				null,
+				"bob",
+			);
+			const bobChartDays = await testGroupedChart.getChart(
+				"day",
+				3,
+				null,
+				"bob",
+			);
 
 			assert.deepStrictEqual(aliceChartHours, {
 				foo: {
@@ -405,15 +441,15 @@ describe('Chart', () => {
 		});
 	});
 
-	describe('Unique increment', () => {
-		it('Can updates', async () => {
-			await testUniqueChart.uniqueIncrement('alice');
-			await testUniqueChart.uniqueIncrement('alice');
-			await testUniqueChart.uniqueIncrement('bob');
+	describe("Unique increment", () => {
+		it("Can updates", async () => {
+			await testUniqueChart.uniqueIncrement("alice");
+			await testUniqueChart.uniqueIncrement("alice");
+			await testUniqueChart.uniqueIncrement("bob");
 			await testUniqueChart.save();
 
-			const chartHours = await testUniqueChart.getChart('hour', 3, null);
-			const chartDays = await testUniqueChart.getChart('day', 3, null);
+			const chartHours = await testUniqueChart.getChart("hour", 3, null);
+			const chartDays = await testUniqueChart.getChart("day", 3, null);
 
 			assert.deepStrictEqual(chartHours, {
 				foo: [2, 0, 0],
@@ -424,22 +460,26 @@ describe('Chart', () => {
 			});
 		});
 
-		describe('Intersection', () => {
-			it('条件が満たされていない場合はカウントされない', async () => {
-				await testIntersectionChart.addA('alice');
-				await testIntersectionChart.addA('bob');
-				await testIntersectionChart.addB('carol');
+		describe("Intersection", () => {
+			it("条件が満たされていない場合はカウントされない", async () => {
+				await testIntersectionChart.addA("alice");
+				await testIntersectionChart.addA("bob");
+				await testIntersectionChart.addB("carol");
 				await testIntersectionChart.save();
-	
-				const chartHours = await testIntersectionChart.getChart('hour', 3, null);
-				const chartDays = await testIntersectionChart.getChart('day', 3, null);
-	
+
+				const chartHours = await testIntersectionChart.getChart(
+					"hour",
+					3,
+					null,
+				);
+				const chartDays = await testIntersectionChart.getChart("day", 3, null);
+
 				assert.deepStrictEqual(chartHours, {
 					a: [2, 0, 0],
 					b: [1, 0, 0],
 					aAndB: [0, 0, 0],
 				});
-	
+
 				assert.deepStrictEqual(chartDays, {
 					a: [2, 0, 0],
 					b: [1, 0, 0],
@@ -447,22 +487,26 @@ describe('Chart', () => {
 				});
 			});
 
-			it('条件が満たされている場合にカウントされる', async () => {
-				await testIntersectionChart.addA('alice');
-				await testIntersectionChart.addA('bob');
-				await testIntersectionChart.addB('carol');
-				await testIntersectionChart.addB('alice');
+			it("条件が満たされている場合にカウントされる", async () => {
+				await testIntersectionChart.addA("alice");
+				await testIntersectionChart.addA("bob");
+				await testIntersectionChart.addB("carol");
+				await testIntersectionChart.addB("alice");
 				await testIntersectionChart.save();
-	
-				const chartHours = await testIntersectionChart.getChart('hour', 3, null);
-				const chartDays = await testIntersectionChart.getChart('day', 3, null);
-	
+
+				const chartHours = await testIntersectionChart.getChart(
+					"hour",
+					3,
+					null,
+				);
+				const chartDays = await testIntersectionChart.getChart("day", 3, null);
+
 				assert.deepStrictEqual(chartHours, {
 					a: [2, 0, 0],
 					b: [2, 0, 0],
 					aAndB: [1, 0, 0],
 				});
-	
+
 				assert.deepStrictEqual(chartDays, {
 					a: [2, 0, 0],
 					b: [2, 0, 0],
@@ -472,14 +516,14 @@ describe('Chart', () => {
 		});
 	});
 
-	describe('Resync', () => {
-		it('Can resync', async () => {
+	describe("Resync", () => {
+		it("Can resync", async () => {
 			testChart.total = 1;
 
 			await testChart.resync();
 
-			const chartHours = await testChart.getChart('hour', 3, null);
-			const chartDays = await testChart.getChart('day', 3, null);
+			const chartHours = await testChart.getChart("hour", 3, null);
+			const chartDays = await testChart.getChart("day", 3, null);
 
 			assert.deepStrictEqual(chartHours, {
 				foo: {
@@ -498,18 +542,18 @@ describe('Chart', () => {
 			});
 		});
 
-		it('Can resync (2)', async () => {
+		it("Can resync (2)", async () => {
 			await testChart.increment();
 			await testChart.save();
 
-			clock.tick('01:00:00');
+			clock.tick("01:00:00");
 
 			testChart.total = 100;
 
 			await testChart.resync();
 
-			const chartHours = await testChart.getChart('hour', 3, null);
-			const chartDays = await testChart.getChart('day', 3, null);
+			const chartHours = await testChart.getChart("hour", 3, null);
+			const chartDays = await testChart.getChart("day", 3, null);
 
 			assert.deepStrictEqual(chartHours, {
 				foo: {
diff --git a/packages/backend/test/extract-mentions.ts b/packages/backend/test/extract-mentions.ts
index 85afb098d..f400e1e63 100644
--- a/packages/backend/test/extract-mentions.ts
+++ b/packages/backend/test/extract-mentions.ts
@@ -1,42 +1,50 @@
-import * as assert from 'assert';
+import * as assert from "assert";
 
-import { parse } from 'mfm-js';
-import { extractMentions } from '../src/misc/extract-mentions.js';
+import { parse } from "mfm-js";
+import { extractMentions } from "../src/misc/extract-mentions.js";
 
-describe('Extract mentions', () => {
-	it('simple', () => {
-		const ast = parse('@foo @bar @baz')!;
+describe("Extract mentions", () => {
+	it("simple", () => {
+		const ast = parse("@foo @bar @baz")!;
 		const mentions = extractMentions(ast);
-		assert.deepStrictEqual(mentions, [{
-			username: 'foo',
-			acct: '@foo',
-			host: null,
-		}, {
-			username: 'bar',
-			acct: '@bar',
-			host: null,
-		}, {
-			username: 'baz',
-			acct: '@baz',
-			host: null,
-		}]);
+		assert.deepStrictEqual(mentions, [
+			{
+				username: "foo",
+				acct: "@foo",
+				host: null,
+			},
+			{
+				username: "bar",
+				acct: "@bar",
+				host: null,
+			},
+			{
+				username: "baz",
+				acct: "@baz",
+				host: null,
+			},
+		]);
 	});
 
-	it('nested', () => {
-		const ast = parse('@foo **@bar** @baz')!;
+	it("nested", () => {
+		const ast = parse("@foo **@bar** @baz")!;
 		const mentions = extractMentions(ast);
-		assert.deepStrictEqual(mentions, [{
-			username: 'foo',
-			acct: '@foo',
-			host: null,
-		}, {
-			username: 'bar',
-			acct: '@bar',
-			host: null,
-		}, {
-			username: 'baz',
-			acct: '@baz',
-			host: null,
-		}]);
+		assert.deepStrictEqual(mentions, [
+			{
+				username: "foo",
+				acct: "@foo",
+				host: null,
+			},
+			{
+				username: "bar",
+				acct: "@bar",
+				host: null,
+			},
+			{
+				username: "baz",
+				acct: "@baz",
+				host: null,
+			},
+		]);
 	});
 });
diff --git a/packages/backend/test/fetch-resource.ts b/packages/backend/test/fetch-resource.ts
index ddb0e94b8..da3116f0e 100644
--- a/packages/backend/test/fetch-resource.ts
+++ b/packages/backend/test/fetch-resource.ts
@@ -1,22 +1,31 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import * as childProcess from 'child_process';
-import * as openapi from '@redocly/openapi-core';
-import { async, startServer, signup, post, request, simpleGet, port, shutdownServer } from './utils.js';
+import * as assert from "assert";
+import * as childProcess from "child_process";
+import * as openapi from "@redocly/openapi-core";
+import {
+	async,
+	startServer,
+	signup,
+	post,
+	request,
+	simpleGet,
+	port,
+	shutdownServer,
+} from "./utils.js";
 
 // Request Accept
-const ONLY_AP = 'application/activity+json';
-const PREFER_AP = 'application/activity+json, */*';
-const PREFER_HTML = 'text/html, */*';
-const UNSPECIFIED = '*/*';
+const ONLY_AP = "application/activity+json";
+const PREFER_AP = "application/activity+json, */*";
+const PREFER_HTML = "text/html, */*";
+const UNSPECIFIED = "*/*";
 
 // Response Contet-Type
-const AP = 'application/activity+json; charset=utf-8';
-const JSON = 'application/json; charset=utf-8';
-const HTML = 'text/html; charset=utf-8';
+const AP = "application/activity+json; charset=utf-8";
+const JSON = "application/json; charset=utf-8";
+const HTML = "text/html; charset=utf-8";
 
-describe('Fetch resource', () => {
+describe("Fetch resource", () => {
 	let p: childProcess.ChildProcess;
 
 	let alice: any;
@@ -24,9 +33,9 @@ describe('Fetch resource', () => {
 
 	before(async () => {
 		p = await startServer();
-		alice = await signup({ username: 'alice' });
+		alice = await signup({ username: "alice" });
 		alicesPost = await post(alice, {
-			text: 'test',
+			text: "test",
 		});
 	});
 
@@ -34,39 +43,38 @@ describe('Fetch resource', () => {
 		await shutdownServer(p);
 	});
 
-	describe('Common', () => {
-		it('meta', async(async () => {
-			const res = await request('/meta', {
-			});
+	describe("Common", () => {
+		it("meta", async(async () => {
+			const res = await request("/meta", {});
 
 			assert.strictEqual(res.status, 200);
 		}));
 
-		it('GET root', async(async () => {
-			const res = await simpleGet('/');
+		it("GET root", async(async () => {
+			const res = await simpleGet("/");
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		}));
 
-		it('GET docs', async(async () => {
-			const res = await simpleGet('/docs/ja-JP/about');
+		it("GET docs", async(async () => {
+			const res = await simpleGet("/docs/ja-JP/about");
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		}));
 
-		it('GET api-doc', async(async () => {
-			const res = await simpleGet('/api-doc');
+		it("GET api-doc", async(async () => {
+			const res = await simpleGet("/api-doc");
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		}));
 
-		it('GET api.json', async(async () => {
-			const res = await simpleGet('/api.json');
+		it("GET api.json", async(async () => {
+			const res = await simpleGet("/api.json");
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, JSON);
 		}));
 
-		it('Validate api.json', async(async () => {
+		it("Validate api.json", async(async () => {
 			const config = await openapi.loadConfig();
 			const result = await openapi.bundle({
 				config,
@@ -80,126 +88,126 @@ describe('Fetch resource', () => {
 			assert.strictEqual(result.problems.length, 0);
 		}));
 
-		it('GET favicon.ico', async(async () => {
-			const res = await simpleGet('/favicon.ico');
+		it("GET favicon.ico", async(async () => {
+			const res = await simpleGet("/favicon.ico");
 			assert.strictEqual(res.status, 200);
-			assert.strictEqual(res.type, 'image/x-icon');
+			assert.strictEqual(res.type, "image/x-icon");
 		}));
 
-		it('GET apple-touch-icon.png', async(async () => {
-			const res = await simpleGet('/apple-touch-icon.png');
+		it("GET apple-touch-icon.png", async(async () => {
+			const res = await simpleGet("/apple-touch-icon.png");
 			assert.strictEqual(res.status, 200);
-			assert.strictEqual(res.type, 'image/png');
+			assert.strictEqual(res.type, "image/png");
 		}));
 
-		it('GET twemoji svg', async(async () => {
-			const res = await simpleGet('/twemoji/2764.svg');
+		it("GET twemoji svg", async(async () => {
+			const res = await simpleGet("/twemoji/2764.svg");
 			assert.strictEqual(res.status, 200);
-			assert.strictEqual(res.type, 'image/svg+xml');
+			assert.strictEqual(res.type, "image/svg+xml");
 		}));
 
-		it('GET twemoji svg with hyphen', async(async () => {
-			const res = await simpleGet('/twemoji/2764-fe0f-200d-1f525.svg');
+		it("GET twemoji svg with hyphen", async(async () => {
+			const res = await simpleGet("/twemoji/2764-fe0f-200d-1f525.svg");
 			assert.strictEqual(res.status, 200);
-			assert.strictEqual(res.type, 'image/svg+xml');
+			assert.strictEqual(res.type, "image/svg+xml");
 		}));
 	});
 
-	describe('/@:username', () => {
-		it('Only AP => AP', async(async () => {
+	describe("/@:username", () => {
+		it("Only AP => AP", async(async () => {
 			const res = await simpleGet(`/@${alice.username}`, ONLY_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		}));
 
-		it('Prefer AP => AP', async(async () => {
+		it("Prefer AP => AP", async(async () => {
 			const res = await simpleGet(`/@${alice.username}`, PREFER_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		}));
 
-		it('Prefer HTML => HTML', async(async () => {
+		it("Prefer HTML => HTML", async(async () => {
 			const res = await simpleGet(`/@${alice.username}`, PREFER_HTML);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		}));
 
-		it('Unspecified => HTML', async(async () => {
+		it("Unspecified => HTML", async(async () => {
 			const res = await simpleGet(`/@${alice.username}`, UNSPECIFIED);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		}));
 	});
 
-	describe('/users/:id', () => {
-		it('Only AP => AP', async(async () => {
+	describe("/users/:id", () => {
+		it("Only AP => AP", async(async () => {
 			const res = await simpleGet(`/users/${alice.id}`, ONLY_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		}));
 
-		it('Prefer AP => AP', async(async () => {
+		it("Prefer AP => AP", async(async () => {
 			const res = await simpleGet(`/users/${alice.id}`, PREFER_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		}));
 
-		it('Prefer HTML => Redirect to /@:username', async(async () => {
+		it("Prefer HTML => Redirect to /@:username", async(async () => {
 			const res = await simpleGet(`/users/${alice.id}`, PREFER_HTML);
 			assert.strictEqual(res.status, 302);
 			assert.strictEqual(res.location, `/@${alice.username}`);
 		}));
 
-		it('Undecided => HTML', async(async () => {
+		it("Undecided => HTML", async(async () => {
 			const res = await simpleGet(`/users/${alice.id}`, UNSPECIFIED);
 			assert.strictEqual(res.status, 302);
 			assert.strictEqual(res.location, `/@${alice.username}`);
 		}));
 	});
 
-	describe('/notes/:id', () => {
-		it('Only AP => AP', async(async () => {
+	describe("/notes/:id", () => {
+		it("Only AP => AP", async(async () => {
 			const res = await simpleGet(`/notes/${alicesPost.id}`, ONLY_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		}));
 
-		it('Prefer AP => AP', async(async () => {
+		it("Prefer AP => AP", async(async () => {
 			const res = await simpleGet(`/notes/${alicesPost.id}`, PREFER_AP);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, AP);
 		}));
 
-		it('Prefer HTML => HTML', async(async () => {
+		it("Prefer HTML => HTML", async(async () => {
 			const res = await simpleGet(`/notes/${alicesPost.id}`, PREFER_HTML);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		}));
 
-		it('Unspecified => HTML', async(async () => {
+		it("Unspecified => HTML", async(async () => {
 			const res = await simpleGet(`/notes/${alicesPost.id}`, UNSPECIFIED);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(res.type, HTML);
 		}));
 	});
 
-	describe('Feeds', () => {
-		it('RSS', async(async () => {
+	describe("Feeds", () => {
+		it("RSS", async(async () => {
 			const res = await simpleGet(`/@${alice.username}.rss`, UNSPECIFIED);
 			assert.strictEqual(res.status, 200);
-			assert.strictEqual(res.type, 'application/rss+xml; charset=utf-8');
+			assert.strictEqual(res.type, "application/rss+xml; charset=utf-8");
 		}));
 
-		it('ATOM', async(async () => {
+		it("ATOM", async(async () => {
 			const res = await simpleGet(`/@${alice.username}.atom`, UNSPECIFIED);
 			assert.strictEqual(res.status, 200);
-			assert.strictEqual(res.type, 'application/atom+xml; charset=utf-8');
+			assert.strictEqual(res.type, "application/atom+xml; charset=utf-8");
 		}));
 
-		it('JSON', async(async () => {
+		it("JSON", async(async () => {
 			const res = await simpleGet(`/@${alice.username}.json`, UNSPECIFIED);
 			assert.strictEqual(res.status, 200);
-			assert.strictEqual(res.type, 'application/json; charset=utf-8');
+			assert.strictEqual(res.type, "application/json; charset=utf-8");
 		}));
 	});
 });
diff --git a/packages/backend/test/ff-visibility.ts b/packages/backend/test/ff-visibility.ts
index 4f6847be6..f898926d9 100644
--- a/packages/backend/test/ff-visibility.ts
+++ b/packages/backend/test/ff-visibility.ts
@@ -1,10 +1,20 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import * as childProcess from 'child_process';
-import { async, signup, request, post, react, connectStream, startServer, shutdownServer, simpleGet } from './utils.js';
+import * as assert from "assert";
+import * as childProcess from "child_process";
+import {
+	async,
+	signup,
+	request,
+	post,
+	react,
+	connectStream,
+	startServer,
+	shutdownServer,
+	simpleGet,
+} from "./utils.js";
 
-describe('FF visibility', () => {
+describe("FF visibility", () => {
 	let p: childProcess.ChildProcess;
 
 	let alice: any;
@@ -13,152 +23,258 @@ describe('FF visibility', () => {
 
 	before(async () => {
 		p = await startServer();
-		alice = await signup({ username: 'alice' });
-		bob = await signup({ username: 'bob' });
-		carol = await signup({ username: 'carol' });
+		alice = await signup({ username: "alice" });
+		bob = await signup({ username: "bob" });
+		carol = await signup({ username: "carol" });
 	});
 
 	after(async () => {
 		await shutdownServer(p);
 	});
 
-	it('ffVisibility が public なユーザーのフォロー/フォロワーを誰でも見れる', async(async () => {
-		await request('/i/update', {
-			ffVisibility: 'public',
-		}, alice);
-
-		const followingRes = await request('/users/following', {
-			userId: alice.id,
-		}, bob);
-		const followersRes = await request('/users/followers', {
-			userId: alice.id,
-		}, bob);
-
-		assert.strictEqual(followingRes.status, 200);
-		assert.strictEqual(Array.isArray(followingRes.body), true);
-		assert.strictEqual(followersRes.status, 200);
-		assert.strictEqual(Array.isArray(followersRes.body), true);
-	}));
-
-	it('ffVisibility が followers なユーザーのフォロー/フォロワーを自分で見れる', async(async () => {
-		await request('/i/update', {
-			ffVisibility: 'followers',
-		}, alice);
-
-		const followingRes = await request('/users/following', {
-			userId: alice.id,
-		}, alice);
-		const followersRes = await request('/users/followers', {
-			userId: alice.id,
-		}, alice);
-
-		assert.strictEqual(followingRes.status, 200);
-		assert.strictEqual(Array.isArray(followingRes.body), true);
-		assert.strictEqual(followersRes.status, 200);
-		assert.strictEqual(Array.isArray(followersRes.body), true);
-	}));
-
-	it('ffVisibility が followers なユーザーのフォロー/フォロワーを非フォロワーが見れない', async(async () => {
-		await request('/i/update', {
-			ffVisibility: 'followers',
-		}, alice);
-
-		const followingRes = await request('/users/following', {
-			userId: alice.id,
-		}, bob);
-		const followersRes = await request('/users/followers', {
-			userId: alice.id,
-		}, bob);
-
-		assert.strictEqual(followingRes.status, 400);
-		assert.strictEqual(followersRes.status, 400);
-	}));
-
-	it('ffVisibility が followers なユーザーのフォロー/フォロワーをフォロワーが見れる', async(async () => {
-		await request('/i/update', {
-			ffVisibility: 'followers',
-		}, alice);
-
-		await request('/following/create', {
-			userId: alice.id,
-		}, bob);
-
-		const followingRes = await request('/users/following', {
-			userId: alice.id,
-		}, bob);
-		const followersRes = await request('/users/followers', {
-			userId: alice.id,
-		}, bob);
-
-		assert.strictEqual(followingRes.status, 200);
-		assert.strictEqual(Array.isArray(followingRes.body), true);
-		assert.strictEqual(followersRes.status, 200);
-		assert.strictEqual(Array.isArray(followersRes.body), true);
-	}));
-
-	it('ffVisibility が private なユーザーのフォロー/フォロワーを自分で見れる', async(async () => {
-		await request('/i/update', {
-			ffVisibility: 'private',
-		}, alice);
-
-		const followingRes = await request('/users/following', {
-			userId: alice.id,
-		}, alice);
-		const followersRes = await request('/users/followers', {
-			userId: alice.id,
-		}, alice);
-
-		assert.strictEqual(followingRes.status, 200);
-		assert.strictEqual(Array.isArray(followingRes.body), true);
-		assert.strictEqual(followersRes.status, 200);
-		assert.strictEqual(Array.isArray(followersRes.body), true);
-	}));
-
-	it('ffVisibility が private なユーザーのフォロー/フォロワーを他人が見れない', async(async () => {
-		await request('/i/update', {
-			ffVisibility: 'private',
-		}, alice);
-
-		const followingRes = await request('/users/following', {
-			userId: alice.id,
-		}, bob);
-		const followersRes = await request('/users/followers', {
-			userId: alice.id,
-		}, bob);
-
-		assert.strictEqual(followingRes.status, 400);
-		assert.strictEqual(followersRes.status, 400);
-	}));
-
-	describe('AP', () => {
-		it('ffVisibility が public 以外ならばAPからは取得できない', async(async () => {
+	it("ffVisibility が public なユーザーのフォロー/フォロワーを誰でも見れる", async(async () => {
+		await request(
+			"/i/update",
 			{
-				await request('/i/update', {
-					ffVisibility: 'public',
-				}, alice);
+				ffVisibility: "public",
+			},
+			alice,
+		);
 
-				const followingRes = await simpleGet(`/users/${alice.id}/following`, 'application/activity+json');
-				const followersRes = await simpleGet(`/users/${alice.id}/followers`, 'application/activity+json');
+		const followingRes = await request(
+			"/users/following",
+			{
+				userId: alice.id,
+			},
+			bob,
+		);
+		const followersRes = await request(
+			"/users/followers",
+			{
+				userId: alice.id,
+			},
+			bob,
+		);
+
+		assert.strictEqual(followingRes.status, 200);
+		assert.strictEqual(Array.isArray(followingRes.body), true);
+		assert.strictEqual(followersRes.status, 200);
+		assert.strictEqual(Array.isArray(followersRes.body), true);
+	}));
+
+	it("ffVisibility が followers なユーザーのフォロー/フォロワーを自分で見れる", async(async () => {
+		await request(
+			"/i/update",
+			{
+				ffVisibility: "followers",
+			},
+			alice,
+		);
+
+		const followingRes = await request(
+			"/users/following",
+			{
+				userId: alice.id,
+			},
+			alice,
+		);
+		const followersRes = await request(
+			"/users/followers",
+			{
+				userId: alice.id,
+			},
+			alice,
+		);
+
+		assert.strictEqual(followingRes.status, 200);
+		assert.strictEqual(Array.isArray(followingRes.body), true);
+		assert.strictEqual(followersRes.status, 200);
+		assert.strictEqual(Array.isArray(followersRes.body), true);
+	}));
+
+	it("ffVisibility が followers なユーザーのフォロー/フォロワーを非フォロワーが見れない", async(async () => {
+		await request(
+			"/i/update",
+			{
+				ffVisibility: "followers",
+			},
+			alice,
+		);
+
+		const followingRes = await request(
+			"/users/following",
+			{
+				userId: alice.id,
+			},
+			bob,
+		);
+		const followersRes = await request(
+			"/users/followers",
+			{
+				userId: alice.id,
+			},
+			bob,
+		);
+
+		assert.strictEqual(followingRes.status, 400);
+		assert.strictEqual(followersRes.status, 400);
+	}));
+
+	it("ffVisibility が followers なユーザーのフォロー/フォロワーをフォロワーが見れる", async(async () => {
+		await request(
+			"/i/update",
+			{
+				ffVisibility: "followers",
+			},
+			alice,
+		);
+
+		await request(
+			"/following/create",
+			{
+				userId: alice.id,
+			},
+			bob,
+		);
+
+		const followingRes = await request(
+			"/users/following",
+			{
+				userId: alice.id,
+			},
+			bob,
+		);
+		const followersRes = await request(
+			"/users/followers",
+			{
+				userId: alice.id,
+			},
+			bob,
+		);
+
+		assert.strictEqual(followingRes.status, 200);
+		assert.strictEqual(Array.isArray(followingRes.body), true);
+		assert.strictEqual(followersRes.status, 200);
+		assert.strictEqual(Array.isArray(followersRes.body), true);
+	}));
+
+	it("ffVisibility が private なユーザーのフォロー/フォロワーを自分で見れる", async(async () => {
+		await request(
+			"/i/update",
+			{
+				ffVisibility: "private",
+			},
+			alice,
+		);
+
+		const followingRes = await request(
+			"/users/following",
+			{
+				userId: alice.id,
+			},
+			alice,
+		);
+		const followersRes = await request(
+			"/users/followers",
+			{
+				userId: alice.id,
+			},
+			alice,
+		);
+
+		assert.strictEqual(followingRes.status, 200);
+		assert.strictEqual(Array.isArray(followingRes.body), true);
+		assert.strictEqual(followersRes.status, 200);
+		assert.strictEqual(Array.isArray(followersRes.body), true);
+	}));
+
+	it("ffVisibility が private なユーザーのフォロー/フォロワーを他人が見れない", async(async () => {
+		await request(
+			"/i/update",
+			{
+				ffVisibility: "private",
+			},
+			alice,
+		);
+
+		const followingRes = await request(
+			"/users/following",
+			{
+				userId: alice.id,
+			},
+			bob,
+		);
+		const followersRes = await request(
+			"/users/followers",
+			{
+				userId: alice.id,
+			},
+			bob,
+		);
+
+		assert.strictEqual(followingRes.status, 400);
+		assert.strictEqual(followersRes.status, 400);
+	}));
+
+	describe("AP", () => {
+		it("ffVisibility が public 以外ならばAPからは取得できない", async(async () => {
+			{
+				await request(
+					"/i/update",
+					{
+						ffVisibility: "public",
+					},
+					alice,
+				);
+
+				const followingRes = await simpleGet(
+					`/users/${alice.id}/following`,
+					"application/activity+json",
+				);
+				const followersRes = await simpleGet(
+					`/users/${alice.id}/followers`,
+					"application/activity+json",
+				);
 				assert.strictEqual(followingRes.status, 200);
 				assert.strictEqual(followersRes.status, 200);
 			}
 			{
-				await request('/i/update', {
-					ffVisibility: 'followers',
-				}, alice);
+				await request(
+					"/i/update",
+					{
+						ffVisibility: "followers",
+					},
+					alice,
+				);
 
-				const followingRes = await simpleGet(`/users/${alice.id}/following`, 'application/activity+json').catch(res => ({ status: res.statusCode }));
-				const followersRes = await simpleGet(`/users/${alice.id}/followers`, 'application/activity+json').catch(res => ({ status: res.statusCode }));
+				const followingRes = await simpleGet(
+					`/users/${alice.id}/following`,
+					"application/activity+json",
+				).catch((res) => ({ status: res.statusCode }));
+				const followersRes = await simpleGet(
+					`/users/${alice.id}/followers`,
+					"application/activity+json",
+				).catch((res) => ({ status: res.statusCode }));
 				assert.strictEqual(followingRes.status, 403);
 				assert.strictEqual(followersRes.status, 403);
 			}
 			{
-				await request('/i/update', {
-					ffVisibility: 'private',
-				}, alice);
+				await request(
+					"/i/update",
+					{
+						ffVisibility: "private",
+					},
+					alice,
+				);
 
-				const followingRes = await simpleGet(`/users/${alice.id}/following`, 'application/activity+json').catch(res => ({ status: res.statusCode }));
-				const followersRes = await simpleGet(`/users/${alice.id}/followers`, 'application/activity+json').catch(res => ({ status: res.statusCode }));
+				const followingRes = await simpleGet(
+					`/users/${alice.id}/following`,
+					"application/activity+json",
+				).catch((res) => ({ status: res.statusCode }));
+				const followersRes = await simpleGet(
+					`/users/${alice.id}/followers`,
+					"application/activity+json",
+				).catch((res) => ({ status: res.statusCode }));
 				assert.strictEqual(followingRes.status, 403);
 				assert.strictEqual(followersRes.status, 403);
 			}
diff --git a/packages/backend/test/get-file-info.ts b/packages/backend/test/get-file-info.ts
index 09378fec8..22dc28c8e 100644
--- a/packages/backend/test/get-file-info.ts
+++ b/packages/backend/test/get-file-info.ts
@@ -1,25 +1,27 @@
-import * as assert from 'assert';
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
-import { getFileInfo } from '../src/misc/get-file-info.js';
-import { async } from './utils.js';
+import * as assert from "assert";
+import { fileURLToPath } from "node:url";
+import { dirname } from "node:path";
+import { getFileInfo } from "../src/misc/get-file-info.js";
+import { async } from "./utils.js";
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
 
-describe('Get file info', () => {
-	it('Empty file', async (async () => {
+describe("Get file info", () => {
+	it("Empty file", async(async () => {
 		const path = `${_dirname}/resources/emptyfile`;
-		const info = await getFileInfo(path, { skipSensitiveDetection: true }) as any;
+		const info = (await getFileInfo(path, {
+			skipSensitiveDetection: true,
+		})) as any;
 		delete info.warnings;
 		delete info.blurhash;
 		delete info.sensitive;
 		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 0,
-			md5: 'd41d8cd98f00b204e9800998ecf8427e',
+			md5: "d41d8cd98f00b204e9800998ecf8427e",
 			type: {
-				mime: 'application/octet-stream',
+				mime: "application/octet-stream",
 				ext: null,
 			},
 			width: undefined,
@@ -28,19 +30,21 @@ describe('Get file info', () => {
 		});
 	}));
 
-	it('Generic JPEG', async (async () => {
+	it("Generic JPEG", async(async () => {
 		const path = `${_dirname}/resources/Lenna.jpg`;
-		const info = await getFileInfo(path, { skipSensitiveDetection: true }) as any;
+		const info = (await 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',
+			md5: "091b3f259662aa31e2ffef4519951168",
 			type: {
-				mime: 'image/jpeg',
-				ext: 'jpg',
+				mime: "image/jpeg",
+				ext: "jpg",
 			},
 			width: 512,
 			height: 512,
@@ -48,19 +52,21 @@ describe('Get file info', () => {
 		});
 	}));
 
-	it('Generic APNG', async (async () => {
+	it("Generic APNG", async(async () => {
 		const path = `${_dirname}/resources/anime.png`;
-		const info = await getFileInfo(path, { skipSensitiveDetection: true }) as any;
+		const info = (await getFileInfo(path, {
+			skipSensitiveDetection: true,
+		})) as any;
 		delete info.warnings;
 		delete info.blurhash;
 		delete info.sensitive;
 		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 1868,
-			md5: '08189c607bea3b952704676bb3c979e0',
+			md5: "08189c607bea3b952704676bb3c979e0",
 			type: {
-				mime: 'image/apng',
-				ext: 'apng',
+				mime: "image/apng",
+				ext: "apng",
 			},
 			width: 256,
 			height: 256,
@@ -68,19 +74,21 @@ describe('Get file info', () => {
 		});
 	}));
 
-	it('Generic AGIF', async (async () => {
+	it("Generic AGIF", async(async () => {
 		const path = `${_dirname}/resources/anime.gif`;
-		const info = await getFileInfo(path, { skipSensitiveDetection: true }) as any;
+		const info = (await getFileInfo(path, {
+			skipSensitiveDetection: true,
+		})) as any;
 		delete info.warnings;
 		delete info.blurhash;
 		delete info.sensitive;
 		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 2248,
-			md5: '32c47a11555675d9267aee1a86571e7e',
+			md5: "32c47a11555675d9267aee1a86571e7e",
 			type: {
-				mime: 'image/gif',
-				ext: 'gif',
+				mime: "image/gif",
+				ext: "gif",
 			},
 			width: 256,
 			height: 256,
@@ -88,19 +96,21 @@ describe('Get file info', () => {
 		});
 	}));
 
-	it('PNG with alpha', async (async () => {
+	it("PNG with alpha", async(async () => {
 		const path = `${_dirname}/resources/with-alpha.png`;
-		const info = await getFileInfo(path, { skipSensitiveDetection: true }) as any;
+		const info = (await getFileInfo(path, {
+			skipSensitiveDetection: true,
+		})) as any;
 		delete info.warnings;
 		delete info.blurhash;
 		delete info.sensitive;
 		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 3772,
-			md5: 'f73535c3e1e27508885b69b10cf6e991',
+			md5: "f73535c3e1e27508885b69b10cf6e991",
 			type: {
-				mime: 'image/png',
-				ext: 'png',
+				mime: "image/png",
+				ext: "png",
 			},
 			width: 256,
 			height: 256,
@@ -108,19 +118,21 @@ describe('Get file info', () => {
 		});
 	}));
 
-	it('Generic SVG', async (async () => {
+	it("Generic SVG", async(async () => {
 		const path = `${_dirname}/resources/image.svg`;
-		const info = await getFileInfo(path, { skipSensitiveDetection: true }) as any;
+		const info = (await getFileInfo(path, {
+			skipSensitiveDetection: true,
+		})) as any;
 		delete info.warnings;
 		delete info.blurhash;
 		delete info.sensitive;
 		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 505,
-			md5: 'b6f52b4b021e7b92cdd04509c7267965',
+			md5: "b6f52b4b021e7b92cdd04509c7267965",
 			type: {
-				mime: 'image/svg+xml',
-				ext: 'svg',
+				mime: "image/svg+xml",
+				ext: "svg",
 			},
 			width: 256,
 			height: 256,
@@ -128,20 +140,22 @@ describe('Get file info', () => {
 		});
 	}));
 
-	it('SVG with XML definition', async (async () => {
+	it("SVG with XML definition", async(async () => {
 		// https://github.com/misskey-dev/misskey/issues/4413
 		const path = `${_dirname}/resources/with-xml-def.svg`;
-		const info = await getFileInfo(path, { skipSensitiveDetection: true }) as any;
+		const info = (await getFileInfo(path, {
+			skipSensitiveDetection: true,
+		})) as any;
 		delete info.warnings;
 		delete info.blurhash;
 		delete info.sensitive;
 		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 544,
-			md5: '4b7a346cde9ccbeb267e812567e33397',
+			md5: "4b7a346cde9ccbeb267e812567e33397",
 			type: {
-				mime: 'image/svg+xml',
-				ext: 'svg',
+				mime: "image/svg+xml",
+				ext: "svg",
 			},
 			width: 256,
 			height: 256,
@@ -149,18 +163,20 @@ describe('Get file info', () => {
 		});
 	}));
 
-	it('Dimension limit', async (async () => {
+	it("Dimension limit", async(async () => {
 		const path = `${_dirname}/resources/25000x25000.png`;
-		const info = await getFileInfo(path, { skipSensitiveDetection: true }) as any;
+		const info = (await getFileInfo(path, {
+			skipSensitiveDetection: true,
+		})) as any;
 		delete info.warnings;
 		delete info.blurhash;
 		delete info.sensitive;
 		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 75933,
-			md5: '268c5dde99e17cf8fe09f1ab3f97df56',
+			md5: "268c5dde99e17cf8fe09f1ab3f97df56",
 			type: {
-				mime: 'application/octet-stream',	// do not treat as image
+				mime: "application/octet-stream", // do not treat as image
 				ext: null,
 			},
 			width: 25000,
@@ -169,19 +185,21 @@ describe('Get file info', () => {
 		});
 	}));
 
-	it('Rotate JPEG', async (async () => {
+	it("Rotate JPEG", async(async () => {
 		const path = `${_dirname}/resources/rotate.jpg`;
-		const info = await getFileInfo(path, { skipSensitiveDetection: true }) as any;
+		const info = (await getFileInfo(path, {
+			skipSensitiveDetection: true,
+		})) as any;
 		delete info.warnings;
 		delete info.blurhash;
 		delete info.sensitive;
 		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 12624,
-			md5: '68d5b2d8d1d1acbbce99203e3ec3857e',
+			md5: "68d5b2d8d1d1acbbce99203e3ec3857e",
 			type: {
-				mime: 'image/jpeg',
-				ext: 'jpg',
+				mime: "image/jpeg",
+				ext: "jpg",
 			},
 			width: 512,
 			height: 256,
diff --git a/packages/backend/test/loader.js b/packages/backend/test/loader.js
index 6b21587e3..7e1bf379d 100644
--- a/packages/backend/test/loader.js
+++ b/packages/backend/test/loader.js
@@ -6,18 +6,21 @@
  * ※ https://github.com/TypeStrong/ts-node/pull/1585 が取り込まれたらこのカスタムローダーは必要なくなる
  */
 
-import { resolve as resolveTs, load } from 'ts-node/esm';
-import { loadConfig, createMatchPath } from 'tsconfig-paths';
-import { pathToFileURL } from 'url';
+import { resolve as resolveTs, load } from "ts-node/esm";
+import { loadConfig, createMatchPath } from "tsconfig-paths";
+import { pathToFileURL } from "url";
 
 const tsconfig = loadConfig();
 const matchPath = createMatchPath(tsconfig.absoluteBaseUrl, tsconfig.paths);
 
 export function resolve(specifier, ctx, defaultResolve) {
 	let resolvedSpecifier;
-	if (specifier.endsWith('.js')) {
+	if (specifier.endsWith(".js")) {
 		// maybe transpiled
-		const specifierWithoutExtension = specifier.substring(0, specifier.length - '.js'.length);
+		const specifierWithoutExtension = specifier.substring(
+			0,
+			specifier.length - ".js".length,
+		);
 		const matchedSpecifier = matchPath(specifierWithoutExtension);
 		if (matchedSpecifier) {
 			resolvedSpecifier = pathToFileURL(`${matchedSpecifier}.js`).href;
diff --git a/packages/backend/test/mfm.ts b/packages/backend/test/mfm.ts
index 5218942a5..605daa710 100644
--- a/packages/backend/test/mfm.ts
+++ b/packages/backend/test/mfm.ts
@@ -1,89 +1,127 @@
-import * as assert from 'assert';
-import * as mfm from 'mfm-js';
+import * as assert from "assert";
+import * as mfm from "mfm-js";
 
-import { toHtml } from '../src/mfm/to-html.js';
-import { fromHtml } from '../src/mfm/from-html.js';
+import { toHtml } from "../src/mfm/to-html.js";
+import { fromHtml } from "../src/mfm/from-html.js";
 
-describe('toHtml', () => {
-	it('br', () => {
-		const input = 'foo\nbar\nbaz';
-		const output = '<p><span>foo<br>bar<br>baz</span></p>';
+describe("toHtml", () => {
+	it("br", () => {
+		const input = "foo\nbar\nbaz";
+		const output = "<p><span>foo<br>bar<br>baz</span></p>";
 		assert.equal(toHtml(mfm.parse(input)), output);
 	});
 
-	it('br alt', () => {
-		const input = 'foo\r\nbar\rbaz';
-		const output = '<p><span>foo<br>bar<br>baz</span></p>';
+	it("br alt", () => {
+		const input = "foo\r\nbar\rbaz";
+		const output = "<p><span>foo<br>bar<br>baz</span></p>";
 		assert.equal(toHtml(mfm.parse(input)), output);
 	});
 });
 
-describe('fromHtml', () => {
-	it('p', () => {
-		assert.deepStrictEqual(fromHtml('<p>a</p><p>b</p>'), 'a\n\nb');
+describe("fromHtml", () => {
+	it("p", () => {
+		assert.deepStrictEqual(fromHtml("<p>a</p><p>b</p>"), "a\n\nb");
 	});
 
-	it('block element', () => {
-		assert.deepStrictEqual(fromHtml('<div>a</div><div>b</div>'), 'a\nb');
+	it("block element", () => {
+		assert.deepStrictEqual(fromHtml("<div>a</div><div>b</div>"), "a\nb");
 	});
 
-	it('inline element', () => {
-		assert.deepStrictEqual(fromHtml('<ul><li>a</li><li>b</li></ul>'), 'a\nb');
+	it("inline element", () => {
+		assert.deepStrictEqual(fromHtml("<ul><li>a</li><li>b</li></ul>"), "a\nb");
 	});
 
-	it('block code', () => {
-		assert.deepStrictEqual(fromHtml('<pre><code>a\nb</code></pre>'), '```\na\nb\n```');
+	it("block code", () => {
+		assert.deepStrictEqual(
+			fromHtml("<pre><code>a\nb</code></pre>"),
+			"```\na\nb\n```",
+		);
 	});
 
-	it('inline code', () => {
-		assert.deepStrictEqual(fromHtml('<code>a</code>'), '`a`');
+	it("inline code", () => {
+		assert.deepStrictEqual(fromHtml("<code>a</code>"), "`a`");
 	});
 
-	it('quote', () => {
-		assert.deepStrictEqual(fromHtml('<blockquote>a\nb</blockquote>'), '> a\n> b');
+	it("quote", () => {
+		assert.deepStrictEqual(
+			fromHtml("<blockquote>a\nb</blockquote>"),
+			"> a\n> b",
+		);
 	});
 
-	it('br', () => {
-		assert.deepStrictEqual(fromHtml('<p>abc<br><br/>d</p>'), 'abc\n\nd');
+	it("br", () => {
+		assert.deepStrictEqual(fromHtml("<p>abc<br><br/>d</p>"), "abc\n\nd");
 	});
 
-	it('link with different text', () => {
-		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/b">c</a> d</p>'), 'a [c](https://example.com/b) d');
+	it("link with different text", () => {
+		assert.deepStrictEqual(
+			fromHtml('<p>a <a href="https://example.com/b">c</a> d</p>'),
+			"a [c](https://example.com/b) d",
+		);
 	});
 
-	it('link with different text, but not encoded', () => {
-		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/ä">c</a> d</p>'), 'a [c](<https://example.com/ä>) d');
+	it("link with different text, but not encoded", () => {
+		assert.deepStrictEqual(
+			fromHtml('<p>a <a href="https://example.com/ä">c</a> d</p>'),
+			"a [c](<https://example.com/ä>) d",
+		);
 	});
 
-	it('link with same text', () => {
-		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/b">https://example.com/b</a> d</p>'), 'a https://example.com/b d');
+	it("link with same text", () => {
+		assert.deepStrictEqual(
+			fromHtml(
+				'<p>a <a href="https://example.com/b">https://example.com/b</a> d</p>',
+			),
+			"a https://example.com/b d",
+		);
 	});
 
-	it('link with same text, but not encoded', () => {
-		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/ä">https://example.com/ä</a> d</p>'), 'a <https://example.com/ä> d');
+	it("link with same text, but not encoded", () => {
+		assert.deepStrictEqual(
+			fromHtml(
+				'<p>a <a href="https://example.com/ä">https://example.com/ä</a> d</p>',
+			),
+			"a <https://example.com/ä> d",
+		);
 	});
 
-	it('link with no url', () => {
-		assert.deepStrictEqual(fromHtml('<p>a <a href="b">c</a> d</p>'), 'a [c](b) d');
+	it("link with no url", () => {
+		assert.deepStrictEqual(
+			fromHtml('<p>a <a href="b">c</a> d</p>'),
+			"a [c](b) d",
+		);
 	});
 
-	it('link without href', () => {
-		assert.deepStrictEqual(fromHtml('<p>a <a>c</a> d</p>'), 'a c d');
+	it("link without href", () => {
+		assert.deepStrictEqual(fromHtml("<p>a <a>c</a> d</p>"), "a c d");
 	});
 
-	it('link without text', () => {
-		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/b"></a> d</p>'), 'a https://example.com/b d');
+	it("link without text", () => {
+		assert.deepStrictEqual(
+			fromHtml('<p>a <a href="https://example.com/b"></a> d</p>'),
+			"a https://example.com/b d",
+		);
 	});
 
-	it('link without both', () => {
-		assert.deepStrictEqual(fromHtml('<p>a <a></a> d</p>'), 'a  d');
+	it("link without both", () => {
+		assert.deepStrictEqual(fromHtml("<p>a <a></a> d</p>"), "a  d");
 	});
 
-	it('mention', () => {
-		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/@user" class="u-url mention">@user</a> d</p>'), 'a @user@example.com d');
+	it("mention", () => {
+		assert.deepStrictEqual(
+			fromHtml(
+				'<p>a <a href="https://example.com/@user" class="u-url mention">@user</a> d</p>',
+			),
+			"a @user@example.com d",
+		);
 	});
 
-	it('hashtag', () => {
-		assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/tags/a">#a</a> d</p>', ['#a']), 'a #a d');
+	it("hashtag", () => {
+		assert.deepStrictEqual(
+			fromHtml('<p>a <a href="https://example.com/tags/a">#a</a> d</p>', [
+				"#a",
+			]),
+			"a #a d",
+		);
 	});
 });
diff --git a/packages/backend/test/misc/mock-resolver.ts b/packages/backend/test/misc/mock-resolver.ts
index ba89ac329..74c67e3d3 100644
--- a/packages/backend/test/misc/mock-resolver.ts
+++ b/packages/backend/test/misc/mock-resolver.ts
@@ -1,5 +1,5 @@
-import Resolver from '../../src/remote/activitypub/resolver.js';
-import { IObject } from '../../src/remote/activitypub/type.js';
+import Resolver from "../../src/remote/activitypub/resolver.js";
+import { IObject } from "../../src/remote/activitypub/type.js";
 
 type MockResponse = {
 	type: string;
@@ -8,23 +8,27 @@ type MockResponse = {
 
 export class MockResolver extends Resolver {
 	private _rs = new Map<string, MockResponse>();
-	public async _register(uri: string, content: string | Record<string, any>, type = 'application/activity+json') {
+	public async _register(
+		uri: string,
+		content: string | Record<string, any>,
+		type = "application/activity+json",
+	) {
 		this._rs.set(uri, {
 			type,
-			content: typeof content === 'string' ? content : JSON.stringify(content),
+			content: typeof content === "string" ? content : JSON.stringify(content),
 		});
 	}
 
 	public async resolve(value: string | IObject): Promise<IObject> {
-		if (typeof value !== 'string') return value;
+		if (typeof value !== "string") return value;
 
 		const r = this._rs.get(value);
 
 		if (!r) {
 			throw {
-				name: 'StatusError',
+				name: "StatusError",
 				statusCode: 404,
-				message: 'Not registed for mock',
+				message: "Not registed for mock",
 			};
 		}
 
diff --git a/packages/backend/test/mute.ts b/packages/backend/test/mute.ts
index 465633973..c51162834 100644
--- a/packages/backend/test/mute.ts
+++ b/packages/backend/test/mute.ts
@@ -1,10 +1,19 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import * as childProcess from 'child_process';
-import { async, signup, request, post, react, startServer, shutdownServer, waitFire } from './utils.js';
+import * as assert from "assert";
+import * as childProcess from "child_process";
+import {
+	async,
+	signup,
+	request,
+	post,
+	react,
+	startServer,
+	shutdownServer,
+	waitFire,
+} from "./utils.js";
 
-describe('Mute', () => {
+describe("Mute", () => {
 	let p: childProcess.ChildProcess;
 
 	// alice mutes carol
@@ -14,110 +23,154 @@ describe('Mute', () => {
 
 	before(async () => {
 		p = await startServer();
-		alice = await signup({ username: 'alice' });
-		bob = await signup({ username: 'bob' });
-		carol = await signup({ username: 'carol' });
+		alice = await signup({ username: "alice" });
+		bob = await signup({ username: "bob" });
+		carol = await signup({ username: "carol" });
 	});
 
 	after(async () => {
 		await shutdownServer(p);
 	});
 
-	it('ミュート作成', async(async () => {
-		const res = await request('/mute/create', {
-			userId: carol.id,
-		}, alice);
+	it("ミュート作成", async(async () => {
+		const res = await request(
+			"/mute/create",
+			{
+				userId: carol.id,
+			},
+			alice,
+		);
 
 		assert.strictEqual(res.status, 204);
 	}));
 
-	it('「自分宛ての投稿」にミュートしているユーザーの投稿が含まれない', async(async () => {
-		const bobNote = await post(bob, { text: '@alice hi' });
-		const carolNote = await post(carol, { text: '@alice hi' });
+	it("「自分宛ての投稿」にミュートしているユーザーの投稿が含まれない", async(async () => {
+		const bobNote = await post(bob, { text: "@alice hi" });
+		const carolNote = await post(carol, { text: "@alice hi" });
 
-		const res = await request('/notes/mentions', {}, alice);
+		const res = await request("/notes/mentions", {}, alice);
 
 		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: any) => note.id === bobNote.id),
+			true,
+		);
+		assert.strictEqual(
+			res.body.some((note: any) => note.id === carolNote.id),
+			false,
+		);
 	}));
 
-	it('ミュートしているユーザーからメンションされても、hasUnreadMentions が true にならない', async(async () => {
+	it("ミュートしているユーザーからメンションされても、hasUnreadMentions が true にならない", async(async () => {
 		// 状態リセット
-		await request('/i/read-all-unread-notes', {}, alice);
+		await request("/i/read-all-unread-notes", {}, alice);
 
-		await post(carol, { text: '@alice hi' });
+		await post(carol, { text: "@alice hi" });
 
-		const res = await request('/i', {}, alice);
+		const res = await request("/i", {}, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(res.body.hasUnreadMentions, false);
 	}));
 
-	it('ミュートしているユーザーからメンションされても、ストリームに unreadMention イベントが流れてこない', async () => {
+	it("ミュートしているユーザーからメンションされても、ストリームに unreadMention イベントが流れてこない", async () => {
 		// 状態リセット
-		await request('/i/read-all-unread-notes', {}, alice);
+		await request("/i/read-all-unread-notes", {}, alice);
 
-		const fired = await waitFire(alice, 'main', () => post(carol, { text: '@alice hi' }), msg => msg.type === 'unreadMention');
+		const fired = await waitFire(
+			alice,
+			"main",
+			() => post(carol, { text: "@alice hi" }),
+			(msg) => msg.type === "unreadMention",
+		);
 
 		assert.strictEqual(fired, false);
 	});
 
-	it('ミュートしているユーザーからメンションされても、ストリームに unreadNotification イベントが流れてこない', async () => {
+	it("ミュートしているユーザーからメンションされても、ストリームに unreadNotification イベントが流れてこない", async () => {
 		// 状態リセット
-		await request('/i/read-all-unread-notes', {}, alice);
-		await request('/notifications/mark-all-as-read', {}, alice);
+		await request("/i/read-all-unread-notes", {}, alice);
+		await request("/notifications/mark-all-as-read", {}, alice);
 
-		const fired = await waitFire(alice, 'main', () => post(carol, { text: '@alice hi' }), msg => msg.type === 'unreadNotification');
+		const fired = await waitFire(
+			alice,
+			"main",
+			() => post(carol, { text: "@alice hi" }),
+			(msg) => msg.type === "unreadNotification",
+		);
 
 		assert.strictEqual(fired, false);
 	});
 
-	describe('Timeline', () => {
-		it('タイムラインにミュートしているユーザーの投稿が含まれない', async(async () => {
+	describe("Timeline", () => {
+		it("タイムラインにミュートしているユーザーの投稿が含まれない", async(async () => {
 			const aliceNote = await post(alice);
 			const bobNote = await post(bob);
 			const carolNote = await post(carol);
 
-			const res = await request('/notes/local-timeline', {}, alice);
+			const res = await request("/notes/local-timeline", {}, alice);
 
 			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: 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,
+			);
 		}));
 
-		it('タイムラインにミュートしているユーザーの投稿のRenoteが含まれない', async(async () => {
+		it("タイムラインにミュートしているユーザーの投稿のRenoteが含まれない", async(async () => {
 			const aliceNote = await post(alice);
 			const carolNote = await post(carol);
 			const bobNote = await post(bob, {
 				renoteId: carolNote.id,
 			});
 
-			const res = await request('/notes/local-timeline', {}, alice);
+			const res = await request("/notes/local-timeline", {}, alice);
 
 			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: 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,
+			);
 		}));
 	});
 
-	describe('Notification', () => {
-		it('通知にミュートしているユーザーの通知が含まれない(リアクション)', async(async () => {
+	describe("Notification", () => {
+		it("通知にミュートしているユーザーの通知が含まれない(リアクション)", async(async () => {
 			const aliceNote = await post(alice);
-			await react(bob, aliceNote, 'like');
-			await react(carol, aliceNote, 'like');
+			await react(bob, aliceNote, "like");
+			await react(carol, aliceNote, "like");
 
-			const res = await request('/i/notifications', {}, alice);
+			const res = await request("/i/notifications", {}, alice);
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(
+				res.body.some((notification: any) => notification.userId === bob.id),
+				true,
+			);
+			assert.strictEqual(
+				res.body.some((notification: any) => notification.userId === carol.id),
+				false,
+			);
 		}));
 	});
 });
diff --git a/packages/backend/test/note.ts b/packages/backend/test/note.ts
index b495d8b7b..3af4b88d8 100644
--- a/packages/backend/test/note.ts
+++ b/packages/backend/test/note.ts
@@ -1,11 +1,21 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import * as childProcess from 'child_process';
-import { Note } from '../src/models/entities/note.js';
-import { async, signup, request, post, uploadUrl, startServer, shutdownServer, initTestDb, api } from './utils.js';
+import * as assert from "assert";
+import * as childProcess from "child_process";
+import { Note } from "../src/models/entities/note.js";
+import {
+	async,
+	signup,
+	request,
+	post,
+	uploadUrl,
+	startServer,
+	shutdownServer,
+	initTestDb,
+	api,
+} from "./utils.js";
 
-describe('Note', () => {
+describe("Note", () => {
 	let p: childProcess.ChildProcess;
 	let Notes: any;
 
@@ -16,351 +26,488 @@ describe('Note', () => {
 		p = await startServer();
 		const connection = await initTestDb(true);
 		Notes = connection.getRepository(Note);
-		alice = await signup({ username: 'alice' });
-		bob = await signup({ username: 'bob' });
+		alice = await signup({ username: "alice" });
+		bob = await signup({ username: "bob" });
 	});
 
 	after(async () => {
 		await shutdownServer(p);
 	});
 
-	it('投稿できる', async(async () => {
+	it("投稿できる", async(async () => {
 		const post = {
-			text: 'test',
+			text: "test",
 		};
 
-		const res = await request('/notes/create', post, alice);
+		const res = await request("/notes/create", post, alice);
 
 		assert.strictEqual(res.status, 200);
-		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+		assert.strictEqual(
+			typeof res.body === "object" && !Array.isArray(res.body),
+			true,
+		);
 		assert.strictEqual(res.body.createdNote.text, post.text);
 	}));
 
-	it('ファイルを添付できる', async(async () => {
-		const file = await uploadUrl(alice, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg');
+	it("ファイルを添付できる", async(async () => {
+		const file = await uploadUrl(
+			alice,
+			"https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg",
+		);
 
-		const res = await request('/notes/create', {
-			fileIds: [file.id],
-		}, alice);
+		const res = await request(
+			"/notes/create",
+			{
+				fileIds: [file.id],
+			},
+			alice,
+		);
 
 		assert.strictEqual(res.status, 200);
-		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+		assert.strictEqual(
+			typeof res.body === "object" && !Array.isArray(res.body),
+			true,
+		);
 		assert.deepStrictEqual(res.body.createdNote.fileIds, [file.id]);
 	}));
 
-	it('他人のファイルは無視', async(async () => {
-		const file = await uploadUrl(bob, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg');
+	it("他人のファイルは無視", async(async () => {
+		const file = await uploadUrl(
+			bob,
+			"https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg",
+		);
 
-		const res = await request('/notes/create', {
-			text: 'test',
-			fileIds: [file.id],
-		}, alice);
+		const res = await request(
+			"/notes/create",
+			{
+				text: "test",
+				fileIds: [file.id],
+			},
+			alice,
+		);
 
 		assert.strictEqual(res.status, 200);
-		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+		assert.strictEqual(
+			typeof res.body === "object" && !Array.isArray(res.body),
+			true,
+		);
 		assert.deepStrictEqual(res.body.createdNote.fileIds, []);
 	}));
 
-	it('存在しないファイルは無視', async(async () => {
-		const res = await request('/notes/create', {
-			text: 'test',
-			fileIds: ['000000000000000000000000'],
-		}, alice);
+	it("存在しないファイルは無視", async(async () => {
+		const res = await request(
+			"/notes/create",
+			{
+				text: "test",
+				fileIds: ["000000000000000000000000"],
+			},
+			alice,
+		);
 
 		assert.strictEqual(res.status, 200);
-		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+		assert.strictEqual(
+			typeof res.body === "object" && !Array.isArray(res.body),
+			true,
+		);
 		assert.deepStrictEqual(res.body.createdNote.fileIds, []);
 	}));
 
-	it('不正なファイルIDは無視', async(async () => {
-		const res = await request('/notes/create', {
-			fileIds: ['kyoppie'],
-		}, alice);
+	it("不正なファイルIDは無視", async(async () => {
+		const res = await request(
+			"/notes/create",
+			{
+				fileIds: ["kyoppie"],
+			},
+			alice,
+		);
 		assert.strictEqual(res.status, 200);
-		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+		assert.strictEqual(
+			typeof res.body === "object" && !Array.isArray(res.body),
+			true,
+		);
 		assert.deepStrictEqual(res.body.createdNote.fileIds, []);
 	}));
 
-	it('返信できる', async(async () => {
+	it("返信できる", async(async () => {
 		const bobPost = await post(bob, {
-			text: 'foo',
+			text: "foo",
 		});
 
 		const alicePost = {
-			text: 'bar',
+			text: "bar",
 			replyId: bobPost.id,
 		};
 
-		const res = await request('/notes/create', alicePost, alice);
+		const res = await request("/notes/create", alicePost, alice);
 
 		assert.strictEqual(res.status, 200);
-		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+		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.strictEqual(res.body.createdNote.reply.text, bobPost.text);
 	}));
 
-	it('renoteできる', async(async () => {
+	it("renoteできる", async(async () => {
 		const bobPost = await post(bob, {
-			text: 'test',
+			text: "test",
 		});
 
 		const alicePost = {
 			renoteId: bobPost.id,
 		};
 
-		const res = await request('/notes/create', alicePost, alice);
+		const res = await request("/notes/create", alicePost, alice);
 
 		assert.strictEqual(res.status, 200);
-		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+		assert.strictEqual(
+			typeof res.body === "object" && !Array.isArray(res.body),
+			true,
+		);
 		assert.strictEqual(res.body.createdNote.renoteId, alicePost.renoteId);
 		assert.strictEqual(res.body.createdNote.renote.text, bobPost.text);
 	}));
 
-	it('引用renoteできる', async(async () => {
+	it("引用renoteできる", async(async () => {
 		const bobPost = await post(bob, {
-			text: 'test',
+			text: "test",
 		});
 
 		const alicePost = {
-			text: 'test',
+			text: "test",
 			renoteId: bobPost.id,
 		};
 
-		const res = await request('/notes/create', alicePost, alice);
+		const res = await request("/notes/create", alicePost, alice);
 
 		assert.strictEqual(res.status, 200);
-		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+		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.strictEqual(res.body.createdNote.renote.text, bobPost.text);
 	}));
 
-	it('文字数ぎりぎりで怒られない', async(async () => {
+	it("文字数ぎりぎりで怒られない", async(async () => {
 		const post = {
-			text: '!'.repeat(3000),
+			text: "!".repeat(3000),
 		};
-		const res = await request('/notes/create', post, alice);
+		const res = await request("/notes/create", post, alice);
 		assert.strictEqual(res.status, 200);
 	}));
 
-	it('文字数オーバーで怒られる', async(async () => {
+	it("文字数オーバーで怒られる", async(async () => {
 		const post = {
-			text: '!'.repeat(3001),
+			text: "!".repeat(3001),
 		};
-		const res = await request('/notes/create', post, alice);
+		const res = await request("/notes/create", post, alice);
 		assert.strictEqual(res.status, 400);
 	}));
 
-	it('存在しないリプライ先で怒られる', async(async () => {
+	it("存在しないリプライ先で怒られる", async(async () => {
 		const post = {
-			text: 'test',
-			replyId: '000000000000000000000000',
+			text: "test",
+			replyId: "000000000000000000000000",
 		};
-		const res = await request('/notes/create', post, alice);
+		const res = await request("/notes/create", post, alice);
 		assert.strictEqual(res.status, 400);
 	}));
 
-	it('存在しないrenote対象で怒られる', async(async () => {
+	it("存在しないrenote対象で怒られる", async(async () => {
 		const post = {
-			renoteId: '000000000000000000000000',
+			renoteId: "000000000000000000000000",
 		};
-		const res = await request('/notes/create', post, alice);
+		const res = await request("/notes/create", post, alice);
 		assert.strictEqual(res.status, 400);
 	}));
 
-	it('不正なリプライ先IDで怒られる', async(async () => {
+	it("不正なリプライ先IDで怒られる", async(async () => {
 		const post = {
-			text: 'test',
-			replyId: 'foo',
+			text: "test",
+			replyId: "foo",
 		};
-		const res = await request('/notes/create', post, alice);
+		const res = await request("/notes/create", post, alice);
 		assert.strictEqual(res.status, 400);
 	}));
 
-	it('不正なrenote対象IDで怒られる', async(async () => {
+	it("不正なrenote対象IDで怒られる", async(async () => {
 		const post = {
-			renoteId: 'foo',
+			renoteId: "foo",
 		};
-		const res = await request('/notes/create', post, alice);
+		const res = await request("/notes/create", post, alice);
 		assert.strictEqual(res.status, 400);
 	}));
 
-	it('存在しないユーザーにメンションできる', async(async () => {
+	it("存在しないユーザーにメンションできる", async(async () => {
 		const post = {
-			text: '@ghost yo',
+			text: "@ghost yo",
 		};
 
-		const res = await request('/notes/create', post, alice);
+		const res = await request("/notes/create", post, alice);
 
 		assert.strictEqual(res.status, 200);
-		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+		assert.strictEqual(
+			typeof res.body === "object" && !Array.isArray(res.body),
+			true,
+		);
 		assert.strictEqual(res.body.createdNote.text, post.text);
 	}));
 
-	it('同じユーザーに複数メンションしても内部的にまとめられる', async(async () => {
+	it("同じユーザーに複数メンションしても内部的にまとめられる", async(async () => {
 		const post = {
-			text: '@bob @bob @bob yo',
+			text: "@bob @bob @bob yo",
 		};
 
-		const res = await request('/notes/create', post, alice);
+		const res = await request("/notes/create", post, alice);
 
 		assert.strictEqual(res.status, 200);
-		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+		assert.strictEqual(
+			typeof res.body === "object" && !Array.isArray(res.body),
+			true,
+		);
 		assert.strictEqual(res.body.createdNote.text, post.text);
 
 		const noteDoc = await Notes.findOneBy({ id: res.body.createdNote.id });
 		assert.deepStrictEqual(noteDoc.mentions, [bob.id]);
 	}));
 
-	describe('notes/create', () => {
-		it('投票を添付できる', async(async () => {
-			const res = await request('/notes/create', {
-				text: 'test',
-				poll: {
-					choices: ['foo', 'bar'],
+	describe("notes/create", () => {
+		it("投票を添付できる", async(async () => {
+			const res = await request(
+				"/notes/create",
+				{
+					text: "test",
+					poll: {
+						choices: ["foo", "bar"],
+					},
 				},
-			}, alice);
+				alice,
+			);
 
 			assert.strictEqual(res.status, 200);
-			assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+			assert.strictEqual(
+				typeof res.body === "object" && !Array.isArray(res.body),
+				true,
+			);
 			assert.strictEqual(res.body.createdNote.poll != null, true);
 		}));
 
-		it('投票の選択肢が無くて怒られる', async(async () => {
-			const res = await request('/notes/create', {
-				poll: {},
-			}, alice);
+		it("投票の選択肢が無くて怒られる", async(async () => {
+			const res = await request(
+				"/notes/create",
+				{
+					poll: {},
+				},
+				alice,
+			);
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('投票の選択肢が無くて怒られる (空の配列)', async(async () => {
-			const res = await request('/notes/create', {
-				poll: {
-					choices: [],
+		it("投票の選択肢が無くて怒られる (空の配列)", async(async () => {
+			const res = await request(
+				"/notes/create",
+				{
+					poll: {
+						choices: [],
+					},
 				},
-			}, alice);
+				alice,
+			);
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('投票の選択肢が1つで怒られる', async(async () => {
-			const res = await request('/notes/create', {
-				poll: {
-					choices: ['Strawberry Pasta'],
+		it("投票の選択肢が1つで怒られる", async(async () => {
+			const res = await request(
+				"/notes/create",
+				{
+					poll: {
+						choices: ["Strawberry Pasta"],
+					},
 				},
-			}, alice);
+				alice,
+			);
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('投票できる', async(async () => {
-			const { body } = await request('/notes/create', {
-				text: 'test',
-				poll: {
-					choices: ['sakura', 'izumi', 'ako'],
+		it("投票できる", async(async () => {
+			const { body } = await request(
+				"/notes/create",
+				{
+					text: "test",
+					poll: {
+						choices: ["sakura", "izumi", "ako"],
+					},
 				},
-			}, alice);
+				alice,
+			);
 
-			const res = await request('/notes/polls/vote', {
-				noteId: body.createdNote.id,
-				choice: 1,
-			}, alice);
+			const res = await request(
+				"/notes/polls/vote",
+				{
+					noteId: body.createdNote.id,
+					choice: 1,
+				},
+				alice,
+			);
 
 			assert.strictEqual(res.status, 204);
 		}));
 
-		it('複数投票できない', async(async () => {
-			const { body } = await request('/notes/create', {
-				text: 'test',
-				poll: {
-					choices: ['sakura', 'izumi', 'ako'],
+		it("複数投票できない", async(async () => {
+			const { body } = await request(
+				"/notes/create",
+				{
+					text: "test",
+					poll: {
+						choices: ["sakura", "izumi", "ako"],
+					},
 				},
-			}, alice);
+				alice,
+			);
 
-			await request('/notes/polls/vote', {
-				noteId: body.createdNote.id,
-				choice: 0,
-			}, alice);
+			await request(
+				"/notes/polls/vote",
+				{
+					noteId: body.createdNote.id,
+					choice: 0,
+				},
+				alice,
+			);
 
-			const res = await request('/notes/polls/vote', {
-				noteId: body.createdNote.id,
-				choice: 2,
-			}, alice);
+			const res = await request(
+				"/notes/polls/vote",
+				{
+					noteId: body.createdNote.id,
+					choice: 2,
+				},
+				alice,
+			);
 
 			assert.strictEqual(res.status, 400);
 		}));
 
-		it('許可されている場合は複数投票できる', async(async () => {
-			const { body } = await request('/notes/create', {
-				text: 'test',
-				poll: {
-					choices: ['sakura', 'izumi', 'ako'],
-					multiple: true,
+		it("許可されている場合は複数投票できる", async(async () => {
+			const { body } = await request(
+				"/notes/create",
+				{
+					text: "test",
+					poll: {
+						choices: ["sakura", "izumi", "ako"],
+						multiple: true,
+					},
 				},
-			}, alice);
+				alice,
+			);
 
-			await request('/notes/polls/vote', {
-				noteId: body.createdNote.id,
-				choice: 0,
-			}, alice);
+			await request(
+				"/notes/polls/vote",
+				{
+					noteId: body.createdNote.id,
+					choice: 0,
+				},
+				alice,
+			);
 
-			await request('/notes/polls/vote', {
-				noteId: body.createdNote.id,
-				choice: 1,
-			}, alice);
+			await request(
+				"/notes/polls/vote",
+				{
+					noteId: body.createdNote.id,
+					choice: 1,
+				},
+				alice,
+			);
 
-			const res = await request('/notes/polls/vote', {
-				noteId: body.createdNote.id,
-				choice: 2,
-			}, alice);
+			const res = await request(
+				"/notes/polls/vote",
+				{
+					noteId: body.createdNote.id,
+					choice: 2,
+				},
+				alice,
+			);
 
 			assert.strictEqual(res.status, 204);
 		}));
 
-		it('締め切られている場合は投票できない', async(async () => {
-			const { body } = await request('/notes/create', {
-				text: 'test',
-				poll: {
-					choices: ['sakura', 'izumi', 'ako'],
-					expiredAfter: 1,
+		it("締め切られている場合は投票できない", async(async () => {
+			const { body } = await request(
+				"/notes/create",
+				{
+					text: "test",
+					poll: {
+						choices: ["sakura", "izumi", "ako"],
+						expiredAfter: 1,
+					},
 				},
-			}, alice);
+				alice,
+			);
 
-			await new Promise(x => setTimeout(x, 2));
+			await new Promise((x) => setTimeout(x, 2));
 
-			const res = await request('/notes/polls/vote', {
-				noteId: body.createdNote.id,
-				choice: 1,
-			}, alice);
+			const res = await request(
+				"/notes/polls/vote",
+				{
+					noteId: body.createdNote.id,
+					choice: 1,
+				},
+				alice,
+			);
 
 			assert.strictEqual(res.status, 400);
 		}));
 	});
 
-	describe('notes/delete', () => {
-		it('delete a reply', async(async () => {
-			const mainNoteRes = await api('notes/create', {
-				text: 'main post',
-			}, alice);
-			const replyOneRes = await api('notes/create', {
-				text: 'reply one',
-				replyId: mainNoteRes.body.createdNote.id,
-			}, alice);
-			const replyTwoRes = await api('notes/create', {
-				text: 'reply two',
-				replyId: mainNoteRes.body.createdNote.id,
-			}, alice);
+	describe("notes/delete", () => {
+		it("delete a reply", async(async () => {
+			const mainNoteRes = await api(
+				"notes/create",
+				{
+					text: "main post",
+				},
+				alice,
+			);
+			const replyOneRes = await api(
+				"notes/create",
+				{
+					text: "reply one",
+					replyId: mainNoteRes.body.createdNote.id,
+				},
+				alice,
+			);
+			const replyTwoRes = await api(
+				"notes/create",
+				{
+					text: "reply two",
+					replyId: mainNoteRes.body.createdNote.id,
+				},
+				alice,
+			);
 
-			const deleteOneRes = await api('notes/delete', {
-				noteId: replyOneRes.body.createdNote.id,
-			}, alice);
+			const deleteOneRes = await api(
+				"notes/delete",
+				{
+					noteId: replyOneRes.body.createdNote.id,
+				},
+				alice,
+			);
 
 			assert.strictEqual(deleteOneRes.status, 204);
-			let mainNote = await Notes.findOneBy({ id: mainNoteRes.body.createdNote.id });
+			let mainNote = await Notes.findOneBy({
+				id: mainNoteRes.body.createdNote.id,
+			});
 			assert.strictEqual(mainNote.repliesCount, 1);
 
-			const deleteTwoRes = await api('notes/delete', {
-				noteId: replyTwoRes.body.createdNote.id,
-			}, alice);
+			const deleteTwoRes = await api(
+				"notes/delete",
+				{
+					noteId: replyTwoRes.body.createdNote.id,
+				},
+				alice,
+			);
 
 			assert.strictEqual(deleteTwoRes.status, 204);
 			mainNote = await Notes.findOneBy({ id: mainNoteRes.body.createdNote.id });
diff --git a/packages/backend/test/prelude/maybe.ts b/packages/backend/test/prelude/maybe.ts
index 0f4b00065..df589981c 100644
--- a/packages/backend/test/prelude/maybe.ts
+++ b/packages/backend/test/prelude/maybe.ts
@@ -1,18 +1,18 @@
-import * as assert from 'assert';
-import { just, nothing } from '../../src/prelude/maybe.js';
+import * as assert from "assert";
+import { just, nothing } from "../../src/prelude/maybe.js";
 
-describe('just', () => {
-	it('has a value', () => {
+describe("just", () => {
+	it("has a value", () => {
 		assert.deepStrictEqual(just(3).isJust(), true);
 	});
 
-	it('has the inverse called get', () => {
+	it("has the inverse called get", () => {
 		assert.deepStrictEqual(just(3).get(), 3);
 	});
 });
 
-describe('nothing', () => {
-	it('has no value', () => {
+describe("nothing", () => {
+	it("has no value", () => {
 		assert.deepStrictEqual(nothing().isJust(), false);
 	});
 });
diff --git a/packages/backend/test/prelude/url.ts b/packages/backend/test/prelude/url.ts
index df102c8df..5d08ff892 100644
--- a/packages/backend/test/prelude/url.ts
+++ b/packages/backend/test/prelude/url.ts
@@ -1,13 +1,13 @@
-import * as assert from 'assert';
-import { query } from '../../src/prelude/url.js';
+import * as assert from "assert";
+import { query } from "../../src/prelude/url.js";
 
-describe('url', () => {
-	it('query', () => {
+describe("url", () => {
+	it("query", () => {
 		const s = query({
-			foo: 'ふぅ',
-			bar: 'b a r',
+			foo: "ふぅ",
+			bar: "b a r",
 			baz: undefined,
 		});
-		assert.deepStrictEqual(s, 'foo=%E3%81%B5%E3%81%85&bar=b%20a%20r');
+		assert.deepStrictEqual(s, "foo=%E3%81%B5%E3%81%85&bar=b%20a%20r");
 	});
 });
diff --git a/packages/backend/test/streaming.ts b/packages/backend/test/streaming.ts
index c2043ea56..3292c66e1 100644
--- a/packages/backend/test/streaming.ts
+++ b/packages/backend/test/streaming.ts
@@ -1,17 +1,26 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import * as childProcess from 'child_process';
-import { Following } from '../src/models/entities/following.js';
-import { connectStream, signup, api, post, startServer, shutdownServer, initTestDb, waitFire } from './utils.js';
+import * as assert from "assert";
+import * as childProcess from "child_process";
+import { Following } from "../src/models/entities/following.js";
+import {
+	connectStream,
+	signup,
+	api,
+	post,
+	startServer,
+	shutdownServer,
+	initTestDb,
+	waitFire,
+} from "./utils.js";
 
-describe('Streaming', () => {
+describe("Streaming", () => {
 	let p: childProcess.ChildProcess;
 	let Followings: any;
 
 	const follow = async (follower: any, followee: any) => {
 		await Followings.save({
-			id: 'a',
+			id: "a",
 			createdAt: new Date(),
 			followerId: follower.id,
 			followeeId: followee.id,
@@ -24,7 +33,7 @@ describe('Streaming', () => {
 		});
 	};
 
-	describe('Streaming', () => {
+	describe("Streaming", () => {
 		// Local users
 		let ayano: any;
 		let kyoko: any;
@@ -42,576 +51,716 @@ describe('Streaming', () => {
 			const connection = await initTestDb(true);
 			Followings = connection.getRepository(Following);
 
-			ayano = await signup({ username: 'ayano' });
-			kyoko = await signup({ username: 'kyoko' });
-			chitose = await signup({ username: 'chitose' });
+			ayano = await signup({ username: "ayano" });
+			kyoko = await signup({ username: "kyoko" });
+			chitose = await signup({ username: "chitose" });
 
-			akari = await signup({ username: 'akari', host: 'example.com' });
-			chinatsu = await signup({ username: 'chinatsu', host: 'example.com' });
+			akari = await signup({ username: "akari", host: "example.com" });
+			chinatsu = await signup({ username: "chinatsu", host: "example.com" });
 
-			kyokoNote = await post(kyoko, { text: 'foo' });
+			kyokoNote = await post(kyoko, { text: "foo" });
 
 			// Follow: ayano => kyoko
-			await api('following/create', { userId: kyoko.id }, ayano);
+			await api("following/create", { userId: kyoko.id }, ayano);
 
 			// Follow: ayano => akari
 			await follow(ayano, akari);
 
 			// List: chitose => ayano, kyoko
-			list = await api('users/lists/create', {
-				name: 'my list',
-			}, chitose).then(x => x.body);
+			list = await api(
+				"users/lists/create",
+				{
+					name: "my list",
+				},
+				chitose,
+			).then((x) => x.body);
 
-			await api('users/lists/push', {
-				listId: list.id,
-				userId: ayano.id,
-			}, chitose);
+			await api(
+				"users/lists/push",
+				{
+					listId: list.id,
+					userId: ayano.id,
+				},
+				chitose,
+			);
 
-			await api('users/lists/push', {
-				listId: list.id,
-				userId: kyoko.id,
-			}, chitose);
+			await api(
+				"users/lists/push",
+				{
+					listId: list.id,
+					userId: kyoko.id,
+				},
+				chitose,
+			);
 		});
 
 		after(async () => {
 			await shutdownServer(p);
 		});
 
-		describe('Events', () => {
-			it('mention event', async () => {
+		describe("Events", () => {
+			it("mention event", async () => {
 				const fired = await waitFire(
-					kyoko, 'main',	// kyoko:main
-					() => post(ayano, { text: 'foo @kyoko bar' }),	// ayano mention => kyoko
-					msg => msg.type === 'mention' && msg.body.userId === ayano.id	// wait ayano
+					kyoko,
+					"main", // kyoko:main
+					() => post(ayano, { text: "foo @kyoko bar" }), // ayano mention => kyoko
+					(msg) => msg.type === "mention" && msg.body.userId === ayano.id, // wait ayano
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('renote event', async () => {
+			it("renote event", async () => {
 				const fired = await waitFire(
-					kyoko, 'main',	// kyoko:main
-					() => post(ayano, { renoteId: kyokoNote.id }),	// ayano renote
-					msg => msg.type === 'renote' && msg.body.renoteId === kyokoNote.id	// wait renote
+					kyoko,
+					"main", // kyoko:main
+					() => post(ayano, { renoteId: kyokoNote.id }), // ayano renote
+					(msg) => msg.type === "renote" && msg.body.renoteId === kyokoNote.id, // wait renote
 				);
 
 				assert.strictEqual(fired, true);
 			});
 		});
 
-		describe('Home Timeline', () => {
-			it('自分の投稿が流れる', async () => {
+		describe("Home Timeline", () => {
+			it("自分の投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'homeTimeline',	// ayano:Home
-					() => api('notes/create', { text: 'foo' }, ayano),	// ayano posts
-					msg => msg.type === 'note' && msg.body.text === 'foo'
+					ayano,
+					"homeTimeline", // ayano:Home
+					() => api("notes/create", { text: "foo" }, ayano), // ayano posts
+					(msg) => msg.type === "note" && msg.body.text === "foo",
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしているユーザーの投稿が流れる', async () => {
+			it("フォローしているユーザーの投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'homeTimeline',		// ayano:home
-					() => api('notes/create', { text: 'foo' }, kyoko),	// kyoko posts
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id	// wait kyoko
+					ayano,
+					"homeTimeline", // ayano:home
+					() => api("notes/create", { text: "foo" }, kyoko), // kyoko posts
+					(msg) => msg.type === "note" && msg.body.userId === kyoko.id, // wait kyoko
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないユーザーの投稿は流れない', async () => {
+			it("フォローしていないユーザーの投稿は流れない", async () => {
 				const fired = await waitFire(
-					kyoko, 'homeTimeline',	// kyoko:home
-					() => api('notes/create', { text: 'foo' }, ayano),	// ayano posts
-					msg => msg.type === 'note' && msg.body.userId === ayano.id	// wait ayano
+					kyoko,
+					"homeTimeline", // kyoko:home
+					() => api("notes/create", { text: "foo" }, ayano), // ayano posts
+					(msg) => msg.type === "note" && msg.body.userId === ayano.id, // wait ayano
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしているユーザーのダイレクト投稿が流れる', async () => {
+			it("フォローしているユーザーのダイレクト投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'homeTimeline',	// ayano:home
-					() => api('notes/create', { text: 'foo', visibility: 'specified', visibleUserIds: [ayano.id], }, kyoko),	// kyoko dm => ayano
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id	// wait kyoko
+					ayano,
+					"homeTimeline", // ayano:home
+					() =>
+						api(
+							"notes/create",
+							{
+								text: "foo",
+								visibility: "specified",
+								visibleUserIds: [ayano.id],
+							},
+							kyoko,
+						), // kyoko dm => ayano
+					(msg) => msg.type === "note" && msg.body.userId === kyoko.id, // wait kyoko
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしているユーザーでも自分が指定されていないダイレクト投稿は流れない', async () => {
+			it("フォローしているユーザーでも自分が指定されていないダイレクト投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'homeTimeline',	// ayano:home
-					() => api('notes/create', { text: 'foo', visibility: 'specified', visibleUserIds: [chitose.id], }, kyoko),	// kyoko dm => chitose
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id	// wait kyoko
+					ayano,
+					"homeTimeline", // ayano:home
+					() =>
+						api(
+							"notes/create",
+							{
+								text: "foo",
+								visibility: "specified",
+								visibleUserIds: [chitose.id],
+							},
+							kyoko,
+						), // kyoko dm => chitose
+					(msg) => msg.type === "note" && msg.body.userId === kyoko.id, // wait kyoko
 				);
 
 				assert.strictEqual(fired, false);
 			});
-		});	// Home
+		}); // Home
 
-		describe('Local Timeline', () => {
-			it('自分の投稿が流れる', async () => {
+		describe("Local Timeline", () => {
+			it("自分の投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'localTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo' }, ayano),	// ayano posts
-					msg => msg.type === 'note' && msg.body.text === 'foo'
+					ayano,
+					"localTimeline", // ayano:Local
+					() => api("notes/create", { text: "foo" }, ayano), // ayano posts
+					(msg) => msg.type === "note" && msg.body.text === "foo",
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないローカルユーザーの投稿が流れる', async () => {
+			it("フォローしていないローカルユーザーの投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'localTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo' }, chitose),	// chitose posts
-					msg => msg.type === 'note' && msg.body.userId === chitose.id	// wait chitose
+					ayano,
+					"localTimeline", // ayano:Local
+					() => api("notes/create", { text: "foo" }, chitose), // chitose posts
+					(msg) => msg.type === "note" && msg.body.userId === chitose.id, // wait chitose
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('リモートユーザーの投稿は流れない', async () => {
+			it("リモートユーザーの投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'localTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo' }, chinatsu),	// chinatsu posts
-					msg => msg.type === 'note' && msg.body.userId === chinatsu.id	// wait chinatsu
+					ayano,
+					"localTimeline", // ayano:Local
+					() => api("notes/create", { text: "foo" }, chinatsu), // chinatsu posts
+					(msg) => msg.type === "note" && msg.body.userId === chinatsu.id, // wait chinatsu
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしてたとしてもリモートユーザーの投稿は流れない', async () => {
+			it("フォローしてたとしてもリモートユーザーの投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'localTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo' }, akari),	// akari posts
-					msg => msg.type === 'note' && msg.body.userId === akari.id	// wait akari
+					ayano,
+					"localTimeline", // ayano:Local
+					() => api("notes/create", { text: "foo" }, akari), // akari posts
+					(msg) => msg.type === "note" && msg.body.userId === akari.id, // wait akari
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
-			it('ホーム指定の投稿は流れない', async () => {
+			it("ホーム指定の投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'localTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo', visibility: 'home' }, kyoko),	// kyoko home posts
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id	// wait kyoko
+					ayano,
+					"localTimeline", // ayano:Local
+					() => api("notes/create", { text: "foo", visibility: "home" }, kyoko), // kyoko home posts
+					(msg) => msg.type === "note" && msg.body.userId === kyoko.id, // wait kyoko
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしているローカルユーザーのダイレクト投稿は流れない', async () => {
+			it("フォローしているローカルユーザーのダイレクト投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'localTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo', visibility: 'specified', visibleUserIds: [ayano.id] }, kyoko),	// kyoko DM => ayano
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id	// wait kyoko
+					ayano,
+					"localTimeline", // ayano:Local
+					() =>
+						api(
+							"notes/create",
+							{
+								text: "foo",
+								visibility: "specified",
+								visibleUserIds: [ayano.id],
+							},
+							kyoko,
+						), // kyoko DM => ayano
+					(msg) => msg.type === "note" && msg.body.userId === kyoko.id, // wait kyoko
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしていないローカルユーザーのフォロワー宛て投稿は流れない', async () => {
+			it("フォローしていないローカルユーザーのフォロワー宛て投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'localTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo', visibility: 'followers' }, chitose),
-					msg => msg.type === 'note' && msg.body.userId === chitose.id	// wait chitose
+					ayano,
+					"localTimeline", // ayano:Local
+					() =>
+						api(
+							"notes/create",
+							{ text: "foo", visibility: "followers" },
+							chitose,
+						),
+					(msg) => msg.type === "note" && msg.body.userId === chitose.id, // wait chitose
 				);
 
 				assert.strictEqual(fired, false);
 			});
 		});
 
-		describe('Recommended Timeline', () => {
-			it('自分の投稿が流れる', async () => {
+		describe("Recommended Timeline", () => {
+			it("自分の投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'recommendedTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo' }, ayano),	// ayano posts
-					msg => msg.type === 'note' && msg.body.text === 'foo'
+					ayano,
+					"recommendedTimeline", // ayano:Local
+					() => api("notes/create", { text: "foo" }, ayano), // ayano posts
+					(msg) => msg.type === "note" && msg.body.text === "foo",
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないローカルユーザーの投稿が流れる', async () => {
+			it("フォローしていないローカルユーザーの投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'recommendedTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo' }, chitose),	// chitose posts
-					msg => msg.type === 'note' && msg.body.userId === chitose.id	// wait chitose
+					ayano,
+					"recommendedTimeline", // ayano:Local
+					() => api("notes/create", { text: "foo" }, chitose), // chitose posts
+					(msg) => msg.type === "note" && msg.body.userId === chitose.id, // wait chitose
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('リモートユーザーの投稿は流れない', async () => {
+			it("リモートユーザーの投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'recommendedTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo' }, chinatsu),	// chinatsu posts
-					msg => msg.type === 'note' && msg.body.userId === chinatsu.id	// wait chinatsu
+					ayano,
+					"recommendedTimeline", // ayano:Local
+					() => api("notes/create", { text: "foo" }, chinatsu), // chinatsu posts
+					(msg) => msg.type === "note" && msg.body.userId === chinatsu.id, // wait chinatsu
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしてたとしてもリモートユーザーの投稿は流れない', async () => {
+			it("フォローしてたとしてもリモートユーザーの投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'recommendedTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo' }, akari),	// akari posts
-					msg => msg.type === 'note' && msg.body.userId === akari.id	// wait akari
+					ayano,
+					"recommendedTimeline", // ayano:Local
+					() => api("notes/create", { text: "foo" }, akari), // akari posts
+					(msg) => msg.type === "note" && msg.body.userId === akari.id, // wait akari
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
-			it('ホーム指定の投稿は流れない', async () => {
+			it("ホーム指定の投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'recommendedTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo', visibility: 'home' }, kyoko),	// kyoko home posts
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id	// wait kyoko
+					ayano,
+					"recommendedTimeline", // ayano:Local
+					() => api("notes/create", { text: "foo", visibility: "home" }, kyoko), // kyoko home posts
+					(msg) => msg.type === "note" && msg.body.userId === kyoko.id, // wait kyoko
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしているローカルユーザーのダイレクト投稿は流れない', async () => {
+			it("フォローしているローカルユーザーのダイレクト投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'recommendedTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo', visibility: 'specified', visibleUserIds: [ayano.id] }, kyoko),	// kyoko DM => ayano
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id	// wait kyoko
+					ayano,
+					"recommendedTimeline", // ayano:Local
+					() =>
+						api(
+							"notes/create",
+							{
+								text: "foo",
+								visibility: "specified",
+								visibleUserIds: [ayano.id],
+							},
+							kyoko,
+						), // kyoko DM => ayano
+					(msg) => msg.type === "note" && msg.body.userId === kyoko.id, // wait kyoko
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしていないローカルユーザーのフォロワー宛て投稿は流れない', async () => {
+			it("フォローしていないローカルユーザーのフォロワー宛て投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'recommendedTimeline',	// ayano:Local
-					() => api('notes/create', { text: 'foo', visibility: 'followers' }, chitose),
-					msg => msg.type === 'note' && msg.body.userId === chitose.id	// wait chitose
+					ayano,
+					"recommendedTimeline", // ayano:Local
+					() =>
+						api(
+							"notes/create",
+							{ text: "foo", visibility: "followers" },
+							chitose,
+						),
+					(msg) => msg.type === "note" && msg.body.userId === chitose.id, // wait chitose
 				);
 
 				assert.strictEqual(fired, false);
 			});
 		});
 
-		describe('Hybrid Timeline', () => {
-			it('自分の投稿が流れる', async () => {
+		describe("Hybrid Timeline", () => {
+			it("自分の投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'hybridTimeline',	// ayano:Hybrid
-					() => api('notes/create', { text: 'foo' }, ayano),	// ayano posts
-					msg => msg.type === 'note' && msg.body.text === 'foo'
+					ayano,
+					"hybridTimeline", // ayano:Hybrid
+					() => api("notes/create", { text: "foo" }, ayano), // ayano posts
+					(msg) => msg.type === "note" && msg.body.text === "foo",
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないローカルユーザーの投稿が流れる', async () => {
+			it("フォローしていないローカルユーザーの投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'hybridTimeline',	// ayano:Hybrid
-					() => api('notes/create', { text: 'foo' }, chitose),	// chitose posts
-					msg => msg.type === 'note' && msg.body.userId === chitose.id	// wait chitose
+					ayano,
+					"hybridTimeline", // ayano:Hybrid
+					() => api("notes/create", { text: "foo" }, chitose), // chitose posts
+					(msg) => msg.type === "note" && msg.body.userId === chitose.id, // wait chitose
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしているリモートユーザーの投稿が流れる', async () => {
+			it("フォローしているリモートユーザーの投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'hybridTimeline',	// ayano:Hybrid
-					() => api('notes/create', { text: 'foo' }, akari),	// akari posts
-					msg => msg.type === 'note' && msg.body.userId === akari.id	// wait akari
+					ayano,
+					"hybridTimeline", // ayano:Hybrid
+					() => api("notes/create", { text: "foo" }, akari), // akari posts
+					(msg) => msg.type === "note" && msg.body.userId === akari.id, // wait akari
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないリモートユーザーの投稿は流れない', async () => {
+			it("フォローしていないリモートユーザーの投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'hybridTimeline',	// ayano:Hybrid
-					() => api('notes/create', { text: 'foo' }, chinatsu),	// chinatsu posts
-					msg => msg.type === 'note' && msg.body.userId === chinatsu.id	// wait chinatsu
+					ayano,
+					"hybridTimeline", // ayano:Hybrid
+					() => api("notes/create", { text: "foo" }, chinatsu), // chinatsu posts
+					(msg) => msg.type === "note" && msg.body.userId === chinatsu.id, // wait chinatsu
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしているユーザーのダイレクト投稿が流れる', async () => {
+			it("フォローしているユーザーのダイレクト投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'hybridTimeline',	// ayano:Hybrid
-					() => api('notes/create', { text: 'foo', visibility: 'specified', visibleUserIds: [ayano.id] }, kyoko),
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id	// wait kyoko
+					ayano,
+					"hybridTimeline", // ayano:Hybrid
+					() =>
+						api(
+							"notes/create",
+							{
+								text: "foo",
+								visibility: "specified",
+								visibleUserIds: [ayano.id],
+							},
+							kyoko,
+						),
+					(msg) => msg.type === "note" && msg.body.userId === kyoko.id, // wait kyoko
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしているユーザーのホーム投稿が流れる', async () => {
+			it("フォローしているユーザーのホーム投稿が流れる", async () => {
 				const fired = await waitFire(
-					ayano, 'hybridTimeline',	// ayano:Hybrid
-					() => api('notes/create', { text: 'foo', visibility: 'home' }, kyoko),
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id	// wait kyoko
+					ayano,
+					"hybridTimeline", // ayano:Hybrid
+					() => api("notes/create", { text: "foo", visibility: "home" }, kyoko),
+					(msg) => msg.type === "note" && msg.body.userId === kyoko.id, // wait kyoko
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないローカルユーザーのホーム投稿は流れない', async () => {
+			it("フォローしていないローカルユーザーのホーム投稿は流れない", async () => {
 				const fired = await waitFire(
-					ayano, 'hybridTimeline',	// ayano:Hybrid
-					() => api('notes/create', { text: 'foo', visibility: 'home' }, chitose),
-					msg => msg.type === 'note' && msg.body.userId === chitose.id
+					ayano,
+					"hybridTimeline", // ayano:Hybrid
+					() =>
+						api("notes/create", { text: "foo", visibility: "home" }, chitose),
+					(msg) => msg.type === "note" && msg.body.userId === chitose.id,
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
-			it('フォローしていないローカルユーザーのフォロワー宛て投稿は流れない', () => async () => {
+			it("フォローしていないローカルユーザーのフォロワー宛て投稿は流れない", () =>
+				async () => {
+					const fired = await waitFire(
+						ayano,
+						"hybridTimeline", // ayano:Hybrid
+						() =>
+							api(
+								"notes/create",
+								{ text: "foo", visibility: "followers" },
+								chitose,
+							),
+						(msg) => msg.type === "note" && msg.body.userId === chitose.id,
+					);
+
+					assert.strictEqual(fired, false);
+				});
+		});
+
+		describe("Global Timeline", () => {
+			it("フォローしていないローカルユーザーの投稿が流れる", () => async () => {
 				const fired = await waitFire(
-					ayano, 'hybridTimeline',	// ayano:Hybrid
-					() => api('notes/create', { text: 'foo', visibility: 'followers' }, chitose),
-					msg => msg.type === 'note' && msg.body.userId === chitose.id
+					ayano,
+					"globalTimeline", // ayano:Global
+					() => api("notes/create", { text: "foo" }, chitose), // chitose posts
+					(msg) => msg.type === "note" && msg.body.userId === chitose.id, // wait chitose
+				);
+
+				assert.strictEqual(fired, true);
+			});
+
+			it("フォローしていないリモートユーザーの投稿が流れる", () => async () => {
+				const fired = await waitFire(
+					ayano,
+					"globalTimeline", // ayano:Global
+					() => api("notes/create", { text: "foo" }, chinatsu), // chinatsu posts
+					(msg) => msg.type === "note" && msg.body.userId === chinatsu.id, // wait chinatsu
+				);
+
+				assert.strictEqual(fired, true);
+			});
+
+			it("ホーム投稿は流れない", () => async () => {
+				const fired = await waitFire(
+					ayano,
+					"globalTimeline", // ayano:Global
+					() => api("notes/create", { text: "foo", visibility: "home" }, kyoko), // kyoko posts
+					(msg) => msg.type === "note" && msg.body.userId === kyoko.id, // wait kyoko
 				);
 
 				assert.strictEqual(fired, false);
 			});
 		});
 
-		describe('Global Timeline', () => {
-			it('フォローしていないローカルユーザーの投稿が流れる', () => async () => {
+		describe("UserList Timeline", () => {
+			it("リストに入れているユーザーの投稿が流れる", () => async () => {
 				const fired = await waitFire(
-					ayano, 'globalTimeline',	// ayano:Global
-					() => api('notes/create', { text: 'foo' }, chitose),	// chitose posts
-					msg => msg.type === 'note' && msg.body.userId === chitose.id	// wait chitose
+					chitose,
+					"userList",
+					() => api("notes/create", { text: "foo" }, ayano),
+					(msg) => msg.type === "note" && msg.body.userId === ayano.id,
+					{ listId: list.id },
 				);
 
 				assert.strictEqual(fired, true);
 			});
 
-			it('フォローしていないリモートユーザーの投稿が流れる', () => async () => {
+			it("リストに入れていないユーザーの投稿は流れない", () => async () => {
 				const fired = await waitFire(
-					ayano, 'globalTimeline',	// ayano:Global
-					() => api('notes/create', { text: 'foo' }, chinatsu),	// chinatsu posts
-					msg => msg.type === 'note' && msg.body.userId === chinatsu.id	// wait chinatsu
-				);
-
-				assert.strictEqual(fired, true);
-			});
-
-			it('ホーム投稿は流れない', () => async () => {
-				const fired = await waitFire(
-					ayano, 'globalTimeline',	// ayano:Global
-					() => api('notes/create', { text: 'foo', visibility: 'home' }, kyoko),	// kyoko posts
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id	// wait kyoko
-				);
-
-				assert.strictEqual(fired, false);
-			});
-		});
-
-		describe('UserList Timeline', () => {
-			it('リストに入れているユーザーの投稿が流れる', () => async () => {
-				const fired = await waitFire(
-					chitose, 'userList',
-					() => api('notes/create', { text: 'foo' }, ayano),
-					msg => msg.type === 'note' && msg.body.userId === ayano.id,
-					{ listId: list.id, }
-				);
-
-				assert.strictEqual(fired, true);
-			});
-
-			it('リストに入れていないユーザーの投稿は流れない', () => async () => {
-				const fired = await waitFire(
-					chitose, 'userList',
-					() => api('notes/create', { text: 'foo' }, chinatsu),
-					msg => msg.type === 'note' && msg.body.userId === chinatsu.id,
-					{ listId: list.id, }
+					chitose,
+					"userList",
+					() => api("notes/create", { text: "foo" }, chinatsu),
+					(msg) => msg.type === "note" && msg.body.userId === chinatsu.id,
+					{ listId: list.id },
 				);
 
 				assert.strictEqual(fired, false);
 			});
 
 			// #4471
-			it('リストに入れているユーザーのダイレクト投稿が流れる', () => async () => {
-				const fired = await waitFire(
-					chitose, 'userList',
-					() => api('notes/create', { text: 'foo', visibility: 'specified', visibleUserIds: [chitose.id] }, ayano),
-					msg => msg.type === 'note' && msg.body.userId === ayano.id,
-					{ listId: list.id, }
-				);
+			it("リストに入れているユーザーのダイレクト投稿が流れる", () =>
+				async () => {
+					const fired = await waitFire(
+						chitose,
+						"userList",
+						() =>
+							api(
+								"notes/create",
+								{
+									text: "foo",
+									visibility: "specified",
+									visibleUserIds: [chitose.id],
+								},
+								ayano,
+							),
+						(msg) => msg.type === "note" && msg.body.userId === ayano.id,
+						{ listId: list.id },
+					);
 
-				assert.strictEqual(fired, true);
-			});
+					assert.strictEqual(fired, true);
+				});
 
 			// #4335
-			it('リストに入れているがフォローはしてないユーザーのフォロワー宛て投稿は流れない', () => async () => {
-				const fired = await waitFire(
-					chitose, 'userList',
-					() => api('notes/create', { text: 'foo', visibility: 'followers' }, kyoko),
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id,
-					{ listId: list.id, }
-				);
+			it("リストに入れているがフォローはしてないユーザーのフォロワー宛て投稿は流れない", () =>
+				async () => {
+					const fired = await waitFire(
+						chitose,
+						"userList",
+						() =>
+							api(
+								"notes/create",
+								{ text: "foo", visibility: "followers" },
+								kyoko,
+							),
+						(msg) => msg.type === "note" && msg.body.userId === kyoko.id,
+						{ listId: list.id },
+					);
 
-				assert.strictEqual(fired, false);
-			});
+					assert.strictEqual(fired, false);
+				});
 		});
 
-		describe('Hashtag Timeline', () => {
-			it('指定したハッシュタグの投稿が流れる', () => new Promise<void>(async done => {
-				const ws = await connectStream(chitose, 'hashtag', ({ type, body }) => {
-					if (type == 'note') {
-						assert.deepStrictEqual(body.text, '#foo');
+		describe("Hashtag Timeline", () => {
+			it("指定したハッシュタグの投稿が流れる", () =>
+				new Promise<void>(async (done) => {
+					const ws = await connectStream(
+						chitose,
+						"hashtag",
+						({ type, body }) => {
+							if (type == "note") {
+								assert.deepStrictEqual(body.text, "#foo");
+								ws.close();
+								done();
+							}
+						},
+						{
+							q: [["foo"]],
+						},
+					);
+
+					post(chitose, {
+						text: "#foo",
+					});
+				}));
+
+			it("指定したハッシュタグの投稿が流れる (AND)", () =>
+				new Promise<void>(async (done) => {
+					let fooCount = 0;
+					let barCount = 0;
+					let fooBarCount = 0;
+
+					const ws = await connectStream(
+						chitose,
+						"hashtag",
+						({ type, body }) => {
+							if (type == "note") {
+								if (body.text === "#foo") fooCount++;
+								if (body.text === "#bar") barCount++;
+								if (body.text === "#foo #bar") fooBarCount++;
+							}
+						},
+						{
+							q: [["foo", "bar"]],
+						},
+					);
+
+					post(chitose, {
+						text: "#foo",
+					});
+
+					post(chitose, {
+						text: "#bar",
+					});
+
+					post(chitose, {
+						text: "#foo #bar",
+					});
+
+					setTimeout(() => {
+						assert.strictEqual(fooCount, 0);
+						assert.strictEqual(barCount, 0);
+						assert.strictEqual(fooBarCount, 1);
 						ws.close();
 						done();
-					}
-				}, {
-					q: [
-						['foo'],
-					],
-				});
+					}, 3000);
+				}));
 
-				post(chitose, {
-					text: '#foo',
-				});
-			}));
+			it("指定したハッシュタグの投稿が流れる (OR)", () =>
+				new Promise<void>(async (done) => {
+					let fooCount = 0;
+					let barCount = 0;
+					let fooBarCount = 0;
+					let piyoCount = 0;
 
-			it('指定したハッシュタグの投稿が流れる (AND)', () => new Promise<void>(async done => {
-				let fooCount = 0;
-				let barCount = 0;
-				let fooBarCount = 0;
-	
-				const ws = await connectStream(chitose, 'hashtag', ({ type, body }) => {
-					if (type == 'note') {
-						if (body.text === '#foo') fooCount++;
-						if (body.text === '#bar') barCount++;
-						if (body.text === '#foo #bar') fooBarCount++;
-					}
-				}, {
-					q: [
-						['foo', 'bar'],
-					],
-				});
-	
-				post(chitose, {
-					text: '#foo',
-				});
-	
-				post(chitose, {
-					text: '#bar',
-				});
-	
-				post(chitose, {
-					text: '#foo #bar',
-				});
-	
-				setTimeout(() => {
-					assert.strictEqual(fooCount, 0);
-					assert.strictEqual(barCount, 0);
-					assert.strictEqual(fooBarCount, 1);
-					ws.close();
-					done();
-				}, 3000);
-			}));
+					const ws = await connectStream(
+						chitose,
+						"hashtag",
+						({ type, body }) => {
+							if (type == "note") {
+								if (body.text === "#foo") fooCount++;
+								if (body.text === "#bar") barCount++;
+								if (body.text === "#foo #bar") fooBarCount++;
+								if (body.text === "#piyo") piyoCount++;
+							}
+						},
+						{
+							q: [["foo"], ["bar"]],
+						},
+					);
 
-			it('指定したハッシュタグの投稿が流れる (OR)', () => new Promise<void>(async done => {
-				let fooCount = 0;
-				let barCount = 0;
-				let fooBarCount = 0;
-				let piyoCount = 0;
+					post(chitose, {
+						text: "#foo",
+					});
 
-				const ws = await connectStream(chitose, 'hashtag', ({ type, body }) => {
-					if (type == 'note') {
-						if (body.text === '#foo') fooCount++;
-						if (body.text === '#bar') barCount++;
-						if (body.text === '#foo #bar') fooBarCount++;
-						if (body.text === '#piyo') piyoCount++;
-					}
-				}, {
-					q: [
-						['foo'],
-						['bar'],
-					],
-				});
+					post(chitose, {
+						text: "#bar",
+					});
 
-				post(chitose, {
-					text: '#foo',
-				});
+					post(chitose, {
+						text: "#foo #bar",
+					});
 
-				post(chitose, {
-					text: '#bar',
-				});
+					post(chitose, {
+						text: "#piyo",
+					});
 
-				post(chitose, {
-					text: '#foo #bar',
-				});
+					setTimeout(() => {
+						assert.strictEqual(fooCount, 1);
+						assert.strictEqual(barCount, 1);
+						assert.strictEqual(fooBarCount, 1);
+						assert.strictEqual(piyoCount, 0);
+						ws.close();
+						done();
+					}, 3000);
+				}));
 
-				post(chitose, {
-					text: '#piyo',
-				});
+			it("指定したハッシュタグの投稿が流れる (AND + OR)", () =>
+				new Promise<void>(async (done) => {
+					let fooCount = 0;
+					let barCount = 0;
+					let fooBarCount = 0;
+					let piyoCount = 0;
+					let waaaCount = 0;
 
-				setTimeout(() => {
-					assert.strictEqual(fooCount, 1);
-					assert.strictEqual(barCount, 1);
-					assert.strictEqual(fooBarCount, 1);
-					assert.strictEqual(piyoCount, 0);
-					ws.close();
-					done();
-				}, 3000);
-			}));
+					const ws = await connectStream(
+						chitose,
+						"hashtag",
+						({ type, body }) => {
+							if (type == "note") {
+								if (body.text === "#foo") fooCount++;
+								if (body.text === "#bar") barCount++;
+								if (body.text === "#foo #bar") fooBarCount++;
+								if (body.text === "#piyo") piyoCount++;
+								if (body.text === "#waaa") waaaCount++;
+							}
+						},
+						{
+							q: [["foo", "bar"], ["piyo"]],
+						},
+					);
 
-			it('指定したハッシュタグの投稿が流れる (AND + OR)', () => new Promise<void>(async done => {
-				let fooCount = 0;
-				let barCount = 0;
-				let fooBarCount = 0;
-				let piyoCount = 0;
-				let waaaCount = 0;
+					post(chitose, {
+						text: "#foo",
+					});
 
-				const ws = await connectStream(chitose, 'hashtag', ({ type, body }) => {
-					if (type == 'note') {
-						if (body.text === '#foo') fooCount++;
-						if (body.text === '#bar') barCount++;
-						if (body.text === '#foo #bar') fooBarCount++;
-						if (body.text === '#piyo') piyoCount++;
-						if (body.text === '#waaa') waaaCount++;
-					}
-				}, {
-					q: [
-						['foo', 'bar'],
-						['piyo'],
-					],
-				});
+					post(chitose, {
+						text: "#bar",
+					});
 
-				post(chitose, {
-					text: '#foo',
-				});
+					post(chitose, {
+						text: "#foo #bar",
+					});
 
-				post(chitose, {
-					text: '#bar',
-				});
+					post(chitose, {
+						text: "#piyo",
+					});
 
-				post(chitose, {
-					text: '#foo #bar',
-				});
+					post(chitose, {
+						text: "#waaa",
+					});
 
-				post(chitose, {
-					text: '#piyo',
-				});
-
-				post(chitose, {
-					text: '#waaa',
-				});
-
-				setTimeout(() => {
-					assert.strictEqual(fooCount, 0);
-					assert.strictEqual(barCount, 0);
-					assert.strictEqual(fooBarCount, 1);
-					assert.strictEqual(piyoCount, 1);
-					assert.strictEqual(waaaCount, 0);
-					ws.close();
-					done();
-				}, 3000);
-			}));
+					setTimeout(() => {
+						assert.strictEqual(fooCount, 0);
+						assert.strictEqual(barCount, 0);
+						assert.strictEqual(fooBarCount, 1);
+						assert.strictEqual(piyoCount, 1);
+						assert.strictEqual(waaaCount, 0);
+						ws.close();
+						done();
+					}, 3000);
+				}));
 		});
 	});
 });
diff --git a/packages/backend/test/thread-mute.ts b/packages/backend/test/thread-mute.ts
index cd3e51939..9b3bb8dfe 100644
--- a/packages/backend/test/thread-mute.ts
+++ b/packages/backend/test/thread-mute.ts
@@ -1,10 +1,19 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import * as childProcess from 'child_process';
-import { async, signup, request, post, react, connectStream, startServer, shutdownServer } from './utils.js';
+import * as assert from "assert";
+import * as childProcess from "child_process";
+import {
+	async,
+	signup,
+	request,
+	post,
+	react,
+	connectStream,
+	startServer,
+	shutdownServer,
+} from "./utils.js";
 
-describe('Note thread mute', () => {
+describe("Note thread mute", () => {
 	let p: childProcess.ChildProcess;
 
 	let alice: any;
@@ -13,90 +22,139 @@ describe('Note thread mute', () => {
 
 	before(async () => {
 		p = await startServer();
-		alice = await signup({ username: 'alice' });
-		bob = await signup({ username: 'bob' });
-		carol = await signup({ username: 'carol' });
+		alice = await signup({ username: "alice" });
+		bob = await signup({ username: "bob" });
+		carol = await signup({ username: "carol" });
 	});
 
 	after(async () => {
 		await shutdownServer(p);
 	});
 
-	it('notes/mentions にミュートしているスレッドの投稿が含まれない', async(async () => {
-		const bobNote = await post(bob, { text: '@alice @carol root note' });
-		const aliceReply = await post(alice, { replyId: bobNote.id, text: '@bob @carol child note' });
+	it("notes/mentions にミュートしているスレッドの投稿が含まれない", async(async () => {
+		const bobNote = await post(bob, { text: "@alice @carol root note" });
+		const aliceReply = await post(alice, {
+			replyId: bobNote.id,
+			text: "@bob @carol child note",
+		});
 
-		await request('/notes/thread-muting/create', { noteId: bobNote.id }, alice);
+		await request("/notes/thread-muting/create", { noteId: bobNote.id }, alice);
 
-		const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
-		const carolReplyWithoutMention = await post(carol, { replyId: aliceReply.id, text: 'child note' });
+		const carolReply = await post(carol, {
+			replyId: bobNote.id,
+			text: "@bob @alice child note",
+		});
+		const carolReplyWithoutMention = await post(carol, {
+			replyId: aliceReply.id,
+			text: "child note",
+		});
 
-		const res = await request('/notes/mentions', {}, alice);
+		const res = await request("/notes/mentions", {}, alice);
 
 		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: 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,
+		);
 	}));
 
-	it('ミュートしているスレッドからメンションされても、hasUnreadMentions が true にならない', async(async () => {
+	it("ミュートしているスレッドからメンションされても、hasUnreadMentions が true にならない", async(async () => {
 		// 状態リセット
-		await request('/i/read-all-unread-notes', {}, alice);
+		await request("/i/read-all-unread-notes", {}, alice);
 
-		const bobNote = await post(bob, { text: '@alice @carol root note' });
+		const bobNote = await post(bob, { text: "@alice @carol root note" });
 
-		await request('/notes/thread-muting/create', { noteId: bobNote.id }, alice);
+		await request("/notes/thread-muting/create", { noteId: bobNote.id }, alice);
 
-		const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
+		const carolReply = await post(carol, {
+			replyId: bobNote.id,
+			text: "@bob @alice child note",
+		});
 
-		const res = await request('/i', {}, alice);
+		const res = await request("/i", {}, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(res.body.hasUnreadMentions, false);
 	}));
 
-	it('ミュートしているスレッドからメンションされても、ストリームに unreadMention イベントが流れてこない', () => new Promise(async done => {
-		// 状態リセット
-		await request('/i/read-all-unread-notes', {}, alice);
+	it("ミュートしているスレッドからメンションされても、ストリームに unreadMention イベントが流れてこない", () =>
+		new Promise(async (done) => {
+			// 状態リセット
+			await request("/i/read-all-unread-notes", {}, alice);
 
-		const bobNote = await post(bob, { text: '@alice @carol root note' });
+			const bobNote = await post(bob, { text: "@alice @carol root note" });
 
-		await request('/notes/thread-muting/create', { noteId: bobNote.id }, alice);
+			await request(
+				"/notes/thread-muting/create",
+				{ noteId: bobNote.id },
+				alice,
+			);
 
-		let fired = false;
+			let fired = false;
 
-		const ws = await connectStream(alice, 'main', async ({ type, body }) => {
-			if (type === 'unreadMention') {
-				if (body === bobNote.id) return;
-				fired = true;
-			}
+			const ws = await connectStream(alice, "main", async ({ type, body }) => {
+				if (type === "unreadMention") {
+					if (body === bobNote.id) return;
+					fired = true;
+				}
+			});
+
+			const carolReply = await post(carol, {
+				replyId: bobNote.id,
+				text: "@bob @alice child note",
+			});
+
+			setTimeout(() => {
+				assert.strictEqual(fired, false);
+				ws.close();
+				done();
+			}, 5000);
+		}));
+
+	it("i/notifications にミュートしているスレッドの通知が含まれない", async(async () => {
+		const bobNote = await post(bob, { text: "@alice @carol root note" });
+		const aliceReply = await post(alice, {
+			replyId: bobNote.id,
+			text: "@bob @carol child note",
 		});
 
-		const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
+		await request("/notes/thread-muting/create", { noteId: bobNote.id }, alice);
 
-		setTimeout(() => {
-			assert.strictEqual(fired, false);
-			ws.close();
-			done();
-		}, 5000);
-	}));
+		const carolReply = await post(carol, {
+			replyId: bobNote.id,
+			text: "@bob @alice child note",
+		});
+		const carolReplyWithoutMention = await post(carol, {
+			replyId: aliceReply.id,
+			text: "child note",
+		});
 
-	it('i/notifications にミュートしているスレッドの通知が含まれない', async(async () => {
-		const bobNote = await post(bob, { text: '@alice @carol root note' });
-		const aliceReply = await post(alice, { replyId: bobNote.id, text: '@bob @carol child note' });
-
-		await request('/notes/thread-muting/create', { noteId: bobNote.id }, alice);
-
-		const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
-		const carolReplyWithoutMention = await post(carol, { replyId: aliceReply.id, text: 'child note' });
-
-		const res = await request('/i/notifications', {}, alice);
+		const res = await request("/i/notifications", {}, alice);
 
 		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: any) => notification.note.id === carolReply.id,
+			),
+			false,
+		);
+		assert.strictEqual(
+			res.body.some(
+				(notification: any) =>
+					notification.note.id === carolReplyWithoutMention.id,
+			),
+			false,
+		);
 
 		// NOTE: bobの投稿はスレッドミュート前に行われたため通知に含まれていてもよい
 	}));
diff --git a/packages/backend/test/user-notes.ts b/packages/backend/test/user-notes.ts
index 4447754d6..86a541c10 100644
--- a/packages/backend/test/user-notes.ts
+++ b/packages/backend/test/user-notes.ts
@@ -1,10 +1,18 @@
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-import * as assert from 'assert';
-import * as childProcess from 'child_process';
-import { async, signup, request, post, uploadUrl, startServer, shutdownServer } from './utils.js';
+import * as assert from "assert";
+import * as childProcess from "child_process";
+import {
+	async,
+	signup,
+	request,
+	post,
+	uploadUrl,
+	startServer,
+	shutdownServer,
+} from "./utils.js";
 
-describe('users/notes', () => {
+describe("users/notes", () => {
 	let p: childProcess.ChildProcess;
 
 	let alice: any;
@@ -14,9 +22,15 @@ describe('users/notes', () => {
 
 	before(async () => {
 		p = await startServer();
-		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');
+		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",
+		);
 		jpgNote = await post(alice, {
 			fileIds: [jpg.id],
 		});
@@ -28,34 +42,57 @@ describe('users/notes', () => {
 		});
 	});
 
-	after(async() => {
+	after(async () => {
 		await shutdownServer(p);
 	});
 
-	it('ファイルタイプ指定 (jpg)', async(async () => {
-		const res = await request('/users/notes', {
-			userId: alice.id,
-			fileType: ['image/jpeg'],
-		}, alice);
+	it("ファイルタイプ指定 (jpg)", async(async () => {
+		const res = await request(
+			"/users/notes",
+			{
+				userId: alice.id,
+				fileType: ["image/jpeg"],
+			},
+			alice,
+		);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
 		assert.strictEqual(res.body.length, 2);
-		assert.strictEqual(res.body.some((note: any) => note.id === jpgNote.id), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === jpgPngNote.id), true);
+		assert.strictEqual(
+			res.body.some((note: any) => note.id === jpgNote.id),
+			true,
+		);
+		assert.strictEqual(
+			res.body.some((note: any) => note.id === jpgPngNote.id),
+			true,
+		);
 	}));
 
-	it('ファイルタイプ指定 (jpg or png)', async(async () => {
-		const res = await request('/users/notes', {
-			userId: alice.id,
-			fileType: ['image/jpeg', 'image/png'],
-		}, alice);
+	it("ファイルタイプ指定 (jpg or png)", async(async () => {
+		const res = await request(
+			"/users/notes",
+			{
+				userId: alice.id,
+				fileType: ["image/jpeg", "image/png"],
+			},
+			alice,
+		);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
 		assert.strictEqual(res.body.length, 3);
-		assert.strictEqual(res.body.some((note: any) => note.id === jpgNote.id), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === pngNote.id), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === jpgPngNote.id), true);
+		assert.strictEqual(
+			res.body.some((note: any) => note.id === jpgNote.id),
+			true,
+		);
+		assert.strictEqual(
+			res.body.some((note: any) => note.id === pngNote.id),
+			true,
+		);
+		assert.strictEqual(
+			res.body.some((note: any) => note.id === jpgPngNote.id),
+			true,
+		);
 	}));
 });
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index 6833e6eb5..f3f68b260 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -1,18 +1,18 @@
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
-import * as childProcess from 'child_process';
-import * as http from 'node:http';
-import { SIGKILL } from 'constants';
-import WebSocket from 'ws';
-import * as misskey from 'calckey-js';
-import fetch from 'node-fetch';
-import FormData from 'form-data';
-import { DataSource } from 'typeorm';
-import loadConfig from '../src/config/load.js';
-import { entities } from '../src/db/postgre.js';
-import got from 'got';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+import { dirname } from "node:path";
+import * as childProcess from "child_process";
+import * as http from "node:http";
+import { SIGKILL } from "constants";
+import WebSocket from "ws";
+import * as misskey from "calckey-js";
+import fetch from "node-fetch";
+import FormData from "form-data";
+import { DataSource } from "typeorm";
+import loadConfig from "../src/config/load.js";
+import { entities } from "../src/db/postgre.js";
+import got from "got";
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
@@ -21,24 +21,29 @@ const config = loadConfig();
 export const port = config.port;
 
 export const async = (fn: Function) => (done: Function) => {
-	fn().then(() => {
-		done();
-	}, (err: Error) => {
-		done(err);
-	});
+	fn().then(
+		() => {
+			done();
+		},
+		(err: Error) => {
+			done(err);
+		},
+	);
 };
 
 export const api = async (endpoint: string, params: any, me?: any) => {
-	endpoint = endpoint.replace(/^\//, '');
+	endpoint = endpoint.replace(/^\//, "");
 
-	const auth = me ? {
-		i: me.token
-	} : {};
+	const auth = me
+		? {
+				i: me.token,
+		  }
+		: {};
 
 	const res = await got<string>(`http://localhost:${port}/api/${endpoint}`, {
-		method: 'POST',
+		method: "POST",
 		headers: {
-			'Content-Type': 'application/json'
+			"Content-Type": "application/json",
 		},
 		body: JSON.stringify(Object.assign(auth, params)),
 		retry: {
@@ -46,12 +51,12 @@ export const api = async (endpoint: string, params: any, me?: any) => {
 		},
 		hooks: {
 			beforeError: [
-				error => {
+				(error) => {
 					const { response } = error;
 					if (response && response.body) console.warn(response.body);
 					return error;
-				}
-			]
+				},
+			],
 		},
 	});
 
@@ -60,19 +65,25 @@ export const api = async (endpoint: string, params: any, me?: any) => {
 
 	return {
 		status,
-		body
+		body,
 	};
 };
 
-export const request = async (endpoint: string, params: any, me?: any): Promise<{ body: any, status: number }> => {
-	const auth = me ? {
-		i: me.token,
-	} : {};
+export const request = async (
+	endpoint: string,
+	params: any,
+	me?: any,
+): Promise<{ body: any; status: number }> => {
+	const auth = me
+		? {
+				i: me.token,
+		  }
+		: {};
 
 	const res = await fetch(`http://localhost:${port}/api${endpoint}`, {
-		method: 'POST',
+		method: "POST",
 		headers: {
-			'Content-Type': 'application/json',
+			"Content-Type": "application/json",
 		},
 		body: JSON.stringify(Object.assign(auth, params)),
 	});
@@ -81,36 +92,54 @@ export const request = async (endpoint: string, params: any, me?: any): Promise<
 	const body = res.status !== 204 ? await res.json().catch() : null;
 
 	return {
-		body, status,
+		body,
+		status,
 	};
 };
 
 export const signup = async (params?: any): Promise<any> => {
-	const q = Object.assign({
-		username: 'test',
-		password: 'test',
-	}, params);
+	const q = Object.assign(
+		{
+			username: "test",
+			password: "test",
+		},
+		params,
+	);
 
-	const res = await api('signup', q);
+	const res = await api("signup", q);
 
 	return res.body;
 };
 
-export const post = async (user: any, params?: misskey.Endpoints['notes/create']['req']): Promise<misskey.entities.Note> => {
-	const q = Object.assign({
-		text: 'test',
-	}, params);
+export const post = async (
+	user: any,
+	params?: misskey.Endpoints["notes/create"]["req"],
+): Promise<misskey.entities.Note> => {
+	const q = Object.assign(
+		{
+			text: "test",
+		},
+		params,
+	);
 
-	const res = await api('notes/create', q, user);
+	const res = await api("notes/create", q, user);
 
 	return res.body ? res.body.createdNote : null;
 };
 
-export const react = async (user: any, note: any, reaction: string): Promise<any> => {
-	await api('notes/reactions/create', {
-		noteId: note.id,
-		reaction: reaction,
-	}, user);
+export const react = async (
+	user: any,
+	note: any,
+	reaction: string,
+): Promise<any> => {
+	await api(
+		"notes/reactions/create",
+		{
+			noteId: note.id,
+			reaction: reaction,
+		},
+		user,
+	);
 };
 
 /**
@@ -119,20 +148,28 @@ export const react = async (user: any, note: any, reaction: string): Promise<any
  * @param _path Optional, absolute path or relative from ./resources/
  */
 export const uploadFile = async (user: any, _path?: string): Promise<any> => {
-	const absPath = _path == null ? `${_dirname}/resources/Lenna.jpg` : path.isAbsolute(_path) ? _path : `${_dirname}/resources/${_path}`;
+	const absPath =
+		_path == null
+			? `${_dirname}/resources/Lenna.jpg`
+			: path.isAbsolute(_path)
+			? _path
+			: `${_dirname}/resources/${_path}`;
 
 	const formData = new FormData() as any;
-	formData.append('i', user.token);
-	formData.append('file', fs.createReadStream(absPath));
-	formData.append('force', 'true');
+	formData.append("i", user.token);
+	formData.append("file", fs.createReadStream(absPath));
+	formData.append("force", "true");
 
-	const res = await got<string>(`http://localhost:${port}/api/drive/files/create`, {
-		method: 'POST',
-		body: formData,
-		retry: {
-			limit: 0,
+	const res = await got<string>(
+		`http://localhost:${port}/api/drive/files/create`,
+		{
+			method: "POST",
+			body: formData,
+			retry: {
+				limit: 0,
+			},
 		},
-	});
+	);
 
 	const body = res.statusCode !== 204 ? await JSON.parse(res.body) : null;
 
@@ -142,16 +179,20 @@ export const uploadFile = async (user: any, _path?: string): Promise<any> => {
 export const uploadUrl = async (user: any, url: string) => {
 	let file: any;
 
-	const ws = await connectStream(user, 'main', (msg) => {
-		if (msg.type === 'driveFileCreated') {
+	const ws = await connectStream(user, "main", (msg) => {
+		if (msg.type === "driveFileCreated") {
 			file = msg.body;
 		}
 	});
 
-	await api('drive/files/upload-from-url', {
-		url,
-		force: true,
-	}, user);
+	await api(
+		"drive/files/upload-from-url",
+		{
+			url,
+			force: true,
+		},
+		user,
+	);
 
 	await sleep(5000);
 	ws.close();
@@ -159,46 +200,66 @@ export const uploadUrl = async (user: any, url: string) => {
 	return file;
 };
 
-export function connectStream(user: any, channel: string, listener: (message: Record<string, any>) => any, params?: any): Promise<WebSocket> {
+export function connectStream(
+	user: any,
+	channel: string,
+	listener: (message: Record<string, any>) => any,
+	params?: any,
+): Promise<WebSocket> {
 	return new Promise((res, rej) => {
-		const ws = new WebSocket(`ws://localhost:${port}/streaming?i=${user.token}`);
+		const ws = new WebSocket(
+			`ws://localhost:${port}/streaming?i=${user.token}`,
+		);
 
-		ws.on('open', () => {
-			ws.on('message', data => {
+		ws.on("open", () => {
+			ws.on("message", (data) => {
 				const msg = JSON.parse(data.toString());
-				if (msg.type === 'channel' && msg.body.id === 'a') {
+				if (msg.type === "channel" && msg.body.id === "a") {
 					listener(msg.body);
-				} else if (msg.type === 'connected' && msg.body.id === 'a') {
+				} else if (msg.type === "connected" && msg.body.id === "a") {
 					res(ws);
 				}
 			});
 
-			ws.send(JSON.stringify({
-				type: 'connect',
-				body: {
-					channel: channel,
-					id: 'a',
-					pong: true,
-					params: params,
-				},
-			}));
+			ws.send(
+				JSON.stringify({
+					type: "connect",
+					body: {
+						channel: channel,
+						id: "a",
+						pong: true,
+						params: params,
+					},
+				}),
+			);
 		});
 	});
 }
 
-export const waitFire = async (user: any, channel: string, trgr: () => any, cond: (msg: Record<string, any>) => boolean, params?: any) => {
+export const waitFire = async (
+	user: any,
+	channel: string,
+	trgr: () => any,
+	cond: (msg: Record<string, any>) => boolean,
+	params?: any,
+) => {
 	return new Promise<boolean>(async (res, rej) => {
 		let timer: NodeJS.Timeout;
 
 		let ws: WebSocket;
 		try {
-			ws = await connectStream(user, channel, msg => {
-				if (cond(msg)) {
-					ws.close();
-					if (timer) clearTimeout(timer);
-					res(true);
-				}
-			}, params);
+			ws = await connectStream(
+				user,
+				channel,
+				(msg) => {
+					if (cond(msg)) {
+						ws.close();
+						if (timer) clearTimeout(timer);
+						res(true);
+					}
+				},
+				params,
+			);
 		} catch (e) {
 			rej(e);
 		}
@@ -217,50 +278,63 @@ export const waitFire = async (user: any, channel: string, trgr: () => any, cond
 			if (timer) clearTimeout(timer);
 			rej(e);
 		}
-	})
+	});
 };
 
-export const simpleGet = async (path: string, accept = '*/*'): Promise<{ status?: number, type?: string, location?: string }> => {
+export const simpleGet = async (
+	path: string,
+	accept = "*/*",
+): Promise<{ status?: number; type?: string; location?: string }> => {
 	// node-fetchだと3xxを取れない
 	return await new Promise((resolve, reject) => {
-		const req = http.request(`http://localhost:${port}${path}`, {
-			headers: {
-				Accept: accept,
+		const req = http.request(
+			`http://localhost:${port}${path}`,
+			{
+				headers: {
+					Accept: accept,
+				},
 			},
-		}, res => {
-			if (res.statusCode! >= 400) {
-				reject(res);
-			} else {
-				resolve({
-					status: res.statusCode,
-					type: res.headers['content-type'],
-					location: res.headers.location,
-				});
-			}
-		});
+			(res) => {
+				if (res.statusCode! >= 400) {
+					reject(res);
+				} else {
+					resolve({
+						status: res.statusCode,
+						type: res.headers["content-type"],
+						location: res.headers.location,
+					});
+				}
+			},
+		);
 
 		req.end();
 	});
 };
 
-export function launchServer(callbackSpawnedProcess: (p: childProcess.ChildProcess) => void, moreProcess: () => Promise<void> = async () => {}) {
+export function launchServer(
+	callbackSpawnedProcess: (p: childProcess.ChildProcess) => void,
+	moreProcess: () => Promise<void> = async () => {},
+) {
 	return (done: (err?: Error) => any) => {
-		const p = childProcess.spawn('node', [_dirname + '/../index.js'], {
-			stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
-			env: { NODE_ENV: 'test', PATH: process.env.PATH },
+		const p = childProcess.spawn("node", [_dirname + "/../index.js"], {
+			stdio: ["inherit", "inherit", "inherit", "ipc"],
+			env: { NODE_ENV: "test", PATH: process.env.PATH },
 		});
 		callbackSpawnedProcess(p);
-		p.on('message', message => {
-			if (message === 'ok') moreProcess().then(() => done()).catch(e => done(e));
+		p.on("message", (message) => {
+			if (message === "ok")
+				moreProcess()
+					.then(() => done())
+					.catch((e) => done(e));
 		});
 	};
 }
 
 export async function initTestDb(justBorrow = false, initEntities?: any[]) {
-	if (process.env.NODE_ENV !== 'test') throw 'NODE_ENV is not a test';
+	if (process.env.NODE_ENV !== "test") throw "NODE_ENV is not a test";
 
 	const db = new DataSource({
-		type: 'postgres',
+		type: "postgres",
 		host: config.db.host,
 		port: config.db.port,
 		username: config.db.user,
@@ -276,22 +350,24 @@ export async function initTestDb(justBorrow = false, initEntities?: any[]) {
 	return db;
 }
 
-export function startServer(timeout = 60 * 1000): Promise<childProcess.ChildProcess> {
+export function startServer(
+	timeout = 60 * 1000,
+): Promise<childProcess.ChildProcess> {
 	return new Promise((res, rej) => {
 		const t = setTimeout(() => {
 			p.kill(SIGKILL);
-			rej('timeout to start');
+			rej("timeout to start");
 		}, timeout);
 
-		const p = childProcess.spawn('node', [_dirname + '/../built/index.js'], {
-			stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
-			env: { NODE_ENV: 'test', PATH: process.env.PATH },
+		const p = childProcess.spawn("node", [_dirname + "/../built/index.js"], {
+			stdio: ["inherit", "inherit", "inherit", "ipc"],
+			env: { NODE_ENV: "test", PATH: process.env.PATH },
 		});
 
-		p.on('error', e => rej(e));
+		p.on("error", (e) => rej(e));
 
-		p.on('message', message => {
-			if (message === 'ok') {
+		p.on("message", (message) => {
+			if (message === "ok") {
 				clearTimeout(t);
 				res(p);
 			}
@@ -299,16 +375,19 @@ export function startServer(timeout = 60 * 1000): Promise<childProcess.ChildProc
 	});
 }
 
-export function shutdownServer(p: childProcess.ChildProcess, timeout = 20 * 1000) {
+export function shutdownServer(
+	p: childProcess.ChildProcess,
+	timeout = 20 * 1000,
+) {
 	return new Promise((res, rej) => {
 		const t = setTimeout(() => {
 			p.kill(SIGKILL);
-			res('force exit');
+			res("force exit");
 		}, timeout);
 
-		p.once('exit', () => {
+		p.once("exit", () => {
 			clearTimeout(t);
-			res('exited');
+			res("exited");
 		});
 
 		p.kill();
@@ -316,7 +395,7 @@ export function shutdownServer(p: childProcess.ChildProcess, timeout = 20 * 1000
 }
 
 export function sleep(msec: number) {
-	return new Promise<void>(res => {
+	return new Promise<void>((res) => {
 		setTimeout(() => {
 			res();
 		}, msec);
diff --git a/packages/client/@types/theme.d.ts b/packages/client/@types/theme.d.ts
index 67f724a9a..5f1b81603 100644
--- a/packages/client/@types/theme.d.ts
+++ b/packages/client/@types/theme.d.ts
@@ -1,4 +1,4 @@
-declare module '@/themes/*.json5' {
+declare module "@/themes/*.json5" {
 	import { Theme } from "@/scripts/theme";
 
 	const theme: Theme;
diff --git a/packages/client/@types/vue.d.ts b/packages/client/@types/vue.d.ts
index f6b66228f..2cd2e3971 100644
--- a/packages/client/@types/vue.d.ts
+++ b/packages/client/@types/vue.d.ts
@@ -1,7 +1,7 @@
 /// <reference types="vue/macros-global" />
 
-declare module '*.vue' {
-	import type { DefineComponent } from 'vue';
+declare module "*.vue" {
+	import type { DefineComponent } from "vue";
 	const component: DefineComponent<{}, {}, any>;
 	export default component;
 }
diff --git a/packages/client/assets/tagcanvas.min.js b/packages/client/assets/tagcanvas.min.js
index bcee46e68..562fe02cd 100644
--- a/packages/client/assets/tagcanvas.min.js
+++ b/packages/client/assets/tagcanvas.min.js
@@ -10,7 +10,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -18,4 +18,2536 @@
  * TagCanvas 2.11
  * For more information, please contact <graham@goat1000.com>
  */
- (function(){"use strict";var r,C,p=Math.abs,o=Math.sin,l=Math.cos,g=Math.max,h=Math.min,af=Math.ceil,E=Math.sqrt,w=Math.pow,I={},D={},R={0:"0,",1:"17,",2:"34,",3:"51,",4:"68,",5:"85,",6:"102,",7:"119,",8:"136,",9:"153,",a:"170,",A:"170,",b:"187,",B:"187,",c:"204,",C:"204,",d:"221,",D:"221,",e:"238,",E:"238,",f:"255,",F:"255,"},f,d,b,T,z,F,M,c=document,v,e,P,j={};for(r=0;r<256;++r)C=r.toString(16),r<16&&(C='0'+C),D[C]=D[C.toUpperCase()]=r.toString()+',';function n(a){return typeof a!='undefined'}function B(a){return typeof a=='object'&&a!=null}function G(a,c,b){return isNaN(a)?b:h(b,g(c,a))}function x(){return!1}function q(){return(new Date).valueOf()}function ak(c,d){var b=[],e=c.length,a;for(a=0;a<e;++a)b.push(c[a]);return b.sort(d),b}function ai(a){for(var b=a.length-1,d,c;b;)c=~~(Math.random()*b),d=a[b],a[b]=a[c],a[c]=d,--b}function ag(){var a=window.AudioContext||window.webkitAudioContext;if(e=new a,!e){e='off';return}return e}function $(u,a,t,s,r,q,p){var j=s,h=r,i=t*.01,n=80*i,m=100*i,o=40*i,l=30*i,c=l/2,b=j+n,f=b-o,k=h+m,d=k-l,g=h+l,e=h+m/2;if(a.setTransform(1,0,0,1,0,0),a.setLineDash([]),a.globalAlpha=1,a.strokeStyle=p,a.lineWidth=q,a.lineJoin='round',a.beginPath(),a.moveTo(f,g),a.lineTo(f,d),a.moveTo(b,k),a.lineTo(f,d),a.lineTo(j,d),a.lineTo(j,g),a.lineTo(f,g),a.lineTo(b,h),u){a.lineTo(b,g),a.moveTo(b,d),a.lineTo(b,k),a.moveTo(b-c,e-c),a.lineTo(b+c,e+c),a.moveTo(b+c,e-c),a.lineTo(b-c,e+c),a.stroke();return}a.closePath(),a.stroke()}function s(a,b,c){this.x=a,this.y=b,this.z=c}z=s.prototype,z.length=function(){return E(this.x*this.x+this.y*this.y+this.z*this.z)},z.dot=function(a){return this.x*a.x+this.y*a.y+this.z*a.z},z.cross=function(a){var b=this.y*a.z-this.z*a.y,c=this.z*a.x-this.x*a.z,d=this.x*a.y-this.y*a.x;return new s(b,c,d)},z.angle=function(b){var c=this.dot(b),a;return c==0?Math.PI/2:(a=c/(this.length()*b.length()),a>=1)?0:a<=-1?Math.PI:Math.acos(a)},z.unit=function(){var a=this.length();return new s(this.x/a,this.y/a,this.z/a)};function ay(b,a){a=a*Math.PI/180,b=b*Math.PI/180;var c=o(b)*l(a),d=-o(a),e=-l(b)*l(a);return new s(c,d,e)}function m(a){this[1]={1:a[0],2:a[1],3:a[2]},this[2]={1:a[3],2:a[4],3:a[5]},this[3]={1:a[6],2:a[7],3:a[8]}}T=m.prototype,m.Identity=function(){return new m([1,0,0,0,1,0,0,0,1])},m.Rotation=function(e,a){var c=o(e),d=l(e),b=1-d;return new m([d+w(a.x,2)*b,a.x*a.y*b-a.z*c,a.x*a.z*b+a.y*c,a.y*a.x*b+a.z*c,d+w(a.y,2)*b,a.y*a.z*b-a.x*c,a.z*a.x*b-a.y*c,a.z*a.y*b+a.x*c,d+w(a.z,2)*b])},T.mul=function(c){var d=[],a,b,e=c.xform?1:0;for(a=1;a<=3;++a)for(b=1;b<=3;++b)e?d.push(this[a][1]*c[1][b]+this[a][2]*c[2][b]+this[a][3]*c[3][b]):d.push(this[a][b]*c);return new m(d)},T.xform=function(b){var a={},c=b.x,d=b.y,e=b.z;return a.x=c*this[1][1]+d*this[2][1]+e*this[3][1],a.y=c*this[1][2]+d*this[2][2]+e*this[3][2],a.z=c*this[1][3]+d*this[2][3]+e*this[3][3],a};function aB(g,j,k,m,f){var a,b,c,d,e=[],h=2/g,i;i=Math.PI*(3-E(5)+(parseFloat(f)?parseFloat(f):0));for(a=0;a<g;++a)b=a*h-1+h/2,c=E(1-b*b),d=a*i,e.push([l(d)*c*j,b*k,o(d)*c*m]);return e}function U(n,p,m,k,h,g){var b,f=[],i=2/n,j,a,d,c,e;j=Math.PI*(3-E(5)+(parseFloat(g)?parseFloat(g):0));for(a=0;a<n;++a)d=a*i-1+i/2,b=a*j,c=l(b),e=o(b),f.push(p?[d*m,c*k,e*h]:[c*m,d*k,e*h]);return f}function aa(k,e,f,h,i,j){var b,g=[],m=Math.PI*2/e,a,c,d;for(a=0;a<e;++a)b=a*m,c=l(b),d=o(b),g.push(k?[j*f,c*h,d*i]:[c*f,j*h,d*i]);return g}function ax(a,b,c,d,e){return U(a,0,b,c,d,e)}function aH(a,b,c,d,e){return U(a,1,b,c,d,e)}function aG(b,c,d,e,a){return a=isNaN(a)?0:a*1,aa(0,b,c,d,e,a)}function aF(b,c,d,e,a){return a=isNaN(a)?0:a*1,aa(1,b,c,d,e,a)}function av(b){var a=new Image;a.onload=function(){var c=a.width/2,d=a.height/2;b.centreFunc=function(b,g,h,e,f){b.setTransform(1,0,0,1,0,0),b.globalAlpha=1,b.drawImage(a,e-c,f-d)}},a.src=b.centreImage}function aE(a,c){var b=a,d,e,f=(c*1).toPrecision(3)+')';return a[0]==='#'?(I[a]||(a.length===4?I[a]='rgba('+R[a[1]]+R[a[2]]+R[a[3]]:I[a]='rgba('+D[a.substr(1,2)]+D[a.substr(3,2)]+D[a.substr(5,2)]),b=I[a]+f):a.substr(0,4)==='rgb('||a.substr(0,4)==='hsl('?b=a.replace('(','a(').replace(')',','+f):(a.substr(0,5)==='rgba('||a.substr(0,5)==='hsla(')&&(d=a.lastIndexOf(',')+1,e=a.indexOf(')'),c*=parseFloat(a.substring(d,e)),b=a.substr(0,d)+c.toPrecision(3)+')'),b}function k(b,d){if(window.G_vmlCanvasManager)return null;var a=c.createElement('canvas');return a.width=b,a.height=d,a}function aD(){var b=k(3,3),a,c;return!!b&&(a=b.getContext('2d'),a.strokeStyle='#000',a.shadowColor='#fff',a.shadowBlur=3,a.globalAlpha=0,a.strokeRect(2,2,2,2),a.globalAlpha=1,c=a.getImageData(2,2,1,1),b=null,c.data[0]>0)}function aC(a,c,f,d){var e=a.createLinearGradient(0,0,c,0),b;for(b in d)e.addColorStop(1-b,d[b]);a.fillStyle=e,a.fillRect(0,f,c,1)}function L(a,m,j){var l=1024,d=1,e=a.weightGradient,i,f,b,c;if(a.gCanvas)f=a.gCanvas.getContext('2d'),d=a.gCanvas.height;else{if(B(e[0])?d=e.length:e=[e],a.gCanvas=i=k(l,d),!i)return null;f=i.getContext('2d');for(b=0;b<d;++b)aC(f,l,b,e[b])}return j=g(h(j||0,d-1),0),c=f.getImageData(~~((l-1)*m),j,1,1).data,'rgba('+c[0]+','+c[1]+','+c[2]+','+c[3]/255+')'}function Y(b,i,q,k,o,n,h,d,a,g,f,l){var m=o+(d||0)+(a.length&&a[0]<0?p(a[0]):0),j=n+(d||0)+(a.length&&a[1]<0?p(a[1]):0),c,e;b.font=i,b.textBaseline='top',b.fillStyle=q,h&&(b.shadowColor=h),d&&(b.shadowBlur=d),a.length&&(b.shadowOffsetX=a[0],b.shadowOffsetY=a[1]);for(c=0;c<k.length;++c)e=0,f&&('right'==l?e=g-f[c]:'centre'==l&&(e=(g-f[c])/2)),b.fillText(k[c],m+e,j),j+=parseInt(i)}function y(d,a,b,f,e,c,g){c?(d.beginPath(),d.moveTo(a,b+e-c),d.arcTo(a,b,a+c,b,c),d.arcTo(a+f,b,a+f,b+c,c),d.arcTo(a+f,b+e,a+f-c,b+e,c),d.arcTo(a,b+e,a,b+e-c,c),d.closePath(),d[g?'stroke':'fill']()):d[g?'strokeRect':'fillRect'](a,b,f,e)}function O(a,b,c,d,e,f,g,h,i){this.strings=a,this.font=b,this.width=c,this.height=d,this.maxWidth=e,this.stringWidths=f,this.align=g,this.valign=h,this.scale=i}M=O.prototype,M.SetImage=function(a,b,c,d,e,f,g,h){this.image=a,this.iwidth=b*this.scale,this.iheight=c*this.scale,this.ipos=d,this.ipad=e*this.scale,this.iscale=h,this.ialign=f,this.ivalign=g},M.Align=function(c,d,a){var b=0;return a=='right'||a=='bottom'?b=d-c:a!='left'&&a!='top'&&(b=(d-c)/2),b},M.Create=function(G,D,F,b,A,m,q,j,E){var o,e,f,a,l,s,i,u,v,r,w,n,c,d,x,B=p(q[0]),C=p(q[1]),t,z;return j=g(j,B+m,C+m),l=2*(j+b),i=2*(j+b),e=this.width+l,f=this.height+i,v=r=j+b,this.image&&(w=n=j+b,c=this.iwidth,d=this.iheight,this.ipos=='top'||this.ipos=='bottom'?(c<this.width?w+=this.Align(c,this.width,this.ialign):v+=this.Align(this.width,c,this.align),this.ipos=='top'?r+=d+this.ipad:n+=this.height+this.ipad,e=g(e,c+l),f+=d+this.ipad):(d<this.height?n+=this.Align(d,this.height,this.ivalign):r+=this.Align(this.height,d,this.valign),this.ipos=='right'?w+=this.width+this.ipad:v+=c+this.ipad,e+=c+this.ipad,f=g(f,d+i))),o=k(e,f),!o?null:(l=i=b/2,s=e-b,u=f-b,x=h(E,s/2,u/2),a=o.getContext('2d'),D&&(a.fillStyle=D,y(a,l,i,s,u,x)),b&&(a.strokeStyle=F,a.lineWidth=b,y(a,l,i,s,u,x,!0)),(m||B||C)&&(t=k(e,f),t&&(z=a,a=t.getContext('2d'))),Y(a,this.font,G,this.strings,v,r,0,0,[],this.maxWidth,this.stringWidths,this.align),this.image&&a.drawImage(this.image,w,n,c,d),z&&(a=z,A&&(a.shadowColor=A),m&&(a.shadowBlur=m),a.shadowOffsetX=q[0],a.shadowOffsetY=q[1],a.drawImage(t,0,0)),o)};function H(a,c,d){var b=k(c,d),e;return b?(e=b.getContext('2d'),e.drawImage(a,(c-a.width)/2,(d-a.height)/2),b):null}function S(e,b,c){var a=k(b,c),d;return a?(d=a.getContext('2d'),d.drawImage(e,0,0,b,c),a):null}function W(n,u,t,e,s,c,v,d,r,w){var g=u+(2*d+c)*e,f=t+(2*d+c)*e,l=k(g,f),b,i,q,m,j,o,a,p;return l?(c*=e,r*=e,i=q=c/2,m=g-c,j=f-c,d=d*e+i,b=l.getContext('2d'),p=h(r,m/2,j/2),s&&(b.fillStyle=s,y(b,i,q,m,j,p)),c&&(b.strokeStyle=v,b.lineWidth=c,y(b,i,q,m,j,p,!0)),w?(o=k(g,f),a=o.getContext('2d'),a.drawImage(n,d,d,u,t),a.globalCompositeOperation='source-in',a.fillStyle=v,a.fillRect(0,0,g,f),a.globalCompositeOperation='destination-over',a.drawImage(l,0,0),a.globalCompositeOperation='source-over',b.drawImage(o,0,0)):b.drawImage(n,d,d,n.width,n.height),{image:l,width:g/e,height:f/e}):null}function at(l,f,c,d,j){var e,a,b=parseFloat(f),i=g(c,d);return e=k(c,d),!e?null:(f.indexOf('%')>0?b=i*b/100:b=b*j,a=e.getContext('2d'),a.globalCompositeOperation='source-over',a.fillStyle='#fff',b>=i/2?(b=h(c,d)/2,a.beginPath(),a.moveTo(c/2,d/2),a.arc(c/2,d/2,b,0,2*Math.PI,!1),a.fill(),a.closePath()):(b=h(c/2,d/2,b),y(a,0,0,c,d,b,!0),a.fill()),a.globalCompositeOperation='source-in',a.drawImage(l,0,0,c,d),e)}function ao(q,m,i,b,h,a,c){var g=p(c[0]),f=p(c[1]),j=m+(g>a?g+a:a*2)*b,l=i+(f>a?f+a:a*2)*b,n=b*((a||0)+(c[0]<0?g:0)),o=b*((a||0)+(c[1]<0?f:0)),e,d;return e=k(j,l),!e?null:(d=e.getContext('2d'),h&&(d.shadowColor=h),a&&(d.shadowBlur=a*b),c&&(d.shadowOffsetX=c[0]*b,d.shadowOffsetY=c[1]*b),d.drawImage(q,n,o,m,i),{image:e,width:j/b,height:l/b})}function ae(m,o,l){var c=parseInt(m.toString().length*l),h=parseInt(l*2*m.length),j=k(c,h),g,i,e,f,b,d,n,a;if(!j)return null;g=j.getContext('2d'),g.fillStyle='#000',g.fillRect(0,0,c,h),Y(g,l+'px '+o,'#fff',m,0,0,0,0,[],'centre'),i=g.getImageData(0,0,c,h),e=i.width,f=i.height,a={min:{x:e,y:f},max:{x:-1,y:-1}};for(d=0;d<f;++d)for(b=0;b<e;++b)n=(d*e+b)*4,i.data[n+1]>0&&(b<a.min.x&&(a.min.x=b),b>a.max.x&&(a.max.x=b),d<a.min.y&&(a.min.y=d),d>a.max.y&&(a.max.y=d));return e!=c&&(a.min.x*=c/e,a.max.x*=c/e),f!=h&&(a.min.y*=c/f,a.max.y*=c/f),j=null,a}function Q(a){return"'"+a.replace(/(\'|\")/g,'').replace(/\s*,\s*/g,"', '")+"'"}function t(b,d,a){a=a||c,a.addEventListener?a.addEventListener(b,d,!1):a.attachEvent('on'+b,d)}function am(b,d,a){a=a||c,a.removeEventListener?a.removeEventListener(b,d):a.detachEvent('on'+b,d)}function A(g,e,j,a,b){var l=b.imageScale,h,c,k,m,f,d;if(!e.complete)return t('load',function(){A(g,e,j,a,b)},e);if(!g.complete)return t('load',function(){A(g,e,j,a,b)},g);if(j&&!j.complete)return t('load',function(){A(g,e,j,a,b)},j);e.width=e.width,e.height=e.height,l&&(g.width=e.width*l,g.height=e.height*l),a.iw=g.width,a.ih=g.height,b.txtOpt&&(c=g,h=b.zoomMax*b.txtScale,f=a.iw*h,d=a.ih*h,f<e.naturalWidth||d<e.naturalHeight?(c=S(g,f,d),c&&(a.fimage=c)):(f=a.iw,d=a.ih,h=1),parseFloat(b.imageRadius)&&(a.image=a.fimage=g=at(a.image,b.imageRadius,f,d,h)),a.HasText()||(b.shadow&&(c=ao(a.image,f,d,h,b.shadow,b.shadowBlur,b.shadowOffset),c&&(a.fimage=c.image,a.w=c.width,a.h=c.height)),(b.bgColour||b.bgOutlineThickness)&&(k=b.bgColour=='tag'?i(a.a,'background-color'):b.bgColour,m=b.bgOutline=='tag'?i(a.a,'color'):b.bgOutline||b.textColour,f=a.fimage.width,d=a.fimage.height,b.outlineMethod=='colour'&&(c=W(a.fimage,f,d,h,k,b.bgOutlineThickness,a.outline.colour,b.padding,b.bgRadius,1),c&&(a.oimage=c.image)),c=W(a.fimage,f,d,h,k,b.bgOutlineThickness,m,b.padding,b.bgRadius),c&&(a.fimage=c.image,a.w=c.width,a.h=c.height)),b.outlineMethod=='size'&&(b.outlineIncrease>0?(a.iw+=2*b.outlineIncrease,a.ih+=2*b.outlineIncrease,f=h*a.iw,d=h*a.ih,c=S(a.fimage,f,d),a.oimage=c,a.fimage=H(a.fimage,a.oimage.width,a.oimage.height)):(f=h*(a.iw+2*b.outlineIncrease),d=h*(a.ih+2*b.outlineIncrease),c=S(a.fimage,f,d),a.oimage=H(c,a.fimage.width,a.fimage.height))))),a.alt=j,a.Init()}function i(a,d){var b=c.defaultView,e=d.replace(/\-([a-z])/g,function(a){return a.charAt(1).toUpperCase()});return b&&b.getComputedStyle&&b.getComputedStyle(a,null).getPropertyValue(d)||a.currentStyle&&a.currentStyle[e]}function aj(c,d,e){var b=1,a;return d?b=1*(c.getAttribute(d)||e):(a=i(c,'font-size'))&&(b=a.indexOf('px')>-1&&a.replace('px','')*1||a.indexOf('pt')>-1&&a.replace('pt','')*1.25||a*3.3),b}function u(a){return a.target&&n(a.target.id)?a.target.id:a.srcElement.parentNode.id}function K(a,c){var b,d,e=parseInt(i(c,'width'))/c.width,f=parseInt(i(c,'height'))/c.height;return n(a.offsetX)?b={x:a.offsetX,y:a.offsetY}:(d=X(c.id),n(a.changedTouches)&&(a=a.changedTouches[0]),a.pageX&&(b={x:a.pageX-d.x,y:a.pageY-d.y})),b&&e&&f&&(b.x/=e,b.y/=f),b}function an(c){var d=c.target||c.fromElement.parentNode,b=a.tc[d.id];b&&(b.mx=b.my=-1,b.UnFreeze(),b.EndDrag())}function ad(e){var g,c=a,b,d,f=u(e);for(g in c.tc)b=c.tc[g],b.tttimer&&(clearTimeout(b.tttimer),b.tttimer=null);f&&c.tc[f]&&(b=c.tc[f],(d=K(e,b.canvas))&&(b.mx=d.x,b.my=d.y,b.Drag(e,d)),b.drawn=0)}function ap(b){var e=a,f=c.addEventListener?0:1,d=u(b);d&&b.button==f&&e.tc[d]&&e.tc[d].BeginDrag(b)}function aq(b){var f=a,g=c.addEventListener?0:1,e=u(b),d;e&&b.button==g&&f.tc[e]&&(d=f.tc[e],ad(b),!d.EndDrag()&&!d.touchState&&d.Clicked(b))}function ar(c){var e=u(c),b=e&&a.tc[e],d;b&&c.changedTouches&&(c.touches.length==1&&b.touchState==0?(b.touchState=1,b.BeginDrag(c),(d=K(c,b.canvas))&&(b.mx=d.x,b.my=d.y,b.drawn=0)):c.targetTouches.length==2&&b.pinchZoom?(b.touchState=3,b.EndDrag(),b.BeginPinch(c)):(b.EndDrag(),b.EndPinch(),b.touchState=0))}function ac(c){var d=u(c),b=d&&a.tc[d];if(b&&c.changedTouches){switch(b.touchState){case 1:b.Draw(),b.Clicked();break;break;case 2:b.EndDrag();break;case 3:b.EndPinch()}b.touchState=0}}function au(c){var f,e=a,b,d,g=u(c);for(f in e.tc)b=e.tc[f],b.tttimer&&(clearTimeout(b.tttimer),b.tttimer=null);if(b=g&&e.tc[g],b&&c.changedTouches&&b.touchState){switch(b.touchState){case 1:case 2:(d=K(c,b.canvas))&&(b.mx=d.x,b.my=d.y,b.Drag(c,d)&&(b.touchState=2));break;case 3:b.Pinch(c)}b.drawn=0}}function ab(b){var d=a,c=u(b);c&&d.tc[c]&&(b.cancelBubble=!0,b.returnValue=!1,b.preventDefault&&b.preventDefault(),d.tc[c].Wheel((b.wheelDelta||b.detail)>0))}function aw(d){var c,b=a;clearTimeout(b.scrollTimer);for(c in b.tc)b.tc[c].Pause();b.scrollTimer=setTimeout(function(){var b,c=a;for(b in c.tc)c.tc[b].Resume()},b.scrollPause)}function al(){Z(q())}function Z(b){var c=a.tc,d;a.NextFrame(a.interval),b=b||q();for(d in c)c[d].Draw(b)}function az(){requestAnimationFrame(Z)}function aA(a){setTimeout(al,a)}function X(f){var g=c.getElementById(f),b=g.getBoundingClientRect(),a=c.documentElement,d=c.body,e=window,h=e.pageXOffset||a.scrollLeft,i=e.pageYOffset||a.scrollTop,j=a.clientLeft||d.clientLeft,k=a.clientTop||d.clientTop;return{x:b.left+h-j,y:b.top+i-k}}function aI(a,b,d,e){var c=a.radius*a.z1/(a.z1+a.z2+b.z);return{x:b.x*c*d,y:b.y*c*e,z:b.z,w:(a.z1-b.z)/a.z2}}function V(a){this.e=a,this.br=0,this.line=[],this.text=[],this.original=a.innerText||a.textContent}F=V.prototype,F.Empty=function(){for(var a=0;a<this.text.length;++a)if(this.text[a].length)return!1;return!0},F.Lines=function(c){var e=c?1:0,b,d,a;c=c||this.e,b=c.childNodes,d=b.length;for(a=0;a<d;++a)b[a].nodeName=='BR'?(this.text.push(this.line.join(' ')),this.br=1):b[a].nodeType==3?this.br?(this.line=[b[a].nodeValue],this.br=0):this.line.push(b[a].nodeValue):this.Lines(b[a]);return e||this.br||this.text.push(this.line.join(' ')),this.text},F.SplitWidth=function(h,e,f,g){var c,b,a,d=[];e.font=g+'px '+f;for(c=0;c<this.text.length;++c){a=this.text[c].split(/\s+/),this.line=[a[0]];for(b=1;b<a.length;++b)e.measureText(this.line.join(' ')+' '+a[b]).width>h?(d.push(this.line.join(' ')),this.line=[a[b]]):this.line.push(a[b]);d.push(this.line.join(' '))}return this.text=d};function _(a,b){this.ts=null,this.tc=a,this.tag=b,this.x=this.y=this.w=this.h=this.sc=1,this.z=0,this.pulse=1,this.pulsate=a.pulsateTo<1,this.colour=a.outlineColour,this.adash=~~a.outlineDash,this.agap=~~a.outlineDashSpace||this.adash,this.aspeed=a.outlineDashSpeed*1,this.colour=='tag'?this.colour=i(b.a,'color'):this.colour=='tagbg'&&(this.colour=i(b.a,'background-color')),this.Draw=this.pulsate?this.DrawPulsate:this.DrawSimple,this.radius=a.outlineRadius|0,this.SetMethod(a.outlineMethod,a.altImage)}f=_.prototype,f.SetMethod=function(a,d){var b={block:['PreDraw','DrawBlock'],colour:['PreDraw','DrawColour'],outline:['PostDraw','DrawOutline'],classic:['LastDraw','DrawOutline'],size:['PreDraw','DrawSize'],none:['LastDraw']},c=b[a]||b.outline;a=='none'?this.Draw=function(){return 1}:this.drawFunc=this[c[1]],this[c[0]]=this.Draw,d&&(this.RealPreDraw=this.PreDraw,this.PreDraw=this.DrawAlt)},f.Update=function(d,e,i,j,a,f,g,h){var b=this.tc.outlineOffset,c=2*b;this.x=a*d+g-b,this.y=a*e+h-b,this.w=a*i+c,this.h=a*j+c,this.sc=a,this.z=f},f.Ants=function(k){if(!this.adash)return;var b=this.adash,c=this.agap,a=this.aspeed,j=b+c,h=0,g=b,f=c,i=0,d=0,e;a&&(d=p(a)*(q()-this.ts)/50,a<0&&(d=864e4-d),a=~~d%j),a?(b>=a?(h=b-a,g=a):(f=j-a,i=c-f),e=[h,f,g,i]):e=[b,c],k.setLineDash(e)},f.DrawOutline=function(a,d,e,b,c,f){var g=h(this.radius,c/2,b/2);a.strokeStyle=f,this.Ants(a),y(a,d,e,b,c,g,!0)},f.DrawSize=function(i,n,m,l,k,j,a,h,g){var f=a.w,e=a.h,c,b,d;return this.pulsate?(a.image?d=(a.image.height+this.tc.outlineIncrease)/a.image.height:d=a.oscale,b=a.fimage||a.image,c=1+(d-1)*(1-this.pulse),a.h*=c,a.w*=c):b=a.oimage,a.alpha=1,a.Draw(i,h,g,b),a.h=e,a.w=f,1},f.DrawColour=function(d,h,i,e,f,g,a,b,c){return a.oimage?(this.pulse<1?(a.alpha=1-w(this.pulse,2),a.Draw(d,b,c,a.fimage),a.alpha=this.pulse):a.alpha=1,a.Draw(d,b,c,a.oimage),1):this[a.image?'DrawColourImage':'DrawColourText'](d,h,i,e,f,g,a,b,c)},f.DrawColourText=function(f,h,i,j,g,e,a,b,c){var d=a.colour;return a.colour=e,a.alpha=1,a.Draw(f,b,c),a.colour=d,1},f.DrawColourImage=function(a,q,p,o,n,m,i,r,l){var f=a.canvas,e=~~g(q,0),d=~~g(p,0),c=h(f.width-e,o)+.5|0,b=h(f.height-d,n)+.5|0,j;return v?(v.width=c,v.height=b):v=k(c,b),!v?this.SetMethod('outline'):(j=v.getContext('2d'),j.drawImage(f,e,d,c,b,0,0,c,b),a.clearRect(e,d,c,b),this.pulsate?i.alpha=1-w(this.pulse,2):i.alpha=1,i.Draw(a,r,l),a.setTransform(1,0,0,1,0,0),a.save(),a.beginPath(),a.rect(e,d,c,b),a.clip(),a.globalCompositeOperation='source-in',a.fillStyle=m,a.fillRect(e,d,c,b),a.restore(),a.globalAlpha=1,a.globalCompositeOperation='destination-over',a.drawImage(v,0,0,c,b,e,d,c,b),a.globalCompositeOperation='source-over',1)},f.DrawAlt=function(b,a,c,d,f,g){var e=this.RealPreDraw(b,a,c,d,f,g);return a.alt&&(a.DrawImage(b,c,d,a.alt),e=1),e},f.DrawBlock=function(a,d,e,b,c,f){var g=h(this.radius,c/2,b/2);a.fillStyle=f,y(a,d,e,b,c,g)},f.DrawSimple=function(a,b,c,d,e,f){var g=this.tc;return a.setTransform(1,0,0,1,0,0),a.strokeStyle=this.colour,a.lineWidth=g.outlineThickness,a.shadowBlur=a.shadowOffsetX=a.shadowOffsetY=0,a.globalAlpha=f?e:1,this.drawFunc(a,this.x,this.y,this.w,this.h,this.colour,b,c,d)},f.DrawPulsate=function(h,d,e,f){var g=q()-this.ts,c=this.tc,b=c.pulsateTo+(1-c.pulsateTo)*(.5+l(2*Math.PI*g/(1e3*c.pulsateTime))/2);return this.pulse=b=a.Smooth(1,b),this.DrawSimple(h,d,e,f,b,1)},f.Active=function(d,a,b){var c=a>=this.x&&b>=this.y&&a<=this.x+this.w&&b<=this.y+this.h;return c?this.ts=this.ts||q():this.ts=null,c},f.PreDraw=f.PostDraw=f.LastDraw=x;function J(a,h,c,b,e,f,g,d,i,j,k,l,m,n){this.tc=a,this.image=null,this.text=h,this.text_original=n,this.line_widths=[],this.title=c.title||null,this.a=c,this.position=new s(b[0],b[1],b[2]),this.x=this.y=this.z=0,this.w=e,this.h=f,this.colour=g||a.textColour,this.bgColour=d||a.bgColour,this.bgRadius=i|0,this.bgOutline=j||this.colour,this.bgOutlineThickness=k|0,this.textFont=l||a.textFont,this.padding=m|0,this.sc=this.alpha=1,this.weighted=!a.weight,this.outline=new _(a,this),this.audio=null}d=J.prototype,d.Init=function(b){var a=this.tc;this.textHeight=a.textHeight,this.HasText()?this.Measure(a.ctxt,a):(this.w=this.iw,this.h=this.ih),this.SetShadowColour=a.shadowAlpha?this.SetShadowColourAlpha:this.SetShadowColourFixed,this.SetDraw(a)},d.Draw=x,d.HasText=function(){return this.text&&this.text[0].length>0},d.EqualTo=function(a){var b=a.getElementsByTagName('img');return this.a.href!=a.href?0:b.length?this.image.src==b[0].src:(a.innerText||a.textContent)==this.text_original},d.SetImage=function(a){this.image=this.fimage=a},d.SetAudio=function(a){this.audio=a,this.audio.load()},d.SetDraw=function(a){this.Draw=this.fimage?a.ie>7?this.DrawImageIE:this.DrawImage:this.DrawText,a.noSelect&&(this.CheckActive=x)},d.MeasureText=function(d){var a,e=this.text.length,b=0,c;for(a=0;a<e;++a)this.line_widths[a]=c=d.measureText(this.text[a]).width,b=g(b,c);return b},d.Measure=function(e,a){var f=ae(this.text,this.textFont,this.textHeight),b,k,h,i,g,l,j,c,d;j=f?f.max.y+f.min.y:this.textHeight,e.font=this.font=this.textHeight+'px '+this.textFont,l=this.MeasureText(e),a.txtOpt&&(b=a.txtScale,k=b*this.textHeight,h=k+'px '+this.textFont,i=[b*a.shadowOffset[0],b*a.shadowOffset[1]],e.font=h,g=this.MeasureText(e),d=new O(this.text,h,g+b,b*j+b,g,this.line_widths,a.textAlign,a.textVAlign,b),this.image&&d.SetImage(this.image,this.iw,this.ih,a.imagePosition,a.imagePadding,a.imageAlign,a.imageVAlign,a.imageScale),c=d.Create(this.colour,this.bgColour,this.bgOutline,b*this.bgOutlineThickness,a.shadow,b*a.shadowBlur,i,b*this.padding,b*this.bgRadius),a.outlineMethod=='colour'?this.oimage=d.Create(this.outline.colour,this.bgColour,this.outline.colour,b*this.bgOutlineThickness,a.shadow,b*a.shadowBlur,i,b*this.padding,b*this.bgRadius):a.outlineMethod=='size'&&(f=ae(this.text,this.textFont,this.textHeight+a.outlineIncrease),k=f.max.y+f.min.y,h=b*(this.textHeight+a.outlineIncrease)+'px '+this.textFont,e.font=h,g=this.MeasureText(e),d=new O(this.text,h,g+b,b*k+b,g,this.line_widths,a.textAlign,a.textVAlign,b),this.image&&d.SetImage(this.image,this.iw+a.outlineIncrease,this.ih+a.outlineIncrease,a.imagePosition,a.imagePadding,a.imageAlign,a.imageVAlign,a.imageScale),this.oimage=d.Create(this.colour,this.bgColour,this.bgOutline,b*this.bgOutlineThickness,a.shadow,b*a.shadowBlur,i,b*this.padding,b*this.bgRadius),this.oscale=this.oimage.width/c.width,a.outlineIncrease>0?c=H(c,this.oimage.width,this.oimage.height):this.oimage=H(this.oimage,c.width,c.height)),c&&(this.fimage=c,l=this.fimage.width/b,j=this.fimage.height/b),this.SetDraw(a),a.txtOpt=!!this.fimage),this.h=j,this.w=l},d.SetFont=function(a,b,c,d){this.textFont=a,this.colour=b,this.bgColour=c,this.bgOutline=d,this.Measure(this.tc.ctxt,this.tc)},d.SetWeight=function(c){var b=this.tc,e=b.weightMode.split(/[, ]/),d,a,f=c.length;if(!this.HasText())return;this.weighted=!0;for(a=0;a<f;++a)d=e[a]||'size','both'==d?(this.Weight(c[a],b.ctxt,b,'size',b.min_weight[a],b.max_weight[a],a),this.Weight(c[a],b.ctxt,b,'colour',b.min_weight[a],b.max_weight[a],a)):this.Weight(c[a],b.ctxt,b,d,b.min_weight[a],b.max_weight[a],a);this.Measure(b.ctxt,b)},d.Weight=function(b,i,a,d,f,h,e){b=isNaN(b)?1:b;var c=(b-f)/(h-f);'colour'==d?this.colour=L(a,c,e):'bgcolour'==d?this.bgColour=L(a,c,e):'bgoutline'==d?this.bgOutline=L(a,c,e):'outline'==d?this.outline.colour=L(a,c,e):'size'==d&&(a.weightSizeMin>0&&a.weightSizeMax>a.weightSizeMin?this.textHeight=a.weightSize*(a.weightSizeMin+(a.weightSizeMax-a.weightSizeMin)*c):this.textHeight=g(1,b*a.weightSize))},d.SetShadowColourFixed=function(a,b,c){a.shadowColor=b},d.SetShadowColourAlpha=function(a,b,c){a.shadowColor=aE(b,c)},d.DrawText=function(a,h,i){var e=this.tc,g=this.x,f=this.y,c=this.sc,b,d;a.globalAlpha=this.alpha,a.fillStyle=this.colour,e.shadow&&this.SetShadowColour(a,e.shadow,this.alpha),a.font=this.font,g+=h/c,f+=i/c-this.h/2;for(b=0;b<this.text.length;++b)d=g,'right'==e.textAlign?d+=this.w/2-this.line_widths[b]:'centre'==e.textAlign?d-=this.line_widths[b]/2:d-=this.w/2,a.setTransform(c,0,0,c,c*d,c*f),a.fillText(this.text[b],0,0),f+=this.textHeight},d.DrawImage=function(b,i,k,l){var e=this.x,f=this.y,a=this.sc,j=l||this.fimage,c=this.w,d=this.h,g=this.alpha,h=this.shadow;b.globalAlpha=g,h&&this.SetShadowColour(b,h,g),e+=i/a-c/2,f+=k/a-d/2,b.setTransform(a,0,0,a,a*e,a*f),b.drawImage(j,0,0,c,d)},d.DrawImageIE=function(b,d,e){var c=this.fimage,a=this.sc,f=c.width=this.w*a,g=c.height=this.h*a,h=this.x*a+d-f/2,i=this.y*a+e-g/2;b.setTransform(1,0,0,1,0,0),b.globalAlpha=this.alpha,b.drawImage(c,h,i)},d.Calc=function(g,e){var a,b=this.tc,d=b.minBrightness,f=b.maxBrightness,c=b.max_radius;return a=g.xform(this.position),this.xformed=a,a=aI(b,a,b.stretchX,b.stretchY),this.x=a.x,this.y=a.y,this.z=a.z,this.sc=a.w,this.alpha=e*G(d+(f-d)*(c-this.z)/(2*c),0,1),this.xformed},d.UpdateActive=function(h,e,f){var a=this.outline,b=this.w,c=this.h,d=this.x-b/2,g=this.y-c/2;return a.Update(d,g,b,c,this.sc,this.z,e,f),a},d.CheckActive=function(a,d,e){var b=this.tc,c=this.UpdateActive(a,d,e);return c.Active(a,b.mx,b.my)?c:null},d.Clicked=function(f){var b=this.a,a=b.target,d=b.href,e;if(a!=''&&a!='_self'){if(self.frames[a])self.frames[a].document.location=d;else{try{if(top.frames[a]){top.frames[a].document.location=d;return}}catch(a){}window.open(d,a)}return}if(c.createEvent){if(e=c.createEvent('MouseEvents'),e.initMouseEvent('click',1,1,window,0,0,0,0,0,0,0,0,0,0,null),!b.dispatchEvent(e))return}else if(b.fireEvent)if(!b.fireEvent('onclick'))return;c.location=d},d.StopAudio=function(){this.audio&&this.playing&&this.audio.pause(),this.stopped=1,this.playing=0},d.PlayAudio=function(){if(e==='off'||this.tc.audioOff)return;if(!e&&!ag())return;var a=this.tc.audio,c=this.tc.gain,d='suspended',b;if(this.audio)if(this.track||(this.track=e.createMediaElementSource(this.audio),this.gain=e.createGain(),this.track.connect(this.gain),this.gain.connect(e.destination)),a=this.audio,c=this.gain,!a.paused)return 1;if(a){if(e.state==d&&e.resume(),e.state==d)return;return c.gain.value=h(2,g(0,this.tc.audioVolume*1)),a.currentTime=0,this.stopped=0,b=a.play(),b!==void 0&&b.then(a=>{this.stopped?this.audio.pause():this.playing=1}),1}};function a(f,o,k){var d,i,b=c.getElementById(f),l=['id','class','innerHTML'];if(!b)throw 0;if(n(window.G_vmlCanvasManager)&&(b=window.G_vmlCanvasManager.initElement(b),this.ie=parseFloat(navigator.appVersion.split('MSIE')[1])),b&&(!b.getContext||!b.getContext('2d').fillText)){i=c.createElement('DIV');for(d=0;d<l.length;++d)i[l[d]]=b[l[d]];throw b.parentNode.insertBefore(i,b),b.parentNode.removeChild(b),0}for(d in a.options)this[d]=k&&n(k[d])?k[d]:n(a[d])?a[d]:a.options[d];if(this.canvas=b,this.ctxt=b.getContext('2d'),this.z1=250/g(this.depth,.001),this.z2=this.z1/this.zoom,this.radius=h(b.height,b.width)*.0075,this.max_radius=100,this.max_weight=[],this.min_weight=[],this.textFont=this.textFont&&Q(this.textFont),this.textHeight*=1,this.imageRadius=this.imageRadius.toString(),this.pulsateTo=G(this.pulsateTo,0,1),this.minBrightness=G(this.minBrightness,0,1),this.maxBrightness=G(this.maxBrightness,this.minBrightness,1),this.ctxt.textBaseline='top',this.lx=(this.lock+'').indexOf('x')+1,this.ly=(this.lock+'').indexOf('y')+1,this.frozen=this.dx=this.dy=this.fixedAnim=this.touchState=0,this.fixedAlpha=1,this.source=o||f,this.repeatTags=h(64,~~this.repeatTags),this.minTags=h(200,~~this.minTags),~~this.scrollPause>0?a.scrollPause=~~this.scrollPause:this.scrollPause=0,this.minTags>0&&this.repeatTags<1&&(d=this.GetTags().length)&&(this.repeatTags=af(this.minTags/d)-1),this.transform=m.Identity(),this.startTime=this.time=q(),this.mx=this.my=-1,this.centreImage&&av(this),this.Animate=this.dragControl?this.AnimateDrag:this.AnimatePosition,this.animTiming=typeof a[this.animTiming]=='function'?a[this.animTiming]:a.Smooth,this.shadowBlur||this.shadowOffset[0]||this.shadowOffset[1]?(this.ctxt.shadowColor=this.shadow,this.shadow=this.ctxt.shadowColor,this.shadowAlpha=aD()):delete this.shadow,this.activeAudio===!1?e='off':this.activeAudio&&this.LoadAudio(),this.Load(),o&&this.hideTags&&function(b){a.loaded?b.HideTags():t('load',function(){b.HideTags()},window)}(this),this.yaw=this.initial?this.initial[0]*this.maxSpeed:0,this.pitch=this.initial?this.initial[1]*this.maxSpeed:0,this.tooltip?(this.ctitle=b.title,b.title='',this.tooltip=='native'?this.Tooltip=this.TooltipNative:(this.Tooltip=this.TooltipDiv,this.ttdiv||(this.ttdiv=c.createElement('div'),this.ttdiv.className=this.tooltipClass,this.ttdiv.style.position='absolute',this.ttdiv.style.zIndex=b.style.zIndex+1,t('mouseover',function(a){a.target.style.display='none'},this.ttdiv),c.body.appendChild(this.ttdiv)))):this.Tooltip=this.TooltipNone,!this.noMouse&&!j[f]){j[f]=[['mousemove',ad],['mouseout',an],['mouseup',aq],['touchstart',ar],['touchend',ac],['touchcancel',ac],['touchmove',au]],this.dragControl&&(j[f].push(['mousedown',ap]),j[f].push(['selectstart',x])),this.wheelZoom&&(j[f].push(['mousewheel',ab]),j[f].push(['DOMMouseScroll',ab])),this.scrollPause&&j[f].push(['scroll',aw,window]);for(d=0;d<j[f].length;++d)i=j[f][d],t(i[0],i[1],i[2]?i[2]:b)}a.started||(a.NextFrame=window.requestAnimationFrame?az:aA,a.interval=this.interval,a.NextFrame(this.interval),a.started=1)}b=a.prototype,b.SourceElements=function(){return c.querySelectorAll?c.querySelectorAll('#'+this.source):[c.getElementById(this.source)]},b.HideTags=function(){var b=this.SourceElements(),a;for(a=0;a<b.length;++a)b[a].style.display='none'},b.GetTags=function(){var e=this.SourceElements(),c,f=[],a,b,d;for(d=0;d<=this.repeatTags;++d)for(a=0;a<e.length;++a){c=e[a].getElementsByTagName('a');for(b=0;b<c.length;++b)f.push(c[b])}return f},b.Message=function(j){var g=[],a,f,b=j.split(''),d,e,h,i;for(a=0;a<b.length;++a)b[a]!=' '&&(f=a-b.length/2,d=c.createElement('A'),d.href='#',d.innerText=b[a],h=100*o(f/9),i=-100*l(f/9),e=new J(this,b[a],d,[h,0,i],2,18,'#000','#fff',0,0,0,'monospace',2,b[a]),e.Init(),g.push(e));return g},b.AddAudio=function(b,c){if(e==='off')return;var a=b.getElementsByTagName('audio');a.length&&(c.SetAudio(a[0]),this.hasAudio=1)},b.CreateTag=function(b){var e,c,a,f,d,g,h,j,k=[0,0,0],l;if('text'!=this.imageMode)if(e=b.getElementsByTagName('img'),e.length)if(c=new Image,c.src=e[0].src,!this.imageMode)return a=new J(this,"",b,k,0,0),a.SetImage(c),A(c,e[0],e[1],a,this),this.AddAudio(b,a),a;if('image'!=this.imageMode&&(d=new V(b),f=d.Lines(),d.Empty()?d=null:(g=this.textFont||Q(i(b,'font-family')),this.splitWidth&&(f=d.SplitWidth(this.splitWidth,this.ctxt,g,this.textHeight)),h=this.bgColour=='tag'?i(b,'background-color'):this.bgColour,j=this.bgOutline=='tag'?i(b,'color'):this.bgOutline)),d||c)return a=new J(this,f,b,k,2,this.textHeight+2,this.textColour||i(b,'color'),h,this.bgRadius,j,this.bgOutlineThickness,g,this.padding,d&&d.original),c?(a.SetImage(c),A(c,e[0],e[1],a,this)):a.Init(),this.AddAudio(b,a),a},b.UpdateTag=function(a,b){var c=this.textColour||i(b,'color'),d=this.textFont||Q(i(b,'font-family')),e=this.bgColour=='tag'?i(b,'background-color'):this.bgColour,f=this.bgOutline=='tag'?i(b,'color'):this.bgOutline;a.a=b,a.title=b.title,(a.colour!=c||a.textFont!=d||a.bgColour!=e||a.bgOutline!=f)&&a.SetFont(d,c,e,f)},b.Weight=function(d){var f=d.length,c,b,a,e=[],g,h=this.weightFrom?this.weightFrom.split(/[, ]/):[null],i=h.length;for(b=0;b<f;++b){e[b]=[];for(a=0;a<i;++a)c=aj(d[b].a,h[a],this.textHeight),(!this.max_weight[a]||c>this.max_weight[a])&&(this.max_weight[a]=c),(!this.min_weight[a]||c<this.min_weight[a])&&(this.min_weight[a]=c),e[b][a]=c}for(a=0;a<i;++a)this.max_weight[a]>this.min_weight[a]&&(g=1);if(g)for(b=0;b<f;++b)d[b].SetWeight(e[b])},b.Load=function(){var c=this.GetTags(),b=[],d,k,l,h,i,j,f,a,e=[],m={sphere:aB,vcylinder:ax,hcylinder:aH,vring:aG,hring:aF};if(c.length){e.length=c.length;for(a=0;a<c.length;++a)e[a]=a;this.shuffleTags&&ai(e),h=100*this.radiusX,i=100*this.radiusY,j=100*this.radiusZ,this.max_radius=g(h,g(i,j));for(a=0;a<c.length;++a)k=this.CreateTag(c[e[a]]),k&&b.push(k);this.weight&&this.Weight(b,!0),this.shapeArgs?this.shapeArgs[0]=b.length:(l=this.shape.toString().split(/[(),]/),d=l.shift(),typeof window[d]=='function'?this.shape=window[d]:this.shape=m[d]||m.sphere,this.shapeArgs=[b.length,h,i,j].concat(l)),f=this.shape.apply(this,this.shapeArgs),this.listLength=b.length;for(a=0;a<b.length;++a)b[a].position=new s(f[a][0],f[a][1],f[a][2])}this.noTagsMessage&&!b.length&&(a=this.imageMode&&this.imageMode!='both'?this.imageMode+' ':'',b=this.Message('No '+a+'tags')),this.taglist=b},b.Update=function(){var e=this.GetTags(),d=[],j=this.taglist,k,f=[],c=[],h,i,g,a,b;if(!this.shapeArgs)return this.Load();if(e.length){g=this.listLength=e.length,i=j.length;for(a=0;a<i;++a)d.push(j[a]),c.push(a);for(a=0;a<g;++a){for(b=0,k=0;b<i;++b)j[b].EqualTo(e[a])&&(this.UpdateTag(d[b],e[a]),k=c[b]=-1);k||f.push(a)}for(a=0,b=0;a<i;++a)c[b]==-1?c.splice(b,1):++b;if(c.length){for(ai(c);c.length&&f.length;)a=c.shift(),b=f.shift(),d[a]=this.CreateTag(e[b]);for(c.sort(function(a,b){return a-b});c.length;)d.splice(c.pop(),1)}for(b=d.length/(f.length+1),a=0;f.length;)d.splice(af(++a*b),0,this.CreateTag(e[f.shift()]));this.shapeArgs[0]=g=d.length,h=this.shape.apply(this,this.shapeArgs);for(a=0;a<g;++a)d[a].position=new s(h[a][0],h[a][1],h[a][2]);this.weight&&this.Weight(d)}this.taglist=d},b.SetShadow=function(a){a.shadowBlur=this.shadowBlur,a.shadowOffsetX=this.shadowOffset[0],a.shadowOffsetY=this.shadowOffset[1]},b.LoadAudio=function(){if(!e&&!ag())return;this.audio=c.createElement('audio'),this.audio.src=this.activeAudio,this.track=e.createMediaElementSource(this.audio),this.gain=e.createGain(),this.track.connect(this.gain),this.gain.connect(e.destination),this.hasAudio=1,P=function(a){e.resume(),c.removeEventListener('click',P)},c.addEventListener('click',P)},b.ShowAudioIcon=function(){var a=this.audioIconSize,c=this.canvas,d=this.ctxt,k=c.width-a-3,f=c.height-a-3,g=this.audioIconThickness,h='#000',i='#fff',j=this.audioIconDark,b=this.audioOff,l='suspended';if(!e)return;b||(b=e.state===l),this.audioIcon&&this.hasAudio&&($(b,d,a,k,f,g+1,j?i:h),$(b,d,a,k,f,g,j?h:i))},b.CheckAudioIcon=function(){var a=this.audioIconSize,b=this.canvas,c=this.audioIconThickness/2,d=b.width-a-3-c,e=b.height-a-3-c;if(this.audioIcon&&this.mx>=d&&this.my>=e)return!0},b.ToggleAudio=function(){var a=this.audioOff||e&&e.state==='suspended';a||this.currentAudio&&this.currentAudio.StopAudio(),this.audioOff=!a},b.Draw=function(s){if(this.paused)return;var l=this.canvas,i=l.width,j=l.height,q=0,p=(s-this.time)*a.interval/1e3,h=i/2+this.offsetX,g=j/2+this.offsetY,d=this.ctxt,b,f,c,o=-1,e=this.taglist,k=e.length,t=this.active&&this.active.tag,m='',u=this.frontSelect,r=this.centreFunc==x,n;if(this.time=s,this.frozen&&this.drawn)return this.Animate(i,j,p);n=this.AnimateFixed(),d.setTransform(1,0,0,1,0,0);for(c=0;c<k;++c)e[c].Calc(this.transform,this.fixedAlpha);if(e=ak(e,function(a,b){return b.z-a.z}),n&&this.fixedAnim.active)b=this.fixedAnim.tag.UpdateActive(d,h,g);else if(this.active=null,this.CheckAudioIcon())m='pointer';else{for(c=0;c<k;++c)f=this.mx>=0&&this.my>=0&&this.taglist[c].CheckActive(d,h,g),f&&f.sc>q&&(!u||f.z<=0)&&(b=f,o=c,b.tag=this.taglist[c],q=f.sc);this.active=b}this.txtOpt||this.shadow&&this.SetShadow(d),d.clearRect(0,0,i,j);for(c=0;c<k;++c){if(!r&&e[c].z<=0){try{this.centreFunc(d,i,j,h,g)}catch(a){alert(a),this.centreFunc=x}r=!0}b&&b.tag==e[c]&&b.PreDraw(d,e[c],h,g)||e[c].Draw(d,h,g),b&&b.tag==e[c]&&b.PostDraw(d)}this.freezeActive&&b?this.Freeze():(this.UnFreeze(),this.drawn=k==this.listLength),this.fixedCallback&&(this.fixedCallback(this,this.fixedCallbackTag),this.fixedCallback=null),n||this.Animate(i,j,p),b&&(b.LastDraw(d),b.tag!=t&&(this.currentAudio&&this.currentAudio!=b.tag&&this.currentAudio.StopAudio(),b.tag.PlayAudio()&&(this.currentAudio=b.tag)),m=this.activeCursor),l.style.cursor=m,this.Tooltip(b,this.taglist[o]),this.audioIcon&&this.ShowAudioIcon()},b.TooltipNone=function(){},b.TooltipNative=function(b,a){b?this.canvas.title=a&&a.title?a.title:'':this.canvas.title=this.ctitle},b.SetTTDiv=function(c,d){var a=this,b=a.ttdiv.style;c!=a.ttdiv.innerHTML&&(b.display='none'),a.ttdiv.innerHTML=c,d&&(d.title=a.ttdiv.innerHTML),b.display=='none'&&!a.tttimer&&(a.tttimer=setTimeout(function(){var c=X(a.canvas.id);b.display='block',b.left=c.x+a.mx+'px',b.top=c.y+a.my+24+'px',a.tttimer=null},a.tooltipDelay))},b.TooltipDiv=function(b,a){b&&a&&a.title?this.SetTTDiv(a.title,a):!b&&this.mx!=-1&&this.my!=-1&&this.ctitle.length?this.SetTTDiv(this.ctitle):this.ttdiv.style.display='none'},b.Transform=function(c,a,b){if(a||b){var d=o(a),e=l(a),f=o(b),g=l(b),h=new m([g,0,f,0,1,0,-f,0,g]),i=new m([1,0,0,0,e,-d,0,d,e]);c.transform=c.transform.mul(h.mul(i))}},b.AnimateFixed=function(){var a,b,c,d,e;return!!(this.fadeIn&&(b=q()-this.startTime,b>=this.fadeIn?(this.fadeIn=0,this.fixedAlpha=1):this.fixedAlpha=b/this.fadeIn),this.fixedAnim)&&(this.fixedAnim.transform||(this.fixedAnim.transform=this.transform),a=this.fixedAnim,b=q()-a.t0,c=a.angle,d,e=this.animTiming(a.t,b),this.transform=a.transform,b>=a.t?(this.fixedCallbackTag=a.tag,this.fixedCallback=a.cb,this.fixedAnim=this.yaw=this.pitch=0):c*=e,d=m.Rotation(c,a.axis),this.transform=this.transform.mul(d),this.fixedAnim!=0)},b.AnimatePosition=function(g,h,f){var a=this,d=a.mx,e=a.my,b,c;!a.frozen&&d>=0&&e>=0&&d<g&&e<h?(b=a.maxSpeed,c=a.reverse?-1:1,a.lx||(a.yaw=(d*2*b/g-b)*c*f),a.ly||(a.pitch=(e*2*b/h-b)*-c*f),a.initial=null):a.initial||(a.frozen&&!a.freezeDecel?a.yaw=a.pitch=0:a.Decel(a)),this.Transform(a,a.pitch,a.yaw)},b.AnimateDrag=function(d,e,c){var a=this,b=100*c*a.maxSpeed/a.max_radius/a.zoom;a.dx||a.dy?(a.lx||(a.yaw=a.dx*b/a.stretchX),a.ly||(a.pitch=a.dy*-b/a.stretchY),a.dx=a.dy=0,a.initial=null):a.initial||a.Decel(a),this.Transform(a,a.pitch,a.yaw)},b.Freeze=function(){this.frozen||(this.preFreeze=[this.yaw,this.pitch],this.frozen=1,this.drawn=0)},b.UnFreeze=function(){this.frozen&&(this.yaw=this.preFreeze[0],this.pitch=this.preFreeze[1],this.frozen=0)},b.Decel=function(a){var b=a.minSpeed,c=p(a.yaw),d=p(a.pitch);!a.lx&&c>b&&(a.yaw=c>a.z0?a.yaw*a.decel:0),!a.ly&&d>b&&(a.pitch=d>a.z0?a.pitch*a.decel:0)},b.Zoom=function(a){this.z2=this.z1*(1/a),this.drawn=0},b.Clicked=function(b){if(this.CheckAudioIcon()){this.ToggleAudio();return}var a=this.active;try{a&&a.tag&&(this.clickToFront===!1||this.clickToFront===null?a.tag.Clicked(b):this.TagToFront(a.tag,this.clickToFront,function(){a.tag.Clicked(b)},!0))}catch(a){}},b.Wheel=function(a){var b=this.zoom+this.zoomStep*(a?1:-1);this.zoom=h(this.zoomMax,g(this.zoomMin,b)),this.Zoom(this.zoom)},b.BeginDrag=function(a){this.down=K(a,this.canvas),a.cancelBubble=!0,a.returnValue=!1,a.preventDefault&&a.preventDefault()},b.Drag=function(e,a){if(this.dragControl&&this.down){var d=this.dragThreshold*this.dragThreshold,b=a.x-this.down.x,c=a.y-this.down.y;(this.dragging||b*b+c*c>d)&&(this.dx=b,this.dy=c,this.dragging=1,this.down=a)}return this.dragging},b.EndDrag=function(){var a=this.dragging;return this.dragging=this.down=null,a};function ah(a){var b=a.targetTouches[0],c=a.targetTouches[1];return E(w(c.pageX-b.pageX,2)+w(c.pageY-b.pageY,2))}b.BeginPinch=function(a){this.pinched=[ah(a),this.zoom],a.preventDefault&&a.preventDefault()},b.Pinch=function(d){var b,c,a=this.pinched;if(!a)return;c=ah(d),b=a[1]*c/a[0],this.zoom=h(this.zoomMax,g(this.zoomMin,b)),this.Zoom(this.zoom)},b.EndPinch=function(a){this.pinched=null},b.Pause=function(){this.paused=!0},b.Resume=function(){this.paused=!1},b.SetSpeed=function(a){this.initial=a,this.yaw=a[0]*this.maxSpeed,this.pitch=a[1]*this.maxSpeed},b.FindTag=function(a){if(!n(a))return null;if(n(a.index)&&(a=a.index),!B(a))return this.taglist[a];var c,d,b;n(a.id)?(c='id',d=a.id):n(a.text)&&(c='innerText',d=a.text);for(b=0;b<this.taglist.length;++b)if(this.taglist[b].a[c]==d)return this.taglist[b]},b.RotateTag=function(a,h,i,j,f,g){var b=a.Calc(this.transform,1),c=new s(b.x,b.y,b.z),d=ay(i,h),e=c.angle(d),k=c.cross(d).unit();e==0?(this.fixedCallbackTag=a,this.fixedCallback=f):this.fixedAnim={angle:-e,axis:k,t:j,t0:q(),cb:f,tag:a,active:g}},b.TagToFront=function(a,b,c,d){this.RotateTag(a,0,0,b,c,d)},b.Volume=function(a){this.audioVolume=a*1},a.Start=function(b,c,d){a.Delete(b),a.tc[b]=new a(b,c,d)};function N(c,b){a.tc[b]&&a.tc[b][c]()}a.Linear=function(a,b){return b/a},a.Smooth=function(a,b){return.5-l(b*Math.PI/a)/2},a.Pause=function(a){N('Pause',a)},a.Resume=function(a){N('Resume',a)},a.Reload=function(a){N('Load',a)},a.Update=function(a){N('Update',a)},a.SetSpeed=function(c,b){return!!(B(b)&&a.tc[c]&&!isNaN(b[0])&&!isNaN(b[1]))&&(a.tc[c].SetSpeed(b),!0)},a.TagToFront=function(c,b){return!!B(b)&&(b.lat=b.lng=0,a.RotateTag(c,b))},a.RotateTag=function(c,b){if(B(b)&&a.tc[c]){isNaN(b.time)&&(b.time=500);var d=a.tc[c].FindTag(b);if(d)return a.tc[c].RotateTag(d,b.lat,b.lng,b.time,b.callback,b.active),!0}return!1},a.Delete=function(b){var d,e;if(j[b])if(e=c.getElementById(b),e)for(d=0;d<j[b].length;++d)am(j[b][d][0],j[b][d][1],e);delete j[b],delete a.tc[b]},a.tc={},a.options={z1:2e4,z2:2e4,z0:2e-4,freezeActive:!1,freezeDecel:!1,activeCursor:'pointer',pulsateTo:1,pulsateTime:3,reverse:!1,depth:.5,maxSpeed:.05,minSpeed:0,decel:.95,interval:20,minBrightness:.1,maxBrightness:1,outlineColour:'#ffff99',outlineThickness:2,outlineOffset:5,outlineMethod:'outline',outlineRadius:0,textColour:'#ff99ff',textHeight:15,textFont:'Helvetica, Arial, sans-serif',shadow:'#000',shadowBlur:0,shadowOffset:[0,0],initial:null,hideTags:!0,zoom:1,weight:!1,weightMode:'size',weightFrom:null,weightSize:1,weightSizeMin:null,weightSizeMax:null,weightGradient:{0:'#f00',0.33:'#ff0',0.66:'#0f0',1:'#00f'},txtOpt:!0,txtScale:2,frontSelect:!1,wheelZoom:!0,zoomMin:.3,zoomMax:3,zoomStep:.05,shape:'sphere',lock:null,tooltip:null,tooltipDelay:300,tooltipClass:'tctooltip',radiusX:1,radiusY:1,radiusZ:1,stretchX:1,stretchY:1,offsetX:0,offsetY:0,shuffleTags:!1,noSelect:!1,noMouse:!1,imageScale:1,paused:!1,dragControl:!1,dragThreshold:4,centreFunc:x,splitWidth:0,animTiming:'Smooth',clickToFront:!1,fadeIn:0,padding:0,bgColour:null,bgRadius:0,bgOutline:null,bgOutlineThickness:0,outlineIncrease:4,textAlign:'centre',textVAlign:'middle',imageMode:null,imagePosition:null,imagePadding:2,imageAlign:'centre',imageVAlign:'middle',noTagsMessage:!0,centreImage:null,pinchZoom:!1,repeatTags:0,minTags:0,imageRadius:0,scrollPause:!1,outlineDash:0,outlineDashSpace:0,outlineDashSpeed:1,activeAudio:'',audioVolume:1,audioIcon:1,audioIconSize:20,audioIconThickness:2,audioIconDark:0,altImage:0};for(r in a.options)a[r]=a.options[r];window.TagCanvas=a,t('load',function(){a.loaded=1},window)})()
+(function () {
+	"use strict";
+	var r,
+		C,
+		p = Math.abs,
+		o = Math.sin,
+		l = Math.cos,
+		g = Math.max,
+		h = Math.min,
+		af = Math.ceil,
+		E = Math.sqrt,
+		w = Math.pow,
+		I = {},
+		D = {},
+		R = {
+			0: "0,",
+			1: "17,",
+			2: "34,",
+			3: "51,",
+			4: "68,",
+			5: "85,",
+			6: "102,",
+			7: "119,",
+			8: "136,",
+			9: "153,",
+			a: "170,",
+			A: "170,",
+			b: "187,",
+			B: "187,",
+			c: "204,",
+			C: "204,",
+			d: "221,",
+			D: "221,",
+			e: "238,",
+			E: "238,",
+			f: "255,",
+			F: "255,",
+		},
+		f,
+		d,
+		b,
+		T,
+		z,
+		F,
+		M,
+		c = document,
+		v,
+		e,
+		P,
+		j = {};
+	for (r = 0; r < 256; ++r)
+		(C = r.toString(16)),
+			r < 16 && (C = "0" + C),
+			(D[C] = D[C.toUpperCase()] = r.toString() + ",");
+	function n(a) {
+		return typeof a != "undefined";
+	}
+	function B(a) {
+		return typeof a == "object" && a != null;
+	}
+	function G(a, c, b) {
+		return isNaN(a) ? b : h(b, g(c, a));
+	}
+	function x() {
+		return !1;
+	}
+	function q() {
+		return new Date().valueOf();
+	}
+	function ak(c, d) {
+		var b = [],
+			e = c.length,
+			a;
+		for (a = 0; a < e; ++a) b.push(c[a]);
+		return b.sort(d), b;
+	}
+	function ai(a) {
+		for (var b = a.length - 1, d, c; b; )
+			(c = ~~(Math.random() * b)), (d = a[b]), (a[b] = a[c]), (a[c] = d), --b;
+	}
+	function ag() {
+		var a = window.AudioContext || window.webkitAudioContext;
+		if (((e = new a()), !e)) {
+			e = "off";
+			return;
+		}
+		return e;
+	}
+	function $(u, a, t, s, r, q, p) {
+		var j = s,
+			h = r,
+			i = t * 0.01,
+			n = 80 * i,
+			m = 100 * i,
+			o = 40 * i,
+			l = 30 * i,
+			c = l / 2,
+			b = j + n,
+			f = b - o,
+			k = h + m,
+			d = k - l,
+			g = h + l,
+			e = h + m / 2;
+		if (
+			(a.setTransform(1, 0, 0, 1, 0, 0),
+			a.setLineDash([]),
+			(a.globalAlpha = 1),
+			(a.strokeStyle = p),
+			(a.lineWidth = q),
+			(a.lineJoin = "round"),
+			a.beginPath(),
+			a.moveTo(f, g),
+			a.lineTo(f, d),
+			a.moveTo(b, k),
+			a.lineTo(f, d),
+			a.lineTo(j, d),
+			a.lineTo(j, g),
+			a.lineTo(f, g),
+			a.lineTo(b, h),
+			u)
+		) {
+			a.lineTo(b, g),
+				a.moveTo(b, d),
+				a.lineTo(b, k),
+				a.moveTo(b - c, e - c),
+				a.lineTo(b + c, e + c),
+				a.moveTo(b + c, e - c),
+				a.lineTo(b - c, e + c),
+				a.stroke();
+			return;
+		}
+		a.closePath(), a.stroke();
+	}
+	function s(a, b, c) {
+		(this.x = a), (this.y = b), (this.z = c);
+	}
+	(z = s.prototype),
+		(z.length = function () {
+			return E(this.x * this.x + this.y * this.y + this.z * this.z);
+		}),
+		(z.dot = function (a) {
+			return this.x * a.x + this.y * a.y + this.z * a.z;
+		}),
+		(z.cross = function (a) {
+			var b = this.y * a.z - this.z * a.y,
+				c = this.z * a.x - this.x * a.z,
+				d = this.x * a.y - this.y * a.x;
+			return new s(b, c, d);
+		}),
+		(z.angle = function (b) {
+			var c = this.dot(b),
+				a;
+			return c == 0
+				? Math.PI / 2
+				: ((a = c / (this.length() * b.length())), a >= 1)
+				? 0
+				: a <= -1
+				? Math.PI
+				: Math.acos(a);
+		}),
+		(z.unit = function () {
+			var a = this.length();
+			return new s(this.x / a, this.y / a, this.z / a);
+		});
+	function ay(b, a) {
+		(a = (a * Math.PI) / 180), (b = (b * Math.PI) / 180);
+		var c = o(b) * l(a),
+			d = -o(a),
+			e = -l(b) * l(a);
+		return new s(c, d, e);
+	}
+	function m(a) {
+		(this[1] = { 1: a[0], 2: a[1], 3: a[2] }),
+			(this[2] = { 1: a[3], 2: a[4], 3: a[5] }),
+			(this[3] = { 1: a[6], 2: a[7], 3: a[8] });
+	}
+	(T = m.prototype),
+		(m.Identity = function () {
+			return new m([1, 0, 0, 0, 1, 0, 0, 0, 1]);
+		}),
+		(m.Rotation = function (e, a) {
+			var c = o(e),
+				d = l(e),
+				b = 1 - d;
+			return new m([
+				d + w(a.x, 2) * b,
+				a.x * a.y * b - a.z * c,
+				a.x * a.z * b + a.y * c,
+				a.y * a.x * b + a.z * c,
+				d + w(a.y, 2) * b,
+				a.y * a.z * b - a.x * c,
+				a.z * a.x * b - a.y * c,
+				a.z * a.y * b + a.x * c,
+				d + w(a.z, 2) * b,
+			]);
+		}),
+		(T.mul = function (c) {
+			var d = [],
+				a,
+				b,
+				e = c.xform ? 1 : 0;
+			for (a = 1; a <= 3; ++a)
+				for (b = 1; b <= 3; ++b)
+					e
+						? d.push(
+								this[a][1] * c[1][b] +
+									this[a][2] * c[2][b] +
+									this[a][3] * c[3][b],
+						  )
+						: d.push(this[a][b] * c);
+			return new m(d);
+		}),
+		(T.xform = function (b) {
+			var a = {},
+				c = b.x,
+				d = b.y,
+				e = b.z;
+			return (
+				(a.x = c * this[1][1] + d * this[2][1] + e * this[3][1]),
+				(a.y = c * this[1][2] + d * this[2][2] + e * this[3][2]),
+				(a.z = c * this[1][3] + d * this[2][3] + e * this[3][3]),
+				a
+			);
+		});
+	function aB(g, j, k, m, f) {
+		var a,
+			b,
+			c,
+			d,
+			e = [],
+			h = 2 / g,
+			i;
+		i = Math.PI * (3 - E(5) + (parseFloat(f) ? parseFloat(f) : 0));
+		for (a = 0; a < g; ++a)
+			(b = a * h - 1 + h / 2),
+				(c = E(1 - b * b)),
+				(d = a * i),
+				e.push([l(d) * c * j, b * k, o(d) * c * m]);
+		return e;
+	}
+	function U(n, p, m, k, h, g) {
+		var b,
+			f = [],
+			i = 2 / n,
+			j,
+			a,
+			d,
+			c,
+			e;
+		j = Math.PI * (3 - E(5) + (parseFloat(g) ? parseFloat(g) : 0));
+		for (a = 0; a < n; ++a)
+			(d = a * i - 1 + i / 2),
+				(b = a * j),
+				(c = l(b)),
+				(e = o(b)),
+				f.push(p ? [d * m, c * k, e * h] : [c * m, d * k, e * h]);
+		return f;
+	}
+	function aa(k, e, f, h, i, j) {
+		var b,
+			g = [],
+			m = (Math.PI * 2) / e,
+			a,
+			c,
+			d;
+		for (a = 0; a < e; ++a)
+			(b = a * m),
+				(c = l(b)),
+				(d = o(b)),
+				g.push(k ? [j * f, c * h, d * i] : [c * f, j * h, d * i]);
+		return g;
+	}
+	function ax(a, b, c, d, e) {
+		return U(a, 0, b, c, d, e);
+	}
+	function aH(a, b, c, d, e) {
+		return U(a, 1, b, c, d, e);
+	}
+	function aG(b, c, d, e, a) {
+		return (a = isNaN(a) ? 0 : a * 1), aa(0, b, c, d, e, a);
+	}
+	function aF(b, c, d, e, a) {
+		return (a = isNaN(a) ? 0 : a * 1), aa(1, b, c, d, e, a);
+	}
+	function av(b) {
+		var a = new Image();
+		(a.onload = function () {
+			var c = a.width / 2,
+				d = a.height / 2;
+			b.centreFunc = function (b, g, h, e, f) {
+				b.setTransform(1, 0, 0, 1, 0, 0),
+					(b.globalAlpha = 1),
+					b.drawImage(a, e - c, f - d);
+			};
+		}),
+			(a.src = b.centreImage);
+	}
+	function aE(a, c) {
+		var b = a,
+			d,
+			e,
+			f = (c * 1).toPrecision(3) + ")";
+		return (
+			a[0] === "#"
+				? (I[a] ||
+						(a.length === 4
+							? (I[a] = "rgba(" + R[a[1]] + R[a[2]] + R[a[3]])
+							: (I[a] =
+									"rgba(" +
+									D[a.substr(1, 2)] +
+									D[a.substr(3, 2)] +
+									D[a.substr(5, 2)])),
+				  (b = I[a] + f))
+				: a.substr(0, 4) === "rgb(" || a.substr(0, 4) === "hsl("
+				? (b = a.replace("(", "a(").replace(")", "," + f))
+				: (a.substr(0, 5) === "rgba(" || a.substr(0, 5) === "hsla(") &&
+				  ((d = a.lastIndexOf(",") + 1),
+				  (e = a.indexOf(")")),
+				  (c *= parseFloat(a.substring(d, e))),
+				  (b = a.substr(0, d) + c.toPrecision(3) + ")")),
+			b
+		);
+	}
+	function k(b, d) {
+		if (window.G_vmlCanvasManager) return null;
+		var a = c.createElement("canvas");
+		return (a.width = b), (a.height = d), a;
+	}
+	function aD() {
+		var b = k(3, 3),
+			a,
+			c;
+		return (
+			!!b &&
+			((a = b.getContext("2d")),
+			(a.strokeStyle = "#000"),
+			(a.shadowColor = "#fff"),
+			(a.shadowBlur = 3),
+			(a.globalAlpha = 0),
+			a.strokeRect(2, 2, 2, 2),
+			(a.globalAlpha = 1),
+			(c = a.getImageData(2, 2, 1, 1)),
+			(b = null),
+			c.data[0] > 0)
+		);
+	}
+	function aC(a, c, f, d) {
+		var e = a.createLinearGradient(0, 0, c, 0),
+			b;
+		for (b in d) e.addColorStop(1 - b, d[b]);
+		(a.fillStyle = e), a.fillRect(0, f, c, 1);
+	}
+	function L(a, m, j) {
+		var l = 1024,
+			d = 1,
+			e = a.weightGradient,
+			i,
+			f,
+			b,
+			c;
+		if (a.gCanvas) (f = a.gCanvas.getContext("2d")), (d = a.gCanvas.height);
+		else {
+			if ((B(e[0]) ? (d = e.length) : (e = [e]), (a.gCanvas = i = k(l, d)), !i))
+				return null;
+			f = i.getContext("2d");
+			for (b = 0; b < d; ++b) aC(f, l, b, e[b]);
+		}
+		return (
+			(j = g(h(j || 0, d - 1), 0)),
+			(c = f.getImageData(~~((l - 1) * m), j, 1, 1).data),
+			"rgba(" + c[0] + "," + c[1] + "," + c[2] + "," + c[3] / 255 + ")"
+		);
+	}
+	function Y(b, i, q, k, o, n, h, d, a, g, f, l) {
+		var m = o + (d || 0) + (a.length && a[0] < 0 ? p(a[0]) : 0),
+			j = n + (d || 0) + (a.length && a[1] < 0 ? p(a[1]) : 0),
+			c,
+			e;
+		(b.font = i),
+			(b.textBaseline = "top"),
+			(b.fillStyle = q),
+			h && (b.shadowColor = h),
+			d && (b.shadowBlur = d),
+			a.length && ((b.shadowOffsetX = a[0]), (b.shadowOffsetY = a[1]));
+		for (c = 0; c < k.length; ++c)
+			(e = 0),
+				f &&
+					("right" == l
+						? (e = g - f[c])
+						: "centre" == l && (e = (g - f[c]) / 2)),
+				b.fillText(k[c], m + e, j),
+				(j += parseInt(i));
+	}
+	function y(d, a, b, f, e, c, g) {
+		c
+			? (d.beginPath(),
+			  d.moveTo(a, b + e - c),
+			  d.arcTo(a, b, a + c, b, c),
+			  d.arcTo(a + f, b, a + f, b + c, c),
+			  d.arcTo(a + f, b + e, a + f - c, b + e, c),
+			  d.arcTo(a, b + e, a, b + e - c, c),
+			  d.closePath(),
+			  d[g ? "stroke" : "fill"]())
+			: d[g ? "strokeRect" : "fillRect"](a, b, f, e);
+	}
+	function O(a, b, c, d, e, f, g, h, i) {
+		(this.strings = a),
+			(this.font = b),
+			(this.width = c),
+			(this.height = d),
+			(this.maxWidth = e),
+			(this.stringWidths = f),
+			(this.align = g),
+			(this.valign = h),
+			(this.scale = i);
+	}
+	(M = O.prototype),
+		(M.SetImage = function (a, b, c, d, e, f, g, h) {
+			(this.image = a),
+				(this.iwidth = b * this.scale),
+				(this.iheight = c * this.scale),
+				(this.ipos = d),
+				(this.ipad = e * this.scale),
+				(this.iscale = h),
+				(this.ialign = f),
+				(this.ivalign = g);
+		}),
+		(M.Align = function (c, d, a) {
+			var b = 0;
+			return (
+				a == "right" || a == "bottom"
+					? (b = d - c)
+					: a != "left" && a != "top" && (b = (d - c) / 2),
+				b
+			);
+		}),
+		(M.Create = function (G, D, F, b, A, m, q, j, E) {
+			var o,
+				e,
+				f,
+				a,
+				l,
+				s,
+				i,
+				u,
+				v,
+				r,
+				w,
+				n,
+				c,
+				d,
+				x,
+				B = p(q[0]),
+				C = p(q[1]),
+				t,
+				z;
+			return (
+				(j = g(j, B + m, C + m)),
+				(l = 2 * (j + b)),
+				(i = 2 * (j + b)),
+				(e = this.width + l),
+				(f = this.height + i),
+				(v = r = j + b),
+				this.image &&
+					((w = n = j + b),
+					(c = this.iwidth),
+					(d = this.iheight),
+					this.ipos == "top" || this.ipos == "bottom"
+						? (c < this.width
+								? (w += this.Align(c, this.width, this.ialign))
+								: (v += this.Align(this.width, c, this.align)),
+						  this.ipos == "top"
+								? (r += d + this.ipad)
+								: (n += this.height + this.ipad),
+						  (e = g(e, c + l)),
+						  (f += d + this.ipad))
+						: (d < this.height
+								? (n += this.Align(d, this.height, this.ivalign))
+								: (r += this.Align(this.height, d, this.valign)),
+						  this.ipos == "right"
+								? (w += this.width + this.ipad)
+								: (v += c + this.ipad),
+						  (e += c + this.ipad),
+						  (f = g(f, d + i)))),
+				(o = k(e, f)),
+				!o
+					? null
+					: ((l = i = b / 2),
+					  (s = e - b),
+					  (u = f - b),
+					  (x = h(E, s / 2, u / 2)),
+					  (a = o.getContext("2d")),
+					  D && ((a.fillStyle = D), y(a, l, i, s, u, x)),
+					  b &&
+							((a.strokeStyle = F), (a.lineWidth = b), y(a, l, i, s, u, x, !0)),
+					  (m || B || C) &&
+							((t = k(e, f)), t && ((z = a), (a = t.getContext("2d")))),
+					  Y(
+							a,
+							this.font,
+							G,
+							this.strings,
+							v,
+							r,
+							0,
+							0,
+							[],
+							this.maxWidth,
+							this.stringWidths,
+							this.align,
+					  ),
+					  this.image && a.drawImage(this.image, w, n, c, d),
+					  z &&
+							((a = z),
+							A && (a.shadowColor = A),
+							m && (a.shadowBlur = m),
+							(a.shadowOffsetX = q[0]),
+							(a.shadowOffsetY = q[1]),
+							a.drawImage(t, 0, 0)),
+					  o)
+			);
+		});
+	function H(a, c, d) {
+		var b = k(c, d),
+			e;
+		return b
+			? ((e = b.getContext("2d")),
+			  e.drawImage(a, (c - a.width) / 2, (d - a.height) / 2),
+			  b)
+			: null;
+	}
+	function S(e, b, c) {
+		var a = k(b, c),
+			d;
+		return a ? ((d = a.getContext("2d")), d.drawImage(e, 0, 0, b, c), a) : null;
+	}
+	function W(n, u, t, e, s, c, v, d, r, w) {
+		var g = u + (2 * d + c) * e,
+			f = t + (2 * d + c) * e,
+			l = k(g, f),
+			b,
+			i,
+			q,
+			m,
+			j,
+			o,
+			a,
+			p;
+		return l
+			? ((c *= e),
+			  (r *= e),
+			  (i = q = c / 2),
+			  (m = g - c),
+			  (j = f - c),
+			  (d = d * e + i),
+			  (b = l.getContext("2d")),
+			  (p = h(r, m / 2, j / 2)),
+			  s && ((b.fillStyle = s), y(b, i, q, m, j, p)),
+			  c && ((b.strokeStyle = v), (b.lineWidth = c), y(b, i, q, m, j, p, !0)),
+			  w
+					? ((o = k(g, f)),
+					  (a = o.getContext("2d")),
+					  a.drawImage(n, d, d, u, t),
+					  (a.globalCompositeOperation = "source-in"),
+					  (a.fillStyle = v),
+					  a.fillRect(0, 0, g, f),
+					  (a.globalCompositeOperation = "destination-over"),
+					  a.drawImage(l, 0, 0),
+					  (a.globalCompositeOperation = "source-over"),
+					  b.drawImage(o, 0, 0))
+					: b.drawImage(n, d, d, n.width, n.height),
+			  { image: l, width: g / e, height: f / e })
+			: null;
+	}
+	function at(l, f, c, d, j) {
+		var e,
+			a,
+			b = parseFloat(f),
+			i = g(c, d);
+		return (
+			(e = k(c, d)),
+			!e
+				? null
+				: (f.indexOf("%") > 0 ? (b = (i * b) / 100) : (b = b * j),
+				  (a = e.getContext("2d")),
+				  (a.globalCompositeOperation = "source-over"),
+				  (a.fillStyle = "#fff"),
+				  b >= i / 2
+						? ((b = h(c, d) / 2),
+						  a.beginPath(),
+						  a.moveTo(c / 2, d / 2),
+						  a.arc(c / 2, d / 2, b, 0, 2 * Math.PI, !1),
+						  a.fill(),
+						  a.closePath())
+						: ((b = h(c / 2, d / 2, b)), y(a, 0, 0, c, d, b, !0), a.fill()),
+				  (a.globalCompositeOperation = "source-in"),
+				  a.drawImage(l, 0, 0, c, d),
+				  e)
+		);
+	}
+	function ao(q, m, i, b, h, a, c) {
+		var g = p(c[0]),
+			f = p(c[1]),
+			j = m + (g > a ? g + a : a * 2) * b,
+			l = i + (f > a ? f + a : a * 2) * b,
+			n = b * ((a || 0) + (c[0] < 0 ? g : 0)),
+			o = b * ((a || 0) + (c[1] < 0 ? f : 0)),
+			e,
+			d;
+		return (
+			(e = k(j, l)),
+			!e
+				? null
+				: ((d = e.getContext("2d")),
+				  h && (d.shadowColor = h),
+				  a && (d.shadowBlur = a * b),
+				  c && ((d.shadowOffsetX = c[0] * b), (d.shadowOffsetY = c[1] * b)),
+				  d.drawImage(q, n, o, m, i),
+				  { image: e, width: j / b, height: l / b })
+		);
+	}
+	function ae(m, o, l) {
+		var c = parseInt(m.toString().length * l),
+			h = parseInt(l * 2 * m.length),
+			j = k(c, h),
+			g,
+			i,
+			e,
+			f,
+			b,
+			d,
+			n,
+			a;
+		if (!j) return null;
+		(g = j.getContext("2d")),
+			(g.fillStyle = "#000"),
+			g.fillRect(0, 0, c, h),
+			Y(g, l + "px " + o, "#fff", m, 0, 0, 0, 0, [], "centre"),
+			(i = g.getImageData(0, 0, c, h)),
+			(e = i.width),
+			(f = i.height),
+			(a = { min: { x: e, y: f }, max: { x: -1, y: -1 } });
+		for (d = 0; d < f; ++d)
+			for (b = 0; b < e; ++b)
+				(n = (d * e + b) * 4),
+					i.data[n + 1] > 0 &&
+						(b < a.min.x && (a.min.x = b),
+						b > a.max.x && (a.max.x = b),
+						d < a.min.y && (a.min.y = d),
+						d > a.max.y && (a.max.y = d));
+		return (
+			e != c && ((a.min.x *= c / e), (a.max.x *= c / e)),
+			f != h && ((a.min.y *= c / f), (a.max.y *= c / f)),
+			(j = null),
+			a
+		);
+	}
+	function Q(a) {
+		return "'" + a.replace(/(\'|\")/g, "").replace(/\s*,\s*/g, "', '") + "'";
+	}
+	function t(b, d, a) {
+		(a = a || c),
+			a.addEventListener
+				? a.addEventListener(b, d, !1)
+				: a.attachEvent("on" + b, d);
+	}
+	function am(b, d, a) {
+		(a = a || c),
+			a.removeEventListener
+				? a.removeEventListener(b, d)
+				: a.detachEvent("on" + b, d);
+	}
+	function A(g, e, j, a, b) {
+		var l = b.imageScale,
+			h,
+			c,
+			k,
+			m,
+			f,
+			d;
+		if (!e.complete)
+			return t(
+				"load",
+				function () {
+					A(g, e, j, a, b);
+				},
+				e,
+			);
+		if (!g.complete)
+			return t(
+				"load",
+				function () {
+					A(g, e, j, a, b);
+				},
+				g,
+			);
+		if (j && !j.complete)
+			return t(
+				"load",
+				function () {
+					A(g, e, j, a, b);
+				},
+				j,
+			);
+		(e.width = e.width),
+			(e.height = e.height),
+			l && ((g.width = e.width * l), (g.height = e.height * l)),
+			(a.iw = g.width),
+			(a.ih = g.height),
+			b.txtOpt &&
+				((c = g),
+				(h = b.zoomMax * b.txtScale),
+				(f = a.iw * h),
+				(d = a.ih * h),
+				f < e.naturalWidth || d < e.naturalHeight
+					? ((c = S(g, f, d)), c && (a.fimage = c))
+					: ((f = a.iw), (d = a.ih), (h = 1)),
+				parseFloat(b.imageRadius) &&
+					(a.image = a.fimage = g = at(a.image, b.imageRadius, f, d, h)),
+				a.HasText() ||
+					(b.shadow &&
+						((c = ao(a.image, f, d, h, b.shadow, b.shadowBlur, b.shadowOffset)),
+						c && ((a.fimage = c.image), (a.w = c.width), (a.h = c.height))),
+					(b.bgColour || b.bgOutlineThickness) &&
+						((k =
+							b.bgColour == "tag" ? i(a.a, "background-color") : b.bgColour),
+						(m =
+							b.bgOutline == "tag"
+								? i(a.a, "color")
+								: b.bgOutline || b.textColour),
+						(f = a.fimage.width),
+						(d = a.fimage.height),
+						b.outlineMethod == "colour" &&
+							((c = W(
+								a.fimage,
+								f,
+								d,
+								h,
+								k,
+								b.bgOutlineThickness,
+								a.outline.colour,
+								b.padding,
+								b.bgRadius,
+								1,
+							)),
+							c && (a.oimage = c.image)),
+						(c = W(
+							a.fimage,
+							f,
+							d,
+							h,
+							k,
+							b.bgOutlineThickness,
+							m,
+							b.padding,
+							b.bgRadius,
+						)),
+						c && ((a.fimage = c.image), (a.w = c.width), (a.h = c.height))),
+					b.outlineMethod == "size" &&
+						(b.outlineIncrease > 0
+							? ((a.iw += 2 * b.outlineIncrease),
+							  (a.ih += 2 * b.outlineIncrease),
+							  (f = h * a.iw),
+							  (d = h * a.ih),
+							  (c = S(a.fimage, f, d)),
+							  (a.oimage = c),
+							  (a.fimage = H(a.fimage, a.oimage.width, a.oimage.height)))
+							: ((f = h * (a.iw + 2 * b.outlineIncrease)),
+							  (d = h * (a.ih + 2 * b.outlineIncrease)),
+							  (c = S(a.fimage, f, d)),
+							  (a.oimage = H(c, a.fimage.width, a.fimage.height)))))),
+			(a.alt = j),
+			a.Init();
+	}
+	function i(a, d) {
+		var b = c.defaultView,
+			e = d.replace(/\-([a-z])/g, function (a) {
+				return a.charAt(1).toUpperCase();
+			});
+		return (
+			(b &&
+				b.getComputedStyle &&
+				b.getComputedStyle(a, null).getPropertyValue(d)) ||
+			(a.currentStyle && a.currentStyle[e])
+		);
+	}
+	function aj(c, d, e) {
+		var b = 1,
+			a;
+		return (
+			d
+				? (b = 1 * (c.getAttribute(d) || e))
+				: (a = i(c, "font-size")) &&
+				  (b =
+						(a.indexOf("px") > -1 && a.replace("px", "") * 1) ||
+						(a.indexOf("pt") > -1 && a.replace("pt", "") * 1.25) ||
+						a * 3.3),
+			b
+		);
+	}
+	function u(a) {
+		return a.target && n(a.target.id)
+			? a.target.id
+			: a.srcElement.parentNode.id;
+	}
+	function K(a, c) {
+		var b,
+			d,
+			e = parseInt(i(c, "width")) / c.width,
+			f = parseInt(i(c, "height")) / c.height;
+		return (
+			n(a.offsetX)
+				? (b = { x: a.offsetX, y: a.offsetY })
+				: ((d = X(c.id)),
+				  n(a.changedTouches) && (a = a.changedTouches[0]),
+				  a.pageX && (b = { x: a.pageX - d.x, y: a.pageY - d.y })),
+			b && e && f && ((b.x /= e), (b.y /= f)),
+			b
+		);
+	}
+	function an(c) {
+		var d = c.target || c.fromElement.parentNode,
+			b = a.tc[d.id];
+		b && ((b.mx = b.my = -1), b.UnFreeze(), b.EndDrag());
+	}
+	function ad(e) {
+		var g,
+			c = a,
+			b,
+			d,
+			f = u(e);
+		for (g in c.tc)
+			(b = c.tc[g]), b.tttimer && (clearTimeout(b.tttimer), (b.tttimer = null));
+		f &&
+			c.tc[f] &&
+			((b = c.tc[f]),
+			(d = K(e, b.canvas)) && ((b.mx = d.x), (b.my = d.y), b.Drag(e, d)),
+			(b.drawn = 0));
+	}
+	function ap(b) {
+		var e = a,
+			f = c.addEventListener ? 0 : 1,
+			d = u(b);
+		d && b.button == f && e.tc[d] && e.tc[d].BeginDrag(b);
+	}
+	function aq(b) {
+		var f = a,
+			g = c.addEventListener ? 0 : 1,
+			e = u(b),
+			d;
+		e &&
+			b.button == g &&
+			f.tc[e] &&
+			((d = f.tc[e]), ad(b), !d.EndDrag() && !d.touchState && d.Clicked(b));
+	}
+	function ar(c) {
+		var e = u(c),
+			b = e && a.tc[e],
+			d;
+		b &&
+			c.changedTouches &&
+			(c.touches.length == 1 && b.touchState == 0
+				? ((b.touchState = 1),
+				  b.BeginDrag(c),
+				  (d = K(c, b.canvas)) && ((b.mx = d.x), (b.my = d.y), (b.drawn = 0)))
+				: c.targetTouches.length == 2 && b.pinchZoom
+				? ((b.touchState = 3), b.EndDrag(), b.BeginPinch(c))
+				: (b.EndDrag(), b.EndPinch(), (b.touchState = 0)));
+	}
+	function ac(c) {
+		var d = u(c),
+			b = d && a.tc[d];
+		if (b && c.changedTouches) {
+			switch (b.touchState) {
+				case 1:
+					b.Draw(), b.Clicked();
+					break;
+					break;
+				case 2:
+					b.EndDrag();
+					break;
+				case 3:
+					b.EndPinch();
+			}
+			b.touchState = 0;
+		}
+	}
+	function au(c) {
+		var f,
+			e = a,
+			b,
+			d,
+			g = u(c);
+		for (f in e.tc)
+			(b = e.tc[f]), b.tttimer && (clearTimeout(b.tttimer), (b.tttimer = null));
+		if (((b = g && e.tc[g]), b && c.changedTouches && b.touchState)) {
+			switch (b.touchState) {
+				case 1:
+				case 2:
+					(d = K(c, b.canvas)) &&
+						((b.mx = d.x), (b.my = d.y), b.Drag(c, d) && (b.touchState = 2));
+					break;
+				case 3:
+					b.Pinch(c);
+			}
+			b.drawn = 0;
+		}
+	}
+	function ab(b) {
+		var d = a,
+			c = u(b);
+		c &&
+			d.tc[c] &&
+			((b.cancelBubble = !0),
+			(b.returnValue = !1),
+			b.preventDefault && b.preventDefault(),
+			d.tc[c].Wheel((b.wheelDelta || b.detail) > 0));
+	}
+	function aw(d) {
+		var c,
+			b = a;
+		clearTimeout(b.scrollTimer);
+		for (c in b.tc) b.tc[c].Pause();
+		b.scrollTimer = setTimeout(function () {
+			var b,
+				c = a;
+			for (b in c.tc) c.tc[b].Resume();
+		}, b.scrollPause);
+	}
+	function al() {
+		Z(q());
+	}
+	function Z(b) {
+		var c = a.tc,
+			d;
+		a.NextFrame(a.interval), (b = b || q());
+		for (d in c) c[d].Draw(b);
+	}
+	function az() {
+		requestAnimationFrame(Z);
+	}
+	function aA(a) {
+		setTimeout(al, a);
+	}
+	function X(f) {
+		var g = c.getElementById(f),
+			b = g.getBoundingClientRect(),
+			a = c.documentElement,
+			d = c.body,
+			e = window,
+			h = e.pageXOffset || a.scrollLeft,
+			i = e.pageYOffset || a.scrollTop,
+			j = a.clientLeft || d.clientLeft,
+			k = a.clientTop || d.clientTop;
+		return { x: b.left + h - j, y: b.top + i - k };
+	}
+	function aI(a, b, d, e) {
+		var c = (a.radius * a.z1) / (a.z1 + a.z2 + b.z);
+		return { x: b.x * c * d, y: b.y * c * e, z: b.z, w: (a.z1 - b.z) / a.z2 };
+	}
+	function V(a) {
+		(this.e = a),
+			(this.br = 0),
+			(this.line = []),
+			(this.text = []),
+			(this.original = a.innerText || a.textContent);
+	}
+	(F = V.prototype),
+		(F.Empty = function () {
+			for (var a = 0; a < this.text.length; ++a)
+				if (this.text[a].length) return !1;
+			return !0;
+		}),
+		(F.Lines = function (c) {
+			var e = c ? 1 : 0,
+				b,
+				d,
+				a;
+			(c = c || this.e), (b = c.childNodes), (d = b.length);
+			for (a = 0; a < d; ++a)
+				b[a].nodeName == "BR"
+					? (this.text.push(this.line.join(" ")), (this.br = 1))
+					: b[a].nodeType == 3
+					? this.br
+						? ((this.line = [b[a].nodeValue]), (this.br = 0))
+						: this.line.push(b[a].nodeValue)
+					: this.Lines(b[a]);
+			return e || this.br || this.text.push(this.line.join(" ")), this.text;
+		}),
+		(F.SplitWidth = function (h, e, f, g) {
+			var c,
+				b,
+				a,
+				d = [];
+			e.font = g + "px " + f;
+			for (c = 0; c < this.text.length; ++c) {
+				(a = this.text[c].split(/\s+/)), (this.line = [a[0]]);
+				for (b = 1; b < a.length; ++b)
+					e.measureText(this.line.join(" ") + " " + a[b]).width > h
+						? (d.push(this.line.join(" ")), (this.line = [a[b]]))
+						: this.line.push(a[b]);
+				d.push(this.line.join(" "));
+			}
+			return (this.text = d);
+		});
+	function _(a, b) {
+		(this.ts = null),
+			(this.tc = a),
+			(this.tag = b),
+			(this.x = this.y = this.w = this.h = this.sc = 1),
+			(this.z = 0),
+			(this.pulse = 1),
+			(this.pulsate = a.pulsateTo < 1),
+			(this.colour = a.outlineColour),
+			(this.adash = ~~a.outlineDash),
+			(this.agap = ~~a.outlineDashSpace || this.adash),
+			(this.aspeed = a.outlineDashSpeed * 1),
+			this.colour == "tag"
+				? (this.colour = i(b.a, "color"))
+				: this.colour == "tagbg" && (this.colour = i(b.a, "background-color")),
+			(this.Draw = this.pulsate ? this.DrawPulsate : this.DrawSimple),
+			(this.radius = a.outlineRadius | 0),
+			this.SetMethod(a.outlineMethod, a.altImage);
+	}
+	(f = _.prototype),
+		(f.SetMethod = function (a, d) {
+			var b = {
+					block: ["PreDraw", "DrawBlock"],
+					colour: ["PreDraw", "DrawColour"],
+					outline: ["PostDraw", "DrawOutline"],
+					classic: ["LastDraw", "DrawOutline"],
+					size: ["PreDraw", "DrawSize"],
+					none: ["LastDraw"],
+				},
+				c = b[a] || b.outline;
+			a == "none"
+				? (this.Draw = function () {
+						return 1;
+				  })
+				: (this.drawFunc = this[c[1]]),
+				(this[c[0]] = this.Draw),
+				d && ((this.RealPreDraw = this.PreDraw), (this.PreDraw = this.DrawAlt));
+		}),
+		(f.Update = function (d, e, i, j, a, f, g, h) {
+			var b = this.tc.outlineOffset,
+				c = 2 * b;
+			(this.x = a * d + g - b),
+				(this.y = a * e + h - b),
+				(this.w = a * i + c),
+				(this.h = a * j + c),
+				(this.sc = a),
+				(this.z = f);
+		}),
+		(f.Ants = function (k) {
+			if (!this.adash) return;
+			var b = this.adash,
+				c = this.agap,
+				a = this.aspeed,
+				j = b + c,
+				h = 0,
+				g = b,
+				f = c,
+				i = 0,
+				d = 0,
+				e;
+			a &&
+				((d = (p(a) * (q() - this.ts)) / 50),
+				a < 0 && (d = 864e4 - d),
+				(a = ~~d % j)),
+				a
+					? (b >= a ? ((h = b - a), (g = a)) : ((f = j - a), (i = c - f)),
+					  (e = [h, f, g, i]))
+					: (e = [b, c]),
+				k.setLineDash(e);
+		}),
+		(f.DrawOutline = function (a, d, e, b, c, f) {
+			var g = h(this.radius, c / 2, b / 2);
+			(a.strokeStyle = f), this.Ants(a), y(a, d, e, b, c, g, !0);
+		}),
+		(f.DrawSize = function (i, n, m, l, k, j, a, h, g) {
+			var f = a.w,
+				e = a.h,
+				c,
+				b,
+				d;
+			return (
+				this.pulsate
+					? (a.image
+							? (d =
+									(a.image.height + this.tc.outlineIncrease) / a.image.height)
+							: (d = a.oscale),
+					  (b = a.fimage || a.image),
+					  (c = 1 + (d - 1) * (1 - this.pulse)),
+					  (a.h *= c),
+					  (a.w *= c))
+					: (b = a.oimage),
+				(a.alpha = 1),
+				a.Draw(i, h, g, b),
+				(a.h = e),
+				(a.w = f),
+				1
+			);
+		}),
+		(f.DrawColour = function (d, h, i, e, f, g, a, b, c) {
+			return a.oimage
+				? (this.pulse < 1
+						? ((a.alpha = 1 - w(this.pulse, 2)),
+						  a.Draw(d, b, c, a.fimage),
+						  (a.alpha = this.pulse))
+						: (a.alpha = 1),
+				  a.Draw(d, b, c, a.oimage),
+				  1)
+				: this[a.image ? "DrawColourImage" : "DrawColourText"](
+						d,
+						h,
+						i,
+						e,
+						f,
+						g,
+						a,
+						b,
+						c,
+				  );
+		}),
+		(f.DrawColourText = function (f, h, i, j, g, e, a, b, c) {
+			var d = a.colour;
+			return (a.colour = e), (a.alpha = 1), a.Draw(f, b, c), (a.colour = d), 1;
+		}),
+		(f.DrawColourImage = function (a, q, p, o, n, m, i, r, l) {
+			var f = a.canvas,
+				e = ~~g(q, 0),
+				d = ~~g(p, 0),
+				c = (h(f.width - e, o) + 0.5) | 0,
+				b = (h(f.height - d, n) + 0.5) | 0,
+				j;
+			return (
+				v ? ((v.width = c), (v.height = b)) : (v = k(c, b)),
+				!v
+					? this.SetMethod("outline")
+					: ((j = v.getContext("2d")),
+					  j.drawImage(f, e, d, c, b, 0, 0, c, b),
+					  a.clearRect(e, d, c, b),
+					  this.pulsate ? (i.alpha = 1 - w(this.pulse, 2)) : (i.alpha = 1),
+					  i.Draw(a, r, l),
+					  a.setTransform(1, 0, 0, 1, 0, 0),
+					  a.save(),
+					  a.beginPath(),
+					  a.rect(e, d, c, b),
+					  a.clip(),
+					  (a.globalCompositeOperation = "source-in"),
+					  (a.fillStyle = m),
+					  a.fillRect(e, d, c, b),
+					  a.restore(),
+					  (a.globalAlpha = 1),
+					  (a.globalCompositeOperation = "destination-over"),
+					  a.drawImage(v, 0, 0, c, b, e, d, c, b),
+					  (a.globalCompositeOperation = "source-over"),
+					  1)
+			);
+		}),
+		(f.DrawAlt = function (b, a, c, d, f, g) {
+			var e = this.RealPreDraw(b, a, c, d, f, g);
+			return a.alt && (a.DrawImage(b, c, d, a.alt), (e = 1)), e;
+		}),
+		(f.DrawBlock = function (a, d, e, b, c, f) {
+			var g = h(this.radius, c / 2, b / 2);
+			(a.fillStyle = f), y(a, d, e, b, c, g);
+		}),
+		(f.DrawSimple = function (a, b, c, d, e, f) {
+			var g = this.tc;
+			return (
+				a.setTransform(1, 0, 0, 1, 0, 0),
+				(a.strokeStyle = this.colour),
+				(a.lineWidth = g.outlineThickness),
+				(a.shadowBlur = a.shadowOffsetX = a.shadowOffsetY = 0),
+				(a.globalAlpha = f ? e : 1),
+				this.drawFunc(a, this.x, this.y, this.w, this.h, this.colour, b, c, d)
+			);
+		}),
+		(f.DrawPulsate = function (h, d, e, f) {
+			var g = q() - this.ts,
+				c = this.tc,
+				b =
+					c.pulsateTo +
+					(1 - c.pulsateTo) *
+						(0.5 + l((2 * Math.PI * g) / (1e3 * c.pulsateTime)) / 2);
+			return (
+				(this.pulse = b = a.Smooth(1, b)), this.DrawSimple(h, d, e, f, b, 1)
+			);
+		}),
+		(f.Active = function (d, a, b) {
+			var c =
+				a >= this.x &&
+				b >= this.y &&
+				a <= this.x + this.w &&
+				b <= this.y + this.h;
+			return c ? (this.ts = this.ts || q()) : (this.ts = null), c;
+		}),
+		(f.PreDraw = f.PostDraw = f.LastDraw = x);
+	function J(a, h, c, b, e, f, g, d, i, j, k, l, m, n) {
+		(this.tc = a),
+			(this.image = null),
+			(this.text = h),
+			(this.text_original = n),
+			(this.line_widths = []),
+			(this.title = c.title || null),
+			(this.a = c),
+			(this.position = new s(b[0], b[1], b[2])),
+			(this.x = this.y = this.z = 0),
+			(this.w = e),
+			(this.h = f),
+			(this.colour = g || a.textColour),
+			(this.bgColour = d || a.bgColour),
+			(this.bgRadius = i | 0),
+			(this.bgOutline = j || this.colour),
+			(this.bgOutlineThickness = k | 0),
+			(this.textFont = l || a.textFont),
+			(this.padding = m | 0),
+			(this.sc = this.alpha = 1),
+			(this.weighted = !a.weight),
+			(this.outline = new _(a, this)),
+			(this.audio = null);
+	}
+	(d = J.prototype),
+		(d.Init = function (b) {
+			var a = this.tc;
+			(this.textHeight = a.textHeight),
+				this.HasText()
+					? this.Measure(a.ctxt, a)
+					: ((this.w = this.iw), (this.h = this.ih)),
+				(this.SetShadowColour = a.shadowAlpha
+					? this.SetShadowColourAlpha
+					: this.SetShadowColourFixed),
+				this.SetDraw(a);
+		}),
+		(d.Draw = x),
+		(d.HasText = function () {
+			return this.text && this.text[0].length > 0;
+		}),
+		(d.EqualTo = function (a) {
+			var b = a.getElementsByTagName("img");
+			return this.a.href != a.href
+				? 0
+				: b.length
+				? this.image.src == b[0].src
+				: (a.innerText || a.textContent) == this.text_original;
+		}),
+		(d.SetImage = function (a) {
+			this.image = this.fimage = a;
+		}),
+		(d.SetAudio = function (a) {
+			(this.audio = a), this.audio.load();
+		}),
+		(d.SetDraw = function (a) {
+			(this.Draw = this.fimage
+				? a.ie > 7
+					? this.DrawImageIE
+					: this.DrawImage
+				: this.DrawText),
+				a.noSelect && (this.CheckActive = x);
+		}),
+		(d.MeasureText = function (d) {
+			var a,
+				e = this.text.length,
+				b = 0,
+				c;
+			for (a = 0; a < e; ++a)
+				(this.line_widths[a] = c = d.measureText(this.text[a]).width),
+					(b = g(b, c));
+			return b;
+		}),
+		(d.Measure = function (e, a) {
+			var f = ae(this.text, this.textFont, this.textHeight),
+				b,
+				k,
+				h,
+				i,
+				g,
+				l,
+				j,
+				c,
+				d;
+			(j = f ? f.max.y + f.min.y : this.textHeight),
+				(e.font = this.font = this.textHeight + "px " + this.textFont),
+				(l = this.MeasureText(e)),
+				a.txtOpt &&
+					((b = a.txtScale),
+					(k = b * this.textHeight),
+					(h = k + "px " + this.textFont),
+					(i = [b * a.shadowOffset[0], b * a.shadowOffset[1]]),
+					(e.font = h),
+					(g = this.MeasureText(e)),
+					(d = new O(
+						this.text,
+						h,
+						g + b,
+						b * j + b,
+						g,
+						this.line_widths,
+						a.textAlign,
+						a.textVAlign,
+						b,
+					)),
+					this.image &&
+						d.SetImage(
+							this.image,
+							this.iw,
+							this.ih,
+							a.imagePosition,
+							a.imagePadding,
+							a.imageAlign,
+							a.imageVAlign,
+							a.imageScale,
+						),
+					(c = d.Create(
+						this.colour,
+						this.bgColour,
+						this.bgOutline,
+						b * this.bgOutlineThickness,
+						a.shadow,
+						b * a.shadowBlur,
+						i,
+						b * this.padding,
+						b * this.bgRadius,
+					)),
+					a.outlineMethod == "colour"
+						? (this.oimage = d.Create(
+								this.outline.colour,
+								this.bgColour,
+								this.outline.colour,
+								b * this.bgOutlineThickness,
+								a.shadow,
+								b * a.shadowBlur,
+								i,
+								b * this.padding,
+								b * this.bgRadius,
+						  ))
+						: a.outlineMethod == "size" &&
+						  ((f = ae(
+								this.text,
+								this.textFont,
+								this.textHeight + a.outlineIncrease,
+						  )),
+						  (k = f.max.y + f.min.y),
+						  (h =
+								b * (this.textHeight + a.outlineIncrease) +
+								"px " +
+								this.textFont),
+						  (e.font = h),
+						  (g = this.MeasureText(e)),
+						  (d = new O(
+								this.text,
+								h,
+								g + b,
+								b * k + b,
+								g,
+								this.line_widths,
+								a.textAlign,
+								a.textVAlign,
+								b,
+						  )),
+						  this.image &&
+								d.SetImage(
+									this.image,
+									this.iw + a.outlineIncrease,
+									this.ih + a.outlineIncrease,
+									a.imagePosition,
+									a.imagePadding,
+									a.imageAlign,
+									a.imageVAlign,
+									a.imageScale,
+								),
+						  (this.oimage = d.Create(
+								this.colour,
+								this.bgColour,
+								this.bgOutline,
+								b * this.bgOutlineThickness,
+								a.shadow,
+								b * a.shadowBlur,
+								i,
+								b * this.padding,
+								b * this.bgRadius,
+						  )),
+						  (this.oscale = this.oimage.width / c.width),
+						  a.outlineIncrease > 0
+								? (c = H(c, this.oimage.width, this.oimage.height))
+								: (this.oimage = H(this.oimage, c.width, c.height))),
+					c &&
+						((this.fimage = c),
+						(l = this.fimage.width / b),
+						(j = this.fimage.height / b)),
+					this.SetDraw(a),
+					(a.txtOpt = !!this.fimage)),
+				(this.h = j),
+				(this.w = l);
+		}),
+		(d.SetFont = function (a, b, c, d) {
+			(this.textFont = a),
+				(this.colour = b),
+				(this.bgColour = c),
+				(this.bgOutline = d),
+				this.Measure(this.tc.ctxt, this.tc);
+		}),
+		(d.SetWeight = function (c) {
+			var b = this.tc,
+				e = b.weightMode.split(/[, ]/),
+				d,
+				a,
+				f = c.length;
+			if (!this.HasText()) return;
+			this.weighted = !0;
+			for (a = 0; a < f; ++a)
+				(d = e[a] || "size"),
+					"both" == d
+						? (this.Weight(
+								c[a],
+								b.ctxt,
+								b,
+								"size",
+								b.min_weight[a],
+								b.max_weight[a],
+								a,
+						  ),
+						  this.Weight(
+								c[a],
+								b.ctxt,
+								b,
+								"colour",
+								b.min_weight[a],
+								b.max_weight[a],
+								a,
+						  ))
+						: this.Weight(
+								c[a],
+								b.ctxt,
+								b,
+								d,
+								b.min_weight[a],
+								b.max_weight[a],
+								a,
+						  );
+			this.Measure(b.ctxt, b);
+		}),
+		(d.Weight = function (b, i, a, d, f, h, e) {
+			b = isNaN(b) ? 1 : b;
+			var c = (b - f) / (h - f);
+			"colour" == d
+				? (this.colour = L(a, c, e))
+				: "bgcolour" == d
+				? (this.bgColour = L(a, c, e))
+				: "bgoutline" == d
+				? (this.bgOutline = L(a, c, e))
+				: "outline" == d
+				? (this.outline.colour = L(a, c, e))
+				: "size" == d &&
+				  (a.weightSizeMin > 0 && a.weightSizeMax > a.weightSizeMin
+						? (this.textHeight =
+								a.weightSize *
+								(a.weightSizeMin + (a.weightSizeMax - a.weightSizeMin) * c))
+						: (this.textHeight = g(1, b * a.weightSize)));
+		}),
+		(d.SetShadowColourFixed = function (a, b, c) {
+			a.shadowColor = b;
+		}),
+		(d.SetShadowColourAlpha = function (a, b, c) {
+			a.shadowColor = aE(b, c);
+		}),
+		(d.DrawText = function (a, h, i) {
+			var e = this.tc,
+				g = this.x,
+				f = this.y,
+				c = this.sc,
+				b,
+				d;
+			(a.globalAlpha = this.alpha),
+				(a.fillStyle = this.colour),
+				e.shadow && this.SetShadowColour(a, e.shadow, this.alpha),
+				(a.font = this.font),
+				(g += h / c),
+				(f += i / c - this.h / 2);
+			for (b = 0; b < this.text.length; ++b)
+				(d = g),
+					"right" == e.textAlign
+						? (d += this.w / 2 - this.line_widths[b])
+						: "centre" == e.textAlign
+						? (d -= this.line_widths[b] / 2)
+						: (d -= this.w / 2),
+					a.setTransform(c, 0, 0, c, c * d, c * f),
+					a.fillText(this.text[b], 0, 0),
+					(f += this.textHeight);
+		}),
+		(d.DrawImage = function (b, i, k, l) {
+			var e = this.x,
+				f = this.y,
+				a = this.sc,
+				j = l || this.fimage,
+				c = this.w,
+				d = this.h,
+				g = this.alpha,
+				h = this.shadow;
+			(b.globalAlpha = g),
+				h && this.SetShadowColour(b, h, g),
+				(e += i / a - c / 2),
+				(f += k / a - d / 2),
+				b.setTransform(a, 0, 0, a, a * e, a * f),
+				b.drawImage(j, 0, 0, c, d);
+		}),
+		(d.DrawImageIE = function (b, d, e) {
+			var c = this.fimage,
+				a = this.sc,
+				f = (c.width = this.w * a),
+				g = (c.height = this.h * a),
+				h = this.x * a + d - f / 2,
+				i = this.y * a + e - g / 2;
+			b.setTransform(1, 0, 0, 1, 0, 0),
+				(b.globalAlpha = this.alpha),
+				b.drawImage(c, h, i);
+		}),
+		(d.Calc = function (g, e) {
+			var a,
+				b = this.tc,
+				d = b.minBrightness,
+				f = b.maxBrightness,
+				c = b.max_radius;
+			return (
+				(a = g.xform(this.position)),
+				(this.xformed = a),
+				(a = aI(b, a, b.stretchX, b.stretchY)),
+				(this.x = a.x),
+				(this.y = a.y),
+				(this.z = a.z),
+				(this.sc = a.w),
+				(this.alpha = e * G(d + ((f - d) * (c - this.z)) / (2 * c), 0, 1)),
+				this.xformed
+			);
+		}),
+		(d.UpdateActive = function (h, e, f) {
+			var a = this.outline,
+				b = this.w,
+				c = this.h,
+				d = this.x - b / 2,
+				g = this.y - c / 2;
+			return a.Update(d, g, b, c, this.sc, this.z, e, f), a;
+		}),
+		(d.CheckActive = function (a, d, e) {
+			var b = this.tc,
+				c = this.UpdateActive(a, d, e);
+			return c.Active(a, b.mx, b.my) ? c : null;
+		}),
+		(d.Clicked = function (f) {
+			var b = this.a,
+				a = b.target,
+				d = b.href,
+				e;
+			if (a != "" && a != "_self") {
+				if (self.frames[a]) self.frames[a].document.location = d;
+				else {
+					try {
+						if (top.frames[a]) {
+							top.frames[a].document.location = d;
+							return;
+						}
+					} catch (a) {}
+					window.open(d, a);
+				}
+				return;
+			}
+			if (c.createEvent) {
+				if (
+					((e = c.createEvent("MouseEvents")),
+					e.initMouseEvent(
+						"click",
+						1,
+						1,
+						window,
+						0,
+						0,
+						0,
+						0,
+						0,
+						0,
+						0,
+						0,
+						0,
+						0,
+						null,
+					),
+					!b.dispatchEvent(e))
+				)
+					return;
+			} else if (b.fireEvent) if (!b.fireEvent("onclick")) return;
+			c.location = d;
+		}),
+		(d.StopAudio = function () {
+			this.audio && this.playing && this.audio.pause(),
+				(this.stopped = 1),
+				(this.playing = 0);
+		}),
+		(d.PlayAudio = function () {
+			if (e === "off" || this.tc.audioOff) return;
+			if (!e && !ag()) return;
+			var a = this.tc.audio,
+				c = this.tc.gain,
+				d = "suspended",
+				b;
+			if (this.audio)
+				if (
+					(this.track ||
+						((this.track = e.createMediaElementSource(this.audio)),
+						(this.gain = e.createGain()),
+						this.track.connect(this.gain),
+						this.gain.connect(e.destination)),
+					(a = this.audio),
+					(c = this.gain),
+					!a.paused)
+				)
+					return 1;
+			if (a) {
+				if ((e.state == d && e.resume(), e.state == d)) return;
+				return (
+					(c.gain.value = h(2, g(0, this.tc.audioVolume * 1))),
+					(a.currentTime = 0),
+					(this.stopped = 0),
+					(b = a.play()),
+					b !== void 0 &&
+						b.then((a) => {
+							this.stopped ? this.audio.pause() : (this.playing = 1);
+						}),
+					1
+				);
+			}
+		});
+	function a(f, o, k) {
+		var d,
+			i,
+			b = c.getElementById(f),
+			l = ["id", "class", "innerHTML"];
+		if (!b) throw 0;
+		if (
+			(n(window.G_vmlCanvasManager) &&
+				((b = window.G_vmlCanvasManager.initElement(b)),
+				(this.ie = parseFloat(navigator.appVersion.split("MSIE")[1]))),
+			b && (!b.getContext || !b.getContext("2d").fillText))
+		) {
+			i = c.createElement("DIV");
+			for (d = 0; d < l.length; ++d) i[l[d]] = b[l[d]];
+			throw (b.parentNode.insertBefore(i, b), b.parentNode.removeChild(b), 0);
+		}
+		for (d in a.options)
+			this[d] = k && n(k[d]) ? k[d] : n(a[d]) ? a[d] : a.options[d];
+		if (
+			((this.canvas = b),
+			(this.ctxt = b.getContext("2d")),
+			(this.z1 = 250 / g(this.depth, 0.001)),
+			(this.z2 = this.z1 / this.zoom),
+			(this.radius = h(b.height, b.width) * 0.0075),
+			(this.max_radius = 100),
+			(this.max_weight = []),
+			(this.min_weight = []),
+			(this.textFont = this.textFont && Q(this.textFont)),
+			(this.textHeight *= 1),
+			(this.imageRadius = this.imageRadius.toString()),
+			(this.pulsateTo = G(this.pulsateTo, 0, 1)),
+			(this.minBrightness = G(this.minBrightness, 0, 1)),
+			(this.maxBrightness = G(this.maxBrightness, this.minBrightness, 1)),
+			(this.ctxt.textBaseline = "top"),
+			(this.lx = (this.lock + "").indexOf("x") + 1),
+			(this.ly = (this.lock + "").indexOf("y") + 1),
+			(this.frozen = this.dx = this.dy = this.fixedAnim = this.touchState = 0),
+			(this.fixedAlpha = 1),
+			(this.source = o || f),
+			(this.repeatTags = h(64, ~~this.repeatTags)),
+			(this.minTags = h(200, ~~this.minTags)),
+			~~this.scrollPause > 0
+				? (a.scrollPause = ~~this.scrollPause)
+				: (this.scrollPause = 0),
+			this.minTags > 0 &&
+				this.repeatTags < 1 &&
+				(d = this.GetTags().length) &&
+				(this.repeatTags = af(this.minTags / d) - 1),
+			(this.transform = m.Identity()),
+			(this.startTime = this.time = q()),
+			(this.mx = this.my = -1),
+			this.centreImage && av(this),
+			(this.Animate = this.dragControl
+				? this.AnimateDrag
+				: this.AnimatePosition),
+			(this.animTiming =
+				typeof a[this.animTiming] == "function"
+					? a[this.animTiming]
+					: a.Smooth),
+			this.shadowBlur || this.shadowOffset[0] || this.shadowOffset[1]
+				? ((this.ctxt.shadowColor = this.shadow),
+				  (this.shadow = this.ctxt.shadowColor),
+				  (this.shadowAlpha = aD()))
+				: delete this.shadow,
+			this.activeAudio === !1
+				? (e = "off")
+				: this.activeAudio && this.LoadAudio(),
+			this.Load(),
+			o &&
+				this.hideTags &&
+				(function (b) {
+					a.loaded
+						? b.HideTags()
+						: t(
+								"load",
+								function () {
+									b.HideTags();
+								},
+								window,
+						  );
+				})(this),
+			(this.yaw = this.initial ? this.initial[0] * this.maxSpeed : 0),
+			(this.pitch = this.initial ? this.initial[1] * this.maxSpeed : 0),
+			this.tooltip
+				? ((this.ctitle = b.title),
+				  (b.title = ""),
+				  this.tooltip == "native"
+						? (this.Tooltip = this.TooltipNative)
+						: ((this.Tooltip = this.TooltipDiv),
+						  this.ttdiv ||
+								((this.ttdiv = c.createElement("div")),
+								(this.ttdiv.className = this.tooltipClass),
+								(this.ttdiv.style.position = "absolute"),
+								(this.ttdiv.style.zIndex = b.style.zIndex + 1),
+								t(
+									"mouseover",
+									function (a) {
+										a.target.style.display = "none";
+									},
+									this.ttdiv,
+								),
+								c.body.appendChild(this.ttdiv))))
+				: (this.Tooltip = this.TooltipNone),
+			!this.noMouse && !j[f])
+		) {
+			(j[f] = [
+				["mousemove", ad],
+				["mouseout", an],
+				["mouseup", aq],
+				["touchstart", ar],
+				["touchend", ac],
+				["touchcancel", ac],
+				["touchmove", au],
+			]),
+				this.dragControl &&
+					(j[f].push(["mousedown", ap]), j[f].push(["selectstart", x])),
+				this.wheelZoom &&
+					(j[f].push(["mousewheel", ab]), j[f].push(["DOMMouseScroll", ab])),
+				this.scrollPause && j[f].push(["scroll", aw, window]);
+			for (d = 0; d < j[f].length; ++d)
+				(i = j[f][d]), t(i[0], i[1], i[2] ? i[2] : b);
+		}
+		a.started ||
+			((a.NextFrame = window.requestAnimationFrame ? az : aA),
+			(a.interval = this.interval),
+			a.NextFrame(this.interval),
+			(a.started = 1));
+	}
+	(b = a.prototype),
+		(b.SourceElements = function () {
+			return c.querySelectorAll
+				? c.querySelectorAll("#" + this.source)
+				: [c.getElementById(this.source)];
+		}),
+		(b.HideTags = function () {
+			var b = this.SourceElements(),
+				a;
+			for (a = 0; a < b.length; ++a) b[a].style.display = "none";
+		}),
+		(b.GetTags = function () {
+			var e = this.SourceElements(),
+				c,
+				f = [],
+				a,
+				b,
+				d;
+			for (d = 0; d <= this.repeatTags; ++d)
+				for (a = 0; a < e.length; ++a) {
+					c = e[a].getElementsByTagName("a");
+					for (b = 0; b < c.length; ++b) f.push(c[b]);
+				}
+			return f;
+		}),
+		(b.Message = function (j) {
+			var g = [],
+				a,
+				f,
+				b = j.split(""),
+				d,
+				e,
+				h,
+				i;
+			for (a = 0; a < b.length; ++a)
+				b[a] != " " &&
+					((f = a - b.length / 2),
+					(d = c.createElement("A")),
+					(d.href = "#"),
+					(d.innerText = b[a]),
+					(h = 100 * o(f / 9)),
+					(i = -100 * l(f / 9)),
+					(e = new J(
+						this,
+						b[a],
+						d,
+						[h, 0, i],
+						2,
+						18,
+						"#000",
+						"#fff",
+						0,
+						0,
+						0,
+						"monospace",
+						2,
+						b[a],
+					)),
+					e.Init(),
+					g.push(e));
+			return g;
+		}),
+		(b.AddAudio = function (b, c) {
+			if (e === "off") return;
+			var a = b.getElementsByTagName("audio");
+			a.length && (c.SetAudio(a[0]), (this.hasAudio = 1));
+		}),
+		(b.CreateTag = function (b) {
+			var e,
+				c,
+				a,
+				f,
+				d,
+				g,
+				h,
+				j,
+				k = [0, 0, 0],
+				l;
+			if ("text" != this.imageMode)
+				if (((e = b.getElementsByTagName("img")), e.length))
+					if (((c = new Image()), (c.src = e[0].src), !this.imageMode))
+						return (
+							(a = new J(this, "", b, k, 0, 0)),
+							a.SetImage(c),
+							A(c, e[0], e[1], a, this),
+							this.AddAudio(b, a),
+							a
+						);
+			if (
+				("image" != this.imageMode &&
+					((d = new V(b)),
+					(f = d.Lines()),
+					d.Empty()
+						? (d = null)
+						: ((g = this.textFont || Q(i(b, "font-family"))),
+						  this.splitWidth &&
+								(f = d.SplitWidth(
+									this.splitWidth,
+									this.ctxt,
+									g,
+									this.textHeight,
+								)),
+						  (h =
+								this.bgColour == "tag"
+									? i(b, "background-color")
+									: this.bgColour),
+						  (j = this.bgOutline == "tag" ? i(b, "color") : this.bgOutline))),
+				d || c)
+			)
+				return (
+					(a = new J(
+						this,
+						f,
+						b,
+						k,
+						2,
+						this.textHeight + 2,
+						this.textColour || i(b, "color"),
+						h,
+						this.bgRadius,
+						j,
+						this.bgOutlineThickness,
+						g,
+						this.padding,
+						d && d.original,
+					)),
+					c ? (a.SetImage(c), A(c, e[0], e[1], a, this)) : a.Init(),
+					this.AddAudio(b, a),
+					a
+				);
+		}),
+		(b.UpdateTag = function (a, b) {
+			var c = this.textColour || i(b, "color"),
+				d = this.textFont || Q(i(b, "font-family")),
+				e = this.bgColour == "tag" ? i(b, "background-color") : this.bgColour,
+				f = this.bgOutline == "tag" ? i(b, "color") : this.bgOutline;
+			(a.a = b),
+				(a.title = b.title),
+				(a.colour != c ||
+					a.textFont != d ||
+					a.bgColour != e ||
+					a.bgOutline != f) &&
+					a.SetFont(d, c, e, f);
+		}),
+		(b.Weight = function (d) {
+			var f = d.length,
+				c,
+				b,
+				a,
+				e = [],
+				g,
+				h = this.weightFrom ? this.weightFrom.split(/[, ]/) : [null],
+				i = h.length;
+			for (b = 0; b < f; ++b) {
+				e[b] = [];
+				for (a = 0; a < i; ++a)
+					(c = aj(d[b].a, h[a], this.textHeight)),
+						(!this.max_weight[a] || c > this.max_weight[a]) &&
+							(this.max_weight[a] = c),
+						(!this.min_weight[a] || c < this.min_weight[a]) &&
+							(this.min_weight[a] = c),
+						(e[b][a] = c);
+			}
+			for (a = 0; a < i; ++a)
+				this.max_weight[a] > this.min_weight[a] && (g = 1);
+			if (g) for (b = 0; b < f; ++b) d[b].SetWeight(e[b]);
+		}),
+		(b.Load = function () {
+			var c = this.GetTags(),
+				b = [],
+				d,
+				k,
+				l,
+				h,
+				i,
+				j,
+				f,
+				a,
+				e = [],
+				m = { sphere: aB, vcylinder: ax, hcylinder: aH, vring: aG, hring: aF };
+			if (c.length) {
+				e.length = c.length;
+				for (a = 0; a < c.length; ++a) e[a] = a;
+				this.shuffleTags && ai(e),
+					(h = 100 * this.radiusX),
+					(i = 100 * this.radiusY),
+					(j = 100 * this.radiusZ),
+					(this.max_radius = g(h, g(i, j)));
+				for (a = 0; a < c.length; ++a)
+					(k = this.CreateTag(c[e[a]])), k && b.push(k);
+				this.weight && this.Weight(b, !0),
+					this.shapeArgs
+						? (this.shapeArgs[0] = b.length)
+						: ((l = this.shape.toString().split(/[(),]/)),
+						  (d = l.shift()),
+						  typeof window[d] == "function"
+								? (this.shape = window[d])
+								: (this.shape = m[d] || m.sphere),
+						  (this.shapeArgs = [b.length, h, i, j].concat(l))),
+					(f = this.shape.apply(this, this.shapeArgs)),
+					(this.listLength = b.length);
+				for (a = 0; a < b.length; ++a)
+					b[a].position = new s(f[a][0], f[a][1], f[a][2]);
+			}
+			this.noTagsMessage &&
+				!b.length &&
+				((a =
+					this.imageMode && this.imageMode != "both"
+						? this.imageMode + " "
+						: ""),
+				(b = this.Message("No " + a + "tags"))),
+				(this.taglist = b);
+		}),
+		(b.Update = function () {
+			var e = this.GetTags(),
+				d = [],
+				j = this.taglist,
+				k,
+				f = [],
+				c = [],
+				h,
+				i,
+				g,
+				a,
+				b;
+			if (!this.shapeArgs) return this.Load();
+			if (e.length) {
+				(g = this.listLength = e.length), (i = j.length);
+				for (a = 0; a < i; ++a) d.push(j[a]), c.push(a);
+				for (a = 0; a < g; ++a) {
+					for (b = 0, k = 0; b < i; ++b)
+						j[b].EqualTo(e[a]) && (this.UpdateTag(d[b], e[a]), (k = c[b] = -1));
+					k || f.push(a);
+				}
+				for (a = 0, b = 0; a < i; ++a) c[b] == -1 ? c.splice(b, 1) : ++b;
+				if (c.length) {
+					for (ai(c); c.length && f.length; )
+						(a = c.shift()), (b = f.shift()), (d[a] = this.CreateTag(e[b]));
+					for (
+						c.sort(function (a, b) {
+							return a - b;
+						});
+						c.length;
+					)
+						d.splice(c.pop(), 1);
+				}
+				for (b = d.length / (f.length + 1), a = 0; f.length; )
+					d.splice(af(++a * b), 0, this.CreateTag(e[f.shift()]));
+				(this.shapeArgs[0] = g = d.length),
+					(h = this.shape.apply(this, this.shapeArgs));
+				for (a = 0; a < g; ++a)
+					d[a].position = new s(h[a][0], h[a][1], h[a][2]);
+				this.weight && this.Weight(d);
+			}
+			this.taglist = d;
+		}),
+		(b.SetShadow = function (a) {
+			(a.shadowBlur = this.shadowBlur),
+				(a.shadowOffsetX = this.shadowOffset[0]),
+				(a.shadowOffsetY = this.shadowOffset[1]);
+		}),
+		(b.LoadAudio = function () {
+			if (!e && !ag()) return;
+			(this.audio = c.createElement("audio")),
+				(this.audio.src = this.activeAudio),
+				(this.track = e.createMediaElementSource(this.audio)),
+				(this.gain = e.createGain()),
+				this.track.connect(this.gain),
+				this.gain.connect(e.destination),
+				(this.hasAudio = 1),
+				(P = function (a) {
+					e.resume(), c.removeEventListener("click", P);
+				}),
+				c.addEventListener("click", P);
+		}),
+		(b.ShowAudioIcon = function () {
+			var a = this.audioIconSize,
+				c = this.canvas,
+				d = this.ctxt,
+				k = c.width - a - 3,
+				f = c.height - a - 3,
+				g = this.audioIconThickness,
+				h = "#000",
+				i = "#fff",
+				j = this.audioIconDark,
+				b = this.audioOff,
+				l = "suspended";
+			if (!e) return;
+			b || (b = e.state === l),
+				this.audioIcon &&
+					this.hasAudio &&
+					($(b, d, a, k, f, g + 1, j ? i : h), $(b, d, a, k, f, g, j ? h : i));
+		}),
+		(b.CheckAudioIcon = function () {
+			var a = this.audioIconSize,
+				b = this.canvas,
+				c = this.audioIconThickness / 2,
+				d = b.width - a - 3 - c,
+				e = b.height - a - 3 - c;
+			if (this.audioIcon && this.mx >= d && this.my >= e) return !0;
+		}),
+		(b.ToggleAudio = function () {
+			var a = this.audioOff || (e && e.state === "suspended");
+			a || (this.currentAudio && this.currentAudio.StopAudio()),
+				(this.audioOff = !a);
+		}),
+		(b.Draw = function (s) {
+			if (this.paused) return;
+			var l = this.canvas,
+				i = l.width,
+				j = l.height,
+				q = 0,
+				p = ((s - this.time) * a.interval) / 1e3,
+				h = i / 2 + this.offsetX,
+				g = j / 2 + this.offsetY,
+				d = this.ctxt,
+				b,
+				f,
+				c,
+				o = -1,
+				e = this.taglist,
+				k = e.length,
+				t = this.active && this.active.tag,
+				m = "",
+				u = this.frontSelect,
+				r = this.centreFunc == x,
+				n;
+			if (((this.time = s), this.frozen && this.drawn))
+				return this.Animate(i, j, p);
+			(n = this.AnimateFixed()), d.setTransform(1, 0, 0, 1, 0, 0);
+			for (c = 0; c < k; ++c) e[c].Calc(this.transform, this.fixedAlpha);
+			if (
+				((e = ak(e, function (a, b) {
+					return b.z - a.z;
+				})),
+				n && this.fixedAnim.active)
+			)
+				b = this.fixedAnim.tag.UpdateActive(d, h, g);
+			else if (((this.active = null), this.CheckAudioIcon())) m = "pointer";
+			else {
+				for (c = 0; c < k; ++c)
+					(f =
+						this.mx >= 0 &&
+						this.my >= 0 &&
+						this.taglist[c].CheckActive(d, h, g)),
+						f &&
+							f.sc > q &&
+							(!u || f.z <= 0) &&
+							((b = f), (o = c), (b.tag = this.taglist[c]), (q = f.sc));
+				this.active = b;
+			}
+			this.txtOpt || (this.shadow && this.SetShadow(d)),
+				d.clearRect(0, 0, i, j);
+			for (c = 0; c < k; ++c) {
+				if (!r && e[c].z <= 0) {
+					try {
+						this.centreFunc(d, i, j, h, g);
+					} catch (a) {
+						alert(a), (this.centreFunc = x);
+					}
+					r = !0;
+				}
+				(b && b.tag == e[c] && b.PreDraw(d, e[c], h, g)) || e[c].Draw(d, h, g),
+					b && b.tag == e[c] && b.PostDraw(d);
+			}
+			this.freezeActive && b
+				? this.Freeze()
+				: (this.UnFreeze(), (this.drawn = k == this.listLength)),
+				this.fixedCallback &&
+					(this.fixedCallback(this, this.fixedCallbackTag),
+					(this.fixedCallback = null)),
+				n || this.Animate(i, j, p),
+				b &&
+					(b.LastDraw(d),
+					b.tag != t &&
+						(this.currentAudio &&
+							this.currentAudio != b.tag &&
+							this.currentAudio.StopAudio(),
+						b.tag.PlayAudio() && (this.currentAudio = b.tag)),
+					(m = this.activeCursor)),
+				(l.style.cursor = m),
+				this.Tooltip(b, this.taglist[o]),
+				this.audioIcon && this.ShowAudioIcon();
+		}),
+		(b.TooltipNone = function () {}),
+		(b.TooltipNative = function (b, a) {
+			b
+				? (this.canvas.title = a && a.title ? a.title : "")
+				: (this.canvas.title = this.ctitle);
+		}),
+		(b.SetTTDiv = function (c, d) {
+			var a = this,
+				b = a.ttdiv.style;
+			c != a.ttdiv.innerHTML && (b.display = "none"),
+				(a.ttdiv.innerHTML = c),
+				d && (d.title = a.ttdiv.innerHTML),
+				b.display == "none" &&
+					!a.tttimer &&
+					(a.tttimer = setTimeout(function () {
+						var c = X(a.canvas.id);
+						(b.display = "block"),
+							(b.left = c.x + a.mx + "px"),
+							(b.top = c.y + a.my + 24 + "px"),
+							(a.tttimer = null);
+					}, a.tooltipDelay));
+		}),
+		(b.TooltipDiv = function (b, a) {
+			b && a && a.title
+				? this.SetTTDiv(a.title, a)
+				: !b && this.mx != -1 && this.my != -1 && this.ctitle.length
+				? this.SetTTDiv(this.ctitle)
+				: (this.ttdiv.style.display = "none");
+		}),
+		(b.Transform = function (c, a, b) {
+			if (a || b) {
+				var d = o(a),
+					e = l(a),
+					f = o(b),
+					g = l(b),
+					h = new m([g, 0, f, 0, 1, 0, -f, 0, g]),
+					i = new m([1, 0, 0, 0, e, -d, 0, d, e]);
+				c.transform = c.transform.mul(h.mul(i));
+			}
+		}),
+		(b.AnimateFixed = function () {
+			var a, b, c, d, e;
+			return (
+				!!(this.fadeIn &&
+					((b = q() - this.startTime),
+					b >= this.fadeIn
+						? ((this.fadeIn = 0), (this.fixedAlpha = 1))
+						: (this.fixedAlpha = b / this.fadeIn)),
+				this.fixedAnim) &&
+				(this.fixedAnim.transform ||
+					(this.fixedAnim.transform = this.transform),
+				(a = this.fixedAnim),
+				(b = q() - a.t0),
+				(c = a.angle),
+				d,
+				(e = this.animTiming(a.t, b)),
+				(this.transform = a.transform),
+				b >= a.t
+					? ((this.fixedCallbackTag = a.tag),
+					  (this.fixedCallback = a.cb),
+					  (this.fixedAnim = this.yaw = this.pitch = 0))
+					: (c *= e),
+				(d = m.Rotation(c, a.axis)),
+				(this.transform = this.transform.mul(d)),
+				this.fixedAnim != 0)
+			);
+		}),
+		(b.AnimatePosition = function (g, h, f) {
+			var a = this,
+				d = a.mx,
+				e = a.my,
+				b,
+				c;
+			!a.frozen && d >= 0 && e >= 0 && d < g && e < h
+				? ((b = a.maxSpeed),
+				  (c = a.reverse ? -1 : 1),
+				  a.lx || (a.yaw = ((d * 2 * b) / g - b) * c * f),
+				  a.ly || (a.pitch = ((e * 2 * b) / h - b) * -c * f),
+				  (a.initial = null))
+				: a.initial ||
+				  (a.frozen && !a.freezeDecel ? (a.yaw = a.pitch = 0) : a.Decel(a)),
+				this.Transform(a, a.pitch, a.yaw);
+		}),
+		(b.AnimateDrag = function (d, e, c) {
+			var a = this,
+				b = (100 * c * a.maxSpeed) / a.max_radius / a.zoom;
+			a.dx || a.dy
+				? (a.lx || (a.yaw = (a.dx * b) / a.stretchX),
+				  a.ly || (a.pitch = (a.dy * -b) / a.stretchY),
+				  (a.dx = a.dy = 0),
+				  (a.initial = null))
+				: a.initial || a.Decel(a),
+				this.Transform(a, a.pitch, a.yaw);
+		}),
+		(b.Freeze = function () {
+			this.frozen ||
+				((this.preFreeze = [this.yaw, this.pitch]),
+				(this.frozen = 1),
+				(this.drawn = 0));
+		}),
+		(b.UnFreeze = function () {
+			this.frozen &&
+				((this.yaw = this.preFreeze[0]),
+				(this.pitch = this.preFreeze[1]),
+				(this.frozen = 0));
+		}),
+		(b.Decel = function (a) {
+			var b = a.minSpeed,
+				c = p(a.yaw),
+				d = p(a.pitch);
+			!a.lx && c > b && (a.yaw = c > a.z0 ? a.yaw * a.decel : 0),
+				!a.ly && d > b && (a.pitch = d > a.z0 ? a.pitch * a.decel : 0);
+		}),
+		(b.Zoom = function (a) {
+			(this.z2 = this.z1 * (1 / a)), (this.drawn = 0);
+		}),
+		(b.Clicked = function (b) {
+			if (this.CheckAudioIcon()) {
+				this.ToggleAudio();
+				return;
+			}
+			var a = this.active;
+			try {
+				a &&
+					a.tag &&
+					(this.clickToFront === !1 || this.clickToFront === null
+						? a.tag.Clicked(b)
+						: this.TagToFront(
+								a.tag,
+								this.clickToFront,
+								function () {
+									a.tag.Clicked(b);
+								},
+								!0,
+						  ));
+			} catch (a) {}
+		}),
+		(b.Wheel = function (a) {
+			var b = this.zoom + this.zoomStep * (a ? 1 : -1);
+			(this.zoom = h(this.zoomMax, g(this.zoomMin, b))), this.Zoom(this.zoom);
+		}),
+		(b.BeginDrag = function (a) {
+			(this.down = K(a, this.canvas)),
+				(a.cancelBubble = !0),
+				(a.returnValue = !1),
+				a.preventDefault && a.preventDefault();
+		}),
+		(b.Drag = function (e, a) {
+			if (this.dragControl && this.down) {
+				var d = this.dragThreshold * this.dragThreshold,
+					b = a.x - this.down.x,
+					c = a.y - this.down.y;
+				(this.dragging || b * b + c * c > d) &&
+					((this.dx = b), (this.dy = c), (this.dragging = 1), (this.down = a));
+			}
+			return this.dragging;
+		}),
+		(b.EndDrag = function () {
+			var a = this.dragging;
+			return (this.dragging = this.down = null), a;
+		});
+	function ah(a) {
+		var b = a.targetTouches[0],
+			c = a.targetTouches[1];
+		return E(w(c.pageX - b.pageX, 2) + w(c.pageY - b.pageY, 2));
+	}
+	(b.BeginPinch = function (a) {
+		(this.pinched = [ah(a), this.zoom]), a.preventDefault && a.preventDefault();
+	}),
+		(b.Pinch = function (d) {
+			var b,
+				c,
+				a = this.pinched;
+			if (!a) return;
+			(c = ah(d)),
+				(b = (a[1] * c) / a[0]),
+				(this.zoom = h(this.zoomMax, g(this.zoomMin, b))),
+				this.Zoom(this.zoom);
+		}),
+		(b.EndPinch = function (a) {
+			this.pinched = null;
+		}),
+		(b.Pause = function () {
+			this.paused = !0;
+		}),
+		(b.Resume = function () {
+			this.paused = !1;
+		}),
+		(b.SetSpeed = function (a) {
+			(this.initial = a),
+				(this.yaw = a[0] * this.maxSpeed),
+				(this.pitch = a[1] * this.maxSpeed);
+		}),
+		(b.FindTag = function (a) {
+			if (!n(a)) return null;
+			if ((n(a.index) && (a = a.index), !B(a))) return this.taglist[a];
+			var c, d, b;
+			n(a.id)
+				? ((c = "id"), (d = a.id))
+				: n(a.text) && ((c = "innerText"), (d = a.text));
+			for (b = 0; b < this.taglist.length; ++b)
+				if (this.taglist[b].a[c] == d) return this.taglist[b];
+		}),
+		(b.RotateTag = function (a, h, i, j, f, g) {
+			var b = a.Calc(this.transform, 1),
+				c = new s(b.x, b.y, b.z),
+				d = ay(i, h),
+				e = c.angle(d),
+				k = c.cross(d).unit();
+			e == 0
+				? ((this.fixedCallbackTag = a), (this.fixedCallback = f))
+				: (this.fixedAnim = {
+						angle: -e,
+						axis: k,
+						t: j,
+						t0: q(),
+						cb: f,
+						tag: a,
+						active: g,
+				  });
+		}),
+		(b.TagToFront = function (a, b, c, d) {
+			this.RotateTag(a, 0, 0, b, c, d);
+		}),
+		(b.Volume = function (a) {
+			this.audioVolume = a * 1;
+		}),
+		(a.Start = function (b, c, d) {
+			a.Delete(b), (a.tc[b] = new a(b, c, d));
+		});
+	function N(c, b) {
+		a.tc[b] && a.tc[b][c]();
+	}
+	(a.Linear = function (a, b) {
+		return b / a;
+	}),
+		(a.Smooth = function (a, b) {
+			return 0.5 - l((b * Math.PI) / a) / 2;
+		}),
+		(a.Pause = function (a) {
+			N("Pause", a);
+		}),
+		(a.Resume = function (a) {
+			N("Resume", a);
+		}),
+		(a.Reload = function (a) {
+			N("Load", a);
+		}),
+		(a.Update = function (a) {
+			N("Update", a);
+		}),
+		(a.SetSpeed = function (c, b) {
+			return (
+				!!(B(b) && a.tc[c] && !isNaN(b[0]) && !isNaN(b[1])) &&
+				(a.tc[c].SetSpeed(b), !0)
+			);
+		}),
+		(a.TagToFront = function (c, b) {
+			return !!B(b) && ((b.lat = b.lng = 0), a.RotateTag(c, b));
+		}),
+		(a.RotateTag = function (c, b) {
+			if (B(b) && a.tc[c]) {
+				isNaN(b.time) && (b.time = 500);
+				var d = a.tc[c].FindTag(b);
+				if (d)
+					return (
+						a.tc[c].RotateTag(d, b.lat, b.lng, b.time, b.callback, b.active), !0
+					);
+			}
+			return !1;
+		}),
+		(a.Delete = function (b) {
+			var d, e;
+			if (j[b])
+				if (((e = c.getElementById(b)), e))
+					for (d = 0; d < j[b].length; ++d) am(j[b][d][0], j[b][d][1], e);
+			delete j[b], delete a.tc[b];
+		}),
+		(a.tc = {}),
+		(a.options = {
+			z1: 2e4,
+			z2: 2e4,
+			z0: 2e-4,
+			freezeActive: !1,
+			freezeDecel: !1,
+			activeCursor: "pointer",
+			pulsateTo: 1,
+			pulsateTime: 3,
+			reverse: !1,
+			depth: 0.5,
+			maxSpeed: 0.05,
+			minSpeed: 0,
+			decel: 0.95,
+			interval: 20,
+			minBrightness: 0.1,
+			maxBrightness: 1,
+			outlineColour: "#ffff99",
+			outlineThickness: 2,
+			outlineOffset: 5,
+			outlineMethod: "outline",
+			outlineRadius: 0,
+			textColour: "#ff99ff",
+			textHeight: 15,
+			textFont: "Helvetica, Arial, sans-serif",
+			shadow: "#000",
+			shadowBlur: 0,
+			shadowOffset: [0, 0],
+			initial: null,
+			hideTags: !0,
+			zoom: 1,
+			weight: !1,
+			weightMode: "size",
+			weightFrom: null,
+			weightSize: 1,
+			weightSizeMin: null,
+			weightSizeMax: null,
+			weightGradient: { 0: "#f00", 0.33: "#ff0", 0.66: "#0f0", 1: "#00f" },
+			txtOpt: !0,
+			txtScale: 2,
+			frontSelect: !1,
+			wheelZoom: !0,
+			zoomMin: 0.3,
+			zoomMax: 3,
+			zoomStep: 0.05,
+			shape: "sphere",
+			lock: null,
+			tooltip: null,
+			tooltipDelay: 300,
+			tooltipClass: "tctooltip",
+			radiusX: 1,
+			radiusY: 1,
+			radiusZ: 1,
+			stretchX: 1,
+			stretchY: 1,
+			offsetX: 0,
+			offsetY: 0,
+			shuffleTags: !1,
+			noSelect: !1,
+			noMouse: !1,
+			imageScale: 1,
+			paused: !1,
+			dragControl: !1,
+			dragThreshold: 4,
+			centreFunc: x,
+			splitWidth: 0,
+			animTiming: "Smooth",
+			clickToFront: !1,
+			fadeIn: 0,
+			padding: 0,
+			bgColour: null,
+			bgRadius: 0,
+			bgOutline: null,
+			bgOutlineThickness: 0,
+			outlineIncrease: 4,
+			textAlign: "centre",
+			textVAlign: "middle",
+			imageMode: null,
+			imagePosition: null,
+			imagePadding: 2,
+			imageAlign: "centre",
+			imageVAlign: "middle",
+			noTagsMessage: !0,
+			centreImage: null,
+			pinchZoom: !1,
+			repeatTags: 0,
+			minTags: 0,
+			imageRadius: 0,
+			scrollPause: !1,
+			outlineDash: 0,
+			outlineDashSpace: 0,
+			outlineDashSpeed: 1,
+			activeAudio: "",
+			audioVolume: 1,
+			audioIcon: 1,
+			audioIconSize: 20,
+			audioIconThickness: 2,
+			audioIconDark: 0,
+			altImage: 0,
+		});
+	for (r in a.options) a[r] = a.options[r];
+	(window.TagCanvas = a),
+		t(
+			"load",
+			function () {
+				a.loaded = 1;
+			},
+			window,
+		);
+})();
diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index f4d04e5ec..f2d3209d6 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -1,20 +1,37 @@
-import * as fs from 'fs';
-import pluginVue from '@vitejs/plugin-vue';
-import { defineConfig } from 'vite';
+import * as fs from "fs";
+import pluginVue from "@vitejs/plugin-vue";
+import { defineConfig } from "vite";
 
-import locales from '../../locales';
-import meta from '../../package.json';
-import pluginJson5 from './vite.json5';
-import viteCompression from 'vite-plugin-compression';
+import locales from "../../locales";
+import meta from "../../package.json";
+import pluginJson5 from "./vite.json5";
+import viteCompression from "vite-plugin-compression";
 
-const extensions = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.json', '.json5', '.svg', '.sass', '.scss', '.css', '.vue'];
+const extensions = [
+	".ts",
+	".tsx",
+	".js",
+	".jsx",
+	".mjs",
+	".json",
+	".json5",
+	".svg",
+	".sass",
+	".scss",
+	".css",
+	".vue",
+];
 
 export default defineConfig(({ command, mode }) => {
-	fs.mkdirSync(__dirname + '/../../built', { recursive: true });
-	fs.writeFileSync(__dirname + '/../../built/meta.json', JSON.stringify({ version: meta.version }), 'utf-8');
+	fs.mkdirSync(__dirname + "/../../built", { recursive: true });
+	fs.writeFileSync(
+		__dirname + "/../../built/meta.json",
+		JSON.stringify({ version: meta.version }),
+		"utf-8",
+	);
 
 	return {
-		base: '/assets/',
+		base: "/assets/",
 
 		plugins: [
 			pluginVue({
@@ -22,56 +39,53 @@ export default defineConfig(({ command, mode }) => {
 			}),
 			pluginJson5(),
 			viteCompression({
-				algorithm: 'brotliCompress'
+				algorithm: "brotliCompress",
 			}),
 		],
 
 		resolve: {
 			extensions,
 			alias: {
-				'@/': __dirname + '/src/',
-				'/client-assets/': __dirname + '/assets/',
-				'/static-assets/': __dirname + '/../backend/assets/',
+				"@/": __dirname + "/src/",
+				"/client-assets/": __dirname + "/assets/",
+				"/static-assets/": __dirname + "/../backend/assets/",
 			},
 		},
 
 		define: {
 			_VERSION_: JSON.stringify(meta.version),
-			_LANGS_: JSON.stringify(Object.entries(locales).map(([k, v]) => [k, v._lang_])),
+			_LANGS_: JSON.stringify(
+				Object.entries(locales).map(([k, v]) => [k, v._lang_]),
+			),
 			_ENV_: JSON.stringify(process.env.NODE_ENV),
-			_DEV_: process.env.NODE_ENV !== 'production',
-			_PERF_PREFIX_: JSON.stringify('Misskey:'),
-			_DATA_TRANSFER_DRIVE_FILE_: JSON.stringify('mk_drive_file'),
-			_DATA_TRANSFER_DRIVE_FOLDER_: JSON.stringify('mk_drive_folder'),
-			_DATA_TRANSFER_DECK_COLUMN_: JSON.stringify('mk_deck_column'),
+			_DEV_: process.env.NODE_ENV !== "production",
+			_PERF_PREFIX_: JSON.stringify("Misskey:"),
+			_DATA_TRANSFER_DRIVE_FILE_: JSON.stringify("mk_drive_file"),
+			_DATA_TRANSFER_DRIVE_FOLDER_: JSON.stringify("mk_drive_folder"),
+			_DATA_TRANSFER_DECK_COLUMN_: JSON.stringify("mk_deck_column"),
 			__VUE_OPTIONS_API__: true,
 			__VUE_PROD_DEVTOOLS__: false,
 		},
 
 		build: {
-			target: [
-				'chrome87',
-				'firefox78',
-				'safari14',
-				'es2017',
-			],
-			manifest: 'manifest.json',
+			target: ["chrome87", "firefox78", "safari14", "es2017"],
+			manifest: "manifest.json",
 			rollupOptions: {
 				input: {
-					app: './src/init.ts',
+					app: "./src/init.ts",
 				},
 				output: {
 					manualChunks: {
-						vue: ['vue'],
+						vue: ["vue"],
 					},
 				},
 			},
 			cssCodeSplit: true,
 			assetsInlineLimit: 0,
-			outDir: __dirname + '/../../built/_client_dist_',
-			assetsDir: '.',
+			outDir: __dirname + "/../../built/_client_dist_",
+			assetsDir: ".",
 			emptyOutDir: false,
-			sourcemap: process.env.NODE_ENV === 'development',
+			sourcemap: process.env.NODE_ENV === "development",
 			reportCompressedSize: false,
 		},
 		optimizeDeps: {
diff --git a/packages/client/vite.json5.ts b/packages/client/vite.json5.ts
index e4f1c7123..8653c66d8 100644
--- a/packages/client/vite.json5.ts
+++ b/packages/client/vite.json5.ts
@@ -1,9 +1,9 @@
 // Original: https://github.com/rollup/plugins/tree/8835dd2aed92f408d7dc72d7cc25a9728e16face/packages/json
 
-import JSON5 from 'json5';
-import { Plugin } from 'rollup';
-import { createFilter, dataToEsm } from '@rollup/pluginutils';
-import { RollupJsonOptions } from '@rollup/plugin-json';
+import JSON5 from "json5";
+import { Plugin } from "rollup";
+import { createFilter, dataToEsm } from "@rollup/pluginutils";
+import { RollupJsonOptions } from "@rollup/plugin-json";
 
 interface Json5SyntaxError extends SyntaxError {
 	lineNumber: number;
@@ -12,13 +12,13 @@ interface Json5SyntaxError extends SyntaxError {
 
 export default function json5(options: RollupJsonOptions = {}): Plugin {
 	const filter = createFilter(options.include, options.exclude);
-	const indent = 'indent' in options ? options.indent : '\t';
+	const indent = "indent" in options ? options.indent : "\t";
 
 	return {
-		name: 'json5',
+		name: "json5",
 
 		transform(json, id) {
-			if (id.slice(-6) !== '.json5' || !filter(id)) return null;
+			if (id.slice(-6) !== ".json5" || !filter(id)) return null;
 
 			try {
 				const parsed = JSON5.parse(json);
@@ -29,15 +29,19 @@ export default function json5(options: RollupJsonOptions = {}): Plugin {
 						namedExports: options.namedExports,
 						indent,
 					}),
-					map: { mappings: '' },
+					map: { mappings: "" },
 				};
 			} catch (err) {
 				if (!(err instanceof SyntaxError)) {
 					throw err;
 				}
-				const message = 'Could not parse JSON5 file';
+				const message = "Could not parse JSON5 file";
 				const { lineNumber, columnNumber } = err as Json5SyntaxError;
-				this.warn({ message, id, loc: { line: lineNumber, column: columnNumber } });
+				this.warn({
+					message,
+					id,
+					loc: { line: lineNumber, column: columnNumber },
+				});
 				return null;
 			}
 		},
diff --git a/packages/sw/webpack.config.js b/packages/sw/webpack.config.js
index 8c9cc6e06..3443585d9 100644
--- a/packages/sw/webpack.config.js
+++ b/packages/sw/webpack.config.js
@@ -1,48 +1,50 @@
 const webpack = require("webpack");
-const path = require('path');
-const locales = require('../../locales');
-const meta = require('../../package.json');
+const path = require("path");
+const locales = require("../../locales");
+const meta = require("../../package.json");
 
 const isProduction = process.env.NODE_ENV === "production";
 
 module.exports = {
-    mode: isProduction ? "production" : "development",
-		stats: "errors-only",
-    entry: "./src/sw.ts",
-    output: {
-        path: path.resolve(__dirname, "../../built/_sw_dist_"),
-        filename: "sw.js"
-    },
-    resolve: {
-        extensions: [".js", ".ts"],
-    },
-    module: {
-        rules: [
-            {
-                test: /\.ts$/,
-                exclude: /(node_modules|bower_components)/,
-                use: {
-                    loader: "swc-loader",
-                    options: {
-                        // This makes swc-loader invoke swc synchronously.
-                        sync: true,
-                        jsc: {
-                            parser: {
-                                syntax: "typescript"
-                            }
-                        }
-                    }
-                }
-            }
-        ]
-    },
-    plugins: [
-        new webpack.DefinePlugin({
-            _VERSION_: JSON.stringify(meta.version),
-            _LANGS_: JSON.stringify(Object.entries(locales).map(([k, v]) => [k, v._lang_])),
-            _ENV_: JSON.stringify(process.env.NODE_ENV),
-            _DEV_: !isProduction,
-            _PERF_PREFIX_: JSON.stringify('Calckey:'),
-        })
-   ]
-}
+	mode: isProduction ? "production" : "development",
+	stats: "errors-only",
+	entry: "./src/sw.ts",
+	output: {
+		path: path.resolve(__dirname, "../../built/_sw_dist_"),
+		filename: "sw.js",
+	},
+	resolve: {
+		extensions: [".js", ".ts"],
+	},
+	module: {
+		rules: [
+			{
+				test: /\.ts$/,
+				exclude: /(node_modules|bower_components)/,
+				use: {
+					loader: "swc-loader",
+					options: {
+						// This makes swc-loader invoke swc synchronously.
+						sync: true,
+						jsc: {
+							parser: {
+								syntax: "typescript",
+							},
+						},
+					},
+				},
+			},
+		],
+	},
+	plugins: [
+		new webpack.DefinePlugin({
+			_VERSION_: JSON.stringify(meta.version),
+			_LANGS_: JSON.stringify(
+				Object.entries(locales).map(([k, v]) => [k, v._lang_]),
+			),
+			_ENV_: JSON.stringify(process.env.NODE_ENV),
+			_DEV_: !isProduction,
+			_PERF_PREFIX_: JSON.stringify("Calckey:"),
+		}),
+	],
+};

From 7b3993c83ea40b6560fd1448c4701510c91f8d79 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Thu, 6 Apr 2023 22:11:10 -0700
Subject: [PATCH 409/582] feat: blur muted text

---
 packages/client/src/components/MkNoteDetailed.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 66ad47484..6da148888 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -110,7 +110,7 @@
 			</MkA>
 		</template>
 		<template #reason>
-			<b>{{ muted.matched.join(", ") }}</b>
+			<b class="_mfm_blur_">{{ muted.matched.join(", ") }}</b>
 		</template>
 	</I18n>
 </div>
@@ -354,6 +354,15 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
+._mfm_blur_ {
+	filter: blur(6px);
+	transition: filter 0.3s;
+
+	&:hover {
+		filter: blur(0px);
+	}
+}
+
 .lxwezrsl {
 	font-size: 1.05em;
 	position: relative;

From ae53b4e5d385a5aa773f92d58ad202368b76b1f3 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Thu, 6 Apr 2023 22:28:44 -0700
Subject: [PATCH 410/582] refactor

---
 packages/client/src/components/MkNote.vue     |  2 +-
 .../client/src/components/MkNoteDetailed.vue  | 11 +---------
 .../global/MkMisskeyFlavoredMarkdown.vue      |  9 --------
 packages/client/src/components/mfm.ts         | 21 ++++++++++---------
 packages/client/src/style.scss                |  8 +++++++
 5 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index a0c4edda7..79dcef6e4 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -104,7 +104,7 @@
 			</MkA>
 		</template>
 		<template #reason>
-			<b>{{ muted.matched.join(", ") }}</b>
+			<b class="_blur_text">{{ muted.matched.join(", ") }}</b>
 		</template>
 	</I18n>
 </div>
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 6da148888..4be07a41f 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -110,7 +110,7 @@
 			</MkA>
 		</template>
 		<template #reason>
-			<b class="_mfm_blur_">{{ muted.matched.join(", ") }}</b>
+			<b class="_blur_text">{{ muted.matched.join(", ") }}</b>
 		</template>
 	</I18n>
 </div>
@@ -354,15 +354,6 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-._mfm_blur_ {
-	filter: blur(6px);
-	transition: filter 0.3s;
-
-	&:hover {
-		filter: blur(0px);
-	}
-}
-
 .lxwezrsl {
 	font-size: 1.05em;
 	position: relative;
diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index 36c3ea7b5..19e1d88e1 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -22,15 +22,6 @@ const props = withDefaults(defineProps<{
 </script>
 
 <style lang="scss">
-._mfm_blur_ {
-	filter: blur(6px);
-	transition: filter 0.3s;
-
-	&:hover {
-		filter: blur(0px);
-	}
-}
-
 .mfm-x2 {
 	--mfm-zoom-size: 200%;
 }
diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 6a8f81e40..e7f27854f 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -14,6 +14,7 @@ import MkA from "@/components/global/MkA.vue";
 import { host } from "@/config";
 import { MFM_TAGS } from "@/scripts/mfm-tags";
 import { reducedMotion } from "@/scripts/reduced-motion";
+import { defaultStore } from "@/store";
 
 export default defineComponent({
 	props: {
@@ -103,7 +104,7 @@ export default defineComponent({
 								case "tada": {
 									const speed = validTime(token.props.args.speed) || "1s";
 									style = `font-size: 150%;${
-										this.$store.state.animatedMfm
+										defaultStore.state.animatedMfm
 											? `animation: tada ${speed} linear infinite both;`
 											: ""
 									}`;
@@ -112,7 +113,7 @@ export default defineComponent({
 								case "jelly": {
 									const speed = validTime(token.props.args.speed) || "1s";
 									style =
-										this.$store.state.animatedMfm && !reducedMotion()
+										defaultStore.state.animatedMfm && !reducedMotion()
 											? `animation: mfm-rubberBand ${speed} linear infinite both;`
 											: "";
 									break;
@@ -120,7 +121,7 @@ export default defineComponent({
 								case "twitch": {
 									const speed = validTime(token.props.args.speed) || "0.5s";
 									style =
-										this.$store.state.animatedMfm && !reducedMotion()
+										defaultStore.state.animatedMfm && !reducedMotion()
 											? `animation: mfm-twitch ${speed} ease infinite;`
 											: "";
 									break;
@@ -128,7 +129,7 @@ export default defineComponent({
 								case "shake": {
 									const speed = validTime(token.props.args.speed) || "0.5s";
 									style =
-										this.$store.state.animatedMfm && !reducedMotion()
+										defaultStore.state.animatedMfm && !reducedMotion()
 											? `animation: mfm-shake ${speed} ease infinite;`
 											: "";
 									break;
@@ -146,7 +147,7 @@ export default defineComponent({
 										: "mfm-spin";
 									const speed = validTime(token.props.args.speed) || "1.5s";
 									style =
-										this.$store.state.animatedMfm && !reducedMotion()
+										defaultStore.state.animatedMfm && !reducedMotion()
 											? `animation: ${anime} ${speed} linear infinite; animation-direction: ${direction};`
 											: "";
 									break;
@@ -154,7 +155,7 @@ export default defineComponent({
 								case "jump": {
 									const speed = validTime(token.props.args.speed) || "0.75s";
 									style =
-										this.$store.state.animatedMfm && !reducedMotion()
+										defaultStore.state.animatedMfm && !reducedMotion()
 											? `animation: mfm-jump ${speed} linear infinite;`
 											: "";
 									break;
@@ -162,7 +163,7 @@ export default defineComponent({
 								case "bounce": {
 									const speed = validTime(token.props.args.speed) || "0.75s";
 									style =
-										this.$store.state.animatedMfm && !reducedMotion()
+										defaultStore.state.animatedMfm && !reducedMotion()
 											? `animation: mfm-bounce ${speed} linear infinite; transform-origin: center bottom;`
 											: "";
 									break;
@@ -170,13 +171,13 @@ export default defineComponent({
 								case "rainbow": {
 									const speed = validTime(token.props.args.speed) || "1s";
 									style =
-										this.$store.state.animatedMfm && !reducedMotion()
+										defaultStore.state.animatedMfm && !reducedMotion()
 											? `animation: mfm-rainbow ${speed} linear infinite;`
 											: "";
 									break;
 								}
 								case "sparkle": {
-									if (!(this.$store.state.animatedMfm || reducedMotion())) {
+									if (!(defaultStore.state.animatedMfm || reducedMotion())) {
 										return genEl(token.children);
 									}
 									return h(MkSparkle, {}, genEl(token.children));
@@ -239,7 +240,7 @@ export default defineComponent({
 									return h(
 										"span",
 										{
-											class: "_mfm_blur_",
+											class: "_blur_text",
 										},
 										genEl(token.children),
 									);
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 7a8a78f00..c1a1820bc 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -689,6 +689,14 @@ hr {
 	display: inline-flex;
 }
 
+._blur_text {
+	filter: blur(6px);
+	transition: filter 0.3s;
+
+	&:hover {
+		filter: blur(0px);
+	}
+}
 
 @media(prefers-reduced-motion: no-preference) {
 	@keyframes scaleIn {

From 78ef2c996aaa500e13bd85daf8859bc7060d775d Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 05:37:46 +0000
Subject: [PATCH 411/582] Update 'CALCKEY.md'

---
 CALCKEY.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 6121323ec..252450b3c 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -13,7 +13,6 @@
   - Join Reason system like Mastodon/Pleroma
   - Option to publicize instance blocks
   - Build flag to remove NSFW/AI stuff
-  - Timeline filters
   - Filter notifications by user
   - Exclude self from antenna
 - Form
@@ -34,7 +33,7 @@
 - Admin custom CSS
 - Add back time machine (jump to date)
 - Improve accesibility
-- Non-nyaify cat mode
+- Timeline filters
 
 ## Implemented
 
@@ -114,6 +113,11 @@
 - Compile time compression
 - Sonic search
 - Popular color schemes, including Nord, Gruvbox, and Catppuccin
+- Non-nyaify cat mode
+
+## Implemented (remote)
+
+
 - MissV: [fix Misskey Forkbomb](https://code.vtopia.live/Vtopia/MissV/commit/40b23c070bd4adbb3188c73546c6c625138fb3c1)
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)

From 8646a98023d80476f1a5239b940b75f904871e07 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 05:40:50 +0000
Subject: [PATCH 412/582] Update 'CALCKEY.md'

---
 CALCKEY.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 252450b3c..937110afb 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -5,8 +5,8 @@
 - Stucture
   - [DragonflyDB](https://dragonflydb.io/) support as a Redis alternative
   - Optionally use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes
-  - Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum)
-  - Use [Magic ReGeXP](https://regexp.dev/) for ReGeX 🦄
+  - Rewrite backend in Rust and [Rocket](https://rocket.rs/)
+  - Use [Magic RegExP](https://regexp.dev/) for RegEx 🦄
 - Function
   - Federate with note edits
   - User "choices" (recommended users) like Mastodon and Soapbox
@@ -20,6 +20,7 @@
   - Personal notes for all accounts
   - Fully revamp non-logged-in screen
   - Classic mode make instance icon bring up new context menu
+  - Lookup/details for post/file/instance
   - [Rat mode?](https://stop.voring.me/notes/933fx97bmd)
 
 ## Work in progress

From dac3b02a3fcadb7ecfe18c4dc7a3bc17235628dd Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Thu, 6 Apr 2023 22:48:07 -0700
Subject: [PATCH 413/582] days for featured

---
 packages/backend/src/server/api/endpoints/notes/featured.ts | 4 ++--
 packages/client/src/pages/explore.featured.vue              | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts
index a6d764bf3..47c1e1381 100644
--- a/packages/backend/src/server/api/endpoints/notes/featured.ts
+++ b/packages/backend/src/server/api/endpoints/notes/featured.ts
@@ -32,17 +32,17 @@ export const paramDef = {
 			enum: ["combined", "local", "remote"],
 			default: "local",
 		},
+		days: { type: "integer", minimum: 1, maximum: 365, default: 3 },
 	},
 	required: [],
 } as const;
 
 export default define(meta, paramDef, async (ps, user) => {
 	const max = 30;
-	const day = 1000 * 60 * 60 * 24 * 3; // 3日前まで
+	const day = 1000 * 60 * 60 * 24 * ps.days;
 
 	const query = Notes.createQueryBuilder("note")
 		.addSelect("note.score")
-		// .where("note.userHost IS NULL")
 		.andWhere("note.score > 0")
 		.andWhere("note.createdAt > :date", { date: new Date(Date.now() - day) })
 		.andWhere("note.visibility = 'public'")
diff --git a/packages/client/src/pages/explore.featured.vue b/packages/client/src/pages/explore.featured.vue
index 79de49db5..0f66307ab 100644
--- a/packages/client/src/pages/explore.featured.vue
+++ b/packages/client/src/pages/explore.featured.vue
@@ -19,6 +19,9 @@ const paginationForLocal = {
 	limit: 10,
 	origin: 'local',
 	offsetMode: true,
+	params: {
+		days: 14,
+	}
 };
 
 const paginationForRemote = {
@@ -27,6 +30,7 @@ const paginationForRemote = {
 	offsetMode: true,
 	params: {
 		origin: 'remote',
+		days: 7,
 	}
 }
 

From b999bf17661bdb93465e0d967e6123a51f90c4c0 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Thu, 6 Apr 2023 22:56:25 -0700
Subject: [PATCH 414/582] locale

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

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 3f3ab32b2..16e7aa7cb 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -956,9 +956,9 @@ license: "License"
 indexPosts: "Index posts"
 indexFrom: "Index from Post ID onwards (leave blank to index every post)"
 indexNotice: "Now indexing. This will probably take a while, please don't restart your server for at least an hour."
-customKaTeXMacro: "Custom KaTeX Macro"
+customKaTeXMacro: "Custom KaTeX macros"
 customKaTeXMacroDescription: "Set up macros to write mathematical expressions easily! The notation conforms to the LaTeX command definitions and is written as \\newcommand{\\name}{content} or \\newcommand{\\name}[number of arguments]{content}. For example, \\newcommand{\\add}[2]{#1 + #2} will expand \\add{3}{foo} to 3 + foo. The curly brackets surrounding the macro name can be changed to round or square brackets. This affects the brackets used for arguments. One (and only one) macro can be defined per line, and you can't break the line in the middle of the definition. Invalid lines are simply ignored. Only simple string substitution functions are supported; advanced syntax, such as conditional branching, cannot be used here."
-enableCustomKaTeXMacro: "Enable custom KaTeX macro"
+enableCustomKaTeXMacro: "Enable custom KaTeX macros"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."

From 07180d073bec69cd48895d61f8f9d695c5495318 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Thu, 6 Apr 2023 23:02:07 -0700
Subject: [PATCH 415/582] menu opts

---
 packages/client/src/store.ts | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index d2350e2ed..15cb69ff0 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -1,6 +1,7 @@
 import { markRaw, ref } from "vue";
 import { Storage } from "./pizzax";
 import { Theme } from "./scripts/theme";
+import { deviceKind } from '@/scripts/device-kind';
 
 export const postFormActions = [];
 export const userActions = [];
@@ -8,6 +9,18 @@ export const noteActions = [];
 export const noteViewInterruptors = [];
 export const notePostInterruptors = [];
 
+const menuOptions = [
+	"notifications",
+	"followRequests",
+	"messaging",
+	"explore",
+	"favorites",
+	"channels",
+	"search"
+];
+
+if (deviceKind === 'desktop') menuOptions.push("ui");
+
 // TODO: それぞれいちいちwhereとかdefaultというキーを付けなきゃいけないの冗長なのでなんとかする(ただ型定義が面倒になりそう)
 //       あと、現行の定義の仕方なら「whereが何であるかに関わらずキー名の重複不可」という制約を付けられるメリットもあるからそのメリットを引き継ぐ方法も考えないといけない
 export const defaultStore = markRaw(
@@ -82,17 +95,7 @@ export const defaultStore = markRaw(
 		},
 		menu: {
 			where: "deviceAccount",
-			default: [
-				"notifications",
-				undefined,
-				"followRequests",
-				"messaging",
-				"explore",
-				"favorites",
-				"channels",
-				"search",
-				"ui",
-			],
+			default: menuOptions,
 		},
 		visibility: {
 			where: "deviceAccount",

From c5464e7167acc566d3bdb50a252373792dab2fd1 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 7 Apr 2023 17:36:39 +0900
Subject: [PATCH 416/582] Update Japanese locale

---
 locales/ja-JP.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 6af0d7fc6..d553f9eab 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -612,7 +612,7 @@ regexpError: "正規表現エラー"
 regexpErrorDescription: "{tab}ワードミュートの{line}行目の正規表現にエラーが発生しました:"
 instanceMute: "インスタンスミュート"
 userSaysSomething: "{name}が何かを言いました"
-userSaysSomethingReason: "{name}前記{reason}"
+userSaysSomethingReason: "{name}が{reason}と言いました"
 makeActive: "アクティブにする"
 display: "表示"
 copy: "コピー"

From 177e9a50b2ad7558383b1ba25c40a619b54bd5bc Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.a-ef.org>
Date: Fri, 7 Apr 2023 06:26:13 -0400
Subject: [PATCH 417/582] fix id of move activity

---
 packages/backend/src/server/api/endpoints/i/move.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts
index bfeba0459..3d947063f 100644
--- a/packages/backend/src/server/api/endpoints/i/move.ts
+++ b/packages/backend/src/server/api/endpoints/i/move.ts
@@ -3,7 +3,6 @@ import { resolveUser } from "@/remote/resolve-user.js";
 import { DAY } from "@/const.js";
 import DeliverManager from "@/remote/activitypub/deliver-manager.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
-import { genId } from "@/misc/gen-id.js";
 import define from "../../define.js";
 import { ApiError } from "../../error.js";
 import { apiLogger } from "../../logger.js";
@@ -81,7 +80,7 @@ export const paramDef = {
 
 function moveActivity(toUrl: string, fromUrl: string) {
 	const activity = {
-		id: genId(),
+		id: null,
 		actor: fromUrl,
 		type: "Move",
 		object: fromUrl,

From 21905514d45e2c1f4e7998d6234c90ea8a0db801 Mon Sep 17 00:00:00 2001
From: Kaity A <supakaity@noreply.codeberg.org>
Date: Fri, 7 Apr 2023 14:25:22 +0000
Subject: [PATCH 418/582] Incorporate calckey-js into calckey repository
 (#9820)

Closes #9712.

Co-authored-by: Kaity A <kaity@theallans.com.au>
Co-authored-by: Ken Allan <ken@norganna.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9820
Co-authored-by: Kaity A <supakaity@noreply.codeberg.org>
Co-committed-by: Kaity A <supakaity@noreply.codeberg.org>
---
 Dockerfile                                 |     2 +
 package.json                               |     1 -
 packages/backend/package.json              |     2 +-
 packages/calckey-js/.editorconfig          |     7 +
 packages/calckey-js/.eslintignore          |     7 +
 packages/calckey-js/.eslintrc.js           |    57 +
 packages/calckey-js/.gitignore             |   113 +
 packages/calckey-js/CHANGELOG.md           |    29 +
 packages/calckey-js/LICENSE                |    21 +
 packages/calckey-js/README.md              |     7 +
 packages/calckey-js/api-extractor.json     |   364 +
 packages/calckey-js/codecov.yml            |     2 +
 packages/calckey-js/etc/calckey-js.api.md  |  2696 +++++
 packages/calckey-js/etc/misskey-js.api.md  |  2681 +++++
 packages/calckey-js/jest.config.ts         |   197 +
 packages/calckey-js/package-lock.json      | 10662 +++++++++++++++++++
 packages/calckey-js/package.json           |    47 +
 packages/calckey-js/src/acct.ts            |    14 +
 packages/calckey-js/src/api.ts             |    98 +
 packages/calckey-js/src/api.types.ts       |   612 ++
 packages/calckey-js/src/consts.ts          |    42 +
 packages/calckey-js/src/entities.ts        |   478 +
 packages/calckey-js/src/index.ts           |    26 +
 packages/calckey-js/src/streaming.ts       |   340 +
 packages/calckey-js/src/streaming.types.ts |   165 +
 packages/calckey-js/test-d/api.ts          |    45 +
 packages/calckey-js/test-d/streaming.ts    |    26 +
 packages/calckey-js/test/api.ts            |   212 +
 packages/calckey-js/test/streaming.ts      |   165 +
 packages/calckey-js/tsconfig.json          |    25 +
 packages/client/package.json               |     2 +-
 packages/client/vite.config.ts             |     3 +
 packages/sw/package.json                   |     2 +-
 pnpm-lock.yaml                             |  2403 ++++-
 pnpm-workspace.yaml                        |     1 +
 35 files changed, 21475 insertions(+), 79 deletions(-)
 create mode 100644 packages/calckey-js/.editorconfig
 create mode 100644 packages/calckey-js/.eslintignore
 create mode 100644 packages/calckey-js/.eslintrc.js
 create mode 100644 packages/calckey-js/.gitignore
 create mode 100644 packages/calckey-js/CHANGELOG.md
 create mode 100644 packages/calckey-js/LICENSE
 create mode 100644 packages/calckey-js/README.md
 create mode 100644 packages/calckey-js/api-extractor.json
 create mode 100644 packages/calckey-js/codecov.yml
 create mode 100644 packages/calckey-js/etc/calckey-js.api.md
 create mode 100644 packages/calckey-js/etc/misskey-js.api.md
 create mode 100644 packages/calckey-js/jest.config.ts
 create mode 100644 packages/calckey-js/package-lock.json
 create mode 100644 packages/calckey-js/package.json
 create mode 100644 packages/calckey-js/src/acct.ts
 create mode 100644 packages/calckey-js/src/api.ts
 create mode 100644 packages/calckey-js/src/api.types.ts
 create mode 100644 packages/calckey-js/src/consts.ts
 create mode 100644 packages/calckey-js/src/entities.ts
 create mode 100644 packages/calckey-js/src/index.ts
 create mode 100644 packages/calckey-js/src/streaming.ts
 create mode 100644 packages/calckey-js/src/streaming.types.ts
 create mode 100644 packages/calckey-js/test-d/api.ts
 create mode 100644 packages/calckey-js/test-d/streaming.ts
 create mode 100644 packages/calckey-js/test/api.ts
 create mode 100644 packages/calckey-js/test/streaming.ts
 create mode 100644 packages/calckey-js/tsconfig.json

diff --git a/Dockerfile b/Dockerfile
index 1a1a0aac6..bdf11a9df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ COPY package.json pnpm*.yaml ./
 COPY packages/backend/package.json packages/backend/package.json
 COPY packages/client/package.json packages/client/package.json
 COPY packages/sw/package.json packages/sw/package.json
+COPY packages/calckey-js/package.json packages/calckey-js/package.json
 COPY packages/backend/native-utils/package.json packages/backend/native-utils/package.json
 COPY packages/backend/native-utils/npm/linux-x64-musl/package.json packages/backend/native-utils/npm/linux-x64-musl/package.json
 COPY packages/backend/native-utils/npm/linux-arm64-musl/package.json packages/backend/native-utils/npm/linux-arm64-musl/package.json
@@ -43,6 +44,7 @@ COPY --from=build /calckey/node_modules /calckey/node_modules
 COPY --from=build /calckey/packages/backend/node_modules /calckey/packages/backend/node_modules
 COPY --from=build /calckey/packages/sw/node_modules /calckey/packages/sw/node_modules
 COPY --from=build /calckey/packages/client/node_modules /calckey/packages/client/node_modules
+COPY --from=build /calckey/packages/calckey-js/node_modules /calckey/packages/calckey-js/node_modules
 
 # Copy the finished compiled files
 COPY --from=build /calckey/built /calckey/built
diff --git a/package.json b/package.json
index 3af5dc01d..e990a5851 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,6 @@
 		"@bull-board/ui": "^4.10.2",
 		"@napi-rs/cli": "^2.15.0",
 		"@tensorflow/tfjs": "^3.21.0",
-		"calckey-js": "^0.0.22",
 		"js-yaml": "4.1.0",
 		"seedrandom": "^3.0.5"
 	},
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 61ba601cd..9139d24ee 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -49,7 +49,7 @@
 		"blurhash": "1.1.5",
 		"bull": "4.10.2",
 		"cacheable-lookup": "7.0.0",
-		"calckey-js": "^0.0.22",
+		"calckey-js": "workspace:*",
 		"cbor": "8.1.0",
 		"chalk": "5.2.0",
 		"chalk-template": "0.4.0",
diff --git a/packages/calckey-js/.editorconfig b/packages/calckey-js/.editorconfig
new file mode 100644
index 000000000..da178f070
--- /dev/null
+++ b/packages/calckey-js/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 2
+charset = utf-8
+insert_final_newline = true
diff --git a/packages/calckey-js/.eslintignore b/packages/calckey-js/.eslintignore
new file mode 100644
index 000000000..f22128f04
--- /dev/null
+++ b/packages/calckey-js/.eslintignore
@@ -0,0 +1,7 @@
+node_modules
+/built
+/coverage
+/.eslintrc.js
+/jest.config.ts
+/test
+/test-d
diff --git a/packages/calckey-js/.eslintrc.js b/packages/calckey-js/.eslintrc.js
new file mode 100644
index 000000000..426894947
--- /dev/null
+++ b/packages/calckey-js/.eslintrc.js
@@ -0,0 +1,57 @@
+module.exports = {
+	root: true,
+	parser: '@typescript-eslint/parser',
+	parserOptions: {
+		tsconfigRootDir: __dirname,
+		project: ['./tsconfig.json'],
+	},
+	plugins: [
+		'@typescript-eslint',
+	],
+	extends: [
+		'eslint:recommended',
+		'plugin:@typescript-eslint/recommended',
+	],
+	rules: {
+		'indent': ['error', 'tab', {
+			'SwitchCase': 1,
+			'MemberExpression': 'off',
+			'flatTernaryExpressions': true,
+			'ArrayExpression': 'first',
+			'ObjectExpression': 'first',
+		}],
+		'eol-last': ['error', 'always'],
+		'semi': ['error', 'always'],
+		'quotes': ['error', 'single'],
+		'comma-dangle': ['error', 'always-multiline'],
+		'keyword-spacing': ['error', {
+			'before': true,
+			'after': true,
+		}],
+		'key-spacing': ['error', {
+			'beforeColon': false,
+			'afterColon': true,
+		}],
+		'space-infix-ops': ['error'],
+		'space-before-blocks': ['error', 'always'],
+		'object-curly-spacing': ['error', 'always'],
+		'nonblock-statement-body-position': ['error', 'beside'],
+		'eqeqeq': ['error', 'always', { 'null': 'ignore' }],
+		'no-multiple-empty-lines': ['error', { 'max': 1 }],
+		'no-multi-spaces': ['error'],
+		'no-var': ['error'],
+		'prefer-arrow-callback': ['error'],
+		'no-throw-literal': ['error'],
+		'no-param-reassign': ['warn'],
+		'no-constant-condition': ['warn'],
+		'no-empty-pattern': ['warn'],
+		'@typescript-eslint/no-unnecessary-condition': ['error'],
+		'@typescript-eslint/no-inferrable-types': ['warn'],
+		'@typescript-eslint/no-non-null-assertion': ['warn'],
+		'@typescript-eslint/explicit-function-return-type': ['warn'],
+		'@typescript-eslint/no-misused-promises': ['error', {
+			'checksVoidReturn': false,
+		}],
+		'@typescript-eslint/consistent-type-imports': 'error',
+	},
+};
diff --git a/packages/calckey-js/.gitignore b/packages/calckey-js/.gitignore
new file mode 100644
index 000000000..8a97abf3a
--- /dev/null
+++ b/packages/calckey-js/.gitignore
@@ -0,0 +1,113 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# Next.js build output
+.next
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and *not* Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# App
+temp
+# built
+
+# Yarn
+.yarn/*
+.pnp.cjs
+.pnp.loader.mjs
diff --git a/packages/calckey-js/CHANGELOG.md b/packages/calckey-js/CHANGELOG.md
new file mode 100644
index 000000000..88a5c2461
--- /dev/null
+++ b/packages/calckey-js/CHANGELOG.md
@@ -0,0 +1,29 @@
+# 0.0.14
+- remove needless Object.freeze()
+
+# 0.0.13
+- expose ChannelConnection and Channels types
+
+# 0.0.12
+- fix a bug that cannot connect to streaming
+
+# 0.0.11
+- update user type
+- add missing main stream types
+
+# 0.0.10
+- add consts
+
+# 0.0.9
+- add list of api permission
+- Update Note type
+
+# 0.0.8
+- add type definition for `messagingMessage` event to main stream channel
+- Update Note type
+
+# 0.0.7
+- Notificationsの型を修正
+- MessagingMessageの型を修正
+- UserLiteの型を修正
+- apiでネイティブfetchを格納する際に無名関数でラップするように
diff --git a/packages/calckey-js/LICENSE b/packages/calckey-js/LICENSE
new file mode 100644
index 000000000..11c1f9ce2
--- /dev/null
+++ b/packages/calckey-js/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021-2022 syuilo and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/calckey-js/README.md b/packages/calckey-js/README.md
new file mode 100644
index 000000000..b7a699285
--- /dev/null
+++ b/packages/calckey-js/README.md
@@ -0,0 +1,7 @@
+# Calckey.js
+
+Fork of Misskey.js for Calckey
+
+https://www.npmjs.com/package/calckey-js
+
+![Parody of the Javascript logo with "CK" instead of "JS"](https://codeberg.org/repo-avatars/80771-4d86135f67b9a460cdd1be9e91648e5f)
\ No newline at end of file
diff --git a/packages/calckey-js/api-extractor.json b/packages/calckey-js/api-extractor.json
new file mode 100644
index 000000000..a95281a6d
--- /dev/null
+++ b/packages/calckey-js/api-extractor.json
@@ -0,0 +1,364 @@
+/**
+ * Config file for API Extractor.  For more info, please visit: https://api-extractor.com
+ */
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+
+  /**
+   * Optionally specifies another JSON config file that this file extends from.  This provides a way for
+   * standard settings to be shared across multiple projects.
+   *
+   * If the path starts with "./" or "../", the path is resolved relative to the folder of the file that contains
+   * the "extends" field.  Otherwise, the first path segment is interpreted as an NPM package name, and will be
+   * resolved using NodeJS require().
+   *
+   * SUPPORTED TOKENS: none
+   * DEFAULT VALUE: ""
+   */
+  // "extends": "./shared/api-extractor-base.json"
+  // "extends": "my-package/include/api-extractor-base.json"
+
+  /**
+   * Determines the "<projectFolder>" token that can be used with other config file settings.  The project folder
+   * typically contains the tsconfig.json and package.json config files, but the path is user-defined.
+   *
+   * The path is resolved relative to the folder of the config file that contains the setting.
+   *
+   * The default value for "projectFolder" is the token "<lookup>", which means the folder is determined by traversing
+   * parent folders, starting from the folder containing api-extractor.json, and stopping at the first folder
+   * that contains a tsconfig.json file.  If a tsconfig.json file cannot be found in this way, then an error
+   * will be reported.
+   *
+   * SUPPORTED TOKENS: <lookup>
+   * DEFAULT VALUE: "<lookup>"
+   */
+  // "projectFolder": "..",
+
+  /**
+   * (REQUIRED) Specifies the .d.ts file to be used as the starting point for analysis.  API Extractor
+   * analyzes the symbols exported by this module.
+   *
+   * The file extension must be ".d.ts" and not ".ts".
+   *
+   * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+   * prepend a folder token such as "<projectFolder>".
+   *
+   * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+   */
+  "mainEntryPointFilePath": "<projectFolder>/built/index.d.ts",
+
+  /**
+   * A list of NPM package names whose exports should be treated as part of this package.
+   *
+   * For example, suppose that Webpack is used to generate a distributed bundle for the project "library1",
+   * and another NPM package "library2" is embedded in this bundle.  Some types from library2 may become part
+   * of the exported API for library1, but by default API Extractor would generate a .d.ts rollup that explicitly
+   * imports library2.  To avoid this, we can specify:
+   *
+   *   "bundledPackages": [ "library2" ],
+   *
+   * This would direct API Extractor to embed those types directly in the .d.ts rollup, as if they had been
+   * local files for library1.
+   */
+  "bundledPackages": [],
+
+  /**
+   * Determines how the TypeScript compiler engine will be invoked by API Extractor.
+   */
+  "compiler": {
+    /**
+     * Specifies the path to the tsconfig.json file to be used by API Extractor when analyzing the project.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * Note: This setting will be ignored if "overrideTsconfig" is used.
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/tsconfig.json"
+     */
+    // "tsconfigFilePath": "<projectFolder>/tsconfig.json",
+    /**
+     * Provides a compiler configuration that will be used instead of reading the tsconfig.json file from disk.
+     * The object must conform to the TypeScript tsconfig schema:
+     *
+     * http://json.schemastore.org/tsconfig
+     *
+     * If omitted, then the tsconfig.json file will be read from the "projectFolder".
+     *
+     * DEFAULT VALUE: no overrideTsconfig section
+     */
+    // "overrideTsconfig": {
+    //   . . .
+    // }
+    /**
+     * This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended
+     * and may cause API Extractor to produce incomplete or incorrect declarations, but it may be required when
+     * dependencies contain declarations that are incompatible with the TypeScript engine that API Extractor uses
+     * for its analysis.  Where possible, the underlying issue should be fixed rather than relying on skipLibCheck.
+     *
+     * DEFAULT VALUE: false
+     */
+    // "skipLibCheck": true,
+  },
+
+  /**
+   * Configures how the API report file (*.api.md) will be generated.
+   */
+  "apiReport": {
+    /**
+     * (REQUIRED) Whether to generate an API report.
+     */
+    "enabled": true
+
+    /**
+     * The filename for the API report files.  It will be combined with "reportFolder" or "reportTempFolder" to produce
+     * a full file path.
+     *
+     * The file extension should be ".api.md", and the string should not contain a path separator such as "\" or "/".
+     *
+     * SUPPORTED TOKENS: <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<unscopedPackageName>.api.md"
+     */
+    // "reportFileName": "<unscopedPackageName>.api.md",
+
+    /**
+     * Specifies the folder where the API report file is written.  The file name portion is determined by
+     * the "reportFileName" setting.
+     *
+     * The API report file is normally tracked by Git.  Changes to it can be used to trigger a branch policy,
+     * e.g. for an API review.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/etc/"
+     */
+    // "reportFolder": "<projectFolder>/etc/",
+
+    /**
+     * Specifies the folder where the temporary report file is written.  The file name portion is determined by
+     * the "reportFileName" setting.
+     *
+     * After the temporary file is written to disk, it is compared with the file in the "reportFolder".
+     * If they are different, a production build will fail.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/temp/"
+     */
+    // "reportTempFolder": "<projectFolder>/temp/"
+  },
+
+  /**
+   * Configures how the doc model file (*.api.json) will be generated.
+   */
+  "docModel": {
+    /**
+     * (REQUIRED) Whether to generate a doc model file.
+     */
+    "enabled": true
+
+    /**
+     * The output path for the doc model file.  The file extension should be ".api.json".
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/temp/<unscopedPackageName>.api.json"
+     */
+    // "apiJsonFilePath": "<projectFolder>/temp/<unscopedPackageName>.api.json"
+  },
+
+  /**
+   * Configures how the .d.ts rollup file will be generated.
+   */
+  "dtsRollup": {
+    /**
+     * (REQUIRED) Whether to generate the .d.ts rollup file.
+     */
+    "enabled": false
+
+    /**
+     * Specifies the output path for a .d.ts rollup file to be generated without any trimming.
+     * This file will include all declarations that are exported by the main entry point.
+     *
+     * If the path is an empty string, then this file will not be written.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/dist/<unscopedPackageName>.d.ts"
+     */
+    // "untrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>.d.ts",
+
+    /**
+     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "beta" release.
+     * This file will include only declarations that are marked as "@public" or "@beta".
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: ""
+     */
+    // "betaTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-beta.d.ts",
+
+    /**
+     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "public" release.
+     * This file will include only declarations that are marked as "@public".
+     *
+     * If the path is an empty string, then this file will not be written.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: ""
+     */
+    // "publicTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-public.d.ts",
+
+    /**
+     * When a declaration is trimmed, by default it will be replaced by a code comment such as
+     * "Excluded from this release type: exampleMember".  Set "omitTrimmingComments" to true to remove the
+     * declaration completely.
+     *
+     * DEFAULT VALUE: false
+     */
+    // "omitTrimmingComments": true
+  },
+
+  /**
+   * Configures how the tsdoc-metadata.json file will be generated.
+   */
+  "tsdocMetadata": {
+    /**
+     * Whether to generate the tsdoc-metadata.json file.
+     *
+     * DEFAULT VALUE: true
+     */
+    // "enabled": true,
+    /**
+     * Specifies where the TSDoc metadata file should be written.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * The default value is "<lookup>", which causes the path to be automatically inferred from the "tsdocMetadata",
+     * "typings" or "main" fields of the project's package.json.  If none of these fields are set, the lookup
+     * falls back to "tsdoc-metadata.json" in the package folder.
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<lookup>"
+     */
+    // "tsdocMetadataFilePath": "<projectFolder>/dist/tsdoc-metadata.json"
+  },
+
+  /**
+   * Specifies what type of newlines API Extractor should use when writing output files.  By default, the output files
+   * will be written with Windows-style newlines.  To use POSIX-style newlines, specify "lf" instead.
+   * To use the OS's default newline kind, specify "os".
+   *
+   * DEFAULT VALUE: "crlf"
+   */
+  // "newlineKind": "crlf",
+
+  /**
+   * Configures how API Extractor reports error and warning messages produced during analysis.
+   *
+   * There are three sources of messages:  compiler messages, API Extractor messages, and TSDoc messages.
+   */
+  "messages": {
+    /**
+     * Configures handling of diagnostic messages reported by the TypeScript compiler engine while analyzing
+     * the input .d.ts files.
+     *
+     * TypeScript message identifiers start with "TS" followed by an integer.  For example: "TS2551"
+     *
+     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
+     */
+    "compilerMessageReporting": {
+      /**
+       * Configures the default routing for messages that don't match an explicit rule in this table.
+       */
+      "default": {
+        /**
+         * Specifies whether the message should be written to the the tool's output log.  Note that
+         * the "addToApiReportFile" property may supersede this option.
+         *
+         * Possible values: "error", "warning", "none"
+         *
+         * Errors cause the build to fail and return a nonzero exit code.  Warnings cause a production build fail
+         * and return a nonzero exit code.  For a non-production build (e.g. when "api-extractor run" includes
+         * the "--local" option), the warning is displayed but the build will not fail.
+         *
+         * DEFAULT VALUE: "warning"
+         */
+        "logLevel": "warning"
+
+        /**
+         * When addToApiReportFile is true:  If API Extractor is configured to write an API report file (.api.md),
+         * then the message will be written inside that file; otherwise, the message is instead logged according to
+         * the "logLevel" option.
+         *
+         * DEFAULT VALUE: false
+         */
+        // "addToApiReportFile": false
+      }
+
+      // "TS2551": {
+      //   "logLevel": "warning",
+      //   "addToApiReportFile": true
+      // },
+      //
+      // . . .
+    },
+
+    /**
+     * Configures handling of messages reported by API Extractor during its analysis.
+     *
+     * API Extractor message identifiers start with "ae-".  For example: "ae-extra-release-tag"
+     *
+     * DEFAULT VALUE: See api-extractor-defaults.json for the complete table of extractorMessageReporting mappings
+     */
+    "extractorMessageReporting": {
+      "default": {
+        "logLevel": "none"
+        // "addToApiReportFile": false
+      }
+
+      // "ae-extra-release-tag": {
+      //   "logLevel": "warning",
+      //   "addToApiReportFile": true
+      // },
+      //
+      // . . .
+    },
+
+    /**
+     * Configures handling of messages reported by the TSDoc parser when analyzing code comments.
+     *
+     * TSDoc message identifiers start with "tsdoc-".  For example: "tsdoc-link-tag-unescaped-text"
+     *
+     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
+     */
+    "tsdocMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+        // "addToApiReportFile": false
+      }
+
+      // "tsdoc-link-tag-unescaped-text": {
+      //   "logLevel": "warning",
+      //   "addToApiReportFile": true
+      // },
+      //
+      // . . .
+    }
+  }
+}
diff --git a/packages/calckey-js/codecov.yml b/packages/calckey-js/codecov.yml
new file mode 100644
index 000000000..524298721
--- /dev/null
+++ b/packages/calckey-js/codecov.yml
@@ -0,0 +1,2 @@
+codecov:
+  token: d55e1270-f20a-4727-aa05-2bd57793315a
diff --git a/packages/calckey-js/etc/calckey-js.api.md b/packages/calckey-js/etc/calckey-js.api.md
new file mode 100644
index 000000000..9e19852d4
--- /dev/null
+++ b/packages/calckey-js/etc/calckey-js.api.md
@@ -0,0 +1,2696 @@
+## API Report File for "calckey-js"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { EventEmitter } from 'eventemitter3';
+
+// @public (undocumented)
+export type Acct = {
+    username: string;
+    host: string | null;
+};
+
+// Warning: (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+type Ad = TODO_2;
+
+// @public (undocumented)
+type Announcement = {
+    id: ID;
+    createdAt: DateString;
+    updatedAt: DateString | null;
+    text: string;
+    title: string;
+    imageUrl: string | null;
+    isRead?: boolean;
+};
+
+// @public (undocumented)
+type Antenna = {
+    id: ID;
+    createdAt: DateString;
+    name: string;
+    keywords: string[][];
+    excludeKeywords: string[][];
+    src: 'home' | 'all' | 'users' | 'list' | 'group';
+    userListId: ID | null;
+    userGroupId: ID | null;
+    users: string[];
+    caseSensitive: boolean;
+    notify: boolean;
+    withReplies: boolean;
+    withFile: boolean;
+    hasUnreadNote: boolean;
+};
+
+declare namespace api {
+    export {
+        isAPIError,
+        APIError,
+        FetchLike,
+        APIClient
+    }
+}
+export { api }
+
+// @public (undocumented)
+class APIClient {
+    constructor(opts: {
+        origin: APIClient['origin'];
+        credential?: APIClient['credential'];
+        fetch?: APIClient['fetch'] | null | undefined;
+    });
+    // (undocumented)
+    credential: string | null | undefined;
+    // (undocumented)
+    fetch: FetchLike;
+    // (undocumented)
+    origin: string;
+    // Warning: (ae-forgotten-export) The symbol "IsCaseMatched" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "GetCaseResult" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(endpoint: E, params?: P, credential?: string | null | undefined): Promise<Endpoints[E]['res'] extends {
+        $switch: {
+            $cases: [any, any][];
+            $default: any;
+        };
+    } ? IsCaseMatched<E, P, 0> extends true ? GetCaseResult<E, P, 0> : IsCaseMatched<E, P, 1> extends true ? GetCaseResult<E, P, 1> : IsCaseMatched<E, P, 2> extends true ? GetCaseResult<E, P, 2> : IsCaseMatched<E, P, 3> extends true ? GetCaseResult<E, P, 3> : IsCaseMatched<E, P, 4> extends true ? GetCaseResult<E, P, 4> : IsCaseMatched<E, P, 5> extends true ? GetCaseResult<E, P, 5> : IsCaseMatched<E, P, 6> extends true ? GetCaseResult<E, P, 6> : IsCaseMatched<E, P, 7> extends true ? GetCaseResult<E, P, 7> : IsCaseMatched<E, P, 8> extends true ? GetCaseResult<E, P, 8> : IsCaseMatched<E, P, 9> extends true ? GetCaseResult<E, P, 9> : Endpoints[E]['res']['$switch']['$default'] : Endpoints[E]['res']>;
+}
+
+// @public (undocumented)
+type APIError = {
+    id: string;
+    code: string;
+    message: string;
+    kind: 'client' | 'server';
+    info: Record<string, any>;
+};
+
+// @public (undocumented)
+type App = TODO_2;
+
+// @public (undocumented)
+type AuthSession = {
+    id: ID;
+    app: App;
+    token: string;
+};
+
+// @public (undocumented)
+type Blocking = {
+    id: ID;
+    createdAt: DateString;
+    blockeeId: User['id'];
+    blockee: UserDetailed;
+};
+
+// @public (undocumented)
+type Channel = {
+    id: ID;
+};
+
+// 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']> {
+    constructor(stream: Stream, channel: string, name?: string);
+    // (undocumented)
+    channel: string;
+    // (undocumented)
+    abstract dispose(): void;
+    // (undocumented)
+    abstract id: string;
+    // (undocumented)
+    inCount: number;
+    // (undocumented)
+    name?: string;
+    // (undocumented)
+    outCount: number;
+    // (undocumented)
+    send<T extends keyof Channel['receives']>(type: T, body: Channel['receives'][T]): void;
+    // (undocumented)
+    protected stream: Stream;
+}
+
+// @public (undocumented)
+export type Channels = {
+    main: {
+        params: null;
+        events: {
+            notification: (payload: Notification_2) => void;
+            mention: (payload: Note) => void;
+            reply: (payload: Note) => void;
+            renote: (payload: Note) => void;
+            follow: (payload: User) => void;
+            followed: (payload: User) => void;
+            unfollow: (payload: User) => void;
+            meUpdated: (payload: MeDetailed) => void;
+            pageEvent: (payload: PageEvent) => void;
+            urlUploadFinished: (payload: {
+                marker: string;
+                file: DriveFile;
+            }) => void;
+            readAllNotifications: () => void;
+            unreadNotification: (payload: Notification_2) => void;
+            unreadMention: (payload: Note['id']) => void;
+            readAllUnreadMentions: () => void;
+            unreadSpecifiedNote: (payload: Note['id']) => void;
+            readAllUnreadSpecifiedNotes: () => void;
+            readAllMessagingMessages: () => void;
+            messagingMessage: (payload: MessagingMessage) => void;
+            unreadMessagingMessage: (payload: MessagingMessage) => void;
+            readAllAntennas: () => void;
+            unreadAntenna: (payload: Antenna) => void;
+            readAllAnnouncements: () => void;
+            readAllChannels: () => void;
+            unreadChannel: (payload: Note['id']) => void;
+            myTokenRegenerated: () => void;
+            reversiNoInvites: () => void;
+            reversiInvited: (payload: FIXME) => void;
+            signin: (payload: FIXME) => void;
+            registryUpdated: (payload: {
+                scope?: string[];
+                key: string;
+                value: any | null;
+            }) => void;
+            driveFileCreated: (payload: DriveFile) => void;
+            readAntenna: (payload: Antenna) => void;
+        };
+        receives: null;
+    };
+    homeTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    localTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    hybridTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    recommendedTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    globalTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    messaging: {
+        params: {
+            otherparty?: User['id'] | null;
+            group?: UserGroup['id'] | null;
+        };
+        events: {
+            message: (payload: MessagingMessage) => void;
+            deleted: (payload: MessagingMessage['id']) => void;
+            read: (payload: MessagingMessage['id'][]) => void;
+            typers: (payload: User[]) => void;
+        };
+        receives: {
+            read: {
+                id: MessagingMessage['id'];
+            };
+        };
+    };
+    serverStats: {
+        params: null;
+        events: {
+            stats: (payload: FIXME) => void;
+        };
+        receives: {
+            requestLog: {
+                id: string | number;
+                length: number;
+            };
+        };
+    };
+    queueStats: {
+        params: null;
+        events: {
+            stats: (payload: FIXME) => void;
+        };
+        receives: {
+            requestLog: {
+                id: string | number;
+                length: number;
+            };
+        };
+    };
+};
+
+// @public (undocumented)
+type Clip = TODO_2;
+
+// @public (undocumented)
+type CustomEmoji = {
+    id: string;
+    name: string;
+    url: string;
+    category: string;
+    aliases: string[];
+};
+
+// @public (undocumented)
+type DateString = string;
+
+// @public (undocumented)
+type DetailedInstanceMetadata = LiteInstanceMetadata & {
+    features: Record<string, any>;
+};
+
+// @public (undocumented)
+type DriveFile = {
+    id: ID;
+    createdAt: DateString;
+    isSensitive: boolean;
+    name: string;
+    thumbnailUrl: string;
+    url: string;
+    type: string;
+    size: number;
+    md5: string;
+    blurhash: string;
+    comment: string | null;
+    properties: Record<string, any>;
+};
+
+// @public (undocumented)
+type DriveFolder = TODO_2;
+
+// @public (undocumented)
+export type Endpoints = {
+    'admin/abuse-user-reports': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/delete-all-files-of-a-user': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'admin/delete-logs': {
+        req: NoParams;
+        res: null;
+    };
+    'admin/get-index-stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/get-table-stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/invite': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/logs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/reset-password': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/resolve-abuse-user-report': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/resync-chart': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/send-email': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/server-info': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-moderation-logs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/silence-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/suspend-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/unsilence-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/unsuspend-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/update-meta': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/vacuum': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/accounts/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/delete': {
+        req: {
+            id: Ad['id'];
+        };
+        res: null;
+    };
+    'admin/ad/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/delete': {
+        req: {
+            id: Announcement['id'];
+        };
+        res: null;
+    };
+    'admin/announcements/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/clean-remote-files': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/cleanup': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/files': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/show-file': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/copy': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/list-remote': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/delete-all-files': {
+        req: {
+            host: string;
+        };
+        res: null;
+    };
+    'admin/federation/refresh-remote-instance-metadata': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/remove-all-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/update-instance': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/moderators/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/moderators/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/promo/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/clear': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/deliver-delayed': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/inbox-delayed': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/jobs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'announcements': {
+        req: {
+            limit?: number;
+            withUnreads?: boolean;
+            sinceId?: Announcement['id'];
+            untilId?: Announcement['id'];
+        };
+        res: Announcement[];
+    };
+    'antennas/create': {
+        req: TODO;
+        res: Antenna;
+    };
+    'antennas/delete': {
+        req: {
+            antennaId: Antenna['id'];
+        };
+        res: null;
+    };
+    'antennas/list': {
+        req: NoParams;
+        res: Antenna[];
+    };
+    'antennas/notes': {
+        req: {
+            antennaId: Antenna['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'antennas/show': {
+        req: {
+            antennaId: Antenna['id'];
+        };
+        res: Antenna;
+    };
+    'antennas/update': {
+        req: TODO;
+        res: Antenna;
+    };
+    'ap/get': {
+        req: {
+            uri: string;
+        };
+        res: Record<string, any>;
+    };
+    'ap/show': {
+        req: {
+            uri: string;
+        };
+        res: {
+            type: 'Note';
+            object: Note;
+        } | {
+            type: 'User';
+            object: UserDetailed;
+        };
+    };
+    'app/create': {
+        req: TODO;
+        res: App;
+    };
+    'app/show': {
+        req: {
+            appId: App['id'];
+        };
+        res: App;
+    };
+    'auth/accept': {
+        req: {
+            token: string;
+        };
+        res: null;
+    };
+    'auth/session/generate': {
+        req: {
+            appSecret: string;
+        };
+        res: {
+            token: string;
+            url: string;
+        };
+    };
+    'auth/session/show': {
+        req: {
+            token: string;
+        };
+        res: AuthSession;
+    };
+    'auth/session/userkey': {
+        req: {
+            appSecret: string;
+            token: string;
+        };
+        res: {
+            accessToken: string;
+            user: User;
+        };
+    };
+    'blocking/create': {
+        req: {
+            userId: User['id'];
+        };
+        res: UserDetailed;
+    };
+    'blocking/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: UserDetailed;
+    };
+    'blocking/list': {
+        req: {
+            limit?: number;
+            sinceId?: Blocking['id'];
+            untilId?: Blocking['id'];
+        };
+        res: Blocking[];
+    };
+    'channels/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/featured': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/follow': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/followed': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/owned': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/pin-note': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/timeline': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/unfollow': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'charts/active-users': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                users: number[];
+            };
+            remote: {
+                users: number[];
+            };
+        };
+    };
+    'charts/drive': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                decCount: number[];
+                decSize: number[];
+                incCount: number[];
+                incSize: number[];
+                totalCount: number[];
+                totalSize: number[];
+            };
+            remote: {
+                decCount: number[];
+                decSize: number[];
+                incCount: number[];
+                incSize: number[];
+                totalCount: number[];
+                totalSize: number[];
+            };
+        };
+    };
+    'charts/federation': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            instance: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'charts/hashtag': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: TODO;
+    };
+    'charts/instance': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            host: string;
+        };
+        res: {
+            drive: {
+                decFiles: number[];
+                decUsage: number[];
+                incFiles: number[];
+                incUsage: number[];
+                totalFiles: number[];
+                totalUsage: number[];
+            };
+            followers: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            following: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            notes: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+            requests: {
+                failed: number[];
+                received: number[];
+                succeeded: number[];
+            };
+            users: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'charts/network': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: TODO;
+    };
+    'charts/notes': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+            remote: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+        };
+    };
+    'charts/user/drive': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: {
+            decCount: number[];
+            decSize: number[];
+            incCount: number[];
+            incSize: number[];
+            totalCount: number[];
+            totalSize: number[];
+        };
+    };
+    'charts/user/following': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: TODO;
+    };
+    'charts/user/notes': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: {
+            dec: number[];
+            inc: number[];
+            total: number[];
+            diffs: {
+                normal: number[];
+                renote: number[];
+                reply: number[];
+            };
+        };
+    };
+    'charts/user/reactions': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: TODO;
+    };
+    'charts/users': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            remote: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'clips/add-note': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/delete': {
+        req: {
+            clipId: Clip['id'];
+        };
+        res: null;
+    };
+    'clips/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive': {
+        req: NoParams;
+        res: {
+            capacity: number;
+            usage: number;
+        };
+    };
+    'drive/files': {
+        req: {
+            folderId?: DriveFolder['id'] | null;
+            type?: DriveFile['type'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFile[];
+    };
+    'drive/files/attached-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/check-existence': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/delete': {
+        req: {
+            fileId: DriveFile['id'];
+        };
+        res: null;
+    };
+    'drive/files/find-by-hash': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/find': {
+        req: {
+            name: string;
+            folderId?: DriveFolder['id'] | null;
+        };
+        res: DriveFile[];
+    };
+    'drive/files/show': {
+        req: {
+            fileId?: DriveFile['id'];
+            url?: string;
+        };
+        res: DriveFile;
+    };
+    'drive/files/update': {
+        req: {
+            fileId: DriveFile['id'];
+            folderId?: DriveFolder['id'] | null;
+            name?: string;
+            isSensitive?: boolean;
+            comment?: string | null;
+        };
+        res: DriveFile;
+    };
+    'drive/files/upload-from-url': {
+        req: {
+            url: string;
+            folderId?: DriveFolder['id'] | null;
+            isSensitive?: boolean;
+            comment?: string | null;
+            marker?: string | null;
+            force?: boolean;
+        };
+        res: null;
+    };
+    'drive/folders': {
+        req: {
+            folderId?: DriveFolder['id'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFolder[];
+    };
+    'drive/folders/create': {
+        req: {
+            name?: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder;
+    };
+    'drive/folders/delete': {
+        req: {
+            folderId: DriveFolder['id'];
+        };
+        res: null;
+    };
+    'drive/folders/find': {
+        req: {
+            name: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder[];
+    };
+    'drive/folders/show': {
+        req: {
+            folderId: DriveFolder['id'];
+        };
+        res: DriveFolder;
+    };
+    'drive/folders/update': {
+        req: {
+            folderId: DriveFolder['id'];
+            name?: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder;
+    };
+    'drive/stream': {
+        req: {
+            type?: DriveFile['type'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFile[];
+    };
+    'endpoint': {
+        req: {
+            endpoint: string;
+        };
+        res: {
+            params: {
+                name: string;
+                type: string;
+            }[];
+        };
+    };
+    'endpoints': {
+        req: NoParams;
+        res: string[];
+    };
+    'federation/dns': {
+        req: {
+            host: string;
+        };
+        res: {
+            a: string[];
+            aaaa: string[];
+            cname: string[];
+            txt: string[];
+        };
+    };
+    'federation/followers': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'federation/following': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'federation/instances': {
+        req: {
+            host?: string | null;
+            blocked?: boolean | null;
+            notResponding?: boolean | null;
+            suspended?: boolean | null;
+            federating?: boolean | null;
+            subscribing?: boolean | null;
+            publishing?: boolean | null;
+            limit?: number;
+            offset?: number;
+            sort?: '+pubSub' | '-pubSub' | '+notes' | '-notes' | '+users' | '-users' | '+following' | '-following' | '+followers' | '-followers' | '+caughtAt' | '-caughtAt' | '+lastCommunicatedAt' | '-lastCommunicatedAt' | '+driveUsage' | '-driveUsage' | '+driveFiles' | '-driveFiles';
+        };
+        res: Instance[];
+    };
+    'federation/show-instance': {
+        req: {
+            host: string;
+        };
+        res: Instance;
+    };
+    'federation/update-remote-user': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'federation/users': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: User['id'];
+            untilId?: User['id'];
+        };
+        res: UserDetailed[];
+    };
+    'following/create': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/requests/accept': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'following/requests/cancel': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/requests/list': {
+        req: NoParams;
+        res: FollowRequest[];
+    };
+    'following/requests/reject': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'gallery/featured': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/popular': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/delete': {
+        req: {
+            postId: GalleryPost['id'];
+        };
+        res: null;
+    };
+    'gallery/posts/like': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/unlike': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games/surrender': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/invitations': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/match': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/match/cancel': {
+        req: TODO;
+        res: TODO;
+    };
+    'get-online-users-count': {
+        req: NoParams;
+        res: {
+            count: number;
+        };
+    };
+    'hashtags/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/trend': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/users': {
+        req: TODO;
+        res: TODO;
+    };
+    'i': {
+        req: NoParams;
+        res: User;
+    };
+    'i/apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/authorized-apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/change-password': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/delete-account': {
+        req: {
+            password: string;
+        };
+        res: null;
+    };
+    'i/export-blocking': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-mute': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-user-lists': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/favorites': {
+        req: {
+            limit?: number;
+            sinceId?: NoteFavorite['id'];
+            untilId?: NoteFavorite['id'];
+        };
+        res: NoteFavorite[];
+    };
+    'i/gallery/likes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/get-word-muted-notes-count': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/import-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/import-user-lists': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/move': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/known-as': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/notifications': {
+        req: {
+            limit?: number;
+            sinceId?: Notification_2['id'];
+            untilId?: Notification_2['id'];
+            following?: boolean;
+            markAsRead?: boolean;
+            includeTypes?: Notification_2['type'][];
+            excludeTypes?: Notification_2['type'][];
+        };
+        res: Notification_2[];
+    };
+    'i/page-likes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/pages': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/pin': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: MeDetailed;
+    };
+    'i/read-all-messaging-messages': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/read-all-unread-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/read-announcement': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/regenerate-token': {
+        req: {
+            password: string;
+        };
+        res: null;
+    };
+    'i/registry/get-all': {
+        req: {
+            scope?: string[];
+        };
+        res: Record<string, any>;
+    };
+    'i/registry/get-detail': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: {
+            updatedAt: DateString;
+            value: any;
+        };
+    };
+    'i/registry/get': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: any;
+    };
+    'i/registry/keys-with-type': {
+        req: {
+            scope?: string[];
+        };
+        res: Record<string, 'null' | 'array' | 'number' | 'string' | 'boolean' | 'object'>;
+    };
+    'i/registry/keys': {
+        req: {
+            scope?: string[];
+        };
+        res: string[];
+    };
+    'i/registry/remove': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: null;
+    };
+    'i/registry/scopes': {
+        req: NoParams;
+        res: string[][];
+    };
+    'i/registry/set': {
+        req: {
+            key: string;
+            value: any;
+            scope?: string[];
+        };
+        res: null;
+    };
+    'i/revoke-token': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/signin-history': {
+        req: {
+            limit?: number;
+            sinceId?: Signin['id'];
+            untilId?: Signin['id'];
+        };
+        res: Signin[];
+    };
+    'i/unpin': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: MeDetailed;
+    };
+    'i/update-email': {
+        req: {
+            password: string;
+            email?: string | null;
+        };
+        res: MeDetailed;
+    };
+    'i/update': {
+        req: {
+            name?: string | null;
+            description?: string | null;
+            lang?: string | null;
+            location?: string | null;
+            birthday?: string | null;
+            avatarId?: DriveFile['id'] | null;
+            bannerId?: DriveFile['id'] | null;
+            fields?: {
+                name: string;
+                value: string;
+            }[];
+            isLocked?: boolean;
+            isExplorable?: boolean;
+            hideOnlineStatus?: boolean;
+            carefulBot?: boolean;
+            autoAcceptFollowed?: boolean;
+            noCrawle?: boolean;
+            isBot?: boolean;
+            isCat?: boolean;
+            injectFeaturedNote?: boolean;
+            receiveAnnouncementEmail?: boolean;
+            alwaysMarkNsfw?: boolean;
+            mutedWords?: string[][];
+            mutingNotificationTypes?: Notification_2['type'][];
+            emailNotificationTypes?: string[];
+        };
+        res: MeDetailed;
+    };
+    'i/user-group-invites': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/done': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/key-done': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/password-less': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/register-key': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/register': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/remove-key': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/unregister': {
+        req: TODO;
+        res: TODO;
+    };
+    'messaging/history': {
+        req: {
+            limit?: number;
+            group?: boolean;
+        };
+        res: MessagingMessage[];
+    };
+    'messaging/messages': {
+        req: {
+            userId?: User['id'];
+            groupId?: UserGroup['id'];
+            limit?: number;
+            sinceId?: MessagingMessage['id'];
+            untilId?: MessagingMessage['id'];
+            markAsRead?: boolean;
+        };
+        res: MessagingMessage[];
+    };
+    'messaging/messages/create': {
+        req: {
+            userId?: User['id'];
+            groupId?: UserGroup['id'];
+            text?: string;
+            fileId?: DriveFile['id'];
+        };
+        res: MessagingMessage;
+    };
+    'messaging/messages/delete': {
+        req: {
+            messageId: MessagingMessage['id'];
+        };
+        res: null;
+    };
+    'messaging/messages/read': {
+        req: {
+            messageId: MessagingMessage['id'];
+        };
+        res: null;
+    };
+    'meta': {
+        req: {
+            detail?: boolean;
+        };
+        res: {
+            $switch: {
+                $cases: [
+                [
+                    {
+                    detail: true;
+                },
+                DetailedInstanceMetadata
+                ],
+                [
+                    {
+                    detail: false;
+                },
+                LiteInstanceMetadata
+                ],
+                [
+                    {
+                    detail: boolean;
+                },
+                LiteInstanceMetadata | DetailedInstanceMetadata
+                ]
+                ];
+                $default: LiteInstanceMetadata;
+            };
+        };
+    };
+    'miauth/gen-token': {
+        req: TODO;
+        res: TODO;
+    };
+    'mute/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'mute/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'mute/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'my/apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/children': {
+        req: {
+            noteId: Note['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/clips': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/conversation': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/create': {
+        req: {
+            visibility?: 'public' | 'home' | 'followers' | 'specified';
+            visibleUserIds?: User['id'][];
+            text?: null | string;
+            cw?: null | string;
+            viaMobile?: boolean;
+            localOnly?: boolean;
+            fileIds?: DriveFile['id'][];
+            replyId?: null | Note['id'];
+            renoteId?: null | Note['id'];
+            channelId?: null | Channel['id'];
+            poll?: null | {
+                choices: string[];
+                multiple?: boolean;
+                expiresAt?: null | number;
+                expiredAfter?: null | number;
+            };
+        };
+        res: {
+            createdNote: Note;
+        };
+    };
+    'notes/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/favorites/create': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/favorites/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/featured': {
+        req: TODO;
+        res: Note[];
+    };
+    'notes/global-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/recommended-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/hybrid-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/local-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/mentions': {
+        req: {
+            following?: boolean;
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/polls/recommendation': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/polls/vote': {
+        req: {
+            noteId: Note['id'];
+            choice: number;
+        };
+        res: null;
+    };
+    'notes/reactions': {
+        req: {
+            noteId: Note['id'];
+            type?: string | null;
+            limit?: number;
+        };
+        res: NoteReaction[];
+    };
+    'notes/reactions/create': {
+        req: {
+            noteId: Note['id'];
+            reaction: string;
+        };
+        res: null;
+    };
+    'notes/reactions/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/renotes': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            noteId: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/replies': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            noteId: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/search-by-tag': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/show': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: Note;
+    };
+    'notes/state': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/unrenote': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/user-list-timeline': {
+        req: {
+            listId: UserList['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/watching/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/watching/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notifications/create': {
+        req: {
+            body: string;
+            header?: string | null;
+            icon?: string | null;
+        };
+        res: null;
+    };
+    'notifications/mark-all-as-read': {
+        req: NoParams;
+        res: null;
+    };
+    'notifications/read': {
+        req: {
+            notificationId: Notification_2['id'];
+        };
+        res: null;
+    };
+    'page-push': {
+        req: {
+            pageId: Page['id'];
+            event: string;
+            var?: any;
+        };
+        res: null;
+    };
+    'pages/create': {
+        req: TODO;
+        res: Page;
+    };
+    'pages/delete': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/featured': {
+        req: NoParams;
+        res: Page[];
+    };
+    'pages/like': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/show': {
+        req: {
+            pageId?: Page['id'];
+            name?: string;
+            username?: string;
+        };
+        res: Page;
+    };
+    'pages/unlike': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/update': {
+        req: TODO;
+        res: null;
+    };
+    'ping': {
+        req: NoParams;
+        res: {
+            pong: number;
+        };
+    };
+    'pinned-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'promo/read': {
+        req: TODO;
+        res: TODO;
+    };
+    'request-reset-password': {
+        req: {
+            username: string;
+            email: string;
+        };
+        res: null;
+    };
+    'reset-password': {
+        req: {
+            token: string;
+            password: string;
+        };
+        res: null;
+    };
+    'room/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'room/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'stats': {
+        req: NoParams;
+        res: Stats;
+    };
+    'server-info': {
+        req: NoParams;
+        res: ServerInfo;
+    };
+    'latest-version': {
+        req: NoParams;
+        res: TODO;
+    };
+    'sw/register': {
+        req: TODO;
+        res: TODO;
+    };
+    'username/available': {
+        req: {
+            username: string;
+        };
+        res: {
+            available: boolean;
+        };
+    };
+    'users': {
+        req: {
+            limit?: number;
+            offset?: number;
+            sort?: UserSorting;
+            origin?: OriginType;
+        };
+        res: User[];
+    };
+    'users/clips': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/followers': {
+        req: {
+            userId?: User['id'];
+            username?: User['username'];
+            host?: User['host'] | null;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFollowerPopulated[];
+    };
+    'users/following': {
+        req: {
+            userId?: User['id'];
+            username?: User['username'];
+            host?: User['host'] | null;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'users/gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/get-frequently-replied-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/delete': {
+        req: {
+            groupId: UserGroup['id'];
+        };
+        res: null;
+    };
+    'users/groups/invitations/accept': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/invitations/reject': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/invite': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/joined': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/owned': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/pull': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/transfer': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/lists/create': {
+        req: {
+            name: string;
+        };
+        res: UserList;
+    };
+    'users/lists/delete': {
+        req: {
+            listId: UserList['id'];
+        };
+        res: null;
+    };
+    'users/lists/list': {
+        req: NoParams;
+        res: UserList[];
+    };
+    'users/lists/pull': {
+        req: {
+            listId: UserList['id'];
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'users/lists/push': {
+        req: {
+            listId: UserList['id'];
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'users/lists/show': {
+        req: {
+            listId: UserList['id'];
+        };
+        res: UserList;
+    };
+    'users/lists/update': {
+        req: {
+            listId: UserList['id'];
+            name: string;
+        };
+        res: UserList;
+    };
+    'users/notes': {
+        req: {
+            userId: User['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'users/pages': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/recommendation': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/relation': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/report-abuse': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/search-by-username-and-host': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/show': {
+        req: ShowUserReq | {
+            userIds: User['id'][];
+        };
+        res: {
+            $switch: {
+                $cases: [
+                [
+                    {
+                    userIds: User['id'][];
+                },
+                UserDetailed[]
+                ]
+                ];
+                $default: UserDetailed;
+            };
+        };
+    };
+    'users/stats': {
+        req: TODO;
+        res: TODO;
+    };
+};
+
+declare namespace entities {
+    export {
+        ID,
+        DateString,
+        User,
+        UserLite,
+        UserDetailed,
+        UserGroup,
+        UserList,
+        MeDetailed,
+        DriveFile,
+        DriveFolder,
+        GalleryPost,
+        Note,
+        NoteReaction,
+        Notification_2 as Notification,
+        MessagingMessage,
+        CustomEmoji,
+        LiteInstanceMetadata,
+        DetailedInstanceMetadata,
+        InstanceMetadata,
+        ServerInfo,
+        Stats,
+        Page,
+        PageEvent,
+        Announcement,
+        Antenna,
+        App,
+        AuthSession,
+        Ad,
+        Clip,
+        NoteFavorite,
+        FollowRequest,
+        Channel,
+        Following,
+        FollowingFolloweePopulated,
+        FollowingFollowerPopulated,
+        Blocking,
+        Instance,
+        Signin,
+        UserSorting,
+        OriginType
+    }
+}
+export { entities }
+
+// @public (undocumented)
+type FetchLike = (input: string, init?: {
+    method?: string;
+    body?: string;
+    credentials?: RequestCredentials;
+    cache?: RequestCache;
+}) => Promise<{
+    status: number;
+    json(): Promise<any>;
+}>;
+
+// @public (undocumented)
+export const ffVisibility: readonly ["public", "followers", "private"];
+
+// @public (undocumented)
+type Following = {
+    id: ID;
+    createdAt: DateString;
+    followerId: User['id'];
+    followeeId: User['id'];
+};
+
+// @public (undocumented)
+type FollowingFolloweePopulated = Following & {
+    followee: UserDetailed;
+};
+
+// @public (undocumented)
+type FollowingFollowerPopulated = Following & {
+    follower: UserDetailed;
+};
+
+// @public (undocumented)
+type FollowRequest = {
+    id: ID;
+    follower: User;
+    followee: User;
+};
+
+// @public (undocumented)
+type GalleryPost = TODO_2;
+
+// @public (undocumented)
+type ID = string;
+
+// @public (undocumented)
+type Instance = {
+    id: ID;
+    caughtAt: DateString;
+    host: string;
+    usersCount: number;
+    notesCount: number;
+    followingCount: number;
+    followersCount: number;
+    driveUsage: number;
+    driveFiles: number;
+    latestRequestSentAt: DateString | null;
+    latestStatus: number | null;
+    latestRequestReceivedAt: DateString | null;
+    lastCommunicatedAt: DateString;
+    isNotResponding: boolean;
+    isSuspended: boolean;
+    softwareName: string | null;
+    softwareVersion: string | null;
+    openRegistrations: boolean | null;
+    name: string | null;
+    description: string | null;
+    maintainerName: string | null;
+    maintainerEmail: string | null;
+    iconUrl: string | null;
+    faviconUrl: string | null;
+    themeColor: string | null;
+    infoUpdatedAt: DateString | null;
+};
+
+// @public (undocumented)
+type InstanceMetadata = LiteInstanceMetadata | DetailedInstanceMetadata;
+
+// @public (undocumented)
+function isAPIError(reason: any): reason is APIError;
+
+// @public (undocumented)
+type LiteInstanceMetadata = {
+    maintainerName: string | null;
+    maintainerEmail: string | null;
+    version: string;
+    name: string | null;
+    uri: string;
+    description: string | null;
+    tosUrl: string | null;
+    disableRegistration: boolean;
+    disableLocalTimeline: boolean;
+    disableRecommendedTimeline: boolean;
+    disableGlobalTimeline: boolean;
+    driveCapacityPerLocalUserMb: number;
+    driveCapacityPerRemoteUserMb: number;
+    enableHcaptcha: boolean;
+    hcaptchaSiteKey: string | null;
+    enableRecaptcha: boolean;
+    recaptchaSiteKey: string | null;
+    swPublickey: string | null;
+    maxNoteTextLength: number;
+    enableEmail: boolean;
+    enableTwitterIntegration: boolean;
+    enableGithubIntegration: boolean;
+    enableDiscordIntegration: boolean;
+    enableServiceWorker: boolean;
+    emojis: CustomEmoji[];
+    ads: {
+        id: ID;
+        ratio: number;
+        place: string;
+        url: string;
+        imageUrl: string;
+    }[];
+};
+
+// @public (undocumented)
+type MeDetailed = UserDetailed & {
+    avatarId: DriveFile['id'];
+    bannerId: DriveFile['id'];
+    autoAcceptFollowed: boolean;
+    alwaysMarkNsfw: boolean;
+    carefulBot: boolean;
+    emailNotificationTypes: string[];
+    hasPendingReceivedFollowRequest: boolean;
+    hasUnreadAnnouncement: boolean;
+    hasUnreadAntenna: boolean;
+    hasUnreadChannel: boolean;
+    hasUnreadMentions: boolean;
+    hasUnreadMessagingMessage: boolean;
+    hasUnreadNotification: boolean;
+    hasUnreadSpecifiedNotes: boolean;
+    hideOnlineStatus: boolean;
+    injectFeaturedNote: boolean;
+    integrations: Record<string, any>;
+    isDeleted: boolean;
+    isExplorable: boolean;
+    mutedWords: string[][];
+    mutingNotificationTypes: string[];
+    noCrawle: boolean;
+    receiveAnnouncementEmail: boolean;
+    usePasswordLessLogin: boolean;
+    [other: string]: any;
+};
+
+// @public (undocumented)
+type MessagingMessage = {
+    id: ID;
+    createdAt: DateString;
+    file: DriveFile | null;
+    fileId: DriveFile['id'] | null;
+    isRead: boolean;
+    reads: User['id'][];
+    text: string | null;
+    user: User;
+    userId: User['id'];
+    recipient?: User | null;
+    recipientId: User['id'] | null;
+    group?: UserGroup | null;
+    groupId: UserGroup['id'] | null;
+};
+
+// @public (undocumented)
+export const mutedNoteReasons: readonly ["word", "manual", "spam", "other"];
+
+// @public (undocumented)
+type Note = {
+    id: ID;
+    createdAt: DateString;
+    text: string | null;
+    cw: string | null;
+    user: User;
+    userId: User['id'];
+    reply?: Note;
+    replyId: Note['id'];
+    renote?: Note;
+    renoteId: Note['id'];
+    files: DriveFile[];
+    fileIds: DriveFile['id'][];
+    visibility: 'public' | 'home' | 'followers' | 'specified';
+    visibleUserIds?: User['id'][];
+    localOnly?: boolean;
+    myReaction?: string;
+    reactions: Record<string, number>;
+    renoteCount: number;
+    repliesCount: number;
+    poll?: {
+        expiresAt: DateString | null;
+        multiple: boolean;
+        choices: {
+            isVoted: boolean;
+            text: string;
+            votes: number;
+        }[];
+    };
+    emojis: {
+        name: string;
+        url: string;
+    }[];
+    uri?: string;
+    url?: string;
+    isHidden?: boolean;
+};
+
+// @public (undocumented)
+type NoteFavorite = {
+    id: ID;
+    createdAt: DateString;
+    noteId: Note['id'];
+    note: Note;
+};
+
+// @public (undocumented)
+type NoteReaction = {
+    id: ID;
+    createdAt: DateString;
+    user: UserLite;
+    type: string;
+};
+
+// @public (undocumented)
+export const noteVisibilities: readonly ["public", "home", "followers", "specified"];
+
+// @public (undocumented)
+type Notification_2 = {
+    id: ID;
+    createdAt: DateString;
+    isRead: boolean;
+} & ({
+    type: 'reaction';
+    reaction: string;
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'reply';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'renote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'quote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'mention';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'pollVote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'follow';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'followRequestAccepted';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'receiveFollowRequest';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'groupInvited';
+    invitation: UserGroup;
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'app';
+    header?: string | null;
+    body: string;
+    icon?: string | null;
+});
+
+// @public (undocumented)
+export const notificationTypes: readonly ["follow", "mention", "reply", "renote", "quote", "reaction", "pollVote", "pollEnded", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app"];
+
+// @public (undocumented)
+type OriginType = 'combined' | 'local' | 'remote';
+
+// @public (undocumented)
+type Page = {
+    id: ID;
+    createdAt: DateString;
+    updatedAt: DateString;
+    userId: User['id'];
+    user: User;
+    content: Record<string, any>[];
+    variables: Record<string, any>[];
+    title: string;
+    name: string;
+    summary: string | null;
+    hideTitleWhenPinned: boolean;
+    alignCenter: boolean;
+    font: string;
+    script: string;
+    eyeCatchingImageId: DriveFile['id'] | null;
+    eyeCatchingImage: DriveFile | null;
+    attachedFiles: any;
+    likedCount: number;
+    isLiked?: boolean;
+};
+
+// @public (undocumented)
+type PageEvent = {
+    pageId: Page['id'];
+    event: string;
+    var: any;
+    userId: User['id'];
+    user: User;
+};
+
+// @public (undocumented)
+export const permissions: string[];
+
+// @public (undocumented)
+type ServerInfo = {
+    machine: string;
+    cpu: {
+        model: string;
+        cores: number;
+    };
+    mem: {
+        total: number;
+    };
+    fs: {
+        total: number;
+        used: number;
+    };
+};
+
+// @public (undocumented)
+type Signin = {
+    id: ID;
+    createdAt: DateString;
+    ip: string;
+    headers: Record<string, any>;
+    success: boolean;
+};
+
+// @public (undocumented)
+type Stats = {
+    notesCount: number;
+    originalNotesCount: number;
+    usersCount: number;
+    originalUsersCount: number;
+    instances: number;
+    driveUsageLocal: number;
+    driveUsageRemote: number;
+};
+
+// Warning: (ae-forgotten-export) The symbol "StreamEvents" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export class Stream extends EventEmitter<StreamEvents> {
+    constructor(origin: string, user: {
+        token: string;
+    } | null, options?: {
+        WebSocket?: any;
+    });
+    // (undocumented)
+    close(): void;
+    // Warning: (ae-forgotten-export) The symbol "NonSharedConnection" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    disconnectToChannel(connection: NonSharedConnection): void;
+    // Warning: (ae-forgotten-export) The symbol "SharedConnection" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    removeSharedConnection(connection: SharedConnection): void;
+    // Warning: (ae-forgotten-export) The symbol "Pool" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    removeSharedConnectionPool(pool: Pool): void;
+    // (undocumented)
+    send(typeOrPayload: any, payload?: any): void;
+    // (undocumented)
+    state: 'initializing' | 'reconnecting' | 'connected';
+    // (undocumented)
+    useChannel<C extends keyof Channels>(channel: C, params?: Channels[C]['params'], name?: string): ChannelConnection<Channels[C]>;
+}
+
+// @public (undocumented)
+type User = UserLite | UserDetailed;
+
+// @public (undocumented)
+type UserDetailed = UserLite & {
+    bannerBlurhash: string | null;
+    bannerColor: string | null;
+    bannerUrl: string | null;
+    birthday: string | null;
+    createdAt: DateString;
+    description: string | null;
+    ffVisibility: 'public' | 'followers' | 'private';
+    fields: {
+        name: string;
+        value: string;
+    }[];
+    followersCount: number;
+    followingCount: number;
+    hasPendingFollowRequestFromYou: boolean;
+    hasPendingFollowRequestToYou: boolean;
+    isAdmin: boolean;
+    isBlocked: boolean;
+    isBlocking: boolean;
+    isBot: boolean;
+    isCat: boolean;
+    isFollowed: boolean;
+    isFollowing: boolean;
+    isLocked: boolean;
+    isModerator: boolean;
+    isMuted: boolean;
+    isSilenced: boolean;
+    isSuspended: boolean;
+    lang: string | null;
+    lastFetchedAt?: DateString;
+    location: string | null;
+    notesCount: number;
+    pinnedNoteIds: ID[];
+    pinnedNotes: Note[];
+    pinnedPage: Page | null;
+    pinnedPageId: string | null;
+    publicReactions: boolean;
+    securityKeys: boolean;
+    twoFactorEnabled: boolean;
+    updatedAt: DateString | null;
+    uri: string | null;
+    url: string | null;
+};
+
+// @public (undocumented)
+type UserGroup = TODO_2;
+
+// @public (undocumented)
+type UserList = {
+    id: ID;
+    createdAt: DateString;
+    name: string;
+    userIds: User['id'][];
+};
+
+// @public (undocumented)
+type UserLite = {
+    id: ID;
+    username: string;
+    host: string | null;
+    name: string;
+    onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
+    avatarUrl: string;
+    avatarBlurhash: string;
+    alsoKnownAs: string[];
+    movedToUri: any;
+    emojis: {
+        name: string;
+        url: string;
+    }[];
+    instance?: {
+        name: Instance['name'];
+        softwareName: Instance['softwareName'];
+        softwareVersion: Instance['softwareVersion'];
+        iconUrl: Instance['iconUrl'];
+        faviconUrl: Instance['faviconUrl'];
+        themeColor: Instance['themeColor'];
+    };
+};
+
+// @public (undocumented)
+type UserSorting = '+follower' | '-follower' | '+createdAt' | '-createdAt' | '+updatedAt' | '-updatedAt';
+
+// Warnings were encountered during analysis:
+//
+// src/api.types.ts:16:32 - (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
+// src/api.types.ts:18:25 - (ae-forgotten-export) The symbol "NoParams" needs to be exported by the entry point index.d.ts
+// src/api.types.ts:601:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts
+// src/streaming.types.ts:35:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/calckey-js/etc/misskey-js.api.md b/packages/calckey-js/etc/misskey-js.api.md
new file mode 100644
index 000000000..269d5cf10
--- /dev/null
+++ b/packages/calckey-js/etc/misskey-js.api.md
@@ -0,0 +1,2681 @@
+## API Report File for "misskey-js"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { EventEmitter } from 'eventemitter3';
+
+// @public (undocumented)
+export type Acct = {
+    username: string;
+    host: string | null;
+};
+
+// Warning: (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+type Ad = TODO_2;
+
+// @public (undocumented)
+type Announcement = {
+    id: ID;
+    createdAt: DateString;
+    updatedAt: DateString | null;
+    text: string;
+    title: string;
+    imageUrl: string | null;
+    isRead?: boolean;
+};
+
+// @public (undocumented)
+type Antenna = {
+    id: ID;
+    createdAt: DateString;
+    name: string;
+    keywords: string[][];
+    excludeKeywords: string[][];
+    src: 'home' | 'all' | 'users' | 'list' | 'group';
+    userListId: ID | null;
+    userGroupId: ID | null;
+    users: string[];
+    caseSensitive: boolean;
+    notify: boolean;
+    withReplies: boolean;
+    withFile: boolean;
+    hasUnreadNote: boolean;
+};
+
+declare namespace api {
+    export {
+        isAPIError,
+        APIError,
+        FetchLike,
+        APIClient
+    }
+}
+export { api }
+
+// @public (undocumented)
+class APIClient {
+    constructor(opts: {
+        origin: APIClient['origin'];
+        credential?: APIClient['credential'];
+        fetch?: APIClient['fetch'] | null | undefined;
+    });
+    // (undocumented)
+    credential: string | null | undefined;
+    // (undocumented)
+    fetch: FetchLike;
+    // (undocumented)
+    origin: string;
+    // Warning: (ae-forgotten-export) The symbol "IsCaseMatched" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "GetCaseResult" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(endpoint: E, params?: P, credential?: string | null | undefined): Promise<Endpoints[E]['res'] extends {
+        $switch: {
+            $cases: [any, any][];
+            $default: any;
+        };
+    } ? IsCaseMatched<E, P, 0> extends true ? GetCaseResult<E, P, 0> : IsCaseMatched<E, P, 1> extends true ? GetCaseResult<E, P, 1> : IsCaseMatched<E, P, 2> extends true ? GetCaseResult<E, P, 2> : IsCaseMatched<E, P, 3> extends true ? GetCaseResult<E, P, 3> : IsCaseMatched<E, P, 4> extends true ? GetCaseResult<E, P, 4> : IsCaseMatched<E, P, 5> extends true ? GetCaseResult<E, P, 5> : IsCaseMatched<E, P, 6> extends true ? GetCaseResult<E, P, 6> : IsCaseMatched<E, P, 7> extends true ? GetCaseResult<E, P, 7> : IsCaseMatched<E, P, 8> extends true ? GetCaseResult<E, P, 8> : IsCaseMatched<E, P, 9> extends true ? GetCaseResult<E, P, 9> : Endpoints[E]['res']['$switch']['$default'] : Endpoints[E]['res']>;
+}
+
+// @public (undocumented)
+type APIError = {
+    id: string;
+    code: string;
+    message: string;
+    kind: 'client' | 'server';
+    info: Record<string, any>;
+};
+
+// @public (undocumented)
+type App = TODO_2;
+
+// @public (undocumented)
+type AuthSession = {
+    id: ID;
+    app: App;
+    token: string;
+};
+
+// @public (undocumented)
+type Blocking = {
+    id: ID;
+    createdAt: DateString;
+    blockeeId: User['id'];
+    blockee: UserDetailed;
+};
+
+// @public (undocumented)
+type Channel = {
+    id: ID;
+};
+
+// 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']> {
+    constructor(stream: Stream, channel: string, name?: string);
+    // (undocumented)
+    channel: string;
+    // (undocumented)
+    abstract dispose(): void;
+    // (undocumented)
+    abstract id: string;
+    // (undocumented)
+    inCount: number;
+    // (undocumented)
+    name?: string;
+    // (undocumented)
+    outCount: number;
+    // (undocumented)
+    send<T extends keyof Channel['receives']>(type: T, body: Channel['receives'][T]): void;
+    // (undocumented)
+    protected stream: Stream;
+}
+
+// @public (undocumented)
+export type Channels = {
+    main: {
+        params: null;
+        events: {
+            notification: (payload: Notification_2) => void;
+            mention: (payload: Note) => void;
+            reply: (payload: Note) => void;
+            renote: (payload: Note) => void;
+            follow: (payload: User) => void;
+            followed: (payload: User) => void;
+            unfollow: (payload: User) => void;
+            meUpdated: (payload: MeDetailed) => void;
+            pageEvent: (payload: PageEvent) => void;
+            urlUploadFinished: (payload: {
+                marker: string;
+                file: DriveFile;
+            }) => void;
+            readAllNotifications: () => void;
+            unreadNotification: (payload: Notification_2) => void;
+            unreadMention: (payload: Note['id']) => void;
+            readAllUnreadMentions: () => void;
+            unreadSpecifiedNote: (payload: Note['id']) => void;
+            readAllUnreadSpecifiedNotes: () => void;
+            readAllMessagingMessages: () => void;
+            messagingMessage: (payload: MessagingMessage) => void;
+            unreadMessagingMessage: (payload: MessagingMessage) => void;
+            readAllAntennas: () => void;
+            unreadAntenna: (payload: Antenna) => void;
+            readAllAnnouncements: () => void;
+            readAllChannels: () => void;
+            unreadChannel: (payload: Note['id']) => void;
+            myTokenRegenerated: () => void;
+            reversiNoInvites: () => void;
+            reversiInvited: (payload: FIXME) => void;
+            signin: (payload: FIXME) => void;
+            registryUpdated: (payload: {
+                scope?: string[];
+                key: string;
+                value: any | null;
+            }) => void;
+            driveFileCreated: (payload: DriveFile) => void;
+            readAntenna: (payload: Antenna) => void;
+        };
+        receives: null;
+    };
+    homeTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    localTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    hybridTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    recommendedTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    globalTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    messaging: {
+        params: {
+            otherparty?: User['id'] | null;
+            group?: UserGroup['id'] | null;
+        };
+        events: {
+            message: (payload: MessagingMessage) => void;
+            deleted: (payload: MessagingMessage['id']) => void;
+            read: (payload: MessagingMessage['id'][]) => void;
+            typers: (payload: User[]) => void;
+        };
+        receives: {
+            read: {
+                id: MessagingMessage['id'];
+            };
+        };
+    };
+    serverStats: {
+        params: null;
+        events: {
+            stats: (payload: FIXME) => void;
+        };
+        receives: {
+            requestLog: {
+                id: string | number;
+                length: number;
+            };
+        };
+    };
+    queueStats: {
+        params: null;
+        events: {
+            stats: (payload: FIXME) => void;
+        };
+        receives: {
+            requestLog: {
+                id: string | number;
+                length: number;
+            };
+        };
+    };
+};
+
+// @public (undocumented)
+type Clip = TODO_2;
+
+// @public (undocumented)
+type CustomEmoji = {
+    id: string;
+    name: string;
+    url: string;
+    category: string;
+    aliases: string[];
+};
+
+// @public (undocumented)
+type DateString = string;
+
+// @public (undocumented)
+type DetailedInstanceMetadata = LiteInstanceMetadata & {
+    features: Record<string, any>;
+};
+
+// @public (undocumented)
+type DriveFile = {
+    id: ID;
+    createdAt: DateString;
+    isSensitive: boolean;
+    name: string;
+    thumbnailUrl: string;
+    url: string;
+    type: string;
+    size: number;
+    md5: string;
+    blurhash: string;
+    properties: Record<string, any>;
+};
+
+// @public (undocumented)
+type DriveFolder = TODO_2;
+
+// @public (undocumented)
+export type Endpoints = {
+    'admin/abuse-user-reports': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/delete-all-files-of-a-user': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'admin/delete-logs': {
+        req: NoParams;
+        res: null;
+    };
+    'admin/get-index-stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/get-table-stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/invite': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/logs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/reset-password': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/resolve-abuse-user-report': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/resync-chart': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/send-email': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/server-info': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-moderation-logs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/silence-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/suspend-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/unsilence-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/unsuspend-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/update-meta': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/vacuum': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/accounts/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/delete': {
+        req: {
+            id: Ad['id'];
+        };
+        res: null;
+    };
+    'admin/ad/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/delete': {
+        req: {
+            id: Announcement['id'];
+        };
+        res: null;
+    };
+    'admin/announcements/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/clean-remote-files': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/cleanup': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/files': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/show-file': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/copy': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/list-remote': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/delete-all-files': {
+        req: {
+            host: string;
+        };
+        res: null;
+    };
+    'admin/federation/refresh-remote-instance-metadata': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/remove-all-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/update-instance': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/moderators/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/moderators/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/promo/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/clear': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/deliver-delayed': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/inbox-delayed': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/jobs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'announcements': {
+        req: {
+            limit?: number;
+            withUnreads?: boolean;
+            sinceId?: Announcement['id'];
+            untilId?: Announcement['id'];
+        };
+        res: Announcement[];
+    };
+    'antennas/create': {
+        req: TODO;
+        res: Antenna;
+    };
+    'antennas/delete': {
+        req: {
+            antennaId: Antenna['id'];
+        };
+        res: null;
+    };
+    'antennas/list': {
+        req: NoParams;
+        res: Antenna[];
+    };
+    'antennas/notes': {
+        req: {
+            antennaId: Antenna['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'antennas/show': {
+        req: {
+            antennaId: Antenna['id'];
+        };
+        res: Antenna;
+    };
+    'antennas/update': {
+        req: TODO;
+        res: Antenna;
+    };
+    'ap/get': {
+        req: {
+            uri: string;
+        };
+        res: Record<string, any>;
+    };
+    'ap/show': {
+        req: {
+            uri: string;
+        };
+        res: {
+            type: 'Note';
+            object: Note;
+        } | {
+            type: 'User';
+            object: UserDetailed;
+        };
+    };
+    'app/create': {
+        req: TODO;
+        res: App;
+    };
+    'app/show': {
+        req: {
+            appId: App['id'];
+        };
+        res: App;
+    };
+    'auth/accept': {
+        req: {
+            token: string;
+        };
+        res: null;
+    };
+    'auth/session/generate': {
+        req: {
+            appSecret: string;
+        };
+        res: {
+            token: string;
+            url: string;
+        };
+    };
+    'auth/session/show': {
+        req: {
+            token: string;
+        };
+        res: AuthSession;
+    };
+    'auth/session/userkey': {
+        req: {
+            appSecret: string;
+            token: string;
+        };
+        res: {
+            accessToken: string;
+            user: User;
+        };
+    };
+    'blocking/create': {
+        req: {
+            userId: User['id'];
+        };
+        res: UserDetailed;
+    };
+    'blocking/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: UserDetailed;
+    };
+    'blocking/list': {
+        req: {
+            limit?: number;
+            sinceId?: Blocking['id'];
+            untilId?: Blocking['id'];
+        };
+        res: Blocking[];
+    };
+    'channels/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/featured': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/follow': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/followed': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/owned': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/pin-note': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/timeline': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/unfollow': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'charts/active-users': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                users: number[];
+            };
+            remote: {
+                users: number[];
+            };
+        };
+    };
+    'charts/drive': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                decCount: number[];
+                decSize: number[];
+                incCount: number[];
+                incSize: number[];
+                totalCount: number[];
+                totalSize: number[];
+            };
+            remote: {
+                decCount: number[];
+                decSize: number[];
+                incCount: number[];
+                incSize: number[];
+                totalCount: number[];
+                totalSize: number[];
+            };
+        };
+    };
+    'charts/federation': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            instance: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'charts/hashtag': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: TODO;
+    };
+    'charts/instance': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            host: string;
+        };
+        res: {
+            drive: {
+                decFiles: number[];
+                decUsage: number[];
+                incFiles: number[];
+                incUsage: number[];
+                totalFiles: number[];
+                totalUsage: number[];
+            };
+            followers: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            following: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            notes: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+            requests: {
+                failed: number[];
+                received: number[];
+                succeeded: number[];
+            };
+            users: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'charts/network': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: TODO;
+    };
+    'charts/notes': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+            remote: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+        };
+    };
+    'charts/user/drive': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: {
+            decCount: number[];
+            decSize: number[];
+            incCount: number[];
+            incSize: number[];
+            totalCount: number[];
+            totalSize: number[];
+        };
+    };
+    'charts/user/following': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: TODO;
+    };
+    'charts/user/notes': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: {
+            dec: number[];
+            inc: number[];
+            total: number[];
+            diffs: {
+                normal: number[];
+                renote: number[];
+                reply: number[];
+            };
+        };
+    };
+    'charts/user/reactions': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: TODO;
+    };
+    'charts/users': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            remote: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'clips/add-note': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/delete': {
+        req: {
+            clipId: Clip['id'];
+        };
+        res: null;
+    };
+    'clips/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive': {
+        req: NoParams;
+        res: {
+            capacity: number;
+            usage: number;
+        };
+    };
+    'drive/files': {
+        req: {
+            folderId?: DriveFolder['id'] | null;
+            type?: DriveFile['type'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFile[];
+    };
+    'drive/files/attached-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/check-existence': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/delete': {
+        req: {
+            fileId: DriveFile['id'];
+        };
+        res: null;
+    };
+    'drive/files/find-by-hash': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/find': {
+        req: {
+            name: string;
+            folderId?: DriveFolder['id'] | null;
+        };
+        res: DriveFile[];
+    };
+    'drive/files/show': {
+        req: {
+            fileId?: DriveFile['id'];
+            url?: string;
+        };
+        res: DriveFile;
+    };
+    'drive/files/update': {
+        req: {
+            fileId: DriveFile['id'];
+            folderId?: DriveFolder['id'] | null;
+            name?: string;
+            isSensitive?: boolean;
+            comment?: string | null;
+        };
+        res: DriveFile;
+    };
+    'drive/files/upload-from-url': {
+        req: {
+            url: string;
+            folderId?: DriveFolder['id'] | null;
+            isSensitive?: boolean;
+            comment?: string | null;
+            marker?: string | null;
+            force?: boolean;
+        };
+        res: null;
+    };
+    'drive/folders': {
+        req: {
+            folderId?: DriveFolder['id'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFolder[];
+    };
+    'drive/folders/create': {
+        req: {
+            name?: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder;
+    };
+    'drive/folders/delete': {
+        req: {
+            folderId: DriveFolder['id'];
+        };
+        res: null;
+    };
+    'drive/folders/find': {
+        req: {
+            name: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder[];
+    };
+    'drive/folders/show': {
+        req: {
+            folderId: DriveFolder['id'];
+        };
+        res: DriveFolder;
+    };
+    'drive/folders/update': {
+        req: {
+            folderId: DriveFolder['id'];
+            name?: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder;
+    };
+    'drive/stream': {
+        req: {
+            type?: DriveFile['type'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFile[];
+    };
+    'endpoint': {
+        req: {
+            endpoint: string;
+        };
+        res: {
+            params: {
+                name: string;
+                type: string;
+            }[];
+        };
+    };
+    'endpoints': {
+        req: NoParams;
+        res: string[];
+    };
+    'federation/dns': {
+        req: {
+            host: string;
+        };
+        res: {
+            a: string[];
+            aaaa: string[];
+            cname: string[];
+            txt: string[];
+        };
+    };
+    'federation/followers': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'federation/following': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'federation/instances': {
+        req: {
+            host?: string | null;
+            blocked?: boolean | null;
+            notResponding?: boolean | null;
+            suspended?: boolean | null;
+            federating?: boolean | null;
+            subscribing?: boolean | null;
+            publishing?: boolean | null;
+            limit?: number;
+            offset?: number;
+            sort?: '+pubSub' | '-pubSub' | '+notes' | '-notes' | '+users' | '-users' | '+following' | '-following' | '+followers' | '-followers' | '+caughtAt' | '-caughtAt' | '+lastCommunicatedAt' | '-lastCommunicatedAt' | '+driveUsage' | '-driveUsage' | '+driveFiles' | '-driveFiles';
+        };
+        res: Instance[];
+    };
+    'federation/show-instance': {
+        req: {
+            host: string;
+        };
+        res: Instance;
+    };
+    'federation/update-remote-user': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'federation/users': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: User['id'];
+            untilId?: User['id'];
+        };
+        res: UserDetailed[];
+    };
+    'following/create': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/requests/accept': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'following/requests/cancel': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/requests/list': {
+        req: NoParams;
+        res: FollowRequest[];
+    };
+    'following/requests/reject': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'gallery/featured': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/popular': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/delete': {
+        req: {
+            postId: GalleryPost['id'];
+        };
+        res: null;
+    };
+    'gallery/posts/like': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/unlike': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games/surrender': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/invitations': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/match': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/match/cancel': {
+        req: TODO;
+        res: TODO;
+    };
+    'get-online-users-count': {
+        req: NoParams;
+        res: {
+            count: number;
+        };
+    };
+    'hashtags/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/trend': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/users': {
+        req: TODO;
+        res: TODO;
+    };
+    'i': {
+        req: NoParams;
+        res: User;
+    };
+    'i/apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/authorized-apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/change-password': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/delete-account': {
+        req: {
+            password: string;
+        };
+        res: null;
+    };
+    'i/export-blocking': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-mute': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-user-lists': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/favorites': {
+        req: {
+            limit?: number;
+            sinceId?: NoteFavorite['id'];
+            untilId?: NoteFavorite['id'];
+        };
+        res: NoteFavorite[];
+    };
+    'i/gallery/likes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/get-word-muted-notes-count': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/import-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/import-user-lists': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/notifications': {
+        req: {
+            limit?: number;
+            sinceId?: Notification_2['id'];
+            untilId?: Notification_2['id'];
+            following?: boolean;
+            markAsRead?: boolean;
+            includeTypes?: Notification_2['type'][];
+            excludeTypes?: Notification_2['type'][];
+        };
+        res: Notification_2[];
+    };
+    'i/page-likes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/pages': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/pin': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: MeDetailed;
+    };
+    'i/read-all-messaging-messages': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/read-all-unread-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/read-announcement': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/regenerate-token': {
+        req: {
+            password: string;
+        };
+        res: null;
+    };
+    'i/registry/get-all': {
+        req: {
+            scope?: string[];
+        };
+        res: Record<string, any>;
+    };
+    'i/registry/get-detail': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: {
+            updatedAt: DateString;
+            value: any;
+        };
+    };
+    'i/registry/get': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: any;
+    };
+    'i/registry/keys-with-type': {
+        req: {
+            scope?: string[];
+        };
+        res: Record<string, 'null' | 'array' | 'number' | 'string' | 'boolean' | 'object'>;
+    };
+    'i/registry/keys': {
+        req: {
+            scope?: string[];
+        };
+        res: string[];
+    };
+    'i/registry/remove': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: null;
+    };
+    'i/registry/scopes': {
+        req: NoParams;
+        res: string[][];
+    };
+    'i/registry/set': {
+        req: {
+            key: string;
+            value: any;
+            scope?: string[];
+        };
+        res: null;
+    };
+    'i/revoke-token': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/signin-history': {
+        req: {
+            limit?: number;
+            sinceId?: Signin['id'];
+            untilId?: Signin['id'];
+        };
+        res: Signin[];
+    };
+    'i/unpin': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: MeDetailed;
+    };
+    'i/update-email': {
+        req: {
+            password: string;
+            email?: string | null;
+        };
+        res: MeDetailed;
+    };
+    'i/update': {
+        req: {
+            name?: string | null;
+            description?: string | null;
+            lang?: string | null;
+            location?: string | null;
+            birthday?: string | null;
+            avatarId?: DriveFile['id'] | null;
+            bannerId?: DriveFile['id'] | null;
+            fields?: {
+                name: string;
+                value: string;
+            }[];
+            isLocked?: boolean;
+            isExplorable?: boolean;
+            hideOnlineStatus?: boolean;
+            carefulBot?: boolean;
+            autoAcceptFollowed?: boolean;
+            noCrawle?: boolean;
+            isBot?: boolean;
+            isCat?: boolean;
+            injectFeaturedNote?: boolean;
+            receiveAnnouncementEmail?: boolean;
+            alwaysMarkNsfw?: boolean;
+            mutedWords?: string[][];
+            mutingNotificationTypes?: Notification_2['type'][];
+            emailNotificationTypes?: string[];
+        };
+        res: MeDetailed;
+    };
+    'i/user-group-invites': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/done': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/key-done': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/password-less': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/register-key': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/register': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/remove-key': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/unregister': {
+        req: TODO;
+        res: TODO;
+    };
+    'messaging/history': {
+        req: {
+            limit?: number;
+            group?: boolean;
+        };
+        res: MessagingMessage[];
+    };
+    'messaging/messages': {
+        req: {
+            userId?: User['id'];
+            groupId?: UserGroup['id'];
+            limit?: number;
+            sinceId?: MessagingMessage['id'];
+            untilId?: MessagingMessage['id'];
+            markAsRead?: boolean;
+        };
+        res: MessagingMessage[];
+    };
+    'messaging/messages/create': {
+        req: {
+            userId?: User['id'];
+            groupId?: UserGroup['id'];
+            text?: string;
+            fileId?: DriveFile['id'];
+        };
+        res: MessagingMessage;
+    };
+    'messaging/messages/delete': {
+        req: {
+            messageId: MessagingMessage['id'];
+        };
+        res: null;
+    };
+    'messaging/messages/read': {
+        req: {
+            messageId: MessagingMessage['id'];
+        };
+        res: null;
+    };
+    'meta': {
+        req: {
+            detail?: boolean;
+        };
+        res: {
+            $switch: {
+                $cases: [
+                [
+                    {
+                    detail: true;
+                },
+                DetailedInstanceMetadata
+                ],
+                [
+                    {
+                    detail: false;
+                },
+                LiteInstanceMetadata
+                ],
+                [
+                    {
+                    detail: boolean;
+                },
+                LiteInstanceMetadata | DetailedInstanceMetadata
+                ]
+                ];
+                $default: LiteInstanceMetadata;
+            };
+        };
+    };
+    'miauth/gen-token': {
+        req: TODO;
+        res: TODO;
+    };
+    'mute/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'mute/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'mute/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'my/apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/children': {
+        req: {
+            noteId: Note['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/clips': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/conversation': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/create': {
+        req: {
+            visibility?: 'public' | 'home' | 'followers' | 'specified';
+            visibleUserIds?: User['id'][];
+            text?: null | string;
+            cw?: null | string;
+            viaMobile?: boolean;
+            localOnly?: boolean;
+            fileIds?: DriveFile['id'][];
+            replyId?: null | Note['id'];
+            renoteId?: null | Note['id'];
+            channelId?: null | Channel['id'];
+            poll?: null | {
+                choices: string[];
+                multiple?: boolean;
+                expiresAt?: null | number;
+                expiredAfter?: null | number;
+            };
+        };
+        res: {
+            createdNote: Note;
+        };
+    };
+    'notes/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/favorites/create': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/favorites/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/featured': {
+        req: TODO;
+        res: Note[];
+    };
+    'notes/global-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/recommended-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/hybrid-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/local-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/mentions': {
+        req: {
+            following?: boolean;
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/polls/recommendation': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/polls/vote': {
+        req: {
+            noteId: Note['id'];
+            choice: number;
+        };
+        res: null;
+    };
+    'notes/reactions': {
+        req: {
+            noteId: Note['id'];
+            type?: string | null;
+            limit?: number;
+        };
+        res: NoteReaction[];
+    };
+    'notes/reactions/create': {
+        req: {
+            noteId: Note['id'];
+            reaction: string;
+        };
+        res: null;
+    };
+    'notes/reactions/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/renotes': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            noteId: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/replies': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            noteId: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/search-by-tag': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/show': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: Note;
+    };
+    'notes/state': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/unrenote': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/user-list-timeline': {
+        req: {
+            listId: UserList['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/watching/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/watching/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notifications/create': {
+        req: {
+            body: string;
+            header?: string | null;
+            icon?: string | null;
+        };
+        res: null;
+    };
+    'notifications/mark-all-as-read': {
+        req: NoParams;
+        res: null;
+    };
+    'notifications/read': {
+        req: {
+            notificationId: Notification_2['id'];
+        };
+        res: null;
+    };
+    'page-push': {
+        req: {
+            pageId: Page['id'];
+            event: string;
+            var?: any;
+        };
+        res: null;
+    };
+    'pages/create': {
+        req: TODO;
+        res: Page;
+    };
+    'pages/delete': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/featured': {
+        req: NoParams;
+        res: Page[];
+    };
+    'pages/like': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/show': {
+        req: {
+            pageId?: Page['id'];
+            name?: string;
+            username?: string;
+        };
+        res: Page;
+    };
+    'pages/unlike': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/update': {
+        req: TODO;
+        res: null;
+    };
+    'ping': {
+        req: NoParams;
+        res: {
+            pong: number;
+        };
+    };
+    'pinned-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'promo/read': {
+        req: TODO;
+        res: TODO;
+    };
+    'request-reset-password': {
+        req: {
+            username: string;
+            email: string;
+        };
+        res: null;
+    };
+    'reset-password': {
+        req: {
+            token: string;
+            password: string;
+        };
+        res: null;
+    };
+    'room/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'room/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'stats': {
+        req: NoParams;
+        res: Stats;
+    };
+    'server-info': {
+        req: NoParams;
+        res: ServerInfo;
+    };
+    'sw/register': {
+        req: TODO;
+        res: TODO;
+    };
+    'username/available': {
+        req: {
+            username: string;
+        };
+        res: {
+            available: boolean;
+        };
+    };
+    'users': {
+        req: {
+            limit?: number;
+            offset?: number;
+            sort?: UserSorting;
+            origin?: OriginType;
+        };
+        res: User[];
+    };
+    'users/clips': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/followers': {
+        req: {
+            userId?: User['id'];
+            username?: User['username'];
+            host?: User['host'] | null;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFollowerPopulated[];
+    };
+    'users/following': {
+        req: {
+            userId?: User['id'];
+            username?: User['username'];
+            host?: User['host'] | null;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'users/gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/get-frequently-replied-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/delete': {
+        req: {
+            groupId: UserGroup['id'];
+        };
+        res: null;
+    };
+    'users/groups/invitations/accept': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/invitations/reject': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/invite': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/joined': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/owned': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/pull': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/transfer': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/lists/create': {
+        req: {
+            name: string;
+        };
+        res: UserList;
+    };
+    'users/lists/delete': {
+        req: {
+            listId: UserList['id'];
+        };
+        res: null;
+    };
+    'users/lists/list': {
+        req: NoParams;
+        res: UserList[];
+    };
+    'users/lists/pull': {
+        req: {
+            listId: UserList['id'];
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'users/lists/push': {
+        req: {
+            listId: UserList['id'];
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'users/lists/show': {
+        req: {
+            listId: UserList['id'];
+        };
+        res: UserList;
+    };
+    'users/lists/update': {
+        req: {
+            listId: UserList['id'];
+            name: string;
+        };
+        res: UserList;
+    };
+    'users/notes': {
+        req: {
+            userId: User['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'users/pages': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/recommendation': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/relation': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/report-abuse': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/search-by-username-and-host': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/show': {
+        req: ShowUserReq | {
+            userIds: User['id'][];
+        };
+        res: {
+            $switch: {
+                $cases: [
+                [
+                    {
+                    userIds: User['id'][];
+                },
+                UserDetailed[]
+                ]
+                ];
+                $default: UserDetailed;
+            };
+        };
+    };
+    'users/stats': {
+        req: TODO;
+        res: TODO;
+    };
+};
+
+declare namespace entities {
+    export {
+        ID,
+        DateString,
+        User,
+        UserLite,
+        UserDetailed,
+        UserGroup,
+        UserList,
+        MeDetailed,
+        DriveFile,
+        DriveFolder,
+        GalleryPost,
+        Note,
+        NoteReaction,
+        Notification_2 as Notification,
+        MessagingMessage,
+        CustomEmoji,
+        LiteInstanceMetadata,
+        DetailedInstanceMetadata,
+        InstanceMetadata,
+        ServerInfo,
+        Stats,
+        Page,
+        PageEvent,
+        Announcement,
+        Antenna,
+        App,
+        AuthSession,
+        Ad,
+        Clip,
+        NoteFavorite,
+        FollowRequest,
+        Channel,
+        Following,
+        FollowingFolloweePopulated,
+        FollowingFollowerPopulated,
+        Blocking,
+        Instance,
+        Signin,
+        UserSorting,
+        OriginType
+    }
+}
+export { entities }
+
+// @public (undocumented)
+type FetchLike = (input: string, init?: {
+    method?: string;
+    body?: string;
+    credentials?: RequestCredentials;
+    cache?: RequestCache;
+}) => Promise<{
+    status: number;
+    json(): Promise<any>;
+}>;
+
+// @public (undocumented)
+export const ffVisibility: readonly ["public", "followers", "private"];
+
+// @public (undocumented)
+type Following = {
+    id: ID;
+    createdAt: DateString;
+    followerId: User['id'];
+    followeeId: User['id'];
+};
+
+// @public (undocumented)
+type FollowingFolloweePopulated = Following & {
+    followee: UserDetailed;
+};
+
+// @public (undocumented)
+type FollowingFollowerPopulated = Following & {
+    follower: UserDetailed;
+};
+
+// @public (undocumented)
+type FollowRequest = {
+    id: ID;
+    follower: User;
+    followee: User;
+};
+
+// @public (undocumented)
+type GalleryPost = TODO_2;
+
+// @public (undocumented)
+type ID = string;
+
+// @public (undocumented)
+type Instance = {
+    id: ID;
+    caughtAt: DateString;
+    host: string;
+    usersCount: number;
+    notesCount: number;
+    followingCount: number;
+    followersCount: number;
+    driveUsage: number;
+    driveFiles: number;
+    latestRequestSentAt: DateString | null;
+    latestStatus: number | null;
+    latestRequestReceivedAt: DateString | null;
+    lastCommunicatedAt: DateString;
+    isNotResponding: boolean;
+    isSuspended: boolean;
+    softwareName: string | null;
+    softwareVersion: string | null;
+    openRegistrations: boolean | null;
+    name: string | null;
+    description: string | null;
+    maintainerName: string | null;
+    maintainerEmail: string | null;
+    iconUrl: string | null;
+    faviconUrl: string | null;
+    themeColor: string | null;
+    infoUpdatedAt: DateString | null;
+};
+
+// @public (undocumented)
+type InstanceMetadata = LiteInstanceMetadata | DetailedInstanceMetadata;
+
+// @public (undocumented)
+function isAPIError(reason: any): reason is APIError;
+
+// @public (undocumented)
+type LiteInstanceMetadata = {
+    maintainerName: string | null;
+    maintainerEmail: string | null;
+    version: string;
+    name: string | null;
+    uri: string;
+    description: string | null;
+    tosUrl: string | null;
+    disableRegistration: boolean;
+    disableLocalTimeline: boolean;
+    disableRecommendedTimeline: boolean;
+    disableGlobalTimeline: boolean;
+    driveCapacityPerLocalUserMb: number;
+    driveCapacityPerRemoteUserMb: number;
+    enableHcaptcha: boolean;
+    hcaptchaSiteKey: string | null;
+    enableRecaptcha: boolean;
+    recaptchaSiteKey: string | null;
+    swPublickey: string | null;
+    maxNoteTextLength: number;
+    enableEmail: boolean;
+    enableTwitterIntegration: boolean;
+    enableGithubIntegration: boolean;
+    enableDiscordIntegration: boolean;
+    enableServiceWorker: boolean;
+    emojis: CustomEmoji[];
+    ads: {
+        id: ID;
+        ratio: number;
+        place: string;
+        url: string;
+        imageUrl: string;
+    }[];
+};
+
+// @public (undocumented)
+type MeDetailed = UserDetailed & {
+    avatarId: DriveFile['id'];
+    bannerId: DriveFile['id'];
+    autoAcceptFollowed: boolean;
+    alwaysMarkNsfw: boolean;
+    carefulBot: boolean;
+    emailNotificationTypes: string[];
+    hasPendingReceivedFollowRequest: boolean;
+    hasUnreadAnnouncement: boolean;
+    hasUnreadAntenna: boolean;
+    hasUnreadChannel: boolean;
+    hasUnreadMentions: boolean;
+    hasUnreadMessagingMessage: boolean;
+    hasUnreadNotification: boolean;
+    hasUnreadSpecifiedNotes: boolean;
+    hideOnlineStatus: boolean;
+    injectFeaturedNote: boolean;
+    integrations: Record<string, any>;
+    isDeleted: boolean;
+    isExplorable: boolean;
+    mutedWords: string[][];
+    mutingNotificationTypes: string[];
+    noCrawle: boolean;
+    receiveAnnouncementEmail: boolean;
+    usePasswordLessLogin: boolean;
+    [other: string]: any;
+};
+
+// @public (undocumented)
+type MessagingMessage = {
+    id: ID;
+    createdAt: DateString;
+    file: DriveFile | null;
+    fileId: DriveFile['id'] | null;
+    isRead: boolean;
+    reads: User['id'][];
+    text: string | null;
+    user: User;
+    userId: User['id'];
+    recipient?: User | null;
+    recipientId: User['id'] | null;
+    group?: UserGroup | null;
+    groupId: UserGroup['id'] | null;
+};
+
+// @public (undocumented)
+export const mutedNoteReasons: readonly ["word", "manual", "spam", "other"];
+
+// @public (undocumented)
+type Note = {
+    id: ID;
+    createdAt: DateString;
+    text: string | null;
+    cw: string | null;
+    user: User;
+    userId: User['id'];
+    reply?: Note;
+    replyId: Note['id'];
+    renote?: Note;
+    renoteId: Note['id'];
+    files: DriveFile[];
+    fileIds: DriveFile['id'][];
+    visibility: 'public' | 'home' | 'followers' | 'specified';
+    visibleUserIds?: User['id'][];
+    localOnly?: boolean;
+    myReaction?: string;
+    reactions: Record<string, number>;
+    renoteCount: number;
+    repliesCount: number;
+    poll?: {
+        expiresAt: DateString | null;
+        multiple: boolean;
+        choices: {
+            isVoted: boolean;
+            text: string;
+            votes: number;
+        }[];
+    };
+    emojis: {
+        name: string;
+        url: string;
+    }[];
+    uri?: string;
+    url?: string;
+    isHidden?: boolean;
+};
+
+// @public (undocumented)
+type NoteFavorite = {
+    id: ID;
+    createdAt: DateString;
+    noteId: Note['id'];
+    note: Note;
+};
+
+// @public (undocumented)
+type NoteReaction = {
+    id: ID;
+    createdAt: DateString;
+    user: UserLite;
+    type: string;
+};
+
+// @public (undocumented)
+export const noteVisibilities: readonly ["public", "home", "followers", "specified"];
+
+// @public (undocumented)
+type Notification_2 = {
+    id: ID;
+    createdAt: DateString;
+    isRead: boolean;
+} & ({
+    type: 'reaction';
+    reaction: string;
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'reply';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'renote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'quote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'mention';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'pollVote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'follow';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'followRequestAccepted';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'receiveFollowRequest';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'groupInvited';
+    invitation: UserGroup;
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'app';
+    header?: string | null;
+    body: string;
+    icon?: string | null;
+});
+
+// @public (undocumented)
+export const notificationTypes: readonly ["follow", "mention", "reply", "renote", "quote", "reaction", "pollVote", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app"];
+
+// @public (undocumented)
+type OriginType = 'combined' | 'local' | 'remote';
+
+// @public (undocumented)
+type Page = {
+    id: ID;
+    createdAt: DateString;
+    updatedAt: DateString;
+    userId: User['id'];
+    user: User;
+    content: Record<string, any>[];
+    variables: Record<string, any>[];
+    title: string;
+    name: string;
+    summary: string | null;
+    hideTitleWhenPinned: boolean;
+    alignCenter: boolean;
+    font: string;
+    script: string;
+    eyeCatchingImageId: DriveFile['id'] | null;
+    eyeCatchingImage: DriveFile | null;
+    attachedFiles: any;
+    likedCount: number;
+    isLiked?: boolean;
+};
+
+// @public (undocumented)
+type PageEvent = {
+    pageId: Page['id'];
+    event: string;
+    var: any;
+    userId: User['id'];
+    user: User;
+};
+
+// @public (undocumented)
+export const permissions: string[];
+
+// @public (undocumented)
+type ServerInfo = {
+    machine: string;
+    cpu: {
+        model: string;
+        cores: number;
+    };
+    mem: {
+        total: number;
+    };
+    fs: {
+        total: number;
+        used: number;
+    };
+};
+
+// @public (undocumented)
+type Signin = {
+    id: ID;
+    createdAt: DateString;
+    ip: string;
+    headers: Record<string, any>;
+    success: boolean;
+};
+
+// @public (undocumented)
+type Stats = {
+    notesCount: number;
+    originalNotesCount: number;
+    usersCount: number;
+    originalUsersCount: number;
+    instances: number;
+    driveUsageLocal: number;
+    driveUsageRemote: number;
+};
+
+// Warning: (ae-forgotten-export) The symbol "StreamEvents" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export class Stream extends EventEmitter<StreamEvents> {
+    constructor(origin: string, user: {
+        token: string;
+    } | null, options?: {
+        WebSocket?: any;
+    });
+    // (undocumented)
+    close(): void;
+    // Warning: (ae-forgotten-export) The symbol "NonSharedConnection" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    disconnectToChannel(connection: NonSharedConnection): void;
+    // Warning: (ae-forgotten-export) The symbol "SharedConnection" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    removeSharedConnection(connection: SharedConnection): void;
+    // Warning: (ae-forgotten-export) The symbol "Pool" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    removeSharedConnectionPool(pool: Pool): void;
+    // (undocumented)
+    send(typeOrPayload: any, payload?: any): void;
+    // (undocumented)
+    state: 'initializing' | 'reconnecting' | 'connected';
+    // (undocumented)
+    useChannel<C extends keyof Channels>(channel: C, params?: Channels[C]['params'], name?: string): ChannelConnection<Channels[C]>;
+}
+
+// @public (undocumented)
+type User = UserLite | UserDetailed;
+
+// @public (undocumented)
+type UserDetailed = UserLite & {
+    bannerBlurhash: string | null;
+    bannerColor: string | null;
+    bannerUrl: string | null;
+    birthday: string | null;
+    createdAt: DateString;
+    description: string | null;
+    ffVisibility: 'public' | 'followers' | 'private';
+    fields: {
+        name: string;
+        value: string;
+    }[];
+    followersCount: number;
+    followingCount: number;
+    hasPendingFollowRequestFromYou: boolean;
+    hasPendingFollowRequestToYou: boolean;
+    isAdmin: boolean;
+    isBlocked: boolean;
+    isBlocking: boolean;
+    isBot: boolean;
+    isCat: boolean;
+    isFollowed: boolean;
+    isFollowing: boolean;
+    isLocked: boolean;
+    isModerator: boolean;
+    isMuted: boolean;
+    isSilenced: boolean;
+    isSuspended: boolean;
+    lang: string | null;
+    lastFetchedAt?: DateString;
+    location: string | null;
+    notesCount: number;
+    pinnedNoteIds: ID[];
+    pinnedNotes: Note[];
+    pinnedPage: Page | null;
+    pinnedPageId: string | null;
+    publicReactions: boolean;
+    securityKeys: boolean;
+    twoFactorEnabled: boolean;
+    updatedAt: DateString | null;
+    uri: string | null;
+    url: string | null;
+};
+
+// @public (undocumented)
+type UserGroup = TODO_2;
+
+// @public (undocumented)
+type UserList = {
+    id: ID;
+    createdAt: DateString;
+    name: string;
+    userIds: User['id'][];
+};
+
+// @public (undocumented)
+type UserLite = {
+    id: ID;
+    username: string;
+    host: string | null;
+    name: string;
+    onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
+    avatarUrl: string;
+    avatarBlurhash: string;
+    emojis: {
+        name: string;
+        url: string;
+    }[];
+    instance?: {
+        name: Instance['name'];
+        softwareName: Instance['softwareName'];
+        softwareVersion: Instance['softwareVersion'];
+        iconUrl: Instance['iconUrl'];
+        faviconUrl: Instance['faviconUrl'];
+        themeColor: Instance['themeColor'];
+    };
+};
+
+// @public (undocumented)
+type UserSorting = '+follower' | '-follower' | '+createdAt' | '-createdAt' | '+updatedAt' | '-updatedAt';
+
+// Warnings were encountered during analysis:
+//
+// src/api.types.ts:16:32 - (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
+// src/api.types.ts:18:25 - (ae-forgotten-export) The symbol "NoParams" needs to be exported by the entry point index.d.ts
+// src/api.types.ts:595:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts
+// src/streaming.types.ts:35:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/calckey-js/jest.config.ts b/packages/calckey-js/jest.config.ts
new file mode 100644
index 000000000..6d7eeddfe
--- /dev/null
+++ b/packages/calckey-js/jest.config.ts
@@ -0,0 +1,197 @@
+/*
+* For a detailed explanation regarding each configuration property and type check, visit:
+* https://jestjs.io/docs/en/configuration.html
+*/
+
+export default {
+	// All imported modules in your tests should be mocked automatically
+	// automock: false,
+
+	// Stop running tests after `n` failures
+	// bail: 0,
+
+	// The directory where Jest should store its cached dependency information
+	// cacheDirectory: "C:\\Users\\ai\\AppData\\Local\\Temp\\jest",
+
+	// Automatically clear mock calls and instances between every test
+	// clearMocks: false,
+
+	// Indicates whether the coverage information should be collected while executing the test
+	// collectCoverage: false,
+
+	// An array of glob patterns indicating a set of files for which coverage information should be collected
+	// collectCoverageFrom: undefined,
+
+	// The directory where Jest should output its coverage files
+	coverageDirectory: "coverage",
+
+	// An array of regexp pattern strings used to skip coverage collection
+	// coveragePathIgnorePatterns: [
+	//   "\\\\node_modules\\\\"
+	// ],
+
+	// Indicates which provider should be used to instrument code for coverage
+	coverageProvider: "v8",
+
+	// A list of reporter names that Jest uses when writing coverage reports
+	// coverageReporters: [
+	//   "json",
+	//   "text",
+	//   "lcov",
+	//   "clover"
+	// ],
+
+	// An object that configures minimum threshold enforcement for coverage results
+	// coverageThreshold: undefined,
+
+	// A path to a custom dependency extractor
+	// dependencyExtractor: undefined,
+
+	// Make calling deprecated APIs throw helpful error messages
+	// errorOnDeprecated: false,
+
+	// Force coverage collection from ignored files using an array of glob patterns
+	// forceCoverageMatch: [],
+
+	// A path to a module which exports an async function that is triggered once before all test suites
+	// globalSetup: undefined,
+
+	// A path to a module which exports an async function that is triggered once after all test suites
+	// globalTeardown: undefined,
+
+	// A set of global variables that need to be available in all test environments
+	// globals: {},
+
+	// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+	// maxWorkers: "50%",
+
+	// An array of directory names to be searched recursively up from the requiring module's location
+	// moduleDirectories: [
+	//   "node_modules"
+	// ],
+
+	// An array of file extensions your modules use
+	// moduleFileExtensions: [
+	//   "js",
+	//   "json",
+	//   "jsx",
+	//   "ts",
+	//   "tsx",
+	//   "node"
+	// ],
+
+	// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+	// moduleNameMapper: {},
+
+	// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+	// modulePathIgnorePatterns: [],
+
+	// Activates notifications for test results
+	// notify: false,
+
+	// An enum that specifies notification mode. Requires { notify: true }
+	// notifyMode: "failure-change",
+
+	// A preset that is used as a base for Jest's configuration
+	// preset: undefined,
+
+	// Run tests from one or more projects
+	// projects: undefined,
+
+	// Use this configuration option to add custom reporters to Jest
+	// reporters: undefined,
+
+	// Automatically reset mock state between every test
+	// resetMocks: false,
+
+	// Reset the module registry before running each individual test
+	// resetModules: false,
+
+	// A path to a custom resolver
+	// resolver: undefined,
+
+	// Automatically restore mock state between every test
+	// restoreMocks: false,
+
+	// The root directory that Jest should scan for tests and modules within
+	// rootDir: undefined,
+
+	// A list of paths to directories that Jest should use to search for files in
+	roots: [
+		"<rootDir>"
+	],
+
+	// Allows you to use a custom runner instead of Jest's default test runner
+	// runner: "jest-runner",
+
+	// The paths to modules that run some code to configure or set up the testing environment before each test
+	// setupFiles: [],
+
+	// A list of paths to modules that run some code to configure or set up the testing framework before each test
+	// setupFilesAfterEnv: [],
+
+	// The number of seconds after which a test is considered as slow and reported as such in the results.
+	// slowTestThreshold: 5,
+
+	// A list of paths to snapshot serializer modules Jest should use for snapshot testing
+	// snapshotSerializers: [],
+
+	// The test environment that will be used for testing
+	testEnvironment: "node",
+
+	// Options that will be passed to the testEnvironment
+	// testEnvironmentOptions: {},
+
+	// Adds a location field to test results
+	// testLocationInResults: false,
+
+	// The glob patterns Jest uses to detect test files
+	testMatch: [
+		"**/__tests__/**/*.[jt]s?(x)",
+		"**/?(*.)+(spec|test).[tj]s?(x)",
+		"<rootDir>/test/**/*"
+	],
+
+	// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+	// testPathIgnorePatterns: [
+	//   "\\\\node_modules\\\\"
+	// ],
+
+	// The regexp pattern or array of patterns that Jest uses to detect test files
+	// testRegex: [],
+
+	// This option allows the use of a custom results processor
+	// testResultsProcessor: undefined,
+
+	// This option allows use of a custom test runner
+	// testRunner: "jasmine2",
+
+	// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
+	// testURL: "http://localhost",
+
+	// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
+	// timers: "real",
+
+	// A map from regular expressions to paths to transformers
+	transform: {
+		"^.+\\.(ts|tsx)$": "ts-jest"
+	},
+
+	// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+	// transformIgnorePatterns: [
+	//   "\\\\node_modules\\\\",
+	//   "\\.pnp\\.[^\\\\]+$"
+	// ],
+
+	// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+	// unmockedModulePathPatterns: undefined,
+
+	// Indicates whether each individual test should be reported during the run
+	// verbose: undefined,
+
+	// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+	// watchPathIgnorePatterns: [],
+
+	// Whether to use watchman for file crawling
+	// watchman: true,
+};
diff --git a/packages/calckey-js/package-lock.json b/packages/calckey-js/package-lock.json
new file mode 100644
index 000000000..774fcd5fa
--- /dev/null
+++ b/packages/calckey-js/package-lock.json
@@ -0,0 +1,10662 @@
+{
+	"name": "calckey-js",
+	"version": "0.0.16",
+	"lockfileVersion": 2,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "calckey-js",
+			"version": "0.0.16",
+			"dependencies": {
+				"autobind-decorator": "^2.4.0",
+				"eventemitter3": "^4.0.7",
+				"reconnecting-websocket": "^4.4.0",
+				"semver": "^7.3.8"
+			},
+			"devDependencies": {
+				"@microsoft/api-extractor": "^7.19.3",
+				"@types/jest": "^27.4.0",
+				"@types/node": "17.0.5",
+				"@typescript-eslint/eslint-plugin": "5.8.1",
+				"@typescript-eslint/parser": "5.8.1",
+				"eslint": "8.6.0",
+				"jest": "^27.4.5",
+				"jest-fetch-mock": "^3.0.3",
+				"jest-websocket-mock": "^2.2.1",
+				"mock-socket": "^9.0.8",
+				"ts-jest": "^27.1.2",
+				"ts-node": "10.4.0",
+				"tsd": "^0.19.1",
+				"typescript": "4.5.4"
+			}
+		},
+		"node_modules/@babel/code-frame": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/highlight": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/compat-data": {
+			"version": "7.16.4",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
+			"integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/core": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz",
+			"integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.16.7",
+				"@babel/helper-compilation-targets": "^7.16.7",
+				"@babel/helper-module-transforms": "^7.16.7",
+				"@babel/helpers": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7",
+				"convert-source-map": "^1.7.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.1.2",
+				"semver": "^6.3.0",
+				"source-map": "^0.5.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/babel"
+			}
+		},
+		"node_modules/@babel/core/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/core/node_modules/source-map": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@babel/generator": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.7.tgz",
+			"integrity": "sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7",
+				"jsesc": "^2.5.1",
+				"source-map": "^0.5.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/generator/node_modules/source-map": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
+			"integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/compat-data": "^7.16.4",
+				"@babel/helper-validator-option": "^7.16.7",
+				"browserslist": "^4.17.5",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/helper-environment-visitor": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+			"integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-function-name": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
+			"integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-get-function-arity": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-get-function-arity": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
+			"integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-hoist-variables": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+			"integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-imports": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+			"integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-transforms": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
+			"integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-module-imports": "^7.16.7",
+				"@babel/helper-simple-access": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-plugin-utils": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+			"integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-simple-access": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
+			"integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-split-export-declaration": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+			"integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-identifier": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-option": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+			"integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helpers": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
+			"integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz",
+			"integrity": "sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"chalk": "^2.0.0",
+				"js-tokens": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^1.9.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "1.1.3"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"dev": true
+		},
+		"node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/parser": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.7.tgz",
+			"integrity": "sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==",
+			"dev": true,
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-async-generators": {
+			"version": "7.8.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-bigint": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-class-properties": {
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.12.13"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-import-meta": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-json-strings": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-numeric-separator": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-object-rest-spread": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-chaining": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-top-level-await": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-typescript": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz",
+			"integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/template": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+			"integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.7.tgz",
+			"integrity": "sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.16.7",
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-function-name": "^7.16.7",
+				"@babel/helper-hoist-variables": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/types": "^7.16.7",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/types": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.7.tgz",
+			"integrity": "sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"to-fast-properties": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@bcoe/v8-coverage": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+			"dev": true
+		},
+		"node_modules/@cspotcode/source-map-consumer": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
+			"integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 12"
+			}
+		},
+		"node_modules/@cspotcode/source-map-support": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
+			"integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
+			"dev": true,
+			"dependencies": {
+				"@cspotcode/source-map-consumer": "0.8.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@eslint/eslintrc": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
+			"integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^6.12.4",
+				"debug": "^4.3.2",
+				"espree": "^9.2.0",
+				"globals": "^13.9.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/@humanwhocodes/config-array": {
+			"version": "0.9.2",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz",
+			"integrity": "sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==",
+			"dev": true,
+			"dependencies": {
+				"@humanwhocodes/object-schema": "^1.2.1",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=10.10.0"
+			}
+		},
+		"node_modules/@humanwhocodes/object-schema": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+			"dev": true
+		},
+		"node_modules/@istanbuljs/load-nyc-config": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+			"dev": true,
+			"dependencies": {
+				"camelcase": "^5.3.1",
+				"find-up": "^4.1.0",
+				"get-package-type": "^0.1.0",
+				"js-yaml": "^3.13.1",
+				"resolve-from": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/schema": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/console": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz",
+			"integrity": "sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"jest-message-util": "^27.4.2",
+				"jest-util": "^27.4.2",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/core": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.5.tgz",
+			"integrity": "sha512-3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^27.4.2",
+				"@jest/reporters": "^27.4.5",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"emittery": "^0.8.1",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"jest-changed-files": "^27.4.2",
+				"jest-config": "^27.4.5",
+				"jest-haste-map": "^27.4.5",
+				"jest-message-util": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-resolve-dependencies": "^27.4.5",
+				"jest-runner": "^27.4.5",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"jest-watcher": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"rimraf": "^3.0.0",
+				"slash": "^3.0.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@jest/environment": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.4.tgz",
+			"integrity": "sha512-q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz",
+			"integrity": "sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"@sinonjs/fake-timers": "^8.0.1",
+				"@types/node": "*",
+				"jest-message-util": "^27.4.2",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/globals": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.4.tgz",
+			"integrity": "sha512-bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^27.4.4",
+				"@jest/types": "^27.4.2",
+				"expect": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/reporters": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.5.tgz",
+			"integrity": "sha512-3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA==",
+			"dev": true,
+			"dependencies": {
+				"@bcoe/v8-coverage": "^0.2.3",
+				"@jest/console": "^27.4.2",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.2",
+				"graceful-fs": "^4.2.4",
+				"istanbul-lib-coverage": "^3.0.0",
+				"istanbul-lib-instrument": "^4.0.3",
+				"istanbul-lib-report": "^3.0.0",
+				"istanbul-lib-source-maps": "^4.0.0",
+				"istanbul-reports": "^3.0.2",
+				"jest-haste-map": "^27.4.5",
+				"jest-resolve": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"slash": "^3.0.0",
+				"source-map": "^0.6.0",
+				"string-length": "^4.0.1",
+				"terminal-link": "^2.0.0",
+				"v8-to-istanbul": "^8.1.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@jest/source-map": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz",
+			"integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==",
+			"dev": true,
+			"dependencies": {
+				"callsites": "^3.0.0",
+				"graceful-fs": "^4.2.4",
+				"source-map": "^0.6.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/test-result": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz",
+			"integrity": "sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"collect-v8-coverage": "^1.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/test-sequencer": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.5.tgz",
+			"integrity": "sha512-n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/test-result": "^27.4.2",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-runtime": "^27.4.5"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/transform": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.5.tgz",
+			"integrity": "sha512-PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.1.0",
+				"@jest/types": "^27.4.2",
+				"babel-plugin-istanbul": "^6.0.0",
+				"chalk": "^4.0.0",
+				"convert-source-map": "^1.4.0",
+				"fast-json-stable-stringify": "^2.0.0",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-regex-util": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"pirates": "^4.0.1",
+				"slash": "^3.0.0",
+				"source-map": "^0.6.1",
+				"write-file-atomic": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/types": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
+			"integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^16.0.0",
+				"chalk": "^4.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@microsoft/api-extractor": {
+			"version": "7.19.3",
+			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.19.3.tgz",
+			"integrity": "sha512-GZe+R3K4kh2X425iOHkPbByysB7FN0592mPPA6vNj5IhyhlPHgdZS6m6AmOZOIxMS4euM+SBKzEJEp3oC+WsOQ==",
+			"dev": true,
+			"dependencies": {
+				"@microsoft/api-extractor-model": "7.15.2",
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "~0.15.2",
+				"@rushstack/node-core-library": "3.44.3",
+				"@rushstack/rig-package": "0.3.7",
+				"@rushstack/ts-command-line": "4.10.6",
+				"colors": "~1.2.1",
+				"lodash": "~4.17.15",
+				"resolve": "~1.17.0",
+				"semver": "~7.3.0",
+				"source-map": "~0.6.1",
+				"typescript": "~4.5.2"
+			},
+			"bin": {
+				"api-extractor": "bin/api-extractor"
+			}
+		},
+		"node_modules/@microsoft/api-extractor-model": {
+			"version": "7.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.15.2.tgz",
+			"integrity": "sha512-qgxKX/s6vo3nCVLhP0Ds7555QrErhcYHEok5/KyEZ7iR8J5M5oldD1eJJQmtEdVF5IzmnPPbxx1nRvfgA674LQ==",
+			"dev": true,
+			"dependencies": {
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "~0.15.2",
+				"@rushstack/node-core-library": "3.44.3"
+			}
+		},
+		"node_modules/@microsoft/api-extractor/node_modules/resolve": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+			"dev": true,
+			"dependencies": {
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/@microsoft/tsdoc": {
+			"version": "0.13.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
+			"integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
+			"dev": true
+		},
+		"node_modules/@microsoft/tsdoc-config": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
+			"integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
+			"dev": true,
+			"dependencies": {
+				"@microsoft/tsdoc": "0.13.2",
+				"ajv": "~6.12.6",
+				"jju": "~1.4.0",
+				"resolve": "~1.19.0"
+			}
+		},
+		"node_modules/@microsoft/tsdoc-config/node_modules/resolve": {
+			"version": "1.19.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+			"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+			"dev": true,
+			"dependencies": {
+				"is-core-module": "^2.1.0",
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/@nodelib/fs.scandir": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
+			"integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "2.0.4",
+				"run-parallel": "^1.1.9"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.stat": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
+			"integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.walk": {
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
+			"integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.scandir": "2.1.4",
+				"fastq": "^1.6.0"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@rushstack/node-core-library": {
+			"version": "3.44.3",
+			"resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.44.3.tgz",
+			"integrity": "sha512-Bt+R5LAnVr2BImTJqPpton5rvhJ2Wq8x4BaTqaCHQMmfxqtz5lb4nLYT9kneMJTCDuRMBvvLpSuz4MBj50PV3w==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "12.20.24",
+				"colors": "~1.2.1",
+				"fs-extra": "~7.0.1",
+				"import-lazy": "~4.0.0",
+				"jju": "~1.4.0",
+				"resolve": "~1.17.0",
+				"semver": "~7.3.0",
+				"timsort": "~0.3.0",
+				"z-schema": "~5.0.2"
+			}
+		},
+		"node_modules/@rushstack/node-core-library/node_modules/@types/node": {
+			"version": "12.20.24",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz",
+			"integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==",
+			"dev": true
+		},
+		"node_modules/@rushstack/node-core-library/node_modules/resolve": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+			"dev": true,
+			"dependencies": {
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/@rushstack/rig-package": {
+			"version": "0.3.7",
+			"resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.7.tgz",
+			"integrity": "sha512-pzMsTSeTC8IiZ6EJLr53gGMvhT4oLWH+hxD7907cHyWuIUlEXFtu/2pK25vUQT13nKp5DJCWxXyYoGRk/h6rtA==",
+			"dev": true,
+			"dependencies": {
+				"resolve": "~1.17.0",
+				"strip-json-comments": "~3.1.1"
+			}
+		},
+		"node_modules/@rushstack/rig-package/node_modules/resolve": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+			"dev": true,
+			"dependencies": {
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/@rushstack/ts-command-line": {
+			"version": "4.10.6",
+			"resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.10.6.tgz",
+			"integrity": "sha512-Y3GkUag39sTIlukDg9mUp8MCHrrlJ27POrBNRQGc/uF+VVgX8M7zMzHch5zP6O1QVquWgD7Engdpn2piPYaS/g==",
+			"dev": true,
+			"dependencies": {
+				"@types/argparse": "1.0.38",
+				"argparse": "~1.0.9",
+				"colors": "~1.2.1",
+				"string-argv": "~0.3.1"
+			}
+		},
+		"node_modules/@sinonjs/commons": {
+			"version": "1.8.3",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+			"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+			"dev": true,
+			"dependencies": {
+				"type-detect": "4.0.8"
+			}
+		},
+		"node_modules/@sinonjs/fake-timers": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+			"integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+			"dev": true,
+			"dependencies": {
+				"@sinonjs/commons": "^1.7.0"
+			}
+		},
+		"node_modules/@tootallnate/once": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/@tsconfig/node10": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
+			"integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
+			"dev": true
+		},
+		"node_modules/@tsconfig/node12": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
+			"integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
+			"dev": true
+		},
+		"node_modules/@tsconfig/node14": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
+			"integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
+			"dev": true
+		},
+		"node_modules/@tsconfig/node16": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
+			"integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
+			"dev": true
+		},
+		"node_modules/@tsd/typescript": {
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/@tsd/typescript/-/typescript-4.5.4.tgz",
+			"integrity": "sha512-iDlLkdg3sCjUSNdoUCsYM/SXheHrdxHsR6msIkbFDW4pV6gHTMwg/8te/paLtywDjGL4S4ByDdUKA3RbfdBX0g==",
+			"dev": true,
+			"bin": {
+				"tsc": "typescript/bin/tsc",
+				"tsserver": "typescript/bin/tsserver"
+			}
+		},
+		"node_modules/@types/argparse": {
+			"version": "1.0.38",
+			"resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz",
+			"integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==",
+			"dev": true
+		},
+		"node_modules/@types/babel__core": {
+			"version": "7.1.18",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz",
+			"integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0",
+				"@types/babel__generator": "*",
+				"@types/babel__template": "*",
+				"@types/babel__traverse": "*"
+			}
+		},
+		"node_modules/@types/babel__generator": {
+			"version": "7.6.4",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+			"integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"node_modules/@types/babel__template": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+			"integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+			"dev": true,
+			"dependencies": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"node_modules/@types/babel__traverse": {
+			"version": "7.14.2",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
+			"integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.3.0"
+			}
+		},
+		"node_modules/@types/eslint": {
+			"version": "7.29.0",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
+			"integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
+			"dev": true,
+			"dependencies": {
+				"@types/estree": "*",
+				"@types/json-schema": "*"
+			}
+		},
+		"node_modules/@types/estree": {
+			"version": "0.0.50",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
+			"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+			"dev": true
+		},
+		"node_modules/@types/graceful-fs": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+			"integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/istanbul-lib-coverage": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+			"integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+			"dev": true
+		},
+		"node_modules/@types/istanbul-lib-report": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-coverage": "*"
+			}
+		},
+		"node_modules/@types/istanbul-reports": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+			"integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-report": "*"
+			}
+		},
+		"node_modules/@types/jest": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz",
+			"integrity": "sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==",
+			"dev": true,
+			"dependencies": {
+				"jest-diff": "^27.0.0",
+				"pretty-format": "^27.0.0"
+			}
+		},
+		"node_modules/@types/json-schema": {
+			"version": "7.0.9",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+			"dev": true
+		},
+		"node_modules/@types/minimist": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
+			"integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+			"dev": true
+		},
+		"node_modules/@types/node": {
+			"version": "17.0.5",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.5.tgz",
+			"integrity": "sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw==",
+			"dev": true
+		},
+		"node_modules/@types/normalize-package-data": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+			"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+			"dev": true
+		},
+		"node_modules/@types/prettier": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
+			"integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
+			"dev": true
+		},
+		"node_modules/@types/stack-utils": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+			"integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+			"dev": true
+		},
+		"node_modules/@types/yargs": {
+			"version": "16.0.4",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+			"integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+			"dev": true,
+			"dependencies": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"node_modules/@types/yargs-parser": {
+			"version": "20.2.1",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
+			"integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
+			"dev": true
+		},
+		"node_modules/@typescript-eslint/eslint-plugin": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.1.tgz",
+			"integrity": "sha512-wTZ5oEKrKj/8/366qTM366zqhIKAp6NCMweoRONtfuC07OAU9nVI2GZZdqQ1qD30WAAtcPdkH+npDwtRFdp4Rw==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/experimental-utils": "5.8.1",
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"debug": "^4.3.2",
+				"functional-red-black-tree": "^1.0.1",
+				"ignore": "^5.1.8",
+				"regexpp": "^3.2.0",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"@typescript-eslint/parser": "^5.0.0",
+				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/experimental-utils": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.1.tgz",
+			"integrity": "sha512-fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/typescript-estree": "5.8.1",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^3.0.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/@typescript-eslint/parser": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.8.1.tgz",
+			"integrity": "sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/typescript-estree": "5.8.1",
+				"debug": "^4.3.2"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/scope-manager": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.8.1.tgz",
+			"integrity": "sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/visitor-keys": "5.8.1"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/types": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.1.tgz",
+			"integrity": "sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz",
+			"integrity": "sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/visitor-keys": "5.8.1",
+				"debug": "^4.3.2",
+				"globby": "^11.0.4",
+				"is-glob": "^4.0.3",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/visitor-keys": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.1.tgz",
+			"integrity": "sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.8.1",
+				"eslint-visitor-keys": "^3.0.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/abab": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+			"integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+			"dev": true
+		},
+		"node_modules/acorn": {
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-globals": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+			"integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^7.1.1",
+				"acorn-walk": "^7.1.1"
+			}
+		},
+		"node_modules/acorn-globals/node_modules/acorn": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"peerDependencies": {
+				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/acorn-walk": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/agent-base": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+			"dev": true,
+			"dependencies": {
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6.0.0"
+			}
+		},
+		"node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/ansi-escapes": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.21.3"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ansi-escapes/node_modules/type-fest": {
+			"version": "0.21.3",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/anymatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+			"dev": true,
+			"dependencies": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/arg": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+			"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+			"dev": true
+		},
+		"node_modules/argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"dependencies": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"node_modules/array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/arrify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+			"dev": true
+		},
+		"node_modules/autobind-decorator": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/autobind-decorator/-/autobind-decorator-2.4.0.tgz",
+			"integrity": "sha512-OGYhWUO72V6DafbF8PM8rm3EPbfuyMZcJhtm5/n26IDwO18pohE4eNazLoCGhPiXOCD0gEGmrbU3849QvM8bbw==",
+			"engines": {
+				"node": ">=8.10",
+				"npm": ">=6.4.1"
+			}
+		},
+		"node_modules/babel-jest": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.5.tgz",
+			"integrity": "sha512-3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.0.0",
+				"babel-preset-jest": "^27.4.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.8.0"
+			}
+		},
+		"node_modules/babel-plugin-istanbul": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-instrument": "^5.0.4",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
+			"integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.12.3",
+				"@babel/parser": "^7.14.7",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-coverage": "^3.2.0",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-plugin-istanbul/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/babel-plugin-jest-hoist": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz",
+			"integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.0.0",
+				"@types/babel__traverse": "^7.0.6"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/babel-preset-current-node-syntax": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-bigint": "^7.8.3",
+				"@babel/plugin-syntax-class-properties": "^7.8.3",
+				"@babel/plugin-syntax-import-meta": "^7.8.3",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-top-level-await": "^7.8.3"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/babel-preset-jest": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz",
+			"integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==",
+			"dev": true,
+			"dependencies": {
+				"babel-plugin-jest-hoist": "^27.4.0",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true
+		},
+		"node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/browser-process-hrtime": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+			"dev": true
+		},
+		"node_modules/browserslist": {
+			"version": "4.19.1",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+			"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+			"dev": true,
+			"dependencies": {
+				"caniuse-lite": "^1.0.30001286",
+				"electron-to-chromium": "^1.4.17",
+				"escalade": "^3.1.1",
+				"node-releases": "^2.0.1",
+				"picocolors": "^1.0.0"
+			},
+			"bin": {
+				"browserslist": "cli.js"
+			},
+			"engines": {
+				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/browserslist"
+			}
+		},
+		"node_modules/bs-logger": {
+			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+			"dev": true,
+			"dependencies": {
+				"fast-json-stable-stringify": "2.x"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/bser": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+			"dev": true,
+			"dependencies": {
+				"node-int64": "^0.4.0"
+			}
+		},
+		"node_modules/buffer-from": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+			"dev": true
+		},
+		"node_modules/callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/camelcase": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/camelcase-keys": {
+			"version": "6.2.2",
+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+			"dev": true,
+			"dependencies": {
+				"camelcase": "^5.3.1",
+				"map-obj": "^4.0.0",
+				"quick-lru": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/caniuse-lite": {
+			"version": "1.0.30001294",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz",
+			"integrity": "sha512-LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g==",
+			"dev": true,
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/browserslist"
+			}
+		},
+		"node_modules/chalk": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+			"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/char-regex": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/ci-info": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
+			"integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+			"dev": true
+		},
+		"node_modules/cjs-module-lexer": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
+			"integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+			"dev": true
+		},
+		"node_modules/cliui": {
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+			"dev": true,
+			"dependencies": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^7.0.0"
+			}
+		},
+		"node_modules/co": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+			"dev": true,
+			"engines": {
+				"iojs": ">= 1.0.0",
+				"node": ">= 0.12.0"
+			}
+		},
+		"node_modules/collect-v8-coverage": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+			"dev": true
+		},
+		"node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/colors": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
+			"integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.1.90"
+			}
+		},
+		"node_modules/combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dev": true,
+			"dependencies": {
+				"delayed-stream": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"node_modules/convert-source-map": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+			"dev": true,
+			"dependencies": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
+		"node_modules/create-require": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+			"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+			"dev": true
+		},
+		"node_modules/cross-fetch": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
+			"integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
+			"dev": true,
+			"dependencies": {
+				"node-fetch": "2.6.1"
+			}
+		},
+		"node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/cssom": {
+			"version": "0.4.4",
+			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+			"integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+			"dev": true
+		},
+		"node_modules/cssstyle": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+			"integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+			"dev": true,
+			"dependencies": {
+				"cssom": "~0.3.6"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cssstyle/node_modules/cssom": {
+			"version": "0.3.8",
+			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+			"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+			"dev": true
+		},
+		"node_modules/data-urls": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+			"integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+			"dev": true,
+			"dependencies": {
+				"abab": "^2.0.3",
+				"whatwg-mimetype": "^2.3.0",
+				"whatwg-url": "^8.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/debug": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.1.2"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/decamelize": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decamelize-keys": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+			"integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+			"dev": true,
+			"dependencies": {
+				"decamelize": "^1.1.0",
+				"map-obj": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decamelize-keys/node_modules/map-obj": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decimal.js": {
+			"version": "10.3.1",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+			"integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+			"dev": true
+		},
+		"node_modules/dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+			"dev": true
+		},
+		"node_modules/deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
+		"node_modules/deepmerge": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/detect-newline": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/diff": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.3.1"
+			}
+		},
+		"node_modules/diff-sequences": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz",
+			"integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==",
+			"dev": true,
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"dev": true,
+			"dependencies": {
+				"path-type": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"dependencies": {
+				"esutils": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/domexception": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+			"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+			"dev": true,
+			"dependencies": {
+				"webidl-conversions": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/domexception/node_modules/webidl-conversions": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+			"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/electron-to-chromium": {
+			"version": "1.4.31",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.31.tgz",
+			"integrity": "sha512-t3XVQtk+Frkv6aTD4RRk0OqosU+VLe1dQFW83MDer78ZD6a52frgXuYOIsLYTQiH2Lm+JB2OKYcn7zrX+YGAiQ==",
+			"dev": true
+		},
+		"node_modules/emittery": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+			"integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/emittery?sponsor=1"
+			}
+		},
+		"node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"node_modules/enquirer": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+			"dev": true,
+			"dependencies": {
+				"ansi-colors": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/error-ex": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"dev": true,
+			"dependencies": {
+				"is-arrayish": "^0.2.1"
+			}
+		},
+		"node_modules/escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/escodegen": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+			"integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+			"dev": true,
+			"dependencies": {
+				"esprima": "^4.0.1",
+				"estraverse": "^5.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1"
+			},
+			"bin": {
+				"escodegen": "bin/escodegen.js",
+				"esgenerate": "bin/esgenerate.js"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"optionalDependencies": {
+				"source-map": "~0.6.1"
+			}
+		},
+		"node_modules/escodegen/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/levn": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+			"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/optionator": {
+			"version": "0.8.3",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+			"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+			"dev": true,
+			"dependencies": {
+				"deep-is": "~0.1.3",
+				"fast-levenshtein": "~2.0.6",
+				"levn": "~0.3.0",
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2",
+				"word-wrap": "~1.2.3"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/prelude-ls": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+			"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/type-check": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "~1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/eslint": {
+			"version": "8.6.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.6.0.tgz",
+			"integrity": "sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==",
+			"dev": true,
+			"dependencies": {
+				"@eslint/eslintrc": "^1.0.5",
+				"@humanwhocodes/config-array": "^0.9.2",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.3.2",
+				"doctrine": "^3.0.0",
+				"enquirer": "^2.3.5",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^7.1.0",
+				"eslint-utils": "^3.0.0",
+				"eslint-visitor-keys": "^3.1.0",
+				"espree": "^9.3.0",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^6.0.1",
+				"globals": "^13.6.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^4.1.0",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"progress": "^2.0.0",
+				"regexpp": "^3.2.0",
+				"semver": "^7.2.1",
+				"strip-ansi": "^6.0.1",
+				"strip-json-comments": "^3.1.0",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"bin": {
+				"eslint": "bin/eslint.js"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint-formatter-pretty": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz",
+			"integrity": "sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/eslint": "^7.2.13",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.1.0",
+				"eslint-rule-docs": "^1.1.5",
+				"log-symbols": "^4.0.0",
+				"plur": "^4.0.0",
+				"string-width": "^4.2.0",
+				"supports-hyperlinks": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint-rule-docs": {
+			"version": "1.1.231",
+			"resolved": "https://registry.npmjs.org/eslint-rule-docs/-/eslint-rule-docs-1.1.231.tgz",
+			"integrity": "sha512-egHz9A1WG7b8CS0x1P6P/Rj5FqZOjray/VjpJa14tMZalfRKvpE2ONJ3plCM7+PcinmU4tcmbPLv0VtwzSdLVA==",
+			"dev": true
+		},
+		"node_modules/eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=5"
+			}
+		},
+		"node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/eslint-visitor-keys": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
+			"integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint/node_modules/eslint-scope": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
+			"integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/eslint/node_modules/glob-parent": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.3"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/eslint/node_modules/ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/espree": {
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
+			"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.7.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^3.1.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true,
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/esquery": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/esquery/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/eventemitter3": {
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+		},
+		"node_modules/execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+			"dev": true,
+			"dependencies": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
+			}
+		},
+		"node_modules/exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/expect": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz",
+			"integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"ansi-styles": "^5.0.0",
+				"jest-get-type": "^27.4.0",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-regex-util": "^27.4.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/expect/node_modules/ansi-styles": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
+		},
+		"node_modules/fast-glob": {
+			"version": "3.2.5",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
+			"integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.0",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.2",
+				"picomatch": "^2.2.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"node_modules/fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"node_modules/fastq": {
+			"version": "1.11.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
+			"integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+			"dev": true,
+			"dependencies": {
+				"reusify": "^1.0.4"
+			}
+		},
+		"node_modules/fb-watchman": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+			"integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+			"dev": true,
+			"dependencies": {
+				"bser": "2.1.1"
+			}
+		},
+		"node_modules/file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"dependencies": {
+				"flat-cache": "^3.0.4"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"dev": true,
+			"dependencies": {
+				"flatted": "^3.1.0",
+				"rimraf": "^3.0.2"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/flatted": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
+			"integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==",
+			"dev": true
+		},
+		"node_modules/form-data": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+			"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+			"dev": true,
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/fs-extra": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.1.2",
+				"jsonfile": "^4.0.0",
+				"universalify": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=6 <7 || >=8"
+			}
+		},
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"dev": true
+		},
+		"node_modules/fsevents": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+			"dev": true,
+			"hasInstallScript": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
+		"node_modules/function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+			"dev": true
+		},
+		"node_modules/functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
+		"node_modules/gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true,
+			"engines": {
+				"node": "6.* || 8.* || >= 10.*"
+			}
+		},
+		"node_modules/get-package-type": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/glob": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+			"dev": true,
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/globals": {
+			"version": "13.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+			"integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/globby": {
+			"version": "11.0.4",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+			"integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+			"dev": true,
+			"dependencies": {
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.1.1",
+				"ignore": "^5.1.4",
+				"merge2": "^1.3.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/graceful-fs": {
+			"version": "4.2.6",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+			"integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+			"dev": true
+		},
+		"node_modules/hard-rejection": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4.0"
+			}
+		},
+		"node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/hosted-git-info": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/html-encoding-sniffer": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+			"integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+			"dev": true,
+			"dependencies": {
+				"whatwg-encoding": "^1.0.5"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/html-escaper": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+			"dev": true
+		},
+		"node_modules/http-proxy-agent": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+			"dev": true,
+			"dependencies": {
+				"@tootallnate/once": "1",
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/https-proxy-agent": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+			"dev": true,
+			"dependencies": {
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.17.0"
+			}
+		},
+		"node_modules/iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"dev": true,
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ignore": {
+			"version": "5.1.8",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
+			"dependencies": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/import-lazy": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/import-local": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
+			"integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
+			"dev": true,
+			"dependencies": {
+				"pkg-dir": "^4.2.0",
+				"resolve-cwd": "^3.0.0"
+			},
+			"bin": {
+				"import-local-fixture": "fixtures/cli.js"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.19"
+			}
+		},
+		"node_modules/indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"dev": true,
+			"dependencies": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"node_modules/irregular-plurals": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz",
+			"integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+			"dev": true
+		},
+		"node_modules/is-core-module": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
+			"integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+			"dev": true,
+			"dependencies": {
+				"has": "^1.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-generator-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+			"dev": true,
+			"dependencies": {
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/is-plain-obj": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-potential-custom-element-name": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+			"dev": true
+		},
+		"node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+			"dev": true
+		},
+		"node_modules/is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"node_modules/istanbul-lib-coverage": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/istanbul-lib-instrument": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+			"integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.7.5",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-coverage": "^3.0.0",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/istanbul-lib-instrument/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/istanbul-lib-report": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+			"dev": true,
+			"dependencies": {
+				"istanbul-lib-coverage": "^3.0.0",
+				"make-dir": "^3.0.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/istanbul-lib-source-maps": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+			"dev": true,
+			"dependencies": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^3.0.0",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-reports": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz",
+			"integrity": "sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==",
+			"dev": true,
+			"dependencies": {
+				"html-escaper": "^2.0.0",
+				"istanbul-lib-report": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest/-/jest-27.4.5.tgz",
+			"integrity": "sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/core": "^27.4.5",
+				"import-local": "^3.0.2",
+				"jest-cli": "^27.4.5"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-changed-files": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz",
+			"integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"execa": "^5.0.0",
+				"throat": "^6.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-circus": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.5.tgz",
+			"integrity": "sha512-eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^27.4.4",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"dedent": "^0.7.0",
+				"expect": "^27.4.2",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^27.4.2",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3",
+				"throat": "^6.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-cli": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.5.tgz",
+			"integrity": "sha512-hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/core": "^27.4.5",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"import-local": "^3.0.2",
+				"jest-config": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"prompts": "^2.0.1",
+				"yargs": "^16.2.0"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-config": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.5.tgz",
+			"integrity": "sha512-t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.1.0",
+				"@jest/test-sequencer": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"babel-jest": "^27.4.5",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"deepmerge": "^4.2.2",
+				"glob": "^7.1.1",
+				"graceful-fs": "^4.2.4",
+				"jest-circus": "^27.4.5",
+				"jest-environment-jsdom": "^27.4.4",
+				"jest-environment-node": "^27.4.4",
+				"jest-get-type": "^27.4.0",
+				"jest-jasmine2": "^27.4.5",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-runner": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"ts-node": ">=9.0.0"
+			},
+			"peerDependenciesMeta": {
+				"ts-node": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-diff": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz",
+			"integrity": "sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^27.4.0",
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-docblock": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz",
+			"integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==",
+			"dev": true,
+			"dependencies": {
+				"detect-newline": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-each": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz",
+			"integrity": "sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-environment-jsdom": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz",
+			"integrity": "sha512-cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^27.4.4",
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2",
+				"jsdom": "^16.6.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-environment-node": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.4.tgz",
+			"integrity": "sha512-D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^27.4.4",
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-fetch-mock": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz",
+			"integrity": "sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==",
+			"dev": true,
+			"dependencies": {
+				"cross-fetch": "^3.0.4",
+				"promise-polyfill": "^8.1.3"
+			}
+		},
+		"node_modules/jest-get-type": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
+			"integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==",
+			"dev": true,
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-haste-map": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.5.tgz",
+			"integrity": "sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"@types/graceful-fs": "^4.1.2",
+				"@types/node": "*",
+				"anymatch": "^3.0.3",
+				"fb-watchman": "^2.0.0",
+				"graceful-fs": "^4.2.4",
+				"jest-regex-util": "^27.4.0",
+				"jest-serializer": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"micromatch": "^4.0.4",
+				"walker": "^1.0.7"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.2"
+			}
+		},
+		"node_modules/jest-jasmine2": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.5.tgz",
+			"integrity": "sha512-oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/traverse": "^7.1.0",
+				"@jest/environment": "^27.4.4",
+				"@jest/source-map": "^27.4.0",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"expect": "^27.4.2",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^27.4.2",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2",
+				"throat": "^6.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-leak-detector": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz",
+			"integrity": "sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==",
+			"dev": true,
+			"dependencies": {
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-matcher-utils": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz",
+			"integrity": "sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^27.4.2",
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-message-util": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz",
+			"integrity": "sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.4.2",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-mock": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz",
+			"integrity": "sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-pnp-resolver": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			},
+			"peerDependencies": {
+				"jest-resolve": "*"
+			},
+			"peerDependenciesMeta": {
+				"jest-resolve": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-regex-util": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
+			"integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==",
+			"dev": true,
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-resolve": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.5.tgz",
+			"integrity": "sha512-xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-pnp-resolver": "^1.2.2",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"resolve": "^1.20.0",
+				"resolve.exports": "^1.1.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-resolve-dependencies": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.5.tgz",
+			"integrity": "sha512-elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-snapshot": "^27.4.5"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-runner": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.5.tgz",
+			"integrity": "sha512-/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^27.4.2",
+				"@jest/environment": "^27.4.4",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"emittery": "^0.8.1",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"jest-docblock": "^27.4.0",
+				"jest-environment-jsdom": "^27.4.4",
+				"jest-environment-node": "^27.4.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-leak-detector": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-resolve": "^27.4.5",
+				"jest-runtime": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"source-map-support": "^0.5.6",
+				"throat": "^6.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-runtime": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.5.tgz",
+			"integrity": "sha512-CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^27.4.2",
+				"@jest/environment": "^27.4.4",
+				"@jest/globals": "^27.4.4",
+				"@jest/source-map": "^27.4.0",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/yargs": "^16.0.0",
+				"chalk": "^4.0.0",
+				"cjs-module-lexer": "^1.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"execa": "^5.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-message-util": "^27.4.2",
+				"jest-mock": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"slash": "^3.0.0",
+				"strip-bom": "^4.0.0",
+				"yargs": "^16.2.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-serializer": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
+			"integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"graceful-fs": "^4.2.4"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-snapshot": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.5.tgz",
+			"integrity": "sha512-eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.7.2",
+				"@babel/generator": "^7.7.2",
+				"@babel/parser": "^7.7.2",
+				"@babel/plugin-syntax-typescript": "^7.7.2",
+				"@babel/traverse": "^7.7.2",
+				"@babel/types": "^7.0.0",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/babel__traverse": "^7.0.4",
+				"@types/prettier": "^2.1.5",
+				"babel-preset-current-node-syntax": "^1.0.0",
+				"chalk": "^4.0.0",
+				"expect": "^27.4.2",
+				"graceful-fs": "^4.2.4",
+				"jest-diff": "^27.4.2",
+				"jest-get-type": "^27.4.0",
+				"jest-haste-map": "^27.4.5",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-resolve": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"natural-compare": "^1.4.0",
+				"pretty-format": "^27.4.2",
+				"semver": "^7.3.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-util": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
+			"integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"graceful-fs": "^4.2.4",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-validate": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz",
+			"integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"camelcase": "^6.2.0",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^27.4.0",
+				"leven": "^3.1.0",
+				"pretty-format": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-validate/node_modules/camelcase": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
+			"integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/jest-watcher": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz",
+			"integrity": "sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"jest-util": "^27.4.2",
+				"string-length": "^4.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-websocket-mock": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/jest-websocket-mock/-/jest-websocket-mock-2.2.1.tgz",
+			"integrity": "sha512-fhsGLXrPfs06PhHoxqOSA9yZ6Rb4qYrf4Wcm7/nfRzjlrf1gIeuhYUkzMRjjE0TMQ37SwkmeLanwrZY4ZaNp8g==",
+			"dev": true,
+			"dependencies": {
+				"jest-diff": "^27.0.2"
+			},
+			"peerDependencies": {
+				"mock-socket": "^8||^9"
+			}
+		},
+		"node_modules/jest-worker": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz",
+			"integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			}
+		},
+		"node_modules/jest-worker/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/jju": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+			"integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
+			"dev": true
+		},
+		"node_modules/js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
+		"node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/js-yaml/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/jsdom": {
+			"version": "16.7.0",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+			"integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+			"dev": true,
+			"dependencies": {
+				"abab": "^2.0.5",
+				"acorn": "^8.2.4",
+				"acorn-globals": "^6.0.0",
+				"cssom": "^0.4.4",
+				"cssstyle": "^2.3.0",
+				"data-urls": "^2.0.0",
+				"decimal.js": "^10.2.1",
+				"domexception": "^2.0.1",
+				"escodegen": "^2.0.0",
+				"form-data": "^3.0.0",
+				"html-encoding-sniffer": "^2.0.1",
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"is-potential-custom-element-name": "^1.0.1",
+				"nwsapi": "^2.2.0",
+				"parse5": "6.0.1",
+				"saxes": "^5.0.1",
+				"symbol-tree": "^3.2.4",
+				"tough-cookie": "^4.0.0",
+				"w3c-hr-time": "^1.0.2",
+				"w3c-xmlserializer": "^2.0.0",
+				"webidl-conversions": "^6.1.0",
+				"whatwg-encoding": "^1.0.5",
+				"whatwg-mimetype": "^2.3.0",
+				"whatwg-url": "^8.5.0",
+				"ws": "^7.4.6",
+				"xml-name-validator": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"peerDependencies": {
+				"canvas": "^2.5.0"
+			},
+			"peerDependenciesMeta": {
+				"canvas": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jsesc": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"dev": true,
+			"bin": {
+				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+			"dev": true
+		},
+		"node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"node_modules/json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+			"dev": true
+		},
+		"node_modules/json5": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+			"dev": true,
+			"dependencies": {
+				"minimist": "^1.2.5"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/jsonfile": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+			"dev": true,
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/kleur": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/lines-and-columns": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+			"dev": true
+		},
+		"node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/lodash": {
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+			"dev": true
+		},
+		"node_modules/lodash.get": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+			"dev": true
+		},
+		"node_modules/lodash.isequal": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+			"dev": true
+		},
+		"node_modules/lodash.memoize": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+			"dev": true
+		},
+		"node_modules/lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true
+		},
+		"node_modules/log-symbols": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.1.0",
+				"is-unicode-supported": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/make-dir": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+			"dev": true,
+			"dependencies": {
+				"semver": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/make-dir/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/make-error": {
+			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+			"dev": true
+		},
+		"node_modules/makeerror": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+			"dev": true,
+			"dependencies": {
+				"tmpl": "1.0.5"
+			}
+		},
+		"node_modules/map-obj": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
+			"integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/meow": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/minimist": "^1.2.0",
+				"camelcase-keys": "^6.2.2",
+				"decamelize": "^1.2.0",
+				"decamelize-keys": "^1.1.0",
+				"hard-rejection": "^2.1.0",
+				"minimist-options": "4.1.0",
+				"normalize-package-data": "^3.0.0",
+				"read-pkg-up": "^7.0.1",
+				"redent": "^3.0.0",
+				"trim-newlines": "^3.0.0",
+				"type-fest": "^0.18.0",
+				"yargs-parser": "^20.2.3"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/meow/node_modules/type-fest": {
+			"version": "0.18.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+			"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/merge-stream": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+			"dev": true
+		},
+		"node_modules/merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/micromatch": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"dev": true,
+			"dependencies": {
+				"braces": "^3.0.1",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/mime-db": {
+			"version": "1.51.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+			"integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mime-types": {
+			"version": "2.1.34",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+			"integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+			"dev": true,
+			"dependencies": {
+				"mime-db": "1.51.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/min-indent": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"dev": true
+		},
+		"node_modules/minimist-options": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+			"dev": true,
+			"dependencies": {
+				"arrify": "^1.0.1",
+				"is-plain-obj": "^1.1.0",
+				"kind-of": "^6.0.3"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/mock-socket": {
+			"version": "9.0.8",
+			"resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.0.8.tgz",
+			"integrity": "sha512-8Syqkaaa2SzRqW68DEsnZkKQicHP7hVzfj3uCvigB5TL79H1ljKbwmOcRIENkx0ZTyu/5W6u+Pk9Qy6JCp38Ww==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"node_modules/natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"node_modules/node-fetch": {
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+			"dev": true,
+			"engines": {
+				"node": "4.x || >=6.0.0"
+			}
+		},
+		"node_modules/node-int64": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+			"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+			"dev": true
+		},
+		"node_modules/node-releases": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+			"dev": true
+		},
+		"node_modules/normalize-package-data": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
+			"integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
+			"dev": true,
+			"dependencies": {
+				"hosted-git-info": "^4.0.1",
+				"resolve": "^1.20.0",
+				"semver": "^7.3.4",
+				"validate-npm-package-license": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/nwsapi": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+			"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+			"dev": true
+		},
+		"node_modules/once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"dependencies": {
+				"wrappy": "1"
+			}
+		},
+		"node_modules/onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+			"dev": true,
+			"dependencies": {
+				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/optionator": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+			"dev": true,
+			"dependencies": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.3"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"dependencies": {
+				"callsites": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parse-json": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/parse5": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+			"dev": true
+		},
+		"node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true
+		},
+		"node_modules/path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/picocolors": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+			"dev": true
+		},
+		"node_modules/picomatch": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+			"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/pirates": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
+			"integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/plur": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
+			"integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
+			"dev": true,
+			"dependencies": {
+				"irregular-plurals": "^3.2.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/pretty-format": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz",
+			"integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"ansi-regex": "^5.0.1",
+				"ansi-styles": "^5.0.0",
+				"react-is": "^17.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/pretty-format/node_modules/ansi-styles": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/promise-polyfill": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.2.0.tgz",
+			"integrity": "sha512-k/TC0mIcPVF6yHhUvwAp7cvL6I2fFV7TzF1DuGPI8mBh4QQazf36xCKEHKTZKRysEoTQoQdKyP25J8MPJp7j5g==",
+			"dev": true
+		},
+		"node_modules/prompts": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+			"dev": true,
+			"dependencies": {
+				"kleur": "^3.0.3",
+				"sisteransi": "^1.0.5"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/psl": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+			"dev": true
+		},
+		"node_modules/punycode": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/quick-lru": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/react-is": {
+			"version": "17.0.2",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+			"dev": true
+		},
+		"node_modules/read-pkg": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+			"dev": true,
+			"dependencies": {
+				"@types/normalize-package-data": "^2.4.0",
+				"normalize-package-data": "^2.5.0",
+				"parse-json": "^5.0.0",
+				"type-fest": "^0.6.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg-up": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.1.0",
+				"read-pkg": "^5.2.0",
+				"type-fest": "^0.8.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg/node_modules/hosted-git-info": {
+			"version": "2.8.9",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+			"dev": true
+		},
+		"node_modules/read-pkg/node_modules/normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"dependencies": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
+		"node_modules/read-pkg/node_modules/semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/read-pkg/node_modules/type-fest": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/reconnecting-websocket": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz",
+			"integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng=="
+		},
+		"node_modules/redent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+			"dev": true,
+			"dependencies": {
+				"indent-string": "^4.0.0",
+				"strip-indent": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/regexpp": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			}
+		},
+		"node_modules/require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/resolve": {
+			"version": "1.20.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+			"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+			"dev": true,
+			"dependencies": {
+				"is-core-module": "^2.2.0",
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/resolve-cwd": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+			"dev": true,
+			"dependencies": {
+				"resolve-from": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/resolve-cwd/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/resolve.exports": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
+			"integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"dev": true,
+			"engines": {
+				"iojs": ">=1.0.0",
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
+		"node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"node_modules/safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"dev": true
+		},
+		"node_modules/saxes": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+			"integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+			"dev": true,
+			"dependencies": {
+				"xmlchars": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/semver": {
+			"version": "7.3.8",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+			"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/signal-exit": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
+			"integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
+			"dev": true
+		},
+		"node_modules/sisteransi": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+			"dev": true
+		},
+		"node_modules/slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/source-map-support": {
+			"version": "0.5.21",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+			"dev": true,
+			"dependencies": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
+		"node_modules/spdx-correct": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+			"dev": true,
+			"dependencies": {
+				"spdx-expression-parse": "^3.0.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/spdx-exceptions": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+			"dev": true
+		},
+		"node_modules/spdx-expression-parse": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+			"dev": true,
+			"dependencies": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/spdx-license-ids": {
+			"version": "3.0.9",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
+			"integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
+			"dev": true
+		},
+		"node_modules/sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
+		"node_modules/stack-utils": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
+			"integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+			"dev": true,
+			"dependencies": {
+				"escape-string-regexp": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/stack-utils/node_modules/escape-string-regexp": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/string-argv": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+			"integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.6.19"
+			}
+		},
+		"node_modules/string-length": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+			"dev": true,
+			"dependencies": {
+				"char-regex": "^1.0.2",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-bom": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-final-newline": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/strip-indent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+			"dev": true,
+			"dependencies": {
+				"min-indent": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/supports-hyperlinks": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+			"integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0",
+				"supports-color": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/symbol-tree": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+			"dev": true
+		},
+		"node_modules/terminal-link": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+			"integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-escapes": "^4.2.1",
+				"supports-hyperlinks": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/test-exclude": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+			"dev": true,
+			"dependencies": {
+				"@istanbuljs/schema": "^0.1.2",
+				"glob": "^7.1.4",
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+			"dev": true
+		},
+		"node_modules/throat": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
+			"integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+			"dev": true
+		},
+		"node_modules/timsort": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+			"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+			"dev": true
+		},
+		"node_modules/tmpl": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+			"dev": true
+		},
+		"node_modules/to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/tough-cookie": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+			"integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+			"dev": true,
+			"dependencies": {
+				"psl": "^1.1.33",
+				"punycode": "^2.1.1",
+				"universalify": "^0.1.2"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tr46": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+			"integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+			"dev": true,
+			"dependencies": {
+				"punycode": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/trim-newlines": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ts-jest": {
+			"version": "27.1.2",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.2.tgz",
+			"integrity": "sha512-eSOiJOWq6Hhs6Khzk5wKC5sgWIXgXqOCiIl1+3lfnearu58Hj4QpE5tUhQcA3xtZrELbcvAGCsd6HB8OsaVaTA==",
+			"dev": true,
+			"dependencies": {
+				"bs-logger": "0.x",
+				"fast-json-stable-stringify": "2.x",
+				"jest-util": "^27.0.0",
+				"json5": "2.x",
+				"lodash.memoize": "4.x",
+				"make-error": "1.x",
+				"semver": "7.x",
+				"yargs-parser": "20.x"
+			},
+			"bin": {
+				"ts-jest": "cli.js"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7.0.0-beta.0 <8",
+				"@types/jest": "^27.0.0",
+				"babel-jest": ">=27.0.0 <28",
+				"esbuild": "~0.14.0",
+				"jest": "^27.0.0",
+				"typescript": ">=3.8 <5.0"
+			},
+			"peerDependenciesMeta": {
+				"@babel/core": {
+					"optional": true
+				},
+				"@types/jest": {
+					"optional": true
+				},
+				"babel-jest": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ts-node": {
+			"version": "10.4.0",
+			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz",
+			"integrity": "sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==",
+			"dev": true,
+			"dependencies": {
+				"@cspotcode/source-map-support": "0.7.0",
+				"@tsconfig/node10": "^1.0.7",
+				"@tsconfig/node12": "^1.0.7",
+				"@tsconfig/node14": "^1.0.0",
+				"@tsconfig/node16": "^1.0.2",
+				"acorn": "^8.4.1",
+				"acorn-walk": "^8.1.1",
+				"arg": "^4.1.0",
+				"create-require": "^1.1.0",
+				"diff": "^4.0.1",
+				"make-error": "^1.1.1",
+				"yn": "3.1.1"
+			},
+			"bin": {
+				"ts-node": "dist/bin.js",
+				"ts-node-cwd": "dist/bin-cwd.js",
+				"ts-node-script": "dist/bin-script.js",
+				"ts-node-transpile-only": "dist/bin-transpile.js",
+				"ts-script": "dist/bin-script-deprecated.js"
+			},
+			"peerDependencies": {
+				"@swc/core": ">=1.2.50",
+				"@swc/wasm": ">=1.2.50",
+				"@types/node": "*",
+				"typescript": ">=2.7"
+			},
+			"peerDependenciesMeta": {
+				"@swc/core": {
+					"optional": true
+				},
+				"@swc/wasm": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ts-node/node_modules/acorn-walk": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+			"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/tsd": {
+			"version": "0.19.1",
+			"resolved": "https://registry.npmjs.org/tsd/-/tsd-0.19.1.tgz",
+			"integrity": "sha512-pSwchclr+ADdxlahRUQXUrdAIOjXx1T1PQV+fLfVLuo/S4z+T00YU84fH8iPlZxyA2pWgJjo42BG1p9SDb4NOw==",
+			"dev": true,
+			"dependencies": {
+				"@tsd/typescript": "~4.5.2",
+				"eslint-formatter-pretty": "^4.1.0",
+				"globby": "^11.0.1",
+				"meow": "^9.0.0",
+				"path-exists": "^4.0.0",
+				"read-pkg-up": "^7.0.0"
+			},
+			"bin": {
+				"tsd": "dist/cli.js"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+			"dev": true
+		},
+		"node_modules/tsutils": {
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+			"dev": true,
+			"dependencies": {
+				"tslib": "^1.8.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			},
+			"peerDependencies": {
+				"typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+			}
+		},
+		"node_modules/type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/type-detect": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/typedarray-to-buffer": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+			"dev": true,
+			"dependencies": {
+				"is-typedarray": "^1.0.0"
+			}
+		},
+		"node_modules/typescript": {
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
+			"integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
+			"dev": true,
+			"bin": {
+				"tsc": "bin/tsc",
+				"tsserver": "bin/tsserver"
+			},
+			"engines": {
+				"node": ">=4.2.0"
+			}
+		},
+		"node_modules/universalify": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4.0.0"
+			}
+		},
+		"node_modules/uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
+			"dependencies": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"node_modules/v8-compile-cache": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+			"dev": true
+		},
+		"node_modules/v8-to-istanbul": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz",
+			"integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-coverage": "^2.0.1",
+				"convert-source-map": "^1.6.0",
+				"source-map": "^0.7.3"
+			},
+			"engines": {
+				"node": ">=10.12.0"
+			}
+		},
+		"node_modules/v8-to-istanbul/node_modules/source-map": {
+			"version": "0.7.3",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+			"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"dev": true,
+			"dependencies": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"node_modules/validator": {
+			"version": "13.7.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
+			"integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/w3c-hr-time": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+			"dev": true,
+			"dependencies": {
+				"browser-process-hrtime": "^1.0.0"
+			}
+		},
+		"node_modules/w3c-xmlserializer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+			"integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+			"dev": true,
+			"dependencies": {
+				"xml-name-validator": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/walker": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+			"dev": true,
+			"dependencies": {
+				"makeerror": "1.0.12"
+			}
+		},
+		"node_modules/webidl-conversions": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+			"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.4"
+			}
+		},
+		"node_modules/whatwg-encoding": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+			"integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+			"dev": true,
+			"dependencies": {
+				"iconv-lite": "0.4.24"
+			}
+		},
+		"node_modules/whatwg-mimetype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+			"dev": true
+		},
+		"node_modules/whatwg-url": {
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+			"integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+			"dev": true,
+			"dependencies": {
+				"lodash": "^4.7.0",
+				"tr46": "^2.1.0",
+				"webidl-conversions": "^6.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/word-wrap": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		},
+		"node_modules/write-file-atomic": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+			"dev": true,
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"is-typedarray": "^1.0.0",
+				"signal-exit": "^3.0.2",
+				"typedarray-to-buffer": "^3.1.5"
+			}
+		},
+		"node_modules/ws": {
+			"version": "7.5.6",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
+			"integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.3.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": "^5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
+				},
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/xml-name-validator": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+			"dev": true
+		},
+		"node_modules/xmlchars": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+			"dev": true
+		},
+		"node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+		},
+		"node_modules/yargs": {
+			"version": "16.2.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+			"dev": true,
+			"dependencies": {
+				"cliui": "^7.0.2",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.0",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^20.2.2"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yargs-parser": {
+			"version": "20.2.7",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+			"integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yn": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/z-schema": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.2.tgz",
+			"integrity": "sha512-40TH47ukMHq5HrzkeVE40Ad7eIDKaRV2b+Qpi2prLc9X9eFJFzV7tMe5aH12e6avaSS/u5l653EQOv+J9PirPw==",
+			"dev": true,
+			"dependencies": {
+				"lodash.get": "^4.4.2",
+				"lodash.isequal": "^4.5.0",
+				"validator": "^13.7.0"
+			},
+			"bin": {
+				"z-schema": "bin/z-schema"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			},
+			"optionalDependencies": {
+				"commander": "^2.7.1"
+			}
+		}
+	},
+	"dependencies": {
+		"@babel/code-frame": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+			"dev": true,
+			"requires": {
+				"@babel/highlight": "^7.16.7"
+			}
+		},
+		"@babel/compat-data": {
+			"version": "7.16.4",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
+			"integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==",
+			"dev": true
+		},
+		"@babel/core": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz",
+			"integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.16.7",
+				"@babel/helper-compilation-targets": "^7.16.7",
+				"@babel/helper-module-transforms": "^7.16.7",
+				"@babel/helpers": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7",
+				"convert-source-map": "^1.7.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.1.2",
+				"semver": "^6.3.0",
+				"source-map": "^0.5.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true
+				}
+			}
+		},
+		"@babel/generator": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.7.tgz",
+			"integrity": "sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7",
+				"jsesc": "^2.5.1",
+				"source-map": "^0.5.0"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-compilation-targets": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
+			"integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+			"dev": true,
+			"requires": {
+				"@babel/compat-data": "^7.16.4",
+				"@babel/helper-validator-option": "^7.16.7",
+				"browserslist": "^4.17.5",
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-environment-visitor": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+			"integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
+			"integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
+			"integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-hoist-variables": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+			"integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-module-imports": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+			"integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-module-transforms": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
+			"integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-module-imports": "^7.16.7",
+				"@babel/helper-simple-access": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-plugin-utils": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+			"integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+			"dev": true
+		},
+		"@babel/helper-simple-access": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
+			"integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+			"integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-validator-identifier": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+			"dev": true
+		},
+		"@babel/helper-validator-option": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+			"integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+			"dev": true
+		},
+		"@babel/helpers": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
+			"integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+			"dev": true,
+			"requires": {
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/highlight": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz",
+			"integrity": "sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"chalk": "^2.0.0",
+				"js-tokens": "^4.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.1",
+						"escape-string-regexp": "^1.0.5",
+						"supports-color": "^5.3.0"
+					}
+				},
+				"color-convert": {
+					"version": "1.9.3",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+					"dev": true,
+					"requires": {
+						"color-name": "1.1.3"
+					}
+				},
+				"color-name": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+					"dev": true
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
+					}
+				}
+			}
+		},
+		"@babel/parser": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.7.tgz",
+			"integrity": "sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==",
+			"dev": true
+		},
+		"@babel/plugin-syntax-async-generators": {
+			"version": "7.8.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-bigint": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-class-properties": {
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.12.13"
+			}
+		},
+		"@babel/plugin-syntax-import-meta": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			}
+		},
+		"@babel/plugin-syntax-json-strings": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-logical-assignment-operators": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			}
+		},
+		"@babel/plugin-syntax-nullish-coalescing-operator": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-numeric-separator": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			}
+		},
+		"@babel/plugin-syntax-object-rest-spread": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-optional-catch-binding": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-optional-chaining": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-top-level-await": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			}
+		},
+		"@babel/plugin-syntax-typescript": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz",
+			"integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.16.7"
+			}
+		},
+		"@babel/template": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+			"integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/traverse": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.7.tgz",
+			"integrity": "sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.16.7",
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-function-name": "^7.16.7",
+				"@babel/helper-hoist-variables": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/types": "^7.16.7",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0"
+			},
+			"dependencies": {
+				"globals": {
+					"version": "11.12.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/types": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.7.tgz",
+			"integrity": "sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"to-fast-properties": "^2.0.0"
+			}
+		},
+		"@bcoe/v8-coverage": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+			"dev": true
+		},
+		"@cspotcode/source-map-consumer": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
+			"integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
+			"dev": true
+		},
+		"@cspotcode/source-map-support": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
+			"integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
+			"dev": true,
+			"requires": {
+				"@cspotcode/source-map-consumer": "0.8.0"
+			}
+		},
+		"@eslint/eslintrc": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
+			"integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==",
+			"dev": true,
+			"requires": {
+				"ajv": "^6.12.4",
+				"debug": "^4.3.2",
+				"espree": "^9.2.0",
+				"globals": "^13.9.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"dependencies": {
+				"ignore": {
+					"version": "4.0.6",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+					"dev": true
+				}
+			}
+		},
+		"@humanwhocodes/config-array": {
+			"version": "0.9.2",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz",
+			"integrity": "sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==",
+			"dev": true,
+			"requires": {
+				"@humanwhocodes/object-schema": "^1.2.1",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			}
+		},
+		"@humanwhocodes/object-schema": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+			"dev": true
+		},
+		"@istanbuljs/load-nyc-config": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+			"dev": true,
+			"requires": {
+				"camelcase": "^5.3.1",
+				"find-up": "^4.1.0",
+				"get-package-type": "^0.1.0",
+				"js-yaml": "^3.13.1",
+				"resolve-from": "^5.0.0"
+			},
+			"dependencies": {
+				"js-yaml": {
+					"version": "3.14.1",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+					"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+					"dev": true,
+					"requires": {
+						"argparse": "^1.0.7",
+						"esprima": "^4.0.0"
+					}
+				},
+				"resolve-from": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+					"dev": true
+				}
+			}
+		},
+		"@istanbuljs/schema": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+			"dev": true
+		},
+		"@jest/console": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz",
+			"integrity": "sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"jest-message-util": "^27.4.2",
+				"jest-util": "^27.4.2",
+				"slash": "^3.0.0"
+			}
+		},
+		"@jest/core": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.5.tgz",
+			"integrity": "sha512-3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.4.2",
+				"@jest/reporters": "^27.4.5",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"emittery": "^0.8.1",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"jest-changed-files": "^27.4.2",
+				"jest-config": "^27.4.5",
+				"jest-haste-map": "^27.4.5",
+				"jest-message-util": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-resolve-dependencies": "^27.4.5",
+				"jest-runner": "^27.4.5",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"jest-watcher": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"rimraf": "^3.0.0",
+				"slash": "^3.0.0",
+				"strip-ansi": "^6.0.0"
+			}
+		},
+		"@jest/environment": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.4.tgz",
+			"integrity": "sha512-q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ==",
+			"dev": true,
+			"requires": {
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2"
+			}
+		},
+		"@jest/fake-timers": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz",
+			"integrity": "sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"@sinonjs/fake-timers": "^8.0.1",
+				"@types/node": "*",
+				"jest-message-util": "^27.4.2",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2"
+			}
+		},
+		"@jest/globals": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.4.tgz",
+			"integrity": "sha512-bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.4.4",
+				"@jest/types": "^27.4.2",
+				"expect": "^27.4.2"
+			}
+		},
+		"@jest/reporters": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.5.tgz",
+			"integrity": "sha512-3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA==",
+			"dev": true,
+			"requires": {
+				"@bcoe/v8-coverage": "^0.2.3",
+				"@jest/console": "^27.4.2",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.2",
+				"graceful-fs": "^4.2.4",
+				"istanbul-lib-coverage": "^3.0.0",
+				"istanbul-lib-instrument": "^4.0.3",
+				"istanbul-lib-report": "^3.0.0",
+				"istanbul-lib-source-maps": "^4.0.0",
+				"istanbul-reports": "^3.0.2",
+				"jest-haste-map": "^27.4.5",
+				"jest-resolve": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"slash": "^3.0.0",
+				"source-map": "^0.6.0",
+				"string-length": "^4.0.1",
+				"terminal-link": "^2.0.0",
+				"v8-to-istanbul": "^8.1.0"
+			}
+		},
+		"@jest/source-map": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz",
+			"integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==",
+			"dev": true,
+			"requires": {
+				"callsites": "^3.0.0",
+				"graceful-fs": "^4.2.4",
+				"source-map": "^0.6.0"
+			}
+		},
+		"@jest/test-result": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz",
+			"integrity": "sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"collect-v8-coverage": "^1.0.0"
+			}
+		},
+		"@jest/test-sequencer": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.5.tgz",
+			"integrity": "sha512-n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ==",
+			"dev": true,
+			"requires": {
+				"@jest/test-result": "^27.4.2",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-runtime": "^27.4.5"
+			}
+		},
+		"@jest/transform": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.5.tgz",
+			"integrity": "sha512-PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.1.0",
+				"@jest/types": "^27.4.2",
+				"babel-plugin-istanbul": "^6.0.0",
+				"chalk": "^4.0.0",
+				"convert-source-map": "^1.4.0",
+				"fast-json-stable-stringify": "^2.0.0",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-regex-util": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"pirates": "^4.0.1",
+				"slash": "^3.0.0",
+				"source-map": "^0.6.1",
+				"write-file-atomic": "^3.0.0"
+			}
+		},
+		"@jest/types": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
+			"integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^16.0.0",
+				"chalk": "^4.0.0"
+			}
+		},
+		"@microsoft/api-extractor": {
+			"version": "7.19.3",
+			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.19.3.tgz",
+			"integrity": "sha512-GZe+R3K4kh2X425iOHkPbByysB7FN0592mPPA6vNj5IhyhlPHgdZS6m6AmOZOIxMS4euM+SBKzEJEp3oC+WsOQ==",
+			"dev": true,
+			"requires": {
+				"@microsoft/api-extractor-model": "7.15.2",
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "~0.15.2",
+				"@rushstack/node-core-library": "3.44.3",
+				"@rushstack/rig-package": "0.3.7",
+				"@rushstack/ts-command-line": "4.10.6",
+				"colors": "~1.2.1",
+				"lodash": "~4.17.15",
+				"resolve": "~1.17.0",
+				"semver": "~7.3.0",
+				"source-map": "~0.6.1",
+				"typescript": "~4.5.2"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.17.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+					"dev": true,
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"@microsoft/api-extractor-model": {
+			"version": "7.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.15.2.tgz",
+			"integrity": "sha512-qgxKX/s6vo3nCVLhP0Ds7555QrErhcYHEok5/KyEZ7iR8J5M5oldD1eJJQmtEdVF5IzmnPPbxx1nRvfgA674LQ==",
+			"dev": true,
+			"requires": {
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "~0.15.2",
+				"@rushstack/node-core-library": "3.44.3"
+			}
+		},
+		"@microsoft/tsdoc": {
+			"version": "0.13.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
+			"integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
+			"dev": true
+		},
+		"@microsoft/tsdoc-config": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
+			"integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
+			"dev": true,
+			"requires": {
+				"@microsoft/tsdoc": "0.13.2",
+				"ajv": "~6.12.6",
+				"jju": "~1.4.0",
+				"resolve": "~1.19.0"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.19.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+					"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+					"dev": true,
+					"requires": {
+						"is-core-module": "^2.1.0",
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"@nodelib/fs.scandir": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
+			"integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.stat": "2.0.4",
+				"run-parallel": "^1.1.9"
+			}
+		},
+		"@nodelib/fs.stat": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
+			"integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
+			"dev": true
+		},
+		"@nodelib/fs.walk": {
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
+			"integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.scandir": "2.1.4",
+				"fastq": "^1.6.0"
+			}
+		},
+		"@rushstack/node-core-library": {
+			"version": "3.44.3",
+			"resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.44.3.tgz",
+			"integrity": "sha512-Bt+R5LAnVr2BImTJqPpton5rvhJ2Wq8x4BaTqaCHQMmfxqtz5lb4nLYT9kneMJTCDuRMBvvLpSuz4MBj50PV3w==",
+			"dev": true,
+			"requires": {
+				"@types/node": "12.20.24",
+				"colors": "~1.2.1",
+				"fs-extra": "~7.0.1",
+				"import-lazy": "~4.0.0",
+				"jju": "~1.4.0",
+				"resolve": "~1.17.0",
+				"semver": "~7.3.0",
+				"timsort": "~0.3.0",
+				"z-schema": "~5.0.2"
+			},
+			"dependencies": {
+				"@types/node": {
+					"version": "12.20.24",
+					"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz",
+					"integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==",
+					"dev": true
+				},
+				"resolve": {
+					"version": "1.17.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+					"dev": true,
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"@rushstack/rig-package": {
+			"version": "0.3.7",
+			"resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.7.tgz",
+			"integrity": "sha512-pzMsTSeTC8IiZ6EJLr53gGMvhT4oLWH+hxD7907cHyWuIUlEXFtu/2pK25vUQT13nKp5DJCWxXyYoGRk/h6rtA==",
+			"dev": true,
+			"requires": {
+				"resolve": "~1.17.0",
+				"strip-json-comments": "~3.1.1"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.17.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+					"dev": true,
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"@rushstack/ts-command-line": {
+			"version": "4.10.6",
+			"resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.10.6.tgz",
+			"integrity": "sha512-Y3GkUag39sTIlukDg9mUp8MCHrrlJ27POrBNRQGc/uF+VVgX8M7zMzHch5zP6O1QVquWgD7Engdpn2piPYaS/g==",
+			"dev": true,
+			"requires": {
+				"@types/argparse": "1.0.38",
+				"argparse": "~1.0.9",
+				"colors": "~1.2.1",
+				"string-argv": "~0.3.1"
+			}
+		},
+		"@sinonjs/commons": {
+			"version": "1.8.3",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+			"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+			"dev": true,
+			"requires": {
+				"type-detect": "4.0.8"
+			}
+		},
+		"@sinonjs/fake-timers": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+			"integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+			"dev": true,
+			"requires": {
+				"@sinonjs/commons": "^1.7.0"
+			}
+		},
+		"@tootallnate/once": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+			"dev": true
+		},
+		"@tsconfig/node10": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
+			"integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
+			"dev": true
+		},
+		"@tsconfig/node12": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
+			"integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
+			"dev": true
+		},
+		"@tsconfig/node14": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
+			"integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
+			"dev": true
+		},
+		"@tsconfig/node16": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
+			"integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
+			"dev": true
+		},
+		"@tsd/typescript": {
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/@tsd/typescript/-/typescript-4.5.4.tgz",
+			"integrity": "sha512-iDlLkdg3sCjUSNdoUCsYM/SXheHrdxHsR6msIkbFDW4pV6gHTMwg/8te/paLtywDjGL4S4ByDdUKA3RbfdBX0g==",
+			"dev": true
+		},
+		"@types/argparse": {
+			"version": "1.0.38",
+			"resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz",
+			"integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==",
+			"dev": true
+		},
+		"@types/babel__core": {
+			"version": "7.1.18",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz",
+			"integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
+			"dev": true,
+			"requires": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0",
+				"@types/babel__generator": "*",
+				"@types/babel__template": "*",
+				"@types/babel__traverse": "*"
+			}
+		},
+		"@types/babel__generator": {
+			"version": "7.6.4",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+			"integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@types/babel__template": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+			"integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+			"dev": true,
+			"requires": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@types/babel__traverse": {
+			"version": "7.14.2",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
+			"integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.3.0"
+			}
+		},
+		"@types/eslint": {
+			"version": "7.29.0",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
+			"integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
+			"dev": true,
+			"requires": {
+				"@types/estree": "*",
+				"@types/json-schema": "*"
+			}
+		},
+		"@types/estree": {
+			"version": "0.0.50",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
+			"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+			"dev": true
+		},
+		"@types/graceful-fs": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+			"integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
+		"@types/istanbul-lib-coverage": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+			"integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+			"dev": true
+		},
+		"@types/istanbul-lib-report": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-coverage": "*"
+			}
+		},
+		"@types/istanbul-reports": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+			"integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-report": "*"
+			}
+		},
+		"@types/jest": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz",
+			"integrity": "sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==",
+			"dev": true,
+			"requires": {
+				"jest-diff": "^27.0.0",
+				"pretty-format": "^27.0.0"
+			}
+		},
+		"@types/json-schema": {
+			"version": "7.0.9",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+			"dev": true
+		},
+		"@types/minimist": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
+			"integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+			"dev": true
+		},
+		"@types/node": {
+			"version": "17.0.5",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.5.tgz",
+			"integrity": "sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw==",
+			"dev": true
+		},
+		"@types/normalize-package-data": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+			"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+			"dev": true
+		},
+		"@types/prettier": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
+			"integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
+			"dev": true
+		},
+		"@types/stack-utils": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+			"integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+			"dev": true
+		},
+		"@types/yargs": {
+			"version": "16.0.4",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+			"integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+			"dev": true,
+			"requires": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"@types/yargs-parser": {
+			"version": "20.2.1",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
+			"integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
+			"dev": true
+		},
+		"@typescript-eslint/eslint-plugin": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.1.tgz",
+			"integrity": "sha512-wTZ5oEKrKj/8/366qTM366zqhIKAp6NCMweoRONtfuC07OAU9nVI2GZZdqQ1qD30WAAtcPdkH+npDwtRFdp4Rw==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/experimental-utils": "5.8.1",
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"debug": "^4.3.2",
+				"functional-red-black-tree": "^1.0.1",
+				"ignore": "^5.1.8",
+				"regexpp": "^3.2.0",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			}
+		},
+		"@typescript-eslint/experimental-utils": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.1.tgz",
+			"integrity": "sha512-fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww==",
+			"dev": true,
+			"requires": {
+				"@types/json-schema": "^7.0.9",
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/typescript-estree": "5.8.1",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^3.0.0"
+			}
+		},
+		"@typescript-eslint/parser": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.8.1.tgz",
+			"integrity": "sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/typescript-estree": "5.8.1",
+				"debug": "^4.3.2"
+			}
+		},
+		"@typescript-eslint/scope-manager": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.8.1.tgz",
+			"integrity": "sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/visitor-keys": "5.8.1"
+			}
+		},
+		"@typescript-eslint/types": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.1.tgz",
+			"integrity": "sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==",
+			"dev": true
+		},
+		"@typescript-eslint/typescript-estree": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz",
+			"integrity": "sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/visitor-keys": "5.8.1",
+				"debug": "^4.3.2",
+				"globby": "^11.0.4",
+				"is-glob": "^4.0.3",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			}
+		},
+		"@typescript-eslint/visitor-keys": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.1.tgz",
+			"integrity": "sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "5.8.1",
+				"eslint-visitor-keys": "^3.0.0"
+			}
+		},
+		"abab": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+			"integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+			"dev": true
+		},
+		"acorn": {
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+			"dev": true
+		},
+		"acorn-globals": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+			"integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+			"dev": true,
+			"requires": {
+				"acorn": "^7.1.1",
+				"acorn-walk": "^7.1.1"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "7.4.1",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+					"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+					"dev": true
+				}
+			}
+		},
+		"acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"requires": {}
+		},
+		"acorn-walk": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+			"dev": true
+		},
+		"agent-base": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+			"dev": true,
+			"requires": {
+				"debug": "4"
+			}
+		},
+		"ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"requires": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			}
+		},
+		"ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true
+		},
+		"ansi-escapes": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+			"dev": true,
+			"requires": {
+				"type-fest": "^0.21.3"
+			},
+			"dependencies": {
+				"type-fest": {
+					"version": "0.21.3",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+					"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+					"dev": true
+				}
+			}
+		},
+		"ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true
+		},
+		"ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"requires": {
+				"color-convert": "^2.0.1"
+			}
+		},
+		"anymatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+			"dev": true,
+			"requires": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			}
+		},
+		"arg": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+			"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+			"dev": true
+		},
+		"argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"requires": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+			"dev": true
+		},
+		"arrify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+			"dev": true
+		},
+		"asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+			"dev": true
+		},
+		"autobind-decorator": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/autobind-decorator/-/autobind-decorator-2.4.0.tgz",
+			"integrity": "sha512-OGYhWUO72V6DafbF8PM8rm3EPbfuyMZcJhtm5/n26IDwO18pohE4eNazLoCGhPiXOCD0gEGmrbU3849QvM8bbw=="
+		},
+		"babel-jest": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.5.tgz",
+			"integrity": "sha512-3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA==",
+			"dev": true,
+			"requires": {
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.0.0",
+				"babel-preset-jest": "^27.4.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"slash": "^3.0.0"
+			}
+		},
+		"babel-plugin-istanbul": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-instrument": "^5.0.4",
+				"test-exclude": "^6.0.0"
+			},
+			"dependencies": {
+				"istanbul-lib-instrument": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
+					"integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
+					"dev": true,
+					"requires": {
+						"@babel/core": "^7.12.3",
+						"@babel/parser": "^7.14.7",
+						"@istanbuljs/schema": "^0.1.2",
+						"istanbul-lib-coverage": "^3.2.0",
+						"semver": "^6.3.0"
+					}
+				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"babel-plugin-jest-hoist": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz",
+			"integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==",
+			"dev": true,
+			"requires": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.0.0",
+				"@types/babel__traverse": "^7.0.6"
+			}
+		},
+		"babel-preset-current-node-syntax": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+			"dev": true,
+			"requires": {
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-bigint": "^7.8.3",
+				"@babel/plugin-syntax-class-properties": "^7.8.3",
+				"@babel/plugin-syntax-import-meta": "^7.8.3",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-top-level-await": "^7.8.3"
+			}
+		},
+		"babel-preset-jest": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz",
+			"integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==",
+			"dev": true,
+			"requires": {
+				"babel-plugin-jest-hoist": "^27.4.0",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			}
+		},
+		"balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true
+		},
+		"brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"requires": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"requires": {
+				"fill-range": "^7.0.1"
+			}
+		},
+		"browser-process-hrtime": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+			"dev": true
+		},
+		"browserslist": {
+			"version": "4.19.1",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+			"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+			"dev": true,
+			"requires": {
+				"caniuse-lite": "^1.0.30001286",
+				"electron-to-chromium": "^1.4.17",
+				"escalade": "^3.1.1",
+				"node-releases": "^2.0.1",
+				"picocolors": "^1.0.0"
+			}
+		},
+		"bs-logger": {
+			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+			"dev": true,
+			"requires": {
+				"fast-json-stable-stringify": "2.x"
+			}
+		},
+		"bser": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+			"dev": true,
+			"requires": {
+				"node-int64": "^0.4.0"
+			}
+		},
+		"buffer-from": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+			"dev": true
+		},
+		"callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true
+		},
+		"camelcase": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"dev": true
+		},
+		"camelcase-keys": {
+			"version": "6.2.2",
+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+			"dev": true,
+			"requires": {
+				"camelcase": "^5.3.1",
+				"map-obj": "^4.0.0",
+				"quick-lru": "^4.0.1"
+			}
+		},
+		"caniuse-lite": {
+			"version": "1.0.30001294",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz",
+			"integrity": "sha512-LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g==",
+			"dev": true
+		},
+		"chalk": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+			"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			}
+		},
+		"char-regex": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+			"dev": true
+		},
+		"ci-info": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
+			"integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+			"dev": true
+		},
+		"cjs-module-lexer": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
+			"integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+			"dev": true
+		},
+		"cliui": {
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+			"dev": true,
+			"requires": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^7.0.0"
+			}
+		},
+		"co": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+			"dev": true
+		},
+		"collect-v8-coverage": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+			"dev": true
+		},
+		"color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"requires": {
+				"color-name": "~1.1.4"
+			}
+		},
+		"color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"colors": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
+			"integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
+			"dev": true
+		},
+		"combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dev": true,
+			"requires": {
+				"delayed-stream": "~1.0.0"
+			}
+		},
+		"commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true,
+			"optional": true
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"convert-source-map": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
+		"create-require": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+			"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+			"dev": true
+		},
+		"cross-fetch": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
+			"integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
+			"dev": true,
+			"requires": {
+				"node-fetch": "2.6.1"
+			}
+		},
+		"cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"requires": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			}
+		},
+		"cssom": {
+			"version": "0.4.4",
+			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+			"integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+			"dev": true
+		},
+		"cssstyle": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+			"integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+			"dev": true,
+			"requires": {
+				"cssom": "~0.3.6"
+			},
+			"dependencies": {
+				"cssom": {
+					"version": "0.3.8",
+					"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+					"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+					"dev": true
+				}
+			}
+		},
+		"data-urls": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+			"integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+			"dev": true,
+			"requires": {
+				"abab": "^2.0.3",
+				"whatwg-mimetype": "^2.3.0",
+				"whatwg-url": "^8.0.0"
+			}
+		},
+		"debug": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+			"dev": true,
+			"requires": {
+				"ms": "2.1.2"
+			}
+		},
+		"decamelize": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+			"dev": true
+		},
+		"decamelize-keys": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+			"integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+			"dev": true,
+			"requires": {
+				"decamelize": "^1.1.0",
+				"map-obj": "^1.0.0"
+			},
+			"dependencies": {
+				"map-obj": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+					"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+					"dev": true
+				}
+			}
+		},
+		"decimal.js": {
+			"version": "10.3.1",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+			"integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+			"dev": true
+		},
+		"dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+			"dev": true
+		},
+		"deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
+		"deepmerge": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+			"dev": true
+		},
+		"delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+			"dev": true
+		},
+		"detect-newline": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+			"dev": true
+		},
+		"diff": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+			"dev": true
+		},
+		"diff-sequences": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz",
+			"integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==",
+			"dev": true
+		},
+		"dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"dev": true,
+			"requires": {
+				"path-type": "^4.0.0"
+			}
+		},
+		"doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"requires": {
+				"esutils": "^2.0.2"
+			}
+		},
+		"domexception": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+			"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+			"dev": true,
+			"requires": {
+				"webidl-conversions": "^5.0.0"
+			},
+			"dependencies": {
+				"webidl-conversions": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+					"dev": true
+				}
+			}
+		},
+		"electron-to-chromium": {
+			"version": "1.4.31",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.31.tgz",
+			"integrity": "sha512-t3XVQtk+Frkv6aTD4RRk0OqosU+VLe1dQFW83MDer78ZD6a52frgXuYOIsLYTQiH2Lm+JB2OKYcn7zrX+YGAiQ==",
+			"dev": true
+		},
+		"emittery": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+			"integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+			"dev": true
+		},
+		"emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"enquirer": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+			"dev": true,
+			"requires": {
+				"ansi-colors": "^4.1.1"
+			}
+		},
+		"error-ex": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"dev": true,
+			"requires": {
+				"is-arrayish": "^0.2.1"
+			}
+		},
+		"escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true
+		},
+		"escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true
+		},
+		"escodegen": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+			"integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+			"dev": true,
+			"requires": {
+				"esprima": "^4.0.1",
+				"estraverse": "^5.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"dev": true
+				},
+				"levn": {
+					"version": "0.3.0",
+					"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+					"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+					"dev": true,
+					"requires": {
+						"prelude-ls": "~1.1.2",
+						"type-check": "~0.3.2"
+					}
+				},
+				"optionator": {
+					"version": "0.8.3",
+					"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+					"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+					"dev": true,
+					"requires": {
+						"deep-is": "~0.1.3",
+						"fast-levenshtein": "~2.0.6",
+						"levn": "~0.3.0",
+						"prelude-ls": "~1.1.2",
+						"type-check": "~0.3.2",
+						"word-wrap": "~1.2.3"
+					}
+				},
+				"prelude-ls": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+					"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+					"dev": true
+				},
+				"type-check": {
+					"version": "0.3.2",
+					"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+					"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+					"dev": true,
+					"requires": {
+						"prelude-ls": "~1.1.2"
+					}
+				}
+			}
+		},
+		"eslint": {
+			"version": "8.6.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.6.0.tgz",
+			"integrity": "sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==",
+			"dev": true,
+			"requires": {
+				"@eslint/eslintrc": "^1.0.5",
+				"@humanwhocodes/config-array": "^0.9.2",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.3.2",
+				"doctrine": "^3.0.0",
+				"enquirer": "^2.3.5",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^7.1.0",
+				"eslint-utils": "^3.0.0",
+				"eslint-visitor-keys": "^3.1.0",
+				"espree": "^9.3.0",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^6.0.1",
+				"globals": "^13.6.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^4.1.0",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"progress": "^2.0.0",
+				"regexpp": "^3.2.0",
+				"semver": "^7.2.1",
+				"strip-ansi": "^6.0.1",
+				"strip-json-comments": "^3.1.0",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"dependencies": {
+				"eslint-scope": {
+					"version": "7.1.0",
+					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
+					"integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
+					"dev": true,
+					"requires": {
+						"esrecurse": "^4.3.0",
+						"estraverse": "^5.2.0"
+					}
+				},
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"dev": true
+				},
+				"glob-parent": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+					"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+					"dev": true,
+					"requires": {
+						"is-glob": "^4.0.3"
+					}
+				},
+				"ignore": {
+					"version": "4.0.6",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-formatter-pretty": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz",
+			"integrity": "sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==",
+			"dev": true,
+			"requires": {
+				"@types/eslint": "^7.2.13",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.1.0",
+				"eslint-rule-docs": "^1.1.5",
+				"log-symbols": "^4.0.0",
+				"plur": "^4.0.0",
+				"string-width": "^4.2.0",
+				"supports-hyperlinks": "^2.0.0"
+			}
+		},
+		"eslint-rule-docs": {
+			"version": "1.1.231",
+			"resolved": "https://registry.npmjs.org/eslint-rule-docs/-/eslint-rule-docs-1.1.231.tgz",
+			"integrity": "sha512-egHz9A1WG7b8CS0x1P6P/Rj5FqZOjray/VjpJa14tMZalfRKvpE2ONJ3plCM7+PcinmU4tcmbPLv0VtwzSdLVA==",
+			"dev": true
+		},
+		"eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"requires": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			}
+		},
+		"eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"requires": {
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"dependencies": {
+				"eslint-visitor-keys": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+					"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-visitor-keys": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
+			"integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
+			"dev": true
+		},
+		"espree": {
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
+			"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
+			"dev": true,
+			"requires": {
+				"acorn": "^8.7.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^3.1.0"
+			}
+		},
+		"esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true
+		},
+		"esquery": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.1.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"dev": true
+				}
+			}
+		},
+		"esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.2.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"dev": true
+				}
+			}
+		},
+		"estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true
+		},
+		"esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true
+		},
+		"eventemitter3": {
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+		},
+		"execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			}
+		},
+		"exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true
+		},
+		"expect": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz",
+			"integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"ansi-styles": "^5.0.0",
+				"jest-get-type": "^27.4.0",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-regex-util": "^27.4.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+					"dev": true
+				}
+			}
+		},
+		"fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
+		},
+		"fast-glob": {
+			"version": "3.2.5",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
+			"integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.0",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.2",
+				"picomatch": "^2.2.1"
+			}
+		},
+		"fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"fastq": {
+			"version": "1.11.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
+			"integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+			"dev": true,
+			"requires": {
+				"reusify": "^1.0.4"
+			}
+		},
+		"fb-watchman": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+			"integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+			"dev": true,
+			"requires": {
+				"bser": "2.1.1"
+			}
+		},
+		"file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"requires": {
+				"flat-cache": "^3.0.4"
+			}
+		},
+		"fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"requires": {
+				"to-regex-range": "^5.0.1"
+			}
+		},
+		"find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"requires": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			}
+		},
+		"flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"dev": true,
+			"requires": {
+				"flatted": "^3.1.0",
+				"rimraf": "^3.0.2"
+			}
+		},
+		"flatted": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
+			"integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==",
+			"dev": true
+		},
+		"form-data": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+			"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+			"dev": true,
+			"requires": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			}
+		},
+		"fs-extra": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.2",
+				"jsonfile": "^4.0.0",
+				"universalify": "^0.1.0"
+			}
+		},
+		"fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"dev": true
+		},
+		"fsevents": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+			"dev": true,
+			"optional": true
+		},
+		"function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+			"dev": true
+		},
+		"functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
+		"gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true
+		},
+		"get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true
+		},
+		"get-package-type": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+			"dev": true
+		},
+		"get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"dev": true
+		},
+		"glob": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+			"dev": true,
+			"requires": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			}
+		},
+		"glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"requires": {
+				"is-glob": "^4.0.1"
+			}
+		},
+		"globals": {
+			"version": "13.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+			"integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+			"dev": true,
+			"requires": {
+				"type-fest": "^0.20.2"
+			}
+		},
+		"globby": {
+			"version": "11.0.4",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+			"integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+			"dev": true,
+			"requires": {
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.1.1",
+				"ignore": "^5.1.4",
+				"merge2": "^1.3.0",
+				"slash": "^3.0.0"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.2.6",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+			"integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+			"dev": true
+		},
+		"hard-rejection": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+			"dev": true
+		},
+		"has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1"
+			}
+		},
+		"has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true
+		},
+		"hosted-git-info": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "^6.0.0"
+			}
+		},
+		"html-encoding-sniffer": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+			"integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+			"dev": true,
+			"requires": {
+				"whatwg-encoding": "^1.0.5"
+			}
+		},
+		"html-escaper": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+			"dev": true
+		},
+		"http-proxy-agent": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+			"dev": true,
+			"requires": {
+				"@tootallnate/once": "1",
+				"agent-base": "6",
+				"debug": "4"
+			}
+		},
+		"https-proxy-agent": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+			"dev": true,
+			"requires": {
+				"agent-base": "6",
+				"debug": "4"
+			}
+		},
+		"human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"dev": true
+		},
+		"iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"dev": true,
+			"requires": {
+				"safer-buffer": ">= 2.1.2 < 3"
+			}
+		},
+		"ignore": {
+			"version": "5.1.8",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+			"dev": true
+		},
+		"import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
+			"requires": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			}
+		},
+		"import-lazy": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+			"dev": true
+		},
+		"import-local": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
+			"integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
+			"dev": true,
+			"requires": {
+				"pkg-dir": "^4.2.0",
+				"resolve-cwd": "^3.0.0"
+			}
+		},
+		"imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true
+		},
+		"indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"dev": true
+		},
+		"inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"dev": true,
+			"requires": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"irregular-plurals": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz",
+			"integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==",
+			"dev": true
+		},
+		"is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+			"dev": true
+		},
+		"is-core-module": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
+			"integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+			"dev": true,
+			"requires": {
+				"has": "^1.0.3"
+			}
+		},
+		"is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true
+		},
+		"is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true
+		},
+		"is-generator-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+			"dev": true
+		},
+		"is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+			"dev": true,
+			"requires": {
+				"is-extglob": "^2.1.1"
+			}
+		},
+		"is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true
+		},
+		"is-plain-obj": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+			"dev": true
+		},
+		"is-potential-custom-element-name": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+			"dev": true
+		},
+		"is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true
+		},
+		"is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+			"dev": true
+		},
+		"is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+			"dev": true
+		},
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"istanbul-lib-coverage": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+			"dev": true
+		},
+		"istanbul-lib-instrument": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+			"integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.7.5",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-coverage": "^3.0.0",
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-lib-report": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+			"dev": true,
+			"requires": {
+				"istanbul-lib-coverage": "^3.0.0",
+				"make-dir": "^3.0.0",
+				"supports-color": "^7.1.0"
+			}
+		},
+		"istanbul-lib-source-maps": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^3.0.0",
+				"source-map": "^0.6.1"
+			}
+		},
+		"istanbul-reports": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz",
+			"integrity": "sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==",
+			"dev": true,
+			"requires": {
+				"html-escaper": "^2.0.0",
+				"istanbul-lib-report": "^3.0.0"
+			}
+		},
+		"jest": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest/-/jest-27.4.5.tgz",
+			"integrity": "sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==",
+			"dev": true,
+			"requires": {
+				"@jest/core": "^27.4.5",
+				"import-local": "^3.0.2",
+				"jest-cli": "^27.4.5"
+			}
+		},
+		"jest-changed-files": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz",
+			"integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"execa": "^5.0.0",
+				"throat": "^6.0.1"
+			}
+		},
+		"jest-circus": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.5.tgz",
+			"integrity": "sha512-eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.4.4",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"dedent": "^0.7.0",
+				"expect": "^27.4.2",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^27.4.2",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3",
+				"throat": "^6.0.1"
+			}
+		},
+		"jest-cli": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.5.tgz",
+			"integrity": "sha512-hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg==",
+			"dev": true,
+			"requires": {
+				"@jest/core": "^27.4.5",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"import-local": "^3.0.2",
+				"jest-config": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"prompts": "^2.0.1",
+				"yargs": "^16.2.0"
+			}
+		},
+		"jest-config": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.5.tgz",
+			"integrity": "sha512-t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.1.0",
+				"@jest/test-sequencer": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"babel-jest": "^27.4.5",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"deepmerge": "^4.2.2",
+				"glob": "^7.1.1",
+				"graceful-fs": "^4.2.4",
+				"jest-circus": "^27.4.5",
+				"jest-environment-jsdom": "^27.4.4",
+				"jest-environment-node": "^27.4.4",
+				"jest-get-type": "^27.4.0",
+				"jest-jasmine2": "^27.4.5",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-runner": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0"
+			}
+		},
+		"jest-diff": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz",
+			"integrity": "sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^27.4.0",
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			}
+		},
+		"jest-docblock": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz",
+			"integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==",
+			"dev": true,
+			"requires": {
+				"detect-newline": "^3.0.0"
+			}
+		},
+		"jest-each": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz",
+			"integrity": "sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2"
+			}
+		},
+		"jest-environment-jsdom": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz",
+			"integrity": "sha512-cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.4.4",
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2",
+				"jsdom": "^16.6.0"
+			}
+		},
+		"jest-environment-node": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.4.tgz",
+			"integrity": "sha512-D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.4.4",
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2"
+			}
+		},
+		"jest-fetch-mock": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz",
+			"integrity": "sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==",
+			"dev": true,
+			"requires": {
+				"cross-fetch": "^3.0.4",
+				"promise-polyfill": "^8.1.3"
+			}
+		},
+		"jest-get-type": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
+			"integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==",
+			"dev": true
+		},
+		"jest-haste-map": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.5.tgz",
+			"integrity": "sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"@types/graceful-fs": "^4.1.2",
+				"@types/node": "*",
+				"anymatch": "^3.0.3",
+				"fb-watchman": "^2.0.0",
+				"fsevents": "^2.3.2",
+				"graceful-fs": "^4.2.4",
+				"jest-regex-util": "^27.4.0",
+				"jest-serializer": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"micromatch": "^4.0.4",
+				"walker": "^1.0.7"
+			}
+		},
+		"jest-jasmine2": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.5.tgz",
+			"integrity": "sha512-oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw==",
+			"dev": true,
+			"requires": {
+				"@babel/traverse": "^7.1.0",
+				"@jest/environment": "^27.4.4",
+				"@jest/source-map": "^27.4.0",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"expect": "^27.4.2",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^27.4.2",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2",
+				"throat": "^6.0.1"
+			}
+		},
+		"jest-leak-detector": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz",
+			"integrity": "sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==",
+			"dev": true,
+			"requires": {
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			}
+		},
+		"jest-matcher-utils": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz",
+			"integrity": "sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^27.4.2",
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			}
+		},
+		"jest-message-util": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz",
+			"integrity": "sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.4.2",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			}
+		},
+		"jest-mock": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz",
+			"integrity": "sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*"
+			}
+		},
+		"jest-pnp-resolver": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+			"dev": true,
+			"requires": {}
+		},
+		"jest-regex-util": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
+			"integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==",
+			"dev": true
+		},
+		"jest-resolve": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.5.tgz",
+			"integrity": "sha512-xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-pnp-resolver": "^1.2.2",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"resolve": "^1.20.0",
+				"resolve.exports": "^1.1.0",
+				"slash": "^3.0.0"
+			}
+		},
+		"jest-resolve-dependencies": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.5.tgz",
+			"integrity": "sha512-elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-snapshot": "^27.4.5"
+			}
+		},
+		"jest-runner": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.5.tgz",
+			"integrity": "sha512-/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.4.2",
+				"@jest/environment": "^27.4.4",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"emittery": "^0.8.1",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"jest-docblock": "^27.4.0",
+				"jest-environment-jsdom": "^27.4.4",
+				"jest-environment-node": "^27.4.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-leak-detector": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-resolve": "^27.4.5",
+				"jest-runtime": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"source-map-support": "^0.5.6",
+				"throat": "^6.0.1"
+			}
+		},
+		"jest-runtime": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.5.tgz",
+			"integrity": "sha512-CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.4.2",
+				"@jest/environment": "^27.4.4",
+				"@jest/globals": "^27.4.4",
+				"@jest/source-map": "^27.4.0",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/yargs": "^16.0.0",
+				"chalk": "^4.0.0",
+				"cjs-module-lexer": "^1.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"execa": "^5.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-message-util": "^27.4.2",
+				"jest-mock": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"slash": "^3.0.0",
+				"strip-bom": "^4.0.0",
+				"yargs": "^16.2.0"
+			}
+		},
+		"jest-serializer": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
+			"integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"graceful-fs": "^4.2.4"
+			}
+		},
+		"jest-snapshot": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.5.tgz",
+			"integrity": "sha512-eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.7.2",
+				"@babel/generator": "^7.7.2",
+				"@babel/parser": "^7.7.2",
+				"@babel/plugin-syntax-typescript": "^7.7.2",
+				"@babel/traverse": "^7.7.2",
+				"@babel/types": "^7.0.0",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/babel__traverse": "^7.0.4",
+				"@types/prettier": "^2.1.5",
+				"babel-preset-current-node-syntax": "^1.0.0",
+				"chalk": "^4.0.0",
+				"expect": "^27.4.2",
+				"graceful-fs": "^4.2.4",
+				"jest-diff": "^27.4.2",
+				"jest-get-type": "^27.4.0",
+				"jest-haste-map": "^27.4.5",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-resolve": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"natural-compare": "^1.4.0",
+				"pretty-format": "^27.4.2",
+				"semver": "^7.3.2"
+			}
+		},
+		"jest-util": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
+			"integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"graceful-fs": "^4.2.4",
+				"picomatch": "^2.2.3"
+			}
+		},
+		"jest-validate": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz",
+			"integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"camelcase": "^6.2.0",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^27.4.0",
+				"leven": "^3.1.0",
+				"pretty-format": "^27.4.2"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
+					"integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
+					"dev": true
+				}
+			}
+		},
+		"jest-watcher": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz",
+			"integrity": "sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==",
+			"dev": true,
+			"requires": {
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"jest-util": "^27.4.2",
+				"string-length": "^4.0.1"
+			}
+		},
+		"jest-websocket-mock": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/jest-websocket-mock/-/jest-websocket-mock-2.2.1.tgz",
+			"integrity": "sha512-fhsGLXrPfs06PhHoxqOSA9yZ6Rb4qYrf4Wcm7/nfRzjlrf1gIeuhYUkzMRjjE0TMQ37SwkmeLanwrZY4ZaNp8g==",
+			"dev": true,
+			"requires": {
+				"jest-diff": "^27.0.2"
+			}
+		},
+		"jest-worker": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz",
+			"integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"dependencies": {
+				"supports-color": {
+					"version": "8.1.1",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
+		"jju": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+			"integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
+			"dev": true
+		},
+		"js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"requires": {
+				"argparse": "^2.0.1"
+			},
+			"dependencies": {
+				"argparse": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+					"dev": true
+				}
+			}
+		},
+		"jsdom": {
+			"version": "16.7.0",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+			"integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+			"dev": true,
+			"requires": {
+				"abab": "^2.0.5",
+				"acorn": "^8.2.4",
+				"acorn-globals": "^6.0.0",
+				"cssom": "^0.4.4",
+				"cssstyle": "^2.3.0",
+				"data-urls": "^2.0.0",
+				"decimal.js": "^10.2.1",
+				"domexception": "^2.0.1",
+				"escodegen": "^2.0.0",
+				"form-data": "^3.0.0",
+				"html-encoding-sniffer": "^2.0.1",
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"is-potential-custom-element-name": "^1.0.1",
+				"nwsapi": "^2.2.0",
+				"parse5": "6.0.1",
+				"saxes": "^5.0.1",
+				"symbol-tree": "^3.2.4",
+				"tough-cookie": "^4.0.0",
+				"w3c-hr-time": "^1.0.2",
+				"w3c-xmlserializer": "^2.0.0",
+				"webidl-conversions": "^6.1.0",
+				"whatwg-encoding": "^1.0.5",
+				"whatwg-mimetype": "^2.3.0",
+				"whatwg-url": "^8.5.0",
+				"ws": "^7.4.6",
+				"xml-name-validator": "^3.0.0"
+			}
+		},
+		"jsesc": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"dev": true
+		},
+		"json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+			"dev": true
+		},
+		"json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+			"dev": true
+		},
+		"json5": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.5"
+			}
+		},
+		"jsonfile": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true
+		},
+		"kleur": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+			"dev": true
+		},
+		"leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"dev": true
+		},
+		"levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
+			"requires": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			}
+		},
+		"lines-and-columns": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+			"dev": true
+		},
+		"locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"requires": {
+				"p-locate": "^4.1.0"
+			}
+		},
+		"lodash": {
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+			"dev": true
+		},
+		"lodash.get": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+			"dev": true
+		},
+		"lodash.isequal": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+			"dev": true
+		},
+		"lodash.memoize": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+			"dev": true
+		},
+		"lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true
+		},
+		"log-symbols": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.1.0",
+				"is-unicode-supported": "^0.1.0"
+			}
+		},
+		"lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"requires": {
+				"yallist": "^4.0.0"
+			}
+		},
+		"make-dir": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+			"dev": true,
+			"requires": {
+				"semver": "^6.0.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"make-error": {
+			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+			"dev": true
+		},
+		"makeerror": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+			"dev": true,
+			"requires": {
+				"tmpl": "1.0.5"
+			}
+		},
+		"map-obj": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
+			"integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
+			"dev": true
+		},
+		"meow": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+			"dev": true,
+			"requires": {
+				"@types/minimist": "^1.2.0",
+				"camelcase-keys": "^6.2.2",
+				"decamelize": "^1.2.0",
+				"decamelize-keys": "^1.1.0",
+				"hard-rejection": "^2.1.0",
+				"minimist-options": "4.1.0",
+				"normalize-package-data": "^3.0.0",
+				"read-pkg-up": "^7.0.1",
+				"redent": "^3.0.0",
+				"trim-newlines": "^3.0.0",
+				"type-fest": "^0.18.0",
+				"yargs-parser": "^20.2.3"
+			},
+			"dependencies": {
+				"type-fest": {
+					"version": "0.18.1",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+					"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+					"dev": true
+				}
+			}
+		},
+		"merge-stream": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+			"dev": true
+		},
+		"merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"dev": true
+		},
+		"micromatch": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"dev": true,
+			"requires": {
+				"braces": "^3.0.1",
+				"picomatch": "^2.2.3"
+			}
+		},
+		"mime-db": {
+			"version": "1.51.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+			"integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+			"dev": true
+		},
+		"mime-types": {
+			"version": "2.1.34",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+			"integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+			"dev": true,
+			"requires": {
+				"mime-db": "1.51.0"
+			}
+		},
+		"mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"dev": true
+		},
+		"min-indent": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+			"dev": true
+		},
+		"minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"requires": {
+				"brace-expansion": "^1.1.7"
+			}
+		},
+		"minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"dev": true
+		},
+		"minimist-options": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+			"dev": true,
+			"requires": {
+				"arrify": "^1.0.1",
+				"is-plain-obj": "^1.1.0",
+				"kind-of": "^6.0.3"
+			}
+		},
+		"mock-socket": {
+			"version": "9.0.8",
+			"resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.0.8.tgz",
+			"integrity": "sha512-8Syqkaaa2SzRqW68DEsnZkKQicHP7hVzfj3uCvigB5TL79H1ljKbwmOcRIENkx0ZTyu/5W6u+Pk9Qy6JCp38Ww==",
+			"dev": true
+		},
+		"ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"node-fetch": {
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+			"dev": true
+		},
+		"node-int64": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+			"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+			"dev": true
+		},
+		"node-releases": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+			"dev": true
+		},
+		"normalize-package-data": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
+			"integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^4.0.1",
+				"resolve": "^1.20.0",
+				"semver": "^7.3.4",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
+		"normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true
+		},
+		"npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dev": true,
+			"requires": {
+				"path-key": "^3.0.0"
+			}
+		},
+		"nwsapi": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+			"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+			"dev": true
+		},
+		"once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"requires": {
+				"wrappy": "1"
+			}
+		},
+		"onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+			"dev": true,
+			"requires": {
+				"mimic-fn": "^2.1.0"
+			}
+		},
+		"optionator": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+			"dev": true,
+			"requires": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.3"
+			}
+		},
+		"p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"requires": {
+				"p-try": "^2.0.0"
+			}
+		},
+		"p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"requires": {
+				"p-limit": "^2.2.0"
+			}
+		},
+		"p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true
+		},
+		"parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"requires": {
+				"callsites": "^3.0.0"
+			}
+		},
+		"parse-json": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
+			}
+		},
+		"parse5": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+			"dev": true
+		},
+		"path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true
+		},
+		"path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+			"dev": true
+		},
+		"path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true
+		},
+		"path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true
+		},
+		"path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"dev": true
+		},
+		"picocolors": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+			"dev": true
+		},
+		"picomatch": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+			"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+			"dev": true
+		},
+		"pirates": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
+			"integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==",
+			"dev": true
+		},
+		"pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"requires": {
+				"find-up": "^4.0.0"
+			}
+		},
+		"plur": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
+			"integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
+			"dev": true,
+			"requires": {
+				"irregular-plurals": "^3.2.0"
+			}
+		},
+		"prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true
+		},
+		"pretty-format": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz",
+			"integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"ansi-regex": "^5.0.1",
+				"ansi-styles": "^5.0.0",
+				"react-is": "^17.0.1"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+					"dev": true
+				}
+			}
+		},
+		"progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"dev": true
+		},
+		"promise-polyfill": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.2.0.tgz",
+			"integrity": "sha512-k/TC0mIcPVF6yHhUvwAp7cvL6I2fFV7TzF1DuGPI8mBh4QQazf36xCKEHKTZKRysEoTQoQdKyP25J8MPJp7j5g==",
+			"dev": true
+		},
+		"prompts": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+			"dev": true,
+			"requires": {
+				"kleur": "^3.0.3",
+				"sisteransi": "^1.0.5"
+			}
+		},
+		"psl": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+			"dev": true
+		},
+		"punycode": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true
+		},
+		"queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"dev": true
+		},
+		"quick-lru": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+			"dev": true
+		},
+		"react-is": {
+			"version": "17.0.2",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+			"dev": true
+		},
+		"read-pkg": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+			"dev": true,
+			"requires": {
+				"@types/normalize-package-data": "^2.4.0",
+				"normalize-package-data": "^2.5.0",
+				"parse-json": "^5.0.0",
+				"type-fest": "^0.6.0"
+			},
+			"dependencies": {
+				"hosted-git-info": {
+					"version": "2.8.9",
+					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+					"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+					"dev": true
+				},
+				"normalize-package-data": {
+					"version": "2.5.0",
+					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+					"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+					"dev": true,
+					"requires": {
+						"hosted-git-info": "^2.1.4",
+						"resolve": "^1.10.0",
+						"semver": "2 || 3 || 4 || 5",
+						"validate-npm-package-license": "^3.0.1"
+					}
+				},
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				},
+				"type-fest": {
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+					"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+					"dev": true
+				}
+			}
+		},
+		"read-pkg-up": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+			"dev": true,
+			"requires": {
+				"find-up": "^4.1.0",
+				"read-pkg": "^5.2.0",
+				"type-fest": "^0.8.1"
+			},
+			"dependencies": {
+				"type-fest": {
+					"version": "0.8.1",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+					"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+					"dev": true
+				}
+			}
+		},
+		"reconnecting-websocket": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz",
+			"integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng=="
+		},
+		"redent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+			"dev": true,
+			"requires": {
+				"indent-string": "^4.0.0",
+				"strip-indent": "^3.0.0"
+			}
+		},
+		"regexpp": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+			"dev": true
+		},
+		"require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+			"dev": true
+		},
+		"resolve": {
+			"version": "1.20.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+			"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+			"dev": true,
+			"requires": {
+				"is-core-module": "^2.2.0",
+				"path-parse": "^1.0.6"
+			}
+		},
+		"resolve-cwd": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+			"dev": true,
+			"requires": {
+				"resolve-from": "^5.0.0"
+			},
+			"dependencies": {
+				"resolve-from": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+					"dev": true
+				}
+			}
+		},
+		"resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true
+		},
+		"resolve.exports": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
+			"integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+			"dev": true
+		},
+		"reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"dev": true
+		},
+		"rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
+			"requires": {
+				"glob": "^7.1.3"
+			}
+		},
+		"run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"dev": true,
+			"requires": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
+		"safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"dev": true
+		},
+		"saxes": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+			"integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+			"dev": true,
+			"requires": {
+				"xmlchars": "^2.2.0"
+			}
+		},
+		"semver": {
+			"version": "7.3.8",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+			"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+			"requires": {
+				"lru-cache": "^6.0.0"
+			}
+		},
+		"shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"requires": {
+				"shebang-regex": "^3.0.0"
+			}
+		},
+		"shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true
+		},
+		"signal-exit": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
+			"integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
+			"dev": true
+		},
+		"sisteransi": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+			"dev": true
+		},
+		"slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true
+		},
+		"source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true
+		},
+		"source-map-support": {
+			"version": "0.5.21",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+			"dev": true,
+			"requires": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
+		"spdx-correct": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+			"dev": true,
+			"requires": {
+				"spdx-expression-parse": "^3.0.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"spdx-exceptions": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+			"dev": true
+		},
+		"spdx-expression-parse": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+			"dev": true,
+			"requires": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"spdx-license-ids": {
+			"version": "3.0.9",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
+			"integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
+			"dev": true
+		},
+		"sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
+		"stack-utils": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
+			"integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+			"dev": true,
+			"requires": {
+				"escape-string-regexp": "^2.0.0"
+			},
+			"dependencies": {
+				"escape-string-regexp": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+					"dev": true
+				}
+			}
+		},
+		"string-argv": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+			"integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+			"dev": true
+		},
+		"string-length": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+			"dev": true,
+			"requires": {
+				"char-regex": "^1.0.2",
+				"strip-ansi": "^6.0.0"
+			}
+		},
+		"string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"requires": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			}
+		},
+		"strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"requires": {
+				"ansi-regex": "^5.0.1"
+			}
+		},
+		"strip-bom": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+			"dev": true
+		},
+		"strip-final-newline": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+			"dev": true
+		},
+		"strip-indent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+			"dev": true,
+			"requires": {
+				"min-indent": "^1.0.0"
+			}
+		},
+		"strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true
+		},
+		"supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"requires": {
+				"has-flag": "^4.0.0"
+			}
+		},
+		"supports-hyperlinks": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+			"integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+			"dev": true,
+			"requires": {
+				"has-flag": "^4.0.0",
+				"supports-color": "^7.0.0"
+			}
+		},
+		"symbol-tree": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+			"dev": true
+		},
+		"terminal-link": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+			"integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+			"dev": true,
+			"requires": {
+				"ansi-escapes": "^4.2.1",
+				"supports-hyperlinks": "^2.0.0"
+			}
+		},
+		"test-exclude": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+			"dev": true,
+			"requires": {
+				"@istanbuljs/schema": "^0.1.2",
+				"glob": "^7.1.4",
+				"minimatch": "^3.0.4"
+			}
+		},
+		"text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+			"dev": true
+		},
+		"throat": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
+			"integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+			"dev": true
+		},
+		"timsort": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+			"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+			"dev": true
+		},
+		"tmpl": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+			"dev": true
+		},
+		"to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+			"dev": true
+		},
+		"to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"requires": {
+				"is-number": "^7.0.0"
+			}
+		},
+		"tough-cookie": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+			"integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+			"dev": true,
+			"requires": {
+				"psl": "^1.1.33",
+				"punycode": "^2.1.1",
+				"universalify": "^0.1.2"
+			}
+		},
+		"tr46": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+			"integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+			"dev": true,
+			"requires": {
+				"punycode": "^2.1.1"
+			}
+		},
+		"trim-newlines": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+			"dev": true
+		},
+		"ts-jest": {
+			"version": "27.1.2",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.2.tgz",
+			"integrity": "sha512-eSOiJOWq6Hhs6Khzk5wKC5sgWIXgXqOCiIl1+3lfnearu58Hj4QpE5tUhQcA3xtZrELbcvAGCsd6HB8OsaVaTA==",
+			"dev": true,
+			"requires": {
+				"bs-logger": "0.x",
+				"fast-json-stable-stringify": "2.x",
+				"jest-util": "^27.0.0",
+				"json5": "2.x",
+				"lodash.memoize": "4.x",
+				"make-error": "1.x",
+				"semver": "7.x",
+				"yargs-parser": "20.x"
+			}
+		},
+		"ts-node": {
+			"version": "10.4.0",
+			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz",
+			"integrity": "sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==",
+			"dev": true,
+			"requires": {
+				"@cspotcode/source-map-support": "0.7.0",
+				"@tsconfig/node10": "^1.0.7",
+				"@tsconfig/node12": "^1.0.7",
+				"@tsconfig/node14": "^1.0.0",
+				"@tsconfig/node16": "^1.0.2",
+				"acorn": "^8.4.1",
+				"acorn-walk": "^8.1.1",
+				"arg": "^4.1.0",
+				"create-require": "^1.1.0",
+				"diff": "^4.0.1",
+				"make-error": "^1.1.1",
+				"yn": "3.1.1"
+			},
+			"dependencies": {
+				"acorn-walk": {
+					"version": "8.2.0",
+					"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+					"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+					"dev": true
+				}
+			}
+		},
+		"tsd": {
+			"version": "0.19.1",
+			"resolved": "https://registry.npmjs.org/tsd/-/tsd-0.19.1.tgz",
+			"integrity": "sha512-pSwchclr+ADdxlahRUQXUrdAIOjXx1T1PQV+fLfVLuo/S4z+T00YU84fH8iPlZxyA2pWgJjo42BG1p9SDb4NOw==",
+			"dev": true,
+			"requires": {
+				"@tsd/typescript": "~4.5.2",
+				"eslint-formatter-pretty": "^4.1.0",
+				"globby": "^11.0.1",
+				"meow": "^9.0.0",
+				"path-exists": "^4.0.0",
+				"read-pkg-up": "^7.0.0"
+			}
+		},
+		"tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+			"dev": true
+		},
+		"tsutils": {
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+			"dev": true,
+			"requires": {
+				"tslib": "^1.8.1"
+			}
+		},
+		"type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
+			"requires": {
+				"prelude-ls": "^1.2.1"
+			}
+		},
+		"type-detect": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+			"dev": true
+		},
+		"type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true
+		},
+		"typedarray-to-buffer": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+			"dev": true,
+			"requires": {
+				"is-typedarray": "^1.0.0"
+			}
+		},
+		"typescript": {
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
+			"integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
+			"dev": true
+		},
+		"universalify": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+			"dev": true
+		},
+		"uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
+			"requires": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"v8-compile-cache": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+			"dev": true
+		},
+		"v8-to-istanbul": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz",
+			"integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-coverage": "^2.0.1",
+				"convert-source-map": "^1.6.0",
+				"source-map": "^0.7.3"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				}
+			}
+		},
+		"validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"dev": true,
+			"requires": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"validator": {
+			"version": "13.7.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
+			"integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
+			"dev": true
+		},
+		"w3c-hr-time": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+			"dev": true,
+			"requires": {
+				"browser-process-hrtime": "^1.0.0"
+			}
+		},
+		"w3c-xmlserializer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+			"integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+			"dev": true,
+			"requires": {
+				"xml-name-validator": "^3.0.0"
+			}
+		},
+		"walker": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+			"dev": true,
+			"requires": {
+				"makeerror": "1.0.12"
+			}
+		},
+		"webidl-conversions": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+			"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+			"dev": true
+		},
+		"whatwg-encoding": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+			"integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+			"dev": true,
+			"requires": {
+				"iconv-lite": "0.4.24"
+			}
+		},
+		"whatwg-mimetype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+			"dev": true
+		},
+		"whatwg-url": {
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+			"integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+			"dev": true,
+			"requires": {
+				"lodash": "^4.7.0",
+				"tr46": "^2.1.0",
+				"webidl-conversions": "^6.1.0"
+			}
+		},
+		"which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"requires": {
+				"isexe": "^2.0.0"
+			}
+		},
+		"word-wrap": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"dev": true
+		},
+		"wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			}
+		},
+		"wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		},
+		"write-file-atomic": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+			"dev": true,
+			"requires": {
+				"imurmurhash": "^0.1.4",
+				"is-typedarray": "^1.0.0",
+				"signal-exit": "^3.0.2",
+				"typedarray-to-buffer": "^3.1.5"
+			}
+		},
+		"ws": {
+			"version": "7.5.6",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
+			"integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
+			"dev": true,
+			"requires": {}
+		},
+		"xml-name-validator": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+			"dev": true
+		},
+		"xmlchars": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+			"dev": true
+		},
+		"y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"dev": true
+		},
+		"yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+		},
+		"yargs": {
+			"version": "16.2.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+			"dev": true,
+			"requires": {
+				"cliui": "^7.0.2",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.0",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^20.2.2"
+			}
+		},
+		"yargs-parser": {
+			"version": "20.2.7",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+			"integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+			"dev": true
+		},
+		"yn": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+			"dev": true
+		},
+		"z-schema": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.2.tgz",
+			"integrity": "sha512-40TH47ukMHq5HrzkeVE40Ad7eIDKaRV2b+Qpi2prLc9X9eFJFzV7tMe5aH12e6avaSS/u5l653EQOv+J9PirPw==",
+			"dev": true,
+			"requires": {
+				"commander": "^2.7.1",
+				"lodash.get": "^4.4.2",
+				"lodash.isequal": "^4.5.0",
+				"validator": "^13.7.0"
+			}
+		}
+	}
+}
diff --git a/packages/calckey-js/package.json b/packages/calckey-js/package.json
new file mode 100644
index 000000000..d68f24175
--- /dev/null
+++ b/packages/calckey-js/package.json
@@ -0,0 +1,47 @@
+{
+	"name": "calckey-js",
+	"version": "0.0.22",
+	"description": "Calckey SDK for JavaScript",
+	"main": "./built/index.js",
+	"types": "./built/index.d.ts",
+	"scripts": {
+		"build": "tsc",
+		"tsd": "tsd",
+		"api": "pnpm api-extractor run --local --verbose",
+		"api-prod": "pnpm api-extractor run --verbose",
+		"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
+		"typecheck": "tsc --noEmit",
+		"lint": "pnpm typecheck && pnpm eslint",
+		"jest": "jest --coverage --detectOpenHandles",
+		"test": "pnpm jest && pnpm tsd"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://codeberg.org/calckey/calckey.js"
+	},
+	"devDependencies": {
+		"@microsoft/api-extractor": "^7.19.3",
+		"@types/jest": "^27.4.0",
+		"@types/node": "17.0.5",
+		"@typescript-eslint/eslint-plugin": "5.8.1",
+		"@typescript-eslint/parser": "5.8.1",
+		"eslint": "8.6.0",
+		"jest": "^27.4.5",
+		"jest-fetch-mock": "^3.0.3",
+		"jest-websocket-mock": "^2.2.1",
+		"mock-socket": "^9.0.8",
+		"ts-jest": "^27.1.2",
+		"ts-node": "10.4.0",
+		"tsd": "^0.19.1",
+		"typescript": "4.5.4"
+	},
+	"files": [
+		"built"
+	],
+	"dependencies": {
+		"autobind-decorator": "^2.4.0",
+		"eventemitter3": "^4.0.7",
+		"reconnecting-websocket": "^4.4.0",
+		"semver": "^7.3.8"
+	}
+}
diff --git a/packages/calckey-js/src/acct.ts b/packages/calckey-js/src/acct.ts
new file mode 100644
index 000000000..c32cee86c
--- /dev/null
+++ b/packages/calckey-js/src/acct.ts
@@ -0,0 +1,14 @@
+export type Acct = {
+	username: string;
+	host: string | null;
+};
+
+export function parse(acct: string): Acct {
+	if (acct.startsWith('@')) acct = acct.substr(1);
+	const split = acct.split('@', 2);
+	return { username: split[0], host: split[1] || null };
+}
+
+export function toString(acct: Acct): string {
+	return acct.host == null ? acct.username : `${acct.username}@${acct.host}`;
+}
diff --git a/packages/calckey-js/src/api.ts b/packages/calckey-js/src/api.ts
new file mode 100644
index 000000000..2cf848810
--- /dev/null
+++ b/packages/calckey-js/src/api.ts
@@ -0,0 +1,98 @@
+import { Endpoints } from './api.types';
+
+const MK_API_ERROR = Symbol();
+
+export type APIError = {
+	id: string;
+	code: string;
+	message: string;
+	kind: 'client' | 'server';
+	info: Record<string, any>;
+};
+
+export function isAPIError(reason: any): reason is APIError {
+	return reason[MK_API_ERROR] === true;
+}
+
+export type FetchLike = (input: string, init?: {
+		method?: string;
+		body?: string;
+		credentials?: RequestCredentials;
+		cache?: RequestCache;
+	}) => Promise<{
+		status: number;
+		json(): Promise<any>;
+	}>;
+
+type IsNeverType<T> = [T] extends [never] ? true : false;
+
+type StrictExtract<Union, Cond> = Cond extends Union ? Union : never;
+
+type IsCaseMatched<E extends keyof Endpoints, P extends Endpoints[E]['req'], C extends number> =
+	IsNeverType<StrictExtract<Endpoints[E]['res']['$switch']['$cases'][C], [P, any]>> extends false ? true : false;
+
+type GetCaseResult<E extends keyof Endpoints, P extends Endpoints[E]['req'], C extends number> =
+	StrictExtract<Endpoints[E]['res']['$switch']['$cases'][C], [P, any]>[1];
+
+export class APIClient {
+	public origin: string;
+	public credential: string | null | undefined;
+	public fetch: FetchLike;
+
+	constructor(opts: {
+		origin: APIClient['origin'];
+		credential?: APIClient['credential'];
+		fetch?: APIClient['fetch'] | null | undefined;
+	}) {
+		this.origin = opts.origin;
+		this.credential = opts.credential;
+		// ネイティブ関数をそのまま変数に代入して使おうとするとChromiumではIllegal invocationエラーが発生するため、
+		// 環境で実装されているfetchを使う場合は無名関数でラップして使用する
+		this.fetch = opts.fetch || ((...args) => fetch(...args));
+	}
+
+	public request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(
+		endpoint: E, params: P = {} as P, credential?: string | null | undefined,
+	): Promise<Endpoints[E]['res'] extends { $switch: { $cases: [any, any][]; $default: any; }; }
+		?
+			IsCaseMatched<E, P, 0> extends true ? GetCaseResult<E, P, 0> :
+			IsCaseMatched<E, P, 1> extends true ? GetCaseResult<E, P, 1> :
+			IsCaseMatched<E, P, 2> extends true ? GetCaseResult<E, P, 2> :
+			IsCaseMatched<E, P, 3> extends true ? GetCaseResult<E, P, 3> :
+			IsCaseMatched<E, P, 4> extends true ? GetCaseResult<E, P, 4> :
+			IsCaseMatched<E, P, 5> extends true ? GetCaseResult<E, P, 5> :
+			IsCaseMatched<E, P, 6> extends true ? GetCaseResult<E, P, 6> :
+			IsCaseMatched<E, P, 7> extends true ? GetCaseResult<E, P, 7> :
+			IsCaseMatched<E, P, 8> extends true ? GetCaseResult<E, P, 8> :
+			IsCaseMatched<E, P, 9> extends true ? GetCaseResult<E, P, 9> :
+			Endpoints[E]['res']['$switch']['$default']
+		: Endpoints[E]['res']>
+	{
+		const promise = new Promise((resolve, reject) => {
+			this.fetch(`${this.origin}/api/${endpoint}`, {
+				method: 'POST',
+				body: JSON.stringify({
+					...params,
+					i: credential !== undefined ? credential : this.credential,
+				}),
+				credentials: 'omit',
+				cache: 'no-cache',
+			}).then(async (res) => {
+				const body = res.status === 204 ? null : await res.json();
+	
+				if (res.status === 200) {
+					resolve(body);
+				} else if (res.status === 204) {
+					resolve(null);
+				} else {
+					reject({
+						[MK_API_ERROR]: true,
+						...body.error,
+					});
+				}
+			}).catch(reject);
+		});
+	
+		return promise as any;
+	}
+}
diff --git a/packages/calckey-js/src/api.types.ts b/packages/calckey-js/src/api.types.ts
new file mode 100644
index 000000000..86aabaca4
--- /dev/null
+++ b/packages/calckey-js/src/api.types.ts
@@ -0,0 +1,612 @@
+import {
+	Ad, Announcement, Antenna, App, AuthSession, Blocking, Channel, Clip, DateString, DetailedInstanceMetadata, DriveFile, DriveFolder, Following, FollowingFolloweePopulated, FollowingFollowerPopulated, FollowRequest, GalleryPost, Instance, InstanceMetadata,
+	LiteInstanceMetadata,
+	MeDetailed,
+	Note, NoteFavorite, OriginType, Page, ServerInfo, Stats, User, UserDetailed, UserGroup, UserList, UserSorting, Notification, NoteReaction, Signin, MessagingMessage,
+} from './entities';
+
+type TODO = Record<string, any> | null;
+
+type NoParams = Record<string, never>;
+
+type ShowUserReq = { username: string; host?: string; } | { userId: User['id']; };
+
+export type Endpoints = {
+	// admin
+	'admin/abuse-user-reports': { req: TODO; res: TODO; };
+	'admin/delete-all-files-of-a-user': { req: { userId: User['id']; }; res: null; };
+	'admin/delete-logs': { req: NoParams; res: null; };
+	'admin/get-index-stats': { req: TODO; res: TODO; };
+	'admin/get-table-stats': { req: TODO; res: TODO; };
+	'admin/invite': { req: TODO; res: TODO; };
+	'admin/logs': { req: TODO; res: TODO; };
+	'admin/reset-password': { req: TODO; res: TODO; };
+	'admin/resolve-abuse-user-report': { req: TODO; res: TODO; };
+	'admin/resync-chart': { req: TODO; res: TODO; };
+	'admin/send-email': { req: TODO; res: TODO; };
+	'admin/server-info': { req: TODO; res: TODO; };
+	'admin/show-moderation-logs': { req: TODO; res: TODO; };
+	'admin/show-user': { req: TODO; res: TODO; };
+	'admin/show-users': { req: TODO; res: TODO; };
+	'admin/silence-user': { req: TODO; res: TODO; };
+	'admin/suspend-user': { req: TODO; res: TODO; };
+	'admin/unsilence-user': { req: TODO; res: TODO; };
+	'admin/unsuspend-user': { req: TODO; res: TODO; };
+	'admin/update-meta': { req: TODO; res: TODO; };
+	'admin/vacuum': { req: TODO; res: TODO; };
+	'admin/accounts/create': { req: TODO; res: TODO; };
+	'admin/ad/create': { req: TODO; res: TODO; };
+	'admin/ad/delete': { req: { id: Ad['id']; }; res: null; };
+	'admin/ad/list': { req: TODO; res: TODO; };
+	'admin/ad/update': { req: TODO; res: TODO; };
+	'admin/announcements/create': { req: TODO; res: TODO; };
+	'admin/announcements/delete': { req: { id: Announcement['id'] }; res: null; };
+	'admin/announcements/list': { req: TODO; res: TODO; };
+	'admin/announcements/update': { req: TODO; res: TODO; };
+	'admin/drive/clean-remote-files': { req: TODO; res: TODO; };
+	'admin/drive/cleanup': { req: TODO; res: TODO; };
+	'admin/drive/files': { req: TODO; res: TODO; };
+	'admin/drive/show-file': { req: TODO; res: TODO; };
+	'admin/emoji/add': { req: TODO; res: TODO; };
+	'admin/emoji/copy': { req: TODO; res: TODO; };
+	'admin/emoji/list-remote': { req: TODO; res: TODO; };
+	'admin/emoji/list': { req: TODO; res: TODO; };
+	'admin/emoji/remove': { req: TODO; res: TODO; };
+	'admin/emoji/update': { req: TODO; res: TODO; };
+	'admin/federation/delete-all-files': { req: { host: string; }; res: null; };
+	'admin/federation/refresh-remote-instance-metadata': { req: TODO; res: TODO; };
+	'admin/federation/remove-all-following': { req: TODO; res: TODO; };
+	'admin/federation/update-instance': { req: TODO; res: TODO; };
+	'admin/moderators/add': { req: TODO; res: TODO; };
+	'admin/moderators/remove': { req: TODO; res: TODO; };
+	'admin/promo/create': { req: TODO; res: TODO; };
+	'admin/queue/clear': { req: TODO; res: TODO; };
+	'admin/queue/deliver-delayed': { req: TODO; res: TODO; };
+	'admin/queue/inbox-delayed': { req: TODO; res: TODO; };
+	'admin/queue/jobs': { req: TODO; res: TODO; };
+	'admin/queue/stats': { req: TODO; res: TODO; };
+	'admin/relays/add': { req: TODO; res: TODO; };
+	'admin/relays/list': { req: TODO; res: TODO; };
+	'admin/relays/remove': { req: TODO; res: TODO; };
+
+	// announcements
+	'announcements': { req: { limit?: number; withUnreads?: boolean; sinceId?: Announcement['id']; untilId?: Announcement['id']; }; res: Announcement[]; };
+
+	// antennas
+	'antennas/create': { req: TODO; res: Antenna; };
+	'antennas/delete': { req: { antennaId: Antenna['id']; }; res: null; };
+	'antennas/list': { req: NoParams; res: Antenna[]; };
+	'antennas/notes': { req: { antennaId: Antenna['id']; limit?: number; sinceId?: Note['id']; untilId?: Note['id']; }; res: Note[]; };
+	'antennas/show': { req: { antennaId: Antenna['id']; }; res: Antenna; };
+	'antennas/update': { req: TODO; res: Antenna; };
+	'antennas/mark-read': { req: TODO; res: Antenna; };
+
+	// ap
+	'ap/get': { req: { uri: string; }; res: Record<string, any>; };
+	'ap/show': { req: { uri: string; }; res: {
+		type: 'Note';
+		object: Note;
+	} | {
+		type: 'User';
+		object: UserDetailed;
+	}; };
+
+	// app
+	'app/create': { req: TODO; res: App; };
+	'app/show': { req: { appId: App['id']; }; res: App; };
+
+	// auth
+	'auth/accept': { req: { token: string; }; res: null; };
+	'auth/session/generate': { req: { appSecret: string; }; res: { token: string; url: string; }; };
+	'auth/session/show': { req: { token: string; }; res: AuthSession; };
+	'auth/session/userkey': { req: { appSecret: string; token: string; }; res: { accessToken: string; user: User }; };
+
+	// blocking
+	'blocking/create': { req: { userId: User['id'] }; res: UserDetailed; };
+	'blocking/delete': { req: { userId: User['id'] }; res: UserDetailed; };
+	'blocking/list': { req: { limit?: number; sinceId?: Blocking['id']; untilId?: Blocking['id']; }; res: Blocking[]; };
+
+	// channels
+	'channels/create': { req: TODO; res: TODO; };
+	'channels/featured': { req: TODO; res: TODO; };
+	'channels/follow': { req: TODO; res: TODO; };
+	'channels/followed': { req: TODO; res: TODO; };
+	'channels/owned': { req: TODO; res: TODO; };
+	'channels/pin-note': { req: TODO; res: TODO; };
+	'channels/show': { req: TODO; res: TODO; };
+	'channels/timeline': { req: TODO; res: TODO; };
+	'channels/unfollow': { req: TODO; res: TODO; };
+	'channels/update': { req: TODO; res: TODO; };
+
+	// charts
+	'charts/active-users': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: {
+		local: {
+			users: number[];
+		};
+		remote: {
+			users: number[];
+		};
+	}; };
+	'charts/drive': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: {
+		local: {
+			decCount: number[];
+			decSize: number[];
+			incCount: number[];
+			incSize: number[];
+			totalCount: number[];
+			totalSize: number[];
+		};
+		remote: {
+			decCount: number[];
+			decSize: number[];
+			incCount: number[];
+			incSize: number[];
+			totalCount: number[];
+			totalSize: number[];
+		};
+	}; };
+	'charts/federation': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: {
+		instance: {
+			dec: number[];
+			inc: number[];
+			total: number[];
+		};
+	}; };
+	'charts/hashtag': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: TODO; };
+	'charts/instance': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; host: string; }; res: {
+		drive: {
+			decFiles: number[];
+			decUsage: number[];
+			incFiles: number[];
+			incUsage: number[];
+			totalFiles: number[];
+			totalUsage: number[];
+		};
+		followers: {
+			dec: number[];
+			inc: number[];
+			total: number[];
+		};
+		following: {
+			dec: number[];
+			inc: number[];
+			total: number[];
+		};
+		notes: {
+			dec: number[];
+			inc: number[];
+			total: number[];
+			diffs: {
+				normal: number[];
+				renote: number[];
+				reply: number[];
+			};
+		};
+		requests: {
+			failed: number[];
+			received: number[];
+			succeeded: number[];
+		};
+		users: {
+			dec: number[];
+			inc: number[];
+			total: number[];
+		};
+	}; };
+	'charts/network': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: TODO; };
+	'charts/notes': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: {
+		local: {
+			dec: number[];
+			inc: number[];
+			total: number[];
+			diffs: {
+				normal: number[];
+				renote: number[];
+				reply: number[];
+			};
+		};
+		remote: {
+			dec: number[];
+			inc: number[];
+			total: number[];
+			diffs: {
+				normal: number[];
+				renote: number[];
+				reply: number[];
+			};
+		};
+	}; };
+	'charts/user/drive': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; userId: User['id']; }; res: {
+		decCount: number[];
+		decSize: number[];
+		incCount: number[];
+		incSize: number[];
+		totalCount: number[];
+		totalSize: number[];
+	}; };
+	'charts/user/following': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; userId: User['id']; }; res: TODO; };
+	'charts/user/notes': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; userId: User['id']; }; res: {
+		dec: number[];
+		inc: number[];
+		total: number[];
+		diffs: {
+			normal: number[];
+			renote: number[];
+			reply: number[];
+		};
+	}; };
+	'charts/user/reactions': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; userId: User['id']; }; res: TODO; };
+	'charts/users': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: {
+		local: {
+			dec: number[];
+			inc: number[];
+			total: number[];
+		};
+		remote: {
+			dec: number[];
+			inc: number[];
+			total: number[];
+		};
+	}; };
+
+	// clips
+	'clips/add-note': { req: TODO; res: TODO; };
+	'clips/create': { req: TODO; res: TODO; };
+	'clips/delete': { req: { clipId: Clip['id']; }; res: null; };
+	'clips/list': { req: TODO; res: TODO; };
+	'clips/notes': { req: TODO; res: TODO; };
+	'clips/show': { req: TODO; res: TODO; };
+	'clips/update': { req: TODO; res: TODO; };
+
+	// drive
+	'drive': { req: NoParams; res: { capacity: number; usage: number; }; };
+	'drive/files': { req: { folderId?: DriveFolder['id'] | null; type?: DriveFile['type'] | null; limit?: number; sinceId?: DriveFile['id']; untilId?: DriveFile['id']; }; res: DriveFile[]; };
+	'drive/files/attached-notes': { req: TODO; res: TODO; };
+	'drive/files/check-existence': { req: TODO; res: TODO; };
+	'drive/files/create': { req: TODO; res: TODO; };
+	'drive/files/delete': { req: { fileId: DriveFile['id']; }; res: null; };
+	'drive/files/find-by-hash': { req: TODO; res: TODO; };
+	'drive/files/find': { req: { name: string; folderId?: DriveFolder['id'] | null; }; res: DriveFile[]; };
+	'drive/files/show': { req: { fileId?: DriveFile['id']; url?: string; }; res: DriveFile; };
+	'drive/files/update': { req: { fileId: DriveFile['id']; folderId?: DriveFolder['id'] | null; name?: string; isSensitive?: boolean; comment?: string | null; }; res: DriveFile; };
+	'drive/files/upload-from-url': { req: { url: string; folderId?: DriveFolder['id'] | null; isSensitive?: boolean; comment?: string | null; marker?: string | null; force?: boolean; }; res: null; };
+	'drive/folders': { req: { folderId?: DriveFolder['id'] | null; limit?: number; sinceId?: DriveFile['id']; untilId?: DriveFile['id']; }; res: DriveFolder[]; };
+	'drive/folders/create': { req: { name?: string; parentId?: DriveFolder['id'] | null; }; res: DriveFolder; };
+	'drive/folders/delete': { req: { folderId: DriveFolder['id']; }; res: null; };
+	'drive/folders/find': { req: { name: string; parentId?: DriveFolder['id'] | null; }; res: DriveFolder[]; };
+	'drive/folders/show': { req: { folderId: DriveFolder['id']; }; res: DriveFolder; };
+	'drive/folders/update': { req: { folderId: DriveFolder['id']; name?: string; parentId?: DriveFolder['id'] | null; }; res: DriveFolder; };
+	'drive/stream': { req: { type?: DriveFile['type'] | null; limit?: number; sinceId?: DriveFile['id']; untilId?: DriveFile['id']; }; res: DriveFile[]; };
+
+	// endpoint
+	'endpoint': { req: { endpoint: string; }; res: { params: { name: string; type: string; }[]; }; };
+
+	// endpoints
+	'endpoints': { req: NoParams; res: string[]; };
+
+	// federation
+	'federation/dns': { req: { host: string; }; res: {
+		a: string[];
+		aaaa: string[];
+		cname: string[];
+		txt: string[];
+	}; };
+	'federation/followers': { req: { host: string; limit?: number; sinceId?: Following['id']; untilId?: Following['id']; }; res: FollowingFolloweePopulated[]; };
+	'federation/following': { req: { host: string; limit?: number; sinceId?: Following['id']; untilId?: Following['id']; }; res: FollowingFolloweePopulated[]; };
+	'federation/instances': { req: {
+		host?: string | null;
+		blocked?: boolean | null;
+		notResponding?: boolean | null;
+		suspended?: boolean | null;
+		federating?: boolean | null;
+		subscribing?: boolean | null;
+		publishing?: boolean | null;
+		limit?: number;
+		offset?: number;
+		sort?: '+pubSub' | '-pubSub' | '+notes' | '-notes' | '+users' | '-users' | '+following' | '-following' | '+followers' | '-followers' | '+caughtAt' | '-caughtAt' | '+lastCommunicatedAt' | '-lastCommunicatedAt' | '+driveUsage' | '-driveUsage' | '+driveFiles' | '-driveFiles';
+	}; res: Instance[]; };
+	'federation/show-instance': { req: { host: string; }; res: Instance; };
+	'federation/update-remote-user': { req: { userId: User['id']; }; res: null; };
+	'federation/users': { req: { host: string; limit?: number; sinceId?: User['id']; untilId?: User['id']; }; res: UserDetailed[]; };
+
+	// following
+	'following/create': { req: { userId: User['id'] }; res: User; };
+	'following/delete': { req: { userId: User['id'] }; res: User; };
+	'following/requests/accept': { req: { userId: User['id'] }; res: null; };
+	'following/requests/cancel': { req: { userId: User['id'] }; res: User; };
+	'following/requests/list': { req: NoParams; res: FollowRequest[]; };
+	'following/requests/reject': { req: { userId: User['id'] }; res: null; };
+
+	// gallery
+	'gallery/featured': { req: TODO; res: TODO; };
+	'gallery/popular': { req: TODO; res: TODO; };
+	'gallery/posts': { req: TODO; res: TODO; };
+	'gallery/posts/create': { req: TODO; res: TODO; };
+	'gallery/posts/delete': { req: { postId: GalleryPost['id'] }; res: null; };
+	'gallery/posts/like': { req: TODO; res: TODO; };
+	'gallery/posts/show': { req: TODO; res: TODO; };
+	'gallery/posts/unlike': { req: TODO; res: TODO; };
+	'gallery/posts/update': { req: TODO; res: TODO; };
+
+	// games
+	'games/reversi/games': { req: TODO; res: TODO; };
+	'games/reversi/games/show': { req: TODO; res: TODO; };
+	'games/reversi/games/surrender': { req: TODO; res: TODO; };
+	'games/reversi/invitations': { req: TODO; res: TODO; };
+	'games/reversi/match': { req: TODO; res: TODO; };
+	'games/reversi/match/cancel': { req: TODO; res: TODO; };
+
+	// get-online-users-count
+	'get-online-users-count': { req: NoParams; res: { count: number; }; };
+
+	// hashtags
+	'hashtags/list': { req: TODO; res: TODO; };
+	'hashtags/search': { req: TODO; res: TODO; };
+	'hashtags/show': { req: TODO; res: TODO; };
+	'hashtags/trend': { req: TODO; res: TODO; };
+	'hashtags/users': { req: TODO; res: TODO; };
+
+	// i
+	'i': { req: NoParams; res: User; };
+	'i/apps': { req: TODO; res: TODO; };
+	'i/authorized-apps': { req: TODO; res: TODO; };
+	'i/change-password': { req: TODO; res: TODO; };
+	'i/delete-account': { req: { password: string; }; res: null; };
+	'i/export-blocking': { req: TODO; res: TODO; };
+	'i/export-following': { req: TODO; res: TODO; };
+	'i/export-mute': { req: TODO; res: TODO; };
+	'i/export-notes': { req: TODO; res: TODO; };
+	'i/export-user-lists': { req: TODO; res: TODO; };
+	'i/favorites': { req: { limit?: number; sinceId?: NoteFavorite['id']; untilId?: NoteFavorite['id']; }; res: NoteFavorite[]; };
+	'i/gallery/likes': { req: TODO; res: TODO; };
+	'i/gallery/posts': { req: TODO; res: TODO; };
+	'i/get-word-muted-notes-count': { req: TODO; res: TODO; };
+	'i/import-following': { req: TODO; res: TODO; };
+	'i/import-user-lists': { req: TODO; res: TODO; };
+	'i/move': { req: TODO; res: TODO; };
+	'i/known-as': { req: TODO; res: TODO; };
+	'i/notifications': { req: {
+		limit?: number;
+		sinceId?: Notification['id'];
+		untilId?: Notification['id'];
+		following?: boolean;
+		markAsRead?: boolean;
+		includeTypes?: Notification['type'][];
+		excludeTypes?: Notification['type'][];
+	}; res: Notification[]; };
+	'i/page-likes': { req: TODO; res: TODO; };
+	'i/pages': { req: TODO; res: TODO; };
+	'i/pin': { req: { noteId: Note['id']; }; res: MeDetailed; };
+	'i/read-all-messaging-messages': { req: TODO; res: TODO; };
+	'i/read-all-unread-notes': { req: TODO; res: TODO; };
+	'i/read-announcement': { req: TODO; res: TODO; };
+	'i/regenerate-token': { req: { password: string; }; res: null; };
+	'i/registry/get-all': { req: { scope?: string[]; }; res: Record<string, any>; };
+	'i/registry/get-detail': { req: { key: string; scope?: string[]; }; res: { updatedAt: DateString; value: any; }; };
+	'i/registry/get': { req: { key: string; scope?: string[]; }; res: any; };
+	'i/registry/keys-with-type': { req: { scope?: string[]; }; res: Record<string, 'null' | 'array' | 'number' | 'string' | 'boolean' | 'object'>; };
+	'i/registry/keys': { req: { scope?: string[]; }; res: string[]; };
+	'i/registry/remove': { req: { key: string; scope?: string[]; }; res: null; };
+	'i/registry/scopes': { req: NoParams; res: string[][]; };
+	'i/registry/set': { req: { key: string; value: any; scope?: string[]; }; res: null; };
+	'i/revoke-token': { req: TODO; res: TODO; };
+	'i/signin-history': { req: { limit?: number; sinceId?: Signin['id']; untilId?: Signin['id']; }; res: Signin[]; };
+	'i/unpin': { req: { noteId: Note['id']; }; res: MeDetailed; };
+	'i/update-email': { req: {
+		password: string;
+		email?: string | null;
+	}; res: MeDetailed; };
+	'i/update': { req: {
+		name?: string | null;
+		description?: string | null;
+		lang?: string | null;
+		location?: string | null;
+		birthday?: string | null;
+		avatarId?: DriveFile['id'] | null;
+		bannerId?: DriveFile['id'] | null;
+		fields?: {
+			name: string;
+			value: string;
+		}[];
+		isLocked?: boolean;
+		isExplorable?: boolean;
+		hideOnlineStatus?: boolean;
+		carefulBot?: boolean;
+		autoAcceptFollowed?: boolean;
+		noCrawle?: boolean;
+		isBot?: boolean;
+		isCat?: boolean;
+		injectFeaturedNote?: boolean;
+		receiveAnnouncementEmail?: boolean;
+		alwaysMarkNsfw?: boolean;
+		mutedWords?: string[][];
+		mutingNotificationTypes?: Notification['type'][];
+		emailNotificationTypes?: string[];
+	}; res: MeDetailed; };
+	'i/user-group-invites': { req: TODO; res: TODO; };
+	'i/2fa/done': { req: TODO; res: TODO; };
+	'i/2fa/key-done': { req: TODO; res: TODO; };
+	'i/2fa/password-less': { req: TODO; res: TODO; };
+	'i/2fa/register-key': { req: TODO; res: TODO; };
+	'i/2fa/register': { req: TODO; res: TODO; };
+	'i/2fa/remove-key': { req: TODO; res: TODO; };
+	'i/2fa/unregister': { req: TODO; res: TODO; };
+
+	// messaging
+	'messaging/history': { req: { limit?: number; group?: boolean; }; res: MessagingMessage[]; };
+	'messaging/messages': { req: { userId?: User['id']; groupId?: UserGroup['id']; limit?: number; sinceId?: MessagingMessage['id']; untilId?: MessagingMessage['id']; markAsRead?: boolean; }; res: MessagingMessage[]; };
+	'messaging/messages/create': { req: { userId?: User['id']; groupId?: UserGroup['id']; text?: string; fileId?: DriveFile['id']; }; res: MessagingMessage; };
+	'messaging/messages/delete': { req: { messageId: MessagingMessage['id']; }; res: null; };
+	'messaging/messages/read': { req: { messageId: MessagingMessage['id']; }; res: null; };
+
+	// meta
+	'meta': { req: { detail?: boolean; }; res: {
+		$switch: {
+			$cases: [[
+				{ detail: true; },
+				DetailedInstanceMetadata,
+			], [
+				{ detail: false; },
+				LiteInstanceMetadata,
+			], [
+				{ detail: boolean; },
+				LiteInstanceMetadata | DetailedInstanceMetadata,
+			]];
+			$default: LiteInstanceMetadata;
+		};
+	}; };
+
+	// miauth
+	'miauth/gen-token': { req: TODO; res: TODO; };
+
+	// mute
+	'mute/create': { req: TODO; res: TODO; };
+	'mute/delete': { req: { userId: User['id'] }; res: null; };
+	'mute/list': { req: TODO; res: TODO; };
+
+	// my
+	'my/apps': { req: TODO; res: TODO; };
+
+	// notes
+	'notes': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; }; res: Note[]; };
+	'notes/children': { req: { noteId: Note['id']; limit?: number; sinceId?: Note['id']; untilId?: Note['id']; }; res: Note[]; };
+	'notes/clips': { req: TODO; res: TODO; };
+	'notes/conversation': { req: TODO; res: TODO; };
+	'notes/create': { req: {
+		visibility?: 'public' | 'home' | 'followers' | 'specified',
+		visibleUserIds?: User['id'][];
+		text?: null | string;
+		cw?: null | string;
+		viaMobile?: boolean;
+		localOnly?: boolean;
+		fileIds?: DriveFile['id'][];
+		replyId?: null | Note['id'];
+		renoteId?: null | Note['id'];
+		channelId?: null | Channel['id'];
+		poll?: null | {
+			choices: string[];
+			multiple?: boolean;
+			expiresAt?: null | number;
+			expiredAfter?: null | number;
+		};
+	}; res: { createdNote: Note }; };
+	'notes/delete': { req: { noteId: Note['id']; }; res: null; };
+	'notes/favorites/create': { req: { noteId: Note['id']; }; res: null; };
+	'notes/favorites/delete': { req: { noteId: Note['id']; }; res: null; };
+	'notes/featured': { req: TODO; res: Note[]; };
+	'notes/global-timeline': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
+	'notes/recommended-timeline': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
+	'notes/hybrid-timeline': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
+	'notes/local-timeline': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
+	'notes/mentions': { req: { following?: boolean; limit?: number; sinceId?: Note['id']; untilId?: Note['id']; }; res: Note[]; };
+	'notes/polls/recommendation': { req: TODO; res: TODO; };
+	'notes/polls/vote': { req: { noteId: Note['id']; choice: number; }; res: null; };
+	'notes/reactions': { req: { noteId: Note['id']; type?: string | null; limit?: number; }; res: NoteReaction[]; };
+	'notes/reactions/create': { req: { noteId: Note['id']; reaction: string; }; res: null; };
+	'notes/reactions/delete': { req: { noteId: Note['id']; }; res: null; };
+	'notes/renotes': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; noteId: Note['id']; }; res: Note[]; };
+	'notes/replies': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; noteId: Note['id']; }; res: Note[]; };
+	'notes/search-by-tag': { req: TODO; res: TODO; };
+	'notes/search': { req: TODO; res: TODO; };
+	'notes/show': { req: { noteId: Note['id']; }; res: Note; };
+	'notes/state': { req: TODO; res: TODO; };
+	'notes/timeline': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
+	'notes/unrenote': { req: { noteId: Note['id']; }; res: null; };
+	'notes/user-list-timeline': { req: { listId: UserList['id']; limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
+	'notes/watching/create': { req: TODO; res: TODO; };
+	'notes/watching/delete': { req: { noteId: Note['id']; }; res: null; };
+
+	// notifications
+	'notifications/create': { req: { body: string; header?: string | null; icon?: string | null; }; res: null; };
+	'notifications/mark-all-as-read': { req: NoParams; res: null; };
+	'notifications/read': { req: { notificationId: Notification['id']; }; res: null; };
+
+	// page-push
+	'page-push': { req: { pageId: Page['id']; event: string; var?: any; }; res: null; };
+
+	// pages
+	'pages/create': { req: TODO; res: Page; };
+	'pages/delete': { req: { pageId: Page['id']; }; res: null; };
+	'pages/featured': { req: NoParams; res: Page[]; };
+	'pages/like': { req: { pageId: Page['id']; }; res: null; };
+	'pages/show': { req: { pageId?: Page['id']; name?: string; username?: string; }; res: Page; };
+	'pages/unlike': { req: { pageId: Page['id']; }; res: null; };
+	'pages/update': { req: TODO; res: null; };
+
+	// ping
+	'ping': { req: NoParams; res: { pong: number; }; };
+
+	// pinned-users
+	'pinned-users': { req: TODO; res: TODO; };
+
+	// promo
+	'promo/read': { req: TODO; res: TODO; };
+
+	// request-reset-password
+	'request-reset-password': { req: { username: string; email: string; }; res: null; };
+
+	// reset-password
+	'reset-password': { req: { token: string; password: string; }; res: null; };
+
+	// room
+	'room/show': { req: TODO; res: TODO; };
+	'room/update': { req: TODO; res: TODO; };
+
+	// stats
+	'stats': { req: NoParams; res: Stats; };
+
+	// server-info
+	'server-info': { req: NoParams; res: ServerInfo; };
+
+	// ck specific
+	'latest-version': { req: NoParams; res: TODO; };
+
+	// sw
+	'sw/register': { req: TODO; res: TODO; };
+
+	// username
+	'username/available': { req: { username: string; }; res: { available: boolean; }; };
+
+	// users
+	'users': { req: { limit?: number; offset?: number; sort?: UserSorting; origin?: OriginType; }; res: User[]; };
+	'users/clips': { req: TODO; res: TODO; };
+	'users/followers': { req: { userId?: User['id']; username?: User['username']; host?: User['host'] | null; limit?: number; sinceId?: Following['id']; untilId?: Following['id']; }; res: FollowingFollowerPopulated[]; };
+	'users/following': { req: { userId?: User['id']; username?: User['username']; host?: User['host'] | null; limit?: number; sinceId?: Following['id']; untilId?: Following['id']; }; res: FollowingFolloweePopulated[]; };
+	'users/gallery/posts': { req: TODO; res: TODO; };
+	'users/get-frequently-replied-users': { req: TODO; res: TODO; };
+	'users/groups/create': { req: TODO; res: TODO; };
+	'users/groups/delete': { req: { groupId: UserGroup['id'] }; res: null; };
+	'users/groups/invitations/accept': { req: TODO; res: TODO; };
+	'users/groups/invitations/reject': { req: TODO; res: TODO; };
+	'users/groups/invite': { req: TODO; res: TODO; };
+	'users/groups/joined': { req: TODO; res: TODO; };
+	'users/groups/owned': { req: TODO; res: TODO; };
+	'users/groups/pull': { req: TODO; res: TODO; };
+	'users/groups/show': { req: TODO; res: TODO; };
+	'users/groups/transfer': { req: TODO; res: TODO; };
+	'users/groups/update': { req: TODO; res: TODO; };
+	'users/lists/create': { req: { name: string; }; res: UserList; };
+	'users/lists/delete': { req: { listId: UserList['id']; }; res: null; };
+	'users/lists/list': { req: NoParams; res: UserList[]; };
+	'users/lists/pull': { req: { listId: UserList['id']; userId: User['id']; }; res: null; };
+	'users/lists/push': { req: { listId: UserList['id']; userId: User['id']; }; res: null; };
+	'users/lists/show': { req: { listId: UserList['id']; }; res: UserList; };
+	'users/lists/update': { req: { listId: UserList['id']; name: string; }; res: UserList; };
+	'users/notes': { req: { userId: User['id']; limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
+	'users/pages': { req: TODO; res: TODO; };
+	'users/recommendation': { req: TODO; res: TODO; };
+	'users/relation': { req: TODO; res: TODO; };
+	'users/report-abuse': { req: TODO; res: TODO; };
+	'users/search-by-username-and-host': { req: TODO; res: TODO; };
+	'users/search': { req: TODO; res: TODO; };
+	'users/show': { req: ShowUserReq | { userIds: User['id'][]; }; res: {
+		$switch: {
+			$cases: [[
+				{ userIds: User['id'][]; },
+				UserDetailed[],
+			]];
+			$default: UserDetailed;
+		};
+	}; };
+	'users/stats': { req: TODO; res: TODO; };
+};
diff --git a/packages/calckey-js/src/consts.ts b/packages/calckey-js/src/consts.ts
new file mode 100644
index 000000000..261ecd33f
--- /dev/null
+++ b/packages/calckey-js/src/consts.ts
@@ -0,0 +1,42 @@
+export const notificationTypes = ['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app'] as const;
+
+export const noteVisibilities = ['public', 'home', 'followers', 'specified'] as const;
+
+export const mutedNoteReasons = ['word', 'manual', 'spam', 'other'] as const;
+
+export const ffVisibility = ['public', 'followers', 'private'] as const;
+
+export const permissions = [
+	'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',
+];
diff --git a/packages/calckey-js/src/entities.ts b/packages/calckey-js/src/entities.ts
new file mode 100644
index 000000000..bade8b4b1
--- /dev/null
+++ b/packages/calckey-js/src/entities.ts
@@ -0,0 +1,478 @@
+export type ID = string;
+export type DateString = string;
+
+type TODO = Record<string, any>;
+
+// NOTE: 極力この型を使うのは避け、UserLite か UserDetailed か明示するように
+export type User = UserLite | UserDetailed;
+
+export type UserLite = {
+	id: ID;
+	username: string;
+	host: string | null;
+	name: string;
+	onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
+	avatarUrl: string;
+	avatarBlurhash: string;
+	alsoKnownAs: string[];
+	movedToUri: any;
+	emojis: {
+		name: string;
+		url: string;
+	}[];
+	instance?: {
+		name: Instance['name'];
+		softwareName: Instance['softwareName'];
+		softwareVersion: Instance['softwareVersion'];
+		iconUrl: Instance['iconUrl'];
+		faviconUrl: Instance['faviconUrl'];
+		themeColor: Instance['themeColor'];
+	};
+};
+
+export type UserDetailed = UserLite & {
+	bannerBlurhash: string | null;
+	bannerColor: string | null;
+	bannerUrl: string | null;
+	birthday: string | null;
+	createdAt: DateString;
+	description: string | null;
+	ffVisibility: 'public' | 'followers' | 'private';
+	fields: {name: string; value: string}[];
+	followersCount: number;
+	followingCount: number;
+	hasPendingFollowRequestFromYou: boolean;
+	hasPendingFollowRequestToYou: boolean;
+	isAdmin: boolean;
+	isBlocked: boolean;
+	isBlocking: boolean;
+	isBot: boolean;
+	isCat: boolean;
+	isFollowed: boolean;
+	isFollowing: boolean;
+	isLocked: boolean;
+	isModerator: boolean;
+	isMuted: boolean;
+	isSilenced: boolean;
+	isSuspended: boolean;
+	lang: string | null;
+	lastFetchedAt?: DateString;
+	location: string | null;
+	notesCount: number;
+	pinnedNoteIds: ID[];
+	pinnedNotes: Note[];
+	pinnedPage: Page | null;
+	pinnedPageId: string | null;
+	publicReactions: boolean;
+	securityKeys: boolean;
+	twoFactorEnabled: boolean;
+	updatedAt: DateString | null;
+	uri: string | null;
+	url: string | null;
+};
+
+export type UserGroup = TODO;
+
+export type UserList = {
+	id: ID;
+	createdAt: DateString;
+	name: string;
+	userIds: User['id'][];
+};
+
+export type MeDetailed = UserDetailed & {
+	avatarId: DriveFile['id'];
+	bannerId: DriveFile['id'];
+	autoAcceptFollowed: boolean;
+	alwaysMarkNsfw: boolean;
+	carefulBot: boolean;
+	emailNotificationTypes: string[];
+	hasPendingReceivedFollowRequest: boolean;
+	hasUnreadAnnouncement: boolean;
+	hasUnreadAntenna: boolean;
+	hasUnreadChannel: boolean;
+	hasUnreadMentions: boolean;
+	hasUnreadMessagingMessage: boolean;
+	hasUnreadNotification: boolean;
+	hasUnreadSpecifiedNotes: boolean;
+	hideOnlineStatus: boolean;
+	injectFeaturedNote: boolean;
+	integrations: Record<string, any>;
+	isDeleted: boolean;
+	isExplorable: boolean;
+	mutedWords: string[][];
+	mutingNotificationTypes: string[];
+	noCrawle: boolean;
+	receiveAnnouncementEmail: boolean;
+	usePasswordLessLogin: boolean;
+	[other: string]: any;
+};
+
+export type DriveFile = {
+	id: ID;
+	createdAt: DateString;
+	isSensitive: boolean;
+	name: string;
+	thumbnailUrl: string;
+	url: string;
+	type: string;
+	size: number;
+	md5: string;
+	blurhash: string;
+	comment: string | null;
+	properties: Record<string, any>;
+};
+
+export type DriveFolder = TODO;
+
+export type GalleryPost = TODO;
+
+export type Note = {
+	id: ID;
+	createdAt: DateString;
+	text: string | null;
+	cw: string | null;
+	user: User;
+	userId: User['id'];
+	reply?: Note;
+	replyId: Note['id'];
+	renote?: Note;
+	renoteId: Note['id'];
+	files: DriveFile[];
+	fileIds: DriveFile['id'][];
+	visibility: 'public' | 'home' | 'followers' | 'specified';
+	visibleUserIds?: User['id'][];
+	localOnly?: boolean;
+	myReaction?: string;
+	reactions: Record<string, number>;
+	renoteCount: number;
+	repliesCount: number;
+	poll?: {
+		expiresAt: DateString | null;
+		multiple: boolean;
+		choices: {
+			isVoted: boolean;
+			text: string;
+			votes: number;
+		}[];
+	};
+	emojis: {
+		name: string;
+		url: string;
+	}[];
+	uri?: string;
+	url?: string;
+	isHidden?: boolean;
+};
+
+export type NoteReaction = {
+	id: ID;
+	createdAt: DateString;
+	user: UserLite;
+	type: string;
+};
+
+export type Notification = {
+	id: ID;
+	createdAt: DateString;
+	isRead: boolean;
+} & ({
+	type: 'reaction';
+	reaction: string;
+	user: User;
+	userId: User['id'];
+	note: Note;
+} | {
+	type: 'reply';
+	user: User;
+	userId: User['id'];
+	note: Note;
+} | {
+	type: 'renote';
+	user: User;
+	userId: User['id'];
+	note: Note;
+} | {
+	type: 'quote';
+	user: User;
+	userId: User['id'];
+	note: Note;
+} | {
+	type: 'mention';
+	user: User;
+	userId: User['id'];
+	note: Note;
+} | {
+	type: 'pollVote';
+	user: User;
+	userId: User['id'];
+	note: Note;
+} | {
+	type: 'follow';
+	user: User;
+	userId: User['id'];
+} | {
+	type: 'followRequestAccepted';
+	user: User;
+	userId: User['id'];
+} | {
+	type: 'receiveFollowRequest';
+	user: User;
+	userId: User['id'];
+} | {
+	type: 'groupInvited';
+	invitation: UserGroup;
+	user: User;
+	userId: User['id'];
+} | {
+	type: 'app';
+	header?: string | null;
+	body: string;
+	icon?: string | null;
+});
+
+export type MessagingMessage = {
+	id: ID;
+	createdAt: DateString;
+	file: DriveFile | null;
+	fileId: DriveFile['id'] | null;
+	isRead: boolean;
+	reads: User['id'][];
+	text: string | null;
+	user: User;
+	userId: User['id'];
+	recipient?: User | null;
+	recipientId: User['id'] | null;
+	group?: UserGroup | null;
+	groupId: UserGroup['id'] | null;
+};
+
+export type CustomEmoji = {
+	id: string;
+	name: string;
+	url: string;
+	category: string;
+	aliases: string[];
+};
+
+export type LiteInstanceMetadata = {
+	maintainerName: string | null;
+	maintainerEmail: string | null;
+	version: string;
+	name: string | null;
+	uri: string;
+	description: string | null;
+	tosUrl: string | null;
+	disableRegistration: boolean;
+	disableLocalTimeline: boolean;
+	disableRecommendedTimeline: boolean;
+	disableGlobalTimeline: boolean;
+	driveCapacityPerLocalUserMb: number;
+	driveCapacityPerRemoteUserMb: number;
+	enableHcaptcha: boolean;
+	hcaptchaSiteKey: string | null;
+	enableRecaptcha: boolean;
+	recaptchaSiteKey: string | null;
+	swPublickey: string | null;
+	maxNoteTextLength: number;
+	enableEmail: boolean;
+	enableTwitterIntegration: boolean;
+	enableGithubIntegration: boolean;
+	enableDiscordIntegration: boolean;
+	enableServiceWorker: boolean;
+	emojis: CustomEmoji[];
+	ads: {
+		id: ID;
+		ratio: number;
+		place: string;
+		url: string;
+		imageUrl: string;
+	}[];
+};
+
+export type DetailedInstanceMetadata = LiteInstanceMetadata & {
+	features: Record<string, any>;
+};
+
+export type InstanceMetadata = LiteInstanceMetadata | DetailedInstanceMetadata;
+
+export type ServerInfo = {
+	machine: string;
+	cpu: {
+		model: string;
+		cores: number;
+	};
+	mem: {
+		total: number;
+	};
+	fs: {
+		total: number;
+		used: number;
+	};
+};
+
+export type Stats = {
+	notesCount: number;
+	originalNotesCount: number;
+	usersCount: number;
+	originalUsersCount: number;
+	instances: number;
+	driveUsageLocal: number;
+	driveUsageRemote: number;
+};
+
+export type Page = {
+	id: ID;
+	createdAt: DateString;
+	updatedAt: DateString;
+	userId: User['id'];
+	user: User;
+	content: Record<string, any>[];
+	variables: Record<string, any>[];
+	title: string;
+	name: string;
+	summary: string | null;
+	hideTitleWhenPinned: boolean;
+	alignCenter: boolean;
+	font: string;
+	script: string;
+	eyeCatchingImageId: DriveFile['id'] | null;
+	eyeCatchingImage: DriveFile | null;
+	attachedFiles: any;
+	likedCount: number;
+	isLiked?: boolean;
+};
+
+export type PageEvent = {
+	pageId: Page['id'];
+	event: string;
+	var: any;
+	userId: User['id'];
+	user: User;
+};
+
+export type Announcement = {
+	id: ID;
+	createdAt: DateString;
+	updatedAt: DateString | null;
+	text: string;
+	title: string;
+	imageUrl: string | null;
+	isRead?: boolean;
+};
+
+export type Antenna = {
+	id: ID;
+	createdAt: DateString;
+	name: string;
+	keywords: string[][]; // TODO
+	excludeKeywords: string[][]; // TODO
+	src: 'home' | 'all' | 'users' | 'list' | 'group' | 'instances';
+	userListId: ID | null; // TODO
+	userGroupId: ID | null; // TODO
+	users: string[]; // TODO
+	instances: string[];
+	caseSensitive: boolean;
+	notify: boolean;
+	withReplies: boolean;
+	withFile: boolean;
+	hasUnreadNote: boolean;
+};
+
+export type App = TODO;
+
+export type AuthSession = {
+	id: ID;
+	app: App;
+	token: string;
+};
+
+export type Ad = TODO;
+
+export type Clip = TODO;
+
+export type NoteFavorite = {
+	id: ID;
+	createdAt: DateString;
+	noteId: Note['id'];
+	note: Note;
+};
+
+export type FollowRequest = {
+	id: ID;
+	follower: User;
+	followee: User;
+};
+
+export type Channel = {
+	id: ID;
+	// TODO
+};
+
+export type Following = {
+	id: ID;
+	createdAt: DateString;
+	followerId: User['id'];
+	followeeId: User['id'];
+};
+
+export type FollowingFolloweePopulated = Following & {
+	followee: UserDetailed;
+};
+
+export type FollowingFollowerPopulated = Following & {
+	follower: UserDetailed;
+};
+
+export type Blocking = {
+	id: ID;
+	createdAt: DateString;
+	blockeeId: User['id'];
+	blockee: UserDetailed;
+};
+
+export type Instance = {
+	id: ID;
+	caughtAt: DateString;
+	host: string;
+	usersCount: number;
+	notesCount: number;
+	followingCount: number;
+	followersCount: number;
+	driveUsage: number;
+	driveFiles: number;
+	latestRequestSentAt: DateString | null;
+	latestStatus: number | null;
+	latestRequestReceivedAt: DateString | null;
+	lastCommunicatedAt: DateString;
+	isNotResponding: boolean;
+	isSuspended: boolean;
+	softwareName: string | null;
+	softwareVersion: string | null;
+	openRegistrations: boolean | null;
+	name: string | null;
+	description: string | null;
+	maintainerName: string | null;
+	maintainerEmail: string | null;
+	iconUrl: string | null;
+	faviconUrl: string | null;
+	themeColor: string | null;
+	infoUpdatedAt: DateString | null;
+};
+
+export type Signin = {
+	id: ID;
+	createdAt: DateString;
+	ip: string;
+	headers: Record<string, any>;
+	success: boolean;
+};
+
+export type UserSorting =
+	| '+follower'
+	| '-follower'
+	| '+createdAt'
+	| '-createdAt'
+	| '+updatedAt'
+	| '-updatedAt';
+export type OriginType = 'combined' | 'local' | 'remote';
diff --git a/packages/calckey-js/src/index.ts b/packages/calckey-js/src/index.ts
new file mode 100644
index 000000000..f431d65cc
--- /dev/null
+++ b/packages/calckey-js/src/index.ts
@@ -0,0 +1,26 @@
+import { Endpoints } from './api.types';
+import Stream, { Connection } from './streaming';
+import { Channels } from './streaming.types';
+import { Acct } from './acct';
+import * as consts from './consts';
+
+export {
+	Endpoints,
+	Stream,
+	Connection as ChannelConnection,
+	Channels,
+	Acct,
+};
+
+export const permissions = consts.permissions;
+export const notificationTypes = consts.notificationTypes;
+export const noteVisibilities = consts.noteVisibilities;
+export const mutedNoteReasons = consts.mutedNoteReasons;
+export const ffVisibility = consts.ffVisibility;
+
+// api extractor not supported yet
+//export * as api from './api';
+//export * as entities from './entities';
+import * as api from './api';
+import * as entities from './entities';
+export { api, entities };
diff --git a/packages/calckey-js/src/streaming.ts b/packages/calckey-js/src/streaming.ts
new file mode 100644
index 000000000..14be97b43
--- /dev/null
+++ b/packages/calckey-js/src/streaming.ts
@@ -0,0 +1,340 @@
+import autobind from 'autobind-decorator';
+import { EventEmitter } from 'eventemitter3';
+import ReconnectingWebsocket from 'reconnecting-websocket';
+import { BroadcastEvents, Channels } from './streaming.types';
+
+export function urlQuery(obj: Record<string, string | number | boolean | undefined>): string {
+	const params = Object.entries(obj)
+		.filter(([, v]) => Array.isArray(v) ? v.length : v !== undefined)
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		.reduce((a, [k, v]) => (a[k] = v!, a), {} as Record<string, string | number | boolean>);
+
+	return Object.entries(params)
+		.map((e) => `${e[0]}=${encodeURIComponent(e[1])}`)
+		.join('&');
+}
+
+type AnyOf<T extends Record<any, any>> = T[keyof T];
+
+type StreamEvents = {
+	_connected_: void;
+	_disconnected_: void;
+} & BroadcastEvents;
+
+/**
+ * Misskey stream connection
+ */
+export default class Stream extends EventEmitter<StreamEvents> {
+	private stream: ReconnectingWebsocket;
+	public state: 'initializing' | 'reconnecting' | 'connected' = 'initializing';
+	private sharedConnectionPools: Pool[] = [];
+	private sharedConnections: SharedConnection[] = [];
+	private nonSharedConnections: NonSharedConnection[] = [];
+	private idCounter = 0;
+
+	constructor(origin: string, user: { token: string; } | null, options?: {
+		WebSocket?: any;
+	}) {
+		super();
+		options = options || { };
+
+		const query = urlQuery({
+			i: user?.token,
+
+			// To prevent cache of an HTML such as error screen
+			_t: Date.now(),
+		});
+
+		const wsOrigin = origin.replace('http://', 'ws://').replace('https://', 'wss://');
+
+		this.stream = new ReconnectingWebsocket(`${wsOrigin}/streaming?${query}`, '', {
+			minReconnectionDelay: 1, // https://github.com/pladaria/reconnecting-websocket/issues/91
+			WebSocket: options.WebSocket,
+		});
+		this.stream.addEventListener('open', this.onOpen);
+		this.stream.addEventListener('close', this.onClose);
+		this.stream.addEventListener('message', this.onMessage);
+	}
+
+	@autobind
+	private genId(): string {
+		return (++this.idCounter).toString();
+	}
+
+	@autobind
+	public useChannel<C extends keyof Channels>(channel: C, params?: Channels[C]['params'], name?: string): Connection<Channels[C]> {
+		if (params) {
+			return this.connectToChannel(channel, params);
+		} else {
+			return this.useSharedConnection(channel, name);
+		}
+	}
+
+	@autobind
+	private useSharedConnection<C extends keyof Channels>(channel: C, name?: string): SharedConnection<Channels[C]> {
+		let pool = this.sharedConnectionPools.find(p => p.channel === channel);
+
+		if (pool == null) {
+			pool = new Pool(this, channel, this.genId());
+			this.sharedConnectionPools.push(pool);
+		}
+
+		const connection = new SharedConnection(this, channel, pool, name);
+		this.sharedConnections.push(connection);
+		return connection;
+	}
+
+	@autobind
+	public removeSharedConnection(connection: SharedConnection): void {
+		this.sharedConnections = this.sharedConnections.filter(c => c !== connection);
+	}
+
+	@autobind
+	public removeSharedConnectionPool(pool: Pool): void {
+		this.sharedConnectionPools = this.sharedConnectionPools.filter(p => p !== pool);
+	}
+
+	@autobind
+	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);
+		return connection;
+	}
+
+	@autobind
+	public disconnectToChannel(connection: NonSharedConnection): void {
+		this.nonSharedConnections = this.nonSharedConnections.filter(c => c !== connection);
+	}
+
+	/**
+	 * Callback of when open connection
+	 */
+	@autobind
+	private onOpen(): void {
+		const isReconnect = this.state === 'reconnecting';
+
+		this.state = 'connected';
+		this.emit('_connected_');
+
+		// チャンネル再接続
+		if (isReconnect) {
+			for (const p of this.sharedConnectionPools) p.connect();
+			for (const c of this.nonSharedConnections) c.connect();
+		}
+	}
+
+	/**
+	 * Callback of when close connection
+	 */
+	@autobind
+	private onClose(): void {
+		if (this.state === 'connected') {
+			this.state = 'reconnecting';
+			this.emit('_disconnected_');
+		}
+	}
+
+	/**
+	 * Callback of when received a message from connection
+	 */
+	@autobind
+	private onMessage(message: { data: string; }): void {
+		const { type, body } = JSON.parse(message.data);
+
+		if (type === 'channel') {
+			const id = body.id;
+
+			let connections: Connection[];
+
+			connections = this.sharedConnections.filter(c => c.id === id);
+
+			if (connections.length === 0) {
+				const found = this.nonSharedConnections.find(c => c.id === id);
+				if (found) {
+					connections = [found];
+				}
+			}
+
+			for (const c of connections) {
+				c.emit(body.type, body.body);
+				c.inCount++;
+			}
+		} else {
+			this.emit(type, body);
+		}
+	}
+
+	/**
+	 * Send a message to connection
+	 */
+	@autobind
+	public send(typeOrPayload: any, payload?: any): void {
+		const data = payload === undefined ? typeOrPayload : {
+			type: typeOrPayload,
+			body: payload,
+		};
+
+		this.stream.send(JSON.stringify(data));
+	}
+
+	/**
+	 * Close this connection
+	 */
+	@autobind
+	public close(): void {
+		this.stream.close();
+	}
+}
+
+// TODO: これらのクラスを Stream クラスの内部クラスにすれば余計なメンバをpublicにしないで済むかも？
+// もしくは @internal を使う？ https://www.typescriptlang.org/tsconfig#stripInternal
+class Pool {
+	public channel: string;
+	public id: string;
+	protected stream: Stream;
+	public users = 0;
+	private disposeTimerId: any;
+	private isConnected = false;
+
+	constructor(stream: Stream, channel: string, id: string) {
+		this.channel = channel;
+		this.stream = stream;
+		this.id = id;
+
+		this.stream.on('_disconnected_', this.onStreamDisconnected);
+	}
+
+	@autobind
+	private onStreamDisconnected(): void {
+		this.isConnected = false;
+	}
+
+	@autobind
+	public inc(): void {
+		if (this.users === 0 && !this.isConnected) {
+			this.connect();
+		}
+
+		this.users++;
+
+		// タイマー解除
+		if (this.disposeTimerId) {
+			clearTimeout(this.disposeTimerId);
+			this.disposeTimerId = null;
+		}
+	}
+
+	@autobind
+	public dec(): void {
+		this.users--;
+
+		// そのコネクションの利用者が誰もいなくなったら
+		if (this.users === 0) {
+			// また直ぐに再利用される可能性があるので、一定時間待ち、
+			// 新たな利用者が現れなければコネクションを切断する
+			this.disposeTimerId = setTimeout(() => {
+				this.disconnect();
+			}, 3000);
+		}
+	}
+
+	@autobind
+	public connect(): void {
+		if (this.isConnected) return;
+		this.isConnected = true;
+		this.stream.send('connect', {
+			channel: this.channel,
+			id: this.id,
+		});
+	}
+
+	@autobind
+	private disconnect(): void {
+		this.stream.off('_disconnected_', this.onStreamDisconnected);
+		this.stream.send('disconnect', { id: this.id });
+		this.stream.removeSharedConnectionPool(this);
+	}
+}
+
+export abstract class Connection<Channel extends AnyOf<Channels> = any> extends EventEmitter<Channel['events']> {
+	public channel: string;
+	protected stream: Stream;
+	public abstract id: string;
+
+	public name?: string; // for debug
+	public inCount = 0; // for debug
+	public outCount = 0; // for debug
+
+	constructor(stream: Stream, channel: string, name?: string) {
+		super();
+
+		this.stream = stream;
+		this.channel = channel;
+		this.name = name;
+	}
+
+	@autobind
+	public send<T extends keyof Channel['receives']>(type: T, body: Channel['receives'][T]): void {
+		this.stream.send('ch', {
+			id: this.id,
+			type: type,
+			body: body,
+		});
+
+		this.outCount++;
+	}
+
+	public abstract dispose(): void;
+}
+
+class SharedConnection<Channel extends AnyOf<Channels> = any> extends Connection<Channel> {
+	private pool: Pool;
+
+	public get id(): string {
+		return this.pool.id;
+	}
+
+	constructor(stream: Stream, channel: string, pool: Pool, name?: string) {
+		super(stream, channel, name);
+
+		this.pool = pool;
+		this.pool.inc();
+	}
+
+	@autobind
+	public dispose(): void {
+		this.pool.dec();
+		this.removeAllListeners();
+		this.stream.removeSharedConnection(this);
+	}
+}
+
+class NonSharedConnection<Channel extends AnyOf<Channels> = any> extends Connection<Channel> {
+	public id: string;
+	protected params: Channel['params'];
+
+	constructor(stream: Stream, channel: string, id: string, params: Channel['params']) {
+		super(stream, channel);
+
+		this.params = params;
+		this.id = id;
+
+		this.connect();
+	}
+
+	@autobind
+	public connect(): void {
+		this.stream.send('connect', {
+			channel: this.channel,
+			id: this.id,
+			params: this.params,
+		});
+	}
+
+	@autobind
+	public dispose(): void {
+		this.removeAllListeners();
+		this.stream.send('disconnect', { id: this.id });
+		this.stream.disconnectToChannel(this);
+	}
+}
diff --git a/packages/calckey-js/src/streaming.types.ts b/packages/calckey-js/src/streaming.types.ts
new file mode 100644
index 000000000..24adb9e3c
--- /dev/null
+++ b/packages/calckey-js/src/streaming.types.ts
@@ -0,0 +1,165 @@
+import { Antenna, CustomEmoji, DriveFile, MeDetailed, MessagingMessage, Note, Notification, PageEvent, User, UserGroup } from './entities';
+
+type FIXME = any;
+
+export type Channels = {
+	main: {
+		params: null;
+		events: {
+			notification: (payload: Notification) => void;
+			mention: (payload: Note) => void;
+			reply: (payload: Note) => void;
+			renote: (payload: Note) => void;
+			follow: (payload: User) => void; // 自分が他人をフォローしたとき
+			followed: (payload: User) => void; // 他人が自分をフォローしたとき
+			unfollow: (payload: User) => void; // 自分が他人をフォロー解除したとき
+			meUpdated: (payload: MeDetailed) => void;
+			pageEvent: (payload: PageEvent) => void;
+			urlUploadFinished: (payload: { marker: string; file: DriveFile; }) => void;
+			readAllNotifications: () => void;
+			unreadNotification: (payload: Notification) => void;
+			unreadMention: (payload: Note['id']) => void;
+			readAllUnreadMentions: () => void;
+			unreadSpecifiedNote: (payload: Note['id']) => void;
+			readAllUnreadSpecifiedNotes: () => void;
+			readAllMessagingMessages: () => void;
+			messagingMessage: (payload: MessagingMessage) => void;
+			unreadMessagingMessage: (payload: MessagingMessage) => void;
+			readAllAntennas: () => void;
+			unreadAntenna: (payload: Antenna) => void;
+			readAllAnnouncements: () => void;
+			readAllChannels: () => void;
+			unreadChannel: (payload: Note['id']) => void;
+			myTokenRegenerated: () => void;
+			reversiNoInvites: () => void;
+			reversiInvited: (payload: FIXME) => void;
+			signin: (payload: FIXME) => void;
+			registryUpdated: (payload: {
+				scope?: string[];
+				key: string;
+				value: any | null;
+			}) => void;
+			driveFileCreated: (payload: DriveFile) => void;
+			readAntenna: (payload: Antenna) => void;
+		};
+		receives: null;
+	};
+	homeTimeline: {
+		params: null;
+		events: {
+			note: (payload: Note) => void;
+		};
+		receives: null;
+	};
+	localTimeline: {
+		params: null;
+		events: {
+			note: (payload: Note) => void;
+		};
+		receives: null;
+	};
+	hybridTimeline: {
+		params: null;
+		events: {
+			note: (payload: Note) => void;
+		};
+		receives: null;
+	};
+	recommendedTimeline: {
+		params: null;
+		events: {
+			note: (payload: Note) => void;
+		};
+		receives: null;
+	};
+	globalTimeline: {
+		params: null;
+		events: {
+			note: (payload: Note) => void;
+		};
+		receives: null;
+	};
+	messaging: {
+		params: {
+			otherparty?: User['id'] | null;
+			group?: UserGroup['id'] | null;
+		};
+		events: {
+			message: (payload: MessagingMessage) => void;
+			deleted: (payload: MessagingMessage['id']) => void;
+			read: (payload: MessagingMessage['id'][]) => void;
+			typers: (payload: User[]) => void;
+		};
+		receives: {
+			read: {
+				id: MessagingMessage['id'];
+			};
+		};
+	};
+	serverStats: {
+		params: null;
+		events: {
+			stats: (payload: FIXME) => void;
+		};
+		receives: {
+			requestLog: {
+				id: string | number;
+				length: number;
+			};
+		};
+	};
+	queueStats: {
+		params: null;
+		events: {
+			stats: (payload: FIXME) => void;
+		};
+		receives: {
+			requestLog: {
+				id: string | number;
+				length: number;
+			};
+		};
+	};
+};
+
+export type NoteUpdatedEvent = {
+	id: Note['id'];
+	type: 'reacted';
+	body: {
+		reaction: string;
+		userId: User['id'];
+	};
+} | {
+	id: Note['id'];
+	type: 'unreacted';
+	body: {
+		reaction: string;
+		userId: User['id'];
+	};
+} | {
+	id: Note['id'];
+	type: 'deleted';
+	body: {
+		deletedAt: string;
+	};
+} | {
+	id: Note['id'];
+	type: 'pollVoted';
+	body: {
+		choice: number;
+		userId: User['id'];
+	};
+} | {
+    id: Note['id'];
+    type: 'replied';
+    body: {
+        id: Note['id'];
+    };
+};
+
+export type BroadcastEvents = {
+	noteUpdated: (payload: NoteUpdatedEvent) => void;
+	emojiAdded: (payload: {
+		emoji: CustomEmoji;
+	}) => void;
+};
diff --git a/packages/calckey-js/test-d/api.ts b/packages/calckey-js/test-d/api.ts
new file mode 100644
index 000000000..ce793f6fd
--- /dev/null
+++ b/packages/calckey-js/test-d/api.ts
@@ -0,0 +1,45 @@
+import { expectType } from 'tsd';
+import * as Misskey from '../src';
+
+describe('API', () => {
+	test('success', async () => {
+		const cli = new Misskey.api.APIClient({
+			origin: 'https://misskey.test',
+			credential: 'TOKEN'
+		});
+		const res = await cli.request('meta', { detail: true });
+		expectType<Misskey.entities.DetailedInstanceMetadata>(res);
+	});
+
+	test('conditional respose type (meta)', async () => {
+		const cli = new Misskey.api.APIClient({
+			origin: 'https://misskey.test',
+			credential: 'TOKEN'
+		});
+
+		const res = await cli.request('meta', { detail: true });
+		expectType<Misskey.entities.DetailedInstanceMetadata>(res);
+
+		const res2 = await cli.request('meta', { detail: false });
+		expectType<Misskey.entities.LiteInstanceMetadata>(res2);
+
+		const res3 = await cli.request('meta', { });
+		expectType<Misskey.entities.LiteInstanceMetadata>(res3);
+
+		const res4 = await cli.request('meta', { detail: true as boolean });
+		expectType<Misskey.entities.LiteInstanceMetadata | Misskey.entities.DetailedInstanceMetadata>(res4);
+	});
+
+	test('conditional respose type (users/show)', async () => {
+		const cli = new Misskey.api.APIClient({
+			origin: 'https://misskey.test',
+			credential: 'TOKEN'
+		});
+
+		const res = await cli.request('users/show', { userId: 'xxxxxxxx' });
+		expectType<Misskey.entities.UserDetailed>(res);
+
+		const res2 = await cli.request('users/show', { userIds: ['xxxxxxxx'] });
+		expectType<Misskey.entities.UserDetailed[]>(res2);
+	});
+});
diff --git a/packages/calckey-js/test-d/streaming.ts b/packages/calckey-js/test-d/streaming.ts
new file mode 100644
index 000000000..7ff7f9599
--- /dev/null
+++ b/packages/calckey-js/test-d/streaming.ts
@@ -0,0 +1,26 @@
+import { expectType } from 'tsd';
+import * as Misskey from '../src';
+
+describe('Streaming', () => {
+	test('emit type', async () => {
+		const stream = new Misskey.Stream('https://misskey.test', { token: 'TOKEN' });
+		const mainChannel = stream.useChannel('main');
+		mainChannel.on('notification', notification => {
+			expectType<Misskey.entities.Notification>(notification);
+		});
+	});
+
+	test('params type', async () => {
+		const stream = new Misskey.Stream('https://misskey.test', { token: 'TOKEN' });
+		// TODO: 「stream.useChannel の第二引数として受け入れる型が
+		// {
+		//   otherparty?: User['id'] | null;
+		//   group?: UserGroup['id'] | null;
+		// } 
+		// になっている」というテストを行いたいけどtsdでの書き方がわからない
+		const messagingChannel = stream.useChannel('messaging', { otherparty: 'aaa' });
+		messagingChannel.on('message', message => {
+			expectType<Misskey.entities.MessagingMessage>(message);
+		});
+	});
+});
diff --git a/packages/calckey-js/test/api.ts b/packages/calckey-js/test/api.ts
new file mode 100644
index 000000000..47c837801
--- /dev/null
+++ b/packages/calckey-js/test/api.ts
@@ -0,0 +1,212 @@
+import { APIClient, isAPIError } from '../src/api';
+import { enableFetchMocks } from 'jest-fetch-mock';
+
+enableFetchMocks();
+
+function getFetchCall(call: any[]) {
+	const { body, method } = call[1];
+	if (body != null && typeof body != 'string') {
+		throw new Error('invalid body');
+	}
+	return {
+		url: call[0],
+		method: method,
+		body: JSON.parse(body as any)
+	};
+}
+
+describe('API', () => {
+	test('success', async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			const body = await req.json();
+			if (req.method == 'POST' && req.url == 'https://misskey.test/api/i') {
+				if (body.i === 'TOKEN') {
+					return JSON.stringify({ id: 'foo' });
+				} else {
+					return { status: 400 };
+				}
+			} else {
+				return { status: 404 };
+			}
+		});
+
+		const cli = new APIClient({
+			origin: 'https://misskey.test',
+			credential: 'TOKEN',
+		});
+
+		const res = await cli.request('i');
+
+		expect(res).toEqual({
+			id: 'foo'
+		});
+
+		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
+			url: 'https://misskey.test/api/i',
+			method: 'POST',
+			body: { i: 'TOKEN' }
+		});
+	});
+
+	test('with params', async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			const body = await req.json();
+			if (req.method == 'POST' && req.url == 'https://misskey.test/api/notes/show') {
+				if (body.i === 'TOKEN' && body.noteId === 'aaaaa') {
+					return JSON.stringify({ id: 'foo' });
+				} else {
+					return { status: 400 };
+				}
+			} else {
+				return { status: 404 };
+			}
+		});
+
+		const cli = new APIClient({
+			origin: 'https://misskey.test',
+			credential: 'TOKEN',
+		});
+
+		const res = await cli.request('notes/show', { noteId: 'aaaaa' });
+
+		expect(res).toEqual({
+			id: 'foo'
+		});
+
+		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
+			url: 'https://misskey.test/api/notes/show',
+			method: 'POST',
+			body: { i: 'TOKEN', noteId: 'aaaaa' }
+		});
+	});
+
+	test('204 No Content で null が返る', async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			if (req.method == 'POST' && req.url == 'https://misskey.test/api/reset-password') {
+				return { status: 204 };
+			} else {
+				return { status: 404 };
+			}
+		});
+
+		const cli = new APIClient({
+			origin: 'https://misskey.test',
+			credential: 'TOKEN',
+		});
+
+		const res = await cli.request('reset-password', { token: 'aaa', password: 'aaa' });
+
+		expect(res).toEqual(null);
+
+		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
+			url: 'https://misskey.test/api/reset-password',
+			method: 'POST',
+			body: { i: 'TOKEN', token: 'aaa', password: 'aaa' }
+		});
+	});
+
+	test('インスタンスの credential が指定されていても引数で credential が null ならば null としてリクエストされる', async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			const body = await req.json();
+			if (req.method == 'POST' && req.url == 'https://misskey.test/api/i') {
+				if (typeof body.i === 'string') {
+					return JSON.stringify({ id: 'foo' });
+				} else {
+					return {
+						status: 401,
+						body: JSON.stringify({
+							error: {
+								message: 'Credential required.',
+								code: 'CREDENTIAL_REQUIRED',
+								id: '1384574d-a912-4b81-8601-c7b1c4085df1',
+							}
+						})
+					};
+				}
+			} else {
+				return { status: 404 };
+			}
+		});
+
+		try {
+			const cli = new APIClient({
+				origin: 'https://misskey.test',
+				credential: 'TOKEN',
+			});
+	
+			await cli.request('i', {}, null);
+		} catch (e) {
+			expect(isAPIError(e)).toEqual(true);
+		}
+	});
+
+	test('api error', async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			return {
+				status: 500,
+				body: JSON.stringify({
+					error: {
+						message: 'Internal error occurred. Please contact us if the error persists.',
+						code: 'INTERNAL_ERROR',
+						id: '5d37dbcb-891e-41ca-a3d6-e690c97775ac',
+						kind: 'server',
+					},
+				})
+			};
+		});
+
+		try {
+			const cli = new APIClient({
+				origin: 'https://misskey.test',
+				credential: 'TOKEN',
+			});
+	
+			await cli.request('i');
+		} catch (e: any) {
+			expect(isAPIError(e)).toEqual(true);
+			expect(e.id).toEqual('5d37dbcb-891e-41ca-a3d6-e690c97775ac');
+		}
+	});
+
+	test('network error', async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockAbort();
+
+		try {
+			const cli = new APIClient({
+				origin: 'https://misskey.test',
+				credential: 'TOKEN',
+			});
+	
+			await cli.request('i');
+		} catch (e) {
+			expect(isAPIError(e)).toEqual(false);
+		}
+	});
+
+	test('json parse error', async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			return {
+				status: 500,
+				body: '<html>I AM NOT JSON</html>'
+			};
+		});
+
+		try {
+			const cli = new APIClient({
+				origin: 'https://misskey.test',
+				credential: 'TOKEN',
+			});
+	
+			await cli.request('i');
+		} catch (e) {
+			expect(isAPIError(e)).toEqual(false);
+		}
+	});
+});
diff --git a/packages/calckey-js/test/streaming.ts b/packages/calckey-js/test/streaming.ts
new file mode 100644
index 000000000..913db8b28
--- /dev/null
+++ b/packages/calckey-js/test/streaming.ts
@@ -0,0 +1,165 @@
+import WS from 'jest-websocket-mock';
+import Stream from '../src/streaming';
+
+describe('Streaming', () => {
+	test('useChannel', async () => {
+		const server = new WS('wss://misskey.test/streaming');
+		const stream = new Stream('https://misskey.test', { token: 'TOKEN' });
+		const mainChannelReceived: any[] = [];
+		const main = stream.useChannel('main');
+		main.on('meUpdated', payload => {
+			mainChannelReceived.push(payload);
+		});
+
+		const ws = await server.connected;
+		expect(new URLSearchParams(new URL(ws.url).search).get('i')).toEqual('TOKEN');
+
+		const msg = JSON.parse(await server.nextMessage as string);
+		const mainChannelId = msg.body.id;
+		expect(msg.type).toEqual('connect');
+		expect(msg.body.channel).toEqual('main');
+		expect(mainChannelId != null).toEqual(true);
+
+		server.send(JSON.stringify({
+			type: 'channel',
+			body: {
+				id: mainChannelId,
+				type: 'meUpdated',
+				body: {
+					id: 'foo'
+				}
+			}
+		}));
+
+		expect(mainChannelReceived[0]).toEqual({
+			id: 'foo'
+		});
+
+		stream.close();
+		server.close();
+	});
+
+	test('useChannel with parameters', async () => {
+		const server = new WS('wss://misskey.test/streaming');
+		const stream = new Stream('https://misskey.test', { token: 'TOKEN' });
+		const messagingChannelReceived: any[] = [];
+		const messaging = stream.useChannel('messaging', { otherparty: 'aaa' });
+		messaging.on('message', payload => {
+			messagingChannelReceived.push(payload);
+		});
+
+		const ws = await server.connected;
+		expect(new URLSearchParams(new URL(ws.url).search).get('i')).toEqual('TOKEN');
+
+		const msg = JSON.parse(await server.nextMessage as string);
+		const messagingChannelId = msg.body.id;
+		expect(msg.type).toEqual('connect');
+		expect(msg.body.channel).toEqual('messaging');
+		expect(msg.body.params).toEqual({ otherparty: 'aaa' });
+		expect(messagingChannelId != null).toEqual(true);
+
+		server.send(JSON.stringify({
+			type: 'channel',
+			body: {
+				id: messagingChannelId,
+				type: 'message',
+				body: {
+					id: 'foo'
+				}
+			}
+		}));
+
+		expect(messagingChannelReceived[0]).toEqual({
+			id: 'foo'
+		});
+
+		stream.close();
+		server.close();
+	});
+
+	test('ちゃんとチャンネルごとにidが異なる', async () => {
+		const server = new WS('wss://misskey.test/streaming');
+		const stream = new Stream('https://misskey.test', { token: 'TOKEN' });
+
+		stream.useChannel('messaging', { otherparty: 'aaa' });
+		stream.useChannel('messaging', { otherparty: 'bbb' });
+
+		const ws = await server.connected;
+		expect(new URLSearchParams(new URL(ws.url).search).get('i')).toEqual('TOKEN');
+
+		const msg = JSON.parse(await server.nextMessage as string);
+		const messagingChannelId = msg.body.id;
+		const msg2 = JSON.parse(await server.nextMessage as string);
+		const messagingChannelId2 = msg2.body.id;
+
+		expect(messagingChannelId != null).toEqual(true);
+		expect(messagingChannelId2 != null).toEqual(true);
+		expect(messagingChannelId).not.toEqual(messagingChannelId2);
+
+		stream.close();
+		server.close();
+	});
+
+	test('Connection#send', async () => {
+		const server = new WS('wss://misskey.test/streaming');
+		const stream = new Stream('https://misskey.test', { token: 'TOKEN' });
+
+		const messaging = stream.useChannel('messaging', { otherparty: 'aaa' });
+		messaging.send('read', { id: 'aaa' });
+
+		const ws = await server.connected;
+		expect(new URLSearchParams(new URL(ws.url).search).get('i')).toEqual('TOKEN');
+
+		const connectMsg = JSON.parse(await server.nextMessage as string);
+		const channelId = connectMsg.body.id;
+		const msg = JSON.parse(await server.nextMessage as string);
+
+		expect(msg.type).toEqual('ch');
+		expect(msg.body.id).toEqual(channelId);
+		expect(msg.body.type).toEqual('read');
+		expect(msg.body.body).toEqual({ id: 'aaa' });
+
+		stream.close();
+		server.close();
+	});
+
+	test('Connection#dispose', async () => {
+		const server = new WS('wss://misskey.test/streaming');
+		const stream = new Stream('https://misskey.test', { token: 'TOKEN' });
+		const mainChannelReceived: any[] = [];
+		const main = stream.useChannel('main');
+		main.on('meUpdated', payload => {
+			mainChannelReceived.push(payload);
+		});
+		
+		const ws = await server.connected;
+		expect(new URLSearchParams(new URL(ws.url).search).get('i')).toEqual('TOKEN');
+
+		const msg = JSON.parse(await server.nextMessage as string);
+		const mainChannelId = msg.body.id;
+		expect(msg.type).toEqual('connect');
+		expect(msg.body.channel).toEqual('main');
+		expect(mainChannelId != null).toEqual(true);
+		main.dispose();
+
+		server.send(JSON.stringify({
+			type: 'channel',
+			body: {
+				id: mainChannelId,
+				type: 'meUpdated',
+				body: {
+					id: 'foo'
+				}
+			}
+		}));
+
+		expect(mainChannelReceived.length).toEqual(0);
+
+		stream.close();
+		server.close();
+	});
+
+	// TODO: SharedConnection#dispose して一定時間経ったら disconnect メッセージがサーバーに送られてくるかのテスト
+
+	// TODO: チャンネル接続が使いまわされるかのテスト
+});
diff --git a/packages/calckey-js/tsconfig.json b/packages/calckey-js/tsconfig.json
new file mode 100644
index 000000000..a03a24262
--- /dev/null
+++ b/packages/calckey-js/tsconfig.json
@@ -0,0 +1,25 @@
+{
+	"$schema": "http://json.schemastore.org/tsconfig",
+	"compilerOptions": {
+		"target": "es2020",
+		"module": "commonjs",
+		"declaration": true,
+		"declarationMap": true,
+		"sourceMap": true,
+		"outDir": "./built/",
+		"removeComments": true,
+		"strict": true,
+		"strictFunctionTypes": true,
+		"strictNullChecks": true,
+		"experimentalDecorators": true,
+		"noImplicitReturns": true,
+		"esModuleInterop": true
+	},
+	"include": [
+		"src/**/*"
+	],
+	"exclude": [
+		"node_modules",
+		"test/**/*"
+	]
+}
diff --git a/packages/client/package.json b/packages/client/package.json
index be7538542..b1da8e0a0 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -32,7 +32,7 @@
 		"blurhash": "1.1.5",
 		"broadcast-channel": "4.19.1",
 		"browser-image-resizer": "https://github.com/misskey-dev/browser-image-resizer.git",
-		"calckey-js": "^0.0.22",
+		"calckey-js": "workspace:*",
 		"chart.js": "4.1.1",
 		"chartjs-adapter-date-fns": "2.0.1",
 		"chartjs-chart-matrix": "^2.0.1",
diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index f2d3209d6..6c644660e 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -87,6 +87,9 @@ export default defineConfig(({ command, mode }) => {
 			emptyOutDir: false,
 			sourcemap: process.env.NODE_ENV === "development",
 			reportCompressedSize: false,
+			commonjsOptions: {
+				include: [/calckey-js/, /node_modules/],
+			},
 		},
 		optimizeDeps: {
 			auto: true,
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 32a7fcb7b..2c41a95b5 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -13,7 +13,7 @@
 		"@swc/cli": "^0.1.59",
 		"@swc/core": "^1.3.26",
 		"@swc/core-android-arm64": "1.3.11",
-		"calckey-js": "^0.0.22",
+		"calckey-js": "workspace:*",
 		"idb-keyval": "^6.2.0",
 		"swc-loader": "^0.2.3",
 		"webpack": "^5.75.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1446d8df6..b7b0b3123 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -19,9 +19,6 @@ importers:
       '@tensorflow/tfjs':
         specifier: ^3.21.0
         version: 3.21.0(seedrandom@3.0.5)
-      calckey-js:
-        specifier: ^0.0.22
-        version: 0.0.22
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
@@ -153,8 +150,8 @@ importers:
         specifier: 7.0.0
         version: 7.0.0
       calckey-js:
-        specifier: ^0.0.22
-        version: 0.0.22
+        specifier: workspace:*
+        version: link:../calckey-js
       cbor:
         specifier: 8.1.0
         version: 8.1.0
@@ -590,6 +587,64 @@ importers:
         specifier: 8.11.0
         version: 8.11.0
 
+  packages/calckey-js:
+    dependencies:
+      autobind-decorator:
+        specifier: ^2.4.0
+        version: 2.4.0
+      eventemitter3:
+        specifier: ^4.0.7
+        version: 4.0.7
+      reconnecting-websocket:
+        specifier: ^4.4.0
+        version: 4.4.0
+      semver:
+        specifier: ^7.3.8
+        version: 7.3.8
+    devDependencies:
+      '@microsoft/api-extractor':
+        specifier: ^7.19.3
+        version: 7.19.3
+      '@types/jest':
+        specifier: ^27.4.0
+        version: 27.4.0
+      '@types/node':
+        specifier: 17.0.5
+        version: 17.0.5
+      '@typescript-eslint/eslint-plugin':
+        specifier: 5.8.1
+        version: 5.8.1(@typescript-eslint/parser@5.8.1)(eslint@8.6.0)(typescript@4.5.4)
+      '@typescript-eslint/parser':
+        specifier: 5.8.1
+        version: 5.8.1(eslint@8.6.0)(typescript@4.5.4)
+      eslint:
+        specifier: 8.6.0
+        version: 8.6.0
+      jest:
+        specifier: ^27.4.5
+        version: 27.4.5(ts-node@10.4.0)
+      jest-fetch-mock:
+        specifier: ^3.0.3
+        version: 3.0.3
+      jest-websocket-mock:
+        specifier: ^2.2.1
+        version: 2.2.1(mock-socket@9.0.8)
+      mock-socket:
+        specifier: ^9.0.8
+        version: 9.0.8
+      ts-jest:
+        specifier: ^27.1.2
+        version: 27.1.2(@babel/core@7.21.4)(@types/jest@27.4.0)(jest@27.4.5)(typescript@4.5.4)
+      ts-node:
+        specifier: 10.4.0
+        version: 10.4.0(@types/node@17.0.5)(typescript@4.5.4)
+      tsd:
+        specifier: ^0.19.1
+        version: 0.19.1
+      typescript:
+        specifier: 4.5.4
+        version: 4.5.4
+
   packages/client:
     devDependencies:
       '@discordapp/twemoji':
@@ -668,8 +723,8 @@ importers:
         specifier: https://github.com/misskey-dev/browser-image-resizer.git
         version: github.com/misskey-dev/browser-image-resizer/0380d12c8e736788ea7f4e6e985175521ea7b23c
       calckey-js:
-        specifier: ^0.0.22
-        version: 0.0.22
+        specifier: workspace:*
+        version: link:../calckey-js
       chart.js:
         specifier: 4.1.1
         version: 4.1.1
@@ -836,8 +891,8 @@ importers:
         specifier: 1.3.11
         version: 1.3.11
       calckey-js:
-        specifier: ^0.0.22
-        version: 0.0.22
+        specifier: workspace:*
+        version: link:../calckey-js
       idb-keyval:
         specifier: ^6.2.0
         version: 6.2.0
@@ -853,12 +908,54 @@ importers:
 
 packages:
 
+  /@ampproject/remapping@2.2.1:
+    resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.2
+      '@jridgewell/trace-mapping': 0.3.17
+    dev: true
+
   /@babel/code-frame@7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.18.6
-    dev: false
+
+  /@babel/code-frame@7.21.4:
+    resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/highlight': 7.18.6
+    dev: true
+
+  /@babel/compat-data@7.21.4:
+    resolution: {integrity: sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/core@7.21.4:
+    resolution: {integrity: sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@ampproject/remapping': 2.2.1
+      '@babel/code-frame': 7.21.4
+      '@babel/generator': 7.21.4
+      '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.21.4)
+      '@babel/helper-module-transforms': 7.21.2
+      '@babel/helpers': 7.21.0
+      '@babel/parser': 7.21.4
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.21.4
+      '@babel/types': 7.21.4
+      convert-source-map: 1.9.0
+      debug: 4.3.4(supports-color@8.1.1)
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
   /@babel/generator@7.20.7:
     resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==}
@@ -867,12 +964,34 @@ packages:
       '@babel/types': 7.20.7
       '@jridgewell/gen-mapping': 0.3.2
       jsesc: 2.5.2
-    dev: false
+
+  /@babel/generator@7.21.4:
+    resolution: {integrity: sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.21.4
+      '@jridgewell/gen-mapping': 0.3.2
+      '@jridgewell/trace-mapping': 0.3.17
+      jsesc: 2.5.2
+    dev: true
+
+  /@babel/helper-compilation-targets@7.21.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/compat-data': 7.21.4
+      '@babel/core': 7.21.4
+      '@babel/helper-validator-option': 7.21.0
+      browserslist: 4.21.4
+      lru-cache: 5.1.1
+      semver: 6.3.0
+    dev: true
 
   /@babel/helper-environment-visitor@7.18.9:
     resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
     engines: {node: '>=6.9.0'}
-    dev: false
 
   /@babel/helper-function-name@7.19.0:
     resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==}
@@ -880,21 +999,61 @@ packages:
     dependencies:
       '@babel/template': 7.20.7
       '@babel/types': 7.20.7
-    dev: false
+
+  /@babel/helper-function-name@7.21.0:
+    resolution: {integrity: sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.20.7
+      '@babel/types': 7.21.4
+    dev: true
 
   /@babel/helper-hoist-variables@7.18.6:
     resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.7
-    dev: false
+
+  /@babel/helper-module-imports@7.21.4:
+    resolution: {integrity: sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.21.4
+    dev: true
+
+  /@babel/helper-module-transforms@7.21.2:
+    resolution: {integrity: sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-module-imports': 7.21.4
+      '@babel/helper-simple-access': 7.20.2
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/helper-validator-identifier': 7.19.1
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.21.4
+      '@babel/types': 7.21.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-plugin-utils@7.20.2:
+    resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-simple-access@7.20.2:
+    resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.21.4
+    dev: true
 
   /@babel/helper-split-export-declaration@7.18.6:
     resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.7
-    dev: false
 
   /@babel/helper-string-parser@7.19.4:
     resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
@@ -904,6 +1063,22 @@ packages:
     resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/helper-validator-option@7.21.0:
+    resolution: {integrity: sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helpers@7.21.0:
+    resolution: {integrity: sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.21.4
+      '@babel/types': 7.21.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/highlight@7.18.6:
     resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
     engines: {node: '>=6.9.0'}
@@ -911,7 +1086,6 @@ packages:
       '@babel/helper-validator-identifier': 7.19.1
       chalk: 2.4.2
       js-tokens: 4.0.0
-    dev: false
 
   /@babel/parser@7.20.7:
     resolution: {integrity: sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==}
@@ -920,6 +1094,133 @@ packages:
     dependencies:
       '@babel/types': 7.20.7
 
+  /@babel/parser@7.21.4:
+    resolution: {integrity: sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.21.4
+    dev: true
+
+  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.21.4):
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.21.4):
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-typescript@7.21.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
   /@babel/runtime@7.20.7:
     resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==}
     engines: {node: '>=6.9.0'}
@@ -934,7 +1235,6 @@ packages:
       '@babel/code-frame': 7.18.6
       '@babel/parser': 7.20.7
       '@babel/types': 7.20.7
-    dev: false
 
   /@babel/traverse@7.20.12:
     resolution: {integrity: sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==}
@@ -952,7 +1252,24 @@ packages:
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
-    dev: false
+
+  /@babel/traverse@7.21.4:
+    resolution: {integrity: sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.21.4
+      '@babel/generator': 7.21.4
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-function-name': 7.21.0
+      '@babel/helper-hoist-variables': 7.18.6
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/parser': 7.21.4
+      '@babel/types': 7.21.4
+      debug: 4.3.4(supports-color@8.1.1)
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
   /@babel/types@7.20.7:
     resolution: {integrity: sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==}
@@ -962,6 +1279,19 @@ packages:
       '@babel/helper-validator-identifier': 7.19.1
       to-fast-properties: 2.0.0
 
+  /@babel/types@7.21.4:
+    resolution: {integrity: sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.19.4
+      '@babel/helper-validator-identifier': 7.19.1
+      to-fast-properties: 2.0.0
+    dev: true
+
+  /@bcoe/v8-coverage@0.2.3:
+    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
+    dev: true
+
   /@bull-board/api@4.10.2:
     resolution: {integrity: sha512-lRHo0A7hsz71aOx1ZN0SmLLWfSuvKdL6EZ4imlgo5SuXGozybvlRc5KPIJU2/E1w5meoUGi+nFezBwp1gT/SMw==}
     dependencies:
@@ -1161,6 +1491,18 @@ packages:
     resolution: {integrity: sha512-RJu5IWzH6vcygwLsx9KEqzwjnEqApPkSFViMzxCRbe0IuAXt2ZlSUmYKgLFZY+YJIdaZ+/P7PwiUcZ7GYH3Msw==}
     dev: true
 
+  /@cspotcode/source-map-consumer@0.8.0:
+    resolution: {integrity: sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==}
+    engines: {node: '>= 12'}
+    dev: true
+
+  /@cspotcode/source-map-support@0.7.0:
+    resolution: {integrity: sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@cspotcode/source-map-consumer': 0.8.0
+    dev: true
+
   /@cspotcode/source-map-support@0.8.1:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
@@ -1474,6 +1816,17 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@humanwhocodes/config-array@0.9.5:
+    resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==}
+    engines: {node: '>=10.10.0'}
+    dependencies:
+      '@humanwhocodes/object-schema': 1.2.1
+      debug: 4.3.4(supports-color@8.1.1)
+      minimatch: 3.1.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@humanwhocodes/module-importer@1.0.1:
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
@@ -1484,6 +1837,213 @@ packages:
   /@ioredis/commands@1.2.0:
     resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==}
 
+  /@istanbuljs/load-nyc-config@1.1.0:
+    resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      camelcase: 5.3.1
+      find-up: 4.1.0
+      get-package-type: 0.1.0
+      js-yaml: 3.14.1
+      resolve-from: 5.0.0
+    dev: true
+
+  /@istanbuljs/schema@0.1.3:
+    resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /@jest/console@27.5.1:
+    resolution: {integrity: sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      jest-message-util: 27.5.1
+      jest-util: 27.5.1
+      slash: 3.0.0
+    dev: true
+
+  /@jest/core@27.5.1(ts-node@10.4.0):
+    resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@jest/console': 27.5.1
+      '@jest/reporters': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      emittery: 0.8.1
+      exit: 0.1.2
+      graceful-fs: 4.2.10
+      jest-changed-files: 27.5.1
+      jest-config: 27.5.1(ts-node@10.4.0)
+      jest-haste-map: 27.5.1
+      jest-message-util: 27.5.1
+      jest-regex-util: 27.5.1
+      jest-resolve: 27.5.1
+      jest-resolve-dependencies: 27.5.1
+      jest-runner: 27.5.1
+      jest-runtime: 27.5.1
+      jest-snapshot: 27.5.1
+      jest-util: 27.5.1
+      jest-validate: 27.5.1
+      jest-watcher: 27.5.1
+      micromatch: 4.0.5
+      rimraf: 3.0.2
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+    dev: true
+
+  /@jest/environment@27.5.1:
+    resolution: {integrity: sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/fake-timers': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      jest-mock: 27.5.1
+    dev: true
+
+  /@jest/fake-timers@27.5.1:
+    resolution: {integrity: sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      '@sinonjs/fake-timers': 8.1.0
+      '@types/node': 18.11.18
+      jest-message-util: 27.5.1
+      jest-mock: 27.5.1
+      jest-util: 27.5.1
+    dev: true
+
+  /@jest/globals@27.5.1:
+    resolution: {integrity: sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/types': 27.5.1
+      expect: 27.5.1
+    dev: true
+
+  /@jest/reporters@27.5.1:
+    resolution: {integrity: sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@bcoe/v8-coverage': 0.2.3
+      '@jest/console': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      collect-v8-coverage: 1.0.1
+      exit: 0.1.2
+      glob: 7.2.3
+      graceful-fs: 4.2.10
+      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-instrument: 5.2.1
+      istanbul-lib-report: 3.0.0
+      istanbul-lib-source-maps: 4.0.1
+      istanbul-reports: 3.1.5
+      jest-haste-map: 27.5.1
+      jest-resolve: 27.5.1
+      jest-util: 27.5.1
+      jest-worker: 27.5.1
+      slash: 3.0.0
+      source-map: 0.6.1
+      string-length: 4.0.2
+      terminal-link: 2.1.1
+      v8-to-istanbul: 8.1.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@jest/source-map@27.5.1:
+    resolution: {integrity: sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      callsites: 3.1.0
+      graceful-fs: 4.2.10
+      source-map: 0.6.1
+    dev: true
+
+  /@jest/test-result@27.5.1:
+    resolution: {integrity: sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/console': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/istanbul-lib-coverage': 2.0.4
+      collect-v8-coverage: 1.0.1
+    dev: true
+
+  /@jest/test-sequencer@27.5.1:
+    resolution: {integrity: sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/test-result': 27.5.1
+      graceful-fs: 4.2.10
+      jest-haste-map: 27.5.1
+      jest-runtime: 27.5.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@jest/transform@27.5.1:
+    resolution: {integrity: sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@babel/core': 7.21.4
+      '@jest/types': 27.5.1
+      babel-plugin-istanbul: 6.1.1
+      chalk: 4.1.2
+      convert-source-map: 1.9.0
+      fast-json-stable-stringify: 2.1.0
+      graceful-fs: 4.2.10
+      jest-haste-map: 27.5.1
+      jest-regex-util: 27.5.1
+      jest-util: 27.5.1
+      micromatch: 4.0.5
+      pirates: 4.0.5
+      slash: 3.0.0
+      source-map: 0.6.1
+      write-file-atomic: 3.0.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@jest/types@27.5.1:
+    resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.4
+      '@types/istanbul-reports': 3.0.1
+      '@types/node': 18.11.18
+      '@types/yargs': 16.0.5
+      chalk: 4.1.2
+    dev: true
+
   /@jridgewell/gen-mapping@0.3.2:
     resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
     engines: {node: '>=6.0.0'}
@@ -1616,6 +2176,45 @@ packages:
     dev: false
     optional: true
 
+  /@microsoft/api-extractor-model@7.15.2:
+    resolution: {integrity: sha512-qgxKX/s6vo3nCVLhP0Ds7555QrErhcYHEok5/KyEZ7iR8J5M5oldD1eJJQmtEdVF5IzmnPPbxx1nRvfgA674LQ==}
+    dependencies:
+      '@microsoft/tsdoc': 0.13.2
+      '@microsoft/tsdoc-config': 0.15.2
+      '@rushstack/node-core-library': 3.44.3
+    dev: true
+
+  /@microsoft/api-extractor@7.19.3:
+    resolution: {integrity: sha512-GZe+R3K4kh2X425iOHkPbByysB7FN0592mPPA6vNj5IhyhlPHgdZS6m6AmOZOIxMS4euM+SBKzEJEp3oC+WsOQ==}
+    hasBin: true
+    dependencies:
+      '@microsoft/api-extractor-model': 7.15.2
+      '@microsoft/tsdoc': 0.13.2
+      '@microsoft/tsdoc-config': 0.15.2
+      '@rushstack/node-core-library': 3.44.3
+      '@rushstack/rig-package': 0.3.7
+      '@rushstack/ts-command-line': 4.10.6
+      colors: 1.2.5
+      lodash: 4.17.21
+      resolve: 1.17.0
+      semver: 7.3.8
+      source-map: 0.6.1
+      typescript: 4.5.4
+    dev: true
+
+  /@microsoft/tsdoc-config@0.15.2:
+    resolution: {integrity: sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==}
+    dependencies:
+      '@microsoft/tsdoc': 0.13.2
+      ajv: 6.12.6
+      jju: 1.4.0
+      resolve: 1.19.0
+    dev: true
+
+  /@microsoft/tsdoc@0.13.2:
+    resolution: {integrity: sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==}
+    dev: true
+
   /@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0:
     resolution: {integrity: sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==}
     cpu: [arm64]
@@ -1904,6 +2503,36 @@ packages:
     dev: true
     optional: true
 
+  /@rushstack/node-core-library@3.44.3:
+    resolution: {integrity: sha512-Bt+R5LAnVr2BImTJqPpton5rvhJ2Wq8x4BaTqaCHQMmfxqtz5lb4nLYT9kneMJTCDuRMBvvLpSuz4MBj50PV3w==}
+    dependencies:
+      '@types/node': 12.20.24
+      colors: 1.2.5
+      fs-extra: 7.0.1
+      import-lazy: 4.0.0
+      jju: 1.4.0
+      resolve: 1.17.0
+      semver: 7.3.8
+      timsort: 0.3.0
+      z-schema: 5.0.5
+    dev: true
+
+  /@rushstack/rig-package@0.3.7:
+    resolution: {integrity: sha512-pzMsTSeTC8IiZ6EJLr53gGMvhT4oLWH+hxD7907cHyWuIUlEXFtu/2pK25vUQT13nKp5DJCWxXyYoGRk/h6rtA==}
+    dependencies:
+      resolve: 1.17.0
+      strip-json-comments: 3.1.1
+    dev: true
+
+  /@rushstack/ts-command-line@4.10.6:
+    resolution: {integrity: sha512-Y3GkUag39sTIlukDg9mUp8MCHrrlJ27POrBNRQGc/uF+VVgX8M7zMzHch5zP6O1QVquWgD7Engdpn2piPYaS/g==}
+    dependencies:
+      '@types/argparse': 1.0.38
+      argparse: 1.0.10
+      colors: 1.2.5
+      string-argv: 0.3.1
+    dev: true
+
   /@sideway/address@4.1.4:
     resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
     dependencies:
@@ -1937,7 +2566,12 @@ packages:
     resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==}
     dependencies:
       type-detect: 4.0.8
-    dev: false
+
+  /@sinonjs/fake-timers@8.1.0:
+    resolution: {integrity: sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==}
+    dependencies:
+      '@sinonjs/commons': 1.8.6
+    dev: true
 
   /@sinonjs/fake-timers@9.1.2:
     resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==}
@@ -2311,6 +2945,11 @@ packages:
     resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
     dev: false
 
+  /@tootallnate/once@1.1.2:
+    resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
+    engines: {node: '>= 6'}
+    dev: true
+
   /@tootallnate/once@2.0.0:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
@@ -2328,11 +2967,49 @@ packages:
   /@tsconfig/node16@1.0.3:
     resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==}
 
+  /@tsd/typescript@4.5.5:
+    resolution: {integrity: sha512-TxQ9QiUT94ZjKu++ta/iwTMVHsix4ApohnaHPTSd58WQuTjPIELP0tUYcW7lT6psz7yZiU4eRw+X4v/XV830Sw==}
+    hasBin: true
+    dev: true
+
   /@types/accepts@1.3.5:
     resolution: {integrity: sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==}
     dependencies:
       '@types/node': 18.11.18
 
+  /@types/argparse@1.0.38:
+    resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==}
+    dev: true
+
+  /@types/babel__core@7.20.0:
+    resolution: {integrity: sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==}
+    dependencies:
+      '@babel/parser': 7.20.7
+      '@babel/types': 7.20.7
+      '@types/babel__generator': 7.6.4
+      '@types/babel__template': 7.4.1
+      '@types/babel__traverse': 7.18.3
+    dev: true
+
+  /@types/babel__generator@7.6.4:
+    resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
+    dependencies:
+      '@babel/types': 7.21.4
+    dev: true
+
+  /@types/babel__template@7.4.1:
+    resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
+    dependencies:
+      '@babel/parser': 7.21.4
+      '@babel/types': 7.21.4
+    dev: true
+
+  /@types/babel__traverse@7.18.3:
+    resolution: {integrity: sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==}
+    dependencies:
+      '@babel/types': 7.20.7
+    dev: true
+
   /@types/bcryptjs@2.4.2:
     resolution: {integrity: sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==}
     dev: true
@@ -2406,6 +3083,13 @@ packages:
       '@types/estree': 0.0.51
     dev: true
 
+  /@types/eslint@7.29.0:
+    resolution: {integrity: sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==}
+    dependencies:
+      '@types/estree': 0.0.51
+      '@types/json-schema': 7.0.11
+    dev: true
+
   /@types/eslint@8.4.10:
     resolution: {integrity: sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==}
     dependencies:
@@ -2466,6 +3150,12 @@ packages:
       '@types/node': 18.11.18
     dev: true
 
+  /@types/graceful-fs@4.1.6:
+    resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
+    dependencies:
+      '@types/node': 18.11.18
+    dev: true
+
   /@types/gulp-rename@2.0.1:
     resolution: {integrity: sha512-9ZjeS2RHEnmBmTcyi2+oeye3BgCsWhvi4uv3qCnAg8i6plOuRdaeNxjOves0ELysEXYLBl7bCl5fbVs7AZtgTA==}
     dependencies:
@@ -2500,6 +3190,29 @@ packages:
       - supports-color
     dev: true
 
+  /@types/istanbul-lib-coverage@2.0.4:
+    resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
+    dev: true
+
+  /@types/istanbul-lib-report@3.0.0:
+    resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==}
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.4
+    dev: true
+
+  /@types/istanbul-reports@3.0.1:
+    resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==}
+    dependencies:
+      '@types/istanbul-lib-report': 3.0.0
+    dev: true
+
+  /@types/jest@27.4.0:
+    resolution: {integrity: sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==}
+    dependencies:
+      jest-diff: 27.5.1
+      pretty-format: 27.5.1
+    dev: true
+
   /@types/js-yaml@4.0.5:
     resolution: {integrity: sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==}
     dev: true
@@ -2685,6 +3398,10 @@ packages:
     resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
     dev: true
 
+  /@types/minimist@1.2.2:
+    resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
+    dev: true
+
   /@types/mocha@9.1.1:
     resolution: {integrity: sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==}
     dev: true
@@ -2703,9 +3420,17 @@ packages:
       node-fetch: 3.3.0
     dev: true
 
+  /@types/node@12.20.24:
+    resolution: {integrity: sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==}
+    dev: true
+
   /@types/node@14.18.36:
     resolution: {integrity: sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==}
 
+  /@types/node@17.0.5:
+    resolution: {integrity: sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw==}
+    dev: true
+
   /@types/node@18.11.18:
     resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
 
@@ -2715,6 +3440,10 @@ packages:
       '@types/node': 18.11.18
     dev: true
 
+  /@types/normalize-package-data@2.4.1:
+    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
+    dev: true
+
   /@types/oauth@0.9.1:
     resolution: {integrity: sha512-a1iY62/a3yhZ7qH7cNUsxoI3U/0Fe9+RnuFrpTKr+0WVOzbKlSLojShCKe20aOD1Sppv+i8Zlq0pLDuTJnwS4A==}
     dependencies:
@@ -2728,6 +3457,10 @@ packages:
     resolution: {integrity: sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg==}
     dev: false
 
+  /@types/prettier@2.7.2:
+    resolution: {integrity: sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==}
+    dev: true
+
   /@types/pug@2.0.6:
     resolution: {integrity: sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==}
     dev: true
@@ -2826,6 +3559,10 @@ packages:
       '@types/node': 18.11.18
     dev: true
 
+  /@types/stack-utils@2.0.1:
+    resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
+    dev: true
+
   /@types/throttle-debounce@5.0.0:
     resolution: {integrity: sha512-Pb7k35iCGFcGPECoNE4DYp3Oyf2xcTd3FbFQxXUI9hEYKUl6YX+KLf7HrBmgVcD05nl50LIH6i+80js4iYmWbw==}
     dev: true
@@ -2909,6 +3646,16 @@ packages:
       '@types/node': 18.11.18
     dev: false
 
+  /@types/yargs-parser@21.0.0:
+    resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
+    dev: true
+
+  /@types/yargs@16.0.5:
+    resolution: {integrity: sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==}
+    dependencies:
+      '@types/yargs-parser': 21.0.0
+    dev: true
+
   /@types/yauzl@2.10.0:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     requiresBuild: true
@@ -2917,6 +3664,112 @@ packages:
     dev: true
     optional: true
 
+  /@typescript-eslint/eslint-plugin@5.8.1(@typescript-eslint/parser@5.8.1)(eslint@8.6.0)(typescript@4.5.4):
+    resolution: {integrity: sha512-wTZ5oEKrKj/8/366qTM366zqhIKAp6NCMweoRONtfuC07OAU9nVI2GZZdqQ1qD30WAAtcPdkH+npDwtRFdp4Rw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/experimental-utils': 5.8.1(eslint@8.6.0)(typescript@4.5.4)
+      '@typescript-eslint/parser': 5.8.1(eslint@8.6.0)(typescript@4.5.4)
+      '@typescript-eslint/scope-manager': 5.8.1
+      debug: 4.3.4(supports-color@8.1.1)
+      eslint: 8.6.0
+      functional-red-black-tree: 1.0.1
+      ignore: 5.2.4
+      regexpp: 3.2.0
+      semver: 7.3.8
+      tsutils: 3.21.0(typescript@4.5.4)
+      typescript: 4.5.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/experimental-utils@5.8.1(eslint@8.6.0)(typescript@4.5.4):
+    resolution: {integrity: sha512-fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      '@types/json-schema': 7.0.11
+      '@typescript-eslint/scope-manager': 5.8.1
+      '@typescript-eslint/types': 5.8.1
+      '@typescript-eslint/typescript-estree': 5.8.1(typescript@4.5.4)
+      eslint: 8.6.0
+      eslint-scope: 5.1.1
+      eslint-utils: 3.0.0(eslint@8.6.0)
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/parser@5.8.1(eslint@8.6.0)(typescript@4.5.4):
+    resolution: {integrity: sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/scope-manager': 5.8.1
+      '@typescript-eslint/types': 5.8.1
+      '@typescript-eslint/typescript-estree': 5.8.1(typescript@4.5.4)
+      debug: 4.3.4(supports-color@8.1.1)
+      eslint: 8.6.0
+      typescript: 4.5.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/scope-manager@5.8.1:
+    resolution: {integrity: sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.8.1
+      '@typescript-eslint/visitor-keys': 5.8.1
+    dev: true
+
+  /@typescript-eslint/types@5.8.1:
+    resolution: {integrity: sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /@typescript-eslint/typescript-estree@5.8.1(typescript@4.5.4):
+    resolution: {integrity: sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': 5.8.1
+      '@typescript-eslint/visitor-keys': 5.8.1
+      debug: 4.3.4(supports-color@8.1.1)
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.3.8
+      tsutils: 3.21.0(typescript@4.5.4)
+      typescript: 4.5.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/visitor-keys@5.8.1:
+    resolution: {integrity: sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.8.1
+      eslint-visitor-keys: 3.3.0
+    dev: true
+
   /@vitejs/plugin-vue@4.0.0(vite@4.1.1)(vue@3.2.45):
     resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -3180,7 +4033,6 @@ packages:
 
   /abab@2.0.6:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
-    dev: false
 
   /abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
@@ -3200,6 +4052,13 @@ packages:
       negotiator: 0.6.3
     dev: false
 
+  /acorn-globals@6.0.0:
+    resolution: {integrity: sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==}
+    dependencies:
+      acorn: 7.4.1
+      acorn-walk: 7.2.0
+    dev: true
+
   /acorn-globals@7.0.1:
     resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
     dependencies:
@@ -3222,6 +4081,11 @@ packages:
     dependencies:
       acorn: 8.8.1
 
+  /acorn-walk@7.2.0:
+    resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
+    engines: {node: '>=0.4.0'}
+    dev: true
+
   /acorn-walk@8.2.0:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
@@ -3257,7 +4121,6 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
   /agentkeepalive@4.2.1:
     resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==}
@@ -3356,7 +4219,6 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       color-convert: 1.9.3
-    dev: false
 
   /ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
@@ -3364,6 +4226,11 @@ packages:
     dependencies:
       color-convert: 2.0.1
 
+  /ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+    dev: true
+
   /ansi-wrap@0.1.0:
     resolution: {integrity: sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==}
     engines: {node: '>=0.10.0'}
@@ -3569,6 +4436,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /arrify@1.0.1:
+    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /asap@2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
 
@@ -3749,6 +4621,79 @@ packages:
       - supports-color
     dev: false
 
+  /babel-jest@27.5.1(@babel/core@7.21.4):
+    resolution: {integrity: sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    peerDependencies:
+      '@babel/core': ^7.8.0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/babel__core': 7.20.0
+      babel-plugin-istanbul: 6.1.1
+      babel-preset-jest: 27.5.1(@babel/core@7.21.4)
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      slash: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-istanbul@6.1.1:
+    resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@babel/helper-plugin-utils': 7.20.2
+      '@istanbuljs/load-nyc-config': 1.1.0
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-instrument: 5.2.1
+      test-exclude: 6.0.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-jest-hoist@27.5.1:
+    resolution: {integrity: sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@babel/template': 7.20.7
+      '@babel/types': 7.21.4
+      '@types/babel__core': 7.20.0
+      '@types/babel__traverse': 7.18.3
+    dev: true
+
+  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.21.4):
+    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.4)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.21.4)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.21.4)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.4)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.4)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.21.4)
+    dev: true
+
+  /babel-preset-jest@27.5.1(@babel/core@7.21.4):
+    resolution: {integrity: sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.21.4
+      babel-plugin-jest-hoist: 27.5.1
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.4)
+    dev: true
+
   /babel-walk@3.0.0-canary-5:
     resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==}
     engines: {node: '>= 10.0.0'}
@@ -3954,6 +4899,10 @@ packages:
       unload: 2.4.1
     dev: true
 
+  /browser-process-hrtime@1.0.0:
+    resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==}
+    dev: true
+
   /browser-stdout@1.3.1:
     resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==}
     dev: true
@@ -3978,6 +4927,19 @@ packages:
       update-browserslist-db: 1.0.10(browserslist@4.21.4)
     dev: true
 
+  /bs-logger@0.2.6:
+    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
+    engines: {node: '>= 6'}
+    dependencies:
+      fast-json-stable-stringify: 2.1.0
+    dev: true
+
+  /bser@2.1.1:
+    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
+    dependencies:
+      node-int64: 0.4.0
+    dev: true
+
   /buffer-alloc-unsafe@1.1.0:
     resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==}
     dev: true
@@ -4183,14 +5145,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /calckey-js@0.0.22:
-    resolution: {integrity: sha512-So4Jc3w5QiwNO+8yLomjgNvHR9luKZ5bGLqjIEzAMsD/bIvUqWvriQAyWHN4EweyQUJ8UZCXBG9iyVX8VjtiXw==}
-    dependencies:
-      autobind-decorator: 2.4.0
-      eventemitter3: 4.0.7
-      reconnecting-websocket: 4.4.0
-      semver: 7.3.8
-
   /call-bind@1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
@@ -4201,6 +5155,15 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
+  /camelcase-keys@6.2.2:
+    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
+    engines: {node: '>=8'}
+    dependencies:
+      camelcase: 5.3.1
+      map-obj: 4.3.0
+      quick-lru: 4.0.1
+    dev: true
+
   /camelcase@3.0.0:
     resolution: {integrity: sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==}
     engines: {node: '>=0.10.0'}
@@ -4209,7 +5172,6 @@ packages:
   /camelcase@5.3.1:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
     engines: {node: '>=6'}
-    dev: false
 
   /camelcase@6.3.0:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
@@ -4287,7 +5249,6 @@ packages:
       ansi-styles: 3.2.1
       escape-string-regexp: 1.0.5
       supports-color: 5.5.0
-    dev: false
 
   /chalk@4.0.0:
     resolution: {integrity: sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==}
@@ -4427,6 +5388,10 @@ packages:
       lodash: 4.17.21
     dev: true
 
+  /cjs-module-lexer@1.2.2:
+    resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
+    dev: true
+
   /clap@1.2.3:
     resolution: {integrity: sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==}
     engines: {node: '>=0.10.0'}
@@ -4595,7 +5560,6 @@ packages:
   /co@4.6.0:
     resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
-    dev: false
 
   /coa@1.0.4:
     resolution: {integrity: sha512-KAGck/eNAmCL0dcT3BiuYwLbExK6lduR8DxM3C1TyDzaXhZHyZ8ooX5I5+na2e3dPFuibfxrGdorr0/Lr7RYCQ==}
@@ -4609,6 +5573,10 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /collect-v8-coverage@1.0.1:
+    resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
+    dev: true
+
   /collection-map@1.0.0:
     resolution: {integrity: sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==}
     engines: {node: '>=0.10.0'}
@@ -4697,6 +5665,11 @@ packages:
     engines: {node: '>=0.1.90'}
     dev: true
 
+  /colors@1.2.5:
+    resolution: {integrity: sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==}
+    engines: {node: '>=0.1.90'}
+    dev: true
+
   /combined-stream@1.0.8:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
@@ -5048,6 +6021,14 @@ packages:
       cross-spawn: 7.0.3
     dev: true
 
+  /cross-fetch@3.1.5:
+    resolution: {integrity: sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==}
+    dependencies:
+      node-fetch: 2.6.7
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
   /cross-spawn@5.1.0:
     resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
     dependencies:
@@ -5144,7 +6125,10 @@ packages:
 
   /cssom@0.3.8:
     resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
-    dev: false
+
+  /cssom@0.4.4:
+    resolution: {integrity: sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==}
+    dev: true
 
   /cssom@0.5.0:
     resolution: {integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==}
@@ -5155,7 +6139,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       cssom: 0.3.8
-    dev: false
 
   /csstype@2.6.21:
     resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
@@ -5245,6 +6228,15 @@ packages:
     resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
     engines: {node: '>= 12'}
 
+  /data-urls@2.0.0:
+    resolution: {integrity: sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      abab: 2.0.6
+      whatwg-mimetype: 2.3.0
+      whatwg-url: 8.7.0
+    dev: true
+
   /data-urls@3.0.2:
     resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==}
     engines: {node: '>=12'}
@@ -5310,6 +6302,14 @@ packages:
     resolution: {integrity: sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==}
     dev: false
 
+  /decamelize-keys@1.1.1:
+    resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      decamelize: 1.2.0
+      map-obj: 1.0.1
+    dev: true
+
   /decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
@@ -5321,7 +6321,6 @@ packages:
 
   /decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
-    dev: false
 
   /decode-uri-component@0.2.2:
     resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
@@ -5395,6 +6394,10 @@ packages:
       strip-dirs: 2.1.0
     dev: true
 
+  /dedent@0.7.0:
+    resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
+    dev: true
+
   /deep-email-validator@0.1.21:
     resolution: {integrity: sha512-DBAmMzbr+MAubXQ+TS9tZuPwLcdKscb8YzKZiwoLqF3NmaeEgXvSSHhZ0EXOFeKFE2FNWC4mNXCyiQ/JdFXUwg==}
     dependencies:
@@ -5421,7 +6424,6 @@ packages:
   /deepmerge@4.2.2:
     resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
     engines: {node: '>=0.10.0'}
-    dev: false
 
   /default-compare@1.0.0:
     resolution: {integrity: sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==}
@@ -5510,6 +6512,11 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
+  /detect-newline@3.1.0:
+    resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
+    engines: {node: '>=8'}
+    dev: true
+
   /dezalgo@1.0.4:
     resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
     dependencies:
@@ -5517,6 +6524,11 @@ packages:
       wrappy: 1.0.2
     dev: false
 
+  /diff-sequences@27.5.1:
+    resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dev: true
+
   /diff@4.0.2:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
@@ -5577,6 +6589,13 @@ packages:
   /domelementtype@2.3.0:
     resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
 
+  /domexception@2.0.1:
+    resolution: {integrity: sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==}
+    engines: {node: '>=8'}
+    dependencies:
+      webidl-conversions: 5.0.0
+    dev: true
+
   /domexception@4.0.0:
     resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==}
     engines: {node: '>=12'}
@@ -5706,6 +6725,11 @@ packages:
     resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
     dev: true
 
+  /emittery@0.8.1:
+    resolution: {integrity: sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==}
+    engines: {node: '>=10'}
+    dev: true
+
   /emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
@@ -5876,6 +6900,11 @@ packages:
     resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
     engines: {node: '>=0.8.0'}
 
+  /escape-string-regexp@2.0.0:
+    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
+    engines: {node: '>=8'}
+    dev: true
+
   /escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
@@ -5891,7 +6920,24 @@ packages:
       optionator: 0.8.3
     optionalDependencies:
       source-map: 0.6.1
-    dev: false
+
+  /eslint-formatter-pretty@4.1.0:
+    resolution: {integrity: sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      '@types/eslint': 7.29.0
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      eslint-rule-docs: 1.1.235
+      log-symbols: 4.1.0
+      plur: 4.0.0
+      string-width: 4.2.3
+      supports-hyperlinks: 2.3.0
+    dev: true
+
+  /eslint-rule-docs@1.1.235:
+    resolution: {integrity: sha512-+TQ+x4JdTnDoFEXXb3fDvfGOwnyNV7duH8fXWTPD1ieaBmB8omj7Gw/pMBBu4uI2uJCCU8APDaQJzWuXnTsH4A==}
+    dev: true
 
   /eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
@@ -5917,6 +6963,16 @@ packages:
       eslint: 8.31.0
       eslint-visitor-keys: 2.1.0
 
+  /eslint-utils@3.0.0(eslint@8.6.0):
+    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
+    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
+    peerDependencies:
+      eslint: '>=5'
+    dependencies:
+      eslint: 8.6.0
+      eslint-visitor-keys: 2.1.0
+    dev: true
+
   /eslint-visitor-keys@1.3.0:
     resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==}
     engines: {node: '>=4'}
@@ -5977,6 +7033,53 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /eslint@8.6.0:
+    resolution: {integrity: sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    hasBin: true
+    dependencies:
+      '@eslint/eslintrc': 1.4.1
+      '@humanwhocodes/config-array': 0.9.5
+      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
+      enquirer: 2.3.6
+      escape-string-regexp: 4.0.0
+      eslint-scope: 7.1.1
+      eslint-utils: 3.0.0(eslint@8.6.0)
+      eslint-visitor-keys: 3.3.0
+      espree: 9.4.1
+      esquery: 1.4.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 6.0.1
+      functional-red-black-tree: 1.0.1
+      glob-parent: 6.0.2
+      globals: 13.19.0
+      ignore: 4.0.6
+      import-fresh: 3.3.0
+      imurmurhash: 0.1.4
+      is-glob: 4.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.1
+      progress: 2.0.3
+      regexpp: 3.2.0
+      semver: 7.3.8
+      strip-ansi: 6.0.1
+      strip-json-comments: 3.1.1
+      text-table: 0.2.0
+      v8-compile-cache: 2.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /espree@9.4.1:
     resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5995,7 +7098,6 @@ packages:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
     hasBin: true
-    dev: false
 
   /esquery@1.4.0:
     resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
@@ -6148,6 +7250,11 @@ packages:
       mixly: 1.0.0
     dev: true
 
+  /exit@0.1.2:
+    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
+    engines: {node: '>= 0.8.0'}
+    dev: true
+
   /expand-brackets@2.1.4:
     resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==}
     engines: {node: '>=0.10.0'}
@@ -6175,6 +7282,16 @@ packages:
       homedir-polyfill: 1.0.3
     dev: true
 
+  /expect@27.5.1:
+    resolution: {integrity: sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      jest-get-type: 27.5.1
+      jest-matcher-utils: 27.5.1
+      jest-message-util: 27.5.1
+    dev: true
+
   /ext-list@2.2.2:
     resolution: {integrity: sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==}
     engines: {node: '>=0.10.0'}
@@ -6297,6 +7414,12 @@ packages:
     dependencies:
       reusify: 1.0.4
 
+  /fb-watchman@2.0.2:
+    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
+    dependencies:
+      bser: 2.1.1
+    dev: true
+
   /fd-slicer@1.1.0:
     resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
     dependencies:
@@ -6560,7 +7683,6 @@ packages:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       mime-types: 2.1.35
-    dev: false
 
   /form-data@4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
@@ -6621,6 +7743,15 @@ packages:
       universalify: 2.0.0
     dev: true
 
+  /fs-extra@7.0.1:
+    resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
+    engines: {node: '>=6 <7 || >=8'}
+    dependencies:
+      graceful-fs: 4.2.10
+      jsonfile: 4.0.0
+      universalify: 0.1.2
+    dev: true
+
   /fs-extra@8.1.0:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
     engines: {node: '>=6 <7 || >=8'}
@@ -6689,6 +7820,10 @@ packages:
   /function-bind@1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
 
+  /functional-red-black-tree@1.0.1:
+    resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==}
+    dev: true
+
   /gauge@3.0.2:
     resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==}
     engines: {node: '>=10'}
@@ -6723,6 +7858,11 @@ packages:
     engines: {node: '>= 4'}
     dev: true
 
+  /gensync@1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
   /get-caller-file@1.0.3:
     resolution: {integrity: sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==}
     dev: true
@@ -6738,6 +7878,11 @@ packages:
       has: 1.0.3
       has-symbols: 1.0.3
 
+  /get-package-type@0.1.0:
+    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
+    engines: {node: '>=8.0.0'}
+    dev: true
+
   /get-paths@0.0.7:
     resolution: {integrity: sha512-0wdJt7C1XKQxuCgouqd+ZvLJ56FQixKoki9MrFaO4EriqzXOiH9gbukaDE1ou08S8Ns3/yDzoBAISNPqj6e6tA==}
     engines: {node: '>=6.4'}
@@ -6944,7 +8089,6 @@ packages:
   /globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
-    dev: false
 
   /globals@13.19.0:
     resolution: {integrity: sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==}
@@ -7153,6 +8297,11 @@ packages:
       har-schema: 2.0.0
     dev: false
 
+  /hard-rejection@2.1.0:
+    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
+    engines: {node: '>=6'}
+    dev: true
+
   /has-ansi@2.0.0:
     resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
     engines: {node: '>=0.10.0'}
@@ -7168,7 +8317,6 @@ packages:
   /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
-    dev: false
 
   /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
@@ -7266,6 +8414,13 @@ packages:
     resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
     dev: true
 
+  /hosted-git-info@4.1.0:
+    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
+    engines: {node: '>=10'}
+    dependencies:
+      lru-cache: 6.0.0
+    dev: true
+
   /hpagent@0.1.2:
     resolution: {integrity: sha512-ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ==}
     dev: false
@@ -7274,6 +8429,13 @@ packages:
     resolution: {integrity: sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==}
     dev: true
 
+  /html-encoding-sniffer@2.0.1:
+    resolution: {integrity: sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      whatwg-encoding: 1.0.5
+    dev: true
+
   /html-encoding-sniffer@3.0.0:
     resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
     engines: {node: '>=12'}
@@ -7285,6 +8447,10 @@ packages:
     resolution: {integrity: sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==}
     dev: false
 
+  /html-escaper@2.0.2:
+    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
+    dev: true
+
   /htmlparser2@3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -7350,6 +8516,17 @@ packages:
       toidentifier: 1.0.1
     dev: false
 
+  /http-proxy-agent@4.0.1:
+    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
+    engines: {node: '>= 6'}
+    dependencies:
+      '@tootallnate/once': 1.1.2
+      agent-base: 6.0.2
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /http-proxy-agent@5.0.0:
     resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
     engines: {node: '>= 6'}
@@ -7421,7 +8598,6 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
   /human-signals@1.1.1:
     resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
@@ -7453,7 +8629,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dependencies:
       safer-buffer: 2.1.2
-    dev: false
 
   /iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
@@ -7479,6 +8654,11 @@ packages:
   /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
+  /ignore@4.0.6:
+    resolution: {integrity: sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==}
+    engines: {node: '>= 4'}
+    dev: true
+
   /ignore@5.2.4:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
@@ -7499,6 +8679,11 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /import-lazy@4.0.0:
+    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
+    engines: {node: '>=8'}
+    dev: true
+
   /import-local@3.1.0:
     resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
     engines: {node: '>=8'}
@@ -7638,6 +8823,11 @@ packages:
     engines: {node: '>= 10'}
     dev: false
 
+  /irregular-plurals@3.5.0:
+    resolution: {integrity: sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==}
+    engines: {node: '>=8'}
+    dev: true
+
   /is-absolute-url@2.1.0:
     resolution: {integrity: sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==}
     engines: {node: '>=0.10.0'}
@@ -7775,6 +8965,11 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
+  /is-generator-fn@2.1.0:
+    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
+    engines: {node: '>=6'}
+    dev: true
+
   /is-generator-function@1.0.10:
     resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
     engines: {node: '>= 0.4'}
@@ -7870,7 +9065,6 @@ packages:
 
   /is-potential-custom-element-name@1.0.1:
     resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
-    dev: false
 
   /is-promise@2.2.2:
     resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==}
@@ -7996,6 +9190,52 @@ packages:
   /isstream@0.1.2:
     resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
 
+  /istanbul-lib-coverage@3.2.0:
+    resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /istanbul-lib-instrument@5.2.1:
+    resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/parser': 7.20.7
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-coverage: 3.2.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /istanbul-lib-report@3.0.0:
+    resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
+    engines: {node: '>=8'}
+    dependencies:
+      istanbul-lib-coverage: 3.2.0
+      make-dir: 3.1.0
+      supports-color: 7.2.0
+    dev: true
+
+  /istanbul-lib-source-maps@4.0.1:
+    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
+    engines: {node: '>=10'}
+    dependencies:
+      debug: 4.3.4(supports-color@8.1.1)
+      istanbul-lib-coverage: 3.2.0
+      source-map: 0.6.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /istanbul-reports@3.1.5:
+    resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==}
+    engines: {node: '>=8'}
+    dependencies:
+      html-escaper: 2.0.2
+      istanbul-lib-report: 3.0.0
+    dev: true
+
   /istextorbinary@3.3.0:
     resolution: {integrity: sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==}
     engines: {node: '>=8'}
@@ -8022,6 +9262,461 @@ packages:
       filelist: 1.0.4
       minimatch: 3.1.2
 
+  /jest-changed-files@27.5.1:
+    resolution: {integrity: sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      execa: 5.1.1
+      throat: 6.0.2
+    dev: true
+
+  /jest-circus@27.5.1:
+    resolution: {integrity: sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      co: 4.6.0
+      dedent: 0.7.0
+      expect: 27.5.1
+      is-generator-fn: 2.1.0
+      jest-each: 27.5.1
+      jest-matcher-utils: 27.5.1
+      jest-message-util: 27.5.1
+      jest-runtime: 27.5.1
+      jest-snapshot: 27.5.1
+      jest-util: 27.5.1
+      pretty-format: 27.5.1
+      slash: 3.0.0
+      stack-utils: 2.0.6
+      throat: 6.0.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jest-cli@27.5.1(ts-node@10.4.0):
+    resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@jest/core': 27.5.1(ts-node@10.4.0)
+      '@jest/test-result': 27.5.1
+      '@jest/types': 27.5.1
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.10
+      import-local: 3.1.0
+      jest-config: 27.5.1(ts-node@10.4.0)
+      jest-util: 27.5.1
+      jest-validate: 27.5.1
+      prompts: 2.4.2
+      yargs: 16.2.0
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+    dev: true
+
+  /jest-config@27.5.1(ts-node@10.4.0):
+    resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    peerDependencies:
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      ts-node:
+        optional: true
+    dependencies:
+      '@babel/core': 7.21.4
+      '@jest/test-sequencer': 27.5.1
+      '@jest/types': 27.5.1
+      babel-jest: 27.5.1(@babel/core@7.21.4)
+      chalk: 4.1.2
+      ci-info: 3.7.1
+      deepmerge: 4.2.2
+      glob: 7.2.3
+      graceful-fs: 4.2.10
+      jest-circus: 27.5.1
+      jest-environment-jsdom: 27.5.1
+      jest-environment-node: 27.5.1
+      jest-get-type: 27.5.1
+      jest-jasmine2: 27.5.1
+      jest-regex-util: 27.5.1
+      jest-resolve: 27.5.1
+      jest-runner: 27.5.1
+      jest-util: 27.5.1
+      jest-validate: 27.5.1
+      micromatch: 4.0.5
+      parse-json: 5.2.0
+      pretty-format: 27.5.1
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+      ts-node: 10.4.0(@types/node@17.0.5)(typescript@4.5.4)
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - utf-8-validate
+    dev: true
+
+  /jest-diff@27.5.1:
+    resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      chalk: 4.1.2
+      diff-sequences: 27.5.1
+      jest-get-type: 27.5.1
+      pretty-format: 27.5.1
+    dev: true
+
+  /jest-docblock@27.5.1:
+    resolution: {integrity: sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      detect-newline: 3.1.0
+    dev: true
+
+  /jest-each@27.5.1:
+    resolution: {integrity: sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      chalk: 4.1.2
+      jest-get-type: 27.5.1
+      jest-util: 27.5.1
+      pretty-format: 27.5.1
+    dev: true
+
+  /jest-environment-jsdom@27.5.1:
+    resolution: {integrity: sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/fake-timers': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      jest-mock: 27.5.1
+      jest-util: 27.5.1
+      jsdom: 16.7.0
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - utf-8-validate
+    dev: true
+
+  /jest-environment-node@27.5.1:
+    resolution: {integrity: sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/fake-timers': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      jest-mock: 27.5.1
+      jest-util: 27.5.1
+    dev: true
+
+  /jest-fetch-mock@3.0.3:
+    resolution: {integrity: sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==}
+    dependencies:
+      cross-fetch: 3.1.5
+      promise-polyfill: 8.3.0
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
+  /jest-get-type@27.5.1:
+    resolution: {integrity: sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dev: true
+
+  /jest-haste-map@27.5.1:
+    resolution: {integrity: sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      '@types/graceful-fs': 4.1.6
+      '@types/node': 18.11.18
+      anymatch: 3.1.3
+      fb-watchman: 2.0.2
+      graceful-fs: 4.2.10
+      jest-regex-util: 27.5.1
+      jest-serializer: 27.5.1
+      jest-util: 27.5.1
+      jest-worker: 27.5.1
+      micromatch: 4.0.5
+      walker: 1.0.8
+    optionalDependencies:
+      fsevents: 2.3.2
+    dev: true
+
+  /jest-jasmine2@27.5.1:
+    resolution: {integrity: sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/source-map': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      co: 4.6.0
+      expect: 27.5.1
+      is-generator-fn: 2.1.0
+      jest-each: 27.5.1
+      jest-matcher-utils: 27.5.1
+      jest-message-util: 27.5.1
+      jest-runtime: 27.5.1
+      jest-snapshot: 27.5.1
+      jest-util: 27.5.1
+      pretty-format: 27.5.1
+      throat: 6.0.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jest-leak-detector@27.5.1:
+    resolution: {integrity: sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      jest-get-type: 27.5.1
+      pretty-format: 27.5.1
+    dev: true
+
+  /jest-matcher-utils@27.5.1:
+    resolution: {integrity: sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      chalk: 4.1.2
+      jest-diff: 27.5.1
+      jest-get-type: 27.5.1
+      pretty-format: 27.5.1
+    dev: true
+
+  /jest-message-util@27.5.1:
+    resolution: {integrity: sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@babel/code-frame': 7.18.6
+      '@jest/types': 27.5.1
+      '@types/stack-utils': 2.0.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      micromatch: 4.0.5
+      pretty-format: 27.5.1
+      slash: 3.0.0
+      stack-utils: 2.0.6
+    dev: true
+
+  /jest-mock@27.5.1:
+    resolution: {integrity: sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+    dev: true
+
+  /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1):
+    resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
+    engines: {node: '>=6'}
+    peerDependencies:
+      jest-resolve: '*'
+    peerDependenciesMeta:
+      jest-resolve:
+        optional: true
+    dependencies:
+      jest-resolve: 27.5.1
+    dev: true
+
+  /jest-regex-util@27.5.1:
+    resolution: {integrity: sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dev: true
+
+  /jest-resolve-dependencies@27.5.1:
+    resolution: {integrity: sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      jest-regex-util: 27.5.1
+      jest-snapshot: 27.5.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jest-resolve@27.5.1:
+    resolution: {integrity: sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      jest-haste-map: 27.5.1
+      jest-pnp-resolver: 1.2.3(jest-resolve@27.5.1)
+      jest-util: 27.5.1
+      jest-validate: 27.5.1
+      resolve: 1.22.1
+      resolve.exports: 1.1.1
+      slash: 3.0.0
+    dev: true
+
+  /jest-runner@27.5.1:
+    resolution: {integrity: sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/console': 27.5.1
+      '@jest/environment': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      emittery: 0.8.1
+      graceful-fs: 4.2.10
+      jest-docblock: 27.5.1
+      jest-environment-jsdom: 27.5.1
+      jest-environment-node: 27.5.1
+      jest-haste-map: 27.5.1
+      jest-leak-detector: 27.5.1
+      jest-message-util: 27.5.1
+      jest-resolve: 27.5.1
+      jest-runtime: 27.5.1
+      jest-util: 27.5.1
+      jest-worker: 27.5.1
+      source-map-support: 0.5.21
+      throat: 6.0.2
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - utf-8-validate
+    dev: true
+
+  /jest-runtime@27.5.1:
+    resolution: {integrity: sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/fake-timers': 27.5.1
+      '@jest/globals': 27.5.1
+      '@jest/source-map': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      chalk: 4.1.2
+      cjs-module-lexer: 1.2.2
+      collect-v8-coverage: 1.0.1
+      execa: 5.1.1
+      glob: 7.2.3
+      graceful-fs: 4.2.10
+      jest-haste-map: 27.5.1
+      jest-message-util: 27.5.1
+      jest-mock: 27.5.1
+      jest-regex-util: 27.5.1
+      jest-resolve: 27.5.1
+      jest-snapshot: 27.5.1
+      jest-util: 27.5.1
+      slash: 3.0.0
+      strip-bom: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jest-serializer@27.5.1:
+    resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@types/node': 18.11.18
+      graceful-fs: 4.2.10
+    dev: true
+
+  /jest-snapshot@27.5.1:
+    resolution: {integrity: sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/generator': 7.20.7
+      '@babel/plugin-syntax-typescript': 7.21.4(@babel/core@7.21.4)
+      '@babel/traverse': 7.20.12
+      '@babel/types': 7.20.7
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/babel__traverse': 7.18.3
+      '@types/prettier': 2.7.2
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.4)
+      chalk: 4.1.2
+      expect: 27.5.1
+      graceful-fs: 4.2.10
+      jest-diff: 27.5.1
+      jest-get-type: 27.5.1
+      jest-haste-map: 27.5.1
+      jest-matcher-utils: 27.5.1
+      jest-message-util: 27.5.1
+      jest-util: 27.5.1
+      natural-compare: 1.4.0
+      pretty-format: 27.5.1
+      semver: 7.3.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jest-util@27.5.1:
+    resolution: {integrity: sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      ci-info: 3.7.1
+      graceful-fs: 4.2.10
+      picomatch: 2.3.1
+    dev: true
+
+  /jest-validate@27.5.1:
+    resolution: {integrity: sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      camelcase: 6.3.0
+      chalk: 4.1.2
+      jest-get-type: 27.5.1
+      leven: 3.1.0
+      pretty-format: 27.5.1
+    dev: true
+
+  /jest-watcher@27.5.1:
+    resolution: {integrity: sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/test-result': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      jest-util: 27.5.1
+      string-length: 4.0.2
+    dev: true
+
+  /jest-websocket-mock@2.2.1(mock-socket@9.0.8):
+    resolution: {integrity: sha512-fhsGLXrPfs06PhHoxqOSA9yZ6Rb4qYrf4Wcm7/nfRzjlrf1gIeuhYUkzMRjjE0TMQ37SwkmeLanwrZY4ZaNp8g==}
+    peerDependencies:
+      mock-socket: ^8||^9
+    dependencies:
+      jest-diff: 27.5.1
+      mock-socket: 9.0.8
+    dev: true
+
   /jest-worker@27.5.1:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
@@ -8031,6 +9726,31 @@ packages:
       supports-color: 8.1.1
     dev: true
 
+  /jest@27.4.5(ts-node@10.4.0):
+    resolution: {integrity: sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@jest/core': 27.5.1(ts-node@10.4.0)
+      import-local: 3.1.0
+      jest-cli: 27.5.1(ts-node@10.4.0)
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+    dev: true
+
+  /jju@1.4.0:
+    resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
+    dev: true
+
   /jmespath@0.16.0:
     resolution: {integrity: sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==}
     engines: {node: '>= 0.6.0'}
@@ -8081,7 +9801,14 @@ packages:
 
   /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
-    dev: false
+
+  /js-yaml@3.14.1:
+    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+    hasBin: true
+    dependencies:
+      argparse: 1.0.10
+      esprima: 4.0.1
+    dev: true
 
   /js-yaml@3.7.0:
     resolution: {integrity: sha512-eIlkGty7HGmntbV6P/ZlAsoncFLGsNoM27lkTzS+oneY/EiNhj+geqD9ezg/ip+SW6Var0BJU2JtV0vEUZpWVQ==}
@@ -8109,6 +9836,48 @@ packages:
     engines: {node: '>=0.1.90'}
     dev: false
 
+  /jsdom@16.7.0:
+    resolution: {integrity: sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      canvas: ^2.5.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+    dependencies:
+      abab: 2.0.6
+      acorn: 8.8.1
+      acorn-globals: 6.0.0
+      cssom: 0.4.4
+      cssstyle: 2.3.0
+      data-urls: 2.0.0
+      decimal.js: 10.4.3
+      domexception: 2.0.1
+      escodegen: 2.0.0
+      form-data: 3.0.1
+      html-encoding-sniffer: 2.0.1
+      http-proxy-agent: 4.0.1
+      https-proxy-agent: 5.0.1
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.2
+      parse5: 6.0.1
+      saxes: 5.0.1
+      symbol-tree: 3.2.4
+      tough-cookie: 4.1.2
+      w3c-hr-time: 1.0.2
+      w3c-xmlserializer: 2.0.0
+      webidl-conversions: 6.1.0
+      whatwg-encoding: 1.0.5
+      whatwg-mimetype: 2.3.0
+      whatwg-url: 8.7.0
+      ws: 7.5.9
+      xml-name-validator: 3.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+    dev: true
+
   /jsdom@20.0.3:
     resolution: {integrity: sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==}
     engines: {node: '>=14'}
@@ -8154,7 +9923,6 @@ packages:
     resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
     engines: {node: '>=4'}
     hasBin: true
-    dev: false
 
   /json-buffer@3.0.0:
     resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==}
@@ -8332,6 +10100,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /kleur@3.0.3:
+    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
+    engines: {node: '>=6'}
+    dev: true
+
   /koa-body@6.0.1:
     resolution: {integrity: sha512-M8ZvMD8r+kPHy28aWP9VxL7kY8oPWA+C7ZgCljrCMeaU7uX6wsIQgDHskyrAr9sw+jqnIXyv4Mlxri5R4InIJg==}
     dependencies:
@@ -8597,13 +10370,17 @@ packages:
       flush-write-stream: 1.1.1
     dev: true
 
+  /leven@3.1.0:
+    resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
+    engines: {node: '>=6'}
+    dev: true
+
   /levn@0.3.0:
     resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.1.2
       type-check: 0.3.2
-    dev: false
 
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
@@ -8628,6 +10405,10 @@ packages:
       - supports-color
     dev: true
 
+  /lines-and-columns@1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+    dev: true
+
   /listenercount@1.0.1:
     resolution: {integrity: sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==}
     dev: false
@@ -8741,12 +10522,15 @@ packages:
     resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
     dev: false
 
+  /lodash.get@4.4.2:
+    resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
+    dev: true
+
   /lodash.isarguments@3.1.0:
     resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
 
   /lodash.isequal@4.5.0:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
-    dev: false
 
   /lodash.isplainobject@4.0.6:
     resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
@@ -8846,6 +10630,12 @@ packages:
       pseudomap: 1.0.2
       yallist: 2.1.2
 
+  /lru-cache@5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
+    dependencies:
+      yallist: 3.1.1
+    dev: true
+
   /lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
@@ -8884,7 +10674,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       semver: 6.3.0
-    dev: false
 
   /make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
@@ -8921,11 +10710,27 @@ packages:
       kind-of: 6.0.3
     dev: true
 
+  /makeerror@1.0.12:
+    resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
+    dependencies:
+      tmpl: 1.0.5
+    dev: true
+
   /map-cache@0.2.2:
     resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /map-obj@1.0.1:
+    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /map-obj@4.3.0:
+    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
+    engines: {node: '>=8'}
+    dev: true
+
   /map-stream@0.1.0:
     resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==}
     dev: true
@@ -8962,6 +10767,24 @@ packages:
     engines: {node: '>= 0.6'}
     dev: false
 
+  /meow@9.0.0:
+    resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      '@types/minimist': 1.2.2
+      camelcase-keys: 6.2.2
+      decamelize: 1.2.0
+      decamelize-keys: 1.1.1
+      hard-rejection: 2.1.0
+      minimist-options: 4.1.0
+      normalize-package-data: 3.0.3
+      read-pkg-up: 7.0.1
+      redent: 3.0.0
+      trim-newlines: 3.0.1
+      type-fest: 0.18.1
+      yargs-parser: 20.2.9
+    dev: true
+
   /merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
     dev: true
@@ -9044,6 +10867,11 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: false
 
+  /min-indent@1.0.1:
+    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
+    engines: {node: '>=4'}
+    dev: true
+
   /minimalistic-assert@1.0.1:
     resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
     dev: false
@@ -9066,6 +10894,15 @@ packages:
     dependencies:
       brace-expansion: 2.0.1
 
+  /minimist-options@4.1.0:
+    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
+    engines: {node: '>= 6'}
+    dependencies:
+      arrify: 1.0.1
+      is-plain-obj: 1.1.0
+      kind-of: 6.0.3
+    dev: true
+
   /minimist@1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
 
@@ -9204,6 +11041,11 @@ packages:
       yargs-unparser: 2.0.0
     dev: true
 
+  /mock-socket@9.0.8:
+    resolution: {integrity: sha512-8Syqkaaa2SzRqW68DEsnZkKQicHP7hVzfj3uCvigB5TL79H1ljKbwmOcRIENkx0ZTyu/5W6u+Pk9Qy6JCp38Ww==}
+    engines: {node: '>= 8'}
+    dev: true
+
   /moment@2.29.4:
     resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
     dev: false
@@ -9398,6 +11240,18 @@ packages:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
     engines: {node: '>=10.5.0'}
 
+  /node-fetch@2.6.7:
+    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+    dependencies:
+      whatwg-url: 5.0.0
+    dev: true
+
   /node-fetch@2.6.8:
     resolution: {integrity: sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==}
     engines: {node: 4.x || >=6.0.0}
@@ -9449,6 +11303,10 @@ packages:
       - supports-color
     dev: false
 
+  /node-int64@0.4.0:
+    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
+    dev: true
+
   /node-releases@2.0.8:
     resolution: {integrity: sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==}
     dev: true
@@ -9486,6 +11344,16 @@ packages:
       validate-npm-package-license: 3.0.4
     dev: true
 
+  /normalize-package-data@3.0.3:
+    resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
+    engines: {node: '>=10'}
+    dependencies:
+      hosted-git-info: 4.1.0
+      is-core-module: 2.11.0
+      semver: 7.3.8
+      validate-npm-package-license: 3.0.4
+    dev: true
+
   /normalize-path@2.1.1:
     resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==}
     engines: {node: '>=0.10.0'}
@@ -9612,7 +11480,6 @@ packages:
 
   /nwsapi@2.2.2:
     resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==}
-    dev: false
 
   /oauth-sign@0.9.0:
     resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
@@ -9760,7 +11627,6 @@ packages:
       prelude-ls: 1.1.2
       type-check: 0.3.2
       word-wrap: 1.2.3
-    dev: false
 
   /optionator@0.9.1:
     resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
@@ -9919,6 +11785,16 @@ packages:
       error-ex: 1.3.2
     dev: true
 
+  /parse-json@5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@babel/code-frame': 7.18.6
+      error-ex: 1.3.2
+      json-parse-even-better-errors: 2.3.1
+      lines-and-columns: 1.2.4
+    dev: true
+
   /parse-link-header@2.0.0:
     resolution: {integrity: sha512-xjU87V0VyHZybn2RrCX5TIFGxTVZE6zqqZWMPlIKiSKuWh/X5WZdt+w1Ki1nXB+8L/KtL+nZ4iq+sfI6MrhhMw==}
     dependencies:
@@ -9951,7 +11827,6 @@ packages:
 
   /parse5@6.0.1:
     resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
-    dev: false
 
   /parse5@7.1.2:
     resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
@@ -10150,6 +12025,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /pirates@4.0.5:
+    resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
+    engines: {node: '>= 6'}
+    dev: true
+
   /pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
@@ -10173,6 +12053,13 @@ packages:
       extend-shallow: 3.0.2
     dev: true
 
+  /plur@4.0.0:
+    resolution: {integrity: sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==}
+    engines: {node: '>=10'}
+    dependencies:
+      irregular-plurals: 3.5.0
+    dev: true
+
   /pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
@@ -10461,7 +12348,6 @@ packages:
   /prelude-ls@1.1.2:
     resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
     engines: {node: '>= 0.8.0'}
-    dev: false
 
   /prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
@@ -10482,6 +12368,15 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /pretty-format@27.5.1:
+    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      ansi-regex: 5.0.1
+      ansi-styles: 5.2.0
+      react-is: 17.0.2
+    dev: true
+
   /pretty-hrtime@1.0.3:
     resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
     engines: {node: '>= 0.8'}
@@ -10534,8 +12429,6 @@ packages:
   /progress@2.0.3:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
     engines: {node: '>=0.4.0'}
-    dev: false
-    optional: true
 
   /promise-inflight@1.0.1:
     resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
@@ -10550,6 +12443,10 @@ packages:
     resolution: {integrity: sha512-7nJ6v5lnJsXwGprnGXga4wx6d1POjvi5Qmf1ivTRxTjH4Z/9Czja/UCMLVmB9N93GeWOU93XaFaEt6jbuoagNw==}
     dev: false
 
+  /promise-polyfill@8.3.0:
+    resolution: {integrity: sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==}
+    dev: true
+
   /promise-retry@2.0.1:
     resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
     engines: {node: '>=10'}
@@ -10563,6 +12460,14 @@ packages:
     dependencies:
       asap: 2.0.6
 
+  /prompts@2.4.2:
+    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
+    engines: {node: '>= 6'}
+    dependencies:
+      kleur: 3.0.3
+      sisteransi: 1.0.5
+    dev: true
+
   /proto-list@1.2.4:
     resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
 
@@ -10785,7 +12690,6 @@ packages:
 
   /querystringify@2.2.0:
     resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
-    dev: false
 
   /queue-lit@1.5.0:
     resolution: {integrity: sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA==}
@@ -10794,6 +12698,11 @@ packages:
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
+  /quick-lru@4.0.1:
+    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
+    engines: {node: '>=8'}
+    dev: true
+
   /quick-lru@5.1.1:
     resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
     engines: {node: '>=10'}
@@ -10862,6 +12771,10 @@ packages:
       - supports-color
     dev: false
 
+  /react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+    dev: true
+
   /read-pkg-up@1.0.1:
     resolution: {integrity: sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==}
     engines: {node: '>=0.10.0'}
@@ -10870,6 +12783,15 @@ packages:
       read-pkg: 1.1.0
     dev: true
 
+  /read-pkg-up@7.0.1:
+    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
+    engines: {node: '>=8'}
+    dependencies:
+      find-up: 4.1.0
+      read-pkg: 5.2.0
+      type-fest: 0.8.1
+    dev: true
+
   /read-pkg@1.1.0:
     resolution: {integrity: sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==}
     engines: {node: '>=0.10.0'}
@@ -10879,6 +12801,16 @@ packages:
       path-type: 1.1.0
     dev: true
 
+  /read-pkg@5.2.0:
+    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@types/normalize-package-data': 2.4.1
+      normalize-package-data: 2.5.0
+      parse-json: 5.2.0
+      type-fest: 0.6.0
+    dev: true
+
   /readable-stream@1.1.14:
     resolution: {integrity: sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==}
     dependencies:
@@ -10942,6 +12874,15 @@ packages:
 
   /reconnecting-websocket@4.4.0:
     resolution: {integrity: sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==}
+    dev: false
+
+  /redent@3.0.0:
+    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
+    engines: {node: '>=8'}
+    dependencies:
+      indent-string: 4.0.0
+      strip-indent: 3.0.0
+    dev: true
 
   /redis-errors@1.2.0:
     resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
@@ -11126,7 +13067,6 @@ packages:
 
   /requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
-    dev: false
 
   /resolve-alpn@1.2.1:
     resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
@@ -11174,6 +13114,24 @@ packages:
     resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
     deprecated: https://github.com/lydell/resolve-url#deprecated
 
+  /resolve.exports@1.1.1:
+    resolution: {integrity: sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /resolve@1.17.0:
+    resolution: {integrity: sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==}
+    dependencies:
+      path-parse: 1.0.7
+    dev: true
+
+  /resolve@1.19.0:
+    resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==}
+    dependencies:
+      is-core-module: 2.11.0
+      path-parse: 1.0.7
+    dev: true
+
   /resolve@1.22.1:
     resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
     hasBin: true
@@ -11345,6 +13303,13 @@ packages:
   /sax@1.2.4:
     resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
 
+  /saxes@5.0.1:
+    resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==}
+    engines: {node: '>=10'}
+    dependencies:
+      xmlchars: 2.2.0
+    dev: true
+
   /saxes@6.0.0:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
     engines: {node: '>=v12.22.7'}
@@ -11404,7 +13369,6 @@ packages:
   /semver@6.3.0:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
-    dev: false
 
   /semver@7.3.8:
     resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
@@ -11532,6 +13496,10 @@ packages:
       is-arrayish: 0.3.2
     dev: false
 
+  /sisteransi@1.0.5:
+    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+    dev: true
+
   /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
@@ -11776,6 +13744,13 @@ packages:
     resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}
     dev: true
 
+  /stack-utils@2.0.6:
+    resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      escape-string-regexp: 2.0.0
+    dev: true
+
   /standard-as-callback@2.1.0:
     resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
 
@@ -11849,6 +13824,19 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /string-argv@0.3.1:
+    resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
+    engines: {node: '>=0.6.19'}
+    dev: true
+
+  /string-length@4.0.2:
+    resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      char-regex: 1.0.2
+      strip-ansi: 6.0.1
+    dev: true
+
   /string-width@1.0.2:
     resolution: {integrity: sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==}
     engines: {node: '>=0.10.0'}
@@ -11910,6 +13898,11 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  /strip-bom@4.0.0:
+    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
+    engines: {node: '>=8'}
+    dev: true
+
   /strip-dirs@2.1.0:
     resolution: {integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==}
     dependencies:
@@ -11931,6 +13924,13 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
+  /strip-indent@3.0.0:
+    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      min-indent: 1.0.1
+    dev: true
+
   /strip-json-comments@2.0.1:
     resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
     engines: {node: '>=0.10.0'}
@@ -11994,7 +13994,6 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
-    dev: false
 
   /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
@@ -12008,6 +14007,14 @@ packages:
     dependencies:
       has-flag: 4.0.0
 
+  /supports-hyperlinks@2.3.0:
+    resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
+    engines: {node: '>=8'}
+    dependencies:
+      has-flag: 4.0.0
+      supports-color: 7.2.0
+    dev: true
+
   /supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
@@ -12055,7 +14062,6 @@ packages:
 
   /symbol-tree@3.2.4:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
-    dev: false
 
   /syslog-pro@1.0.0:
     resolution: {integrity: sha512-7SNMJKtQBJlwBUp1jxFT7bXya71cnINXPCYJ2AVhlQE4MKL7o2QiPdAXbMdWRiLeykQ2rx+7TNrnoGzvzhO+eA==}
@@ -12139,6 +14145,14 @@ packages:
       yallist: 4.0.0
     dev: false
 
+  /terminal-link@2.1.1:
+    resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-escapes: 4.3.2
+      supports-hyperlinks: 2.3.0
+    dev: true
+
   /terser-webpack-plugin@5.3.6(@swc/core@1.3.26)(webpack@5.75.0):
     resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
     engines: {node: '>= 10.13.0'}
@@ -12202,6 +14216,15 @@ packages:
       - supports-color
     dev: false
 
+  /test-exclude@6.0.0:
+    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@istanbuljs/schema': 0.1.3
+      glob: 7.2.3
+      minimatch: 3.1.2
+    dev: true
+
   /text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
 
@@ -12229,6 +14252,10 @@ packages:
     resolution: {integrity: sha512-1lvNfLezN6OJ9NaFAhfX4sm5e9YCzHtaRgZ1+B4C+Hv6TibRMsuBAM5/wVKzxjpYIlMymvgsHEFrrigEfXnb2A==}
     dev: true
 
+  /throat@6.0.2:
+    resolution: {integrity: sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==}
+    dev: true
+
   /throttle-debounce@5.0.0:
     resolution: {integrity: sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==}
     engines: {node: '>=12.22'}
@@ -12275,6 +14302,10 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /timsort@0.3.0:
+    resolution: {integrity: sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==}
+    dev: true
+
   /tinycolor2@1.5.2:
     resolution: {integrity: sha512-h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg==}
 
@@ -12284,6 +14315,10 @@ packages:
     dependencies:
       rimraf: 3.0.2
 
+  /tmpl@1.0.5:
+    resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
+    dev: true
+
   /to-absolute-glob@2.0.2:
     resolution: {integrity: sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==}
     engines: {node: '>=0.10.0'}
@@ -12358,7 +14393,7 @@ packages:
     engines: {node: '>=0.8'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.2.0
+      punycode: 2.1.1
 
   /tough-cookie@4.1.2:
     resolution: {integrity: sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==}
@@ -12368,17 +14403,22 @@ packages:
       punycode: 2.2.0
       universalify: 0.2.0
       url-parse: 1.5.10
-    dev: false
 
   /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
-    dev: false
+
+  /tr46@2.1.0:
+    resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==}
+    engines: {node: '>=8'}
+    dependencies:
+      punycode: 2.1.1
+    dev: true
 
   /tr46@3.0.0:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
     dependencies:
-      punycode: 2.2.0
+      punycode: 2.1.1
     dev: false
 
   /trace-redirect@1.0.6:
@@ -12389,6 +14429,11 @@ packages:
     resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==}
     dev: false
 
+  /trim-newlines@3.0.1:
+    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
+    engines: {node: '>=8'}
+    dev: true
+
   /trim-repeated@1.0.0:
     resolution: {integrity: sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==}
     engines: {node: '>=0.10.0'}
@@ -12396,6 +14441,41 @@ packages:
       escape-string-regexp: 1.0.5
     dev: true
 
+  /ts-jest@27.1.2(@babel/core@7.21.4)(@types/jest@27.4.0)(jest@27.4.5)(typescript@4.5.4):
+    resolution: {integrity: sha512-eSOiJOWq6Hhs6Khzk5wKC5sgWIXgXqOCiIl1+3lfnearu58Hj4QpE5tUhQcA3xtZrELbcvAGCsd6HB8OsaVaTA==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    hasBin: true
+    peerDependencies:
+      '@babel/core': '>=7.0.0-beta.0 <8'
+      '@types/jest': ^27.0.0
+      babel-jest: '>=27.0.0 <28'
+      esbuild: ~0.14.0
+      jest: ^27.0.0
+      typescript: '>=3.8 <5.0'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      '@types/jest':
+        optional: true
+      babel-jest:
+        optional: true
+      esbuild:
+        optional: true
+    dependencies:
+      '@babel/core': 7.21.4
+      '@types/jest': 27.4.0
+      bs-logger: 0.2.6
+      fast-json-stable-stringify: 2.1.0
+      jest: 27.4.5(ts-node@10.4.0)
+      jest-util: 27.5.1
+      json5: 2.2.3
+      lodash.memoize: 4.1.2
+      make-error: 1.3.6
+      semver: 7.3.8
+      typescript: 4.5.4
+      yargs-parser: 20.2.9
+    dev: true
+
   /ts-loader@9.4.2(typescript@4.9.4)(webpack@5.75.0):
     resolution: {integrity: sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==}
     engines: {node: '>=12.0.0'}
@@ -12411,6 +14491,36 @@ packages:
       webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
     dev: true
 
+  /ts-node@10.4.0(@types/node@17.0.5)(typescript@4.5.4):
+    resolution: {integrity: sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==}
+    hasBin: true
+    peerDependencies:
+      '@swc/core': '>=1.2.50'
+      '@swc/wasm': '>=1.2.50'
+      '@types/node': '*'
+      typescript: '>=2.7'
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      '@swc/wasm':
+        optional: true
+    dependencies:
+      '@cspotcode/source-map-support': 0.7.0
+      '@tsconfig/node10': 1.0.9
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.3
+      '@types/node': 17.0.5
+      acorn: 8.8.1
+      acorn-walk: 8.2.0
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 4.5.4
+      yn: 3.1.1
+    dev: true
+
   /ts-node@10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
@@ -12463,6 +14573,23 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
+  /tsd@0.19.1:
+    resolution: {integrity: sha512-pSwchclr+ADdxlahRUQXUrdAIOjXx1T1PQV+fLfVLuo/S4z+T00YU84fH8iPlZxyA2pWgJjo42BG1p9SDb4NOw==}
+    engines: {node: '>=12'}
+    hasBin: true
+    dependencies:
+      '@tsd/typescript': 4.5.5
+      eslint-formatter-pretty: 4.1.0
+      globby: 11.1.0
+      meow: 9.0.0
+      path-exists: 4.0.0
+      read-pkg-up: 7.0.1
+    dev: true
+
+  /tslib@1.14.1:
+    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
+    dev: true
+
   /tslib@2.4.1:
     resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
 
@@ -12471,6 +14598,16 @@ packages:
     engines: {node: '>=0.6.x'}
     dev: false
 
+  /tsutils@3.21.0(typescript@4.5.4):
+    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
+    engines: {node: '>= 6'}
+    peerDependencies:
+      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+    dependencies:
+      tslib: 1.14.1
+      typescript: 4.5.4
+    dev: true
+
   /tunnel-agent@0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
     dependencies:
@@ -12487,7 +14624,6 @@ packages:
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.1.2
-    dev: false
 
   /type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
@@ -12498,7 +14634,11 @@ packages:
   /type-detect@4.0.8:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
     engines: {node: '>=4'}
-    dev: false
+
+  /type-fest@0.18.1:
+    resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==}
+    engines: {node: '>=10'}
+    dev: true
 
   /type-fest@0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
@@ -12509,6 +14649,16 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /type-fest@0.6.0:
+    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /type-fest@0.8.1:
+    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
+    engines: {node: '>=8'}
+    dev: true
+
   /type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}
@@ -12527,7 +14677,6 @@ packages:
     resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
     dependencies:
       is-typedarray: 1.0.0
-    dev: false
 
   /typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
@@ -12614,6 +14763,12 @@ packages:
       - supports-color
     dev: false
 
+  /typescript@4.5.4:
+    resolution: {integrity: sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==}
+    engines: {node: '>=4.2.0'}
+    hasBin: true
+    dev: true
+
   /typescript@4.9.4:
     resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==}
     engines: {node: '>=4.2.0'}
@@ -12709,7 +14864,6 @@ packages:
   /universalify@0.2.0:
     resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
     engines: {node: '>= 4.0.0'}
-    dev: false
 
   /universalify@2.0.0:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
@@ -12786,7 +14940,6 @@ packages:
     dependencies:
       querystringify: 2.2.0
       requires-port: 1.0.0
-    dev: false
 
   /url-polyfill@1.1.12:
     resolution: {integrity: sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==}
@@ -12860,6 +15013,19 @@ packages:
   /v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
+  /v8-compile-cache@2.3.0:
+    resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
+    dev: true
+
+  /v8-to-istanbul@8.1.1:
+    resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==}
+    engines: {node: '>=10.12.0'}
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.4
+      convert-source-map: 1.9.0
+      source-map: 0.7.4
+    dev: true
+
   /v8flags@3.2.0:
     resolution: {integrity: sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==}
     engines: {node: '>= 0.10'}
@@ -12874,6 +15040,11 @@ packages:
       spdx-expression-parse: 3.0.1
     dev: true
 
+  /validator@13.9.0:
+    resolution: {integrity: sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==}
+    engines: {node: '>= 0.10'}
+    dev: true
+
   /value-or-function@3.0.0:
     resolution: {integrity: sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==}
     engines: {node: '>= 0.10'}
@@ -13053,6 +15224,20 @@ packages:
       vue: 3.2.45
     dev: true
 
+  /w3c-hr-time@1.0.2:
+    resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
+    deprecated: Use your platform's native performance.now() and performance.timeOrigin.
+    dependencies:
+      browser-process-hrtime: 1.0.0
+    dev: true
+
+  /w3c-xmlserializer@2.0.0:
+    resolution: {integrity: sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==}
+    engines: {node: '>=10'}
+    dependencies:
+      xml-name-validator: 3.0.0
+    dev: true
+
   /w3c-xmlserializer@4.0.0:
     resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==}
     engines: {node: '>=14'}
@@ -13074,6 +15259,12 @@ packages:
       - debug
     dev: true
 
+  /walker@1.0.8:
+    resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
+    dependencies:
+      makeerror: 1.0.12
+    dev: true
+
   /wasm-feature-detect@1.4.0:
     resolution: {integrity: sha512-9z4Yk3SeHQdb7E4g6ywQYcUt1CHr9HFiCIA5h29rv0gmW4lCE5dnDhheiJI5qzVPSDnXHyXQPLGPyucsuIzacw==}
     dev: false
@@ -13107,7 +15298,16 @@ packages:
 
   /webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
-    dev: false
+
+  /webidl-conversions@5.0.0:
+    resolution: {integrity: sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /webidl-conversions@6.1.0:
+    resolution: {integrity: sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==}
+    engines: {node: '>=10.4'}
+    dev: true
 
   /webidl-conversions@7.0.0:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
@@ -13215,6 +15415,12 @@ packages:
       - supports-color
     dev: false
 
+  /whatwg-encoding@1.0.5:
+    resolution: {integrity: sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==}
+    dependencies:
+      iconv-lite: 0.4.24
+    dev: true
+
   /whatwg-encoding@2.0.0:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
     engines: {node: '>=12'}
@@ -13222,6 +15428,10 @@ packages:
       iconv-lite: 0.6.3
     dev: false
 
+  /whatwg-mimetype@2.3.0:
+    resolution: {integrity: sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==}
+    dev: true
+
   /whatwg-mimetype@3.0.0:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
     engines: {node: '>=12'}
@@ -13240,7 +15450,15 @@ packages:
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
-    dev: false
+
+  /whatwg-url@8.7.0:
+    resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==}
+    engines: {node: '>=10'}
+    dependencies:
+      lodash: 4.17.21
+      tr46: 2.1.0
+      webidl-conversions: 6.1.0
+    dev: true
 
   /whet.extend@0.9.9:
     resolution: {integrity: sha512-mmIPAft2vTgEILgPeZFqE/wWh24SEsR/k+N9fJ3Jxrz44iDFy9aemCxdksfURSHYFCLmvs/d/7Iso5XjPpNfrA==}
@@ -13334,6 +15552,28 @@ packages:
   /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
+  /write-file-atomic@3.0.3:
+    resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}
+    dependencies:
+      imurmurhash: 0.1.4
+      is-typedarray: 1.0.0
+      signal-exit: 3.0.7
+      typedarray-to-buffer: 3.1.5
+    dev: true
+
+  /ws@7.5.9:
+    resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==}
+    engines: {node: '>=8.3.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: ^5.0.2
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+    dev: true
+
   /ws@8.11.0:
     resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==}
     engines: {node: '>=10.0.0'}
@@ -13370,6 +15610,10 @@ packages:
       sax: 1.2.4
     dev: false
 
+  /xml-name-validator@3.0.0:
+    resolution: {integrity: sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==}
+    dev: true
+
   /xml-name-validator@4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
     engines: {node: '>=12'}
@@ -13402,7 +15646,6 @@ packages:
 
   /xmlchars@2.2.0:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
-    dev: false
 
   /xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
@@ -13430,8 +15673,6 @@ packages:
 
   /yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
-    dev: false
-    optional: true
 
   /yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
@@ -13558,6 +15799,18 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
+  /z-schema@5.0.5:
+    resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}
+    engines: {node: '>=8.0.0'}
+    hasBin: true
+    dependencies:
+      lodash.get: 4.4.2
+      lodash.isequal: 4.5.0
+      validator: 13.9.0
+    optionalDependencies:
+      commander: 9.5.0
+    dev: true
+
   /zip-stream@4.1.0:
     resolution: {integrity: sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==}
     engines: {node: '>= 10'}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 87d240173..a2ebb0465 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,3 +2,4 @@ packages:
  - 'packages/backend'
  - 'packages/client'
  - 'packages/sw'
+ - 'packages/calckey-js'

From a5468a82046fbb859fd6dfaa081500e0b3d97b4a Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.a-ef.org>
Date: Fri, 7 Apr 2023 17:48:25 -0400
Subject: [PATCH 419/582] fix move inbox

---
 .../remote/activitypub/kernel/move/index.ts   | 105 +++++++-----------
 1 file changed, 39 insertions(+), 66 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/kernel/move/index.ts b/packages/backend/src/remote/activitypub/kernel/move/index.ts
index 47a55b8ab..690b84b0e 100644
--- a/packages/backend/src/remote/activitypub/kernel/move/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/move/index.ts
@@ -1,19 +1,14 @@
 import type { CacheableRemoteUser } from "@/models/entities/user.js";
-import { IRemoteUser, User } from "@/models/entities/user.js";
-import DbResolver from "@/remote/activitypub/db-resolver.js";
-import { getRemoteUser } from "@/server/api/common/getters.js";
-import { updatePerson } from "@/remote/activitypub/models/person.js";
 import { Followings, Users } from "@/models/index.js";
-import { makePaginationQuery } from "@/server/api/common/make-pagination-query.js";
-import deleteFollowing from "@/services/following/delete.js";
+import {
+	resolvePerson,
+	updatePerson,
+} from "@/remote/activitypub/models/person.js";
 import create from "@/services/following/create.js";
-import { getUser } from "@/server/api/common/getters.js";
-import { IdentifiableError } from "@/misc/identifiable-error.js";
-import { ApiError } from "@/server/api/error.js";
-import { meta } from "@/server/api/endpoints/following/create.js";
-import { IObject } from "../../type.js";
-import type { IMove, IActor } from "../../type.js";
-import Resolver from "@/remote/activitypub/resolver.js";
+import deleteFollowing from "@/services/following/delete.js";
+
+import type { IMove } from "../../type.js";
+import { getApHrefNullable } from "../../type.js";
 
 export default async (
 	actor: CacheableRemoteUser,
@@ -21,68 +16,46 @@ export default async (
 ): Promise<string> => {
 	// ※ There is a block target in activity.object, which should be a local user that exists.
 
-	const dbResolver = new DbResolver();
-	const resolver = new Resolver();
-	let new_acc = await dbResolver.getUserFromApId(activity.target);
-	let actor_new;
-	if (!new_acc)
-		actor_new = (await resolver.resolve(<string>activity.target)) as IActor;
+	// fetch the new and old accounts
+	const targetUri = getApHrefNullable(activity.target);
+	if (!targetUri) return "move: target uri is null";
+	const new_acc = await resolvePerson(targetUri);
+	if (!actor.uri) return "move: actor uri is null";
+	const old_acc = await resolvePerson(actor.uri);
 
-	if (
-		(!new_acc || new_acc.uri === null) &&
-		(!actor_new || actor_new.id === null)
-	) {
-		return "move: new acc not found";
+	// update them if they're remote
+	if (new_acc.uri) await updatePerson(new_acc.uri);
+	if (old_acc.uri) await updatePerson(old_acc.uri);
+
+	// check if alsoKnownAs of the new account is valid
+	let isValidMove = true;
+	if (old_acc.uri) {
+		if (!new_acc.alsoKnownAs?.includes(old_acc.uri)) {
+			isValidMove = false;
+		}
+	} else if (!new_acc.alsoKnownAs?.includes(old_acc.id)) {
+		isValidMove = false;
+	}
+	if (!isValidMove) {
+		return "skip: accounts invalid";
 	}
 
-	const newUri = new_acc ? new_acc.uri : actor_new?.url?.toString();
-
-	if (newUri === null || newUri === undefined)
-		return "move: new acc not found #2";
-
-	await updatePerson(newUri);
-	await updatePerson(actor.uri!);
-
-	new_acc = await dbResolver.getUserFromApId(newUri);
-	const old = await dbResolver.getUserFromApId(actor.uri!);
-
-	if (
-		old === null ||
-		old.uri === null ||
-		!new_acc?.alsoKnownAs?.includes(old.uri)
-	)
-		return "move: accounts invalid";
-
-	old.movedToUri = new_acc.uri;
-
-	const followee = await getUser(actor.id).catch((e) => {
-		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff")
-			throw new ApiError(meta.errors.noSuchUser);
-		throw e;
-	});
-
-	const followeeNew = await getUser(new_acc.id).catch((e) => {
-		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff")
-			throw new ApiError(meta.errors.noSuchUser);
-		throw e;
-	});
+	// add target uri to movedToUri in order to indicate that the user has moved
+	await Users.update(old_acc.id, { movedToUri: targetUri });
 
+	// follow the new account and unfollow the old one
 	const followings = await Followings.findBy({
-		followeeId: followee.id,
+		followeeId: old_acc.id,
 	});
-
 	followings.forEach(async (following) => {
-		//if follower is local
+		// If follower is local
 		if (!following.followerHost) {
-			const follower = await getUser(following.followerId).catch((e) => {
-				if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff")
-					throw new ApiError(meta.errors.noSuchUser);
-				throw e;
-			});
-			await deleteFollowing(follower!, followee);
 			try {
-				await create(follower!, followeeNew);
-			} catch (e) {
+				const follower = await Users.findOneBy({ id: following.followerId });
+				if (!follower) return;
+				await create(follower, new_acc);
+				await deleteFollowing(follower, old_acc);
+			} catch {
 				/* empty */
 			}
 		}

From 1309bafb07f91d7ba1f001f647d294139a96ea74 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 16:47:04 -0700
Subject: [PATCH 420/582] chore: rome formatting

---
 packages/calckey-js/.eslintrc.js           |  106 +-
 packages/calckey-js/jest.config.ts         |   14 +-
 packages/calckey-js/src/acct.ts            |    4 +-
 packages/calckey-js/src/api.ts             |  127 +-
 packages/calckey-js/src/api.types.ts       | 1457 +++++++++++++-------
 packages/calckey-js/src/consts.ts          |   90 +-
 packages/calckey-js/src/entities.ts        |  198 +--
 packages/calckey-js/src/index.ts           |   22 +-
 packages/calckey-js/src/streaming.ts       |  165 ++-
 packages/calckey-js/src/streaming.types.ts |  104 +-
 packages/calckey-js/test-d/api.ts          |   43 +-
 packages/calckey-js/test-d/streaming.ts    |   30 +-
 packages/calckey-js/test/api.ts            |  152 +-
 packages/calckey-js/test/streaming.ts      |  178 +--
 packages/client/src/store.ts               |    6 +-
 15 files changed, 1664 insertions(+), 1032 deletions(-)

diff --git a/packages/calckey-js/.eslintrc.js b/packages/calckey-js/.eslintrc.js
index 426894947..164cf1fbe 100644
--- a/packages/calckey-js/.eslintrc.js
+++ b/packages/calckey-js/.eslintrc.js
@@ -1,57 +1,65 @@
 module.exports = {
 	root: true,
-	parser: '@typescript-eslint/parser',
+	parser: "@typescript-eslint/parser",
 	parserOptions: {
 		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json'],
+		project: ["./tsconfig.json"],
 	},
-	plugins: [
-		'@typescript-eslint',
-	],
-	extends: [
-		'eslint:recommended',
-		'plugin:@typescript-eslint/recommended',
-	],
+	plugins: ["@typescript-eslint"],
+	extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
 	rules: {
-		'indent': ['error', 'tab', {
-			'SwitchCase': 1,
-			'MemberExpression': 'off',
-			'flatTernaryExpressions': true,
-			'ArrayExpression': 'first',
-			'ObjectExpression': 'first',
-		}],
-		'eol-last': ['error', 'always'],
-		'semi': ['error', 'always'],
-		'quotes': ['error', 'single'],
-		'comma-dangle': ['error', 'always-multiline'],
-		'keyword-spacing': ['error', {
-			'before': true,
-			'after': true,
-		}],
-		'key-spacing': ['error', {
-			'beforeColon': false,
-			'afterColon': true,
-		}],
-		'space-infix-ops': ['error'],
-		'space-before-blocks': ['error', 'always'],
-		'object-curly-spacing': ['error', 'always'],
-		'nonblock-statement-body-position': ['error', 'beside'],
-		'eqeqeq': ['error', 'always', { 'null': 'ignore' }],
-		'no-multiple-empty-lines': ['error', { 'max': 1 }],
-		'no-multi-spaces': ['error'],
-		'no-var': ['error'],
-		'prefer-arrow-callback': ['error'],
-		'no-throw-literal': ['error'],
-		'no-param-reassign': ['warn'],
-		'no-constant-condition': ['warn'],
-		'no-empty-pattern': ['warn'],
-		'@typescript-eslint/no-unnecessary-condition': ['error'],
-		'@typescript-eslint/no-inferrable-types': ['warn'],
-		'@typescript-eslint/no-non-null-assertion': ['warn'],
-		'@typescript-eslint/explicit-function-return-type': ['warn'],
-		'@typescript-eslint/no-misused-promises': ['error', {
-			'checksVoidReturn': false,
-		}],
-		'@typescript-eslint/consistent-type-imports': 'error',
+		indent: [
+			"error",
+			"tab",
+			{
+				SwitchCase: 1,
+				MemberExpression: "off",
+				flatTernaryExpressions: true,
+				ArrayExpression: "first",
+				ObjectExpression: "first",
+			},
+		],
+		"eol-last": ["error", "always"],
+		semi: ["error", "always"],
+		quotes: ["error", "single"],
+		"comma-dangle": ["error", "always-multiline"],
+		"keyword-spacing": [
+			"error",
+			{
+				before: true,
+				after: true,
+			},
+		],
+		"key-spacing": [
+			"error",
+			{
+				beforeColon: false,
+				afterColon: true,
+			},
+		],
+		"space-infix-ops": ["error"],
+		"space-before-blocks": ["error", "always"],
+		"object-curly-spacing": ["error", "always"],
+		"nonblock-statement-body-position": ["error", "beside"],
+		eqeqeq: ["error", "always", { null: "ignore" }],
+		"no-multiple-empty-lines": ["error", { max: 1 }],
+		"no-multi-spaces": ["error"],
+		"no-var": ["error"],
+		"prefer-arrow-callback": ["error"],
+		"no-throw-literal": ["error"],
+		"no-param-reassign": ["warn"],
+		"no-constant-condition": ["warn"],
+		"no-empty-pattern": ["warn"],
+		"@typescript-eslint/no-unnecessary-condition": ["error"],
+		"@typescript-eslint/no-inferrable-types": ["warn"],
+		"@typescript-eslint/no-non-null-assertion": ["warn"],
+		"@typescript-eslint/explicit-function-return-type": ["warn"],
+		"@typescript-eslint/no-misused-promises": [
+			"error",
+			{
+				checksVoidReturn: false,
+			},
+		],
+		"@typescript-eslint/consistent-type-imports": "error",
 	},
 };
diff --git a/packages/calckey-js/jest.config.ts b/packages/calckey-js/jest.config.ts
index 6d7eeddfe..f26a77c27 100644
--- a/packages/calckey-js/jest.config.ts
+++ b/packages/calckey-js/jest.config.ts
@@ -1,7 +1,7 @@
 /*
-* For a detailed explanation regarding each configuration property and type check, visit:
-* https://jestjs.io/docs/en/configuration.html
-*/
+ * For a detailed explanation regarding each configuration property and type check, visit:
+ * https://jestjs.io/docs/en/configuration.html
+ */
 
 export default {
 	// All imported modules in your tests should be mocked automatically
@@ -117,9 +117,7 @@ export default {
 	// rootDir: undefined,
 
 	// A list of paths to directories that Jest should use to search for files in
-	roots: [
-		"<rootDir>"
-	],
+	roots: ["<rootDir>"],
 
 	// Allows you to use a custom runner instead of Jest's default test runner
 	// runner: "jest-runner",
@@ -149,7 +147,7 @@ export default {
 	testMatch: [
 		"**/__tests__/**/*.[jt]s?(x)",
 		"**/?(*.)+(spec|test).[tj]s?(x)",
-		"<rootDir>/test/**/*"
+		"<rootDir>/test/**/*",
 	],
 
 	// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
@@ -174,7 +172,7 @@ export default {
 
 	// A map from regular expressions to paths to transformers
 	transform: {
-		"^.+\\.(ts|tsx)$": "ts-jest"
+		"^.+\\.(ts|tsx)$": "ts-jest",
 	},
 
 	// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
diff --git a/packages/calckey-js/src/acct.ts b/packages/calckey-js/src/acct.ts
index c32cee86c..5b7767a10 100644
--- a/packages/calckey-js/src/acct.ts
+++ b/packages/calckey-js/src/acct.ts
@@ -4,8 +4,8 @@ export type Acct = {
 };
 
 export function parse(acct: string): Acct {
-	if (acct.startsWith('@')) acct = acct.substr(1);
-	const split = acct.split('@', 2);
+	if (acct.startsWith("@")) acct = acct.substr(1);
+	const split = acct.split("@", 2);
 	return { username: split[0], host: split[1] || null };
 }
 
diff --git a/packages/calckey-js/src/api.ts b/packages/calckey-js/src/api.ts
index 2cf848810..141aa4b85 100644
--- a/packages/calckey-js/src/api.ts
+++ b/packages/calckey-js/src/api.ts
@@ -1,4 +1,4 @@
-import { Endpoints } from './api.types';
+import { Endpoints } from "./api.types";
 
 const MK_API_ERROR = Symbol();
 
@@ -6,7 +6,7 @@ export type APIError = {
 	id: string;
 	code: string;
 	message: string;
-	kind: 'client' | 'server';
+	kind: "client" | "server";
 	info: Record<string, any>;
 };
 
@@ -14,25 +14,38 @@ export function isAPIError(reason: any): reason is APIError {
 	return reason[MK_API_ERROR] === true;
 }
 
-export type FetchLike = (input: string, init?: {
+export type FetchLike = (
+	input: string,
+	init?: {
 		method?: string;
 		body?: string;
 		credentials?: RequestCredentials;
 		cache?: RequestCache;
-	}) => Promise<{
-		status: number;
-		json(): Promise<any>;
-	}>;
+	},
+) => Promise<{
+	status: number;
+	json(): Promise<any>;
+}>;
 
 type IsNeverType<T> = [T] extends [never] ? true : false;
 
 type StrictExtract<Union, Cond> = Cond extends Union ? Union : never;
 
-type IsCaseMatched<E extends keyof Endpoints, P extends Endpoints[E]['req'], C extends number> =
-	IsNeverType<StrictExtract<Endpoints[E]['res']['$switch']['$cases'][C], [P, any]>> extends false ? true : false;
+type IsCaseMatched<
+	E extends keyof Endpoints,
+	P extends Endpoints[E]["req"],
+	C extends number,
+> = IsNeverType<
+	StrictExtract<Endpoints[E]["res"]["$switch"]["$cases"][C], [P, any]>
+> extends false
+	? true
+	: false;
 
-type GetCaseResult<E extends keyof Endpoints, P extends Endpoints[E]['req'], C extends number> =
-	StrictExtract<Endpoints[E]['res']['$switch']['$cases'][C], [P, any]>[1];
+type GetCaseResult<
+	E extends keyof Endpoints,
+	P extends Endpoints[E]["req"],
+	C extends number,
+> = StrictExtract<Endpoints[E]["res"]["$switch"]["$cases"][C], [P, any]>[1];
 
 export class APIClient {
 	public origin: string;
@@ -40,9 +53,9 @@ export class APIClient {
 	public fetch: FetchLike;
 
 	constructor(opts: {
-		origin: APIClient['origin'];
-		credential?: APIClient['credential'];
-		fetch?: APIClient['fetch'] | null | undefined;
+		origin: APIClient["origin"];
+		credential?: APIClient["credential"];
+		fetch?: APIClient["fetch"] | null | undefined;
 	}) {
 		this.origin = opts.origin;
 		this.credential = opts.credential;
@@ -51,48 +64,64 @@ export class APIClient {
 		this.fetch = opts.fetch || ((...args) => fetch(...args));
 	}
 
-	public request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(
-		endpoint: E, params: P = {} as P, credential?: string | null | undefined,
-	): Promise<Endpoints[E]['res'] extends { $switch: { $cases: [any, any][]; $default: any; }; }
-		?
-			IsCaseMatched<E, P, 0> extends true ? GetCaseResult<E, P, 0> :
-			IsCaseMatched<E, P, 1> extends true ? GetCaseResult<E, P, 1> :
-			IsCaseMatched<E, P, 2> extends true ? GetCaseResult<E, P, 2> :
-			IsCaseMatched<E, P, 3> extends true ? GetCaseResult<E, P, 3> :
-			IsCaseMatched<E, P, 4> extends true ? GetCaseResult<E, P, 4> :
-			IsCaseMatched<E, P, 5> extends true ? GetCaseResult<E, P, 5> :
-			IsCaseMatched<E, P, 6> extends true ? GetCaseResult<E, P, 6> :
-			IsCaseMatched<E, P, 7> extends true ? GetCaseResult<E, P, 7> :
-			IsCaseMatched<E, P, 8> extends true ? GetCaseResult<E, P, 8> :
-			IsCaseMatched<E, P, 9> extends true ? GetCaseResult<E, P, 9> :
-			Endpoints[E]['res']['$switch']['$default']
-		: Endpoints[E]['res']>
-	{
+	public request<E extends keyof Endpoints, P extends Endpoints[E]["req"]>(
+		endpoint: E,
+		params: P = {} as P,
+		credential?: string | null | undefined,
+	): Promise<
+		Endpoints[E]["res"] extends {
+			$switch: { $cases: [any, any][]; $default: any };
+		}
+			? IsCaseMatched<E, P, 0> extends true
+				? GetCaseResult<E, P, 0>
+				: IsCaseMatched<E, P, 1> extends true
+				? GetCaseResult<E, P, 1>
+				: IsCaseMatched<E, P, 2> extends true
+				? GetCaseResult<E, P, 2>
+				: IsCaseMatched<E, P, 3> extends true
+				? GetCaseResult<E, P, 3>
+				: IsCaseMatched<E, P, 4> extends true
+				? GetCaseResult<E, P, 4>
+				: IsCaseMatched<E, P, 5> extends true
+				? GetCaseResult<E, P, 5>
+				: IsCaseMatched<E, P, 6> extends true
+				? GetCaseResult<E, P, 6>
+				: IsCaseMatched<E, P, 7> extends true
+				? GetCaseResult<E, P, 7>
+				: IsCaseMatched<E, P, 8> extends true
+				? GetCaseResult<E, P, 8>
+				: IsCaseMatched<E, P, 9> extends true
+				? GetCaseResult<E, P, 9>
+				: Endpoints[E]["res"]["$switch"]["$default"]
+			: Endpoints[E]["res"]
+	> {
 		const promise = new Promise((resolve, reject) => {
 			this.fetch(`${this.origin}/api/${endpoint}`, {
-				method: 'POST',
+				method: "POST",
 				body: JSON.stringify({
 					...params,
 					i: credential !== undefined ? credential : this.credential,
 				}),
-				credentials: 'omit',
-				cache: 'no-cache',
-			}).then(async (res) => {
-				const body = res.status === 204 ? null : await res.json();
-	
-				if (res.status === 200) {
-					resolve(body);
-				} else if (res.status === 204) {
-					resolve(null);
-				} else {
-					reject({
-						[MK_API_ERROR]: true,
-						...body.error,
-					});
-				}
-			}).catch(reject);
+				credentials: "omit",
+				cache: "no-cache",
+			})
+				.then(async (res) => {
+					const body = res.status === 204 ? null : await res.json();
+
+					if (res.status === 200) {
+						resolve(body);
+					} else if (res.status === 204) {
+						resolve(null);
+					} else {
+						reject({
+							[MK_API_ERROR]: true,
+							...body.error,
+						});
+					}
+				})
+				.catch(reject);
 		});
-	
+
 		return promise as any;
 	}
 }
diff --git a/packages/calckey-js/src/api.types.ts b/packages/calckey-js/src/api.types.ts
index 86aabaca4..bbe781e92 100644
--- a/packages/calckey-js/src/api.types.ts
+++ b/packages/calckey-js/src/api.types.ts
@@ -1,134 +1,320 @@
 import {
-	Ad, Announcement, Antenna, App, AuthSession, Blocking, Channel, Clip, DateString, DetailedInstanceMetadata, DriveFile, DriveFolder, Following, FollowingFolloweePopulated, FollowingFollowerPopulated, FollowRequest, GalleryPost, Instance, InstanceMetadata,
+	Ad,
+	Announcement,
+	Antenna,
+	App,
+	AuthSession,
+	Blocking,
+	Channel,
+	Clip,
+	DateString,
+	DetailedInstanceMetadata,
+	DriveFile,
+	DriveFolder,
+	Following,
+	FollowingFolloweePopulated,
+	FollowingFollowerPopulated,
+	FollowRequest,
+	GalleryPost,
+	Instance,
+	InstanceMetadata,
 	LiteInstanceMetadata,
 	MeDetailed,
-	Note, NoteFavorite, OriginType, Page, ServerInfo, Stats, User, UserDetailed, UserGroup, UserList, UserSorting, Notification, NoteReaction, Signin, MessagingMessage,
-} from './entities';
+	Note,
+	NoteFavorite,
+	OriginType,
+	Page,
+	ServerInfo,
+	Stats,
+	User,
+	UserDetailed,
+	UserGroup,
+	UserList,
+	UserSorting,
+	Notification,
+	NoteReaction,
+	Signin,
+	MessagingMessage,
+} from "./entities";
 
 type TODO = Record<string, any> | null;
 
 type NoParams = Record<string, never>;
 
-type ShowUserReq = { username: string; host?: string; } | { userId: User['id']; };
+type ShowUserReq = { username: string; host?: string } | { userId: User["id"] };
 
 export type Endpoints = {
 	// admin
-	'admin/abuse-user-reports': { req: TODO; res: TODO; };
-	'admin/delete-all-files-of-a-user': { req: { userId: User['id']; }; res: null; };
-	'admin/delete-logs': { req: NoParams; res: null; };
-	'admin/get-index-stats': { req: TODO; res: TODO; };
-	'admin/get-table-stats': { req: TODO; res: TODO; };
-	'admin/invite': { req: TODO; res: TODO; };
-	'admin/logs': { req: TODO; res: TODO; };
-	'admin/reset-password': { req: TODO; res: TODO; };
-	'admin/resolve-abuse-user-report': { req: TODO; res: TODO; };
-	'admin/resync-chart': { req: TODO; res: TODO; };
-	'admin/send-email': { req: TODO; res: TODO; };
-	'admin/server-info': { req: TODO; res: TODO; };
-	'admin/show-moderation-logs': { req: TODO; res: TODO; };
-	'admin/show-user': { req: TODO; res: TODO; };
-	'admin/show-users': { req: TODO; res: TODO; };
-	'admin/silence-user': { req: TODO; res: TODO; };
-	'admin/suspend-user': { req: TODO; res: TODO; };
-	'admin/unsilence-user': { req: TODO; res: TODO; };
-	'admin/unsuspend-user': { req: TODO; res: TODO; };
-	'admin/update-meta': { req: TODO; res: TODO; };
-	'admin/vacuum': { req: TODO; res: TODO; };
-	'admin/accounts/create': { req: TODO; res: TODO; };
-	'admin/ad/create': { req: TODO; res: TODO; };
-	'admin/ad/delete': { req: { id: Ad['id']; }; res: null; };
-	'admin/ad/list': { req: TODO; res: TODO; };
-	'admin/ad/update': { req: TODO; res: TODO; };
-	'admin/announcements/create': { req: TODO; res: TODO; };
-	'admin/announcements/delete': { req: { id: Announcement['id'] }; res: null; };
-	'admin/announcements/list': { req: TODO; res: TODO; };
-	'admin/announcements/update': { req: TODO; res: TODO; };
-	'admin/drive/clean-remote-files': { req: TODO; res: TODO; };
-	'admin/drive/cleanup': { req: TODO; res: TODO; };
-	'admin/drive/files': { req: TODO; res: TODO; };
-	'admin/drive/show-file': { req: TODO; res: TODO; };
-	'admin/emoji/add': { req: TODO; res: TODO; };
-	'admin/emoji/copy': { req: TODO; res: TODO; };
-	'admin/emoji/list-remote': { req: TODO; res: TODO; };
-	'admin/emoji/list': { req: TODO; res: TODO; };
-	'admin/emoji/remove': { req: TODO; res: TODO; };
-	'admin/emoji/update': { req: TODO; res: TODO; };
-	'admin/federation/delete-all-files': { req: { host: string; }; res: null; };
-	'admin/federation/refresh-remote-instance-metadata': { req: TODO; res: TODO; };
-	'admin/federation/remove-all-following': { req: TODO; res: TODO; };
-	'admin/federation/update-instance': { req: TODO; res: TODO; };
-	'admin/moderators/add': { req: TODO; res: TODO; };
-	'admin/moderators/remove': { req: TODO; res: TODO; };
-	'admin/promo/create': { req: TODO; res: TODO; };
-	'admin/queue/clear': { req: TODO; res: TODO; };
-	'admin/queue/deliver-delayed': { req: TODO; res: TODO; };
-	'admin/queue/inbox-delayed': { req: TODO; res: TODO; };
-	'admin/queue/jobs': { req: TODO; res: TODO; };
-	'admin/queue/stats': { req: TODO; res: TODO; };
-	'admin/relays/add': { req: TODO; res: TODO; };
-	'admin/relays/list': { req: TODO; res: TODO; };
-	'admin/relays/remove': { req: TODO; res: TODO; };
+	"admin/abuse-user-reports": { req: TODO; res: TODO };
+	"admin/delete-all-files-of-a-user": {
+		req: { userId: User["id"] };
+		res: null;
+	};
+	"admin/delete-logs": { req: NoParams; res: null };
+	"admin/get-index-stats": { req: TODO; res: TODO };
+	"admin/get-table-stats": { req: TODO; res: TODO };
+	"admin/invite": { req: TODO; res: TODO };
+	"admin/logs": { req: TODO; res: TODO };
+	"admin/reset-password": { req: TODO; res: TODO };
+	"admin/resolve-abuse-user-report": { req: TODO; res: TODO };
+	"admin/resync-chart": { req: TODO; res: TODO };
+	"admin/send-email": { req: TODO; res: TODO };
+	"admin/server-info": { req: TODO; res: TODO };
+	"admin/show-moderation-logs": { req: TODO; res: TODO };
+	"admin/show-user": { req: TODO; res: TODO };
+	"admin/show-users": { req: TODO; res: TODO };
+	"admin/silence-user": { req: TODO; res: TODO };
+	"admin/suspend-user": { req: TODO; res: TODO };
+	"admin/unsilence-user": { req: TODO; res: TODO };
+	"admin/unsuspend-user": { req: TODO; res: TODO };
+	"admin/update-meta": { req: TODO; res: TODO };
+	"admin/vacuum": { req: TODO; res: TODO };
+	"admin/accounts/create": { req: TODO; res: TODO };
+	"admin/ad/create": { req: TODO; res: TODO };
+	"admin/ad/delete": { req: { id: Ad["id"] }; res: null };
+	"admin/ad/list": { req: TODO; res: TODO };
+	"admin/ad/update": { req: TODO; res: TODO };
+	"admin/announcements/create": { req: TODO; res: TODO };
+	"admin/announcements/delete": { req: { id: Announcement["id"] }; res: null };
+	"admin/announcements/list": { req: TODO; res: TODO };
+	"admin/announcements/update": { req: TODO; res: TODO };
+	"admin/drive/clean-remote-files": { req: TODO; res: TODO };
+	"admin/drive/cleanup": { req: TODO; res: TODO };
+	"admin/drive/files": { req: TODO; res: TODO };
+	"admin/drive/show-file": { req: TODO; res: TODO };
+	"admin/emoji/add": { req: TODO; res: TODO };
+	"admin/emoji/copy": { req: TODO; res: TODO };
+	"admin/emoji/list-remote": { req: TODO; res: TODO };
+	"admin/emoji/list": { req: TODO; res: TODO };
+	"admin/emoji/remove": { req: TODO; res: TODO };
+	"admin/emoji/update": { req: TODO; res: TODO };
+	"admin/federation/delete-all-files": { req: { host: string }; res: null };
+	"admin/federation/refresh-remote-instance-metadata": { req: TODO; res: TODO };
+	"admin/federation/remove-all-following": { req: TODO; res: TODO };
+	"admin/federation/update-instance": { req: TODO; res: TODO };
+	"admin/moderators/add": { req: TODO; res: TODO };
+	"admin/moderators/remove": { req: TODO; res: TODO };
+	"admin/promo/create": { req: TODO; res: TODO };
+	"admin/queue/clear": { req: TODO; res: TODO };
+	"admin/queue/deliver-delayed": { req: TODO; res: TODO };
+	"admin/queue/inbox-delayed": { req: TODO; res: TODO };
+	"admin/queue/jobs": { req: TODO; res: TODO };
+	"admin/queue/stats": { req: TODO; res: TODO };
+	"admin/relays/add": { req: TODO; res: TODO };
+	"admin/relays/list": { req: TODO; res: TODO };
+	"admin/relays/remove": { req: TODO; res: TODO };
 
 	// announcements
-	'announcements': { req: { limit?: number; withUnreads?: boolean; sinceId?: Announcement['id']; untilId?: Announcement['id']; }; res: Announcement[]; };
+	announcements: {
+		req: {
+			limit?: number;
+			withUnreads?: boolean;
+			sinceId?: Announcement["id"];
+			untilId?: Announcement["id"];
+		};
+		res: Announcement[];
+	};
 
 	// antennas
-	'antennas/create': { req: TODO; res: Antenna; };
-	'antennas/delete': { req: { antennaId: Antenna['id']; }; res: null; };
-	'antennas/list': { req: NoParams; res: Antenna[]; };
-	'antennas/notes': { req: { antennaId: Antenna['id']; limit?: number; sinceId?: Note['id']; untilId?: Note['id']; }; res: Note[]; };
-	'antennas/show': { req: { antennaId: Antenna['id']; }; res: Antenna; };
-	'antennas/update': { req: TODO; res: Antenna; };
-	'antennas/mark-read': { req: TODO; res: Antenna; };
+	"antennas/create": { req: TODO; res: Antenna };
+	"antennas/delete": { req: { antennaId: Antenna["id"] }; res: null };
+	"antennas/list": { req: NoParams; res: Antenna[] };
+	"antennas/notes": {
+		req: {
+			antennaId: Antenna["id"];
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+		};
+		res: Note[];
+	};
+	"antennas/show": { req: { antennaId: Antenna["id"] }; res: Antenna };
+	"antennas/update": { req: TODO; res: Antenna };
+	"antennas/mark-read": { req: TODO; res: Antenna };
 
 	// ap
-	'ap/get': { req: { uri: string; }; res: Record<string, any>; };
-	'ap/show': { req: { uri: string; }; res: {
-		type: 'Note';
-		object: Note;
-	} | {
-		type: 'User';
-		object: UserDetailed;
-	}; };
+	"ap/get": { req: { uri: string }; res: Record<string, any> };
+	"ap/show": {
+		req: { uri: string };
+		res:
+			| {
+					type: "Note";
+					object: Note;
+			  }
+			| {
+					type: "User";
+					object: UserDetailed;
+			  };
+	};
 
 	// app
-	'app/create': { req: TODO; res: App; };
-	'app/show': { req: { appId: App['id']; }; res: App; };
+	"app/create": { req: TODO; res: App };
+	"app/show": { req: { appId: App["id"] }; res: App };
 
 	// auth
-	'auth/accept': { req: { token: string; }; res: null; };
-	'auth/session/generate': { req: { appSecret: string; }; res: { token: string; url: string; }; };
-	'auth/session/show': { req: { token: string; }; res: AuthSession; };
-	'auth/session/userkey': { req: { appSecret: string; token: string; }; res: { accessToken: string; user: User }; };
+	"auth/accept": { req: { token: string }; res: null };
+	"auth/session/generate": {
+		req: { appSecret: string };
+		res: { token: string; url: string };
+	};
+	"auth/session/show": { req: { token: string }; res: AuthSession };
+	"auth/session/userkey": {
+		req: { appSecret: string; token: string };
+		res: { accessToken: string; user: User };
+	};
 
 	// blocking
-	'blocking/create': { req: { userId: User['id'] }; res: UserDetailed; };
-	'blocking/delete': { req: { userId: User['id'] }; res: UserDetailed; };
-	'blocking/list': { req: { limit?: number; sinceId?: Blocking['id']; untilId?: Blocking['id']; }; res: Blocking[]; };
+	"blocking/create": { req: { userId: User["id"] }; res: UserDetailed };
+	"blocking/delete": { req: { userId: User["id"] }; res: UserDetailed };
+	"blocking/list": {
+		req: { limit?: number; sinceId?: Blocking["id"]; untilId?: Blocking["id"] };
+		res: Blocking[];
+	};
 
 	// channels
-	'channels/create': { req: TODO; res: TODO; };
-	'channels/featured': { req: TODO; res: TODO; };
-	'channels/follow': { req: TODO; res: TODO; };
-	'channels/followed': { req: TODO; res: TODO; };
-	'channels/owned': { req: TODO; res: TODO; };
-	'channels/pin-note': { req: TODO; res: TODO; };
-	'channels/show': { req: TODO; res: TODO; };
-	'channels/timeline': { req: TODO; res: TODO; };
-	'channels/unfollow': { req: TODO; res: TODO; };
-	'channels/update': { req: TODO; res: TODO; };
+	"channels/create": { req: TODO; res: TODO };
+	"channels/featured": { req: TODO; res: TODO };
+	"channels/follow": { req: TODO; res: TODO };
+	"channels/followed": { req: TODO; res: TODO };
+	"channels/owned": { req: TODO; res: TODO };
+	"channels/pin-note": { req: TODO; res: TODO };
+	"channels/show": { req: TODO; res: TODO };
+	"channels/timeline": { req: TODO; res: TODO };
+	"channels/unfollow": { req: TODO; res: TODO };
+	"channels/update": { req: TODO; res: TODO };
 
 	// charts
-	'charts/active-users': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: {
-		local: {
-			users: number[];
+	"charts/active-users": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: {
+			local: {
+				users: number[];
+			};
+			remote: {
+				users: number[];
+			};
 		};
-		remote: {
-			users: number[];
+	};
+	"charts/drive": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: {
+			local: {
+				decCount: number[];
+				decSize: number[];
+				incCount: number[];
+				incSize: number[];
+				totalCount: number[];
+				totalSize: number[];
+			};
+			remote: {
+				decCount: number[];
+				decSize: number[];
+				incCount: number[];
+				incSize: number[];
+				totalCount: number[];
+				totalSize: number[];
+			};
 		};
-	}; };
-	'charts/drive': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: {
-		local: {
+	};
+	"charts/federation": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: {
+			instance: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+			};
+		};
+	};
+	"charts/hashtag": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: TODO;
+	};
+	"charts/instance": {
+		req: {
+			span: "day" | "hour";
+			limit?: number;
+			offset?: number | null;
+			host: string;
+		};
+		res: {
+			drive: {
+				decFiles: number[];
+				decUsage: number[];
+				incFiles: number[];
+				incUsage: number[];
+				totalFiles: number[];
+				totalUsage: number[];
+			};
+			followers: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+			};
+			following: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+			};
+			notes: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+				diffs: {
+					normal: number[];
+					renote: number[];
+					reply: number[];
+				};
+			};
+			requests: {
+				failed: number[];
+				received: number[];
+				succeeded: number[];
+			};
+			users: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+			};
+		};
+	};
+	"charts/network": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: TODO;
+	};
+	"charts/notes": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: {
+			local: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+				diffs: {
+					normal: number[];
+					renote: number[];
+					reply: number[];
+				};
+			};
+			remote: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+				diffs: {
+					normal: number[];
+					renote: number[];
+					reply: number[];
+				};
+			};
+		};
+	};
+	"charts/user/drive": {
+		req: {
+			span: "day" | "hour";
+			limit?: number;
+			offset?: number | null;
+			userId: User["id"];
+		};
+		res: {
 			decCount: number[];
 			decSize: number[];
 			incCount: number[];
@@ -136,43 +322,24 @@ export type Endpoints = {
 			totalCount: number[];
 			totalSize: number[];
 		};
-		remote: {
-			decCount: number[];
-			decSize: number[];
-			incCount: number[];
-			incSize: number[];
-			totalCount: number[];
-			totalSize: number[];
+	};
+	"charts/user/following": {
+		req: {
+			span: "day" | "hour";
+			limit?: number;
+			offset?: number | null;
+			userId: User["id"];
 		};
-	}; };
-	'charts/federation': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: {
-		instance: {
-			dec: number[];
-			inc: number[];
-			total: number[];
+		res: TODO;
+	};
+	"charts/user/notes": {
+		req: {
+			span: "day" | "hour";
+			limit?: number;
+			offset?: number | null;
+			userId: User["id"];
 		};
-	}; };
-	'charts/hashtag': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: TODO; };
-	'charts/instance': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; host: string; }; res: {
-		drive: {
-			decFiles: number[];
-			decUsage: number[];
-			incFiles: number[];
-			incUsage: number[];
-			totalFiles: number[];
-			totalUsage: number[];
-		};
-		followers: {
-			dec: number[];
-			inc: number[];
-			total: number[];
-		};
-		following: {
-			dec: number[];
-			inc: number[];
-			total: number[];
-		};
-		notes: {
+		res: {
 			dec: number[];
 			inc: number[];
 			total: number[];
@@ -182,431 +349,733 @@ export type Endpoints = {
 				reply: number[];
 			};
 		};
-		requests: {
-			failed: number[];
-			received: number[];
-			succeeded: number[];
+	};
+	"charts/user/reactions": {
+		req: {
+			span: "day" | "hour";
+			limit?: number;
+			offset?: number | null;
+			userId: User["id"];
 		};
-		users: {
-			dec: number[];
-			inc: number[];
-			total: number[];
-		};
-	}; };
-	'charts/network': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: TODO; };
-	'charts/notes': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: {
-		local: {
-			dec: number[];
-			inc: number[];
-			total: number[];
-			diffs: {
-				normal: number[];
-				renote: number[];
-				reply: number[];
+		res: TODO;
+	};
+	"charts/users": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: {
+			local: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+			};
+			remote: {
+				dec: number[];
+				inc: number[];
+				total: number[];
 			};
 		};
-		remote: {
-			dec: number[];
-			inc: number[];
-			total: number[];
-			diffs: {
-				normal: number[];
-				renote: number[];
-				reply: number[];
-			};
-		};
-	}; };
-	'charts/user/drive': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; userId: User['id']; }; res: {
-		decCount: number[];
-		decSize: number[];
-		incCount: number[];
-		incSize: number[];
-		totalCount: number[];
-		totalSize: number[];
-	}; };
-	'charts/user/following': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; userId: User['id']; }; res: TODO; };
-	'charts/user/notes': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; userId: User['id']; }; res: {
-		dec: number[];
-		inc: number[];
-		total: number[];
-		diffs: {
-			normal: number[];
-			renote: number[];
-			reply: number[];
-		};
-	}; };
-	'charts/user/reactions': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; userId: User['id']; }; res: TODO; };
-	'charts/users': { req: { span: 'day' | 'hour'; limit?: number; offset?: number | null; }; res: {
-		local: {
-			dec: number[];
-			inc: number[];
-			total: number[];
-		};
-		remote: {
-			dec: number[];
-			inc: number[];
-			total: number[];
-		};
-	}; };
+	};
 
 	// clips
-	'clips/add-note': { req: TODO; res: TODO; };
-	'clips/create': { req: TODO; res: TODO; };
-	'clips/delete': { req: { clipId: Clip['id']; }; res: null; };
-	'clips/list': { req: TODO; res: TODO; };
-	'clips/notes': { req: TODO; res: TODO; };
-	'clips/show': { req: TODO; res: TODO; };
-	'clips/update': { req: TODO; res: TODO; };
+	"clips/add-note": { req: TODO; res: TODO };
+	"clips/create": { req: TODO; res: TODO };
+	"clips/delete": { req: { clipId: Clip["id"] }; res: null };
+	"clips/list": { req: TODO; res: TODO };
+	"clips/notes": { req: TODO; res: TODO };
+	"clips/show": { req: TODO; res: TODO };
+	"clips/update": { req: TODO; res: TODO };
 
 	// drive
-	'drive': { req: NoParams; res: { capacity: number; usage: number; }; };
-	'drive/files': { req: { folderId?: DriveFolder['id'] | null; type?: DriveFile['type'] | null; limit?: number; sinceId?: DriveFile['id']; untilId?: DriveFile['id']; }; res: DriveFile[]; };
-	'drive/files/attached-notes': { req: TODO; res: TODO; };
-	'drive/files/check-existence': { req: TODO; res: TODO; };
-	'drive/files/create': { req: TODO; res: TODO; };
-	'drive/files/delete': { req: { fileId: DriveFile['id']; }; res: null; };
-	'drive/files/find-by-hash': { req: TODO; res: TODO; };
-	'drive/files/find': { req: { name: string; folderId?: DriveFolder['id'] | null; }; res: DriveFile[]; };
-	'drive/files/show': { req: { fileId?: DriveFile['id']; url?: string; }; res: DriveFile; };
-	'drive/files/update': { req: { fileId: DriveFile['id']; folderId?: DriveFolder['id'] | null; name?: string; isSensitive?: boolean; comment?: string | null; }; res: DriveFile; };
-	'drive/files/upload-from-url': { req: { url: string; folderId?: DriveFolder['id'] | null; isSensitive?: boolean; comment?: string | null; marker?: string | null; force?: boolean; }; res: null; };
-	'drive/folders': { req: { folderId?: DriveFolder['id'] | null; limit?: number; sinceId?: DriveFile['id']; untilId?: DriveFile['id']; }; res: DriveFolder[]; };
-	'drive/folders/create': { req: { name?: string; parentId?: DriveFolder['id'] | null; }; res: DriveFolder; };
-	'drive/folders/delete': { req: { folderId: DriveFolder['id']; }; res: null; };
-	'drive/folders/find': { req: { name: string; parentId?: DriveFolder['id'] | null; }; res: DriveFolder[]; };
-	'drive/folders/show': { req: { folderId: DriveFolder['id']; }; res: DriveFolder; };
-	'drive/folders/update': { req: { folderId: DriveFolder['id']; name?: string; parentId?: DriveFolder['id'] | null; }; res: DriveFolder; };
-	'drive/stream': { req: { type?: DriveFile['type'] | null; limit?: number; sinceId?: DriveFile['id']; untilId?: DriveFile['id']; }; res: DriveFile[]; };
+	drive: { req: NoParams; res: { capacity: number; usage: number } };
+	"drive/files": {
+		req: {
+			folderId?: DriveFolder["id"] | null;
+			type?: DriveFile["type"] | null;
+			limit?: number;
+			sinceId?: DriveFile["id"];
+			untilId?: DriveFile["id"];
+		};
+		res: DriveFile[];
+	};
+	"drive/files/attached-notes": { req: TODO; res: TODO };
+	"drive/files/check-existence": { req: TODO; res: TODO };
+	"drive/files/create": { req: TODO; res: TODO };
+	"drive/files/delete": { req: { fileId: DriveFile["id"] }; res: null };
+	"drive/files/find-by-hash": { req: TODO; res: TODO };
+	"drive/files/find": {
+		req: { name: string; folderId?: DriveFolder["id"] | null };
+		res: DriveFile[];
+	};
+	"drive/files/show": {
+		req: { fileId?: DriveFile["id"]; url?: string };
+		res: DriveFile;
+	};
+	"drive/files/update": {
+		req: {
+			fileId: DriveFile["id"];
+			folderId?: DriveFolder["id"] | null;
+			name?: string;
+			isSensitive?: boolean;
+			comment?: string | null;
+		};
+		res: DriveFile;
+	};
+	"drive/files/upload-from-url": {
+		req: {
+			url: string;
+			folderId?: DriveFolder["id"] | null;
+			isSensitive?: boolean;
+			comment?: string | null;
+			marker?: string | null;
+			force?: boolean;
+		};
+		res: null;
+	};
+	"drive/folders": {
+		req: {
+			folderId?: DriveFolder["id"] | null;
+			limit?: number;
+			sinceId?: DriveFile["id"];
+			untilId?: DriveFile["id"];
+		};
+		res: DriveFolder[];
+	};
+	"drive/folders/create": {
+		req: { name?: string; parentId?: DriveFolder["id"] | null };
+		res: DriveFolder;
+	};
+	"drive/folders/delete": { req: { folderId: DriveFolder["id"] }; res: null };
+	"drive/folders/find": {
+		req: { name: string; parentId?: DriveFolder["id"] | null };
+		res: DriveFolder[];
+	};
+	"drive/folders/show": {
+		req: { folderId: DriveFolder["id"] };
+		res: DriveFolder;
+	};
+	"drive/folders/update": {
+		req: {
+			folderId: DriveFolder["id"];
+			name?: string;
+			parentId?: DriveFolder["id"] | null;
+		};
+		res: DriveFolder;
+	};
+	"drive/stream": {
+		req: {
+			type?: DriveFile["type"] | null;
+			limit?: number;
+			sinceId?: DriveFile["id"];
+			untilId?: DriveFile["id"];
+		};
+		res: DriveFile[];
+	};
 
 	// endpoint
-	'endpoint': { req: { endpoint: string; }; res: { params: { name: string; type: string; }[]; }; };
+	endpoint: {
+		req: { endpoint: string };
+		res: { params: { name: string; type: string }[] };
+	};
 
 	// endpoints
-	'endpoints': { req: NoParams; res: string[]; };
+	endpoints: { req: NoParams; res: string[] };
 
 	// federation
-	'federation/dns': { req: { host: string; }; res: {
-		a: string[];
-		aaaa: string[];
-		cname: string[];
-		txt: string[];
-	}; };
-	'federation/followers': { req: { host: string; limit?: number; sinceId?: Following['id']; untilId?: Following['id']; }; res: FollowingFolloweePopulated[]; };
-	'federation/following': { req: { host: string; limit?: number; sinceId?: Following['id']; untilId?: Following['id']; }; res: FollowingFolloweePopulated[]; };
-	'federation/instances': { req: {
-		host?: string | null;
-		blocked?: boolean | null;
-		notResponding?: boolean | null;
-		suspended?: boolean | null;
-		federating?: boolean | null;
-		subscribing?: boolean | null;
-		publishing?: boolean | null;
-		limit?: number;
-		offset?: number;
-		sort?: '+pubSub' | '-pubSub' | '+notes' | '-notes' | '+users' | '-users' | '+following' | '-following' | '+followers' | '-followers' | '+caughtAt' | '-caughtAt' | '+lastCommunicatedAt' | '-lastCommunicatedAt' | '+driveUsage' | '-driveUsage' | '+driveFiles' | '-driveFiles';
-	}; res: Instance[]; };
-	'federation/show-instance': { req: { host: string; }; res: Instance; };
-	'federation/update-remote-user': { req: { userId: User['id']; }; res: null; };
-	'federation/users': { req: { host: string; limit?: number; sinceId?: User['id']; untilId?: User['id']; }; res: UserDetailed[]; };
+	"federation/dns": {
+		req: { host: string };
+		res: {
+			a: string[];
+			aaaa: string[];
+			cname: string[];
+			txt: string[];
+		};
+	};
+	"federation/followers": {
+		req: {
+			host: string;
+			limit?: number;
+			sinceId?: Following["id"];
+			untilId?: Following["id"];
+		};
+		res: FollowingFolloweePopulated[];
+	};
+	"federation/following": {
+		req: {
+			host: string;
+			limit?: number;
+			sinceId?: Following["id"];
+			untilId?: Following["id"];
+		};
+		res: FollowingFolloweePopulated[];
+	};
+	"federation/instances": {
+		req: {
+			host?: string | null;
+			blocked?: boolean | null;
+			notResponding?: boolean | null;
+			suspended?: boolean | null;
+			federating?: boolean | null;
+			subscribing?: boolean | null;
+			publishing?: boolean | null;
+			limit?: number;
+			offset?: number;
+			sort?:
+				| "+pubSub"
+				| "-pubSub"
+				| "+notes"
+				| "-notes"
+				| "+users"
+				| "-users"
+				| "+following"
+				| "-following"
+				| "+followers"
+				| "-followers"
+				| "+caughtAt"
+				| "-caughtAt"
+				| "+lastCommunicatedAt"
+				| "-lastCommunicatedAt"
+				| "+driveUsage"
+				| "-driveUsage"
+				| "+driveFiles"
+				| "-driveFiles";
+		};
+		res: Instance[];
+	};
+	"federation/show-instance": { req: { host: string }; res: Instance };
+	"federation/update-remote-user": { req: { userId: User["id"] }; res: null };
+	"federation/users": {
+		req: {
+			host: string;
+			limit?: number;
+			sinceId?: User["id"];
+			untilId?: User["id"];
+		};
+		res: UserDetailed[];
+	};
 
 	// following
-	'following/create': { req: { userId: User['id'] }; res: User; };
-	'following/delete': { req: { userId: User['id'] }; res: User; };
-	'following/requests/accept': { req: { userId: User['id'] }; res: null; };
-	'following/requests/cancel': { req: { userId: User['id'] }; res: User; };
-	'following/requests/list': { req: NoParams; res: FollowRequest[]; };
-	'following/requests/reject': { req: { userId: User['id'] }; res: null; };
+	"following/create": { req: { userId: User["id"] }; res: User };
+	"following/delete": { req: { userId: User["id"] }; res: User };
+	"following/requests/accept": { req: { userId: User["id"] }; res: null };
+	"following/requests/cancel": { req: { userId: User["id"] }; res: User };
+	"following/requests/list": { req: NoParams; res: FollowRequest[] };
+	"following/requests/reject": { req: { userId: User["id"] }; res: null };
 
 	// gallery
-	'gallery/featured': { req: TODO; res: TODO; };
-	'gallery/popular': { req: TODO; res: TODO; };
-	'gallery/posts': { req: TODO; res: TODO; };
-	'gallery/posts/create': { req: TODO; res: TODO; };
-	'gallery/posts/delete': { req: { postId: GalleryPost['id'] }; res: null; };
-	'gallery/posts/like': { req: TODO; res: TODO; };
-	'gallery/posts/show': { req: TODO; res: TODO; };
-	'gallery/posts/unlike': { req: TODO; res: TODO; };
-	'gallery/posts/update': { req: TODO; res: TODO; };
+	"gallery/featured": { req: TODO; res: TODO };
+	"gallery/popular": { req: TODO; res: TODO };
+	"gallery/posts": { req: TODO; res: TODO };
+	"gallery/posts/create": { req: TODO; res: TODO };
+	"gallery/posts/delete": { req: { postId: GalleryPost["id"] }; res: null };
+	"gallery/posts/like": { req: TODO; res: TODO };
+	"gallery/posts/show": { req: TODO; res: TODO };
+	"gallery/posts/unlike": { req: TODO; res: TODO };
+	"gallery/posts/update": { req: TODO; res: TODO };
 
 	// games
-	'games/reversi/games': { req: TODO; res: TODO; };
-	'games/reversi/games/show': { req: TODO; res: TODO; };
-	'games/reversi/games/surrender': { req: TODO; res: TODO; };
-	'games/reversi/invitations': { req: TODO; res: TODO; };
-	'games/reversi/match': { req: TODO; res: TODO; };
-	'games/reversi/match/cancel': { req: TODO; res: TODO; };
+	"games/reversi/games": { req: TODO; res: TODO };
+	"games/reversi/games/show": { req: TODO; res: TODO };
+	"games/reversi/games/surrender": { req: TODO; res: TODO };
+	"games/reversi/invitations": { req: TODO; res: TODO };
+	"games/reversi/match": { req: TODO; res: TODO };
+	"games/reversi/match/cancel": { req: TODO; res: TODO };
 
 	// get-online-users-count
-	'get-online-users-count': { req: NoParams; res: { count: number; }; };
+	"get-online-users-count": { req: NoParams; res: { count: number } };
 
 	// hashtags
-	'hashtags/list': { req: TODO; res: TODO; };
-	'hashtags/search': { req: TODO; res: TODO; };
-	'hashtags/show': { req: TODO; res: TODO; };
-	'hashtags/trend': { req: TODO; res: TODO; };
-	'hashtags/users': { req: TODO; res: TODO; };
+	"hashtags/list": { req: TODO; res: TODO };
+	"hashtags/search": { req: TODO; res: TODO };
+	"hashtags/show": { req: TODO; res: TODO };
+	"hashtags/trend": { req: TODO; res: TODO };
+	"hashtags/users": { req: TODO; res: TODO };
 
 	// i
-	'i': { req: NoParams; res: User; };
-	'i/apps': { req: TODO; res: TODO; };
-	'i/authorized-apps': { req: TODO; res: TODO; };
-	'i/change-password': { req: TODO; res: TODO; };
-	'i/delete-account': { req: { password: string; }; res: null; };
-	'i/export-blocking': { req: TODO; res: TODO; };
-	'i/export-following': { req: TODO; res: TODO; };
-	'i/export-mute': { req: TODO; res: TODO; };
-	'i/export-notes': { req: TODO; res: TODO; };
-	'i/export-user-lists': { req: TODO; res: TODO; };
-	'i/favorites': { req: { limit?: number; sinceId?: NoteFavorite['id']; untilId?: NoteFavorite['id']; }; res: NoteFavorite[]; };
-	'i/gallery/likes': { req: TODO; res: TODO; };
-	'i/gallery/posts': { req: TODO; res: TODO; };
-	'i/get-word-muted-notes-count': { req: TODO; res: TODO; };
-	'i/import-following': { req: TODO; res: TODO; };
-	'i/import-user-lists': { req: TODO; res: TODO; };
-	'i/move': { req: TODO; res: TODO; };
-	'i/known-as': { req: TODO; res: TODO; };
-	'i/notifications': { req: {
-		limit?: number;
-		sinceId?: Notification['id'];
-		untilId?: Notification['id'];
-		following?: boolean;
-		markAsRead?: boolean;
-		includeTypes?: Notification['type'][];
-		excludeTypes?: Notification['type'][];
-	}; res: Notification[]; };
-	'i/page-likes': { req: TODO; res: TODO; };
-	'i/pages': { req: TODO; res: TODO; };
-	'i/pin': { req: { noteId: Note['id']; }; res: MeDetailed; };
-	'i/read-all-messaging-messages': { req: TODO; res: TODO; };
-	'i/read-all-unread-notes': { req: TODO; res: TODO; };
-	'i/read-announcement': { req: TODO; res: TODO; };
-	'i/regenerate-token': { req: { password: string; }; res: null; };
-	'i/registry/get-all': { req: { scope?: string[]; }; res: Record<string, any>; };
-	'i/registry/get-detail': { req: { key: string; scope?: string[]; }; res: { updatedAt: DateString; value: any; }; };
-	'i/registry/get': { req: { key: string; scope?: string[]; }; res: any; };
-	'i/registry/keys-with-type': { req: { scope?: string[]; }; res: Record<string, 'null' | 'array' | 'number' | 'string' | 'boolean' | 'object'>; };
-	'i/registry/keys': { req: { scope?: string[]; }; res: string[]; };
-	'i/registry/remove': { req: { key: string; scope?: string[]; }; res: null; };
-	'i/registry/scopes': { req: NoParams; res: string[][]; };
-	'i/registry/set': { req: { key: string; value: any; scope?: string[]; }; res: null; };
-	'i/revoke-token': { req: TODO; res: TODO; };
-	'i/signin-history': { req: { limit?: number; sinceId?: Signin['id']; untilId?: Signin['id']; }; res: Signin[]; };
-	'i/unpin': { req: { noteId: Note['id']; }; res: MeDetailed; };
-	'i/update-email': { req: {
-		password: string;
-		email?: string | null;
-	}; res: MeDetailed; };
-	'i/update': { req: {
-		name?: string | null;
-		description?: string | null;
-		lang?: string | null;
-		location?: string | null;
-		birthday?: string | null;
-		avatarId?: DriveFile['id'] | null;
-		bannerId?: DriveFile['id'] | null;
-		fields?: {
-			name: string;
-			value: string;
-		}[];
-		isLocked?: boolean;
-		isExplorable?: boolean;
-		hideOnlineStatus?: boolean;
-		carefulBot?: boolean;
-		autoAcceptFollowed?: boolean;
-		noCrawle?: boolean;
-		isBot?: boolean;
-		isCat?: boolean;
-		injectFeaturedNote?: boolean;
-		receiveAnnouncementEmail?: boolean;
-		alwaysMarkNsfw?: boolean;
-		mutedWords?: string[][];
-		mutingNotificationTypes?: Notification['type'][];
-		emailNotificationTypes?: string[];
-	}; res: MeDetailed; };
-	'i/user-group-invites': { req: TODO; res: TODO; };
-	'i/2fa/done': { req: TODO; res: TODO; };
-	'i/2fa/key-done': { req: TODO; res: TODO; };
-	'i/2fa/password-less': { req: TODO; res: TODO; };
-	'i/2fa/register-key': { req: TODO; res: TODO; };
-	'i/2fa/register': { req: TODO; res: TODO; };
-	'i/2fa/remove-key': { req: TODO; res: TODO; };
-	'i/2fa/unregister': { req: TODO; res: TODO; };
+	i: { req: NoParams; res: User };
+	"i/apps": { req: TODO; res: TODO };
+	"i/authorized-apps": { req: TODO; res: TODO };
+	"i/change-password": { req: TODO; res: TODO };
+	"i/delete-account": { req: { password: string }; res: null };
+	"i/export-blocking": { req: TODO; res: TODO };
+	"i/export-following": { req: TODO; res: TODO };
+	"i/export-mute": { req: TODO; res: TODO };
+	"i/export-notes": { req: TODO; res: TODO };
+	"i/export-user-lists": { req: TODO; res: TODO };
+	"i/favorites": {
+		req: {
+			limit?: number;
+			sinceId?: NoteFavorite["id"];
+			untilId?: NoteFavorite["id"];
+		};
+		res: NoteFavorite[];
+	};
+	"i/gallery/likes": { req: TODO; res: TODO };
+	"i/gallery/posts": { req: TODO; res: TODO };
+	"i/get-word-muted-notes-count": { req: TODO; res: TODO };
+	"i/import-following": { req: TODO; res: TODO };
+	"i/import-user-lists": { req: TODO; res: TODO };
+	"i/move": { req: TODO; res: TODO };
+	"i/known-as": { req: TODO; res: TODO };
+	"i/notifications": {
+		req: {
+			limit?: number;
+			sinceId?: Notification["id"];
+			untilId?: Notification["id"];
+			following?: boolean;
+			markAsRead?: boolean;
+			includeTypes?: Notification["type"][];
+			excludeTypes?: Notification["type"][];
+		};
+		res: Notification[];
+	};
+	"i/page-likes": { req: TODO; res: TODO };
+	"i/pages": { req: TODO; res: TODO };
+	"i/pin": { req: { noteId: Note["id"] }; res: MeDetailed };
+	"i/read-all-messaging-messages": { req: TODO; res: TODO };
+	"i/read-all-unread-notes": { req: TODO; res: TODO };
+	"i/read-announcement": { req: TODO; res: TODO };
+	"i/regenerate-token": { req: { password: string }; res: null };
+	"i/registry/get-all": { req: { scope?: string[] }; res: Record<string, any> };
+	"i/registry/get-detail": {
+		req: { key: string; scope?: string[] };
+		res: { updatedAt: DateString; value: any };
+	};
+	"i/registry/get": { req: { key: string; scope?: string[] }; res: any };
+	"i/registry/keys-with-type": {
+		req: { scope?: string[] };
+		res: Record<
+			string,
+			"null" | "array" | "number" | "string" | "boolean" | "object"
+		>;
+	};
+	"i/registry/keys": { req: { scope?: string[] }; res: string[] };
+	"i/registry/remove": { req: { key: string; scope?: string[] }; res: null };
+	"i/registry/scopes": { req: NoParams; res: string[][] };
+	"i/registry/set": {
+		req: { key: string; value: any; scope?: string[] };
+		res: null;
+	};
+	"i/revoke-token": { req: TODO; res: TODO };
+	"i/signin-history": {
+		req: { limit?: number; sinceId?: Signin["id"]; untilId?: Signin["id"] };
+		res: Signin[];
+	};
+	"i/unpin": { req: { noteId: Note["id"] }; res: MeDetailed };
+	"i/update-email": {
+		req: {
+			password: string;
+			email?: string | null;
+		};
+		res: MeDetailed;
+	};
+	"i/update": {
+		req: {
+			name?: string | null;
+			description?: string | null;
+			lang?: string | null;
+			location?: string | null;
+			birthday?: string | null;
+			avatarId?: DriveFile["id"] | null;
+			bannerId?: DriveFile["id"] | null;
+			fields?: {
+				name: string;
+				value: string;
+			}[];
+			isLocked?: boolean;
+			isExplorable?: boolean;
+			hideOnlineStatus?: boolean;
+			carefulBot?: boolean;
+			autoAcceptFollowed?: boolean;
+			noCrawle?: boolean;
+			isBot?: boolean;
+			isCat?: boolean;
+			injectFeaturedNote?: boolean;
+			receiveAnnouncementEmail?: boolean;
+			alwaysMarkNsfw?: boolean;
+			mutedWords?: string[][];
+			mutingNotificationTypes?: Notification["type"][];
+			emailNotificationTypes?: string[];
+		};
+		res: MeDetailed;
+	};
+	"i/user-group-invites": { req: TODO; res: TODO };
+	"i/2fa/done": { req: TODO; res: TODO };
+	"i/2fa/key-done": { req: TODO; res: TODO };
+	"i/2fa/password-less": { req: TODO; res: TODO };
+	"i/2fa/register-key": { req: TODO; res: TODO };
+	"i/2fa/register": { req: TODO; res: TODO };
+	"i/2fa/remove-key": { req: TODO; res: TODO };
+	"i/2fa/unregister": { req: TODO; res: TODO };
 
 	// messaging
-	'messaging/history': { req: { limit?: number; group?: boolean; }; res: MessagingMessage[]; };
-	'messaging/messages': { req: { userId?: User['id']; groupId?: UserGroup['id']; limit?: number; sinceId?: MessagingMessage['id']; untilId?: MessagingMessage['id']; markAsRead?: boolean; }; res: MessagingMessage[]; };
-	'messaging/messages/create': { req: { userId?: User['id']; groupId?: UserGroup['id']; text?: string; fileId?: DriveFile['id']; }; res: MessagingMessage; };
-	'messaging/messages/delete': { req: { messageId: MessagingMessage['id']; }; res: null; };
-	'messaging/messages/read': { req: { messageId: MessagingMessage['id']; }; res: null; };
+	"messaging/history": {
+		req: { limit?: number; group?: boolean };
+		res: MessagingMessage[];
+	};
+	"messaging/messages": {
+		req: {
+			userId?: User["id"];
+			groupId?: UserGroup["id"];
+			limit?: number;
+			sinceId?: MessagingMessage["id"];
+			untilId?: MessagingMessage["id"];
+			markAsRead?: boolean;
+		};
+		res: MessagingMessage[];
+	};
+	"messaging/messages/create": {
+		req: {
+			userId?: User["id"];
+			groupId?: UserGroup["id"];
+			text?: string;
+			fileId?: DriveFile["id"];
+		};
+		res: MessagingMessage;
+	};
+	"messaging/messages/delete": {
+		req: { messageId: MessagingMessage["id"] };
+		res: null;
+	};
+	"messaging/messages/read": {
+		req: { messageId: MessagingMessage["id"] };
+		res: null;
+	};
 
 	// meta
-	'meta': { req: { detail?: boolean; }; res: {
-		$switch: {
-			$cases: [[
-				{ detail: true; },
-				DetailedInstanceMetadata,
-			], [
-				{ detail: false; },
-				LiteInstanceMetadata,
-			], [
-				{ detail: boolean; },
-				LiteInstanceMetadata | DetailedInstanceMetadata,
-			]];
-			$default: LiteInstanceMetadata;
+	meta: {
+		req: { detail?: boolean };
+		res: {
+			$switch: {
+				$cases: [
+					[{ detail: true }, DetailedInstanceMetadata],
+					[{ detail: false }, LiteInstanceMetadata],
+					[
+						{ detail: boolean },
+						LiteInstanceMetadata | DetailedInstanceMetadata,
+					],
+				];
+				$default: LiteInstanceMetadata;
+			};
 		};
-	}; };
+	};
 
 	// miauth
-	'miauth/gen-token': { req: TODO; res: TODO; };
+	"miauth/gen-token": { req: TODO; res: TODO };
 
 	// mute
-	'mute/create': { req: TODO; res: TODO; };
-	'mute/delete': { req: { userId: User['id'] }; res: null; };
-	'mute/list': { req: TODO; res: TODO; };
+	"mute/create": { req: TODO; res: TODO };
+	"mute/delete": { req: { userId: User["id"] }; res: null };
+	"mute/list": { req: TODO; res: TODO };
 
 	// my
-	'my/apps': { req: TODO; res: TODO; };
+	"my/apps": { req: TODO; res: TODO };
 
 	// notes
-	'notes': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; }; res: Note[]; };
-	'notes/children': { req: { noteId: Note['id']; limit?: number; sinceId?: Note['id']; untilId?: Note['id']; }; res: Note[]; };
-	'notes/clips': { req: TODO; res: TODO; };
-	'notes/conversation': { req: TODO; res: TODO; };
-	'notes/create': { req: {
-		visibility?: 'public' | 'home' | 'followers' | 'specified',
-		visibleUserIds?: User['id'][];
-		text?: null | string;
-		cw?: null | string;
-		viaMobile?: boolean;
-		localOnly?: boolean;
-		fileIds?: DriveFile['id'][];
-		replyId?: null | Note['id'];
-		renoteId?: null | Note['id'];
-		channelId?: null | Channel['id'];
-		poll?: null | {
-			choices: string[];
-			multiple?: boolean;
-			expiresAt?: null | number;
-			expiredAfter?: null | number;
+	notes: {
+		req: { limit?: number; sinceId?: Note["id"]; untilId?: Note["id"] };
+		res: Note[];
+	};
+	"notes/children": {
+		req: {
+			noteId: Note["id"];
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
 		};
-	}; res: { createdNote: Note }; };
-	'notes/delete': { req: { noteId: Note['id']; }; res: null; };
-	'notes/favorites/create': { req: { noteId: Note['id']; }; res: null; };
-	'notes/favorites/delete': { req: { noteId: Note['id']; }; res: null; };
-	'notes/featured': { req: TODO; res: Note[]; };
-	'notes/global-timeline': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
-	'notes/recommended-timeline': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
-	'notes/hybrid-timeline': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
-	'notes/local-timeline': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
-	'notes/mentions': { req: { following?: boolean; limit?: number; sinceId?: Note['id']; untilId?: Note['id']; }; res: Note[]; };
-	'notes/polls/recommendation': { req: TODO; res: TODO; };
-	'notes/polls/vote': { req: { noteId: Note['id']; choice: number; }; res: null; };
-	'notes/reactions': { req: { noteId: Note['id']; type?: string | null; limit?: number; }; res: NoteReaction[]; };
-	'notes/reactions/create': { req: { noteId: Note['id']; reaction: string; }; res: null; };
-	'notes/reactions/delete': { req: { noteId: Note['id']; }; res: null; };
-	'notes/renotes': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; noteId: Note['id']; }; res: Note[]; };
-	'notes/replies': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; noteId: Note['id']; }; res: Note[]; };
-	'notes/search-by-tag': { req: TODO; res: TODO; };
-	'notes/search': { req: TODO; res: TODO; };
-	'notes/show': { req: { noteId: Note['id']; }; res: Note; };
-	'notes/state': { req: TODO; res: TODO; };
-	'notes/timeline': { req: { limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
-	'notes/unrenote': { req: { noteId: Note['id']; }; res: null; };
-	'notes/user-list-timeline': { req: { listId: UserList['id']; limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
-	'notes/watching/create': { req: TODO; res: TODO; };
-	'notes/watching/delete': { req: { noteId: Note['id']; }; res: null; };
+		res: Note[];
+	};
+	"notes/clips": { req: TODO; res: TODO };
+	"notes/conversation": { req: TODO; res: TODO };
+	"notes/create": {
+		req: {
+			visibility?: "public" | "home" | "followers" | "specified";
+			visibleUserIds?: User["id"][];
+			text?: null | string;
+			cw?: null | string;
+			viaMobile?: boolean;
+			localOnly?: boolean;
+			fileIds?: DriveFile["id"][];
+			replyId?: null | Note["id"];
+			renoteId?: null | Note["id"];
+			channelId?: null | Channel["id"];
+			poll?: null | {
+				choices: string[];
+				multiple?: boolean;
+				expiresAt?: null | number;
+				expiredAfter?: null | number;
+			};
+		};
+		res: { createdNote: Note };
+	};
+	"notes/delete": { req: { noteId: Note["id"] }; res: null };
+	"notes/favorites/create": { req: { noteId: Note["id"] }; res: null };
+	"notes/favorites/delete": { req: { noteId: Note["id"] }; res: null };
+	"notes/featured": { req: TODO; res: Note[] };
+	"notes/global-timeline": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/recommended-timeline": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/hybrid-timeline": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/local-timeline": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/mentions": {
+		req: {
+			following?: boolean;
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+		};
+		res: Note[];
+	};
+	"notes/polls/recommendation": { req: TODO; res: TODO };
+	"notes/polls/vote": {
+		req: { noteId: Note["id"]; choice: number };
+		res: null;
+	};
+	"notes/reactions": {
+		req: { noteId: Note["id"]; type?: string | null; limit?: number };
+		res: NoteReaction[];
+	};
+	"notes/reactions/create": {
+		req: { noteId: Note["id"]; reaction: string };
+		res: null;
+	};
+	"notes/reactions/delete": { req: { noteId: Note["id"] }; res: null };
+	"notes/renotes": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			noteId: Note["id"];
+		};
+		res: Note[];
+	};
+	"notes/replies": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			noteId: Note["id"];
+		};
+		res: Note[];
+	};
+	"notes/search-by-tag": { req: TODO; res: TODO };
+	"notes/search": { req: TODO; res: TODO };
+	"notes/show": { req: { noteId: Note["id"] }; res: Note };
+	"notes/state": { req: TODO; res: TODO };
+	"notes/timeline": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/unrenote": { req: { noteId: Note["id"] }; res: null };
+	"notes/user-list-timeline": {
+		req: {
+			listId: UserList["id"];
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/watching/create": { req: TODO; res: TODO };
+	"notes/watching/delete": { req: { noteId: Note["id"] }; res: null };
 
 	// notifications
-	'notifications/create': { req: { body: string; header?: string | null; icon?: string | null; }; res: null; };
-	'notifications/mark-all-as-read': { req: NoParams; res: null; };
-	'notifications/read': { req: { notificationId: Notification['id']; }; res: null; };
+	"notifications/create": {
+		req: { body: string; header?: string | null; icon?: string | null };
+		res: null;
+	};
+	"notifications/mark-all-as-read": { req: NoParams; res: null };
+	"notifications/read": {
+		req: { notificationId: Notification["id"] };
+		res: null;
+	};
 
 	// page-push
-	'page-push': { req: { pageId: Page['id']; event: string; var?: any; }; res: null; };
+	"page-push": {
+		req: { pageId: Page["id"]; event: string; var?: any };
+		res: null;
+	};
 
 	// pages
-	'pages/create': { req: TODO; res: Page; };
-	'pages/delete': { req: { pageId: Page['id']; }; res: null; };
-	'pages/featured': { req: NoParams; res: Page[]; };
-	'pages/like': { req: { pageId: Page['id']; }; res: null; };
-	'pages/show': { req: { pageId?: Page['id']; name?: string; username?: string; }; res: Page; };
-	'pages/unlike': { req: { pageId: Page['id']; }; res: null; };
-	'pages/update': { req: TODO; res: null; };
+	"pages/create": { req: TODO; res: Page };
+	"pages/delete": { req: { pageId: Page["id"] }; res: null };
+	"pages/featured": { req: NoParams; res: Page[] };
+	"pages/like": { req: { pageId: Page["id"] }; res: null };
+	"pages/show": {
+		req: { pageId?: Page["id"]; name?: string; username?: string };
+		res: Page;
+	};
+	"pages/unlike": { req: { pageId: Page["id"] }; res: null };
+	"pages/update": { req: TODO; res: null };
 
 	// ping
-	'ping': { req: NoParams; res: { pong: number; }; };
+	ping: { req: NoParams; res: { pong: number } };
 
 	// pinned-users
-	'pinned-users': { req: TODO; res: TODO; };
+	"pinned-users": { req: TODO; res: TODO };
 
 	// promo
-	'promo/read': { req: TODO; res: TODO; };
+	"promo/read": { req: TODO; res: TODO };
 
 	// request-reset-password
-	'request-reset-password': { req: { username: string; email: string; }; res: null; };
+	"request-reset-password": {
+		req: { username: string; email: string };
+		res: null;
+	};
 
 	// reset-password
-	'reset-password': { req: { token: string; password: string; }; res: null; };
+	"reset-password": { req: { token: string; password: string }; res: null };
 
 	// room
-	'room/show': { req: TODO; res: TODO; };
-	'room/update': { req: TODO; res: TODO; };
+	"room/show": { req: TODO; res: TODO };
+	"room/update": { req: TODO; res: TODO };
 
 	// stats
-	'stats': { req: NoParams; res: Stats; };
+	stats: { req: NoParams; res: Stats };
 
 	// server-info
-	'server-info': { req: NoParams; res: ServerInfo; };
+	"server-info": { req: NoParams; res: ServerInfo };
 
 	// ck specific
-	'latest-version': { req: NoParams; res: TODO; };
+	"latest-version": { req: NoParams; res: TODO };
 
 	// sw
-	'sw/register': { req: TODO; res: TODO; };
+	"sw/register": { req: TODO; res: TODO };
 
 	// username
-	'username/available': { req: { username: string; }; res: { available: boolean; }; };
+	"username/available": {
+		req: { username: string };
+		res: { available: boolean };
+	};
 
 	// users
-	'users': { req: { limit?: number; offset?: number; sort?: UserSorting; origin?: OriginType; }; res: User[]; };
-	'users/clips': { req: TODO; res: TODO; };
-	'users/followers': { req: { userId?: User['id']; username?: User['username']; host?: User['host'] | null; limit?: number; sinceId?: Following['id']; untilId?: Following['id']; }; res: FollowingFollowerPopulated[]; };
-	'users/following': { req: { userId?: User['id']; username?: User['username']; host?: User['host'] | null; limit?: number; sinceId?: Following['id']; untilId?: Following['id']; }; res: FollowingFolloweePopulated[]; };
-	'users/gallery/posts': { req: TODO; res: TODO; };
-	'users/get-frequently-replied-users': { req: TODO; res: TODO; };
-	'users/groups/create': { req: TODO; res: TODO; };
-	'users/groups/delete': { req: { groupId: UserGroup['id'] }; res: null; };
-	'users/groups/invitations/accept': { req: TODO; res: TODO; };
-	'users/groups/invitations/reject': { req: TODO; res: TODO; };
-	'users/groups/invite': { req: TODO; res: TODO; };
-	'users/groups/joined': { req: TODO; res: TODO; };
-	'users/groups/owned': { req: TODO; res: TODO; };
-	'users/groups/pull': { req: TODO; res: TODO; };
-	'users/groups/show': { req: TODO; res: TODO; };
-	'users/groups/transfer': { req: TODO; res: TODO; };
-	'users/groups/update': { req: TODO; res: TODO; };
-	'users/lists/create': { req: { name: string; }; res: UserList; };
-	'users/lists/delete': { req: { listId: UserList['id']; }; res: null; };
-	'users/lists/list': { req: NoParams; res: UserList[]; };
-	'users/lists/pull': { req: { listId: UserList['id']; userId: User['id']; }; res: null; };
-	'users/lists/push': { req: { listId: UserList['id']; userId: User['id']; }; res: null; };
-	'users/lists/show': { req: { listId: UserList['id']; }; res: UserList; };
-	'users/lists/update': { req: { listId: UserList['id']; name: string; }; res: UserList; };
-	'users/notes': { req: { userId: User['id']; limit?: number; sinceId?: Note['id']; untilId?: Note['id']; sinceDate?: number; untilDate?: number; }; res: Note[]; };
-	'users/pages': { req: TODO; res: TODO; };
-	'users/recommendation': { req: TODO; res: TODO; };
-	'users/relation': { req: TODO; res: TODO; };
-	'users/report-abuse': { req: TODO; res: TODO; };
-	'users/search-by-username-and-host': { req: TODO; res: TODO; };
-	'users/search': { req: TODO; res: TODO; };
-	'users/show': { req: ShowUserReq | { userIds: User['id'][]; }; res: {
-		$switch: {
-			$cases: [[
-				{ userIds: User['id'][]; },
-				UserDetailed[],
-			]];
-			$default: UserDetailed;
+	users: {
+		req: {
+			limit?: number;
+			offset?: number;
+			sort?: UserSorting;
+			origin?: OriginType;
 		};
-	}; };
-	'users/stats': { req: TODO; res: TODO; };
+		res: User[];
+	};
+	"users/clips": { req: TODO; res: TODO };
+	"users/followers": {
+		req: {
+			userId?: User["id"];
+			username?: User["username"];
+			host?: User["host"] | null;
+			limit?: number;
+			sinceId?: Following["id"];
+			untilId?: Following["id"];
+		};
+		res: FollowingFollowerPopulated[];
+	};
+	"users/following": {
+		req: {
+			userId?: User["id"];
+			username?: User["username"];
+			host?: User["host"] | null;
+			limit?: number;
+			sinceId?: Following["id"];
+			untilId?: Following["id"];
+		};
+		res: FollowingFolloweePopulated[];
+	};
+	"users/gallery/posts": { req: TODO; res: TODO };
+	"users/get-frequently-replied-users": { req: TODO; res: TODO };
+	"users/groups/create": { req: TODO; res: TODO };
+	"users/groups/delete": { req: { groupId: UserGroup["id"] }; res: null };
+	"users/groups/invitations/accept": { req: TODO; res: TODO };
+	"users/groups/invitations/reject": { req: TODO; res: TODO };
+	"users/groups/invite": { req: TODO; res: TODO };
+	"users/groups/joined": { req: TODO; res: TODO };
+	"users/groups/owned": { req: TODO; res: TODO };
+	"users/groups/pull": { req: TODO; res: TODO };
+	"users/groups/show": { req: TODO; res: TODO };
+	"users/groups/transfer": { req: TODO; res: TODO };
+	"users/groups/update": { req: TODO; res: TODO };
+	"users/lists/create": { req: { name: string }; res: UserList };
+	"users/lists/delete": { req: { listId: UserList["id"] }; res: null };
+	"users/lists/list": { req: NoParams; res: UserList[] };
+	"users/lists/pull": {
+		req: { listId: UserList["id"]; userId: User["id"] };
+		res: null;
+	};
+	"users/lists/push": {
+		req: { listId: UserList["id"]; userId: User["id"] };
+		res: null;
+	};
+	"users/lists/show": { req: { listId: UserList["id"] }; res: UserList };
+	"users/lists/update": {
+		req: { listId: UserList["id"]; name: string };
+		res: UserList;
+	};
+	"users/notes": {
+		req: {
+			userId: User["id"];
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"users/pages": { req: TODO; res: TODO };
+	"users/recommendation": { req: TODO; res: TODO };
+	"users/relation": { req: TODO; res: TODO };
+	"users/report-abuse": { req: TODO; res: TODO };
+	"users/search-by-username-and-host": { req: TODO; res: TODO };
+	"users/search": { req: TODO; res: TODO };
+	"users/show": {
+		req: ShowUserReq | { userIds: User["id"][] };
+		res: {
+			$switch: {
+				$cases: [[{ userIds: User["id"][] }, UserDetailed[]]];
+				$default: UserDetailed;
+			};
+		};
+	};
+	"users/stats": { req: TODO; res: TODO };
 };
diff --git a/packages/calckey-js/src/consts.ts b/packages/calckey-js/src/consts.ts
index 261ecd33f..be33c0d3e 100644
--- a/packages/calckey-js/src/consts.ts
+++ b/packages/calckey-js/src/consts.ts
@@ -1,42 +1,60 @@
-export const notificationTypes = ['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app'] as const;
+export const notificationTypes = [
+	"follow",
+	"mention",
+	"reply",
+	"renote",
+	"quote",
+	"reaction",
+	"pollVote",
+	"pollEnded",
+	"receiveFollowRequest",
+	"followRequestAccepted",
+	"groupInvited",
+	"app",
+] as const;
 
-export const noteVisibilities = ['public', 'home', 'followers', 'specified'] as const;
+export const noteVisibilities = [
+	"public",
+	"home",
+	"followers",
+	"specified",
+] as const;
 
-export const mutedNoteReasons = ['word', 'manual', 'spam', 'other'] as const;
+export const mutedNoteReasons = ["word", "manual", "spam", "other"] as const;
 
-export const ffVisibility = ['public', 'followers', 'private'] as const;
+export const ffVisibility = ["public", "followers", "private"] as const;
 
 export const permissions = [
-	'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: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",
 ];
diff --git a/packages/calckey-js/src/entities.ts b/packages/calckey-js/src/entities.ts
index bade8b4b1..b15dd8fca 100644
--- a/packages/calckey-js/src/entities.ts
+++ b/packages/calckey-js/src/entities.ts
@@ -11,7 +11,7 @@ export type UserLite = {
 	username: string;
 	host: string | null;
 	name: string;
-	onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
+	onlineStatus: "online" | "active" | "offline" | "unknown";
 	avatarUrl: string;
 	avatarBlurhash: string;
 	alsoKnownAs: string[];
@@ -21,12 +21,12 @@ export type UserLite = {
 		url: string;
 	}[];
 	instance?: {
-		name: Instance['name'];
-		softwareName: Instance['softwareName'];
-		softwareVersion: Instance['softwareVersion'];
-		iconUrl: Instance['iconUrl'];
-		faviconUrl: Instance['faviconUrl'];
-		themeColor: Instance['themeColor'];
+		name: Instance["name"];
+		softwareName: Instance["softwareName"];
+		softwareVersion: Instance["softwareVersion"];
+		iconUrl: Instance["iconUrl"];
+		faviconUrl: Instance["faviconUrl"];
+		themeColor: Instance["themeColor"];
 	};
 };
 
@@ -37,8 +37,8 @@ export type UserDetailed = UserLite & {
 	birthday: string | null;
 	createdAt: DateString;
 	description: string | null;
-	ffVisibility: 'public' | 'followers' | 'private';
-	fields: {name: string; value: string}[];
+	ffVisibility: "public" | "followers" | "private";
+	fields: { name: string; value: string }[];
 	followersCount: number;
 	followingCount: number;
 	hasPendingFollowRequestFromYou: boolean;
@@ -77,12 +77,12 @@ export type UserList = {
 	id: ID;
 	createdAt: DateString;
 	name: string;
-	userIds: User['id'][];
+	userIds: User["id"][];
 };
 
 export type MeDetailed = UserDetailed & {
-	avatarId: DriveFile['id'];
-	bannerId: DriveFile['id'];
+	avatarId: DriveFile["id"];
+	bannerId: DriveFile["id"];
 	autoAcceptFollowed: boolean;
 	alwaysMarkNsfw: boolean;
 	carefulBot: boolean;
@@ -133,15 +133,15 @@ export type Note = {
 	text: string | null;
 	cw: string | null;
 	user: User;
-	userId: User['id'];
+	userId: User["id"];
 	reply?: Note;
-	replyId: Note['id'];
+	replyId: Note["id"];
 	renote?: Note;
-	renoteId: Note['id'];
+	renoteId: Note["id"];
 	files: DriveFile[];
-	fileIds: DriveFile['id'][];
-	visibility: 'public' | 'home' | 'followers' | 'specified';
-	visibleUserIds?: User['id'][];
+	fileIds: DriveFile["id"][];
+	visibility: "public" | "home" | "followers" | "specified";
+	visibleUserIds?: User["id"][];
 	localOnly?: boolean;
 	myReaction?: string;
 	reactions: Record<string, number>;
@@ -176,75 +176,87 @@ export type Notification = {
 	id: ID;
 	createdAt: DateString;
 	isRead: boolean;
-} & ({
-	type: 'reaction';
-	reaction: string;
-	user: User;
-	userId: User['id'];
-	note: Note;
-} | {
-	type: 'reply';
-	user: User;
-	userId: User['id'];
-	note: Note;
-} | {
-	type: 'renote';
-	user: User;
-	userId: User['id'];
-	note: Note;
-} | {
-	type: 'quote';
-	user: User;
-	userId: User['id'];
-	note: Note;
-} | {
-	type: 'mention';
-	user: User;
-	userId: User['id'];
-	note: Note;
-} | {
-	type: 'pollVote';
-	user: User;
-	userId: User['id'];
-	note: Note;
-} | {
-	type: 'follow';
-	user: User;
-	userId: User['id'];
-} | {
-	type: 'followRequestAccepted';
-	user: User;
-	userId: User['id'];
-} | {
-	type: 'receiveFollowRequest';
-	user: User;
-	userId: User['id'];
-} | {
-	type: 'groupInvited';
-	invitation: UserGroup;
-	user: User;
-	userId: User['id'];
-} | {
-	type: 'app';
-	header?: string | null;
-	body: string;
-	icon?: string | null;
-});
+} & (
+	| {
+			type: "reaction";
+			reaction: string;
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "reply";
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "renote";
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "quote";
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "mention";
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "pollVote";
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "follow";
+			user: User;
+			userId: User["id"];
+	  }
+	| {
+			type: "followRequestAccepted";
+			user: User;
+			userId: User["id"];
+	  }
+	| {
+			type: "receiveFollowRequest";
+			user: User;
+			userId: User["id"];
+	  }
+	| {
+			type: "groupInvited";
+			invitation: UserGroup;
+			user: User;
+			userId: User["id"];
+	  }
+	| {
+			type: "app";
+			header?: string | null;
+			body: string;
+			icon?: string | null;
+	  }
+);
 
 export type MessagingMessage = {
 	id: ID;
 	createdAt: DateString;
 	file: DriveFile | null;
-	fileId: DriveFile['id'] | null;
+	fileId: DriveFile["id"] | null;
 	isRead: boolean;
-	reads: User['id'][];
+	reads: User["id"][];
 	text: string | null;
 	user: User;
-	userId: User['id'];
+	userId: User["id"];
 	recipient?: User | null;
-	recipientId: User['id'] | null;
+	recipientId: User["id"] | null;
 	group?: UserGroup | null;
-	groupId: UserGroup['id'] | null;
+	groupId: UserGroup["id"] | null;
 };
 
 export type CustomEmoji = {
@@ -325,7 +337,7 @@ export type Page = {
 	id: ID;
 	createdAt: DateString;
 	updatedAt: DateString;
-	userId: User['id'];
+	userId: User["id"];
 	user: User;
 	content: Record<string, any>[];
 	variables: Record<string, any>[];
@@ -336,7 +348,7 @@ export type Page = {
 	alignCenter: boolean;
 	font: string;
 	script: string;
-	eyeCatchingImageId: DriveFile['id'] | null;
+	eyeCatchingImageId: DriveFile["id"] | null;
 	eyeCatchingImage: DriveFile | null;
 	attachedFiles: any;
 	likedCount: number;
@@ -344,10 +356,10 @@ export type Page = {
 };
 
 export type PageEvent = {
-	pageId: Page['id'];
+	pageId: Page["id"];
 	event: string;
 	var: any;
-	userId: User['id'];
+	userId: User["id"];
 	user: User;
 };
 
@@ -367,7 +379,7 @@ export type Antenna = {
 	name: string;
 	keywords: string[][]; // TODO
 	excludeKeywords: string[][]; // TODO
-	src: 'home' | 'all' | 'users' | 'list' | 'group' | 'instances';
+	src: "home" | "all" | "users" | "list" | "group" | "instances";
 	userListId: ID | null; // TODO
 	userGroupId: ID | null; // TODO
 	users: string[]; // TODO
@@ -394,7 +406,7 @@ export type Clip = TODO;
 export type NoteFavorite = {
 	id: ID;
 	createdAt: DateString;
-	noteId: Note['id'];
+	noteId: Note["id"];
 	note: Note;
 };
 
@@ -412,8 +424,8 @@ export type Channel = {
 export type Following = {
 	id: ID;
 	createdAt: DateString;
-	followerId: User['id'];
-	followeeId: User['id'];
+	followerId: User["id"];
+	followeeId: User["id"];
 };
 
 export type FollowingFolloweePopulated = Following & {
@@ -427,7 +439,7 @@ export type FollowingFollowerPopulated = Following & {
 export type Blocking = {
 	id: ID;
 	createdAt: DateString;
-	blockeeId: User['id'];
+	blockeeId: User["id"];
 	blockee: UserDetailed;
 };
 
@@ -469,10 +481,10 @@ export type Signin = {
 };
 
 export type UserSorting =
-	| '+follower'
-	| '-follower'
-	| '+createdAt'
-	| '-createdAt'
-	| '+updatedAt'
-	| '-updatedAt';
-export type OriginType = 'combined' | 'local' | 'remote';
+	| "+follower"
+	| "-follower"
+	| "+createdAt"
+	| "-createdAt"
+	| "+updatedAt"
+	| "-updatedAt";
+export type OriginType = "combined" | "local" | "remote";
diff --git a/packages/calckey-js/src/index.ts b/packages/calckey-js/src/index.ts
index f431d65cc..128ed8c53 100644
--- a/packages/calckey-js/src/index.ts
+++ b/packages/calckey-js/src/index.ts
@@ -1,16 +1,10 @@
-import { Endpoints } from './api.types';
-import Stream, { Connection } from './streaming';
-import { Channels } from './streaming.types';
-import { Acct } from './acct';
-import * as consts from './consts';
+import { Endpoints } from "./api.types";
+import Stream, { Connection } from "./streaming";
+import { Channels } from "./streaming.types";
+import { Acct } from "./acct";
+import * as consts from "./consts";
 
-export {
-	Endpoints,
-	Stream,
-	Connection as ChannelConnection,
-	Channels,
-	Acct,
-};
+export { Endpoints, Stream, Connection as ChannelConnection, Channels, Acct };
 
 export const permissions = consts.permissions;
 export const notificationTypes = consts.notificationTypes;
@@ -21,6 +15,6 @@ export const ffVisibility = consts.ffVisibility;
 // api extractor not supported yet
 //export * as api from './api';
 //export * as entities from './entities';
-import * as api from './api';
-import * as entities from './entities';
+import * as api from "./api";
+import * as entities from "./entities";
 export { api, entities };
diff --git a/packages/calckey-js/src/streaming.ts b/packages/calckey-js/src/streaming.ts
index 14be97b43..80a3d6e8c 100644
--- a/packages/calckey-js/src/streaming.ts
+++ b/packages/calckey-js/src/streaming.ts
@@ -1,17 +1,22 @@
-import autobind from 'autobind-decorator';
-import { EventEmitter } from 'eventemitter3';
-import ReconnectingWebsocket from 'reconnecting-websocket';
-import { BroadcastEvents, Channels } from './streaming.types';
+import autobind from "autobind-decorator";
+import { EventEmitter } from "eventemitter3";
+import ReconnectingWebsocket from "reconnecting-websocket";
+import { BroadcastEvents, Channels } from "./streaming.types";
 
-export function urlQuery(obj: Record<string, string | number | boolean | undefined>): string {
+export function urlQuery(
+	obj: Record<string, string | number | boolean | undefined>,
+): string {
 	const params = Object.entries(obj)
-		.filter(([, v]) => Array.isArray(v) ? v.length : v !== undefined)
+		.filter(([, v]) => (Array.isArray(v) ? v.length : v !== undefined))
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		.reduce((a, [k, v]) => (a[k] = v!, a), {} as Record<string, string | number | boolean>);
+		.reduce(
+			(a, [k, v]) => ((a[k] = v!), a),
+			{} as Record<string, string | number | boolean>,
+		);
 
 	return Object.entries(params)
 		.map((e) => `${e[0]}=${encodeURIComponent(e[1])}`)
-		.join('&');
+		.join("&");
 }
 
 type AnyOf<T extends Record<any, any>> = T[keyof T];
@@ -26,17 +31,21 @@ type StreamEvents = {
  */
 export default class Stream extends EventEmitter<StreamEvents> {
 	private stream: ReconnectingWebsocket;
-	public state: 'initializing' | 'reconnecting' | 'connected' = 'initializing';
+	public state: "initializing" | "reconnecting" | "connected" = "initializing";
 	private sharedConnectionPools: Pool[] = [];
 	private sharedConnections: SharedConnection[] = [];
 	private nonSharedConnections: NonSharedConnection[] = [];
 	private idCounter = 0;
 
-	constructor(origin: string, user: { token: string; } | null, options?: {
-		WebSocket?: any;
-	}) {
+	constructor(
+		origin: string,
+		user: { token: string } | null,
+		options?: {
+			WebSocket?: any;
+		},
+	) {
 		super();
-		options = options || { };
+		options = options || {};
 
 		const query = urlQuery({
 			i: user?.token,
@@ -45,15 +54,21 @@ export default class Stream extends EventEmitter<StreamEvents> {
 			_t: Date.now(),
 		});
 
-		const wsOrigin = origin.replace('http://', 'ws://').replace('https://', 'wss://');
+		const wsOrigin = origin
+			.replace("http://", "ws://")
+			.replace("https://", "wss://");
 
-		this.stream = new ReconnectingWebsocket(`${wsOrigin}/streaming?${query}`, '', {
-			minReconnectionDelay: 1, // https://github.com/pladaria/reconnecting-websocket/issues/91
-			WebSocket: options.WebSocket,
-		});
-		this.stream.addEventListener('open', this.onOpen);
-		this.stream.addEventListener('close', this.onClose);
-		this.stream.addEventListener('message', this.onMessage);
+		this.stream = new ReconnectingWebsocket(
+			`${wsOrigin}/streaming?${query}`,
+			"",
+			{
+				minReconnectionDelay: 1, // https://github.com/pladaria/reconnecting-websocket/issues/91
+				WebSocket: options.WebSocket,
+			},
+		);
+		this.stream.addEventListener("open", this.onOpen);
+		this.stream.addEventListener("close", this.onClose);
+		this.stream.addEventListener("message", this.onMessage);
 	}
 
 	@autobind
@@ -62,7 +77,11 @@ export default class Stream extends EventEmitter<StreamEvents> {
 	}
 
 	@autobind
-	public useChannel<C extends keyof Channels>(channel: C, params?: Channels[C]['params'], name?: string): Connection<Channels[C]> {
+	public useChannel<C extends keyof Channels>(
+		channel: C,
+		params?: Channels[C]["params"],
+		name?: string,
+	): Connection<Channels[C]> {
 		if (params) {
 			return this.connectToChannel(channel, params);
 		} else {
@@ -71,8 +90,11 @@ export default class Stream extends EventEmitter<StreamEvents> {
 	}
 
 	@autobind
-	private useSharedConnection<C extends keyof Channels>(channel: C, name?: string): SharedConnection<Channels[C]> {
-		let pool = this.sharedConnectionPools.find(p => p.channel === channel);
+	private useSharedConnection<C extends keyof Channels>(
+		channel: C,
+		name?: string,
+	): SharedConnection<Channels[C]> {
+		let pool = this.sharedConnectionPools.find((p) => p.channel === channel);
 
 		if (pool == null) {
 			pool = new Pool(this, channel, this.genId());
@@ -86,24 +108,38 @@ export default class Stream extends EventEmitter<StreamEvents> {
 
 	@autobind
 	public removeSharedConnection(connection: SharedConnection): void {
-		this.sharedConnections = this.sharedConnections.filter(c => c !== connection);
+		this.sharedConnections = this.sharedConnections.filter(
+			(c) => c !== connection,
+		);
 	}
 
 	@autobind
 	public removeSharedConnectionPool(pool: Pool): void {
-		this.sharedConnectionPools = this.sharedConnectionPools.filter(p => p !== pool);
+		this.sharedConnectionPools = this.sharedConnectionPools.filter(
+			(p) => p !== pool,
+		);
 	}
 
 	@autobind
-	private connectToChannel<C extends keyof Channels>(channel: C, params: Channels[C]['params']): NonSharedConnection<Channels[C]> {
-		const connection = new NonSharedConnection(this, channel, this.genId(), params);
+	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);
 		return connection;
 	}
 
 	@autobind
 	public disconnectToChannel(connection: NonSharedConnection): void {
-		this.nonSharedConnections = this.nonSharedConnections.filter(c => c !== connection);
+		this.nonSharedConnections = this.nonSharedConnections.filter(
+			(c) => c !== connection,
+		);
 	}
 
 	/**
@@ -111,10 +147,10 @@ export default class Stream extends EventEmitter<StreamEvents> {
 	 */
 	@autobind
 	private onOpen(): void {
-		const isReconnect = this.state === 'reconnecting';
+		const isReconnect = this.state === "reconnecting";
 
-		this.state = 'connected';
-		this.emit('_connected_');
+		this.state = "connected";
+		this.emit("_connected_");
 
 		// チャンネル再接続
 		if (isReconnect) {
@@ -128,9 +164,9 @@ export default class Stream extends EventEmitter<StreamEvents> {
 	 */
 	@autobind
 	private onClose(): void {
-		if (this.state === 'connected') {
-			this.state = 'reconnecting';
-			this.emit('_disconnected_');
+		if (this.state === "connected") {
+			this.state = "reconnecting";
+			this.emit("_disconnected_");
 		}
 	}
 
@@ -138,18 +174,18 @@ export default class Stream extends EventEmitter<StreamEvents> {
 	 * Callback of when received a message from connection
 	 */
 	@autobind
-	private onMessage(message: { data: string; }): void {
+	private onMessage(message: { data: string }): void {
 		const { type, body } = JSON.parse(message.data);
 
-		if (type === 'channel') {
+		if (type === "channel") {
 			const id = body.id;
 
 			let connections: Connection[];
 
-			connections = this.sharedConnections.filter(c => c.id === id);
+			connections = this.sharedConnections.filter((c) => c.id === id);
 
 			if (connections.length === 0) {
-				const found = this.nonSharedConnections.find(c => c.id === id);
+				const found = this.nonSharedConnections.find((c) => c.id === id);
 				if (found) {
 					connections = [found];
 				}
@@ -169,10 +205,13 @@ export default class Stream extends EventEmitter<StreamEvents> {
 	 */
 	@autobind
 	public send(typeOrPayload: any, payload?: any): void {
-		const data = payload === undefined ? typeOrPayload : {
-			type: typeOrPayload,
-			body: payload,
-		};
+		const data =
+			payload === undefined
+				? typeOrPayload
+				: {
+						type: typeOrPayload,
+						body: payload,
+				  };
 
 		this.stream.send(JSON.stringify(data));
 	}
@@ -201,7 +240,7 @@ class Pool {
 		this.stream = stream;
 		this.id = id;
 
-		this.stream.on('_disconnected_', this.onStreamDisconnected);
+		this.stream.on("_disconnected_", this.onStreamDisconnected);
 	}
 
 	@autobind
@@ -242,7 +281,7 @@ class Pool {
 	public connect(): void {
 		if (this.isConnected) return;
 		this.isConnected = true;
-		this.stream.send('connect', {
+		this.stream.send("connect", {
 			channel: this.channel,
 			id: this.id,
 		});
@@ -250,13 +289,15 @@ class Pool {
 
 	@autobind
 	private disconnect(): void {
-		this.stream.off('_disconnected_', this.onStreamDisconnected);
-		this.stream.send('disconnect', { id: this.id });
+		this.stream.off("_disconnected_", this.onStreamDisconnected);
+		this.stream.send("disconnect", { id: this.id });
 		this.stream.removeSharedConnectionPool(this);
 	}
 }
 
-export abstract class Connection<Channel extends AnyOf<Channels> = any> extends EventEmitter<Channel['events']> {
+export abstract class Connection<
+	Channel extends AnyOf<Channels> = any,
+> extends EventEmitter<Channel["events"]> {
 	public channel: string;
 	protected stream: Stream;
 	public abstract id: string;
@@ -274,8 +315,11 @@ export abstract class Connection<Channel extends AnyOf<Channels> = any> extends
 	}
 
 	@autobind
-	public send<T extends keyof Channel['receives']>(type: T, body: Channel['receives'][T]): void {
-		this.stream.send('ch', {
+	public send<T extends keyof Channel["receives"]>(
+		type: T,
+		body: Channel["receives"][T],
+	): void {
+		this.stream.send("ch", {
 			id: this.id,
 			type: type,
 			body: body,
@@ -287,7 +331,9 @@ 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> = any,
+> extends Connection<Channel> {
 	private pool: Pool;
 
 	public get id(): string {
@@ -309,11 +355,18 @@ class SharedConnection<Channel extends AnyOf<Channels> = any> extends Connection
 	}
 }
 
-class NonSharedConnection<Channel extends AnyOf<Channels> = any> extends Connection<Channel> {
+class NonSharedConnection<
+	Channel extends AnyOf<Channels> = any,
+> extends Connection<Channel> {
 	public id: string;
-	protected params: Channel['params'];
+	protected params: Channel["params"];
 
-	constructor(stream: Stream, channel: string, id: string, params: Channel['params']) {
+	constructor(
+		stream: Stream,
+		channel: string,
+		id: string,
+		params: Channel["params"],
+	) {
 		super(stream, channel);
 
 		this.params = params;
@@ -324,7 +377,7 @@ class NonSharedConnection<Channel extends AnyOf<Channels> = any> extends Connect
 
 	@autobind
 	public connect(): void {
-		this.stream.send('connect', {
+		this.stream.send("connect", {
 			channel: this.channel,
 			id: this.id,
 			params: this.params,
@@ -334,7 +387,7 @@ class NonSharedConnection<Channel extends AnyOf<Channels> = any> extends Connect
 	@autobind
 	public dispose(): void {
 		this.removeAllListeners();
-		this.stream.send('disconnect', { id: this.id });
+		this.stream.send("disconnect", { id: this.id });
 		this.stream.disconnectToChannel(this);
 	}
 }
diff --git a/packages/calckey-js/src/streaming.types.ts b/packages/calckey-js/src/streaming.types.ts
index 24adb9e3c..44ef647bc 100644
--- a/packages/calckey-js/src/streaming.types.ts
+++ b/packages/calckey-js/src/streaming.types.ts
@@ -1,4 +1,15 @@
-import { Antenna, CustomEmoji, DriveFile, MeDetailed, MessagingMessage, Note, Notification, PageEvent, User, UserGroup } from './entities';
+import {
+	Antenna,
+	CustomEmoji,
+	DriveFile,
+	MeDetailed,
+	MessagingMessage,
+	Note,
+	Notification,
+	PageEvent,
+	User,
+	UserGroup,
+} from "./entities";
 
 type FIXME = any;
 
@@ -15,12 +26,12 @@ export type Channels = {
 			unfollow: (payload: User) => void; // 自分が他人をフォロー解除したとき
 			meUpdated: (payload: MeDetailed) => void;
 			pageEvent: (payload: PageEvent) => void;
-			urlUploadFinished: (payload: { marker: string; file: DriveFile; }) => void;
+			urlUploadFinished: (payload: { marker: string; file: DriveFile }) => void;
 			readAllNotifications: () => void;
 			unreadNotification: (payload: Notification) => void;
-			unreadMention: (payload: Note['id']) => void;
+			unreadMention: (payload: Note["id"]) => void;
 			readAllUnreadMentions: () => void;
-			unreadSpecifiedNote: (payload: Note['id']) => void;
+			unreadSpecifiedNote: (payload: Note["id"]) => void;
 			readAllUnreadSpecifiedNotes: () => void;
 			readAllMessagingMessages: () => void;
 			messagingMessage: (payload: MessagingMessage) => void;
@@ -29,7 +40,7 @@ export type Channels = {
 			unreadAntenna: (payload: Antenna) => void;
 			readAllAnnouncements: () => void;
 			readAllChannels: () => void;
-			unreadChannel: (payload: Note['id']) => void;
+			unreadChannel: (payload: Note["id"]) => void;
 			myTokenRegenerated: () => void;
 			reversiNoInvites: () => void;
 			reversiInvited: (payload: FIXME) => void;
@@ -81,18 +92,18 @@ export type Channels = {
 	};
 	messaging: {
 		params: {
-			otherparty?: User['id'] | null;
-			group?: UserGroup['id'] | null;
+			otherparty?: User["id"] | null;
+			group?: UserGroup["id"] | null;
 		};
 		events: {
 			message: (payload: MessagingMessage) => void;
-			deleted: (payload: MessagingMessage['id']) => void;
-			read: (payload: MessagingMessage['id'][]) => void;
+			deleted: (payload: MessagingMessage["id"]) => void;
+			read: (payload: MessagingMessage["id"][]) => void;
 			typers: (payload: User[]) => void;
 		};
 		receives: {
 			read: {
-				id: MessagingMessage['id'];
+				id: MessagingMessage["id"];
 			};
 		};
 	};
@@ -122,40 +133,45 @@ export type Channels = {
 	};
 };
 
-export type NoteUpdatedEvent = {
-	id: Note['id'];
-	type: 'reacted';
-	body: {
-		reaction: string;
-		userId: User['id'];
-	};
-} | {
-	id: Note['id'];
-	type: 'unreacted';
-	body: {
-		reaction: string;
-		userId: User['id'];
-	};
-} | {
-	id: Note['id'];
-	type: 'deleted';
-	body: {
-		deletedAt: string;
-	};
-} | {
-	id: Note['id'];
-	type: 'pollVoted';
-	body: {
-		choice: number;
-		userId: User['id'];
-	};
-} | {
-    id: Note['id'];
-    type: 'replied';
-    body: {
-        id: Note['id'];
-    };
-};
+export type NoteUpdatedEvent =
+	| {
+			id: Note["id"];
+			type: "reacted";
+			body: {
+				reaction: string;
+				userId: User["id"];
+			};
+	  }
+	| {
+			id: Note["id"];
+			type: "unreacted";
+			body: {
+				reaction: string;
+				userId: User["id"];
+			};
+	  }
+	| {
+			id: Note["id"];
+			type: "deleted";
+			body: {
+				deletedAt: string;
+			};
+	  }
+	| {
+			id: Note["id"];
+			type: "pollVoted";
+			body: {
+				choice: number;
+				userId: User["id"];
+			};
+	  }
+	| {
+			id: Note["id"];
+			type: "replied";
+			body: {
+				id: Note["id"];
+			};
+	  };
 
 export type BroadcastEvents = {
 	noteUpdated: (payload: NoteUpdatedEvent) => void;
diff --git a/packages/calckey-js/test-d/api.ts b/packages/calckey-js/test-d/api.ts
index ce793f6fd..c5018177c 100644
--- a/packages/calckey-js/test-d/api.ts
+++ b/packages/calckey-js/test-d/api.ts
@@ -1,45 +1,48 @@
-import { expectType } from 'tsd';
-import * as Misskey from '../src';
+import { expectType } from "tsd";
+import * as Misskey from "../src";
 
-describe('API', () => {
-	test('success', async () => {
+describe("API", () => {
+	test("success", async () => {
 		const cli = new Misskey.api.APIClient({
-			origin: 'https://misskey.test',
-			credential: 'TOKEN'
+			origin: "https://misskey.test",
+			credential: "TOKEN",
 		});
-		const res = await cli.request('meta', { detail: true });
+		const res = await cli.request("meta", { detail: true });
 		expectType<Misskey.entities.DetailedInstanceMetadata>(res);
 	});
 
-	test('conditional respose type (meta)', async () => {
+	test("conditional respose type (meta)", async () => {
 		const cli = new Misskey.api.APIClient({
-			origin: 'https://misskey.test',
-			credential: 'TOKEN'
+			origin: "https://misskey.test",
+			credential: "TOKEN",
 		});
 
-		const res = await cli.request('meta', { detail: true });
+		const res = await cli.request("meta", { detail: true });
 		expectType<Misskey.entities.DetailedInstanceMetadata>(res);
 
-		const res2 = await cli.request('meta', { detail: false });
+		const res2 = await cli.request("meta", { detail: false });
 		expectType<Misskey.entities.LiteInstanceMetadata>(res2);
 
-		const res3 = await cli.request('meta', { });
+		const res3 = await cli.request("meta", {});
 		expectType<Misskey.entities.LiteInstanceMetadata>(res3);
 
-		const res4 = await cli.request('meta', { detail: true as boolean });
-		expectType<Misskey.entities.LiteInstanceMetadata | Misskey.entities.DetailedInstanceMetadata>(res4);
+		const res4 = await cli.request("meta", { detail: true as boolean });
+		expectType<
+			| Misskey.entities.LiteInstanceMetadata
+			| Misskey.entities.DetailedInstanceMetadata
+		>(res4);
 	});
 
-	test('conditional respose type (users/show)', async () => {
+	test("conditional respose type (users/show)", async () => {
 		const cli = new Misskey.api.APIClient({
-			origin: 'https://misskey.test',
-			credential: 'TOKEN'
+			origin: "https://misskey.test",
+			credential: "TOKEN",
 		});
 
-		const res = await cli.request('users/show', { userId: 'xxxxxxxx' });
+		const res = await cli.request("users/show", { userId: "xxxxxxxx" });
 		expectType<Misskey.entities.UserDetailed>(res);
 
-		const res2 = await cli.request('users/show', { userIds: ['xxxxxxxx'] });
+		const res2 = await cli.request("users/show", { userIds: ["xxxxxxxx"] });
 		expectType<Misskey.entities.UserDetailed[]>(res2);
 	});
 });
diff --git a/packages/calckey-js/test-d/streaming.ts b/packages/calckey-js/test-d/streaming.ts
index 7ff7f9599..c49795dcc 100644
--- a/packages/calckey-js/test-d/streaming.ts
+++ b/packages/calckey-js/test-d/streaming.ts
@@ -1,25 +1,31 @@
-import { expectType } from 'tsd';
-import * as Misskey from '../src';
+import { expectType } from "tsd";
+import * as Misskey from "../src";
 
-describe('Streaming', () => {
-	test('emit type', async () => {
-		const stream = new Misskey.Stream('https://misskey.test', { token: 'TOKEN' });
-		const mainChannel = stream.useChannel('main');
-		mainChannel.on('notification', notification => {
+describe("Streaming", () => {
+	test("emit type", async () => {
+		const stream = new Misskey.Stream("https://misskey.test", {
+			token: "TOKEN",
+		});
+		const mainChannel = stream.useChannel("main");
+		mainChannel.on("notification", (notification) => {
 			expectType<Misskey.entities.Notification>(notification);
 		});
 	});
 
-	test('params type', async () => {
-		const stream = new Misskey.Stream('https://misskey.test', { token: 'TOKEN' });
+	test("params type", async () => {
+		const stream = new Misskey.Stream("https://misskey.test", {
+			token: "TOKEN",
+		});
 		// TODO: 「stream.useChannel の第二引数として受け入れる型が
 		// {
 		//   otherparty?: User['id'] | null;
 		//   group?: UserGroup['id'] | null;
-		// } 
+		// }
 		// になっている」というテストを行いたいけどtsdでの書き方がわからない
-		const messagingChannel = stream.useChannel('messaging', { otherparty: 'aaa' });
-		messagingChannel.on('message', message => {
+		const messagingChannel = stream.useChannel("messaging", {
+			otherparty: "aaa",
+		});
+		messagingChannel.on("message", (message) => {
 			expectType<Misskey.entities.MessagingMessage>(message);
 		});
 	});
diff --git a/packages/calckey-js/test/api.ts b/packages/calckey-js/test/api.ts
index 47c837801..a8a1fc0e6 100644
--- a/packages/calckey-js/test/api.ts
+++ b/packages/calckey-js/test/api.ts
@@ -1,28 +1,28 @@
-import { APIClient, isAPIError } from '../src/api';
-import { enableFetchMocks } from 'jest-fetch-mock';
+import { APIClient, isAPIError } from "../src/api";
+import { enableFetchMocks } from "jest-fetch-mock";
 
 enableFetchMocks();
 
 function getFetchCall(call: any[]) {
 	const { body, method } = call[1];
-	if (body != null && typeof body != 'string') {
-		throw new Error('invalid body');
+	if (body != null && typeof body != "string") {
+		throw new Error("invalid body");
 	}
 	return {
 		url: call[0],
 		method: method,
-		body: JSON.parse(body as any)
+		body: JSON.parse(body as any),
 	};
 }
 
-describe('API', () => {
-	test('success', async () => {
+describe("API", () => {
+	test("success", async () => {
 		fetchMock.resetMocks();
 		fetchMock.mockResponse(async (req) => {
 			const body = await req.json();
-			if (req.method == 'POST' && req.url == 'https://misskey.test/api/i') {
-				if (body.i === 'TOKEN') {
-					return JSON.stringify({ id: 'foo' });
+			if (req.method == "POST" && req.url == "https://misskey.test/api/i") {
+				if (body.i === "TOKEN") {
+					return JSON.stringify({ id: "foo" });
 				} else {
 					return { status: 400 };
 				}
@@ -32,30 +32,33 @@ describe('API', () => {
 		});
 
 		const cli = new APIClient({
-			origin: 'https://misskey.test',
-			credential: 'TOKEN',
+			origin: "https://misskey.test",
+			credential: "TOKEN",
 		});
 
-		const res = await cli.request('i');
+		const res = await cli.request("i");
 
 		expect(res).toEqual({
-			id: 'foo'
+			id: "foo",
 		});
 
 		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
-			url: 'https://misskey.test/api/i',
-			method: 'POST',
-			body: { i: 'TOKEN' }
+			url: "https://misskey.test/api/i",
+			method: "POST",
+			body: { i: "TOKEN" },
 		});
 	});
 
-	test('with params', async () => {
+	test("with params", async () => {
 		fetchMock.resetMocks();
 		fetchMock.mockResponse(async (req) => {
 			const body = await req.json();
-			if (req.method == 'POST' && req.url == 'https://misskey.test/api/notes/show') {
-				if (body.i === 'TOKEN' && body.noteId === 'aaaaa') {
-					return JSON.stringify({ id: 'foo' });
+			if (
+				req.method == "POST" &&
+				req.url == "https://misskey.test/api/notes/show"
+			) {
+				if (body.i === "TOKEN" && body.noteId === "aaaaa") {
+					return JSON.stringify({ id: "foo" });
 				} else {
 					return { status: 400 };
 				}
@@ -65,27 +68,30 @@ describe('API', () => {
 		});
 
 		const cli = new APIClient({
-			origin: 'https://misskey.test',
-			credential: 'TOKEN',
+			origin: "https://misskey.test",
+			credential: "TOKEN",
 		});
 
-		const res = await cli.request('notes/show', { noteId: 'aaaaa' });
+		const res = await cli.request("notes/show", { noteId: "aaaaa" });
 
 		expect(res).toEqual({
-			id: 'foo'
+			id: "foo",
 		});
 
 		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
-			url: 'https://misskey.test/api/notes/show',
-			method: 'POST',
-			body: { i: 'TOKEN', noteId: 'aaaaa' }
+			url: "https://misskey.test/api/notes/show",
+			method: "POST",
+			body: { i: "TOKEN", noteId: "aaaaa" },
 		});
 	});
 
-	test('204 No Content で null が返る', async () => {
+	test("204 No Content で null が返る", async () => {
 		fetchMock.resetMocks();
 		fetchMock.mockResponse(async (req) => {
-			if (req.method == 'POST' && req.url == 'https://misskey.test/api/reset-password') {
+			if (
+				req.method == "POST" &&
+				req.url == "https://misskey.test/api/reset-password"
+			) {
 				return { status: 204 };
 			} else {
 				return { status: 404 };
@@ -93,38 +99,41 @@ describe('API', () => {
 		});
 
 		const cli = new APIClient({
-			origin: 'https://misskey.test',
-			credential: 'TOKEN',
+			origin: "https://misskey.test",
+			credential: "TOKEN",
 		});
 
-		const res = await cli.request('reset-password', { token: 'aaa', password: 'aaa' });
+		const res = await cli.request("reset-password", {
+			token: "aaa",
+			password: "aaa",
+		});
 
 		expect(res).toEqual(null);
 
 		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
-			url: 'https://misskey.test/api/reset-password',
-			method: 'POST',
-			body: { i: 'TOKEN', token: 'aaa', password: 'aaa' }
+			url: "https://misskey.test/api/reset-password",
+			method: "POST",
+			body: { i: "TOKEN", token: "aaa", password: "aaa" },
 		});
 	});
 
-	test('インスタンスの credential が指定されていても引数で credential が null ならば null としてリクエストされる', async () => {
+	test("インスタンスの credential が指定されていても引数で credential が null ならば null としてリクエストされる", async () => {
 		fetchMock.resetMocks();
 		fetchMock.mockResponse(async (req) => {
 			const body = await req.json();
-			if (req.method == 'POST' && req.url == 'https://misskey.test/api/i') {
-				if (typeof body.i === 'string') {
-					return JSON.stringify({ id: 'foo' });
+			if (req.method == "POST" && req.url == "https://misskey.test/api/i") {
+				if (typeof body.i === "string") {
+					return JSON.stringify({ id: "foo" });
 				} else {
 					return {
 						status: 401,
 						body: JSON.stringify({
 							error: {
-								message: 'Credential required.',
-								code: 'CREDENTIAL_REQUIRED',
-								id: '1384574d-a912-4b81-8601-c7b1c4085df1',
-							}
-						})
+								message: "Credential required.",
+								code: "CREDENTIAL_REQUIRED",
+								id: "1384574d-a912-4b81-8601-c7b1c4085df1",
+							},
+						}),
 					};
 				}
 			} else {
@@ -134,77 +143,78 @@ describe('API', () => {
 
 		try {
 			const cli = new APIClient({
-				origin: 'https://misskey.test',
-				credential: 'TOKEN',
+				origin: "https://misskey.test",
+				credential: "TOKEN",
 			});
-	
-			await cli.request('i', {}, null);
+
+			await cli.request("i", {}, null);
 		} catch (e) {
 			expect(isAPIError(e)).toEqual(true);
 		}
 	});
 
-	test('api error', async () => {
+	test("api error", async () => {
 		fetchMock.resetMocks();
 		fetchMock.mockResponse(async (req) => {
 			return {
 				status: 500,
 				body: JSON.stringify({
 					error: {
-						message: 'Internal error occurred. Please contact us if the error persists.',
-						code: 'INTERNAL_ERROR',
-						id: '5d37dbcb-891e-41ca-a3d6-e690c97775ac',
-						kind: 'server',
+						message:
+							"Internal error occurred. Please contact us if the error persists.",
+						code: "INTERNAL_ERROR",
+						id: "5d37dbcb-891e-41ca-a3d6-e690c97775ac",
+						kind: "server",
 					},
-				})
+				}),
 			};
 		});
 
 		try {
 			const cli = new APIClient({
-				origin: 'https://misskey.test',
-				credential: 'TOKEN',
+				origin: "https://misskey.test",
+				credential: "TOKEN",
 			});
-	
-			await cli.request('i');
+
+			await cli.request("i");
 		} catch (e: any) {
 			expect(isAPIError(e)).toEqual(true);
-			expect(e.id).toEqual('5d37dbcb-891e-41ca-a3d6-e690c97775ac');
+			expect(e.id).toEqual("5d37dbcb-891e-41ca-a3d6-e690c97775ac");
 		}
 	});
 
-	test('network error', async () => {
+	test("network error", async () => {
 		fetchMock.resetMocks();
 		fetchMock.mockAbort();
 
 		try {
 			const cli = new APIClient({
-				origin: 'https://misskey.test',
-				credential: 'TOKEN',
+				origin: "https://misskey.test",
+				credential: "TOKEN",
 			});
-	
-			await cli.request('i');
+
+			await cli.request("i");
 		} catch (e) {
 			expect(isAPIError(e)).toEqual(false);
 		}
 	});
 
-	test('json parse error', async () => {
+	test("json parse error", async () => {
 		fetchMock.resetMocks();
 		fetchMock.mockResponse(async (req) => {
 			return {
 				status: 500,
-				body: '<html>I AM NOT JSON</html>'
+				body: "<html>I AM NOT JSON</html>",
 			};
 		});
 
 		try {
 			const cli = new APIClient({
-				origin: 'https://misskey.test',
-				credential: 'TOKEN',
+				origin: "https://misskey.test",
+				credential: "TOKEN",
 			});
-	
-			await cli.request('i');
+
+			await cli.request("i");
 		} catch (e) {
 			expect(isAPIError(e)).toEqual(false);
 		}
diff --git a/packages/calckey-js/test/streaming.ts b/packages/calckey-js/test/streaming.ts
index 913db8b28..920a9102b 100644
--- a/packages/calckey-js/test/streaming.ts
+++ b/packages/calckey-js/test/streaming.ts
@@ -1,95 +1,105 @@
-import WS from 'jest-websocket-mock';
-import Stream from '../src/streaming';
+import WS from "jest-websocket-mock";
+import Stream from "../src/streaming";
 
-describe('Streaming', () => {
-	test('useChannel', async () => {
-		const server = new WS('wss://misskey.test/streaming');
-		const stream = new Stream('https://misskey.test', { token: 'TOKEN' });
+describe("Streaming", () => {
+	test("useChannel", async () => {
+		const server = new WS("wss://misskey.test/streaming");
+		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
 		const mainChannelReceived: any[] = [];
-		const main = stream.useChannel('main');
-		main.on('meUpdated', payload => {
+		const main = stream.useChannel("main");
+		main.on("meUpdated", (payload) => {
 			mainChannelReceived.push(payload);
 		});
 
 		const ws = await server.connected;
-		expect(new URLSearchParams(new URL(ws.url).search).get('i')).toEqual('TOKEN');
+		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
+			"TOKEN",
+		);
 
-		const msg = JSON.parse(await server.nextMessage as string);
+		const msg = JSON.parse((await server.nextMessage) as string);
 		const mainChannelId = msg.body.id;
-		expect(msg.type).toEqual('connect');
-		expect(msg.body.channel).toEqual('main');
+		expect(msg.type).toEqual("connect");
+		expect(msg.body.channel).toEqual("main");
 		expect(mainChannelId != null).toEqual(true);
 
-		server.send(JSON.stringify({
-			type: 'channel',
-			body: {
-				id: mainChannelId,
-				type: 'meUpdated',
+		server.send(
+			JSON.stringify({
+				type: "channel",
 				body: {
-					id: 'foo'
-				}
-			}
-		}));
+					id: mainChannelId,
+					type: "meUpdated",
+					body: {
+						id: "foo",
+					},
+				},
+			}),
+		);
 
 		expect(mainChannelReceived[0]).toEqual({
-			id: 'foo'
+			id: "foo",
 		});
 
 		stream.close();
 		server.close();
 	});
 
-	test('useChannel with parameters', async () => {
-		const server = new WS('wss://misskey.test/streaming');
-		const stream = new Stream('https://misskey.test', { token: 'TOKEN' });
+	test("useChannel with parameters", async () => {
+		const server = new WS("wss://misskey.test/streaming");
+		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
 		const messagingChannelReceived: any[] = [];
-		const messaging = stream.useChannel('messaging', { otherparty: 'aaa' });
-		messaging.on('message', payload => {
+		const messaging = stream.useChannel("messaging", { otherparty: "aaa" });
+		messaging.on("message", (payload) => {
 			messagingChannelReceived.push(payload);
 		});
 
 		const ws = await server.connected;
-		expect(new URLSearchParams(new URL(ws.url).search).get('i')).toEqual('TOKEN');
+		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
+			"TOKEN",
+		);
 
-		const msg = JSON.parse(await server.nextMessage as string);
+		const msg = JSON.parse((await server.nextMessage) as string);
 		const messagingChannelId = msg.body.id;
-		expect(msg.type).toEqual('connect');
-		expect(msg.body.channel).toEqual('messaging');
-		expect(msg.body.params).toEqual({ otherparty: 'aaa' });
+		expect(msg.type).toEqual("connect");
+		expect(msg.body.channel).toEqual("messaging");
+		expect(msg.body.params).toEqual({ otherparty: "aaa" });
 		expect(messagingChannelId != null).toEqual(true);
 
-		server.send(JSON.stringify({
-			type: 'channel',
-			body: {
-				id: messagingChannelId,
-				type: 'message',
+		server.send(
+			JSON.stringify({
+				type: "channel",
 				body: {
-					id: 'foo'
-				}
-			}
-		}));
+					id: messagingChannelId,
+					type: "message",
+					body: {
+						id: "foo",
+					},
+				},
+			}),
+		);
 
 		expect(messagingChannelReceived[0]).toEqual({
-			id: 'foo'
+			id: "foo",
 		});
 
 		stream.close();
 		server.close();
 	});
 
-	test('ちゃんとチャンネルごとにidが異なる', async () => {
-		const server = new WS('wss://misskey.test/streaming');
-		const stream = new Stream('https://misskey.test', { token: 'TOKEN' });
+	test("ちゃんとチャンネルごとにidが異なる", async () => {
+		const server = new WS("wss://misskey.test/streaming");
+		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
 
-		stream.useChannel('messaging', { otherparty: 'aaa' });
-		stream.useChannel('messaging', { otherparty: 'bbb' });
+		stream.useChannel("messaging", { otherparty: "aaa" });
+		stream.useChannel("messaging", { otherparty: "bbb" });
 
 		const ws = await server.connected;
-		expect(new URLSearchParams(new URL(ws.url).search).get('i')).toEqual('TOKEN');
+		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
+			"TOKEN",
+		);
 
-		const msg = JSON.parse(await server.nextMessage as string);
+		const msg = JSON.parse((await server.nextMessage) as string);
 		const messagingChannelId = msg.body.id;
-		const msg2 = JSON.parse(await server.nextMessage as string);
+		const msg2 = JSON.parse((await server.nextMessage) as string);
 		const messagingChannelId2 = msg2.body.id;
 
 		expect(messagingChannelId != null).toEqual(true);
@@ -100,58 +110,64 @@ describe('Streaming', () => {
 		server.close();
 	});
 
-	test('Connection#send', async () => {
-		const server = new WS('wss://misskey.test/streaming');
-		const stream = new Stream('https://misskey.test', { token: 'TOKEN' });
+	test("Connection#send", async () => {
+		const server = new WS("wss://misskey.test/streaming");
+		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
 
-		const messaging = stream.useChannel('messaging', { otherparty: 'aaa' });
-		messaging.send('read', { id: 'aaa' });
+		const messaging = stream.useChannel("messaging", { otherparty: "aaa" });
+		messaging.send("read", { id: "aaa" });
 
 		const ws = await server.connected;
-		expect(new URLSearchParams(new URL(ws.url).search).get('i')).toEqual('TOKEN');
+		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
+			"TOKEN",
+		);
 
-		const connectMsg = JSON.parse(await server.nextMessage as string);
+		const connectMsg = JSON.parse((await server.nextMessage) as string);
 		const channelId = connectMsg.body.id;
-		const msg = JSON.parse(await server.nextMessage as string);
+		const msg = JSON.parse((await server.nextMessage) as string);
 
-		expect(msg.type).toEqual('ch');
+		expect(msg.type).toEqual("ch");
 		expect(msg.body.id).toEqual(channelId);
-		expect(msg.body.type).toEqual('read');
-		expect(msg.body.body).toEqual({ id: 'aaa' });
+		expect(msg.body.type).toEqual("read");
+		expect(msg.body.body).toEqual({ id: "aaa" });
 
 		stream.close();
 		server.close();
 	});
 
-	test('Connection#dispose', async () => {
-		const server = new WS('wss://misskey.test/streaming');
-		const stream = new Stream('https://misskey.test', { token: 'TOKEN' });
+	test("Connection#dispose", async () => {
+		const server = new WS("wss://misskey.test/streaming");
+		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
 		const mainChannelReceived: any[] = [];
-		const main = stream.useChannel('main');
-		main.on('meUpdated', payload => {
+		const main = stream.useChannel("main");
+		main.on("meUpdated", (payload) => {
 			mainChannelReceived.push(payload);
 		});
-		
-		const ws = await server.connected;
-		expect(new URLSearchParams(new URL(ws.url).search).get('i')).toEqual('TOKEN');
 
-		const msg = JSON.parse(await server.nextMessage as string);
+		const ws = await server.connected;
+		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
+			"TOKEN",
+		);
+
+		const msg = JSON.parse((await server.nextMessage) as string);
 		const mainChannelId = msg.body.id;
-		expect(msg.type).toEqual('connect');
-		expect(msg.body.channel).toEqual('main');
+		expect(msg.type).toEqual("connect");
+		expect(msg.body.channel).toEqual("main");
 		expect(mainChannelId != null).toEqual(true);
 		main.dispose();
 
-		server.send(JSON.stringify({
-			type: 'channel',
-			body: {
-				id: mainChannelId,
-				type: 'meUpdated',
+		server.send(
+			JSON.stringify({
+				type: "channel",
 				body: {
-					id: 'foo'
-				}
-			}
-		}));
+					id: mainChannelId,
+					type: "meUpdated",
+					body: {
+						id: "foo",
+					},
+				},
+			}),
+		);
 
 		expect(mainChannelReceived.length).toEqual(0);
 
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 15cb69ff0..2aa204d18 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -1,7 +1,7 @@
 import { markRaw, ref } from "vue";
 import { Storage } from "./pizzax";
 import { Theme } from "./scripts/theme";
-import { deviceKind } from '@/scripts/device-kind';
+import { deviceKind } from "@/scripts/device-kind";
 
 export const postFormActions = [];
 export const userActions = [];
@@ -16,10 +16,10 @@ const menuOptions = [
 	"explore",
 	"favorites",
 	"channels",
-	"search"
+	"search",
 ];
 
-if (deviceKind === 'desktop') menuOptions.push("ui");
+if (deviceKind === "desktop") menuOptions.push("ui");
 
 // TODO: それぞれいちいちwhereとかdefaultというキーを付けなきゃいけないの冗長なのでなんとかする(ただ型定義が面倒になりそう)
 //       あと、現行の定義の仕方なら「whereが何であるかに関わらずキー名の重複不可」という制約を付けられるメリットもあるからそのメリットを引き継ぐ方法も考えないといけない

From 8f35b66bbb310ebcda7dbf5cee2a6a64611d4e44 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 17:01:42 -0700
Subject: [PATCH 421/582] fix: format script; chore: format

---
 CONTRIBUTING.md                               |    4 +-
 package.json                                  |    2 +-
 packages/client/.prettierrc                   |   15 +
 packages/client/package.json                  |    5 +-
 .../client/src/components/MkAbuseReport.vue   |  120 +-
 .../src/components/MkAbuseReportWindow.vue    |   93 +-
 .../client/src/components/MkAnalogClock.vue   |  245 ++--
 .../client/src/components/MkAutocomplete.vue  |  307 ++--
 packages/client/src/components/MkAvatars.vue  |   16 +-
 packages/client/src/components/MkButton.vue   |   81 +-
 packages/client/src/components/MkCaptcha.vue  |   80 +-
 .../src/components/MkChannelFollowButton.vue  |   61 +-
 .../src/components/MkChannelPreview.vue       |   81 +-
 packages/client/src/components/MkChart.vue    | 1236 ++++++++++-------
 .../client/src/components/MkChartTooltip.vue  |   43 +-
 .../client/src/components/MkChatPreview.vue   |  109 +-
 .../src/components/MkCheatSheetDialog.vue     |   36 +-
 .../client/src/components/MkCode.core.vue     |   25 +-
 packages/client/src/components/MkCode.vue     |    8 +-
 .../client/src/components/MkContainer.vue     |  127 +-
 .../client/src/components/MkContextMenu.vue   |   48 +-
 .../client/src/components/MkCropperDialog.vue |  115 +-
 packages/client/src/components/MkCwButton.vue |   38 +-
 .../src/components/MkDateSeparatedList.vue    |  140 +-
 packages/client/src/components/MkDialog.vue   |  252 +++-
 .../client/src/components/MkDigitalClock.vue  |   75 +-
 .../client/src/components/MkDrive.file.vue    |  246 ++--
 .../client/src/components/MkDrive.folder.vue  |  287 ++--
 .../src/components/MkDrive.navFolder.vue      |   75 +-
 packages/client/src/components/MkDrive.vue    |  633 +++++----
 .../src/components/MkDriveFileThumbnail.vue   |   98 +-
 .../src/components/MkDriveSelectDialog.vue    |   86 +-
 .../client/src/components/MkDriveWindow.vue   |   36 +-
 .../src/components/MkEmojiPicker.section.vue  |   47 +-
 .../client/src/components/MkEmojiPicker.vue   |  358 +++--
 .../src/components/MkEmojiPickerDialog.vue    |   92 +-
 .../src/components/MkFeaturedPhotos.vue       |   14 +-
 .../src/components/MkFileListForAdmin.vue     |  102 +-
 .../client/src/components/MkFileTypeIcon.vue  |   12 +-
 packages/client/src/components/MkFolder.vue   |   87 +-
 .../client/src/components/MkFollowButton.vue  |  154 +-
 .../src/components/MkForgotPassword.vue       |  108 +-
 .../client/src/components/MkFormDialog.vue    |  231 ++-
 packages/client/src/components/MkFormula.vue  |   10 +-
 .../client/src/components/MkFormulaCore.vue   |   20 +-
 .../src/components/MkGalleryPostPreview.vue   |   40 +-
 packages/client/src/components/MkGoogle.vue   |   20 +-
 packages/client/src/components/MkHeatmap.vue  |  169 ++-
 .../client/src/components/MkImageViewer.vue   |   57 +-
 .../src/components/MkImgWithBlurhash.vue      |   62 +-
 packages/client/src/components/MkInfo.vue     |   12 +-
 .../src/components/MkInstanceCardMini.vue     |   80 +-
 .../src/components/MkInstanceSelectDialog.vue |  116 +-
 .../client/src/components/MkInstanceStats.vue |  193 ++-
 .../src/components/MkInstanceTicker.vue       |   54 +-
 packages/client/src/components/MkKeyValue.vue |   49 +-
 .../client/src/components/MkLaunchPad.vue     |  131 +-
 packages/client/src/components/MkLink.vue     |   65 +-
 packages/client/src/components/MkMarquee.vue  |   62 +-
 .../client/src/components/MkMediaBanner.vue   |  120 +-
 .../client/src/components/MkMediaCaption.vue  |  136 +-
 .../client/src/components/MkMediaImage.vue    |   93 +-
 .../client/src/components/MkMediaList.vue     |  160 ++-
 .../client/src/components/MkMediaVideo.vue    |   98 +-
 packages/client/src/components/MkMention.vue  |   74 +-
 .../client/src/components/MkMenu.child.vue    |   48 +-
 packages/client/src/components/MkMenu.vue     |  333 +++--
 .../client/src/components/MkMiniChart.vue     |   69 +-
 packages/client/src/components/MkModal.vue    |  378 +++--
 .../src/components/MkModalPageWindow.vue      |  154 +-
 .../client/src/components/MkModalWindow.vue   |   95 +-
 packages/client/src/components/MkMoved.vue    |   17 +-
 packages/client/src/components/MkNote.vue     |  600 +++++---
 .../client/src/components/MkNoteDetailed.vue  |  622 ++++++---
 .../client/src/components/MkNoteHeader.vue    |   88 +-
 .../client/src/components/MkNotePreview.vue   |   25 +-
 .../client/src/components/MkNoteSimple.vue    |   44 +-
 packages/client/src/components/MkNoteSub.vue  |  440 ++++--
 packages/client/src/components/MkNotes.vue    |   59 +-
 .../client/src/components/MkNotification.vue  |  410 ++++--
 .../MkNotificationSettingWindow.vue           |  116 +-
 .../src/components/MkNotificationToast.vue    |   34 +-
 .../client/src/components/MkNotifications.vue |  119 +-
 packages/client/src/components/MkNumber.vue   |   22 +-
 .../client/src/components/MkNumberDiff.vue    |   11 +-
 .../src/components/MkObjectView.value.vue     |   86 +-
 .../client/src/components/MkObjectView.vue    |   11 +-
 .../client/src/components/MkPagePreview.vue   |   50 +-
 .../client/src/components/MkPageWindow.vue    |  157 ++-
 .../client/src/components/MkPagination.vue    |  695 +++++----
 packages/client/src/components/MkPoll.vue     |  137 +-
 .../client/src/components/MkPollEditor.vue    |  202 +--
 .../client/src/components/MkPopupMenu.vue     |   35 +-
 packages/client/src/components/MkPostForm.vue |  815 +++++++----
 .../src/components/MkPostFormAttaches.vue     |  166 ++-
 .../src/components/MkPostFormDialog.vue       |   30 +-
 .../MkPushNotificationAllowButton.vue         |  183 ++-
 .../client/src/components/MkQuoteButton.vue   |   34 +-
 .../src/components/MkReactedUsersDialog.vue   |  120 +-
 .../client/src/components/MkReactionIcon.vue  |   10 +-
 .../src/components/MkReactionTooltip.vue      |   30 +-
 .../components/MkReactionsViewer.details.vue  |   46 +-
 .../components/MkReactionsViewer.reaction.vue |  105 +-
 .../src/components/MkReactionsViewer.vue      |   25 +-
 .../client/src/components/MkRemoteCaution.vue |   13 +-
 .../client/src/components/MkRenoteButton.vue  |  221 +--
 packages/client/src/components/MkRipple.vue   |  140 +-
 packages/client/src/components/MkSample.vue   |  142 +-
 packages/client/src/components/MkSignin.vue   |  387 ++++--
 .../client/src/components/MkSigninDialog.vue  |   53 +-
 packages/client/src/components/MkSignup.vue   |  568 +++++---
 .../client/src/components/MkSignupDialog.vue  |   55 +-
 packages/client/src/components/MkSparkle.vue  |   93 +-
 .../client/src/components/MkStarButton.vue    |   78 +-
 .../src/components/MkSubNoteContent.vue       |  148 +-
 .../client/src/components/MkSuperMenu.vue     |   73 +-
 packages/client/src/components/MkTab.vue      |   44 +-
 packages/client/src/components/MkTagCloud.vue |   65 +-
 packages/client/src/components/MkTimeline.vue |  130 +-
 packages/client/src/components/MkToast.vue    |   37 +-
 .../src/components/MkTokenGenerateWindow.vue  |  117 +-
 packages/client/src/components/MkTooltip.vue  |   77 +-
 .../src/components/MkTutorialDialog.vue       |  338 +++--
 packages/client/src/components/MkUpdated.vue  |   65 +-
 .../client/src/components/MkUrlPreview.vue    |  204 ++-
 .../src/components/MkUrlPreviewPopup.vue      |   30 +-
 .../client/src/components/MkUserCardMini.vue  |   73 +-
 packages/client/src/components/MkUserInfo.vue |   86 +-
 packages/client/src/components/MkUserList.vue |   45 +-
 .../src/components/MkUserOnlineIndicator.vue  |   20 +-
 .../client/src/components/MkUserPreview.vue   |  165 ++-
 .../src/components/MkUserSelectDialog.vue     |  167 ++-
 .../client/src/components/MkUsersTooltip.vue  |   29 +-
 .../client/src/components/MkVisibility.vue    |   55 +-
 .../src/components/MkVisibilityPicker.vue     |  162 ++-
 .../client/src/components/MkWaitingDialog.vue |   54 +-
 packages/client/src/components/MkWidgets.vue  |  176 ++-
 packages/client/src/components/MkWindow.vue   |  358 +++--
 .../client/src/components/form/checkbox.vue   |   59 +-
 .../client/src/components/form/folder.vue     |   47 +-
 packages/client/src/components/form/input.vue |  162 ++-
 packages/client/src/components/form/link.vue  |   46 +-
 packages/client/src/components/form/radio.vue |   43 +-
 .../client/src/components/form/radios.vue     |   81 +-
 packages/client/src/components/form/range.vue |  162 ++-
 .../client/src/components/form/section.vue    |   13 +-
 .../client/src/components/form/select.vue     |  138 +-
 packages/client/src/components/form/slot.vue  |   14 +-
 packages/client/src/components/form/split.vue |   23 +-
 .../client/src/components/form/suspense.vue   |   56 +-
 .../client/src/components/form/switch.vue     |   51 +-
 .../client/src/components/form/textarea.vue   |   91 +-
 packages/client/src/components/global/MkA.vue |  121 +-
 .../client/src/components/global/MkAcct.vue   |   18 +-
 .../client/src/components/global/MkAd.vue     |   91 +-
 .../client/src/components/global/MkAvatar.vue |  154 +-
 .../src/components/global/MkEllipsis.vue      |    4 +-
 .../client/src/components/global/MkEmoji.vue  |   55 +-
 .../client/src/components/global/MkError.vue  |   27 +-
 .../src/components/global/MkLoading.vue       |   61 +-
 .../global/MkMisskeyFlavoredMarkdown.vue      |  324 +++--
 .../src/components/global/MkPageHeader.vue    |  226 ++-
 .../client/src/components/global/MkSpacer.vue |   44 +-
 .../components/global/MkStickyContainer.vue   |   42 +-
 .../client/src/components/global/MkTime.vue   |   65 +-
 .../client/src/components/global/MkUrl.vue    |   82 +-
 .../src/components/global/MkUserName.vue      |   27 +-
 .../src/components/global/RouterView.vue      |   53 +-
 .../client/src/components/page/page.block.vue |   68 +-
 .../src/components/page/page.button.vue       |   54 +-
 .../src/components/page/page.canvas.vue       |   24 +-
 .../src/components/page/page.counter.vue      |   35 +-
 .../client/src/components/page/page.if.vue    |   28 +-
 .../client/src/components/page/page.image.vue |   31 +-
 .../client/src/components/page/page.note.vue  |   43 +-
 .../src/components/page/page.number-input.vue |   37 +-
 .../client/src/components/page/page.post.vue  |   78 +-
 .../src/components/page/page.radio-button.vue |   37 +-
 .../src/components/page/page.section.vue      |   36 +-
 .../src/components/page/page.switch.vue       |   32 +-
 .../src/components/page/page.text-input.vue   |   37 +-
 .../client/src/components/page/page.text.vue  |   60 +-
 .../components/page/page.textarea-input.vue   |   37 +-
 .../src/components/page/page.textarea.vue     |   28 +-
 packages/client/src/components/page/page.vue  |   57 +-
 .../client/src/components/queue-chart.vue     |  129 --
 packages/client/src/pages/_empty_.vue         |    4 +-
 packages/client/src/pages/_error_.vue         |  100 +-
 packages/client/src/pages/_loading_.vue       |    5 +-
 packages/client/src/pages/about-calckey.vue   |  236 +++-
 packages/client/src/pages/about.emojis.vue    |  106 +-
 .../client/src/pages/about.federation.vue     |  202 ++-
 packages/client/src/pages/about.vue           |  501 ++++---
 packages/client/src/pages/admin-file.vue      |  343 +++--
 packages/client/src/pages/admin/_header_.vue  |  160 ++-
 packages/client/src/pages/admin/abuses.vue    |  142 +-
 .../client/src/pages/admin/announcements.vue  |  163 ++-
 .../client/src/pages/admin/bot-protection.vue |  146 +-
 .../client/src/pages/admin/custom-css.vue     |   38 +-
 packages/client/src/pages/admin/database.vue  |   86 +-
 .../client/src/pages/admin/email-settings.vue |  196 ++-
 .../src/pages/admin/emoji-edit-dialog.vue     |  113 +-
 packages/client/src/pages/admin/emojis.vue    |  503 ++++---
 .../client/src/pages/admin/federation.vue     |   40 +-
 packages/client/src/pages/admin/files.vue     |  203 ++-
 packages/client/src/pages/admin/index.vue     |  484 ++++---
 .../client/src/pages/admin/instance-block.vue |   62 +-
 .../src/pages/admin/integrations.discord.vue  |   71 +-
 .../src/pages/admin/integrations.github.vue   |   73 +-
 .../client/src/pages/admin/integrations.vue   |   75 +-
 packages/client/src/pages/admin/metrics.vue   |  606 ++++----
 .../client/src/pages/admin/object-storage.vue |  232 ++--
 .../client/src/pages/admin/other-settings.vue |   51 +-
 .../src/pages/admin/overview.active-users.vue |  118 +-
 .../src/pages/admin/overview.ap-requests.vue  |  186 +--
 .../src/pages/admin/overview.federation.vue   |  152 +-
 .../src/pages/admin/overview.heatmap.vue      |   32 +-
 .../src/pages/admin/overview.instances.vue    |   43 +-
 .../src/pages/admin/overview.moderators.vue   |   42 +-
 .../client/src/pages/admin/overview.pie.vue   |   58 +-
 .../src/pages/admin/overview.queue-chart.vue  |  133 +-
 .../src/pages/admin/overview.queue.chart.vue  |   91 +-
 .../client/src/pages/admin/overview.queue.vue |   90 +-
 .../client/src/pages/admin/overview.stats.vue |  145 +-
 .../client/src/pages/admin/overview.user.vue  |   37 +-
 .../client/src/pages/admin/overview.users.vue |   42 +-
 packages/client/src/pages/admin/overview.vue  |  138 +-
 .../client/src/pages/admin/promotions.vue     |  153 +-
 .../client/src/pages/admin/proxy-account.vue  |   70 +-
 .../src/pages/admin/queue.chart.chart.vue     |   90 +-
 .../client/src/pages/admin/queue.chart.vue    |  116 +-
 packages/client/src/pages/admin/queue.vue     |   79 +-
 packages/client/src/pages/admin/relays.vue    |  120 +-
 packages/client/src/pages/admin/security.vue  |  412 ++++--
 packages/client/src/pages/admin/settings.vue  |  626 ++++++---
 packages/client/src/pages/admin/users.vue     |  252 ++--
 packages/client/src/pages/announcements.vue   |   71 +-
 .../client/src/pages/antenna-timeline.vue     |  126 +-
 packages/client/src/pages/api-console.vue     |  141 +-
 packages/client/src/pages/apps.vue            |  182 ++-
 packages/client/src/pages/auth.form.vue       |   62 +-
 packages/client/src/pages/auth.vue            |  175 ++-
 packages/client/src/pages/channel-editor.vue  |  126 +-
 packages/client/src/pages/channel.vue         |  198 ++-
 packages/client/src/pages/channels.vue        |  198 ++-
 packages/client/src/pages/clip.vue            |  192 +--
 packages/client/src/pages/drive.vue           |   28 +-
 packages/client/src/pages/emojis.emoji.vue    |   75 +-
 .../client/src/pages/explore.featured.vue     |   41 +-
 packages/client/src/pages/explore.users.vue   |  326 +++--
 packages/client/src/pages/explore.vue         |  123 +-
 packages/client/src/pages/favorites.vue       |    6 +-
 packages/client/src/pages/follow-requests.vue |  128 +-
 packages/client/src/pages/follow.vue          |   41 +-
 packages/client/src/pages/gallery/edit.vue    |  166 ++-
 packages/client/src/pages/gallery/index.vue   |  230 +--
 packages/client/src/pages/gallery/post.vue    |  265 ++--
 packages/client/src/pages/instance-info.vue   |  578 +++++---
 packages/client/src/pages/messaging/index.vue |  316 +++--
 .../pages/messaging/messaging-room.form.vue   |  207 +--
 .../messaging/messaging-room.message.vue      |  131 +-
 .../src/pages/messaging/messaging-room.vue    |  258 ++--
 packages/client/src/pages/mfm-cheat-sheet.vue |  652 +++++----
 packages/client/src/pages/miauth.vue          |  124 +-
 .../client/src/pages/my-antennas/create.vue   |   26 +-
 .../client/src/pages/my-antennas/edit.vue     |   40 +-
 .../client/src/pages/my-antennas/editor.vue   |  261 ++--
 .../client/src/pages/my-antennas/index.vue    |   93 +-
 packages/client/src/pages/my-clips/index.vue  |   74 +-
 packages/client/src/pages/my-groups/group.vue |   67 +-
 packages/client/src/pages/my-groups/index.vue |  104 +-
 packages/client/src/pages/my-lists/index.vue  |   83 +-
 packages/client/src/pages/my-lists/list.vue   |  139 +-
 packages/client/src/pages/not-found.vue       |   20 +-
 packages/client/src/pages/note.vue            |  250 ++--
 packages/client/src/pages/notifications.vue   |  230 +--
 .../page-editor/els/page-editor.el.button.vue |  171 ++-
 .../page-editor/els/page-editor.el.canvas.vue |   74 +-
 .../els/page-editor.el.counter.vue            |   66 +-
 .../page-editor/els/page-editor.el.if.vue     |  101 +-
 .../page-editor/els/page-editor.el.image.vue  |   64 +-
 .../page-editor/els/page-editor.el.note.vue   |  104 +-
 .../els/page-editor.el.number-input.vue       |   66 +-
 .../page-editor/els/page-editor.el.post.vue   |   64 +-
 .../els/page-editor.el.radio-button.vue       |   86 +-
 .../els/page-editor.el.section.vue            |   72 +-
 .../page-editor/els/page-editor.el.switch.vue |   60 +-
 .../els/page-editor.el.text-input.vue         |   58 +-
 .../page-editor/els/page-editor.el.text.vue   |   38 +-
 .../els/page-editor.el.textarea-input.vue     |   60 +-
 .../els/page-editor.el.textarea.vue           |   38 +-
 .../pages/page-editor/page-editor.blocks.vue  |  102 +-
 .../page-editor/page-editor.container.vue     |   73 +-
 .../page-editor/page-editor.script-block.vue  |  405 ++++--
 .../src/pages/page-editor/page-editor.vue     |  536 ++++---
 packages/client/src/pages/page.vue            |  331 +++--
 packages/client/src/pages/pages.vue           |  204 +--
 packages/client/src/pages/preview.vue         |   24 +-
 packages/client/src/pages/registry.keys.vue   |  103 +-
 packages/client/src/pages/registry.value.vue  |  129 +-
 packages/client/src/pages/registry.vue        |   70 +-
 packages/client/src/pages/reset-password.vue  |   78 +-
 packages/client/src/pages/scratchpad.vue      |  161 ++-
 packages/client/src/pages/search.vue          |   94 +-
 packages/client/src/pages/settings/2fa.vue    |  372 +++--
 .../src/pages/settings/account-info.vue       |  312 +++--
 .../client/src/pages/settings/accounts.vue    |  162 ++-
 packages/client/src/pages/settings/api.vue    |   70 +-
 packages/client/src/pages/settings/apps.vue   |  105 +-
 .../client/src/pages/settings/custom-css.vue  |   40 +-
 .../src/pages/settings/custom-katex-macro.vue |   63 +-
 packages/client/src/pages/settings/deck.vue   |   53 +-
 .../src/pages/settings/delete-account.vue     |   44 +-
 packages/client/src/pages/settings/drive.vue  |  164 ++-
 packages/client/src/pages/settings/email.vue  |  177 ++-
 .../client/src/pages/settings/general.vue     |  480 ++++---
 .../src/pages/settings/import-export.vue      |  308 ++--
 packages/client/src/pages/settings/index.vue  |  441 +++---
 .../src/pages/settings/instance-mute.vue      |   58 +-
 .../client/src/pages/settings/integration.vue |  106 +-
 .../client/src/pages/settings/migration.vue   |   86 +-
 .../client/src/pages/settings/mute-block.vue  |   88 +-
 packages/client/src/pages/settings/navbar.vue |  102 +-
 .../src/pages/settings/notifications.vue      |  152 +-
 packages/client/src/pages/settings/other.vue  |   56 +-
 .../src/pages/settings/plugin.install.vue     |  143 +-
 packages/client/src/pages/settings/plugin.vue |  125 +-
 .../pages/settings/preferences-backups.vue    |  453 +++---
 .../client/src/pages/settings/privacy.vue     |  202 ++-
 .../client/src/pages/settings/profile.vue     |  365 +++--
 .../client/src/pages/settings/reaction.vue    |  222 +--
 .../client/src/pages/settings/security.vue    |  124 +-
 packages/client/src/pages/settings/sounds.vue |  110 +-
 .../pages/settings/statusbar.statusbar.vue    |  299 ++--
 .../client/src/pages/settings/statusbar.vue   |   48 +-
 .../src/pages/settings/theme.install.vue      |   64 +-
 .../src/pages/settings/theme.manage.vue       |  116 +-
 packages/client/src/pages/settings/theme.vue  |  353 +++--
 .../src/pages/settings/webhook.edit.vue       |  122 +-
 .../client/src/pages/settings/webhook.new.vue |  110 +-
 .../client/src/pages/settings/webhook.vue     |   96 +-
 .../client/src/pages/settings/word-mute.vue   |  140 +-
 packages/client/src/pages/share.vue           |  185 ++-
 packages/client/src/pages/signup-complete.vue |   30 +-
 packages/client/src/pages/tag.vue             |   32 +-
 packages/client/src/pages/theme-editor.vue    |  381 +++--
 packages/client/src/pages/timeline.vue        |  373 ++---
 packages/client/src/pages/user-info.vue       |  680 ++++++---
 .../client/src/pages/user-list-timeline.vue   |  104 +-
 packages/client/src/pages/user/clips.vue      |   40 +-
 .../client/src/pages/user/follow-list.vue     |   42 +-
 packages/client/src/pages/user/followers.vue  |   94 +-
 packages/client/src/pages/user/following.vue  |   94 +-
 packages/client/src/pages/user/gallery.vue    |   39 +-
 packages/client/src/pages/user/home.vue       |  532 ++++---
 .../client/src/pages/user/index.activity.vue  |   87 +-
 .../client/src/pages/user/index.photos.vue    |   87 +-
 .../client/src/pages/user/index.timeline.vue  |   38 +-
 packages/client/src/pages/user/index.vue      |  179 +--
 packages/client/src/pages/user/pages.vue      |   29 +-
 packages/client/src/pages/user/reactions.vue  |   44 +-
 .../client/src/pages/welcome.entrance.a.vue   |  249 ++--
 .../client/src/pages/welcome.entrance.b.vue   |  218 ++-
 .../client/src/pages/welcome.entrance.c.vue   |  225 +--
 packages/client/src/pages/welcome.setup.vue   |  114 +-
 .../client/src/pages/welcome.timeline.vue     |   63 +-
 packages/client/src/pages/welcome.vue         |   32 +-
 packages/client/src/ui/_common_/common.vue    |   81 +-
 .../src/ui/_common_/navbar-for-mobile.vue     |  238 +++-
 packages/client/src/ui/_common_/navbar.vue    |  292 ++--
 .../src/ui/_common_/statusbar-federation.vue  |   94 +-
 .../client/src/ui/_common_/statusbar-rss.vue  |   64 +-
 .../src/ui/_common_/statusbar-user-list.vue   |   79 +-
 .../client/src/ui/_common_/statusbars.vue     |   77 +-
 .../src/ui/_common_/stream-indicator.vue      |   31 +-
 packages/client/src/ui/_common_/upload.vue    |  188 ++-
 packages/client/src/ui/classic.header.vue     |  175 ++-
 packages/client/src/ui/classic.sidebar.vue    |  293 ++--
 packages/client/src/ui/classic.vue            |  244 ++--
 packages/client/src/ui/classic.widgets.vue    |   92 +-
 packages/client/src/ui/deck.vue               |  381 +++--
 .../client/src/ui/deck/antenna-column.vue     |   62 +-
 packages/client/src/ui/deck/column-core.vue   |   82 +-
 packages/client/src/ui/deck/column.vue        |  333 +++--
 packages/client/src/ui/deck/direct-column.vue |   32 +-
 packages/client/src/ui/deck/list-column.vue   |   62 +-
 packages/client/src/ui/deck/main-column.vue   |   84 +-
 .../client/src/ui/deck/mentions-column.vue    |   27 +-
 .../src/ui/deck/notifications-column.vue      |   69 +-
 packages/client/src/ui/deck/tl-column.vue     |  136 +-
 .../client/src/ui/deck/widgets-column.vue     |   62 +-
 packages/client/src/ui/universal.vue          |  446 +++---
 packages/client/src/ui/universal.widgets.vue  |   75 +-
 packages/client/src/ui/visitor.vue            |   14 +-
 packages/client/src/ui/visitor/a.vue          |  158 ++-
 packages/client/src/ui/visitor/b.vue          |  190 ++-
 packages/client/src/ui/visitor/header.vue     |  180 ++-
 packages/client/src/ui/visitor/kanban.vue     |  157 ++-
 packages/client/src/ui/zen.vue                |   26 +-
 .../client/src/widgets/activity.calendar.vue  |   73 +-
 .../client/src/widgets/activity.chart.vue     |  102 +-
 packages/client/src/widgets/activity.vue      |   85 +-
 packages/client/src/widgets/aiscript.vue      |  157 ++-
 packages/client/src/widgets/button.vue        |   98 +-
 packages/client/src/widgets/calendar.vue      |  116 +-
 packages/client/src/widgets/clock.vue         |  283 ++--
 packages/client/src/widgets/digital-clock.vue |  108 +-
 packages/client/src/widgets/federation.vue    |  120 +-
 .../client/src/widgets/instance-cloud.vue     |  102 +-
 packages/client/src/widgets/job-queue.vue     |  222 ++-
 packages/client/src/widgets/memo.vue          |   71 +-
 packages/client/src/widgets/notifications.vue |   90 +-
 packages/client/src/widgets/online-users.vue  |   56 +-
 packages/client/src/widgets/photos.vue        |   83 +-
 packages/client/src/widgets/post-form.vue     |   30 +-
 packages/client/src/widgets/rss-ticker.vue    |  110 +-
 packages/client/src/widgets/rss.vue           |   68 +-
 .../src/widgets/server-metric/cpu-mem.vue     |  208 +--
 .../client/src/widgets/server-metric/cpu.vue  |   26 +-
 .../client/src/widgets/server-metric/disk.vue |   22 +-
 .../src/widgets/server-metric/index.vue       |  102 +-
 .../client/src/widgets/server-metric/mem.vue  |   30 +-
 .../client/src/widgets/server-metric/net.vue  |  141 +-
 .../client/src/widgets/server-metric/pie.vue  |   50 +-
 packages/client/src/widgets/slideshow.vue     |   80 +-
 packages/client/src/widgets/timeline.vue      |  200 ++-
 packages/client/src/widgets/trends.vue        |   84 +-
 packages/client/src/widgets/unix-clock.vue    |   73 +-
 packages/client/src/widgets/user-list.vue     |   68 +-
 pnpm-lock.yaml                                |   18 +
 430 files changed, 36649 insertions(+), 21793 deletions(-)
 create mode 100644 packages/client/.prettierrc
 delete mode 100644 packages/client/src/components/queue-chart.vue

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f824432e2..7a1fdee31 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -48,8 +48,8 @@ Thank you for your PR! Before creating a PR, please check the following:
 - If there is an Issue which will be resolved by this PR, please include a reference to the Issue in the text. Good examples include `Closing: #21` or `Resolves: #21`
 - 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 run test` and `pnpm run lint`. [See more info](#testing)
+- Please make sure that formatting, tests and Lint are passed in advance.
+  - You can run it with `pnpm run format`, `pnpm run test` and `pnpm run lint`. [See more info](#testing)
 - If this PR includes UI changes, please attach a screenshot in the text.
 
 Thanks for your cooperation 🤗
diff --git a/package.json b/package.json
index e990a5851..3a324fa0b 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
 		"e2e": "start-server-and-test start:test http://localhost:61812 cy:run",
 		"mocha": "pnpm --filter backend run mocha",
 		"test": "pnpm run mocha",
-		"format": "gulp format",
+		"format": "pnpm rome format packages/**/* --write && pnpm --filter client run format",
 		"clean": "pnpm node ./scripts/clean.js",
 		"clean-all": "pnpm node ./scripts/clean-all.js",
 		"cleanall": "pnpm run clean-all"
diff --git a/packages/client/.prettierrc b/packages/client/.prettierrc
new file mode 100644
index 000000000..77a5016a4
--- /dev/null
+++ b/packages/client/.prettierrc
@@ -0,0 +1,15 @@
+{
+  "tabWidth": 4,
+  "useTabs": true,
+	"singleQuote": false,
+	"vueIndentScriptAndStyle": false,
+	"plugins": ["vue"],
+	"overrides": [
+		{
+			"files": "*.vue",
+			"options": {
+				"parser": "vue"
+			}
+		}
+	]
+}
diff --git a/packages/client/package.json b/packages/client/package.json
index b1da8e0a0..24af5b143 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -4,7 +4,8 @@
 	"scripts": {
 		"watch": "pnpm vite build --watch --mode development",
 		"build": "pnpm vite build",
-		"lint": "pnpm rome check \"src/**/*.{ts,vue}\""
+		"lint": "pnpm rome check \"src/**/*.{ts,vue}\"",
+		"format": "pnpm prettier --write '**/*.vue'"
 	},
 	"devDependencies": {
 		"@discordapp/twemoji": "14.0.2",
@@ -54,6 +55,8 @@
 		"matter-js": "0.18.0",
 		"mfm-js": "0.23.2",
 		"photoswipe": "5.3.4",
+		"prettier": "2.8.7",
+		"prettier-plugin-vue": "1.1.6",
 		"prismjs": "1.29.0",
 		"punycode": "2.1.1",
 		"querystring": "0.2.1",
diff --git a/packages/client/src/components/MkAbuseReport.vue b/packages/client/src/components/MkAbuseReport.vue
index 9a3464b64..ccb85d722 100644
--- a/packages/client/src/components/MkAbuseReport.vue
+++ b/packages/client/src/components/MkAbuseReport.vue
@@ -1,64 +1,93 @@
 <template>
-<div class="bcekxzvu _gap _panel">
-	<div class="target">
-		<MkA v-user-preview="report.targetUserId" class="info" :to="`/user-info/${report.targetUserId}`">
-			<MkAvatar class="avatar" :user="report.targetUser" :show-indicator="true" :disable-link="true"/>
-			<div class="names">
-				<MkUserName class="name" :user="report.targetUser"/>
-				<MkAcct class="acct" :user="report.targetUser" style="display: block;"/>
+	<div class="bcekxzvu _gap _panel">
+		<div class="target">
+			<MkA
+				v-user-preview="report.targetUserId"
+				class="info"
+				:to="`/user-info/${report.targetUserId}`"
+			>
+				<MkAvatar
+					class="avatar"
+					:user="report.targetUser"
+					:show-indicator="true"
+					:disable-link="true"
+				/>
+				<div class="names">
+					<MkUserName class="name" :user="report.targetUser" />
+					<MkAcct
+						class="acct"
+						:user="report.targetUser"
+						style="display: block"
+					/>
+				</div>
+			</MkA>
+			<MkKeyValue class="_formBlock">
+				<template #key>{{ i18n.ts.registeredDate }}</template>
+				<template #value
+					>{{
+						new Date(report.targetUser.createdAt).toLocaleString()
+					}}
+					(<MkTime :time="report.targetUser.createdAt" />)</template
+				>
+			</MkKeyValue>
+		</div>
+		<div class="detail">
+			<div>
+				<Mfm :text="report.comment" />
+			</div>
+			<hr />
+			<div>
+				{{ i18n.ts.reporter }}: <MkAcct :user="report.reporter" />
+			</div>
+			<div v-if="report.assignee">
+				{{ i18n.ts.moderator }}:
+				<MkAcct :user="report.assignee" />
+			</div>
+			<div><MkTime :time="report.createdAt" /></div>
+			<div class="action">
+				<MkSwitch
+					v-model="forward"
+					:disabled="
+						report.targetUser.host == null || report.resolved
+					"
+				>
+					{{ i18n.ts.forwardReport }}
+					<template #caption>{{
+						i18n.ts.forwardReportIsAnonymous
+					}}</template>
+				</MkSwitch>
+				<MkButton v-if="!report.resolved" primary @click="resolve">{{
+					i18n.ts.abuseMarkAsResolved
+				}}</MkButton>
 			</div>
-		</MkA>
-		<MkKeyValue class="_formBlock">
-			<template #key>{{ i18n.ts.registeredDate }}</template>
-			<template #value>{{ new Date(report.targetUser.createdAt).toLocaleString() }} (<MkTime :time="report.targetUser.createdAt"/>)</template>
-		</MkKeyValue>
-	</div>
-	<div class="detail">
-		<div>
-			<Mfm :text="report.comment"/>
-		</div>
-		<hr/>
-		<div>{{ i18n.ts.reporter }}: <MkAcct :user="report.reporter"/></div>
-		<div v-if="report.assignee">
-			{{ i18n.ts.moderator }}:
-			<MkAcct :user="report.assignee"/>
-		</div>
-		<div><MkTime :time="report.createdAt"/></div>
-		<div class="action">
-			<MkSwitch v-model="forward" :disabled="report.targetUser.host == null || report.resolved">
-				{{ i18n.ts.forwardReport }}
-				<template #caption>{{ i18n.ts.forwardReportIsAnonymous }}</template>
-			</MkSwitch>
-			<MkButton v-if="!report.resolved" primary @click="resolve">{{ i18n.ts.abuseMarkAsResolved }}</MkButton>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import MkButton from '@/components/MkButton.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import { acct, userPage } from '@/filters/user';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import MkButton from "@/components/MkButton.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import { acct, userPage } from "@/filters/user";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	report: any;
 }>();
 
 const emit = defineEmits<{
-	(ev: 'resolved', reportId: string): void;
+	(ev: "resolved", reportId: string): void;
 }>();
 
 let forward = $ref(props.report.forwarded);
 
 function resolve() {
-	os.apiWithDialog('admin/resolve-abuse-user-report', {
+	os.apiWithDialog("admin/resolve-abuse-user-report", {
 		forward: forward,
 		reportId: props.report.id,
 	}).then(() => {
-		emit('resolved', props.report.id);
+		emit("resolved", props.report.id);
 	});
 }
 </script>
@@ -81,7 +110,16 @@ function resolve() {
 			padding: 14px;
 			border-radius: 8px;
 			--c: rgb(255 196 0 / 15%);
-			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-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;
 
 			> .avatar {
diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue
index f1b3ae431..19b8ba526 100644
--- a/packages/client/src/components/MkAbuseReportWindow.vue
+++ b/packages/client/src/components/MkAbuseReportWindow.vue
@@ -1,35 +1,52 @@
 <template>
-<XWindow ref="uiWindow" :initial-width="400" :initial-height="500" :can-resize="true" @closed="emit('closed')">
-	<template #header>
-		<i class="ph-warning-circle ph-bold ph-lg" style="margin-right: 0.5em;"></i>
-		<I18n :src="i18n.ts.reportAbuseOf" tag="span">
-			<template #name>
-				<b><MkAcct :user="user"/></b>
-			</template>
-		</I18n>
-	</template>
-	<div class="dpvffvvy _monolithic_">
-		<div class="_section">
-			<MkTextarea v-model="comment">
-				<template #label>{{ i18n.ts.details }}</template>
-				<template #caption>{{ i18n.ts.fillAbuseReportDescription }}</template>
-			</MkTextarea>
+	<XWindow
+		ref="uiWindow"
+		:initial-width="400"
+		:initial-height="500"
+		:can-resize="true"
+		@closed="emit('closed')"
+	>
+		<template #header>
+			<i
+				class="ph-warning-circle ph-bold ph-lg"
+				style="margin-right: 0.5em"
+			></i>
+			<I18n :src="i18n.ts.reportAbuseOf" tag="span">
+				<template #name>
+					<b><MkAcct :user="user" /></b>
+				</template>
+			</I18n>
+		</template>
+		<div class="dpvffvvy _monolithic_">
+			<div class="_section">
+				<MkTextarea v-model="comment">
+					<template #label>{{ i18n.ts.details }}</template>
+					<template #caption>{{
+						i18n.ts.fillAbuseReportDescription
+					}}</template>
+				</MkTextarea>
+			</div>
+			<div class="_section">
+				<MkButton
+					primary
+					full
+					:disabled="comment.length === 0"
+					@click="send"
+					>{{ i18n.ts.send }}</MkButton
+				>
+			</div>
 		</div>
-		<div class="_section">
-			<MkButton primary full :disabled="comment.length === 0" @click="send">{{ i18n.ts.send }}</MkButton>
-		</div>
-	</div>
-</XWindow>
+	</XWindow>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
-import * as Misskey from 'calckey-js';
-import XWindow from '@/components/MkWindow.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { ref } from "vue";
+import * as Misskey from "calckey-js";
+import XWindow from "@/components/MkWindow.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	user: Misskey.entities.User;
@@ -37,23 +54,27 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
 const uiWindow = ref<InstanceType<typeof XWindow>>();
-const comment = ref(props.initialComment || '');
+const comment = ref(props.initialComment || "");
 
 function send() {
-	os.apiWithDialog('users/report-abuse', {
-		userId: props.user.id,
-		comment: comment.value,
-	}, undefined).then(res => {
+	os.apiWithDialog(
+		"users/report-abuse",
+		{
+			userId: props.user.id,
+			comment: comment.value,
+		},
+		undefined
+	).then((res) => {
 		os.alert({
-			type: 'success',
-			text: i18n.ts.abuseReported
+			type: "success",
+			text: i18n.ts.abuseReported,
 		});
 		uiWindow.value?.close();
-		emit('closed');
+		emit("closed");
 	});
 }
 </script>
diff --git a/packages/client/src/components/MkAnalogClock.vue b/packages/client/src/components/MkAnalogClock.vue
index 40ef626ae..43d81f2a9 100644
--- a/packages/client/src/components/MkAnalogClock.vue
+++ b/packages/client/src/components/MkAnalogClock.vue
@@ -1,32 +1,62 @@
 <template>
-<svg class="mbcofsoe" viewBox="0 0 10 10" preserveAspectRatio="none">
-	<template v-if="props.graduations === 'dots'">
-		<circle
-			v-for="(angle, i) in graduationsMajor"
-			:cx="5 + (Math.sin(angle) * (5 - graduationsPadding))"
-			:cy="5 - (Math.cos(angle) * (5 - graduationsPadding))"
-			:r="0.125"
-			:fill="(props.twentyfour ? h : h % 12) === i ? nowColor : majorGraduationColor"
-			:opacity="!props.fadeGraduations || (props.twentyfour ? h : h % 12) === i ? 1 : Math.max(0, 1 - (angleDiff(hAngle, angle) / Math.PI) - numbersOpacityFactor)"
-		/>
-	</template>
-	<template v-else-if="props.graduations === 'numbers'">
-		<text
-			v-for="(angle, i) in texts"
-			:x="5 + (Math.sin(angle) * (5 - textsPadding))"
-			:y="5 - (Math.cos(angle) * (5 - textsPadding))"
-			text-anchor="middle"
-			dominant-baseline="middle"
-			:font-size="(props.twentyfour ? h : h % 12) === i ? 1 : 0.7"
-			:font-weight="(props.twentyfour ? h : h % 12) === i ? 'bold' : 'normal'"
-			:fill="(props.twentyfour ? h : h % 12) === i ? nowColor : 'currentColor'"
-			:opacity="!props.fadeGraduations || (props.twentyfour ? h : h % 12) === i ? 1 : Math.max(0, 1 - (angleDiff(hAngle, angle) / Math.PI) - numbersOpacityFactor)"
-		>
-			{{ i === 0 ? (props.twentyfour ? '24' : '12') : i }}
-		</text>
-	</template>
+	<svg class="mbcofsoe" viewBox="0 0 10 10" preserveAspectRatio="none">
+		<template v-if="props.graduations === 'dots'">
+			<circle
+				v-for="(angle, i) in graduationsMajor"
+				:cx="5 + Math.sin(angle) * (5 - graduationsPadding)"
+				:cy="5 - Math.cos(angle) * (5 - graduationsPadding)"
+				:r="0.125"
+				:fill="
+					(props.twentyfour ? h : h % 12) === i
+						? nowColor
+						: majorGraduationColor
+				"
+				:opacity="
+					!props.fadeGraduations ||
+					(props.twentyfour ? h : h % 12) === i
+						? 1
+						: Math.max(
+								0,
+								1 -
+									angleDiff(hAngle, angle) / Math.PI -
+									numbersOpacityFactor
+						  )
+				"
+			/>
+		</template>
+		<template v-else-if="props.graduations === 'numbers'">
+			<text
+				v-for="(angle, i) in texts"
+				:x="5 + Math.sin(angle) * (5 - textsPadding)"
+				:y="5 - Math.cos(angle) * (5 - textsPadding)"
+				text-anchor="middle"
+				dominant-baseline="middle"
+				:font-size="(props.twentyfour ? h : h % 12) === i ? 1 : 0.7"
+				:font-weight="
+					(props.twentyfour ? h : h % 12) === i ? 'bold' : 'normal'
+				"
+				:fill="
+					(props.twentyfour ? h : h % 12) === i
+						? nowColor
+						: 'currentColor'
+				"
+				:opacity="
+					!props.fadeGraduations ||
+					(props.twentyfour ? h : h % 12) === i
+						? 1
+						: Math.max(
+								0,
+								1 -
+									angleDiff(hAngle, angle) / Math.PI -
+									numbersOpacityFactor
+						  )
+				"
+			>
+				{{ i === 0 ? (props.twentyfour ? "24" : "12") : i }}
+			</text>
+		</template>
 
-	<!--
+		<!--
 	<line
 		:x1="5 - (Math.sin(sAngle) * (sHandLengthRatio * handsTailLength))"
 		:y1="5 + (Math.cos(sAngle) * (sHandLengthRatio * handsTailLength))"
@@ -38,50 +68,61 @@
 	/>
 	-->
 
-	<line
-		class="s"
-		:class="{ animate: !disableSAnimate && sAnimation !== 'none', elastic: sAnimation === 'elastic', easeOut: sAnimation === 'easeOut' }"
-		:x1="5 - (0 * (sHandLengthRatio * handsTailLength))"
-		:y1="5 + (1 * (sHandLengthRatio * handsTailLength))"
-		:x2="5 + (0 * ((sHandLengthRatio * 5) - handsPadding))"
-		:y2="5 - (1 * ((sHandLengthRatio * 5) - handsPadding))"
-		:stroke="sHandColor"
-		:stroke-width="thickness / 2"
-		:style="`transform: rotateZ(${sAngle}rad)`"
-		stroke-linecap="round"
-	/>
+		<line
+			class="s"
+			:class="{
+				animate: !disableSAnimate && sAnimation !== 'none',
+				elastic: sAnimation === 'elastic',
+				easeOut: sAnimation === 'easeOut',
+			}"
+			:x1="5 - 0 * (sHandLengthRatio * handsTailLength)"
+			:y1="5 + 1 * (sHandLengthRatio * handsTailLength)"
+			:x2="5 + 0 * (sHandLengthRatio * 5 - handsPadding)"
+			:y2="5 - 1 * (sHandLengthRatio * 5 - handsPadding)"
+			:stroke="sHandColor"
+			:stroke-width="thickness / 2"
+			:style="`transform: rotateZ(${sAngle}rad)`"
+			stroke-linecap="round"
+		/>
 
-	<line
-		:x1="5 - (Math.sin(mAngle) * (mHandLengthRatio * handsTailLength))"
-		:y1="5 + (Math.cos(mAngle) * (mHandLengthRatio * handsTailLength))"
-		:x2="5 + (Math.sin(mAngle) * ((mHandLengthRatio * 5) - handsPadding))"
-		:y2="5 - (Math.cos(mAngle) * ((mHandLengthRatio * 5) - handsPadding))"
-		:stroke="mHandColor"
-		:stroke-width="thickness"
-		stroke-linecap="round"
-	/>
+		<line
+			:x1="5 - Math.sin(mAngle) * (mHandLengthRatio * handsTailLength)"
+			:y1="5 + Math.cos(mAngle) * (mHandLengthRatio * handsTailLength)"
+			:x2="5 + Math.sin(mAngle) * (mHandLengthRatio * 5 - handsPadding)"
+			:y2="5 - Math.cos(mAngle) * (mHandLengthRatio * 5 - handsPadding)"
+			:stroke="mHandColor"
+			:stroke-width="thickness"
+			stroke-linecap="round"
+		/>
 
-	<line
-		:x1="5 - (Math.sin(hAngle) * (hHandLengthRatio * handsTailLength))"
-		:y1="5 + (Math.cos(hAngle) * (hHandLengthRatio * handsTailLength))"
-		:x2="5 + (Math.sin(hAngle) * ((hHandLengthRatio * 5) - handsPadding))"
-		:y2="5 - (Math.cos(hAngle) * ((hHandLengthRatio * 5) - handsPadding))"
-		:stroke="hHandColor"
-		:stroke-width="thickness"
-		stroke-linecap="round"
-	/>
-</svg>
+		<line
+			:x1="5 - Math.sin(hAngle) * (hHandLengthRatio * handsTailLength)"
+			:y1="5 + Math.cos(hAngle) * (hHandLengthRatio * handsTailLength)"
+			:x2="5 + Math.sin(hAngle) * (hHandLengthRatio * 5 - handsPadding)"
+			:y2="5 - Math.cos(hAngle) * (hHandLengthRatio * 5 - handsPadding)"
+			:stroke="hHandColor"
+			:stroke-width="thickness"
+			stroke-linecap="round"
+		/>
+	</svg>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, onBeforeUnmount, shallowRef, nextTick } from 'vue';
-import tinycolor from 'tinycolor2';
-import { globalEvents } from '@/events.js';
+import {
+	ref,
+	computed,
+	onMounted,
+	onBeforeUnmount,
+	shallowRef,
+	nextTick,
+} from "vue";
+import tinycolor from "tinycolor2";
+import { globalEvents } from "@/events.js";
 
 // https://stackoverflow.com/questions/1878907/how-can-i-find-the-difference-between-two-angles
 const angleDiff = (a: number, b: number) => {
 	const x = Math.abs(a - b);
-	return Math.abs((x + Math.PI) % (Math.PI * 2) - Math.PI);
+	return Math.abs(((x + Math.PI) % (Math.PI * 2)) - Math.PI);
 };
 
 const graduationsPadding = 0.5;
@@ -93,28 +134,31 @@ const mHandLengthRatio = 1;
 const sHandLengthRatio = 1;
 const numbersOpacityFactor = 0.35;
 
-const props = withDefaults(defineProps<{
-	thickness?: number;
-	offset?: number;
-	twentyfour?: boolean;
-	graduations?: 'none' | 'dots' | 'numbers';
-	fadeGraduations?: boolean;
-	sAnimation?: 'none' | 'elastic' | 'easeOut';
-}>(), {
-	numbers: false,
-	thickness: 0.1,
-	offset: 0 - new Date().getTimezoneOffset(),
-	twentyfour: false,
-	graduations: 'dots',
-	fadeGraduations: true,
-	sAnimation: 'elastic',
-});
+const props = withDefaults(
+	defineProps<{
+		thickness?: number;
+		offset?: number;
+		twentyfour?: boolean;
+		graduations?: "none" | "dots" | "numbers";
+		fadeGraduations?: boolean;
+		sAnimation?: "none" | "elastic" | "easeOut";
+	}>(),
+	{
+		numbers: false,
+		thickness: 0.1,
+		offset: 0 - new Date().getTimezoneOffset(),
+		twentyfour: false,
+		graduations: "dots",
+		fadeGraduations: true,
+		sAnimation: "elastic",
+	}
+);
 
 const graduationsMajor = computed(() => {
 	const angles: number[] = [];
 	const times = props.twentyfour ? 24 : 12;
 	for (let i = 0; i < times; i++) {
-		const angle = Math.PI * i / (times / 2);
+		const angle = (Math.PI * i) / (times / 2);
 		angles.push(angle);
 	}
 	return angles;
@@ -123,7 +167,7 @@ const texts = computed(() => {
 	const angles: number[] = [];
 	const times = props.twentyfour ? 24 : 12;
 	for (let i = 0; i < times; i++) {
-		const angle = Math.PI * i / (times / 2);
+		const angle = (Math.PI * i) / (times / 2);
 		angles.push(angle);
 	}
 	return angles;
@@ -147,14 +191,19 @@ let sOneRound = false;
 
 function tick() {
 	const now = new Date();
-	now.setMinutes(now.getMinutes() + (new Date().getTimezoneOffset() + props.offset));
+	now.setMinutes(
+		now.getMinutes() + (new Date().getTimezoneOffset() + props.offset)
+	);
 	s = now.getSeconds();
 	m = now.getMinutes();
 	h = now.getHours();
-	hAngle = Math.PI * (h % (props.twentyfour ? 24 : 12) + (m + s / 60) / 60) / (props.twentyfour ? 12 : 6);
-	mAngle = Math.PI * (m + s / 60) / 30;
-	if (sOneRound) { // 秒針が一周した際のアニメーションをよしなに処理する(これが無いと秒が59->0になったときに期待したアニメーションにならない)
-		sAngle = Math.PI * 60 / 30;
+	hAngle =
+		(Math.PI * ((h % (props.twentyfour ? 24 : 12)) + (m + s / 60) / 60)) /
+		(props.twentyfour ? 12 : 6);
+	mAngle = (Math.PI * (m + s / 60)) / 30;
+	if (sOneRound) {
+		// 秒針が一周した際のアニメーションをよしなに処理する(これが無いと秒が59->0になったときに期待したアニメーションにならない)
+		sAngle = (Math.PI * 60) / 30;
 		window.setTimeout(() => {
 			disableSAnimate = true;
 			window.setTimeout(() => {
@@ -165,7 +214,7 @@ function tick() {
 			}, 100);
 		}, 700);
 	} else {
-		sAngle = Math.PI * s / 30;
+		sAngle = (Math.PI * s) / 30;
 	}
 	sOneRound = s === 59;
 }
@@ -174,12 +223,18 @@ tick();
 
 function calcColors() {
 	const computedStyle = getComputedStyle(document.documentElement);
-	const dark = tinycolor(computedStyle.getPropertyValue('--bg')).isDark();
-	const accent = tinycolor(computedStyle.getPropertyValue('--accent')).toHexString();
-	majorGraduationColor = dark ? 'rgba(255, 255, 255, 0.3)' : 'rgba(0, 0, 0, 0.3)';
+	const dark = tinycolor(computedStyle.getPropertyValue("--bg")).isDark();
+	const accent = tinycolor(
+		computedStyle.getPropertyValue("--accent")
+	).toHexString();
+	majorGraduationColor = dark
+		? "rgba(255, 255, 255, 0.3)"
+		: "rgba(0, 0, 0, 0.3)";
 	//minorGraduationColor = dark ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
-	sHandColor = dark ? 'rgba(255, 255, 255, 0.5)' : 'rgba(0, 0, 0, 0.3)';
-	mHandColor = tinycolor(computedStyle.getPropertyValue('--fg')).toHexString();
+	sHandColor = dark ? "rgba(255, 255, 255, 0.5)" : "rgba(0, 0, 0, 0.3)";
+	mHandColor = tinycolor(
+		computedStyle.getPropertyValue("--fg")
+	).toHexString();
 	hHandColor = accent;
 	nowColor = accent;
 }
@@ -195,13 +250,13 @@ onMounted(() => {
 	};
 	update();
 
-	globalEvents.on('themeChanged', calcColors);
+	globalEvents.on("themeChanged", calcColors);
 });
 
 onBeforeUnmount(() => {
 	enabled = false;
 
-	globalEvents.off('themeChanged', calcColors);
+	globalEvents.off("themeChanged", calcColors);
 });
 </script>
 
@@ -214,11 +269,11 @@ onBeforeUnmount(() => {
 		transform-origin: 50% 50%;
 
 		&.animate.elastic {
-			transition: transform .2s cubic-bezier(.4,2.08,.55,.44);
+			transition: transform 0.2s cubic-bezier(0.4, 2.08, 0.55, 0.44);
 		}
 
 		&.animate.easeOut {
-			transition: transform .7s cubic-bezier(0,.7,.3,1);
+			transition: transform 0.7s cubic-bezier(0, 0.7, 0.3, 1);
 		}
 	}
 }
diff --git a/packages/client/src/components/MkAutocomplete.vue b/packages/client/src/components/MkAutocomplete.vue
index ae708026e..0455bd9d5 100644
--- a/packages/client/src/components/MkAutocomplete.vue
+++ b/packages/client/src/components/MkAutocomplete.vue
@@ -1,49 +1,107 @@
 <template>
-<div ref="rootEl" class="swhvrteh _popup _shadow" :style="{ zIndex }" @contextmenu.prevent="() => {}">
-	<ol v-if="type === 'user'" ref="suggests" class="users">
-		<li v-for="user in users" tabindex="-1" class="user" @click="complete(type, user)" @keydown="onKeydown">
-			<img class="avatar" :src="user.avatarUrl"/>
-			<span class="name">
-				<MkUserName :key="user.id" :user="user"/>
-			</span>
-			<span class="username">@{{ acct(user) }}</span>
-		</li>
-		<li tabindex="-1" class="choose" @click="chooseUser()" @keydown="onKeydown">{{ i18n.ts.selectUser }}</li>
-	</ol>
-	<ol v-else-if="hashtags.length > 0" ref="suggests" class="hashtags">
-		<li v-for="hashtag in hashtags" tabindex="-1" @click="complete(type, hashtag)" @keydown="onKeydown">
-			<span class="name">{{ hashtag }}</span>
-		</li>
-	</ol>
-	<ol v-else-if="emojis.length > 0" ref="suggests" class="emojis">
-		<li v-for="emoji in emojis" tabindex="-1" @click="complete(type, emoji.emoji)" @keydown="onKeydown">
-			<span v-if="emoji.isCustomEmoji" class="emoji"><img :src="defaultStore.state.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span>
-			<span v-else-if="!defaultStore.state.useOsNativeEmojis" class="emoji"><img :src="emoji.url" :alt="emoji.emoji"/></span>
-			<span v-else class="emoji">{{ emoji.emoji }}</span>
-			<span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
-			<span v-if="emoji.aliasOf" class="alias">({{ emoji.aliasOf }})</span>
-		</li>
-	</ol>
-	<ol v-else-if="mfmTags.length > 0" ref="suggests" class="mfmTags">
-		<li v-for="tag in mfmTags" tabindex="-1" @click="complete(type, tag)" @keydown="onKeydown">
-			<span class="tag">{{ tag }}</span>
-		</li>
-	</ol>
-</div>
+	<div
+		ref="rootEl"
+		class="swhvrteh _popup _shadow"
+		:style="{ zIndex }"
+		@contextmenu.prevent="() => {}"
+	>
+		<ol v-if="type === 'user'" ref="suggests" class="users">
+			<li
+				v-for="user in users"
+				tabindex="-1"
+				class="user"
+				@click="complete(type, user)"
+				@keydown="onKeydown"
+			>
+				<img class="avatar" :src="user.avatarUrl" />
+				<span class="name">
+					<MkUserName :key="user.id" :user="user" />
+				</span>
+				<span class="username">@{{ acct(user) }}</span>
+			</li>
+			<li
+				tabindex="-1"
+				class="choose"
+				@click="chooseUser()"
+				@keydown="onKeydown"
+			>
+				{{ i18n.ts.selectUser }}
+			</li>
+		</ol>
+		<ol v-else-if="hashtags.length > 0" ref="suggests" class="hashtags">
+			<li
+				v-for="hashtag in hashtags"
+				tabindex="-1"
+				@click="complete(type, hashtag)"
+				@keydown="onKeydown"
+			>
+				<span class="name">{{ hashtag }}</span>
+			</li>
+		</ol>
+		<ol v-else-if="emojis.length > 0" ref="suggests" class="emojis">
+			<li
+				v-for="emoji in emojis"
+				tabindex="-1"
+				@click="complete(type, emoji.emoji)"
+				@keydown="onKeydown"
+			>
+				<span v-if="emoji.isCustomEmoji" class="emoji"
+					><img
+						:src="
+							defaultStore.state.disableShowingAnimatedImages
+								? getStaticImageUrl(emoji.url)
+								: emoji.url
+						"
+						:alt="emoji.emoji"
+				/></span>
+				<span
+					v-else-if="!defaultStore.state.useOsNativeEmojis"
+					class="emoji"
+					><img :src="emoji.url" :alt="emoji.emoji"
+				/></span>
+				<span v-else class="emoji">{{ emoji.emoji }}</span>
+				<span
+					class="name"
+					v-html="emoji.name.replace(q, `<b>${q}</b>`)"
+				></span>
+				<span v-if="emoji.aliasOf" class="alias"
+					>({{ emoji.aliasOf }})</span
+				>
+			</li>
+		</ol>
+		<ol v-else-if="mfmTags.length > 0" ref="suggests" class="mfmTags">
+			<li
+				v-for="tag in mfmTags"
+				tabindex="-1"
+				@click="complete(type, tag)"
+				@keydown="onKeydown"
+			>
+				<span class="tag">{{ tag }}</span>
+			</li>
+		</ol>
+	</div>
 </template>
 
 <script lang="ts">
-import { markRaw, ref, onUpdated, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
-import contains from '@/scripts/contains';
-import { char2filePath } from '@/scripts/twemoji-base';
-import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import { acct } from '@/filters/user';
-import * as os from '@/os';
-import { MFM_TAGS } from '@/scripts/mfm-tags';
-import { defaultStore } from '@/store';
-import { emojilist } from '@/scripts/emojilist';
-import { instance } from '@/instance';
-import { i18n } from '@/i18n';
+import {
+	markRaw,
+	ref,
+	onUpdated,
+	onMounted,
+	onBeforeUnmount,
+	nextTick,
+	watch,
+} from "vue";
+import contains from "@/scripts/contains";
+import { char2filePath } from "@/scripts/twemoji-base";
+import { getStaticImageUrl } from "@/scripts/get-static-image-url";
+import { acct } from "@/filters/user";
+import * as os from "@/os";
+import { MFM_TAGS } from "@/scripts/mfm-tags";
+import { defaultStore } from "@/store";
+import { emojilist } from "@/scripts/emojilist";
+import { instance } from "@/instance";
+import { i18n } from "@/i18n";
 
 type EmojiDef = {
 	emoji: string;
@@ -53,9 +111,9 @@ type EmojiDef = {
 	isCustomEmoji?: boolean;
 };
 
-const lib = emojilist.filter(x => x.category !== 'flags');
+const lib = emojilist.filter((x) => x.category !== "flags");
 
-const emjdb: EmojiDef[] = lib.map(x => ({
+const emjdb: EmojiDef[] = lib.map((x) => ({
 	emoji: x.char,
 	name: x.name,
 	url: char2filePath(x.char),
@@ -85,7 +143,7 @@ for (const x of customEmojis) {
 		name: x.name,
 		emoji: `:${x.name}:`,
 		url: x.url,
-		isCustomEmoji: true
+		isCustomEmoji: true,
 	});
 
 	if (x.aliases) {
@@ -95,7 +153,7 @@ for (const x of customEmojis) {
 				aliasOf: x.name,
 				emoji: `:${x.name}:`,
 				url: x.url,
-				isCustomEmoji: true
+				isCustomEmoji: true,
 			});
 		}
 	}
@@ -125,8 +183,8 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(event: 'done', value: { type: string; value: any }): void;
-	(event: 'closed'): void;
+	(event: "done", value: { type: string; value: any }): void;
+	(event: "closed"): void;
 }>();
 
 const suggests = ref<Element>();
@@ -135,36 +193,37 @@ const rootEl = ref<HTMLDivElement>();
 const fetching = ref(true);
 const users = ref<any[]>([]);
 const hashtags = ref<any[]>([]);
-const emojis = ref<(EmojiDef)[]>([]);
+const emojis = ref<EmojiDef[]>([]);
 const items = ref<Element[] | HTMLCollection>([]);
 const mfmTags = ref<string[]>([]);
 const select = ref(-1);
-const zIndex = os.claimZIndex('high');
+const zIndex = os.claimZIndex("high");
 
 function complete(type: string, value: any) {
-	emit('done', { type, value });
-	emit('closed');
-	if (type === 'emoji') {
+	emit("done", { type, value });
+	emit("closed");
+	if (type === "emoji") {
 		let recents = defaultStore.state.recentlyUsedEmojis;
 		recents = recents.filter((emoji: any) => emoji !== value);
 		recents.unshift(value);
-		defaultStore.set('recentlyUsedEmojis', recents.splice(0, 32));
+		defaultStore.set("recentlyUsedEmojis", recents.splice(0, 32));
 	}
 }
 
 function setPosition() {
 	if (!rootEl.value) return;
 	if (props.x + rootEl.value.offsetWidth > window.innerWidth) {
-		rootEl.value.style.left = (window.innerWidth - rootEl.value.offsetWidth) + 'px';
+		rootEl.value.style.left =
+			window.innerWidth - rootEl.value.offsetWidth + "px";
 	} else {
 		rootEl.value.style.left = `${props.x}px`;
 	}
 	if (props.y + rootEl.value.offsetHeight > window.innerHeight) {
-		rootEl.value.style.top = (props.y - rootEl.value.offsetHeight) + 'px';
-		rootEl.value.style.marginTop = '0';
+		rootEl.value.style.top = props.y - rootEl.value.offsetHeight + "px";
+		rootEl.value.style.marginTop = "0";
 	} else {
-		rootEl.value.style.top = props.y + 'px';
-		rootEl.value.style.marginTop = 'calc(1em + 8px)';
+		rootEl.value.style.top = props.y + "px";
+		rootEl.value.style.marginTop = "calc(1em + 8px)";
 	}
 }
 
@@ -172,10 +231,10 @@ function exec() {
 	select.value = -1;
 	if (suggests.value) {
 		for (const el of Array.from(items.value)) {
-			el.removeAttribute('data-selected');
+			el.removeAttribute("data-selected");
 		}
 	}
-	if (props.type === 'user') {
+	if (props.type === "user") {
 		if (!props.q) {
 			users.value = [];
 			fetching.value = false;
@@ -189,20 +248,22 @@ function exec() {
 			users.value = JSON.parse(cache);
 			fetching.value = false;
 		} else {
-			os.api('users/search-by-username-and-host', {
+			os.api("users/search-by-username-and-host", {
 				username: props.q,
 				limit: 10,
-				detail: false
-			}).then(searchedUsers => {
+				detail: false,
+			}).then((searchedUsers) => {
 				users.value = searchedUsers as any[];
 				fetching.value = false;
 				// キャッシュ
 				sessionStorage.setItem(cacheKey, JSON.stringify(searchedUsers));
 			});
 		}
-	} else if (props.type === 'hashtag') {
-		if (!props.q || props.q === '') {
-			hashtags.value = JSON.parse(localStorage.getItem('hashtags') || '[]');
+	} else if (props.type === "hashtag") {
+		if (!props.q || props.q === "") {
+			hashtags.value = JSON.parse(
+				localStorage.getItem("hashtags") || "[]"
+			);
 			fetching.value = false;
 		} else {
 			const cacheKey = `autocomplete:hashtag:${props.q}`;
@@ -212,59 +273,80 @@ function exec() {
 				hashtags.value = hashtags;
 				fetching.value = false;
 			} else {
-				os.api('hashtags/search', {
+				os.api("hashtags/search", {
 					query: props.q,
-					limit: 30
-				}).then(searchedHashtags => {
+					limit: 30,
+				}).then((searchedHashtags) => {
 					hashtags.value = searchedHashtags as any[];
 					fetching.value = false;
 					// キャッシュ
-					sessionStorage.setItem(cacheKey, JSON.stringify(searchedHashtags));
+					sessionStorage.setItem(
+						cacheKey,
+						JSON.stringify(searchedHashtags)
+					);
 				});
 			}
 		}
-	} else if (props.type === 'emoji') {
-		if (!props.q || props.q === '') {
+	} else if (props.type === "emoji") {
+		if (!props.q || props.q === "") {
 			// 最近使った絵文字をサジェスト
-			emojis.value = defaultStore.state.recentlyUsedEmojis.map(emoji => emojiDb.find(dbEmoji => dbEmoji.emoji === emoji)).filter(x => x) as EmojiDef[];
+			emojis.value = defaultStore.state.recentlyUsedEmojis
+				.map((emoji) =>
+					emojiDb.find((dbEmoji) => dbEmoji.emoji === emoji)
+				)
+				.filter((x) => x) as EmojiDef[];
 			return;
 		}
 
 		const matched: EmojiDef[] = [];
 		const max = 30;
 
-		emojiDb.some(x => {
-			if (x.name.startsWith(props.q ?? '') && !x.aliasOf && !matched.some(y => y.emoji === x.emoji)) matched.push(x);
+		emojiDb.some((x) => {
+			if (
+				x.name.startsWith(props.q ?? "") &&
+				!x.aliasOf &&
+				!matched.some((y) => y.emoji === x.emoji)
+			)
+				matched.push(x);
 			return matched.length === max;
 		});
 
 		if (matched.length < max) {
-			emojiDb.some(x => {
-				if (x.name.startsWith(props.q ?? '') && !matched.some(y => y.emoji === x.emoji)) matched.push(x);
+			emojiDb.some((x) => {
+				if (
+					x.name.startsWith(props.q ?? "") &&
+					!matched.some((y) => y.emoji === x.emoji)
+				)
+					matched.push(x);
 				return matched.length === max;
 			});
 		}
 
 		if (matched.length < max) {
-			emojiDb.some(x => {
-				if (x.name.includes(props.q ?? '') && !matched.some(y => y.emoji === x.emoji)) matched.push(x);
+			emojiDb.some((x) => {
+				if (
+					x.name.includes(props.q ?? "") &&
+					!matched.some((y) => y.emoji === x.emoji)
+				)
+					matched.push(x);
 				return matched.length === max;
 			});
 		}
 
 		emojis.value = matched;
-	} else if (props.type === 'mfmTag') {
-		if (!props.q || props.q === '') {
+	} else if (props.type === "mfmTag") {
+		if (!props.q || props.q === "") {
 			mfmTags.value = MFM_TAGS;
 			return;
 		}
 
-		mfmTags.value = MFM_TAGS.filter(tag => tag.startsWith(props.q ?? ''));
+		mfmTags.value = MFM_TAGS.filter((tag) => tag.startsWith(props.q ?? ""));
 	}
 }
 
 function onMousedown(event: Event) {
-	if (!contains(rootEl.value, event.target) && (rootEl.value !== event.target)) props.close();
+	if (!contains(rootEl.value, event.target) && rootEl.value !== event.target)
+		props.close();
 }
 
 function onKeydown(event: KeyboardEvent) {
@@ -274,7 +356,7 @@ function onKeydown(event: KeyboardEvent) {
 	};
 
 	switch (event.key) {
-		case 'Enter':
+		case "Enter":
 			if (select.value !== -1) {
 				cancel();
 				(items.value[select.value] as any).click();
@@ -283,12 +365,12 @@ function onKeydown(event: KeyboardEvent) {
 			}
 			break;
 
-		case 'Escape':
+		case "Escape":
 			cancel();
 			props.close();
 			break;
 
-		case 'ArrowUp':
+		case "ArrowUp":
 			if (select.value !== -1) {
 				cancel();
 				selectPrev();
@@ -297,8 +379,8 @@ function onKeydown(event: KeyboardEvent) {
 			}
 			break;
 
-		case 'Tab':
-		case 'ArrowDown':
+		case "Tab":
+		case "ArrowDown":
 			cancel();
 			selectNext();
 			break;
@@ -322,19 +404,19 @@ function selectPrev() {
 
 function applySelect() {
 	for (const el of Array.from(items.value)) {
-		el.removeAttribute('data-selected');
+		el.removeAttribute("data-selected");
 	}
 
 	if (select.value !== -1) {
-		items.value[select.value].setAttribute('data-selected', 'true');
+		items.value[select.value].setAttribute("data-selected", "true");
 		(items.value[select.value] as any).focus();
 	}
 }
 
 function chooseUser() {
 	props.close();
-	os.selectUser().then(user => {
-		complete('user', user);
+	os.selectUser().then((user) => {
+		complete("user", user);
 		props.textarea.focus();
 	});
 }
@@ -347,28 +429,31 @@ onUpdated(() => {
 onMounted(() => {
 	setPosition();
 
-	props.textarea.addEventListener('keydown', onKeydown);
+	props.textarea.addEventListener("keydown", onKeydown);
 
-	for (const el of Array.from(document.querySelectorAll('body *'))) {
-		el.addEventListener('mousedown', onMousedown);
+	for (const el of Array.from(document.querySelectorAll("body *"))) {
+		el.addEventListener("mousedown", onMousedown);
 	}
 
 	nextTick(() => {
 		exec();
 
-		watch(() => props.q, () => {
-			nextTick(() => {
-				exec();
-			});
-		});
+		watch(
+			() => props.q,
+			() => {
+				nextTick(() => {
+					exec();
+				});
+			}
+		);
 	});
 });
 
 onBeforeUnmount(() => {
-	props.textarea.removeEventListener('keydown', onKeydown);
+	props.textarea.removeEventListener("keydown", onKeydown);
 
-	for (const el of Array.from(document.querySelectorAll('body *'))) {
-		el.removeEventListener('mousedown', onMousedown);
+	for (const el of Array.from(document.querySelectorAll("body *"))) {
+		el.removeEventListener("mousedown", onMousedown);
 	}
 });
 </script>
@@ -399,7 +484,8 @@ onBeforeUnmount(() => {
 			font-size: 0.9em;
 			cursor: default;
 
-			&, * {
+			&,
+			* {
 				user-select: none;
 			}
 
@@ -412,10 +498,11 @@ onBeforeUnmount(() => {
 				background: var(--X3);
 			}
 
-			&[data-selected='true'] {
+			&[data-selected="true"] {
 				background: var(--accent);
 
-				&, * {
+				&,
+				* {
 					color: #fff !important;
 				}
 			}
@@ -423,7 +510,8 @@ onBeforeUnmount(() => {
 			&:active {
 				background: var(--accentDarken);
 
-				&, * {
+				&,
+				* {
 					color: #fff !important;
 				}
 			}
@@ -431,7 +519,6 @@ onBeforeUnmount(() => {
 	}
 
 	> .users > li {
-
 		.avatar {
 			min-width: 28px;
 			min-height: 28px;
@@ -447,7 +534,6 @@ onBeforeUnmount(() => {
 	}
 
 	> .emojis > li {
-
 		.emoji {
 			display: inline-block;
 			margin: 0 4px 0 0;
@@ -465,7 +551,6 @@ onBeforeUnmount(() => {
 	}
 
 	> .mfmTags > li {
-
 		.name {
 		}
 	}
diff --git a/packages/client/src/components/MkAvatars.vue b/packages/client/src/components/MkAvatars.vue
index 52fda8b1d..d92eee22c 100644
--- a/packages/client/src/components/MkAvatars.vue
+++ b/packages/client/src/components/MkAvatars.vue
@@ -1,14 +1,14 @@
 <template>
-<div class="defgtij">
-	<div v-for="user in users" :key="user.id" class="avatar-holder">
-		<MkAvatar :user="user" :show-indicator="true" class="avatar"/>
+	<div class="defgtij">
+		<div v-for="user in users" :key="user.id" class="avatar-holder">
+			<MkAvatar :user="user" :show-indicator="true" class="avatar" />
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
-import * as os from '@/os';
+import { onMounted, ref } from "vue";
+import * as os from "@/os";
 
 const props = defineProps<{
 	userIds: string[];
@@ -17,8 +17,8 @@ const props = defineProps<{
 const users = ref([]);
 
 onMounted(async () => {
-	users.value = await os.api('users/show', {
-		userIds: props.userIds
+	users.value = await os.api("users/show", {
+		userIds: props.userIds,
 	});
 });
 </script>
diff --git a/packages/client/src/components/MkButton.vue b/packages/client/src/components/MkButton.vue
index 9042500b4..5f1a5bdb7 100644
--- a/packages/client/src/components/MkButton.vue
+++ b/packages/client/src/components/MkButton.vue
@@ -1,34 +1,36 @@
 <template>
-<button
-	v-if="!link" class="bghgjjyj _button"
-	:class="{ inline, primary, gradate, danger, rounded, full }"
-	:type="type"
-	@click="emit('click', $event)"
-	@mousedown="onMousedown"
->
-	<div ref="ripples" class="ripples"></div>
-	<div class="content">
-		<slot></slot>
-	</div>
-</button>
-<MkA
-	v-else class="bghgjjyj _button"
-	:class="{ inline, primary, gradate, danger, rounded, full }"
-	:to="to"
-	@mousedown="onMousedown"
->
-	<div ref="ripples" class="ripples"></div>
-	<div class="content">
-		<slot></slot>
-	</div>
-</MkA>
+	<button
+		v-if="!link"
+		class="bghgjjyj _button"
+		:class="{ inline, primary, gradate, danger, rounded, full }"
+		:type="type"
+		@click="emit('click', $event)"
+		@mousedown="onMousedown"
+	>
+		<div ref="ripples" class="ripples"></div>
+		<div class="content">
+			<slot></slot>
+		</div>
+	</button>
+	<MkA
+		v-else
+		class="bghgjjyj _button"
+		:class="{ inline, primary, gradate, danger, rounded, full }"
+		:to="to"
+		@mousedown="onMousedown"
+	>
+		<div ref="ripples" class="ripples"></div>
+		<div class="content">
+			<slot></slot>
+		</div>
+	</MkA>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onMounted } from 'vue';
+import { nextTick, onMounted } from "vue";
 
 const props = defineProps<{
-	type?: 'button' | 'submit' | 'reset';
+	type?: "button" | "submit" | "reset";
 	primary?: boolean;
 	gradate?: boolean;
 	rounded?: boolean;
@@ -42,7 +44,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'click', payload: MouseEvent): void;
+	(ev: "click", payload: MouseEvent): void;
 }>();
 
 let el = $ref<HTMLElement | null>(null);
@@ -73,23 +75,28 @@ function onMousedown(evt: MouseEvent): void {
 	const target = evt.target! as HTMLElement;
 	const rect = target.getBoundingClientRect();
 
-	const ripple = document.createElement('div');
-	ripple.style.top = (evt.clientY - rect.top - 1).toString() + 'px';
-	ripple.style.left = (evt.clientX - rect.left - 1).toString() + 'px';
+	const ripple = document.createElement("div");
+	ripple.style.top = (evt.clientY - rect.top - 1).toString() + "px";
+	ripple.style.left = (evt.clientX - rect.left - 1).toString() + "px";
 
 	ripples!.appendChild(ripple);
 
 	const circleCenterX = evt.clientX - rect.left;
 	const circleCenterY = evt.clientY - rect.top;
 
-	const scale = calcCircleScale(target.clientWidth, target.clientHeight, circleCenterX, circleCenterY);
+	const scale = calcCircleScale(
+		target.clientWidth,
+		target.clientHeight,
+		circleCenterX,
+		circleCenterY
+	);
 
 	window.setTimeout(() => {
-		ripple.style.transform = 'scale(' + (scale / 2) + ')';
+		ripple.style.transform = "scale(" + scale / 2 + ")";
 	}, 1);
 	window.setTimeout(() => {
-		ripple.style.transition = 'all 1s ease';
-		ripple.style.opacity = '0';
+		ripple.style.transition = "all 1s ease";
+		ripple.style.opacity = "0";
 	}, 1000);
 	window.setTimeout(() => {
 		if (ripples) ripples.removeChild(ripple);
@@ -151,7 +158,11 @@ function onMousedown(evt: MouseEvent): void {
 	&.gradate {
 		font-weight: bold;
 		color: var(--fgOnAccent) !important;
-		background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
+		background: linear-gradient(
+			90deg,
+			var(--buttonGradateA),
+			var(--buttonGradateB)
+		);
 
 		&:not(:disabled):hover {
 			background: linear-gradient(90deg, var(--X8), var(--X8));
@@ -212,7 +223,7 @@ function onMousedown(evt: MouseEvent): void {
 			background: rgba(0, 0, 0, 0.1);
 			opacity: 1;
 			transform: scale(1);
-			transition: all 0.5s cubic-bezier(0,.5,0,1);
+			transition: all 0.5s cubic-bezier(0, 0.5, 0, 1);
 		}
 	}
 
diff --git a/packages/client/src/components/MkCaptcha.vue b/packages/client/src/components/MkCaptcha.vue
index 736073491..554d4ac3a 100644
--- a/packages/client/src/components/MkCaptcha.vue
+++ b/packages/client/src/components/MkCaptcha.vue
@@ -1,33 +1,46 @@
 <template>
-<div>
-	<span v-if="!available">{{ i18n.ts.waiting }}<MkEllipsis/></span>
-	<div ref="captchaEl"></div>
-</div>
+	<div>
+		<span v-if="!available">{{ i18n.ts.waiting }}<MkEllipsis /></span>
+		<div ref="captchaEl"></div>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, onBeforeUnmount, watch } from 'vue';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
+import { ref, computed, onMounted, onBeforeUnmount, watch } from "vue";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
 
 type Captcha = {
-	render(container: string | Node, options: {
-		readonly [_ in 'sitekey' | 'theme' | 'type' | 'size' | 'tabindex' | 'callback' | 'expired' | 'expired-callback' | 'error-callback' | 'endpoint']?: unknown;
-	}): string;
+	render(
+		container: string | Node,
+		options: {
+			readonly [_ in
+				| "sitekey"
+				| "theme"
+				| "type"
+				| "size"
+				| "tabindex"
+				| "callback"
+				| "expired"
+				| "expired-callback"
+				| "error-callback"
+				| "endpoint"]?: unknown;
+		}
+	): string;
 	remove(id: string): void;
 	execute(id: string): void;
 	reset(id?: string): void;
 	getResponse(id: string): string;
 };
 
-type CaptchaProvider = 'hcaptcha' | 'recaptcha';
+type CaptchaProvider = "hcaptcha" | "recaptcha";
 
 type CaptchaContainer = {
 	readonly [_ in CaptchaProvider]?: Captcha;
 };
 
 declare global {
-	interface Window extends CaptchaContainer { }
+	interface Window extends CaptchaContainer {}
 }
 
 const props = defineProps<{
@@ -37,7 +50,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'update:modelValue', v: string | null): void;
+	(ev: "update:modelValue", v: string | null): void;
 }>();
 
 const available = ref(false);
@@ -46,8 +59,10 @@ const captchaEl = ref<HTMLDivElement | undefined>();
 
 const variable = computed(() => {
 	switch (props.provider) {
-		case 'hcaptcha': return 'hcaptcha';
-		case 'recaptcha': return 'grecaptcha';
+		case "hcaptcha":
+			return "hcaptcha";
+		case "recaptcha":
+			return "grecaptcha";
 	}
 });
 
@@ -55,22 +70,30 @@ const loaded = !!window[variable.value];
 
 const src = computed(() => {
 	switch (props.provider) {
-		case 'hcaptcha': return 'https://js.hcaptcha.com/1/api.js?render=explicit&recaptchacompat=off';
-		case 'recaptcha': return 'https://www.recaptcha.net/recaptcha/api.js?render=explicit';
+		case "hcaptcha":
+			return "https://js.hcaptcha.com/1/api.js?render=explicit&recaptchacompat=off";
+		case "recaptcha":
+			return "https://www.recaptcha.net/recaptcha/api.js?render=explicit";
 	}
 });
 
-const captcha = computed<Captcha>(() => window[variable.value] || {} as unknown as Captcha);
+const captcha = computed<Captcha>(
+	() => window[variable.value] || ({} as unknown as Captcha)
+);
 
 if (loaded) {
 	available.value = true;
 } else {
-	(document.getElementById(props.provider) || document.head.appendChild(Object.assign(document.createElement('script'), {
-		async: true,
-		id: props.provider,
-		src: src.value,
-	})))
-		.addEventListener('load', () => available.value = true);
+	(
+		document.getElementById(props.provider) ||
+		document.head.appendChild(
+			Object.assign(document.createElement("script"), {
+				async: true,
+				id: props.provider,
+				src: src.value,
+			})
+		)
+	).addEventListener("load", () => (available.value = true));
 }
 
 function reset() {
@@ -81,10 +104,10 @@ function requestRender() {
 	if (captcha.value.render && captchaEl.value instanceof Element) {
 		captcha.value.render(captchaEl.value, {
 			sitekey: props.sitekey,
-			theme: defaultStore.state.darkMode ? 'dark' : 'light',
+			theme: defaultStore.state.darkMode ? "dark" : "light",
 			callback: callback,
-			'expired-callback': callback,
-			'error-callback': callback,
+			"expired-callback": callback,
+			"error-callback": callback,
 		});
 	} else {
 		window.setTimeout(requestRender, 1);
@@ -92,7 +115,7 @@ function requestRender() {
 }
 
 function callback(response?: string) {
-	emit('update:modelValue', typeof response === 'string' ? response : null);
+	emit("update:modelValue", typeof response === "string" ? response : null);
 }
 
 onMounted(() => {
@@ -110,5 +133,4 @@ onBeforeUnmount(() => {
 defineExpose({
 	reset,
 });
-
 </script>
diff --git a/packages/client/src/components/MkChannelFollowButton.vue b/packages/client/src/components/MkChannelFollowButton.vue
index 7c23b91ed..b4cb1a87f 100644
--- a/packages/client/src/components/MkChannelFollowButton.vue
+++ b/packages/client/src/components/MkChannelFollowButton.vue
@@ -1,34 +1,41 @@
 <template>
-<button class="hdcaacmi _button"
-	:class="{ wait, active: isFollowing, full }"
-	:disabled="wait"
-	@click="onClick"
->
-	<template v-if="!wait">
-		<template v-if="isFollowing">
-			<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="ph-minus ph-bold ph-lg"></i>
+	<button
+		class="hdcaacmi _button"
+		:class="{ wait, active: isFollowing, full }"
+		:disabled="wait"
+		@click="onClick"
+	>
+		<template v-if="!wait">
+			<template v-if="isFollowing">
+				<span v-if="full">{{ i18n.ts.unfollow }}</span
+				><i class="ph-minus ph-bold ph-lg"></i>
+			</template>
+			<template v-else>
+				<span v-if="full">{{ i18n.ts.follow }}</span
+				><i class="ph-plus ph-bold ph-lg"></i>
+			</template>
 		</template>
 		<template v-else>
-			<span v-if="full">{{ i18n.ts.follow }}</span><i class="ph-plus ph-bold ph-lg"></i>
+			<span v-if="full">{{ i18n.ts.processing }}</span
+			><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
 		</template>
-	</template>
-	<template v-else>
-		<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
-	</template>
-</button>
+	</button>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { ref } from "vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	channel: Record<string, any>;
-	full?: boolean;
-}>(), {
-	full: false,
-});
+const props = withDefaults(
+	defineProps<{
+		channel: Record<string, any>;
+		full?: boolean;
+	}>(),
+	{
+		full: false,
+	}
+);
 
 const isFollowing = ref<boolean>(props.channel.isFollowing);
 const wait = ref(false);
@@ -38,13 +45,13 @@ async function onClick() {
 
 	try {
 		if (isFollowing.value) {
-			await os.api('channels/unfollow', {
-				channelId: props.channel.id
+			await os.api("channels/unfollow", {
+				channelId: props.channel.id,
 			});
 			isFollowing.value = false;
 		} else {
-			await os.api('channels/follow', {
-				channelId: props.channel.id
+			await os.api("channels/follow", {
+				channelId: props.channel.id,
 			});
 			isFollowing.value = true;
 		}
diff --git a/packages/client/src/components/MkChannelPreview.vue b/packages/client/src/components/MkChannelPreview.vue
index 6af2a7b64..12df63bf0 100644
--- a/packages/client/src/components/MkChannelPreview.vue
+++ b/packages/client/src/components/MkChannelPreview.vue
@@ -1,41 +1,57 @@
 <template>
-<MkA :to="`/channels/${channel.id}`" class="eftoefju _panel" tabindex="-1">
-	<div class="banner" :style="bannerStyle">
-		<div class="fade"></div>
-		<div class="name"><i class="ph-television ph-bold ph-lg"></i> {{ channel.name }}</div>
-		<div class="status">
-			<div>
-				<i class="ph-users ph-bold ph-lg ph-fw ph-lg"></i>
-				<I18n :src="i18n.ts._channel.usersCount" tag="span" style="margin-left: 4px;">
-					<template #n>
-						<b>{{ channel.usersCount }}</b>
-					</template>
-				</I18n>
+	<MkA :to="`/channels/${channel.id}`" class="eftoefju _panel" tabindex="-1">
+		<div class="banner" :style="bannerStyle">
+			<div class="fade"></div>
+			<div class="name">
+				<i class="ph-television ph-bold ph-lg"></i> {{ channel.name }}
 			</div>
-			<div>
-				<i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i>
-				<I18n :src="i18n.ts._channel.notesCount" tag="span" style="margin-left: 4px;">
-					<template #n>
-						<b>{{ channel.notesCount }}</b>
-					</template>
-				</I18n>
+			<div class="status">
+				<div>
+					<i class="ph-users ph-bold ph-lg ph-fw ph-lg"></i>
+					<I18n
+						:src="i18n.ts._channel.usersCount"
+						tag="span"
+						style="margin-left: 4px"
+					>
+						<template #n>
+							<b>{{ channel.usersCount }}</b>
+						</template>
+					</I18n>
+				</div>
+				<div>
+					<i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i>
+					<I18n
+						:src="i18n.ts._channel.notesCount"
+						tag="span"
+						style="margin-left: 4px"
+					>
+						<template #n>
+							<b>{{ channel.notesCount }}</b>
+						</template>
+					</I18n>
+				</div>
 			</div>
 		</div>
-	</div>
-	<article v-if="channel.description">
-		<p :title="channel.description">{{ channel.description.length > 85 ? channel.description.slice(0, 85) + '…' : channel.description }}</p>
-	</article>
-	<footer>
-		<span v-if="channel.lastNotedAt">
-			{{ i18n.ts.updatedAt }}: <MkTime :time="channel.lastNotedAt"/>
-		</span>
-	</footer>
-</MkA>
+		<article v-if="channel.description">
+			<p :title="channel.description">
+				{{
+					channel.description.length > 85
+						? channel.description.slice(0, 85) + "…"
+						: channel.description
+				}}
+			</p>
+		</article>
+		<footer>
+			<span v-if="channel.lastNotedAt">
+				{{ i18n.ts.updatedAt }}: <MkTime :time="channel.lastNotedAt" />
+			</span>
+		</footer>
+	</MkA>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import { i18n } from '@/i18n';
+import { computed } from "vue";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	channel: Record<string, any>;
@@ -45,7 +61,7 @@ const bannerStyle = computed(() => {
 	if (props.channel.bannerUrl) {
 		return { backgroundImage: `url(${props.channel.bannerUrl})` };
 	} else {
-		return { backgroundColor: '#4c5e6d' };
+		return { backgroundColor: "#4c5e6d" };
 	}
 });
 </script>
@@ -155,5 +171,4 @@ const bannerStyle = computed(() => {
 		}
 	}
 }
-
 </style>
diff --git a/packages/client/src/components/MkChart.vue b/packages/client/src/components/MkChart.vue
index 2ff45a229..310d980b4 100644
--- a/packages/client/src/components/MkChart.vue
+++ b/packages/client/src/components/MkChart.vue
@@ -1,14 +1,14 @@
 <template>
-<div class="cbbedffa">
-	<canvas ref="chartEl"></canvas>
-	<div v-if="fetching" class="fetching">
-		<MkLoading/>
+	<div class="cbbedffa">
+		<canvas ref="chartEl"></canvas>
+		<div v-if="fetching" class="fetching">
+			<MkLoading />
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, watch, PropType, onUnmounted } from 'vue';
+import { onMounted, ref, watch, PropType, onUnmounted } from "vue";
 import {
 	Chart,
 	ArcElement,
@@ -25,16 +25,16 @@ import {
 	Tooltip,
 	SubTitle,
 	Filler,
-} from 'chart.js';
-import 'chartjs-adapter-date-fns';
-import { enUS } from 'date-fns/locale';
-import zoomPlugin from 'chartjs-plugin-zoom';
+} from "chart.js";
+import "chartjs-adapter-date-fns";
+import { enUS } from "date-fns/locale";
+import zoomPlugin from "chartjs-plugin-zoom";
 // https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114242002
 // We can't use gradient because Vite throws a error.
 //import gradient from 'chartjs-plugin-gradient';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip';
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { useChartTooltip } from "@/scripts/use-chart-tooltip";
 
 const props = defineProps({
 	src: {
@@ -51,7 +51,7 @@ const props = defineProps({
 		default: 90,
 	},
 	span: {
-		type: String as PropType<'hour' | 'day'>,
+		type: String as PropType<"hour" | "day">,
 		required: true,
 	},
 	detailed: {
@@ -91,12 +91,12 @@ Chart.register(
 	Tooltip,
 	SubTitle,
 	Filler,
-	zoomPlugin,
+	zoomPlugin
 	//gradient,
 );
 
 const sum = (...arr) => arr.reduce((r, a) => r.map((b, i) => a[i] + b));
-const negate = arr => arr.map(x => -x);
+const negate = (arr) => arr.map((x) => -x);
 const alpha = (hex, a) => {
 	const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)!;
 	const r = parseInt(result[1], 16);
@@ -106,16 +106,22 @@ const alpha = (hex, a) => {
 };
 
 const colors = {
-	blue: '#31748f',
-	green: '#9ccfd8',
-	yellow: '#f6c177',
-	red: '#eb6f92',
-	purple: '#c4a7e7',
-	orange: '#ebbcba',
-	lime: '#56949f',
-	cyan: '#9ccfd8',
+	blue: "#31748f",
+	green: "#9ccfd8",
+	yellow: "#f6c177",
+	red: "#eb6f92",
+	purple: "#c4a7e7",
+	orange: "#ebbcba",
+	lime: "#56949f",
+	cyan: "#9ccfd8",
 };
-const colorSets = [colors.blue, colors.green, colors.yellow, colors.red, colors.purple];
+const colorSets = [
+	colors.blue,
+	colors.green,
+	colors.yellow,
+	colors.red,
+	colors.purple,
+];
 const getColor = (i) => {
 	return colorSets[i % colorSets.length];
 };
@@ -125,7 +131,7 @@ let chartInstance: Chart = null;
 let chartData: {
 	series: {
 		name: string;
-		type: 'line' | 'area';
+		type: "line" | "area";
 		color?: string;
 		dashed?: boolean;
 		hidden?: boolean;
@@ -145,7 +151,9 @@ const getDate = (ago: number) => {
 	const d = now.getDate();
 	const h = now.getHours();
 
-	return props.span === 'day' ? new Date(y, m, d - ago) : new Date(y, m, d, h - ago);
+	return props.span === "day"
+		? new Date(y, m, d - ago)
+		: new Date(y, m, d, h - ago);
 };
 
 const format = (arr) => {
@@ -162,18 +170,30 @@ const render = () => {
 		chartInstance.destroy();
 	}
 
-	const gridColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
-	const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
+	const gridColor = defaultStore.state.darkMode
+		? "rgba(255, 255, 255, 0.1)"
+		: "rgba(0, 0, 0, 0.1)";
+	const vLineColor = defaultStore.state.darkMode
+		? "rgba(255, 255, 255, 0.2)"
+		: "rgba(0, 0, 0, 0.2)";
 
 	// フォントカラー
-	Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
+	Chart.defaults.color = getComputedStyle(
+		document.documentElement
+	).getPropertyValue("--fg");
 
-	const maxes = chartData.series.map((x, i) => Math.max(...x.data.map(d => d.y)));
+	const maxes = chartData.series.map((x, i) =>
+		Math.max(...x.data.map((d) => d.y))
+	);
 
 	chartInstance = new Chart(chartEl.value, {
-		type: props.bar ? 'bar' : 'line',
+		type: props.bar ? "bar" : "line",
 		data: {
-			labels: new Array(props.limit).fill(0).map((_, i) => getDate(i).toLocaleString()).slice().reverse(),
+			labels: new Array(props.limit)
+				.fill(0)
+				.map((_, i) => getDate(i).toLocaleString())
+				.slice()
+				.reverse(),
 			datasets: chartData.series.map((x, i) => ({
 				parsing: false,
 				label: x.name,
@@ -183,9 +203,13 @@ const render = () => {
 				borderWidth: props.bar ? 0 : 2,
 				borderColor: x.color ? x.color : getColor(i),
 				borderDash: x.dashed ? [5, 5] : [],
-				borderJoinStyle: 'round',
+				borderJoinStyle: "round",
 				borderRadius: props.bar ? 3 : undefined,
-				backgroundColor: props.bar ? (x.color ? x.color : getColor(i)) : alpha(x.color ? x.color : getColor(i), 0.1),
+				backgroundColor: props.bar
+					? x.color
+						? x.color
+						: getColor(i)
+					: alpha(x.color ? x.color : getColor(i), 0.1),
 				/*gradient: props.bar ? undefined : {
 					backgroundColor: {
 						axis: 'y',
@@ -197,7 +221,7 @@ const render = () => {
 				},*/
 				barPercentage: 0.9,
 				categoryPercentage: 0.9,
-				fill: x.type === 'area',
+				fill: x.type === "area",
 				clip: 8,
 				hidden: !!x.hidden,
 			})),
@@ -214,16 +238,16 @@ const render = () => {
 			},
 			scales: {
 				x: {
-					type: 'time',
+					type: "time",
 					stacked: props.stacked,
 					offset: false,
 					time: {
 						stepSize: 1,
-						unit: props.span === 'day' ? 'month' : 'day',
+						unit: props.span === "day" ? "month" : "day",
 					},
 					grid: {
 						color: gridColor,
-						borderColor: 'rgb(0, 0, 0, 0)',
+						borderColor: "rgb(0, 0, 0, 0)",
 					},
 					ticks: {
 						display: props.detailed,
@@ -238,12 +262,12 @@ const render = () => {
 					min: getDate(props.limit).getTime(),
 				},
 				y: {
-					position: 'left',
+					position: "left",
 					stacked: props.stacked,
 					suggestedMax: 50,
 					grid: {
 						color: gridColor,
-						borderColor: 'rgb(0, 0, 0, 0)',
+						borderColor: "rgb(0, 0, 0, 0)",
 					},
 					ticks: {
 						display: props.detailed,
@@ -253,7 +277,7 @@ const render = () => {
 			},
 			interaction: {
 				intersect: false,
-				mode: 'index',
+				mode: "index",
 			},
 			elements: {
 				point: {
@@ -265,70 +289,74 @@ const render = () => {
 			plugins: {
 				legend: {
 					display: props.detailed,
-					position: 'bottom',
+					position: "bottom",
 					labels: {
 						boxWidth: 16,
 					},
 				},
 				tooltip: {
 					enabled: false,
-					mode: 'index',
+					mode: "index",
 					animation: {
 						duration: 0,
 					},
 					external: externalTooltipHandler,
 				},
-				zoom: props.detailed ? {
-					pan: {
-						enabled: true,
-					},
-					zoom: {
-						wheel: {
-							enabled: true,
-						},
-						pinch: {
-							enabled: true,
-						},
-						drag: {
-							enabled: false,
-						},
-						mode: 'x',
-					},
-					limits: {
-						x: {
-							min: 'original',
-							max: 'original',
-						},
-						y: {
-							min: 'original',
-							max: 'original',
-						},
-					},
-				} : undefined,
+				zoom: props.detailed
+					? {
+							pan: {
+								enabled: true,
+							},
+							zoom: {
+								wheel: {
+									enabled: true,
+								},
+								pinch: {
+									enabled: true,
+								},
+								drag: {
+									enabled: false,
+								},
+								mode: "x",
+							},
+							limits: {
+								x: {
+									min: "original",
+									max: "original",
+								},
+								y: {
+									min: "original",
+									max: "original",
+								},
+							},
+					  }
+					: undefined,
 				//gradient,
 			},
 		},
-		plugins: [{
-			id: 'vLine',
-			beforeDraw(chart, args, options) {
-				if (chart.tooltip?._active?.length) {
-					const activePoint = chart.tooltip._active[0];
-					const ctx = chart.ctx;
-					const x = activePoint.element.x;
-					const topY = chart.scales.y.top;
-					const bottomY = chart.scales.y.bottom;
+		plugins: [
+			{
+				id: "vLine",
+				beforeDraw(chart, args, options) {
+					if (chart.tooltip?._active?.length) {
+						const activePoint = chart.tooltip._active[0];
+						const ctx = chart.ctx;
+						const x = activePoint.element.x;
+						const topY = chart.scales.y.top;
+						const bottomY = chart.scales.y.bottom;
 
-					ctx.save();
-					ctx.beginPath();
-					ctx.moveTo(x, bottomY);
-					ctx.lineTo(x, topY);
-					ctx.lineWidth = 1;
-					ctx.strokeStyle = vLineColor;
-					ctx.stroke();
-					ctx.restore();
-				}
+						ctx.save();
+						ctx.beginPath();
+						ctx.moveTo(x, bottomY);
+						ctx.lineTo(x, topY);
+						ctx.lineWidth = 1;
+						ctx.strokeStyle = vLineColor;
+						ctx.stroke();
+						ctx.restore();
+					}
+				},
 			},
-		}],
+		],
 	});
 };
 
@@ -337,507 +365,717 @@ const exportData = () => {
 };
 
 const fetchFederationChart = async (): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/federation', { limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/federation", {
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'Received',
-			type: 'area',
-			data: format(raw.inboxInstances),
-			color: colors.blue,
-		}, {
-			name: 'Delivered',
-			type: 'area',
-			data: format(raw.deliveredInstances),
-			color: colors.green,
-		}, {
-			name: 'Stalled',
-			type: 'area',
-			data: format(raw.stalled),
-			color: colors.red,
-		}, {
-			name: 'Pub Active',
-			type: 'line',
-			data: format(raw.pubActive),
-			color: colors.purple,
-		}, {
-			name: 'Sub Active',
-			type: 'line',
-			data: format(raw.subActive),
-			color: colors.orange,
-		}, {
-			name: 'Pub & Sub',
-			type: 'line',
-			data: format(raw.pubsub),
-			dashed: true,
-			color: colors.cyan,
-		}, {
-			name: 'Pub',
-			type: 'line',
-			data: format(raw.pub),
-			dashed: true,
-			color: colors.purple,
-		}, {
-			name: 'Sub',
-			type: 'line',
-			data: format(raw.sub),
-			dashed: true,
-			color: colors.orange,
-		}],
+		series: [
+			{
+				name: "Received",
+				type: "area",
+				data: format(raw.inboxInstances),
+				color: colors.blue,
+			},
+			{
+				name: "Delivered",
+				type: "area",
+				data: format(raw.deliveredInstances),
+				color: colors.green,
+			},
+			{
+				name: "Stalled",
+				type: "area",
+				data: format(raw.stalled),
+				color: colors.red,
+			},
+			{
+				name: "Pub Active",
+				type: "line",
+				data: format(raw.pubActive),
+				color: colors.purple,
+			},
+			{
+				name: "Sub Active",
+				type: "line",
+				data: format(raw.subActive),
+				color: colors.orange,
+			},
+			{
+				name: "Pub & Sub",
+				type: "line",
+				data: format(raw.pubsub),
+				dashed: true,
+				color: colors.cyan,
+			},
+			{
+				name: "Pub",
+				type: "line",
+				data: format(raw.pub),
+				dashed: true,
+				color: colors.purple,
+			},
+			{
+				name: "Sub",
+				type: "line",
+				data: format(raw.sub),
+				dashed: true,
+				color: colors.orange,
+			},
+		],
 	};
 };
 
 const fetchApRequestChart = async (): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/ap-request', { limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/ap-request", {
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'In',
-			type: 'area',
-			color: '#31748f',
-			data: format(raw.inboxReceived),
-		}, {
-			name: 'Out (succ)',
-			type: 'area',
-			color: '#c4a7e7',
-			data: format(raw.deliverSucceeded),
-		}, {
-			name: 'Out (fail)',
-			type: 'area',
-			color: '#f6c177',
-			data: format(raw.deliverFailed),
-		}],
+		series: [
+			{
+				name: "In",
+				type: "area",
+				color: "#31748f",
+				data: format(raw.inboxReceived),
+			},
+			{
+				name: "Out (succ)",
+				type: "area",
+				color: "#c4a7e7",
+				data: format(raw.deliverSucceeded),
+			},
+			{
+				name: "Out (fail)",
+				type: "area",
+				color: "#f6c177",
+				data: format(raw.deliverFailed),
+			},
+		],
 	};
 };
 
 const fetchNotesChart = async (type: string): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/notes', { limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/notes", {
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'All',
-			type: 'line',
-			data: format(type === 'combined'
-				? sum(raw.local.inc, negate(raw.local.dec), raw.remote.inc, negate(raw.remote.dec))
-				: sum(raw[type].inc, negate(raw[type].dec)),
-			),
-			color: '#888888',
-		}, {
-			name: 'Renotes',
-			type: 'area',
-			data: format(type === 'combined'
-				? sum(raw.local.diffs.renote, raw.remote.diffs.renote)
-				: raw[type].diffs.renote,
-			),
-			color: colors.green,
-		}, {
-			name: 'Replies',
-			type: 'area',
-			data: format(type === 'combined'
-				? sum(raw.local.diffs.reply, raw.remote.diffs.reply)
-				: raw[type].diffs.reply,
-			),
-			color: colors.yellow,
-		}, {
-			name: 'Normal',
-			type: 'area',
-			data: format(type === 'combined'
-				? sum(raw.local.diffs.normal, raw.remote.diffs.normal)
-				: raw[type].diffs.normal,
-			),
-			color: colors.blue,
-		}, {
-			name: 'With file',
-			type: 'area',
-			data: format(type === 'combined'
-				? sum(raw.local.diffs.withFile, raw.remote.diffs.withFile)
-				: raw[type].diffs.withFile,
-			),
-			color: colors.purple,
-		}],
+		series: [
+			{
+				name: "All",
+				type: "line",
+				data: format(
+					type === "combined"
+						? sum(
+								raw.local.inc,
+								negate(raw.local.dec),
+								raw.remote.inc,
+								negate(raw.remote.dec)
+						  )
+						: sum(raw[type].inc, negate(raw[type].dec))
+				),
+				color: "#888888",
+			},
+			{
+				name: "Renotes",
+				type: "area",
+				data: format(
+					type === "combined"
+						? sum(raw.local.diffs.renote, raw.remote.diffs.renote)
+						: raw[type].diffs.renote
+				),
+				color: colors.green,
+			},
+			{
+				name: "Replies",
+				type: "area",
+				data: format(
+					type === "combined"
+						? sum(raw.local.diffs.reply, raw.remote.diffs.reply)
+						: raw[type].diffs.reply
+				),
+				color: colors.yellow,
+			},
+			{
+				name: "Normal",
+				type: "area",
+				data: format(
+					type === "combined"
+						? sum(raw.local.diffs.normal, raw.remote.diffs.normal)
+						: raw[type].diffs.normal
+				),
+				color: colors.blue,
+			},
+			{
+				name: "With file",
+				type: "area",
+				data: format(
+					type === "combined"
+						? sum(
+								raw.local.diffs.withFile,
+								raw.remote.diffs.withFile
+						  )
+						: raw[type].diffs.withFile
+				),
+				color: colors.purple,
+			},
+		],
 	};
 };
 
 const fetchNotesTotalChart = async (): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/notes', { limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/notes", {
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'Combined',
-			type: 'line',
-			data: format(sum(raw.local.total, raw.remote.total)),
-		}, {
-			name: 'Local',
-			type: 'area',
-			data: format(raw.local.total),
-		}, {
-			name: 'Remote',
-			type: 'area',
-			data: format(raw.remote.total),
-		}],
+		series: [
+			{
+				name: "Combined",
+				type: "line",
+				data: format(sum(raw.local.total, raw.remote.total)),
+			},
+			{
+				name: "Local",
+				type: "area",
+				data: format(raw.local.total),
+			},
+			{
+				name: "Remote",
+				type: "area",
+				data: format(raw.remote.total),
+			},
+		],
 	};
 };
 
 const fetchUsersChart = async (total: boolean): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/users', { limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/users", {
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'Combined',
-			type: 'line',
-			data: format(total
-				? sum(raw.local.total, raw.remote.total)
-				: sum(raw.local.inc, negate(raw.local.dec), raw.remote.inc, negate(raw.remote.dec)),
-			),
-		}, {
-			name: 'Local',
-			type: 'area',
-			data: format(total
-				? raw.local.total
-				: sum(raw.local.inc, negate(raw.local.dec)),
-			),
-		}, {
-			name: 'Remote',
-			type: 'area',
-			data: format(total
-				? raw.remote.total
-				: sum(raw.remote.inc, negate(raw.remote.dec)),
-			),
-		}],
+		series: [
+			{
+				name: "Combined",
+				type: "line",
+				data: format(
+					total
+						? sum(raw.local.total, raw.remote.total)
+						: sum(
+								raw.local.inc,
+								negate(raw.local.dec),
+								raw.remote.inc,
+								negate(raw.remote.dec)
+						  )
+				),
+			},
+			{
+				name: "Local",
+				type: "area",
+				data: format(
+					total
+						? raw.local.total
+						: sum(raw.local.inc, negate(raw.local.dec))
+				),
+			},
+			{
+				name: "Remote",
+				type: "area",
+				data: format(
+					total
+						? raw.remote.total
+						: sum(raw.remote.inc, negate(raw.remote.dec))
+				),
+			},
+		],
 	};
 };
 
 const fetchActiveUsersChart = async (): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/active-users', { limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/active-users", {
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'Read & Write',
-			type: 'area',
-			data: format(raw.readWrite),
-			color: colors.orange,
-		}, {
-			name: 'Write',
-			type: 'area',
-			data: format(raw.write),
-			color: colors.lime,
-		}, {
-			name: 'Read',
-			type: 'area',
-			data: format(raw.read),
-			color: colors.blue,
-		}, {
-			name: '< Week',
-			type: 'area',
-			data: format(raw.registeredWithinWeek),
-			color: colors.green,
-		}, {
-			name: '< Month',
-			type: 'area',
-			data: format(raw.registeredWithinMonth),
-			color: colors.yellow,
-		}, {
-			name: '< Year',
-			type: 'area',
-			data: format(raw.registeredWithinYear),
-			color: colors.red,
-		}, {
-			name: '> Week',
-			type: 'area',
-			data: format(raw.registeredOutsideWeek),
-			color: colors.yellow,
-		}, {
-			name: '> Month',
-			type: 'area',
-			data: format(raw.registeredOutsideMonth),
-			color: colors.red,
-		}, {
-			name: '> Year',
-			type: 'area',
-			data: format(raw.registeredOutsideYear),
-			color: colors.purple,
-		}],
+		series: [
+			{
+				name: "Read & Write",
+				type: "area",
+				data: format(raw.readWrite),
+				color: colors.orange,
+			},
+			{
+				name: "Write",
+				type: "area",
+				data: format(raw.write),
+				color: colors.lime,
+			},
+			{
+				name: "Read",
+				type: "area",
+				data: format(raw.read),
+				color: colors.blue,
+			},
+			{
+				name: "< Week",
+				type: "area",
+				data: format(raw.registeredWithinWeek),
+				color: colors.green,
+			},
+			{
+				name: "< Month",
+				type: "area",
+				data: format(raw.registeredWithinMonth),
+				color: colors.yellow,
+			},
+			{
+				name: "< Year",
+				type: "area",
+				data: format(raw.registeredWithinYear),
+				color: colors.red,
+			},
+			{
+				name: "> Week",
+				type: "area",
+				data: format(raw.registeredOutsideWeek),
+				color: colors.yellow,
+			},
+			{
+				name: "> Month",
+				type: "area",
+				data: format(raw.registeredOutsideMonth),
+				color: colors.red,
+			},
+			{
+				name: "> Year",
+				type: "area",
+				data: format(raw.registeredOutsideYear),
+				color: colors.purple,
+			},
+		],
 	};
 };
 
 const fetchDriveChart = async (): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/drive', { limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/drive", {
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
 		bytes: true,
-		series: [{
-			name: 'All',
-			type: 'line',
-			dashed: true,
-			data: format(
-				sum(
-					raw.local.incSize,
-					negate(raw.local.decSize),
-					raw.remote.incSize,
-					negate(raw.remote.decSize),
+		series: [
+			{
+				name: "All",
+				type: "line",
+				dashed: true,
+				data: format(
+					sum(
+						raw.local.incSize,
+						negate(raw.local.decSize),
+						raw.remote.incSize,
+						negate(raw.remote.decSize)
+					)
 				),
-			),
-		}, {
-			name: 'Local +',
-			type: 'area',
-			data: format(raw.local.incSize),
-		}, {
-			name: 'Local -',
-			type: 'area',
-			data: format(negate(raw.local.decSize)),
-		}, {
-			name: 'Remote +',
-			type: 'area',
-			data: format(raw.remote.incSize),
-		}, {
-			name: 'Remote -',
-			type: 'area',
-			data: format(negate(raw.remote.decSize)),
-		}],
+			},
+			{
+				name: "Local +",
+				type: "area",
+				data: format(raw.local.incSize),
+			},
+			{
+				name: "Local -",
+				type: "area",
+				data: format(negate(raw.local.decSize)),
+			},
+			{
+				name: "Remote +",
+				type: "area",
+				data: format(raw.remote.incSize),
+			},
+			{
+				name: "Remote -",
+				type: "area",
+				data: format(negate(raw.remote.decSize)),
+			},
+		],
 	};
 };
 
 const fetchDriveFilesChart = async (): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/drive', { limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/drive", {
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'All',
-			type: 'line',
-			dashed: true,
-			data: format(
-				sum(
-					raw.local.incCount,
-					negate(raw.local.decCount),
-					raw.remote.incCount,
-					negate(raw.remote.decCount),
+		series: [
+			{
+				name: "All",
+				type: "line",
+				dashed: true,
+				data: format(
+					sum(
+						raw.local.incCount,
+						negate(raw.local.decCount),
+						raw.remote.incCount,
+						negate(raw.remote.decCount)
+					)
 				),
-			),
-		}, {
-			name: 'Local +',
-			type: 'area',
-			data: format(raw.local.incCount),
-		}, {
-			name: 'Local -',
-			type: 'area',
-			data: format(negate(raw.local.decCount)),
-		}, {
-			name: 'Remote +',
-			type: 'area',
-			data: format(raw.remote.incCount),
-		}, {
-			name: 'Remote -',
-			type: 'area',
-			data: format(negate(raw.remote.decCount)),
-		}],
+			},
+			{
+				name: "Local +",
+				type: "area",
+				data: format(raw.local.incCount),
+			},
+			{
+				name: "Local -",
+				type: "area",
+				data: format(negate(raw.local.decCount)),
+			},
+			{
+				name: "Remote +",
+				type: "area",
+				data: format(raw.remote.incCount),
+			},
+			{
+				name: "Remote -",
+				type: "area",
+				data: format(negate(raw.remote.decCount)),
+			},
+		],
 	};
 };
 
 const fetchInstanceRequestsChart = async (): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/instance", {
+		host: props.args.host,
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'In',
-			type: 'area',
-			color: '#31748f',
-			data: format(raw.requests.received),
-		}, {
-			name: 'Out (succ)',
-			type: 'area',
-			color: '#c4a7e7',
-			data: format(raw.requests.succeeded),
-		}, {
-			name: 'Out (fail)',
-			type: 'area',
-			color: '#f6c177',
-			data: format(raw.requests.failed),
-		}],
+		series: [
+			{
+				name: "In",
+				type: "area",
+				color: "#31748f",
+				data: format(raw.requests.received),
+			},
+			{
+				name: "Out (succ)",
+				type: "area",
+				color: "#c4a7e7",
+				data: format(raw.requests.succeeded),
+			},
+			{
+				name: "Out (fail)",
+				type: "area",
+				color: "#f6c177",
+				data: format(raw.requests.failed),
+			},
+		],
 	};
 };
 
-const fetchInstanceUsersChart = async (total: boolean): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+const fetchInstanceUsersChart = async (
+	total: boolean
+): Promise<typeof chartData> => {
+	const raw = await os.apiGet("charts/instance", {
+		host: props.args.host,
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'Users',
-			type: 'area',
-			color: '#31748f',
-			data: format(total
-				? raw.users.total
-				: sum(raw.users.inc, negate(raw.users.dec)),
-			),
-		}],
+		series: [
+			{
+				name: "Users",
+				type: "area",
+				color: "#31748f",
+				data: format(
+					total
+						? raw.users.total
+						: sum(raw.users.inc, negate(raw.users.dec))
+				),
+			},
+		],
 	};
 };
 
-const fetchInstanceNotesChart = async (total: boolean): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+const fetchInstanceNotesChart = async (
+	total: boolean
+): Promise<typeof chartData> => {
+	const raw = await os.apiGet("charts/instance", {
+		host: props.args.host,
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'Posts',
-			type: 'area',
-			color: '#31748f',
-			data: format(total
-				? raw.notes.total
-				: sum(raw.notes.inc, negate(raw.notes.dec)),
-			),
-		}],
+		series: [
+			{
+				name: "Posts",
+				type: "area",
+				color: "#31748f",
+				data: format(
+					total
+						? raw.notes.total
+						: sum(raw.notes.inc, negate(raw.notes.dec))
+				),
+			},
+		],
 	};
 };
 
-const fetchInstanceFfChart = async (total: boolean): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+const fetchInstanceFfChart = async (
+	total: boolean
+): Promise<typeof chartData> => {
+	const raw = await os.apiGet("charts/instance", {
+		host: props.args.host,
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'Following',
-			type: 'area',
-			color: '#31748f',
-			data: format(total
-				? raw.following.total
-				: sum(raw.following.inc, negate(raw.following.dec)),
-			),
-		}, {
-			name: 'Followers',
-			type: 'area',
-			color: '#c4a7e7',
-			data: format(total
-				? raw.followers.total
-				: sum(raw.followers.inc, negate(raw.followers.dec)),
-			),
-		}],
+		series: [
+			{
+				name: "Following",
+				type: "area",
+				color: "#31748f",
+				data: format(
+					total
+						? raw.following.total
+						: sum(raw.following.inc, negate(raw.following.dec))
+				),
+			},
+			{
+				name: "Followers",
+				type: "area",
+				color: "#c4a7e7",
+				data: format(
+					total
+						? raw.followers.total
+						: sum(raw.followers.inc, negate(raw.followers.dec))
+				),
+			},
+		],
 	};
 };
 
-const fetchInstanceDriveUsageChart = async (total: boolean): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+const fetchInstanceDriveUsageChart = async (
+	total: boolean
+): Promise<typeof chartData> => {
+	const raw = await os.apiGet("charts/instance", {
+		host: props.args.host,
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
 		bytes: true,
-		series: [{
-			name: 'Drive usage',
-			type: 'area',
-			color: '#31748f',
-			data: format(total
-				? raw.drive.totalUsage
-				: sum(raw.drive.incUsage, negate(raw.drive.decUsage)),
-			),
-		}],
+		series: [
+			{
+				name: "Drive usage",
+				type: "area",
+				color: "#31748f",
+				data: format(
+					total
+						? raw.drive.totalUsage
+						: sum(raw.drive.incUsage, negate(raw.drive.decUsage))
+				),
+			},
+		],
 	};
 };
 
-const fetchInstanceDriveFilesChart = async (total: boolean): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+const fetchInstanceDriveFilesChart = async (
+	total: boolean
+): Promise<typeof chartData> => {
+	const raw = await os.apiGet("charts/instance", {
+		host: props.args.host,
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'Drive files',
-			type: 'area',
-			color: '#31748f',
-			data: format(total
-				? raw.drive.totalFiles
-				: sum(raw.drive.incFiles, negate(raw.drive.decFiles)),
-			),
-		}],
+		series: [
+			{
+				name: "Drive files",
+				type: "area",
+				color: "#31748f",
+				data: format(
+					total
+						? raw.drive.totalFiles
+						: sum(raw.drive.incFiles, negate(raw.drive.decFiles))
+				),
+			},
+		],
 	};
 };
 
 const fetchPerUserNotesChart = async (): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/user/notes', { userId: props.args.user.id, limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/user/notes", {
+		userId: props.args.user.id,
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [...(props.args.withoutAll ? [] : [{
-			name: 'All',
-			type: 'line',
-			data: format(sum(raw.inc, negate(raw.dec))),
-			color: '#888888',
-		}]), {
-			name: 'With file',
-			type: 'area',
-			data: format(raw.diffs.withFile),
-			color: colors.purple,
-		}, {
-			name: 'Renotes',
-			type: 'area',
-			data: format(raw.diffs.renote),
-			color: colors.green,
-		}, {
-			name: 'Replies',
-			type: 'area',
-			data: format(raw.diffs.reply),
-			color: colors.yellow,
-		}, {
-			name: 'Normal',
-			type: 'area',
-			data: format(raw.diffs.normal),
-			color: colors.blue,
-		}],
+		series: [
+			...(props.args.withoutAll
+				? []
+				: [
+						{
+							name: "All",
+							type: "line",
+							data: format(sum(raw.inc, negate(raw.dec))),
+							color: "#888888",
+						},
+				  ]),
+			{
+				name: "With file",
+				type: "area",
+				data: format(raw.diffs.withFile),
+				color: colors.purple,
+			},
+			{
+				name: "Renotes",
+				type: "area",
+				data: format(raw.diffs.renote),
+				color: colors.green,
+			},
+			{
+				name: "Replies",
+				type: "area",
+				data: format(raw.diffs.reply),
+				color: colors.yellow,
+			},
+			{
+				name: "Normal",
+				type: "area",
+				data: format(raw.diffs.normal),
+				color: colors.blue,
+			},
+		],
 	};
 };
 
 const fetchPerUserFollowingChart = async (): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/user/following', { userId: props.args.user.id, limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/user/following", {
+		userId: props.args.user.id,
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'Local',
-			type: 'area',
-			data: format(raw.local.followings.total),
-		}, {
-			name: 'Remote',
-			type: 'area',
-			data: format(raw.remote.followings.total),
-		}],
+		series: [
+			{
+				name: "Local",
+				type: "area",
+				data: format(raw.local.followings.total),
+			},
+			{
+				name: "Remote",
+				type: "area",
+				data: format(raw.remote.followings.total),
+			},
+		],
 	};
 };
 
 const fetchPerUserFollowersChart = async (): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/user/following', { userId: props.args.user.id, limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/user/following", {
+		userId: props.args.user.id,
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'Local',
-			type: 'area',
-			data: format(raw.local.followers.total),
-		}, {
-			name: 'Remote',
-			type: 'area',
-			data: format(raw.remote.followers.total),
-		}],
+		series: [
+			{
+				name: "Local",
+				type: "area",
+				data: format(raw.local.followers.total),
+			},
+			{
+				name: "Remote",
+				type: "area",
+				data: format(raw.remote.followers.total),
+			},
+		],
 	};
 };
 
 const fetchPerUserDriveChart = async (): Promise<typeof chartData> => {
-	const raw = await os.apiGet('charts/user/drive', { userId: props.args.user.id, limit: props.limit, span: props.span });
+	const raw = await os.apiGet("charts/user/drive", {
+		userId: props.args.user.id,
+		limit: props.limit,
+		span: props.span,
+	});
 	return {
-		series: [{
-			name: 'Inc',
-			type: 'area',
-			data: format(raw.incSize),
-		}, {
-			name: 'Dec',
-			type: 'area',
-			data: format(raw.decSize),
-		}],
+		series: [
+			{
+				name: "Inc",
+				type: "area",
+				data: format(raw.incSize),
+			},
+			{
+				name: "Dec",
+				type: "area",
+				data: format(raw.decSize),
+			},
+		],
 	};
 };
 
 const fetchAndRender = async () => {
 	const fetchData = () => {
 		switch (props.src) {
-			case 'federation': return fetchFederationChart();
-			case 'ap-request': return fetchApRequestChart();
-			case 'users': return fetchUsersChart(false);
-			case 'users-total': return fetchUsersChart(true);
-			case 'active-users': return fetchActiveUsersChart();
-			case 'notes': return fetchNotesChart('combined');
-			case 'local-notes': return fetchNotesChart('local');
-			case 'remote-notes': return fetchNotesChart('remote');
-			case 'notes-total': return fetchNotesTotalChart();
-			case 'drive': return fetchDriveChart();
-			case 'drive-files': return fetchDriveFilesChart();
-			case 'instance-requests': return fetchInstanceRequestsChart();
-			case 'instance-users': return fetchInstanceUsersChart(false);
-			case 'instance-users-total': return fetchInstanceUsersChart(true);
-			case 'instance-notes': return fetchInstanceNotesChart(false);
-			case 'instance-notes-total': return fetchInstanceNotesChart(true);
-			case 'instance-ff': return fetchInstanceFfChart(false);
-			case 'instance-ff-total': return fetchInstanceFfChart(true);
-			case 'instance-drive-usage': return fetchInstanceDriveUsageChart(false);
-			case 'instance-drive-usage-total': return fetchInstanceDriveUsageChart(true);
-			case 'instance-drive-files': return fetchInstanceDriveFilesChart(false);
-			case 'instance-drive-files-total': return fetchInstanceDriveFilesChart(true);
+			case "federation":
+				return fetchFederationChart();
+			case "ap-request":
+				return fetchApRequestChart();
+			case "users":
+				return fetchUsersChart(false);
+			case "users-total":
+				return fetchUsersChart(true);
+			case "active-users":
+				return fetchActiveUsersChart();
+			case "notes":
+				return fetchNotesChart("combined");
+			case "local-notes":
+				return fetchNotesChart("local");
+			case "remote-notes":
+				return fetchNotesChart("remote");
+			case "notes-total":
+				return fetchNotesTotalChart();
+			case "drive":
+				return fetchDriveChart();
+			case "drive-files":
+				return fetchDriveFilesChart();
+			case "instance-requests":
+				return fetchInstanceRequestsChart();
+			case "instance-users":
+				return fetchInstanceUsersChart(false);
+			case "instance-users-total":
+				return fetchInstanceUsersChart(true);
+			case "instance-notes":
+				return fetchInstanceNotesChart(false);
+			case "instance-notes-total":
+				return fetchInstanceNotesChart(true);
+			case "instance-ff":
+				return fetchInstanceFfChart(false);
+			case "instance-ff-total":
+				return fetchInstanceFfChart(true);
+			case "instance-drive-usage":
+				return fetchInstanceDriveUsageChart(false);
+			case "instance-drive-usage-total":
+				return fetchInstanceDriveUsageChart(true);
+			case "instance-drive-files":
+				return fetchInstanceDriveFilesChart(false);
+			case "instance-drive-files-total":
+				return fetchInstanceDriveFilesChart(true);
 
-			case 'per-user-notes': return fetchPerUserNotesChart();
-			case 'per-user-following': return fetchPerUserFollowingChart();
-			case 'per-user-followers': return fetchPerUserFollowersChart();
-			case 'per-user-drive': return fetchPerUserDriveChart();
+			case "per-user-notes":
+				return fetchPerUserNotesChart();
+			case "per-user-following":
+				return fetchPerUserFollowingChart();
+			case "per-user-followers":
+				return fetchPerUserFollowersChart();
+			case "per-user-drive":
+				return fetchPerUserDriveChart();
 		}
 	};
 	fetching.value = true;
diff --git a/packages/client/src/components/MkChartTooltip.vue b/packages/client/src/components/MkChartTooltip.vue
index a92dd36b6..659dc6d39 100644
--- a/packages/client/src/components/MkChartTooltip.vue
+++ b/packages/client/src/components/MkChartTooltip.vue
@@ -1,20 +1,35 @@
 <template>
-<MkTooltip ref="tooltip" :showing="showing" :x="x" :y="y" :max-width="340" :direction="'top'" :inner-margin="16" @closed="emit('closed')">
-	<div v-if="title || series" class="qpcyisrl">
-		<div v-if="title" class="title">{{ title }}</div>
-		<template v-if="series">
-			<div v-for="x in series" class="series">
-				<span class="color" :style="{ background: x.backgroundColor, borderColor: x.borderColor }"></span>
-				<span>{{ x.text }}</span>
-			</div>
-		</template>
-	</div>
-</MkTooltip>
+	<MkTooltip
+		ref="tooltip"
+		:showing="showing"
+		:x="x"
+		:y="y"
+		:max-width="340"
+		:direction="'top'"
+		:inner-margin="16"
+		@closed="emit('closed')"
+	>
+		<div v-if="title || series" class="qpcyisrl">
+			<div v-if="title" class="title">{{ title }}</div>
+			<template v-if="series">
+				<div v-for="x in series" class="series">
+					<span
+						class="color"
+						:style="{
+							background: x.backgroundColor,
+							borderColor: x.borderColor,
+						}"
+					></span>
+					<span>{{ x.text }}</span>
+				</div>
+			</template>
+		</div>
+	</MkTooltip>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkTooltip from './MkTooltip.vue';
+import {} from "vue";
+import MkTooltip from "./MkTooltip.vue";
 
 const props = defineProps<{
 	showing: boolean;
@@ -29,7 +44,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 </script>
 
diff --git a/packages/client/src/components/MkChatPreview.vue b/packages/client/src/components/MkChatPreview.vue
index 131498e09..6cd79d74c 100644
--- a/packages/client/src/components/MkChatPreview.vue
+++ b/packages/client/src/components/MkChatPreview.vue
@@ -1,56 +1,72 @@
 <template>
-<MkA
-	class="rivslvers"
-	tabindex="-1"
-	:class="{
-		isMe: isMe(message),
-		isRead: message.groupId ? message.reads.includes($i?.id) : message.isRead,
-	}"
-	:to="
-		message.groupId
-			? `/my/messaging/group/${message.groupId}`
-			: `/my/messaging/${getAcct(
-				isMe(message) ? message.recipient : message.user
-			)}`
-	"
->
-	<div class="message _block">
-		<MkAvatar
-			class="avatar"
-			:user="
-				message.groupId
-					? message.user
-					: isMe(message)
+	<MkA
+		class="rivslvers"
+		tabindex="-1"
+		:class="{
+			isMe: isMe(message),
+			isRead: message.groupId
+				? message.reads.includes($i?.id)
+				: message.isRead,
+		}"
+		:to="
+			message.groupId
+				? `/my/messaging/group/${message.groupId}`
+				: `/my/messaging/${getAcct(
+						isMe(message) ? message.recipient : message.user
+				  )}`
+		"
+	>
+		<div class="message _block">
+			<MkAvatar
+				class="avatar"
+				:user="
+					message.groupId
+						? message.user
+						: isMe(message)
 						? message.recipient
 						: message.user
-			"
-			:show-indicator="true"
-		/>
-		<header v-if="message.groupId">
-			<span class="name">{{ message.group.name }}</span>
-			<MkTime :time="message.createdAt" class="time"/>
-		</header>
-		<header v-else>
-			<span class="name"><MkUserName :user="isMe(message) ? message.recipient : message.user"/></span>
-			<span class="username">@{{ acct(isMe(message) ? message.recipient : message.user) }}</span>
-			<MkTime :time="message.createdAt" class="time"/>
-		</header>
-		<div class="body">
-			<p class="text">
-				<span v-if="isMe(message)" class="me">{{ i18n.ts.you }}: </span>
-				<Mfm v-if="message.text != null && message.text.length > 0" :text="message.text"/>
-				<span v-else> 📎</span>
-			</p>
+				"
+				:show-indicator="true"
+			/>
+			<header v-if="message.groupId">
+				<span class="name">{{ message.group.name }}</span>
+				<MkTime :time="message.createdAt" class="time" />
+			</header>
+			<header v-else>
+				<span class="name"
+					><MkUserName
+						:user="
+							isMe(message) ? message.recipient : message.user
+						"
+				/></span>
+				<span class="username"
+					>@{{
+						acct(isMe(message) ? message.recipient : message.user)
+					}}</span
+				>
+				<MkTime :time="message.createdAt" class="time" />
+			</header>
+			<div class="body">
+				<p class="text">
+					<span v-if="isMe(message)" class="me"
+						>{{ i18n.ts.you }}:
+					</span>
+					<Mfm
+						v-if="message.text != null && message.text.length > 0"
+						:text="message.text"
+					/>
+					<span v-else> 📎</span>
+				</p>
+			</div>
 		</div>
-	</div>
-</MkA>
+	</MkA>
 </template>
 
 <script lang="ts" setup>
-import * as Acct from 'calckey-js/built/acct';
-import { i18n } from '@/i18n';
-import { acct } from '@/filters/user';
-import { $i } from '@/account';
+import * as Acct from "calckey-js/built/acct";
+import { i18n } from "@/i18n";
+import { acct } from "@/filters/user";
+import { $i } from "@/account";
 
 const getAcct = Acct.toString;
 
@@ -138,7 +154,6 @@ function isMe(message): boolean {
 		}
 
 		> .body {
-
 			> .text {
 				display: block;
 				margin: 0 0 0 0;
diff --git a/packages/client/src/components/MkCheatSheetDialog.vue b/packages/client/src/components/MkCheatSheetDialog.vue
index b2ee6dd9a..04b8cec6e 100644
--- a/packages/client/src/components/MkCheatSheetDialog.vue
+++ b/packages/client/src/components/MkCheatSheetDialog.vue
@@ -1,28 +1,28 @@
 <template>
-<XModalWindow
-	ref="dialog"
-	:width="600"
-	@close="dialog?.close()"
-	@closed="$emit('closed')"
->
-	<template #header>{{ i18n.ts._mfm.cheatSheet }}</template>
+	<XModalWindow
+		ref="dialog"
+		:width="600"
+		@close="dialog?.close()"
+		@closed="$emit('closed')"
+	>
+		<template #header>{{ i18n.ts._mfm.cheatSheet }}</template>
 
-	<div class="_monolithic_">
-		<div class="_section">
-			<XCheatSheet/>
+		<div class="_monolithic_">
+			<div class="_section">
+				<XCheatSheet />
+			</div>
 		</div>
-	</div>
-</XModalWindow>
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import XModalWindow from '@/components/MkModalWindow.vue';
-import XCheatSheet from '@/pages/mfm-cheat-sheet.vue';
-import { i18n } from '@/i18n';
+import XModalWindow from "@/components/MkModalWindow.vue";
+import XCheatSheet from "@/pages/mfm-cheat-sheet.vue";
+import { i18n } from "@/i18n";
 
 const emit = defineEmits<{
-	(ev: 'done'): void;
-	(ev: 'closed'): void;
+	(ev: "done"): void;
+	(ev: "closed"): void;
 }>();
 
 const dialog = $ref<InstanceType<typeof XModalWindow>>();
@@ -41,6 +41,4 @@ function close(res) {
 .fade-leave-to {
 	opacity: 0;
 }
-
 </style>
-
diff --git a/packages/client/src/components/MkCode.core.vue b/packages/client/src/components/MkCode.core.vue
index 934e0a158..c397a950c 100644
--- a/packages/client/src/components/MkCode.core.vue
+++ b/packages/client/src/components/MkCode.core.vue
@@ -1,12 +1,15 @@
 <template>
-<code v-if="inline" :class="`language-${prismLang}`" v-html="html"></code>
-<pre v-else :class="`language-${prismLang}`"><code :class="`language-${prismLang}`" v-html="html"></code></pre>
+	<code v-if="inline" :class="`language-${prismLang}`" v-html="html"></code>
+	<pre
+		v-else
+		:class="`language-${prismLang}`"
+	><code :class="`language-${prismLang}`" v-html="html"></code></pre>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import Prism from 'prismjs';
-import 'prismjs/themes/prism-okaidia.css';
+import { computed } from "vue";
+import Prism from "prismjs";
+import "prismjs/themes/prism-okaidia.css";
 
 const props = defineProps<{
 	code: string;
@@ -14,6 +17,14 @@ const props = defineProps<{
 	inline?: boolean;
 }>();
 
-const prismLang = computed(() => Prism.languages[props.lang] ? props.lang : 'js');
-const html = computed(() => Prism.highlight(props.code, Prism.languages[prismLang.value], prismLang.value));
+const prismLang = computed(() =>
+	Prism.languages[props.lang] ? props.lang : "js"
+);
+const html = computed(() =>
+	Prism.highlight(
+		props.code,
+		Prism.languages[prismLang.value],
+		prismLang.value
+	)
+);
 </script>
diff --git a/packages/client/src/components/MkCode.vue b/packages/client/src/components/MkCode.vue
index 1640258d5..f012b5312 100644
--- a/packages/client/src/components/MkCode.vue
+++ b/packages/client/src/components/MkCode.vue
@@ -1,9 +1,9 @@
 <template>
-<XCode :code="code" :lang="lang" :inline="inline"/>
+	<XCode :code="code" :lang="lang" :inline="inline" />
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent } from 'vue';
+import { defineAsyncComponent } from "vue";
 
 defineProps<{
 	code: string;
@@ -11,5 +11,7 @@ defineProps<{
 	inline?: boolean;
 }>();
 
-const XCode = defineAsyncComponent(() => import('@/components/MkCode.core.vue'));
+const XCode = defineAsyncComponent(
+	() => import("@/components/MkCode.core.vue")
+);
 </script>
diff --git a/packages/client/src/components/MkContainer.vue b/packages/client/src/components/MkContainer.vue
index e601dd56b..62c198cb1 100644
--- a/packages/client/src/components/MkContainer.vue
+++ b/packages/client/src/components/MkContainer.vue
@@ -1,35 +1,67 @@
 <template>
-<div v-size="{ max: [380] }" class="ukygtjoj _panel" :class="{ naked, thin, hideHeader: !showHeader, scrollable, closed: !showBody }">
-	<header v-if="showHeader" ref="header">
-		<div class="title"><slot name="header"></slot></div>
-		<div class="sub">
-			<slot name="func"></slot>
-			<button v-if="foldable" class="_button" @click="() => showBody = !showBody">
-				<template v-if="showBody"><i class="ph-caret-up ph-bold ph-lg"></i></template>
-				<template v-else><i class="ph-caret-down ph-bold ph-lg"></i></template>
-			</button>
-		</div>
-	</header>
-	<transition
-		:name="$store.state.animation ? 'container-toggle' : ''"
-		@enter="enter"
-		@after-enter="afterEnter"
-		@leave="leave"
-		@after-leave="afterLeave"
+	<div
+		v-size="{ max: [380] }"
+		class="ukygtjoj _panel"
+		:class="{
+			naked,
+			thin,
+			hideHeader: !showHeader,
+			scrollable,
+			closed: !showBody,
+		}"
 	>
-		<div v-show="showBody" ref="content" class="content" :class="{ omitted }">
-			<slot></slot>
-			<button v-if="omitted" class="fade _button" @click="() => { ignoreOmit = true; omitted = false; }">
-				<span>{{ i18n.ts.showMore }}</span>
-			</button>
-		</div>
-	</transition>
-</div>
+		<header v-if="showHeader" ref="header">
+			<div class="title"><slot name="header"></slot></div>
+			<div class="sub">
+				<slot name="func"></slot>
+				<button
+					v-if="foldable"
+					class="_button"
+					@click="() => (showBody = !showBody)"
+				>
+					<template v-if="showBody"
+						><i class="ph-caret-up ph-bold ph-lg"></i
+					></template>
+					<template v-else
+						><i class="ph-caret-down ph-bold ph-lg"></i
+					></template>
+				</button>
+			</div>
+		</header>
+		<transition
+			:name="$store.state.animation ? 'container-toggle' : ''"
+			@enter="enter"
+			@after-enter="afterEnter"
+			@leave="leave"
+			@after-leave="afterLeave"
+		>
+			<div
+				v-show="showBody"
+				ref="content"
+				class="content"
+				:class="{ omitted }"
+			>
+				<slot></slot>
+				<button
+					v-if="omitted"
+					class="fade _button"
+					@click="
+						() => {
+							ignoreOmit = true;
+							omitted = false;
+						}
+					"
+				>
+					<span>{{ i18n.ts.showMore }}</span>
+				</button>
+			</div>
+		</transition>
+	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import { i18n } from '@/i18n';
+import { defineComponent } from "vue";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	props: {
@@ -78,22 +110,29 @@ export default defineComponent({
 		};
 	},
 	mounted() {
-		this.$watch('showBody', showBody => {
-			const headerHeight = this.showHeader ? this.$refs.header.offsetHeight : 0;
-			this.$el.style.minHeight = `${headerHeight}px`;
-			if (showBody) {
-				this.$el.style.flexBasis = 'auto';
-			} else {
-				this.$el.style.flexBasis = `${headerHeight}px`;
+		this.$watch(
+			"showBody",
+			(showBody) => {
+				const headerHeight = this.showHeader
+					? this.$refs.header.offsetHeight
+					: 0;
+				this.$el.style.minHeight = `${headerHeight}px`;
+				if (showBody) {
+					this.$el.style.flexBasis = "auto";
+				} else {
+					this.$el.style.flexBasis = `${headerHeight}px`;
+				}
+			},
+			{
+				immediate: true,
 			}
-		}, {
-			immediate: true,
-		});
+		);
 
-		this.$el.style.setProperty('--maxHeight', this.maxHeight + 'px');
+		this.$el.style.setProperty("--maxHeight", this.maxHeight + "px");
 
 		const calcOmit = () => {
-			if (this.omitted || this.ignoreOmit || this.maxHeight == null) return;
+			if (this.omitted || this.ignoreOmit || this.maxHeight == null)
+				return;
 			const height = this.$refs.content.offsetHeight;
 			this.omitted = height > this.maxHeight;
 		};
@@ -113,14 +152,14 @@ export default defineComponent({
 			const elementHeight = el.getBoundingClientRect().height;
 			el.style.height = 0;
 			el.offsetHeight; // reflow
-			el.style.height = elementHeight + 'px';
+			el.style.height = elementHeight + "px";
 		},
 		afterEnter(el) {
 			el.style.height = null;
 		},
 		leave(el) {
 			const elementHeight = el.getBoundingClientRect().height;
-			el.style.height = elementHeight + 'px';
+			el.style.height = elementHeight + "px";
 			el.offsetHeight; // reflow
 			el.style.height = 0;
 		},
@@ -132,7 +171,8 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.container-toggle-enter-active, .container-toggle-leave-active {
+.container-toggle-enter-active,
+.container-toggle-leave-active {
 	overflow-y: hidden;
 	transition: opacity 0.5s, height 0.5s !important;
 }
@@ -236,7 +276,8 @@ export default defineComponent({
 		}
 	}
 
-	&.max-width_380px, &.thin {
+	&.max-width_380px,
+	&.thin {
 		> header {
 			> .title {
 				padding: 8px 10px;
diff --git a/packages/client/src/components/MkContextMenu.vue b/packages/client/src/components/MkContextMenu.vue
index cfc9502b4..3e94dd59d 100644
--- a/packages/client/src/components/MkContextMenu.vue
+++ b/packages/client/src/components/MkContextMenu.vue
@@ -1,17 +1,22 @@
 <template>
-<transition :name="$store.state.animation ? 'fade' : ''" appear>
-	<div ref="rootEl" class="nvlagfpb" :style="{ zIndex }" @contextmenu.prevent.stop="() => {}">
-		<MkMenu :items="items" :align="'left'" @close="$emit('closed')"/>
-	</div>
-</transition>
+	<transition :name="$store.state.animation ? 'fade' : ''" appear>
+		<div
+			ref="rootEl"
+			class="nvlagfpb"
+			:style="{ zIndex }"
+			@contextmenu.prevent.stop="() => {}"
+		>
+			<MkMenu :items="items" :align="'left'" @close="$emit('closed')" />
+		</div>
+	</transition>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onBeforeUnmount } from 'vue';
-import MkMenu from './MkMenu.vue';
-import { MenuItem } from './types/menu.vue';
-import contains from '@/scripts/contains';
-import * as os from '@/os';
+import { onMounted, onBeforeUnmount } from "vue";
+import MkMenu from "./MkMenu.vue";
+import { MenuItem } from "./types/menu.vue";
+import contains from "@/scripts/contains";
+import * as os from "@/os";
 
 const props = defineProps<{
 	items: MenuItem[];
@@ -19,12 +24,12 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
 let rootEl = $ref<HTMLDivElement>();
 
-let zIndex = $ref<number>(os.claimZIndex('high'));
+let zIndex = $ref<number>(os.claimZIndex("high"));
 
 onMounted(() => {
 	let left = props.ev.pageX + 1; // 間違って右ダブルクリックした場合に意図せずアイテムがクリックされるのを防ぐため + 1
@@ -52,19 +57,19 @@ onMounted(() => {
 	rootEl.style.top = `${top}px`;
 	rootEl.style.left = `${left}px`;
 
-	for (const el of Array.from(document.querySelectorAll('body *'))) {
-		el.addEventListener('mousedown', onMousedown);
+	for (const el of Array.from(document.querySelectorAll("body *"))) {
+		el.addEventListener("mousedown", onMousedown);
 	}
 });
 
 onBeforeUnmount(() => {
-	for (const el of Array.from(document.querySelectorAll('body *'))) {
-		el.removeEventListener('mousedown', onMousedown);
+	for (const el of Array.from(document.querySelectorAll("body *"))) {
+		el.removeEventListener("mousedown", onMousedown);
 	}
 });
 
 function onMousedown(evt: Event) {
-	if (!contains(rootEl, evt.target) && (rootEl !== evt.target)) emit('closed');
+	if (!contains(rootEl, evt.target) && rootEl !== evt.target) emit("closed");
 }
 </script>
 
@@ -73,12 +78,15 @@ function onMousedown(evt: Event) {
 	position: absolute;
 }
 
-.fade-enter-active, .fade-leave-active {
-	transition: opacity 0.5s cubic-bezier(0.16, 1, 0.3, 1), transform 0.5s cubic-bezier(0.16, 1, 0.3, 1);
+.fade-enter-active,
+.fade-leave-active {
+	transition: opacity 0.5s cubic-bezier(0.16, 1, 0.3, 1),
+		transform 0.5s cubic-bezier(0.16, 1, 0.3, 1);
 	transform-origin: left top;
 }
 
-.fade-enter-from, .fade-leave-to {
+.fade-enter-from,
+.fade-leave-to {
 	opacity: 0;
 	transform: scale(0.9);
 }
diff --git a/packages/client/src/components/MkCropperDialog.vue b/packages/client/src/components/MkCropperDialog.vue
index ec1226262..cce948572 100644
--- a/packages/client/src/components/MkCropperDialog.vue
+++ b/packages/client/src/components/MkCropperDialog.vue
@@ -1,47 +1,55 @@
 <template>
-<XModalWindow
-	ref="dialogEl"
-	:width="800"
-	:height="500"
-	:scroll="false"
-	:with-ok-button="true"
-	@close="cancel()"
-	@ok="ok()"
-	@closed="$emit('closed')"
->
-	<template #header>{{ i18n.ts.cropImage }}</template>
-	<template #default="{ width, height }">
-		<div class="mk-cropper-dialog" :style="`--vw: ${width}px; --vh: ${height}px;`">
-			<Transition name="fade">
-				<div v-if="loading" class="loading">
-					<MkLoading/>
+	<XModalWindow
+		ref="dialogEl"
+		:width="800"
+		:height="500"
+		:scroll="false"
+		:with-ok-button="true"
+		@close="cancel()"
+		@ok="ok()"
+		@closed="$emit('closed')"
+	>
+		<template #header>{{ i18n.ts.cropImage }}</template>
+		<template #default="{ width, height }">
+			<div
+				class="mk-cropper-dialog"
+				:style="`--vw: ${width}px; --vh: ${height}px;`"
+			>
+				<Transition name="fade">
+					<div v-if="loading" class="loading">
+						<MkLoading />
+					</div>
+				</Transition>
+				<div class="container">
+					<img
+						ref="imgEl"
+						:src="imgUrl"
+						style="display: none"
+						@load="onImageLoad"
+					/>
 				</div>
-			</Transition>
-			<div class="container">
-				<img ref="imgEl" :src="imgUrl" style="display: none;" @load="onImageLoad">
 			</div>
-		</div>
-	</template>
-</XModalWindow>
+		</template>
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onMounted } from 'vue';
-import * as misskey from 'calckey-js';
-import Cropper from 'cropperjs';
-import tinycolor from 'tinycolor2';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import * as os from '@/os';
-import { $i } from '@/account';
-import { defaultStore } from '@/store';
-import { apiUrl, url } from '@/config';
-import { query } from '@/scripts/url';
-import { i18n } from '@/i18n';
+import { nextTick, onMounted } from "vue";
+import * as misskey from "calckey-js";
+import Cropper from "cropperjs";
+import tinycolor from "tinycolor2";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import * as os from "@/os";
+import { $i } from "@/account";
+import { defaultStore } from "@/store";
+import { apiUrl, url } from "@/config";
+import { query } from "@/scripts/url";
+import { i18n } from "@/i18n";
 
 const emit = defineEmits<{
-	(ev: 'ok', cropped: misskey.entities.DriveFile): void;
-	(ev: 'cancel'): void;
-	(ev: 'closed'): void;
+	(ev: "ok", cropped: misskey.entities.DriveFile): void;
+	(ev: "cancel"): void;
+	(ev: "closed"): void;
 }>();
 
 const props = defineProps<{
@@ -60,24 +68,24 @@ let loading = $ref(true);
 const ok = async () => {
 	const promise = new Promise<misskey.entities.DriveFile>(async (res) => {
 		const croppedCanvas = await cropper?.getCropperSelection()?.$toCanvas();
-		croppedCanvas.toBlob(blob => {
+		croppedCanvas.toBlob((blob) => {
 			const formData = new FormData();
-			formData.append('file', blob);
+			formData.append("file", blob);
 			if (defaultStore.state.uploadFolder) {
-				formData.append('folderId', defaultStore.state.uploadFolder);
+				formData.append("folderId", defaultStore.state.uploadFolder);
 			}
 
-			fetch(apiUrl + '/drive/files/create', {
-				method: 'POST',
+			fetch(apiUrl + "/drive/files/create", {
+				method: "POST",
 				body: formData,
 				headers: {
 					authorization: `Bearer ${$i.token}`,
 				},
 			})
-			.then(response => response.json())
-			.then(f => {
-				res(f);
-			});
+				.then((response) => response.json())
+				.then((f) => {
+					res(f);
+				});
 		});
 	});
 
@@ -85,12 +93,12 @@ const ok = async () => {
 
 	const f = await promise;
 
-	emit('ok', f);
+	emit("ok", f);
 	dialogEl.close();
 };
 
 const cancel = () => {
-	emit('cancel');
+	emit("cancel");
 	dialogEl.close();
 };
 
@@ -98,31 +106,32 @@ const onImageLoad = () => {
 	loading = false;
 
 	if (cropper) {
-		cropper.getCropperImage()!.$center('contain');
+		cropper.getCropperImage()!.$center("contain");
 		cropper.getCropperSelection()!.$center();
 	}
 };
 
 onMounted(() => {
-	cropper = new Cropper(imgEl, {
-	});
+	cropper = new Cropper(imgEl, {});
 
 	const computedStyle = getComputedStyle(document.documentElement);
 
 	const selection = cropper.getCropperSelection()!;
-	selection.themeColor = tinycolor(computedStyle.getPropertyValue('--accent')).toHexString();
+	selection.themeColor = tinycolor(
+		computedStyle.getPropertyValue("--accent")
+	).toHexString();
 	selection.aspectRatio = props.aspectRatio;
 	selection.initialAspectRatio = props.aspectRatio;
 	selection.outlined = true;
 
 	window.setTimeout(() => {
-		cropper.getCropperImage()!.$center('contain');
+		cropper.getCropperImage()!.$center("contain");
 		selection.$center();
 	}, 100);
 
 	// モーダルオープンアニメーションが終わったあとで再度調整
 	window.setTimeout(() => {
-		cropper.getCropperImage()!.$center('contain');
+		cropper.getCropperImage()!.$center("contain");
 		selection.$center();
 	}, 500);
 });
diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 909f0cca9..b4a69ac6a 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -1,16 +1,16 @@
 <template>
-<button class="nrvgflfu _button" @click.stop="toggle">
-	<b>{{ modelValue ? i18n.ts._cw.hide : i18n.ts._cw.show }}</b>
-	<span v-if="!modelValue">{{ label }}</span>
-</button>
+	<button class="nrvgflfu _button" @click.stop="toggle">
+		<b>{{ modelValue ? i18n.ts._cw.hide : i18n.ts._cw.show }}</b>
+		<span v-if="!modelValue">{{ label }}</span>
+	</button>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import { length } from 'stringz';
-import * as misskey from 'calckey-js';
-import { concat } from '@/scripts/array';
-import { i18n } from '@/i18n';
+import { computed } from "vue";
+import { length } from "stringz";
+import * as misskey from "calckey-js";
+import { concat } from "@/scripts/array";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	modelValue: boolean;
@@ -18,19 +18,23 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'update:modelValue', v: boolean): void;
+	(ev: "update:modelValue", v: boolean): void;
 }>();
 
 const label = computed(() => {
 	return concat([
-		props.note.text ? [i18n.t('_cw.chars', { count: length(props.note.text) })] : [],
-		props.note.files && props.note.files.length !== 0 ? [i18n.t('_cw.files', { count: props.note.files.length }) ] : [],
-		props.note.poll != null ? [i18n.ts.poll] : []
-	] as string[][]).join(' / ');
+		props.note.text
+			? [i18n.t("_cw.chars", { count: length(props.note.text) })]
+			: [],
+		props.note.files && props.note.files.length !== 0
+			? [i18n.t("_cw.files", { count: props.note.files.length })]
+			: [],
+		props.note.poll != null ? [i18n.ts.poll] : [],
+	] as string[][]).join(" / ");
 });
 
 const toggle = () => {
-	emit('update:modelValue', !props.modelValue);
+	emit("update:modelValue", !props.modelValue);
 };
 </script>
 
@@ -60,11 +64,11 @@ const toggle = () => {
 		margin-left: 4px;
 
 		&:before {
-			content: '(';
+			content: "(";
 		}
 
 		&:after {
-			content: ')';
+			content: ")";
 		}
 	}
 }
diff --git a/packages/client/src/components/MkDateSeparatedList.vue b/packages/client/src/components/MkDateSeparatedList.vue
index 41e7ac376..29c7c518a 100644
--- a/packages/client/src/components/MkDateSeparatedList.vue
+++ b/packages/client/src/components/MkDateSeparatedList.vue
@@ -1,19 +1,21 @@
 <script lang="ts">
-import { defineComponent, h, PropType, TransitionGroup } from 'vue';
-import MkAd from '@/components/global/MkAd.vue';
-import { i18n } from '@/i18n';
-import { defaultStore } from '@/store';
+import { defineComponent, h, PropType, TransitionGroup } from "vue";
+import MkAd from "@/components/global/MkAd.vue";
+import { i18n } from "@/i18n";
+import { defaultStore } from "@/store";
 
 export default defineComponent({
 	props: {
 		items: {
-			type: Array as PropType<{ id: string; createdAt: string; _shouldInsertAd_: boolean; }[]>,
+			type: Array as PropType<
+				{ id: string; createdAt: string; _shouldInsertAd_: boolean }[]
+			>,
 			required: true,
 		},
 		direction: {
 			type: String,
 			required: false,
-			default: 'down',
+			default: "down",
 		},
 		reversed: {
 			type: Boolean,
@@ -36,7 +38,7 @@ export default defineComponent({
 		function getDateText(time: string) {
 			const date = new Date(time).getDate();
 			const month = new Date(time).getMonth() + 1;
-			return i18n.t('monthAndDay', {
+			return i18n.t("monthAndDay", {
 				month: month.toString(),
 				day: date.toString(),
 			});
@@ -44,64 +46,81 @@ export default defineComponent({
 
 		if (props.items.length === 0) return;
 
-		const renderChildren = () => props.items.map((item, i) => {
-			if (!slots || !slots.default) return;
+		const renderChildren = () =>
+			props.items.map((item, i) => {
+				if (!slots || !slots.default) return;
 
-			const el = slots.default({
-				item: item,
-			})[0];
-			if (el.key == null && item.id) el.key = item.id;
+				const el = slots.default({
+					item: item,
+				})[0];
+				if (el.key == null && item.id) el.key = item.id;
 
-			if (
-				i !== props.items.length - 1 &&
-				new Date(item.createdAt).getDate() !== new Date(props.items[i + 1].createdAt).getDate()
-			) {
-				const separator = h('div', {
-					class: 'separator',
-					key: item.id + ':separator',
-				}, h('p', {
-					class: 'date',
-				}, [
-					h('span', [
-						h('i', {
-							class: 'ph-caret-up ph-bold ph-lg icon',
-						}),
-						getDateText(item.createdAt),
-					]),
-					h('span', [
-						getDateText(props.items[i + 1].createdAt),
-						h('i', {
-							class: 'ph-caret-down ph-bold ph-lg icon',
-						}),
-					]),
-				]));
+				if (
+					i !== props.items.length - 1 &&
+					new Date(item.createdAt).getDate() !==
+						new Date(props.items[i + 1].createdAt).getDate()
+				) {
+					const separator = h(
+						"div",
+						{
+							class: "separator",
+							key: item.id + ":separator",
+						},
+						h(
+							"p",
+							{
+								class: "date",
+							},
+							[
+								h("span", [
+									h("i", {
+										class: "ph-caret-up ph-bold ph-lg icon",
+									}),
+									getDateText(item.createdAt),
+								]),
+								h("span", [
+									getDateText(props.items[i + 1].createdAt),
+									h("i", {
+										class: "ph-caret-down ph-bold ph-lg icon",
+									}),
+								]),
+							]
+						)
+					);
 
-				return [el, separator];
-			} else {
-				if (props.ad && item._shouldInsertAd_) {
-					return [h(MkAd, {
-						class: 'a', // advertiseの意(ブロッカー対策)
-						key: item.id + ':ad',
-						prefer: ['horizontal', 'horizontal-big'],
-					}), el];
+					return [el, separator];
 				} else {
-					return el;
+					if (props.ad && item._shouldInsertAd_) {
+						return [
+							h(MkAd, {
+								class: "a", // advertiseの意(ブロッカー対策)
+								key: item.id + ":ad",
+								prefer: ["horizontal", "horizontal-big"],
+							}),
+							el,
+						];
+					} else {
+						return el;
+					}
 				}
-			}
-		});
+			});
 
-		return () => h(
-			defaultStore.state.animation ? TransitionGroup : 'div',
-			defaultStore.state.animation ? {
-				class: 'sqadhkmv' + (props.noGap ? ' noGap' : ''),
-				name: 'list',
-				tag: 'div',
-				'data-direction': props.direction,
-				'data-reversed': props.reversed ? 'true' : 'false',
-			} : {
-				class: 'sqadhkmv' + (props.noGap ? ' noGap' : ''),
-			},
-			{ default: renderChildren });
+		return () =>
+			h(
+				defaultStore.state.animation ? TransitionGroup : "div",
+				defaultStore.state.animation
+					? {
+							class: "sqadhkmv" + (props.noGap ? " noGap" : ""),
+							name: "list",
+							tag: "div",
+							"data-direction": props.direction,
+							"data-reversed": props.reversed ? "true" : "false",
+					  }
+					: {
+							class: "sqadhkmv" + (props.noGap ? " noGap" : ""),
+					  },
+				{ default: renderChildren }
+			);
 	},
 });
 </script>
@@ -121,7 +140,8 @@ export default defineComponent({
 	}
 
 	> .list-enter-active {
-		transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.7s cubic-bezier(0.23, 1, 0.32, 1);
+		transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1),
+			opacity 0.7s cubic-bezier(0.23, 1, 0.32, 1);
 	}
 
 	&[data-direction="up"] {
diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue
index de9cbe810..557442b5b 100644
--- a/packages/client/src/components/MkDialog.vue
+++ b/packages/client/src/components/MkDialog.vue
@@ -1,63 +1,171 @@
 <template>
-	<MkModal ref="modal" :prefer-type="'dialog'" :z-priority="'high'" @click="done(true)" @closed="emit('closed')">
+	<MkModal
+		ref="modal"
+		:prefer-type="'dialog'"
+		:z-priority="'high'"
+		@click="done(true)"
+		@closed="emit('closed')"
+	>
 		<div :class="$style.root">
 			<div v-if="icon" :class="$style.icon">
 				<i :class="icon"></i>
 			</div>
-			<div v-else-if="!input && !select" :class="[$style.icon, $style['type_' + type]]">
-				<i v-if="type === 'success'" :class="$style.iconInner" class="ph-check ph-bold ph-lg"></i>
-				<i v-else-if="type === 'error'" :class="$style.iconInner" class="ph-circle-wavy-warning ph-bold ph-lg"></i>
-				<i v-else-if="type === 'warning'" :class="$style.iconInner" class="ph-warning ph-bold ph-lg"></i>
-				<i v-else-if="type === 'info'" :class="$style.iconInner" class="ph-info ph-bold ph-lg"></i>
-				<i v-else-if="type === 'question'" :class="$style.iconInner" class="ph-circle-question ph-bold ph-lg"></i>
-				<MkLoading v-else-if="type === 'waiting'" :class="$style.iconInner" :em="true"/>
+			<div
+				v-else-if="!input && !select"
+				:class="[$style.icon, $style['type_' + type]]"
+			>
+				<i
+					v-if="type === 'success'"
+					:class="$style.iconInner"
+					class="ph-check ph-bold ph-lg"
+				></i>
+				<i
+					v-else-if="type === 'error'"
+					:class="$style.iconInner"
+					class="ph-circle-wavy-warning ph-bold ph-lg"
+				></i>
+				<i
+					v-else-if="type === 'warning'"
+					:class="$style.iconInner"
+					class="ph-warning ph-bold ph-lg"
+				></i>
+				<i
+					v-else-if="type === 'info'"
+					:class="$style.iconInner"
+					class="ph-info ph-bold ph-lg"
+				></i>
+				<i
+					v-else-if="type === 'question'"
+					:class="$style.iconInner"
+					class="ph-circle-question ph-bold ph-lg"
+				></i>
+				<MkLoading
+					v-else-if="type === 'waiting'"
+					:class="$style.iconInner"
+					:em="true"
+				/>
 			</div>
-			<header v-if="title" :class="$style.title"><Mfm :text="title"/></header>
-			<header v-if="title == null && (input && input.type === 'password')" :class="$style.title"><Mfm :text="i18n.ts.password"/></header>
-			<div v-if="text" :class="$style.text"><Mfm :text="text"/></div>
-			<MkInput v-if="input && input.type !== 'paragraph'" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" @keydown="onInputKeydown">
-				<template v-if="input.type === 'password'" #prefix><i class="ph-password ph-bold ph-lg"></i></template>
+			<header v-if="title" :class="$style.title">
+				<Mfm :text="title" />
+			</header>
+			<header
+				v-if="title == null && input && input.type === 'password'"
+				:class="$style.title"
+			>
+				<Mfm :text="i18n.ts.password" />
+			</header>
+			<div v-if="text" :class="$style.text"><Mfm :text="text" /></div>
+			<MkInput
+				v-if="input && input.type !== 'paragraph'"
+				v-model="inputValue"
+				autofocus
+				:type="input.type || 'text'"
+				:placeholder="input.placeholder || undefined"
+				@keydown="onInputKeydown"
+			>
+				<template v-if="input.type === 'password'" #prefix
+					><i class="ph-password ph-bold ph-lg"></i
+				></template>
 			</MkInput>
-			<MkTextarea v-if="input && input.type === 'paragraph'" v-model="inputValue" autofocus :type="paragraph" :placeholder="input.placeholder || undefined">
+			<MkTextarea
+				v-if="input && input.type === 'paragraph'"
+				v-model="inputValue"
+				autofocus
+				:type="paragraph"
+				:placeholder="input.placeholder || undefined"
+			>
 			</MkTextarea>
 			<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>
+					<option v-for="item in select.items" :value="item.value">
+						{{ item.text }}
+					</option>
 				</template>
 				<template v-else>
-					<optgroup v-for="groupedItem in select.groupedItems" :label="groupedItem.label">
-						<option v-for="item in groupedItem.items" :value="item.value">{{ item.text }}</option>
+					<optgroup
+						v-for="groupedItem in select.groupedItems"
+						:label="groupedItem.label"
+					>
+						<option
+							v-for="item in groupedItem.items"
+							:value="item.value"
+						>
+							{{ item.text }}
+						</option>
 					</optgroup>
 				</template>
 			</MkSelect>
-			<div v-if="(showOkButton || showCancelButton) && !actions" :class="$style.buttons">
+			<div
+				v-if="(showOkButton || showCancelButton) && !actions"
+				:class="$style.buttons"
+			>
 				<div v-if="!isYesNo">
-					<MkButton v-if="showOkButton" inline primary :autofocus="!input && !select" @click="ok">{{ (showCancelButton || input || select) ? i18n.ts.ok : i18n.ts.gotIt }}</MkButton>
-					<MkButton v-if="showCancelButton || input || select" inline @click="cancel">{{ i18n.ts.cancel }}</MkButton>
+					<MkButton
+						v-if="showOkButton"
+						inline
+						primary
+						:autofocus="!input && !select"
+						@click="ok"
+						>{{
+							showCancelButton || input || select
+								? i18n.ts.ok
+								: i18n.ts.gotIt
+						}}</MkButton
+					>
+					<MkButton
+						v-if="showCancelButton || input || select"
+						inline
+						@click="cancel"
+						>{{ i18n.ts.cancel }}</MkButton
+					>
 				</div>
 				<div v-else>
-					<MkButton v-if="showOkButton" inline primary :autofocus="!input && !select" @click="ok">{{ i18n.ts.yes }}</MkButton>
-					<MkButton v-if="showCancelButton || input || select" inline @click="cancel">{{ i18n.ts.no }}</MkButton>
+					<MkButton
+						v-if="showOkButton"
+						inline
+						primary
+						:autofocus="!input && !select"
+						@click="ok"
+						>{{ i18n.ts.yes }}</MkButton
+					>
+					<MkButton
+						v-if="showCancelButton || input || select"
+						inline
+						@click="cancel"
+						>{{ i18n.ts.no }}</MkButton
+					>
 				</div>
 			</div>
 			<div v-if="actions" :class="$style.buttons">
-				<MkButton v-for="action in actions" :key="action.text" inline :primary="action.primary" @click="() => { action.callback(); modal?.close(); }">{{ action.text }}</MkButton>
+				<MkButton
+					v-for="action in actions"
+					:key="action.text"
+					inline
+					:primary="action.primary"
+					@click="
+						() => {
+							action.callback();
+							modal?.close();
+						}
+					"
+					>{{ action.text }}</MkButton
+				>
 			</div>
 		</div>
 	</MkModal>
 </template>
 
 <script lang="ts" setup>
-import { onBeforeUnmount, onMounted, ref, shallowRef } from 'vue';
-import MkModal from '@/components/MkModal.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import MkSelect from '@/components/form/select.vue';
-import { i18n } from '@/i18n';
+import { onBeforeUnmount, onMounted, ref, shallowRef } from "vue";
+import MkModal from "@/components/MkModal.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import MkSelect from "@/components/form/select.vue";
+import { i18n } from "@/i18n";
 
 type Input = {
-	type: HTMLInputElement['type'];
+	type: HTMLInputElement["type"];
 	placeholder?: string | null;
 	default: any | null;
 };
@@ -77,37 +185,46 @@ type Select = {
 	default: string | null;
 };
 
-const props = withDefaults(defineProps<{
-	type?: 'success' | 'error' | 'warning' | 'info' | 'question' | 'waiting';
-	title: string;
-	text?: string;
-	input?: Input;
-	select?: Select;
-	icon?: string;
-	actions?: {
-		text: string;
-		primary?: boolean,
-		callback: (...args: any[]) => void;
-	}[];
-	showOkButton?: boolean;
-	showCancelButton?: boolean;
-	isYesNo?: boolean;
+const props = withDefaults(
+	defineProps<{
+		type?:
+			| "success"
+			| "error"
+			| "warning"
+			| "info"
+			| "question"
+			| "waiting";
+		title: string;
+		text?: string;
+		input?: Input;
+		select?: Select;
+		icon?: string;
+		actions?: {
+			text: string;
+			primary?: boolean;
+			callback: (...args: any[]) => void;
+		}[];
+		showOkButton?: boolean;
+		showCancelButton?: boolean;
+		isYesNo?: boolean;
 
-	cancelableByBgClick?: boolean;
-	okText?: string;
-	cancelText?: string;
-}>(), {
-	type: 'info',
-	showOkButton: true,
-	showCancelButton: false,
-	isYesNo: false,
+		cancelableByBgClick?: boolean;
+		okText?: string;
+		cancelText?: string;
+	}>(),
+	{
+		type: "info",
+		showOkButton: true,
+		showCancelButton: false,
+		isYesNo: false,
 
-	cancelableByBgClick: true,
-});
+		cancelableByBgClick: true,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'done', v: { canceled: boolean; result: any }): void;
-	(ev: 'closed'): void;
+	(ev: "done", v: { canceled: boolean; result: any }): void;
+	(ev: "closed"): void;
 }>();
 
 const modal = shallowRef<InstanceType<typeof MkModal>>();
@@ -116,17 +233,18 @@ const inputValue = ref(props.input?.default || null);
 const selectedValue = ref(props.select?.default || null);
 
 function done(canceled: boolean, result?) {
-	emit('done', { canceled, result });
+	emit("done", { canceled, result });
 	modal.value?.close();
 }
 
 async function ok() {
 	if (!props.showOkButton) return;
 
-	const result =
-		props.input ? inputValue.value :
-		props.select ? selectedValue.value :
-		true;
+	const result = props.input
+		? inputValue.value
+		: props.select
+		? selectedValue.value
+		: true;
 	done(false, result);
 }
 
@@ -139,11 +257,11 @@ function onBgClick() {
 }
 */
 function onKeydown(evt: KeyboardEvent) {
-	if (evt.key === 'Escape') cancel();
+	if (evt.key === "Escape") cancel();
 }
 
 function onInputKeydown(evt: KeyboardEvent) {
-	if (evt.key === 'Enter') {
+	if (evt.key === "Enter") {
 		evt.preventDefault();
 		evt.stopPropagation();
 		ok();
@@ -151,11 +269,11 @@ function onInputKeydown(evt: KeyboardEvent) {
 }
 
 onMounted(() => {
-	document.addEventListener('keydown', onKeydown);
+	document.addEventListener("keydown", onKeydown);
 });
 
 onBeforeUnmount(() => {
-	document.removeEventListener('keydown', onKeydown);
+	document.removeEventListener("keydown", onKeydown);
 });
 </script>
 
diff --git a/packages/client/src/components/MkDigitalClock.vue b/packages/client/src/components/MkDigitalClock.vue
index 9ed8d63d1..c4edecbec 100644
--- a/packages/client/src/components/MkDigitalClock.vue
+++ b/packages/client/src/components/MkDigitalClock.vue
@@ -1,33 +1,36 @@
 <template>
-<span class="zjobosdg">
-	<span v-text="hh"></span>
-	<span class="colon" :class="{ showColon }">:</span>
-	<span v-text="mm"></span>
-	<span v-if="showS" class="colon" :class="{ showColon }">:</span>
-	<span v-if="showS" v-text="ss"></span>
-	<span v-if="showMs" class="colon" :class="{ showColon }">:</span>
-	<span v-if="showMs" v-text="ms"></span>
-</span>
+	<span class="zjobosdg">
+		<span v-text="hh"></span>
+		<span class="colon" :class="{ showColon }">:</span>
+		<span v-text="mm"></span>
+		<span v-if="showS" class="colon" :class="{ showColon }">:</span>
+		<span v-if="showS" v-text="ss"></span>
+		<span v-if="showMs" class="colon" :class="{ showColon }">:</span>
+		<span v-if="showMs" v-text="ms"></span>
+	</span>
 </template>
 
 <script lang="ts" setup>
-import { onUnmounted, ref, watch } from 'vue';
+import { onUnmounted, ref, watch } from "vue";
 
-const props = withDefaults(defineProps<{
-	showS?: boolean;
-	showMs?: boolean;
-	offset?: number;
-}>(), {
-	showS: true,
-	showMs: false,
-	offset: 0 - new Date().getTimezoneOffset(),
-});
+const props = withDefaults(
+	defineProps<{
+		showS?: boolean;
+		showMs?: boolean;
+		offset?: number;
+	}>(),
+	{
+		showS: true,
+		showMs: false,
+		offset: 0 - new Date().getTimezoneOffset(),
+	}
+);
 
 let intervalId;
-const hh = ref('');
-const mm = ref('');
-const ss = ref('');
-const ms = ref('');
+const hh = ref("");
+const mm = ref("");
+const ss = ref("");
+const ms = ref("");
 const showColon = ref(false);
 let prevSec: number | null = null;
 
@@ -41,21 +44,29 @@ watch(showColon, (v) => {
 
 const tick = () => {
 	const now = new Date();
-	now.setMinutes(now.getMinutes() + (new Date().getTimezoneOffset() + props.offset));
-	hh.value = now.getHours().toString().padStart(2, '0');
-	mm.value = now.getMinutes().toString().padStart(2, '0');
-	ss.value = now.getSeconds().toString().padStart(2, '0');
-	ms.value = Math.floor(now.getMilliseconds() / 10).toString().padStart(2, '0');
+	now.setMinutes(
+		now.getMinutes() + (new Date().getTimezoneOffset() + props.offset)
+	);
+	hh.value = now.getHours().toString().padStart(2, "0");
+	mm.value = now.getMinutes().toString().padStart(2, "0");
+	ss.value = now.getSeconds().toString().padStart(2, "0");
+	ms.value = Math.floor(now.getMilliseconds() / 10)
+		.toString()
+		.padStart(2, "0");
 	if (now.getSeconds() !== prevSec) showColon.value = true;
 	prevSec = now.getSeconds();
 };
 
 tick();
 
-watch(() => props.showMs, () => {
-	if (intervalId) window.clearInterval(intervalId);
-	intervalId = window.setInterval(tick, props.showMs ? 10 : 1000);
-}, { immediate: true });
+watch(
+	() => props.showMs,
+	() => {
+		if (intervalId) window.clearInterval(intervalId);
+		intervalId = window.setInterval(tick, props.showMs ? 10 : 1000);
+	},
+	{ immediate: true }
+);
 
 onUnmounted(() => {
 	window.clearInterval(intervalId);
diff --git a/packages/client/src/components/MkDrive.file.vue b/packages/client/src/components/MkDrive.file.vue
index 4ebf74199..667a5c754 100644
--- a/packages/client/src/components/MkDrive.file.vue
+++ b/packages/client/src/components/MkDrive.file.vue
@@ -1,102 +1,131 @@
 <template>
-<div
-	class="ncvczrfv"
-	:class="{ isSelected }"
-	draggable="true"
-	:title="title"
-	@click="onClick"
-	@contextmenu.stop="onContextmenu"
-	@dragstart="onDragstart"
-	@dragend="onDragend"
->
-	<div v-if="$i?.avatarId == file.id" class="label">
-		<img src="/client-assets/label.svg"/>
-		<p>{{ i18n.ts.avatar }}</p>
-	</div>
-	<div v-if="$i?.bannerId == file.id" class="label">
-		<img src="/client-assets/label.svg"/>
-		<p>{{ i18n.ts.banner }}</p>
-	</div>
-	<div v-if="file.isSensitive" class="label red">
-		<img src="/client-assets/label-red.svg"/>
-		<p>{{ i18n.ts.nsfw }}</p>
-	</div>
+	<div
+		class="ncvczrfv"
+		:class="{ isSelected }"
+		draggable="true"
+		:title="title"
+		@click="onClick"
+		@contextmenu.stop="onContextmenu"
+		@dragstart="onDragstart"
+		@dragend="onDragend"
+	>
+		<div v-if="$i?.avatarId == file.id" class="label">
+			<img src="/client-assets/label.svg" />
+			<p>{{ i18n.ts.avatar }}</p>
+		</div>
+		<div v-if="$i?.bannerId == file.id" class="label">
+			<img src="/client-assets/label.svg" />
+			<p>{{ i18n.ts.banner }}</p>
+		</div>
+		<div v-if="file.isSensitive" class="label red">
+			<img src="/client-assets/label-red.svg" />
+			<p>{{ i18n.ts.nsfw }}</p>
+		</div>
 
-	<MkDriveFileThumbnail class="thumbnail" :file="file" fit="contain"/>
+		<MkDriveFileThumbnail class="thumbnail" :file="file" fit="contain" />
 
-	<p class="name">
-		<span>{{ file.name.lastIndexOf('.') != -1 ? file.name.substr(0, file.name.lastIndexOf('.')) : file.name }}</span>
-		<span v-if="file.name.lastIndexOf('.') != -1" class="ext">{{ file.name.substr(file.name.lastIndexOf('.')) }}</span>
-	</p>
-</div>
+		<p class="name">
+			<span>{{
+				file.name.lastIndexOf(".") != -1
+					? file.name.substr(0, file.name.lastIndexOf("."))
+					: file.name
+			}}</span>
+			<span v-if="file.name.lastIndexOf('.') != -1" class="ext">{{
+				file.name.substr(file.name.lastIndexOf("."))
+			}}</span>
+		</p>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, ref } from 'vue';
-import * as Misskey from 'calckey-js';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
-import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
-import bytes from '@/filters/bytes';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { $i } from '@/account';
+import { computed, defineAsyncComponent, ref } from "vue";
+import * as Misskey from "calckey-js";
+import copyToClipboard from "@/scripts/copy-to-clipboard";
+import MkDriveFileThumbnail from "@/components/MkDriveFileThumbnail.vue";
+import bytes from "@/filters/bytes";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { $i } from "@/account";
 
-const props = withDefaults(defineProps<{
-	file: Misskey.entities.DriveFile;
-	isSelected?: boolean;
-	selectMode?: boolean;
-}>(), {
-	isSelected: false,
-	selectMode: false,
-});
+const props = withDefaults(
+	defineProps<{
+		file: Misskey.entities.DriveFile;
+		isSelected?: boolean;
+		selectMode?: boolean;
+	}>(),
+	{
+		isSelected: false,
+		selectMode: false,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'chosen', r: Misskey.entities.DriveFile): void;
-	(ev: 'dragstart'): void;
-	(ev: 'dragend'): void;
+	(ev: "chosen", r: Misskey.entities.DriveFile): void;
+	(ev: "dragstart"): void;
+	(ev: "dragend"): void;
 }>();
 
 const isDragging = ref(false);
 
-const title = computed(() => `${props.file.name}\n${props.file.type} ${bytes(props.file.size)}`);
+const title = computed(
+	() => `${props.file.name}\n${props.file.type} ${bytes(props.file.size)}`
+);
 
 function getMenu() {
-	return [{
-		text: i18n.ts.rename,
-		icon: 'ph-cursor-text ph-bold ph-lg',
-		action: rename,
-	}, {
-		text: props.file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
-		icon: props.file.isSensitive ? 'ph-eye ph-bold ph-lg' : 'ph-eye-slash ph-bold ph-lg',
-		action: toggleSensitive,
-	}, {
-		text: i18n.ts.describeFile,
-		icon: 'ph-cursor-text ph-bold ph-lg',
-		action: describe,
-	}, null, {
-		text: i18n.ts.copyUrl,
-		icon: 'ph-link-simple ph-bold ph-lg',
-		action: copyUrl,
-	}, {
-		type: 'a',
-		href: props.file.url,
-		target: '_blank',
-		text: i18n.ts.download,
-		icon: 'ph-download-simple ph-bold ph-lg',
-		download: props.file.name,
-	}, null, {
-		text: i18n.ts.delete,
-		icon: 'ph-trash ph-bold ph-lg',
-		danger: true,
-		action: deleteFile,
-	}];
+	return [
+		{
+			text: i18n.ts.rename,
+			icon: "ph-cursor-text ph-bold ph-lg",
+			action: rename,
+		},
+		{
+			text: props.file.isSensitive
+				? i18n.ts.unmarkAsSensitive
+				: i18n.ts.markAsSensitive,
+			icon: props.file.isSensitive
+				? "ph-eye ph-bold ph-lg"
+				: "ph-eye-slash ph-bold ph-lg",
+			action: toggleSensitive,
+		},
+		{
+			text: i18n.ts.describeFile,
+			icon: "ph-cursor-text ph-bold ph-lg",
+			action: describe,
+		},
+		null,
+		{
+			text: i18n.ts.copyUrl,
+			icon: "ph-link-simple ph-bold ph-lg",
+			action: copyUrl,
+		},
+		{
+			type: "a",
+			href: props.file.url,
+			target: "_blank",
+			text: i18n.ts.download,
+			icon: "ph-download-simple ph-bold ph-lg",
+			download: props.file.name,
+		},
+		null,
+		{
+			text: i18n.ts.delete,
+			icon: "ph-trash ph-bold ph-lg",
+			danger: true,
+			action: deleteFile,
+		},
+	];
 }
 
 function onClick(ev: MouseEvent) {
 	if (props.selectMode) {
-		emit('chosen', props.file);
+		emit("chosen", props.file);
 	} else {
-		os.popupMenu(getMenu(), (ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined);
+		os.popupMenu(
+			getMenu(),
+			(ev.currentTarget ?? ev.target ?? undefined) as
+				| HTMLElement
+				| undefined
+		);
 	}
 }
 
@@ -106,17 +135,20 @@ function onContextmenu(ev: MouseEvent) {
 
 function onDragstart(ev: DragEvent) {
 	if (ev.dataTransfer) {
-		ev.dataTransfer.effectAllowed = 'move';
-		ev.dataTransfer.setData(_DATA_TRANSFER_DRIVE_FILE_, JSON.stringify(props.file));
+		ev.dataTransfer.effectAllowed = "move";
+		ev.dataTransfer.setData(
+			_DATA_TRANSFER_DRIVE_FILE_,
+			JSON.stringify(props.file)
+		);
 	}
 	isDragging.value = true;
 
-	emit('dragstart');
+	emit("dragstart");
 }
 
 function onDragend() {
 	isDragging.value = false;
-	emit('dragend');
+	emit("dragend");
 }
 
 function rename() {
@@ -126,7 +158,7 @@ function rename() {
 		default: props.file.name,
 	}).then(({ canceled, result: name }) => {
 		if (canceled) return;
-		os.api('drive/files/update', {
+		os.api("drive/files/update", {
 			fileId: props.file.id,
 			name: name,
 		});
@@ -134,27 +166,32 @@ function rename() {
 }
 
 function describe() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkMediaCaption.vue')), {
-		title: i18n.ts.describeFile,
-		input: {
-			placeholder: i18n.ts.inputNewDescription,
-			default: props.file.comment != null ? props.file.comment : '',
+	os.popup(
+		defineAsyncComponent(() => import("@/components/MkMediaCaption.vue")),
+		{
+			title: i18n.ts.describeFile,
+			input: {
+				placeholder: i18n.ts.inputNewDescription,
+				default: props.file.comment != null ? props.file.comment : "",
+			},
+			image: props.file,
 		},
-		image: props.file,
-	}, {
-		done: result => {
-			if (!result || result.canceled) return;
-			let comment = result.result;
-			os.api('drive/files/update', {
-				fileId: props.file.id,
-				comment: comment.length === 0 ? null : comment,
-			});
+		{
+			done: (result) => {
+				if (!result || result.canceled) return;
+				let comment = result.result;
+				os.api("drive/files/update", {
+					fileId: props.file.id,
+					comment: comment.length === 0 ? null : comment,
+				});
+			},
 		},
-	}, 'closed');
+		"closed"
+	);
 }
 
 function toggleSensitive() {
-	os.api('drive/files/update', {
+	os.api("drive/files/update", {
 		fileId: props.file.id,
 		isSensitive: !props.file.isSensitive,
 	});
@@ -171,12 +208,12 @@ function addApp() {
 */
 async function deleteFile() {
 	const { canceled } = await os.confirm({
-		type: 'warning',
-		text: i18n.t('driveFileDeleteConfirm', { name: props.file.name }),
+		type: "warning",
+		text: i18n.t("driveFileDeleteConfirm", { name: props.file.name }),
 	});
 
 	if (canceled) return;
-	os.api('drive/files/delete', {
+	os.api("drive/files/delete", {
 		fileId: props.file.id,
 	});
 }
@@ -189,7 +226,8 @@ async function deleteFile() {
 	min-height: 180px;
 	border-radius: 8px;
 
-	&, * {
+	&,
+	* {
 		cursor: pointer;
 	}
 
diff --git a/packages/client/src/components/MkDrive.folder.vue b/packages/client/src/components/MkDrive.folder.vue
index a36ab2673..aff6219f5 100644
--- a/packages/client/src/components/MkDrive.folder.vue
+++ b/packages/client/src/components/MkDrive.folder.vue
@@ -1,56 +1,68 @@
 <template>
-<div
-	class="rghtznwe"
-	:class="{ draghover }"
-	draggable="true"
-	:title="title"
-	@click="onClick"
-	@contextmenu.stop="onContextmenu"
-	@mouseover="onMouseover"
-	@mouseout="onMouseout"
-	@dragover.prevent.stop="onDragover"
-	@dragenter.prevent="onDragenter"
-	@dragleave="onDragleave"
-	@drop.prevent.stop="onDrop"
-	@dragstart="onDragstart"
-	@dragend="onDragend"
->
-	<p class="name">
-		<template v-if="hover"><i class="ph-folder-notch-open ph-bold ph-lg ph-fw ph-lg"></i></template>
-		<template v-if="!hover"><i class="ph-folder-notch ph-bold ph-lg ph-fw ph-lg"></i></template>
-		{{ folder.name }}
-	</p>
-	<p v-if="defaultStore.state.uploadFolder == folder.id" class="upload">
-		{{ i18n.ts.uploadFolder }}
-	</p>
-	<button v-if="selectMode" class="checkbox _button" :class="{ checked: isSelected }" @click.prevent.stop="checkboxClicked"></button>
-</div>
+	<div
+		class="rghtznwe"
+		:class="{ draghover }"
+		draggable="true"
+		:title="title"
+		@click="onClick"
+		@contextmenu.stop="onContextmenu"
+		@mouseover="onMouseover"
+		@mouseout="onMouseout"
+		@dragover.prevent.stop="onDragover"
+		@dragenter.prevent="onDragenter"
+		@dragleave="onDragleave"
+		@drop.prevent.stop="onDrop"
+		@dragstart="onDragstart"
+		@dragend="onDragend"
+	>
+		<p class="name">
+			<template v-if="hover"
+				><i class="ph-folder-notch-open ph-bold ph-lg ph-fw ph-lg"></i
+			></template>
+			<template v-if="!hover"
+				><i class="ph-folder-notch ph-bold ph-lg ph-fw ph-lg"></i
+			></template>
+			{{ folder.name }}
+		</p>
+		<p v-if="defaultStore.state.uploadFolder == folder.id" class="upload">
+			{{ i18n.ts.uploadFolder }}
+		</p>
+		<button
+			v-if="selectMode"
+			class="checkbox _button"
+			:class="{ checked: isSelected }"
+			@click.prevent.stop="checkboxClicked"
+		></button>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, ref } from 'vue';
-import * as Misskey from 'calckey-js';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { defaultStore } from '@/store';
+import { computed, defineAsyncComponent, ref } from "vue";
+import * as Misskey from "calckey-js";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { defaultStore } from "@/store";
 
-const props = withDefaults(defineProps<{
-	folder: Misskey.entities.DriveFolder;
-	isSelected?: boolean;
-	selectMode?: boolean;
-}>(), {
-	isSelected: false,
-	selectMode: false,
-});
+const props = withDefaults(
+	defineProps<{
+		folder: Misskey.entities.DriveFolder;
+		isSelected?: boolean;
+		selectMode?: boolean;
+	}>(),
+	{
+		isSelected: false,
+		selectMode: false,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'chosen', 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;
-	(ev: 'removeFolder', v: Misskey.entities.DriveFolder['id']): void;
-	(ev: 'dragstart'): void;
-	(ev: 'dragend'): void;
+	(ev: "chosen", 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;
+	(ev: "removeFolder", v: Misskey.entities.DriveFolder["id"]): void;
+	(ev: "dragstart"): void;
+	(ev: "dragend"): void;
 }>();
 
 const hover = ref(false);
@@ -60,11 +72,11 @@ const isDragging = ref(false);
 const title = computed(() => props.folder.name);
 
 function checkboxClicked() {
-	emit('chosen', props.folder);
+	emit("chosen", props.folder);
 }
 
 function onClick() {
-	emit('move', props.folder);
+	emit("move", props.folder);
 }
 
 function onMouseover() {
@@ -81,18 +93,20 @@ function onDragover(ev: DragEvent) {
 	// 自分自身がドラッグされている場合
 	if (isDragging.value) {
 		// 自分自身にはドロップさせない
-		ev.dataTransfer.dropEffect = 'none';
+		ev.dataTransfer.dropEffect = "none";
 		return;
 	}
 
-	const isFile = ev.dataTransfer.items[0].kind === 'file';
+	const isFile = ev.dataTransfer.items[0].kind === "file";
 	const isDriveFile = ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FILE_;
-	const isDriveFolder = ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FOLDER_;
+	const isDriveFolder =
+		ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FOLDER_;
 
 	if (isFile || isDriveFile || isDriveFolder) {
-		ev.dataTransfer.dropEffect = ev.dataTransfer.effectAllowed === 'all' ? 'copy' : 'move';
+		ev.dataTransfer.dropEffect =
+			ev.dataTransfer.effectAllowed === "all" ? "copy" : "move";
 	} else {
-		ev.dataTransfer.dropEffect = 'none';
+		ev.dataTransfer.dropEffect = "none";
 	}
 }
 
@@ -112,17 +126,17 @@ function onDrop(ev: DragEvent) {
 	// ファイルだったら
 	if (ev.dataTransfer.files.length > 0) {
 		for (const file of Array.from(ev.dataTransfer.files)) {
-			emit('upload', file, props.folder);
+			emit("upload", file, props.folder);
 		}
 		return;
 	}
 
 	//#region ドライブのファイル
 	const driveFile = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
-	if (driveFile != null && driveFile !== '') {
+	if (driveFile != null && driveFile !== "") {
 		const file = JSON.parse(driveFile);
-		emit('removeFile', file.id);
-		os.api('drive/files/update', {
+		emit("removeFile", file.id);
+		os.api("drive/files/update", {
 			fileId: file.id,
 			folderId: props.folder.id,
 		});
@@ -131,33 +145,35 @@ function onDrop(ev: DragEvent) {
 
 	//#region ドライブのフォルダ
 	const driveFolder = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FOLDER_);
-	if (driveFolder != null && driveFolder !== '') {
+	if (driveFolder != null && driveFolder !== "") {
 		const folder = JSON.parse(driveFolder);
 
 		// 移動先が自分自身ならreject
 		if (folder.id === props.folder.id) return;
 
-		emit('removeFolder', folder.id);
-		os.api('drive/folders/update', {
+		emit("removeFolder", folder.id);
+		os.api("drive/folders/update", {
 			folderId: folder.id,
 			parentId: props.folder.id,
-		}).then(() => {
-			// noop
-		}).catch(err => {
-			switch (err) {
-				case 'detected-circular-definition':
-					os.alert({
-						title: i18n.ts.unableToProcess,
-						text: i18n.ts.circularReferenceFolder,
-					});
-					break;
-				default:
-					os.alert({
-						type: 'error',
-						text: i18n.ts.somethingHappened,
-					});
-			}
-		});
+		})
+			.then(() => {
+				// noop
+			})
+			.catch((err) => {
+				switch (err) {
+					case "detected-circular-definition":
+						os.alert({
+							title: i18n.ts.unableToProcess,
+							text: i18n.ts.circularReferenceFolder,
+						});
+						break;
+					default:
+						os.alert({
+							type: "error",
+							text: i18n.ts.somethingHappened,
+						});
+				}
+			});
 	}
 	//#endregion
 }
@@ -165,22 +181,25 @@ function onDrop(ev: DragEvent) {
 function onDragstart(ev: DragEvent) {
 	if (!ev.dataTransfer) return;
 
-	ev.dataTransfer.effectAllowed = 'move';
-	ev.dataTransfer.setData(_DATA_TRANSFER_DRIVE_FOLDER_, JSON.stringify(props.folder));
+	ev.dataTransfer.effectAllowed = "move";
+	ev.dataTransfer.setData(
+		_DATA_TRANSFER_DRIVE_FOLDER_,
+		JSON.stringify(props.folder)
+	);
 	isDragging.value = true;
 
 	// 親ブラウザに対して、ドラッグが開始されたフラグを立てる
 	// (=あなたの子供が、ドラッグを開始しましたよ)
-	emit('dragstart');
+	emit("dragstart");
 }
 
 function onDragend() {
 	isDragging.value = false;
-	emit('dragend');
+	emit("dragend");
 }
 
 function go() {
-	emit('move', props.folder.id);
+	emit("move", props.folder.id);
 }
 
 function rename() {
@@ -190,7 +209,7 @@ function rename() {
 		default: props.folder.name,
 	}).then(({ canceled, result: name }) => {
 		if (canceled) return;
-		os.api('drive/folders/update', {
+		os.api("drive/folders/update", {
 			folderId: props.folder.id,
 			name: name,
 		});
@@ -198,54 +217,71 @@ function rename() {
 }
 
 function deleteFolder() {
-	os.api('drive/folders/delete', {
+	os.api("drive/folders/delete", {
 		folderId: props.folder.id,
-	}).then(() => {
-		if (defaultStore.state.uploadFolder === props.folder.id) {
-			defaultStore.set('uploadFolder', null);
-		}
-	}).catch(err => {
-		switch (err.id) {
-			case 'b0fc8a17-963c-405d-bfbc-859a487295e1':
-				os.alert({
-					type: 'error',
-					title: i18n.ts.unableToDelete,
-					text: i18n.ts.hasChildFilesOrFolders,
-				});
-				break;
-			default:
-				os.alert({
-					type: 'error',
-					text: i18n.ts.unableToDelete,
-				});
-		}
-	});
+	})
+		.then(() => {
+			if (defaultStore.state.uploadFolder === props.folder.id) {
+				defaultStore.set("uploadFolder", null);
+			}
+		})
+		.catch((err) => {
+			switch (err.id) {
+				case "b0fc8a17-963c-405d-bfbc-859a487295e1":
+					os.alert({
+						type: "error",
+						title: i18n.ts.unableToDelete,
+						text: i18n.ts.hasChildFilesOrFolders,
+					});
+					break;
+				default:
+					os.alert({
+						type: "error",
+						text: i18n.ts.unableToDelete,
+					});
+			}
+		});
 }
 
 function setAsUploadFolder() {
-	defaultStore.set('uploadFolder', props.folder.id);
+	defaultStore.set("uploadFolder", props.folder.id);
 }
 
 function onContextmenu(ev: MouseEvent) {
-	os.contextMenu([{
-		text: i18n.ts.openInWindow,
-		icon: 'ph-copy ph-bold ph-lg',
-		action: () => {
-			os.popup(defineAsyncComponent(() => import('@/components/MkDriveWindow.vue')), {
-				initialFolder: props.folder,
-			}, {
-			}, 'closed');
-		},
-	}, null, {
-		text: i18n.ts.rename,
-		icon: 'ph-cursor-text ph-bold ph-lg',
-		action: rename,
-	}, null, {
-		text: i18n.ts.delete,
-		icon: 'ph-trash ph-bold ph-lg',
-		danger: true,
-		action: deleteFolder,
-	}], ev);
+	os.contextMenu(
+		[
+			{
+				text: i18n.ts.openInWindow,
+				icon: "ph-copy ph-bold ph-lg",
+				action: () => {
+					os.popup(
+						defineAsyncComponent(
+							() => import("@/components/MkDriveWindow.vue")
+						),
+						{
+							initialFolder: props.folder,
+						},
+						{},
+						"closed"
+					);
+				},
+			},
+			null,
+			{
+				text: i18n.ts.rename,
+				icon: "ph-cursor-text ph-bold ph-lg",
+				action: rename,
+			},
+			null,
+			{
+				text: i18n.ts.delete,
+				icon: "ph-trash ph-bold ph-lg",
+				danger: true,
+				action: deleteFolder,
+			},
+		],
+		ev
+	);
 }
 </script>
 
@@ -257,7 +293,8 @@ function onContextmenu(ev: MouseEvent) {
 	background: var(--driveFolderBg);
 	border-radius: 4px;
 
-	&, * {
+	&,
+	* {
 		cursor: pointer;
 	}
 
diff --git a/packages/client/src/components/MkDrive.navFolder.vue b/packages/client/src/components/MkDrive.navFolder.vue
index 38fd76877..aa0bea192 100644
--- a/packages/client/src/components/MkDrive.navFolder.vue
+++ b/packages/client/src/components/MkDrive.navFolder.vue
@@ -1,22 +1,23 @@
 <template>
-<div class="drylbebk"
-	:class="{ draghover }"
-	@click="onClick"
-	@dragover.prevent.stop="onDragover"
-	@dragenter="onDragenter"
-	@dragleave="onDragleave"
-	@drop.stop="onDrop"
->
-	<i v-if="folder == null" class="ph-cloud ph-bold ph-lg"></i>
-	<span>{{ folder == null ? i18n.ts.drive : folder.name }}</span>
-</div>
+	<div
+		class="drylbebk"
+		:class="{ draghover }"
+		@click="onClick"
+		@dragover.prevent.stop="onDragover"
+		@dragenter="onDragenter"
+		@dragleave="onDragleave"
+		@drop.stop="onDrop"
+	>
+		<i v-if="folder == null" class="ph-cloud ph-bold ph-lg"></i>
+		<span>{{ folder == null ? i18n.ts.drive : folder.name }}</span>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import * as Misskey from 'calckey-js';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { ref } from "vue";
+import * as Misskey from "calckey-js";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	folder?: Misskey.entities.DriveFolder;
@@ -24,17 +25,21 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'move', v?: Misskey.entities.DriveFolder): void;
-	(ev: 'upload', file: File, folder?: Misskey.entities.DriveFolder | null): void;
-	(ev: 'removeFile', v: Misskey.entities.DriveFile['id']): void;
-	(ev: 'removeFolder', v: Misskey.entities.DriveFolder['id']): void;
+	(ev: "move", v?: Misskey.entities.DriveFolder): void;
+	(
+		ev: "upload",
+		file: File,
+		folder?: Misskey.entities.DriveFolder | null
+	): void;
+	(ev: "removeFile", v: Misskey.entities.DriveFile["id"]): void;
+	(ev: "removeFolder", v: Misskey.entities.DriveFolder["id"]): void;
 }>();
 
 const hover = ref(false);
 const draghover = ref(false);
 
 function onClick() {
-	emit('move', props.folder);
+	emit("move", props.folder);
 }
 
 function onMouseover() {
@@ -50,17 +55,19 @@ function onDragover(ev: DragEvent) {
 
 	// このフォルダがルートかつカレントディレクトリならドロップ禁止
 	if (props.folder == null && props.parentFolder == null) {
-		ev.dataTransfer.dropEffect = 'none';
+		ev.dataTransfer.dropEffect = "none";
 	}
 
-	const isFile = ev.dataTransfer.items[0].kind === 'file';
+	const isFile = ev.dataTransfer.items[0].kind === "file";
 	const isDriveFile = ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FILE_;
-	const isDriveFolder = ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FOLDER_;
+	const isDriveFolder =
+		ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FOLDER_;
 
 	if (isFile || isDriveFile || isDriveFolder) {
-		ev.dataTransfer.dropEffect = ev.dataTransfer.effectAllowed === 'all' ? 'copy' : 'move';
+		ev.dataTransfer.dropEffect =
+			ev.dataTransfer.effectAllowed === "all" ? "copy" : "move";
 	} else {
-		ev.dataTransfer.dropEffect = 'none';
+		ev.dataTransfer.dropEffect = "none";
 	}
 
 	return false;
@@ -82,33 +89,33 @@ function onDrop(ev: DragEvent) {
 	// ファイルだったら
 	if (ev.dataTransfer.files.length > 0) {
 		for (const file of Array.from(ev.dataTransfer.files)) {
-			emit('upload', file, props.folder);
+			emit("upload", file, props.folder);
 		}
 		return;
 	}
 
 	//#region ドライブのファイル
 	const driveFile = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
-	if (driveFile != null && driveFile !== '') {
+	if (driveFile != null && driveFile !== "") {
 		const file = JSON.parse(driveFile);
-		emit('removeFile', file.id);
-		os.api('drive/files/update', {
+		emit("removeFile", file.id);
+		os.api("drive/files/update", {
 			fileId: file.id,
-			folderId: props.folder ? props.folder.id : null
+			folderId: props.folder ? props.folder.id : null,
 		});
 	}
 	//#endregion
 
 	//#region ドライブのフォルダ
 	const driveFolder = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FOLDER_);
-	if (driveFolder != null && driveFolder !== '') {
+	if (driveFolder != null && driveFolder !== "") {
 		const folder = JSON.parse(driveFolder);
 		// 移動先が自分自身ならreject
 		if (props.folder && folder.id === props.folder.id) return;
-		emit('removeFolder', folder.id);
-		os.api('drive/folders/update', {
+		emit("removeFolder", folder.id);
+		os.api("drive/folders/update", {
 			folderId: folder.id,
-			parentId: props.folder ? props.folder.id : null
+			parentId: props.folder ? props.folder.id : null,
 		});
 	}
 	//#endregion
diff --git a/packages/client/src/components/MkDrive.vue b/packages/client/src/components/MkDrive.vue
index 24c400c3e..d52e796e5 100644
--- a/packages/client/src/components/MkDrive.vue
+++ b/packages/client/src/components/MkDrive.vue
@@ -1,121 +1,181 @@
 <template>
-<div class="yfudmmck">
-	<nav>
-		<div class="path" @contextmenu.prevent.stop="() => {}">
-			<XNavFolder
-				:class="{ current: folder == null }"
-				:parent-folder="folder"
-				@move="move"
-				@upload="upload"
-				@removeFile="removeFile"
-				@removeFolder="removeFolder"
-			/>
-			<template v-for="f in hierarchyFolders">
-				<span class="separator"><i class="ph-caret-right ph-bold ph-lg"></i></span>
+	<div class="yfudmmck">
+		<nav>
+			<div class="path" @contextmenu.prevent.stop="() => {}">
 				<XNavFolder
-					:folder="f"
+					:class="{ current: folder == null }"
 					:parent-folder="folder"
 					@move="move"
 					@upload="upload"
 					@removeFile="removeFile"
 					@removeFolder="removeFolder"
 				/>
-			</template>
-			<span v-if="folder != null" class="separator"><i class="ph-caret-right ph-bold ph-lg"></i></span>
-			<span v-if="folder != null" class="folder current">{{ folder.name }}</span>
+				<template v-for="f in hierarchyFolders">
+					<span class="separator"
+						><i class="ph-caret-right ph-bold ph-lg"></i
+					></span>
+					<XNavFolder
+						:folder="f"
+						:parent-folder="folder"
+						@move="move"
+						@upload="upload"
+						@removeFile="removeFile"
+						@removeFolder="removeFolder"
+					/>
+				</template>
+				<span v-if="folder != null" class="separator"
+					><i class="ph-caret-right ph-bold ph-lg"></i
+				></span>
+				<span v-if="folder != null" class="folder current">{{
+					folder.name
+				}}</span>
+			</div>
+			<button class="menu _button" @click="showMenu">
+				<i class="ph-dots-three-outline ph-bold ph-lg"></i>
+			</button>
+		</nav>
+		<div
+			ref="main"
+			class="main"
+			:class="{ uploading: uploadings.length > 0, fetching }"
+			@dragover.prevent.stop="onDragover"
+			@dragenter="onDragenter"
+			@dragleave="onDragleave"
+			@drop.prevent.stop="onDrop"
+			@contextmenu.stop="onContextmenu"
+		>
+			<div ref="contents" class="contents">
+				<div
+					v-show="folders.length > 0"
+					ref="foldersContainer"
+					class="folders"
+				>
+					<XFolder
+						v-for="(f, i) in folders"
+						:key="f.id"
+						v-anim="i"
+						class="folder"
+						:folder="f"
+						:select-mode="select === 'folder'"
+						:is-selected="
+							selectedFolders.some((x) => x.id === f.id)
+						"
+						@chosen="chooseFolder"
+						@move="move"
+						@upload="upload"
+						@removeFile="removeFile"
+						@removeFolder="removeFolder"
+						@dragstart="isDragSource = true"
+						@dragend="isDragSource = false"
+					/>
+					<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
+					<div v-for="(n, i) in 16" :key="i" class="padding"></div>
+					<MkButton v-if="moreFolders" ref="moreFolders">{{
+						i18n.ts.loadMore
+					}}</MkButton>
+				</div>
+				<div
+					v-show="files.length > 0"
+					ref="filesContainer"
+					class="files"
+				>
+					<XFile
+						v-for="(file, i) in files"
+						:key="file.id"
+						v-anim="i"
+						class="file"
+						:file="file"
+						:select-mode="select === 'file'"
+						:is-selected="
+							selectedFiles.some((x) => x.id === file.id)
+						"
+						@chosen="chooseFile"
+						@dragstart="isDragSource = true"
+						@dragend="isDragSource = false"
+					/>
+					<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
+					<div v-for="(n, i) in 16" :key="i" class="padding"></div>
+					<MkButton
+						v-show="moreFiles"
+						ref="loadMoreFiles"
+						@click="fetchMoreFiles"
+						>{{ i18n.ts.loadMore }}</MkButton
+					>
+				</div>
+				<div
+					v-if="files.length == 0 && folders.length == 0 && !fetching"
+					class="empty"
+				>
+					<p v-if="draghover">{{ i18n.t("empty-draghover") }}</p>
+					<p v-if="!draghover && folder == null">
+						<strong>{{ i18n.ts.emptyDrive }}</strong
+						><br />{{ i18n.t("empty-drive-description") }}
+					</p>
+					<p v-if="!draghover && folder != null">
+						{{ i18n.ts.emptyFolder }}
+					</p>
+				</div>
+			</div>
+			<MkLoading v-if="fetching" />
 		</div>
-		<button class="menu _button" @click="showMenu"><i class="ph-dots-three-outline ph-bold ph-lg"></i></button>
-	</nav>
-	<div
-		ref="main" class="main"
-		:class="{ uploading: uploadings.length > 0, fetching }"
-		@dragover.prevent.stop="onDragover"
-		@dragenter="onDragenter"
-		@dragleave="onDragleave"
-		@drop.prevent.stop="onDrop"
-		@contextmenu.stop="onContextmenu"
-	>
-		<div ref="contents" class="contents">
-			<div v-show="folders.length > 0" ref="foldersContainer" class="folders">
-				<XFolder
-					v-for="(f, i) in folders"
-					:key="f.id"
-					v-anim="i"
-					class="folder"
-					:folder="f"
-					:select-mode="select === 'folder'"
-					:is-selected="selectedFolders.some(x => x.id === f.id)"
-					@chosen="chooseFolder"
-					@move="move"
-					@upload="upload"
-					@removeFile="removeFile"
-					@removeFolder="removeFolder"
-					@dragstart="isDragSource = true"
-					@dragend="isDragSource = false"
-				/>
-				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
-				<div v-for="(n, i) in 16" :key="i" class="padding"></div>
-				<MkButton v-if="moreFolders" ref="moreFolders">{{ i18n.ts.loadMore }}</MkButton>
-			</div>
-			<div v-show="files.length > 0" ref="filesContainer" class="files">
-				<XFile
-					v-for="(file, i) in files"
-					:key="file.id"
-					v-anim="i"
-					class="file"
-					:file="file"
-					:select-mode="select === 'file'"
-					:is-selected="selectedFiles.some(x => x.id === file.id)"
-					@chosen="chooseFile"
-					@dragstart="isDragSource = true"
-					@dragend="isDragSource = false"
-				/>
-				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
-				<div v-for="(n, i) in 16" :key="i" class="padding"></div>
-				<MkButton v-show="moreFiles" ref="loadMoreFiles" @click="fetchMoreFiles">{{ i18n.ts.loadMore }}</MkButton>
-			</div>
-			<div v-if="files.length == 0 && folders.length == 0 && !fetching" class="empty">
-				<p v-if="draghover">{{ i18n.t('empty-draghover') }}</p>
-				<p v-if="!draghover && folder == null"><strong>{{ i18n.ts.emptyDrive }}</strong><br/>{{ i18n.t('empty-drive-description') }}</p>
-				<p v-if="!draghover && folder != null">{{ i18n.ts.emptyFolder }}</p>
-			</div>
-		</div>
-		<MkLoading v-if="fetching"/>
+		<div v-if="draghover" class="dropzone"></div>
+		<input
+			ref="fileInput"
+			type="file"
+			accept="*/*"
+			multiple
+			tabindex="-1"
+			@change="onChangeFileInput"
+		/>
 	</div>
-	<div v-if="draghover" class="dropzone"></div>
-	<input ref="fileInput" type="file" accept="*/*" multiple tabindex="-1" @change="onChangeFileInput"/>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { markRaw, nextTick, onActivated, onBeforeUnmount, onMounted, ref, watch } from 'vue';
-import * as Misskey from 'calckey-js';
-import MkButton from './MkButton.vue';
-import XNavFolder from '@/components/MkDrive.navFolder.vue';
-import XFolder from '@/components/MkDrive.folder.vue';
-import XFile from '@/components/MkDrive.file.vue';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import { uploadFile, uploads } from '@/scripts/upload';
+import {
+	markRaw,
+	nextTick,
+	onActivated,
+	onBeforeUnmount,
+	onMounted,
+	ref,
+	watch,
+} from "vue";
+import * as Misskey from "calckey-js";
+import MkButton from "./MkButton.vue";
+import XNavFolder from "@/components/MkDrive.navFolder.vue";
+import XFolder from "@/components/MkDrive.folder.vue";
+import XFile from "@/components/MkDrive.file.vue";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { uploadFile, uploads } from "@/scripts/upload";
 
-const props = withDefaults(defineProps<{
-	initialFolder?: Misskey.entities.DriveFolder;
-	type?: string;
-	multiple?: boolean;
-	select?: 'file' | 'folder' | null;
-}>(), {
-	multiple: false,
-	select: null,
-});
+const props = withDefaults(
+	defineProps<{
+		initialFolder?: Misskey.entities.DriveFolder;
+		type?: string;
+		multiple?: boolean;
+		select?: "file" | "folder" | null;
+	}>(),
+	{
+		multiple: false,
+		select: null,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'selected', v: Misskey.entities.DriveFile | Misskey.entities.DriveFolder): void;
-	(ev: 'change-selection', v: Misskey.entities.DriveFile[] | Misskey.entities.DriveFolder[]): void;
-	(ev: 'move-root'): void;
-	(ev: 'cd', v: Misskey.entities.DriveFolder | null): void;
-	(ev: 'open-folder', v: Misskey.entities.DriveFolder): void;
+	(
+		ev: "selected",
+		v: Misskey.entities.DriveFile | Misskey.entities.DriveFolder
+	): void;
+	(
+		ev: "change-selection",
+		v: Misskey.entities.DriveFile[] | Misskey.entities.DriveFolder[]
+	): void;
+	(ev: "move-root"): void;
+	(ev: "cd", v: Misskey.entities.DriveFolder | null): void;
+	(ev: "open-folder", v: Misskey.entities.DriveFolder): void;
 }>();
 
 const loadMoreFiles = ref<InstanceType<typeof MkButton>>();
@@ -130,7 +190,7 @@ const hierarchyFolders = ref<Misskey.entities.DriveFolder[]>([]);
 const selectedFiles = ref<Misskey.entities.DriveFile[]>([]);
 const selectedFolders = ref<Misskey.entities.DriveFolder[]>([]);
 const uploadings = uploads;
-const connection = stream.useChannel('drive');
+const connection = stream.useChannel("drive");
 const keepOriginal = ref<boolean>(defaultStore.state.keepOriginalUploading); // 外部渡しが多いので$refは使わないほうがよい
 
 // ドロップされようとしているか
@@ -143,10 +203,14 @@ const isDragSource = ref(false);
 const fetching = ref(true);
 
 const ilFilesObserver = new IntersectionObserver(
-	(entries) => entries.some((entry) => entry.isIntersecting) && !fetching.value && moreFiles.value && fetchMoreFiles(),
+	(entries) =>
+		entries.some((entry) => entry.isIntersecting) &&
+		!fetching.value &&
+		moreFiles.value &&
+		fetchMoreFiles()
 );
 
-watch(folder, () => emit('cd', folder.value));
+watch(folder, () => emit("cd", folder.value));
 
 function onStreamDriveFileCreated(file: Misskey.entities.DriveFile) {
 	addFile(file, true);
@@ -165,11 +229,15 @@ function onStreamDriveFileDeleted(fileId: string) {
 	removeFile(fileId);
 }
 
-function onStreamDriveFolderCreated(createdFolder: Misskey.entities.DriveFolder) {
+function onStreamDriveFolderCreated(
+	createdFolder: Misskey.entities.DriveFolder
+) {
 	addFolder(createdFolder, true);
 }
 
-function onStreamDriveFolderUpdated(updatedFolder: Misskey.entities.DriveFolder) {
+function onStreamDriveFolderUpdated(
+	updatedFolder: Misskey.entities.DriveFolder
+) {
 	const current = folder.value ? folder.value.id : null;
 	if (current !== updatedFolder.parentId) {
 		removeFolder(updatedFolder);
@@ -188,17 +256,19 @@ function onDragover(ev: DragEvent): any {
 	// ドラッグ元が自分自身の所有するアイテムだったら
 	if (isDragSource.value) {
 		// 自分自身にはドロップさせない
-		ev.dataTransfer.dropEffect = 'none';
+		ev.dataTransfer.dropEffect = "none";
 		return;
 	}
 
-	const isFile = ev.dataTransfer.items[0].kind === 'file';
+	const isFile = ev.dataTransfer.items[0].kind === "file";
 	const isDriveFile = ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FILE_;
-	const isDriveFolder = ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FOLDER_;
+	const isDriveFolder =
+		ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FOLDER_;
 	if (isFile || isDriveFile || isDriveFolder) {
-		ev.dataTransfer.dropEffect = ev.dataTransfer.effectAllowed === 'all' ? 'copy' : 'move';
+		ev.dataTransfer.dropEffect =
+			ev.dataTransfer.effectAllowed === "all" ? "copy" : "move";
 	} else {
-		ev.dataTransfer.dropEffect = 'none';
+		ev.dataTransfer.dropEffect = "none";
 	}
 
 	return false;
@@ -227,11 +297,11 @@ function onDrop(ev: DragEvent): any {
 
 	//#region ドライブのファイル
 	const driveFile = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
-	if (driveFile != null && driveFile !== '') {
+	if (driveFile != null && driveFile !== "") {
 		const file = JSON.parse(driveFile);
-		if (files.value.some(f => f.id === file.id)) return;
+		if (files.value.some((f) => f.id === file.id)) return;
 		removeFile(file.id);
-		os.api('drive/files/update', {
+		os.api("drive/files/update", {
 			fileId: file.id,
 			folderId: folder.value ? folder.value.id : null,
 		});
@@ -240,33 +310,35 @@ function onDrop(ev: DragEvent): any {
 
 	//#region ドライブのフォルダ
 	const driveFolder = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FOLDER_);
-	if (driveFolder != null && driveFolder !== '') {
+	if (driveFolder != null && driveFolder !== "") {
 		const droppedFolder = JSON.parse(driveFolder);
 
 		// 移動先が自分自身ならreject
 		if (folder.value && droppedFolder.id === folder.value.id) return false;
-		if (folders.value.some(f => f.id === droppedFolder.id)) return false;
+		if (folders.value.some((f) => f.id === droppedFolder.id)) return false;
 		removeFolder(droppedFolder.id);
-		os.api('drive/folders/update', {
+		os.api("drive/folders/update", {
 			folderId: droppedFolder.id,
 			parentId: folder.value ? folder.value.id : null,
-		}).then(() => {
-			// noop
-		}).catch(err => {
-			switch (err) {
-				case 'detected-circular-definition':
-					os.alert({
-						title: i18n.ts.unableToProcess,
-						text: i18n.ts.circularReferenceFolder,
-					});
-					break;
-				default:
-					os.alert({
-						type: 'error',
-						text: i18n.ts.somethingHappened,
-					});
-			}
-		});
+		})
+			.then(() => {
+				// noop
+			})
+			.catch((err) => {
+				switch (err) {
+					case "detected-circular-definition":
+						os.alert({
+							title: i18n.ts.unableToProcess,
+							text: i18n.ts.circularReferenceFolder,
+						});
+						break;
+					default:
+						os.alert({
+							type: "error",
+							text: i18n.ts.somethingHappened,
+						});
+				}
+			});
 	}
 	//#endregion
 }
@@ -278,11 +350,11 @@ function selectLocalFile() {
 function urlUpload() {
 	os.inputText({
 		title: i18n.ts.uploadFromUrl,
-		type: 'url',
+		type: "url",
 		placeholder: i18n.ts.uploadFromUrlDescription,
 	}).then(({ canceled, result: url }) => {
 		if (canceled || !url) return;
-		os.api('drive/files/upload-from-url', {
+		os.api("drive/files/upload-from-url", {
 			url: url,
 			folderId: folder.value ? folder.value.id : undefined,
 		});
@@ -300,10 +372,10 @@ function createFolder() {
 		placeholder: i18n.ts.folderName,
 	}).then(({ canceled, result: name }) => {
 		if (canceled) return;
-		os.api('drive/folders/create', {
+		os.api("drive/folders/create", {
 			name: name,
 			parentId: folder.value ? folder.value.id : undefined,
-		}).then(createdFolder => {
+		}).then((createdFolder) => {
 			addFolder(createdFolder, true);
 		});
 	});
@@ -316,10 +388,10 @@ function renameFolder(folderToRename: Misskey.entities.DriveFolder) {
 		default: folderToRename.name,
 	}).then(({ canceled, result: name }) => {
 		if (canceled) return;
-		os.api('drive/folders/update', {
+		os.api("drive/folders/update", {
 			folderId: folderToRename.id,
 			name: name,
-		}).then(updatedFolder => {
+		}).then((updatedFolder) => {
 			// FIXME: 画面を更新するために自分自身に移動
 			move(updatedFolder);
 		});
@@ -327,27 +399,29 @@ function renameFolder(folderToRename: Misskey.entities.DriveFolder) {
 }
 
 function deleteFolder(folderToDelete: Misskey.entities.DriveFolder) {
-	os.api('drive/folders/delete', {
+	os.api("drive/folders/delete", {
 		folderId: folderToDelete.id,
-	}).then(() => {
-		// 削除時に親フォルダに移動
-		move(folderToDelete.parentId);
-	}).catch(err => {
-		switch (err.id) {
-			case 'b0fc8a17-963c-405d-bfbc-859a487295e1':
-				os.alert({
-					type: 'error',
-					title: i18n.ts.unableToDelete,
-					text: i18n.ts.hasChildFilesOrFolders,
-				});
-				break;
-			default:
-				os.alert({
-					type: 'error',
-					text: i18n.ts.unableToDelete,
-				});
-		}
-	});
+	})
+		.then(() => {
+			// 削除時に親フォルダに移動
+			move(folderToDelete.parentId);
+		})
+		.catch((err) => {
+			switch (err.id) {
+				case "b0fc8a17-963c-405d-bfbc-859a487295e1":
+					os.alert({
+						type: "error",
+						title: i18n.ts.unableToDelete,
+						text: i18n.ts.hasChildFilesOrFolders,
+					});
+					break;
+				default:
+					os.alert({
+						type: "error",
+						text: i18n.ts.unableToDelete,
+					});
+			}
+		});
 }
 
 function onChangeFileInput() {
@@ -357,46 +431,62 @@ function onChangeFileInput() {
 	}
 }
 
-function upload(file: File, folderToUpload?: Misskey.entities.DriveFolder | null) {
-	uploadFile(file, (folderToUpload && typeof folderToUpload === 'object') ? folderToUpload.id : null, undefined, keepOriginal.value).then(res => {
+function upload(
+	file: File,
+	folderToUpload?: Misskey.entities.DriveFolder | null
+) {
+	uploadFile(
+		file,
+		folderToUpload && typeof folderToUpload === "object"
+			? folderToUpload.id
+			: null,
+		undefined,
+		keepOriginal.value
+	).then((res) => {
 		addFile(res, true);
 	});
 }
 
 function chooseFile(file: Misskey.entities.DriveFile) {
-	const isAlreadySelected = selectedFiles.value.some(f => f.id === file.id);
+	const isAlreadySelected = selectedFiles.value.some((f) => f.id === file.id);
 	if (props.multiple) {
 		if (isAlreadySelected) {
-			selectedFiles.value = selectedFiles.value.filter(f => f.id !== file.id);
+			selectedFiles.value = selectedFiles.value.filter(
+				(f) => f.id !== file.id
+			);
 		} else {
 			selectedFiles.value.push(file);
 		}
-		emit('change-selection', selectedFiles.value);
+		emit("change-selection", selectedFiles.value);
 	} else {
 		if (isAlreadySelected) {
-			emit('selected', file);
+			emit("selected", file);
 		} else {
 			selectedFiles.value = [file];
-			emit('change-selection', [file]);
+			emit("change-selection", [file]);
 		}
 	}
 }
 
 function chooseFolder(folderToChoose: Misskey.entities.DriveFolder) {
-	const isAlreadySelected = selectedFolders.value.some(f => f.id === folderToChoose.id);
+	const isAlreadySelected = selectedFolders.value.some(
+		(f) => f.id === folderToChoose.id
+	);
 	if (props.multiple) {
 		if (isAlreadySelected) {
-			selectedFolders.value = selectedFolders.value.filter(f => f.id !== folderToChoose.id);
+			selectedFolders.value = selectedFolders.value.filter(
+				(f) => f.id !== folderToChoose.id
+			);
 		} else {
 			selectedFolders.value.push(folderToChoose);
 		}
-		emit('change-selection', selectedFolders.value);
+		emit("change-selection", selectedFolders.value);
 	} else {
 		if (isAlreadySelected) {
-			emit('selected', folderToChoose);
+			emit("selected", folderToChoose);
 		} else {
 			selectedFolders.value = [folderToChoose];
-			emit('change-selection', [folderToChoose]);
+			emit("change-selection", [folderToChoose]);
 		}
 	}
 }
@@ -405,26 +495,26 @@ function move(target?: Misskey.entities.DriveFolder) {
 	if (!target) {
 		goRoot();
 		return;
-	} else if (typeof target === 'object') {
+	} else if (typeof target === "object") {
 		target = target.id;
 	}
 
 	fetching.value = true;
 
-	os.api('drive/folders/show', {
+	os.api("drive/folders/show", {
 		folderId: target,
-	}).then(folderToMove => {
+	}).then((folderToMove) => {
 		folder.value = folderToMove;
 		hierarchyFolders.value = [];
 
-		const dive = folderToDive => {
+		const dive = (folderToDive) => {
 			hierarchyFolders.value.unshift(folderToDive);
 			if (folderToDive.parent) dive(folderToDive.parent);
 		};
 
 		if (folderToMove.parent) dive(folderToMove.parent);
 
-		emit('open-folder', folderToMove);
+		emit("open-folder", folderToMove);
 		fetch();
 	});
 }
@@ -433,8 +523,8 @@ function addFolder(folderToAdd: Misskey.entities.DriveFolder, unshift = false) {
 	const current = folder.value ? folder.value.id : null;
 	if (current !== folderToAdd.parentId) return;
 
-	if (folders.value.some(f => f.id === folderToAdd.id)) {
-		const exist = folders.value.map(f => f.id).indexOf(folderToAdd.id);
+	if (folders.value.some((f) => f.id === folderToAdd.id)) {
+		const exist = folders.value.map((f) => f.id).indexOf(folderToAdd.id);
 		folders.value[exist] = folderToAdd;
 		return;
 	}
@@ -450,8 +540,8 @@ function addFile(fileToAdd: Misskey.entities.DriveFile, unshift = false) {
 	const current = folder.value ? folder.value.id : null;
 	if (current !== fileToAdd.folderId) return;
 
-	if (files.value.some(f => f.id === fileToAdd.id)) {
-		const exist = files.value.map(f => f.id).indexOf(fileToAdd.id);
+	if (files.value.some((f) => f.id === fileToAdd.id)) {
+		const exist = files.value.map((f) => f.id).indexOf(fileToAdd.id);
 		files.value[exist] = fileToAdd;
 		return;
 	}
@@ -464,13 +554,14 @@ function addFile(fileToAdd: Misskey.entities.DriveFile, unshift = false) {
 }
 
 function removeFolder(folderToRemove: Misskey.entities.DriveFolder | string) {
-	const folderIdToRemove = typeof folderToRemove === 'object' ? folderToRemove.id : folderToRemove;
-	folders.value = folders.value.filter(f => f.id !== folderIdToRemove);
+	const folderIdToRemove =
+		typeof folderToRemove === "object" ? folderToRemove.id : folderToRemove;
+	folders.value = folders.value.filter((f) => f.id !== folderIdToRemove);
 }
 
 function removeFile(file: Misskey.entities.DriveFile | string) {
-	const fileId = typeof file === 'object' ? file.id : file;
-	files.value = files.value.filter(f => f.id !== fileId);
+	const fileId = typeof file === "object" ? file.id : file;
+	files.value = files.value.filter((f) => f.id !== fileId);
 }
 
 function appendFile(file: Misskey.entities.DriveFile) {
@@ -495,7 +586,7 @@ function goRoot() {
 
 	folder.value = null;
 	hierarchyFolders.value = [];
-	emit('move-root');
+	emit("move-root");
 	fetch();
 }
 
@@ -509,30 +600,37 @@ async function fetch() {
 	const foldersMax = 30;
 	const filesMax = 30;
 
-	const foldersPromise = os.api('drive/folders', {
-		folderId: folder.value ? folder.value.id : null,
-		limit: foldersMax + 1,
-	}).then(fetchedFolders => {
-		if (fetchedFolders.length === foldersMax + 1) {
-			moreFolders.value = true;
-			fetchedFolders.pop();
-		}
-		return fetchedFolders;
-	});
+	const foldersPromise = os
+		.api("drive/folders", {
+			folderId: folder.value ? folder.value.id : null,
+			limit: foldersMax + 1,
+		})
+		.then((fetchedFolders) => {
+			if (fetchedFolders.length === foldersMax + 1) {
+				moreFolders.value = true;
+				fetchedFolders.pop();
+			}
+			return fetchedFolders;
+		});
 
-	const filesPromise = os.api('drive/files', {
-		folderId: folder.value ? folder.value.id : null,
-		type: props.type,
-		limit: filesMax + 1,
-	}).then(fetchedFiles => {
-		if (fetchedFiles.length === filesMax + 1) {
-			moreFiles.value = true;
-			fetchedFiles.pop();
-		}
-		return fetchedFiles;
-	});
+	const filesPromise = os
+		.api("drive/files", {
+			folderId: folder.value ? folder.value.id : null,
+			type: props.type,
+			limit: filesMax + 1,
+		})
+		.then((fetchedFiles) => {
+			if (fetchedFiles.length === filesMax + 1) {
+				moreFiles.value = true;
+				fetchedFiles.pop();
+			}
+			return fetchedFiles;
+		});
 
-	const [fetchedFolders, fetchedFiles] = await Promise.all([foldersPromise, filesPromise]);
+	const [fetchedFolders, fetchedFiles] = await Promise.all([
+		foldersPromise,
+		filesPromise,
+	]);
 
 	for (const x of fetchedFolders) appendFolder(x);
 	for (const x of fetchedFiles) appendFile(x);
@@ -546,12 +644,12 @@ function fetchMoreFiles() {
 	const max = 30;
 
 	// ファイル一覧取得
-	os.api('drive/files', {
+	os.api("drive/files", {
 		folderId: folder.value ? folder.value.id : null,
 		type: props.type,
 		untilId: files.value[files.value.length - 1].id,
 		limit: max + 1,
-	}).then(files => {
+	}).then((files) => {
 		if (files.length === max + 1) {
 			moreFiles.value = true;
 			files.pop();
@@ -564,41 +662,71 @@ function fetchMoreFiles() {
 }
 
 function getMenu() {
-	return [{
-		type: 'switch',
-		text: i18n.ts.keepOriginalUploading,
-		ref: keepOriginal,
-	}, null, {
-		text: i18n.ts.addFile,
-		type: 'label',
-	}, {
-		text: i18n.ts.upload,
-		icon: 'ph-upload-simple ph-bold ph-lg',
-		action: () => { selectLocalFile(); },
-	}, {
-		text: i18n.ts.fromUrl,
-		icon: 'ph-link-simple ph-bold ph-lg',
-		action: () => { urlUpload(); },
-	}, null, {
-		text: folder.value ? folder.value.name : i18n.ts.drive,
-		type: 'label',
-	}, folder.value ? {
-		text: i18n.ts.renameFolder,
-		icon: 'ph-cursor-text ph-bold ph-lg',
-		action: () => { renameFolder(folder.value); },
-	} : undefined, folder.value ? {
-		text: i18n.ts.deleteFolder,
-		icon: 'ph-trash ph-bold ph-lg',
-		action: () => { deleteFolder(folder.value as Misskey.entities.DriveFolder); },
-	} : undefined, {
-		text: i18n.ts.createFolder,
-		icon: 'ph-folder-notch-plus ph-bold ph-lg',
-		action: () => { createFolder(); },
-	}];
+	return [
+		{
+			type: "switch",
+			text: i18n.ts.keepOriginalUploading,
+			ref: keepOriginal,
+		},
+		null,
+		{
+			text: i18n.ts.addFile,
+			type: "label",
+		},
+		{
+			text: i18n.ts.upload,
+			icon: "ph-upload-simple ph-bold ph-lg",
+			action: () => {
+				selectLocalFile();
+			},
+		},
+		{
+			text: i18n.ts.fromUrl,
+			icon: "ph-link-simple ph-bold ph-lg",
+			action: () => {
+				urlUpload();
+			},
+		},
+		null,
+		{
+			text: folder.value ? folder.value.name : i18n.ts.drive,
+			type: "label",
+		},
+		folder.value
+			? {
+					text: i18n.ts.renameFolder,
+					icon: "ph-cursor-text ph-bold ph-lg",
+					action: () => {
+						renameFolder(folder.value);
+					},
+			  }
+			: undefined,
+		folder.value
+			? {
+					text: i18n.ts.deleteFolder,
+					icon: "ph-trash ph-bold ph-lg",
+					action: () => {
+						deleteFolder(
+							folder.value as Misskey.entities.DriveFolder
+						);
+					},
+			  }
+			: undefined,
+		{
+			text: i18n.ts.createFolder,
+			icon: "ph-folder-notch-plus ph-bold ph-lg",
+			action: () => {
+				createFolder();
+			},
+		},
+	];
 }
 
 function showMenu(ev: MouseEvent) {
-	os.popupMenu(getMenu(), (ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined);
+	os.popupMenu(
+		getMenu(),
+		(ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined
+	);
 }
 
 function onContextmenu(ev: MouseEvent) {
@@ -612,12 +740,12 @@ onMounted(() => {
 		});
 	}
 
-	connection.on('fileCreated', onStreamDriveFileCreated);
-	connection.on('fileUpdated', onStreamDriveFileUpdated);
-	connection.on('fileDeleted', onStreamDriveFileDeleted);
-	connection.on('folderCreated', onStreamDriveFolderCreated);
-	connection.on('folderUpdated', onStreamDriveFolderUpdated);
-	connection.on('folderDeleted', onStreamDriveFolderDeleted);
+	connection.on("fileCreated", onStreamDriveFileCreated);
+	connection.on("fileUpdated", onStreamDriveFileUpdated);
+	connection.on("fileDeleted", onStreamDriveFileDeleted);
+	connection.on("folderCreated", onStreamDriveFolderCreated);
+	connection.on("folderUpdated", onStreamDriveFolderUpdated);
+	connection.on("folderDeleted", onStreamDriveFolderDeleted);
 
 	if (props.initialFolder) {
 		move(props.initialFolder);
@@ -656,7 +784,8 @@ onBeforeUnmount(() => {
 		font-size: 0.9em;
 		box-shadow: 0 1px 0 var(--divider);
 
-		&, * {
+		&,
+		* {
 			user-select: none;
 		}
 
@@ -714,7 +843,8 @@ onBeforeUnmount(() => {
 		overflow: auto;
 		padding: var(--margin);
 
-		&, * {
+		&,
+		* {
 			user-select: none;
 		}
 
@@ -735,7 +865,6 @@ onBeforeUnmount(() => {
 		}
 
 		> .contents {
-
 			> .folders,
 			> .files {
 				display: flex;
diff --git a/packages/client/src/components/MkDriveFileThumbnail.vue b/packages/client/src/components/MkDriveFileThumbnail.vue
index da8137774..39150c10c 100644
--- a/packages/client/src/components/MkDriveFileThumbnail.vue
+++ b/packages/client/src/components/MkDriveFileThumbnail.vue
@@ -1,23 +1,48 @@
 <template>
-<div ref="thumbnail" class="zdjebgpv">
-	<ImgWithBlurhash v-if="isThumbnailAvailable" :hash="file.blurhash" :src="file.thumbnailUrl" :alt="file.name" :title="file.name" :cover="fit !== 'contain'"/>
-	<i v-else-if="is === 'image'" class="ph-file-image ph-bold ph-lg icon"></i>
-	<i v-else-if="is === 'video'" class="ph-file-video ph-bold ph-lg icon"></i>
-	<i v-else-if="is === 'audio' || is === 'midi'" class="ph-file-audio ph-bold ph-lg icon"></i>
-	<i v-else-if="is === 'csv'" class="ph-file-csv ph-bold ph-lg icon"></i>
-	<i v-else-if="is === 'pdf'" class="ph-file-pdf ph-bold ph-lg icon"></i>
-	<i v-else-if="is === 'textfile'" class="ph-file-text ph-bold ph-lg icon"></i>
-	<i v-else-if="is === 'archive'" class="ph-file-zip ph-bold ph-lg icon"></i>
-	<i v-else class="ph-file ph-bold ph-lg icon"></i>
+	<div ref="thumbnail" class="zdjebgpv">
+		<ImgWithBlurhash
+			v-if="isThumbnailAvailable"
+			:hash="file.blurhash"
+			:src="file.thumbnailUrl"
+			:alt="file.name"
+			:title="file.name"
+			:cover="fit !== 'contain'"
+		/>
+		<i
+			v-else-if="is === 'image'"
+			class="ph-file-image ph-bold ph-lg icon"
+		></i>
+		<i
+			v-else-if="is === 'video'"
+			class="ph-file-video ph-bold ph-lg icon"
+		></i>
+		<i
+			v-else-if="is === 'audio' || is === 'midi'"
+			class="ph-file-audio ph-bold ph-lg icon"
+		></i>
+		<i v-else-if="is === 'csv'" class="ph-file-csv ph-bold ph-lg icon"></i>
+		<i v-else-if="is === 'pdf'" class="ph-file-pdf ph-bold ph-lg icon"></i>
+		<i
+			v-else-if="is === 'textfile'"
+			class="ph-file-text ph-bold ph-lg icon"
+		></i>
+		<i
+			v-else-if="is === 'archive'"
+			class="ph-file-zip ph-bold ph-lg icon"
+		></i>
+		<i v-else class="ph-file ph-bold ph-lg icon"></i>
 
-	<i v-if="isThumbnailAvailable && is === 'video'" class="ph-file-video ph-bold ph-lg icon-sub"></i>
-</div>
+		<i
+			v-if="isThumbnailAvailable && is === 'video'"
+			class="ph-file-video ph-bold ph-lg icon-sub"
+		></i>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import type * as Misskey from 'calckey-js';
-import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
+import { computed } from "vue";
+import type * as Misskey from "calckey-js";
+import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
 
 const props = defineProps<{
 	file: Misskey.entities.DriveFile;
@@ -25,30 +50,33 @@ const props = defineProps<{
 }>();
 
 const is = computed(() => {
-	if (props.file.type.startsWith('image/')) return 'image';
-	if (props.file.type.startsWith('video/')) return 'video';
-	if (props.file.type === 'audio/midi') return 'midi';
-	if (props.file.type.startsWith('audio/')) return 'audio';
-	if (props.file.type.endsWith('/csv')) return 'csv';
-	if (props.file.type.endsWith('/pdf')) return 'pdf';
-	if (props.file.type.startsWith('text/')) return 'textfile';
-	if ([
-		'application/zip',
-		'application/x-cpio',
-		'application/x-bzip',
-		'application/x-bzip2',
-		'application/java-archive',
-		'application/x-rar-compressed',
-		'application/x-tar',
-		'application/gzip',
-		'application/x-7z-compressed',
-	].some(archiveType => archiveType === props.file.type)) return 'archive';
-	return 'unknown';
+	if (props.file.type.startsWith("image/")) return "image";
+	if (props.file.type.startsWith("video/")) return "video";
+	if (props.file.type === "audio/midi") return "midi";
+	if (props.file.type.startsWith("audio/")) return "audio";
+	if (props.file.type.endsWith("/csv")) return "csv";
+	if (props.file.type.endsWith("/pdf")) return "pdf";
+	if (props.file.type.startsWith("text/")) return "textfile";
+	if (
+		[
+			"application/zip",
+			"application/x-cpio",
+			"application/x-bzip",
+			"application/x-bzip2",
+			"application/java-archive",
+			"application/x-rar-compressed",
+			"application/x-tar",
+			"application/gzip",
+			"application/x-7z-compressed",
+		].some((archiveType) => archiveType === props.file.type)
+	)
+		return "archive";
+	return "unknown";
 });
 
 const isThumbnailAvailable = computed(() => {
 	return props.file.thumbnailUrl
-		? (is.value === 'image' as const || is.value === 'video')
+		? is.value === ("image" as const) || is.value === "video"
 		: false;
 });
 </script>
diff --git a/packages/client/src/components/MkDriveSelectDialog.vue b/packages/client/src/components/MkDriveSelectDialog.vue
index b9abcf7ec..6b419e253 100644
--- a/packages/client/src/components/MkDriveSelectDialog.vue
+++ b/packages/client/src/components/MkDriveSelectDialog.vue
@@ -1,41 +1,61 @@
 <template>
-<XModalWindow
-	ref="dialog"
-	:width="800"
-	:height="500"
-	:with-ok-button="true"
-	:ok-button-disabled="(type === 'file') && (selected.length === 0)"
-	@click="cancel()"
-	@close="cancel()"
-	@ok="ok()"
-	@closed="emit('closed')"
->
-	<template #header>
-		{{ multiple ? ((type === 'file') ? i18n.ts.selectFiles : i18n.ts.selectFolders) : ((type === 'file') ? i18n.ts.selectFile : i18n.ts.selectFolder) }}
-		<span v-if="selected.length > 0" style="margin-left: 8px; opacity: 0.5;">({{ number(selected.length) }})</span>
-	</template>
-	<XDrive :multiple="multiple" :select="type" @changeSelection="onChangeSelection" @selected="ok()"/>
-</XModalWindow>
+	<XModalWindow
+		ref="dialog"
+		:width="800"
+		:height="500"
+		:with-ok-button="true"
+		:ok-button-disabled="type === 'file' && selected.length === 0"
+		@click="cancel()"
+		@close="cancel()"
+		@ok="ok()"
+		@closed="emit('closed')"
+	>
+		<template #header>
+			{{
+				multiple
+					? type === "file"
+						? i18n.ts.selectFiles
+						: i18n.ts.selectFolders
+					: type === "file"
+					? i18n.ts.selectFile
+					: i18n.ts.selectFolder
+			}}
+			<span
+				v-if="selected.length > 0"
+				style="margin-left: 8px; opacity: 0.5"
+				>({{ number(selected.length) }})</span
+			>
+		</template>
+		<XDrive
+			:multiple="multiple"
+			:select="type"
+			@changeSelection="onChangeSelection"
+			@selected="ok()"
+		/>
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import * as Misskey from 'calckey-js';
-import XDrive from '@/components/MkDrive.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import number from '@/filters/number';
-import { i18n } from '@/i18n';
+import { ref } from "vue";
+import * as Misskey from "calckey-js";
+import XDrive from "@/components/MkDrive.vue";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import number from "@/filters/number";
+import { i18n } from "@/i18n";
 
-withDefaults(defineProps<{
-	type?: 'file' | 'folder';
-	multiple: boolean;
-}>(), {
-	type: 'file',
-});
+withDefaults(
+	defineProps<{
+		type?: "file" | "folder";
+		multiple: boolean;
+	}>(),
+	{
+		type: "file",
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'done', r?: Misskey.entities.DriveFile[]): void;
-	(ev: 'closed'): void;
+	(ev: "done", r?: Misskey.entities.DriveFile[]): void;
+	(ev: "closed"): void;
 }>();
 
 const dialog = ref<InstanceType<typeof XModalWindow>>();
@@ -43,12 +63,12 @@ const dialog = ref<InstanceType<typeof XModalWindow>>();
 const selected = ref<Misskey.entities.DriveFile[]>([]);
 
 function ok() {
-	emit('done', selected.value);
+	emit("done", selected.value);
 	dialog.value?.close();
 }
 
 function cancel() {
-	emit('done');
+	emit("done");
 	dialog.value?.close();
 }
 
diff --git a/packages/client/src/components/MkDriveWindow.vue b/packages/client/src/components/MkDriveWindow.vue
index e5e7ed540..9b94e67f8 100644
--- a/packages/client/src/components/MkDriveWindow.vue
+++ b/packages/client/src/components/MkDriveWindow.vue
@@ -1,30 +1,30 @@
 <template>
-<XWindow
-	ref="window"
-	:initial-width="800"
-	:initial-height="500"
-	:can-resize="true"
-	@closed="emit('closed')"
->
-	<template #header>
-		{{ i18n.ts.drive }}
-	</template>
-	<XDrive :initial-folder="initialFolder"/>
-</XWindow>
+	<XWindow
+		ref="window"
+		:initial-width="800"
+		:initial-height="500"
+		:can-resize="true"
+		@closed="emit('closed')"
+	>
+		<template #header>
+			{{ i18n.ts.drive }}
+		</template>
+		<XDrive :initial-folder="initialFolder" />
+	</XWindow>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as Misskey from 'calckey-js';
-import XDrive from '@/components/MkDrive.vue';
-import XWindow from '@/components/MkWindow.vue';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import * as Misskey from "calckey-js";
+import XDrive from "@/components/MkDrive.vue";
+import XWindow from "@/components/MkWindow.vue";
+import { i18n } from "@/i18n";
 
 defineProps<{
 	initialFolder?: Misskey.entities.DriveFolder;
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 </script>
diff --git a/packages/client/src/components/MkEmojiPicker.section.vue b/packages/client/src/components/MkEmojiPicker.section.vue
index c9aea124b..12e869e04 100644
--- a/packages/client/src/components/MkEmojiPicker.section.vue
+++ b/packages/client/src/components/MkEmojiPicker.section.vue
@@ -1,24 +1,32 @@
 <template>
-<!-- このコンポーネントの要素のclassは親から利用されるのでむやみに弄らないこと -->
-<section>
-	<header class="_acrylic" @click="shown = !shown">
-		<i class="toggle ph-fw ph-lg" :class="shown ? 'ph-caret-down-bold ph-lg' : 'ph-caret-up ph-bold ph-lg'"></i> <slot></slot> ({{ emojis.length }})
-	</header>
-	<div v-if="shown" class="body">
-		<button
-			v-for="emoji in emojis"
-			:key="emoji"
-			class="_button item"
-			@click="emit('chosen', emoji, $event)"
-		>
-			<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
-		</button>
-	</div>
-</section>
+	<!-- このコンポーネントの要素のclassは親から利用されるのでむやみに弄らないこと -->
+	<section>
+		<header class="_acrylic" @click="shown = !shown">
+			<i
+				class="toggle ph-fw ph-lg"
+				:class="
+					shown
+						? 'ph-caret-down-bold ph-lg'
+						: 'ph-caret-up ph-bold ph-lg'
+				"
+			></i>
+			<slot></slot> ({{ emojis.length }})
+		</header>
+		<div v-if="shown" class="body">
+			<button
+				v-for="emoji in emojis"
+				:key="emoji"
+				class="_button item"
+				@click="emit('chosen', emoji, $event)"
+			>
+				<MkEmoji class="emoji" :emoji="emoji" :normal="true" />
+			</button>
+		</div>
+	</section>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref } from "vue";
 
 const props = defineProps<{
 	emojis: string[];
@@ -26,11 +34,10 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'chosen', v: string, event: MouseEvent): void;
+	(ev: "chosen", v: string, event: MouseEvent): void;
 }>();
 
 const shown = ref(!!props.initialShown);
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index 2790965db..a22006951 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -1,107 +1,191 @@
 <template>
-<div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
-	<input ref="search" v-model.trim="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @paste.stop="paste" @keyup.enter="done()">
-	<div ref="emojis" class="emojis">
-		<section class="result">
-			<div v-if="searchResultCustom.length > 0" class="body">
-				<button
-					v-for="emoji in searchResultCustom"
-					:key="emoji.id"
-					class="_button item"
-					:title="emoji.name"
-					tabindex="0"
-					@click="chosen(emoji, $event)"
-				>
-					<!--<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>-->
-					<img class="emoji" :src="disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
-				</button>
-			</div>
-			<div v-if="searchResultUnicode.length > 0" class="body">
-				<button
-					v-for="emoji in searchResultUnicode"
-					:key="emoji.name"
-					class="_button item"
-					:title="emoji.name"
-					tabindex="0"
-					@click="chosen(emoji, $event)"
-				>
-					<MkEmoji class="emoji" :emoji="emoji.char"/>
-				</button>
-			</div>
-		</section>
-
-		<div v-if="tab === 'index'" class="group index">
-			<section v-if="showPinned">
-				<div class="body">
+	<div
+		class="omfetrab"
+		:class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]"
+		:style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }"
+	>
+		<input
+			ref="search"
+			v-model.trim="q"
+			class="search"
+			data-prevent-emoji-insert
+			:class="{ filled: q != null && q != '' }"
+			:placeholder="i18n.ts.search"
+			type="search"
+			@paste.stop="paste"
+			@keyup.enter="done()"
+		/>
+		<div ref="emojis" class="emojis">
+			<section class="result">
+				<div v-if="searchResultCustom.length > 0" class="body">
 					<button
-						v-for="emoji in pinned"
-						:key="emoji"
+						v-for="emoji in searchResultCustom"
+						:key="emoji.id"
 						class="_button item"
+						:title="emoji.name"
 						tabindex="0"
 						@click="chosen(emoji, $event)"
 					>
-						<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
+						<!--<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>-->
+						<img
+							class="emoji"
+							:src="
+								disableShowingAnimatedImages
+									? getStaticImageUrl(emoji.url)
+									: emoji.url
+							"
+						/>
+					</button>
+				</div>
+				<div v-if="searchResultUnicode.length > 0" class="body">
+					<button
+						v-for="emoji in searchResultUnicode"
+						:key="emoji.name"
+						class="_button item"
+						:title="emoji.name"
+						tabindex="0"
+						@click="chosen(emoji, $event)"
+					>
+						<MkEmoji class="emoji" :emoji="emoji.char" />
 					</button>
 				</div>
 			</section>
 
-			<section>
-				<header class="_acrylic"><i class="ph-alarm ph-bold ph-fw ph-lg"></i> {{ i18n.ts.recentUsed }}</header>
-				<div class="body">
-					<button
-						v-for="emoji in recentlyUsedEmojis"
-						:key="emoji"
-						class="_button item"
-						@click="chosen(emoji, $event)"
-					>
-						<MkEmoji class="emoji" :emoji="emoji" :normal="true"/>
-					</button>
-				</div>
-			</section>
+			<div v-if="tab === 'index'" class="group index">
+				<section v-if="showPinned">
+					<div class="body">
+						<button
+							v-for="emoji in pinned"
+							:key="emoji"
+							class="_button item"
+							tabindex="0"
+							@click="chosen(emoji, $event)"
+						>
+							<MkEmoji
+								class="emoji"
+								:emoji="emoji"
+								:normal="true"
+							/>
+						</button>
+					</div>
+				</section>
+
+				<section>
+					<header class="_acrylic">
+						<i class="ph-alarm ph-bold ph-fw ph-lg"></i>
+						{{ i18n.ts.recentUsed }}
+					</header>
+					<div class="body">
+						<button
+							v-for="emoji in recentlyUsedEmojis"
+							:key="emoji"
+							class="_button item"
+							@click="chosen(emoji, $event)"
+						>
+							<MkEmoji
+								class="emoji"
+								:emoji="emoji"
+								:normal="true"
+							/>
+						</button>
+					</div>
+				</section>
+			</div>
+			<div v-once class="group">
+				<header>{{ i18n.ts.customEmojis }}</header>
+				<XSection
+					v-for="category in customEmojiCategories"
+					:key="'custom:' + category"
+					:initial-shown="false"
+					:emojis="
+						customEmojis
+							.filter((e) => e.category === category)
+							.map((e) => ':' + e.name + ':')
+					"
+					@chosen="chosen"
+					>{{ category || i18n.ts.other }}</XSection
+				>
+			</div>
+			<div v-once class="group">
+				<header>{{ i18n.ts.emoji }}</header>
+				<XSection
+					v-for="category in categories"
+					:key="category"
+					:emojis="
+						emojilist
+							.filter((e) => e.category === category)
+							.map((e) => e.char)
+					"
+					@chosen="chosen"
+					>{{ category }}</XSection
+				>
+			</div>
 		</div>
-		<div v-once class="group">
-			<header>{{ i18n.ts.customEmojis }}</header>
-			<XSection v-for="category in customEmojiCategories" :key="'custom:' + category" :initial-shown="false" :emojis="customEmojis.filter(e => e.category === category).map(e => ':' + e.name + ':')" @chosen="chosen">{{ category || i18n.ts.other }}</XSection>
-		</div>
-		<div v-once class="group">
-			<header>{{ i18n.ts.emoji }}</header>
-			<XSection v-for="category in categories" :key="category" :emojis="emojilist.filter(e => e.category === category).map(e => e.char)" @chosen="chosen">{{ category }}</XSection>
+		<div class="tabs">
+			<button
+				class="_button tab"
+				:class="{ active: tab === 'index' }"
+				@click="tab = 'index'"
+			>
+				<i class="ph-asterisk ph-bold ph-lg ph-fw ph-lg"></i>
+			</button>
+			<button
+				class="_button tab"
+				:class="{ active: tab === 'custom' }"
+				@click="tab = 'custom'"
+			>
+				<i class="ph-smiley ph-bold ph-lg ph-fw ph-lg"></i>
+			</button>
+			<button
+				class="_button tab"
+				:class="{ active: tab === 'unicode' }"
+				@click="tab = 'unicode'"
+			>
+				<i class="ph-leaf ph-bold ph-lg ph-fw ph-lg"></i>
+			</button>
+			<button
+				class="_button tab"
+				:class="{ active: tab === 'tags' }"
+				@click="tab = 'tags'"
+			>
+				<i class="ph-hash ph-bold ph-lg ph-fw ph-lg"></i>
+			</button>
 		</div>
 	</div>
-	<div class="tabs">
-		<button class="_button tab" :class="{ active: tab === 'index' }" @click="tab = 'index'"><i class="ph-asterisk ph-bold ph-lg ph-fw ph-lg"></i></button>
-		<button class="_button tab" :class="{ active: tab === 'custom' }" @click="tab = 'custom'"><i class="ph-smiley ph-bold ph-lg ph-fw ph-lg"></i></button>
-		<button class="_button tab" :class="{ active: tab === 'unicode' }" @click="tab = 'unicode'"><i class="ph-leaf ph-bold ph-lg ph-fw ph-lg"></i></button>
-		<button class="_button tab" :class="{ active: tab === 'tags' }" @click="tab = 'tags'"><i class="ph-hash ph-bold ph-lg ph-fw ph-lg"></i></button>
-	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, watch, onMounted } from 'vue';
-import * as Misskey from 'calckey-js';
-import XSection from '@/components/MkEmojiPicker.section.vue';
-import { emojilist, UnicodeEmojiDef, unicodeEmojiCategories as categories } from '@/scripts/emojilist';
-import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import Ripple from '@/components/MkRipple.vue';
-import * as os from '@/os';
-import { isTouchUsing } from '@/scripts/touch';
-import { deviceKind } from '@/scripts/device-kind';
-import { emojiCategories, instance } from '@/instance';
-import { i18n } from '@/i18n';
-import { defaultStore } from '@/store';
+import { ref, computed, watch, onMounted } from "vue";
+import * as Misskey from "calckey-js";
+import XSection from "@/components/MkEmojiPicker.section.vue";
+import {
+	emojilist,
+	UnicodeEmojiDef,
+	unicodeEmojiCategories as categories,
+} from "@/scripts/emojilist";
+import { getStaticImageUrl } from "@/scripts/get-static-image-url";
+import Ripple from "@/components/MkRipple.vue";
+import * as os from "@/os";
+import { isTouchUsing } from "@/scripts/touch";
+import { deviceKind } from "@/scripts/device-kind";
+import { emojiCategories, instance } from "@/instance";
+import { i18n } from "@/i18n";
+import { defaultStore } from "@/store";
 
-const props = withDefaults(defineProps<{
-	showPinned?: boolean;
-	asReactionPicker?: boolean;
-	maxHeight?: number;
-	asDrawer?: boolean;
-}>(), {
-	showPinned: true,
-});
+const props = withDefaults(
+	defineProps<{
+		showPinned?: boolean;
+		asReactionPicker?: boolean;
+		maxHeight?: number;
+		asDrawer?: boolean;
+	}>(),
+	{
+		showPinned: true,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'chosen', v: string): void;
+	(ev: "chosen", v: string): void;
 }>();
 
 const search = ref<HTMLInputElement>();
@@ -116,41 +200,48 @@ const {
 	recentlyUsedEmojis,
 } = defaultStore.reactiveState;
 
-const size = computed(() => props.asReactionPicker ? reactionPickerSize.value : 1);
-const width = computed(() => props.asReactionPicker ? reactionPickerWidth.value : 3);
-const height = computed(() => props.asReactionPicker ? reactionPickerHeight.value : 2);
+const size = computed(() =>
+	props.asReactionPicker ? reactionPickerSize.value : 1
+);
+const width = computed(() =>
+	props.asReactionPicker ? reactionPickerWidth.value : 3
+);
+const height = computed(() =>
+	props.asReactionPicker ? reactionPickerHeight.value : 2
+);
 const customEmojiCategories = emojiCategories;
 const customEmojis = instance.emojis;
 const q = ref<string | null>(null);
 const searchResultCustom = ref<Misskey.entities.CustomEmoji[]>([]);
 const searchResultUnicode = ref<UnicodeEmojiDef[]>([]);
-const tab = ref<'index' | 'custom' | 'unicode' | 'tags'>('index');
+const tab = ref<"index" | "custom" | "unicode" | "tags">("index");
 
 watch(q, () => {
 	if (emojis.value) emojis.value.scrollTop = 0;
 
-	if (q.value == null || q.value === '') {
+	if (q.value == null || q.value === "") {
 		searchResultCustom.value = [];
 		searchResultUnicode.value = [];
 		return;
 	}
 
-	const newQ = q.value.replace(/:/g, '').toLowerCase();
+	const newQ = q.value.replace(/:/g, "").toLowerCase();
 
 	const searchCustom = () => {
 		const max = 8;
 		const emojis = customEmojis;
 		const matches = new Set<Misskey.entities.CustomEmoji>();
 
-		const exactMatch = emojis.find(emoji => emoji.name === newQ);
+		const exactMatch = emojis.find((emoji) => emoji.name === newQ);
 		if (exactMatch) matches.add(exactMatch);
 
-		if (newQ.includes(' ')) { // AND検索
-			const keywords = newQ.split(' ');
+		if (newQ.includes(" ")) {
+			// AND検索
+			const keywords = newQ.split(" ");
 
 			// 名前にキーワードが含まれている
 			for (const emoji of emojis) {
-				if (keywords.every(keyword => emoji.name.includes(keyword))) {
+				if (keywords.every((keyword) => emoji.name.includes(keyword))) {
 					matches.add(emoji);
 					if (matches.size >= max) break;
 				}
@@ -159,7 +250,15 @@ watch(q, () => {
 
 			// 名前またはエイリアスにキーワードが含まれている
 			for (const emoji of emojis) {
-				if (keywords.every(keyword => emoji.name.includes(keyword) || emoji.aliases.some(alias => alias.includes(keyword)))) {
+				if (
+					keywords.every(
+						(keyword) =>
+							emoji.name.includes(keyword) ||
+							emoji.aliases.some((alias) =>
+								alias.includes(keyword)
+							)
+					)
+				) {
 					matches.add(emoji);
 					if (matches.size >= max) break;
 				}
@@ -174,7 +273,7 @@ watch(q, () => {
 			if (matches.size >= max) return matches;
 
 			for (const emoji of emojis) {
-				if (emoji.aliases.some(alias => alias.startsWith(newQ))) {
+				if (emoji.aliases.some((alias) => alias.startsWith(newQ))) {
 					matches.add(emoji);
 					if (matches.size >= max) break;
 				}
@@ -190,7 +289,7 @@ watch(q, () => {
 			if (matches.size >= max) return matches;
 
 			for (const emoji of emojis) {
-				if (emoji.aliases.some(alias => alias.includes(newQ))) {
+				if (emoji.aliases.some((alias) => alias.includes(newQ))) {
 					matches.add(emoji);
 					if (matches.size >= max) break;
 				}
@@ -205,15 +304,16 @@ watch(q, () => {
 		const emojis = emojilist;
 		const matches = new Set<UnicodeEmojiDef>();
 
-		const exactMatch = emojis.find(emoji => emoji.name === newQ);
+		const exactMatch = emojis.find((emoji) => emoji.name === newQ);
 		if (exactMatch) matches.add(exactMatch);
 
-		if (newQ.includes(' ')) { // AND検索
-			const keywords = newQ.split(' ');
+		if (newQ.includes(" ")) {
+			// AND検索
+			const keywords = newQ.split(" ");
 
 			// 名前にキーワードが含まれている
 			for (const emoji of emojis) {
-				if (keywords.every(keyword => emoji.name.includes(keyword))) {
+				if (keywords.every((keyword) => emoji.name.includes(keyword))) {
 					matches.add(emoji);
 					if (matches.size >= max) break;
 				}
@@ -222,7 +322,15 @@ watch(q, () => {
 
 			// 名前またはエイリアスにキーワードが含まれている
 			for (const emoji of emojis) {
-				if (keywords.every(keyword => emoji.name.includes(keyword) || emoji.keywords.some(alias => alias.includes(keyword)))) {
+				if (
+					keywords.every(
+						(keyword) =>
+							emoji.name.includes(keyword) ||
+							emoji.keywords.some((alias) =>
+								alias.includes(keyword)
+							)
+					)
+				) {
 					matches.add(emoji);
 					if (matches.size >= max) break;
 				}
@@ -237,7 +345,9 @@ watch(q, () => {
 			if (matches.size >= max) return matches;
 
 			for (const emoji of emojis) {
-				if (emoji.keywords.some(keyword => keyword.startsWith(newQ))) {
+				if (
+					emoji.keywords.some((keyword) => keyword.startsWith(newQ))
+				) {
 					matches.add(emoji);
 					if (matches.size >= max) break;
 				}
@@ -253,7 +363,7 @@ watch(q, () => {
 			if (matches.size >= max) return matches;
 
 			for (const emoji of emojis) {
-				if (emoji.keywords.some(keyword => keyword.includes(newQ))) {
+				if (emoji.keywords.some((keyword) => keyword.includes(newQ))) {
 					matches.add(emoji);
 					if (matches.size >= max) break;
 				}
@@ -268,7 +378,7 @@ watch(q, () => {
 });
 
 function focus() {
-	if (!['smartphone', 'tablet'].includes(deviceKind) && !isTouchUsing) {
+	if (!["smartphone", "tablet"].includes(deviceKind) && !isTouchUsing) {
 		search.value?.focus({
 			preventScroll: true,
 		});
@@ -277,36 +387,40 @@ function focus() {
 
 function reset() {
 	if (emojis.value) emojis.value.scrollTop = 0;
-	q.value = '';
+	q.value = "";
 }
 
-function getKey(emoji: string | Misskey.entities.CustomEmoji | UnicodeEmojiDef): string {
-	return typeof emoji === 'string' ? emoji : (emoji.char || `:${emoji.name}:`);
+function getKey(
+	emoji: string | Misskey.entities.CustomEmoji | UnicodeEmojiDef
+): string {
+	return typeof emoji === "string" ? emoji : emoji.char || `:${emoji.name}:`;
 }
 
 function chosen(emoji: any, ev?: MouseEvent) {
-	const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
+	const el =
+		ev &&
+		((ev.currentTarget ?? ev.target) as HTMLElement | null | undefined);
 	if (el) {
 		const rect = el.getBoundingClientRect();
-		const x = rect.left + (el.offsetWidth / 2);
-		const y = rect.top + (el.offsetHeight / 2);
-		os.popup(Ripple, { x, y }, {}, 'end');
+		const x = rect.left + el.offsetWidth / 2;
+		const y = rect.top + el.offsetHeight / 2;
+		os.popup(Ripple, { x, y }, {}, "end");
 	}
 
 	const key = getKey(emoji);
-	emit('chosen', key);
+	emit("chosen", key);
 
 	// 最近使った絵文字更新
 	if (!pinned.value.includes(key)) {
 		let recents = defaultStore.state.recentlyUsedEmojis;
 		recents = recents.filter((emoji: any) => emoji !== key);
 		recents.unshift(key);
-		defaultStore.set('recentlyUsedEmojis', recents.splice(0, 32));
+		defaultStore.set("recentlyUsedEmojis", recents.splice(0, 32));
 	}
 }
 
 function paste(event: ClipboardEvent) {
-	const paste = (event.clipboardData || window.clipboardData).getData('text');
+	const paste = (event.clipboardData || window.clipboardData).getData("text");
 	if (done(paste)) {
 		event.preventDefault();
 	}
@@ -314,15 +428,17 @@ function paste(event: ClipboardEvent) {
 
 function done(query?: any): boolean | void {
 	if (query == null) query = q.value;
-	if (query == null || typeof query !== 'string') return;
+	if (query == null || typeof query !== "string") return;
 
-	const q2 = query.replaceAll(':', '');
-	const exactMatchCustom = customEmojis.find(emoji => emoji.name === q2);
+	const q2 = query.replaceAll(":", "");
+	const exactMatchCustom = customEmojis.find((emoji) => emoji.name === q2);
 	if (exactMatchCustom) {
 		chosen(exactMatchCustom);
 		return true;
 	}
-	const exactMatchUnicode = emojilist.find(emoji => emoji.char === q2 || emoji.name === q2);
+	const exactMatchUnicode = emojilist.find(
+		(emoji) => emoji.char === q2 || emoji.name === q2
+	);
 	if (exactMatchUnicode) {
 		chosen(exactMatchUnicode);
 		return true;
@@ -543,7 +659,7 @@ defineExpose({
 
 					> .emoji {
 						height: 1.25em;
-						vertical-align: -.25em;
+						vertical-align: -0.25em;
 						pointer-events: none;
 					}
 				}
diff --git a/packages/client/src/components/MkEmojiPickerDialog.vue b/packages/client/src/components/MkEmojiPickerDialog.vue
index 3b41f9d75..4cff9f275 100644
--- a/packages/client/src/components/MkEmojiPickerDialog.vue
+++ b/packages/client/src/components/MkEmojiPickerDialog.vue
@@ -1,58 +1,66 @@
 <template>
-<MkModal
-	ref="modal"
-	v-slot="{ type, maxHeight }"
-	:z-priority="'middle'"
-	:prefer-type="asReactionPicker && defaultStore.state.reactionPickerUseDrawerForMobile === false ? 'popup' : 'auto'"
-	:transparent-bg="true"
-	:manual-showing="manualShowing"
-	:src="src"
-	@click="modal?.close()"
-	@opening="opening"
-	@close="emit('close')"
-	@closed="emit('closed')"
->
-	<MkEmojiPicker
-		ref="picker"
-		class="ryghynhb _popup _shadow"
-		:class="{ drawer: type === 'drawer' }"
-		:show-pinned="showPinned"
-		:as-reaction-picker="asReactionPicker"
-		:as-drawer="type === 'drawer'"
-		:max-height="maxHeight"
-		@chosen="chosen"
-	/>
-</MkModal>
+	<MkModal
+		ref="modal"
+		v-slot="{ type, maxHeight }"
+		:z-priority="'middle'"
+		:prefer-type="
+			asReactionPicker &&
+			defaultStore.state.reactionPickerUseDrawerForMobile === false
+				? 'popup'
+				: 'auto'
+		"
+		:transparent-bg="true"
+		:manual-showing="manualShowing"
+		:src="src"
+		@click="modal?.close()"
+		@opening="opening"
+		@close="emit('close')"
+		@closed="emit('closed')"
+	>
+		<MkEmojiPicker
+			ref="picker"
+			class="ryghynhb _popup _shadow"
+			:class="{ drawer: type === 'drawer' }"
+			:show-pinned="showPinned"
+			:as-reaction-picker="asReactionPicker"
+			:as-drawer="type === 'drawer'"
+			:max-height="maxHeight"
+			@chosen="chosen"
+		/>
+	</MkModal>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import MkModal from '@/components/MkModal.vue';
-import MkEmojiPicker from '@/components/MkEmojiPicker.vue';
-import { defaultStore } from '@/store';
+import { ref } from "vue";
+import MkModal from "@/components/MkModal.vue";
+import MkEmojiPicker from "@/components/MkEmojiPicker.vue";
+import { defaultStore } from "@/store";
 
-withDefaults(defineProps<{
-	manualShowing?: boolean | null;
-	src?: HTMLElement;
-	showPinned?: boolean;
-	asReactionPicker?: boolean;
-}>(), {
-	manualShowing: null,
-	showPinned: true,
-	asReactionPicker: false,
-});
+withDefaults(
+	defineProps<{
+		manualShowing?: boolean | null;
+		src?: HTMLElement;
+		showPinned?: boolean;
+		asReactionPicker?: boolean;
+	}>(),
+	{
+		manualShowing: null,
+		showPinned: true,
+		asReactionPicker: false,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'done', v: any): void;
-	(ev: 'close'): void;
-	(ev: 'closed'): void;
+	(ev: "done", v: any): void;
+	(ev: "close"): void;
+	(ev: "closed"): void;
 }>();
 
 const modal = ref<InstanceType<typeof MkModal>>();
 const picker = ref<InstanceType<typeof MkEmojiPicker>>();
 
 function chosen(emoji: any) {
-	emit('done', emoji);
+	emit("done", emoji);
 	modal.value?.close();
 }
 
diff --git a/packages/client/src/components/MkFeaturedPhotos.vue b/packages/client/src/components/MkFeaturedPhotos.vue
index a5c920dd9..3faf38c65 100644
--- a/packages/client/src/components/MkFeaturedPhotos.vue
+++ b/packages/client/src/components/MkFeaturedPhotos.vue
@@ -1,15 +1,19 @@
 <template>
-<div v-if="meta" class="xfbouadm" :style="{ backgroundImage: `url(${ meta.backgroundImageUrl })` }"></div>
+	<div
+		v-if="meta"
+		class="xfbouadm"
+		:style="{ backgroundImage: `url(${meta.backgroundImageUrl})` }"
+	></div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import * as Misskey from 'calckey-js';
-import * as os from '@/os';
+import { ref } from "vue";
+import * as Misskey from "calckey-js";
+import * as os from "@/os";
 
 const meta = ref<Misskey.entities.DetailedInstanceMetadata>();
 
-os.api('meta', { detail: true }).then(gotMeta => {
+os.api("meta", { detail: true }).then((gotMeta) => {
 	meta.value = gotMeta;
 });
 </script>
diff --git a/packages/client/src/components/MkFileListForAdmin.vue b/packages/client/src/components/MkFileListForAdmin.vue
index 3c23e2e2f..1d485a1d6 100644
--- a/packages/client/src/components/MkFileListForAdmin.vue
+++ b/packages/client/src/components/MkFileListForAdmin.vue
@@ -1,56 +1,80 @@
 <template>
-<div>
-	<MkPagination v-slot="{items}" :pagination="pagination" class="urempief" :class="{ grid: viewMode === 'grid' }">
-		<MkA
-			v-for="file in items"
-			:key="file.id"
-			v-tooltip.mfm="`${file.type}\n${bytes(file.size)}\n${new Date(file.createdAt).toLocaleString()}\nby ${file.user ? '@' + Acct.toString(file.user) : 'system'}`"
-			:to="`/admin/file/${file.id}`"
-			class="file _button"
+	<div>
+		<MkPagination
+			v-slot="{ items }"
+			:pagination="pagination"
+			class="urempief"
+			:class="{ grid: viewMode === 'grid' }"
 		>
-			<div v-if="file.isSensitive" class="sensitive-label">{{ i18n.ts.sensitive }}</div>
-			<MkDriveFileThumbnail class="thumbnail" :file="file" fit="contain"/>
-			<div v-if="viewMode === 'list'" class="body">
-				<div>
-					<small style="opacity: 0.7;">{{ file.name }}</small>
+			<MkA
+				v-for="file in items"
+				:key="file.id"
+				v-tooltip.mfm="
+					`${file.type}\n${bytes(file.size)}\n${new Date(
+						file.createdAt
+					).toLocaleString()}\nby ${
+						file.user ? '@' + Acct.toString(file.user) : 'system'
+					}`
+				"
+				:to="`/admin/file/${file.id}`"
+				class="file _button"
+			>
+				<div v-if="file.isSensitive" class="sensitive-label">
+					{{ i18n.ts.sensitive }}
 				</div>
-				<div>
-					<MkAcct v-if="file.user" :user="file.user"/>
-					<div v-else>{{ i18n.ts.system }}</div>
+				<MkDriveFileThumbnail
+					class="thumbnail"
+					:file="file"
+					fit="contain"
+				/>
+				<div v-if="viewMode === 'list'" class="body">
+					<div>
+						<small style="opacity: 0.7">{{ file.name }}</small>
+					</div>
+					<div>
+						<MkAcct v-if="file.user" :user="file.user" />
+						<div v-else>{{ i18n.ts.system }}</div>
+					</div>
+					<div>
+						<span style="margin-right: 1em">{{ file.type }}</span>
+						<span>{{ bytes(file.size) }}</span>
+					</div>
+					<div>
+						<span
+							>{{ i18n.ts.registeredDate }}:
+							<MkTime :time="file.createdAt" mode="detail"
+						/></span>
+					</div>
 				</div>
-				<div>
-					<span style="margin-right: 1em;">{{ file.type }}</span>
-					<span>{{ bytes(file.size) }}</span>
-				</div>
-				<div>
-					<span>{{ i18n.ts.registeredDate }}: <MkTime :time="file.createdAt" mode="detail"/></span>
-				</div>
-			</div>
-		</MkA>
-	</MkPagination>
-</div>
+			</MkA>
+		</MkPagination>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import * as Acct from 'calckey-js/built/acct';
-import MkSwitch from '@/components/ui/switch.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
-import bytes from '@/filters/bytes';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { computed } from "vue";
+import * as Acct from "calckey-js/built/acct";
+import MkSwitch from "@/components/ui/switch.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkDriveFileThumbnail from "@/components/MkDriveFileThumbnail.vue";
+import bytes from "@/filters/bytes";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	pagination: any;
-	viewMode: 'grid' | 'list';
+	viewMode: "grid" | "list";
 }>();
 </script>
 
 <style lang="scss" scoped>
 @keyframes sensitive-blink {
-	0% { opacity: 1; }
-	50% { opacity: 0; }
+	0% {
+		opacity: 1;
+	}
+	50% {
+		opacity: 0;
+	}
 }
 
 .urempief {
@@ -94,7 +118,7 @@ const props = defineProps<{
 		> .file {
 			position: relative;
 			aspect-ratio: 1;
-		
+
 			> .thumbnail {
 				width: 100%;
 				height: 100%;
diff --git a/packages/client/src/components/MkFileTypeIcon.vue b/packages/client/src/components/MkFileTypeIcon.vue
index 3e0761ae1..388b6d7fc 100644
--- a/packages/client/src/components/MkFileTypeIcon.vue
+++ b/packages/client/src/components/MkFileTypeIcon.vue
@@ -1,15 +1,17 @@
 <template>
-<span class="mk-file-type-icon">
-	<template v-if="kind == 'image'"><i class="ph-file-image ph-bold ph-lg"></i></template>
-</span>
+	<span class="mk-file-type-icon">
+		<template v-if="kind == 'image'"
+			><i class="ph-file-image ph-bold ph-lg"></i
+		></template>
+	</span>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
+import { computed } from "vue";
 
 const props = defineProps<{
 	type: string;
 }>();
 
-const kind = computed(() => props.type.split('/')[0]);
+const kind = computed(() => props.type.split("/")[0]);
 </script>
diff --git a/packages/client/src/components/MkFolder.vue b/packages/client/src/components/MkFolder.vue
index a0be2e856..337873fc1 100644
--- a/packages/client/src/components/MkFolder.vue
+++ b/packages/client/src/components/MkFolder.vue
@@ -1,33 +1,40 @@
 <template>
-<div v-size="{ max: [500] }" class="ssazuxis">
-	<header class="_button" :style="{ background: bg }" @click="showBody = !showBody">
-		<div class="title"><slot name="header"></slot></div>
-		<div class="divider"></div>
-		<button class="_button">
-			<template v-if="showBody"><i class="ph-caret-up ph-bold ph-lg"></i></template>
-			<template v-else><i class="ph-caret-down ph-bold ph-lg"></i></template>
-		</button>
-	</header>
-	<transition
-		:name="$store.state.animation ? 'folder-toggle' : ''"
-		@enter="enter"
-		@after-enter="afterEnter"
-		@leave="leave"
-		@after-leave="afterLeave"
-	>
-		<div v-show="showBody">
-			<slot></slot>
-		</div>
-	</transition>
-</div>
+	<div v-size="{ max: [500] }" class="ssazuxis">
+		<header
+			class="_button"
+			:style="{ background: bg }"
+			@click="showBody = !showBody"
+		>
+			<div class="title"><slot name="header"></slot></div>
+			<div class="divider"></div>
+			<button class="_button">
+				<template v-if="showBody"
+					><i class="ph-caret-up ph-bold ph-lg"></i
+				></template>
+				<template v-else
+					><i class="ph-caret-down ph-bold ph-lg"></i
+				></template>
+			</button>
+		</header>
+		<transition
+			:name="$store.state.animation ? 'folder-toggle' : ''"
+			@enter="enter"
+			@after-enter="afterEnter"
+			@leave="leave"
+			@after-leave="afterLeave"
+		>
+			<div v-show="showBody">
+				<slot></slot>
+			</div>
+		</transition>
+	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import tinycolor from 'tinycolor2';
-
-const localStoragePrefix = 'ui:folder:';
+import { defineComponent } from "vue";
+import tinycolor from "tinycolor2";
 
+const localStoragePrefix = "ui:folder:";
 
 export default defineComponent({
 	props: {
@@ -45,19 +52,28 @@ export default defineComponent({
 	data() {
 		return {
 			bg: null,
-			showBody: (this.persistKey && localStorage.getItem(localStoragePrefix + this.persistKey)) ? localStorage.getItem(localStoragePrefix + this.persistKey) === 't' : this.expanded,
+			showBody:
+				this.persistKey &&
+				localStorage.getItem(localStoragePrefix + this.persistKey)
+					? localStorage.getItem(
+							localStoragePrefix + this.persistKey
+					  ) === "t"
+					: this.expanded,
 		};
 	},
 	watch: {
 		showBody() {
 			if (this.persistKey) {
-				localStorage.setItem(localStoragePrefix + this.persistKey, this.showBody ? 't' : 'f');
+				localStorage.setItem(
+					localStoragePrefix + this.persistKey,
+					this.showBody ? "t" : "f"
+				);
 			}
 		},
 	},
 	mounted() {
 		function getParentBg(el: Element | null): string {
-			if (el == null || el.tagName === 'BODY') return 'var(--bg)';
+			if (el == null || el.tagName === "BODY") return "var(--bg)";
 			const bg = el.style.background || el.style.backgroundColor;
 			if (bg) {
 				return bg;
@@ -66,7 +82,13 @@ export default defineComponent({
 			}
 		}
 		const rawBg = getParentBg(this.$el);
-		const bg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);
+		const bg = tinycolor(
+			rawBg.startsWith("var(")
+				? getComputedStyle(document.documentElement).getPropertyValue(
+						rawBg.slice(4, -1)
+				  )
+				: rawBg
+		);
 		bg.setAlpha(0.85);
 		this.bg = bg.toRgbString();
 	},
@@ -79,14 +101,14 @@ export default defineComponent({
 			const elementHeight = el.getBoundingClientRect().height;
 			el.style.height = 0;
 			el.offsetHeight; // reflow
-			el.style.height = elementHeight + 'px';
+			el.style.height = elementHeight + "px";
 		},
 		afterEnter(el) {
 			el.style.height = null;
 		},
 		leave(el) {
 			const elementHeight = el.getBoundingClientRect().height;
-			el.style.height = elementHeight + 'px';
+			el.style.height = elementHeight + "px";
 			el.offsetHeight; // reflow
 			el.style.height = 0;
 		},
@@ -98,7 +120,8 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.folder-toggle-enter-active, .folder-toggle-leave-active {
+.folder-toggle-enter-active,
+.folder-toggle-leave-active {
 	overflow-y: hidden;
 	transition: opacity 0.5s, height 0.5s !important;
 }
diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index ba8c8170e..12491f6ad 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -1,72 +1,87 @@
 <template>
-<button
-	class="kpoogebi _button"
-	:class="{
-		wait,
-		active: isFollowing || hasPendingFollowRequestFromYou,
-		full,
-		large,
-		blocking: isBlocking
-	}"
-	:disabled="wait"
-	@click="onClick"
->
-	<template v-if="!wait">
-		<template v-if="isBlocking">
-			<span v-if="full">{{ i18n.ts.blocked }}</span><i class="ph-prohibit ph-bold ph-lg"></i>
+	<button
+		class="kpoogebi _button"
+		:class="{
+			wait,
+			active: isFollowing || hasPendingFollowRequestFromYou,
+			full,
+			large,
+			blocking: isBlocking,
+		}"
+		:disabled="wait"
+		@click="onClick"
+	>
+		<template v-if="!wait">
+			<template v-if="isBlocking">
+				<span v-if="full">{{ i18n.ts.blocked }}</span
+				><i class="ph-prohibit ph-bold ph-lg"></i>
+			</template>
+			<template
+				v-else-if="hasPendingFollowRequestFromYou && user.isLocked"
+			>
+				<span v-if="full">{{ i18n.ts.followRequestPending }}</span
+				><i class="ph-hourglass-medium ph-bold ph-lg"></i>
+			</template>
+			<template
+				v-else-if="hasPendingFollowRequestFromYou && !user.isLocked"
+			>
+				<!-- つまりリモートフォローの場合。 -->
+				<span v-if="full">{{ i18n.ts.processing }}</span
+				><i class="ph-circle-notch ph-bold ph-lg fa-pulse"></i>
+			</template>
+			<template v-else-if="isFollowing">
+				<span v-if="full">{{ i18n.ts.unfollow }}</span
+				><i class="ph-minus ph-bold ph-lg"></i>
+			</template>
+			<template v-else-if="!isFollowing && user.isLocked">
+				<span v-if="full">{{ i18n.ts.followRequest }}</span
+				><i class="ph-plus ph-bold ph-lg"></i>
+			</template>
+			<template v-else-if="!isFollowing && !user.isLocked">
+				<span v-if="full">{{ i18n.ts.follow }}</span
+				><i class="ph-plus ph-bold ph-lg"></i>
+			</template>
 		</template>
-		<template v-else-if="hasPendingFollowRequestFromYou && user.isLocked">
-			<span v-if="full">{{ i18n.ts.followRequestPending }}</span><i class="ph-hourglass-medium ph-bold ph-lg"></i>
+		<template v-else>
+			<span v-if="full">{{ i18n.ts.processing }}</span
+			><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
 		</template>
-		<template v-else-if="hasPendingFollowRequestFromYou && !user.isLocked">
-			<!-- つまりリモートフォローの場合。 -->
-			<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch ph-bold ph-lg fa-pulse"></i>
-		</template>
-		<template v-else-if="isFollowing">
-			<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="ph-minus ph-bold ph-lg"></i>
-		</template>
-		<template v-else-if="!isFollowing && user.isLocked">
-			<span v-if="full">{{ i18n.ts.followRequest }}</span><i class="ph-plus ph-bold ph-lg"></i>
-		</template>
-		<template v-else-if="!isFollowing && !user.isLocked">
-			<span v-if="full">{{ i18n.ts.follow }}</span><i class="ph-plus ph-bold ph-lg"></i>
-		</template>
-	</template>
-	<template v-else>
-		<span v-if="full">{{ i18n.ts.processing }}</span><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
-	</template>
-</button>
+	</button>
 </template>
 
 <script lang="ts" setup>
-import { computed, onBeforeUnmount, onMounted } from 'vue';
-import type * as Misskey from 'calckey-js';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import { i18n } from '@/i18n';
+import { computed, onBeforeUnmount, onMounted } from "vue";
+import type * as Misskey from "calckey-js";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import { i18n } from "@/i18n";
 
-const emit = defineEmits(['refresh'])
-const props = withDefaults(defineProps<{
-		user: Misskey.entities.UserDetailed,
-		full?: boolean,
-		large?: boolean,
-	}>(), {
-	full: false,
-	large: false,
-});
+const emit = defineEmits(["refresh"]);
+const props = withDefaults(
+	defineProps<{
+		user: Misskey.entities.UserDetailed;
+		full?: boolean;
+		large?: boolean;
+	}>(),
+	{
+		full: false,
+		large: false,
+	}
+);
 
 const isBlocking = computed(() => props.user.isBlocking);
 
 let isFollowing = $ref(props.user.isFollowing);
-let hasPendingFollowRequestFromYou = $ref(props.user.hasPendingFollowRequestFromYou);
+let hasPendingFollowRequestFromYou = $ref(
+	props.user.hasPendingFollowRequestFromYou
+);
 let wait = $ref(false);
-const connection = stream.useChannel('main');
+const connection = stream.useChannel("main");
 
 if (props.user.isFollowing == null) {
-	os.api('users/show', {
+	os.api("users/show", {
 		userId: props.user.id,
-	})
-		.then(onFollowChange);
+	}).then(onFollowChange);
 }
 
 function onFollowChange(user: Misskey.entities.UserDetailed) {
@@ -82,40 +97,41 @@ async function onClick() {
 	try {
 		if (isBlocking.value) {
 			const { canceled } = await os.confirm({
-				type: 'warning',
-				text: i18n.t('unblockConfirm'),
+				type: "warning",
+				text: i18n.t("unblockConfirm"),
 			});
-			if (canceled) return
+			if (canceled) return;
 
 			await os.api("blocking/delete", {
 				userId: props.user.id,
-			})
+			});
 			if (props.user.isMuted) {
 				await os.api("mute/delete", {
 					userId: props.user.id,
-				})
+				});
 			}
-			emit('refresh')
-		}
-		else if (isFollowing) {
+			emit("refresh");
+		} else if (isFollowing) {
 			const { canceled } = await os.confirm({
-				type: 'warning',
-				text: i18n.t('unfollowConfirm', { name: props.user.name || props.user.username }),
+				type: "warning",
+				text: i18n.t("unfollowConfirm", {
+					name: props.user.name || props.user.username,
+				}),
 			});
 
 			if (canceled) return;
 
-			await os.api('following/delete', {
+			await os.api("following/delete", {
 				userId: props.user.id,
 			});
 		} else {
 			if (hasPendingFollowRequestFromYou) {
-				await os.api('following/requests/cancel', {
+				await os.api("following/requests/cancel", {
 					userId: props.user.id,
 				});
 				hasPendingFollowRequestFromYou = false;
 			} else {
-				await os.api('following/create', {
+				await os.api("following/create", {
 					userId: props.user.id,
 				});
 				hasPendingFollowRequestFromYou = true;
@@ -129,8 +145,8 @@ async function onClick() {
 }
 
 onMounted(() => {
-	connection.on('follow', onFollowChange);
-	connection.on('unfollow', onFollowChange);
+	connection.on("follow", onFollowChange);
+	connection.on("unfollow", onFollowChange);
 });
 
 onBeforeUnmount(() => {
diff --git a/packages/client/src/components/MkForgotPassword.vue b/packages/client/src/components/MkForgotPassword.vue
index 1b55451c9..07f086601 100644
--- a/packages/client/src/components/MkForgotPassword.vue
+++ b/packages/client/src/components/MkForgotPassword.vue
@@ -1,63 +1,93 @@
 <template>
-<XModalWindow ref="dialog"
-	:width="370"
-	:height="400"
-	@close="dialog.close()"
-	@closed="emit('closed')"
->
-	<template #header>{{ i18n.ts.forgotPassword }}</template>
+	<XModalWindow
+		ref="dialog"
+		:width="370"
+		:height="400"
+		@close="dialog.close()"
+		@closed="emit('closed')"
+	>
+		<template #header>{{ i18n.ts.forgotPassword }}</template>
 
-	<form v-if="instance.enableEmail" class="bafeceda" @submit.prevent="onSubmit">
-		<div class="main _formRoot">
-			<MkInput v-model="username" class="_formBlock" type="text" pattern="^[a-zA-Z0-9_]+$" :spellcheck="false" autofocus required>
-				<template #label>{{ i18n.ts.username }}</template>
-				<template #prefix>@</template>
-			</MkInput>
+		<form
+			v-if="instance.enableEmail"
+			class="bafeceda"
+			@submit.prevent="onSubmit"
+		>
+			<div class="main _formRoot">
+				<MkInput
+					v-model="username"
+					class="_formBlock"
+					type="text"
+					pattern="^[a-zA-Z0-9_]+$"
+					:spellcheck="false"
+					autofocus
+					required
+				>
+					<template #label>{{ i18n.ts.username }}</template>
+					<template #prefix>@</template>
+				</MkInput>
 
-			<MkInput v-model="email" class="_formBlock" type="email" :spellcheck="false" required>
-				<template #label>{{ i18n.ts.emailAddress }}</template>
-				<template #caption>{{ i18n.ts._forgotPassword.enterEmail }}</template>
-			</MkInput>
+				<MkInput
+					v-model="email"
+					class="_formBlock"
+					type="email"
+					:spellcheck="false"
+					required
+				>
+					<template #label>{{ i18n.ts.emailAddress }}</template>
+					<template #caption>{{
+						i18n.ts._forgotPassword.enterEmail
+					}}</template>
+				</MkInput>
 
-			<MkButton class="_formBlock" type="submit" :disabled="processing" primary style="margin: 0 auto;">{{ i18n.ts.send }}</MkButton>
+				<MkButton
+					class="_formBlock"
+					type="submit"
+					:disabled="processing"
+					primary
+					style="margin: 0 auto"
+					>{{ i18n.ts.send }}</MkButton
+				>
+			</div>
+			<div class="sub">
+				<MkA to="/about" class="_link">{{
+					i18n.ts._forgotPassword.ifNoEmail
+				}}</MkA>
+			</div>
+		</form>
+		<div v-else class="bafecedb">
+			{{ i18n.ts._forgotPassword.contactAdmin }}
 		</div>
-		<div class="sub">
-			<MkA to="/about" class="_link">{{ i18n.ts._forgotPassword.ifNoEmail }}</MkA>
-		</div>
-	</form>
-	<div v-else class="bafecedb">
-		{{ i18n.ts._forgotPassword.contactAdmin }}
-	</div>
-</XModalWindow>
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import * as os from '@/os';
-import { instance } from '@/instance';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import * as os from "@/os";
+import { instance } from "@/instance";
+import { i18n } from "@/i18n";
 
 const emit = defineEmits<{
-	(ev: 'done'): void;
-	(ev: 'closed'): void;
+	(ev: "done"): void;
+	(ev: "closed"): void;
 }>();
 
 let dialog: InstanceType<typeof XModalWindow> = $ref();
 
-let username = $ref('');
-let email = $ref('');
+let username = $ref("");
+let email = $ref("");
 let processing = $ref(false);
 
 async function onSubmit() {
 	processing = true;
-	await os.apiWithDialog('request-reset-password', {
+	await os.apiWithDialog("request-reset-password", {
 		username,
 		email,
 	});
-	emit('done');
+	emit("done");
 	dialog.close();
 }
 </script>
diff --git a/packages/client/src/components/MkFormDialog.vue b/packages/client/src/components/MkFormDialog.vue
index a92f39d5d..9b1cab73f 100644
--- a/packages/client/src/components/MkFormDialog.vue
+++ b/packages/client/src/components/MkFormDialog.vue
@@ -1,70 +1,170 @@
 <template>
-<XModalWindow
-	ref="dialog"
-	:width="450"
-	:can-close="false"
-	:with-ok-button="true"
-	:ok-button-disabled="false"
-	@click="cancel()"
-	@ok="ok()"
-	@close="cancel()"
-	@closed="$emit('closed')"
->
-	<template #header>
-		{{ title }}
-	</template>
+	<XModalWindow
+		ref="dialog"
+		:width="450"
+		:can-close="false"
+		:with-ok-button="true"
+		:ok-button-disabled="false"
+		@click="cancel()"
+		@ok="ok()"
+		@close="cancel()"
+		@closed="$emit('closed')"
+	>
+		<template #header>
+			{{ title }}
+		</template>
 
-	<MkSpacer :margin-min="20" :margin-max="32">
-		<div class="xkpnjxcv _formRoot">
-			<template v-for="item in Object.keys(form).filter(item => !form[item].hidden)">
-				<FormInput v-if="form[item].type === 'number'" v-model="values[item]" type="number" :step="form[item].step || 1" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
-					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
-				</FormInput>
-				<FormInput v-else-if="form[item].type === 'string' && !form[item].multiline" v-model="values[item]" type="text" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
-					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
-				</FormInput>
-				<FormTextarea v-else-if="form[item].type === 'string' && form[item].multiline" v-model="values[item]" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
-					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
-				</FormTextarea>
-				<FormSwitch v-else-if="form[item].type === 'boolean'" v-model="values[item]" class="_formBlock">
-					<span v-text="form[item].label || item"></span>
-					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
-				</FormSwitch>
-				<FormSelect v-else-if="form[item].type === 'enum'" v-model="values[item]" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
-					<option v-for="item in form[item].enum" :key="item.value" :value="item.value">{{ item.label }}</option>
-				</FormSelect>
-				<FormRadios v-else-if="form[item].type === 'radio'" v-model="values[item]" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
-					<option v-for="item in form[item].options" :key="item.value" :value="item.value">{{ item.label }}</option>
-				</FormRadios>
-				<FormRange v-else-if="form[item].type === 'range'" v-model="values[item]" :min="form[item].min" :max="form[item].max" :step="form[item].step" :text-converter="form[item].textConverter" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
-					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
-				</FormRange>
-				<MkButton v-else-if="form[item].type === 'button'" class="_formBlock" @click="form[item].action($event, values)">
-					<span v-text="form[item].content || item"></span>
-				</MkButton>
-			</template>
-		</div>
-	</MkSpacer>
-</XModalWindow>
+		<MkSpacer :margin-min="20" :margin-max="32">
+			<div class="xkpnjxcv _formRoot">
+				<template
+					v-for="item in Object.keys(form).filter(
+						(item) => !form[item].hidden
+					)"
+				>
+					<FormInput
+						v-if="form[item].type === 'number'"
+						v-model="values[item]"
+						type="number"
+						:step="form[item].step || 1"
+						class="_formBlock"
+					>
+						<template #label
+							><span v-text="form[item].label || item"></span
+							><span v-if="form[item].required === false">
+								({{ i18n.ts.optional }})</span
+							></template
+						>
+						<template v-if="form[item].description" #caption>{{
+							form[item].description
+						}}</template>
+					</FormInput>
+					<FormInput
+						v-else-if="
+							form[item].type === 'string' &&
+							!form[item].multiline
+						"
+						v-model="values[item]"
+						type="text"
+						class="_formBlock"
+					>
+						<template #label
+							><span v-text="form[item].label || item"></span
+							><span v-if="form[item].required === false">
+								({{ i18n.ts.optional }})</span
+							></template
+						>
+						<template v-if="form[item].description" #caption>{{
+							form[item].description
+						}}</template>
+					</FormInput>
+					<FormTextarea
+						v-else-if="
+							form[item].type === 'string' && form[item].multiline
+						"
+						v-model="values[item]"
+						class="_formBlock"
+					>
+						<template #label
+							><span v-text="form[item].label || item"></span
+							><span v-if="form[item].required === false">
+								({{ i18n.ts.optional }})</span
+							></template
+						>
+						<template v-if="form[item].description" #caption>{{
+							form[item].description
+						}}</template>
+					</FormTextarea>
+					<FormSwitch
+						v-else-if="form[item].type === 'boolean'"
+						v-model="values[item]"
+						class="_formBlock"
+					>
+						<span v-text="form[item].label || item"></span>
+						<template v-if="form[item].description" #caption>{{
+							form[item].description
+						}}</template>
+					</FormSwitch>
+					<FormSelect
+						v-else-if="form[item].type === 'enum'"
+						v-model="values[item]"
+						class="_formBlock"
+					>
+						<template #label
+							><span v-text="form[item].label || item"></span
+							><span v-if="form[item].required === false">
+								({{ i18n.ts.optional }})</span
+							></template
+						>
+						<option
+							v-for="item in form[item].enum"
+							:key="item.value"
+							:value="item.value"
+						>
+							{{ item.label }}
+						</option>
+					</FormSelect>
+					<FormRadios
+						v-else-if="form[item].type === 'radio'"
+						v-model="values[item]"
+						class="_formBlock"
+					>
+						<template #label
+							><span v-text="form[item].label || item"></span
+							><span v-if="form[item].required === false">
+								({{ i18n.ts.optional }})</span
+							></template
+						>
+						<option
+							v-for="item in form[item].options"
+							:key="item.value"
+							:value="item.value"
+						>
+							{{ item.label }}
+						</option>
+					</FormRadios>
+					<FormRange
+						v-else-if="form[item].type === 'range'"
+						v-model="values[item]"
+						:min="form[item].min"
+						:max="form[item].max"
+						:step="form[item].step"
+						:text-converter="form[item].textConverter"
+						class="_formBlock"
+					>
+						<template #label
+							><span v-text="form[item].label || item"></span
+							><span v-if="form[item].required === false">
+								({{ i18n.ts.optional }})</span
+							></template
+						>
+						<template v-if="form[item].description" #caption>{{
+							form[item].description
+						}}</template>
+					</FormRange>
+					<MkButton
+						v-else-if="form[item].type === 'button'"
+						class="_formBlock"
+						@click="form[item].action($event, values)"
+					>
+						<span v-text="form[item].content || item"></span>
+					</MkButton>
+				</template>
+			</div>
+		</MkSpacer>
+	</XModalWindow>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import FormInput from './form/input.vue';
-import FormTextarea from './form/textarea.vue';
-import FormSwitch from './form/switch.vue';
-import FormSelect from './form/select.vue';
-import FormRange from './form/range.vue';
-import MkButton from './MkButton.vue';
-import FormRadios from './form/radios.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import { i18n } from '@/i18n';
+import { defineComponent } from "vue";
+import FormInput from "./form/input.vue";
+import FormTextarea from "./form/textarea.vue";
+import FormSwitch from "./form/switch.vue";
+import FormSelect from "./form/select.vue";
+import FormRange from "./form/range.vue";
+import MkButton from "./MkButton.vue";
+import FormRadios from "./form/radios.vue";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
@@ -89,7 +189,7 @@ export default defineComponent({
 		},
 	},
 
-	emits: ['done'],
+	emits: ["done"],
 
 	data() {
 		return {
@@ -106,14 +206,14 @@ export default defineComponent({
 
 	methods: {
 		ok() {
-			this.$emit('done', {
+			this.$emit("done", {
 				result: this.values,
 			});
 			this.$refs.dialog.close();
 		},
 
 		cancel() {
-			this.$emit('done', {
+			this.$emit("done", {
 				canceled: true,
 			});
 			this.$refs.dialog.close();
@@ -124,6 +224,5 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 .xkpnjxcv {
-
 }
 </style>
diff --git a/packages/client/src/components/MkFormula.vue b/packages/client/src/components/MkFormula.vue
index 65a2fee93..2dacad167 100644
--- a/packages/client/src/components/MkFormula.vue
+++ b/packages/client/src/components/MkFormula.vue
@@ -1,14 +1,16 @@
 <template>
-<XFormula :formula="formula" :block="block"/>
+	<XFormula :formula="formula" :block="block" />
 </template>
 
 <script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
-import * as os from '@/os';
+import { defineComponent, defineAsyncComponent } from "vue";
+import * as os from "@/os";
 
 export default defineComponent({
 	components: {
-		XFormula: defineAsyncComponent(() => import('@/components/MkFormulaCore.vue')),
+		XFormula: defineAsyncComponent(
+			() => import("@/components/MkFormulaCore.vue")
+		),
 	},
 	props: {
 		formula: {
diff --git a/packages/client/src/components/MkFormulaCore.vue b/packages/client/src/components/MkFormulaCore.vue
index de24befed..5675dbfa0 100644
--- a/packages/client/src/components/MkFormulaCore.vue
+++ b/packages/client/src/components/MkFormulaCore.vue
@@ -1,30 +1,30 @@
 <template>
-<div v-if="block" v-html="compiledFormula"></div>
-<span v-else v-html="compiledFormula"></span>
+	<div v-if="block" v-html="compiledFormula"></div>
+	<span v-else v-html="compiledFormula"></span>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import katex from 'katex';
+import { defineComponent } from "vue";
+import katex from "katex";
 
 export default defineComponent({
 	props: {
 		formula: {
 			type: String,
-			required: true
+			required: true,
 		},
 		block: {
 			type: Boolean,
-			required: true
-		}
+			required: true,
+		},
 	},
 	computed: {
 		compiledFormula(): any {
 			return katex.renderToString(this.formula, {
-				throwOnError: false
+				throwOnError: false,
 			} as any);
-		}
-	}
+		},
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/MkGalleryPostPreview.vue b/packages/client/src/components/MkGalleryPostPreview.vue
index 056f1dff4..f4f694383 100644
--- a/packages/client/src/components/MkGalleryPostPreview.vue
+++ b/packages/client/src/components/MkGalleryPostPreview.vue
@@ -1,27 +1,31 @@
 <template>
-<MkA :to="`/gallery/${post.id}`" class="ttasepnz _panel" tabindex="-1">
-	<div class="thumbnail">
-		<ImgWithBlurhash class="img" :src="post.files[0].thumbnailUrl" :hash="post.files[0].blurhash"/>
-	</div>
-	<article>
-		<header>
-			<MkAvatar :user="post.user" class="avatar"/>
-		</header>
-		<footer>
-			<span class="title">{{ post.title }}</span>
-		</footer>
-	</article>
-</MkA>
+	<MkA :to="`/gallery/${post.id}`" class="ttasepnz _panel" tabindex="-1">
+		<div class="thumbnail">
+			<ImgWithBlurhash
+				class="img"
+				:src="post.files[0].thumbnailUrl"
+				:hash="post.files[0].blurhash"
+			/>
+		</div>
+		<article>
+			<header>
+				<MkAvatar :user="post.user" class="avatar" />
+			</header>
+			<footer>
+				<span class="title">{{ post.title }}</span>
+			</footer>
+		</article>
+	</MkA>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import { userName } from '@/filters/user';
-import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
+import {} from "vue";
+import { userName } from "@/filters/user";
+import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
 
 const props = defineProps<{
-		post: any;
-	}>();
+	post: any;
+}>();
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/MkGoogle.vue b/packages/client/src/components/MkGoogle.vue
index 274f851a6..2599aea47 100644
--- a/packages/client/src/components/MkGoogle.vue
+++ b/packages/client/src/components/MkGoogle.vue
@@ -1,13 +1,16 @@
 <template>
-<div class="mk-google">
-	<input v-model="query" type="search" :placeholder="q">
-	<button @click="search"><i class="ph-magnifying-glass ph-bold ph-lg"></i> {{ i18n.ts.searchByGoogle }}</button>
-</div>
+	<div class="mk-google">
+		<input v-model="query" type="search" :placeholder="q" />
+		<button @click="search">
+			<i class="ph-magnifying-glass ph-bold ph-lg"></i>
+			{{ i18n.ts.searchByGoogle }}
+		</button>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import { i18n } from '@/i18n';
+import { ref } from "vue";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	q: string;
@@ -16,7 +19,10 @@ const props = defineProps<{
 const query = ref(props.q);
 
 const search = () => {
-	window.open(`https://search.annoyingorange.xyz/search?q=${query.value}`, '_blank');
+	window.open(
+		`https://search.annoyingorange.xyz/search?q=${query.value}`,
+		"_blank"
+	);
 };
 </script>
 
diff --git a/packages/client/src/components/MkHeatmap.vue b/packages/client/src/components/MkHeatmap.vue
index 02f5c7aed..1af278b23 100644
--- a/packages/client/src/components/MkHeatmap.vue
+++ b/packages/client/src/components/MkHeatmap.vue
@@ -1,23 +1,30 @@
 <template>
 	<div ref="rootEl">
-		<MkLoading v-if="fetching"/>
+		<MkLoading v-if="fetching" />
 		<div v-else>
 			<canvas ref="chartEl"></canvas>
 		</div>
 	</div>
-	</template>
+</template>
 
 <script lang="ts" setup>
-import { markRaw, version as vueVersion, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
-import { Chart } from 'chart.js';
-import tinycolor from 'tinycolor2';
-import { MatrixController, MatrixElement } from 'chartjs-chart-matrix';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip';
-import { chartVLine } from '@/scripts/chart-vline';
-import { alpha } from '@/scripts/color';
-import { initChart } from '@/scripts/init-chart';
+import {
+	markRaw,
+	version as vueVersion,
+	onMounted,
+	onBeforeUnmount,
+	nextTick,
+	watch,
+} from "vue";
+import { Chart } from "chart.js";
+import tinycolor from "tinycolor2";
+import { MatrixController, MatrixElement } from "chartjs-chart-matrix";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { useChartTooltip } from "@/scripts/use-chart-tooltip";
+import { chartVLine } from "@/scripts/chart-vline";
+import { alpha } from "@/scripts/color";
+import { initChart } from "@/scripts/init-chart";
 
 initChart();
 
@@ -32,7 +39,7 @@ let chartInstance: Chart = null;
 let fetching = $ref(true);
 
 const { handler: externalTooltipHandler } = useChartTooltip({
-	position: 'middle',
+	position: "middle",
 });
 
 async function renderChart() {
@@ -57,7 +64,9 @@ async function renderChart() {
 	const format = (arr) => {
 		return arr.map((v, i) => {
 			const dt = getDate(i);
-			const iso = `${dt.getFullYear()}-${(dt.getMonth() + 1).toString().padStart(2, '0')}-${dt.getDate().toString().padStart(2, '0')}`;
+			const iso = `${dt.getFullYear()}-${(dt.getMonth() + 1)
+				.toString()
+				.padStart(2, "0")}-${dt.getDate().toString().padStart(2, "0")}`;
 			return {
 				x: iso,
 				y: dt.getDay(),
@@ -69,20 +78,35 @@ async function renderChart() {
 
 	let values;
 
-	if (props.src === 'active-users') {
-		const raw = await os.api('charts/active-users', { limit: chartLimit, span: 'day' });
+	if (props.src === "active-users") {
+		const raw = await os.api("charts/active-users", {
+			limit: chartLimit,
+			span: "day",
+		});
 		values = raw.readWrite;
-	} else if (props.src === 'notes') {
-		const raw = await os.api('charts/notes', { limit: chartLimit, span: 'day' });
+	} else if (props.src === "notes") {
+		const raw = await os.api("charts/notes", {
+			limit: chartLimit,
+			span: "day",
+		});
 		values = raw.local.inc;
-	} else if (props.src === 'ap-requests-inbox-received') {
-		const raw = await os.api('charts/ap-request', { limit: chartLimit, span: 'day' });
+	} else if (props.src === "ap-requests-inbox-received") {
+		const raw = await os.api("charts/ap-request", {
+			limit: chartLimit,
+			span: "day",
+		});
 		values = raw.inboxReceived;
-	} else if (props.src === 'ap-requests-deliver-succeeded') {
-		const raw = await os.api('charts/ap-request', { limit: chartLimit, span: 'day' });
+	} else if (props.src === "ap-requests-deliver-succeeded") {
+		const raw = await os.api("charts/ap-request", {
+			limit: chartLimit,
+			span: "day",
+		});
 		values = raw.deliverSucceeded;
-	} else if (props.src === 'ap-requests-deliver-failed') {
-		const raw = await os.api('charts/ap-request', { limit: chartLimit, span: 'day' });
+	} else if (props.src === "ap-requests-deliver-failed") {
+		const raw = await os.api("charts/ap-request", {
+			limit: chartLimit,
+			span: "day",
+		});
 		values = raw.deliverFailed;
 	}
 
@@ -90,43 +114,51 @@ async function renderChart() {
 
 	await nextTick();
 
-	const color = defaultStore.state.darkMode ? '#ebbcba' : '#d7827e';
+	const color = defaultStore.state.darkMode ? "#ebbcba" : "#d7827e";
 
 	// 視覚上の分かりやすさのため上から最も大きい3つの値の平均を最大値とする
-	const max = values.slice().sort((a, b) => b - a).slice(0, 3).reduce((a, b) => a + b, 0) / 3;
+	const max =
+		values
+			.slice()
+			.sort((a, b) => b - a)
+			.slice(0, 3)
+			.reduce((a, b) => a + b, 0) / 3;
 
 	const min = Math.max(0, Math.min(...values) - 1);
 
 	const marginEachCell = 4;
 
 	chartInstance = new Chart(chartEl, {
-		type: 'matrix',
+		type: "matrix",
 		data: {
-			datasets: [{
-				label: 'Read & Write',
-				data: format(values),
-				pointRadius: 0,
-				borderWidth: 0,
-				borderJoinStyle: 'round',
-				borderRadius: 3,
-				backgroundColor(c) {
-					const value = c.dataset.data[c.dataIndex].v;
-					let a = (value - min) / max;
-					if (value !== 0) { // 0でない限りは完全に不可視にはしない
-						a = Math.max(a, 0.05);
-					}
-					return alpha(color, a);
+			datasets: [
+				{
+					label: "Read & Write",
+					data: format(values),
+					pointRadius: 0,
+					borderWidth: 0,
+					borderJoinStyle: "round",
+					borderRadius: 3,
+					backgroundColor(c) {
+						const value = c.dataset.data[c.dataIndex].v;
+						let a = (value - min) / max;
+						if (value !== 0) {
+							// 0でない限りは完全に不可視にはしない
+							a = Math.max(a, 0.05);
+						}
+						return alpha(color, a);
+					},
+					fill: true,
+					width(c) {
+						const a = c.chart.chartArea ?? {};
+						return (a.right - a.left) / weeks - marginEachCell;
+					},
+					height(c) {
+						const a = c.chart.chartArea ?? {};
+						return (a.bottom - a.top) / 7 - marginEachCell;
+					},
 				},
-				fill: true,
-				width(c) {
-					const a = c.chart.chartArea ?? {};
-					return (a.right - a.left) / weeks - marginEachCell;
-				},
-				height(c) {
-					const a = c.chart.chartArea ?? {};
-					return (a.bottom - a.top) / 7 - marginEachCell;
-				},
-			}],
+			],
 		},
 		options: {
 			aspectRatio: wide ? 6 : narrow ? 1.8 : 3.2,
@@ -140,17 +172,17 @@ async function renderChart() {
 			},
 			scales: {
 				x: {
-					type: 'time',
+					type: "time",
 					offset: true,
-					position: 'bottom',
+					position: "bottom",
 					time: {
-						unit: 'week',
-						round: 'week',
+						unit: "week",
+						round: "week",
 						isoWeekday: 0,
 						displayFormats: {
-							day: 'M/d',
-							month: 'Y/M',
-							week: 'M/d',
+							day: "M/d",
+							month: "Y/M",
+							week: "M/d",
 						},
 					},
 					grid: {
@@ -165,7 +197,7 @@ async function renderChart() {
 				y: {
 					offset: true,
 					reverse: true,
-					position: 'right',
+					position: "right",
 					grid: {
 						display: false,
 					},
@@ -176,7 +208,8 @@ async function renderChart() {
 						font: {
 							size: 9,
 						},
-						callback: (value, index, values) => ['', 'Mon', '', 'Wed', '', 'Fri', ''][value],
+						callback: (value, index, values) =>
+							["", "Mon", "", "Wed", "", "Fri", ""][value],
 					},
 				},
 			},
@@ -188,12 +221,13 @@ async function renderChart() {
 					enabled: false,
 					callbacks: {
 						title(context) {
-							const v = context[0].dataset.data[context[0].dataIndex];
+							const v =
+								context[0].dataset.data[context[0].dataIndex];
 							return v.d;
 						},
 						label(context) {
 							const v = context.dataset.data[context.dataIndex];
-							return ['Active: ' + v.v];
+							return ["Active: " + v.v];
 						},
 					},
 					//mode: 'index',
@@ -207,10 +241,13 @@ async function renderChart() {
 	});
 }
 
-watch(() => props.src, () => {
-	fetching = true;
-	renderChart();
-});
+watch(
+	() => props.src,
+	() => {
+		fetching = true;
+		renderChart();
+	}
+);
 
 onMounted(async () => {
 	renderChart();
diff --git a/packages/client/src/components/MkImageViewer.vue b/packages/client/src/components/MkImageViewer.vue
index 263ce7c0a..51173d99d 100644
--- a/packages/client/src/components/MkImageViewer.vue
+++ b/packages/client/src/components/MkImageViewer.vue
@@ -1,31 +1,46 @@
 <template>
-<MkModal ref="modal" :z-priority="'middle'" @click="modal.close()" @closed="emit('closed')">
-	<div class="xubzgfga">
-		<header>{{ image.name }}</header>
-		<img :src="image.url" :alt="image.comment" :title="image.comment" @click="modal.close()"/>
-		<footer>
-			<span>{{ image.type }}</span>
-			<span>{{ bytes(image.size) }}</span>
-			<span v-if="image.properties && image.properties.width">{{ number(image.properties.width) }}px × {{ number(image.properties.height) }}px</span>
-		</footer>
-	</div>
-</MkModal>
+	<MkModal
+		ref="modal"
+		:z-priority="'middle'"
+		@click="modal.close()"
+		@closed="emit('closed')"
+	>
+		<div class="xubzgfga">
+			<header>{{ image.name }}</header>
+			<img
+				:src="image.url"
+				:alt="image.comment"
+				:title="image.comment"
+				@click="modal.close()"
+			/>
+			<footer>
+				<span>{{ image.type }}</span>
+				<span>{{ bytes(image.size) }}</span>
+				<span v-if="image.properties && image.properties.width"
+					>{{ number(image.properties.width) }}px ×
+					{{ number(image.properties.height) }}px</span
+				>
+			</footer>
+		</div>
+	</MkModal>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import type * as misskey from 'calckey-js';
-import bytes from '@/filters/bytes';
-import number from '@/filters/number';
-import MkModal from '@/components/MkModal.vue';
+import {} from "vue";
+import type * as misskey from "calckey-js";
+import bytes from "@/filters/bytes";
+import number from "@/filters/number";
+import MkModal from "@/components/MkModal.vue";
 
-const props = withDefaults(defineProps<{
-	image: misskey.entities.DriveFile;
-}>(), {
-});
+const props = withDefaults(
+	defineProps<{
+		image: misskey.entities.DriveFile;
+	}>(),
+	{}
+);
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
 const modal = $ref<InstanceType<typeof MkModal>>();
diff --git a/packages/client/src/components/MkImgWithBlurhash.vue b/packages/client/src/components/MkImgWithBlurhash.vue
index b6eae622d..c7652f476 100644
--- a/packages/client/src/components/MkImgWithBlurhash.vue
+++ b/packages/client/src/components/MkImgWithBlurhash.vue
@@ -1,30 +1,46 @@
 <template>
-<div class="xubzgfgb" :class="{ cover }" :title="title">
-	<canvas v-if="!loaded" ref="canvas" :width="size" :height="size" :title="title"/>
-	<img v-if="src" :src="src" :title="title" :type="type" :alt="alt" @load="onLoad"/>
-</div>
+	<div class="xubzgfgb" :class="{ cover }" :title="title">
+		<canvas
+			v-if="!loaded"
+			ref="canvas"
+			:width="size"
+			:height="size"
+			:title="title"
+		/>
+		<img
+			v-if="src"
+			:src="src"
+			:title="title"
+			:type="type"
+			:alt="alt"
+			@load="onLoad"
+		/>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import { decode } from 'blurhash';
+import { onMounted } from "vue";
+import { decode } from "blurhash";
 
-const props = withDefaults(defineProps<{
-	src?: string | null;
-	hash?: string;
-	alt?: string;
-	type?: string | null;
-	title?: string | null;
-	size?: number;
-	cover?: boolean;
-}>(), {
-	src: null,
-	type: null,
-	alt: '',
-	title: null,
-	size: 64,
-	cover: true,
-});
+const props = withDefaults(
+	defineProps<{
+		src?: string | null;
+		hash?: string;
+		alt?: string;
+		type?: string | null;
+		title?: string | null;
+		size?: number;
+		cover?: boolean;
+	}>(),
+	{
+		src: null,
+		type: null,
+		alt: "",
+		title: null,
+		size: 64,
+		cover: true,
+	}
+);
 
 const canvas = $ref<HTMLCanvasElement>();
 let loaded = $ref(false);
@@ -32,7 +48,7 @@ let loaded = $ref(false);
 function draw() {
 	if (props.hash == null) return;
 	const pixels = decode(props.hash, props.size, props.size);
-	const ctx = canvas.getContext('2d');
+	const ctx = canvas.getContext("2d");
 	const imageData = ctx!.createImageData(props.size, props.size);
 	imageData.data.set(pixels);
 	ctx!.putImageData(imageData, 0, 0);
diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index 005ac53ff..43f2de29e 100644
--- a/packages/client/src/components/MkInfo.vue
+++ b/packages/client/src/components/MkInfo.vue
@@ -1,13 +1,13 @@
 <template>
-<div class="fpezltsf" :class="{ warn }">
-	<i v-if="warn" class="ph-warning ph-bold ph-lg"></i>
-	<i v-else class="ph-info ph-bold ph-lg"></i>
-	<slot></slot>
-</div>
+	<div class="fpezltsf" :class="{ warn }">
+		<i v-if="warn" class="ph-warning ph-bold ph-lg"></i>
+		<i v-else class="ph-info ph-bold ph-lg"></i>
+		<slot></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
+import {} from "vue";
 
 defineProps<{
 	warn?: boolean;
diff --git a/packages/client/src/components/MkInstanceCardMini.vue b/packages/client/src/components/MkInstanceCardMini.vue
index 11952e46c..0a3fbbea2 100644
--- a/packages/client/src/components/MkInstanceCardMini.vue
+++ b/packages/client/src/components/MkInstanceCardMini.vue
@@ -1,19 +1,32 @@
 <template>
-<div :class="[$style.root, { yellow: instance.isNotResponding, red: instance.isBlocked, gray: instance.isSuspended }]">
-	<img class="icon" :src="getInstanceIcon(instance)" alt=""/>
-	<div class="body">
-		<span class="host">{{ instance.name ?? instance.host }}</span>
-		<span class="sub _monospace"><b>{{ instance.host }}</b> / {{ instance.softwareName || '?' }} {{ instance.softwareVersion }}</span>
+	<div
+		:class="[
+			$style.root,
+			{
+				yellow: instance.isNotResponding,
+				red: instance.isBlocked,
+				gray: instance.isSuspended,
+			},
+		]"
+	>
+		<img class="icon" :src="getInstanceIcon(instance)" alt="" />
+		<div class="body">
+			<span class="host">{{ instance.name ?? instance.host }}</span>
+			<span class="sub _monospace"
+				><b>{{ instance.host }}</b> /
+				{{ instance.softwareName || "?" }}
+				{{ instance.softwareVersion }}</span
+			>
+		</div>
+		<MkMiniChart v-if="chartValues" class="chart" :src="chartValues" />
 	</div>
-	<MkMiniChart v-if="chartValues" class="chart" :src="chartValues"/>
-</div>
 </template>
 
 <script lang="ts" setup>
-import * as misskey from 'calckey-js';
-import MkMiniChart from '@/components/MkMiniChart.vue';
-import * as os from '@/os';
-import { getProxiedImageUrlNullable } from '@/scripts/media-proxy';
+import * as misskey from "calckey-js";
+import MkMiniChart from "@/components/MkMiniChart.vue";
+import * as os from "@/os";
+import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
 
 const props = defineProps<{
 	instance: misskey.entities.Instance;
@@ -21,14 +34,22 @@ const props = defineProps<{
 
 let chartValues = $ref<number[] | null>(null);
 
-os.apiGet('charts/instance', { host: props.instance.host, limit: 16 + 1, span: 'day' }).then(res => {
+os.apiGet("charts/instance", {
+	host: props.instance.host,
+	limit: 16 + 1,
+	span: "day",
+}).then((res) => {
 	// 今日のぶんの値はまだ途中の値であり、それも含めると大抵の場合前日よりも下降しているようなグラフになってしまうため今日は弾く
 	res.requests.received.splice(0, 1);
 	chartValues = res.requests.received;
 });
 
 function getInstanceIcon(instance): string {
-	return getProxiedImageUrlNullable(instance.iconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? '/client-assets/dummy.png';
+	return (
+		getProxiedImageUrlNullable(instance.iconUrl, "preview") ??
+		getProxiedImageUrlNullable(instance.faviconUrl, "preview") ??
+		"/client-assets/dummy.png"
+	);
 }
 </script>
 
@@ -86,19 +107,46 @@ function getInstanceIcon(instance): string {
 
 	&:global(.yellow) {
 		--c: rgb(255 196 0 / 15%);
-		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-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;
 	}
 
 	&:global(.red) {
 		--c: rgb(255 0 0 / 15%);
-		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-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;
 	}
 
 	&: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-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;
 	}
 }
diff --git a/packages/client/src/components/MkInstanceSelectDialog.vue b/packages/client/src/components/MkInstanceSelectDialog.vue
index 0d0123f0f..c79879d14 100644
--- a/packages/client/src/components/MkInstanceSelectDialog.vue
+++ b/packages/client/src/components/MkInstanceSelectDialog.vue
@@ -1,87 +1,113 @@
 <template>
-<XModalWindow
-	ref="dialogEl"
-	:with-ok-button="true"
-	:ok-button-disabled="selected == null"
-	@click="cancel()"
-	@close="cancel()"
-	@ok="ok()"
-	@closed="$emit('closed')"
->
-	<template #header>{{ i18n.ts.selectInstance }}</template>
-	<div class="mehkoush">
-		<div class="form">
-				<MkInput v-model="hostname" :autofocus="true" @update:modelValue="search">
+	<XModalWindow
+		ref="dialogEl"
+		:with-ok-button="true"
+		:ok-button-disabled="selected == null"
+		@click="cancel()"
+		@close="cancel()"
+		@ok="ok()"
+		@closed="$emit('closed')"
+	>
+		<template #header>{{ i18n.ts.selectInstance }}</template>
+		<div class="mehkoush">
+			<div class="form">
+				<MkInput
+					v-model="hostname"
+					:autofocus="true"
+					@update:modelValue="search"
+				>
 					<template #label>{{ i18n.ts.instance }}</template>
 				</MkInput>
-		</div>
-		<div v-if="hostname != ''" class="result" :class="{ hit: instances.length > 0 }">
-			<div v-if="instances.length > 0" class="instances">
-				<div v-for="item in instances" :key="item.id" class="instance" :class="{ selected: selected && selected.id === item.id }" @click="selected = item" @dblclick="ok()">
-					<div class="body">
-						<img class="icon" :src="item.iconUrl ?? '/client-assets/dummy.png'" aria-hidden="true"/>
-						<span class="name">{{ item.host }}</span>
+			</div>
+			<div
+				v-if="hostname != ''"
+				class="result"
+				:class="{ hit: instances.length > 0 }"
+			>
+				<div v-if="instances.length > 0" class="instances">
+					<div
+						v-for="item in instances"
+						:key="item.id"
+						class="instance"
+						:class="{
+							selected: selected && selected.id === item.id,
+						}"
+						@click="selected = item"
+						@dblclick="ok()"
+					>
+						<div class="body">
+							<img
+								class="icon"
+								:src="
+									item.iconUrl ?? '/client-assets/dummy.png'
+								"
+								aria-hidden="true"
+							/>
+							<span class="name">{{ item.host }}</span>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div v-else class="empty">
-				<span>{{ i18n.ts.noInstances }}</span>
+				<div v-else class="empty">
+					<span>{{ i18n.ts.noInstances }}</span>
+				</div>
 			</div>
 		</div>
-	</div>
-</XModalWindow>
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import MkInput from '@/components/form/input.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { Instance } from 'calckey-js/built/entities';
+import MkInput from "@/components/form/input.vue";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { Instance } from "calckey-js/built/entities";
 
 const emit = defineEmits<{
-	(ev: 'ok', selected: Instance): void;
-	(ev: 'cancel'): void;
-	(ev: 'closed'): void;
+	(ev: "ok", selected: Instance): void;
+	(ev: "cancel"): void;
+	(ev: "closed"): void;
 }>();
 
-let hostname = $ref('');
+let hostname = $ref("");
 let instances: Instance[] = $ref([]);
 let selected: Instance | null = $ref(null);
 let dialogEl = $ref<InstanceType<typeof XModalWindow>>();
 
 let searchOrderLatch = 0;
 const search = () => {
-	if (hostname === '') {
+	if (hostname === "") {
 		instances = [];
 		return;
 	}
 
 	const searchId = ++searchOrderLatch;
-	os.api('federation/instances', {
+	os.api("federation/instances", {
 		host: hostname,
 		limit: 10,
 		blocked: false,
 		suspended: false,
-		sort: '+pubSub',
-	}).then(_instances => {
+		sort: "+pubSub",
+	}).then((_instances) => {
 		if (searchId !== searchOrderLatch) return;
-		instances = _instances.map(x => ({
-			id: x.id,
-			host: x.host,
-			iconUrl: x.iconUrl,
-		} as Instance));
+		instances = _instances.map(
+			(x) =>
+				({
+					id: x.id,
+					host: x.host,
+					iconUrl: x.iconUrl,
+				} as Instance)
+		);
 	});
 };
 
 const ok = () => {
 	if (selected == null) return;
-	emit('ok', selected);
+	emit("ok", selected);
 	dialogEl?.close();
 };
 
 const cancel = () => {
-	emit('cancel');
+	emit("cancel");
 	dialogEl?.close();
 };
 </script>
diff --git a/packages/client/src/components/MkInstanceStats.vue b/packages/client/src/components/MkInstanceStats.vue
index a9cb7977a..f73580fd6 100644
--- a/packages/client/src/components/MkInstanceStats.vue
+++ b/packages/client/src/components/MkInstanceStats.vue
@@ -4,49 +4,82 @@
 			<template #header>Chart</template>
 			<div :class="$style.chart">
 				<div class="selects">
-					<MkSelect v-model="chartSrc" style="margin: 0; flex: 1;">
+					<MkSelect v-model="chartSrc" style="margin: 0; flex: 1">
 						<optgroup :label="i18n.ts.federation">
-							<option value="federation">{{ i18n.ts._charts.federation }}</option>
-							<option value="ap-request">{{ i18n.ts._charts.apRequest }}</option>
+							<option value="federation">
+								{{ i18n.ts._charts.federation }}
+							</option>
+							<option value="ap-request">
+								{{ i18n.ts._charts.apRequest }}
+							</option>
 						</optgroup>
 						<optgroup :label="i18n.ts.users">
-							<option value="users">{{ i18n.ts._charts.usersIncDec }}</option>
-							<option value="users-total">{{ i18n.ts._charts.usersTotal }}</option>
-							<option value="active-users">{{ i18n.ts._charts.activeUsers }}</option>
+							<option value="users">
+								{{ i18n.ts._charts.usersIncDec }}
+							</option>
+							<option value="users-total">
+								{{ i18n.ts._charts.usersTotal }}
+							</option>
+							<option value="active-users">
+								{{ i18n.ts._charts.activeUsers }}
+							</option>
 						</optgroup>
 						<optgroup :label="i18n.ts.notes">
-							<option value="notes">{{ i18n.ts._charts.notesIncDec }}</option>
-							<option value="local-notes">{{ i18n.ts._charts.localNotesIncDec }}</option>
-							<option value="remote-notes">{{ i18n.ts._charts.remoteNotesIncDec }}</option>
-							<option value="notes-total">{{ i18n.ts._charts.notesTotal }}</option>
+							<option value="notes">
+								{{ i18n.ts._charts.notesIncDec }}
+							</option>
+							<option value="local-notes">
+								{{ i18n.ts._charts.localNotesIncDec }}
+							</option>
+							<option value="remote-notes">
+								{{ i18n.ts._charts.remoteNotesIncDec }}
+							</option>
+							<option value="notes-total">
+								{{ i18n.ts._charts.notesTotal }}
+							</option>
 						</optgroup>
 						<optgroup :label="i18n.ts.drive">
-							<option value="drive-files">{{ i18n.ts._charts.filesIncDec }}</option>
-							<option value="drive">{{ i18n.ts._charts.storageUsageIncDec }}</option>
+							<option value="drive-files">
+								{{ i18n.ts._charts.filesIncDec }}
+							</option>
+							<option value="drive">
+								{{ i18n.ts._charts.storageUsageIncDec }}
+							</option>
 						</optgroup>
 					</MkSelect>
-					<MkSelect v-model="chartSpan" style="margin: 0 0 0 10px;">
+					<MkSelect v-model="chartSpan" style="margin: 0 0 0 10px">
 						<option value="hour">{{ i18n.ts.perHour }}</option>
 						<option value="day">{{ i18n.ts.perDay }}</option>
 					</MkSelect>
 				</div>
 				<div class="chart _panel">
-					<MkChart :src="chartSrc" :span="chartSpan" :limit="chartLimit" :detailed="true"></MkChart>
+					<MkChart
+						:src="chartSrc"
+						:span="chartSpan"
+						:limit="chartLimit"
+						:detailed="true"
+					></MkChart>
 				</div>
 			</div>
 		</MkFolder>
 
 		<MkFolder class="item">
 			<template #header>Active users heatmap</template>
-			<MkSelect v-model="heatmapSrc" style="margin: 0 0 12px 0;">
+			<MkSelect v-model="heatmapSrc" style="margin: 0 0 12px 0">
 				<option value="active-users">Active users</option>
 				<option value="notes">Notes</option>
-				<option value="ap-requests-inbox-received">Fediverse Requests: inboxReceived</option>
-				<option value="ap-requests-deliver-succeeded">Fediverse Requests: deliverSucceeded</option>
-				<option value="ap-requests-deliver-failed">Fediverse Requests: deliverFailed</option>
+				<option value="ap-requests-inbox-received">
+					Fediverse Requests: inboxReceived
+				</option>
+				<option value="ap-requests-deliver-succeeded">
+					Fediverse Requests: deliverSucceeded
+				</option>
+				<option value="ap-requests-deliver-failed">
+					Fediverse Requests: deliverFailed
+				</option>
 			</MkSelect>
 			<div class="_panel" :class="$style.heatmap">
-				<MkHeatmap :src="heatmapSrc"/>
+				<MkHeatmap :src="heatmapSrc" />
 			</div>
 		</MkFolder>
 
@@ -69,45 +102,49 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import { Chart } from 'chart.js';
-import MkSelect from '@/components/form/select.vue';
-import MkChart from '@/components/MkChart.vue';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import MkHeatmap from '@/components/MkHeatmap.vue';
-import MkFolder from '@/components/MkFolder.vue';
-import { initChart } from '@/scripts/init-chart';
+import { onMounted } from "vue";
+import { Chart } from "chart.js";
+import MkSelect from "@/components/form/select.vue";
+import MkChart from "@/components/MkChart.vue";
+import { useChartTooltip } from "@/scripts/use-chart-tooltip";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import MkHeatmap from "@/components/MkHeatmap.vue";
+import MkFolder from "@/components/MkFolder.vue";
+import { initChart } from "@/scripts/init-chart";
 
 initChart();
 
 const chartLimit = 500;
-let chartSpan = $ref<'hour' | 'day'>('hour');
-let chartSrc = $ref('active-users');
-let heatmapSrc = $ref('active-users');
+let chartSpan = $ref<"hour" | "day">("hour");
+let chartSrc = $ref("active-users");
+let heatmapSrc = $ref("active-users");
 let subDoughnutEl = $shallowRef<HTMLCanvasElement>();
 let pubDoughnutEl = $shallowRef<HTMLCanvasElement>();
 
 const { handler: externalTooltipHandler1 } = useChartTooltip({
-	position: 'middle',
+	position: "middle",
 });
 const { handler: externalTooltipHandler2 } = useChartTooltip({
-	position: 'middle',
+	position: "middle",
 });
 
 function createDoughnut(chartEl, tooltip, data) {
 	const chartInstance = new Chart(chartEl, {
-		type: 'doughnut',
+		type: "doughnut",
 		data: {
-			labels: data.map(x => x.name),
-			datasets: [{
-				backgroundColor: data.map(x => x.color),
-				borderColor: getComputedStyle(document.documentElement).getPropertyValue('--panel'),
-				borderWidth: 2,
-				hoverOffset: 0,
-				data: data.map(x => x.value),
-			}],
+			labels: data.map((x) => x.name),
+			datasets: [
+				{
+					backgroundColor: data.map((x) => x.color),
+					borderColor: getComputedStyle(
+						document.documentElement
+					).getPropertyValue("--panel"),
+					borderWidth: 2,
+					hoverOffset: 0,
+					data: data.map((x) => x.value),
+				},
+			],
 		},
 		options: {
 			maintainAspectRatio: false,
@@ -120,7 +157,12 @@ function createDoughnut(chartEl, tooltip, data) {
 				},
 			},
 			onClick: (ev) => {
-				const hit = chartInstance.getElementsAtEventForMode(ev, 'nearest', { intersect: true }, false)[0];
+				const hit = chartInstance.getElementsAtEventForMode(
+					ev,
+					"nearest",
+					{ intersect: true },
+					false
+				)[0];
 				if (hit && data[hit.index].onClick) {
 					data[hit.index].onClick();
 				}
@@ -131,7 +173,7 @@ function createDoughnut(chartEl, tooltip, data) {
 				},
 				tooltip: {
 					enabled: false,
-					mode: 'index',
+					mode: "index",
 					animation: {
 						duration: 0,
 					},
@@ -145,24 +187,48 @@ function createDoughnut(chartEl, tooltip, data) {
 }
 
 onMounted(() => {
-	os.apiGet('federation/stats', { limit: 30 }).then(fedStats => {
-		createDoughnut(subDoughnutEl, externalTooltipHandler1, fedStats.topSubInstances.map(x => ({
-			name: x.host,
-			color: x.themeColor,
-			value: x.followersCount,
-			onClick: () => {
-				os.pageWindow(`/instance-info/${x.host}`);
-			},
-		})).concat([{ name: '(other)', color: '#80808080', value: fedStats.otherFollowersCount }]));
+	os.apiGet("federation/stats", { limit: 30 }).then((fedStats) => {
+		createDoughnut(
+			subDoughnutEl,
+			externalTooltipHandler1,
+			fedStats.topSubInstances
+				.map((x) => ({
+					name: x.host,
+					color: x.themeColor,
+					value: x.followersCount,
+					onClick: () => {
+						os.pageWindow(`/instance-info/${x.host}`);
+					},
+				}))
+				.concat([
+					{
+						name: "(other)",
+						color: "#80808080",
+						value: fedStats.otherFollowersCount,
+					},
+				])
+		);
 
-		createDoughnut(pubDoughnutEl, externalTooltipHandler2, fedStats.topPubInstances.map(x => ({
-			name: x.host,
-			color: x.themeColor,
-			value: x.followingCount,
-			onClick: () => {
-				os.pageWindow(`/instance-info/${x.host}`);
-			},
-		})).concat([{ name: '(other)', color: '#80808080', value: fedStats.otherFollowingCount }]));
+		createDoughnut(
+			pubDoughnutEl,
+			externalTooltipHandler2,
+			fedStats.topPubInstances
+				.map((x) => ({
+					name: x.host,
+					color: x.themeColor,
+					value: x.followingCount,
+					onClick: () => {
+						os.pageWindow(`/instance-info/${x.host}`);
+					},
+				}))
+				.concat([
+					{
+						name: "(other)",
+						color: "#80808080",
+						value: fedStats.otherFollowingCount,
+					},
+				])
+		);
 	});
 });
 </script>
@@ -205,7 +271,8 @@ onMounted(() => {
 			display: flex;
 			gap: 16px;
 
-			> .sub, > .pub {
+			> .sub,
+			> .pub {
 				flex: 1;
 				min-width: 0;
 				position: relative;
diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue
index 6e2912965..8e2d17b2a 100644
--- a/packages/client/src/components/MkInstanceTicker.vue
+++ b/packages/client/src/components/MkInstanceTicker.vue
@@ -1,41 +1,50 @@
 <template>
-<div class="hpaizdrt" ref="ticker" :style="bg">
-	<img class="icon" :src="getInstanceIcon(instance)" aria-hidden="true"/>
-	<span class="name">{{ instance.name }}</span>
-</div>
+	<div class="hpaizdrt" ref="ticker" :style="bg">
+		<img class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" />
+		<span class="name">{{ instance.name }}</span>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { instanceName } from '@/config';
-import { instance as Instance } from '@/instance';
-import { getProxiedImageUrlNullable } from '@/scripts/media-proxy';
+import { instanceName } from "@/config";
+import { instance as Instance } from "@/instance";
+import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
 
 const props = defineProps<{
 	instance?: {
-		faviconUrl?: string
-		name: string
-		themeColor?: string
-	}
+		faviconUrl?: string;
+		name: string;
+		themeColor?: string;
+	};
 }>();
 
 let ticker = $ref<HTMLElement | null>(null);
 
 // if no instance data is given, this is for the local instance
 const instance = props.instance ?? {
-	faviconUrl: Instance.iconUrl || Instance.faviconUrl || '/favicon.ico',
+	faviconUrl: Instance.iconUrl || Instance.faviconUrl || "/favicon.ico",
 	name: instanceName,
-	themeColor: (document.querySelector('meta[name="theme-color-orig"]') as HTMLMetaElement)?.content
+	themeColor: (
+		document.querySelector(
+			'meta[name="theme-color-orig"]'
+		) as HTMLMetaElement
+	)?.content,
 };
 
 const computedStyle = getComputedStyle(document.documentElement);
-const themeColor = instance.themeColor ?? computedStyle.getPropertyValue('--bg');
+const themeColor =
+	instance.themeColor ?? computedStyle.getPropertyValue("--bg");
 
 const bg = {
 	background: `linear-gradient(90deg, ${themeColor}, ${themeColor}55)`,
 };
 
 function getInstanceIcon(instance): string {
-	return getProxiedImageUrlNullable(instance.iconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? '/client-assets/dummy.png';
+	return (
+		getProxiedImageUrlNullable(instance.iconUrl, "preview") ??
+		getProxiedImageUrlNullable(instance.faviconUrl, "preview") ??
+		"/client-assets/dummy.png"
+	);
 }
 </script>
 
@@ -48,10 +57,10 @@ function getInstanceIcon(instance): string {
 	align-items: center;
 	height: 1.1em;
 	justify-self: flex-end;
-	padding: .2em .4em;
-	padding: .2em .4em;
+	padding: 0.2em 0.4em;
+	padding: 0.2em 0.4em;
 	border-radius: 100px;
-	font-size: .8em;
+	font-size: 0.8em;
 	text-shadow: 0 2px 2px var(--shadow);
 	overflow: hidden;
 	.header > .body & {
@@ -80,11 +89,14 @@ function getInstanceIcon(instance): string {
 		white-space: nowrap;
 		text-overflow: ellipsis;
 		white-space: nowrap;
-		text-shadow: -1px -1px 0 var(--bg), 1px -1px 0 var(--bg), -1px 1px 0 var(--bg), 1px 1px 0 var(--bg);
-		.article > .main &, .header > .body & {
+		text-shadow: -1px -1px 0 var(--bg), 1px -1px 0 var(--bg),
+			-1px 1px 0 var(--bg), 1px 1px 0 var(--bg);
+		.article > .main &,
+		.header > .body & {
 			display: unset;
 		}
-		.article > .main &, .header > .body & {
+		.article > .main &,
+		.header > .body & {
 			display: unset;
 		}
 	}
diff --git a/packages/client/src/components/MkKeyValue.vue b/packages/client/src/components/MkKeyValue.vue
index de4673ffe..3db05f0f4 100644
--- a/packages/client/src/components/MkKeyValue.vue
+++ b/packages/client/src/components/MkKeyValue.vue
@@ -1,28 +1,39 @@
 <template>
-<div class="alqyeyti" :class="{ oneline }">
-	<div class="key">
-		<slot name="key"></slot>
+	<div class="alqyeyti" :class="{ oneline }">
+		<div class="key">
+			<slot name="key"></slot>
+		</div>
+		<div class="value">
+			<slot name="value"></slot>
+			<button
+				v-if="copy"
+				v-tooltip="i18n.ts.copy"
+				class="_textButton"
+				style="margin-left: 0.5em"
+				@click="copy_"
+			>
+				<i class="ph-clipboard-text ph-bold"></i>
+			</button>
+		</div>
 	</div>
-	<div class="value">
-		<slot name="value"></slot>
-		<button v-if="copy" v-tooltip="i18n.ts.copy" class="_textButton" style="margin-left: 0.5em;" @click="copy_"><i class="ph-clipboard-text ph-bold"></i></button>
-	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import copyToClipboard from "@/scripts/copy-to-clipboard";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	copy?: string | null;
-	oneline?: boolean;
-}>(), {
-	copy: null,
-	oneline: false,
-});
+const props = withDefaults(
+	defineProps<{
+		copy?: string | null;
+		oneline?: boolean;
+	}>(),
+	{
+		copy: null,
+		oneline: false,
+	}
+);
 
 const copy_ = () => {
 	copyToClipboard(props.copy);
diff --git a/packages/client/src/components/MkLaunchPad.vue b/packages/client/src/components/MkLaunchPad.vue
index 39e99e6c2..f713b4c41 100644
--- a/packages/client/src/components/MkLaunchPad.vue
+++ b/packages/client/src/components/MkLaunchPad.vue
@@ -1,61 +1,103 @@
 <template>
-<MkModal ref="modal" v-slot="{ type, maxHeight }" :prefer-type="preferedModalType" :anchor="anchor" :transparent-bg="true" :src="src" @click="modal.close()" @closed="emit('closed')">
-	<div class="szkkfdyq _popup _shadow" :class="{ asDrawer: type === 'drawer' }" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : '' }">
-		<div class="main">
-			<template v-for="item in items">
-				<button v-if="item.action" v-click-anime class="_button" @click="$event => { item.action($event); close(); }">
-					<i class="icon" :class="item.icon"></i>
-					<div class="text">{{ item.text }}</div>
-					<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
-				</button>
-				<MkA v-else v-click-anime :to="item.to" @click.passive="close()">
-					<i class="icon" :class="item.icon"></i>
-					<div class="text">{{ item.text }}</div>
-					<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
-				</MkA>
-			</template>
+	<MkModal
+		ref="modal"
+		v-slot="{ type, maxHeight }"
+		:prefer-type="preferedModalType"
+		:anchor="anchor"
+		:transparent-bg="true"
+		:src="src"
+		@click="modal.close()"
+		@closed="emit('closed')"
+	>
+		<div
+			class="szkkfdyq _popup _shadow"
+			:class="{ asDrawer: type === 'drawer' }"
+			:style="{ maxHeight: maxHeight ? maxHeight + 'px' : '' }"
+		>
+			<div class="main">
+				<template v-for="item in items">
+					<button
+						v-if="item.action"
+						v-click-anime
+						class="_button"
+						@click="
+							($event) => {
+								item.action($event);
+								close();
+							}
+						"
+					>
+						<i class="icon" :class="item.icon"></i>
+						<div class="text">{{ item.text }}</div>
+						<span v-if="item.indicate" class="indicator"
+							><i class="ph-circle ph-fill"></i
+						></span>
+					</button>
+					<MkA
+						v-else
+						v-click-anime
+						:to="item.to"
+						@click.passive="close()"
+					>
+						<i class="icon" :class="item.icon"></i>
+						<div class="text">{{ item.text }}</div>
+						<span v-if="item.indicate" class="indicator"
+							><i class="ph-circle ph-fill"></i
+						></span>
+					</MkA>
+				</template>
+			</div>
 		</div>
-	</div>
-</MkModal>
+	</MkModal>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkModal from '@/components/MkModal.vue';
-import { navbarItemDef } from '@/navbar';
-import { instanceName } from '@/config';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import { deviceKind } from '@/scripts/device-kind';
-import * as os from '@/os';
+import {} from "vue";
+import MkModal from "@/components/MkModal.vue";
+import { navbarItemDef } from "@/navbar";
+import { instanceName } from "@/config";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { deviceKind } from "@/scripts/device-kind";
+import * as os from "@/os";
 
-const props = withDefaults(defineProps<{
-	src?: HTMLElement;
-	anchor?: { x: string; y: string; };
-}>(), {
-	anchor: () => ({ x: 'right', y: 'center' }),
-});
+const props = withDefaults(
+	defineProps<{
+		src?: HTMLElement;
+		anchor?: { x: string; y: string };
+	}>(),
+	{
+		anchor: () => ({ x: "right", y: "center" }),
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
-const preferedModalType = (deviceKind === 'desktop' && props.src != null) ? 'popup' :
-	deviceKind === 'smartphone' ? 'drawer' :
-	'dialog';
+const preferedModalType =
+	deviceKind === "desktop" && props.src != null
+		? "popup"
+		: deviceKind === "smartphone"
+		? "drawer"
+		: "dialog";
 
 const modal = $ref<InstanceType<typeof MkModal>>();
 
 const menu = defaultStore.state.menu;
 
-const items = Object.keys(navbarItemDef).filter(k => !menu.includes(k)).map(k => navbarItemDef[k]).filter(def => def.show == null ? true : def.show).map(def => ({
-	type: def.to ? 'link' : 'button',
-	text: i18n.ts[def.title],
-	icon: def.icon,
-	to: def.to,
-	action: def.action,
-	indicate: def.indicated,
-}));
+const items = Object.keys(navbarItemDef)
+	.filter((k) => !menu.includes(k))
+	.map((k) => navbarItemDef[k])
+	.filter((def) => (def.show == null ? true : def.show))
+	.map((def) => ({
+		type: def.to ? "link" : "button",
+		text: i18n.ts[def.title],
+		icon: def.icon,
+		to: def.to,
+		action: def.action,
+		indicate: def.indicated,
+	}));
 
 function close() {
 	modal.close();
@@ -82,7 +124,8 @@ function close() {
 		text-align: center;
 	}
 
-	> .main, > .sub {
+	> .main,
+	> .sub {
 		display: grid;
 		grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
 
diff --git a/packages/client/src/components/MkLink.vue b/packages/client/src/components/MkLink.vue
index 753628489..e26e1ed24 100644
--- a/packages/client/src/components/MkLink.vue
+++ b/packages/client/src/components/MkLink.vue
@@ -1,36 +1,55 @@
 <template>
-<component :is="self ? 'MkA' : 'a'" ref="el" class="xlcxczvw _link" :[attr]="self ? url.substr(local.length) : url" :rel="rel" :target="target"
-	:title="url" @click.stop
->
-	<slot></slot>
-	<i v-if="target === '_blank'" class="ph-arrow-square-out ph-bold ph-lg icon"></i>
-</component>
+	<component
+		:is="self ? 'MkA' : 'a'"
+		ref="el"
+		class="xlcxczvw _link"
+		:[attr]="self ? url.substr(local.length) : url"
+		:rel="rel"
+		:target="target"
+		:title="url"
+		@click.stop
+	>
+		<slot></slot>
+		<i
+			v-if="target === '_blank'"
+			class="ph-arrow-square-out ph-bold ph-lg icon"
+		></i>
+	</component>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent } from 'vue';
-import { url as local } from '@/config';
-import { useTooltip } from '@/scripts/use-tooltip';
-import * as os from '@/os';
+import { defineAsyncComponent } from "vue";
+import { url as local } from "@/config";
+import { useTooltip } from "@/scripts/use-tooltip";
+import * as os from "@/os";
 
-const props = withDefaults(defineProps<{
-	url: string;
-	rel?: null | string;
-}>(), {
-});
+const props = withDefaults(
+	defineProps<{
+		url: string;
+		rel?: null | string;
+	}>(),
+	{}
+);
 
 const self = props.url.startsWith(local);
-const attr = self ? 'to' : 'href';
-const target = self ? null : '_blank';
+const attr = self ? "to" : "href";
+const target = self ? null : "_blank";
 
 const el = $ref();
 
 useTooltip($$(el), (showing) => {
-	os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
-		showing,
-		url: props.url,
-		source: el,
-	}, {}, 'closed');
+	os.popup(
+		defineAsyncComponent(
+			() => import("@/components/MkUrlPreviewPopup.vue")
+		),
+		{
+			showing,
+			url: props.url,
+			source: el,
+		},
+		{},
+		"closed"
+	);
 });
 </script>
 
@@ -40,7 +59,7 @@ useTooltip($$(el), (showing) => {
 
 	> .icon {
 		padding-left: 2px;
-		font-size: .9em;
+		font-size: 0.9em;
 	}
 }
 </style>
diff --git a/packages/client/src/components/MkMarquee.vue b/packages/client/src/components/MkMarquee.vue
index 5ca04b0b4..d99ad95b6 100644
--- a/packages/client/src/components/MkMarquee.vue
+++ b/packages/client/src/components/MkMarquee.vue
@@ -1,8 +1,8 @@
 <script lang="ts">
-import { h, onMounted, onUnmounted, ref, watch } from 'vue';
+import { h, onMounted, onUnmounted, ref, watch } from "vue";
 
 export default {
-	name: 'MarqueeText',
+	name: "MarqueeText",
 	props: {
 		duration: {
 			type: Number,
@@ -38,37 +38,35 @@ export default {
 			calc();
 		});
 
-		onUnmounted(() => {
-		});
+		onUnmounted(() => {});
 
 		return {
 			contentEl,
 		};
 	},
-	render({
-		$slots, $style, $props: {
-			duration, repeat, paused, reverse,
-		},
-	}) {
-		return h('div', { class: [$style.wrap] }, [
-			h('span', {
-				ref: 'contentEl',
-				class: [
-					paused
-						? $style.paused
-						: undefined,
-					$style.content,
-				],
-			}, Array(repeat).fill(
-				h('span', {
-					class: $style.text,
-					style: {
-						animationDirection: reverse
-							? 'reverse'
-							: undefined,
-					},
-				}, $slots.default()),
-			)),
+	render({ $slots, $style, $props: { duration, repeat, paused, reverse } }) {
+		return h("div", { class: [$style.wrap] }, [
+			h(
+				"span",
+				{
+					ref: "contentEl",
+					class: [paused ? $style.paused : undefined, $style.content],
+				},
+				Array(repeat).fill(
+					h(
+						"span",
+						{
+							class: $style.text,
+							style: {
+								animationDirection: reverse
+									? "reverse"
+									: undefined,
+							},
+						},
+						$slots.default()
+					)
+				)
+			),
 		]);
 	},
 };
@@ -100,7 +98,11 @@ export default {
 	animation-play-state: paused;
 }
 @keyframes marquee {
-	0% { transform:translateX(0); }
-	100% { transform:translateX(-100%); }
+	0% {
+		transform: translateX(0);
+	}
+	100% {
+		transform: translateX(-100%);
+	}
 }
 </style>
diff --git a/packages/client/src/components/MkMediaBanner.vue b/packages/client/src/components/MkMediaBanner.vue
index b09e61d37..833100843 100644
--- a/packages/client/src/components/MkMediaBanner.vue
+++ b/packages/client/src/components/MkMediaBanner.vue
@@ -1,70 +1,84 @@
 <template>
-<div class="mk-media-banner">
-	<div v-if="media.isSensitive && hide" class="sensitive" @click="hide = false">
-		<span class="icon"><i class="ph-warning ph-bold ph-lg"></i></span>
-		<b>{{ i18n.ts.sensitive }}</b>
-		<span>{{ i18n.ts.clickToShow }}</span>
-	</div>
-	<div v-else-if="media.type.startsWith('audio') && media.type !== 'audio/midi'" class="audio">
-		<VuePlyr
-			:options="{
-				controls: [
-					'play-large',
-					'play',
-					'progress',
-					'current-time',
-					'mute',
-					'volume',
-					'download',
-				],
-				disableContextMenu: false,
-			}"
+	<div class="mk-media-banner">
+		<div
+			v-if="media.isSensitive && hide"
+			class="sensitive"
+			@click="hide = false"
 		>
-			<audio
-				ref="audioEl"
-				class="audio"
-				:src="media.url"
-				:title="media.name"
-				controls
-				preload="metadata"
-				@volumechange="volumechange"
-			/>
-		</VuePlyr>
+			<span class="icon"><i class="ph-warning ph-bold ph-lg"></i></span>
+			<b>{{ i18n.ts.sensitive }}</b>
+			<span>{{ i18n.ts.clickToShow }}</span>
+		</div>
+		<div
+			v-else-if="
+				media.type.startsWith('audio') && media.type !== 'audio/midi'
+			"
+			class="audio"
+		>
+			<VuePlyr
+				:options="{
+					controls: [
+						'play-large',
+						'play',
+						'progress',
+						'current-time',
+						'mute',
+						'volume',
+						'download',
+					],
+					disableContextMenu: false,
+				}"
+			>
+				<audio
+					ref="audioEl"
+					class="audio"
+					:src="media.url"
+					:title="media.name"
+					controls
+					preload="metadata"
+					@volumechange="volumechange"
+				/>
+			</VuePlyr>
+		</div>
+		<a
+			v-else
+			class="download"
+			:href="media.url"
+			:title="media.name"
+			:download="media.name"
+		>
+			<span class="icon"
+				><i class="ph-download-simple ph-bold ph-lg"></i
+			></span>
+			<b>{{ media.name }}</b>
+		</a>
 	</div>
-	<a
-		v-else class="download"
-		:href="media.url"
-		:title="media.name"
-		:download="media.name"
-	>
-		<span class="icon"><i class="ph-download-simple ph-bold ph-lg"></i></span>
-		<b>{{ media.name }}</b>
-	</a>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import VuePlyr from 'vue-plyr';
-import type * as misskey from 'calckey-js';
-import { ColdDeviceStorage } from '@/store';
-import 'vue-plyr/dist/vue-plyr.css';
-import { i18n } from '@/i18n';
+import { onMounted } from "vue";
+import VuePlyr from "vue-plyr";
+import type * as misskey from "calckey-js";
+import { ColdDeviceStorage } from "@/store";
+import "vue-plyr/dist/vue-plyr.css";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	media: misskey.entities.DriveFile;
-}>(), {
-});
+const props = withDefaults(
+	defineProps<{
+		media: misskey.entities.DriveFile;
+	}>(),
+	{}
+);
 
 const audioEl = $ref<HTMLAudioElement | null>();
 let hide = $ref(true);
 
 function volumechange() {
-	if (audioEl) ColdDeviceStorage.set('mediaVolume', audioEl.volume);
+	if (audioEl) ColdDeviceStorage.set("mediaVolume", audioEl.volume);
 }
 
 onMounted(() => {
-	if (audioEl) audioEl.volume = ColdDeviceStorage.get('mediaVolume');
+	if (audioEl) audioEl.volume = ColdDeviceStorage.get("mediaVolume");
 });
 </script>
 
@@ -97,7 +111,7 @@ onMounted(() => {
 		}
 
 		> *:not(:last-child) {
-			margin-right: .2em;
+			margin-right: 0.2em;
 		}
 
 		> .icon {
diff --git a/packages/client/src/components/MkMediaCaption.vue b/packages/client/src/components/MkMediaCaption.vue
index 7168d8723..44f7b55a6 100644
--- a/packages/client/src/components/MkMediaCaption.vue
+++ b/packages/client/src/components/MkMediaCaption.vue
@@ -1,45 +1,81 @@
 <template>
-<MkModal ref="modal" @click="done(true)" @closed="$emit('closed')">
-	<div class="container">
-		<div class="fullwidth top-caption">
-			<div class="mk-dialog">
-				<header>
-					<Mfm v-if="title" class="title" :text="title"/>
-					<span class="text-count" :class="{ over: remainingLength < 0 }">{{ remainingLength }}</span>
-					<br/>
-				</header>
-				<textarea id="captioninput" v-model="inputValue" autofocus :placeholder="input.placeholder" @keydown="onInputKeydown"></textarea>
-				<div v-if="(showOkButton || showCaptionButton || showCancelButton)" class="buttons">
-					<MkButton inline primary :disabled="remainingLength < 0" @click="ok">{{ i18n.ts.ok }}</MkButton>
-					<MkButton inline @click="caption">{{ i18n.ts.caption }}</MkButton>
-					<MkButton inline @click="cancel">{{ i18n.ts.cancel }}</MkButton>
+	<MkModal ref="modal" @click="done(true)" @closed="$emit('closed')">
+		<div class="container">
+			<div class="fullwidth top-caption">
+				<div class="mk-dialog">
+					<header>
+						<Mfm v-if="title" class="title" :text="title" />
+						<span
+							class="text-count"
+							:class="{ over: remainingLength < 0 }"
+							>{{ remainingLength }}</span
+						>
+						<br />
+					</header>
+					<textarea
+						id="captioninput"
+						v-model="inputValue"
+						autofocus
+						:placeholder="input.placeholder"
+						@keydown="onInputKeydown"
+					></textarea>
+					<div
+						v-if="
+							showOkButton ||
+							showCaptionButton ||
+							showCancelButton
+						"
+						class="buttons"
+					>
+						<MkButton
+							inline
+							primary
+							:disabled="remainingLength < 0"
+							@click="ok"
+							>{{ i18n.ts.ok }}</MkButton
+						>
+						<MkButton inline @click="caption">{{
+							i18n.ts.caption
+						}}</MkButton>
+						<MkButton inline @click="cancel">{{
+							i18n.ts.cancel
+						}}</MkButton>
+					</div>
 				</div>
 			</div>
+			<div class="hdrwpsaf fullwidth">
+				<header>{{ image.name }}</header>
+				<img
+					id="imgtocaption"
+					:src="image.url"
+					:alt="image.comment"
+					:title="image.comment"
+					@click="$refs.modal.close()"
+				/>
+				<footer>
+					<span>{{ image.type }}</span>
+					<span>{{ bytes(image.size) }}</span>
+					<span v-if="image.properties && image.properties.width"
+						>{{ number(image.properties.width) }}px ×
+						{{ number(image.properties.height) }}px</span
+					>
+				</footer>
+			</div>
 		</div>
-		<div class="hdrwpsaf fullwidth">
-			<header>{{ image.name }}</header>
-			<img id="imgtocaption" :src="image.url" :alt="image.comment" :title="image.comment" @click="$refs.modal.close()"/>
-			<footer>
-				<span>{{ image.type }}</span>
-				<span>{{ bytes(image.size) }}</span>
-				<span v-if="image.properties && image.properties.width">{{ number(image.properties.width) }}px × {{ number(image.properties.height) }}px</span>
-			</footer>
-		</div>
-	</div>
-</MkModal>
+	</MkModal>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import insertTextAtCursor from 'insert-text-at-cursor';
-import { length } from 'stringz';
-import * as os from '@/os';
-import MkModal from '@/components/MkModal.vue';
-import MkButton from '@/components/MkButton.vue';
-import bytes from '@/filters/bytes';
-import number from '@/filters/number';
-import { i18n } from '@/i18n';
-import { instance } from '@/instance';
+import { defineComponent } from "vue";
+import insertTextAtCursor from "insert-text-at-cursor";
+import { length } from "stringz";
+import * as os from "@/os";
+import MkModal from "@/components/MkModal.vue";
+import MkButton from "@/components/MkButton.vue";
+import bytes from "@/filters/bytes";
+import number from "@/filters/number";
+import { i18n } from "@/i18n";
+import { instance } from "@/instance";
 
 export default defineComponent({
 	components: {
@@ -77,7 +113,7 @@ export default defineComponent({
 		},
 	},
 
-	emits: ['done', 'closed'],
+	emits: ["done", "closed"],
 
 	data() {
 		return {
@@ -91,15 +127,15 @@ export default defineComponent({
 			const maxCaptionLength = instance.maxCaptionTextLength ?? 512;
 			if (typeof this.inputValue !== "string") return maxCaptionLength;
 			return maxCaptionLength - length(this.inputValue);
-		}
+		},
 	},
 
 	mounted() {
-		document.addEventListener('keydown', this.onKeydown);
+		document.addEventListener("keydown", this.onKeydown);
 	},
 
 	beforeUnmount() {
-		document.removeEventListener('keydown', this.onKeydown);
+		document.removeEventListener("keydown", this.onKeydown);
 	},
 
 	methods: {
@@ -107,7 +143,7 @@ export default defineComponent({
 		number,
 
 		done(canceled, result?) {
-			this.$emit('done', { canceled, result });
+			this.$emit("done", { canceled, result });
 			this.$refs.modal.close();
 		},
 
@@ -129,13 +165,15 @@ export default defineComponent({
 		},
 
 		onKeydown(evt) {
-			if (evt.which === 27) { // ESC
+			if (evt.which === 27) {
+				// ESC
 				this.cancel();
 			}
 		},
 
 		onInputKeydown(evt) {
-			if (evt.which === 13) { // Enter
+			if (evt.which === 13) {
+				// Enter
 				if (evt.ctrlKey) {
 					evt.preventDefault();
 					evt.stopPropagation();
@@ -145,12 +183,16 @@ export default defineComponent({
 		},
 
 		caption() {
-			const img = document.getElementById('imgtocaption') as HTMLImageElement;
-			const ta = document.getElementById('captioninput') as HTMLTextAreaElement;
-			os.api('drive/files/caption-image', {
+			const img = document.getElementById(
+				"imgtocaption"
+			) as HTMLImageElement;
+			const ta = document.getElementById(
+				"captioninput"
+			) as HTMLTextAreaElement;
+			os.api("drive/files/caption-image", {
 				url: img.src,
-			}).then(text => {
-				insertTextAtCursor(ta, text.slice(0, (512 - ta.value.length)));
+			}).then((text) => {
+				insertTextAtCursor(ta, text.slice(0, 512 - ta.value.length));
 			});
 		},
 	},
diff --git a/packages/client/src/components/MkMediaImage.vue b/packages/client/src/components/MkMediaImage.vue
index 4ad4ffaa7..882908040 100644
--- a/packages/client/src/components/MkMediaImage.vue
+++ b/packages/client/src/components/MkMediaImage.vue
@@ -1,32 +1,50 @@
 <template>
-<div v-if="hide" class="qjewsnkg" @click="hide = false">
-	<ImgWithBlurhash class="bg" :hash="image.blurhash" :title="image.comment" :alt="image.comment"/>
-	<div class="text">
-		<div class="wrapper">
-			<b style="display: block;"><i class="ph-warning ph-bold ph-lg"></i> {{ i18n.ts.sensitive }}</b>
-			<span style="display: block;">{{ i18n.ts.clickToShow }}</span>
+	<div v-if="hide" class="qjewsnkg" @click="hide = false">
+		<ImgWithBlurhash
+			class="bg"
+			:hash="image.blurhash"
+			:title="image.comment"
+			:alt="image.comment"
+		/>
+		<div class="text">
+			<div class="wrapper">
+				<b style="display: block"
+					><i class="ph-warning ph-bold ph-lg"></i>
+					{{ i18n.ts.sensitive }}</b
+				>
+				<span style="display: block">{{ i18n.ts.clickToShow }}</span>
+			</div>
 		</div>
 	</div>
-</div>
-<div v-else class="gqnyydlz">
-	<a
-		:href="image.url"
-		:title="image.name"
-	>
-		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment" :type="image.type" :title="image.comment" :cover="false"/>
-		<div v-if="image.type === 'image/gif'" class="gif">GIF</div>
-	</a>
-	<button v-tooltip="i18n.ts.hide" class="_button hide" @click="hide = true"><i class="ph-eye-slash ph-bold ph-lg"></i></button>
-</div>
+	<div v-else class="gqnyydlz">
+		<a :href="image.url" :title="image.name">
+			<ImgWithBlurhash
+				:hash="image.blurhash"
+				:src="url"
+				:alt="image.comment"
+				:type="image.type"
+				:title="image.comment"
+				:cover="false"
+			/>
+			<div v-if="image.type === 'image/gif'" class="gif">GIF</div>
+		</a>
+		<button
+			v-tooltip="i18n.ts.hide"
+			class="_button hide"
+			@click="hide = true"
+		>
+			<i class="ph-eye-slash ph-bold ph-lg"></i>
+		</button>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { watch } from 'vue';
-import type * as misskey from 'calckey-js';
-import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
+import { watch } from "vue";
+import type * as misskey from "calckey-js";
+import { getStaticImageUrl } from "@/scripts/get-static-image-url";
+import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	image: misskey.entities.DriveFile;
@@ -35,19 +53,28 @@ const props = defineProps<{
 
 let hide = $ref(true);
 
-const url = (props.raw || defaultStore.state.loadRawImages)
-	? props.image.url
-	: defaultStore.state.disableShowingAnimatedImages
+const url =
+	props.raw || defaultStore.state.loadRawImages
+		? props.image.url
+		: defaultStore.state.disableShowingAnimatedImages
 		? getStaticImageUrl(props.image.thumbnailUrl)
 		: props.image.thumbnailUrl;
 
 // Plugin:register_note_view_interruptor を使って書き換えられる可能性があるためwatchする
-watch(() => props.image, () => {
-	hide = (defaultStore.state.nsfw === 'force') ? true : props.image.isSensitive && (defaultStore.state.nsfw !== 'ignore');
-}, {
-	deep: true,
-	immediate: true,
-});
+watch(
+	() => props.image,
+	() => {
+		hide =
+			defaultStore.state.nsfw === "force"
+				? true
+				: props.image.isSensitive &&
+				  defaultStore.state.nsfw !== "ignore";
+	},
+	{
+		deep: true,
+		immediate: true,
+	}
+);
 </script>
 
 <style lang="scss" scoped>
@@ -120,7 +147,7 @@ watch(() => props.image, () => {
 			font-size: 14px;
 			font-weight: bold;
 			left: 12px;
-			opacity: .5;
+			opacity: 0.5;
 			padding: 0 6px;
 			text-align: center;
 			top: 12px;
diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue
index 8b6d2c2c9..ec23ca5d0 100644
--- a/packages/client/src/components/MkMediaList.vue
+++ b/packages/client/src/components/MkMediaList.vue
@@ -1,29 +1,58 @@
 <template>
-<div class="hoawjimk">
-	<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
-	<div v-if="mediaList.filter(media => previewable(media)).length > 0" class="gird-container" :class="{ dmWidth: inDm }">
-		<div ref="gallery" :data-count="mediaList.filter(media => previewable(media)).length" @click.stop>
-			<template v-for="media in mediaList.filter(media => previewable(media))">
-				<XVideo v-if="media.type.startsWith('video')" :key="media.id" :video="media"/>
-				<XImage v-else-if="media.type.startsWith('image')" :key="media.id" class="image" :data-id="media.id" :image="media" :raw="raw"/>
-			</template>
+	<div class="hoawjimk">
+		<XBanner
+			v-for="media in mediaList.filter((media) => !previewable(media))"
+			:key="media.id"
+			:media="media"
+		/>
+		<div
+			v-if="mediaList.filter((media) => previewable(media)).length > 0"
+			class="gird-container"
+			:class="{ dmWidth: inDm }"
+		>
+			<div
+				ref="gallery"
+				:data-count="
+					mediaList.filter((media) => previewable(media)).length
+				"
+				@click.stop
+			>
+				<template
+					v-for="media in mediaList.filter((media) =>
+						previewable(media)
+					)"
+				>
+					<XVideo
+						v-if="media.type.startsWith('video')"
+						:key="media.id"
+						:video="media"
+					/>
+					<XImage
+						v-else-if="media.type.startsWith('image')"
+						:key="media.id"
+						class="image"
+						:data-id="media.id"
+						:image="media"
+						:raw="raw"
+					/>
+				</template>
+			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
-import * as misskey from 'calckey-js';
-import PhotoSwipeLightbox from 'photoswipe/lightbox';
-import PhotoSwipe from 'photoswipe';
-import 'photoswipe/style.css';
-import XBanner from '@/components/MkMediaBanner.vue';
-import XImage from '@/components/MkMediaImage.vue';
-import XVideo from '@/components/MkMediaVideo.vue';
-import * as os from '@/os';
-import { FILE_TYPE_BROWSERSAFE } from '@/const';
-import { defaultStore } from '@/store';
+import { onMounted, ref } from "vue";
+import * as misskey from "calckey-js";
+import PhotoSwipeLightbox from "photoswipe/lightbox";
+import PhotoSwipe from "photoswipe";
+import "photoswipe/style.css";
+import XBanner from "@/components/MkMediaBanner.vue";
+import XImage from "@/components/MkMediaImage.vue";
+import XVideo from "@/components/MkMediaVideo.vue";
+import * as os from "@/os";
+import { FILE_TYPE_BROWSERSAFE } from "@/const";
+import { defaultStore } from "@/store";
 
 const props = defineProps<{
 	mediaList: misskey.entities.DriveFile[];
@@ -32,60 +61,72 @@ const props = defineProps<{
 }>();
 
 const gallery = ref(null);
-const pswpZIndex = os.claimZIndex('middle');
+const pswpZIndex = os.claimZIndex("middle");
 
 onMounted(() => {
 	const lightbox = new PhotoSwipeLightbox({
 		dataSource: props.mediaList
-			.filter(media => {
-				if (media.type === 'image/svg+xml') return true; // svgのwebpublicはpngなのでtrue
-				return media.type.startsWith('image') && FILE_TYPE_BROWSERSAFE.includes(media.type);
+			.filter((media) => {
+				if (media.type === "image/svg+xml") return true; // svgのwebpublicはpngなのでtrue
+				return (
+					media.type.startsWith("image") &&
+					FILE_TYPE_BROWSERSAFE.includes(media.type)
+				);
 			})
-			.map(media => {
+			.map((media) => {
 				const item = {
 					src: media.url,
 					w: media.properties.width,
 					h: media.properties.height,
 					alt: media.comment,
 				};
-				if (media.properties.orientation != null && media.properties.orientation >= 5) {
+				if (
+					media.properties.orientation != null &&
+					media.properties.orientation >= 5
+				) {
 					[item.w, item.h] = [item.h, item.w];
 				}
 				return item;
 			}),
 		gallery: gallery.value,
-		children: '.image',
-		thumbSelector: '.image',
+		children: ".image",
+		thumbSelector: ".image",
 		loop: false,
-		padding: window.innerWidth > 500 ? {
-			top: 32,
-			bottom: 32,
-			left: 32,
-			right: 32,
-		} : {
-			top: 0,
-			bottom: 0,
-			left: 0,
-			right: 0,
-		},
-		imageClickAction: 'close',
-		tapAction: 'toggle-controls',
+		padding:
+			window.innerWidth > 500
+				? {
+						top: 32,
+						bottom: 32,
+						left: 32,
+						right: 32,
+				  }
+				: {
+						top: 0,
+						bottom: 0,
+						left: 0,
+						right: 0,
+				  },
+		imageClickAction: "close",
+		tapAction: "toggle-controls",
 		pswpModule: PhotoSwipe,
 	});
 
-	lightbox.on('itemData', (ev) => {
+	lightbox.on("itemData", (ev) => {
 		const { itemData } = ev;
 
 		// element is children
 		const { element } = itemData;
 
 		const id = element.dataset.id;
-		const file = props.mediaList.find(media => media.id === id);
+		const file = props.mediaList.find((media) => media.id === id);
 
 		itemData.src = file.url;
 		itemData.w = Number(file.properties.width);
 		itemData.h = Number(file.properties.height);
-		if (file.properties.orientation != null && file.properties.orientation >= 5) {
+		if (
+			file.properties.orientation != null &&
+			file.properties.orientation >= 5
+		) {
 			[itemData.w, itemData.h] = [itemData.h, itemData.w];
 		}
 		itemData.msrc = file.thumbnailUrl;
@@ -93,17 +134,17 @@ onMounted(() => {
 		itemData.thumbCropped = true;
 	});
 
-	lightbox.on('uiRegister', () => {
+	lightbox.on("uiRegister", () => {
 		lightbox.pswp.ui.registerElement({
-			name: 'altText',
-			className: 'pwsp__alt-text-container',
-			appendTo: 'wrapper',
+			name: "altText",
+			className: "pwsp__alt-text-container",
+			appendTo: "wrapper",
 			onInit: (el, pwsp) => {
-				let textBox = document.createElement('p');
-				textBox.className = 'pwsp__alt-text';
+				let textBox = document.createElement("p");
+				textBox.className = "pwsp__alt-text";
 				el.appendChild(textBox);
 
-				let preventProp = function(ev: Event): void {
+				let preventProp = function (ev: Event): void {
 					ev.stopPropagation();
 				};
 
@@ -114,7 +155,7 @@ onMounted(() => {
 				el.onpointercancel = preventProp;
 				el.onpointermove = preventProp;
 
-				pwsp.on('change', () => {
+				pwsp.on("change", () => {
 					textBox.textContent = pwsp.currSlide.data.alt?.trim();
 				});
 			},
@@ -125,15 +166,17 @@ onMounted(() => {
 });
 
 const previewable = (file: misskey.entities.DriveFile): boolean => {
-	if (file.type === 'image/svg+xml') return true; // svgのwebpublic/thumbnailはpngなのでtrue
+	if (file.type === "image/svg+xml") return true; // svgのwebpublic/thumbnailはpngなのでtrue
 	// FILE_TYPE_BROWSERSAFEに適合しないものはブラウザで表示するのに不適切
-	return (file.type.startsWith('video') || file.type.startsWith('image')) && FILE_TYPE_BROWSERSAFE.includes(file.type);
+	return (
+		(file.type.startsWith("video") || file.type.startsWith("image")) &&
+		FILE_TYPE_BROWSERSAFE.includes(file.type)
+	);
 };
 </script>
 
 <style lang="scss" scoped>
 .hoawjimk {
-
 	> .dmWidth {
 		min-width: 20rem;
 		max-width: 40rem;
@@ -147,9 +190,9 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 		overflow: hidden;
 
 		&:before {
-			content: '';
+			content: "";
 			display: block;
-			padding-top: 56.25% // 16:9;
+			padding-top: 56.25%; // 16:9;
 		}
 
 		> div {
@@ -221,7 +264,7 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 <style lang="scss">
 .pswp {
 	// なぜか機能しない
-  //z-index: v-bind(pswpZIndex);
+	//z-index: v-bind(pswpZIndex);
 	z-index: 2000000;
 }
 .pwsp__alt-text-container {
@@ -254,5 +297,4 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 .pwsp__alt-text:empty {
 	display: none;
 }
-
 </style>
diff --git a/packages/client/src/components/MkMediaVideo.vue b/packages/client/src/components/MkMediaVideo.vue
index 48a599407..7440fb2cb 100644
--- a/packages/client/src/components/MkMediaVideo.vue
+++ b/packages/client/src/components/MkMediaVideo.vue
@@ -1,58 +1,66 @@
 <template>
-<div v-if="hide" class="icozogqfvdetwohsdglrbswgrejoxbdj" @click="hide = false">
-	<div>
-		<b><i class="ph-warning ph-bold ph-lg"></i> {{ i18n.ts.sensitive }}</b>
-		<span>{{ i18n.ts.clickToShow }}</span>
-	</div>
-</div>
-<div v-else class="kkjnbbplepmiyuadieoenjgutgcmtsvu">
-	<VuePlyr
-		:options="{
-			controls: [
-				'play-large',
-				'play',
-				'progress',
-				'current-time',
-				'mute',
-				'volume',
-				'pip',
-				'download',
-				'fullscreen'
-			],
-			disableContextMenu: false,
-		}"
+	<div
+		v-if="hide"
+		class="icozogqfvdetwohsdglrbswgrejoxbdj"
+		@click="hide = false"
 	>
-		<video
-			:poster="video.thumbnailUrl"
-			:title="video.comment"
-			:aria-label="video.comment"
-			preload="none"
-			controls
-			@contextmenu.stop
-		>
-			<source
-				:src="video.url"
-				:type="video.type"
+		<div>
+			<b
+				><i class="ph-warning ph-bold ph-lg"></i>
+				{{ i18n.ts.sensitive }}</b
 			>
-		</video>
-	</VuePlyr>
-	<i class="ph-eye-slash ph-bold ph-lg" @click="hide = true"></i>
-</div>
+			<span>{{ i18n.ts.clickToShow }}</span>
+		</div>
+	</div>
+	<div v-else class="kkjnbbplepmiyuadieoenjgutgcmtsvu">
+		<VuePlyr
+			:options="{
+				controls: [
+					'play-large',
+					'play',
+					'progress',
+					'current-time',
+					'mute',
+					'volume',
+					'pip',
+					'download',
+					'fullscreen',
+				],
+				disableContextMenu: false,
+			}"
+		>
+			<video
+				:poster="video.thumbnailUrl"
+				:title="video.comment"
+				:aria-label="video.comment"
+				preload="none"
+				controls
+				@contextmenu.stop
+			>
+				<source :src="video.url" :type="video.type" />
+			</video>
+		</VuePlyr>
+		<i class="ph-eye-slash ph-bold ph-lg" @click="hide = true"></i>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import VuePlyr from 'vue-plyr';
-import type * as misskey from 'calckey-js';
-import { defaultStore } from '@/store';
-import 'vue-plyr/dist/vue-plyr.css';
-import { i18n } from '@/i18n';
+import { ref } from "vue";
+import VuePlyr from "vue-plyr";
+import type * as misskey from "calckey-js";
+import { defaultStore } from "@/store";
+import "vue-plyr/dist/vue-plyr.css";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	video: misskey.entities.DriveFile;
 }>();
 
-const hide = ref((defaultStore.state.nsfw === 'force') ? true : props.video.isSensitive && (defaultStore.state.nsfw !== 'ignore'));
+const hide = ref(
+	defaultStore.state.nsfw === "force"
+		? true
+		: props.video.isSensitive && defaultStore.state.nsfw !== "ignore"
+);
 </script>
 
 <style lang="scss" scoped>
@@ -67,7 +75,7 @@ const hide = ref((defaultStore.state.nsfw === 'force') ? true : props.video.isSe
 		background-color: var(--fg);
 		color: var(--accentLighten);
 		font-size: 14px;
-		opacity: .5;
+		opacity: 0.5;
 		padding: 3px 6px;
 		text-align: center;
 		cursor: pointer;
diff --git a/packages/client/src/components/MkMention.vue b/packages/client/src/components/MkMention.vue
index 2a7340421..4a336c941 100644
--- a/packages/client/src/components/MkMention.vue
+++ b/packages/client/src/components/MkMention.vue
@@ -1,40 +1,68 @@
 <template>
-<MkA v-if="url.startsWith('/')" v-user-preview="canonical" class="akbvjaqn" :class="{ isMe }" :to="url" :style="{ background: bgCss }" @click.stop>
-	<img class="icon" :src="`/avatar/@${username}@${host}`" alt="">
-	<span class="main">
-		<span class="username">@{{ username }}</span>
-		<span v-if="(host != localHost) || $store.state.showFullAcct" class="host">@{{ toUnicode(host) }}</span>
-	</span>
-</MkA>
-<a v-else class="akbvjaqn" :href="url" target="_blank" rel="noopener" :style="{ background: bgCss }" @click.stop>
-	<span class="main">
-		<span class="username">@{{ username }}</span>
-		<span class="host">@{{ toUnicode(host) }}</span>
-	</span>
-</a>
+	<MkA
+		v-if="url.startsWith('/')"
+		v-user-preview="canonical"
+		class="akbvjaqn"
+		:class="{ isMe }"
+		:to="url"
+		:style="{ background: bgCss }"
+		@click.stop
+	>
+		<img class="icon" :src="`/avatar/@${username}@${host}`" alt="" />
+		<span class="main">
+			<span class="username">@{{ username }}</span>
+			<span
+				v-if="host != localHost || $store.state.showFullAcct"
+				class="host"
+				>@{{ toUnicode(host) }}</span
+			>
+		</span>
+	</MkA>
+	<a
+		v-else
+		class="akbvjaqn"
+		:href="url"
+		target="_blank"
+		rel="noopener"
+		:style="{ background: bgCss }"
+		@click.stop
+	>
+		<span class="main">
+			<span class="username">@{{ username }}</span>
+			<span class="host">@{{ toUnicode(host) }}</span>
+		</span>
+	</a>
 </template>
 
 <script lang="ts" setup>
-import { toUnicode } from 'punycode';
-import { } from 'vue';
-import tinycolor from 'tinycolor2';
-import { host as localHost } from '@/config';
-import { $i } from '@/account';
+import { toUnicode } from "punycode";
+import {} from "vue";
+import tinycolor from "tinycolor2";
+import { host as localHost } from "@/config";
+import { $i } from "@/account";
 
 const props = defineProps<{
 	username: string;
 	host: string;
 }>();
 
-const canonical = props.host === localHost ? `@${props.username}` : `@${props.username}@${toUnicode(props.host)}`;
+const canonical =
+	props.host === localHost
+		? `@${props.username}`
+		: `@${props.username}@${toUnicode(props.host)}`;
 
 const url = `/${canonical}`;
 
-const isMe = $i && (
-	`@${props.username}@${toUnicode(props.host)}` === `@${$i.username}@${toUnicode(localHost)}`.toLowerCase()
-);
+const isMe =
+	$i &&
+	`@${props.username}@${toUnicode(props.host)}` ===
+		`@${$i.username}@${toUnicode(localHost)}`.toLowerCase();
 
-const bg = tinycolor(getComputedStyle(document.documentElement).getPropertyValue(isMe ? '--mentionMe' : '--mention'));
+const bg = tinycolor(
+	getComputedStyle(document.documentElement).getPropertyValue(
+		isMe ? "--mentionMe" : "--mention"
+	)
+);
 bg.setAlpha(0.1);
 const bgCss = bg.toRgbString();
 </script>
diff --git a/packages/client/src/components/MkMenu.child.vue b/packages/client/src/components/MkMenu.child.vue
index 3ada4afbd..6b05ab447 100644
--- a/packages/client/src/components/MkMenu.child.vue
+++ b/packages/client/src/components/MkMenu.child.vue
@@ -1,15 +1,29 @@
 <template>
-<div ref="el" class="sfhdhdhr">
-	<MkMenu ref="menu" :items="items" :align="align" :width="width" :as-drawer="false" @close="onChildClosed"/>
-</div>
+	<div ref="el" class="sfhdhdhr">
+		<MkMenu
+			ref="menu"
+			:items="items"
+			:align="align"
+			:width="width"
+			:as-drawer="false"
+			@close="onChildClosed"
+		/>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { on } from 'events';
-import { nextTick, onBeforeUnmount, onMounted, onUnmounted, ref, watch } from 'vue';
-import MkMenu from './MkMenu.vue';
-import { MenuItem } from '@/types/menu';
-import * as os from '@/os';
+import { on } from "events";
+import {
+	nextTick,
+	onBeforeUnmount,
+	onMounted,
+	onUnmounted,
+	ref,
+	watch,
+} from "vue";
+import MkMenu from "./MkMenu.vue";
+import { MenuItem } from "@/types/menu";
+import * as os from "@/os";
 
 const props = defineProps<{
 	items: MenuItem[];
@@ -20,27 +34,27 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
-	(ev: 'actioned'): void;
+	(ev: "closed"): void;
+	(ev: "actioned"): void;
 }>();
 
 const el = ref<HTMLElement>();
-const align = 'left';
+const align = "left";
 
 function setPosition() {
 	const rootRect = props.rootElement.getBoundingClientRect();
 	const rect = props.targetElement.getBoundingClientRect();
 	const left = props.targetElement.offsetWidth;
-	const top = (rect.top - rootRect.top) - 8;
-	el.value.style.left = left + 'px';
-	el.value.style.top = top + 'px';
+	const top = rect.top - rootRect.top - 8;
+	el.value.style.left = left + "px";
+	el.value.style.top = top + "px";
 }
 
 function onChildClosed(actioned?: boolean) {
 	if (actioned) {
-		emit('actioned');
+		emit("actioned");
 	} else {
-		emit('closed');
+		emit("closed");
 	}
 }
 
@@ -53,7 +67,7 @@ onMounted(() => {
 
 defineExpose({
 	checkHit: (ev: MouseEvent) => {
-		return (ev.target === el.value || el.value.contains(ev.target));
+		return ev.target === el.value || el.value.contains(ev.target);
 	},
 });
 </script>
diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index c0502387a..88c8af1c5 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -1,93 +1,225 @@
 <template>
-<div>
-	<div
-		ref="itemsEl" v-hotkey="keymap"
-		class="rrevdjwt _popup _shadow"
-		:class="{ center: align === 'center', asDrawer }"
-		:style="{ width: (width && !asDrawer) ? width + 'px' : '', maxHeight: maxHeight ? maxHeight + 'px' : '' }"
-		@contextmenu.self="e => e.preventDefault()"
-	>
-		<template v-for="(item, i) in items2">
-			<div v-if="item === null" class="divider"></div>
-			<span v-else-if="item.type === 'label'" class="label item">
-				<span :style="item.textStyle || ''">{{ item.text }}</span>
+	<div>
+		<div
+			ref="itemsEl"
+			v-hotkey="keymap"
+			class="rrevdjwt _popup _shadow"
+			:class="{ center: align === 'center', asDrawer }"
+			:style="{
+				width: width && !asDrawer ? width + 'px' : '',
+				maxHeight: maxHeight ? maxHeight + 'px' : '',
+			}"
+			@contextmenu.self="(e) => e.preventDefault()"
+		>
+			<template v-for="(item, i) in items2">
+				<div v-if="item === null" class="divider"></div>
+				<span v-else-if="item.type === 'label'" class="label item">
+					<span :style="item.textStyle || ''">{{ item.text }}</span>
+				</span>
+				<span
+					v-else-if="item.type === 'pending'"
+					:tabindex="i"
+					class="pending item"
+				>
+					<span><MkEllipsis /></span>
+				</span>
+				<MkA
+					v-else-if="item.type === 'link'"
+					:to="item.to"
+					:tabindex="i"
+					class="_button item"
+					@click.passive="close(true)"
+					@mouseenter.passive="onItemMouseEnter(item)"
+					@mouseleave.passive="onItemMouseLeave(item)"
+				>
+					<i
+						v-if="item.icon"
+						class="ph-fw ph-lg"
+						:class="item.icon"
+					></i>
+					<span v-else-if="item.icons">
+						<i
+							v-for="icon in item.icons"
+							class="ph-fw ph-lg"
+							:class="icon"
+						></i>
+					</span>
+					<MkAvatar
+						v-if="item.avatar"
+						:user="item.avatar"
+						class="avatar"
+					/>
+					<span :style="item.textStyle || ''">{{ item.text }}</span>
+					<span v-if="item.indicate" class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</MkA>
+				<a
+					v-else-if="item.type === 'a'"
+					:href="item.href"
+					:target="item.target"
+					:download="item.download"
+					:tabindex="i"
+					class="_button item"
+					@click="close(true)"
+					@mouseenter.passive="onItemMouseEnter(item)"
+					@mouseleave.passive="onItemMouseLeave(item)"
+				>
+					<i
+						v-if="item.icon"
+						class="ph-fw ph-lg"
+						:class="item.icon"
+					></i>
+					<span v-else-if="item.icons">
+						<i
+							v-for="icon in item.icons"
+							class="ph-fw ph-lg"
+							:class="icon"
+						></i>
+					</span>
+					<span :style="item.textStyle || ''">{{ item.text }}</span>
+					<span v-if="item.indicate" class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</a>
+				<button
+					v-else-if="item.type === 'user' && !items.hidden"
+					:tabindex="i"
+					class="_button item"
+					:class="{ active: item.active }"
+					:disabled="item.active"
+					@click="clicked(item.action, $event)"
+					@mouseenter.passive="onItemMouseEnter(item)"
+					@mouseleave.passive="onItemMouseLeave(item)"
+				>
+					<MkAvatar :user="item.user" class="avatar" /><MkUserName
+						:user="item.user"
+					/>
+					<span v-if="item.indicate" class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</button>
+				<span
+					v-else-if="item.type === 'switch'"
+					:tabindex="i"
+					class="item"
+					@mouseenter.passive="onItemMouseEnter(item)"
+					@mouseleave.passive="onItemMouseLeave(item)"
+				>
+					<FormSwitch
+						v-model="item.ref"
+						:disabled="item.disabled"
+						class="form-switch"
+						:style="item.textStyle || ''"
+						>{{ item.text }}</FormSwitch
+					>
+				</span>
+				<button
+					v-else-if="item.type === 'parent'"
+					:tabindex="i"
+					class="_button item parent"
+					:class="{ childShowing: childShowingItem === item }"
+					@mouseenter="showChildren(item, $event)"
+				>
+					<i
+						v-if="item.icon"
+						class="ph-fw ph-lg"
+						:class="item.icon"
+					></i>
+					<span v-else-if="item.icons">
+						<i
+							v-for="icon in item.icons"
+							class="ph-fw ph-lg"
+							:class="icon"
+						></i>
+					</span>
+					<span :style="item.textStyle || ''">{{ item.text }}</span>
+					<span class="caret"
+						><i class="ph-caret-right ph-bold ph-lg ph-fw ph-lg"></i
+					></span>
+				</button>
+				<button
+					v-else-if="!item.hidden"
+					:tabindex="i"
+					class="_button item"
+					:class="{ danger: item.danger, active: item.active }"
+					:disabled="item.active"
+					@click="clicked(item.action, $event)"
+					@mouseenter.passive="onItemMouseEnter(item)"
+					@mouseleave.passive="onItemMouseLeave(item)"
+				>
+					<i
+						v-if="item.icon"
+						class="ph-fw ph-lg"
+						:class="item.icon"
+					></i>
+					<span v-else-if="item.icons">
+						<i
+							v-for="icon in item.icons"
+							class="ph-fw ph-lg"
+							:class="icon"
+						></i>
+					</span>
+					<MkAvatar
+						v-if="item.avatar"
+						:user="item.avatar"
+						class="avatar"
+					/>
+					<span :style="item.textStyle || ''">{{ item.text }}</span>
+					<span v-if="item.indicate" class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</button>
+			</template>
+			<span v-if="items2.length === 0" class="none item">
+				<span>{{ i18n.ts.none }}</span>
 			</span>
-			<span v-else-if="item.type === 'pending'" :tabindex="i" class="pending item">
-				<span><MkEllipsis/></span>
-			</span>
-			<MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="i" class="_button item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
-				<span v-else-if="item.icons">
-					<i v-for="icon in item.icons" class="ph-fw ph-lg" :class="icon"></i>
-				</span>
-				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
-				<span :style="item.textStyle || ''">{{ item.text }}</span>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
-			</MkA>
-			<a v-else-if="item.type === 'a'" :href="item.href" :target="item.target" :download="item.download" :tabindex="i" class="_button item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
-				<span v-else-if="item.icons">
-					<i v-for="icon in item.icons" class="ph-fw ph-lg" :class="icon"></i>
-				</span>
-				<span :style="item.textStyle || ''">{{ item.text }}</span>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
-			</a>
-			<button v-else-if="item.type === 'user' && !items.hidden" :tabindex="i" class="_button item" :class="{ active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<MkAvatar :user="item.user" class="avatar"/><MkUserName :user="item.user"/>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
-			</button>
-			<span v-else-if="item.type === 'switch'" :tabindex="i" class="item" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch" :style="item.textStyle || ''">{{ item.text }}</FormSwitch>
-			</span>
-			<button v-else-if="item.type === 'parent'" :tabindex="i" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)">
-				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
-				<span v-else-if="item.icons">
-					<i v-for="icon in item.icons" class="ph-fw ph-lg" :class="icon"></i>
-				</span>
-				<span :style="item.textStyle || ''">{{ item.text }}</span>
-				<span class="caret"><i class="ph-caret-right ph-bold ph-lg ph-fw ph-lg"></i></span>
-			</button>
-			<button v-else-if="!item.hidden" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<i v-if="item.icon" class="ph-fw ph-lg" :class="item.icon"></i>
-				<span v-else-if="item.icons">
-					<i v-for="icon in item.icons" class="ph-fw ph-lg" :class="icon"></i>
-				</span>
-				<MkAvatar v-if="item.avatar" :user="item.avatar" class="avatar"/>
-				<span :style="item.textStyle || ''">{{ item.text }}</span>
-				<span v-if="item.indicate" class="indicator"><i class="ph-circle ph-fill"></i></span>
-			</button>
-		</template>
-		<span v-if="items2.length === 0" class="none item">
-			<span>{{ i18n.ts.none }}</span>
-		</span>
+		</div>
+		<div v-if="childMenu" class="child">
+			<XChild
+				ref="child"
+				:items="childMenu"
+				:target-element="childTarget"
+				:root-element="itemsEl"
+				showing
+				@actioned="childActioned"
+			/>
+		</div>
 	</div>
-	<div v-if="childMenu" class="child">
-		<XChild ref="child" :items="childMenu" :target-element="childTarget" :root-element="itemsEl" showing @actioned="childActioned"/>
-	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, menu, defineAsyncComponent, nextTick, onBeforeUnmount, onMounted, onUnmounted, Ref, ref, watch } from 'vue';
-import { focusPrev, focusNext } from '@/scripts/focus';
-import FormSwitch from '@/components/form/switch.vue';
-import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from '@/types/menu';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import {
+	computed,
+	menu,
+	defineAsyncComponent,
+	nextTick,
+	onBeforeUnmount,
+	onMounted,
+	onUnmounted,
+	Ref,
+	ref,
+	watch,
+} from "vue";
+import { focusPrev, focusNext } from "@/scripts/focus";
+import FormSwitch from "@/components/form/switch.vue";
+import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from "@/types/menu";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-const XChild = defineAsyncComponent(() => import('./MkMenu.child.vue'));
+const XChild = defineAsyncComponent(() => import("./MkMenu.child.vue"));
 
 const props = defineProps<{
 	items: MenuItem[];
 	viaKeyboard?: boolean;
 	asDrawer?: boolean;
-	align?: 'center' | string;
+	align?: "center" | string;
 	width?: number;
 	maxHeight?: number;
 }>();
 
 const emit = defineEmits<{
-	(ev: 'close', actioned?: boolean): void;
+	(ev: "close", actioned?: boolean): void;
 }>();
 
 let itemsEl = $ref<HTMLDivElement>();
@@ -97,31 +229,38 @@ let items2: InnerMenuItem[] = $ref([]);
 let child = $ref<InstanceType<typeof XChild>>();
 
 let keymap = computed(() => ({
-	'up|k|shift+tab': focusUp,
-	'down|j|tab': focusDown,
-	'esc': close,
+	"up|k|shift+tab": focusUp,
+	"down|j|tab": focusDown,
+	esc: close,
 }));
 
 let childShowingItem = $ref<MenuItem | null>();
 
-watch(() => props.items, () => {
-	const items: (MenuItem | MenuPending)[] = [...props.items].filter(item => item !== undefined);
+watch(
+	() => props.items,
+	() => {
+		const items: (MenuItem | MenuPending)[] = [...props.items].filter(
+			(item) => item !== undefined
+		);
 
-	for (let i = 0; i < items.length; i++) {
-		const item = items[i];
+		for (let i = 0; i < items.length; i++) {
+			const item = items[i];
 
-		if (item && 'then' in item) { // if item is Promise
-			items[i] = { type: 'pending' };
-			item.then(actualItem => {
-				items2[i] = actualItem;
-			});
+			if (item && "then" in item) {
+				// if item is Promise
+				items[i] = { type: "pending" };
+				item.then((actualItem) => {
+					items2[i] = actualItem;
+				});
+			}
 		}
-	}
 
-	items2 = items as InnerMenuItem[];
-}, {
-	immediate: true,
-});
+		items2 = items as InnerMenuItem[];
+	},
+	{
+		immediate: true,
+	}
+);
 
 let childMenu = $ref<MenuItem[] | null>();
 let childTarget = $ref<HTMLElement | null>();
@@ -137,7 +276,11 @@ function childActioned() {
 }
 
 function onGlobalMousedown(event: MouseEvent) {
-	if (childTarget && (event.target === childTarget || childTarget.contains(event.target))) return;
+	if (
+		childTarget &&
+		(event.target === childTarget || childTarget.contains(event.target))
+	)
+		return;
 	if (child && child.checkHit(event)) return;
 	closeChild();
 }
@@ -169,7 +312,7 @@ function clicked(fn: MenuAction, ev: MouseEvent) {
 }
 
 function close(actioned = false) {
-	emit('close', actioned);
+	emit("close", actioned);
 }
 
 function focusUp() {
@@ -187,11 +330,13 @@ onMounted(() => {
 		});
 	}
 
-	document.addEventListener('mousedown', onGlobalMousedown, { passive: true });
+	document.addEventListener("mousedown", onGlobalMousedown, {
+		passive: true,
+	});
 });
 
 onBeforeUnmount(() => {
-	document.removeEventListener('mousedown', onGlobalMousedown);
+	document.removeEventListener("mousedown", onGlobalMousedown);
 });
 </script>
 
diff --git a/packages/client/src/components/MkMiniChart.vue b/packages/client/src/components/MkMiniChart.vue
index c64ce163f..b7db265ac 100644
--- a/packages/client/src/components/MkMiniChart.vue
+++ b/packages/client/src/components/MkMiniChart.vue
@@ -1,35 +1,34 @@
 <template>
-<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`" style="overflow:visible">
-	<defs>
-		<linearGradient :id="gradientId" x1="0" x2="0" y1="1" y2="0">
-			<stop offset="0%" :stop-color="color" stop-opacity="0"></stop>
-			<stop offset="100%" :stop-color="color" stop-opacity="0.65"></stop>
-		</linearGradient>
-	</defs>
-	<polygon
-		:points="polygonPoints"
-		:style="`stroke: none; fill: url(#${ gradientId });`"
-	/>
-	<polyline
-		:points="polylinePoints"
-		fill="none"
-		:stroke="color"
-		stroke-width="2"
-	/>
-	<circle
-		:cx="headX"
-		:cy="headY"
-		r="3"
-		:fill="color"
-	/>
-</svg>
+	<svg :viewBox="`0 0 ${viewBoxX} ${viewBoxY}`" style="overflow: visible">
+		<defs>
+			<linearGradient :id="gradientId" x1="0" x2="0" y1="1" y2="0">
+				<stop offset="0%" :stop-color="color" stop-opacity="0"></stop>
+				<stop
+					offset="100%"
+					:stop-color="color"
+					stop-opacity="0.65"
+				></stop>
+			</linearGradient>
+		</defs>
+		<polygon
+			:points="polygonPoints"
+			:style="`stroke: none; fill: url(#${gradientId});`"
+		/>
+		<polyline
+			:points="polylinePoints"
+			fill="none"
+			:stroke="color"
+			stroke-width="2"
+		/>
+		<circle :cx="headX" :cy="headY" r="3" :fill="color" />
+	</svg>
 </template>
 
 <script lang="ts" setup>
-import { onUnmounted, watch } from 'vue';
-import { v4 as uuid } from 'uuid';
-import tinycolor from 'tinycolor2';
-import { useInterval } from '@/scripts/use-interval';
+import { onUnmounted, watch } from "vue";
+import { v4 as uuid } from "uuid";
+import tinycolor from "tinycolor2";
+import { useInterval } from "@/scripts/use-interval";
 
 const props = defineProps<{
 	src: number[];
@@ -38,12 +37,14 @@ const props = defineProps<{
 const viewBoxX = 50;
 const viewBoxY = 50;
 const gradientId = uuid();
-let polylinePoints = $ref('');
-let polygonPoints = $ref('');
+let polylinePoints = $ref("");
+let polygonPoints = $ref("");
 let headX = $ref<number | null>(null);
 let headY = $ref<number | null>(null);
 let clock = $ref<number | null>(null);
-const accent = tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--accent'));
+const accent = tinycolor(
+	getComputedStyle(document.documentElement).getPropertyValue("--accent")
+);
 const color = accent.toRgbString();
 
 function draw(): void {
@@ -52,12 +53,12 @@ function draw(): void {
 
 	const _polylinePoints = stats.map((n, i) => [
 		i * (viewBoxX / (stats.length - 1)),
-		(1 - (n / peak)) * viewBoxY,
+		(1 - n / peak) * viewBoxY,
 	]);
 
-	polylinePoints = _polylinePoints.map(xy => `${xy[0]},${xy[1]}`).join(' ');
+	polylinePoints = _polylinePoints.map((xy) => `${xy[0]},${xy[1]}`).join(" ");
 
-	polygonPoints = `0,${ viewBoxY } ${ polylinePoints } ${ viewBoxX },${ viewBoxY }`;
+	polygonPoints = `0,${viewBoxY} ${polylinePoints} ${viewBoxX},${viewBoxY}`;
 
 	headX = _polylinePoints[_polylinePoints.length - 1][0];
 	headY = _polylinePoints[_polylinePoints.length - 1][1];
diff --git a/packages/client/src/components/MkModal.vue b/packages/client/src/components/MkModal.vue
index 80cfaf8da..d9cd56f95 100644
--- a/packages/client/src/components/MkModal.vue
+++ b/packages/client/src/components/MkModal.vue
@@ -1,15 +1,64 @@
 <template>
 	<Transition
 		:name="transitionName"
-		:enter-active-class="$style['transition_' + transitionName + '_enterActive']"
-		:leave-active-class="$style['transition_' + transitionName + '_leaveActive']"
-		:enter-from-class="$style['transition_' + transitionName + '_enterFrom']"
+		:enter-active-class="
+			$style['transition_' + transitionName + '_enterActive']
+		"
+		:leave-active-class="
+			$style['transition_' + transitionName + '_leaveActive']
+		"
+		:enter-from-class="
+			$style['transition_' + transitionName + '_enterFrom']
+		"
 		:leave-to-class="$style['transition_' + transitionName + '_leaveTo']"
-		:duration="transitionDuration" appear @after-leave="emit('closed')" @enter="emit('opening')" @after-enter="onOpened"
+		:duration="transitionDuration"
+		appear
+		@after-leave="emit('closed')"
+		@enter="emit('opening')"
+		@after-enter="onOpened"
 	>
-		<div v-show="manualShowing != null ? manualShowing : showing" v-hotkey.global="keymap" :class="[$style.root, { [$style.drawer]: type === 'drawer', [$style.dialog]: type === 'dialog' || type === 'dialog:top', [$style.popup]: type === 'popup' }]" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
-			<div class="_modalBg data-cy-bg" :class="[$style.bg, { [$style.bgTransparent]: isEnableBgTransparent, 'data-cy-transparent': isEnableBgTransparent }]" :style="{ zIndex }" @click="onBgClick" @mousedown="onBgClick" @contextmenu.prevent.stop="() => {}"></div>
-			<div ref="content" :class="[$style.content, { [$style.fixed]: fixed, top: type === 'dialog:top' }]" :style="{ zIndex }" @click.self="onBgClick">
+		<div
+			v-show="manualShowing != null ? manualShowing : showing"
+			v-hotkey.global="keymap"
+			:class="[
+				$style.root,
+				{
+					[$style.drawer]: type === 'drawer',
+					[$style.dialog]: type === 'dialog' || type === 'dialog:top',
+					[$style.popup]: type === 'popup',
+				},
+			]"
+			:style="{
+				zIndex,
+				pointerEvents: (manualShowing != null ? manualShowing : showing)
+					? 'auto'
+					: 'none',
+				'--transformOrigin': transformOrigin,
+			}"
+		>
+			<div
+				class="_modalBg data-cy-bg"
+				:class="[
+					$style.bg,
+					{
+						[$style.bgTransparent]: isEnableBgTransparent,
+						'data-cy-transparent': isEnableBgTransparent,
+					},
+				]"
+				:style="{ zIndex }"
+				@click="onBgClick"
+				@mousedown="onBgClick"
+				@contextmenu.prevent.stop="() => {}"
+			></div>
+			<div
+				ref="content"
+				:class="[
+					$style.content,
+					{ [$style.fixed]: fixed, top: type === 'dialog:top' },
+				]"
+				:style="{ zIndex }"
+				@click.self="onBgClick"
+			>
 				<slot :max-height="maxHeight" :type="type"></slot>
 			</div>
 		</div>
@@ -17,94 +66,103 @@
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onMounted, watch, provide } from 'vue';
-import * as os from '@/os';
-import { isTouchUsing } from '@/scripts/touch';
-import { defaultStore } from '@/store';
-import { deviceKind } from '@/scripts/device-kind';
+import { nextTick, onMounted, watch, provide } from "vue";
+import * as os from "@/os";
+import { isTouchUsing } from "@/scripts/touch";
+import { defaultStore } from "@/store";
+import { deviceKind } from "@/scripts/device-kind";
 
 function getFixedContainer(el: Element | null): Element | null {
-	if (el == null || el.tagName === 'BODY') return null;
-	const position = window.getComputedStyle(el).getPropertyValue('position');
-	if (position === 'fixed') {
+	if (el == null || el.tagName === "BODY") return null;
+	const position = window.getComputedStyle(el).getPropertyValue("position");
+	if (position === "fixed") {
 		return el;
 	} else {
 		return getFixedContainer(el.parentElement);
 	}
 }
 
-type ModalTypes = 'popup' | 'dialog' | 'dialog:top' | 'drawer';
+type ModalTypes = "popup" | "dialog" | "dialog:top" | "drawer";
 
-const props = withDefaults(defineProps<{
-	manualShowing?: boolean | null;
-	anchor?: { x: string; y: string; };
-	src?: HTMLElement;
-	preferType?: ModalTypes | 'auto';
-	zPriority?: 'low' | 'middle' | 'high';
-	noOverlap?: boolean;
-	transparentBg?: boolean;
-}>(), {
-	manualShowing: null,
-	src: null,
-	anchor: () => ({ x: 'center', y: 'bottom' }),
-	preferType: 'auto',
-	zPriority: 'low',
-	noOverlap: true,
-	transparentBg: false,
-});
+const props = withDefaults(
+	defineProps<{
+		manualShowing?: boolean | null;
+		anchor?: { x: string; y: string };
+		src?: HTMLElement;
+		preferType?: ModalTypes | "auto";
+		zPriority?: "low" | "middle" | "high";
+		noOverlap?: boolean;
+		transparentBg?: boolean;
+	}>(),
+	{
+		manualShowing: null,
+		src: null,
+		anchor: () => ({ x: "center", y: "bottom" }),
+		preferType: "auto",
+		zPriority: "low",
+		noOverlap: true,
+		transparentBg: false,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'opening'): void;
-	(ev: 'opened'): void;
-	(ev: 'click'): void;
-	(ev: 'esc'): void;
-	(ev: 'close'): void;
-	(ev: 'closed'): void;
+	(ev: "opening"): void;
+	(ev: "opened"): void;
+	(ev: "click"): void;
+	(ev: "esc"): void;
+	(ev: "close"): void;
+	(ev: "closed"): void;
 }>();
 
-provide('modal', true);
+provide("modal", true);
 
 let maxHeight = $ref<number>();
 let fixed = $ref(false);
-let transformOrigin = $ref('center');
+let transformOrigin = $ref("center");
 let showing = $ref(true);
 let content = $shallowRef<HTMLElement>();
 const zIndex = os.claimZIndex(props.zPriority);
 let useSendAnime = $ref(false);
 const type = $computed<ModalTypes>(() => {
-	if (props.preferType === 'auto') {
-		if (!defaultStore.state.disableDrawer && isTouchUsing && deviceKind === 'smartphone') {
-			return 'drawer';
+	if (props.preferType === "auto") {
+		if (
+			!defaultStore.state.disableDrawer &&
+			isTouchUsing &&
+			deviceKind === "smartphone"
+		) {
+			return "drawer";
 		} else {
-			return props.src != null ? 'popup' : 'dialog';
+			return props.src != null ? "popup" : "dialog";
 		}
 	} else {
 		return props.preferType!;
 	}
 });
-const isEnableBgTransparent = $computed(() => props.transparentBg && (type === 'popup'));
-let transitionName = $computed((() =>
+const isEnableBgTransparent = $computed(
+	() => props.transparentBg && type === "popup"
+);
+let transitionName = $computed(() =>
 	defaultStore.state.animation
 		? useSendAnime
-			? 'send'
-			: type === 'drawer'
-				? 'modal-drawer'
-				: type === 'popup'
-					? 'modal-popup'
-					: 'modal'
-		: ''
-));
-let transitionDuration = $computed((() =>
-	transitionName === 'send'
+			? "send"
+			: type === "drawer"
+			? "modal-drawer"
+			: type === "popup"
+			? "modal-popup"
+			: "modal"
+		: ""
+);
+let transitionDuration = $computed(() =>
+	transitionName === "send"
 		? 400
-		: transitionName === 'modal-popup'
-			? 100
-			: transitionName === 'modal'
-				? 200
-				: transitionName === 'modal-drawer'
-					? 200
-					: 0
-));
+		: transitionName === "modal-popup"
+		? 100
+		: transitionName === "modal"
+		? 200
+		: transitionName === "modal-drawer"
+		? 200
+		: 0
+);
 
 let contentClicking = false;
 
@@ -114,30 +172,30 @@ function close(opts: { useSendAnimation?: boolean } = {}) {
 	}
 
 	// eslint-disable-next-line vue/no-mutating-props
-	if (props.src) props.src.style.pointerEvents = 'auto';
+	if (props.src) props.src.style.pointerEvents = "auto";
 	showing = false;
-	emit('close');
+	emit("close");
 }
 
 function onBgClick() {
 	if (contentClicking) return;
-	emit('click');
+	emit("click");
 }
 
-if (type === 'drawer') {
+if (type === "drawer") {
 	maxHeight = window.innerHeight / 1.5;
 }
 
 const keymap = {
-	'esc': () => emit('esc'),
+	esc: () => emit("esc"),
 };
 
 const MARGIN = 16;
 
 const align = () => {
 	if (props.src == null) return;
-	if (type === 'drawer') return;
-	if (type === 'dialog') return;
+	if (type === "drawer") return;
+	if (type === "dialog") return;
 
 	if (content == null) return;
 
@@ -152,19 +210,19 @@ const align = () => {
 	const x = srcRect.left + (fixed ? 0 : window.pageXOffset);
 	const y = srcRect.top + (fixed ? 0 : window.pageYOffset);
 
-	if (props.anchor.x === 'center') {
-		left = x + (props.src.offsetWidth / 2) - (width / 2);
-	} else if (props.anchor.x === 'left') {
+	if (props.anchor.x === "center") {
+		left = x + props.src.offsetWidth / 2 - width / 2;
+	} else if (props.anchor.x === "left") {
 		// TODO
-	} else if (props.anchor.x === 'right') {
+	} else if (props.anchor.x === "right") {
 		left = x + props.src.offsetWidth;
 	}
 
-	if (props.anchor.y === 'center') {
-		top = (y - (height / 2));
-	} else if (props.anchor.y === 'top') {
+	if (props.anchor.y === "center") {
+		top = y - height / 2;
+	} else if (props.anchor.y === "top") {
 		// TODO
-	} else if (props.anchor.y === 'bottom') {
+	} else if (props.anchor.y === "bottom") {
 		top = y + props.src.offsetHeight;
 	}
 
@@ -174,20 +232,20 @@ const align = () => {
 			left = window.innerWidth - width;
 		}
 
-		const underSpace = (window.innerHeight - MARGIN) - top;
-		const upperSpace = (srcRect.top - MARGIN);
+		const underSpace = window.innerHeight - MARGIN - top;
+		const upperSpace = srcRect.top - MARGIN;
 
 		// 画面から縦にはみ出る場合
-		if (top + height > (window.innerHeight - MARGIN)) {
-			if (props.noOverlap && props.anchor.x === 'center') {
-				if (underSpace >= (upperSpace / 3)) {
+		if (top + height > window.innerHeight - MARGIN) {
+			if (props.noOverlap && props.anchor.x === "center") {
+				if (underSpace >= upperSpace / 3) {
 					maxHeight = underSpace;
 				} else {
 					maxHeight = upperSpace;
-					top = (upperSpace + MARGIN) - height;
+					top = upperSpace + MARGIN - height;
 				}
 			} else {
-				top = (window.innerHeight - MARGIN) - height;
+				top = window.innerHeight - MARGIN - height;
 			}
 		} else {
 			maxHeight = underSpace;
@@ -198,20 +256,26 @@ const align = () => {
 			left = window.innerWidth - width + window.scrollX - 1;
 		}
 
-		const underSpace = (window.innerHeight - MARGIN) - (top - window.pageYOffset);
-		const upperSpace = (srcRect.top - MARGIN);
+		const underSpace =
+			window.innerHeight - MARGIN - (top - window.pageYOffset);
+		const upperSpace = srcRect.top - MARGIN;
 
 		// 画面から縦にはみ出る場合
-		if (top + height - window.scrollY > (window.innerHeight - MARGIN)) {
-			if (props.noOverlap && props.anchor.x === 'center') {
-				if (underSpace >= (upperSpace / 3)) {
+		if (top + height - window.scrollY > window.innerHeight - MARGIN) {
+			if (props.noOverlap && props.anchor.x === "center") {
+				if (underSpace >= upperSpace / 3) {
 					maxHeight = underSpace;
 				} else {
 					maxHeight = upperSpace;
-					top = window.scrollY + ((upperSpace + MARGIN) - height);
+					top = window.scrollY + (upperSpace + MARGIN - height);
 				}
 			} else {
-				top = (window.innerHeight - MARGIN) - height + window.pageYOffset - 1;
+				top =
+					window.innerHeight -
+					MARGIN -
+					height +
+					window.pageYOffset -
+					1;
 			}
 		} else {
 			maxHeight = underSpace;
@@ -226,55 +290,76 @@ const align = () => {
 		left = 0;
 	}
 
-	let transformOriginX = 'center';
-	let transformOriginY = 'center';
+	let transformOriginX = "center";
+	let transformOriginY = "center";
 
-	if (top >= srcRect.top + props.src.offsetHeight + (fixed ? 0 : window.pageYOffset)) {
-		transformOriginY = 'top';
-	} else if ((top + height) <= srcRect.top + (fixed ? 0 : window.pageYOffset)) {
-		transformOriginY = 'bottom';
+	if (
+		top >=
+		srcRect.top + props.src.offsetHeight + (fixed ? 0 : window.pageYOffset)
+	) {
+		transformOriginY = "top";
+	} else if (top + height <= srcRect.top + (fixed ? 0 : window.pageYOffset)) {
+		transformOriginY = "bottom";
 	}
 
-	if (left >= srcRect.left + props.src.offsetWidth + (fixed ? 0 : window.pageXOffset)) {
-		transformOriginX = 'left';
-	} else if ((left + width) <= srcRect.left + (fixed ? 0 : window.pageXOffset)) {
-		transformOriginX = 'right';
+	if (
+		left >=
+		srcRect.left + props.src.offsetWidth + (fixed ? 0 : window.pageXOffset)
+	) {
+		transformOriginX = "left";
+	} else if (
+		left + width <=
+		srcRect.left + (fixed ? 0 : window.pageXOffset)
+	) {
+		transformOriginX = "right";
 	}
 
 	transformOrigin = `${transformOriginX} ${transformOriginY}`;
 
-	content.style.left = left + 'px';
-	content.style.top = top + 'px';
+	content.style.left = left + "px";
+	content.style.top = top + "px";
 };
 
 const onOpened = () => {
-	emit('opened');
+	emit("opened");
 
 	// モーダルコンテンツにマウスボタンが押され、コンテンツ外でマウスボタンが離されたときにモーダルバックグラウンドクリックと判定させないためにマウスイベントを監視しフラグ管理する
 	const el = content!.children[0];
-	el.addEventListener('mousedown', ev => {
-		contentClicking = true;
-		window.addEventListener('mouseup', ev => {
-			// click イベントより先に mouseup イベントが発生するかもしれないのでちょっと待つ
-			window.setTimeout(() => {
-				contentClicking = false;
-			}, 100);
-		}, { passive: true, once: true });
-	}, { passive: true });
+	el.addEventListener(
+		"mousedown",
+		(ev) => {
+			contentClicking = true;
+			window.addEventListener(
+				"mouseup",
+				(ev) => {
+					// click イベントより先に mouseup イベントが発生するかもしれないのでちょっと待つ
+					window.setTimeout(() => {
+						contentClicking = false;
+					}, 100);
+				},
+				{ passive: true, once: true }
+			);
+		},
+		{ passive: true }
+	);
 };
 
 onMounted(() => {
-	watch(() => props.src, async () => {
-		if (props.src) {
-			// eslint-disable-next-line vue/no-mutating-props
-			props.src.style.pointerEvents = 'none';
-		}
-		fixed = (type === 'drawer') || (getFixedContainer(props.src) != null);
+	watch(
+		() => props.src,
+		async () => {
+			if (props.src) {
+				// eslint-disable-next-line vue/no-mutating-props
+				props.src.style.pointerEvents = "none";
+			}
+			fixed = type === "drawer" || getFixedContainer(props.src) != null;
 
-		await nextTick();
+			await nextTick();
 
-		align();
-	}, { immediate: true });
+			align();
+		},
+		{ immediate: true }
+	);
 
 	nextTick(() => {
 		new ResizeObserver((entries, observer) => {
@@ -297,7 +382,8 @@ defineExpose({
 
 	> .content {
 		transform: translateY(0px);
-		transition: opacity 0.3s ease-in, transform 0.3s cubic-bezier(.5,-0.5,1,.5) !important;
+		transition: opacity 0.3s ease-in,
+			transform 0.3s cubic-bezier(0.5, -0.5, 1, 0.5) !important;
 	}
 }
 .transition_send_enterFrom,
@@ -346,7 +432,8 @@ defineExpose({
 
 	> .content {
 		transform-origin: var(--transformOrigin);
-		transition: opacity 0.2s cubic-bezier(0, 0, 0.2, 1), transform 0.2s cubic-bezier(0, 0, 0.2, 1) !important;
+		transition: opacity 0.2s cubic-bezier(0, 0, 0.2, 1),
+			transform 0.2s cubic-bezier(0, 0, 0.2, 1) !important;
 	}
 }
 .transition_modal-popup_enterFrom,
@@ -369,7 +456,7 @@ defineExpose({
 	}
 
 	> .content {
-		transition: transform 0.2s cubic-bezier(0,.5,0,1) !important;
+		transition: transform 0.2s cubic-bezier(0, 0.5, 0, 1) !important;
 	}
 }
 .transition_modal-drawer_leaveActive {
@@ -378,7 +465,7 @@ defineExpose({
 	}
 
 	> .content {
-		transition: transform 0.2s cubic-bezier(0,.5,0,1) !important;
+		transition: transform 0.2s cubic-bezier(0, 0.5, 0, 1) !important;
 	}
 }
 .transition_modal-drawer_enterFrom,
@@ -404,15 +491,39 @@ defineExpose({
 			margin: auto;
 			padding: 32px;
 			// TODO: mask-imageはiOSだとやたら重い。なんとかしたい
-			-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 32px, rgba(0,0,0,1) calc(100% - 32px), rgba(0,0,0,0) 100%);
-			mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 32px, rgba(0,0,0,1) calc(100% - 32px), rgba(0,0,0,0) 100%);
+			-webkit-mask-image: linear-gradient(
+				0deg,
+				rgba(0, 0, 0, 0) 0%,
+				rgba(0, 0, 0, 1) 32px,
+				rgba(0, 0, 0, 1) calc(100% - 32px),
+				rgba(0, 0, 0, 0) 100%
+			);
+			mask-image: linear-gradient(
+				0deg,
+				rgba(0, 0, 0, 0) 0%,
+				rgba(0, 0, 0, 1) 32px,
+				rgba(0, 0, 0, 1) calc(100% - 32px),
+				rgba(0, 0, 0, 0) 100%
+			);
 			overflow: auto;
 			display: flex;
 
 			@media (max-width: 500px) {
 				padding: 16px;
-				-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 16px, rgba(0,0,0,1) calc(100% - 16px), rgba(0,0,0,0) 100%);
-				mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 16px, rgba(0,0,0,1) calc(100% - 16px), rgba(0,0,0,0) 100%);
+				-webkit-mask-image: linear-gradient(
+					0deg,
+					rgba(0, 0, 0, 0) 0%,
+					rgba(0, 0, 0, 1) 16px,
+					rgba(0, 0, 0, 1) calc(100% - 16px),
+					rgba(0, 0, 0, 0) 100%
+				);
+				mask-image: linear-gradient(
+					0deg,
+					rgba(0, 0, 0, 0) 0%,
+					rgba(0, 0, 0, 1) 16px,
+					rgba(0, 0, 0, 1) calc(100% - 16px),
+					rgba(0, 0, 0, 0) 100%
+				);
 			}
 
 			> ::v-deep(*) {
@@ -424,7 +535,6 @@ defineExpose({
 					margin-top: 0;
 				}
 			}
-
 		}
 	}
 
diff --git a/packages/client/src/components/MkModalPageWindow.vue b/packages/client/src/components/MkModalPageWindow.vue
index 7d2a0e569..361128464 100644
--- a/packages/client/src/components/MkModalPageWindow.vue
+++ b/packages/client/src/components/MkModalPageWindow.vue
@@ -1,51 +1,80 @@
 <template>
-<MkModal ref="modal" @click="$emit('click')" @closed="$emit('closed')">
-	<div ref="rootEl" class="hrmcaedk _narrow_" :style="{ width: `${width}px`, height: (height ? `min(${height}px, 100%)` : '100%') }">
-		<div class="header" @contextmenu="onContextmenu">
-			<button v-if="history.length > 0" v-tooltip="i18n.ts.goBack" class="_button" @click="back()"><i class="ph-caret-left ph-bold ph-lg"></i></button>
-			<span v-else style="display: inline-block; width: 20px"></span>
-			<span v-if="pageMetadata?.value" class="title">
-				<i v-if="pageMetadata?.value.icon" class="icon" :class="pageMetadata?.value.icon"></i>
-				<span>{{ pageMetadata?.value.title }}</span>
-			</span>
-			<button class="_button" @click="$refs.modal.close()"><i class="ph-x ph-bold ph-lg"></i></button>
+	<MkModal ref="modal" @click="$emit('click')" @closed="$emit('closed')">
+		<div
+			ref="rootEl"
+			class="hrmcaedk _narrow_"
+			:style="{
+				width: `${width}px`,
+				height: height ? `min(${height}px, 100%)` : '100%',
+			}"
+		>
+			<div class="header" @contextmenu="onContextmenu">
+				<button
+					v-if="history.length > 0"
+					v-tooltip="i18n.ts.goBack"
+					class="_button"
+					@click="back()"
+				>
+					<i class="ph-caret-left ph-bold ph-lg"></i>
+				</button>
+				<span v-else style="display: inline-block; width: 20px"></span>
+				<span v-if="pageMetadata?.value" class="title">
+					<i
+						v-if="pageMetadata?.value.icon"
+						class="icon"
+						:class="pageMetadata?.value.icon"
+					></i>
+					<span>{{ pageMetadata?.value.title }}</span>
+				</span>
+				<button class="_button" @click="$refs.modal.close()">
+					<i class="ph-x ph-bold ph-lg"></i>
+				</button>
+			</div>
+			<div class="body">
+				<MkStickyContainer>
+					<template #header
+						><MkPageHeader
+							v-if="
+								pageMetadata?.value &&
+								!pageMetadata?.value.hideHeader
+							"
+							:info="pageMetadata?.value"
+					/></template>
+					<RouterView :router="router" />
+				</MkStickyContainer>
+			</div>
 		</div>
-		<div class="body">
-			<MkStickyContainer>
-				<template #header><MkPageHeader v-if="pageMetadata?.value && !pageMetadata?.value.hideHeader" :info="pageMetadata?.value"/></template>
-				<RouterView :router="router"/>
-			</MkStickyContainer>
-		</div>
-	</div>
-</MkModal>
+	</MkModal>
 </template>
 
 <script lang="ts" setup>
-import { ComputedRef, provide } from 'vue';
-import MkModal from '@/components/MkModal.vue';
-import { popout as _popout } from '@/scripts/popout';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
-import { url } from '@/config';
-import * as os from '@/os';
-import { mainRouter, routes } from '@/router';
-import { i18n } from '@/i18n';
-import { PageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
-import { Router } from '@/nirax';
+import { ComputedRef, provide } from "vue";
+import MkModal from "@/components/MkModal.vue";
+import { popout as _popout } from "@/scripts/popout";
+import copyToClipboard from "@/scripts/copy-to-clipboard";
+import { url } from "@/config";
+import * as os from "@/os";
+import { mainRouter, routes } from "@/router";
+import { i18n } from "@/i18n";
+import {
+	PageMetadata,
+	provideMetadataReceiver,
+	setPageMetadata,
+} from "@/scripts/page-metadata";
+import { Router } from "@/nirax";
 
 const props = defineProps<{
 	initialPath: string;
 }>();
 
 defineEmits<{
-	(ev: 'closed'): void;
-	(ev: 'click'): void;
+	(ev: "closed"): void;
+	(ev: "click"): void;
 }>();
 
 const router = new Router(routes, props.initialPath);
 
-router.addListener('push', ctx => {
-
-});
+router.addListener("push", (ctx) => {});
 
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 let rootEl = $ref();
@@ -55,40 +84,47 @@ let width = $ref(860);
 let height = $ref(660);
 const history = [];
 
-provide('router', router);
+provide("router", router);
 provideMetadataReceiver((info) => {
 	pageMetadata = info;
 });
-provide('shouldOmitHeaderTitle', true);
-provide('shouldHeaderThin', true);
+provide("shouldOmitHeaderTitle", true);
+provide("shouldHeaderThin", true);
 
 const pageUrl = $computed(() => url + path);
 const contextmenu = $computed(() => {
-	return [{
-		type: 'label',
-		text: path,
-	}, {
-		icon: 'ph-arrows-out-simple ph-bold ph-lg',
-		text: i18n.ts.showInPage,
-		action: expand,
-	}, {
-		icon: 'ph-arrow-square-out ph-bold ph-lg',
-		text: i18n.ts.popout,
-		action: popout,
-	}, null, {
-		icon: 'ph-arrow-square-out ph-bold ph-lg',
-		text: i18n.ts.openInNewTab,
-		action: () => {
-			window.open(pageUrl, '_blank');
-			modal.close();
+	return [
+		{
+			type: "label",
+			text: path,
 		},
-	}, {
-		icon: 'ph-link-simple ph-bold ph-lg',
-		text: i18n.ts.copyLink,
-		action: () => {
-			copyToClipboard(pageUrl);
+		{
+			icon: "ph-arrows-out-simple ph-bold ph-lg",
+			text: i18n.ts.showInPage,
+			action: expand,
 		},
-	}];
+		{
+			icon: "ph-arrow-square-out ph-bold ph-lg",
+			text: i18n.ts.popout,
+			action: popout,
+		},
+		null,
+		{
+			icon: "ph-arrow-square-out ph-bold ph-lg",
+			text: i18n.ts.openInNewTab,
+			action: () => {
+				window.open(pageUrl, "_blank");
+				modal.close();
+			},
+		},
+		{
+			icon: "ph-link-simple ph-bold ph-lg",
+			text: i18n.ts.copyLink,
+			action: () => {
+				copyToClipboard(pageUrl);
+			},
+		},
+	];
 });
 
 function navigate(path, record = true) {
diff --git a/packages/client/src/components/MkModalWindow.vue b/packages/client/src/components/MkModalWindow.vue
index 1d10eba77..3afcff6cb 100644
--- a/packages/client/src/components/MkModalWindow.vue
+++ b/packages/client/src/components/MkModalWindow.vue
@@ -1,13 +1,51 @@
 <template>
-	<MkModal ref="modal" :prefer-type="'dialog'" @click="onBgClick" @closed="$emit('closed')">
-		<div ref="rootEl" class="ebkgoccj" :style="{ width: `${width}px`, height: scroll ? (height ? `${height}px` : null) : (height ? `min(${height}px, 100%)` : '100%') }" @keydown="onKeydown">
+	<MkModal
+		ref="modal"
+		:prefer-type="'dialog'"
+		@click="onBgClick"
+		@closed="$emit('closed')"
+	>
+		<div
+			ref="rootEl"
+			class="ebkgoccj"
+			:style="{
+				width: `${width}px`,
+				height: scroll
+					? height
+						? `${height}px`
+						: null
+					: height
+					? `min(${height}px, 100%)`
+					: '100%',
+			}"
+			@keydown="onKeydown"
+		>
 			<div ref="headerEl" class="header">
-				<button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="ph-x ph-bold ph-lg"></i></button>
+				<button
+					v-if="withOkButton"
+					class="_button"
+					@click="$emit('close')"
+				>
+					<i class="ph-x ph-bold ph-lg"></i>
+				</button>
 				<span class="title">
 					<slot name="header"></slot>
 				</span>
-				<button v-if="!withOkButton" class="_button" @click="$emit('close')"><i class="ph-x ph-bold ph-lg"></i></button>
-				<button v-if="withOkButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ph-check ph-bold ph-lg"></i></button>
+				<button
+					v-if="!withOkButton"
+					class="_button"
+					@click="$emit('close')"
+				>
+					<i class="ph-x ph-bold ph-lg"></i>
+				</button>
+				<button
+					v-if="withOkButton"
+					class="_button"
+					:disabled="okButtonDisabled"
+					@click="$emit('ok')"
+				>
+					<i class="ph-check ph-bold ph-lg"></i>
+				</button>
 			</div>
 			<div class="body">
 				<slot :width="bodyWidth" :height="bodyHeight"></slot>
@@ -17,28 +55,31 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted } from 'vue';
-import MkModal from './MkModal.vue';
+import { onMounted, onUnmounted } from "vue";
+import MkModal from "./MkModal.vue";
 
-const props = withDefaults(defineProps<{
-	withOkButton: boolean;
-	okButtonDisabled: boolean;
-	width: number;
-	height: number | null;
-	scroll: boolean;
-}>(), {
-	withOkButton: false,
-	okButtonDisabled: false,
-	width: 400,
-	height: null,
-	scroll: true,
-});
+const props = withDefaults(
+	defineProps<{
+		withOkButton: boolean;
+		okButtonDisabled: boolean;
+		width: number;
+		height: number | null;
+		scroll: boolean;
+	}>(),
+	{
+		withOkButton: false,
+		okButtonDisabled: false,
+		width: 400,
+		height: null,
+		scroll: true,
+	}
+);
 
 const emit = defineEmits<{
-	(event: 'click'): void;
-	(event: 'close'): void;
-	(event: 'closed'): void;
-	(event: 'ok'): void;
+	(event: "click"): void;
+	(event: "close"): void;
+	(event: "closed"): void;
+	(event: "ok"): void;
 }>();
 
 let modal = $shallowRef<InstanceType<typeof MkModal>>();
@@ -52,11 +93,12 @@ const close = () => {
 };
 
 const onBgClick = () => {
-	emit('click');
+	emit("click");
 };
 
 const onKeydown = (evt) => {
-	if (evt.which === 27) { // Esc
+	if (evt.which === 27) {
+		// Esc
 		evt.preventDefault();
 		evt.stopPropagation();
 		close();
@@ -146,4 +188,3 @@ defineExpose({
 	}
 }
 </style>
-	
\ No newline at end of file
diff --git a/packages/client/src/components/MkMoved.vue b/packages/client/src/components/MkMoved.vue
index d50d49faa..b2f8095a2 100644
--- a/packages/client/src/components/MkMoved.vue
+++ b/packages/client/src/components/MkMoved.vue
@@ -1,14 +1,17 @@
 <template>
-<div class="msjugskd _block">
-	<i class="ph-airplane-takeoff ph-bold ph-lg" style="margin-right: 8px;"/>
-	{{ i18n.ts.accountMoved }}
-	<MkMention class="link" :username="acct" :host="host"/>
-</div>
+	<div class="msjugskd _block">
+		<i
+			class="ph-airplane-takeoff ph-bold ph-lg"
+			style="margin-right: 8px"
+		/>
+		{{ i18n.ts.accountMoved }}
+		<MkMention class="link" :username="acct" :host="host" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import MkMention from './MkMention.vue';
-import { i18n } from '@/i18n';
+import MkMention from "./MkMention.vue";
+import { i18n } from "@/i18n";
 
 defineProps<{
 	acct: string;
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 79dcef6e4..658e799b8 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -1,147 +1,286 @@
 <template>
-<div
-	v-if="!muted.muted"
-	v-show="!isDeleted"
-	ref="el"
-	v-hotkey="keymap"
-	v-size="{ max: [500, 450, 350, 300] }"
-	class="tkcbzcuz"
-	:tabindex="!isDeleted ? '-1' : null"
-	:class="{ renote: isRenote }"
->
-	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to"/>
-	<div class="note-context" @click="noteClick">
-		<div class="line"></div>
-		<div v-if="appearNote._prId_" class="info"><i class="ph-megaphone-simple-bold ph-lg"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click.stop="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ph-x ph-bold ph-lg"></i></button></div>
-		<div v-if="appearNote._featuredId_" class="info"><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts.featured }}</div>
-		<div v-if="pinned" class="info"><i class="ph-push-pin ph-bold ph-lg"></i>{{ i18n.ts.pinnedNote }}</div>
-		<div v-if="isRenote" class="renote">
-			<i class="ph-repeat ph-bold ph-lg"></i>
-			<I18n :src="i18n.ts.renotedBy" tag="span">
-				<template #user>
-					<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)" @click.stop>
-						<MkUserName :user="note.user"/>
-					</MkA>
-				</template>
-			</I18n>
-			<div class="info">
-				<button ref="renoteTime" class="_button time" @click.stop="showRenoteMenu()">
-					<i v-if="isMyRenote" class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"></i>
-					<MkTime :time="note.createdAt"/>
+	<div
+		v-if="!muted.muted"
+		v-show="!isDeleted"
+		ref="el"
+		v-hotkey="keymap"
+		v-size="{ max: [500, 450, 350, 300] }"
+		class="tkcbzcuz"
+		:tabindex="!isDeleted ? '-1' : null"
+		:class="{ renote: isRenote }"
+	>
+		<MkNoteSub
+			v-if="appearNote.reply"
+			:note="appearNote.reply"
+			class="reply-to"
+		/>
+		<div class="note-context" @click="noteClick">
+			<div class="line"></div>
+			<div v-if="appearNote._prId_" class="info">
+				<i class="ph-megaphone-simple-bold ph-lg"></i>
+				{{ i18n.ts.promotion
+				}}<button class="_textButton hide" @click.stop="readPromo()">
+					{{ i18n.ts.hideThisNote }}
+					<i class="ph-x ph-bold ph-lg"></i>
 				</button>
-				<MkVisibility :note="note"/>
+			</div>
+			<div v-if="appearNote._featuredId_" class="info">
+				<i class="ph-lightning ph-bold ph-lg"></i>
+				{{ i18n.ts.featured }}
+			</div>
+			<div v-if="pinned" class="info">
+				<i class="ph-push-pin ph-bold ph-lg"></i
+				>{{ i18n.ts.pinnedNote }}
+			</div>
+			<div v-if="isRenote" class="renote">
+				<i class="ph-repeat ph-bold ph-lg"></i>
+				<I18n :src="i18n.ts.renotedBy" tag="span">
+					<template #user>
+						<MkA
+							v-user-preview="note.userId"
+							class="name"
+							:to="userPage(note.user)"
+							@click.stop
+						>
+							<MkUserName :user="note.user" />
+						</MkA>
+					</template>
+				</I18n>
+				<div class="info">
+					<button
+						ref="renoteTime"
+						class="_button time"
+						@click.stop="showRenoteMenu()"
+					>
+						<i
+							v-if="isMyRenote"
+							class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"
+						></i>
+						<MkTime :time="note.createdAt" />
+					</button>
+					<MkVisibility :note="note" />
+				</div>
 			</div>
 		</div>
-	</div>
-	<article class="article" @contextmenu.stop="onContextmenu" @click="noteClick">
-		<div class="main">
-			<div class="header-container">
-				<MkAvatar class="avatar" :user="appearNote.user"/>
-				<XNoteHeader class="header" :note="appearNote" :mini="true"/>
-			</div>
-			<div class="body">
-				<p v-if="appearNote.cw != null" class="cw">
-					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :custom-emojis="appearNote.emojis" :i="$i"/>
-					<br/>
-					<XCwButton v-model="showContent" :note="appearNote"/>
-				</p>
-				<div v-show="appearNote.cw == null || showContent" class="content" :class="{ collapsed, isLong }">
-					<div class="text">
-						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
-						<!-- <a v-if="appearNote.renote != null" class="rp">RN:</a> -->
-						<div v-if="translating || translation" class="translation">
-							<MkLoading v-if="translating" mini/>
-							<div v-else class="translated">
-								<b>{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: </b>
-								<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+		<article
+			class="article"
+			@contextmenu.stop="onContextmenu"
+			@click="noteClick"
+		>
+			<div class="main">
+				<div class="header-container">
+					<MkAvatar class="avatar" :user="appearNote.user" />
+					<XNoteHeader
+						class="header"
+						:note="appearNote"
+						:mini="true"
+					/>
+				</div>
+				<div class="body">
+					<p v-if="appearNote.cw != null" class="cw">
+						<Mfm
+							v-if="appearNote.cw != ''"
+							class="text"
+							:text="appearNote.cw"
+							:author="appearNote.user"
+							:custom-emojis="appearNote.emojis"
+							:i="$i"
+						/>
+						<br />
+						<XCwButton v-model="showContent" :note="appearNote" />
+					</p>
+					<div
+						v-show="appearNote.cw == null || showContent"
+						class="content"
+						:class="{ collapsed, isLong }"
+					>
+						<div class="text">
+							<Mfm
+								v-if="appearNote.text"
+								:text="appearNote.text"
+								:author="appearNote.user"
+								:i="$i"
+								:custom-emojis="appearNote.emojis"
+							/>
+							<!-- <a v-if="appearNote.renote != null" class="rp">RN:</a> -->
+							<div
+								v-if="translating || translation"
+								class="translation"
+							>
+								<MkLoading v-if="translating" mini />
+								<div v-else class="translated">
+									<b
+										>{{
+											i18n.t("translatedFrom", {
+												x: translation.sourceLang,
+											})
+										}}:
+									</b>
+									<Mfm
+										:text="translation.text"
+										:author="appearNote.user"
+										:i="$i"
+										:custom-emojis="appearNote.emojis"
+									/>
+								</div>
 							</div>
 						</div>
+						<div v-if="appearNote.files.length > 0" class="files">
+							<XMediaList :media-list="appearNote.files" />
+						</div>
+						<XPoll
+							v-if="appearNote.poll"
+							ref="pollViewer"
+							:note="appearNote"
+							class="poll"
+						/>
+						<MkUrlPreview
+							v-for="url in urls"
+							:key="url"
+							:url="url"
+							:compact="true"
+							:detail="false"
+							class="url-preview"
+						/>
+						<div v-if="appearNote.renote" class="renote">
+							<XNoteSimple
+								:note="appearNote.renote"
+								@click.stop="
+									router.push(notePage(appearNote.renote))
+								"
+							/>
+						</div>
+						<button
+							v-if="isLong && collapsed"
+							class="fade _button"
+							@click.stop="collapsed = false"
+						>
+							<span>{{ i18n.ts.showMore }}</span>
+						</button>
+						<button
+							v-else-if="isLong && !collapsed"
+							class="showLess _button"
+							@click.stop="collapsed = true"
+						>
+							<span>{{ i18n.ts.showLess }}</span>
+						</button>
 					</div>
-					<div v-if="appearNote.files.length > 0" class="files">
-						<XMediaList :media-list="appearNote.files"/>
-					</div>
-					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
-					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
-					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote" @click.stop="router.push(notePage(appearNote.renote))"/></div>
-					<button v-if="isLong && collapsed" class="fade _button" @click.stop="collapsed = false">
-						<span>{{ i18n.ts.showMore }}</span>
-					</button>
-					<button v-else-if="isLong && !collapsed" class="showLess _button" @click.stop="collapsed = true">
-						<span>{{ i18n.ts.showLess }}</span>
-					</button>
+					<MkA
+						v-if="appearNote.channel && !inChannel"
+						class="channel"
+						:to="`/channels/${appearNote.channel.id}`"
+						@click.stop
+						><i class="ph-television ph-bold ph-lg"></i>
+						{{ appearNote.channel.name }}</MkA
+					>
 				</div>
-				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`" @click.stop><i class="ph-television ph-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
+				<footer ref="el" class="footer" @click.stop>
+					<XReactionsViewer
+						ref="reactionsViewer"
+						:note="appearNote"
+					/>
+					<button
+						v-tooltip.noDelay.bottom="i18n.ts.reply"
+						class="button _button"
+						@click="reply()"
+					>
+						<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
+						<template v-if="appearNote.repliesCount > 0">
+							<p class="count">{{ appearNote.repliesCount }}</p>
+						</template>
+					</button>
+					<XRenoteButton
+						ref="renoteButton"
+						class="button"
+						:note="appearNote"
+						:count="appearNote.renoteCount"
+					/>
+					<XStarButton
+						v-if="appearNote.myReaction == null"
+						ref="starButton"
+						class="button"
+						:note="appearNote"
+					/>
+					<button
+						v-if="appearNote.myReaction == null"
+						ref="reactButton"
+						v-tooltip.noDelay.bottom="i18n.ts.reaction"
+						class="button _button"
+						@click="react()"
+					>
+						<i class="ph-smiley ph-bold ph-lg"></i>
+					</button>
+					<button
+						v-if="appearNote.myReaction != null"
+						ref="reactButton"
+						class="button _button reacted"
+						@click="undoReact(appearNote)"
+					>
+						<i class="ph-minus ph-bold ph-lg"></i>
+					</button>
+					<XQuoteButton class="button" :note="appearNote" />
+					<button
+						ref="menuButton"
+						v-tooltip.noDelay.bottom="i18n.ts.more"
+						class="button _button"
+						@click="menu()"
+					>
+						<i class="ph-dots-three-outline ph-bold ph-lg"></i>
+					</button>
+				</footer>
 			</div>
-			<footer ref="el" class="footer" @click.stop>
-				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-				<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
-					<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
-					<template v-if="appearNote.repliesCount > 0">
-						<p class="count">{{ appearNote.repliesCount }}</p>
-					</template>
-				</button>
-				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
-				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
-				<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
-					<i class="ph-smiley ph-bold ph-lg"></i>
-				</button>
-				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
-					<i class="ph-minus ph-bold ph-lg"></i>
-				</button>
-				<XQuoteButton class="button" :note="appearNote"/>
-				<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
-					<i class="ph-dots-three-outline ph-bold ph-lg"></i>
-				</button>
-			</footer>
-		</div>
-	</article>
-</div>
-<div v-else class="muted" @click="muted.muted = false">
-	<I18n :src="i18n.ts.userSaysSomethingReason" tag="small">
-		<template #name>
-			<MkA v-user-preview="appearNote.userId" class="name" :to="userPage(appearNote.user)">
-				<MkUserName :user="appearNote.user"/>
-			</MkA>
-		</template>
-		<template #reason>
-			<b class="_blur_text">{{ muted.matched.join(", ") }}</b>
-		</template>
-	</I18n>
-</div>
+		</article>
+	</div>
+	<div v-else class="muted" @click="muted.muted = false">
+		<I18n :src="i18n.ts.userSaysSomethingReason" tag="small">
+			<template #name>
+				<MkA
+					v-user-preview="appearNote.userId"
+					class="name"
+					:to="userPage(appearNote.user)"
+				>
+					<MkUserName :user="appearNote.user" />
+				</MkA>
+			</template>
+			<template #reason>
+				<b class="_blur_text">{{ muted.matched.join(", ") }}</b>
+			</template>
+		</I18n>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, onMounted, onUnmounted, reactive, ref } from 'vue';
-import * as mfm from 'mfm-js';
-import type { Ref } from 'vue';
-import type * as misskey from 'calckey-js';
-import MkNoteSub from '@/components/MkNoteSub.vue';
-import XNoteHeader from '@/components/MkNoteHeader.vue';
-import XNoteSimple from '@/components/MkNoteSimple.vue';
-import XMediaList from '@/components/MkMediaList.vue';
-import XCwButton from '@/components/MkCwButton.vue';
-import XPoll from '@/components/MkPoll.vue';
-import XRenoteButton from '@/components/MkRenoteButton.vue';
-import XReactionsViewer from '@/components/MkReactionsViewer.vue';
-import XStarButton from '@/components/MkStarButton.vue';
-import XQuoteButton from '@/components/MkQuoteButton.vue';
-import MkUrlPreview from '@/components/MkUrlPreview.vue';
-import MkVisibility from '@/components/MkVisibility.vue';
-import { pleaseLogin } from '@/scripts/please-login';
-import { focusPrev, focusNext } from '@/scripts/focus';
-import { getWordMute } from '@/scripts/check-word-mute';
-import { useRouter } from '@/router';
-import { userPage } from '@/filters/user';
-import * as os from '@/os';
-import { defaultStore, noteViewInterruptors } from '@/store';
-import { reactionPicker } from '@/scripts/reaction-picker';
-import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { getNoteMenu } from '@/scripts/get-note-menu';
-import { useNoteCapture } from '@/scripts/use-note-capture';
-import { notePage } from '@/filters/note';
-import { deepClone } from '@/scripts/clone';
+import { computed, inject, onMounted, onUnmounted, reactive, ref } from "vue";
+import * as mfm from "mfm-js";
+import type { Ref } from "vue";
+import type * as misskey from "calckey-js";
+import MkNoteSub from "@/components/MkNoteSub.vue";
+import XNoteHeader from "@/components/MkNoteHeader.vue";
+import XNoteSimple from "@/components/MkNoteSimple.vue";
+import XMediaList from "@/components/MkMediaList.vue";
+import XCwButton from "@/components/MkCwButton.vue";
+import XPoll from "@/components/MkPoll.vue";
+import XRenoteButton from "@/components/MkRenoteButton.vue";
+import XReactionsViewer from "@/components/MkReactionsViewer.vue";
+import XStarButton from "@/components/MkStarButton.vue";
+import XQuoteButton from "@/components/MkQuoteButton.vue";
+import MkUrlPreview from "@/components/MkUrlPreview.vue";
+import MkVisibility from "@/components/MkVisibility.vue";
+import { pleaseLogin } from "@/scripts/please-login";
+import { focusPrev, focusNext } from "@/scripts/focus";
+import { getWordMute } from "@/scripts/check-word-mute";
+import { useRouter } from "@/router";
+import { userPage } from "@/filters/user";
+import * as os from "@/os";
+import { defaultStore, noteViewInterruptors } from "@/store";
+import { reactionPicker } from "@/scripts/reaction-picker";
+import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { getNoteMenu } from "@/scripts/get-note-menu";
+import { useNoteCapture } from "@/scripts/use-note-capture";
+import { notePage } from "@/filters/note";
+import { deepClone } from "@/scripts/clone";
 
 const router = useRouter();
 
@@ -150,7 +289,7 @@ const props = defineProps<{
 	pinned?: boolean;
 }>();
 
-const inChannel = inject('inChannel', null);
+const inChannel = inject("inChannel", null);
 
 let note = $ref(deepClone(props.note));
 
@@ -165,12 +304,11 @@ if (noteViewInterruptors.length > 0) {
 	});
 }
 
-const isRenote = (
+const isRenote =
 	note.renote != null &&
 	note.text == null &&
 	note.fileIds.length === 0 &&
-	note.poll == null
-);
+	note.poll == null;
 
 const el = ref<HTMLElement>();
 const menuButton = ref<HTMLElement>();
@@ -178,29 +316,33 @@ const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
 const renoteTime = ref<HTMLElement>();
 const reactButton = ref<HTMLElement>();
-let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note : note);
-const isMyRenote = $i && ($i.id === note.userId);
+let appearNote = $computed(() =>
+	isRenote ? (note.renote as misskey.entities.Note) : note
+);
+const isMyRenote = $i && $i.id === note.userId;
 const showContent = ref(false);
-const isLong = (appearNote.cw == null && appearNote.text != null && (
-	(appearNote.text.split('\n').length > 9) ||
-	(appearNote.text.length > 500)
-));
+const isLong =
+	appearNote.cw == null &&
+	appearNote.text != null &&
+	(appearNote.text.split("\n").length > 9 || appearNote.text.length > 500);
 const collapsed = ref(appearNote.cw == null && isLong);
 const isDeleted = ref(false);
 const muted = ref(getWordMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
-const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5) : null;
+const urls = appearNote.text
+	? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5)
+	: null;
 
 const keymap = {
-	'r': () => reply(true),
-	'e|a|plus': () => react(true),
-	'q': () => renoteButton.value.renote(true),
-	'up|k|shift+tab': focusBefore,
-	'down|j|tab': focusAfter,
-	'esc': blur,
-	'm|o': () => menu(true),
-	's': () => showContent.value !== showContent.value,
+	r: () => reply(true),
+	"e|a|plus": () => react(true),
+	q: () => renoteButton.value.renote(true),
+	"up|k|shift+tab": focusBefore,
+	"down|j|tab": focusAfter,
+	esc: blur,
+	"m|o": () => menu(true),
+	s: () => showContent.value !== showContent.value,
 };
 
 useNoteCapture({
@@ -211,76 +353,113 @@ useNoteCapture({
 
 function reply(viaKeyboard = false): void {
 	pleaseLogin();
-	os.post({
-		reply: appearNote,
-		animation: !viaKeyboard,
-	}, () => {
-		focus();
-	});
+	os.post(
+		{
+			reply: appearNote,
+			animation: !viaKeyboard,
+		},
+		() => {
+			focus();
+		}
+	);
 }
 
 function react(viaKeyboard = false): void {
 	pleaseLogin();
 	blur();
-	reactionPicker.show(reactButton.value, reaction => {
-		os.api('notes/reactions/create', {
-			noteId: appearNote.id,
-			reaction: reaction,
-		});
-	}, () => {
-		focus();
-	});
+	reactionPicker.show(
+		reactButton.value,
+		(reaction) => {
+			os.api("notes/reactions/create", {
+				noteId: appearNote.id,
+				reaction: reaction,
+			});
+		},
+		() => {
+			focus();
+		}
+	);
 }
 
 function undoReact(note): void {
 	const oldReaction = note.myReaction;
 	if (!oldReaction) return;
-	os.api('notes/reactions/delete', {
+	os.api("notes/reactions/delete", {
 		noteId: note.id,
 	});
 }
 
-const currentClipPage = inject<Ref<misskey.entities.Clip> | null>('currentClipPage', null);
+const currentClipPage = inject<Ref<misskey.entities.Clip> | null>(
+	"currentClipPage",
+	null
+);
 
 function onContextmenu(ev: MouseEvent): void {
 	const isLink = (el: HTMLElement) => {
-		if (el.tagName === 'A') return true;
+		if (el.tagName === "A") return true;
 		if (el.parentElement) {
 			return isLink(el.parentElement);
 		}
 	};
 	if (isLink(ev.target)) return;
-	if (window.getSelection().toString() !== '') return;
+	if (window.getSelection().toString() !== "") return;
 
 	if (defaultStore.state.useReactionPickerForContextMenu) {
 		ev.preventDefault();
 		react();
 	} else {
-		os.contextMenu(getNoteMenu({ note: note, translating, translation, menuButton, isDeleted, currentClipPage }), ev).then(focus);
+		os.contextMenu(
+			getNoteMenu({
+				note: note,
+				translating,
+				translation,
+				menuButton,
+				isDeleted,
+				currentClipPage,
+			}),
+			ev
+		).then(focus);
 	}
 }
 
 function menu(viaKeyboard = false): void {
-	os.popupMenu(getNoteMenu({ note: note, translating, translation, menuButton, isDeleted, currentClipPage }), menuButton.value, {
-		viaKeyboard,
-	}).then(focus);
+	os.popupMenu(
+		getNoteMenu({
+			note: note,
+			translating,
+			translation,
+			menuButton,
+			isDeleted,
+			currentClipPage,
+		}),
+		menuButton.value,
+		{
+			viaKeyboard,
+		}
+	).then(focus);
 }
 
 function showRenoteMenu(viaKeyboard = false): void {
 	if (!isMyRenote) return;
-	os.popupMenu([{
-		text: i18n.ts.unrenote,
-		icon: 'ph-trash ph-bold ph-lg',
-		danger: true,
-		action: () => {
-			os.api('notes/delete', {
-				noteId: note.id,
-			});
-			isDeleted.value = true;
-		},
-	}], renoteTime.value, {
-		viaKeyboard: viaKeyboard,
-	});
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts.unrenote,
+				icon: "ph-trash ph-bold ph-lg",
+				danger: true,
+				action: () => {
+					os.api("notes/delete", {
+						noteId: note.id,
+					});
+					isDeleted.value = true;
+				},
+			},
+		],
+		renoteTime.value,
+		{
+			viaKeyboard: viaKeyboard,
+		}
+	);
 }
 
 function focus() {
@@ -300,15 +479,15 @@ function focusAfter() {
 }
 
 function noteClick(e) {
-	if (document.getSelection().type === 'Range') {
+	if (document.getSelection().type === "Range") {
 		e.stopPropagation();
 	} else {
-		router.push(notePage(appearNote))
+		router.push(notePage(appearNote));
 	}
 }
 
 function readPromo() {
-	os.api('promo/read', {
+	os.api("promo/read", {
 		noteId: appearNote.id,
 	});
 	isDeleted.value = true;
@@ -329,7 +508,7 @@ function readPromo() {
 	// 今度はその処理自体がパフォーマンス低下の原因にならないか懸念される。また、被リアクションでも高さは変化するため、やはり多少のズレは生じる
 	// 一度レンダリングされた要素はブラウザがよしなにサイズを覚えておいてくれるような実装になるまで待った方が良さそう(なるのか？)
 	//content-visibility: auto;
-  //contain-intrinsic-size: 0 128px;
+	//contain-intrinsic-size: 0 128px;
 
 	&:focus-visible {
 		outline: none;
@@ -354,13 +533,14 @@ function readPromo() {
 	}
 
 	& > .article > .main {
-		&:hover, &:focus-within {
+		&:hover,
+		&:focus-within {
 			:deep(.footer .button) {
 				opacity: 1;
 			}
 		}
 	}
-	
+
 	> .reply-to {
 		& + .note-context {
 			.line::before {
@@ -393,9 +573,9 @@ function readPromo() {
 			margin-top: 0;
 			flex-grow: 0;
 		}
-		
+
 		> div > i {
-			margin-left: -.5px;
+			margin-left: -0.5px;
 		}
 		> .info {
 			display: flex;
@@ -414,7 +594,6 @@ function readPromo() {
 			}
 		}
 
-
 		> .renote {
 			display: flex;
 			align-items: center;
@@ -431,7 +610,7 @@ function readPromo() {
 				flex-shrink: 1;
 				text-overflow: ellipsis;
 				white-space: nowrap;
-				
+
 				> .name {
 					font-weight: bold;
 				}
@@ -459,7 +638,6 @@ function readPromo() {
 		padding: 4px 32px 10px;
 		cursor: pointer;
 
-
 		@media (pointer: coarse) {
 			cursor: default;
 		}
@@ -486,7 +664,7 @@ function readPromo() {
 			min-width: 0;
 
 			> .body {
-				margin-top: .7em;
+				margin-top: 0.7em;
 
 				> .cw {
 					cursor: default;
@@ -525,8 +703,14 @@ function readPromo() {
 						overflow: hidden;
 						> .text {
 							max-height: 9em;
-							mask: linear-gradient(black calc(100% - 64px), transparent);
-							-webkit-mask: linear-gradient(black calc(100% - 64px), transparent);
+							mask: linear-gradient(
+								black calc(100% - 64px),
+								transparent
+							);
+							-webkit-mask: linear-gradient(
+								black calc(100% - 64px),
+								transparent
+							);
 						}
 						> .fade {
 							display: block;
@@ -576,8 +760,8 @@ function readPromo() {
 					}
 
 					> .files {
-						margin-top: .4em;
-						margin-bottom: .4em;
+						margin-top: 0.4em;
+						margin-bottom: 0.4em;
 					}
 					> .url-preview {
 						margin-top: 8px;
@@ -594,8 +778,9 @@ function readPromo() {
 							padding: 16px;
 							border: solid 1px var(--renote);
 							border-radius: 8px;
-							transition: background .2s;
-							&:hover, &:focus-within {
+							transition: background 0.2s;
+							&:hover,
+							&:focus-within {
 								background-color: var(--panelHighlight);
 							}
 						}
@@ -623,9 +808,9 @@ function readPromo() {
 					width: max-content;
 					min-width: max-content;
 					pointer-events: all;
-					transition: opacity .2s;
+					transition: opacity 0.2s;
 					&:first-of-type {
-						margin-left: -.5em;
+						margin-left: -0.5em;
 					}
 					&:hover {
 						color: var(--fgHighlighted);
@@ -644,7 +829,6 @@ function readPromo() {
 			}
 		}
 	}
-	
 
 	> .reply {
 		border-top: solid 0.5px var(--divider);
@@ -679,8 +863,6 @@ function readPromo() {
 		}
 	}
 
-
-
 	&.max-width_300px {
 		--avatarSize: 40px;
 	}
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 4be07a41f..0137682b8 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -1,153 +1,309 @@
 <template>
-<div
-	v-if="!muted.muted"
-	v-show="!isDeleted"
-	ref="el"
-	v-hotkey="keymap"
-	v-size="{ max: [500, 450, 350, 300] }"
-	class="lxwezrsl _block"
-	:tabindex="!isDeleted ? '-1' : null"
-	:class="{ renote: isRenote }"
->
-	<MkNoteSub v-for="note in conversation" :key="note.id" class="reply-to-more" :note="note"/>
-	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to"/>
-	<div v-if="isRenote" class="renote">
-		<MkAvatar class="avatar" :user="note.user"/>
-		<i class="ph-repeat ph-bold ph-lg"></i>
-		<I18n :src="i18n.ts.renotedBy" tag="span">
-			<template #user>
-				<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)">
-					<MkUserName :user="note.user"/>
-				</MkA>
-			</template>
-		</I18n>
-		<div class="info">
-			<button ref="renoteTime" class="_button time" @click="showRenoteMenu()">
-				<i v-if="isMyRenote" class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"></i>
-				<MkTime :time="note.createdAt"/>
-			</button>
-			<MkVisibility :note="note"/>
-		</div>
-	</div>
-	<article ref="noteEl" class="article" @contextmenu.stop="onContextmenu" tabindex="-1">
-		<header class="header">
-			<MkAvatar class="avatar" :user="appearNote.user" :show-indicator="true"/>
-			<div class="body">
-				<div class="top">
-					<MkA v-user-preview="appearNote.user.id" class="name" :to="userPage(appearNote.user)">
-						<MkUserName :user="appearNote.user"/>
+	<div
+		v-if="!muted.muted"
+		v-show="!isDeleted"
+		ref="el"
+		v-hotkey="keymap"
+		v-size="{ max: [500, 450, 350, 300] }"
+		class="lxwezrsl _block"
+		:tabindex="!isDeleted ? '-1' : null"
+		:class="{ renote: isRenote }"
+	>
+		<MkNoteSub
+			v-for="note in conversation"
+			:key="note.id"
+			class="reply-to-more"
+			:note="note"
+		/>
+		<MkNoteSub
+			v-if="appearNote.reply"
+			:note="appearNote.reply"
+			class="reply-to"
+		/>
+		<div v-if="isRenote" class="renote">
+			<MkAvatar class="avatar" :user="note.user" />
+			<i class="ph-repeat ph-bold ph-lg"></i>
+			<I18n :src="i18n.ts.renotedBy" tag="span">
+				<template #user>
+					<MkA
+						v-user-preview="note.userId"
+						class="name"
+						:to="userPage(note.user)"
+					>
+						<MkUserName :user="note.user" />
 					</MkA>
-					<span v-if="appearNote.user.isBot" class="is-bot">bot</span>
-					<div class="info">
-						<MkVisibility :note="appearNote"/>
-					</div>
-				</div>
-				<div class="username"><MkAcct :user="appearNote.user"/></div>
-				<MkInstanceTicker v-if="showTicker" class="ticker" :instance="appearNote.user.instance"/>
+				</template>
+			</I18n>
+			<div class="info">
+				<button
+					ref="renoteTime"
+					class="_button time"
+					@click="showRenoteMenu()"
+				>
+					<i
+						v-if="isMyRenote"
+						class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"
+					></i>
+					<MkTime :time="note.createdAt" />
+				</button>
+				<MkVisibility :note="note" />
 			</div>
-		</header>
-		<div class="main">
-			<div class="body">
-				<div v-if="appearNote.cw != null" class="cw">
-					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
-					<br/>
-					<XCwButton v-model="showContent" :note="appearNote"/>
-				</div>
-				<div v-show="appearNote.cw == null || showContent" class="content">
-					<div class="text">
-						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
-						<div v-if="translating || translation" class="translation">
-							<MkLoading v-if="translating" mini/>
-							<div v-else class="translated">
-								<b>{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: </b>
-								<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
-							</div>
+		</div>
+		<article
+			ref="noteEl"
+			class="article"
+			@contextmenu.stop="onContextmenu"
+			tabindex="-1"
+		>
+			<header class="header">
+				<MkAvatar
+					class="avatar"
+					:user="appearNote.user"
+					:show-indicator="true"
+				/>
+				<div class="body">
+					<div class="top">
+						<MkA
+							v-user-preview="appearNote.user.id"
+							class="name"
+							:to="userPage(appearNote.user)"
+						>
+							<MkUserName :user="appearNote.user" />
+						</MkA>
+						<span v-if="appearNote.user.isBot" class="is-bot"
+							>bot</span
+						>
+						<div class="info">
+							<MkVisibility :note="appearNote" />
 						</div>
 					</div>
-					<div v-if="appearNote.files.length > 0" class="files">
-						<XMediaList :media-list="appearNote.files"/>
+					<div class="username">
+						<MkAcct :user="appearNote.user" />
 					</div>
-					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
-					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" class="url-preview"/>
-					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote" @click.stop="router.push(notePage(appearNote.renote))"/></div>
+					<MkInstanceTicker
+						v-if="showTicker"
+						class="ticker"
+						:instance="appearNote.user.instance"
+					/>
 				</div>
-				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television ph-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
+			</header>
+			<div class="main">
+				<div class="body">
+					<div v-if="appearNote.cw != null" class="cw">
+						<Mfm
+							v-if="appearNote.cw != ''"
+							class="text"
+							:text="appearNote.cw"
+							:author="appearNote.user"
+							:i="$i"
+							:custom-emojis="appearNote.emojis"
+						/>
+						<br />
+						<XCwButton v-model="showContent" :note="appearNote" />
+					</div>
+					<div
+						v-show="appearNote.cw == null || showContent"
+						class="content"
+					>
+						<div class="text">
+							<Mfm
+								v-if="appearNote.text"
+								:text="appearNote.text"
+								:author="appearNote.user"
+								:i="$i"
+								:custom-emojis="appearNote.emojis"
+							/>
+							<div
+								v-if="translating || translation"
+								class="translation"
+							>
+								<MkLoading v-if="translating" mini />
+								<div v-else class="translated">
+									<b
+										>{{
+											i18n.t("translatedFrom", {
+												x: translation.sourceLang,
+											})
+										}}:
+									</b>
+									<Mfm
+										:text="translation.text"
+										:author="appearNote.user"
+										:i="$i"
+										:custom-emojis="appearNote.emojis"
+									/>
+								</div>
+							</div>
+						</div>
+						<div v-if="appearNote.files.length > 0" class="files">
+							<XMediaList :media-list="appearNote.files" />
+						</div>
+						<XPoll
+							v-if="appearNote.poll"
+							ref="pollViewer"
+							:note="appearNote"
+							class="poll"
+						/>
+						<MkUrlPreview
+							v-for="url in urls"
+							:key="url"
+							:url="url"
+							:compact="true"
+							:detail="true"
+							class="url-preview"
+						/>
+						<div v-if="appearNote.renote" class="renote">
+							<XNoteSimple
+								:note="appearNote.renote"
+								@click.stop="
+									router.push(notePage(appearNote.renote))
+								"
+							/>
+						</div>
+					</div>
+					<MkA
+						v-if="appearNote.channel && !inChannel"
+						class="channel"
+						:to="`/channels/${appearNote.channel.id}`"
+						><i class="ph-television ph-bold ph-lg"></i>
+						{{ appearNote.channel.name }}</MkA
+					>
+				</div>
+				<footer class="footer">
+					<div class="info">
+						<MkA class="created-at" :to="notePage(appearNote)">
+							<MkTime
+								:time="appearNote.createdAt"
+								mode="detail"
+							/>
+						</MkA>
+					</div>
+					<XReactionsViewer
+						ref="reactionsViewer"
+						:note="appearNote"
+					/>
+					<button
+						v-tooltip.noDelay.bottom="i18n.ts.reply"
+						class="button _button"
+						@click="reply()"
+					>
+						<template v-if="appearNote.reply"
+							><i class="ph-arrow-u-up-left ph-bold ph-lg"></i
+						></template>
+						<template v-else
+							><i class="ph-arrow-bend-up-left ph-bold ph-lg"></i
+						></template>
+						<p v-if="appearNote.repliesCount > 0" class="count">
+							{{ appearNote.repliesCount }}
+						</p>
+					</button>
+					<XRenoteButton
+						ref="renoteButton"
+						class="button"
+						:note="appearNote"
+						:count="appearNote.renoteCount"
+					/>
+					<XStarButton
+						v-if="appearNote.myReaction == null"
+						ref="starButton"
+						class="button"
+						:note="appearNote"
+					/>
+					<button
+						v-if="appearNote.myReaction == null"
+						ref="reactButton"
+						v-tooltip.noDelay.bottom="i18n.ts.reaction"
+						class="button _button"
+						@click="react()"
+					>
+						<i class="ph-smiley ph-bold ph-lg"></i>
+					</button>
+					<button
+						v-if="appearNote.myReaction != null"
+						ref="reactButton"
+						class="button _button reacted"
+						@click="undoReact(appearNote)"
+					>
+						<i class="ph-minus ph-bold ph-lg"></i>
+					</button>
+					<XQuoteButton class="button" :note="appearNote" />
+					<button
+						ref="menuButton"
+						v-tooltip.noDelay.bottom="i18n.ts.more"
+						class="button _button"
+						@click="menu()"
+					>
+						<i class="ph-dots-three-outline ph-bold ph-lg"></i>
+					</button>
+				</footer>
 			</div>
-			<footer class="footer">
-				<div class="info">
-					<MkA class="created-at" :to="notePage(appearNote)">
-						<MkTime :time="appearNote.createdAt" mode="detail"/>
-					</MkA>
-				</div>
-				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-				<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
-					<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left ph-bold ph-lg"></i></template>
-					<template v-else><i class="ph-arrow-bend-up-left ph-bold ph-lg"></i></template>
-					<p v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</p>
-				</button>
-				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
-				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
-				<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
-					<i class="ph-smiley ph-bold ph-lg"></i>
-				</button>
-				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
-					<i class="ph-minus ph-bold ph-lg"></i>
-				</button>
-				<XQuoteButton class="button" :note="appearNote"/>
-				<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
-					<i class="ph-dots-three-outline ph-bold ph-lg"></i>
-				</button>
-			</footer>
-		</div>
-	</article>
-	<MkNoteSub v-for="note in directReplies" :key="note.id" :note="note" class="reply" :conversation="replies"/>
-</div>
-<div v-else class="_panel muted" @click="muted.muted = false">
-	<I18n :src="i18n.ts.userSaysSomethingReason" tag="small">
-		<template #name>
-			<MkA v-user-preview="appearNote.userId" class="name" :to="userPage(appearNote.user)">
-				<MkUserName :user="appearNote.user"/>
-			</MkA>
-		</template>
-		<template #reason>
-			<b class="_blur_text">{{ muted.matched.join(", ") }}</b>
-		</template>
-	</I18n>
-</div>
+		</article>
+		<MkNoteSub
+			v-for="note in directReplies"
+			:key="note.id"
+			:note="note"
+			class="reply"
+			:conversation="replies"
+		/>
+	</div>
+	<div v-else class="_panel muted" @click="muted.muted = false">
+		<I18n :src="i18n.ts.userSaysSomethingReason" tag="small">
+			<template #name>
+				<MkA
+					v-user-preview="appearNote.userId"
+					class="name"
+					:to="userPage(appearNote.user)"
+				>
+					<MkUserName :user="appearNote.user" />
+				</MkA>
+			</template>
+			<template #reason>
+				<b class="_blur_text">{{ muted.matched.join(", ") }}</b>
+			</template>
+		</I18n>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, onMounted, onUnmounted, onUpdated, reactive, ref } from 'vue';
-import * as mfm from 'mfm-js';
-import type * as misskey from 'calckey-js';
-import MkNoteSub from '@/components/MkNoteSub.vue';
-import XNoteSimple from '@/components/MkNoteSimple.vue';
-import XReactionsViewer from '@/components/MkReactionsViewer.vue';
-import XMediaList from '@/components/MkMediaList.vue';
-import XCwButton from '@/components/MkCwButton.vue';
-import XPoll from '@/components/MkPoll.vue';
-import XStarButton from '@/components/MkStarButton.vue';
-import XRenoteButton from '@/components/MkRenoteButton.vue';
-import XQuoteButton from '@/components/MkQuoteButton.vue';
-import MkUrlPreview from '@/components/MkUrlPreview.vue';
-import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
-import MkVisibility from '@/components/MkVisibility.vue';
-import { pleaseLogin } from '@/scripts/please-login';
-import { getWordMute } from '@/scripts/check-word-mute';
-import { userPage } from '@/filters/user';
-import { notePage } from '@/filters/note';
-import { useRouter } from '@/router';
-import * as os from '@/os';
-import { defaultStore, noteViewInterruptors } from '@/store';
-import { reactionPicker } from '@/scripts/reaction-picker';
-import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { getNoteMenu } from '@/scripts/get-note-menu';
-import { useNoteCapture } from '@/scripts/use-note-capture';
-import { deepClone } from '@/scripts/clone';
-import { stream } from '@/stream';
-import { NoteUpdatedEvent } from 'calckey-js/built/streaming.types';
+import {
+	computed,
+	inject,
+	onMounted,
+	onUnmounted,
+	onUpdated,
+	reactive,
+	ref,
+} from "vue";
+import * as mfm from "mfm-js";
+import type * as misskey from "calckey-js";
+import MkNoteSub from "@/components/MkNoteSub.vue";
+import XNoteSimple from "@/components/MkNoteSimple.vue";
+import XReactionsViewer from "@/components/MkReactionsViewer.vue";
+import XMediaList from "@/components/MkMediaList.vue";
+import XCwButton from "@/components/MkCwButton.vue";
+import XPoll from "@/components/MkPoll.vue";
+import XStarButton from "@/components/MkStarButton.vue";
+import XRenoteButton from "@/components/MkRenoteButton.vue";
+import XQuoteButton from "@/components/MkQuoteButton.vue";
+import MkUrlPreview from "@/components/MkUrlPreview.vue";
+import MkInstanceTicker from "@/components/MkInstanceTicker.vue";
+import MkVisibility from "@/components/MkVisibility.vue";
+import { pleaseLogin } from "@/scripts/please-login";
+import { getWordMute } from "@/scripts/check-word-mute";
+import { userPage } from "@/filters/user";
+import { notePage } from "@/filters/note";
+import { useRouter } from "@/router";
+import * as os from "@/os";
+import { defaultStore, noteViewInterruptors } from "@/store";
+import { reactionPicker } from "@/scripts/reaction-picker";
+import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { getNoteMenu } from "@/scripts/get-note-menu";
+import { useNoteCapture } from "@/scripts/use-note-capture";
+import { deepClone } from "@/scripts/clone";
+import { stream } from "@/stream";
+import { NoteUpdatedEvent } from "calckey-js/built/streaming.types";
 
 const router = useRouter();
 
@@ -156,7 +312,7 @@ const props = defineProps<{
 	pinned?: boolean;
 }>();
 
-const inChannel = inject('inChannel', null);
+const inChannel = inject("inChannel", null);
 
 let note = $ref(deepClone(props.note));
 
@@ -171,12 +327,11 @@ if (noteViewInterruptors.length > 0) {
 	});
 }
 
-const isRenote = (
+const isRenote =
 	note.renote != null &&
 	note.text == null &&
 	note.fileIds.length === 0 &&
-	note.poll == null
-);
+	note.poll == null;
 
 const el = ref<HTMLElement>();
 const noteEl = $ref();
@@ -185,28 +340,34 @@ const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
 const renoteTime = ref<HTMLElement>();
 const reactButton = ref<HTMLElement>();
-let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note : note);
-const isMyRenote = $i && ($i.id === note.userId);
+let appearNote = $computed(() =>
+	isRenote ? (note.renote as misskey.entities.Note) : note
+);
+const isMyRenote = $i && $i.id === note.userId;
 const showContent = ref(false);
 const isDeleted = ref(false);
 const muted = ref(getWordMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
-const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5) : null;
-const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance);
+const urls = appearNote.text
+	? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5)
+	: null;
+const showTicker =
+	defaultStore.state.instanceTicker === "always" ||
+	(defaultStore.state.instanceTicker === "remote" &&
+		appearNote.user.instance);
 const conversation = ref<misskey.entities.Note[]>([]);
 const replies = ref<misskey.entities.Note[]>([]);
 const directReplies = ref<misskey.entities.Note[]>([]);
 let isScrolling;
 
-
 const keymap = {
-	'r': () => reply(true),
-	'e|a|plus': () => react(true),
-	'q': () => renoteButton.value.renote(true),
-	'esc': blur,
-	'm|o': () => menu(true),
-	's': () => showContent.value !== showContent.value,
+	r: () => reply(true),
+	"e|a|plus": () => react(true),
+	q: () => renoteButton.value.renote(true),
+	esc: blur,
+	"m|o": () => menu(true),
+	s: () => showContent.value !== showContent.value,
 };
 
 useNoteCapture({
@@ -217,74 +378,106 @@ useNoteCapture({
 
 function reply(viaKeyboard = false): void {
 	pleaseLogin();
-	os.post({
-		reply: appearNote,
-		animation: !viaKeyboard,
-	}, () => {
-		focus();
-	});
+	os.post(
+		{
+			reply: appearNote,
+			animation: !viaKeyboard,
+		},
+		() => {
+			focus();
+		}
+	);
 }
 
 function react(viaKeyboard = false): void {
 	pleaseLogin();
 	blur();
-	reactionPicker.show(reactButton.value, reaction => {
-		os.api('notes/reactions/create', {
-			noteId: appearNote.id,
-			reaction: reaction,
-		});
-	}, () => {
-		focus();
-	});
+	reactionPicker.show(
+		reactButton.value,
+		(reaction) => {
+			os.api("notes/reactions/create", {
+				noteId: appearNote.id,
+				reaction: reaction,
+			});
+		},
+		() => {
+			focus();
+		}
+	);
 }
 
 function undoReact(note): void {
 	const oldReaction = note.myReaction;
 	if (!oldReaction) return;
-	os.api('notes/reactions/delete', {
+	os.api("notes/reactions/delete", {
 		noteId: note.id,
 	});
 }
 
 function onContextmenu(ev: MouseEvent): void {
 	const isLink = (el: HTMLElement) => {
-		if (el.tagName === 'A') return true;
+		if (el.tagName === "A") return true;
 		if (el.parentElement) {
 			return isLink(el.parentElement);
 		}
 	};
 	if (isLink(ev.target)) return;
-	if (window.getSelection().toString() !== '') return;
+	if (window.getSelection().toString() !== "") return;
 
 	if (defaultStore.state.useReactionPickerForContextMenu) {
 		ev.preventDefault();
 		react();
 	} else {
-		os.contextMenu(getNoteMenu({ note: note, translating, translation, menuButton, isDeleted }), ev).then(focus);
+		os.contextMenu(
+			getNoteMenu({
+				note: note,
+				translating,
+				translation,
+				menuButton,
+				isDeleted,
+			}),
+			ev
+		).then(focus);
 	}
 }
 
 function menu(viaKeyboard = false): void {
-	os.popupMenu(getNoteMenu({ note: note, translating, translation, menuButton, isDeleted }), menuButton.value, {
-		viaKeyboard,
-	}).then(focus);
+	os.popupMenu(
+		getNoteMenu({
+			note: note,
+			translating,
+			translation,
+			menuButton,
+			isDeleted,
+		}),
+		menuButton.value,
+		{
+			viaKeyboard,
+		}
+	).then(focus);
 }
 
 function showRenoteMenu(viaKeyboard = false): void {
 	if (!isMyRenote) return;
-	os.popupMenu([{
-		text: i18n.ts.unrenote,
-		icon: 'ph-trash ph-bold ph-lg',
-		danger: true,
-		action: () => {
-			os.api('notes/delete', {
-				noteId: note.id,
-			});
-			isDeleted.value = true;
-		},
-	}], renoteTime.value, {
-		viaKeyboard: viaKeyboard,
-	});
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts.unrenote,
+				icon: "ph-trash ph-bold ph-lg",
+				danger: true,
+				action: () => {
+					os.api("notes/delete", {
+						noteId: note.id,
+					});
+					isDeleted.value = true;
+				},
+			},
+		],
+		renoteTime.value,
+		{
+			viaKeyboard: viaKeyboard,
+		}
+	);
 }
 
 function focus() {
@@ -295,20 +488,26 @@ function blur() {
 	noteEl.blur();
 }
 
-os.api('notes/children', {
+os.api("notes/children", {
 	noteId: appearNote.id,
 	limit: 30,
 	depth: 12,
-}).then(res => {
+}).then((res) => {
 	replies.value = res;
-	directReplies.value = res.filter(note => note.replyId === appearNote.id || note.renoteId === appearNote.id).reverse();
+	directReplies.value = res
+		.filter(
+			(note) =>
+				note.replyId === appearNote.id ||
+				note.renoteId === appearNote.id
+		)
+		.reverse();
 });
 
 if (appearNote.replyId) {
-	os.api('notes/conversation', {
+	os.api("notes/conversation", {
 		noteId: appearNote.replyId,
 		limit: 30,
-	}).then(res => {
+	}).then((res) => {
 		conversation.value = res.reverse();
 		focus();
 	});
@@ -316,24 +515,23 @@ if (appearNote.replyId) {
 
 function onNoteReplied(noteData: NoteUpdatedEvent): void {
 	const { type, id, body } = noteData;
-	if (type === 'replied' && id === appearNote.id) {
+	if (type === "replied" && id === appearNote.id) {
 		const { id: createdId } = body;
 
-		os.api('notes/show', {
+		os.api("notes/show", {
 			noteId: createdId,
-		}).then(note => {
+		}).then((note) => {
 			if (note.replyId === appearNote.id) {
 				replies.value.unshift(note);
 				directReplies.value.unshift(note);
 			}
 		});
 	}
-	
 }
 
 document.addEventListener("wheel", () => {
 	isScrolling = true;
-})
+});
 
 onMounted(() => {
 	stream.on("noteUpdated", onNoteReplied);
@@ -343,14 +541,13 @@ onMounted(() => {
 
 onUpdated(() => {
 	if (!isScrolling) {
-		noteEl.scrollIntoView()
+		noteEl.scrollIntoView();
 	}
-})
+});
 
 onUnmounted(() => {
 	stream.off("noteUpdated", onNoteReplied);
 });
-
 </script>
 
 <style lang="scss" scoped>
@@ -558,8 +755,9 @@ onUnmounted(() => {
 							padding: 16px;
 							border: solid 1px var(--renote);
 							border-radius: 8px;
-							transition: background .2s;
-							&:hover, &:focus-within {
+							transition: background 0.2s;
+							&:hover,
+							&:focus-within {
 								background-color: var(--panelHighlight);
 							}
 						}
@@ -617,7 +815,10 @@ onUnmounted(() => {
 	}
 
 	// Hover
-	.reply :deep(.main), .reply-to, .reply-to-more, :deep(.more) {
+	.reply :deep(.main),
+	.reply-to,
+	.reply-to-more,
+	:deep(.more) {
 		position: relative;
 		&::before {
 			content: "";
@@ -627,10 +828,11 @@ onUnmounted(() => {
 			background: var(--panelHighlight);
 			border-radius: var(--radius);
 			opacity: 0;
-			transition: opacity .2s;
+			transition: opacity 0.2s;
 			z-index: -1;
 		}
-		&.reply-to, &.reply-to-more {
+		&.reply-to,
+		&.reply-to-more {
 			&::before {
 				inset: 0px 8px;
 			}
@@ -651,7 +853,8 @@ onUnmounted(() => {
 		&.more::before {
 			inset: 0 !important;
 		}
-		&:hover, &:focus-within {
+		&:hover,
+		&:focus-within {
 			&::before {
 				opacity: 1;
 			}
@@ -667,14 +870,12 @@ onUnmounted(() => {
 		// 	}
 		// }
 	}
-	
 
 	&.max-width_500px {
 		font-size: 0.9em;
 	}
-	
+
 	&.max-width_450px {
-		
 		> .reply-to-more:first-child {
 			padding-top: 14px;
 		}
@@ -708,7 +909,6 @@ onUnmounted(() => {
 		font-size: 0.825em;
 
 		> .article {
-
 			> .main {
 				> .footer {
 					> .button {
diff --git a/packages/client/src/components/MkNoteHeader.vue b/packages/client/src/components/MkNoteHeader.vue
index 6d55bcff5..c4443141b 100644
--- a/packages/client/src/components/MkNoteHeader.vue
+++ b/packages/client/src/components/MkNoteHeader.vue
@@ -1,36 +1,45 @@
 <template>
-<header class="kkwtjztg">
-	<div class="user-info">
-		<div>
-			<MkA v-user-preview="note.user.id" class="name" :to="userPage(note.user)" @click.stop>
-				<MkUserName :user="note.user" class="mkusername">
-					<span v-if="note.user.isBot" class="is-bot">bot</span>
-				</MkUserName>
-			</MkA>
-			<div class="username"><MkAcct :user="note.user"/></div>
-		</div>
-		<div>
-			<div class="info">
-				<MkA class="created-at" :to="notePage(note)">
-					<MkTime :time="note.createdAt"/>
+	<header class="kkwtjztg">
+		<div class="user-info">
+			<div>
+				<MkA
+					v-user-preview="note.user.id"
+					class="name"
+					:to="userPage(note.user)"
+					@click.stop
+				>
+					<MkUserName :user="note.user" class="mkusername">
+						<span v-if="note.user.isBot" class="is-bot">bot</span>
+					</MkUserName>
 				</MkA>
-				<MkVisibility :note="note"/>
+				<div class="username"><MkAcct :user="note.user" /></div>
+			</div>
+			<div>
+				<div class="info">
+					<MkA class="created-at" :to="notePage(note)">
+						<MkTime :time="note.createdAt" />
+					</MkA>
+					<MkVisibility :note="note" />
+				</div>
+				<MkInstanceTicker
+					v-if="showTicker"
+					class="ticker"
+					:instance="note.user.instance"
+				/>
 			</div>
-			<MkInstanceTicker v-if="showTicker" class="ticker" :instance="note.user.instance"/>
 		</div>
-	</div>
-</header>
+	</header>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import type * as misskey from 'calckey-js';
-import { defaultStore, noteViewInterruptors } from '@/store';
-import MkVisibility from '@/components/MkVisibility.vue';
-import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
-import { notePage } from '@/filters/note';
-import { userPage } from '@/filters/user';
-import { deepClone } from '@/scripts/clone';
+import {} from "vue";
+import type * as misskey from "calckey-js";
+import { defaultStore, noteViewInterruptors } from "@/store";
+import MkVisibility from "@/components/MkVisibility.vue";
+import MkInstanceTicker from "@/components/MkInstanceTicker.vue";
+import { notePage } from "@/filters/note";
+import { userPage } from "@/filters/user";
+import { deepClone } from "@/scripts/clone";
 
 const props = defineProps<{
 	note: misskey.entities.Note;
@@ -39,10 +48,9 @@ const props = defineProps<{
 
 let note = $ref(deepClone(props.note));
 
-const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && note.user.instance);
-
-
-
+const showTicker =
+	defaultStore.state.instanceTicker === "always" ||
+	(defaultStore.state.instanceTicker === "remote" && note.user.instance);
 </script>
 
 <style lang="scss" scoped>
@@ -54,7 +62,7 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
 	white-space: nowrap;
 	justify-self: flex-end;
 	border-radius: 100px;
-	font-size: .8em;
+	font-size: 0.8em;
 	text-shadow: 0 2px 2px var(--shadow);
 	> .avatar {
 		width: 3.7em;
@@ -73,11 +81,11 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
 				width: 0;
 				overflow: hidden;
 				text-overflow: ellipsis;
-				gap: .1em 0;
+				gap: 0.1em 0;
 			}
 			&:last-child {
 				max-width: 50%;
-				gap: .3em .5em;
+				gap: 0.3em 0.5em;
 			}
 			.article > .main & {
 				display: flex;
@@ -94,17 +102,17 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
 		.name {
 			// flex: 1 1 0px;
 			display: inline;
-			margin: 0 .5em 0 0;
+			margin: 0 0.5em 0 0;
 			padding: 0;
 			overflow: hidden;
 			font-weight: bold;
 			text-decoration: none;
 			text-overflow: ellipsis;
 
-			.mkusername >.is-bot {
+			.mkusername > .is-bot {
 				flex-shrink: 0;
 				align-self: center;
-				margin: 0 .5em 0 0;
+				margin: 0 0.5em 0 0;
 				padding: 1px 6px;
 				font-size: 80%;
 				border: solid 0.5px var(--divider);
@@ -118,17 +126,17 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
 
 		.username {
 			display: inline;
-			margin: 0 .5em 0 0;
+			margin: 0 0.5em 0 0;
 			overflow: hidden;
 			text-overflow: ellipsis;
 			align-self: flex-start;
-			font-size: .9em;
+			font-size: 0.9em;
 		}
 
 		.info {
 			display: inline-flex;
 			flex-shrink: 0;
-			margin-left: .5em;
+			margin-left: 0.5em;
 			font-size: 0.9em;
 			.created-at {
 				max-width: 100%;
@@ -139,7 +147,7 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
 
 		.ticker {
 			display: inline-flex;
-			margin-left: .5em;
+			margin-left: 0.5em;
 			vertical-align: middle;
 			> .name {
 				display: none;
diff --git a/packages/client/src/components/MkNotePreview.vue b/packages/client/src/components/MkNotePreview.vue
index 18d21ca61..9d388e71b 100644
--- a/packages/client/src/components/MkNotePreview.vue
+++ b/packages/client/src/components/MkNotePreview.vue
@@ -1,22 +1,22 @@
 <template>
-<div v-size="{ min: [350, 500] }" class="fefdfafb">
-	<MkAvatar class="avatar" :user="$i"/>
-	<div class="main">
-		<div class="header">
-			<MkUserName :user="$i"/>
-		</div>
-		<div class="body">
-			<div class="content">
-				<Mfm :text="preprocess(text).trim()" :author="$i" :i="$i"/>
+	<div v-size="{ min: [350, 500] }" class="fefdfafb">
+		<MkAvatar class="avatar" :user="$i" />
+		<div class="main">
+			<div class="header">
+				<MkUserName :user="$i" />
+			</div>
+			<div class="body">
+				<div class="content">
+					<Mfm :text="preprocess(text).trim()" :author="$i" :i="$i" />
+				</div>
 			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import { preprocess } from '@/scripts/preprocess';
+import {} from "vue";
+import { preprocess } from "@/scripts/preprocess";
 
 const props = defineProps<{
 	text: string;
@@ -67,7 +67,6 @@ const props = defineProps<{
 		}
 
 		> .body {
-
 			> .cw {
 				cursor: default;
 				display: block;
diff --git a/packages/client/src/components/MkNoteSimple.vue b/packages/client/src/components/MkNoteSimple.vue
index dad1bf97d..937f9144a 100644
--- a/packages/client/src/components/MkNoteSimple.vue
+++ b/packages/client/src/components/MkNoteSimple.vue
@@ -1,28 +1,35 @@
 <template>
-<div v-size="{ min: [350, 500] }" class="yohlumlk">
-	<MkAvatar class="avatar" :user="note.user"/>
-	<div class="main">
-		<XNoteHeader class="header" :note="note" :mini="true"/>
-		<div class="body">
-			<p v-if="note.cw != null" class="cw">
-				<Mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
-				<br/>
-				<XCwButton v-model="showContent" :note="note"/>
-			</p>
-			<div v-show="note.cw == null || showContent" class="content">
-				<MkSubNoteContent class="text" :note="note"/>
+	<div v-size="{ min: [350, 500] }" class="yohlumlk">
+		<MkAvatar class="avatar" :user="note.user" />
+		<div class="main">
+			<XNoteHeader class="header" :note="note" :mini="true" />
+			<div class="body">
+				<p v-if="note.cw != null" class="cw">
+					<Mfm
+						v-if="note.cw != ''"
+						class="text"
+						:text="note.cw"
+						:author="note.user"
+						:i="$i"
+						:custom-emojis="note.emojis"
+					/>
+					<br />
+					<XCwButton v-model="showContent" :note="note" />
+				</p>
+				<div v-show="note.cw == null || showContent" class="content">
+					<MkSubNoteContent class="text" :note="note" />
+				</div>
 			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as misskey from 'calckey-js';
-import XNoteHeader from '@/components/MkNoteHeader.vue';
-import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
-import XCwButton from '@/components/MkCwButton.vue';
+import {} from "vue";
+import * as misskey from "calckey-js";
+import XNoteHeader from "@/components/MkNoteHeader.vue";
+import MkSubNoteContent from "@/components/MkSubNoteContent.vue";
+import XCwButton from "@/components/MkCwButton.vue";
 
 const props = defineProps<{
 	note: misskey.entities.Note;
@@ -74,7 +81,6 @@ const showContent = $ref(false);
 		}
 
 		> .body {
-
 			> .cw {
 				cursor: default;
 				display: block;
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 4f172fb0d..9c98ae15d 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -1,178 +1,309 @@
 <template>
-<div ref="el" 
-	v-size="{ max: [450, 500] }"
-	class="wrpstxzv"
-	:class="{ children: depth > 1, singleStart: replies.length == 1, firstColumn: depth == 1 && conversation }"
->
-	<div v-if="conversation && depth > 1" class="line"></div>
-	<div class="main" @click="noteClick">
-		<div class="avatar-container">
-			<MkAvatar class="avatar" :user="appearNote.user"/>
-			<div v-if="(!conversation) || replies.length > 0" class="line"></div>
-		</div>
-		<div class="body">
-			<XNoteHeader class="header" :note="note" :mini="true"/>
+	<div
+		ref="el"
+		v-size="{ max: [450, 500] }"
+		class="wrpstxzv"
+		:class="{
+			children: depth > 1,
+			singleStart: replies.length == 1,
+			firstColumn: depth == 1 && conversation,
+		}"
+	>
+		<div v-if="conversation && depth > 1" class="line"></div>
+		<div class="main" @click="noteClick">
+			<div class="avatar-container">
+				<MkAvatar class="avatar" :user="appearNote.user" />
+				<div
+					v-if="!conversation || replies.length > 0"
+					class="line"
+				></div>
+			</div>
 			<div class="body">
-				<p v-if="appearNote.cw != null" class="cw">
-					<MkA v-if="appearNote.replyId"  :to="`/notes/${appearNote.replyId}`" class="reply-icon" @click.stop>
-						<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
-					</MkA>
-					<MkA v-if="conversation && appearNote.renoteId && appearNote.renoteId != parentId && !appearNote.replyId" :to="`/notes/${appearNote.renoteId}`" class="reply-icon" @click.stop>
-						<i class="ph-quotes ph-bold ph-lg"></i>
-					</MkA>
-					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
-					<br/>
-					<XCwButton v-model="showContent" :note="note"/>
-				</p>
-				<div v-show="appearNote.cw == null || showContent" class="content">
-					<MkSubNoteContent class="text" :note="note" :detailed="true" :parentId="appearNote.parentId" :conversation="conversation"/>
-				</div>
-				<div v-if="translating || translation" class="translation">
-					<MkLoading v-if="translating" mini/>
-					<div v-else class="translated">
-						<b>{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: </b>
-						<Mfm :text="translation.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
+				<XNoteHeader class="header" :note="note" :mini="true" />
+				<div class="body">
+					<p v-if="appearNote.cw != null" class="cw">
+						<MkA
+							v-if="appearNote.replyId"
+							:to="`/notes/${appearNote.replyId}`"
+							class="reply-icon"
+							@click.stop
+						>
+							<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
+						</MkA>
+						<MkA
+							v-if="
+								conversation &&
+								appearNote.renoteId &&
+								appearNote.renoteId != parentId &&
+								!appearNote.replyId
+							"
+							:to="`/notes/${appearNote.renoteId}`"
+							class="reply-icon"
+							@click.stop
+						>
+							<i class="ph-quotes ph-bold ph-lg"></i>
+						</MkA>
+						<Mfm
+							v-if="appearNote.cw != ''"
+							class="text"
+							:text="appearNote.cw"
+							:author="appearNote.user"
+							:i="$i"
+							:custom-emojis="appearNote.emojis"
+						/>
+						<br />
+						<XCwButton v-model="showContent" :note="note" />
+					</p>
+					<div
+						v-show="appearNote.cw == null || showContent"
+						class="content"
+					>
+						<MkSubNoteContent
+							class="text"
+							:note="note"
+							:detailed="true"
+							:parentId="appearNote.parentId"
+							:conversation="conversation"
+						/>
+					</div>
+					<div v-if="translating || translation" class="translation">
+						<MkLoading v-if="translating" mini />
+						<div v-else class="translated">
+							<b
+								>{{
+									i18n.t("translatedFrom", {
+										x: translation.sourceLang,
+									})
+								}}:
+							</b>
+							<Mfm
+								:text="translation.text"
+								:author="appearNote.user"
+								:i="$i"
+								:custom-emojis="appearNote.emojis"
+							/>
+						</div>
 					</div>
 				</div>
+				<footer class="footer" @click.stop>
+					<XReactionsViewer
+						ref="reactionsViewer"
+						:note="appearNote"
+					/>
+					<button
+						v-tooltip.noDelay.bottom="i18n.ts.reply"
+						class="button _button"
+						@click="reply()"
+					>
+						<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
+						<template v-if="appearNote.repliesCount > 0">
+							<p class="count">{{ appearNote.repliesCount }}</p>
+						</template>
+					</button>
+					<XRenoteButton
+						ref="renoteButton"
+						class="button"
+						:note="appearNote"
+						:count="appearNote.renoteCount"
+					/>
+					<XStarButton
+						v-if="appearNote.myReaction == null"
+						ref="starButton"
+						class="button"
+						:note="appearNote"
+					/>
+					<button
+						v-if="appearNote.myReaction == null"
+						ref="reactButton"
+						v-tooltip.noDelay.bottom="i18n.ts.reaction"
+						class="button _button"
+						@click="react()"
+					>
+						<i class="ph-smiley ph-bold ph-lg"></i>
+					</button>
+					<button
+						v-if="appearNote.myReaction != null"
+						ref="reactButton"
+						class="button _button reacted"
+						@click="undoReact(appearNote)"
+					>
+						<i class="ph-minus ph-bold ph-lg"></i>
+					</button>
+					<XQuoteButton class="button" :note="appearNote" />
+					<button
+						ref="menuButton"
+						v-tooltip.noDelay.bottom="i18n.ts.more"
+						class="button _button"
+						@click="menu()"
+					>
+						<i class="ph-dots-three-outline ph-bold ph-lg"></i>
+					</button>
+				</footer>
 			</div>
-			<footer class="footer" @click.stop>
-				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-				<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
-					<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
-					<template v-if="appearNote.repliesCount > 0">
-						<p class="count">{{ appearNote.repliesCount }}</p>
-					</template>
-				</button>
-				<XRenoteButton ref="renoteButton" class="button" :note="appearNote" :count="appearNote.renoteCount"/>
-				<XStarButton v-if="appearNote.myReaction == null" ref="starButton" class="button" :note="appearNote"/>
-				<button v-if="appearNote.myReaction == null" ref="reactButton" v-tooltip.noDelay.bottom="i18n.ts.reaction" class="button _button" @click="react()">
-					<i class="ph-smiley ph-bold ph-lg"></i>
-				</button>
-				<button v-if="appearNote.myReaction != null" ref="reactButton" class="button _button reacted" @click="undoReact(appearNote)">
-					<i class="ph-minus ph-bold ph-lg"></i>
-				</button>
-				<XQuoteButton class="button" :note="appearNote"/>
-				<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
-					<i class="ph-dots-three-outline ph-bold ph-lg"></i>
-				</button>
-			</footer>
 		</div>
+		<template v-if="conversation">
+			<template v-if="replies.length == 1">
+				<MkNoteSub
+					v-for="reply in replies"
+					:key="reply.id"
+					:note="reply"
+					class="reply single"
+					:conversation="conversation"
+					:depth="depth"
+					:parentId="appearNote.replyId"
+				/>
+			</template>
+			<template v-else-if="depth < 5">
+				<MkNoteSub
+					v-for="reply in replies"
+					:key="reply.id"
+					:note="reply"
+					class="reply"
+					:conversation="conversation"
+					:depth="depth + 1"
+					:parentId="appearNote.replyId"
+				/>
+			</template>
+			<div v-else-if="replies.length > 0" class="more">
+				<div class="line"></div>
+				<MkA class="text _link" :to="notePage(note)"
+					>{{ i18n.ts.continueThread }}
+					<i class="ph-caret-double-right ph-bold ph-lg"></i
+				></MkA>
+			</div>
+		</template>
 	</div>
-	<template v-if="conversation">
-		<template v-if="replies.length == 1">
-			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply single" :conversation="conversation" :depth="depth" :parentId="appearNote.replyId"/>
-		</template>
-		<template v-else-if="depth < 5">
-			<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" class="reply" :conversation="conversation" :depth="depth + 1" :parentId="appearNote.replyId"/>
-		</template>
-		<div v-else-if="replies.length > 0" class="more">
-			<div class="line"></div>
-			<MkA class="text _link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ph-caret-double-right ph-bold ph-lg"></i></MkA>
-		</div>
-	</template>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { inject, ref } from 'vue';
-import type { Ref } from 'vue';
-import * as misskey from 'calckey-js';
-import XNoteHeader from '@/components/MkNoteHeader.vue';
-import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
-import XReactionsViewer from '@/components/MkReactionsViewer.vue';
-import XStarButton from '@/components/MkStarButton.vue';
-import XRenoteButton from '@/components/MkRenoteButton.vue';
-import XQuoteButton from '@/components/MkQuoteButton.vue';
-import XCwButton from '@/components/MkCwButton.vue';
-import { pleaseLogin } from '@/scripts/please-login';
-import { getNoteMenu } from '@/scripts/get-note-menu';
-import { notePage } from '@/filters/note';
-import { useRouter } from '@/router';
-import * as os from '@/os';
-import { reactionPicker } from '@/scripts/reaction-picker';
-import { i18n } from '@/i18n';
-import { deepClone } from '@/scripts/clone';
-import { useNoteCapture } from '@/scripts/use-note-capture';
-
+import { inject, ref } from "vue";
+import type { Ref } from "vue";
+import * as misskey from "calckey-js";
+import XNoteHeader from "@/components/MkNoteHeader.vue";
+import MkSubNoteContent from "@/components/MkSubNoteContent.vue";
+import XReactionsViewer from "@/components/MkReactionsViewer.vue";
+import XStarButton from "@/components/MkStarButton.vue";
+import XRenoteButton from "@/components/MkRenoteButton.vue";
+import XQuoteButton from "@/components/MkQuoteButton.vue";
+import XCwButton from "@/components/MkCwButton.vue";
+import { pleaseLogin } from "@/scripts/please-login";
+import { getNoteMenu } from "@/scripts/get-note-menu";
+import { notePage } from "@/filters/note";
+import { useRouter } from "@/router";
+import * as os from "@/os";
+import { reactionPicker } from "@/scripts/reaction-picker";
+import { i18n } from "@/i18n";
+import { deepClone } from "@/scripts/clone";
+import { useNoteCapture } from "@/scripts/use-note-capture";
 
 const router = useRouter();
 
-const props = withDefaults(defineProps<{
-	note: misskey.entities.Note;
-	conversation?: misskey.entities.Note[];
-	parentId?;
+const props = withDefaults(
+	defineProps<{
+		note: misskey.entities.Note;
+		conversation?: misskey.entities.Note[];
+		parentId?;
 
-	// how many notes are in between this one and the note being viewed in detail
-	depth?: number;
-}>(), {
-	depth: 1,
-});
+		// how many notes are in between this one and the note being viewed in detail
+		depth?: number;
+	}>(),
+	{
+		depth: 1,
+	}
+);
 
 let note = $ref(deepClone(props.note));
 
-const isRenote = (
+const isRenote =
 	note.renote != null &&
 	note.text == null &&
 	note.fileIds.length === 0 &&
-	note.poll == null
-);
+	note.poll == null;
 
 const el = ref<HTMLElement>();
 const menuButton = ref<HTMLElement>();
 const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
 const reactButton = ref<HTMLElement>();
-let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note : note);
+let appearNote = $computed(() =>
+	isRenote ? (note.renote as misskey.entities.Note) : note
+);
 const isDeleted = ref(false);
 const translation = ref(null);
 const translating = ref(false);
 let showContent = $ref(false);
-const replies: misskey.entities.Note[] = props.conversation?.filter(item => item.replyId === props.note.id || item.renoteId === props.note.id).reverse() ?? [];
+const replies: misskey.entities.Note[] =
+	props.conversation
+		?.filter(
+			(item) =>
+				item.replyId === props.note.id ||
+				item.renoteId === props.note.id
+		)
+		.reverse() ?? [];
 
 useNoteCapture({
 	rootEl: el,
-	note: $$(appearNote)
+	note: $$(appearNote),
 });
 
-
 function reply(viaKeyboard = false): void {
 	pleaseLogin();
-	os.post({
-		reply: appearNote,
-		animation: !viaKeyboard,
-	}, () => {
-		focus();
-	});
+	os.post(
+		{
+			reply: appearNote,
+			animation: !viaKeyboard,
+		},
+		() => {
+			focus();
+		}
+	);
 }
 
 function react(viaKeyboard = false): void {
 	pleaseLogin();
 	blur();
-	reactionPicker.show(reactButton.value, reaction => {
-		os.api('notes/reactions/create', {
-			noteId: appearNote.id,
-			reaction: reaction,
-		});
-	}, () => {
-		focus();
-	});
+	reactionPicker.show(
+		reactButton.value,
+		(reaction) => {
+			os.api("notes/reactions/create", {
+				noteId: appearNote.id,
+				reaction: reaction,
+			});
+		},
+		() => {
+			focus();
+		}
+	);
 }
 
 function undoReact(note): void {
 	const oldReaction = note.myReaction;
 	if (!oldReaction) return;
-	os.api('notes/reactions/delete', {
+	os.api("notes/reactions/delete", {
 		noteId: note.id,
 	});
 }
 
-const currentClipPage = inject<Ref<misskey.entities.Clip> | null>('currentClipPage', null);
-
+const currentClipPage = inject<Ref<misskey.entities.Clip> | null>(
+	"currentClipPage",
+	null
+);
 
 function menu(viaKeyboard = false): void {
-	os.popupMenu(getNoteMenu({ note: note, translating, translation, menuButton, isDeleted, currentClipPage }), menuButton.value, {
-		viaKeyboard,
-	}).then(focus);
+	os.popupMenu(
+		getNoteMenu({
+			note: note,
+			translating,
+			translation,
+			menuButton,
+			isDeleted,
+			currentClipPage,
+		}),
+		menuButton.value,
+		{
+			viaKeyboard,
+		}
+	).then(focus);
 }
 
 function focus() {
@@ -184,10 +315,10 @@ function blur() {
 }
 
 function noteClick(e) {
-	if (document.getSelection().type === 'Range') {
+	if (document.getSelection().type === "Range") {
 		e.stopPropagation();
 	} else {
-		router.push(notePage(props.note))
+		router.push(notePage(props.note));
 	}
 }
 </script>
@@ -206,7 +337,6 @@ function noteClick(e) {
 		}
 	}
 
-	
 	> .main {
 		display: flex;
 
@@ -231,7 +361,7 @@ function noteClick(e) {
 			@media (pointer: coarse) {
 				cursor: default;
 			}
-			
+
 			> .header {
 				margin-bottom: 2px;
 				cursor: auto;
@@ -241,11 +371,12 @@ function noteClick(e) {
 				.reply-icon {
 					display: inline-block;
 					border-radius: 6px;
-					padding: .2em .2em;
-					margin-right: .2em;
+					padding: 0.2em 0.2em;
+					margin-right: 0.2em;
 					color: var(--accent);
-					transition: background .2s;
-					&:hover, &:focus {
+					transition: background 0.2s;
+					&:hover,
+					&:focus {
 						background: var(--buttonHoverBg);
 					}
 				}
@@ -279,7 +410,7 @@ function noteClick(e) {
 				display: flex;
 				flex-wrap: wrap;
 				pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
-	
+
 				> .button {
 					margin: 0;
 					padding: 8px;
@@ -289,20 +420,20 @@ function noteClick(e) {
 					width: max-content;
 					min-width: max-content;
 					pointer-events: all;
-					transition: opacity .2s;
+					transition: opacity 0.2s;
 					&:first-of-type {
-						margin-left: -.5em;
+						margin-left: -0.5em;
 					}
 					&:hover {
 						color: var(--fgHighlighted);
 					}
-	
+
 					> .count {
 						display: inline;
 						margin: 0 0 0 8px;
 						opacity: 0.7;
 					}
-	
+
 					&.reacted {
 						color: var(--accent);
 					}
@@ -320,7 +451,8 @@ function noteClick(e) {
 			margin-right: 8px !important;
 		}
 	}
-	> .reply, > .more {
+	> .reply,
+	> .more {
 		margin-top: 10px;
 		&.single {
 			padding: 0 !important;
@@ -361,15 +493,19 @@ function noteClick(e) {
 		}
 	}
 
-	&.reply, &.reply-to, &.reply-to-more {
-		> .main:hover, > .main:focus-within {
+	&.reply,
+	&.reply-to,
+	&.reply-to-more {
+		> .main:hover,
+		> .main:focus-within {
 			:deep(.footer .button) {
 				opacity: 1;
 			}
 		}
 	}
 
-	&.reply-to, &.reply-to-more {
+	&.reply-to,
+	&.reply-to-more {
 		padding-bottom: 0;
 		&:first-child {
 			padding-top: 24px;
@@ -378,9 +514,11 @@ function noteClick(e) {
 			margin-bottom: -16px;
 		}
 	}
-	
+
 	// Reply Lines
-	&.reply, &.reply-to, &.reply-to-more {
+	&.reply,
+	&.reply-to,
+	&.reply-to-more {
 		--indent: calc(var(--avatarSize) - 5px);
 		> .main {
 			> .avatar-container {
@@ -413,17 +551,20 @@ function noteClick(e) {
 			}
 		}
 	}
-	&.reply-to, &.reply-to-more {
+	&.reply-to,
+	&.reply-to-more {
 		> .main > .avatar-container > .line {
 			margin-bottom: 0px !important;
 		}
 	}
-	&.single, &.singleStart {
+	&.single,
+	&.singleStart {
 		> .main > .avatar-container > .line {
 			margin-bottom: -10px !important;
 		}
 	}
-	.reply.children:not(:last-child) { // Line that goes through multiple replies
+	.reply.children:not(:last-child) {
+		// Line that goes through multiple replies
 		position: relative;
 		> .line {
 			position: absolute;
@@ -473,7 +614,9 @@ function noteClick(e) {
 	}
 	&.firstColumn > .children:last-child > .main {
 		padding-bottom: 0 !important;
-		&::before { bottom: 0 !important }
+		&::before {
+			bottom: 0 !important;
+		}
 		// &::after { content: unset }
 	}
 
@@ -485,7 +628,9 @@ function noteClick(e) {
 			}
 		}
 		&.firstColumn {
-			> .main, > .line, > .children:not(.single) > .line {
+			> .main,
+			> .line,
+			> .children:not(.single) > .line {
 				--avatarSize: 35px;
 				--indent: 35px;
 			}
@@ -496,7 +641,8 @@ function noteClick(e) {
 	}
 	&.max-width_450px {
 		padding: 14px 16px;
-		&.reply-to, &.reply-to-more {
+		&.reply-to,
+		&.reply-to-more {
 			padding: 14px 16px;
 			padding-top: 14px !important;
 			padding-bottom: 0 !important;
diff --git a/packages/client/src/components/MkNotes.vue b/packages/client/src/components/MkNotes.vue
index f1c8aab46..124ffea6a 100644
--- a/packages/client/src/components/MkNotes.vue
+++ b/packages/client/src/components/MkNotes.vue
@@ -1,29 +1,46 @@
 <template>
-<MkPagination ref="pagingComponent" :pagination="pagination">
-	<template #empty>
-		<div class="_fullinfo">
-			<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>
-			<div>{{ i18n.ts.noNotes }}</div>
-		</div>
-	</template>
+	<MkPagination ref="pagingComponent" :pagination="pagination">
+		<template #empty>
+			<div class="_fullinfo">
+				<img
+					src="/static-assets/badges/info.png"
+					class="_ghost"
+					alt="Info"
+				/>
+				<div>{{ i18n.ts.noNotes }}</div>
+			</div>
+		</template>
 
-	<template #default="{ items: notes }">
-		<div class="giivymft" :class="{ noGap }">
-			<XList ref="notes" v-slot="{ item: note }" :items="notes" :direction="pagination.reversed ? 'up' : 'down'" :reversed="pagination.reversed" :no-gap="noGap" :ad="true" class="notes">
-				<XNote :key="note._featuredId_ || note._prId_ || note.id" class="qtqtichx" :note="note"/>
-			</XList>
-		</div>
-	</template>
-</MkPagination>
+		<template #default="{ items: notes }">
+			<div class="giivymft" :class="{ noGap }">
+				<XList
+					ref="notes"
+					v-slot="{ item: note }"
+					:items="notes"
+					:direction="pagination.reversed ? 'up' : 'down'"
+					:reversed="pagination.reversed"
+					:no-gap="noGap"
+					:ad="true"
+					class="notes"
+				>
+					<XNote
+						:key="note._featuredId_ || note._prId_ || note.id"
+						class="qtqtichx"
+						:note="note"
+					/>
+				</XList>
+			</div>
+		</template>
+	</MkPagination>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import type { Paging } from '@/components/MkPagination.vue';
-import XNote from '@/components/MkNote.vue';
-import XList from '@/components/MkDateSeparatedList.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import { i18n } from '@/i18n';
+import { ref } from "vue";
+import type { Paging } from "@/components/MkPagination.vue";
+import XNote from "@/components/MkNote.vue";
+import XList from "@/components/MkDateSeparatedList.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	pagination: Paging;
diff --git a/packages/client/src/components/MkNotification.vue b/packages/client/src/components/MkNotification.vue
index 1e75c59a9..60aefab9f 100644
--- a/packages/client/src/components/MkNotification.vue
+++ b/packages/client/src/components/MkNotification.vue
@@ -1,99 +1,289 @@
 <template>
-<div ref="elRef" v-size="{ max: [500, 600] }" class="qglefbjs" :class="notification.type">
-	<div class="head">
-		<MkAvatar v-if="notification.type === 'pollEnded'" class="icon" :user="notification.note.user"/>
-		<MkAvatar v-else-if="notification.user" class="icon" :user="notification.user"/>
-		<img v-else-if="notification.icon" class="icon" :src="notification.icon" alt=""/>
-		<div class="sub-icon" :class="notification.type">
-			<i v-if="notification.type === 'follow'" class="ph-hand-waving ph-bold"></i>
-			<i v-else-if="notification.type === 'receiveFollowRequest'" class="ph-clock ph-bold"></i>
-			<i v-else-if="notification.type === 'followRequestAccepted'" class="ph-check ph-bold"></i>
-			<i v-else-if="notification.type === 'groupInvited'" class="ph-identification-card ph-bold"></i>
-			<i v-else-if="notification.type === 'renote'" class="ph-repeat ph-bold"></i>
-			<i v-else-if="notification.type === 'reply'" class="ph-arrow-bend-up-left ph-bold"></i>
-			<i v-else-if="notification.type === 'mention'" class="ph-at ph-bold"></i>
-			<i v-else-if="notification.type === 'quote'" class="ph-quotes ph-bold"></i>
-			<i v-else-if="notification.type === 'pollVote'" class="ph-microphone-stage ph-bold"></i>
-			<i v-else-if="notification.type === 'pollEnded'" class="ph-microphone-stage ph-bold"></i>
-			<!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
-			<XReactionIcon
-				v-else-if="notification.type === 'reaction'"
-				ref="reactionRef"
-				:reaction="notification.reaction ? notification.reaction.replace(/^:(\w+):$/, ':$1@.:') : notification.reaction"
-				:custom-emojis="notification.note.emojis"
-				:no-style="true"
+	<div
+		ref="elRef"
+		v-size="{ max: [500, 600] }"
+		class="qglefbjs"
+		:class="notification.type"
+	>
+		<div class="head">
+			<MkAvatar
+				v-if="notification.type === 'pollEnded'"
+				class="icon"
+				:user="notification.note.user"
 			/>
+			<MkAvatar
+				v-else-if="notification.user"
+				class="icon"
+				:user="notification.user"
+			/>
+			<img
+				v-else-if="notification.icon"
+				class="icon"
+				:src="notification.icon"
+				alt=""
+			/>
+			<div class="sub-icon" :class="notification.type">
+				<i
+					v-if="notification.type === 'follow'"
+					class="ph-hand-waving ph-bold"
+				></i>
+				<i
+					v-else-if="notification.type === 'receiveFollowRequest'"
+					class="ph-clock ph-bold"
+				></i>
+				<i
+					v-else-if="notification.type === 'followRequestAccepted'"
+					class="ph-check ph-bold"
+				></i>
+				<i
+					v-else-if="notification.type === 'groupInvited'"
+					class="ph-identification-card ph-bold"
+				></i>
+				<i
+					v-else-if="notification.type === 'renote'"
+					class="ph-repeat ph-bold"
+				></i>
+				<i
+					v-else-if="notification.type === 'reply'"
+					class="ph-arrow-bend-up-left ph-bold"
+				></i>
+				<i
+					v-else-if="notification.type === 'mention'"
+					class="ph-at ph-bold"
+				></i>
+				<i
+					v-else-if="notification.type === 'quote'"
+					class="ph-quotes ph-bold"
+				></i>
+				<i
+					v-else-if="notification.type === 'pollVote'"
+					class="ph-microphone-stage ph-bold"
+				></i>
+				<i
+					v-else-if="notification.type === 'pollEnded'"
+					class="ph-microphone-stage ph-bold"
+				></i>
+				<!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
+				<XReactionIcon
+					v-else-if="notification.type === 'reaction'"
+					ref="reactionRef"
+					:reaction="
+						notification.reaction
+							? notification.reaction.replace(
+									/^:(\w+):$/,
+									':$1@.:'
+							  )
+							: notification.reaction
+					"
+					:custom-emojis="notification.note.emojis"
+					:no-style="true"
+				/>
+			</div>
+		</div>
+		<div class="tail">
+			<header>
+				<span v-if="notification.type === 'pollEnded'">{{
+					i18n.ts._notification.pollEnded
+				}}</span>
+				<MkA
+					v-else-if="notification.user"
+					v-user-preview="notification.user.id"
+					class="name"
+					:to="userPage(notification.user)"
+					><MkUserName :user="notification.user"
+				/></MkA>
+				<span v-else>{{ notification.header }}</span>
+				<MkTime
+					v-if="withTime"
+					:time="notification.createdAt"
+					class="time"
+				/>
+			</header>
+			<MkA
+				v-if="notification.type === 'reaction'"
+				class="text"
+				:to="notePage(notification.note)"
+				:title="getNoteSummary(notification.note)"
+			>
+				<i class="ph-quotes ph-fill ph-lg"></i>
+				<Mfm
+					:text="getNoteSummary(notification.note)"
+					:plain="true"
+					:nowrap="!full"
+					:custom-emojis="notification.note.emojis"
+				/>
+				<i class="ph-quotes ph-fill ph-lg"></i>
+			</MkA>
+			<MkA
+				v-if="notification.type === 'renote'"
+				class="text"
+				:to="notePage(notification.note)"
+				:title="getNoteSummary(notification.note.renote)"
+			>
+				<i class="ph-quotes ph-fill ph-lg"></i>
+				<Mfm
+					:text="getNoteSummary(notification.note.renote)"
+					:plain="true"
+					:nowrap="!full"
+					:custom-emojis="notification.note.renote.emojis"
+				/>
+				<i class="ph-quotes ph-fill ph-lg"></i>
+			</MkA>
+			<MkA
+				v-if="notification.type === 'reply'"
+				class="text"
+				:to="notePage(notification.note)"
+				:title="getNoteSummary(notification.note)"
+			>
+				<Mfm
+					:text="getNoteSummary(notification.note)"
+					:plain="true"
+					:nowrap="!full"
+					:custom-emojis="notification.note.emojis"
+				/>
+			</MkA>
+			<MkA
+				v-if="notification.type === 'mention'"
+				class="text"
+				:to="notePage(notification.note)"
+				:title="getNoteSummary(notification.note)"
+			>
+				<Mfm
+					:text="getNoteSummary(notification.note)"
+					:plain="true"
+					:nowrap="!full"
+					:custom-emojis="notification.note.emojis"
+				/>
+			</MkA>
+			<MkA
+				v-if="notification.type === 'quote'"
+				class="text"
+				:to="notePage(notification.note)"
+				:title="getNoteSummary(notification.note)"
+			>
+				<Mfm
+					:text="getNoteSummary(notification.note)"
+					:plain="true"
+					:nowrap="!full"
+					:custom-emojis="notification.note.emojis"
+				/>
+			</MkA>
+			<MkA
+				v-if="notification.type === 'pollVote'"
+				class="text"
+				:to="notePage(notification.note)"
+				:title="getNoteSummary(notification.note)"
+			>
+				<i class="ph-quotes ph-fill ph-lg"></i>
+				<Mfm
+					:text="getNoteSummary(notification.note)"
+					:plain="true"
+					:nowrap="!full"
+					:custom-emojis="notification.note.emojis"
+				/>
+				<i class="ph-quotes ph-fill ph-lg"></i>
+			</MkA>
+			<MkA
+				v-if="notification.type === 'pollEnded'"
+				class="text"
+				:to="notePage(notification.note)"
+				:title="getNoteSummary(notification.note)"
+			>
+				<i class="ph-quotes ph-fill ph-lg"></i>
+				<Mfm
+					:text="getNoteSummary(notification.note)"
+					:plain="true"
+					:nowrap="!full"
+					:custom-emojis="notification.note.emojis"
+				/>
+				<i class="ph-quotes ph-fill ph-lg"></i>
+			</MkA>
+			<span
+				v-if="notification.type === 'follow'"
+				class="text"
+				style="opacity: 0.6"
+				>{{ i18n.ts.youGotNewFollower }}
+				<div v-if="full">
+					<MkFollowButton
+						:user="notification.user"
+						:full="true"
+					/></div
+			></span>
+			<span
+				v-if="notification.type === 'followRequestAccepted'"
+				class="text"
+				style="opacity: 0.6"
+				>{{ i18n.ts.followRequestAccepted }}</span
+			>
+			<span
+				v-if="notification.type === 'receiveFollowRequest'"
+				class="text"
+				style="opacity: 0.6"
+				>{{ i18n.ts.receiveFollowRequest }}
+				<div v-if="full && !followRequestDone">
+					<button class="_textButton" @click="acceptFollowRequest()">
+						{{ i18n.ts.accept }}
+					</button>
+					|
+					<button class="_textButton" @click="rejectFollowRequest()">
+						{{ i18n.ts.reject }}
+					</button>
+				</div></span
+			>
+			<span
+				v-if="notification.type === 'groupInvited'"
+				class="text"
+				style="opacity: 0.6"
+				>{{ i18n.ts.groupInvited }}:
+				<b>{{ notification.invitation.group.name }}</b>
+				<div v-if="full && !groupInviteDone">
+					<button
+						class="_textButton"
+						@click="acceptGroupInvitation()"
+					>
+						{{ i18n.ts.accept }}
+					</button>
+					|
+					<button
+						class="_textButton"
+						@click="rejectGroupInvitation()"
+					>
+						{{ i18n.ts.reject }}
+					</button>
+				</div></span
+			>
+			<span v-if="notification.type === 'app'" class="text">
+				<Mfm :text="notification.body" :nowrap="!full" />
+			</span>
 		</div>
 	</div>
-	<div class="tail">
-		<header>
-			<span v-if="notification.type === 'pollEnded'">{{ i18n.ts._notification.pollEnded }}</span>
-			<MkA v-else-if="notification.user" v-user-preview="notification.user.id" class="name" :to="userPage(notification.user)"><MkUserName :user="notification.user"/></MkA>
-			<span v-else>{{ notification.header }}</span>
-			<MkTime v-if="withTime" :time="notification.createdAt" class="time"/>
-		</header>
-		<MkA v-if="notification.type === 'reaction'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-			<i class="ph-quotes ph-fill ph-lg"></i>
-			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
-			<i class="ph-quotes ph-fill ph-lg"></i>
-		</MkA>
-		<MkA v-if="notification.type === 'renote'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note.renote)">
-			<i class="ph-quotes ph-fill ph-lg"></i>
-			<Mfm :text="getNoteSummary(notification.note.renote)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.renote.emojis"/>
-			<i class="ph-quotes ph-fill ph-lg"></i>
-		</MkA>
-		<MkA v-if="notification.type === 'reply'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
-		</MkA>
-		<MkA v-if="notification.type === 'mention'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
-		</MkA>
-		<MkA v-if="notification.type === 'quote'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
-		</MkA>
-		<MkA v-if="notification.type === 'pollVote'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-			<i class="ph-quotes ph-fill ph-lg"></i>
-			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
-			<i class="ph-quotes ph-fill ph-lg"></i>
-		</MkA>
-		<MkA v-if="notification.type === 'pollEnded'" class="text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-			<i class="ph-quotes ph-fill ph-lg"></i>
-			<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/>
-			<i class="ph-quotes ph-fill ph-lg"></i>
-		</MkA>
-		<span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ i18n.ts.youGotNewFollower }}<div v-if="full"><MkFollowButton :user="notification.user" :full="true"/></div></span>
-		<span v-if="notification.type === 'followRequestAccepted'" class="text" style="opacity: 0.6;">{{ i18n.ts.followRequestAccepted }}</span>
-		<span v-if="notification.type === 'receiveFollowRequest'" class="text" style="opacity: 0.6;">{{ i18n.ts.receiveFollowRequest }}<div v-if="full && !followRequestDone"><button class="_textButton" @click="acceptFollowRequest()">{{ i18n.ts.accept }}</button> | <button class="_textButton" @click="rejectFollowRequest()">{{ i18n.ts.reject }}</button></div></span>
-		<span v-if="notification.type === 'groupInvited'" class="text" style="opacity: 0.6;">{{ i18n.ts.groupInvited }}: <b>{{ notification.invitation.group.name }}</b><div v-if="full && !groupInviteDone"><button class="_textButton" @click="acceptGroupInvitation()">{{ i18n.ts.accept }}</button> | <button class="_textButton" @click="rejectGroupInvitation()">{{ i18n.ts.reject }}</button></div></span>
-		<span v-if="notification.type === 'app'" class="text">
-			<Mfm :text="notification.body" :nowrap="!full"/>
-		</span>
-	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onUnmounted, watch } from 'vue';
-import * as misskey from 'calckey-js';
-import XReactionIcon from '@/components/MkReactionIcon.vue';
-import MkFollowButton from '@/components/MkFollowButton.vue';
-import XReactionTooltip from '@/components/MkReactionTooltip.vue';
-import { getNoteSummary } from '@/scripts/get-note-summary';
-import { notePage } from '@/filters/note';
-import { userPage } from '@/filters/user';
-import { i18n } from '@/i18n';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import { useTooltip } from '@/scripts/use-tooltip';
+import { ref, onMounted, onUnmounted, watch } from "vue";
+import * as misskey from "calckey-js";
+import XReactionIcon from "@/components/MkReactionIcon.vue";
+import MkFollowButton from "@/components/MkFollowButton.vue";
+import XReactionTooltip from "@/components/MkReactionTooltip.vue";
+import { getNoteSummary } from "@/scripts/get-note-summary";
+import { notePage } from "@/filters/note";
+import { userPage } from "@/filters/user";
+import { i18n } from "@/i18n";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import { useTooltip } from "@/scripts/use-tooltip";
 
-const props = withDefaults(defineProps<{
-	notification: misskey.entities.Notification;
-	withTime?: boolean;
-	full?: boolean;
-}>(), {
-	withTime: false,
-	full: false,
-});
+const props = withDefaults(
+	defineProps<{
+		notification: misskey.entities.Notification;
+		withTime?: boolean;
+		full?: boolean;
+	}>(),
+	{
+		withTime: false,
+		full: false,
+	}
+);
 
 const elRef = ref<HTMLElement>(null);
 const reactionRef = ref(null);
@@ -104,8 +294,8 @@ let connection;
 onMounted(() => {
 	if (!props.notification.isRead) {
 		readObserver = new IntersectionObserver((entries, observer) => {
-			if (!entries.some(entry => entry.isIntersecting)) return;
-			stream.send('readNotification', {
+			if (!entries.some((entry) => entry.isIntersecting)) return;
+			stream.send("readNotification", {
 				id: props.notification.id,
 			});
 			observer.disconnect();
@@ -113,8 +303,8 @@ onMounted(() => {
 
 		readObserver.observe(elRef.value);
 
-		connection = stream.useChannel('main');
-		connection.on('readAllNotifications', () => readObserver.disconnect());
+		connection = stream.useChannel("main");
+		connection.on("readAllNotifications", () => readObserver.disconnect());
 
 		watch(props.notification.isRead, () => {
 			readObserver.disconnect();
@@ -132,31 +322,42 @@ const groupInviteDone = ref(false);
 
 const acceptFollowRequest = () => {
 	followRequestDone.value = true;
-	os.api('following/requests/accept', { userId: props.notification.user.id });
+	os.api("following/requests/accept", { userId: props.notification.user.id });
 };
 
 const rejectFollowRequest = () => {
 	followRequestDone.value = true;
-	os.api('following/requests/reject', { userId: props.notification.user.id });
+	os.api("following/requests/reject", { userId: props.notification.user.id });
 };
 
 const acceptGroupInvitation = () => {
 	groupInviteDone.value = true;
-	os.apiWithDialog('users/groups/invitations/accept', { invitationId: props.notification.invitation.id });
+	os.apiWithDialog("users/groups/invitations/accept", {
+		invitationId: props.notification.invitation.id,
+	});
 };
 
 const rejectGroupInvitation = () => {
 	groupInviteDone.value = true;
-	os.api('users/groups/invitations/reject', { invitationId: props.notification.invitation.id });
+	os.api("users/groups/invitations/reject", {
+		invitationId: props.notification.invitation.id,
+	});
 };
 
 useTooltip(reactionRef, (showing) => {
-	os.popup(XReactionTooltip, {
-		showing,
-		reaction: props.notification.reaction ? props.notification.reaction.replace(/^:(\w+):$/, ':$1@.:') : props.notification.reaction,
-		emojis: props.notification.note.emojis,
-		targetElement: reactionRef.value.$el,
-	}, {}, 'closed');
+	os.popup(
+		XReactionTooltip,
+		{
+			showing,
+			reaction: props.notification.reaction
+				? props.notification.reaction.replace(/^:(\w+):$/, ":$1@.:")
+				: props.notification.reaction,
+			emojis: props.notification.note.emojis,
+			targetElement: reactionRef.value.$el,
+		},
+		{},
+		"closed"
+	);
 });
 </script>
 
@@ -219,7 +420,10 @@ useTooltip(reactionRef, (showing) => {
 				height: 100%;
 			}
 
-			&.follow, &.followRequestAccepted, &.receiveFollowRequest, &.groupInvited {
+			&.follow,
+			&.followRequestAccepted,
+			&.receiveFollowRequest,
+			&.groupInvited {
 				padding: 3px;
 				background: #31748f;
 				pointer-events: none;
diff --git a/packages/client/src/components/MkNotificationSettingWindow.vue b/packages/client/src/components/MkNotificationSettingWindow.vue
index f2a9aed99..00a61bb2d 100644
--- a/packages/client/src/components/MkNotificationSettingWindow.vue
+++ b/packages/client/src/components/MkNotificationSettingWindow.vue
@@ -1,60 +1,77 @@
 <template>
-<XModalWindow
-	ref="dialog"
-	:width="400"
-	:height="450"
-	:with-ok-button="true"
-	:ok-button-disabled="false"
-	@ok="ok()"
-	@close="dialog.close()"
-	@closed="emit('closed')"
->
-	<template #header>{{ i18n.ts.notificationSetting }}</template>
-	<div class="_monolithic_">
-		<div v-if="showGlobalToggle" class="_section">
-			<MkSwitch v-model="useGlobalSetting">
-				{{ i18n.ts.useGlobalSetting }}
-				<template #caption>{{ i18n.ts.useGlobalSettingDesc }}</template>
-			</MkSwitch>
+	<XModalWindow
+		ref="dialog"
+		:width="400"
+		:height="450"
+		:with-ok-button="true"
+		:ok-button-disabled="false"
+		@ok="ok()"
+		@close="dialog.close()"
+		@closed="emit('closed')"
+	>
+		<template #header>{{ i18n.ts.notificationSetting }}</template>
+		<div class="_monolithic_">
+			<div v-if="showGlobalToggle" class="_section">
+				<MkSwitch v-model="useGlobalSetting">
+					{{ i18n.ts.useGlobalSetting }}
+					<template #caption>{{
+						i18n.ts.useGlobalSettingDesc
+					}}</template>
+				</MkSwitch>
+			</div>
+			<div v-if="!useGlobalSetting" class="_section">
+				<MkInfo>{{ i18n.ts.notificationSettingDesc }}</MkInfo>
+				<MkButton inline @click="disableAll">{{
+					i18n.ts.disableAll
+				}}</MkButton>
+				<MkButton inline @click="enableAll">{{
+					i18n.ts.enableAll
+				}}</MkButton>
+				<MkSwitch
+					v-for="ntype in notificationTypes"
+					:key="ntype"
+					v-model="typesMap[ntype]"
+					>{{ i18n.t(`_notification._types.${ntype}`) }}</MkSwitch
+				>
+			</div>
 		</div>
-		<div v-if="!useGlobalSetting" class="_section">
-			<MkInfo>{{ i18n.ts.notificationSettingDesc }}</MkInfo>
-			<MkButton inline @click="disableAll">{{ i18n.ts.disableAll }}</MkButton>
-			<MkButton inline @click="enableAll">{{ i18n.ts.enableAll }}</MkButton>
-			<MkSwitch v-for="ntype in notificationTypes" :key="ntype" v-model="typesMap[ntype]">{{ i18n.t(`_notification._types.${ntype}`) }}</MkSwitch>
-		</div>
-	</div>
-</XModalWindow>
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import { notificationTypes } from 'calckey-js';
-import MkSwitch from './form/switch.vue';
-import MkInfo from './MkInfo.vue';
-import MkButton from './MkButton.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import { notificationTypes } from "calckey-js";
+import MkSwitch from "./form/switch.vue";
+import MkInfo from "./MkInfo.vue";
+import MkButton from "./MkButton.vue";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import { i18n } from "@/i18n";
 
 const emit = defineEmits<{
-	(ev: 'done', v: { includingTypes: string[] | null }): void,
-	(ev: 'closed'): void,
+	(ev: "done", v: { includingTypes: string[] | null }): void;
+	(ev: "closed"): void;
 }>();
 
-const props = withDefaults(defineProps<{
-	includingTypes?: typeof notificationTypes[number][] | null;
-	showGlobalToggle?: boolean;
-}>(), {
-	includingTypes: () => [],
-	showGlobalToggle: true,
-});
+const props = withDefaults(
+	defineProps<{
+		includingTypes?: (typeof notificationTypes)[number][] | null;
+		showGlobalToggle?: boolean;
+	}>(),
+	{
+		includingTypes: () => [],
+		showGlobalToggle: true,
+	}
+);
 
 let includingTypes = $computed(() => props.includingTypes || []);
 
 const dialog = $ref<InstanceType<typeof XModalWindow>>();
 
-let typesMap = $ref<Record<typeof notificationTypes[number], boolean>>({});
-let useGlobalSetting = $ref((includingTypes === null || includingTypes.length === 0) && props.showGlobalToggle);
+let typesMap = $ref<Record<(typeof notificationTypes)[number], boolean>>({});
+let useGlobalSetting = $ref(
+	(includingTypes === null || includingTypes.length === 0) &&
+		props.showGlobalToggle
+);
 
 for (const ntype of notificationTypes) {
 	typesMap[ntype] = includingTypes.includes(ntype);
@@ -62,11 +79,12 @@ for (const ntype of notificationTypes) {
 
 function ok() {
 	if (useGlobalSetting) {
-		emit('done', { includingTypes: null });
+		emit("done", { includingTypes: null });
 	} else {
-		emit('done', {
-			includingTypes: (Object.keys(typesMap) as typeof notificationTypes[number][])
-				.filter(type => typesMap[type]),
+		emit("done", {
+			includingTypes: (
+				Object.keys(typesMap) as (typeof notificationTypes)[number][]
+			).filter((type) => typesMap[type]),
 		});
 	}
 
@@ -75,13 +93,13 @@ function ok() {
 
 function disableAll() {
 	for (const type in typesMap) {
-		typesMap[type as typeof notificationTypes[number]] = false;
+		typesMap[type as (typeof notificationTypes)[number]] = false;
 	}
 }
 
 function enableAll() {
 	for (const type in typesMap) {
-		typesMap[type as typeof notificationTypes[number]] = true;
+		typesMap[type as (typeof notificationTypes)[number]] = true;
 	}
 }
 </script>
diff --git a/packages/client/src/components/MkNotificationToast.vue b/packages/client/src/components/MkNotificationToast.vue
index 398f64d54..ba95e11af 100644
--- a/packages/client/src/components/MkNotificationToast.vue
+++ b/packages/client/src/components/MkNotificationToast.vue
@@ -1,25 +1,33 @@
 <template>
-<div class="mk-notification-toast" :style="{ zIndex }">
-	<transition :name="$store.state.animation ? 'notification-toast' : ''" appear @after-leave="$emit('closed')">
-		<XNotification v-if="showing" :notification="notification" class="notification _acrylic"/>
-	</transition>
-</div>
+	<div class="mk-notification-toast" :style="{ zIndex }">
+		<transition
+			:name="$store.state.animation ? 'notification-toast' : ''"
+			appear
+			@after-leave="$emit('closed')"
+		>
+			<XNotification
+				v-if="showing"
+				:notification="notification"
+				class="notification _acrylic"
+			/>
+		</transition>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import XNotification from '@/components/MkNotification.vue';
-import * as os from '@/os';
+import { onMounted } from "vue";
+import XNotification from "@/components/MkNotification.vue";
+import * as os from "@/os";
 
 defineProps<{
 	notification: any; // TODO
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
-const zIndex = os.claimZIndex('high');
+const zIndex = os.claimZIndex("high");
 let showing = $ref(true);
 
 onMounted(() => {
@@ -30,10 +38,12 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-.notification-toast-enter-active, .notification-toast-leave-active {
+.notification-toast-enter-active,
+.notification-toast-leave-active {
 	transition: opacity 0.3s, transform 0.3s !important;
 }
-.notification-toast-enter-from, .notification-toast-leave-to {
+.notification-toast-enter-from,
+.notification-toast-leave-to {
 	opacity: 0;
 	transform: translateX(-250px);
 }
diff --git a/packages/client/src/components/MkNotifications.vue b/packages/client/src/components/MkNotifications.vue
index a38c0e0b2..61b16b16e 100644
--- a/packages/client/src/components/MkNotifications.vue
+++ b/packages/client/src/components/MkNotifications.vue
@@ -1,54 +1,89 @@
 <template>
-<MkPagination ref="pagingComponent" :pagination="pagination">
-	<template #empty>
-		<div class="_fullinfo">
-			<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>
-			<div>{{ i18n.ts.noNotifications }}</div>
-		</div>
-	</template>
+	<MkPagination ref="pagingComponent" :pagination="pagination">
+		<template #empty>
+			<div class="_fullinfo">
+				<img
+					src="/static-assets/badges/info.png"
+					class="_ghost"
+					alt="Info"
+				/>
+				<div>{{ i18n.ts.noNotifications }}</div>
+			</div>
+		</template>
 
-	<template #default="{ items: notifications }">
-		<XList v-slot="{ item: notification }" class="elsfgstc" :items="notifications" :no-gap="true">
-			<XNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="notification.id" :note="notification.note"/>
-			<XNotification v-else :key="notification.id" :notification="notification" :with-time="true" :full="true" class="_panel notification"/>
-		</XList>
-	</template>
-</MkPagination>
+		<template #default="{ items: notifications }">
+			<XList
+				v-slot="{ item: notification }"
+				class="elsfgstc"
+				:items="notifications"
+				:no-gap="true"
+			>
+				<XNote
+					v-if="
+						['reply', 'quote', 'mention'].includes(
+							notification.type
+						)
+					"
+					:key="notification.id"
+					:note="notification.note"
+				/>
+				<XNotification
+					v-else
+					:key="notification.id"
+					:notification="notification"
+					:with-time="true"
+					:full="true"
+					class="_panel notification"
+				/>
+			</XList>
+		</template>
+	</MkPagination>
 </template>
 
 <script lang="ts" setup>
-import { defineComponent, markRaw, onUnmounted, onMounted, computed, ref } from 'vue';
-import { notificationTypes } from 'calckey-js';
-import MkPagination, { Paging } from '@/components/MkPagination.vue';
-import XNotification from '@/components/MkNotification.vue';
-import XList from '@/components/MkDateSeparatedList.vue';
-import XNote from '@/components/MkNote.vue';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
+import {
+	defineComponent,
+	markRaw,
+	onUnmounted,
+	onMounted,
+	computed,
+	ref,
+} from "vue";
+import { notificationTypes } from "calckey-js";
+import MkPagination, { Paging } from "@/components/MkPagination.vue";
+import XNotification from "@/components/MkNotification.vue";
+import XList from "@/components/MkDateSeparatedList.vue";
+import XNote from "@/components/MkNote.vue";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
-	includeTypes?: typeof notificationTypes[number][];
+	includeTypes?: (typeof notificationTypes)[number][];
 	unreadOnly?: boolean;
 }>();
 
 const pagingComponent = ref<InstanceType<typeof MkPagination>>();
 
 const pagination: Paging = {
-	endpoint: 'i/notifications' as const,
+	endpoint: "i/notifications" as const,
 	limit: 10,
 	params: computed(() => ({
 		includeTypes: props.includeTypes ?? undefined,
-		excludeTypes: props.includeTypes ? undefined : $i.mutingNotificationTypes,
+		excludeTypes: props.includeTypes
+			? undefined
+			: $i.mutingNotificationTypes,
 		unreadOnly: props.unreadOnly,
 	})),
 };
 
 const onNotification = (notification) => {
-	const isMuted = props.includeTypes ? !props.includeTypes.includes(notification.type) : $i.mutingNotificationTypes.includes(notification.type);
-	if (isMuted || document.visibilityState === 'visible') {
-		stream.send('readNotification', {
+	const isMuted = props.includeTypes
+		? !props.includeTypes.includes(notification.type)
+		: $i.mutingNotificationTypes.includes(notification.type);
+	if (isMuted || document.visibilityState === "visible") {
+		stream.send("readNotification", {
 			id: notification.id,
 		});
 	}
@@ -56,7 +91,7 @@ const onNotification = (notification) => {
 	if (!isMuted) {
 		pagingComponent.value.prepend({
 			...notification,
-			isRead: document.visibilityState === 'visible',
+			isRead: document.visibilityState === "visible",
 		});
 	}
 };
@@ -64,9 +99,9 @@ const onNotification = (notification) => {
 let connection;
 
 onMounted(() => {
-	connection = stream.useChannel('main');
-	connection.on('notification', onNotification);
-	connection.on('readAllNotifications', () => {
+	connection = stream.useChannel("main");
+	connection.on("notification", onNotification);
+	connection.on("readAllNotifications", () => {
 		if (pagingComponent.value) {
 			for (const item of pagingComponent.value.queue) {
 				item.isRead = true;
@@ -76,15 +111,23 @@ onMounted(() => {
 			}
 		}
 	});
-	connection.on('readNotifications', notificationIds => {
+	connection.on("readNotifications", (notificationIds) => {
 		if (pagingComponent.value) {
 			for (let i = 0; i < pagingComponent.value.queue.length; i++) {
-				if (notificationIds.includes(pagingComponent.value.queue[i].id)) {
+				if (
+					notificationIds.includes(pagingComponent.value.queue[i].id)
+				) {
 					pagingComponent.value.queue[i].isRead = true;
 				}
 			}
-			for (let i = 0; i < (pagingComponent.value.items || []).length; i++) {
-				if (notificationIds.includes(pagingComponent.value.items[i].id)) {
+			for (
+				let i = 0;
+				i < (pagingComponent.value.items || []).length;
+				i++
+			) {
+				if (
+					notificationIds.includes(pagingComponent.value.items[i].id)
+				) {
 					pagingComponent.value.items[i].isRead = true;
 				}
 			}
diff --git a/packages/client/src/components/MkNumber.vue b/packages/client/src/components/MkNumber.vue
index f24b36237..5fa0f765f 100644
--- a/packages/client/src/components/MkNumber.vue
+++ b/packages/client/src/components/MkNumber.vue
@@ -1,11 +1,11 @@
 <template>
-<span>{{ number(Math.floor(tweened.number)) }}</span>
+	<span>{{ number(Math.floor(tweened.number)) }}</span>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, watch } from 'vue';
-import gsap from 'gsap';
-import number from '@/filters/number';
+import { ref, reactive, watch } from "vue";
+import gsap from "gsap";
+import number from "@/filters/number";
 
 const props = defineProps<{
 	value: number;
@@ -15,9 +15,13 @@ const tweened = reactive({
 	number: 0,
 });
 
-watch(() => props.value, (n) => {
-	gsap.to(tweened, { duration: 0.6, number: Number(n) || 0 });
-}, {
-	immediate: true,
-});
+watch(
+	() => props.value,
+	(n) => {
+		gsap.to(tweened, { duration: 0.6, number: Number(n) || 0 });
+	},
+	{
+		immediate: true,
+	}
+);
 </script>
diff --git a/packages/client/src/components/MkNumberDiff.vue b/packages/client/src/components/MkNumberDiff.vue
index e7d4a5472..11b0ad374 100644
--- a/packages/client/src/components/MkNumberDiff.vue
+++ b/packages/client/src/components/MkNumberDiff.vue
@@ -1,12 +1,13 @@
 <template>
-<span class="ceaaebcd" :class="{ isPlus, isMinus, isZero }">
-	<slot name="before"></slot>{{ isPlus ? '+' : '' }}{{ number(value) }}<slot name="after"></slot>
-</span>
+	<span class="ceaaebcd" :class="{ isPlus, isMinus, isZero }">
+		<slot name="before"></slot>{{ isPlus ? "+" : "" }}{{ number(value)
+		}}<slot name="after"></slot>
+	</span>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from 'vue';
-import number from '@/filters/number';
+import { computed, defineComponent } from "vue";
+import number from "@/filters/number";
 
 export default defineComponent({
 	props: {
diff --git a/packages/client/src/components/MkObjectView.value.vue b/packages/client/src/components/MkObjectView.value.vue
index 0c7230d78..8b024229e 100644
--- a/packages/client/src/components/MkObjectView.value.vue
+++ b/packages/client/src/components/MkObjectView.value.vue
@@ -1,39 +1,66 @@
 <template>
-<div class="igpposuu _monospace">
-	<div v-if="value === null" class="null">null</div>
-	<div v-else-if="typeof value === 'boolean'" class="boolean" :class="{ true: value, false: !value }">{{ value ? 'true' : 'false' }}</div>
-	<div v-else-if="typeof value === 'string'" class="string">"{{ value }}"</div>
-	<div v-else-if="typeof value === 'number'" class="number">{{ number(value) }}</div>
-	<div v-else-if="isArray(value) && isEmpty(value)" class="array empty">[]</div>
-	<div v-else-if="isArray(value)" class="array">
-		<div v-for="i in value.length" class="element">
-			{{ i }}: <XValue :value="value[i - 1]" collapsed/>
+	<div class="igpposuu _monospace">
+		<div v-if="value === null" class="null">null</div>
+		<div
+			v-else-if="typeof value === 'boolean'"
+			class="boolean"
+			:class="{ true: value, false: !value }"
+		>
+			{{ value ? "true" : "false" }}
 		</div>
-	</div>
-	<div v-else-if="isObject(value) && isEmpty(value)" class="object empty">{}</div>
-	<div v-else-if="isObject(value)" class="object">
-		<div v-for="k in Object.keys(value)" class="kv">
-			<button class="toggle _button" :class="{ visible: collapsable(value[k]) }" @click="collapsed[k] = !collapsed[k]">{{ collapsed[k] ? '+' : '-' }}</button>
-			<div class="k">{{ k }}:</div>
-			<div v-if="collapsed[k]" class="v">
-				<button class="_button" @click="collapsed[k] = !collapsed[k]">
-					<template v-if="typeof value[k] === 'string'">"..."</template>
-					<template v-else-if="isArray(value[k])">[...]</template>
-					<template v-else-if="isObject(value[k])">{...}</template>
-				</button>
+		<div v-else-if="typeof value === 'string'" class="string">
+			"{{ value }}"
+		</div>
+		<div v-else-if="typeof value === 'number'" class="number">
+			{{ number(value) }}
+		</div>
+		<div v-else-if="isArray(value) && isEmpty(value)" class="array empty">
+			[]
+		</div>
+		<div v-else-if="isArray(value)" class="array">
+			<div v-for="i in value.length" class="element">
+				{{ i }}: <XValue :value="value[i - 1]" collapsed />
+			</div>
+		</div>
+		<div v-else-if="isObject(value) && isEmpty(value)" class="object empty">
+			{}
+		</div>
+		<div v-else-if="isObject(value)" class="object">
+			<div v-for="k in Object.keys(value)" class="kv">
+				<button
+					class="toggle _button"
+					:class="{ visible: collapsable(value[k]) }"
+					@click="collapsed[k] = !collapsed[k]"
+				>
+					{{ collapsed[k] ? "+" : "-" }}
+				</button>
+				<div class="k">{{ k }}:</div>
+				<div v-if="collapsed[k]" class="v">
+					<button
+						class="_button"
+						@click="collapsed[k] = !collapsed[k]"
+					>
+						<template v-if="typeof value[k] === 'string'"
+							>"..."</template
+						>
+						<template v-else-if="isArray(value[k])">[...]</template>
+						<template v-else-if="isObject(value[k])"
+							>{...}</template
+						>
+					</button>
+				</div>
+				<div v-else class="v"><XValue :value="value[k]" /></div>
 			</div>
-			<div v-else class="v"><XValue :value="value[k]"/></div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, reactive, ref } from 'vue';
-import number from '@/filters/number';
+import { computed, defineComponent, reactive, ref } from "vue";
+import number from "@/filters/number";
 
 export default defineComponent({
-	name: 'XValue',
+	name: "XValue",
 
 	props: {
 		value: {
@@ -51,7 +78,7 @@ export default defineComponent({
 		}
 
 		function isObject(v): boolean {
-			return typeof v === 'object' && !Array.isArray(v) && v !== null;
+			return typeof v === "object" && !Array.isArray(v) && v !== null;
 		}
 
 		function isArray(v): boolean {
@@ -59,7 +86,10 @@ export default defineComponent({
 		}
 
 		function isEmpty(v): boolean {
-			return (isArray(v) && v.length === 0) || (isObject(v) && Object.keys(v).length === 0);
+			return (
+				(isArray(v) && v.length === 0) ||
+				(isObject(v) && Object.keys(v).length === 0)
+			);
 		}
 
 		function collapsable(v): boolean {
diff --git a/packages/client/src/components/MkObjectView.vue b/packages/client/src/components/MkObjectView.vue
index 55578a37f..b3fce680b 100644
--- a/packages/client/src/components/MkObjectView.vue
+++ b/packages/client/src/components/MkObjectView.vue
@@ -1,12 +1,12 @@
 <template>
-<div class="zhyxdalp">
-	<XValue :value="value" :collapsed="false"/>
-</div>
+	<div class="zhyxdalp">
+		<XValue :value="value" :collapsed="false" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XValue from './MkObjectView.value.vue';
+import {} from "vue";
+import XValue from "./MkObjectView.value.vue";
 
 const props = defineProps<{
 	value: Record<string, unknown>;
@@ -15,6 +15,5 @@ const props = defineProps<{
 
 <style lang="scss" scoped>
 .zhyxdalp {
-
 }
 </style>
diff --git a/packages/client/src/components/MkPagePreview.vue b/packages/client/src/components/MkPagePreview.vue
index ab7062d3e..034c6fed6 100644
--- a/packages/client/src/components/MkPagePreview.vue
+++ b/packages/client/src/components/MkPagePreview.vue
@@ -1,22 +1,41 @@
 <template>
-<MkA :to="`/@${page.user.username}/pages/${page.name}`" class="vhpxefrj _block" tabindex="-1" :behavior="`${ui === 'deck' ? 'window' : null}`">
-	<div v-if="page.eyeCatchingImage" class="thumbnail" :style="`background-image: url('${page.eyeCatchingImage.thumbnailUrl}')`"></div>
-	<article>
-		<header>
-			<h1 :title="page.title">{{ page.title }}</h1>
-		</header>
-		<p v-if="page.summary" :title="page.summary">{{ page.summary.length > 85 ? page.summary.slice(0, 85) + '…' : page.summary }}</p>
-		<footer>
-			<img class="icon" :src="page.user.avatarUrl" aria-label="none"/>
-			<p>{{ userName(page.user) }}</p>
-		</footer>
-	</article>
-</MkA>
+	<MkA
+		:to="`/@${page.user.username}/pages/${page.name}`"
+		class="vhpxefrj _block"
+		tabindex="-1"
+		:behavior="`${ui === 'deck' ? 'window' : null}`"
+	>
+		<div
+			v-if="page.eyeCatchingImage"
+			class="thumbnail"
+			:style="`background-image: url('${page.eyeCatchingImage.thumbnailUrl}')`"
+		></div>
+		<article>
+			<header>
+				<h1 :title="page.title">{{ page.title }}</h1>
+			</header>
+			<p v-if="page.summary" :title="page.summary">
+				{{
+					page.summary.length > 85
+						? page.summary.slice(0, 85) + "…"
+						: page.summary
+				}}
+			</p>
+			<footer>
+				<img
+					class="icon"
+					:src="page.user.avatarUrl"
+					aria-label="none"
+				/>
+				<p>{{ userName(page.user) }}</p>
+			</footer>
+		</article>
+	</MkA>
 </template>
 
 <script lang="ts" setup>
-import { userName } from '@/filters/user';
-import { ui } from '@/config';
+import { userName } from "@/filters/user";
+import { ui } from "@/config";
 
 defineProps<{
 	page: any;
@@ -149,5 +168,4 @@ defineProps<{
 		}
 	}
 }
-
 </style>
diff --git a/packages/client/src/components/MkPageWindow.vue b/packages/client/src/components/MkPageWindow.vue
index 497b27c6b..bb5066b7e 100644
--- a/packages/client/src/components/MkPageWindow.vue
+++ b/packages/client/src/components/MkPageWindow.vue
@@ -1,63 +1,74 @@
 <template>
-<XWindow
-	ref="windowEl"
-	:initial-width="500"
-	:initial-height="500"
-	:can-resize="true"
-	:close-button="true"
-	:buttons-left="buttonsLeft"
-	:buttons-right="buttonsRight"
-	:contextmenu="contextmenu"
-	@closed="$emit('closed')"
->
-	<template #header>
-		<template v-if="pageMetadata?.value">
-			<i v-if="pageMetadata.value.icon" class="icon" :class="pageMetadata.value.icon" style="margin-right: 0.5em;"></i>
-			<span>{{ pageMetadata.value.title }}</span>
+	<XWindow
+		ref="windowEl"
+		:initial-width="500"
+		:initial-height="500"
+		:can-resize="true"
+		:close-button="true"
+		:buttons-left="buttonsLeft"
+		:buttons-right="buttonsRight"
+		:contextmenu="contextmenu"
+		@closed="$emit('closed')"
+	>
+		<template #header>
+			<template v-if="pageMetadata?.value">
+				<i
+					v-if="pageMetadata.value.icon"
+					class="icon"
+					:class="pageMetadata.value.icon"
+					style="margin-right: 0.5em"
+				></i>
+				<span>{{ pageMetadata.value.title }}</span>
+			</template>
 		</template>
-	</template>
 
-	<div class="yrolvcoq" :style="{ background: pageMetadata?.value?.bg }">
-		<RouterView :router="router"/>
-	</div>
-</XWindow>
+		<div class="yrolvcoq" :style="{ background: pageMetadata?.value?.bg }">
+			<RouterView :router="router" />
+		</div>
+	</XWindow>
 </template>
 
 <script lang="ts" setup>
-import { ComputedRef, inject, provide } from 'vue';
-import RouterView from '@/components/global/RouterView.vue';
-import XWindow from '@/components/MkWindow.vue';
-import { popout as _popout } from '@/scripts/popout';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
-import { url } from '@/config';
-import * as os from '@/os';
-import { mainRouter, routes } from '@/router';
-import { Router } from '@/nirax';
-import { i18n } from '@/i18n';
-import { PageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
+import { ComputedRef, inject, provide } from "vue";
+import RouterView from "@/components/global/RouterView.vue";
+import XWindow from "@/components/MkWindow.vue";
+import { popout as _popout } from "@/scripts/popout";
+import copyToClipboard from "@/scripts/copy-to-clipboard";
+import { url } from "@/config";
+import * as os from "@/os";
+import { mainRouter, routes } from "@/router";
+import { Router } from "@/nirax";
+import { i18n } from "@/i18n";
+import {
+	PageMetadata,
+	provideMetadataReceiver,
+	setPageMetadata,
+} from "@/scripts/page-metadata";
 
 const props = defineProps<{
 	initialPath: string;
 }>();
 
 defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
 const router = new Router(routes, props.initialPath);
 
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 let windowEl = $ref<InstanceType<typeof XWindow>>();
-const history = $ref<{ path: string; key: any; }[]>([{
-	path: router.getCurrentPath(),
-	key: router.getCurrentKey(),
-}]);
+const history = $ref<{ path: string; key: any }[]>([
+	{
+		path: router.getCurrentPath(),
+		key: router.getCurrentKey(),
+	},
+]);
 const buttonsLeft = $computed(() => {
 	const buttons = [];
 
 	if (history.length > 1) {
 		buttons.push({
-			icon: 'ph-caret-left ph-bold ph-lg',
+			icon: "ph-caret-left ph-bold ph-lg",
 			onClick: back,
 		});
 	}
@@ -65,48 +76,55 @@ const buttonsLeft = $computed(() => {
 	return buttons;
 });
 const buttonsRight = $computed(() => {
-	const buttons = [{
-		icon: 'ph-arrows-out-simple ph-bold ph-lg',
-		title: i18n.ts.showInPage,
-		onClick: expand,
-	}];
+	const buttons = [
+		{
+			icon: "ph-arrows-out-simple ph-bold ph-lg",
+			title: i18n.ts.showInPage,
+			onClick: expand,
+		},
+	];
 
 	return buttons;
 });
 
-router.addListener('push', ctx => {
+router.addListener("push", (ctx) => {
 	history.push({ path: ctx.path, key: ctx.key });
 });
 
-provide('router', router);
+provide("router", router);
 provideMetadataReceiver((info) => {
 	pageMetadata = info;
 });
-provide('shouldOmitHeaderTitle', true);
-provide('shouldHeaderThin', true);
+provide("shouldOmitHeaderTitle", true);
+provide("shouldHeaderThin", true);
 
-const contextmenu = $computed(() => ([{
-	icon: 'ph-arrows-out-simple ph-bold ph-lg',
-	text: i18n.ts.showInPage,
-	action: expand,
-}, {
-	icon: 'ph-arrow-square-out ph-bold ph-lg',
-	text: i18n.ts.popout,
-	action: popout,
-}, {
-	icon: 'ph-arrow-square-out ph-bold ph-lg',
-	text: i18n.ts.openInNewTab,
-	action: () => {
-		window.open(url + router.getCurrentPath(), '_blank');
-		windowEl.close();
+const contextmenu = $computed(() => [
+	{
+		icon: "ph-arrows-out-simple ph-bold ph-lg",
+		text: i18n.ts.showInPage,
+		action: expand,
 	},
-}, {
-	icon: 'ph-link-simple ph-bold ph-lg',
-	text: i18n.ts.copyLink,
-	action: () => {
-		copyToClipboard(url + router.getCurrentPath());
+	{
+		icon: "ph-arrow-square-out ph-bold ph-lg",
+		text: i18n.ts.popout,
+		action: popout,
 	},
-}]));
+	{
+		icon: "ph-arrow-square-out ph-bold ph-lg",
+		text: i18n.ts.openInNewTab,
+		action: () => {
+			window.open(url + router.getCurrentPath(), "_blank");
+			windowEl.close();
+		},
+	},
+	{
+		icon: "ph-link-simple ph-bold ph-lg",
+		text: i18n.ts.copyLink,
+		action: () => {
+			copyToClipboard(url + router.getCurrentPath());
+		},
+	},
+]);
 
 function menu(ev) {
 	os.popupMenu(contextmenu, ev.currentTarget ?? ev.target);
@@ -114,7 +132,10 @@ function menu(ev) {
 
 function back() {
 	history.pop();
-	router.replace(history[history.length - 1].path, history[history.length - 1].key);
+	router.replace(
+		history[history.length - 1].path,
+		history[history.length - 1].key
+	);
 }
 
 function close() {
@@ -122,7 +143,7 @@ function close() {
 }
 
 function expand() {
-	mainRouter.push(router.getCurrentPath(), 'forcePage');
+	mainRouter.push(router.getCurrentPath(), "forcePage");
 	windowEl.close();
 }
 
diff --git a/packages/client/src/components/MkPagination.vue b/packages/client/src/components/MkPagination.vue
index 5b71598c0..24018e526 100644
--- a/packages/client/src/components/MkPagination.vue
+++ b/packages/client/src/components/MkPagination.vue
@@ -1,357 +1,490 @@
 <template>
 	<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
-		<MkLoading v-if="fetching"/>
+		<MkLoading v-if="fetching" />
 
-		<MkError v-else-if="error" @retry="init()"/>
+		<MkError v-else-if="error" @retry="init()" />
 
 		<div v-else-if="empty" key="_empty_" class="empty">
 			<slot name="empty">
 				<div class="_fullinfo">
-					<img src="/static-assets/badges/info.png" class="_ghost" alt="Error"/>
+					<img
+						src="/static-assets/badges/info.png"
+						class="_ghost"
+						alt="Error"
+					/>
 					<div>{{ i18n.ts.nothing }}</div>
 				</div>
 			</slot>
 		</div>
 
 		<div v-else ref="rootEl">
-			<div v-show="pagination.reversed && more" key="_more_" class="cxiknjgy _gap">
-				<MkButton v-if="!moreFetching" class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMoreAhead">
+			<div
+				v-show="pagination.reversed && more"
+				key="_more_"
+				class="cxiknjgy _gap"
+			>
+				<MkButton
+					v-if="!moreFetching"
+					class="button"
+					:disabled="moreFetching"
+					:style="{ cursor: moreFetching ? 'wait' : 'pointer' }"
+					primary
+					@click="fetchMoreAhead"
+				>
 					{{ i18n.ts.loadMore }}
 				</MkButton>
-				<MkLoading v-else class="loading"/>
+				<MkLoading v-else class="loading" />
 			</div>
 			<slot :items="items"></slot>
-			<div v-show="!pagination.reversed && more" key="_more_" class="cxiknjgy _gap">
-				<MkButton v-if="!moreFetching" v-appear="($store.state.enableInfiniteScroll && !disableAutoLoad) ? fetchMore : null" class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMore">
+			<div
+				v-show="!pagination.reversed && more"
+				key="_more_"
+				class="cxiknjgy _gap"
+			>
+				<MkButton
+					v-if="!moreFetching"
+					v-appear="
+						$store.state.enableInfiniteScroll && !disableAutoLoad
+							? fetchMore
+							: null
+					"
+					class="button"
+					:disabled="moreFetching"
+					:style="{ cursor: moreFetching ? 'wait' : 'pointer' }"
+					primary
+					@click="fetchMore"
+				>
 					{{ i18n.ts.loadMore }}
 				</MkButton>
-				<MkLoading v-else class="loading"/>
+				<MkLoading v-else class="loading" />
 			</div>
 		</div>
 	</transition>
-	</template>
+</template>
 
-	<script lang="ts" setup>
-	import { computed, ComputedRef, isRef, markRaw, onActivated, onDeactivated, Ref, ref, watch } from 'vue';
-	import * as misskey from 'calckey-js';
-	import * as os from '@/os';
-	import { onScrollTop, isTopVisible, getScrollPosition, getScrollContainer } from '@/scripts/scroll';
-	import MkButton from '@/components/MkButton.vue';
-	import { i18n } from '@/i18n';
+<script lang="ts" setup>
+import {
+	computed,
+	ComputedRef,
+	isRef,
+	markRaw,
+	onActivated,
+	onDeactivated,
+	Ref,
+	ref,
+	watch,
+} from "vue";
+import * as misskey from "calckey-js";
+import * as os from "@/os";
+import {
+	onScrollTop,
+	isTopVisible,
+	getScrollPosition,
+	getScrollContainer,
+} from "@/scripts/scroll";
+import MkButton from "@/components/MkButton.vue";
+import { i18n } from "@/i18n";
 
-	export type Paging<E extends keyof misskey.Endpoints = keyof misskey.Endpoints> = {
-		endpoint: E;
-		limit: number;
-		params?: misskey.Endpoints[E]['req'] | ComputedRef<misskey.Endpoints[E]['req']>;
+export type Paging<
+	E extends keyof misskey.Endpoints = keyof misskey.Endpoints
+> = {
+	endpoint: E;
+	limit: number;
+	params?:
+		| misskey.Endpoints[E]["req"]
+		| ComputedRef<misskey.Endpoints[E]["req"]>;
 
-		/**
-		 * 検索APIのような、ページング不可なエンドポイントを利用する場合
-		 * (そのようなAPIをこの関数で使うのは若干矛盾してるけど)
-		 */
-		noPaging?: boolean;
+	/**
+	 * 検索APIのような、ページング不可なエンドポイントを利用する場合
+	 * (そのようなAPIをこの関数で使うのは若干矛盾してるけど)
+	 */
+	noPaging?: boolean;
 
-		/**
-		 * items 配列の中身を逆順にする(新しい方が最後)
-		 */
-		reversed?: boolean;
+	/**
+	 * items 配列の中身を逆順にする(新しい方が最後)
+	 */
+	reversed?: boolean;
 
-		offsetMode?: boolean;
-	};
+	offsetMode?: boolean;
+};
 
-	const SECOND_FETCH_LIMIT = 30;
+const SECOND_FETCH_LIMIT = 30;
 
-	const props = withDefaults(defineProps<{
+const props = withDefaults(
+	defineProps<{
 		pagination: Paging;
 		disableAutoLoad?: boolean;
 		displayLimit?: number;
-	}>(), {
+	}>(),
+	{
 		displayLimit: 30,
-	});
+	}
+);
 
-	const emit = defineEmits<{
-		(ev: 'queue', count: number): void;
-	}>();
+const emit = defineEmits<{
+	(ev: "queue", count: number): void;
+}>();
 
-	type Item = { id: string; [another: string]: unknown; };
+type Item = { id: string; [another: string]: unknown };
 
-	const rootEl = ref<HTMLElement>();
-	const items = ref<Item[]>([]);
-	const queue = ref<Item[]>([]);
-	const offset = ref(0);
-	const fetching = ref(true);
-	const moreFetching = ref(false);
-	const more = ref(false);
-	const backed = ref(false); // 遡り中か否か
-	const isBackTop = ref(false);
-	const empty = computed(() => items.value.length === 0);
-	const error = ref(false);
+const rootEl = ref<HTMLElement>();
+const items = ref<Item[]>([]);
+const queue = ref<Item[]>([]);
+const offset = ref(0);
+const fetching = ref(true);
+const moreFetching = ref(false);
+const more = ref(false);
+const backed = ref(false); // 遡り中か否か
+const isBackTop = ref(false);
+const empty = computed(() => items.value.length === 0);
+const error = ref(false);
 
-	const init = async (): Promise<void> => {
-		queue.value = [];
-		fetching.value = true;
-		const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
-		await os.api(props.pagination.endpoint, {
+const init = async (): Promise<void> => {
+	queue.value = [];
+	fetching.value = true;
+	const params = props.pagination.params
+		? isRef(props.pagination.params)
+			? props.pagination.params.value
+			: props.pagination.params
+		: {};
+	await os
+		.api(props.pagination.endpoint, {
 			...params,
-			limit: props.pagination.noPaging ? (props.pagination.limit || 10) : (props.pagination.limit || 10) + 1,
-		}).then(res => {
-			for (let i = 0; i < res.length; i++) {
-				const item = res[i];
-				if (props.pagination.reversed) {
-					if (i === res.length - 2) item._shouldInsertAd_ = true;
-				} else {
-					if (i === 3) item._shouldInsertAd_ = true;
+			limit: props.pagination.noPaging
+				? props.pagination.limit || 10
+				: (props.pagination.limit || 10) + 1,
+		})
+		.then(
+			(res) => {
+				for (let i = 0; i < res.length; i++) {
+					const item = res[i];
+					if (props.pagination.reversed) {
+						if (i === res.length - 2) item._shouldInsertAd_ = true;
+					} else {
+						if (i === 3) item._shouldInsertAd_ = true;
+					}
 				}
+				if (
+					!props.pagination.noPaging &&
+					res.length > (props.pagination.limit || 10)
+				) {
+					res.pop();
+					items.value = props.pagination.reversed
+						? [...res].reverse()
+						: res;
+					more.value = true;
+				} else {
+					items.value = props.pagination.reversed
+						? [...res].reverse()
+						: res;
+					more.value = false;
+				}
+				offset.value = res.length;
+				error.value = false;
+				fetching.value = false;
+			},
+			(err) => {
+				error.value = true;
+				fetching.value = false;
 			}
-			if (!props.pagination.noPaging && (res.length > (props.pagination.limit || 10))) {
-				res.pop();
-				items.value = props.pagination.reversed ? [...res].reverse() : res;
-				more.value = true;
-			} else {
-				items.value = props.pagination.reversed ? [...res].reverse() : res;
-				more.value = false;
-			}
-			offset.value = res.length;
-			error.value = false;
-			fetching.value = false;
-		}, err => {
-			error.value = true;
-			fetching.value = false;
-		});
-	};
+		);
+};
 
-	const reload = (): void => {
-		items.value = [];
-		init();
-	};
+const reload = (): void => {
+	items.value = [];
+	init();
+};
 
-	const refresh = async (): void => {
-		const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
-		await os.api(props.pagination.endpoint, {
+const refresh = async (): void => {
+	const params = props.pagination.params
+		? isRef(props.pagination.params)
+			? props.pagination.params.value
+			: props.pagination.params
+		: {};
+	await os
+		.api(props.pagination.endpoint, {
 			...params,
 			limit: items.value.length + 1,
 			offset: 0,
-		}).then(res => {
-			let ids = items.value.reduce((a, b) => {
-				a[b.id] = true;
-				return a;
-			}, {} as { [id: string]: boolean; });
+		})
+		.then(
+			(res) => {
+				let ids = items.value.reduce((a, b) => {
+					a[b.id] = true;
+					return a;
+				}, {} as { [id: string]: boolean });
 
-			for (let i = 0; i < res.length; i++) {
-				const item = res[i];
-				if (!updateItem(item.id, old => item)) {
-					append(item);
+				for (let i = 0; i < res.length; i++) {
+					const item = res[i];
+					if (!updateItem(item.id, (old) => item)) {
+						append(item);
+					}
+					delete ids[item.id];
 				}
-				delete ids[item.id];
-			}
 
-			for (const id in ids) {
-				removeItem(i => i.id === id);
+				for (const id in ids) {
+					removeItem((i) => i.id === id);
+				}
+			},
+			(err) => {
+				error.value = true;
+				fetching.value = false;
 			}
-		}, err => {
-			error.value = true;
-			fetching.value = false;
-		});
-	};
+		);
+};
 
-	const fetchMore = async (): Promise<void> => {
-		if (!more.value || fetching.value || moreFetching.value || items.value.length === 0) return;
-		moreFetching.value = true;
-		backed.value = true;
-		const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
-		await os.api(props.pagination.endpoint, {
+const fetchMore = async (): Promise<void> => {
+	if (
+		!more.value ||
+		fetching.value ||
+		moreFetching.value ||
+		items.value.length === 0
+	)
+		return;
+	moreFetching.value = true;
+	backed.value = true;
+	const params = props.pagination.params
+		? isRef(props.pagination.params)
+			? props.pagination.params.value
+			: props.pagination.params
+		: {};
+	await os
+		.api(props.pagination.endpoint, {
 			...params,
 			limit: SECOND_FETCH_LIMIT + 1,
-			...(props.pagination.offsetMode ? {
-				offset: offset.value,
-			} : props.pagination.reversed ? {
-				sinceId: items.value[0].id,
-			} : {
-				untilId: items.value[items.value.length - 1].id,
-			}),
-		}).then(res => {
-			for (let i = 0; i < res.length; i++) {
-				const item = res[i];
-				if (props.pagination.reversed) {
-					if (i === res.length - 9) item._shouldInsertAd_ = true;
-				} else {
-					if (i === 10) item._shouldInsertAd_ = true;
-				}
-			}
-			if (res.length > SECOND_FETCH_LIMIT) {
-				res.pop();
-				items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
-				more.value = true;
-			} else {
-				items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
-				more.value = false;
-			}
-			offset.value += res.length;
-			moreFetching.value = false;
-		}, err => {
-			moreFetching.value = false;
-		});
-	};
-
-	const fetchMoreAhead = async (): Promise<void> => {
-		if (!more.value || fetching.value || moreFetching.value || items.value.length === 0) return;
-		moreFetching.value = true;
-		const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
-		await os.api(props.pagination.endpoint, {
-			...params,
-			limit: SECOND_FETCH_LIMIT + 1,
-			...(props.pagination.offsetMode ? {
-				offset: offset.value,
-			} : props.pagination.reversed ? {
-				untilId: items.value[0].id,
-			} : {
-				sinceId: items.value[items.value.length - 1].id,
-			}),
-		}).then(res => {
-			if (res.length > SECOND_FETCH_LIMIT) {
-				res.pop();
-				items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
-				more.value = true;
-			} else {
-				items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
-				more.value = false;
-			}
-			offset.value += res.length;
-			moreFetching.value = false;
-		}, err => {
-			moreFetching.value = false;
-		});
-	};
-
-	const prepend = (item: Item): void => {
-		if (props.pagination.reversed) {
-			if (rootEl.value) {
-				const container = getScrollContainer(rootEl.value);
-				if (container == null) {
-					// TODO?
-				} else {
-					const pos = getScrollPosition(rootEl.value);
-					const viewHeight = container.clientHeight;
-					const height = container.scrollHeight;
-					const isBottom = (pos + viewHeight > height - 32);
-					if (isBottom) {
-						// オーバーフローしたら古いアイテムは捨てる
-						if (items.value.length >= props.displayLimit) {
-							// このやり方だとVue 3.2以降アニメーションが動かなくなる
-							//items.value = items.value.slice(-props.displayLimit);
-							while (items.value.length >= props.displayLimit) {
-								items.value.shift();
-							}
-							more.value = true;
-						}
+			...(props.pagination.offsetMode
+				? {
+						offset: offset.value,
+				  }
+				: props.pagination.reversed
+				? {
+						sinceId: items.value[0].id,
+				  }
+				: {
+						untilId: items.value[items.value.length - 1].id,
+				  }),
+		})
+		.then(
+			(res) => {
+				for (let i = 0; i < res.length; i++) {
+					const item = res[i];
+					if (props.pagination.reversed) {
+						if (i === res.length - 9) item._shouldInsertAd_ = true;
+					} else {
+						if (i === 10) item._shouldInsertAd_ = true;
 					}
 				}
-			}
-			items.value.push(item);
-			// TODO
-		} else {
-			// 初回表示時はunshiftだけでOK
-			if (!rootEl.value) {
-				items.value.unshift(item);
-				return;
-			}
-
-			const isTop = isBackTop.value || (document.body.contains(rootEl.value) && isTopVisible(rootEl.value));
-
-			if (isTop) {
-				// Prepend the item
-				items.value.unshift(item);
-
-				// オーバーフローしたら古いアイテムは捨てる
-				if (items.value.length >= props.displayLimit) {
-					// このやり方だとVue 3.2以降アニメーションが動かなくなる
-					//this.items = items.value.slice(0, props.displayLimit);
-					while (items.value.length >= props.displayLimit) {
-						items.value.pop();
-					}
+				if (res.length > SECOND_FETCH_LIMIT) {
+					res.pop();
+					items.value = props.pagination.reversed
+						? [...res].reverse().concat(items.value)
+						: items.value.concat(res);
 					more.value = true;
+				} else {
+					items.value = props.pagination.reversed
+						? [...res].reverse().concat(items.value)
+						: items.value.concat(res);
+					more.value = false;
 				}
+				offset.value += res.length;
+				moreFetching.value = false;
+			},
+			(err) => {
+				moreFetching.value = false;
+			}
+		);
+};
+
+const fetchMoreAhead = async (): Promise<void> => {
+	if (
+		!more.value ||
+		fetching.value ||
+		moreFetching.value ||
+		items.value.length === 0
+	)
+		return;
+	moreFetching.value = true;
+	const params = props.pagination.params
+		? isRef(props.pagination.params)
+			? props.pagination.params.value
+			: props.pagination.params
+		: {};
+	await os
+		.api(props.pagination.endpoint, {
+			...params,
+			limit: SECOND_FETCH_LIMIT + 1,
+			...(props.pagination.offsetMode
+				? {
+						offset: offset.value,
+				  }
+				: props.pagination.reversed
+				? {
+						untilId: items.value[0].id,
+				  }
+				: {
+						sinceId: items.value[items.value.length - 1].id,
+				  }),
+		})
+		.then(
+			(res) => {
+				if (res.length > SECOND_FETCH_LIMIT) {
+					res.pop();
+					items.value = props.pagination.reversed
+						? [...res].reverse().concat(items.value)
+						: items.value.concat(res);
+					more.value = true;
+				} else {
+					items.value = props.pagination.reversed
+						? [...res].reverse().concat(items.value)
+						: items.value.concat(res);
+					more.value = false;
+				}
+				offset.value += res.length;
+				moreFetching.value = false;
+			},
+			(err) => {
+				moreFetching.value = false;
+			}
+		);
+};
+
+const prepend = (item: Item): void => {
+	if (props.pagination.reversed) {
+		if (rootEl.value) {
+			const container = getScrollContainer(rootEl.value);
+			if (container == null) {
+				// TODO?
 			} else {
-				queue.value.push(item);
-				onScrollTop(rootEl.value, () => {
-					for (const queueItem of queue.value) {
-						prepend(queueItem);
+				const pos = getScrollPosition(rootEl.value);
+				const viewHeight = container.clientHeight;
+				const height = container.scrollHeight;
+				const isBottom = pos + viewHeight > height - 32;
+				if (isBottom) {
+					// オーバーフローしたら古いアイテムは捨てる
+					if (items.value.length >= props.displayLimit) {
+						// このやり方だとVue 3.2以降アニメーションが動かなくなる
+						//items.value = items.value.slice(-props.displayLimit);
+						while (items.value.length >= props.displayLimit) {
+							items.value.shift();
+						}
+						more.value = true;
 					}
-					queue.value = [];
-				});
+				}
 			}
 		}
-	};
-
-	const append = (item: Item): void => {
 		items.value.push(item);
-	};
-
-	const removeItem = (finder: (item: Item) => boolean): boolean => {
-		const i = items.value.findIndex(finder);
-		if (i === -1) {
-			return false;
+		// TODO
+	} else {
+		// 初回表示時はunshiftだけでOK
+		if (!rootEl.value) {
+			items.value.unshift(item);
+			return;
 		}
 
-		items.value.splice(i, 1);
-		return true;
-	};
+		const isTop =
+			isBackTop.value ||
+			(document.body.contains(rootEl.value) &&
+				isTopVisible(rootEl.value));
 
-	const updateItem = (id: Item['id'], replacer: (old: Item) => Item): boolean => {
-		const i = items.value.findIndex(item => item.id === id);
-		if (i === -1) {
-			return false;
+		if (isTop) {
+			// Prepend the item
+			items.value.unshift(item);
+
+			// オーバーフローしたら古いアイテムは捨てる
+			if (items.value.length >= props.displayLimit) {
+				// このやり方だとVue 3.2以降アニメーションが動かなくなる
+				//this.items = items.value.slice(0, props.displayLimit);
+				while (items.value.length >= props.displayLimit) {
+					items.value.pop();
+				}
+				more.value = true;
+			}
+		} else {
+			queue.value.push(item);
+			onScrollTop(rootEl.value, () => {
+				for (const queueItem of queue.value) {
+					prepend(queueItem);
+				}
+				queue.value = [];
+			});
 		}
+	}
+};
 
-		items.value[i] = replacer(items.value[i]);
-		return true;
-	};
+const append = (item: Item): void => {
+	items.value.push(item);
+};
 
-	if (props.pagination.params && isRef(props.pagination.params)) {
-		watch(props.pagination.params, init, { deep: true });
+const removeItem = (finder: (item: Item) => boolean): boolean => {
+	const i = items.value.findIndex(finder);
+	if (i === -1) {
+		return false;
 	}
 
-	watch(queue, (a, b) => {
+	items.value.splice(i, 1);
+	return true;
+};
+
+const updateItem = (id: Item["id"], replacer: (old: Item) => Item): boolean => {
+	const i = items.value.findIndex((item) => item.id === id);
+	if (i === -1) {
+		return false;
+	}
+
+	items.value[i] = replacer(items.value[i]);
+	return true;
+};
+
+if (props.pagination.params && isRef(props.pagination.params)) {
+	watch(props.pagination.params, init, { deep: true });
+}
+
+watch(
+	queue,
+	(a, b) => {
 		if (a.length === 0 && b.length === 0) return;
-		emit('queue', queue.value.length);
-	}, { deep: true });
+		emit("queue", queue.value.length);
+	},
+	{ deep: true }
+);
 
-	init();
+init();
 
-	onActivated(() => {
-		isBackTop.value = false;
-	});
+onActivated(() => {
+	isBackTop.value = false;
+});
 
-	onDeactivated(() => {
-		isBackTop.value = window.scrollY === 0;
-	});
+onDeactivated(() => {
+	isBackTop.value = window.scrollY === 0;
+});
 
-	defineExpose({
-		items,
-		queue,
-		backed,
-		reload,
-		refresh,
-		prepend,
-		append,
-		removeItem,
-		updateItem,
-	});
-	</script>
+defineExpose({
+	items,
+	queue,
+	backed,
+	reload,
+	refresh,
+	prepend,
+	append,
+	removeItem,
+	updateItem,
+});
+</script>
 
-	<style lang="scss" scoped>
-	.fade-enter-active,
-	.fade-leave-active {
-		transition: opacity 0.125s ease;
+<style lang="scss" scoped>
+.fade-enter-active,
+.fade-leave-active {
+	transition: opacity 0.125s ease;
+}
+.fade-enter-from,
+.fade-leave-to {
+	opacity: 0;
+}
+
+.cxiknjgy {
+	> .button {
+		margin-left: auto;
+		margin-right: auto;
 	}
-	.fade-enter-from,
-	.fade-leave-to {
-		opacity: 0;
-	}
-
-	.cxiknjgy {
-		> .button {
-			margin-left: auto;
-			margin-right: auto;
-		}
-	}
-	</style>
+}
+</style>
diff --git a/packages/client/src/components/MkPoll.vue b/packages/client/src/components/MkPoll.vue
index 56d9400b5..db4c3350f 100644
--- a/packages/client/src/components/MkPoll.vue
+++ b/packages/client/src/components/MkPoll.vue
@@ -1,34 +1,62 @@
 <template>
-<div class="tivcixzd" :class="{ done: closed || isVoted }">
-	<ul>
-		<li v-for="(choice, i) in note.poll.choices" :key="i" :class="{ voted: choice.voted }" @click.stop="vote(i)">
-			<div class="backdrop" :style="{ 'width': `${showResult ? (choice.votes / total * 100) : 0}%` }"></div>
-			<span>
-				<template v-if="choice.isVoted"><i class="ph-check ph-bold ph-lg"></i></template>
-				<Mfm :text="choice.text" :plain="true" :custom-emojis="note.emojis"/>
-				<span v-if="showResult" class="votes">({{ i18n.t('_poll.votesCount', { n: choice.votes }) }})</span>
-			</span>
-		</li>
-	</ul>
-	<p v-if="!readOnly">
-		<span>{{ i18n.t('_poll.totalVotes', { n: total }) }}</span>
-		<span> · </span>
-		<a v-if="!closed && !isVoted" @click.stop="showResult = !showResult">{{ showResult ? i18n.ts._poll.vote : i18n.ts._poll.showResult }}</a>
-		<span v-if="isVoted">{{ i18n.ts._poll.voted }}</span>
-		<span v-else-if="closed">{{ i18n.ts._poll.closed }}</span>
-		<span v-if="remaining > 0"> · {{ timer }}</span>
-	</p>
-</div>
+	<div class="tivcixzd" :class="{ done: closed || isVoted }">
+		<ul>
+			<li
+				v-for="(choice, i) in note.poll.choices"
+				:key="i"
+				:class="{ voted: choice.voted }"
+				@click.stop="vote(i)"
+			>
+				<div
+					class="backdrop"
+					:style="{
+						width: `${
+							showResult ? (choice.votes / total) * 100 : 0
+						}%`,
+					}"
+				></div>
+				<span>
+					<template v-if="choice.isVoted"
+						><i class="ph-check ph-bold ph-lg"></i
+					></template>
+					<Mfm
+						:text="choice.text"
+						:plain="true"
+						:custom-emojis="note.emojis"
+					/>
+					<span v-if="showResult" class="votes"
+						>({{
+							i18n.t("_poll.votesCount", { n: choice.votes })
+						}})</span
+					>
+				</span>
+			</li>
+		</ul>
+		<p v-if="!readOnly">
+			<span>{{ i18n.t("_poll.totalVotes", { n: total }) }}</span>
+			<span> · </span>
+			<a
+				v-if="!closed && !isVoted"
+				@click.stop="showResult = !showResult"
+				>{{
+					showResult ? i18n.ts._poll.vote : i18n.ts._poll.showResult
+				}}</a
+			>
+			<span v-if="isVoted">{{ i18n.ts._poll.voted }}</span>
+			<span v-else-if="closed">{{ i18n.ts._poll.closed }}</span>
+			<span v-if="remaining > 0"> · {{ timer }}</span>
+		</p>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onUnmounted, ref, toRef } from 'vue';
-import * as misskey from 'calckey-js';
-import { sum } from '@/scripts/array';
-import { pleaseLogin } from '@/scripts/please-login';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { useInterval } from '@/scripts/use-interval';
+import { computed, onUnmounted, ref, toRef } from "vue";
+import * as misskey from "calckey-js";
+import { sum } from "@/scripts/array";
+import { pleaseLogin } from "@/scripts/please-login";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { useInterval } from "@/scripts/use-interval";
 
 const props = defineProps<{
 	note: misskey.entities.Note;
@@ -37,25 +65,42 @@ const props = defineProps<{
 
 const remaining = ref(-1);
 
-const total = computed(() => sum(props.note.poll.choices.map(x => x.votes)));
+const total = computed(() => sum(props.note.poll.choices.map((x) => x.votes)));
 const closed = computed(() => remaining.value === 0);
-const isVoted = computed(() => !props.note.poll.multiple && props.note.poll.choices.some(c => c.isVoted));
-const timer = computed(() => i18n.t(
-	remaining.value >= 86400 ? '_poll.remainingDays' :
-	remaining.value >= 3600 ? '_poll.remainingHours' :
-	remaining.value >= 60 ? '_poll.remainingMinutes' : '_poll.remainingSeconds', {
-		s: Math.floor(remaining.value % 60),
-		m: Math.floor(remaining.value / 60) % 60,
-		h: Math.floor(remaining.value / 3600) % 24,
-		d: Math.floor(remaining.value / 86400),
-	}));
+const isVoted = computed(
+	() =>
+		!props.note.poll.multiple &&
+		props.note.poll.choices.some((c) => c.isVoted)
+);
+const timer = computed(() =>
+	i18n.t(
+		remaining.value >= 86400
+			? "_poll.remainingDays"
+			: remaining.value >= 3600
+			? "_poll.remainingHours"
+			: remaining.value >= 60
+			? "_poll.remainingMinutes"
+			: "_poll.remainingSeconds",
+		{
+			s: Math.floor(remaining.value % 60),
+			m: Math.floor(remaining.value / 60) % 60,
+			h: Math.floor(remaining.value / 3600) % 24,
+			d: Math.floor(remaining.value / 86400),
+		}
+	)
+);
 
 const showResult = ref(props.readOnly || isVoted.value);
 
 // 期限付きアンケート
 if (props.note.poll.expiresAt) {
 	const tick = () => {
-		remaining.value = Math.floor(Math.max(new Date(props.note.poll.expiresAt).getTime() - Date.now(), 0) / 1000);
+		remaining.value = Math.floor(
+			Math.max(
+				new Date(props.note.poll.expiresAt).getTime() - Date.now(),
+				0
+			) / 1000
+		);
 		if (remaining.value === 0) {
 			showResult.value = true;
 		}
@@ -73,12 +118,14 @@ const vote = async (id) => {
 	if (props.readOnly || closed.value || isVoted.value) return;
 
 	const { canceled } = await os.confirm({
-		type: 'question',
-		text: i18n.t('voteConfirm', { choice: props.note.poll.choices[id].text }),
+		type: "question",
+		text: i18n.t("voteConfirm", {
+			choice: props.note.poll.choices[id].text,
+		}),
 	});
 	if (canceled) return;
 
-	await os.api('notes/polls/vote', {
+	await os.api("notes/polls/vote", {
 		noteId: props.note.id,
 		choice: id,
 	});
@@ -111,7 +158,11 @@ const vote = async (id) => {
 				left: 0;
 				height: 100%;
 				background: var(--accent);
-				background: linear-gradient(90deg,var(--buttonGradateA),var(--buttonGradateB));
+				background: linear-gradient(
+					90deg,
+					var(--buttonGradateA),
+					var(--buttonGradateB)
+				);
 				transition: width 1s ease;
 			}
 
diff --git a/packages/client/src/components/MkPollEditor.vue b/packages/client/src/components/MkPollEditor.vue
index b5f8ea594..95cc11302 100644
--- a/packages/client/src/components/MkPollEditor.vue
+++ b/packages/client/src/components/MkPollEditor.vue
@@ -1,61 +1,84 @@
 <template>
-<div class="zmdxowus">
-	<p v-if="choices.length < 2" class="caution">
-		<i class="ph-warning ph-bold ph-lg"></i>{{ i18n.ts._poll.noOnlyOneChoice }}
-	</p>
-	<ul>
-		<li v-for="(choice, i) in choices" :key="i">
-			<MkInput class="input" small :model-value="choice" :placeholder="i18n.t('_poll.choiceN', { n: i + 1 })" @update:modelValue="onInput(i, $event)">
-			</MkInput>
-			<button class="_button" @click="remove(i)">
-				<i class="ph-x ph-bold ph-lg"></i>
-			</button>
-		</li>
-	</ul>
-	<MkButton v-if="choices.length < 10" class="add" @click="add">{{ i18n.ts.add }}</MkButton>
-	<MkButton v-else class="add" disabled>{{ i18n.ts._poll.noMore }}</MkButton>
-	<MkSwitch v-model="multiple">{{ i18n.ts._poll.canMultipleVote }}</MkSwitch>
-	<section>
-		<div>
-			<MkSelect v-model="expiration" small>
-				<template #label>{{ i18n.ts._poll.expiration }}</template>
-				<option value="infinite">{{ i18n.ts._poll.infinite }}</option>
-				<option value="at">{{ i18n.ts._poll.at }}</option>
-				<option value="after">{{ i18n.ts._poll.after }}</option>
-			</MkSelect>
-			<section v-if="expiration === 'at'">
-				<MkInput v-model="atDate" small type="date" class="input">
-					<template #label>{{ i18n.ts._poll.deadlineDate }}</template>
+	<div class="zmdxowus">
+		<p v-if="choices.length < 2" class="caution">
+			<i class="ph-warning ph-bold ph-lg"></i
+			>{{ i18n.ts._poll.noOnlyOneChoice }}
+		</p>
+		<ul>
+			<li v-for="(choice, i) in choices" :key="i">
+				<MkInput
+					class="input"
+					small
+					:model-value="choice"
+					:placeholder="i18n.t('_poll.choiceN', { n: i + 1 })"
+					@update:modelValue="onInput(i, $event)"
+				>
 				</MkInput>
-				<MkInput v-model="atTime" small type="time" class="input">
-					<template #label>{{ i18n.ts._poll.deadlineTime }}</template>
-				</MkInput>
-			</section>
-			<section v-else-if="expiration === 'after'">
-				<MkInput v-model="after" small type="number" class="input">
-					<template #label>{{ i18n.ts._poll.duration }}</template>
-				</MkInput>
-				<MkSelect v-model="unit" small>
-					<option value="second">{{ i18n.ts._time.second }}</option>
-					<option value="minute">{{ i18n.ts._time.minute }}</option>
-					<option value="hour">{{ i18n.ts._time.hour }}</option>
-					<option value="day">{{ i18n.ts._time.day }}</option>
+				<button class="_button" @click="remove(i)">
+					<i class="ph-x ph-bold ph-lg"></i>
+				</button>
+			</li>
+		</ul>
+		<MkButton v-if="choices.length < 10" class="add" @click="add">{{
+			i18n.ts.add
+		}}</MkButton>
+		<MkButton v-else class="add" disabled>{{
+			i18n.ts._poll.noMore
+		}}</MkButton>
+		<MkSwitch v-model="multiple">{{
+			i18n.ts._poll.canMultipleVote
+		}}</MkSwitch>
+		<section>
+			<div>
+				<MkSelect v-model="expiration" small>
+					<template #label>{{ i18n.ts._poll.expiration }}</template>
+					<option value="infinite">
+						{{ i18n.ts._poll.infinite }}
+					</option>
+					<option value="at">{{ i18n.ts._poll.at }}</option>
+					<option value="after">{{ i18n.ts._poll.after }}</option>
 				</MkSelect>
-			</section>
-		</div>
-	</section>
-</div>
+				<section v-if="expiration === 'at'">
+					<MkInput v-model="atDate" small type="date" class="input">
+						<template #label>{{
+							i18n.ts._poll.deadlineDate
+						}}</template>
+					</MkInput>
+					<MkInput v-model="atTime" small type="time" class="input">
+						<template #label>{{
+							i18n.ts._poll.deadlineTime
+						}}</template>
+					</MkInput>
+				</section>
+				<section v-else-if="expiration === 'after'">
+					<MkInput v-model="after" small type="number" class="input">
+						<template #label>{{ i18n.ts._poll.duration }}</template>
+					</MkInput>
+					<MkSelect v-model="unit" small>
+						<option value="second">
+							{{ i18n.ts._time.second }}
+						</option>
+						<option value="minute">
+							{{ i18n.ts._time.minute }}
+						</option>
+						<option value="hour">{{ i18n.ts._time.hour }}</option>
+						<option value="day">{{ i18n.ts._time.day }}</option>
+					</MkSelect>
+				</section>
+			</div>
+		</section>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue';
-import MkInput from './form/input.vue';
-import MkSelect from './form/select.vue';
-import MkSwitch from './form/switch.vue';
-import MkButton from './MkButton.vue';
-import { formatDateTimeString } from '@/scripts/format-time-string';
-import { addTime } from '@/scripts/time';
-import { i18n } from '@/i18n';
+import { ref, watch } from "vue";
+import MkInput from "./form/input.vue";
+import MkSelect from "./form/select.vue";
+import MkSwitch from "./form/switch.vue";
+import MkButton from "./MkButton.vue";
+import { formatDateTimeString } from "@/scripts/format-time-string";
+import { addTime } from "@/scripts/time";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	modelValue: {
@@ -66,30 +89,35 @@ const props = defineProps<{
 	};
 }>();
 const emit = defineEmits<{
-	(ev: 'update:modelValue', v: {
-		expiresAt: string;
-		expiredAfter: number;
-		choices: string[];
-		multiple: boolean;
-	}): void;
+	(
+		ev: "update:modelValue",
+		v: {
+			expiresAt: string;
+			expiredAfter: number;
+			choices: string[];
+			multiple: boolean;
+		}
+	): void;
 }>();
 
 const choices = ref(props.modelValue.choices);
 const multiple = ref(props.modelValue.multiple);
-const expiration = ref('infinite');
-const atDate = ref(formatDateTimeString(addTime(new Date(), 1, 'day'), 'yyyy-MM-dd'));
-const atTime = ref('00:00');
+const expiration = ref("infinite");
+const atDate = ref(
+	formatDateTimeString(addTime(new Date(), 1, "day"), "yyyy-MM-dd")
+);
+const atTime = ref("00:00");
 const after = ref(0);
-const unit = ref('second');
+const unit = ref("second");
 
 if (props.modelValue.expiresAt) {
-	expiration.value = 'at';
+	expiration.value = "at";
 	atDate.value = atTime.value = props.modelValue.expiresAt;
-} else if (typeof props.modelValue.expiredAfter === 'number') {
-	expiration.value = 'after';
+} else if (typeof props.modelValue.expiredAfter === "number") {
+	expiration.value = "after";
 	after.value = props.modelValue.expiredAfter / 1000;
 } else {
-	expiration.value = 'infinite';
+	expiration.value = "infinite";
 }
 
 function onInput(i, value) {
@@ -97,7 +125,7 @@ function onInput(i, value) {
 }
 
 function add() {
-	choices.value.push('');
+	choices.value.push("");
 	// TODO
 	// nextTick(() => {
 	//   (this.$refs.choices as any).childNodes[this.choices.length - 1].childNodes[0].focus();
@@ -116,30 +144,40 @@ function get() {
 	const calcAfter = () => {
 		let base = parseInt(after.value);
 		switch (unit.value) {
-			case 'day': base *= 24;
-				// fallthrough
-			case 'hour': base *= 60;
-				// fallthrough
-			case 'minute': base *= 60;
-				// fallthrough
-			case 'second': return base *= 1000;
-			default: return null;
+			case "day":
+				base *= 24;
+			// fallthrough
+			case "hour":
+				base *= 60;
+			// fallthrough
+			case "minute":
+				base *= 60;
+			// fallthrough
+			case "second":
+				return (base *= 1000);
+			default:
+				return null;
 		}
 	};
 
 	return {
 		choices: choices.value,
 		multiple: multiple.value,
-		...(
-			expiration.value === 'at' ? { expiresAt: calcAt() } :
-			expiration.value === 'after' ? { expiredAfter: calcAfter() } : {}
-		),
+		...(expiration.value === "at"
+			? { expiresAt: calcAt() }
+			: expiration.value === "after"
+			? { expiredAfter: calcAfter() }
+			: {}),
 	};
 }
 
-watch([choices, multiple, expiration, atDate, atTime, after, unit], () => emit('update:modelValue', get()), {
-	deep: true,
-});
+watch(
+	[choices, multiple, expiration, atDate, atTime, after, unit],
+	() => emit("update:modelValue", get()),
+	{
+		deep: true,
+	}
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/MkPopupMenu.vue b/packages/client/src/components/MkPopupMenu.vue
index f04c7f561..4d52616e1 100644
--- a/packages/client/src/components/MkPopupMenu.vue
+++ b/packages/client/src/components/MkPopupMenu.vue
@@ -1,25 +1,42 @@
 <template>
-<MkModal ref="modal" v-slot="{ type, maxHeight }" :z-priority="'high'" :src="src" :transparent-bg="true" @click="modal.close()" @closed="emit('closed')">
-	<MkMenu :items="items" :align="align" :width="width" :max-height="maxHeight" :as-drawer="type === 'drawer'" class="sfhdhdhq" :class="{ drawer: type === 'drawer' }" @close="modal.close()"/>
-</MkModal>
+	<MkModal
+		ref="modal"
+		v-slot="{ type, maxHeight }"
+		:z-priority="'high'"
+		:src="src"
+		:transparent-bg="true"
+		@click="modal.close()"
+		@closed="emit('closed')"
+	>
+		<MkMenu
+			:items="items"
+			:align="align"
+			:width="width"
+			:max-height="maxHeight"
+			:as-drawer="type === 'drawer'"
+			class="sfhdhdhq"
+			:class="{ drawer: type === 'drawer' }"
+			@close="modal.close()"
+		/>
+	</MkModal>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkModal from './MkModal.vue';
-import MkMenu from './MkMenu.vue';
-import { MenuItem } from '@/types/menu';
+import {} from "vue";
+import MkModal from "./MkModal.vue";
+import MkMenu from "./MkMenu.vue";
+import { MenuItem } from "@/types/menu";
 
 defineProps<{
 	items: MenuItem[];
-	align?: 'center' | string;
+	align?: "center" | string;
 	width?: number;
 	viaKeyboard?: boolean;
 	src?: any;
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
 let modal = $ref<InstanceType<typeof MkModal>>();
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index cf22fc0a6..ff63b77d8 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -1,125 +1,290 @@
 <template>
-<div
-	v-size="{ max: [310, 500] }" class="gafaadew"
-	:class="{ modal, _popup: modal }"
-	@dragover.stop="onDragover"
-	@dragenter="onDragenter"
-	@dragleave="onDragleave"
-	@drop.stop="onDrop"
->
-	<header>
-		<button v-if="!fixed" class="cancel _button" @click="cancel"><i class="ph-x ph-bold ph-lg"></i></button>
-		<button v-click-anime v-tooltip="i18n.ts.switchAccount" class="account _button" @click="openAccountMenu">
-			<MkAvatar :user="postAccount ?? $i" class="avatar"/>
-		</button>
-		<div class="right">
-			<span class="text-count" :class="{ over: textLength > maxTextLength }">{{ maxTextLength - textLength }}</span>
-			<span v-if="localOnly" class="local-only"><i class="ph-hand-fist ph-bold ph-lg"></i></span>
-			<button ref="visibilityButton" v-tooltip="i18n.ts.visibility" class="_button visibility" :disabled="channel != null" @click="setVisibility">
-				<span v-if="visibility === 'public'"><i class="ph-planet ph-bold ph-lg"></i></span>
-				<span v-if="visibility === 'home'"><i class="ph-house ph-bold ph-lg"></i></span>
-				<span v-if="visibility === 'followers'"><i class="ph-lock-simple-open ph-bold ph-lg"></i></span>
-				<span v-if="visibility === 'specified'"><i class="ph-envelope-simple-open ph-bold ph-lg"></i></span>
+	<div
+		v-size="{ max: [310, 500] }"
+		class="gafaadew"
+		:class="{ modal, _popup: modal }"
+		@dragover.stop="onDragover"
+		@dragenter="onDragenter"
+		@dragleave="onDragleave"
+		@drop.stop="onDrop"
+	>
+		<header>
+			<button v-if="!fixed" class="cancel _button" @click="cancel">
+				<i class="ph-x ph-bold ph-lg"></i>
 			</button>
-			<button v-tooltip="i18n.ts.previewNoteText" class="_button preview" :class="{ active: showPreview }" @click="showPreview = !showPreview"><i class="ph-file-code ph-bold ph-lg"></i></button>
-			<button class="submit _buttonGradate" :disabled="!canPost" data-cy-open-post-form-submit @click="post">{{ submitText }}<i :class="reply ? 'ph-arrow-u-up-left ph-bold ph-lg' : renote ? 'ph-quotes ph-bold ph-lg' : 'ph-paper-plane-tilt ph-bold ph-lg'"></i></button>
-		</div>
-	</header>
-	<div class="form" :class="{ fixed }">
-		<XNoteSimple v-if="reply" class="preview" :note="reply"/>
-		<XNoteSimple v-if="renote" class="preview" :note="renote"/>
-		<div v-if="quoteId" class="with-quote"><i class="ph-quotes ph-bold ph-lg"></i> {{ i18n.ts.quoteAttached }}<button @click="quoteId = null"><i class="ph-x ph-bold ph-lg"></i></button></div>
-		<div v-if="visibility === 'specified'" class="to-specified">
-			<span style="margin-right: 8px;">{{ i18n.ts.recipient }}</span>
-			<div class="visibleUsers">
-				<span v-for="u in visibleUsers" :key="u.id">
-					<MkAcct :user="u"/>
-					<button class="_button" @click="removeVisibleUser(u)"><i class="ph-x ph-bold ph-lg"></i></button>
-				</span>
-				<button class="_button" @click="addVisibleUser"><i class="ph-plus ph-bold ph-md ph-fw ph-lg"></i></button>
+			<button
+				v-click-anime
+				v-tooltip="i18n.ts.switchAccount"
+				class="account _button"
+				@click="openAccountMenu"
+			>
+				<MkAvatar :user="postAccount ?? $i" class="avatar" />
+			</button>
+			<div class="right">
+				<span
+					class="text-count"
+					:class="{ over: textLength > maxTextLength }"
+					>{{ maxTextLength - textLength }}</span
+				>
+				<span v-if="localOnly" class="local-only"
+					><i class="ph-hand-fist ph-bold ph-lg"></i
+				></span>
+				<button
+					ref="visibilityButton"
+					v-tooltip="i18n.ts.visibility"
+					class="_button visibility"
+					:disabled="channel != null"
+					@click="setVisibility"
+				>
+					<span v-if="visibility === 'public'"
+						><i class="ph-planet ph-bold ph-lg"></i
+					></span>
+					<span v-if="visibility === 'home'"
+						><i class="ph-house ph-bold ph-lg"></i
+					></span>
+					<span v-if="visibility === 'followers'"
+						><i class="ph-lock-simple-open ph-bold ph-lg"></i
+					></span>
+					<span v-if="visibility === 'specified'"
+						><i class="ph-envelope-simple-open ph-bold ph-lg"></i
+					></span>
+				</button>
+				<button
+					v-tooltip="i18n.ts.previewNoteText"
+					class="_button preview"
+					:class="{ active: showPreview }"
+					@click="showPreview = !showPreview"
+				>
+					<i class="ph-file-code ph-bold ph-lg"></i>
+				</button>
+				<button
+					class="submit _buttonGradate"
+					:disabled="!canPost"
+					data-cy-open-post-form-submit
+					@click="post"
+				>
+					{{ submitText
+					}}<i
+						:class="
+							reply
+								? 'ph-arrow-u-up-left ph-bold ph-lg'
+								: renote
+								? 'ph-quotes ph-bold ph-lg'
+								: 'ph-paper-plane-tilt ph-bold ph-lg'
+						"
+					></i>
+				</button>
 			</div>
+		</header>
+		<div class="form" :class="{ fixed }">
+			<XNoteSimple v-if="reply" class="preview" :note="reply" />
+			<XNoteSimple v-if="renote" class="preview" :note="renote" />
+			<div v-if="quoteId" class="with-quote">
+				<i class="ph-quotes ph-bold ph-lg"></i>
+				{{ i18n.ts.quoteAttached
+				}}<button @click="quoteId = null">
+					<i class="ph-x ph-bold ph-lg"></i>
+				</button>
+			</div>
+			<div v-if="visibility === 'specified'" class="to-specified">
+				<span style="margin-right: 8px">{{ i18n.ts.recipient }}</span>
+				<div class="visibleUsers">
+					<span v-for="u in visibleUsers" :key="u.id">
+						<MkAcct :user="u" />
+						<button class="_button" @click="removeVisibleUser(u)">
+							<i class="ph-x ph-bold ph-lg"></i>
+						</button>
+					</span>
+					<button class="_button" @click="addVisibleUser">
+						<i class="ph-plus ph-bold ph-md ph-fw ph-lg"></i>
+					</button>
+				</div>
+			</div>
+			<MkInfo
+				v-if="hasNotSpecifiedMentions"
+				warn
+				class="hasNotSpecifiedMentions"
+				>{{ i18n.ts.notSpecifiedMentionWarning }} -
+				<button class="_textButton" @click="addMissingMention()">
+					{{ i18n.ts.add }}
+				</button></MkInfo
+			>
+			<input
+				v-show="useCw"
+				ref="cwInputEl"
+				v-model="cw"
+				class="cw"
+				:placeholder="i18n.ts.annotation"
+				@keydown="onKeydown"
+			/>
+			<textarea
+				ref="textareaEl"
+				v-model="text"
+				class="text"
+				:class="{ withCw: useCw }"
+				:disabled="posting"
+				:placeholder="placeholder"
+				data-cy-post-form-text
+				@keydown="onKeydown"
+				@paste="onPaste"
+				@compositionupdate="onCompositionUpdate"
+				@compositionend="onCompositionEnd"
+			/>
+			<input
+				v-show="withHashtags"
+				ref="hashtagsInputEl"
+				v-model="hashtags"
+				class="hashtags"
+				:placeholder="i18n.ts.hashtags"
+				list="hashtags"
+			/>
+			<XPostFormAttaches
+				class="attaches"
+				:files="files"
+				@updated="updateFiles"
+				@detach="detachFile"
+				@changeSensitive="updateFileSensitive"
+				@changeName="updateFileName"
+			/>
+			<XPollEditor v-if="poll" v-model="poll" @destroyed="poll = null" />
+			<XNotePreview v-if="showPreview" class="preview" :text="text" />
+			<footer>
+				<button
+					v-tooltip="i18n.ts.attachFile"
+					class="_button"
+					@click="chooseFileFrom"
+				>
+					<i class="ph-upload ph-bold ph-lg"></i>
+				</button>
+				<button
+					v-tooltip="i18n.ts.poll"
+					class="_button"
+					:class="{ active: poll }"
+					@click="togglePoll"
+				>
+					<i class="ph-microphone-stage ph-bold ph-lg"></i>
+				</button>
+				<button
+					v-tooltip="i18n.ts.useCw"
+					class="_button"
+					:class="{ active: useCw }"
+					@click="useCw = !useCw"
+				>
+					<i class="ph-eye-slash ph-bold ph-lg"></i>
+				</button>
+				<button
+					v-tooltip="i18n.ts.mention"
+					class="_button"
+					@click="insertMention"
+				>
+					<i class="ph-at ph-bold ph-lg"></i>
+				</button>
+				<button
+					v-tooltip="i18n.ts.hashtags"
+					class="_button"
+					:class="{ active: withHashtags }"
+					@click="withHashtags = !withHashtags"
+				>
+					<i class="ph-hash ph-bold ph-lg"></i>
+				</button>
+				<button
+					v-tooltip="i18n.ts.emoji"
+					class="_button"
+					@click="insertEmoji"
+				>
+					<i class="ph-smiley ph-bold ph-lg"></i>
+				</button>
+				<button
+					v-if="postFormActions.length > 0"
+					v-tooltip="i18n.ts.plugin"
+					class="_button"
+					@click="showActions"
+				>
+					<i class="ph-plug ph-bold ph-lg"></i>
+				</button>
+				<button
+					v-tooltip="i18n.ts._mfm.cheatSheet"
+					class="_button right"
+					@click="openCheatSheet"
+				>
+					<i class="ph-question ph-bold ph-lg"></i>
+				</button>
+			</footer>
+			<datalist id="hashtags">
+				<option
+					v-for="hashtag in recentHashtags"
+					:key="hashtag"
+					:value="hashtag"
+				/>
+			</datalist>
 		</div>
-		<MkInfo v-if="hasNotSpecifiedMentions" warn class="hasNotSpecifiedMentions">{{ i18n.ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ i18n.ts.add }}</button></MkInfo>
-		<input v-show="useCw" ref="cwInputEl" v-model="cw" class="cw" :placeholder="i18n.ts.annotation" @keydown="onKeydown">
-		<textarea ref="textareaEl" v-model="text" class="text" :class="{ withCw: useCw }" :disabled="posting" :placeholder="placeholder" data-cy-post-form-text @keydown="onKeydown" @paste="onPaste" @compositionupdate="onCompositionUpdate" @compositionend="onCompositionEnd"/>
-		<input v-show="withHashtags" ref="hashtagsInputEl" v-model="hashtags" class="hashtags" :placeholder="i18n.ts.hashtags" list="hashtags">
-		<XPostFormAttaches class="attaches" :files="files" @updated="updateFiles" @detach="detachFile" @changeSensitive="updateFileSensitive" @changeName="updateFileName"/>
-		<XPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/>
-		<XNotePreview v-if="showPreview" class="preview" :text="text"/>
-		<footer>
-			<button v-tooltip="i18n.ts.attachFile" class="_button" @click="chooseFileFrom"><i class="ph-upload ph-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts.poll" class="_button" :class="{ active: poll }" @click="togglePoll"><i class="ph-microphone-stage ph-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts.useCw" class="_button" :class="{ active: useCw }" @click="useCw = !useCw"><i class="ph-eye-slash ph-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts.mention" class="_button" @click="insertMention"><i class="ph-at ph-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts.hashtags" class="_button" :class="{ active: withHashtags }" @click="withHashtags = !withHashtags"><i class="ph-hash ph-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts.emoji" class="_button" @click="insertEmoji"><i class="ph-smiley ph-bold ph-lg"></i></button>
-			<button v-if="postFormActions.length > 0" v-tooltip="i18n.ts.plugin" class="_button" @click="showActions"><i class="ph-plug ph-bold ph-lg"></i></button>
-			<button v-tooltip="i18n.ts._mfm.cheatSheet" class="_button right" @click="openCheatSheet"><i class="ph-question ph-bold ph-lg"></i></button>
-		</footer>
-		<datalist id="hashtags">
-			<option v-for="hashtag in recentHashtags" :key="hashtag" :value="hashtag"/>
-		</datalist>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { inject, watch, nextTick, onMounted, defineAsyncComponent } from 'vue';
-import * as mfm from 'mfm-js';
-import * as misskey from 'calckey-js';
-import insertTextAtCursor from 'insert-text-at-cursor';
-import { length } from 'stringz';
-import { toASCII } from 'punycode/';
-import * as Acct from 'calckey-js/built/acct';
-import { throttle } from 'throttle-debounce';
-import XNoteSimple from '@/components/MkNoteSimple.vue';
-import XNotePreview from '@/components/MkNotePreview.vue';
-import XPostFormAttaches from '@/components/MkPostFormAttaches.vue';
-import XPollEditor from '@/components/MkPollEditor.vue';
-import { host, url } from '@/config';
-import { erase, unique } from '@/scripts/array';
-import { extractMentions } from '@/scripts/extract-mentions';
-import { formatTimeString } from '@/scripts/format-time-string';
-import { Autocomplete } from '@/scripts/autocomplete';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import { selectFiles } from '@/scripts/select-file';
-import { defaultStore, notePostInterruptors, postFormActions } from '@/store';
-import MkInfo from '@/components/MkInfo.vue';
-import { i18n } from '@/i18n';
-import { instance } from '@/instance';
-import { $i, getAccounts, openAccountMenu as openAccountMenu_ } from '@/account';
-import { uploadFile } from '@/scripts/upload';
-import { deepClone } from '@/scripts/clone';
-import XCheatSheet from '@/components/MkCheatSheetDialog.vue';
-import { preprocess } from '@/scripts/preprocess';
+import { inject, watch, nextTick, onMounted, defineAsyncComponent } from "vue";
+import * as mfm from "mfm-js";
+import * as misskey from "calckey-js";
+import insertTextAtCursor from "insert-text-at-cursor";
+import { length } from "stringz";
+import { toASCII } from "punycode/";
+import * as Acct from "calckey-js/built/acct";
+import { throttle } from "throttle-debounce";
+import XNoteSimple from "@/components/MkNoteSimple.vue";
+import XNotePreview from "@/components/MkNotePreview.vue";
+import XPostFormAttaches from "@/components/MkPostFormAttaches.vue";
+import XPollEditor from "@/components/MkPollEditor.vue";
+import { host, url } from "@/config";
+import { erase, unique } from "@/scripts/array";
+import { extractMentions } from "@/scripts/extract-mentions";
+import { formatTimeString } from "@/scripts/format-time-string";
+import { Autocomplete } from "@/scripts/autocomplete";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import { selectFiles } from "@/scripts/select-file";
+import { defaultStore, notePostInterruptors, postFormActions } from "@/store";
+import MkInfo from "@/components/MkInfo.vue";
+import { i18n } from "@/i18n";
+import { instance } from "@/instance";
+import {
+	$i,
+	getAccounts,
+	openAccountMenu as openAccountMenu_,
+} from "@/account";
+import { uploadFile } from "@/scripts/upload";
+import { deepClone } from "@/scripts/clone";
+import XCheatSheet from "@/components/MkCheatSheetDialog.vue";
+import { preprocess } from "@/scripts/preprocess";
 
-const modal = inject('modal');
+const modal = inject("modal");
 
-const props = withDefaults(defineProps<{
-	reply?: misskey.entities.Note;
-	renote?: misskey.entities.Note;
-	channel?: any; // TODO
-	mention?: misskey.entities.User;
-	specified?: misskey.entities.User;
-	initialText?: string;
-	initialVisibility?: typeof misskey.noteVisibilities;
-	initialFiles?: misskey.entities.DriveFile[];
-	initialLocalOnly?: boolean;
-	initialVisibleUsers?: misskey.entities.User[];
-	initialNote?: misskey.entities.Note;
-	instant?: boolean;
-	fixed?: boolean;
-	autofocus?: boolean;
-}>(), {
-	initialVisibleUsers: () => [],
-	autofocus: true,
-});
+const props = withDefaults(
+	defineProps<{
+		reply?: misskey.entities.Note;
+		renote?: misskey.entities.Note;
+		channel?: any; // TODO
+		mention?: misskey.entities.User;
+		specified?: misskey.entities.User;
+		initialText?: string;
+		initialVisibility?: typeof misskey.noteVisibilities;
+		initialFiles?: misskey.entities.DriveFile[];
+		initialLocalOnly?: boolean;
+		initialVisibleUsers?: misskey.entities.User[];
+		initialNote?: misskey.entities.Note;
+		instant?: boolean;
+		fixed?: boolean;
+		autofocus?: boolean;
+	}>(),
+	{
+		initialVisibleUsers: () => [],
+		autofocus: true,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'posted'): void;
-	(ev: 'cancel'): void;
-	(ev: 'esc'): void;
+	(ev: "posted"): void;
+	(ev: "cancel"): void;
+	(ev: "esc"): void;
 }>();
 
 const textareaEl = $ref<HTMLTextAreaElement | null>(null);
@@ -128,7 +293,7 @@ const hashtagsInputEl = $ref<HTMLInputElement | null>(null);
 const visibilityButton = $ref<HTMLElement | null>(null);
 
 let posting = $ref(false);
-let text = $ref(props.initialText ?? '');
+let text = $ref(props.initialText ?? "");
 let files = $ref(props.initialFiles ?? []);
 let poll = $ref<{
 	choices: string[];
@@ -139,8 +304,18 @@ let poll = $ref<{
 let useCw = $ref(false);
 let showPreview = $ref(false);
 let cw = $ref<string | null>(null);
-let localOnly = $ref<boolean>(props.initialLocalOnly ?? defaultStore.state.rememberNoteVisibility ? defaultStore.state.localOnly : defaultStore.state.defaultNoteLocalOnly);
-let visibility = $ref(props.initialVisibility ?? (defaultStore.state.rememberNoteVisibility ? defaultStore.state.visibility : defaultStore.state.defaultNoteVisibility) as typeof misskey.noteVisibilities[number]);
+let localOnly = $ref<boolean>(
+	props.initialLocalOnly ?? defaultStore.state.rememberNoteVisibility
+		? defaultStore.state.localOnly
+		: defaultStore.state.defaultNoteLocalOnly
+);
+let visibility = $ref(
+	props.initialVisibility ??
+		((defaultStore.state.rememberNoteVisibility
+			? defaultStore.state.visibility
+			: defaultStore.state
+					.defaultNoteVisibility) as (typeof misskey.noteVisibilities)[number])
+);
 let visibleUsers = $ref([]);
 if (props.initialVisibleUsers) {
 	props.initialVisibleUsers.forEach(pushVisibleUser);
@@ -149,24 +324,24 @@ let autocomplete = $ref(null);
 let draghover = $ref(false);
 let quoteId = $ref(null);
 let hasNotSpecifiedMentions = $ref(false);
-let recentHashtags = $ref(JSON.parse(localStorage.getItem('hashtags') || '[]'));
-let imeText = $ref('');
+let recentHashtags = $ref(JSON.parse(localStorage.getItem("hashtags") || "[]"));
+let imeText = $ref("");
 
 const typing = throttle(3000, () => {
 	if (props.channel) {
-		stream.send('typingOnChannel', { channel: props.channel.id });
+		stream.send("typingOnChannel", { channel: props.channel.id });
 	}
 });
 
 const draftKey = $computed((): string => {
-	let key = props.channel ? `channel:${props.channel.id}` : '';
+	let key = props.channel ? `channel:${props.channel.id}` : "";
 
 	if (props.renote) {
 		key += `renote:${props.renote.id}`;
 	} else if (props.reply) {
 		key += `reply:${props.reply.id}`;
 	} else {
-		key += 'note';
+		key += "note";
 	}
 
 	return key;
@@ -196,8 +371,8 @@ const submitText = $computed((): string => {
 	return props.renote
 		? i18n.ts.quote
 		: props.reply
-			? i18n.ts.reply
-			: i18n.ts.note;
+		? i18n.ts.reply
+		: i18n.ts.note;
 });
 
 const textLength = $computed((): number => {
@@ -209,32 +384,50 @@ const maxTextLength = $computed((): number => {
 });
 
 const canPost = $computed((): boolean => {
-	return !posting &&
+	return (
+		!posting &&
 		(1 <= textLength || 1 <= files.length || !!poll || !!props.renote) &&
-		(textLength <= maxTextLength) &&
-		(!poll || poll.choices.length >= 2);
+		textLength <= maxTextLength &&
+		(!poll || poll.choices.length >= 2)
+	);
 });
 
-const withHashtags = $computed(defaultStore.makeGetterSetter('postFormWithHashtags'));
-const hashtags = $computed(defaultStore.makeGetterSetter('postFormHashtags'));
+const withHashtags = $computed(
+	defaultStore.makeGetterSetter("postFormWithHashtags")
+);
+const hashtags = $computed(defaultStore.makeGetterSetter("postFormHashtags"));
 
 watch($$(text), () => {
 	checkMissingMention();
 });
 
-watch($$(visibleUsers), () => {
-	checkMissingMention();
-}, {
-	deep: true,
-});
+watch(
+	$$(visibleUsers),
+	() => {
+		checkMissingMention();
+	},
+	{
+		deep: true,
+	}
+);
 
 if (props.mention) {
-	text = props.mention.host ? `@${props.mention.username}@${toASCII(props.mention.host)}` : `@${props.mention.username}`;
-	text += ' ';
+	text = props.mention.host
+		? `@${props.mention.username}@${toASCII(props.mention.host)}`
+		: `@${props.mention.username}`;
+	text += " ";
 }
 
-if (props.reply && (props.reply.user.username !== $i.username || (props.reply.user.host != null && props.reply.user.host !== host))) {
-	text = `@${props.reply.user.username}${props.reply.user.host != null ? '@' + toASCII(props.reply.user.host) : ''} `;
+if (
+	props.reply &&
+	(props.reply.user.username !== $i.username ||
+		(props.reply.user.host != null && props.reply.user.host !== host))
+) {
+	text = `@${props.reply.user.username}${
+		props.reply.user.host != null
+			? "@" + toASCII(props.reply.user.host)
+			: ""
+	} `;
 }
 
 if (props.reply && props.reply.text != null) {
@@ -242,14 +435,15 @@ if (props.reply && props.reply.text != null) {
 	const otherHost = props.reply.user.host;
 
 	for (const x of extractMentions(ast)) {
-		const mention = x.host ?
-			`@${x.username}@${toASCII(x.host)}` :
-			(otherHost == null || otherHost === host) ?
-				`@${x.username}` :
-				`@${x.username}@${toASCII(otherHost)}`;
+		const mention = x.host
+			? `@${x.username}@${toASCII(x.host)}`
+			: otherHost == null || otherHost === host
+			? `@${x.username}`
+			: `@${x.username}@${toASCII(otherHost)}`;
 
 		// 自分は除外
-		if ($i.username === x.username && (x.host == null || x.host === host)) continue;
+		if ($i.username === x.username && (x.host == null || x.host === host))
+			continue;
 
 		// 重複は除外
 		if (text.includes(`${mention} `)) continue;
@@ -259,30 +453,37 @@ if (props.reply && props.reply.text != null) {
 }
 
 if (props.channel) {
-	visibility = 'public';
+	visibility = "public";
 	localOnly = true; // TODO: チャンネルが連合するようになった折には消す
 }
 
 // 公開以外へのリプライ時は元の公開範囲を引き継ぐ
-if (props.reply && ['home', 'followers', 'specified'].includes(props.reply.visibility)) {
+if (
+	props.reply &&
+	["home", "followers", "specified"].includes(props.reply.visibility)
+) {
 	visibility = props.reply.visibility;
-	if (props.reply.visibility === 'specified') {
-		os.api('users/show', {
-			userIds: props.reply.visibleUserIds.filter(uid => uid !== $i.id && uid !== props.reply.userId),
-		}).then(users => {
+	if (props.reply.visibility === "specified") {
+		os.api("users/show", {
+			userIds: props.reply.visibleUserIds.filter(
+				(uid) => uid !== $i.id && uid !== props.reply.userId
+			),
+		}).then((users) => {
 			users.forEach(pushVisibleUser);
 		});
 
 		if (props.reply.userId !== $i.id) {
-			os.api('users/show', { userId: props.reply.userId }).then(user => {
-				pushVisibleUser(user);
-			});
+			os.api("users/show", { userId: props.reply.userId }).then(
+				(user) => {
+					pushVisibleUser(user);
+				}
+			);
 		}
 	}
 }
 
 if (props.specified) {
-	visibility = 'specified';
+	visibility = "specified";
 	pushVisibleUser(props.specified);
 }
 
@@ -303,11 +504,15 @@ function watchForDraft() {
 }
 
 function checkMissingMention() {
-	if (visibility === 'specified') {
+	if (visibility === "specified") {
 		const ast = mfm.parse(text);
 
 		for (const x of extractMentions(ast)) {
-			if (!visibleUsers.some(u => (u.username === x.username) && (u.host === x.host))) {
+			if (
+				!visibleUsers.some(
+					(u) => u.username === x.username && u.host === x.host
+				)
+			) {
 				hasNotSpecifiedMentions = true;
 				return;
 			}
@@ -320,10 +525,16 @@ function addMissingMention() {
 	const ast = mfm.parse(text);
 
 	for (const x of extractMentions(ast)) {
-		if (!visibleUsers.some(u => (u.username === x.username) && (u.host === x.host))) {
-			os.api('users/show', { username: x.username, host: x.host }).then(user => {
-				visibleUsers.push(user);
-			});
+		if (
+			!visibleUsers.some(
+				(u) => u.username === x.username && u.host === x.host
+			)
+		) {
+			os.api("users/show", { username: x.username, host: x.host }).then(
+				(user) => {
+					visibleUsers.push(user);
+				}
+			);
 		}
 	}
 }
@@ -333,7 +544,7 @@ function togglePoll() {
 		poll = null;
 	} else {
 		poll = {
-			choices: ['', ''],
+			choices: ["", ""],
 			multiple: false,
 			expiresAt: null,
 			expiredAfter: null,
@@ -348,20 +559,25 @@ function addTag(tag: string) {
 function focus() {
 	if (textareaEl) {
 		textareaEl.focus();
-		textareaEl.setSelectionRange(textareaEl.value.length, textareaEl.value.length);
+		textareaEl.setSelectionRange(
+			textareaEl.value.length,
+			textareaEl.value.length
+		);
 	}
 }
 
 function chooseFileFrom(ev) {
-	selectFiles(ev.currentTarget ?? ev.target, i18n.ts.attachFile).then(files_ => {
-		for (const file of files_) {
-			files.push(file);
+	selectFiles(ev.currentTarget ?? ev.target, i18n.ts.attachFile).then(
+		(files_) => {
+			for (const file of files_) {
+				files.push(file);
+			}
 		}
-	});
+	);
 }
 
 function detachFile(id) {
-	files = files.filter(x => x.id !== id);
+	files = files.filter((x) => x.id !== id);
 }
 
 function updateFiles(_files) {
@@ -369,15 +585,15 @@ function updateFiles(_files) {
 }
 
 function updateFileSensitive(file, sensitive) {
-	files[files.findIndex(x => x.id === file.id)].isSensitive = sensitive;
+	files[files.findIndex((x) => x.id === file.id)].isSensitive = sensitive;
 }
 
 function updateFileName(file, name) {
-	files[files.findIndex(x => x.id === file.id)].name = name;
+	files[files.findIndex((x) => x.id === file.id)].name = name;
 }
 
 function upload(file: File, name?: string) {
-	uploadFile(file, defaultStore.state.uploadFolder, name).then(res => {
+	uploadFile(file, defaultStore.state.uploadFolder, name).then((res) => {
 		files.push(res);
 	});
 }
@@ -388,34 +604,45 @@ function setVisibility() {
 		return;
 	}
 
-	os.popup(defineAsyncComponent(() => import('@/components/MkVisibilityPicker.vue')), {
-		currentVisibility: visibility,
-		currentLocalOnly: localOnly,
-		src: visibilityButton,
-	}, {
-		changeVisibility: v => {
-			visibility = v;
-			if (defaultStore.state.rememberNoteVisibility) {
-				defaultStore.set('visibility', visibility);
-			}
+	os.popup(
+		defineAsyncComponent(
+			() => import("@/components/MkVisibilityPicker.vue")
+		),
+		{
+			currentVisibility: visibility,
+			currentLocalOnly: localOnly,
+			src: visibilityButton,
 		},
-		changeLocalOnly: v => {
-			localOnly = v;
-			if (defaultStore.state.rememberNoteVisibility) {
-				defaultStore.set('localOnly', localOnly);
-			}
+		{
+			changeVisibility: (v) => {
+				visibility = v;
+				if (defaultStore.state.rememberNoteVisibility) {
+					defaultStore.set("visibility", visibility);
+				}
+			},
+			changeLocalOnly: (v) => {
+				localOnly = v;
+				if (defaultStore.state.rememberNoteVisibility) {
+					defaultStore.set("localOnly", localOnly);
+				}
+			},
 		},
-	}, 'closed');
+		"closed"
+	);
 }
 
 function pushVisibleUser(user) {
-	if (!visibleUsers.some(u => u.username === user.username && u.host === user.host)) {
+	if (
+		!visibleUsers.some(
+			(u) => u.username === user.username && u.host === user.host
+		)
+	) {
 		visibleUsers.push(user);
 	}
 }
 
 function addVisibleUser() {
-	os.selectUser().then(user => {
+	os.selectUser().then((user) => {
 		pushVisibleUser(user);
 	});
 }
@@ -425,15 +652,20 @@ function removeVisibleUser(user) {
 }
 
 function clear() {
-	text = '';
+	text = "";
 	files = [];
 	poll = null;
 	quoteId = null;
 }
 
 function onKeydown(ev: KeyboardEvent) {
-	if ((ev.which === 10 || ev.which === 13) && (ev.ctrlKey || ev.metaKey) && canPost) post();
-	if (ev.which === 27) emit('esc');
+	if (
+		(ev.which === 10 || ev.which === 13) &&
+		(ev.ctrlKey || ev.metaKey) &&
+		canPost
+	)
+		post();
+	if (ev.which === 27) emit("esc");
 	typing();
 }
 
@@ -443,27 +675,32 @@ function onCompositionUpdate(ev: CompositionEvent) {
 }
 
 function onCompositionEnd(ev: CompositionEvent) {
-	imeText = '';
+	imeText = "";
 }
 
 async function onPaste(ev: ClipboardEvent) {
-	for (const { item, i } of Array.from(ev.clipboardData.items).map((item, i) => ({ item, i }))) {
-		if (item.kind === 'file') {
+	for (const { item, i } of Array.from(ev.clipboardData.items).map(
+		(item, i) => ({ item, i })
+	)) {
+		if (item.kind === "file") {
 			const file = item.getAsFile();
-			const lio = file.name.lastIndexOf('.');
-			const ext = lio >= 0 ? file.name.slice(lio) : '';
-			const formatted = `${formatTimeString(new Date(file.lastModified), defaultStore.state.pastedFileName).replace(/{{number}}/g, `${i + 1}`)}${ext}`;
+			const lio = file.name.lastIndexOf(".");
+			const ext = lio >= 0 ? file.name.slice(lio) : "";
+			const formatted = `${formatTimeString(
+				new Date(file.lastModified),
+				defaultStore.state.pastedFileName
+			).replace(/{{number}}/g, `${i + 1}`)}${ext}`;
 			upload(file, formatted);
 		}
 	}
 
-	const paste = ev.clipboardData.getData('text');
+	const paste = ev.clipboardData.getData("text");
 
-	if (!props.renote && !quoteId && paste.startsWith(url + '/notes/')) {
+	if (!props.renote && !quoteId && paste.startsWith(url + "/notes/")) {
 		ev.preventDefault();
 
 		os.yesno({
-			type: 'info',
+			type: "info",
 			text: i18n.ts.quoteQuestion,
 		}).then(({ canceled }) => {
 			if (canceled) {
@@ -478,25 +715,25 @@ async function onPaste(ev: ClipboardEvent) {
 
 function onDragover(ev) {
 	if (!ev.dataTransfer.items[0]) return;
-	const isFile = ev.dataTransfer.items[0].kind === 'file';
+	const isFile = ev.dataTransfer.items[0].kind === "file";
 	const isDriveFile = ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FILE_;
 	if (isFile || isDriveFile) {
 		ev.preventDefault();
 		draghover = true;
 		switch (ev.dataTransfer.effectAllowed) {
-			case 'all':
-			case 'uninitialized':
-			case 'copy': 
-			case 'copyLink': 
-			case 'copyMove': 
-				ev.dataTransfer.dropEffect = 'copy';
+			case "all":
+			case "uninitialized":
+			case "copy":
+			case "copyLink":
+			case "copyMove":
+				ev.dataTransfer.dropEffect = "copy";
 				break;
-			case 'linkMove':
-			case 'move':
-				ev.dataTransfer.dropEffect = 'move';
+			case "linkMove":
+			case "move":
+				ev.dataTransfer.dropEffect = "move";
 				break;
 			default:
-				ev.dataTransfer.dropEffect = 'none';
+				ev.dataTransfer.dropEffect = "none";
 				break;
 		}
 	}
@@ -522,7 +759,7 @@ function onDrop(ev): void {
 
 	//#region ドライブのファイル
 	const driveFile = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
-	if (driveFile != null && driveFile !== '') {
+	if (driveFile != null && driveFile !== "") {
 		const file = JSON.parse(driveFile);
 		files.push(file);
 		ev.preventDefault();
@@ -531,7 +768,7 @@ function onDrop(ev): void {
 }
 
 function saveDraft() {
-	const draftData = JSON.parse(localStorage.getItem('drafts') || '{}');
+	const draftData = JSON.parse(localStorage.getItem("drafts") || "{}");
 
 	draftData[draftKey] = {
 		updatedAt: new Date(),
@@ -546,36 +783,49 @@ function saveDraft() {
 		},
 	};
 
-	localStorage.setItem('drafts', JSON.stringify(draftData));
+	localStorage.setItem("drafts", JSON.stringify(draftData));
 }
 
 function deleteDraft() {
-	const draftData = JSON.parse(localStorage.getItem('drafts') || '{}');
+	const draftData = JSON.parse(localStorage.getItem("drafts") || "{}");
 
 	delete draftData[draftKey];
 
-	localStorage.setItem('drafts', JSON.stringify(draftData));
+	localStorage.setItem("drafts", JSON.stringify(draftData));
 }
 
 async function post() {
 	const processedText = preprocess(text);
 
 	let postData = {
-		text: processedText === '' ? undefined : processedText,
-		fileIds: files.length > 0 ? files.map(f => f.id) : undefined,
+		text: processedText === "" ? undefined : processedText,
+		fileIds: files.length > 0 ? files.map((f) => f.id) : undefined,
 		replyId: props.reply ? props.reply.id : undefined,
-		renoteId: props.renote ? props.renote.id : quoteId ? quoteId : undefined,
+		renoteId: props.renote
+			? props.renote.id
+			: quoteId
+			? quoteId
+			: undefined,
 		channelId: props.channel ? props.channel.id : undefined,
 		poll: poll,
-		cw: useCw ? cw || '' : undefined,
+		cw: useCw ? cw || "" : undefined,
 		localOnly: localOnly,
 		visibility: visibility,
-		visibleUserIds: visibility === 'specified' ? visibleUsers.map(u => u.id) : undefined,
+		visibleUserIds:
+			visibility === "specified"
+				? visibleUsers.map((u) => u.id)
+				: undefined,
 	};
 
-	if (withHashtags && hashtags && hashtags.trim() !== '') {
-		const hashtags_ = hashtags.trim().split(' ').map(x => x.startsWith('#') ? x : '#' + x).join(' ');
-		postData.text = postData.text ? `${postData.text} ${hashtags_}` : hashtags_;
+	if (withHashtags && hashtags && hashtags.trim() !== "") {
+		const hashtags_ = hashtags
+			.trim()
+			.split(" ")
+			.map((x) => (x.startsWith("#") ? x : "#" + x))
+			.join(" ");
+		postData.text = postData.text
+			? `${postData.text} ${hashtags_}`
+			: hashtags_;
 	}
 
 	// plugin
@@ -589,39 +839,49 @@ async function post() {
 
 	if (postAccount) {
 		const storedAccounts = await getAccounts();
-		token = storedAccounts.find(x => x.id === postAccount.id)?.token;
+		token = storedAccounts.find((x) => x.id === postAccount.id)?.token;
 	}
 
 	posting = true;
-	os.api('notes/create', postData, token).then(() => {
-		clear();
-		nextTick(() => {
-			deleteDraft();
-			emit('posted');
-			if (postData.text && postData.text !== '') {
-				const hashtags_ = mfm.parse(postData.text).filter(x => x.type === 'hashtag').map(x => x.props.hashtag);
-				const history = JSON.parse(localStorage.getItem('hashtags') || '[]') as string[];
-				localStorage.setItem('hashtags', JSON.stringify(unique(hashtags_.concat(history))));
-			}
+	os.api("notes/create", postData, token)
+		.then(() => {
+			clear();
+			nextTick(() => {
+				deleteDraft();
+				emit("posted");
+				if (postData.text && postData.text !== "") {
+					const hashtags_ = mfm
+						.parse(postData.text)
+						.filter((x) => x.type === "hashtag")
+						.map((x) => x.props.hashtag);
+					const history = JSON.parse(
+						localStorage.getItem("hashtags") || "[]"
+					) as string[];
+					localStorage.setItem(
+						"hashtags",
+						JSON.stringify(unique(hashtags_.concat(history)))
+					);
+				}
+				posting = false;
+				postAccount = null;
+			});
+		})
+		.catch((err) => {
 			posting = false;
-			postAccount = null;
+			os.alert({
+				type: "error",
+				text: err.message + "\n" + (err as any).id,
+			});
 		});
-	}).catch(err => {
-		posting = false;
-		os.alert({
-			type: 'error',
-			text: err.message + '\n' + (err as any).id,
-		});
-	});
 }
 
 function cancel() {
-	emit('cancel');
+	emit("cancel");
 }
 
 function insertMention() {
-	os.selectUser().then(user => {
-		insertTextAtCursor(textareaEl, '@' + Acct.toString(user) + ' ');
+	os.selectUser().then((user) => {
+		insertTextAtCursor(textareaEl, "@" + Acct.toString(user) + " ");
 	});
 }
 
@@ -630,37 +890,48 @@ async function insertEmoji(ev: MouseEvent) {
 }
 
 async function openCheatSheet(ev: MouseEvent) {
-  os.popup(XCheatSheet, {}, {}, 'closed');
+	os.popup(XCheatSheet, {}, {}, "closed");
 }
 
 function showActions(ev) {
-	os.popupMenu(postFormActions.map(action => ({
-		text: action.title,
-		action: () => {
-			action.handler({
-				text: text,
-			}, (key, value) => {
-				if (key === 'text') { text = value; }
-			});
-		},
-	})), ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		postFormActions.map((action) => ({
+			text: action.title,
+			action: () => {
+				action.handler(
+					{
+						text: text,
+					},
+					(key, value) => {
+						if (key === "text") {
+							text = value;
+						}
+					}
+				);
+			},
+		})),
+		ev.currentTarget ?? ev.target
+	);
 }
 
 let postAccount = $ref<misskey.entities.UserDetailed | null>(null);
 
 function openAccountMenu(ev: MouseEvent) {
-	openAccountMenu_({
-		withExtraOperation: false,
-		includeCurrentAccount: true,
-		active: postAccount != null ? postAccount.id : $i.id,
-		onChoose: (account) => {
-			if (account.id === $i.id) {
-				postAccount = null;
-			} else {
-				postAccount = account;
-			}
+	openAccountMenu_(
+		{
+			withExtraOperation: false,
+			includeCurrentAccount: true,
+			active: postAccount != null ? postAccount.id : $i.id,
+			onChoose: (account) => {
+				if (account.id === $i.id) {
+					postAccount = null;
+				} else {
+					postAccount = account;
+				}
+			},
 		},
-	}, ev);
+		ev
+	);
 }
 
 onMounted(() => {
@@ -680,14 +951,18 @@ onMounted(() => {
 	nextTick(() => {
 		// 書きかけの投稿を復元
 		if (!props.instant && !props.mention && !props.specified) {
-			const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[draftKey];
+			const draft = JSON.parse(localStorage.getItem("drafts") || "{}")[
+				draftKey
+			];
 			if (draft) {
 				text = draft.data.text;
 				useCw = draft.data.useCw;
 				cw = draft.data.cw;
 				visibility = draft.data.visibility;
 				localOnly = draft.data.localOnly;
-				files = (draft.data.files || []).filter(draftFile => draftFile);
+				files = (draft.data.files || []).filter(
+					(draftFile) => draftFile
+				);
 				if (draft.data.poll) {
 					poll = draft.data.poll;
 				}
@@ -697,13 +972,13 @@ onMounted(() => {
 		// 削除して編集
 		if (props.initialNote) {
 			const init = props.initialNote;
-			text = init.text ? init.text : '';
+			text = init.text ? init.text : "";
 			files = init.files;
 			cw = init.cw;
 			useCw = init.cw != null;
 			if (init.poll) {
 				poll = {
-					choices: init.poll.choices.map(x => x.text),
+					choices: init.poll.choices.map((x) => x.text),
 					multiple: init.poll.multiple,
 					expiresAt: init.poll.expiresAt,
 					expiredAfter: init.poll.expiredAfter,
@@ -721,7 +996,7 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .right {
-	float:right
+	float: right;
 }
 .gafaadew {
 	position: relative;
@@ -997,7 +1272,7 @@ onMounted(() => {
 				> button {
 					font-size: 14px;
 					width: 44px;
-				height: 44px;
+					height: 44px;
 				}
 			}
 		}
diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue
index ab8321057..ad2155155 100644
--- a/packages/client/src/components/MkPostFormAttaches.vue
+++ b/packages/client/src/components/MkPostFormAttaches.vue
@@ -1,28 +1,46 @@
 <template>
-<div v-show="files.length != 0" class="skeikyzd">
-	<XDraggable v-model="_files" class="files" item-key="id" animation="150" delay="100" delay-on-touch-only="true">
-		<template #item="{element}">
-			<div class="file" @click="showFileMenu(element, $event)" @contextmenu.prevent="showFileMenu(element, $event)">
-				<MkDriveFileThumbnail :data-id="element.id" class="thumbnail" :file="element" fit="cover"/>
-				<div v-if="element.isSensitive" class="sensitive">
-					<i class="ph-warning ph-bold ph-lg icon"></i>
+	<div v-show="files.length != 0" class="skeikyzd">
+		<XDraggable
+			v-model="_files"
+			class="files"
+			item-key="id"
+			animation="150"
+			delay="100"
+			delay-on-touch-only="true"
+		>
+			<template #item="{ element }">
+				<div
+					class="file"
+					@click="showFileMenu(element, $event)"
+					@contextmenu.prevent="showFileMenu(element, $event)"
+				>
+					<MkDriveFileThumbnail
+						:data-id="element.id"
+						class="thumbnail"
+						:file="element"
+						fit="cover"
+					/>
+					<div v-if="element.isSensitive" class="sensitive">
+						<i class="ph-warning ph-bold ph-lg icon"></i>
+					</div>
 				</div>
-			</div>
-		</template>
-	</XDraggable>
-	<p class="remain">{{ 16 - files.length }}/16</p>
-</div>
+			</template>
+		</XDraggable>
+		<p class="remain">{{ 16 - files.length }}/16</p>
+	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
-import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { defineComponent, defineAsyncComponent } from "vue";
+import MkDriveFileThumbnail from "@/components/MkDriveFileThumbnail.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
-		XDraggable: defineAsyncComponent(() => import('vuedraggable').then(x => x.default)),
+		XDraggable: defineAsyncComponent(() =>
+			import("vuedraggable").then((x) => x.default)
+		),
 		MkDriveFileThumbnail,
 	},
 
@@ -37,7 +55,7 @@ export default defineComponent({
 		},
 	},
 
-	emits: ['updated', 'detach', 'changeSensitive', 'changeName'],
+	emits: ["updated", "detach", "changeSensitive", "changeName"],
 
 	data() {
 		return {
@@ -52,7 +70,7 @@ export default defineComponent({
 				return this.files;
 			},
 			set(value) {
-				this.$emit('updated', value);
+				this.$emit("updated", value);
 			},
 		},
 	},
@@ -62,15 +80,15 @@ export default defineComponent({
 			if (this.detachMediaFn) {
 				this.detachMediaFn(id);
 			} else {
-				this.$emit('detach', id);
+				this.$emit("detach", id);
 			}
 		},
 		toggleSensitive(file) {
-			os.api('drive/files/update', {
+			os.api("drive/files/update", {
 				fileId: file.id,
 				isSensitive: !file.isSensitive,
 			}).then(() => {
-				this.$emit('changeSensitive', file, !file.isSensitive);
+				this.$emit("changeSensitive", file, !file.isSensitive);
 			});
 		},
 		async rename(file) {
@@ -80,56 +98,86 @@ export default defineComponent({
 				allowEmpty: false,
 			});
 			if (canceled) return;
-			os.api('drive/files/update', {
+			os.api("drive/files/update", {
 				fileId: file.id,
 				name: result,
 			}).then(() => {
-				this.$emit('changeName', file, result);
+				this.$emit("changeName", file, result);
 				file.name = result;
 			});
 		},
 
 		async describe(file) {
-			os.popup(defineAsyncComponent(() => import('@/components/MkMediaCaption.vue')), {
-				title: i18n.ts.describeFile,
-				input: {
-					placeholder: i18n.ts.inputNewDescription,
-					default: file.comment !== null ? file.comment : '',
+			os.popup(
+				defineAsyncComponent(
+					() => import("@/components/MkMediaCaption.vue")
+				),
+				{
+					title: i18n.ts.describeFile,
+					input: {
+						placeholder: i18n.ts.inputNewDescription,
+						default: file.comment !== null ? file.comment : "",
+					},
+					image: file,
 				},
-				image: file,
-			}, {
-				done: result => {
-					if (!result || result.canceled) return;
-					let comment = result.result.length === 0 ? null : result.result;
-					os.api('drive/files/update', {
-						fileId: file.id,
-						comment: comment,
-					}).then(() => {
-						file.comment = comment;
-					});
+				{
+					done: (result) => {
+						if (!result || result.canceled) return;
+						let comment =
+							result.result.length === 0 ? null : result.result;
+						os.api("drive/files/update", {
+							fileId: file.id,
+							comment: comment,
+						}).then(() => {
+							file.comment = comment;
+						});
+					},
 				},
-			}, 'closed');
+				"closed"
+			);
 		},
 
 		showFileMenu(file, ev: MouseEvent) {
 			if (this.menu) return;
-			this.menu = os.popupMenu([{
-				text: i18n.ts.renameFile,
-				icon: 'ph-cursor-text ph-bold ph-lg',
-				action: () => { this.rename(file); },
-			}, {
-				text: file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
-				icon: file.isSensitive ? 'ph-eye-slash ph-bold ph-lg' : 'ph-eye ph-bold ph-lg',
-				action: () => { this.toggleSensitive(file); },
-			}, {
-				text: i18n.ts.describeFile,
-				icon: 'ph-cursor-text ph-bold ph-lg',
-				action: () => { this.describe(file); },
-			}, {
-				text: i18n.ts.attachCancel,
-				icon: 'ph-circle-wavy-warning ph-bold ph-lg',
-				action: () => { this.detachMedia(file.id); },
-			}], ev.currentTarget ?? ev.target).then(() => this.menu = null);
+			this.menu = os
+				.popupMenu(
+					[
+						{
+							text: i18n.ts.renameFile,
+							icon: "ph-cursor-text ph-bold ph-lg",
+							action: () => {
+								this.rename(file);
+							},
+						},
+						{
+							text: file.isSensitive
+								? i18n.ts.unmarkAsSensitive
+								: i18n.ts.markAsSensitive,
+							icon: file.isSensitive
+								? "ph-eye-slash ph-bold ph-lg"
+								: "ph-eye ph-bold ph-lg",
+							action: () => {
+								this.toggleSensitive(file);
+							},
+						},
+						{
+							text: i18n.ts.describeFile,
+							icon: "ph-cursor-text ph-bold ph-lg",
+							action: () => {
+								this.describe(file);
+							},
+						},
+						{
+							text: i18n.ts.attachCancel,
+							icon: "ph-circle-wavy-warning ph-bold ph-lg",
+							action: () => {
+								this.detachMedia(file.id);
+							},
+						},
+					],
+					ev.currentTarget ?? ev.target
+				)
+				.then(() => (this.menu = null));
 		},
 	},
 });
@@ -172,7 +220,7 @@ export default defineComponent({
 				top: 0;
 				left: 0;
 				z-index: 2;
-				background: rgba(17, 17, 17, .7);
+				background: rgba(17, 17, 17, 0.7);
 				color: #fff;
 
 				> .icon {
diff --git a/packages/client/src/components/MkPostFormDialog.vue b/packages/client/src/components/MkPostFormDialog.vue
index 147ba9542..c96a94c0c 100644
--- a/packages/client/src/components/MkPostFormDialog.vue
+++ b/packages/client/src/components/MkPostFormDialog.vue
@@ -1,14 +1,28 @@
 <template>
-	<MkModal ref="modal" :prefer-type="'dialog'" @click="modal.close()" @closed="onModalClosed()">
-		<MkPostForm ref="form" style="margin: 0 auto auto auto;" v-bind="props" autofocus freeze-after-posted @posted="onPosted" @cancel="modal.close()" @esc="modal.close()"/>
+	<MkModal
+		ref="modal"
+		:prefer-type="'dialog'"
+		@click="modal.close()"
+		@closed="onModalClosed()"
+	>
+		<MkPostForm
+			ref="form"
+			style="margin: 0 auto auto auto"
+			v-bind="props"
+			autofocus
+			freeze-after-posted
+			@posted="onPosted"
+			@cancel="modal.close()"
+			@esc="modal.close()"
+		/>
 	</MkModal>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as misskey from 'calckey-js';
-import MkModal from '@/components/MkModal.vue';
-import MkPostForm from '@/components/MkPostForm.vue';
+import {} from "vue";
+import * as misskey from "calckey-js";
+import MkModal from "@/components/MkModal.vue";
+import MkPostForm from "@/components/MkPostForm.vue";
 
 const props = defineProps<{
 	reply?: misskey.entities.Note;
@@ -28,7 +42,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
 let modal = $shallowRef<InstanceType<typeof MkModal>>();
@@ -41,6 +55,6 @@ function onPosted() {
 }
 
 function onModalClosed() {
-	emit('closed');
+	emit("closed");
 }
 </script>
diff --git a/packages/client/src/components/MkPushNotificationAllowButton.vue b/packages/client/src/components/MkPushNotificationAllowButton.vue
index b98c814f2..0b2c4f6e3 100644
--- a/packages/client/src/components/MkPushNotificationAllowButton.vue
+++ b/packages/client/src/components/MkPushNotificationAllowButton.vue
@@ -1,46 +1,63 @@
 <template>
-<MkButton
-	v-if="supported && !pushRegistrationInServer"
-	type="button"
-	primary
-	:gradate="gradate"
-	:rounded="rounded"
-	:inline="inline"
-	:autofocus="autofocus"
-	:wait="wait"
-	:full="full"
-	@click="subscribe"
->
-	{{ i18n.ts.subscribePushNotification }}
-</MkButton>
-<MkButton
-	v-else-if="!showOnlyToRegister && ($i ? pushRegistrationInServer : pushSubscription)"
-	type="button"
-	:primary="false"
-	:gradate="gradate"
-	:rounded="rounded"
-	:inline="inline"
-	:autofocus="autofocus"
-	:wait="wait"
-	:full="full"
-	@click="unsubscribe"
->
-	{{ i18n.ts.unsubscribePushNotification }}
-</MkButton>
-<MkButton v-else-if="$i && pushRegistrationInServer" disabled :rounded="rounded" :inline="inline" :wait="wait" :full="full">
-	{{ i18n.ts.pushNotificationAlreadySubscribed }}
-</MkButton>
-<MkButton v-else-if="!supported" disabled :rounded="rounded" :inline="inline" :wait="wait" :full="full">
-	{{ i18n.ts.pushNotificationNotSupported }}
-</MkButton>
+	<MkButton
+		v-if="supported && !pushRegistrationInServer"
+		type="button"
+		primary
+		:gradate="gradate"
+		:rounded="rounded"
+		:inline="inline"
+		:autofocus="autofocus"
+		:wait="wait"
+		:full="full"
+		@click="subscribe"
+	>
+		{{ i18n.ts.subscribePushNotification }}
+	</MkButton>
+	<MkButton
+		v-else-if="
+			!showOnlyToRegister &&
+			($i ? pushRegistrationInServer : pushSubscription)
+		"
+		type="button"
+		:primary="false"
+		:gradate="gradate"
+		:rounded="rounded"
+		:inline="inline"
+		:autofocus="autofocus"
+		:wait="wait"
+		:full="full"
+		@click="unsubscribe"
+	>
+		{{ i18n.ts.unsubscribePushNotification }}
+	</MkButton>
+	<MkButton
+		v-else-if="$i && pushRegistrationInServer"
+		disabled
+		:rounded="rounded"
+		:inline="inline"
+		:wait="wait"
+		:full="full"
+	>
+		{{ i18n.ts.pushNotificationAlreadySubscribed }}
+	</MkButton>
+	<MkButton
+		v-else-if="!supported"
+		disabled
+		:rounded="rounded"
+		:inline="inline"
+		:wait="wait"
+		:full="full"
+	>
+		{{ i18n.ts.pushNotificationNotSupported }}
+	</MkButton>
 </template>
 
 <script setup lang="ts">
-import { $i, getAccounts } from '@/account';
-import MkButton from '@/components/MkButton.vue';
-import { instance } from '@/instance';
-import { api, apiWithDialog, promiseDialog } from '@/os';
-import { i18n } from '@/i18n';
+import { $i, getAccounts } from "@/account";
+import MkButton from "@/components/MkButton.vue";
+import { instance } from "@/instance";
+import { api, apiWithDialog, promiseDialog } from "@/os";
+import { i18n } from "@/i18n";
 
 defineProps<{
 	primary?: boolean;
@@ -62,38 +79,60 @@ let registration = $ref<ServiceWorkerRegistration | undefined>();
 let supported = $ref(false);
 // If this browser has already subscribed to push notification
 let pushSubscription = $ref<PushSubscription | null>(null);
-let pushRegistrationInServer = $ref<{ state?: string; key?: string; userId: string; endpoint: string; sendReadMessage: boolean; } | undefined>();
+let pushRegistrationInServer = $ref<
+	| {
+			state?: string;
+			key?: string;
+			userId: string;
+			endpoint: string;
+			sendReadMessage: boolean;
+	  }
+	| undefined
+>();
 
 function subscribe() {
 	if (!registration || !supported || !instance.swPublickey) return;
 
 	// SEE: https://developer.mozilla.org/en-US/docs/Web/API/PushManager/subscribe#Parameters
-	return promiseDialog(registration.pushManager.subscribe({
-		userVisibleOnly: true,
-		applicationServerKey: urlBase64ToUint8Array(instance.swPublickey),
-	})
-	.then(async subscription => {
-		pushSubscription = subscription;
+	return promiseDialog(
+		registration.pushManager
+			.subscribe({
+				userVisibleOnly: true,
+				applicationServerKey: urlBase64ToUint8Array(
+					instance.swPublickey
+				),
+			})
+			.then(
+				async (subscription) => {
+					pushSubscription = subscription;
 
-		// Register
-		pushRegistrationInServer = await api('sw/register', {
-			endpoint: subscription.endpoint,
-			auth: encode(subscription.getKey('auth')),
-			publickey: encode(subscription.getKey('p256dh')),
-		});
-	}, async err => { // When subscribe failed
-		// 通知が許可されていなかったとき
-		if (err?.name === 'NotAllowedError') {
-			console.info('User denied the notification permission request.');
-			return;
-		}
+					// Register
+					pushRegistrationInServer = await api("sw/register", {
+						endpoint: subscription.endpoint,
+						auth: encode(subscription.getKey("auth")),
+						publickey: encode(subscription.getKey("p256dh")),
+					});
+				},
+				async (err) => {
+					// When subscribe failed
+					// 通知が許可されていなかったとき
+					if (err?.name === "NotAllowedError") {
+						console.info(
+							"User denied the notification permission request."
+						);
+						return;
+					}
 
-		// 違うapplicationServerKey (または gcm_sender_id)のサブスクリプションが
-		// 既に存在していることが原因でエラーになった可能性があるので、
-		// そのサブスクリプションを解除しておく
-		// （これは実行されなさそうだけど、おまじない的に古い実装から残してある）
-		await unsubscribe();
-	}), null, null);
+					// 違うapplicationServerKey (または gcm_sender_id)のサブスクリプションが
+					// 既に存在していることが原因でエラーになった可能性があるので、
+					// そのサブスクリプションを解除しておく
+					// （これは実行されなさそうだけど、おまじない的に古い実装から残してある）
+					await unsubscribe();
+				}
+			),
+		null,
+		null
+	);
 }
 
 async function unsubscribe() {
@@ -105,13 +144,13 @@ async function unsubscribe() {
 	pushRegistrationInServer = undefined;
 
 	if ($i && accounts.length >= 2) {
-		apiWithDialog('sw/unregister', {
+		apiWithDialog("sw/unregister", {
 			i: $i.token,
 			endpoint,
 		});
 	} else {
 		pushSubscription.unsubscribe();
-		apiWithDialog('sw/unregister', {
+		apiWithDialog("sw/unregister", {
 			endpoint,
 		});
 		pushSubscription = null;
@@ -127,10 +166,10 @@ function encode(buffer: ArrayBuffer | null) {
  * @param base64String base64 string
  */
 function urlBase64ToUint8Array(base64String: string): Uint8Array {
-	const padding = '='.repeat((4 - base64String.length % 4) % 4);
+	const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
 	const base64 = (base64String + padding)
-		.replace(/-/g, '+')
-		.replace(/_/g, '/');
+		.replace(/-/g, "+")
+		.replace(/_/g, "/");
 
 	const rawData = window.atob(base64);
 	const outputArray = new Uint8Array(rawData.length);
@@ -144,16 +183,16 @@ function urlBase64ToUint8Array(base64String: string): Uint8Array {
 if (navigator.serviceWorker == null) {
 	// TODO: よしなに？
 } else {
-	navigator.serviceWorker.ready.then(async swr => {
+	navigator.serviceWorker.ready.then(async (swr) => {
 		registration = swr;
 
 		pushSubscription = await registration.pushManager.getSubscription();
 
-		if (instance.swPublickey && ('PushManager' in window) && $i && $i.token) {
+		if (instance.swPublickey && "PushManager" in window && $i && $i.token) {
 			supported = true;
 
 			if (pushSubscription) {
-				const res = await api('sw/show-registration', {
+				const res = await api("sw/show-registration", {
 					endpoint: pushSubscription.endpoint,
 				});
 
diff --git a/packages/client/src/components/MkQuoteButton.vue b/packages/client/src/components/MkQuoteButton.vue
index a936e791d..4710d01b4 100644
--- a/packages/client/src/components/MkQuoteButton.vue
+++ b/packages/client/src/components/MkQuoteButton.vue
@@ -1,27 +1,31 @@
 <template>
-<button
-	v-if="canRenote && $store.state.seperateRenoteQuote"
-	v-tooltip.noDelay.bottom="i18n.ts.quote"
-	class="eddddedb _button"
-	@click="quote()"
->
-	<i class="ph-quotes ph-bold ph-lg"></i>
-</button>
+	<button
+		v-if="canRenote && $store.state.seperateRenoteQuote"
+		v-tooltip.noDelay.bottom="i18n.ts.quote"
+		class="eddddedb _button"
+		@click="quote()"
+	>
+		<i class="ph-quotes ph-bold ph-lg"></i>
+	</button>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import type { Note } from 'calckey-js/built/entities';
-import { pleaseLogin } from '@/scripts/please-login';
-import * as os from '@/os';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
+import { computed } from "vue";
+import type { Note } from "calckey-js/built/entities";
+import { pleaseLogin } from "@/scripts/please-login";
+import * as os from "@/os";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	note: Note;
 }>();
 
-const canRenote = computed(() => ['public', 'home'].includes(props.note.visibility) || props.note.userId === $i?.id);
+const canRenote = computed(
+	() =>
+		["public", "home"].includes(props.note.visibility) ||
+		props.note.userId === $i?.id
+);
 
 function quote(): void {
 	pleaseLogin();
diff --git a/packages/client/src/components/MkReactedUsersDialog.vue b/packages/client/src/components/MkReactedUsersDialog.vue
index a41378f2b..7012ea3fa 100644
--- a/packages/client/src/components/MkReactedUsersDialog.vue
+++ b/packages/client/src/components/MkReactedUsersDialog.vue
@@ -1,58 +1,84 @@
 <template>
-<MkModalWindow
-	ref="dialog"
-	:width="400"
-	:height="450"
-	@close="dialog.close()"
-	@closed="emit('closed')"
->
-	<template #header>{{ i18n.ts.reactions }}</template>
+	<MkModalWindow
+		ref="dialog"
+		:width="400"
+		:height="450"
+		@close="dialog.close()"
+		@closed="emit('closed')"
+	>
+		<template #header>{{ i18n.ts.reactions }}</template>
 
-	<MkSpacer :margin-min="20" :margin-max="28">
-		<div v-if="note" class="_gaps">
-			<div v-if="reactions.length === 0" class="_fullinfo">
-				<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>
-				<div>{{ i18n.ts.nothing }}</div>
-			</div>
-			<template v-else>
-				<div :class="$style.tabs">
-					<button v-for="reaction in reactions" :key="reaction" :class="[$style.tab, { [$style.tabActive]: tab === reaction }]" class="_button" @click="tab = reaction">
-						<MkReactionIcon
-							ref="reactionRef"
-							:reaction="reaction ? reaction.replace(/^:(\w+):$/, ':$1@.:') : reaction"
-							:custom-emojis="note.emojis"
-						/>
-						<span style="margin-left: 4px;">{{ note.reactions[reaction] }}</span>
-					</button>
+		<MkSpacer :margin-min="20" :margin-max="28">
+			<div v-if="note" class="_gaps">
+				<div v-if="reactions.length === 0" class="_fullinfo">
+					<img
+						src="/static-assets/badges/info.png"
+						class="_ghost"
+						alt="Info"
+					/>
+					<div>{{ i18n.ts.nothing }}</div>
 				</div>
-				<MkA v-for="user in users" :key="user.id" :to="userPage(user)">
-					<MkUserCardMini :user="user" :with-chart="false"/>
-				</MkA>
-			</template>
-		</div>
-		<div v-else>
-			<MkLoading/>
-		</div>
-	</MkSpacer>
-</MkModalWindow>
+				<template v-else>
+					<div :class="$style.tabs">
+						<button
+							v-for="reaction in reactions"
+							:key="reaction"
+							:class="[
+								$style.tab,
+								{ [$style.tabActive]: tab === reaction },
+							]"
+							class="_button"
+							@click="tab = reaction"
+						>
+							<MkReactionIcon
+								ref="reactionRef"
+								:reaction="
+									reaction
+										? reaction.replace(
+												/^:(\w+):$/,
+												':$1@.:'
+										  )
+										: reaction
+								"
+								:custom-emojis="note.emojis"
+							/>
+							<span style="margin-left: 4px">{{
+								note.reactions[reaction]
+							}}</span>
+						</button>
+					</div>
+					<MkA
+						v-for="user in users"
+						:key="user.id"
+						:to="userPage(user)"
+					>
+						<MkUserCardMini :user="user" :with-chart="false" />
+					</MkA>
+				</template>
+			</div>
+			<div v-else>
+				<MkLoading />
+			</div>
+		</MkSpacer>
+	</MkModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, watch } from 'vue';
-import * as misskey from 'calckey-js';
-import MkModalWindow from '@/components/MkModalWindow.vue';
-import MkReactionIcon from '@/components/MkReactionIcon.vue';
-import MkUserCardMini from '@/components/MkUserCardMini.vue';
-import { userPage } from '@/filters/user';
-import { i18n } from '@/i18n';
-import * as os from '@/os';
+import { onMounted, watch } from "vue";
+import * as misskey from "calckey-js";
+import MkModalWindow from "@/components/MkModalWindow.vue";
+import MkReactionIcon from "@/components/MkReactionIcon.vue";
+import MkUserCardMini from "@/components/MkUserCardMini.vue";
+import { userPage } from "@/filters/user";
+import { i18n } from "@/i18n";
+import * as os from "@/os";
 
 const emit = defineEmits<{
-	(ev: 'closed'): void,
+	(ev: "closed"): void;
 }>();
 
 const props = defineProps<{
-	noteId: misskey.entities.Note['id'];
+	noteId: misskey.entities.Note["id"];
 }>();
 
 const dialog = $shallowRef<InstanceType<typeof MkModalWindow>>();
@@ -63,17 +89,17 @@ let reactions = $ref<string[]>();
 let users = $ref();
 
 watch($$(tab), async () => {
-	const res = await os.api('notes/reactions', {
+	const res = await os.api("notes/reactions", {
 		noteId: props.noteId,
 		type: tab,
 		limit: 30,
 	});
 
-	users = res.map(x => x.user);
+	users = res.map((x) => x.user);
 });
 
 onMounted(() => {
-	os.api('notes/show', {
+	os.api("notes/show", {
 		noteId: props.noteId,
 	}).then((res) => {
 		reactions = Object.keys(res.reactions);
diff --git a/packages/client/src/components/MkReactionIcon.vue b/packages/client/src/components/MkReactionIcon.vue
index 5638c9a81..eb19a5520 100644
--- a/packages/client/src/components/MkReactionIcon.vue
+++ b/packages/client/src/components/MkReactionIcon.vue
@@ -1,9 +1,15 @@
 <template>
-<MkEmoji :emoji="reaction" :custom-emojis="customEmojis || []" :is-reaction="true" :normal="true" :no-style="noStyle"/>
+	<MkEmoji
+		:emoji="reaction"
+		:custom-emojis="customEmojis || []"
+		:is-reaction="true"
+		:normal="true"
+		:no-style="noStyle"
+	/>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
+import {} from "vue";
 
 const props = defineProps<{
 	reaction: string;
diff --git a/packages/client/src/components/MkReactionTooltip.vue b/packages/client/src/components/MkReactionTooltip.vue
index 2da97cf4f..e3db05c27 100644
--- a/packages/client/src/components/MkReactionTooltip.vue
+++ b/packages/client/src/components/MkReactionTooltip.vue
@@ -1,16 +1,26 @@
 <template>
-<MkTooltip ref="tooltip" :target-element="targetElement" :max-width="340" @closed="emit('closed')">
-	<div class="beeadbfb">
-		<XReactionIcon :reaction="reaction" :custom-emojis="emojis" class="icon" :no-style="true"/>
-		<div class="name">{{ reaction.replace('@.', '') }}</div>
-	</div>
-</MkTooltip>
+	<MkTooltip
+		ref="tooltip"
+		:target-element="targetElement"
+		:max-width="340"
+		@closed="emit('closed')"
+	>
+		<div class="beeadbfb">
+			<XReactionIcon
+				:reaction="reaction"
+				:custom-emojis="emojis"
+				class="icon"
+				:no-style="true"
+			/>
+			<div class="name">{{ reaction.replace("@.", "") }}</div>
+		</div>
+	</MkTooltip>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkTooltip from './MkTooltip.vue';
-import XReactionIcon from '@/components/MkReactionIcon.vue';
+import {} from "vue";
+import MkTooltip from "./MkTooltip.vue";
+import XReactionIcon from "@/components/MkReactionIcon.vue";
 
 const props = defineProps<{
 	reaction: string;
@@ -19,7 +29,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 </script>
 
diff --git a/packages/client/src/components/MkReactionsViewer.details.vue b/packages/client/src/components/MkReactionsViewer.details.vue
index 8c423807b..96dd05162 100644
--- a/packages/client/src/components/MkReactionsViewer.details.vue
+++ b/packages/client/src/components/MkReactionsViewer.details.vue
@@ -1,25 +1,37 @@
 <template>
-<MkTooltip ref="tooltip" :target-element="targetElement" :max-width="340" @closed="emit('closed')">
-	<div class="bqxuuuey">
-		<div class="reaction">
-			<XReactionIcon :reaction="reaction" :custom-emojis="emojis" class="icon" :no-style="true"/>
-			<div class="name">{{ reaction.replace('@.', '') }}</div>
-		</div>
-		<div class="users">
-			<div v-for="u in users" :key="u.id" class="user">
-				<MkAvatar class="avatar" :user="u"/>
-				<MkUserName class="name" :user="u" :nowrap="true"/>
+	<MkTooltip
+		ref="tooltip"
+		:target-element="targetElement"
+		:max-width="340"
+		@closed="emit('closed')"
+	>
+		<div class="bqxuuuey">
+			<div class="reaction">
+				<XReactionIcon
+					:reaction="reaction"
+					:custom-emojis="emojis"
+					class="icon"
+					:no-style="true"
+				/>
+				<div class="name">{{ reaction.replace("@.", "") }}</div>
+			</div>
+			<div class="users">
+				<div v-for="u in users" :key="u.id" class="user">
+					<MkAvatar class="avatar" :user="u" />
+					<MkUserName class="name" :user="u" :nowrap="true" />
+				</div>
+				<div v-if="users.length > 10" class="omitted">
+					+{{ count - 10 }}
+				</div>
 			</div>
-			<div v-if="users.length > 10" class="omitted">+{{ count - 10 }}</div>
 		</div>
-	</div>
-</MkTooltip>
+	</MkTooltip>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkTooltip from './MkTooltip.vue';
-import XReactionIcon from '@/components/MkReactionIcon.vue';
+import {} from "vue";
+import MkTooltip from "./MkTooltip.vue";
+import XReactionIcon from "@/components/MkReactionIcon.vue";
 
 const props = defineProps<{
 	reaction: string;
@@ -30,7 +42,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 </script>
 
diff --git a/packages/client/src/components/MkReactionsViewer.reaction.vue b/packages/client/src/components/MkReactionsViewer.reaction.vue
index 8c952addc..461628a94 100644
--- a/packages/client/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/client/src/components/MkReactionsViewer.reaction.vue
@@ -1,25 +1,33 @@
 <template>
-<button
-	v-if="count > 0"
-	ref="buttonRef"
-	v-ripple="canToggle"
-	class="hkzvhatu _button"
-	:class="{ reacted: note.myReaction == reaction, canToggle, newlyAdded: !isInitial }"
-	@click="toggleReaction()"
->
-	<XReactionIcon class="icon" :reaction="reaction" :custom-emojis="note.emojis"/>
-	<span class="count">{{ count }}</span>
-</button>
+	<button
+		v-if="count > 0"
+		ref="buttonRef"
+		v-ripple="canToggle"
+		class="hkzvhatu _button"
+		:class="{
+			reacted: note.myReaction == reaction,
+			canToggle,
+			newlyAdded: !isInitial,
+		}"
+		@click="toggleReaction()"
+	>
+		<XReactionIcon
+			class="icon"
+			:reaction="reaction"
+			:custom-emojis="note.emojis"
+		/>
+		<span class="count">{{ count }}</span>
+	</button>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
-import * as misskey from 'calckey-js';
-import XDetails from '@/components/MkReactionsViewer.details.vue';
-import XReactionIcon from '@/components/MkReactionIcon.vue';
-import * as os from '@/os';
-import { useTooltip } from '@/scripts/use-tooltip';
-import { $i } from '@/account';
+import { computed, ref } from "vue";
+import * as misskey from "calckey-js";
+import XDetails from "@/components/MkReactionsViewer.details.vue";
+import XReactionIcon from "@/components/MkReactionIcon.vue";
+import * as os from "@/os";
+import { useTooltip } from "@/scripts/use-tooltip";
+import { $i } from "@/account";
 
 const props = defineProps<{
 	reaction: string;
@@ -37,43 +45,52 @@ const toggleReaction = () => {
 
 	const oldReaction = props.note.myReaction;
 	if (oldReaction) {
-		os.api('notes/reactions/delete', {
+		os.api("notes/reactions/delete", {
 			noteId: props.note.id,
 		}).then(() => {
 			if (oldReaction !== props.reaction) {
-				os.api('notes/reactions/create', {
+				os.api("notes/reactions/create", {
 					noteId: props.note.id,
 					reaction: props.reaction,
 				});
 			}
 		});
 	} else {
-		os.api('notes/reactions/create', {
+		os.api("notes/reactions/create", {
 			noteId: props.note.id,
 			reaction: props.reaction,
 		});
 	}
 };
 
-useTooltip(buttonRef, async (showing) => {
-	const reactions = await os.apiGet('notes/reactions', {
-		noteId: props.note.id,
-		type: props.reaction,
-		limit: 11,
-		_cacheKey_: props.count,
-	});
+useTooltip(
+	buttonRef,
+	async (showing) => {
+		const reactions = await os.apiGet("notes/reactions", {
+			noteId: props.note.id,
+			type: props.reaction,
+			limit: 11,
+			_cacheKey_: props.count,
+		});
 
-	const users = reactions.map(x => x.user);
+		const users = reactions.map((x) => x.user);
 
-	os.popup(XDetails, {
-		showing,
-		reaction: props.reaction,
-		emojis: props.note.emojis,
-		users,
-		count: props.count,
-		targetElement: buttonRef.value,
-	}, {}, 'closed');
-}, 100);
+		os.popup(
+			XDetails,
+			{
+				showing,
+				reaction: props.reaction,
+				emojis: props.note.emojis,
+				users,
+				count: props.count,
+				targetElement: buttonRef.value,
+			},
+			{},
+			"closed"
+		);
+	},
+	100
+);
 </script>
 
 <style lang="scss" scoped>
@@ -85,21 +102,21 @@ useTooltip(buttonRef, async (showing) => {
 	border-radius: 4px;
 	pointer-events: all;
 	&.newlyAdded {
-		animation: scaleInSmall .3s cubic-bezier(0,0,0,1.2);
+		animation: scaleInSmall 0.3s cubic-bezier(0, 0, 0, 1.2);
 		:deep(.mk-emoji) {
-			animation: scaleIn .4s cubic-bezier(0.7, 0, 0, 1.5);
+			animation: scaleIn 0.4s cubic-bezier(0.7, 0, 0, 1.5);
 		}
 	}
 	:deep(.mk-emoji) {
-		transition: transform .4s cubic-bezier(0,0,0,6);
+		transition: transform 0.4s cubic-bezier(0, 0, 0, 6);
 	}
 	&.reacted :deep(.mk-emoji) {
-		transition: transform .4s cubic-bezier(0,0,0,1);
+		transition: transform 0.4s cubic-bezier(0, 0, 0, 1);
 	}
 	&:active {
 		:deep(.mk-emoji) {
-			transition: transform .4s cubic-bezier(0,0,0,1);
-			transform: scale(.85);
+			transition: transform 0.4s cubic-bezier(0, 0, 0, 1);
+			transform: scale(0.85);
 		}
 	}
 	&.canToggle {
diff --git a/packages/client/src/components/MkReactionsViewer.vue b/packages/client/src/components/MkReactionsViewer.vue
index eb60e3633..fc108b472 100644
--- a/packages/client/src/components/MkReactionsViewer.vue
+++ b/packages/client/src/components/MkReactionsViewer.vue
@@ -1,14 +1,21 @@
 <template>
-<div class="tdflqwzn" :class="{ isMe }">
-	<XReaction v-for="(count, reaction) in note.reactions" :key="reaction" :reaction="reaction" :count="count" :is-initial="initialReactions.has(reaction)" :note="note"/>
-</div>
+	<div class="tdflqwzn" :class="{ isMe }">
+		<XReaction
+			v-for="(count, reaction) in note.reactions"
+			:key="reaction"
+			:reaction="reaction"
+			:count="count"
+			:is-initial="initialReactions.has(reaction)"
+			:note="note"
+		/>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import * as misskey from 'calckey-js';
-import { $i } from '@/account';
-import XReaction from '@/components/MkReactionsViewer.reaction.vue';
+import { computed } from "vue";
+import * as misskey from "calckey-js";
+import { $i } from "@/account";
+import XReaction from "@/components/MkReactionsViewer.reaction.vue";
 
 const props = defineProps<{
 	note: misskey.entities.Note;
@@ -22,9 +29,9 @@ const isMe = computed(() => $i && $i.id === props.note.userId);
 <style lang="scss" scoped>
 .tdflqwzn {
 	margin-inline: -2px;
-	margin-top: .2em;
+	margin-top: 0.2em;
 	width: 100%;
-	
+
 	&:empty {
 		display: none;
 	}
diff --git a/packages/client/src/components/MkRemoteCaution.vue b/packages/client/src/components/MkRemoteCaution.vue
index 8cb48648f..f8a84e81e 100644
--- a/packages/client/src/components/MkRemoteCaution.vue
+++ b/packages/client/src/components/MkRemoteCaution.vue
@@ -1,9 +1,18 @@
 <template>
-<div class="jmgmzlwq _block">{{ i18n.ts.remoteUserCaution }}<a class="link" :href="href" rel="nofollow noopener" target="_blank">{{ i18n.ts.showOnRemote }}</a></div>
+	<div class="jmgmzlwq _block">
+		{{ i18n.ts.remoteUserCaution
+		}}<a
+			class="link"
+			:href="href"
+			rel="nofollow noopener"
+			target="_blank"
+			>{{ i18n.ts.showOnRemote }}</a
+		>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { i18n } from '@/i18n';
+import { i18n } from "@/i18n";
 
 defineProps<{
 	href: string;
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index 11bcd8bd5..e2968f796 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -1,150 +1,185 @@
 <template>
-<button
-	v-if="canRenote"
-	ref="buttonRef"
-	v-tooltip.noDelay.bottom="i18n.ts.renote"
-	class="eddddedb _button canRenote"
-	@click="renote(false, $event)"
->
-	<i class="ph-repeat ph-bold ph-lg"></i>
-	<p v-if="count > 0" class="count">{{ count }}</p>
-</button>
-<button v-else class="eddddedb _button">
-	<i class="ph-prohibit ph-bold ph-lg"></i>
-</button>
+	<button
+		v-if="canRenote"
+		ref="buttonRef"
+		v-tooltip.noDelay.bottom="i18n.ts.renote"
+		class="eddddedb _button canRenote"
+		@click="renote(false, $event)"
+	>
+		<i class="ph-repeat ph-bold ph-lg"></i>
+		<p v-if="count > 0" class="count">{{ count }}</p>
+	</button>
+	<button v-else class="eddddedb _button">
+		<i class="ph-prohibit ph-bold ph-lg"></i>
+	</button>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
-import type * as misskey from 'calckey-js';
-import Ripple from '@/components/MkRipple.vue';
-import XDetails from '@/components/MkUsersTooltip.vue';
-import { pleaseLogin } from '@/scripts/please-login';
-import * as os from '@/os';
-import { $i } from '@/account';
-import { useTooltip } from '@/scripts/use-tooltip';
-import { i18n } from '@/i18n';
-import { defaultStore } from '@/store';
+import { computed, ref } from "vue";
+import type * as misskey from "calckey-js";
+import Ripple from "@/components/MkRipple.vue";
+import XDetails from "@/components/MkUsersTooltip.vue";
+import { pleaseLogin } from "@/scripts/please-login";
+import * as os from "@/os";
+import { $i } from "@/account";
+import { useTooltip } from "@/scripts/use-tooltip";
+import { i18n } from "@/i18n";
+import { defaultStore } from "@/store";
 
 const props = defineProps<{
-		note: misskey.entities.Note;
-		count: number;
-	}>();
+	note: misskey.entities.Note;
+	count: number;
+}>();
 
 const buttonRef = ref<HTMLElement>();
 
-const canRenote = computed(() => ['public', 'home'].includes(props.note.visibility) || props.note.userId === $i.id);
+const canRenote = computed(
+	() =>
+		["public", "home"].includes(props.note.visibility) ||
+		props.note.userId === $i.id
+);
 
 useTooltip(buttonRef, async (showing) => {
-	const renotes = await os.api('notes/renotes', {
+	const renotes = await os.api("notes/renotes", {
 		noteId: props.note.id,
 		limit: 11,
 	});
 
-	const users = renotes.map(x => x.user);
+	const users = renotes.map((x) => x.user);
 
 	if (users.length < 1) return;
 
-	os.popup(XDetails, {
-		showing,
-		users,
-		count: props.count,
-		targetElement: buttonRef.value,
-	}, {}, 'closed');
+	os.popup(
+		XDetails,
+		{
+			showing,
+			users,
+			count: props.count,
+			targetElement: buttonRef.value,
+		},
+		{},
+		"closed"
+	);
 });
 
 const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 	pleaseLogin();
 
-	const renotes = await os.api('notes/renotes', {
+	const renotes = await os.api("notes/renotes", {
 		noteId: props.note.id,
 		limit: 11,
 	});
 
-	const users = renotes.map(x => x.user.id);
+	const users = renotes.map((x) => x.user.id);
 	const hasRenotedBefore = users.includes($i.id);
 
 	let buttonActions = [];
 
-	if (props.note.visibility === 'public') {
+	if (props.note.visibility === "public") {
 		buttonActions.push({
 			text: i18n.ts.renote,
-			textStyle: 'font-weight: bold',
-			icon: 'ph-repeat ph-bold ph-lg',
+			textStyle: "font-weight: bold",
+			icon: "ph-repeat ph-bold ph-lg",
 			danger: false,
 			action: () => {
-				os.api('notes/create', {
+				os.api("notes/create", {
 					renoteId: props.note.id,
-					visibility: 'public',
+					visibility: "public",
 				});
-				const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
+				const el =
+					ev &&
+					((ev.currentTarget ?? ev.target) as
+						| HTMLElement
+						| null
+						| undefined);
 				if (el) {
 					const rect = el.getBoundingClientRect();
-					const x = rect.left + (el.offsetWidth / 2);
-					const y = rect.top + (el.offsetHeight / 2);
-					os.popup(Ripple, { x, y }, {}, 'end');
+					const x = rect.left + el.offsetWidth / 2;
+					const y = rect.top + el.offsetHeight / 2;
+					os.popup(Ripple, { x, y }, {}, "end");
 				}
 			},
 		});
 	}
 
-	if (['public', 'home'].includes(props.note.visibility)) {
+	if (["public", "home"].includes(props.note.visibility)) {
 		buttonActions.push({
 			text: i18n.ts.renoteAsUnlisted,
-			icons: ['ph-repeat ph-bold ph-lg', 'ph-house ph-bold ph-lg'],
+			icons: ["ph-repeat ph-bold ph-lg", "ph-house ph-bold ph-lg"],
 			danger: false,
 			action: () => {
-				os.api('notes/create', {
+				os.api("notes/create", {
 					renoteId: props.note.id,
-					visibility: 'home',
+					visibility: "home",
 				});
-				const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
+				const el =
+					ev &&
+					((ev.currentTarget ?? ev.target) as
+						| HTMLElement
+						| null
+						| undefined);
 				if (el) {
 					const rect = el.getBoundingClientRect();
-					const x = rect.left + (el.offsetWidth / 2);
-					const y = rect.top + (el.offsetHeight / 2);
-					os.popup(Ripple, { x, y }, {}, 'end');
+					const x = rect.left + el.offsetWidth / 2;
+					const y = rect.top + el.offsetHeight / 2;
+					os.popup(Ripple, { x, y }, {}, "end");
 				}
 			},
 		});
 	}
 
-	if (props.note.visibility === 'specified') {
+	if (props.note.visibility === "specified") {
 		buttonActions.push({
 			text: i18n.ts.renoteToRecipients,
-			icons: ['ph-repeat ph-bold ph-lg', 'ph-envelope-simple-open ph-bold ph-lg'],
+			icons: [
+				"ph-repeat ph-bold ph-lg",
+				"ph-envelope-simple-open ph-bold ph-lg",
+			],
 			danger: false,
 			action: () => {
-				os.api('notes/create', {
+				os.api("notes/create", {
 					renoteId: props.note.id,
-					visibility: 'specified',
+					visibility: "specified",
 					visibleUserIds: props.note.visibleUserIds,
 				});
-				const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
+				const el =
+					ev &&
+					((ev.currentTarget ?? ev.target) as
+						| HTMLElement
+						| null
+						| undefined);
 				if (el) {
 					const rect = el.getBoundingClientRect();
-					const x = rect.left + (el.offsetWidth / 2);
-					const y = rect.top + (el.offsetHeight / 2);
-					os.popup(Ripple, { x, y }, {}, 'end');
+					const x = rect.left + el.offsetWidth / 2;
+					const y = rect.top + el.offsetHeight / 2;
+					os.popup(Ripple, { x, y }, {}, "end");
 				}
 			},
 		});
 	} else {
 		buttonActions.push({
 			text: i18n.ts.renoteToFollowers,
-			icons: ['ph-repeat ph-bold ph-lg', 'ph-lock-simple-open ph-bold ph-lg'],
+			icons: [
+				"ph-repeat ph-bold ph-lg",
+				"ph-lock-simple-open ph-bold ph-lg",
+			],
 			danger: false,
 			action: () => {
-				os.api('notes/create', {
+				os.api("notes/create", {
 					renoteId: props.note.id,
-					visibility: 'followers',
+					visibility: "followers",
 				});
-				const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
+				const el =
+					ev &&
+					((ev.currentTarget ?? ev.target) as
+						| HTMLElement
+						| null
+						| undefined);
 				if (el) {
 					const rect = el.getBoundingClientRect();
-					const x = rect.left + (el.offsetWidth / 2);
-					const y = rect.top + (el.offsetHeight / 2);
-					os.popup(Ripple, { x, y }, {}, 'end');
+					const x = rect.left + el.offsetWidth / 2;
+					const y = rect.top + el.offsetHeight / 2;
+					os.popup(Ripple, { x, y }, {}, "end");
 				}
 			},
 		});
@@ -153,7 +188,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 	if (!defaultStore.state.seperateRenoteQuote) {
 		buttonActions.push({
 			text: i18n.ts.quote,
-			icon: 'ph-quotes ph-bold ph-lg',
+			icon: "ph-quotes ph-bold ph-lg",
 			danger: false,
 			action: () => {
 				os.post({
@@ -166,10 +201,10 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 	if (hasRenotedBefore) {
 		buttonActions.push({
 			text: i18n.ts.unrenote,
-			icon: 'ph-trash ph-bold ph-lg',
+			icon: "ph-trash ph-bold ph-lg",
 			danger: true,
 			action: () => {
-				os.api('notes/unrenote', {
+				os.api("notes/unrenote", {
 					noteId: props.note.id,
 				});
 			},
@@ -179,26 +214,26 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 };
 </script>
 
-	<style lang="scss" scoped>
-	.eddddedb {
-		display: inline-block;
-		height: 32px;
-		margin: 2px;
-		padding: 0 6px;
-		border-radius: 4px;
+<style lang="scss" scoped>
+.eddddedb {
+	display: inline-block;
+	height: 32px;
+	margin: 2px;
+	padding: 0 6px;
+	border-radius: 4px;
 
-		&:not(.canRenote) {
-			cursor: default;
-		}
-
-		&.renoted {
-			background: var(--accent);
-		}
-
-		> .count {
-			display: inline;
-			margin-left: 8px;
-			opacity: 0.7;
-		}
+	&:not(.canRenote) {
+		cursor: default;
 	}
-	</style>
+
+	&.renoted {
+		background: var(--accent);
+	}
+
+	> .count {
+		display: inline;
+		margin-left: 8px;
+		opacity: 0.7;
+	}
+}
+</style>
diff --git a/packages/client/src/components/MkRipple.vue b/packages/client/src/components/MkRipple.vue
index 0eb8d2f4f..d055caad7 100644
--- a/packages/client/src/components/MkRipple.vue
+++ b/packages/client/src/components/MkRipple.vue
@@ -1,93 +1,113 @@
 <template>
-<div class="vswabwbm" :style="{ zIndex, top: `${y - 64}px`, left: `${x - 64}px` }">
-	<svg width="128" height="128" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
-		<circle fill="none" cx="64" cy="64">
-			<animate
-				attributeName="r"
-				begin="0s" dur="0.5s"
-				values="4; 32"
-				calcMode="spline"
-				keyTimes="0; 1"
-				keySplines="0.165, 0.84, 0.44, 1"
-				repeatCount="1"
-			/>
-			<animate
-				attributeName="stroke-width"
-				begin="0s" dur="0.5s"
-				values="16; 0"
-				calcMode="spline"
-				keyTimes="0; 1"
-				keySplines="0.3, 0.61, 0.355, 1"
-				repeatCount="1"
-			/>
-		</circle>
-		<g fill="none" fill-rule="evenodd">
-			<circle v-for="(particle, i) in particles" :key="i" :fill="particle.color">
+	<div
+		class="vswabwbm"
+		:style="{ zIndex, top: `${y - 64}px`, left: `${x - 64}px` }"
+	>
+		<svg
+			width="128"
+			height="128"
+			viewBox="0 0 128 128"
+			xmlns="http://www.w3.org/2000/svg"
+		>
+			<circle fill="none" cx="64" cy="64">
 				<animate
 					attributeName="r"
-					begin="0s" dur="0.8s"
-					:values="`${particle.size}; 0`"
+					begin="0s"
+					dur="0.5s"
+					values="4; 32"
 					calcMode="spline"
 					keyTimes="0; 1"
 					keySplines="0.165, 0.84, 0.44, 1"
 					repeatCount="1"
 				/>
 				<animate
-					attributeName="cx"
-					begin="0s" dur="0.8s"
-					:values="`${particle.xA}; ${particle.xB}`"
-					calcMode="spline"
-					keyTimes="0; 1"
-					keySplines="0.3, 0.61, 0.355, 1"
-					repeatCount="1"
-				/>
-				<animate
-					attributeName="cy"
-					begin="0s" dur="0.8s"
-					:values="`${particle.yA}; ${particle.yB}`"
+					attributeName="stroke-width"
+					begin="0s"
+					dur="0.5s"
+					values="16; 0"
 					calcMode="spline"
 					keyTimes="0; 1"
 					keySplines="0.3, 0.61, 0.355, 1"
 					repeatCount="1"
 				/>
 			</circle>
-		</g>
-	</svg>
-</div>
+			<g fill="none" fill-rule="evenodd">
+				<circle
+					v-for="(particle, i) in particles"
+					:key="i"
+					:fill="particle.color"
+				>
+					<animate
+						attributeName="r"
+						begin="0s"
+						dur="0.8s"
+						:values="`${particle.size}; 0`"
+						calcMode="spline"
+						keyTimes="0; 1"
+						keySplines="0.165, 0.84, 0.44, 1"
+						repeatCount="1"
+					/>
+					<animate
+						attributeName="cx"
+						begin="0s"
+						dur="0.8s"
+						:values="`${particle.xA}; ${particle.xB}`"
+						calcMode="spline"
+						keyTimes="0; 1"
+						keySplines="0.3, 0.61, 0.355, 1"
+						repeatCount="1"
+					/>
+					<animate
+						attributeName="cy"
+						begin="0s"
+						dur="0.8s"
+						:values="`${particle.yA}; ${particle.yB}`"
+						calcMode="spline"
+						keyTimes="0; 1"
+						keySplines="0.3, 0.61, 0.355, 1"
+						repeatCount="1"
+					/>
+				</circle>
+			</g>
+		</svg>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import * as os from '@/os';
+import { onMounted } from "vue";
+import * as os from "@/os";
 
-const props = withDefaults(defineProps<{
-	x: number;
-	y: number;
-	particle?: boolean;
-}>(), {
-	particle: true,
-});
+const props = withDefaults(
+	defineProps<{
+		x: number;
+		y: number;
+		particle?: boolean;
+	}>(),
+	{
+		particle: true,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'end'): void;
+	(ev: "end"): void;
 }>();
 
 const particles = [];
 const origin = 64;
-const colors = ['#eb6f92', '#9ccfd8', '#f6c177'];
-const zIndex = os.claimZIndex('high');
+const colors = ["#eb6f92", "#9ccfd8", "#f6c177"];
+const zIndex = os.claimZIndex("high");
 
 if (props.particle) {
 	for (let i = 0; i < 12; i++) {
 		const angle = Math.random() * (Math.PI * 2);
 		const pos = Math.random() * 16;
-		const velocity = 16 + (Math.random() * 48);
+		const velocity = 16 + Math.random() * 48;
 		particles.push({
-			size: 4 + (Math.random() * 8),
-			xA: origin + (Math.sin(angle) * pos),
-			yA: origin + (Math.cos(angle) * pos),
-			xB: origin + (Math.sin(angle) * (pos + velocity)),
-			yB: origin + (Math.cos(angle) * (pos + velocity)),
+			size: 4 + Math.random() * 8,
+			xA: origin + Math.sin(angle) * pos,
+			yA: origin + Math.cos(angle) * pos,
+			xB: origin + Math.sin(angle) * (pos + velocity),
+			yB: origin + Math.cos(angle) * (pos + velocity),
 			color: colors[Math.floor(Math.random() * colors.length)],
 		});
 	}
@@ -95,7 +115,7 @@ if (props.particle) {
 
 onMounted(() => {
 	window.setTimeout(() => {
-		emit('end');
+		emit("end");
 	}, 1100);
 });
 </script>
diff --git a/packages/client/src/components/MkSample.vue b/packages/client/src/components/MkSample.vue
index 68510809c..fcd064fdc 100644
--- a/packages/client/src/components/MkSample.vue
+++ b/packages/client/src/components/MkSample.vue
@@ -1,41 +1,41 @@
 <template>
-<div class="_card">
-	<div class="_content">
-		<MkInput v-model="text">
-			<template #label>Text</template>
-		</MkInput>
-		<MkSwitch v-model="flag">
-			<span>Switch is now {{ flag ? 'on' : 'off' }}</span>
-		</MkSwitch>
-		<div style="margin: 32px 0;">
-			<MkRadio v-model="radio" value="misskey">Calckey</MkRadio>
-			<MkRadio v-model="radio" value="mastodon">Mastodon</MkRadio>
-			<MkRadio v-model="radio" value="pleroma">Pleroma</MkRadio>
+	<div class="_card">
+		<div class="_content">
+			<MkInput v-model="text">
+				<template #label>Text</template>
+			</MkInput>
+			<MkSwitch v-model="flag">
+				<span>Switch is now {{ flag ? "on" : "off" }}</span>
+			</MkSwitch>
+			<div style="margin: 32px 0">
+				<MkRadio v-model="radio" value="misskey">Calckey</MkRadio>
+				<MkRadio v-model="radio" value="mastodon">Mastodon</MkRadio>
+				<MkRadio v-model="radio" value="pleroma">Pleroma</MkRadio>
+			</div>
+			<MkButton inline>This is</MkButton>
+			<MkButton inline primary>the button</MkButton>
+		</div>
+		<div class="_content" style="pointer-events: none">
+			<Mfm :text="mfm" />
+		</div>
+		<div class="_content">
+			<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>
-		<MkButton inline>This is</MkButton>
-		<MkButton inline primary>the button</MkButton>
 	</div>
-	<div class="_content" style="pointer-events: none;">
-		<Mfm :text="mfm"/>
-	</div>
-	<div class="_content">
-		<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">
-import { defineComponent } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import MkRadio from '@/components/form/radio.vue';
-import * as os from '@/os';
-import * as config from '@/config';
+import { defineComponent } from "vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import MkRadio from "@/components/form/radio.vue";
+import * as os from "@/os";
+import * as config from "@/config";
 
 export default defineComponent({
 	components: {
@@ -48,38 +48,42 @@ export default defineComponent({
 
 	data() {
 		return {
-			text: '',
+			text: "",
 			flag: true,
-			radio: 'calckey',
-			mfm: `Hello world! This is an @example mention. BTW, you are @${this.$i ? this.$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.`
+			radio: "calckey",
+			mfm: `Hello world! This is an @example mention. BTW, you are @${
+				this.$i ? this.$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.`,
 		};
 	},
 
 	methods: {
 		async openDialog() {
 			os.alert({
-				type: 'warning',
-				title: 'Oh my Calc',
-				text: 'Lorem ipsum dolor sit amet, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+				type: "warning",
+				title: "Oh my Calc",
+				text: "Lorem ipsum dolor sit amet, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
 			});
 		},
 
 		async openForm() {
-			os.form('Example form', {
+			os.form("Example form", {
 				foo: {
-					type: 'boolean',
+					type: "boolean",
 					default: true,
-					label: 'This is a boolean property'
+					label: "This is a boolean property",
 				},
 				bar: {
-					type: 'number',
+					type: "number",
 					default: 300,
-					label: 'This is a number property'
+					label: "This is a number property",
 				},
 				baz: {
-					type: 'string',
-					default: 'Calckey makes you happy.',
-					label: 'This is a string property'
+					type: "string",
+					default: "Calckey makes you happy.",
+					label: "This is a string property",
 				},
 			});
 		},
@@ -93,24 +97,34 @@ export default defineComponent({
 		},
 
 		async openMenu(ev) {
-			os.popupMenu([{
-				type: 'label',
-				text: 'Fruits'
-			}, {
-				text: 'Create some apples',
-				action: () => {},
-			}, {
-				text: 'Read some oranges',
-				action: () => {},
-			}, {
-				text: 'Update some melons',
-				action: () => {},
-			}, null, {
-				text: 'Delete some bananas',
-				danger: true,
-				action: () => {},
-			}], ev.currentTarget ?? ev.target);
+			os.popupMenu(
+				[
+					{
+						type: "label",
+						text: "Fruits",
+					},
+					{
+						text: "Create some apples",
+						action: () => {},
+					},
+					{
+						text: "Read some oranges",
+						action: () => {},
+					},
+					{
+						text: "Update some melons",
+						action: () => {},
+					},
+					null,
+					{
+						text: "Delete some bananas",
+						danger: true,
+						action: () => {},
+					},
+				],
+				ev.currentTarget ?? ev.target
+			);
 		},
-	}
+	},
 });
 </script>
diff --git a/packages/client/src/components/MkSignin.vue b/packages/client/src/components/MkSignin.vue
index d03341e56..59f066f6e 100644
--- a/packages/client/src/components/MkSignin.vue
+++ b/packages/client/src/components/MkSignin.vue
@@ -1,72 +1,181 @@
 <template>
-<form class="eppvobhk _monolithic_" :class="{ signing, totpLogin }" @submit.prevent="onSubmit">
-	<div class="auth _section _formRoot">
-		<div v-show="withAvatar" class="avatar" :style="{ backgroundImage: user ? `url('${ user.avatarUrl }')` : null, marginBottom: message ? '1.5em' : null }"></div>
-		<MkInfo v-if="message">
-			{{ message }}
-		</MkInfo>
-		<div v-if="!totpLogin" class="normal-signin">
-			<MkInput v-model="username" class="_formBlock" :placeholder="i18n.ts.username" type="text" pattern="^[a-zA-Z0-9_]+$" :spellcheck="false" autofocus required data-cy-signin-username @update:modelValue="onUsernameChange">
-				<template #prefix>@</template>
-				<template #suffix>@{{ host }}</template>
-			</MkInput>
-			<MkInput v-if="!user || user && !user.usePasswordLessLogin" v-model="password" class="_formBlock" :placeholder="i18n.ts.password" type="password" :with-password-toggle="true" required data-cy-signin-password>
-				<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
-				<template #caption><button class="_textButton" type="button" @click="resetPassword">{{ i18n.ts.forgotPassword }}</button></template>
-			</MkInput>
-			<MkButton class="_formBlock" type="submit" primary :disabled="signing" style="margin: 1rem auto;">{{ signing ? i18n.ts.loggingIn : i18n.ts.login }}</MkButton>
-		</div>
-		<div v-if="totpLogin" class="2fa-signin" :class="{ securityKeys: user && user.securityKeys }">
-			<div v-if="user && user.securityKeys" class="twofa-group tap-group">
-				<p>{{ i18n.ts.tapSecurityKey }}</p>
-				<MkButton v-if="!queryingKey" @click="queryKey">
-					{{ i18n.ts.retry }}
-				</MkButton>
-			</div>
-			<div v-if="user && user.securityKeys" class="or-hr">
-				<p class="or-msg">{{ i18n.ts.or }}</p>
-			</div>
-			<div class="twofa-group totp-group">
-				<p style="margin-bottom:0;">{{ i18n.ts.twoStepAuthentication }}</p>
-				<MkInput v-if="user && user.usePasswordLessLogin" v-model="password" type="password" :with-password-toggle="true" required>
-					<template #label>{{ i18n.ts.password }}</template>
-					<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
+	<form
+		class="eppvobhk _monolithic_"
+		:class="{ signing, totpLogin }"
+		@submit.prevent="onSubmit"
+	>
+		<div class="auth _section _formRoot">
+			<div
+				v-show="withAvatar"
+				class="avatar"
+				:style="{
+					backgroundImage: user ? `url('${user.avatarUrl}')` : null,
+					marginBottom: message ? '1.5em' : null,
+				}"
+			></div>
+			<MkInfo v-if="message">
+				{{ message }}
+			</MkInfo>
+			<div v-if="!totpLogin" class="normal-signin">
+				<MkInput
+					v-model="username"
+					class="_formBlock"
+					:placeholder="i18n.ts.username"
+					type="text"
+					pattern="^[a-zA-Z0-9_]+$"
+					:spellcheck="false"
+					autofocus
+					required
+					data-cy-signin-username
+					@update:modelValue="onUsernameChange"
+				>
+					<template #prefix>@</template>
+					<template #suffix>@{{ host }}</template>
 				</MkInput>
-				<MkInput v-model="token" type="text" pattern="^[0-9]{6}$" autocomplete="off" :spellcheck="false" required>
-					<template #label>{{ i18n.ts.token }}</template>
-					<template #prefix><i class="ph-poker-chip ph-bold ph-lg"></i></template>
+				<MkInput
+					v-if="!user || (user && !user.usePasswordLessLogin)"
+					v-model="password"
+					class="_formBlock"
+					:placeholder="i18n.ts.password"
+					type="password"
+					:with-password-toggle="true"
+					required
+					data-cy-signin-password
+				>
+					<template #prefix
+						><i class="ph-lock ph-bold ph-lg"></i
+					></template>
+					<template #caption
+						><button
+							class="_textButton"
+							type="button"
+							@click="resetPassword"
+						>
+							{{ i18n.ts.forgotPassword }}
+						</button></template
+					>
 				</MkInput>
-				<MkButton type="submit" :disabled="signing" primary style="margin: 0 auto;">{{ signing ? i18n.ts.loggingIn : i18n.ts.login }}</MkButton>
+				<MkButton
+					class="_formBlock"
+					type="submit"
+					primary
+					:disabled="signing"
+					style="margin: 1rem auto"
+					>{{ signing ? i18n.ts.loggingIn : i18n.ts.login }}</MkButton
+				>
+			</div>
+			<div
+				v-if="totpLogin"
+				class="2fa-signin"
+				:class="{ securityKeys: user && user.securityKeys }"
+			>
+				<div
+					v-if="user && user.securityKeys"
+					class="twofa-group tap-group"
+				>
+					<p>{{ i18n.ts.tapSecurityKey }}</p>
+					<MkButton v-if="!queryingKey" @click="queryKey">
+						{{ i18n.ts.retry }}
+					</MkButton>
+				</div>
+				<div v-if="user && user.securityKeys" class="or-hr">
+					<p class="or-msg">{{ i18n.ts.or }}</p>
+				</div>
+				<div class="twofa-group totp-group">
+					<p style="margin-bottom: 0">
+						{{ i18n.ts.twoStepAuthentication }}
+					</p>
+					<MkInput
+						v-if="user && user.usePasswordLessLogin"
+						v-model="password"
+						type="password"
+						:with-password-toggle="true"
+						required
+					>
+						<template #label>{{ i18n.ts.password }}</template>
+						<template #prefix
+							><i class="ph-lock ph-bold ph-lg"></i
+						></template>
+					</MkInput>
+					<MkInput
+						v-model="token"
+						type="text"
+						pattern="^[0-9]{6}$"
+						autocomplete="off"
+						:spellcheck="false"
+						required
+					>
+						<template #label>{{ i18n.ts.token }}</template>
+						<template #prefix
+							><i class="ph-poker-chip ph-bold ph-lg"></i
+						></template>
+					</MkInput>
+					<MkButton
+						type="submit"
+						:disabled="signing"
+						primary
+						style="margin: 0 auto"
+						>{{
+							signing ? i18n.ts.loggingIn : i18n.ts.login
+						}}</MkButton
+					>
+				</div>
 			</div>
 		</div>
-	</div>
-	<div class="social _section">
-		<a v-if="meta && meta.enableTwitterIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/twitter`"><i class="ph-twitter-logo ph-bold ph-lg" style="margin-right: 4px;"></i>{{ i18n.t('signinWith', { x: 'Twitter' }) }}</a>
-		<a v-if="meta && meta.enableGithubIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/github`"><i class="ph-github-logo ph-bold ph-lg" style="margin-right: 4px;"></i>{{ i18n.t('signinWith', { x: 'GitHub' }) }}</a>
-		<a v-if="meta && meta.enableDiscordIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/discord`"><i class="ph-discord-logo ph-bold ph-lg" style="margin-right: 4px;"></i>{{ i18n.t('signinWith', { x: 'Discord' }) }}</a>
-	</div>
-</form>
+		<div class="social _section">
+			<a
+				v-if="meta && meta.enableTwitterIntegration"
+				class="_borderButton _gap"
+				:href="`${apiUrl}/signin/twitter`"
+				><i
+					class="ph-twitter-logo ph-bold ph-lg"
+					style="margin-right: 4px"
+				></i
+				>{{ i18n.t("signinWith", { x: "Twitter" }) }}</a
+			>
+			<a
+				v-if="meta && meta.enableGithubIntegration"
+				class="_borderButton _gap"
+				:href="`${apiUrl}/signin/github`"
+				><i
+					class="ph-github-logo ph-bold ph-lg"
+					style="margin-right: 4px"
+				></i
+				>{{ i18n.t("signinWith", { x: "GitHub" }) }}</a
+			>
+			<a
+				v-if="meta && meta.enableDiscordIntegration"
+				class="_borderButton _gap"
+				:href="`${apiUrl}/signin/discord`"
+				><i
+					class="ph-discord-logo ph-bold ph-lg"
+					style="margin-right: 4px"
+				></i
+				>{{ i18n.t("signinWith", { x: "Discord" }) }}</a
+			>
+		</div>
+	</form>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent } from 'vue';
-import { toUnicode } from 'punycode/';
-import { showSuspendedDialog } from '../scripts/show-suspended-dialog';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import { apiUrl, host as configHost } from '@/config';
-import { byteify, hexify } from '@/scripts/2fa';
-import * as os from '@/os';
-import { login } from '@/account';
-import { instance } from '@/instance';
-import { i18n } from '@/i18n';
+import { defineAsyncComponent } from "vue";
+import { toUnicode } from "punycode/";
+import { showSuspendedDialog } from "../scripts/show-suspended-dialog";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkInfo from "@/components/MkInfo.vue";
+import { apiUrl, host as configHost } from "@/config";
+import { byteify, hexify } from "@/scripts/2fa";
+import * as os from "@/os";
+import { login } from "@/account";
+import { instance } from "@/instance";
+import { i18n } from "@/i18n";
 
 let signing = $ref(false);
 let user = $ref(null);
-let username = $ref('');
-let password = $ref('');
-let token = $ref('');
+let username = $ref("");
+let password = $ref("");
+let token = $ref("");
 let host = $ref(toUnicode(configHost));
 let totpLogin = $ref(false);
 let credential = $ref(null);
@@ -78,7 +187,7 @@ let reCaptchaResponse = $ref(null);
 const meta = $computed(() => instance);
 
 const emit = defineEmits<{
-	(ev: 'login', v: any): void;
+	(ev: "login", v: any): void;
 }>();
 
 const props = defineProps({
@@ -95,18 +204,21 @@ const props = defineProps({
 	message: {
 		type: String,
 		required: false,
-		default: '',
+		default: "",
 	},
 });
 
 function onUsernameChange() {
-	os.api('users/show', {
+	os.api("users/show", {
 		username: username,
-	}).then(userResponse => {
-		user = userResponse;
-	}, () => {
-		user = null;
-	});
+	}).then(
+		(userResponse) => {
+			user = userResponse;
+		},
+		() => {
+			user = null;
+		}
+	);
 }
 
 function onLogin(res) {
@@ -117,105 +229,116 @@ function onLogin(res) {
 
 function queryKey() {
 	queryingKey = true;
-	return navigator.credentials.get({
-		publicKey: {
-			challenge: byteify(challengeData.challenge, 'base64'),
-			allowCredentials: challengeData.securityKeys.map(key => ({
-				id: byteify(key.id, 'hex'),
-				type: 'public-key',
-				transports: ['usb', 'nfc', 'ble', 'internal'],
-			})),
-			timeout: 60 * 1000,
-		},
-	}).catch(() => {
-		queryingKey = false;
-		return Promise.reject(null);
-	}).then(credential => {
-		queryingKey = false;
-		signing = true;
-		return os.api('signin', {
-			username,
-			password,
-			signature: hexify(credential.response.signature),
-			authenticatorData: hexify(credential.response.authenticatorData),
-			clientDataJSON: hexify(credential.response.clientDataJSON),
-			credentialId: credential.id,
-			challengeId: challengeData.challengeId,
-			'hcaptcha-response': hCaptchaResponse,
-			'g-recaptcha-response': reCaptchaResponse,
+	return navigator.credentials
+		.get({
+			publicKey: {
+				challenge: byteify(challengeData.challenge, "base64"),
+				allowCredentials: challengeData.securityKeys.map((key) => ({
+					id: byteify(key.id, "hex"),
+					type: "public-key",
+					transports: ["usb", "nfc", "ble", "internal"],
+				})),
+				timeout: 60 * 1000,
+			},
+		})
+		.catch(() => {
+			queryingKey = false;
+			return Promise.reject(null);
+		})
+		.then((credential) => {
+			queryingKey = false;
+			signing = true;
+			return os.api("signin", {
+				username,
+				password,
+				signature: hexify(credential.response.signature),
+				authenticatorData: hexify(
+					credential.response.authenticatorData
+				),
+				clientDataJSON: hexify(credential.response.clientDataJSON),
+				credentialId: credential.id,
+				challengeId: challengeData.challengeId,
+				"hcaptcha-response": hCaptchaResponse,
+				"g-recaptcha-response": reCaptchaResponse,
+			});
+		})
+		.then((res) => {
+			emit("login", res);
+			return onLogin(res);
+		})
+		.catch((err) => {
+			if (err === null) return;
+			os.alert({
+				type: "error",
+				text: i18n.ts.signinFailed,
+			});
+			signing = false;
 		});
-	}).then(res => {
-		emit('login', res);
-		return onLogin(res);
-	}).catch(err => {
-		if (err === null) return;
-		os.alert({
-			type: 'error',
-			text: i18n.ts.signinFailed,
-		});
-		signing = false;
-	});
 }
 
 function onSubmit() {
 	signing = true;
-	console.log('submit');
+	console.log("submit");
 	if (!totpLogin && user && user.twoFactorEnabled) {
 		if (window.PublicKeyCredential && user.securityKeys) {
-			os.api('signin', {
+			os.api("signin", {
 				username,
 				password,
-				'hcaptcha-response': hCaptchaResponse,
-				'g-recaptcha-response': reCaptchaResponse,
-			}).then(res => {
-				totpLogin = true;
-				signing = false;
-				challengeData = res;
-				return queryKey();
-			}).catch(loginFailed);
+				"hcaptcha-response": hCaptchaResponse,
+				"g-recaptcha-response": reCaptchaResponse,
+			})
+				.then((res) => {
+					totpLogin = true;
+					signing = false;
+					challengeData = res;
+					return queryKey();
+				})
+				.catch(loginFailed);
 		} else {
 			totpLogin = true;
 			signing = false;
 		}
 	} else {
-		os.api('signin', {
+		os.api("signin", {
 			username,
 			password,
-			'hcaptcha-response': hCaptchaResponse,
-			'g-recaptcha-response': reCaptchaResponse,
+			"hcaptcha-response": hCaptchaResponse,
+			"g-recaptcha-response": reCaptchaResponse,
 			token: user && user.twoFactorEnabled ? token : undefined,
-		}).then(res => {
-			emit('login', res);
-			onLogin(res);
-		}).catch(loginFailed);
+		})
+			.then((res) => {
+				emit("login", res);
+				onLogin(res);
+			})
+			.catch(loginFailed);
 	}
 }
 
 function loginFailed(err) {
 	switch (err.id) {
-		case '6cc579cc-885d-43d8-95c2-b8c7fc963280': {
+		case "6cc579cc-885d-43d8-95c2-b8c7fc963280": {
 			os.alert({
-				type: 'error',
+				type: "error",
 				title: i18n.ts.loginFailed,
 				text: i18n.ts.noSuchUser,
 			});
 			break;
 		}
-		case '932c904e-9460-45b7-9ce6-7ed33be7eb2c': {
+		case "932c904e-9460-45b7-9ce6-7ed33be7eb2c": {
 			os.alert({
-				type: 'error',
+				type: "error",
 				title: i18n.ts.loginFailed,
 				text: i18n.ts.incorrectPassword,
 			});
 			break;
 		}
-		case 'e03a5f46-d309-4865-9b69-56282d94e1eb': {
+		case "e03a5f46-d309-4865-9b69-56282d94e1eb": {
 			showSuspendedDialog();
 			break;
 		}
-		case '22d05606-fbcf-421a-a2db-b32610dcfd1b': {
+		case "22d05606-fbcf-421a-a2db-b32610dcfd1b": {
 			os.alert({
-				type: 'error',
+				type: "error",
 				title: i18n.ts.loginFailed,
 				text: i18n.ts.rateLimitExceeded,
 			});
@@ -224,7 +347,7 @@ function loginFailed(err) {
 		default: {
 			console.log(err);
 			os.alert({
-				type: 'error',
+				type: "error",
 				title: i18n.ts.loginFailed,
 				text: JSON.stringify(err),
 			});
@@ -237,8 +360,12 @@ function loginFailed(err) {
 }
 
 function resetPassword() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkForgotPassword.vue')), {}, {
-	}, 'closed');
+	os.popup(
+		defineAsyncComponent(() => import("@/components/MkForgotPassword.vue")),
+		{},
+		{},
+		"closed"
+	);
 }
 </script>
 
diff --git a/packages/client/src/components/MkSigninDialog.vue b/packages/client/src/components/MkSigninDialog.vue
index 7e35e45c5..7989255b1 100644
--- a/packages/client/src/components/MkSigninDialog.vue
+++ b/packages/client/src/components/MkSigninDialog.vue
@@ -1,45 +1,48 @@
 <template>
-<XModalWindow
-	ref="dialog"
-	:width="400"
-	@close="onClose"
-	@closed="emit('closed')"
->
-	<template #header>{{ i18n.ts.login }}</template>
+	<XModalWindow
+		ref="dialog"
+		:width="400"
+		@close="onClose"
+		@closed="emit('closed')"
+	>
+		<template #header>{{ i18n.ts.login }}</template>
 
-	<MkSignin :auto-set="autoSet" :message="message" @login="onLogin"/>
-</XModalWindow>
+		<MkSignin :auto-set="autoSet" :message="message" @login="onLogin" />
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkSignin from '@/components/MkSignin.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import MkSignin from "@/components/MkSignin.vue";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	autoSet?: boolean;
-	message?: string,
-}>(), {
-	autoSet: false,
-	message: '',
-});
+const props = withDefaults(
+	defineProps<{
+		autoSet?: boolean;
+		message?: string;
+	}>(),
+	{
+		autoSet: false,
+		message: "",
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'done'): void;
-	(ev: 'closed'): void;
-	(ev: 'cancelled'): void;
+	(ev: "done"): void;
+	(ev: "closed"): void;
+	(ev: "cancelled"): void;
 }>();
 
 const dialog = $ref<InstanceType<typeof XModalWindow>>();
 
 function onClose() {
-	emit('cancelled');
+	emit("cancelled");
 	dialog.close();
 }
 
 function onLogin(res) {
-	emit('done', res);
+	emit("done", res);
 	dialog.close();
 }
 </script>
diff --git a/packages/client/src/components/MkSignup.vue b/packages/client/src/components/MkSignup.vue
index b3f7f473c..7bb0952f7 100644
--- a/packages/client/src/components/MkSignup.vue
+++ b/packages/client/src/components/MkSignup.vue
@@ -1,93 +1,306 @@
 <template>
-<form class="qlvuhzng _formRoot" autocomplete="new-password" @submit.prevent="onSubmit">
-	<MkInput v-if="instance.disableRegistration" v-model="invitationCode" class="_formBlock" type="text" :spellcheck="false" required data-cy-signup-invitation-code @update:modelValue="onChangeInvitationCode">
-		<template #label>{{ i18n.ts.invitationCode }}</template>
-		<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-	</MkInput>
-	<div v-if="!instance.disableRegistration || (instance.disableRegistration && invitationState === 'entered')">
-		<MkInput v-model="username" class="_formBlock" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :spellcheck="false" required data-cy-signup-username @update:modelValue="onChangeUsername">
-			<template #label>{{ i18n.ts.username }} <div v-tooltip:dialog="i18n.ts.usernameInfo" class="_button _help"><i class="ph-question ph-bold"></i></div></template>
-			<template #prefix>@</template>
-			<template #suffix>@{{ host }}</template>
-			<template #caption>
-				<span v-if="usernameState === 'wait'" style="color:#6e6a86"><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i> {{ i18n.ts.checking }}</span>
-				<span v-else-if="usernameState === 'ok'" style="color: var(--success)"><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.available }}</span>
-				<span v-else-if="usernameState === 'unavailable'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.unavailable }}</span>
-				<span v-else-if="usernameState === 'error'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.error }}</span>
-				<span v-else-if="usernameState === 'invalid-format'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.usernameInvalidFormat }}</span>
-				<span v-else-if="usernameState === 'min-range'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.tooShort }}</span>
-				<span v-else-if="usernameState === 'max-range'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.tooLong }}</span>
-			</template>
+	<form
+		class="qlvuhzng _formRoot"
+		autocomplete="new-password"
+		@submit.prevent="onSubmit"
+	>
+		<MkInput
+			v-if="instance.disableRegistration"
+			v-model="invitationCode"
+			class="_formBlock"
+			type="text"
+			:spellcheck="false"
+			required
+			data-cy-signup-invitation-code
+			@update:modelValue="onChangeInvitationCode"
+		>
+			<template #label>{{ i18n.ts.invitationCode }}</template>
+			<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
 		</MkInput>
-		<MkInput v-if="instance.emailRequiredForSignup" v-model="email" class="_formBlock" :debounce="true" type="email" :spellcheck="false" required data-cy-signup-email @update:modelValue="onChangeEmail">
-			<template #label>{{ i18n.ts.emailAddress }} <div v-tooltip:dialog="i18n.ts._signup.emailAddressInfo" class="_button _help"><i class="ph-question ph-bold"></i></div></template>
-			<template #prefix><i class="ph-envelope-simple-open ph-bold ph-lg"></i></template>
-			<template #caption>
-				<span v-if="emailState === 'wait'" style="color:#6e6a86"><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i> {{ i18n.ts.checking }}</span>
-				<span v-else-if="emailState === 'ok'" style="color: var(--success)"><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.available }}</span>
-				<span v-else-if="emailState === 'unavailable:used'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.used }}</span>
-				<span v-else-if="emailState === 'unavailable:format'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.format }}</span>
-				<span v-else-if="emailState === 'unavailable:disposable'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.disposable }}</span>
-				<span v-else-if="emailState === 'unavailable:mx'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.mx }}</span>
-				<span v-else-if="emailState === 'unavailable:smtp'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts._emailUnavailable.smtp }}</span>
-				<span v-else-if="emailState === 'unavailable'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.unavailable }}</span>
-				<span v-else-if="emailState === 'error'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.error }}</span>
-			</template>
-		</MkInput>
-		<MkInput v-model="password" class="_formBlock" type="password" autocomplete="new-password" required data-cy-signup-password @update:modelValue="onChangePassword">
-			<template #label>{{ i18n.ts.password }}</template>
-			<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
-			<template #caption>
-				<span v-if="passwordStrength == 'low'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.weakPassword }}</span>
-				<span v-if="passwordStrength == 'medium'" style="color: var(--warn)"><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.normalPassword }}</span>
-				<span v-if="passwordStrength == 'high'" style="color: var(--success)"><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.strongPassword }}</span>
-			</template>
-		</MkInput>
-		<MkInput v-model="retypedPassword" class="_formBlock" type="password" autocomplete="new-password" required data-cy-signup-password-retype @update:modelValue="onChangePasswordRetype">
-			<template #label>{{ i18n.ts.password }} ({{ i18n.ts.retype }})</template>
-			<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
-			<template #caption>
-				<span v-if="passwordRetypeState == 'match'" style="color: var(--success)"><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.passwordMatched }}</span>
-				<span v-if="passwordRetypeState == 'not-match'" style="color: var(--error)"><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.passwordNotMatched }}</span>
-			</template>
-		</MkInput>
-		<MkSwitch v-if="instance.tosUrl" v-model="ToSAgreement" class="_formBlock tou">
-			<I18n :src="i18n.ts.agreeTo">
-				<template #0>
-					<a :href="instance.tosUrl" class="_link" target="_blank">{{ i18n.ts.tos }}</a>
+		<div
+			v-if="
+				!instance.disableRegistration ||
+				(instance.disableRegistration && invitationState === 'entered')
+			"
+		>
+			<MkInput
+				v-model="username"
+				class="_formBlock"
+				type="text"
+				pattern="^[a-zA-Z0-9_]{1,20}$"
+				:spellcheck="false"
+				required
+				data-cy-signup-username
+				@update:modelValue="onChangeUsername"
+			>
+				<template #label
+					>{{ i18n.ts.username }}
+					<div
+						v-tooltip:dialog="i18n.ts.usernameInfo"
+						class="_button _help"
+					>
+						<i class="ph-question ph-bold"></i></div
+				></template>
+				<template #prefix>@</template>
+				<template #suffix>@{{ host }}</template>
+				<template #caption>
+					<span v-if="usernameState === 'wait'" style="color: #6e6a86"
+						><i
+							class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"
+						></i>
+						{{ i18n.ts.checking }}</span
+					>
+					<span
+						v-else-if="usernameState === 'ok'"
+						style="color: var(--success)"
+						><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.available }}</span
+					>
+					<span
+						v-else-if="usernameState === 'unavailable'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.unavailable }}</span
+					>
+					<span
+						v-else-if="usernameState === 'error'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.error }}</span
+					>
+					<span
+						v-else-if="usernameState === 'invalid-format'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.usernameInvalidFormat }}</span
+					>
+					<span
+						v-else-if="usernameState === 'min-range'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.tooShort }}</span
+					>
+					<span
+						v-else-if="usernameState === 'max-range'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.tooLong }}</span
+					>
 				</template>
-			</I18n>
-		</MkSwitch>
-		<MkCaptcha v-if="instance.enableHcaptcha" ref="hcaptcha" v-model="hCaptchaResponse" class="_formBlock captcha" provider="hcaptcha" :sitekey="instance.hcaptchaSiteKey"/>
-		<MkCaptcha v-if="instance.enableRecaptcha" ref="recaptcha" v-model="reCaptchaResponse" class="_formBlock captcha" provider="recaptcha" :sitekey="instance.recaptchaSiteKey"/>
-		<MkButton class="_formBlock" type="submit" :disabled="shouldDisableSubmitting" gradate data-cy-signup-submit>{{ i18n.ts.start }}</MkButton>
-	</div>
-</form>
+			</MkInput>
+			<MkInput
+				v-if="instance.emailRequiredForSignup"
+				v-model="email"
+				class="_formBlock"
+				:debounce="true"
+				type="email"
+				:spellcheck="false"
+				required
+				data-cy-signup-email
+				@update:modelValue="onChangeEmail"
+			>
+				<template #label
+					>{{ i18n.ts.emailAddress }}
+					<div
+						v-tooltip:dialog="i18n.ts._signup.emailAddressInfo"
+						class="_button _help"
+					>
+						<i class="ph-question ph-bold"></i></div
+				></template>
+				<template #prefix
+					><i class="ph-envelope-simple-open ph-bold ph-lg"></i
+				></template>
+				<template #caption>
+					<span v-if="emailState === 'wait'" style="color: #6e6a86"
+						><i
+							class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"
+						></i>
+						{{ i18n.ts.checking }}</span
+					>
+					<span
+						v-else-if="emailState === 'ok'"
+						style="color: var(--success)"
+						><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.available }}</span
+					>
+					<span
+						v-else-if="emailState === 'unavailable:used'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts._emailUnavailable.used }}</span
+					>
+					<span
+						v-else-if="emailState === 'unavailable:format'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts._emailUnavailable.format }}</span
+					>
+					<span
+						v-else-if="emailState === 'unavailable:disposable'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts._emailUnavailable.disposable }}</span
+					>
+					<span
+						v-else-if="emailState === 'unavailable:mx'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts._emailUnavailable.mx }}</span
+					>
+					<span
+						v-else-if="emailState === 'unavailable:smtp'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts._emailUnavailable.smtp }}</span
+					>
+					<span
+						v-else-if="emailState === 'unavailable'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.unavailable }}</span
+					>
+					<span
+						v-else-if="emailState === 'error'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.error }}</span
+					>
+				</template>
+			</MkInput>
+			<MkInput
+				v-model="password"
+				class="_formBlock"
+				type="password"
+				autocomplete="new-password"
+				required
+				data-cy-signup-password
+				@update:modelValue="onChangePassword"
+			>
+				<template #label>{{ i18n.ts.password }}</template>
+				<template #prefix
+					><i class="ph-lock ph-bold ph-lg"></i
+				></template>
+				<template #caption>
+					<span
+						v-if="passwordStrength == 'low'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.weakPassword }}</span
+					>
+					<span
+						v-if="passwordStrength == 'medium'"
+						style="color: var(--warn)"
+						><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.normalPassword }}</span
+					>
+					<span
+						v-if="passwordStrength == 'high'"
+						style="color: var(--success)"
+						><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.strongPassword }}</span
+					>
+				</template>
+			</MkInput>
+			<MkInput
+				v-model="retypedPassword"
+				class="_formBlock"
+				type="password"
+				autocomplete="new-password"
+				required
+				data-cy-signup-password-retype
+				@update:modelValue="onChangePasswordRetype"
+			>
+				<template #label
+					>{{ i18n.ts.password }} ({{ i18n.ts.retype }})</template
+				>
+				<template #prefix
+					><i class="ph-lock ph-bold ph-lg"></i
+				></template>
+				<template #caption>
+					<span
+						v-if="passwordRetypeState == 'match'"
+						style="color: var(--success)"
+						><i class="ph-check ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.passwordMatched }}</span
+					>
+					<span
+						v-if="passwordRetypeState == 'not-match'"
+						style="color: var(--error)"
+						><i class="ph-warning ph-bold ph-lg ph-fw ph-lg"></i>
+						{{ i18n.ts.passwordNotMatched }}</span
+					>
+				</template>
+			</MkInput>
+			<MkSwitch
+				v-if="instance.tosUrl"
+				v-model="ToSAgreement"
+				class="_formBlock tou"
+			>
+				<I18n :src="i18n.ts.agreeTo">
+					<template #0>
+						<a
+							:href="instance.tosUrl"
+							class="_link"
+							target="_blank"
+							>{{ i18n.ts.tos }}</a
+						>
+					</template>
+				</I18n>
+			</MkSwitch>
+			<MkCaptcha
+				v-if="instance.enableHcaptcha"
+				ref="hcaptcha"
+				v-model="hCaptchaResponse"
+				class="_formBlock captcha"
+				provider="hcaptcha"
+				:sitekey="instance.hcaptchaSiteKey"
+			/>
+			<MkCaptcha
+				v-if="instance.enableRecaptcha"
+				ref="recaptcha"
+				v-model="reCaptchaResponse"
+				class="_formBlock captcha"
+				provider="recaptcha"
+				:sitekey="instance.recaptchaSiteKey"
+			/>
+			<MkButton
+				class="_formBlock"
+				type="submit"
+				:disabled="shouldDisableSubmitting"
+				gradate
+				data-cy-signup-submit
+				>{{ i18n.ts.start }}</MkButton
+			>
+		</div>
+	</form>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import getPasswordStrength from 'syuilo-password-strength';
-import { toUnicode } from 'punycode/';
-import MkButton from './MkButton.vue';
-import MkInput from './form/input.vue';
-import MkSwitch from './form/switch.vue';
-import MkCaptcha from '@/components/MkCaptcha.vue';
-import * as config from '@/config';
-import * as os from '@/os';
-import { login } from '@/account';
-import { instance } from '@/instance';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import getPasswordStrength from "syuilo-password-strength";
+import { toUnicode } from "punycode/";
+import MkButton from "./MkButton.vue";
+import MkInput from "./form/input.vue";
+import MkSwitch from "./form/switch.vue";
+import MkCaptcha from "@/components/MkCaptcha.vue";
+import * as config from "@/config";
+import * as os from "@/os";
+import { login } from "@/account";
+import { instance } from "@/instance";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	autoSet?: boolean;
-}>(), {
-	autoSet: false,
-});
+const props = withDefaults(
+	defineProps<{
+		autoSet?: boolean;
+	}>(),
+	{
+		autoSet: false,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'signup', user: Record<string, any>): void;
-	(ev: 'signupEmailPending'): void;
+	(ev: "signup", user: Record<string, any>): void;
+	(ev: "signupEmailPending"): void;
 }>();
 
 const host = toUnicode(config.host);
@@ -95,49 +308,71 @@ const host = toUnicode(config.host);
 let hcaptcha = $ref();
 let recaptcha = $ref();
 
-let username: string = $ref('');
-let password: string = $ref('');
-let retypedPassword: string = $ref('');
-let invitationCode: string = $ref('');
-let email = $ref('');
-let usernameState: null | 'wait' | 'ok' | 'unavailable' | 'error' | 'invalid-format' | 'min-range' | 'max-range' = $ref(null);
-let invitationState: null | 'entered' = $ref(null);
-let emailState: null | 'wait' | 'ok' | 'unavailable:used' | 'unavailable:format' | 'unavailable:disposable' | 'unavailable:mx' | 'unavailable:smtp' | 'unavailable' | 'error' = $ref(null);
-let passwordStrength: '' | 'low' | 'medium' | 'high' = $ref('');
-let passwordRetypeState: null | 'match' | 'not-match' = $ref(null);
+let username: string = $ref("");
+let password: string = $ref("");
+let retypedPassword: string = $ref("");
+let invitationCode: string = $ref("");
+let email = $ref("");
+let usernameState:
+	| null
+	| "wait"
+	| "ok"
+	| "unavailable"
+	| "error"
+	| "invalid-format"
+	| "min-range"
+	| "max-range" = $ref(null);
+let invitationState: null | "entered" = $ref(null);
+let emailState:
+	| null
+	| "wait"
+	| "ok"
+	| "unavailable:used"
+	| "unavailable:format"
+	| "unavailable:disposable"
+	| "unavailable:mx"
+	| "unavailable:smtp"
+	| "unavailable"
+	| "error" = $ref(null);
+let passwordStrength: "" | "low" | "medium" | "high" = $ref("");
+let passwordRetypeState: null | "match" | "not-match" = $ref(null);
 let submitting: boolean = $ref(false);
 let ToSAgreement: boolean = $ref(false);
 let hCaptchaResponse = $ref(null);
 let reCaptchaResponse = $ref(null);
 
 const shouldDisableSubmitting = $computed((): boolean => {
-	return submitting ||
-		instance.tosUrl && !ToSAgreement ||
-		instance.enableHcaptcha && !hCaptchaResponse ||
-		instance.enableRecaptcha && !reCaptchaResponse ||
-		passwordRetypeState === 'not-match';
+	return (
+		submitting ||
+		(instance.tosUrl && !ToSAgreement) ||
+		(instance.enableHcaptcha && !hCaptchaResponse) ||
+		(instance.enableRecaptcha && !reCaptchaResponse) ||
+		passwordRetypeState === "not-match"
+	);
 });
 
 function onChangeInvitationCode(): void {
-	if (invitationCode === '') {
+	if (invitationCode === "") {
 		invitationState = null;
 		return;
 	}
-	invitationState = 'entered';
+	invitationState = "entered";
 }
 
 function onChangeUsername(): void {
-	if (username === '') {
+	if (username === "") {
 		usernameState = null;
 		return;
 	}
 
 	{
-		const err =
-			!username.match(/^[a-zA-Z0-9_]+$/) ? 'invalid-format' :
-			username.length < 1 ? 'min-range' :
-			username.length > 20 ? 'max-range' :
-			null;
+		const err = !username.match(/^[a-zA-Z0-9_]+$/)
+			? "invalid-format"
+			: username.length < 1
+			? "min-range"
+			: username.length > 20
+			? "max-range"
+			: null;
 
 		if (err) {
 			usernameState = err;
@@ -145,100 +380,113 @@ function onChangeUsername(): void {
 		}
 	}
 
-	usernameState = 'wait';
+	usernameState = "wait";
 
-	os.api('username/available', {
+	os.api("username/available", {
 		username,
-	}).then(result => {
-		usernameState = result.available ? 'ok' : 'unavailable';
-	}).catch(() => {
-		usernameState = 'error';
-	});
+	})
+		.then((result) => {
+			usernameState = result.available ? "ok" : "unavailable";
+		})
+		.catch(() => {
+			usernameState = "error";
+		});
 }
 
 function onChangeEmail(): void {
-	if (email === '') {
+	if (email === "") {
 		emailState = null;
 		return;
 	}
 
-	emailState = 'wait';
+	emailState = "wait";
 
-	os.api('email-address/available', {
+	os.api("email-address/available", {
 		emailAddress: email,
-	}).then(result => {
-		emailState = result.available ? 'ok' :
-			result.reason === 'used' ? 'unavailable:used' :
-			result.reason === 'format' ? 'unavailable:format' :
-			result.reason === 'disposable' ? 'unavailable:disposable' :
-			result.reason === 'mx' ? 'unavailable:mx' :
-			result.reason === 'smtp' ? 'unavailable:smtp' :
-			'unavailable';
-	}).catch(() => {
-		emailState = 'error';
-	});
+	})
+		.then((result) => {
+			emailState = result.available
+				? "ok"
+				: result.reason === "used"
+				? "unavailable:used"
+				: result.reason === "format"
+				? "unavailable:format"
+				: result.reason === "disposable"
+				? "unavailable:disposable"
+				: result.reason === "mx"
+				? "unavailable:mx"
+				: result.reason === "smtp"
+				? "unavailable:smtp"
+				: "unavailable";
+		})
+		.catch(() => {
+			emailState = "error";
+		});
 }
 
 function onChangePassword(): void {
-	if (password === '') {
-		passwordStrength = '';
+	if (password === "") {
+		passwordStrength = "";
 		return;
 	}
 
 	const strength = getPasswordStrength(password);
-	passwordStrength = strength > 0.7 ? 'high' : strength > 0.3 ? 'medium' : 'low';
+	passwordStrength =
+		strength > 0.7 ? "high" : strength > 0.3 ? "medium" : "low";
 }
 
 function onChangePasswordRetype(): void {
-	if (retypedPassword === '') {
+	if (retypedPassword === "") {
 		passwordRetypeState = null;
 		return;
 	}
 
-	passwordRetypeState = password === retypedPassword ? 'match' : 'not-match';
+	passwordRetypeState = password === retypedPassword ? "match" : "not-match";
 }
 
 function onSubmit(): void {
 	if (submitting) return;
 	submitting = true;
 
-	os.api('signup', {
+	os.api("signup", {
 		username,
 		password,
 		emailAddress: email,
 		invitationCode,
-		'hcaptcha-response': hCaptchaResponse,
-		'g-recaptcha-response': reCaptchaResponse,
-	}).then(() => {
-		if (instance.emailRequiredForSignup) {
+		"hcaptcha-response": hCaptchaResponse,
+		"g-recaptcha-response": reCaptchaResponse,
+	})
+		.then(() => {
+			if (instance.emailRequiredForSignup) {
+				os.alert({
+					type: "success",
+					title: i18n.ts._signup.almostThere,
+					text: i18n.t("_signup.emailSent", { email }),
+				});
+				emit("signupEmailPending");
+			} else {
+				os.api("signin", {
+					username,
+					password,
+				}).then((res) => {
+					emit("signup", res);
+
+					if (props.autoSet) {
+						login(res.i);
+					}
+				});
+			}
+		})
+		.catch(() => {
+			submitting = false;
+			hcaptcha.reset?.();
+			recaptcha.reset?.();
+
 			os.alert({
-				type: 'success',
-				title: i18n.ts._signup.almostThere,
-				text: i18n.t('_signup.emailSent', { email }),
+				type: "error",
+				text: i18n.ts.somethingHappened,
 			});
-			emit('signupEmailPending');
-		} else {
-			os.api('signin', {
-				username,
-				password,
-			}).then(res => {
-				emit('signup', res);
-
-				if (props.autoSet) {
-					login(res.i);
-				}
-			});
-		}
-	}).catch(() => {
-		submitting = false;
-		hcaptcha.reset?.();
-		recaptcha.reset?.();
-
-		os.alert({
-			type: 'error',
-			text: i18n.ts.somethingHappened,
 		});
-	});
 }
 </script>
 
diff --git a/packages/client/src/components/MkSignupDialog.vue b/packages/client/src/components/MkSignupDialog.vue
index 8aceb62d1..282b8f989 100644
--- a/packages/client/src/components/MkSignupDialog.vue
+++ b/packages/client/src/components/MkSignupDialog.vue
@@ -1,41 +1,48 @@
 <template>
-<XModalWindow
-	ref="dialog"
-	:width="400"
-	@close="dialog!.close()"
-	@closed="$emit('closed')"
->
-	<template #header>{{ i18n.ts.signup }}</template>
+	<XModalWindow
+		ref="dialog"
+		:width="400"
+		@close="dialog!.close()"
+		@closed="$emit('closed')"
+	>
+		<template #header>{{ i18n.ts.signup }}</template>
 
-	<div class="_monolithic_">
-		<div class="_section">
-			<XSignup :auto-set="autoSet" @signup="onSignup" @signup-email-pending="onSignupEmailPending"/>
+		<div class="_monolithic_">
+			<div class="_section">
+				<XSignup
+					:auto-set="autoSet"
+					@signup="onSignup"
+					@signup-email-pending="onSignupEmailPending"
+				/>
+			</div>
 		</div>
-	</div>
-</XModalWindow>
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XSignup from '@/components/MkSignup.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import XSignup from "@/components/MkSignup.vue";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	autoSet?: boolean;
-}>(), {
-	autoSet: false,
-});
+const props = withDefaults(
+	defineProps<{
+		autoSet?: boolean;
+	}>(),
+	{
+		autoSet: false,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'done'): void;
-	(ev: 'closed'): void;
+	(ev: "done"): void;
+	(ev: "closed"): void;
 }>();
 
 const dialog = $ref<InstanceType<typeof XModalWindow>>();
 
 function onSignup(res) {
-	emit('done', res);
+	emit("done", res);
 	dialog?.close();
 }
 
diff --git a/packages/client/src/components/MkSparkle.vue b/packages/client/src/components/MkSparkle.vue
index 2311adce8..a5a9053d2 100644
--- a/packages/client/src/components/MkSparkle.vue
+++ b/packages/client/src/components/MkSparkle.vue
@@ -1,9 +1,9 @@
 <template>
-<span class="mk-sparkle">
-	<span ref="el">
-		<slot></slot>
-	</span>
-	<!-- なぜか path に対する key が機能しないため
+	<span class="mk-sparkle">
+		<span ref="el">
+			<slot></slot>
+		</span>
+		<!-- なぜか path に対する key が機能しないため
 	<svg :width="width" :height="height" :viewBox="`0 0 ${width} ${height}`" xmlns="http://www.w3.org/2000/svg">
 		<path v-for="particle in particles" :key="particle.id" style="transform-origin: center; transform-box: fill-box;"
 			:transform="`translate(${particle.x} ${particle.y})`"
@@ -32,46 +32,53 @@
 		</path>
 	</svg>
 	-->
-	<svg v-for="particle in particles" :key="particle.id" :width="width" :height="height" :viewBox="`0 0 ${width} ${height}`" xmlns="http://www.w3.org/2000/svg">
-		<path
-			style="transform-origin: center; transform-box: fill-box;"
-			:transform="`translate(${particle.x} ${particle.y})`"
-			:fill="particle.color"
-			d="M29.427,2.011C29.721,0.83 30.782,0 32,0C33.218,0 34.279,0.83 34.573,2.011L39.455,21.646C39.629,22.347 39.991,22.987 40.502,23.498C41.013,24.009 41.653,24.371 42.354,24.545L61.989,29.427C63.17,29.721 64,30.782 64,32C64,33.218 63.17,34.279 61.989,34.573L42.354,39.455C41.653,39.629 41.013,39.991 40.502,40.502C39.991,41.013 39.629,41.653 39.455,42.354L34.573,61.989C34.279,63.17 33.218,64 32,64C30.782,64 29.721,63.17 29.427,61.989L24.545,42.354C24.371,41.653 24.009,41.013 23.498,40.502C22.987,39.991 22.347,39.629 21.646,39.455L2.011,34.573C0.83,34.279 0,33.218 0,32C0,30.782 0.83,29.721 2.011,29.427L21.646,24.545C22.347,24.371 22.987,24.009 23.498,23.498C24.009,22.987 24.371,22.347 24.545,21.646L29.427,2.011Z"
+		<svg
+			v-for="particle in particles"
+			:key="particle.id"
+			:width="width"
+			:height="height"
+			:viewBox="`0 0 ${width} ${height}`"
+			xmlns="http://www.w3.org/2000/svg"
 		>
-			<animateTransform
-				attributeName="transform"
-				attributeType="XML"
-				type="rotate"
-				from="0 0 0"
-				to="360 0 0"
-				:dur="`${particle.dur}ms`"
-				repeatCount="1"
-				additive="sum"
-			/>
-			<animateTransform
-				attributeName="transform"
-				attributeType="XML"
-				type="scale"
-				:values="`0; ${particle.size}; 0`"
-				:dur="`${particle.dur}ms`"
-				repeatCount="1"
-				additive="sum"
-			/>
-		</path>
-	</svg>
-</span>
+			<path
+				style="transform-origin: center; transform-box: fill-box"
+				:transform="`translate(${particle.x} ${particle.y})`"
+				:fill="particle.color"
+				d="M29.427,2.011C29.721,0.83 30.782,0 32,0C33.218,0 34.279,0.83 34.573,2.011L39.455,21.646C39.629,22.347 39.991,22.987 40.502,23.498C41.013,24.009 41.653,24.371 42.354,24.545L61.989,29.427C63.17,29.721 64,30.782 64,32C64,33.218 63.17,34.279 61.989,34.573L42.354,39.455C41.653,39.629 41.013,39.991 40.502,40.502C39.991,41.013 39.629,41.653 39.455,42.354L34.573,61.989C34.279,63.17 33.218,64 32,64C30.782,64 29.721,63.17 29.427,61.989L24.545,42.354C24.371,41.653 24.009,41.013 23.498,40.502C22.987,39.991 22.347,39.629 21.646,39.455L2.011,34.573C0.83,34.279 0,33.218 0,32C0,30.782 0.83,29.721 2.011,29.427L21.646,24.545C22.347,24.371 22.987,24.009 23.498,23.498C24.009,22.987 24.371,22.347 24.545,21.646L29.427,2.011Z"
+			>
+				<animateTransform
+					attributeName="transform"
+					attributeType="XML"
+					type="rotate"
+					from="0 0 0"
+					to="360 0 0"
+					:dur="`${particle.dur}ms`"
+					repeatCount="1"
+					additive="sum"
+				/>
+				<animateTransform
+					attributeName="transform"
+					attributeType="XML"
+					type="scale"
+					:values="`0; ${particle.size}; 0`"
+					:dur="`${particle.dur}ms`"
+					repeatCount="1"
+					additive="sum"
+				/>
+			</path>
+		</svg>
+	</span>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import { reducedMotion } from '@/scripts/reduced-motion';
+import { onMounted, onUnmounted, ref } from "vue";
+import { reducedMotion } from "@/scripts/reduced-motion";
 
 const particles = ref([]);
 const el = ref<HTMLElement>();
 const width = ref(0);
 const height = ref(0);
-const colors = ['#eb6f92', '#9ccfd8', '#f6c177', '#f6c177', '#f6c177'];
+const colors = ["#eb6f92", "#9ccfd8", "#f6c177", "#f6c177", "#f6c177"];
 let stop = false;
 let ro: ResizeObserver | undefined;
 
@@ -84,25 +91,27 @@ onMounted(() => {
 		ro.observe(el.value);
 		const add = () => {
 			if (stop) return;
-			const x = (Math.random() * (width.value - 64));
-			const y = (Math.random() * (height.value - 64));
+			const x = Math.random() * (width.value - 64);
+			const y = Math.random() * (height.value - 64);
 			const sizeFactor = Math.random();
 			const particle = {
 				id: Math.random().toString(),
 				x,
 				y,
-				size: 0.2 + ((sizeFactor / 10) * 3),
-				dur: 1000 + (sizeFactor * 1000),
+				size: 0.2 + (sizeFactor / 10) * 3,
+				dur: 1000 + sizeFactor * 1000,
 				color: colors[Math.floor(Math.random() * colors.length)],
 			};
 			particles.value.push(particle);
 			window.setTimeout(() => {
-				particles.value = particles.value.filter(x => x.id !== particle.id);
+				particles.value = particles.value.filter(
+					(x) => x.id !== particle.id
+				);
 			}, particle.dur - 100);
 
 			window.setTimeout(() => {
 				add();
-			}, 500 + (Math.random() * 500));
+			}, 500 + Math.random() * 500);
 		};
 		add();
 	}
diff --git a/packages/client/src/components/MkStarButton.vue b/packages/client/src/components/MkStarButton.vue
index 9327e1dd4..a8bf79c40 100644
--- a/packages/client/src/components/MkStarButton.vue
+++ b/packages/client/src/components/MkStarButton.vue
@@ -1,25 +1,50 @@
 <template>
-<button v-tooltip.noDelay.bottom="i18n.ts._gallery.like" class="skdfgljsdkf _button" @click="star($event)">
-	<svg v-if="defaultStore.state.woozyMode === true" width="1.1em" height="1.1em" viewBox="0 0 36 36"><g fill="currentColor">
-		<path d="m17.809-0.20898c-9.9294 2.3e-7 -18 8.0706-18 18 5.8e-7 9.9294 8.0706 18 18 18 9.9294 0 18-8.0706 18-18 0-9.9294-8.0706-18-18-18zm0 1.9785c8.8604 1e-7 16.021 7.1611 16.021 16.021 0 8.8604-7.1611 16.023-16.021 16.023-8.8604 0-16.021-7.163-16.021-16.023-3e-7 -8.8604 7.1611-16.021 16.021-16.021z"/>
-		<path d="m6.001 11c-0.552 0-1-0.448-1-1 0-0.551 0.445-0.998 0.996-1 0.156-2e-3 3.569-0.086 6.205-3.6 0.331-0.44 0.957-0.532 1.4-0.2 0.442 0.331 0.531 0.958 0.2 1.4-3.263 4.35-7.617 4.4-7.801 4.4zm24.986 2.393c0.128 0.537-0.204 1.077-0.741 1.205-0.536 0.128-1.074-0.202-1.204-0.737-0.038-0.151-0.911-3.452-4.941-5.201-0.505-0.22-0.739-0.808-0.519-1.315s0.809-0.739 1.315-0.519c4.989 2.165 6.047 6.388 6.09 6.567z"/>
-		<path d="m23.186 29.526c-0.993 0-1.952-0.455-2.788-1.339-2.816-2.985-3.569-2.333-4.817-1.251-0.781 0.679-1.754 1.523-3.205 1.523-2.351 0-3.969-2.302-4.036-2.4-0.314-0.454-0.2-1.077 0.254-1.391 0.451-0.312 1.074-0.2 1.39 0.251 0.301 0.429 1.317 1.54 2.393 1.54 0.704 0 1.256-0.479 1.895-1.033 1.816-1.578 3.764-2.655 7.583 1.388 0.823 0.873 1.452 0.774 1.908 0.592 1.659-0.665 3.205-3.698 3.197-5.15-3e-3 -0.552 0.442-1.002 0.994-1.005h6e-3c0.55 0 0.997 0.444 1 0.995 0.012 2.103-1.854 5.976-4.454 7.017-0.443 0.175-0.885 0.262-1.32 0.263z"/>
-		<path d="m14.815 15.375c-0.584 2.114-1.642 3.083-3.152 2.666-1.509-0.417-2.343-1.909-1.76-4.023 0.583-2.112 2.175-3.363 3.684-2.946 1.511 0.417 1.812 2.19 1.228 4.303zm11.416-0.755c0.473 2.141-0.675 4.838-2.204 5.176s-3.28-1.719-3.753-3.86c-0.473-2.14 0.419-3.971 1.948-4.309s3.536 0.853 4.009 2.993z"/>
-	</g></svg>
-	<i v-else-if="instance.defaultReaction === '👍'" class="ph-thumbs-up ph-bold ph-lg"></i>
-	<i v-else-if="instance.defaultReaction === '❤️'" class="ph-heart ph-bold ph-lg"></i>
-	<i v-else class="ph-star ph-bold ph-lg"></i>
-</button>
+	<button
+		v-tooltip.noDelay.bottom="i18n.ts._gallery.like"
+		class="skdfgljsdkf _button"
+		@click="star($event)"
+	>
+		<svg
+			v-if="defaultStore.state.woozyMode === true"
+			width="1.1em"
+			height="1.1em"
+			viewBox="0 0 36 36"
+		>
+			<g fill="currentColor">
+				<path
+					d="m17.809-0.20898c-9.9294 2.3e-7 -18 8.0706-18 18 5.8e-7 9.9294 8.0706 18 18 18 9.9294 0 18-8.0706 18-18 0-9.9294-8.0706-18-18-18zm0 1.9785c8.8604 1e-7 16.021 7.1611 16.021 16.021 0 8.8604-7.1611 16.023-16.021 16.023-8.8604 0-16.021-7.163-16.021-16.023-3e-7 -8.8604 7.1611-16.021 16.021-16.021z"
+				/>
+				<path
+					d="m6.001 11c-0.552 0-1-0.448-1-1 0-0.551 0.445-0.998 0.996-1 0.156-2e-3 3.569-0.086 6.205-3.6 0.331-0.44 0.957-0.532 1.4-0.2 0.442 0.331 0.531 0.958 0.2 1.4-3.263 4.35-7.617 4.4-7.801 4.4zm24.986 2.393c0.128 0.537-0.204 1.077-0.741 1.205-0.536 0.128-1.074-0.202-1.204-0.737-0.038-0.151-0.911-3.452-4.941-5.201-0.505-0.22-0.739-0.808-0.519-1.315s0.809-0.739 1.315-0.519c4.989 2.165 6.047 6.388 6.09 6.567z"
+				/>
+				<path
+					d="m23.186 29.526c-0.993 0-1.952-0.455-2.788-1.339-2.816-2.985-3.569-2.333-4.817-1.251-0.781 0.679-1.754 1.523-3.205 1.523-2.351 0-3.969-2.302-4.036-2.4-0.314-0.454-0.2-1.077 0.254-1.391 0.451-0.312 1.074-0.2 1.39 0.251 0.301 0.429 1.317 1.54 2.393 1.54 0.704 0 1.256-0.479 1.895-1.033 1.816-1.578 3.764-2.655 7.583 1.388 0.823 0.873 1.452 0.774 1.908 0.592 1.659-0.665 3.205-3.698 3.197-5.15-3e-3 -0.552 0.442-1.002 0.994-1.005h6e-3c0.55 0 0.997 0.444 1 0.995 0.012 2.103-1.854 5.976-4.454 7.017-0.443 0.175-0.885 0.262-1.32 0.263z"
+				/>
+				<path
+					d="m14.815 15.375c-0.584 2.114-1.642 3.083-3.152 2.666-1.509-0.417-2.343-1.909-1.76-4.023 0.583-2.112 2.175-3.363 3.684-2.946 1.511 0.417 1.812 2.19 1.228 4.303zm11.416-0.755c0.473 2.141-0.675 4.838-2.204 5.176s-3.28-1.719-3.753-3.86c-0.473-2.14 0.419-3.971 1.948-4.309s3.536 0.853 4.009 2.993z"
+				/>
+			</g>
+		</svg>
+		<i
+			v-else-if="instance.defaultReaction === '👍'"
+			class="ph-thumbs-up ph-bold ph-lg"
+		></i>
+		<i
+			v-else-if="instance.defaultReaction === '❤️'"
+			class="ph-heart ph-bold ph-lg"
+		></i>
+		<i v-else class="ph-star ph-bold ph-lg"></i>
+	</button>
 </template>
 
 <script lang="ts" setup>
-import type { Note } from 'calckey-js/built/entities';
-import Ripple from '@/components/MkRipple.vue';
-import { pleaseLogin } from '@/scripts/please-login';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import { instance } from '@/instance';
+import type { Note } from "calckey-js/built/entities";
+import Ripple from "@/components/MkRipple.vue";
+import { pleaseLogin } from "@/scripts/please-login";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { instance } from "@/instance";
 
 const props = defineProps<{
 	note: Note;
@@ -27,16 +52,21 @@ const props = defineProps<{
 
 function star(ev?: MouseEvent): void {
 	pleaseLogin();
-	os.api('notes/reactions/create', {
+	os.api("notes/reactions/create", {
 		noteId: props.note.id,
-		reaction: defaultStore.state.woozyMode === true ? '🥴' : instance.defaultReaction,
+		reaction:
+			defaultStore.state.woozyMode === true
+				? "🥴"
+				: instance.defaultReaction,
 	});
-	const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
+	const el =
+		ev &&
+		((ev.currentTarget ?? ev.target) as HTMLElement | null | undefined);
 	if (el) {
 		const rect = el.getBoundingClientRect();
-		const x = rect.left + (el.offsetWidth / 2);
-		const y = rect.top + (el.offsetHeight / 2);
-		os.popup(Ripple, { x, y }, {}, 'end');
+		const x = rect.left + el.offsetWidth / 2;
+		const y = rect.top + el.offsetHeight / 2;
+		os.popup(Ripple, { x, y }, {}, "end");
 	}
 }
 </script>
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index fa421d10f..58accefc1 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -1,50 +1,90 @@
 <template>
-<div class="wrmlmaau" :class="{ collapsed, isLong }">
-	<div class="body">
-		<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
-		<template v-if="!note.cw">
-			<MkA v-if="note.replyId"  :to="`/notes/${note.replyId}`" class="reply-icon" @click.stop>
-				<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
-			</MkA>
-			<MkA v-if="conversation && note.renoteId && note.renoteId != parentId && !note.replyId" :to="`/notes/${note.renoteId}`" class="reply-icon" @click.stop>
-				<i class="ph-quotes ph-bold ph-lg"></i>
-			</MkA>
-		</template>
-		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
-		<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">{{ i18n.ts.quoteAttached }}: ...</MkA>
-	</div>
-	<div v-if="note.files.length > 0">
-		<XMediaList :media-list="note.files"/>
-	</div>
-	<div v-if="note.poll">
-		<summary>{{ i18n.ts.poll }}</summary>
-		<XPoll :note="note"/>
-	</div>
-	<template v-if="detailed">
-		<!-- <div v-if="note.renoteId" class="renote">
+	<div class="wrmlmaau" :class="{ collapsed, isLong }">
+		<div class="body">
+			<span v-if="note.deletedAt" style="opacity: 0.5"
+				>({{ i18n.ts.deleted }})</span
+			>
+			<template v-if="!note.cw">
+				<MkA
+					v-if="note.replyId"
+					:to="`/notes/${note.replyId}`"
+					class="reply-icon"
+					@click.stop
+				>
+					<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
+				</MkA>
+				<MkA
+					v-if="
+						conversation &&
+						note.renoteId &&
+						note.renoteId != parentId &&
+						!note.replyId
+					"
+					:to="`/notes/${note.renoteId}`"
+					class="reply-icon"
+					@click.stop
+				>
+					<i class="ph-quotes ph-bold ph-lg"></i>
+				</MkA>
+			</template>
+			<Mfm
+				v-if="note.text"
+				:text="note.text"
+				:author="note.user"
+				:i="$i"
+				:custom-emojis="note.emojis"
+			/>
+			<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`"
+				>{{ i18n.ts.quoteAttached }}: ...</MkA
+			>
+		</div>
+		<div v-if="note.files.length > 0">
+			<XMediaList :media-list="note.files" />
+		</div>
+		<div v-if="note.poll">
+			<summary>{{ i18n.ts.poll }}</summary>
+			<XPoll :note="note" />
+		</div>
+		<template v-if="detailed">
+			<!-- <div v-if="note.renoteId" class="renote">
 			<XNoteSimple :note="note.renote"/>
 		</div> -->
-		<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
-	</template>
-	<button v-if="isLong && collapsed" class="fade _button" @click.stop="collapsed = false">
-		<span>{{ i18n.ts.showMore }}</span>
-	</button>
-	<button v-if="isLong && !collapsed" class="showLess _button" @click.stop="collapsed = true">
-		<span>{{ i18n.ts.showLess }}</span>
-	</button>
-</div>
+			<MkUrlPreview
+				v-for="url in urls"
+				:key="url"
+				:url="url"
+				:compact="true"
+				:detail="false"
+				class="url-preview"
+			/>
+		</template>
+		<button
+			v-if="isLong && collapsed"
+			class="fade _button"
+			@click.stop="collapsed = false"
+		>
+			<span>{{ i18n.ts.showMore }}</span>
+		</button>
+		<button
+			v-if="isLong && !collapsed"
+			class="showLess _button"
+			@click.stop="collapsed = true"
+		>
+			<span>{{ i18n.ts.showLess }}</span>
+		</button>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as misskey from 'calckey-js';
-import * as mfm from 'mfm-js';
-import XNoteSimple from '@/components/MkNoteSimple.vue';
-import XMediaList from '@/components/MkMediaList.vue';
-import XPoll from '@/components/MkPoll.vue';
-import MkUrlPreview from '@/components/MkUrlPreview.vue';
-import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import * as misskey from "calckey-js";
+import * as mfm from "mfm-js";
+import XNoteSimple from "@/components/MkNoteSimple.vue";
+import XMediaList from "@/components/MkMediaList.vue";
+import XPoll from "@/components/MkPoll.vue";
+import MkUrlPreview from "@/components/MkUrlPreview.vue";
+import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	note: misskey.entities.Note;
@@ -53,21 +93,20 @@ const props = defineProps<{
 	detailed?: boolean;
 }>();
 
-const isLong = (
-	props.note.cw == null && props.note.text != null && (
-		(props.note.text.split('\n').length > 9) ||
-		(props.note.text.length > 500)
-	)
-);
+const isLong =
+	props.note.cw == null &&
+	props.note.text != null &&
+	(props.note.text.split("\n").length > 9 || props.note.text.length > 500);
 const collapsed = $ref(props.note.cw == null && isLong);
-const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : null;
-
+const urls = props.note.text
+	? extractUrlFromMfm(mfm.parse(props.note.text))
+	: null;
 </script>
 
 <style lang="scss" scoped>
 .wrmlmaau {
 	overflow-wrap: break-word;
-	
+
 	> .body {
 		> .rp {
 			margin-left: 4px;
@@ -77,11 +116,12 @@ const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : n
 		.reply-icon {
 			display: inline-block;
 			border-radius: 6px;
-			padding: .2em .2em;
-			margin-right: .2em;
+			padding: 0.2em 0.2em;
+			margin-right: 0.2em;
 			color: var(--accent);
-			transition: background .2s;
-			&:hover, &:focus {
+			transition: background 0.2s;
+			&:hover,
+			&:focus {
 				background: var(--buttonHoverBg);
 			}
 		}
diff --git a/packages/client/src/components/MkSuperMenu.vue b/packages/client/src/components/MkSuperMenu.vue
index 6e73b4959..55d6fba50 100644
--- a/packages/client/src/components/MkSuperMenu.vue
+++ b/packages/client/src/components/MkSuperMenu.vue
@@ -1,30 +1,62 @@
 <template>
-<div class="rrevdjwu" :class="{ grid }">
-	<div v-for="group in def" class="group">
-		<div v-if="group.title" class="title">{{ group.title }}</div>
+	<div class="rrevdjwu" :class="{ grid }">
+		<div v-for="group in def" class="group">
+			<div v-if="group.title" class="title">{{ group.title }}</div>
 
-		<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 }">
-					<i v-if="item.icon" class="icon ph-fw ph-lg" :class="item.icon"></i>
-					<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)">
-					<i v-if="item.icon" class="icon ph-fw ph-lg" :class="item.icon"></i>
-					<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 }">
-					<i v-if="item.icon" class="icon ph-fw ph-lg" :class="item.icon"></i>
-					<span class="text">{{ item.text }}</span>
-				</MkA>
-			</template>
+			<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 }"
+					>
+						<i
+							v-if="item.icon"
+							class="icon ph-fw ph-lg"
+							:class="item.icon"
+						></i>
+						<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)"
+					>
+						<i
+							v-if="item.icon"
+							class="icon ph-fw ph-lg"
+							:class="item.icon"
+						></i>
+						<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 }"
+					>
+						<i
+							v-if="item.icon"
+							class="icon ph-fw ph-lg"
+							:class="item.icon"
+						></i>
+						<span class="text">{{ item.text }}</span>
+					</MkA>
+				</template>
+			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, unref } from 'vue';
+import { defineComponent, ref, unref } from "vue";
 
 export default defineComponent({
 	props: {
@@ -95,7 +127,6 @@ export default defineComponent({
 					overflow: hidden;
 					padding-right: 12px;
 				}
-
 			}
 		}
 	}
diff --git a/packages/client/src/components/MkTab.vue b/packages/client/src/components/MkTab.vue
index a8e8cbc0f..de3ef290b 100644
--- a/packages/client/src/components/MkTab.vue
+++ b/packages/client/src/components/MkTab.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { defineComponent, h, resolveDirective, withDirectives } from 'vue';
+import { defineComponent, h, resolveDirective, withDirectives } from "vue";
 
 export default defineComponent({
 	props: {
@@ -10,18 +10,38 @@ export default defineComponent({
 	render() {
 		const options = this.$slots.default();
 
-		return h('div', {
-			class: 'pxhvhrfw',
-		}, options.map(option => withDirectives(h('button', {
-			class: ['_button', { active: this.modelValue === option.props?.value }],
-			key: option.key,
-			disabled: this.modelValue === option.props?.value,
-			onClick: () => {
-				this.$emit('update:modelValue', option.props?.value);
+		return h(
+			"div",
+			{
+				class: "pxhvhrfw",
 			},
-		}, option.children), [
-			[resolveDirective('click-anime')],
-		])));
+			options.map((option) =>
+				withDirectives(
+					h(
+						"button",
+						{
+							class: [
+								"_button",
+								{
+									active:
+										this.modelValue === option.props?.value,
+								},
+							],
+							key: option.key,
+							disabled: this.modelValue === option.props?.value,
+							onClick: () => {
+								this.$emit(
+									"update:modelValue",
+									option.props?.value
+								);
+							},
+						},
+						option.children
+					),
+					[[resolveDirective("click-anime")]]
+				)
+			)
+		);
 	},
 });
 </script>
diff --git a/packages/client/src/components/MkTagCloud.vue b/packages/client/src/components/MkTagCloud.vue
index 2dfd26edb..ec0e8d184 100644
--- a/packages/client/src/components/MkTagCloud.vue
+++ b/packages/client/src/components/MkTagCloud.vue
@@ -1,23 +1,44 @@
 <template>
-<div ref="rootEl" class="meijqfqm">
-	<canvas :id="idForCanvas" ref="canvasEl" class="canvas" :width="width" height="300" @contextmenu.prevent="() => {}"></canvas>
-	<div :id="idForTags" ref="tagsEl" class="tags">
-		<ul>
-			<slot></slot>
-		</ul>
+	<div ref="rootEl" class="meijqfqm">
+		<canvas
+			:id="idForCanvas"
+			ref="canvasEl"
+			class="canvas"
+			:width="width"
+			height="300"
+			@contextmenu.prevent="() => {}"
+		></canvas>
+		<div :id="idForTags" ref="tagsEl" class="tags">
+			<ul>
+				<slot></slot>
+			</ul>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, watch, PropType, onBeforeUnmount } from 'vue';
-import tinycolor from 'tinycolor2';
+import { onMounted, ref, watch, PropType, onBeforeUnmount } from "vue";
+import tinycolor from "tinycolor2";
 
 const loaded = !!window.TagCanvas;
-const SAFE_FOR_HTML_ID = 'abcdefghijklmnopqrstuvwxyz';
+const SAFE_FOR_HTML_ID = "abcdefghijklmnopqrstuvwxyz";
 const computedStyle = getComputedStyle(document.documentElement);
-const idForCanvas = Array.from(Array(16)).map(() => SAFE_FOR_HTML_ID[Math.floor(Math.random() * SAFE_FOR_HTML_ID.length)]).join('');
-const idForTags = Array.from(Array(16)).map(() => SAFE_FOR_HTML_ID[Math.floor(Math.random() * SAFE_FOR_HTML_ID.length)]).join('');
+const idForCanvas = Array.from(Array(16))
+	.map(
+		() =>
+			SAFE_FOR_HTML_ID[
+				Math.floor(Math.random() * SAFE_FOR_HTML_ID.length)
+			]
+	)
+	.join("");
+const idForTags = Array.from(Array(16))
+	.map(
+		() =>
+			SAFE_FOR_HTML_ID[
+				Math.floor(Math.random() * SAFE_FOR_HTML_ID.length)
+			]
+	)
+	.join("");
 let available = $ref(false);
 let rootEl = $ref<HTMLElement | null>(null);
 let canvasEl = $ref<HTMLCanvasElement | null>(null);
@@ -27,10 +48,12 @@ let width = $ref(300);
 watch($$(available), () => {
 	try {
 		window.TagCanvas.Start(idForCanvas, idForTags, {
-			textColour: '#ffffff',
-			outlineColour: tinycolor(computedStyle.getPropertyValue('--accent')).toHexString(),
+			textColour: "#ffffff",
+			outlineColour: tinycolor(
+				computedStyle.getPropertyValue("--accent")
+			).toHexString(),
 			outlineRadius: 10,
-			initial: [-0.030, -0.010],
+			initial: [-0.03, -0.01],
 			frontSelect: true,
 			imageRadius: 8,
 			//dragControl: true,
@@ -52,10 +75,14 @@ onMounted(() => {
 	if (loaded) {
 		available = true;
 	} else {
-		document.head.appendChild(Object.assign(document.createElement('script'), {
-			async: true,
-			src: '/client-assets/tagcanvas.min.js',
-		})).addEventListener('load', () => available = true);
+		document.head
+			.appendChild(
+				Object.assign(document.createElement("script"), {
+					async: true,
+					src: "/client-assets/tagcanvas.min.js",
+				})
+			)
+			.addEventListener("load", () => (available = true));
 	}
 });
 
diff --git a/packages/client/src/components/MkTimeline.vue b/packages/client/src/components/MkTimeline.vue
index 47d2edd8c..317e556cf 100644
--- a/packages/client/src/components/MkTimeline.vue
+++ b/packages/client/src/components/MkTimeline.vue
@@ -1,14 +1,19 @@
 <template>
-<XNotes ref="tlComponent" :no-gap="!$store.state.showGapBetweenNotesInTimeline" :pagination="pagination" @queue="emit('queue', $event)"/>
+	<XNotes
+		ref="tlComponent"
+		:no-gap="!$store.state.showGapBetweenNotesInTimeline"
+		:pagination="pagination"
+		@queue="emit('queue', $event)"
+	/>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, provide, onUnmounted } from 'vue';
-import XNotes from '@/components/MkNotes.vue';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import * as sound from '@/scripts/sound';
-import { $i } from '@/account';
+import { ref, computed, provide, onUnmounted } from "vue";
+import XNotes from "@/components/MkNotes.vue";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import * as sound from "@/scripts/sound";
+import { $i } from "@/account";
 
 const props = defineProps<{
 	src: string;
@@ -19,21 +24,24 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'note'): void;
-	(ev: 'queue', count: number): void;
+	(ev: "note"): void;
+	(ev: "queue", count: number): void;
 }>();
 
-provide('inChannel', computed(() => props.src === 'channel'));
+provide(
+	"inChannel",
+	computed(() => props.src === "channel")
+);
 
 const tlComponent: InstanceType<typeof XNotes> = $ref();
 
-const prepend = note => {
+const prepend = (note) => {
 	tlComponent.pagingComponent?.prepend(note);
 
-	emit('note');
+	emit("note");
 
 	if (props.sound) {
-		sound.play($i && (note.userId === $i.id) ? 'noteMy' : 'note');
+		sound.play($i && note.userId === $i.id ? "noteMy" : "note");
 	}
 };
 
@@ -56,75 +64,75 @@ let query;
 let connection;
 let connection2;
 
-if (props.src === 'antenna') {
-	endpoint = 'antennas/notes';
+if (props.src === "antenna") {
+	endpoint = "antennas/notes";
 	query = {
 		antennaId: props.antenna,
 	};
-	connection = stream.useChannel('antenna', {
+	connection = stream.useChannel("antenna", {
 		antennaId: props.antenna,
 	});
-	connection.on('note', prepend);
-} else if (props.src === 'home') {
-	endpoint = 'notes/timeline';
-	connection = stream.useChannel('homeTimeline');
-	connection.on('note', prepend);
+	connection.on("note", prepend);
+} else if (props.src === "home") {
+	endpoint = "notes/timeline";
+	connection = stream.useChannel("homeTimeline");
+	connection.on("note", prepend);
 
-	connection2 = stream.useChannel('main');
-	connection2.on('follow', onChangeFollowing);
-	connection2.on('unfollow', onChangeFollowing);
-} else if (props.src === 'local') {
-	endpoint = 'notes/local-timeline';
-	connection = stream.useChannel('localTimeline');
-	connection.on('note', prepend);
-} else if (props.src === 'recommended') {
-	endpoint = 'notes/recommended-timeline';
-	connection = stream.useChannel('recommendedTimeline');
-	connection.on('note', prepend);
-} else if (props.src === 'social') {
-	endpoint = 'notes/hybrid-timeline';
-	connection = stream.useChannel('hybridTimeline');
-	connection.on('note', prepend);
-} else if (props.src === 'global') {
-	endpoint = 'notes/global-timeline';
-	connection = stream.useChannel('globalTimeline');
-	connection.on('note', prepend);
-} else if (props.src === 'mentions') {
-	endpoint = 'notes/mentions';
-	connection = stream.useChannel('main');
-	connection.on('mention', prepend);
-} else if (props.src === 'directs') {
-	endpoint = 'notes/mentions';
+	connection2 = stream.useChannel("main");
+	connection2.on("follow", onChangeFollowing);
+	connection2.on("unfollow", onChangeFollowing);
+} else if (props.src === "local") {
+	endpoint = "notes/local-timeline";
+	connection = stream.useChannel("localTimeline");
+	connection.on("note", prepend);
+} else if (props.src === "recommended") {
+	endpoint = "notes/recommended-timeline";
+	connection = stream.useChannel("recommendedTimeline");
+	connection.on("note", prepend);
+} else if (props.src === "social") {
+	endpoint = "notes/hybrid-timeline";
+	connection = stream.useChannel("hybridTimeline");
+	connection.on("note", prepend);
+} else if (props.src === "global") {
+	endpoint = "notes/global-timeline";
+	connection = stream.useChannel("globalTimeline");
+	connection.on("note", prepend);
+} else if (props.src === "mentions") {
+	endpoint = "notes/mentions";
+	connection = stream.useChannel("main");
+	connection.on("mention", prepend);
+} else if (props.src === "directs") {
+	endpoint = "notes/mentions";
 	query = {
-		visibility: 'specified',
+		visibility: "specified",
 	};
-	const onNote = note => {
-		if (note.visibility === 'specified') {
+	const onNote = (note) => {
+		if (note.visibility === "specified") {
 			prepend(note);
 		}
 	};
-	connection = stream.useChannel('main');
-	connection.on('mention', onNote);
-} else if (props.src === 'list') {
-	endpoint = 'notes/user-list-timeline';
+	connection = stream.useChannel("main");
+	connection.on("mention", onNote);
+} else if (props.src === "list") {
+	endpoint = "notes/user-list-timeline";
 	query = {
 		listId: props.list,
 	};
-	connection = stream.useChannel('userList', {
+	connection = stream.useChannel("userList", {
 		listId: props.list,
 	});
-	connection.on('note', prepend);
-	connection.on('userAdded', onUserAdded);
-	connection.on('userRemoved', onUserRemoved);
-} else if (props.src === 'channel') {
-	endpoint = 'channels/timeline';
+	connection.on("note", prepend);
+	connection.on("userAdded", onUserAdded);
+	connection.on("userRemoved", onUserRemoved);
+} else if (props.src === "channel") {
+	endpoint = "channels/timeline";
 	query = {
 		channelId: props.channel,
 	};
-	connection = stream.useChannel('channel', {
+	connection = stream.useChannel("channel", {
 		channelId: props.channel,
 	});
-	connection.on('note', prepend);
+	connection.on("note", prepend);
 }
 
 const pagination = {
diff --git a/packages/client/src/components/MkToast.vue b/packages/client/src/components/MkToast.vue
index 87b1d99c1..4ff97fb02 100644
--- a/packages/client/src/components/MkToast.vue
+++ b/packages/client/src/components/MkToast.vue
@@ -1,26 +1,35 @@
 <template>
-<div class="mk-toast">
-	<transition :name="$store.state.animation ? 'toast' : ''" appear @after-leave="emit('closed')">
-		<div v-if="showing" class="body _acrylic" :style="{ zIndex }">
-			<Mfm class="message" :text="message" :plain="true" :nowrap="nowrap"/>
-		</div>
-	</transition>
-</div>
+	<div class="mk-toast">
+		<transition
+			:name="$store.state.animation ? 'toast' : ''"
+			appear
+			@after-leave="emit('closed')"
+		>
+			<div v-if="showing" class="body _acrylic" :style="{ zIndex }">
+				<Mfm
+					class="message"
+					:text="message"
+					:plain="true"
+					:nowrap="nowrap"
+				/>
+			</div>
+		</transition>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
-import * as os from '@/os';
+import { onMounted, ref } from "vue";
+import * as os from "@/os";
 
 defineProps<{
 	message: string;
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
-const zIndex = os.claimZIndex('high');
+const zIndex = os.claimZIndex("high");
 let showing = $ref(true);
 
 onMounted(() => {
@@ -31,10 +40,12 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-.toast-enter-active, .toast-leave-active {
+.toast-enter-active,
+.toast-leave-active {
 	transition: opacity 0.3s, transform 0.3s !important;
 }
-.toast-enter-from, .toast-leave-to {
+.toast-enter-from,
+.toast-leave-to {
 	opacity: 0;
 	transform: translateY(-100%);
 }
diff --git a/packages/client/src/components/MkTokenGenerateWindow.vue b/packages/client/src/components/MkTokenGenerateWindow.vue
index 319eb6661..77caa26b3 100644
--- a/packages/client/src/components/MkTokenGenerateWindow.vue
+++ b/packages/client/src/components/MkTokenGenerateWindow.vue
@@ -1,58 +1,75 @@
 <template>
-<XModalWindow
-	ref="dialog"
-	:width="400"
-	:height="600"
-	:with-ok-button="true"
-	:ok-button-disabled="false"
-	:can-close="false"
-	@close="dialog.close()"
-	@closed="$emit('closed')"
-	@ok="ok()"
-	style="padding: 12px"
->
-	<template #header>{{ title || i18n.ts.generateAccessToken }}</template>
-	<div v-if="information" class="_section">
-		<MkInfo warn>{{ information }}</MkInfo>
-	</div>
-	<div class="_section">
-		<div style="margin-bottom: 16px;"><b>{{ i18n.ts.name }}</b></div>
-		<MkInput style="margin-bottom: 16px;" v-model="name"/>
-	</div>
-	<div class="_section">
-		<div style="margin-bottom: 16px;"><b>{{ i18n.ts.permission }}</b></div>
-		<MkButton inline @click="disableAll">{{ i18n.ts.disableAll }}</MkButton>
-		<MkButton style="margin-bottom: 12px;" inline @click="enableAll">{{ i18n.ts.enableAll }}</MkButton>
-		<MkSwitch style="margin-bottom: 6px;" v-for="kind in (initialPermissions || kinds)" :key="kind" v-model="permissions[kind]">{{ i18n.t(`_permissions.${kind}`) }}</MkSwitch>
-	</div>
-</XModalWindow>
+	<XModalWindow
+		ref="dialog"
+		:width="400"
+		:height="600"
+		:with-ok-button="true"
+		:ok-button-disabled="false"
+		:can-close="false"
+		@close="dialog.close()"
+		@closed="$emit('closed')"
+		@ok="ok()"
+		style="padding: 12px"
+	>
+		<template #header>{{ title || i18n.ts.generateAccessToken }}</template>
+		<div v-if="information" class="_section">
+			<MkInfo warn>{{ information }}</MkInfo>
+		</div>
+		<div class="_section">
+			<div style="margin-bottom: 16px">
+				<b>{{ i18n.ts.name }}</b>
+			</div>
+			<MkInput style="margin-bottom: 16px" v-model="name" />
+		</div>
+		<div class="_section">
+			<div style="margin-bottom: 16px">
+				<b>{{ i18n.ts.permission }}</b>
+			</div>
+			<MkButton inline @click="disableAll">{{
+				i18n.ts.disableAll
+			}}</MkButton>
+			<MkButton style="margin-bottom: 12px" inline @click="enableAll">{{
+				i18n.ts.enableAll
+			}}</MkButton>
+			<MkSwitch
+				style="margin-bottom: 6px"
+				v-for="kind in initialPermissions || kinds"
+				:key="kind"
+				v-model="permissions[kind]"
+				>{{ i18n.t(`_permissions.${kind}`) }}</MkSwitch
+			>
+		</div>
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import { permissions as kinds } from 'calckey-js';
-import MkInput from './form/input.vue';
-import MkSwitch from './form/switch.vue';
-import MkButton from './MkButton.vue';
-import MkInfo from './MkInfo.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import { permissions as kinds } from "calckey-js";
+import MkInput from "./form/input.vue";
+import MkSwitch from "./form/switch.vue";
+import MkButton from "./MkButton.vue";
+import MkInfo from "./MkInfo.vue";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	title?: string | null;
-	information?: string | null;
-	initialName?: string | null;
-	initialPermissions?: string[] | null;
-}>(), {
-	title: null,
-	information: null,
-	initialName: null,
-	initialPermissions: null,
-});
+const props = withDefaults(
+	defineProps<{
+		title?: string | null;
+		information?: string | null;
+		initialName?: string | null;
+		initialPermissions?: string[] | null;
+	}>(),
+	{
+		title: null,
+		information: null,
+		initialName: null,
+		initialPermissions: null,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
-	(ev: 'done', result: { name: string | null, permissions: string[] }): void;
+	(ev: "closed"): void;
+	(ev: "done", result: { name: string | null; permissions: string[] }): void;
 }>();
 
 const dialog = $ref<InstanceType<typeof XModalWindow>>();
@@ -70,9 +87,9 @@ if (props.initialPermissions) {
 }
 
 function ok(): void {
-	emit('done', {
+	emit("done", {
 		name: name,
-		permissions: Object.keys(permissions).filter(p => permissions[p]),
+		permissions: Object.keys(permissions).filter((p) => permissions[p]),
 	});
 	dialog.close();
 }
diff --git a/packages/client/src/components/MkTooltip.vue b/packages/client/src/components/MkTooltip.vue
index 4c6258d24..c528a2f56 100644
--- a/packages/client/src/components/MkTooltip.vue
+++ b/packages/client/src/components/MkTooltip.vue
@@ -1,55 +1,67 @@
 <template>
-<transition :name="$store.state.animation ? 'tooltip' : ''" appear @after-leave="emit('closed')">
-	<div v-show="showing" ref="el" class="buebdbiu _acrylic _shadow" :style="{ zIndex, maxWidth: maxWidth + 'px' }">
-		<slot>
-			<Mfm v-if="asMfm" :text="text"/>
-			<span v-else>{{ text }}</span>
-		</slot>
-	</div>
-</transition>
+	<transition
+		:name="$store.state.animation ? 'tooltip' : ''"
+		appear
+		@after-leave="emit('closed')"
+	>
+		<div
+			v-show="showing"
+			ref="el"
+			class="buebdbiu _acrylic _shadow"
+			:style="{ zIndex, maxWidth: maxWidth + 'px' }"
+		>
+			<slot>
+				<Mfm v-if="asMfm" :text="text" />
+				<span v-else>{{ text }}</span>
+			</slot>
+		</div>
+	</transition>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onMounted, onUnmounted, ref } from 'vue';
-import * as os from '@/os';
-import { calcPopupPosition } from '@/scripts/popup-position';
+import { nextTick, onMounted, onUnmounted, ref } from "vue";
+import * as os from "@/os";
+import { calcPopupPosition } from "@/scripts/popup-position";
 
-const props = withDefaults(defineProps<{
-	showing: boolean;
-	targetElement?: HTMLElement;
-	x?: number;
-	y?: number;
-	text?: string;
-	asMfm?: boolean;
-	maxWidth?: number;
-	direction?: 'top' | 'bottom' | 'right' | 'left';
-	innerMargin?: number;
-}>(), {
-	maxWidth: 250,
-	direction: 'top',
-	innerMargin: 0,
-});
+const props = withDefaults(
+	defineProps<{
+		showing: boolean;
+		targetElement?: HTMLElement;
+		x?: number;
+		y?: number;
+		text?: string;
+		asMfm?: boolean;
+		maxWidth?: number;
+		direction?: "top" | "bottom" | "right" | "left";
+		innerMargin?: number;
+	}>(),
+	{
+		maxWidth: 250,
+		direction: "top",
+		innerMargin: 0,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
 const el = ref<HTMLElement>();
-const zIndex = os.claimZIndex('high');
+const zIndex = os.claimZIndex("high");
 
 function setPosition() {
 	const data = calcPopupPosition(el.value, {
 		anchorElement: props.targetElement,
 		direction: props.direction,
-		align: 'center',
+		align: "center",
 		innerMargin: props.innerMargin,
 		x: props.x,
 		y: props.y,
 	});
 
 	el.value.style.transformOrigin = data.transformOrigin;
-	el.value.style.left = data.left + 'px';
-	el.value.style.top = data.top + 'px';
+	el.value.style.left = data.left + "px";
+	el.value.style.top = data.top + "px";
 }
 
 let loopHandler;
@@ -79,7 +91,8 @@ onUnmounted(() => {
 .tooltip-leave-active {
 	opacity: 1;
 	transform: scale(1);
-	transition: transform 200ms cubic-bezier(0.23, 1, 0.32, 1), opacity 200ms cubic-bezier(0.23, 1, 0.32, 1);
+	transition: transform 200ms cubic-bezier(0.23, 1, 0.32, 1),
+		opacity 200ms cubic-bezier(0.23, 1, 0.32, 1);
 }
 .tooltip-enter-from,
 .tooltip-leave-active {
diff --git a/packages/client/src/components/MkTutorialDialog.vue b/packages/client/src/components/MkTutorialDialog.vue
index 77cc4de6f..eafc88295 100644
--- a/packages/client/src/components/MkTutorialDialog.vue
+++ b/packages/client/src/components/MkTutorialDialog.vue
@@ -1,133 +1,206 @@
 <template>
-<XModalWindow
-	ref="dialog"
-	:width="800"
-	@close="dialog?.close()"
-	@closed="$emit('closed')"
->
-	<template #header>{{ i18n.ts._tutorial.title }}</template>
+	<XModalWindow
+		ref="dialog"
+		:width="800"
+		@close="dialog?.close()"
+		@closed="$emit('closed')"
+	>
+		<template #header>{{ i18n.ts._tutorial.title }}</template>
 
-	<div class="_monolithic_">
-		<div class="_section">
-			<div class="tbkwesmv">
-				<div class="_footer navigation">
-					<div class="step">
-						<button class="arrow _button" :disabled="tutorial === 0" @click="tutorial--">
-							<i class="ph-caret-left ph-bold ph-lg"></i>
-						</button>
-						<span>{{ tutorial + 1 }} / 6</span>
-						<button class="arrow _button" :disabled="tutorial === 5" @click="tutorial++">
-							<i class="ph-caret-right ph-bold ph-lg"></i>
-						</button>
+		<div class="_monolithic_">
+			<div class="_section">
+				<div class="tbkwesmv">
+					<div class="_footer navigation">
+						<div class="step">
+							<button
+								class="arrow _button"
+								:disabled="tutorial === 0"
+								@click="tutorial--"
+							>
+								<i class="ph-caret-left ph-bold ph-lg"></i>
+							</button>
+							<span>{{ tutorial + 1 }} / 6</span>
+							<button
+								class="arrow _button"
+								:disabled="tutorial === 5"
+								@click="tutorial++"
+							>
+								<i class="ph-caret-right ph-bold ph-lg"></i>
+							</button>
+						</div>
+						<MkButton
+							v-if="tutorial === 5"
+							class="ok"
+							primary
+							@click="close"
+							><i class="ph-check ph-bold ph-lg"></i>
+							{{ i18n.ts.gotIt }}</MkButton
+						>
+						<MkButton v-else class="ok" primary @click="tutorial++"
+							><i class="ph-check ph-bold ph-lg"></i>
+							{{ i18n.ts.next }}</MkButton
+						>
 					</div>
-					<MkButton v-if="tutorial === 5" class="ok" primary @click="close"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.gotIt }}</MkButton>
-					<MkButton v-else class="ok" primary @click="tutorial++"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.next }}</MkButton>
+					<h2 class="_title title">
+						<i class="ph-info ph-bold ph-lg"></i>
+						{{ i18n.ts._tutorial.title }}
+					</h2>
+					<Transition name="fade">
+						<div v-if="tutorial === 0" key="1" class="_content">
+							<h3>{{ i18n.ts._tutorial.step1_1 }}</h3>
+							<div>{{ i18n.ts._tutorial.step1_2 }}</div>
+						</div>
+						<div
+							v-else-if="tutorial === 1"
+							key="2"
+							class="_content"
+						>
+							<h3>{{ i18n.ts._tutorial.step2_1 }}</h3>
+							<div>{{ i18n.ts._tutorial.step2_2 }}</div>
+							<br />
+							<XSettings :save-button="true" />
+							<br />
+						</div>
+						<div
+							v-else-if="tutorial === 2"
+							key="3"
+							class="_content"
+						>
+							<h3>{{ i18n.ts._tutorial.step3_1 }}</h3>
+							<div>{{ i18n.ts._tutorial.step3_2 }}</div>
+							<XFeaturedUsers />
+							<br />
+							<MkButton class="ok" primary @click="tutorial++"
+								><i class="ph-check ph-bold ph-lg"></i>
+								{{ i18n.ts.next }}</MkButton
+							>
+						</div>
+						<div
+							v-else-if="tutorial === 3"
+							key="4"
+							class="_content"
+						>
+							<h3>{{ i18n.ts._tutorial.step4_1 }}</h3>
+							<I18n :src="i18n.ts._tutorial.step4_2" tag="div">
+								<template #introduction>
+									<MkA class="_link" to="/tags/introduction"
+										>#introduction</MkA
+									>
+								</template>
+							</I18n>
+							<br />
+							<XPostForm class="post-form _block" />
+						</div>
+						<div
+							v-else-if="tutorial === 4"
+							key="5"
+							class="_content"
+						>
+							<h3>{{ i18n.ts._tutorial.step5_1 }}</h3>
+							<I18n :src="i18n.ts._tutorial.step5_2" tag="div">
+								<template #timelines>
+									<span>{{ timelines.length }}</span>
+								</template>
+							</I18n>
+							<ul>
+								<li>
+									<I18n
+										:src="i18n.ts._tutorial.step5_3"
+										tag="div"
+									>
+										<template #icon>
+											<i class="ph-house ph-bold ph-lg" />
+										</template>
+									</I18n>
+								</li>
+								<li v-if="timelines.includes('local')">
+									<I18n
+										:src="i18n.ts._tutorial.step5_4"
+										tag="div"
+									>
+										<template #icon>
+											<i class="ph-users ph-bold ph-lg" />
+										</template>
+									</I18n>
+								</li>
+								<li v-if="timelines.includes('recommended')">
+									<I18n
+										:src="i18n.ts._tutorial.step5_5"
+										tag="div"
+									>
+										<template #icon>
+											<i
+												class="ph-thumbs-up ph-bold ph-lg"
+											/>
+										</template>
+									</I18n>
+								</li>
+								<li v-if="timelines.includes('social')">
+									<I18n
+										:src="i18n.ts._tutorial.step5_6"
+										tag="div"
+									>
+										<template #icon>
+											<i
+												class="ph-handshake ph-bold ph-lg"
+											/>
+										</template>
+									</I18n>
+								</li>
+								<li v-if="timelines.includes('global')">
+									<I18n
+										:src="i18n.ts._tutorial.step5_7"
+										tag="div"
+									>
+										<template #icon>
+											<i
+												class="ph-planet ph-bold ph-lg"
+											/>
+										</template>
+									</I18n>
+								</li>
+							</ul>
+						</div>
+						<div
+							v-else-if="tutorial === 5"
+							key="6"
+							class="_content"
+						>
+							<h3>{{ i18n.ts._tutorial.step6_1 }}</h3>
+							<div>{{ i18n.ts._tutorial.step6_2 }}</div>
+							<div>{{ i18n.ts._tutorial.step6_3 }}</div>
+							<br />
+							<MkSparkle>
+								<h3>
+									{{ i18n.ts._tutorial.step6_4 }}
+									<Mfm text="$[shake 🚀]"></Mfm>
+								</h3>
+							</MkSparkle>
+							<MkPushNotificationAllowButton
+								primary
+								show-only-to-register
+							/>
+						</div>
+					</Transition>
 				</div>
-				<h2 class="_title title"><i class="ph-info ph-bold ph-lg"></i> {{ i18n.ts._tutorial.title }}</h2>
-				<Transition name="fade">
-					<div v-if="tutorial === 0" key="1" class="_content">
-						<h3>{{ i18n.ts._tutorial.step1_1 }}</h3>
-						<div>{{ i18n.ts._tutorial.step1_2 }}</div>
-					</div>
-					<div v-else-if="tutorial === 1" key="2" class="_content">
-						<h3>{{ i18n.ts._tutorial.step2_1 }}</h3>
-						<div>{{ i18n.ts._tutorial.step2_2 }}</div>
-						<br/>
-						<XSettings :save-button="true"/>
-						<br/>
-					</div>
-					<div v-else-if="tutorial === 2" key="3" class="_content">
-						<h3>{{ i18n.ts._tutorial.step3_1 }}</h3>
-						<div>{{ i18n.ts._tutorial.step3_2 }}</div>
-						<XFeaturedUsers/>
-						<br/>
-						<MkButton class="ok" primary @click="tutorial++"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.next }}</MkButton>
-					</div>
-					<div v-else-if="tutorial === 3" key="4" class="_content">
-						<h3>{{ i18n.ts._tutorial.step4_1 }}</h3>
-						<I18n :src="i18n.ts._tutorial.step4_2" tag="div">
-							<template #introduction>
-								<MkA class="_link" to="/tags/introduction">#introduction</MkA>
-							</template>
-						</I18n>
-						<br/>
-						<XPostForm class="post-form _block"/>
-					</div>
-					<div v-else-if="tutorial === 4" key="5" class="_content">
-						<h3>{{ i18n.ts._tutorial.step5_1 }}</h3>
-						<I18n :src="i18n.ts._tutorial.step5_2" tag="div">
-							<template #timelines>
-								<span>{{ timelines.length }}</span>
-							</template>
-						</I18n>
-						<ul>
-							<li>
-								<I18n :src="i18n.ts._tutorial.step5_3" tag="div">
-									<template #icon>
-										<i class="ph-house ph-bold ph-lg"/>
-									</template>
-								</I18n>
-							</li>
-							<li v-if="timelines.includes('local')">
-								<I18n :src="i18n.ts._tutorial.step5_4" tag="div">
-									<template #icon>
-										<i class="ph-users ph-bold ph-lg"/>
-									</template>
-								</I18n>
-							</li>
-							<li v-if="timelines.includes('recommended')">
-								<I18n :src="i18n.ts._tutorial.step5_5" tag="div">
-									<template #icon>
-										<i class="ph-thumbs-up ph-bold ph-lg"/>
-									</template>
-								</I18n>
-							</li>
-							<li v-if="timelines.includes('social')">
-								<I18n :src="i18n.ts._tutorial.step5_6" tag="div">
-									<template #icon>
-										<i class="ph-handshake ph-bold ph-lg"/>
-									</template>
-								</I18n>
-							</li>
-							<li v-if="timelines.includes('global')">
-								<I18n :src="i18n.ts._tutorial.step5_7" tag="div">
-									<template #icon>
-										<i class="ph-planet ph-bold ph-lg"/>
-									</template>
-								</I18n>
-							</li>
-						</ul>
-					</div>
-					<div v-else-if="tutorial === 5" key="6" class="_content">
-						<h3>{{ i18n.ts._tutorial.step6_1 }}</h3>
-						<div>{{ i18n.ts._tutorial.step6_2 }}</div>
-						<div>{{ i18n.ts._tutorial.step6_3 }}</div>
-						<br/>
-						<MkSparkle>
-							<h3>{{ i18n.ts._tutorial.step6_4 }} <Mfm text="$[shake 🚀]"></Mfm></h3>
-						</MkSparkle>
-						<MkPushNotificationAllowButton primary show-only-to-register/>
-					</div>
-				</Transition>
 			</div>
 		</div>
-	</div>
-</XModalWindow>
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import XSettings from '@/pages/settings/profile.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import MkButton from '@/components/MkButton.vue';
-import XFeaturedUsers from '@/pages/explore.users.vue';
-import XPostForm from '@/components/MkPostForm.vue';
-import MkSparkle from '@/components/MkSparkle.vue';
-import MkPushNotificationAllowButton from '@/components/MkPushNotificationAllowButton.vue';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import { $i } from '@/account';
-import { instance } from '@/instance';
+import { computed } from "vue";
+import XSettings from "@/pages/settings/profile.vue";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import MkButton from "@/components/MkButton.vue";
+import XFeaturedUsers from "@/pages/explore.users.vue";
+import XPostForm from "@/components/MkPostForm.vue";
+import MkSparkle from "@/components/MkSparkle.vue";
+import MkPushNotificationAllowButton from "@/components/MkPushNotificationAllowButton.vue";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { $i } from "@/account";
+import { instance } from "@/instance";
 
 const isLocalTimelineAvailable =
 	!instance.disableLocalTimeline ||
@@ -139,31 +212,35 @@ const isGlobalTimelineAvailable =
 	!instance.disableGlobalTimeline ||
 	($i != null && ($i.isModerator || $i.isAdmin));
 
-let timelines = ['home'];
+let timelines = ["home"];
 
 if (isLocalTimelineAvailable) {
-	timelines.push('local');
+	timelines.push("local");
 }
 if (isRecommendedTimelineAvailable) {
-	timelines.push('recommended');
+	timelines.push("recommended");
 }
 if (isLocalTimelineAvailable) {
-	timelines.push('social');
+	timelines.push("social");
 }
 if (isGlobalTimelineAvailable) {
-	timelines.push('global');
+	timelines.push("global");
 }
 
 const emit = defineEmits<{
-	(ev: 'done'): void;
-	(ev: 'closed'): void;
+	(ev: "done"): void;
+	(ev: "closed"): void;
 }>();
 
 const dialog = $ref<InstanceType<typeof XModalWindow>>();
 
 const tutorial = computed({
-	get() { return defaultStore.reactiveState.tutorial.value || 0; },
-	set(value) { defaultStore.set('tutorial', value); },
+	get() {
+		return defaultStore.reactiveState.tutorial.value || 0;
+	},
+	set(value) {
+		defaultStore.set("tutorial", value);
+	},
 });
 
 function close(res) {
@@ -222,4 +299,3 @@ function close(res) {
 	}
 }
 </style>
-
diff --git a/packages/client/src/components/MkUpdated.vue b/packages/client/src/components/MkUpdated.vue
index 0ffe2edea..d63ba9660 100644
--- a/packages/client/src/components/MkUpdated.vue
+++ b/packages/client/src/components/MkUpdated.vue
@@ -1,43 +1,60 @@
 <template>
-<MkModal ref="modal" :z-priority="'middle'" @click="$refs.modal.close()" @closed="$emit('closed')">
-	<div :class="$style.root">
-		<div :class="$style.title"><MkSparkle>{{ i18n.ts.misskeyUpdated }}</MkSparkle></div>
-		<div :class="$style.version">✨ {{ version }} 🚀</div>
-		<div v-if="newRelease" :class="$style.releaseNotes">
-			<Mfm :text="data.notes"/>
-			<div v-if="data.screenshots.length > 0" style="max-width: 500">
-				<img v-for="i in data.screenshots" :key="i" :src="i" alt="screenshot"/>
+	<MkModal
+		ref="modal"
+		:z-priority="'middle'"
+		@click="$refs.modal.close()"
+		@closed="$emit('closed')"
+	>
+		<div :class="$style.root">
+			<div :class="$style.title">
+				<MkSparkle>{{ i18n.ts.misskeyUpdated }}</MkSparkle>
 			</div>
+			<div :class="$style.version">✨ {{ version }} 🚀</div>
+			<div v-if="newRelease" :class="$style.releaseNotes">
+				<Mfm :text="data.notes" />
+				<div v-if="data.screenshots.length > 0" style="max-width: 500">
+					<img
+						v-for="i in data.screenshots"
+						:key="i"
+						:src="i"
+						alt="screenshot"
+					/>
+				</div>
+			</div>
+			<MkButton
+				:class="$style.gotIt"
+				primary
+				full
+				@click="$refs.modal.close()"
+				>{{ i18n.ts.gotIt }}</MkButton
+			>
 		</div>
-		<MkButton :class="$style.gotIt" primary full @click="$refs.modal.close()">{{ i18n.ts.gotIt }}</MkButton>
-	</div>
-</MkModal>
+	</MkModal>
 </template>
 
 <script lang="ts" setup>
-import { shallowRef } from 'vue';
-import MkModal from '@/components/MkModal.vue';
-import MkSparkle from '@/components/MkSparkle.vue';
-import MkButton from '@/components/MkButton.vue';
-import { version } from '@/config';
-import { i18n } from '@/i18n';
-import * as os from '@/os';
+import { shallowRef } from "vue";
+import MkModal from "@/components/MkModal.vue";
+import MkSparkle from "@/components/MkSparkle.vue";
+import MkButton from "@/components/MkButton.vue";
+import { version } from "@/config";
+import { i18n } from "@/i18n";
+import * as os from "@/os";
 
 const modal = shallowRef<InstanceType<typeof MkModal>>();
 
 let newRelease = $ref(false);
 let data = $ref(Object);
 
-os.api('release').then(res => {
+os.api("release").then((res) => {
 	data = res;
-	newRelease = (version === data?.version);
+	newRelease = version === data?.version;
 });
 
-console.log(`Version: ${version}`)
-console.log(`Data version: ${data.version}`)
-console.log(newRelease)
+console.log(`Version: ${version}`);
+console.log(`Data version: ${data.version}`);
+console.log(newRelease);
 console.log(data);
-
 </script>
 
 <style lang="scss" module>
diff --git a/packages/client/src/components/MkUrlPreview.vue b/packages/client/src/components/MkUrlPreview.vue
index 3aa9a9be2..84fe1cb1f 100644
--- a/packages/client/src/components/MkUrlPreview.vue
+++ b/packages/client/src/components/MkUrlPreview.vue
@@ -1,54 +1,126 @@
 <template>
-<div v-if="playerEnabled" class="player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`" @click.stop>
-	<button class="disablePlayer" :title="i18n.ts.disablePlayer" @click="playerEnabled = false"><i class="ph-x ph-bold ph-lg"></i></button>
-	<iframe :src="player.url + (player.url.match(/\?/) ? '&autoplay=1&auto_play=1' : '?autoplay=1&auto_play=1')" :width="player.width || '100%'" :heigth="player.height || 250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen/>
-</div>
-<div v-else-if="tweetId && tweetExpanded" ref="twitter" class="twitter" @click.stop>
-	<iframe ref="tweet" scrolling="no" frameborder="no" :style="{ position: 'relative', width: '100%', height: `${tweetHeight}px` }" :src="`https://platform.twitter.com/embed/index.html?embedId=${embedId}&amp;hideCard=false&amp;hideThread=false&amp;lang=en&amp;theme=${$store.state.darkMode ? 'dark' : 'light'}&amp;id=${tweetId}`"></iframe>
-</div>
-<div v-else v-size="{ max: [400, 350] }" class="mk-url-preview" @click.stop>
-	<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
-		<component :is="self ? 'MkA' : 'a'" v-if="!fetching" class="link" :class="{ compact }" :[attr]="self ? url.substr(local.length) : url" rel="nofollow noopener" :target="target" :title="url">
-			<div v-if="thumbnail" class="thumbnail" :style="`background-image: url('${thumbnail}')`">
-				<button v-if="!playerEnabled && player.url" class="_button" :title="i18n.ts.enablePlayer" @click.prevent="playerEnabled = true"><i class="ph-play-circle ph-bold ph-lg"></i></button>
-			</div>
-			<article>
-				<header>
-					<h1 :title="title">{{ title }}</h1>
-				</header>
-				<p v-if="description" :title="description">{{ description.length > 85 ? description.slice(0, 85) + '…' : description }}</p>
-				<footer>
-					<img v-if="icon" class="icon" :src="icon"/>
-					<p :title="sitename">{{ sitename }}</p>
-				</footer>
-			</article>
-		</component>
-	</transition>
-	<div v-if="tweetId" class="expandTweet">
-		<a @click="tweetExpanded = true">
-			<i class="ph-twitter-logo ph-bold ph-lg"></i> {{ i18n.ts.expandTweet }}
-		</a>
+	<div
+		v-if="playerEnabled"
+		class="player"
+		:style="`padding: ${
+			((player.height || 0) / (player.width || 1)) * 100
+		}% 0 0`"
+		@click.stop
+	>
+		<button
+			class="disablePlayer"
+			:title="i18n.ts.disablePlayer"
+			@click="playerEnabled = false"
+		>
+			<i class="ph-x ph-bold ph-lg"></i>
+		</button>
+		<iframe
+			:src="
+				player.url +
+				(player.url.match(/\?/)
+					? '&autoplay=1&auto_play=1'
+					: '?autoplay=1&auto_play=1')
+			"
+			:width="player.width || '100%'"
+			:heigth="player.height || 250"
+			frameborder="0"
+			allow="autoplay; encrypted-media"
+			allowfullscreen
+		/>
+	</div>
+	<div
+		v-else-if="tweetId && tweetExpanded"
+		ref="twitter"
+		class="twitter"
+		@click.stop
+	>
+		<iframe
+			ref="tweet"
+			scrolling="no"
+			frameborder="no"
+			:style="{
+				position: 'relative',
+				width: '100%',
+				height: `${tweetHeight}px`,
+			}"
+			:src="`https://platform.twitter.com/embed/index.html?embedId=${embedId}&amp;hideCard=false&amp;hideThread=false&amp;lang=en&amp;theme=${
+				$store.state.darkMode ? 'dark' : 'light'
+			}&amp;id=${tweetId}`"
+		></iframe>
+	</div>
+	<div v-else v-size="{ max: [400, 350] }" class="mk-url-preview" @click.stop>
+		<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
+			<component
+				:is="self ? 'MkA' : 'a'"
+				v-if="!fetching"
+				class="link"
+				:class="{ compact }"
+				:[attr]="self ? url.substr(local.length) : url"
+				rel="nofollow noopener"
+				:target="target"
+				:title="url"
+			>
+				<div
+					v-if="thumbnail"
+					class="thumbnail"
+					:style="`background-image: url('${thumbnail}')`"
+				>
+					<button
+						v-if="!playerEnabled && player.url"
+						class="_button"
+						:title="i18n.ts.enablePlayer"
+						@click.prevent="playerEnabled = true"
+					>
+						<i class="ph-play-circle ph-bold ph-lg"></i>
+					</button>
+				</div>
+				<article>
+					<header>
+						<h1 :title="title">{{ title }}</h1>
+					</header>
+					<p v-if="description" :title="description">
+						{{
+							description.length > 85
+								? description.slice(0, 85) + "…"
+								: description
+						}}
+					</p>
+					<footer>
+						<img v-if="icon" class="icon" :src="icon" />
+						<p :title="sitename">{{ sitename }}</p>
+					</footer>
+				</article>
+			</component>
+		</transition>
+		<div v-if="tweetId" class="expandTweet">
+			<a @click="tweetExpanded = true">
+				<i class="ph-twitter-logo ph-bold ph-lg"></i>
+				{{ i18n.ts.expandTweet }}
+			</a>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted } from 'vue';
-import { url as local, lang } from '@/config';
-import { i18n } from '@/i18n';
+import { onMounted, onUnmounted } from "vue";
+import { url as local, lang } from "@/config";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	url: string;
-	detail?: boolean;
-	compact?: boolean;
-}>(), {
-	detail: false,
-	compact: false,
-});
+const props = withDefaults(
+	defineProps<{
+		url: string;
+		detail?: boolean;
+		compact?: boolean;
+	}>(),
+	{
+		detail: false,
+		compact: false,
+	}
+);
 
 const self = props.url.startsWith(local);
-const attr = self ? 'to' : 'href';
-const target = self ? null : '_blank';
+const attr = self ? "to" : "href";
+const target = self ? null : "_blank";
 let fetching = $ref(true);
 let title = $ref<string | null>(null);
 let description = $ref<string | null>(null);
@@ -63,27 +135,36 @@ let player = $ref({
 let playerEnabled = $ref(false);
 let tweetId = $ref<string | null>(null);
 let tweetExpanded = $ref(props.detail);
-const embedId = `embed${Math.random().toString().replace(/\D/,'')}`;
+const embedId = `embed${Math.random().toString().replace(/\D/, "")}`;
 let tweetHeight = $ref(150);
 
 const requestUrl = new URL(props.url);
-if (!['http:', 'https:'].includes(requestUrl.protocol)) throw new Error('invalid url');
+if (!["http:", "https:"].includes(requestUrl.protocol))
+	throw new Error("invalid url");
 
-if (requestUrl.hostname === 'twitter.com' || requestUrl.hostname === 'mobile.twitter.com') {
+if (
+	requestUrl.hostname === "twitter.com" ||
+	requestUrl.hostname === "mobile.twitter.com"
+) {
 	const m = requestUrl.pathname.match(/^\/.+\/status(?:es)?\/(\d+)/);
 	if (m) tweetId = m[1];
 }
 
-if (requestUrl.hostname === 'music.youtube.com' && requestUrl.pathname.match('^/(?:watch|channel)')) {
-	requestUrl.hostname = 'www.youtube.com';
+if (
+	requestUrl.hostname === "music.youtube.com" &&
+	requestUrl.pathname.match("^/(?:watch|channel)")
+) {
+	requestUrl.hostname = "www.youtube.com";
 }
 
-const requestLang = (lang || 'ja-JP').replace('ja-KS', 'ja-JP');
+const requestLang = (lang || "ja-JP").replace("ja-KS", "ja-JP");
 
-requestUrl.hash = '';
+requestUrl.hash = "";
 
-fetch(`/url?url=${encodeURIComponent(requestUrl.href)}&lang=${requestLang}`).then(res => {
-	res.json().then(info => {
+fetch(
+	`/url?url=${encodeURIComponent(requestUrl.href)}&lang=${requestLang}`
+).then((res) => {
+	res.json().then((info) => {
 		if (info.url == null) return;
 		title = info.title;
 		description = info.description;
@@ -96,18 +177,18 @@ fetch(`/url?url=${encodeURIComponent(requestUrl.href)}&lang=${requestLang}`).the
 });
 
 function adjustTweetHeight(message: any) {
-	if (message.origin !== 'https://platform.twitter.com') return;
-	const embed = message.data?.['twttr.embed'];
-	if (embed?.method !== 'twttr.private.resize') return;
+	if (message.origin !== "https://platform.twitter.com") return;
+	const embed = message.data?.["twttr.embed"];
+	if (embed?.method !== "twttr.private.resize") return;
 	if (embed?.id !== embedId) return;
 	const height = embed?.params[0]?.height;
 	if (height) tweetHeight = height;
 }
 
-(window as any).addEventListener('message', adjustTweetHeight);
+(window as any).addEventListener("message", adjustTweetHeight);
 
 onUnmounted(() => {
-	(window as any).removeEventListener('message', adjustTweetHeight);
+	(window as any).removeEventListener("message", adjustTweetHeight);
 });
 </script>
 
@@ -214,8 +295,9 @@ onUnmounted(() => {
 		border: 1px solid var(--divider);
 		border-radius: 8px;
 		overflow: hidden;
-		transition: background .2s;
-		&:hover, &:focus-within {
+		transition: background 0.2s;
+		&:hover,
+		&:focus-within {
 			text-decoration: none;
 			background-color: var(--panelHighlight);
 			> article > header > h1 {
@@ -293,7 +375,9 @@ onUnmounted(() => {
 
 		&.compact {
 			> article {
-				> header h1, p, footer {
+				> header h1,
+				p,
+				footer {
 					overflow: hidden;
 					white-space: nowrap;
 					text-overflow: ellipsis;
diff --git a/packages/client/src/components/MkUrlPreviewPopup.vue b/packages/client/src/components/MkUrlPreviewPopup.vue
index f343c6d8a..76d014313 100644
--- a/packages/client/src/components/MkUrlPreviewPopup.vue
+++ b/packages/client/src/components/MkUrlPreviewPopup.vue
@@ -1,15 +1,21 @@
 <template>
-<div class="fgmtyycl" :style="{ zIndex, top: top + 'px', left: left + 'px' }">
-	<transition :name="$store.state.animation ? 'zoom' : ''" @after-leave="emit('closed')">
-		<MkUrlPreview v-if="showing" class="_popup _shadow" :url="url"/>
-	</transition>
-</div>
+	<div
+		class="fgmtyycl"
+		:style="{ zIndex, top: top + 'px', left: left + 'px' }"
+	>
+		<transition
+			:name="$store.state.animation ? 'zoom' : ''"
+			@after-leave="emit('closed')"
+		>
+			<MkUrlPreview v-if="showing" class="_popup _shadow" :url="url" />
+		</transition>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import MkUrlPreview from '@/components/MkUrlPreview.vue';
-import * as os from '@/os';
+import { onMounted } from "vue";
+import MkUrlPreview from "@/components/MkUrlPreview.vue";
+import * as os from "@/os";
 
 const props = defineProps<{
 	showing: boolean;
@@ -18,16 +24,18 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
-const zIndex = os.claimZIndex('middle');
+const zIndex = os.claimZIndex("middle");
 let top = $ref(0);
 let left = $ref(0);
 
 onMounted(() => {
 	const rect = props.source.getBoundingClientRect();
-	const x = Math.max((rect.left + (props.source.offsetWidth / 2)) - (300 / 2), 6) + window.pageXOffset;
+	const x =
+		Math.max(rect.left + props.source.offsetWidth / 2 - 300 / 2, 6) +
+		window.pageXOffset;
 	const y = rect.top + props.source.offsetHeight + window.pageYOffset;
 
 	top = y;
diff --git a/packages/client/src/components/MkUserCardMini.vue b/packages/client/src/components/MkUserCardMini.vue
index bc6fc8afc..9d97e2484 100644
--- a/packages/client/src/components/MkUserCardMini.vue
+++ b/packages/client/src/components/MkUserCardMini.vue
@@ -1,19 +1,31 @@
 <template>
-<div :class="[$style.root, { yellow: user.isSilenced, red: user.isSuspended, gray: false }]">
-	<MkAvatar class="avatar" :user="user" :disable-link="true" :show-indicator="true"/>
-	<div class="body">
-		<span class="name"><MkUserName class="name" :user="user"/></span>
-		<span class="sub"><span class="acct _monospace">@{{ acct(user) }}</span></span>
+	<div
+		:class="[
+			$style.root,
+			{ yellow: user.isSilenced, red: user.isSuspended, gray: false },
+		]"
+	>
+		<MkAvatar
+			class="avatar"
+			:user="user"
+			:disable-link="true"
+			:show-indicator="true"
+		/>
+		<div class="body">
+			<span class="name"><MkUserName class="name" :user="user" /></span>
+			<span class="sub"
+				><span class="acct _monospace">@{{ acct(user) }}</span></span
+			>
+		</div>
+		<MkMiniChart v-if="chartValues" class="chart" :src="chartValues" />
 	</div>
-	<MkMiniChart v-if="chartValues" class="chart" :src="chartValues"/>
-</div>
 </template>
 
 <script lang="ts" setup>
-import * as misskey from 'calckey-js';
-import MkMiniChart from '@/components/MkMiniChart.vue';
-import * as os from '@/os';
-import { acct } from '@/filters/user';
+import * as misskey from "calckey-js";
+import MkMiniChart from "@/components/MkMiniChart.vue";
+import * as os from "@/os";
+import { acct } from "@/filters/user";
 
 const props = defineProps<{
 	user: misskey.entities.User;
@@ -21,7 +33,11 @@ const props = defineProps<{
 
 let chartValues = $ref<number[] | null>(null);
 
-os.apiGet('charts/user/notes', { userId: props.user.id, limit: 16 + 1, span: 'day' }).then(res => {
+os.apiGet("charts/user/notes", {
+	userId: props.user.id,
+	limit: 16 + 1,
+	span: "day",
+}).then((res) => {
 	// 今日のぶんの値はまだ途中の値であり、それも含めると大抵の場合前日よりも下降しているようなグラフになってしまうため今日は弾く
 	res.inc.splice(0, 1);
 	chartValues = res.inc;
@@ -80,19 +96,46 @@ os.apiGet('charts/user/notes', { userId: props.user.id, limit: 16 + 1, span: 'da
 
 	&:global(.yellow) {
 		--c: rgb(255 196 0 / 15%);
-		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-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;
 	}
 
 	&:global(.red) {
 		--c: rgb(255 0 0 / 15%);
-		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-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;
 	}
 
 	&: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-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;
 	}
 }
diff --git a/packages/client/src/components/MkUserInfo.vue b/packages/client/src/components/MkUserInfo.vue
index b34c2a87b..5841e6d41 100644
--- a/packages/client/src/components/MkUserInfo.vue
+++ b/packages/client/src/components/MkUserInfo.vue
@@ -1,37 +1,64 @@
 <template>
-<div class="_panel vjnjpkug">
-	<div class="banner" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl})` : ''"></div>
-	<MkAvatar class="avatar" :user="user" :disable-preview="true" :show-indicator="true"/>
-	<div class="title">
-		<MkA class="name" :to="userPage(user)"><MkUserName :user="user" :nowrap="false"/></MkA>
-		<p class="username"><MkAcct :user="user"/></p>
+	<div class="_panel vjnjpkug">
+		<div
+			class="banner"
+			:style="
+				user.bannerUrl ? `background-image: url(${user.bannerUrl})` : ''
+			"
+		></div>
+		<MkAvatar
+			class="avatar"
+			:user="user"
+			:disable-preview="true"
+			:show-indicator="true"
+		/>
+		<div class="title">
+			<MkA class="name" :to="userPage(user)"
+				><MkUserName :user="user" :nowrap="false"
+			/></MkA>
+			<p class="username"><MkAcct :user="user" /></p>
+		</div>
+		<div class="description">
+			<div v-if="user.description" class="mfm">
+				<Mfm
+					:text="user.description"
+					:author="user"
+					:i="$i"
+					:custom-emojis="user.emojis"
+				/>
+			</div>
+			<span v-else style="opacity: 0.7">{{
+				i18n.ts.noAccountDescription
+			}}</span>
+		</div>
+		<div class="status">
+			<div>
+				<p>{{ i18n.ts.notes }}</p>
+				<span>{{ user.notesCount }}</span>
+			</div>
+			<div>
+				<p>{{ i18n.ts.following }}</p>
+				<span>{{ user.followingCount }}</span>
+			</div>
+			<div>
+				<p>{{ i18n.ts.followers }}</p>
+				<span>{{ user.followersCount }}</span>
+			</div>
+		</div>
+		<MkFollowButton
+			v-if="$i && user.id != $i.id"
+			class="koudoku-button"
+			:user="user"
+			mini
+		/>
 	</div>
-	<div class="description">
-		<div v-if="user.description" class="mfm">
-			<Mfm :text="user.description" :author="user" :i="$i" :custom-emojis="user.emojis"/>
-		</div>
-		<span v-else style="opacity: 0.7;">{{ i18n.ts.noAccountDescription }}</span>
-	</div>
-	<div class="status">
-		<div>
-			<p>{{ i18n.ts.notes }}</p><span>{{ user.notesCount }}</span>
-		</div>
-		<div>
-			<p>{{ i18n.ts.following }}</p><span>{{ user.followingCount }}</span>
-		</div>
-		<div>
-			<p>{{ i18n.ts.followers }}</p><span>{{ user.followersCount }}</span>
-		</div>
-	</div>
-	<MkFollowButton v-if="$i && user.id != $i.id" class="koudoku-button" :user="user" mini/>
-</div>
 </template>
 
 <script lang="ts" setup>
-import * as misskey from 'calckey-js';
-import MkFollowButton from '@/components/MkFollowButton.vue';
-import { userPage } from '@/filters/user';
-import { i18n } from '@/i18n';
+import * as misskey from "calckey-js";
+import MkFollowButton from "@/components/MkFollowButton.vue";
+import { userPage } from "@/filters/user";
+import { i18n } from "@/i18n";
 
 defineProps<{
 	user: misskey.entities.UserDetailed;
@@ -47,7 +74,6 @@ defineProps<{
 		background-color: rgba(0, 0, 0, 0.1);
 		background-size: cover;
 		background-position: center;
-
 	}
 
 	> .avatar {
diff --git a/packages/client/src/components/MkUserList.vue b/packages/client/src/components/MkUserList.vue
index 204d7a61d..99815e46e 100644
--- a/packages/client/src/components/MkUserList.vue
+++ b/packages/client/src/components/MkUserList.vue
@@ -1,26 +1,35 @@
 <template>
-<MkPagination ref="pagingComponent" :pagination="pagination">
-	<template #empty>
-		<div class="_fullinfo">
-			<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>
-			<div>{{ i18n.ts.noUsers }}</div>
-		</div>
-	</template>
+	<MkPagination ref="pagingComponent" :pagination="pagination">
+		<template #empty>
+			<div class="_fullinfo">
+				<img
+					src="/static-assets/badges/info.png"
+					class="_ghost"
+					alt="Info"
+				/>
+				<div>{{ i18n.ts.noUsers }}</div>
+			</div>
+		</template>
 
-	<template #default="{ items: users }">
-		<div class="efvhhmdq">
-			<MkUserInfo v-for="user in users" :key="user.id" class="user" :user="user"/>
-		</div>
-	</template>
-</MkPagination>
+		<template #default="{ items: users }">
+			<div class="efvhhmdq">
+				<MkUserInfo
+					v-for="user in users"
+					:key="user.id"
+					class="user"
+					:user="user"
+				/>
+			</div>
+		</template>
+	</MkPagination>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import MkUserInfo from '@/components/MkUserInfo.vue';
-import MkPagination, { Paging } from '@/components/MkPagination.vue';
-import { userPage } from '@/filters/user';
-import { i18n } from '@/i18n';
+import { ref } from "vue";
+import MkUserInfo from "@/components/MkUserInfo.vue";
+import MkPagination, { Paging } from "@/components/MkPagination.vue";
+import { userPage } from "@/filters/user";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	pagination: Paging;
diff --git a/packages/client/src/components/MkUserOnlineIndicator.vue b/packages/client/src/components/MkUserOnlineIndicator.vue
index 35eef94a1..de238ed4b 100644
--- a/packages/client/src/components/MkUserOnlineIndicator.vue
+++ b/packages/client/src/components/MkUserOnlineIndicator.vue
@@ -1,11 +1,11 @@
 <template>
-<div v-tooltip="text" class="fzgwjkgc" :class="user.onlineStatus"></div>
+	<div v-tooltip="text" class="fzgwjkgc" :class="user.onlineStatus"></div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as misskey from 'calckey-js';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import * as misskey from "calckey-js";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	user: misskey.entities.User;
@@ -13,10 +13,14 @@ const props = defineProps<{
 
 const text = $computed(() => {
 	switch (props.user.onlineStatus) {
-		case 'online': return i18n.ts.online;
-		case 'active': return i18n.ts.active;
-		case 'offline': return i18n.ts.offline;
-		case 'unknown': return i18n.ts.unknown;
+		case "online":
+			return i18n.ts.online;
+		case "active":
+			return i18n.ts.active;
+		case "offline":
+			return i18n.ts.offline;
+		case "unknown":
+			return i18n.ts.unknown;
 	}
 });
 </script>
diff --git a/packages/client/src/components/MkUserPreview.vue b/packages/client/src/components/MkUserPreview.vue
index 71f97137a..956dececb 100644
--- a/packages/client/src/components/MkUserPreview.vue
+++ b/packages/client/src/components/MkUserPreview.vue
@@ -1,47 +1,97 @@
 <template>
-<transition :name="$store.state.animation ? 'popup' : ''" appear @after-leave="emit('closed')">
-	<div v-if="showing" class="fxxzrfni _popup _shadow" :style="{ zIndex, top: top + 'px', left: left + 'px' }" @mouseover="() => { emit('mouseover'); }" @mouseleave="() => { emit('mouseleave'); }">
-		<div v-if="user != null" class="info">
-			<div class="banner" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl})` : ''">
-				<span v-if="$i && $i.id != user.id && user.isFollowed" class="followed">{{ i18n.ts.followsYou }}</span>
-			</div>
-			<MkAvatar class="avatar" :user="user" :disable-preview="true" :show-indicator="true"/>
-			<div class="title">
-				<MkA class="name" :to="userPage(user)"><MkUserName :user="user" :nowrap="false"/></MkA>
-				<p class="username"><MkAcct :user="user"/></p>
-			</div>
-			<div class="description">
-				<Mfm v-if="user.description" :text="user.description" :author="user" :i="$i" :custom-emojis="user.emojis"/>
-			</div>
-			<div class="status">
-				<div>
-					<p>{{ i18n.ts.notes }}</p><span>{{ user.notesCount }}</span>
+	<transition
+		:name="$store.state.animation ? 'popup' : ''"
+		appear
+		@after-leave="emit('closed')"
+	>
+		<div
+			v-if="showing"
+			class="fxxzrfni _popup _shadow"
+			:style="{ zIndex, top: top + 'px', left: left + 'px' }"
+			@mouseover="
+				() => {
+					emit('mouseover');
+				}
+			"
+			@mouseleave="
+				() => {
+					emit('mouseleave');
+				}
+			"
+		>
+			<div v-if="user != null" class="info">
+				<div
+					class="banner"
+					:style="
+						user.bannerUrl
+							? `background-image: url(${user.bannerUrl})`
+							: ''
+					"
+				>
+					<span
+						v-if="$i && $i.id != user.id && user.isFollowed"
+						class="followed"
+						>{{ i18n.ts.followsYou }}</span
+					>
 				</div>
-				<div>
-					<p>{{ i18n.ts.following }}</p><span>{{ user.followingCount }}</span>
+				<MkAvatar
+					class="avatar"
+					:user="user"
+					:disable-preview="true"
+					:show-indicator="true"
+				/>
+				<div class="title">
+					<MkA class="name" :to="userPage(user)"
+						><MkUserName :user="user" :nowrap="false"
+					/></MkA>
+					<p class="username"><MkAcct :user="user" /></p>
 				</div>
-				<div>
-					<p>{{ i18n.ts.followers }}</p><span>{{ user.followersCount }}</span>
+				<div class="description">
+					<Mfm
+						v-if="user.description"
+						:text="user.description"
+						:author="user"
+						:i="$i"
+						:custom-emojis="user.emojis"
+					/>
 				</div>
+				<div class="status">
+					<div>
+						<p>{{ i18n.ts.notes }}</p>
+						<span>{{ user.notesCount }}</span>
+					</div>
+					<div>
+						<p>{{ i18n.ts.following }}</p>
+						<span>{{ user.followingCount }}</span>
+					</div>
+					<div>
+						<p>{{ i18n.ts.followers }}</p>
+						<span>{{ user.followersCount }}</span>
+					</div>
+				</div>
+				<MkFollowButton
+					v-if="$i && user.id != $i.id"
+					class="koudoku-button"
+					:user="user"
+					mini
+				/>
+			</div>
+			<div v-else>
+				<MkLoading />
 			</div>
-			<MkFollowButton v-if="$i && user.id != $i.id" class="koudoku-button" :user="user" mini/>
 		</div>
-		<div v-else>
-			<MkLoading/>
-		</div>
-	</div>
-</transition>
+	</transition>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import * as Acct from 'calckey-js/built/acct';
-import type * as misskey from 'calckey-js';
-import MkFollowButton from '@/components/MkFollowButton.vue';
-import { userPage } from '@/filters/user';
-import * as os from '@/os';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
+import { onMounted } from "vue";
+import * as Acct from "calckey-js/built/acct";
+import type * as misskey from "calckey-js";
+import MkFollowButton from "@/components/MkFollowButton.vue";
+import { userPage } from "@/filters/user";
+import * as os from "@/os";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	showing: boolean;
@@ -50,32 +100,33 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
-	(ev: 'mouseover'): void;
-	(ev: 'mouseleave'): void;
+	(ev: "closed"): void;
+	(ev: "mouseover"): void;
+	(ev: "mouseleave"): void;
 }>();
 
-const zIndex = os.claimZIndex('middle');
+const zIndex = os.claimZIndex("middle");
 let user = $ref<misskey.entities.UserDetailed | null>(null);
 let top = $ref(0);
 let left = $ref(0);
 
 onMounted(() => {
-	if (typeof props.q === 'object') {
+	if (typeof props.q === "object") {
 		user = props.q;
 	} else {
-		const query = props.q.startsWith('@') ?
-			Acct.parse(props.q.substr(1)) :
-			{ userId: props.q };
+		const query = props.q.startsWith("@")
+			? Acct.parse(props.q.substr(1))
+			: { userId: props.q };
 
-		os.api('users/show', query).then(res => {
+		os.api("users/show", query).then((res) => {
 			if (!props.showing) return;
 			user = res;
 		});
 	}
 
 	const rect = props.source.getBoundingClientRect();
-	const x = ((rect.left + (props.source.offsetWidth / 2)) - (300 / 2)) + window.pageXOffset;
+	const x =
+		rect.left + props.source.offsetWidth / 2 - 300 / 2 + window.pageXOffset;
 	const y = rect.top + props.source.offsetHeight + window.pageYOffset;
 
 	top = y;
@@ -84,10 +135,12 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-.popup-enter-active, .popup-leave-active {
+.popup-enter-active,
+.popup-leave-active {
 	transition: opacity 0.3s, transform 0.3s !important;
 }
-.popup-enter-from, .popup-leave-to {
+.popup-enter-from,
+.popup-leave-to {
 	opacity: 0;
 	transform: scale(0.9);
 }
@@ -105,14 +158,14 @@ onMounted(() => {
 			background-size: cover;
 			background-position: center;
 			> .followed {
-					position: absolute;
-					top: 12px;
-					left: 12px;
-					padding: 4px 8px;
-					color: #fff;
-					background: rgba(0, 0, 0, 0.7);
-					font-size: 0.7em;
-					border-radius: 6px;
+				position: absolute;
+				top: 12px;
+				left: 12px;
+				padding: 4px 8px;
+				color: #fff;
+				background: rgba(0, 0, 0, 0.7);
+				font-size: 0.7em;
+				border-radius: 6px;
 			}
 
 			&::after {
@@ -123,7 +176,7 @@ onMounted(() => {
 				background-size: cover;
 				background-position: center;
 				pointer-events: none;
-				opacity: .1;
+				opacity: 0.1;
 				filter: var(--blur, blur(10px));
 			}
 		}
diff --git a/packages/client/src/components/MkUserSelectDialog.vue b/packages/client/src/components/MkUserSelectDialog.vue
index afd1cd926..506f48bd4 100644
--- a/packages/client/src/components/MkUserSelectDialog.vue
+++ b/packages/client/src/components/MkUserSelectDialog.vue
@@ -1,115 +1,149 @@
 <template>
-<XModalWindow
-	ref="dialogEl"
-	:with-ok-button="true"
-	:ok-button-disabled="selected == null"
-	@click="cancel()"
-	@close="cancel()"
-	@ok="ok()"
-	@closed="$emit('closed')"
->
-	<template #header>{{ i18n.ts.selectUser }}</template>
-	<div class="tbhwbxda">
-		<div class="form">
-			<FormSplit :min-width="170">
-				<MkInput v-model="username" :autofocus="true" @update:modelValue="search">
-					<template #label>{{ i18n.ts.username }}</template>
-					<template #prefix>@</template>
-				</MkInput>
-				<MkInput v-model="host" @update:modelValue="search">
-					<template #label>{{ i18n.ts.host }}</template>
-					<template #prefix>@</template>
-				</MkInput>
-			</FormSplit>
-		</div>
-		<div v-if="username != '' || host != ''" class="result" :class="{ hit: users.length > 0 }">
-			<div v-if="users.length > 0" class="users">
-				<div v-for="user in users" :key="user.id" class="user" :class="{ selected: selected && selected.id === user.id }" @click="selected = user" @dblclick="ok()">
-					<MkAvatar :user="user" class="avatar" :show-indicator="true"/>
-					<div class="body">
-						<MkUserName :user="user" class="name"/>
-						<MkAcct :user="user" class="acct"/>
+	<XModalWindow
+		ref="dialogEl"
+		:with-ok-button="true"
+		:ok-button-disabled="selected == null"
+		@click="cancel()"
+		@close="cancel()"
+		@ok="ok()"
+		@closed="$emit('closed')"
+	>
+		<template #header>{{ i18n.ts.selectUser }}</template>
+		<div class="tbhwbxda">
+			<div class="form">
+				<FormSplit :min-width="170">
+					<MkInput
+						v-model="username"
+						:autofocus="true"
+						@update:modelValue="search"
+					>
+						<template #label>{{ i18n.ts.username }}</template>
+						<template #prefix>@</template>
+					</MkInput>
+					<MkInput v-model="host" @update:modelValue="search">
+						<template #label>{{ i18n.ts.host }}</template>
+						<template #prefix>@</template>
+					</MkInput>
+				</FormSplit>
+			</div>
+			<div
+				v-if="username != '' || host != ''"
+				class="result"
+				:class="{ hit: users.length > 0 }"
+			>
+				<div v-if="users.length > 0" class="users">
+					<div
+						v-for="user in users"
+						:key="user.id"
+						class="user"
+						:class="{
+							selected: selected && selected.id === user.id,
+						}"
+						@click="selected = user"
+						@dblclick="ok()"
+					>
+						<MkAvatar
+							:user="user"
+							class="avatar"
+							:show-indicator="true"
+						/>
+						<div class="body">
+							<MkUserName :user="user" class="name" />
+							<MkAcct :user="user" class="acct" />
+						</div>
 					</div>
 				</div>
+				<div v-else class="empty">
+					<span>{{ i18n.ts.noUsers }}</span>
+				</div>
 			</div>
-			<div v-else class="empty">
-				<span>{{ i18n.ts.noUsers }}</span>
-			</div>
-		</div>
-		<div v-if="username == '' && host == ''" class="recent">
-			<div class="users">
-				<div v-for="user in recentUsers" :key="user.id" class="user" :class="{ selected: selected && selected.id === user.id }" @click="selected = user" @dblclick="ok()">
-					<MkAvatar :user="user" class="avatar" :show-indicator="true"/>
-					<div class="body">
-						<MkUserName :user="user" class="name"/>
-						<MkAcct :user="user" class="acct"/>
+			<div v-if="username == '' && host == ''" class="recent">
+				<div class="users">
+					<div
+						v-for="user in recentUsers"
+						:key="user.id"
+						class="user"
+						:class="{
+							selected: selected && selected.id === user.id,
+						}"
+						@click="selected = user"
+						@dblclick="ok()"
+					>
+						<MkAvatar
+							:user="user"
+							class="avatar"
+							:show-indicator="true"
+						/>
+						<div class="body">
+							<MkUserName :user="user" class="name" />
+							<MkAcct :user="user" class="acct" />
+						</div>
 					</div>
 				</div>
 			</div>
 		</div>
-	</div>
-</XModalWindow>
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onMounted } from 'vue';
-import * as misskey from 'calckey-js';
-import MkInput from '@/components/form/input.vue';
-import FormSplit from '@/components/form/split.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
+import { nextTick, onMounted } from "vue";
+import * as misskey from "calckey-js";
+import MkInput from "@/components/form/input.vue";
+import FormSplit from "@/components/form/split.vue";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
 
 const emit = defineEmits<{
-	(ev: 'ok', selected: misskey.entities.UserDetailed): void;
-	(ev: 'cancel'): void;
-	(ev: 'closed'): void;
+	(ev: "ok", selected: misskey.entities.UserDetailed): void;
+	(ev: "cancel"): void;
+	(ev: "closed"): void;
 }>();
 
-let username = $ref('');
-let host = $ref('');
+let username = $ref("");
+let host = $ref("");
 let users: misskey.entities.UserDetailed[] = $ref([]);
 let recentUsers: misskey.entities.UserDetailed[] = $ref([]);
 let selected: misskey.entities.UserDetailed | null = $ref(null);
 let dialogEl = $ref();
 
 const search = () => {
-	if (username === '' && host === '') {
+	if (username === "" && host === "") {
 		users = [];
 		return;
 	}
-	os.api('users/search-by-username-and-host', {
+	os.api("users/search-by-username-and-host", {
 		username: username,
 		host: host,
 		limit: 10,
 		detail: false,
-	}).then(_users => {
+	}).then((_users) => {
 		users = _users;
 	});
 };
 
 const ok = () => {
 	if (selected == null) return;
-	emit('ok', selected);
+	emit("ok", selected);
 	dialogEl.close();
 
 	// 最近使ったユーザー更新
 	let recents = defaultStore.state.recentlyUsedUsers;
-	recents = recents.filter(x => x !== selected.id);
+	recents = recents.filter((x) => x !== selected.id);
 	recents.unshift(selected.id);
-	defaultStore.set('recentlyUsedUsers', recents.splice(0, 16));
+	defaultStore.set("recentlyUsedUsers", recents.splice(0, 16));
 };
 
 const cancel = () => {
-	emit('cancel');
+	emit("cancel");
 	dialogEl.close();
 };
 
 onMounted(() => {
-	os.api('users/show', {
+	os.api("users/show", {
 		userIds: defaultStore.state.recentlyUsedUsers,
-	}).then(users => {
+	}).then((users) => {
 		recentUsers = users;
 	});
 });
@@ -121,7 +155,8 @@ onMounted(() => {
 		padding: 0 var(--root-margin);
 	}
 
-	> .result, > .recent {
+	> .result,
+	> .recent {
 		display: flex;
 		flex-direction: column;
 		overflow: auto;
diff --git a/packages/client/src/components/MkUsersTooltip.vue b/packages/client/src/components/MkUsersTooltip.vue
index 4ccc44b47..972864d1f 100644
--- a/packages/client/src/components/MkUsersTooltip.vue
+++ b/packages/client/src/components/MkUsersTooltip.vue
@@ -1,18 +1,25 @@
 <template>
-<MkTooltip ref="tooltip" :target-element="targetElement" :max-width="250" @closed="emit('closed')">
-	<div class="beaffaef">
-		<div v-for="u in users" :key="u.id" class="user">
-			<MkAvatar class="avatar" :user="u"/>
-			<MkUserName class="name" :user="u" :nowrap="true"/>
+	<MkTooltip
+		ref="tooltip"
+		:target-element="targetElement"
+		:max-width="250"
+		@closed="emit('closed')"
+	>
+		<div class="beaffaef">
+			<div v-for="u in users" :key="u.id" class="user">
+				<MkAvatar class="avatar" :user="u" />
+				<MkUserName class="name" :user="u" :nowrap="true" />
+			</div>
+			<div v-if="users.length < count" class="omitted">
+				+{{ count - users.length }}
+			</div>
 		</div>
-		<div v-if="users.length < count" class="omitted">+{{ count - users.length }}</div>
-	</div>
-</MkTooltip>
+	</MkTooltip>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkTooltip from './MkTooltip.vue';
+import {} from "vue";
+import MkTooltip from "./MkTooltip.vue";
 
 const props = defineProps<{
 	users: any[]; // TODO
@@ -21,7 +28,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 </script>
 
diff --git a/packages/client/src/components/MkVisibility.vue b/packages/client/src/components/MkVisibility.vue
index ff6535ed4..04fd6aaef 100644
--- a/packages/client/src/components/MkVisibility.vue
+++ b/packages/client/src/components/MkVisibility.vue
@@ -1,47 +1,62 @@
 <template>
-<span v-if="note.visibility !== 'public'" :class="$style.visibility">
-	<i v-if="note.visibility === 'home'" class="ph-house ph-bold ph-lg"></i>
-	<i v-else-if="note.visibility === 'followers'" class="ph-lock-simple-open ph-bold ph-lg"></i>
-	<i v-else-if="note.visibility === 'specified'" ref="specified" class="ph-envelope-simple-open ph-bold ph-lg"></i>
-</span>
-<span v-if="note.localOnly" :class="$style.localOnly"><i class="ph-hand-fist ph-bold ph-lg"></i></span>
+	<span v-if="note.visibility !== 'public'" :class="$style.visibility">
+		<i v-if="note.visibility === 'home'" class="ph-house ph-bold ph-lg"></i>
+		<i
+			v-else-if="note.visibility === 'followers'"
+			class="ph-lock-simple-open ph-bold ph-lg"
+		></i>
+		<i
+			v-else-if="note.visibility === 'specified'"
+			ref="specified"
+			class="ph-envelope-simple-open ph-bold ph-lg"
+		></i>
+	</span>
+	<span v-if="note.localOnly" :class="$style.localOnly"
+		><i class="ph-hand-fist ph-bold ph-lg"></i
+	></span>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import XDetails from '@/components/MkUsersTooltip.vue';
-import * as os from '@/os';
-import { useTooltip } from '@/scripts/use-tooltip';
+import { ref } from "vue";
+import XDetails from "@/components/MkUsersTooltip.vue";
+import * as os from "@/os";
+import { useTooltip } from "@/scripts/use-tooltip";
 
 const props = defineProps<{
 	note: {
 		visibility: string;
 		localOnly?: boolean;
 		visibleUserIds?: string[];
-	},
+	};
 }>();
 
 const specified = $ref<HTMLElement>();
 
-if (props.note.visibility === 'specified') {
+if (props.note.visibility === "specified") {
 	useTooltip($$(specified), async (showing) => {
-		const users = await os.api('users/show', {
+		const users = await os.api("users/show", {
 			userIds: props.note.visibleUserIds,
 			limit: 10,
 		});
 
-		os.popup(XDetails, {
-			showing,
-			users,
-			count: props.note.visibleUserIds.length,
-			targetElement: specified,
-		}, {}, 'closed');
+		os.popup(
+			XDetails,
+			{
+				showing,
+				users,
+				count: props.note.visibleUserIds.length,
+				targetElement: specified,
+			},
+			{},
+			"closed"
+		);
 	});
 }
 </script>
 
 <style lang="scss" module>
-.visibility, .localOnly {
+.visibility,
+.localOnly {
 	margin-left: 0.5em;
 }
 </style>
diff --git a/packages/client/src/components/MkVisibilityPicker.vue b/packages/client/src/components/MkVisibilityPicker.vue
index 2ad521055..753d8bbba 100644
--- a/packages/client/src/components/MkVisibilityPicker.vue
+++ b/packages/client/src/components/MkVisibilityPicker.vue
@@ -1,78 +1,162 @@
 <template>
-	<MkModal ref="modal" :z-priority="'high'" :src="src" @click="modal.close()" @closed="emit('closed')">
+	<MkModal
+		ref="modal"
+		:z-priority="'high'"
+		:src="src"
+		@click="modal.close()"
+		@closed="emit('closed')"
+	>
 		<div class="_popup" :class="$style.root">
-			<button key="public" class="_button" :class="[$style.item, { [$style.active]: v === 'public' }]" data-index="1" @click="choose('public')">
-				<div :class="$style.icon"><i class="ph-planet ph-bold ph-lg"></i></div>
+			<button
+				key="public"
+				class="_button"
+				:class="[$style.item, { [$style.active]: v === 'public' }]"
+				data-index="1"
+				@click="choose('public')"
+			>
+				<div :class="$style.icon">
+					<i class="ph-planet ph-bold ph-lg"></i>
+				</div>
 				<div :class="$style.body">
-					<span :class="$style.itemTitle">{{ i18n.ts._visibility.public }}</span>
-					<span :class="$style.itemDescription">{{ i18n.ts._visibility.publicDescription }}</span>
+					<span :class="$style.itemTitle">{{
+						i18n.ts._visibility.public
+					}}</span>
+					<span :class="$style.itemDescription">{{
+						i18n.ts._visibility.publicDescription
+					}}</span>
 				</div>
 			</button>
-			<button key="home" class="_button" :class="[$style.item, { [$style.active]: v === 'home' }]" data-index="2" @click="choose('home')">
-				<div :class="$style.icon"><i class="ph-house ph-bold ph-lg"></i></div>
+			<button
+				key="home"
+				class="_button"
+				:class="[$style.item, { [$style.active]: v === 'home' }]"
+				data-index="2"
+				@click="choose('home')"
+			>
+				<div :class="$style.icon">
+					<i class="ph-house ph-bold ph-lg"></i>
+				</div>
 				<div :class="$style.body">
-					<span :class="$style.itemTitle">{{ i18n.ts._visibility.home }}</span>
-					<span :class="$style.itemDescription">{{ i18n.ts._visibility.homeDescription }}</span>
+					<span :class="$style.itemTitle">{{
+						i18n.ts._visibility.home
+					}}</span>
+					<span :class="$style.itemDescription">{{
+						i18n.ts._visibility.homeDescription
+					}}</span>
 				</div>
 			</button>
-			<button key="followers" class="_button" :class="[$style.item, { [$style.active]: v === 'followers' }]" data-index="3" @click="choose('followers')">
-				<div :class="$style.icon"><i class="ph-lock-simple-open ph-bold ph-lg"></i></div>
+			<button
+				key="followers"
+				class="_button"
+				:class="[$style.item, { [$style.active]: v === 'followers' }]"
+				data-index="3"
+				@click="choose('followers')"
+			>
+				<div :class="$style.icon">
+					<i class="ph-lock-simple-open ph-bold ph-lg"></i>
+				</div>
 				<div :class="$style.body">
-					<span :class="$style.itemTitle">{{ i18n.ts._visibility.followers }}</span>
-					<span :class="$style.itemDescription">{{ i18n.ts._visibility.followersDescription }}</span>
+					<span :class="$style.itemTitle">{{
+						i18n.ts._visibility.followers
+					}}</span>
+					<span :class="$style.itemDescription">{{
+						i18n.ts._visibility.followersDescription
+					}}</span>
 				</div>
 			</button>
-			<button key="specified" :disabled="localOnly" class="_button" :class="[$style.item, { [$style.active]: v === 'specified' }]" data-index="4" @click="choose('specified')">
-				<div :class="$style.icon"><i class="ph-envelope-simple-open ph-bold ph-lg"></i></div>
+			<button
+				key="specified"
+				:disabled="localOnly"
+				class="_button"
+				:class="[$style.item, { [$style.active]: v === 'specified' }]"
+				data-index="4"
+				@click="choose('specified')"
+			>
+				<div :class="$style.icon">
+					<i class="ph-envelope-simple-open ph-bold ph-lg"></i>
+				</div>
 				<div :class="$style.body">
-					<span :class="$style.itemTitle">{{ i18n.ts._visibility.specified }}</span>
-					<span :class="$style.itemDescription">{{ i18n.ts._visibility.specifiedDescription }}</span>
+					<span :class="$style.itemTitle">{{
+						i18n.ts._visibility.specified
+					}}</span>
+					<span :class="$style.itemDescription">{{
+						i18n.ts._visibility.specifiedDescription
+					}}</span>
 				</div>
 			</button>
 			<div :class="$style.divider"></div>
-			<button key="localOnly" class="_button" :class="[$style.item, $style.localOnly, { [$style.active]: localOnly }]" data-index="5" @click="localOnly = !localOnly">
-				<div :class="$style.icon"><i class="ph-hand-fist ph-bold ph-lg"></i></div>
-				<div :class="$style.body">
-					<span :class="$style.itemTitle">{{ i18n.ts._visibility.localOnly }}</span>
-					<span :class="$style.itemDescription">{{ i18n.ts._visibility.localOnlyDescription }}</span>
+			<button
+				key="localOnly"
+				class="_button"
+				:class="[
+					$style.item,
+					$style.localOnly,
+					{ [$style.active]: localOnly },
+				]"
+				data-index="5"
+				@click="localOnly = !localOnly"
+			>
+				<div :class="$style.icon">
+					<i class="ph-hand-fist ph-bold ph-lg"></i>
+				</div>
+				<div :class="$style.body">
+					<span :class="$style.itemTitle">{{
+						i18n.ts._visibility.localOnly
+					}}</span>
+					<span :class="$style.itemDescription">{{
+						i18n.ts._visibility.localOnlyDescription
+					}}</span>
+				</div>
+				<div :class="$style.toggle">
+					<i
+						:class="
+							localOnly
+								? 'ph-toggle-right ph-bold ph-lg'
+								: 'ph-toggle-left ph-bold ph-lg'
+						"
+					></i>
 				</div>
-				<div :class="$style.toggle"><i :class="localOnly ? 'ph-toggle-right ph-bold ph-lg' : 'ph-toggle-left ph-bold ph-lg'"></i></div>
 			</button>
 		</div>
 	</MkModal>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, watch } from 'vue';
-import * as misskey from 'calckey-js';
-import MkModal from '@/components/MkModal.vue';
-import { i18n } from '@/i18n';
+import { nextTick, watch } from "vue";
+import * as misskey from "calckey-js";
+import MkModal from "@/components/MkModal.vue";
+import { i18n } from "@/i18n";
 
 const modal = $shallowRef<InstanceType<typeof MkModal>>();
 
-const props = withDefaults(defineProps<{
-	currentVisibility: typeof misskey.noteVisibilities[number];
-	currentLocalOnly: boolean;
-	src?: HTMLElement;
-}>(), {
-});
+const props = withDefaults(
+	defineProps<{
+		currentVisibility: (typeof misskey.noteVisibilities)[number];
+		currentLocalOnly: boolean;
+		src?: HTMLElement;
+	}>(),
+	{}
+);
 
 const emit = defineEmits<{
-	(ev: 'changeVisibility', v: typeof misskey.noteVisibilities[number]): void;
-	(ev: 'changeLocalOnly', v: boolean): void;
-	(ev: 'closed'): void;
+	(
+		ev: "changeVisibility",
+		v: (typeof misskey.noteVisibilities)[number]
+	): void;
+	(ev: "changeLocalOnly", v: boolean): void;
+	(ev: "closed"): void;
 }>();
 
 let v = $ref(props.currentVisibility);
 let localOnly = $ref(props.currentLocalOnly);
 
 watch($$(localOnly), () => {
-	emit('changeLocalOnly', localOnly);
+	emit("changeLocalOnly", localOnly);
 });
 
-function choose(visibility: typeof misskey.noteVisibilities[number]): void {
+function choose(visibility: (typeof misskey.noteVisibilities)[number]): void {
 	v = visibility;
-	emit('changeVisibility', visibility);
+	emit("changeVisibility", visibility);
 	nextTick(() => {
 		modal.close();
 	});
diff --git a/packages/client/src/components/MkWaitingDialog.vue b/packages/client/src/components/MkWaitingDialog.vue
index cd46f6739..acd394c1e 100644
--- a/packages/client/src/components/MkWaitingDialog.vue
+++ b/packages/client/src/components/MkWaitingDialog.vue
@@ -1,16 +1,37 @@
 <template>
-<MkModal ref="modal" :prefer-type="'dialog'" :z-priority="'high'" @click="success ? done() : () => {}" @closed="emit('closed')">
-	<div :class="[$style.root, { [$style.iconOnly]: (text == null) || success }]">
-		<i v-if="success" :class="[$style.icon, $style.success]" class="ph-check ph-bold ph-lg"></i>
-		<MkLoading v-else :class="[$style.icon, $style.waiting]" :em="true"/>
-		<div v-if="text && !success" :class="$style.text">{{ text }}<MkEllipsis/></div>
-	</div>
-</MkModal>
+	<MkModal
+		ref="modal"
+		:prefer-type="'dialog'"
+		:z-priority="'high'"
+		@click="success ? done() : () => {}"
+		@closed="emit('closed')"
+	>
+		<div
+			:class="[
+				$style.root,
+				{ [$style.iconOnly]: text == null || success },
+			]"
+		>
+			<i
+				v-if="success"
+				:class="[$style.icon, $style.success]"
+				class="ph-check ph-bold ph-lg"
+			></i>
+			<MkLoading
+				v-else
+				:class="[$style.icon, $style.waiting]"
+				:em="true"
+			/>
+			<div v-if="text && !success" :class="$style.text">
+				{{ text }}<MkEllipsis />
+			</div>
+		</div>
+	</MkModal>
 </template>
 
 <script lang="ts" setup>
-import { watch, shallowRef } from 'vue';
-import MkModal from '@/components/MkModal.vue';
+import { watch, shallowRef } from "vue";
+import MkModal from "@/components/MkModal.vue";
 
 const modal = shallowRef<InstanceType<typeof MkModal>>();
 
@@ -21,18 +42,21 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'done');
-	(ev: 'closed');
+	(ev: "done");
+	(ev: "closed");
 }>();
 
 function done() {
-	emit('done');
+	emit("done");
 	modal.value?.close();
 }
 
-watch(() => props.showing, () => {
-	if (!props.showing) done();
-});
+watch(
+	() => props.showing,
+	() => {
+		if (!props.showing) done();
+	}
+);
 </script>
 
 <style lang="scss" module>
diff --git a/packages/client/src/components/MkWidgets.vue b/packages/client/src/components/MkWidgets.vue
index 4bb1c0bb8..07e845032 100644
--- a/packages/client/src/components/MkWidgets.vue
+++ b/packages/client/src/components/MkWidgets.vue
@@ -1,45 +1,90 @@
 <template>
-<div class="vjoppmmu">
-	<template v-if="edit">
-		<header>
-			<MkSelect v-model="widgetAdderSelected" style="margin-bottom: var(--margin)" class="mk-widget-select">
-				<template #label>{{ i18n.ts.selectWidget }}</template>
-				<option v-for="widget in widgetDefs" :key="widget" :value="widget">{{ i18n.t(`_widgets.${widget}`) }}</option>
-			</MkSelect>
-			<MkButton inline primary class="mk-widget-add" @click="addWidget"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
-			<MkButton inline @click="$emit('exit')">{{ i18n.ts.close }}</MkButton>
-		</header>
-		<XDraggable
-			v-model="widgets_"
-			item-key="id"
-			handle=".handle"
-			animation="150"
-		>
-			<template #item="{element}">
-				<div class="customize-container">
-					<button class="config _button" @click.prevent.stop="configWidget(element.id)"><i class="ph-gear-six ph-bold ph-lg"></i></button>
-					<button class="remove _button" @click.prevent.stop="removeWidget(element)"><i class="ph-x ph-bold ph-lg"></i></button>
-					<div class="handle">
-						<component :is="`mkw-${element.name}`" :ref="el => widgetRefs[element.id] = el" class="widget" :widget="element" @updateProps="updateWidget(element.id, $event)"/>
+	<div class="vjoppmmu">
+		<template v-if="edit">
+			<header>
+				<MkSelect
+					v-model="widgetAdderSelected"
+					style="margin-bottom: var(--margin)"
+					class="mk-widget-select"
+				>
+					<template #label>{{ i18n.ts.selectWidget }}</template>
+					<option
+						v-for="widget in widgetDefs"
+						:key="widget"
+						:value="widget"
+					>
+						{{ i18n.t(`_widgets.${widget}`) }}
+					</option>
+				</MkSelect>
+				<MkButton
+					inline
+					primary
+					class="mk-widget-add"
+					@click="addWidget"
+					><i class="ph-plus ph-bold ph-lg"></i>
+					{{ i18n.ts.add }}</MkButton
+				>
+				<MkButton inline @click="$emit('exit')">{{
+					i18n.ts.close
+				}}</MkButton>
+			</header>
+			<XDraggable
+				v-model="widgets_"
+				item-key="id"
+				handle=".handle"
+				animation="150"
+			>
+				<template #item="{ element }">
+					<div class="customize-container">
+						<button
+							class="config _button"
+							@click.prevent.stop="configWidget(element.id)"
+						>
+							<i class="ph-gear-six ph-bold ph-lg"></i>
+						</button>
+						<button
+							class="remove _button"
+							@click.prevent.stop="removeWidget(element)"
+						>
+							<i class="ph-x ph-bold ph-lg"></i>
+						</button>
+						<div class="handle">
+							<component
+								:is="`mkw-${element.name}`"
+								:ref="(el) => (widgetRefs[element.id] = el)"
+								class="widget"
+								:widget="element"
+								@updateProps="updateWidget(element.id, $event)"
+							/>
+						</div>
 					</div>
-				</div>
-			</template>
-		</XDraggable>
-	</template>
-	<component :is="`mkw-${widget.name}`" v-for="widget in widgets" v-else :key="widget.id" :ref="el => widgetRefs[widget.id] = el" class="widget" :widget="widget" @updateProps="updateWidget(widget.id, $event)" @contextmenu.stop="onContextmenu(widget, $event)"/>
-</div>
+				</template>
+			</XDraggable>
+		</template>
+		<component
+			:is="`mkw-${widget.name}`"
+			v-for="widget in widgets"
+			v-else
+			:key="widget.id"
+			:ref="(el) => (widgetRefs[widget.id] = el)"
+			class="widget"
+			:widget="widget"
+			@updateProps="updateWidget(widget.id, $event)"
+			@contextmenu.stop="onContextmenu(widget, $event)"
+		/>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, reactive, ref, computed } from 'vue';
-import { v4 as uuid } from 'uuid';
-import MkSelect from '@/components/form/select.vue';
-import MkButton from '@/components/MkButton.vue';
-import { widgets as widgetDefs } from '@/widgets';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { defineAsyncComponent, reactive, ref, computed } from "vue";
+import { v4 as uuid } from "uuid";
+import MkSelect from "@/components/form/select.vue";
+import MkButton from "@/components/MkButton.vue";
+import { widgets as widgetDefs } from "@/widgets";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-const XDraggable = defineAsyncComponent(() => import('vuedraggable'));
+const XDraggable = defineAsyncComponent(() => import("vuedraggable"));
 
 type Widget = {
 	name: string;
@@ -53,11 +98,11 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'updateWidgets', widgets: Widget[]): void;
-	(ev: 'addWidget', widget: Widget): void;
-	(ev: 'removeWidget', widget: Widget): void;
-	(ev: 'updateWidget', widget: Partial<Widget>): void;
-	(ev: 'exit'): void;
+	(ev: "updateWidgets", widgets: Widget[]): void;
+	(ev: "addWidget", widget: Widget): void;
+	(ev: "removeWidget", widget: Widget): void;
+	(ev: "updateWidget", widget: Partial<Widget>): void;
+	(ev: "exit"): void;
 }>();
 
 const widgetRefs = {};
@@ -68,7 +113,7 @@ const widgetAdderSelected = ref(null);
 const addWidget = () => {
 	if (widgetAdderSelected.value == null) return;
 
-	emit('addWidget', {
+	emit("addWidget", {
 		name: widgetAdderSelected.value,
 		id: uuid(),
 		data: {},
@@ -77,39 +122,51 @@ const addWidget = () => {
 	widgetAdderSelected.value = null;
 };
 const removeWidget = (widget) => {
-	emit('removeWidget', widget);
+	emit("removeWidget", widget);
 };
 const updateWidget = (id, data) => {
-	emit('updateWidget', { id, data });
+	emit("updateWidget", { id, data });
 };
 const widgets_ = computed({
 	get: () => props.widgets,
 	set: (value) => {
-		emit('updateWidgets', value);
+		emit("updateWidgets", value);
 	},
 });
 
 function onContextmenu(widget: Widget, ev: MouseEvent) {
 	const isLink = (el: HTMLElement) => {
-		if (el.tagName === 'A') return true;
+		if (el.tagName === "A") return true;
 		if (el.parentElement) {
 			return isLink(el.parentElement);
 		}
 	};
 	if (isLink(ev.target)) return;
-	if (['INPUT', 'TEXTAREA', 'IMG', 'VIDEO', 'CANVAS'].includes(ev.target.tagName) || ev.target.attributes['contenteditable']) return;
-	if (window.getSelection()?.toString() !== '') return;
+	if (
+		["INPUT", "TEXTAREA", "IMG", "VIDEO", "CANVAS"].includes(
+			ev.target.tagName
+		) ||
+		ev.target.attributes["contenteditable"]
+	)
+		return;
+	if (window.getSelection()?.toString() !== "") return;
 
-	os.contextMenu([{
-		type: 'label',
-		text: i18n.t(`_widgets.${widget.name}`),
-	}, {
-		icon: 'ph-gear-six ph-bold ph-lg',
-		text: i18n.ts.settings,
-		action: () => {
-			configWidget(widget.id);
-		},
-	}], ev);
+	os.contextMenu(
+		[
+			{
+				type: "label",
+				text: i18n.t(`_widgets.${widget.name}`),
+			},
+			{
+				icon: "ph-gear-six ph-bold ph-lg",
+				text: i18n.ts.settings,
+				action: () => {
+					configWidget(widget.id);
+				},
+			},
+		],
+		ev
+	);
 }
 </script>
 
@@ -124,7 +181,8 @@ function onContextmenu(widget: Widget, ev: MouseEvent) {
 		}
 	}
 
-	> .widget, .customize-container {
+	> .widget,
+	.customize-container {
 		contain: content;
 		margin: var(--margin) 0;
 
diff --git a/packages/client/src/components/MkWindow.vue b/packages/client/src/components/MkWindow.vue
index 6d43b0dc0..5aa3adef2 100644
--- a/packages/client/src/components/MkWindow.vue
+++ b/packages/client/src/components/MkWindow.vue
@@ -1,107 +1,190 @@
 <template>
-<transition :name="$store.state.animation ? 'window' : ''" appear @after-leave="$emit('closed')">
-	<div v-if="showing" ref="rootEl" class="ebkgocck" :class="{ maximized }">
-		<div class="body _shadow _narrow_" @mousedown="onBodyMousedown" @keydown="onKeydown">
-			<div class="header" :class="{ mini }" @contextmenu.prevent.stop="onContextmenu">
-				<span class="left">
-					<button v-for="button in buttonsLeft" v-tooltip="button.title" class="button _button" :class="{ highlighted: button.highlighted }" @click="button.onClick"><i :class="button.icon"></i></button>
-				</span>
-				<span class="title" @mousedown.prevent="onHeaderMousedown" @touchstart.prevent="onHeaderMousedown">
-					<slot name="header"></slot>
-				</span>
-				<span class="right">
-					<button v-for="button in buttonsRight" v-tooltip="button.title" class="button _button" :class="{ highlighted: button.highlighted }" @click="button.onClick"><i :class="button.icon"></i></button>
-					<button v-if="canResize && maximized" class="button _button" @click="unMaximize()"><i class="ph-copy ph-bold ph-lg"></i></button>
-					<button v-else-if="canResize && !maximized" class="button _button" @click="maximize()"><i class="ph-browser ph-bold ph-lg"></i></button>
-					<button v-if="closeButton" class="button _button" @click="close()"><i class="ph-x ph-bold ph-lg"></i></button>
-				</span>
-			</div>
-			<div class="body">
-				<slot></slot>
+	<transition
+		:name="$store.state.animation ? 'window' : ''"
+		appear
+		@after-leave="$emit('closed')"
+	>
+		<div
+			v-if="showing"
+			ref="rootEl"
+			class="ebkgocck"
+			:class="{ maximized }"
+		>
+			<div
+				class="body _shadow _narrow_"
+				@mousedown="onBodyMousedown"
+				@keydown="onKeydown"
+			>
+				<div
+					class="header"
+					:class="{ mini }"
+					@contextmenu.prevent.stop="onContextmenu"
+				>
+					<span class="left">
+						<button
+							v-for="button in buttonsLeft"
+							v-tooltip="button.title"
+							class="button _button"
+							:class="{ highlighted: button.highlighted }"
+							@click="button.onClick"
+						>
+							<i :class="button.icon"></i>
+						</button>
+					</span>
+					<span
+						class="title"
+						@mousedown.prevent="onHeaderMousedown"
+						@touchstart.prevent="onHeaderMousedown"
+					>
+						<slot name="header"></slot>
+					</span>
+					<span class="right">
+						<button
+							v-for="button in buttonsRight"
+							v-tooltip="button.title"
+							class="button _button"
+							:class="{ highlighted: button.highlighted }"
+							@click="button.onClick"
+						>
+							<i :class="button.icon"></i>
+						</button>
+						<button
+							v-if="canResize && maximized"
+							class="button _button"
+							@click="unMaximize()"
+						>
+							<i class="ph-copy ph-bold ph-lg"></i>
+						</button>
+						<button
+							v-else-if="canResize && !maximized"
+							class="button _button"
+							@click="maximize()"
+						>
+							<i class="ph-browser ph-bold ph-lg"></i>
+						</button>
+						<button
+							v-if="closeButton"
+							class="button _button"
+							@click="close()"
+						>
+							<i class="ph-x ph-bold ph-lg"></i>
+						</button>
+					</span>
+				</div>
+				<div class="body">
+					<slot></slot>
+				</div>
 			</div>
+			<template v-if="canResize">
+				<div
+					class="handle top"
+					@mousedown.prevent="onTopHandleMousedown"
+				></div>
+				<div
+					class="handle right"
+					@mousedown.prevent="onRightHandleMousedown"
+				></div>
+				<div
+					class="handle bottom"
+					@mousedown.prevent="onBottomHandleMousedown"
+				></div>
+				<div
+					class="handle left"
+					@mousedown.prevent="onLeftHandleMousedown"
+				></div>
+				<div
+					class="handle top-left"
+					@mousedown.prevent="onTopLeftHandleMousedown"
+				></div>
+				<div
+					class="handle top-right"
+					@mousedown.prevent="onTopRightHandleMousedown"
+				></div>
+				<div
+					class="handle bottom-right"
+					@mousedown.prevent="onBottomRightHandleMousedown"
+				></div>
+				<div
+					class="handle bottom-left"
+					@mousedown.prevent="onBottomLeftHandleMousedown"
+				></div>
+			</template>
 		</div>
-		<template v-if="canResize">
-			<div class="handle top" @mousedown.prevent="onTopHandleMousedown"></div>
-			<div class="handle right" @mousedown.prevent="onRightHandleMousedown"></div>
-			<div class="handle bottom" @mousedown.prevent="onBottomHandleMousedown"></div>
-			<div class="handle left" @mousedown.prevent="onLeftHandleMousedown"></div>
-			<div class="handle top-left" @mousedown.prevent="onTopLeftHandleMousedown"></div>
-			<div class="handle top-right" @mousedown.prevent="onTopRightHandleMousedown"></div>
-			<div class="handle bottom-right" @mousedown.prevent="onBottomRightHandleMousedown"></div>
-			<div class="handle bottom-left" @mousedown.prevent="onBottomLeftHandleMousedown"></div>
-		</template>
-	</div>
-</transition>
+	</transition>
 </template>
 
 <script lang="ts" setup>
-import { onBeforeUnmount, onMounted, provide } from 'vue';
-import contains from '@/scripts/contains';
-import * as os from '@/os';
-import { MenuItem } from '@/types/menu';
+import { onBeforeUnmount, onMounted, provide } from "vue";
+import contains from "@/scripts/contains";
+import * as os from "@/os";
+import { MenuItem } from "@/types/menu";
 
 const minHeight = 50;
 const minWidth = 250;
 
 function dragListen(fn: (ev: MouseEvent) => void) {
-	window.addEventListener('mousemove', fn);
-	window.addEventListener('touchmove', fn);
-	window.addEventListener('mouseleave', dragClear.bind(null, fn));
-	window.addEventListener('mouseup', dragClear.bind(null, fn));
-	window.addEventListener('touchend', dragClear.bind(null, fn));
+	window.addEventListener("mousemove", fn);
+	window.addEventListener("touchmove", fn);
+	window.addEventListener("mouseleave", dragClear.bind(null, fn));
+	window.addEventListener("mouseup", dragClear.bind(null, fn));
+	window.addEventListener("touchend", dragClear.bind(null, fn));
 }
 
 function dragClear(fn) {
-	window.removeEventListener('mousemove', fn);
-	window.removeEventListener('touchmove', fn);
-	window.removeEventListener('mouseleave', dragClear);
-	window.removeEventListener('mouseup', dragClear);
-	window.removeEventListener('touchend', dragClear);
+	window.removeEventListener("mousemove", fn);
+	window.removeEventListener("touchmove", fn);
+	window.removeEventListener("mouseleave", dragClear);
+	window.removeEventListener("mouseup", dragClear);
+	window.removeEventListener("touchend", dragClear);
 }
 
-const props = withDefaults(defineProps<{
-	initialWidth?: number;
-	initialHeight?: number | null;
-	canResize?: boolean;
-	closeButton?: boolean;
-	mini?: boolean;
-	front?: boolean;
-	contextmenu?: MenuItem[] | null;
-	buttonsLeft?: any[];
-	buttonsRight?: any[];
-}>(), {
-	initialWidth: 400,
-	initialHeight: null,
-	canResize: false,
-	closeButton: true,
-	mini: false,
-	front: false,
-	contextmenu: null,
-	buttonsLeft: () => [],
-	buttonsRight: () => [],
-});
+const props = withDefaults(
+	defineProps<{
+		initialWidth?: number;
+		initialHeight?: number | null;
+		canResize?: boolean;
+		closeButton?: boolean;
+		mini?: boolean;
+		front?: boolean;
+		contextmenu?: MenuItem[] | null;
+		buttonsLeft?: any[];
+		buttonsRight?: any[];
+	}>(),
+	{
+		initialWidth: 400,
+		initialHeight: null,
+		canResize: false,
+		closeButton: true,
+		mini: false,
+		front: false,
+		contextmenu: null,
+		buttonsLeft: () => [],
+		buttonsRight: () => [],
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'closed'): void;
+	(ev: "closed"): void;
 }>();
 
-provide('inWindow', true);
+provide("inWindow", true);
 
 let rootEl = $ref<HTMLElement | null>();
 let showing = $ref(true);
 let beforeClickedAt = 0;
 let maximized = $ref(false);
-let unMaximizedTop = '';
-let unMaximizedLeft = '';
-let unMaximizedWidth = '';
-let unMaximizedHeight = '';
+let unMaximizedTop = "";
+let unMaximizedLeft = "";
+let unMaximizedWidth = "";
+let unMaximizedHeight = "";
 
 function close() {
 	showing = false;
 }
 
 function onKeydown(evt) {
-	if (evt.which === 27) { // Esc
+	if (evt.which === 27) {
+		// Esc
 		evt.preventDefault();
 		evt.stopPropagation();
 		close();
@@ -117,7 +200,7 @@ function onContextmenu(ev: MouseEvent) {
 // 最前面へ移動
 function top() {
 	if (rootEl) {
-		rootEl.style.zIndex = os.claimZIndex(props.front ? 'middle' : 'low');
+		rootEl.style.zIndex = os.claimZIndex(props.front ? "middle" : "low");
 	}
 }
 
@@ -127,10 +210,10 @@ function maximize() {
 	unMaximizedLeft = rootEl.style.left;
 	unMaximizedWidth = rootEl.style.width;
 	unMaximizedHeight = rootEl.style.height;
-	rootEl.style.top = '0';
-	rootEl.style.left = '0';
-	rootEl.style.width = '100%';
-	rootEl.style.height = '100%';
+	rootEl.style.top = "0";
+	rootEl.style.left = "0";
+	rootEl.style.width = "100%";
+	rootEl.style.height = "100%";
 }
 
 function unMaximize() {
@@ -176,9 +259,17 @@ function onHeaderMousedown(evt: MouseEvent) {
 
 	const position = main.getBoundingClientRect();
 
-	const clickX = evt.touches && evt.touches.length > 0 ? evt.touches[0].clientX : evt.clientX;
-	const clickY = evt.touches && evt.touches.length > 0 ? evt.touches[0].clientY : evt.clientY;
-	const moveBaseX = beforeMaximized ? parseInt(unMaximizedWidth, 10) / 2 : clickX - position.left; // TODO: parseIntやめる
+	const clickX =
+		evt.touches && evt.touches.length > 0
+			? evt.touches[0].clientX
+			: evt.clientX;
+	const clickY =
+		evt.touches && evt.touches.length > 0
+			? evt.touches[0].clientY
+			: evt.clientY;
+	const moveBaseX = beforeMaximized
+		? parseInt(unMaximizedWidth, 10) / 2
+		: clickX - position.left; // TODO: parseIntやめる
 	const moveBaseY = beforeMaximized ? 20 : clickY - position.top;
 	const browserWidth = window.innerWidth;
 	const browserHeight = window.innerHeight;
@@ -190,7 +281,8 @@ function onHeaderMousedown(evt: MouseEvent) {
 		let moveTop = y - moveBaseY;
 
 		// 下はみ出し
-		if (moveTop + windowHeight > browserHeight) moveTop = browserHeight - windowHeight;
+		if (moveTop + windowHeight > browserHeight)
+			moveTop = browserHeight - windowHeight;
 
 		// 左はみ出し
 		if (moveLeft < 0) moveLeft = 0;
@@ -199,10 +291,11 @@ function onHeaderMousedown(evt: MouseEvent) {
 		if (moveTop < 0) moveTop = 0;
 
 		// 右はみ出し
-		if (moveLeft + windowWidth > browserWidth) moveLeft = browserWidth - windowWidth;
+		if (moveLeft + windowWidth > browserWidth)
+			moveLeft = browserWidth - windowWidth;
 
-		rootEl.style.left = moveLeft + 'px';
-		rootEl.style.top = moveTop + 'px';
+		rootEl.style.left = moveLeft + "px";
+		rootEl.style.top = moveTop + "px";
 	}
 
 	if (beforeMaximized) {
@@ -210,9 +303,15 @@ function onHeaderMousedown(evt: MouseEvent) {
 	}
 
 	// 動かした時
-	dragListen(me => {
-		const x = me.touches && me.touches.length > 0 ? me.touches[0].clientX : me.clientX;
-		const y = me.touches && me.touches.length > 0 ? me.touches[0].clientY : me.clientY;
+	dragListen((me) => {
+		const x =
+			me.touches && me.touches.length > 0
+				? me.touches[0].clientX
+				: me.clientX;
+		const y =
+			me.touches && me.touches.length > 0
+				? me.touches[0].clientY
+				: me.clientY;
 
 		move(x, y);
 	});
@@ -223,21 +322,23 @@ function onTopHandleMousedown(evt) {
 	const main = rootEl;
 
 	const base = evt.clientY;
-	const height = parseInt(getComputedStyle(main, '').height, 10);
-	const top = parseInt(getComputedStyle(main, '').top, 10);
+	const height = parseInt(getComputedStyle(main, "").height, 10);
+	const top = parseInt(getComputedStyle(main, "").top, 10);
 
 	// 動かした時
-	dragListen(me => {
+	dragListen((me) => {
 		const move = me.clientY - base;
 		if (top + move > 0) {
 			if (height + -move > minHeight) {
 				applyTransformHeight(height + -move);
 				applyTransformTop(top + move);
-			} else { // 最小の高さより小さくなろうとした時
+			} else {
+				// 最小の高さより小さくなろうとした時
 				applyTransformHeight(minHeight);
 				applyTransformTop(top + (height - minHeight));
 			}
-		} else { // 上のはみ出し時
+		} else {
+			// 上のはみ出し時
 			applyTransformHeight(top + height);
 			applyTransformTop(0);
 		}
@@ -249,20 +350,22 @@ function onRightHandleMousedown(evt) {
 	const main = rootEl;
 
 	const base = evt.clientX;
-	const width = parseInt(getComputedStyle(main, '').width, 10);
-	const left = parseInt(getComputedStyle(main, '').left, 10);
+	const width = parseInt(getComputedStyle(main, "").width, 10);
+	const left = parseInt(getComputedStyle(main, "").left, 10);
 	const browserWidth = window.innerWidth;
 
 	// 動かした時
-	dragListen(me => {
+	dragListen((me) => {
 		const move = me.clientX - base;
 		if (left + width + move < browserWidth) {
 			if (width + move > minWidth) {
 				applyTransformWidth(width + move);
-			} else { // 最小の幅より小さくなろうとした時
+			} else {
+				// 最小の幅より小さくなろうとした時
 				applyTransformWidth(minWidth);
 			}
-		} else { // 右のはみ出し時
+		} else {
+			// 右のはみ出し時
 			applyTransformWidth(browserWidth - left);
 		}
 	});
@@ -273,20 +376,22 @@ function onBottomHandleMousedown(evt) {
 	const main = rootEl;
 
 	const base = evt.clientY;
-	const height = parseInt(getComputedStyle(main, '').height, 10);
-	const top = parseInt(getComputedStyle(main, '').top, 10);
+	const height = parseInt(getComputedStyle(main, "").height, 10);
+	const top = parseInt(getComputedStyle(main, "").top, 10);
 	const browserHeight = window.innerHeight;
 
 	// 動かした時
-	dragListen(me => {
+	dragListen((me) => {
 		const move = me.clientY - base;
 		if (top + height + move < browserHeight) {
 			if (height + move > minHeight) {
 				applyTransformHeight(height + move);
-			} else { // 最小の高さより小さくなろうとした時
+			} else {
+				// 最小の高さより小さくなろうとした時
 				applyTransformHeight(minHeight);
 			}
-		} else { // 下のはみ出し時
+		} else {
+			// 下のはみ出し時
 			applyTransformHeight(browserHeight - top);
 		}
 	});
@@ -297,21 +402,23 @@ function onLeftHandleMousedown(evt) {
 	const main = rootEl;
 
 	const base = evt.clientX;
-	const width = parseInt(getComputedStyle(main, '').width, 10);
-	const left = parseInt(getComputedStyle(main, '').left, 10);
+	const width = parseInt(getComputedStyle(main, "").width, 10);
+	const left = parseInt(getComputedStyle(main, "").left, 10);
 
 	// 動かした時
-	dragListen(me => {
+	dragListen((me) => {
 		const move = me.clientX - base;
 		if (left + move > 0) {
 			if (width + -move > minWidth) {
 				applyTransformWidth(width + -move);
 				applyTransformLeft(left + move);
-			} else { // 最小の幅より小さくなろうとした時
+			} else {
+				// 最小の幅より小さくなろうとした時
 				applyTransformWidth(minWidth);
 				applyTransformLeft(left + (width - minWidth));
 			}
-		} else { // 左のはみ出し時
+		} else {
+			// 左のはみ出し時
 			applyTransformWidth(left + width);
 			applyTransformLeft(0);
 		}
@@ -345,23 +452,23 @@ function onBottomLeftHandleMousedown(evt) {
 // 高さを適用
 function applyTransformHeight(height) {
 	if (height > window.innerHeight) height = window.innerHeight;
-	rootEl.style.height = height + 'px';
+	rootEl.style.height = height + "px";
 }
 
 // 幅を適用
 function applyTransformWidth(width) {
 	if (width > window.innerWidth) width = window.innerWidth;
-	rootEl.style.width = width + 'px';
+	rootEl.style.width = width + "px";
 }
 
 // Y座標を適用
 function applyTransformTop(top) {
-	rootEl.style.top = top + 'px';
+	rootEl.style.top = top + "px";
 }
 
 // X座標を適用
 function applyTransformLeft(left) {
-	rootEl.style.left = left + 'px';
+	rootEl.style.left = left + "px";
 }
 
 function onBrowserResize() {
@@ -371,27 +478,29 @@ function onBrowserResize() {
 	const browserHeight = window.innerHeight;
 	const windowWidth = main.offsetWidth;
 	const windowHeight = main.offsetHeight;
-	if (position.left < 0) main.style.left = '0'; // 左はみ出し
-	if (position.top + windowHeight > browserHeight) main.style.top = browserHeight - windowHeight + 'px'; // 下はみ出し
-	if (position.left + windowWidth > browserWidth) main.style.left = browserWidth - windowWidth + 'px'; // 右はみ出し
-	if (position.top < 0) main.style.top = '0'; // 上はみ出し
+	if (position.left < 0) main.style.left = "0"; // 左はみ出し
+	if (position.top + windowHeight > browserHeight)
+		main.style.top = browserHeight - windowHeight + "px"; // 下はみ出し
+	if (position.left + windowWidth > browserWidth)
+		main.style.left = browserWidth - windowWidth + "px"; // 右はみ出し
+	if (position.top < 0) main.style.top = "0"; // 上はみ出し
 }
 
 onMounted(() => {
 	if (props.initialWidth) applyTransformWidth(props.initialWidth);
 	if (props.initialHeight) applyTransformHeight(props.initialHeight);
 
-	applyTransformTop((window.innerHeight / 2) - (rootEl.offsetHeight / 2));
-	applyTransformLeft((window.innerWidth / 2) - (rootEl.offsetWidth / 2));
+	applyTransformTop(window.innerHeight / 2 - rootEl.offsetHeight / 2);
+	applyTransformLeft(window.innerWidth / 2 - rootEl.offsetWidth / 2);
 
 	// 他のウィンドウ内のボタンなどを押してこのウィンドウが開かれた場合、親が最前面になろうとするのでそれに隠されないようにする
 	top();
 
-	window.addEventListener('resize', onBrowserResize);
+	window.addEventListener("resize", onBrowserResize);
 });
 
 onBeforeUnmount(() => {
-	window.removeEventListener('resize', onBrowserResize);
+	window.removeEventListener("resize", onBrowserResize);
 });
 
 defineExpose({
@@ -400,10 +509,12 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-.window-enter-active, .window-leave-active {
+.window-enter-active,
+.window-leave-active {
 	transition: opacity 0.2s, transform 0.2s !important;
 }
-.window-enter-from, .window-leave-to {
+.window-enter-from,
+.window-leave-to {
 	pointer-events: none;
 	opacity: 0;
 	transform: scale(0.9);
@@ -443,7 +554,8 @@ defineExpose({
 			font-size: 95%;
 			font-weight: bold;
 
-			> .left, > .right {
+			> .left,
+			> .right {
 				> .button {
 					height: var(--height);
 					width: var(--height);
diff --git a/packages/client/src/components/form/checkbox.vue b/packages/client/src/components/form/checkbox.vue
index a50b17246..a4d9716bb 100644
--- a/packages/client/src/components/form/checkbox.vue
+++ b/packages/client/src/components/form/checkbox.vue
@@ -1,30 +1,33 @@
 <template>
-<div
-	class="ziffeoms"
-	:class="{ disabled, checked }"
->
-	<input
-		ref="input"
-		type="checkbox"
-		:disabled="disabled"
-		@keydown.enter="toggle"
-	>
-	<span ref="button" v-adaptive-border v-tooltip="checked ? i18n.ts.itsOn : i18n.ts.itsOff" class="button" @click.prevent="toggle">
-		<i class="check ph-check ph-bold ph-lg"></i>
-	</span>
-	<span class="label">
-		<!-- TODO: 無名slotの方は廃止 -->
-		<span @click="toggle"><slot name="label"></slot><slot></slot></span>
-		<p class="caption"><slot name="caption"></slot></p>
-	</span>
-</div>
+	<div class="ziffeoms" :class="{ disabled, checked }">
+		<input
+			ref="input"
+			type="checkbox"
+			:disabled="disabled"
+			@keydown.enter="toggle"
+		/>
+		<span
+			ref="button"
+			v-adaptive-border
+			v-tooltip="checked ? i18n.ts.itsOn : i18n.ts.itsOff"
+			class="button"
+			@click.prevent="toggle"
+		>
+			<i class="check ph-check ph-bold ph-lg"></i>
+		</span>
+		<span class="label">
+			<!-- TODO: 無名slotの方は廃止 -->
+			<span @click="toggle"><slot name="label"></slot><slot></slot></span>
+			<p class="caption"><slot name="caption"></slot></p>
+		</span>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { toRefs, Ref } from 'vue';
-import * as os from '@/os';
-import Ripple from '@/components/MkRipple.vue';
-import { i18n } from '@/i18n';
+import { toRefs, Ref } from "vue";
+import * as os from "@/os";
+import Ripple from "@/components/MkRipple.vue";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	modelValue: boolean | Ref<boolean>;
@@ -32,20 +35,20 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'update:modelValue', v: boolean): void;
+	(ev: "update:modelValue", v: boolean): void;
 }>();
 
 let button = $ref<HTMLElement>();
 const checked = toRefs(props).modelValue;
 const toggle = () => {
 	if (props.disabled) return;
-	emit('update:modelValue', !checked.value);
+	emit("update:modelValue", !checked.value);
 
 	if (!checked.value) {
 		const rect = button.getBoundingClientRect();
-		const x = rect.left + (button.offsetWidth / 2);
-		const y = rect.top + (button.offsetHeight / 2);
-		os.popup(Ripple, { x, y, particle: false }, {}, 'end');
+		const x = rect.left + button.offsetWidth / 2;
+		const y = rect.top + button.offsetHeight / 2;
+		os.popup(Ripple, { x, y, particle: false }, {}, "end");
 	}
 };
 </script>
diff --git a/packages/client/src/components/form/folder.vue b/packages/client/src/components/form/folder.vue
index 1a179879b..8868f5784 100644
--- a/packages/client/src/components/form/folder.vue
+++ b/packages/client/src/components/form/folder.vue
@@ -1,30 +1,33 @@
 <template>
-<div class="dwzlatin" :class="{ opened }">
-	<div class="header _button" @click="toggle">
-		<span class="icon"><slot name="icon"></slot></span>
-		<span class="text"><slot name="label"></slot></span>
-		<span class="right">
-			<span class="text"><slot name="suffix"></slot></span>
-			<i v-if="opened" class="ph-caret-up ph-bold ph-lg icon"></i>
-			<i v-else class="ph-caret-down ph-bold ph-lg icon"></i>
-		</span>
-	</div>
-	<KeepAlive>
-		<div v-if="openedAtLeastOnce" v-show="opened" class="body">
-			<MkSpacer :margin-min="14" :margin-max="22">
-				<slot></slot>
-			</MkSpacer>
+	<div class="dwzlatin" :class="{ opened }">
+		<div class="header _button" @click="toggle">
+			<span class="icon"><slot name="icon"></slot></span>
+			<span class="text"><slot name="label"></slot></span>
+			<span class="right">
+				<span class="text"><slot name="suffix"></slot></span>
+				<i v-if="opened" class="ph-caret-up ph-bold ph-lg icon"></i>
+				<i v-else class="ph-caret-down ph-bold ph-lg icon"></i>
+			</span>
 		</div>
-	</KeepAlive>
-</div>
+		<KeepAlive>
+			<div v-if="openedAtLeastOnce" v-show="opened" class="body">
+				<MkSpacer :margin-min="14" :margin-max="22">
+					<slot></slot>
+				</MkSpacer>
+			</div>
+		</KeepAlive>
+	</div>
 </template>
 
 <script lang="ts" setup>
-const props = withDefaults(defineProps<{
-	defaultOpen: boolean;
-}>(), {
-  defaultOpen: false,
-});
+const props = withDefaults(
+	defineProps<{
+		defaultOpen: boolean;
+	}>(),
+	{
+		defaultOpen: false,
+	}
+);
 
 let opened: boolean = $ref(props.defaultOpen);
 let openedAtLeastOnce: boolean = $ref(props.defaultOpen);
diff --git a/packages/client/src/components/form/input.vue b/packages/client/src/components/form/input.vue
index ee5371175..1304464e4 100644
--- a/packages/client/src/components/form/input.vue
+++ b/packages/client/src/components/form/input.vue
@@ -1,48 +1,70 @@
 <template>
-<div class="matxzzsk">
-	<div class="label" @click="focus"><slot name="label"></slot></div>
-	<div class="input" :class="{ inline, disabled, focused }">
-		<div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div>
-		<input
-			ref="inputEl"
-			v-model="v"
-			v-adaptive-border
-			:type="type"
-			:disabled="disabled"
-			:required="required"
-			:readonly="readonly"
-			:placeholder="placeholder"
-			:pattern="pattern"
-			:autocomplete="autocomplete"
-			:spellcheck="spellcheck"
-			:step="step"
-			:list="id"
-			@focus="focused = true"
-			@blur="focused = false"
-			@keydown="onKeydown($event)"
-			@input="onInput"
-		>
-		<datalist v-if="datalist" :id="id">
-			<option v-for="data in datalist" :value="data"/>
-		</datalist>
-		<div ref="suffixEl" class="suffix"><slot name="suffix"></slot></div>
-	</div>
-	<div class="caption"><slot name="caption"></slot></div>
+	<div class="matxzzsk">
+		<div class="label" @click="focus"><slot name="label"></slot></div>
+		<div class="input" :class="{ inline, disabled, focused }">
+			<div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div>
+			<input
+				ref="inputEl"
+				v-model="v"
+				v-adaptive-border
+				:type="type"
+				:disabled="disabled"
+				:required="required"
+				:readonly="readonly"
+				:placeholder="placeholder"
+				:pattern="pattern"
+				:autocomplete="autocomplete"
+				:spellcheck="spellcheck"
+				:step="step"
+				:list="id"
+				@focus="focused = true"
+				@blur="focused = false"
+				@keydown="onKeydown($event)"
+				@input="onInput"
+			/>
+			<datalist v-if="datalist" :id="id">
+				<option v-for="data in datalist" :value="data" />
+			</datalist>
+			<div ref="suffixEl" class="suffix"><slot name="suffix"></slot></div>
+		</div>
+		<div class="caption"><slot name="caption"></slot></div>
 
-	<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-</div>
+		<MkButton
+			v-if="manualSave && changed"
+			primary
+			class="save"
+			@click="updated"
+			><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton
+		>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
-import { debounce } from 'throttle-debounce';
-import MkButton from '@/components/MkButton.vue';
-import { useInterval } from '@/scripts/use-interval';
-import { i18n } from '@/i18n';
+import {
+	onMounted,
+	onUnmounted,
+	nextTick,
+	ref,
+	watch,
+	computed,
+	toRefs,
+} from "vue";
+import { debounce } from "throttle-debounce";
+import MkButton from "@/components/MkButton.vue";
+import { useInterval } from "@/scripts/use-interval";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	modelValue: string | number;
-	type?: 'text' | 'number' | 'password' | 'email' | 'url' | 'date' | 'time' | 'search';
+	type?:
+		| "text"
+		| "number"
+		| "password"
+		| "email"
+		| "url"
+		| "date"
+		| "time"
+		| "search";
 	required?: boolean;
 	readonly?: boolean;
 	disabled?: boolean;
@@ -61,10 +83,10 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'change', _ev: KeyboardEvent): void;
-	(ev: 'keydown', _ev: KeyboardEvent): void;
-	(ev: 'enter'): void;
-	(ev: 'update:modelValue', value: string | number): void;
+	(ev: "change", _ev: KeyboardEvent): void;
+	(ev: "keydown", _ev: KeyboardEvent): void;
+	(ev: "enter"): void;
+	(ev: "update:modelValue", value: string | number): void;
 }>();
 
 const { modelValue, type, autofocus } = toRefs(props);
@@ -73,44 +95,41 @@ const id = Math.random().toString(); // TODO: uuid?
 const focused = ref(false);
 const changed = ref(false);
 const invalid = ref(false);
-const filled = computed(() => v.value !== '' && v.value != null);
+const filled = computed(() => v.value !== "" && v.value != null);
 const inputEl = ref<HTMLElement>();
 const prefixEl = ref<HTMLElement>();
 const suffixEl = ref<HTMLElement>();
-const height =
-	props.small ? 36 :
-	props.large ? 40 :
-	38;
+const height = props.small ? 36 : props.large ? 40 : 38;
 
 const focus = () => inputEl.value.focus();
 const onInput = (ev: KeyboardEvent) => {
 	changed.value = true;
-	emit('change', ev);
+	emit("change", ev);
 };
 const onKeydown = (ev: KeyboardEvent) => {
-	emit('keydown', ev);
+	emit("keydown", ev);
 
-	if (ev.code === 'Enter') {
-		emit('enter');
+	if (ev.code === "Enter") {
+		emit("enter");
 	}
 };
 
 const updated = () => {
 	changed.value = false;
-	if (type.value === 'number') {
-		emit('update:modelValue', parseFloat(v.value));
+	if (type.value === "number") {
+		emit("update:modelValue", parseFloat(v.value));
 	} else {
-		emit('update:modelValue', v.value);
+		emit("update:modelValue", v.value);
 	}
 };
 
 const debouncedUpdated = debounce(1000, updated);
 
-watch(modelValue, newValue => {
+watch(modelValue, (newValue) => {
 	v.value = newValue;
 });
 
-watch(v, newValue => {
+watch(v, (newValue) => {
 	if (!props.manualSave) {
 		if (props.debounce) {
 			debouncedUpdated();
@@ -124,21 +143,27 @@ watch(v, newValue => {
 
 // このコンポーネントが作成された時、非表示状態である場合がある
 // 非表示状態だと要素の幅などは0になってしまうので、定期的に計算する
-useInterval(() => {
-	if (prefixEl.value) {
-		if (prefixEl.value.offsetWidth) {
-			inputEl.value.style.paddingLeft = prefixEl.value.offsetWidth + 'px';
+useInterval(
+	() => {
+		if (prefixEl.value) {
+			if (prefixEl.value.offsetWidth) {
+				inputEl.value.style.paddingLeft =
+					prefixEl.value.offsetWidth + "px";
+			}
 		}
-	}
-	if (suffixEl.value) {
-		if (suffixEl.value.offsetWidth) {
-			inputEl.value.style.paddingRight = suffixEl.value.offsetWidth + 'px';
+		if (suffixEl.value) {
+			if (suffixEl.value.offsetWidth) {
+				inputEl.value.style.paddingRight =
+					suffixEl.value.offsetWidth + "px";
+			}
 		}
+	},
+	100,
+	{
+		immediate: true,
+		afterMounted: true,
 	}
-}, 100, {
-	immediate: true,
-	afterMounted: true,
-});
+);
 
 onMounted(() => {
 	nextTick(() => {
@@ -250,7 +275,8 @@ onMounted(() => {
 		&.disabled {
 			opacity: 0.7;
 
-			&, * {
+			&,
+			* {
 				cursor: not-allowed !important;
 			}
 		}
diff --git a/packages/client/src/components/form/link.vue b/packages/client/src/components/form/link.vue
index de675d08b..01acb2951 100644
--- a/packages/client/src/components/form/link.vue
+++ b/packages/client/src/components/form/link.vue
@@ -1,32 +1,38 @@
 <template>
-<div class="ffcbddfc" :class="{ inline }">
-	<a v-if="external" class="main _button" :href="to" target="_blank">
-		<span class="icon"><slot name="icon"></slot></span>
-		<span class="text"><slot></slot></span>
-		<span class="right">
-			<span class="text"><slot name="suffix"></slot></span>
-			<i class="ph-arrow-square-out ph-bold ph-lg icon"></i>
-		</span>
-	</a>
-	<MkA v-else class="main _button" :class="{ active }" :to="to" :behavior="behavior">
-		<span class="icon"><slot name="icon"></slot></span>
-		<span class="text"><slot></slot></span>
-		<span class="right">
-			<span class="text"><slot name="suffix"></slot></span>
-			<i class="ph-caret-right ph-bold ph-lg icon"></i>
-		</span>
-	</MkA>
-</div>
+	<div class="ffcbddfc" :class="{ inline }">
+		<a v-if="external" class="main _button" :href="to" target="_blank">
+			<span class="icon"><slot name="icon"></slot></span>
+			<span class="text"><slot></slot></span>
+			<span class="right">
+				<span class="text"><slot name="suffix"></slot></span>
+				<i class="ph-arrow-square-out ph-bold ph-lg icon"></i>
+			</span>
+		</a>
+		<MkA
+			v-else
+			class="main _button"
+			:class="{ active }"
+			:to="to"
+			:behavior="behavior"
+		>
+			<span class="icon"><slot name="icon"></slot></span>
+			<span class="text"><slot></slot></span>
+			<span class="right">
+				<span class="text"><slot name="suffix"></slot></span>
+				<i class="ph-caret-right ph-bold ph-lg icon"></i>
+			</span>
+		</MkA>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
+import {} from "vue";
 
 const props = defineProps<{
 	to: string;
 	active?: boolean;
 	external?: boolean;
-	behavior?: null | 'window' | 'browser' | 'modalWindow';
+	behavior?: null | "window" | "browser" | "modalWindow";
 	inline?: boolean;
 }>();
 </script>
diff --git a/packages/client/src/components/form/radio.vue b/packages/client/src/components/form/radio.vue
index b36f7e9fd..493b2d010 100644
--- a/packages/client/src/components/form/radio.vue
+++ b/packages/client/src/components/form/radio.vue
@@ -1,25 +1,22 @@
 <template>
-<div
-	v-adaptive-border
-	class="novjtctn"
-	:class="{ disabled, checked }"
-	:aria-checked="checked"
-	:aria-disabled="disabled"
-	@click="toggle"
->
-	<input
-		type="radio"
-		:disabled="disabled"
+	<div
+		v-adaptive-border
+		class="novjtctn"
+		:class="{ disabled, checked }"
+		:aria-checked="checked"
+		:aria-disabled="disabled"
+		@click="toggle"
 	>
-	<span class="button">
-		<span></span>
-	</span>
-	<span class="label"><slot></slot></span>
-</div>
+		<input type="radio" :disabled="disabled" />
+		<span class="button">
+			<span></span>
+		</span>
+		<span class="label"><slot></slot></span>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
+import {} from "vue";
 
 const props = defineProps<{
 	modelValue: any;
@@ -28,14 +25,14 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'update:modelValue', value: any): void;
+	(ev: "update:modelValue", value: any): void;
 }>();
 
 let checked = $computed(() => props.modelValue === props.value);
 
 function toggle(): void {
 	if (props.disabled) return;
-	emit('update:modelValue', props.value);
+	emit("update:modelValue", props.value);
 }
 </script>
 
@@ -60,7 +57,8 @@ function toggle(): void {
 	&.disabled {
 		opacity: 0.6;
 
-		&, * {
+		&,
+		* {
 			cursor: not-allowed !important;
 		}
 	}
@@ -74,7 +72,8 @@ function toggle(): void {
 		border-color: var(--accentedBg) !important;
 		color: var(--accent);
 
-		&, * {
+		&,
+		* {
 			cursor: default !important;
 		}
 
@@ -107,7 +106,7 @@ function toggle(): void {
 		transition: inherit;
 
 		&:after {
-			content: '';
+			content: "";
 			display: block;
 			position: absolute;
 			top: 3px;
diff --git a/packages/client/src/components/form/radios.vue b/packages/client/src/components/form/radios.vue
index bde4a8fb0..5c98edce3 100644
--- a/packages/client/src/components/form/radios.vue
+++ b/packages/client/src/components/form/radios.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
-import { defineComponent, h } from 'vue';
-import MkRadio from './radio.vue';
+import { defineComponent, h } from "vue";
+import MkRadio from "./radio.vue";
 
 export default defineComponent({
 	components: {
@@ -18,7 +18,7 @@ export default defineComponent({
 	},
 	watch: {
 		value() {
-			this.$emit('update:modelValue', this.value);
+			this.$emit("update:modelValue", this.value);
 		},
 	},
 	render() {
@@ -27,27 +27,58 @@ export default defineComponent({
 		const caption = this.$slots.caption && this.$slots.caption();
 
 		// なぜかFragmentになることがあるため
-		if (options.length === 1 && options[0].props == null) options = options[0].children;
+		if (options.length === 1 && options[0].props == null)
+			options = options[0].children;
 
-		return h('div', {
-			class: 'novjtcto',
-		}, [
-			...(label ? [h('div', {
-				class: 'label',
-			}, [label])] : []),
-			h('div', {
-				class: 'body',
-			}, options.map(option => h(MkRadio, {
-				key: option.key,
-				value: option.props.value,
-				modelValue: this.value,
-				'onUpdate:modelValue': value => this.value = value,
-			}, option.children)),
-			),
-			...(caption ? [h('div', {
-				class: 'caption',
-			}, [caption])] : []),
-		]);
+		return h(
+			"div",
+			{
+				class: "novjtcto",
+			},
+			[
+				...(label
+					? [
+							h(
+								"div",
+								{
+									class: "label",
+								},
+								[label]
+							),
+					  ]
+					: []),
+				h(
+					"div",
+					{
+						class: "body",
+					},
+					options.map((option) =>
+						h(
+							MkRadio,
+							{
+								key: option.key,
+								value: option.props.value,
+								modelValue: this.value,
+								"onUpdate:modelValue": (value) =>
+									(this.value = value),
+							},
+							option.children
+						)
+					)
+				),
+				...(caption
+					? [
+							h(
+								"div",
+								{
+									class: "caption",
+								},
+								[caption]
+							),
+					  ]
+					: []),
+			]
+		);
 	},
 });
 </script>
@@ -66,8 +97,8 @@ export default defineComponent({
 
 	> .body {
 		display: flex;
-    gap: 12px;
-    flex-wrap: wrap;
+		gap: 12px;
+		flex-wrap: wrap;
 	}
 
 	> .caption {
diff --git a/packages/client/src/components/form/range.vue b/packages/client/src/components/form/range.vue
index db21c3571..e5ec44f68 100644
--- a/packages/client/src/components/form/range.vue
+++ b/packages/client/src/components/form/range.vue
@@ -1,42 +1,66 @@
 <template>
-<div class="timctyfi" :class="{ disabled, easing }">
-	<div class="label"><slot name="label"></slot></div>
-	<div v-adaptive-border class="body">
-		<div ref="containerEl" class="container">
-			<div class="track">
-				<div class="highlight" :style="{ width: (steppedRawValue * 100) + '%' }"></div>
+	<div class="timctyfi" :class="{ disabled, easing }">
+		<div class="label"><slot name="label"></slot></div>
+		<div v-adaptive-border class="body">
+			<div ref="containerEl" class="container">
+				<div class="track">
+					<div
+						class="highlight"
+						:style="{ width: steppedRawValue * 100 + '%' }"
+					></div>
+				</div>
+				<div v-if="steps && showTicks" class="ticks">
+					<div
+						v-for="i in steps + 1"
+						class="tick"
+						:style="{ left: ((i - 1) / steps) * 100 + '%' }"
+					></div>
+				</div>
+				<div
+					ref="thumbEl"
+					v-tooltip="textConverter(finalValue)"
+					class="thumb"
+					:style="{ left: thumbPosition + 'px' }"
+					@mousedown="onMousedown"
+					@touchstart="onMousedown"
+				></div>
 			</div>
-			<div v-if="steps && showTicks" class="ticks">
-				<div v-for="i in (steps + 1)" class="tick" :style="{ left: (((i - 1) / steps) * 100) + '%' }"></div>
-			</div>
-			<div ref="thumbEl" v-tooltip="textConverter(finalValue)" class="thumb" :style="{ left: thumbPosition + 'px' }" @mousedown="onMousedown" @touchstart="onMousedown"></div>
 		</div>
+		<div class="caption"><slot name="caption"></slot></div>
 	</div>
-	<div class="caption"><slot name="caption"></slot></div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, onMounted, onUnmounted, ref, watch } from 'vue';
-import * as os from '@/os';
+import {
+	computed,
+	defineAsyncComponent,
+	onMounted,
+	onUnmounted,
+	ref,
+	watch,
+} from "vue";
+import * as os from "@/os";
 
-const props = withDefaults(defineProps<{
-	modelValue: number;
-	disabled?: boolean;
-	min: number;
-	max: number;
-	step?: number;
-	textConverter?: (value: number) => string,
-	showTicks?: boolean;
-	easing?: boolean;
-}>(), {
-	step: 1,
-	textConverter: (v) => v.toString(),
-	easing: false,
-});
+const props = withDefaults(
+	defineProps<{
+		modelValue: number;
+		disabled?: boolean;
+		min: number;
+		max: number;
+		step?: number;
+		textConverter?: (value: number) => string;
+		showTicks?: boolean;
+		easing?: boolean;
+	}>(),
+	{
+		step: 1,
+		textConverter: (v) => v.toString(),
+		easing: false,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'update:modelValue', value: number): void;
+	(ev: "update:modelValue", value: number): void;
 }>();
 
 const containerEl = ref<HTMLElement>();
@@ -46,16 +70,18 @@ const rawValue = ref((props.modelValue - props.min) / (props.max - props.min));
 const steppedRawValue = computed(() => {
 	if (props.step) {
 		const step = props.step / (props.max - props.min);
-		return (step * Math.round(rawValue.value / step));
+		return step * Math.round(rawValue.value / step);
 	} else {
 		return rawValue.value;
 	}
 });
 const finalValue = computed(() => {
 	if (Number.isInteger(props.step)) {
-		return Math.round((steppedRawValue.value * (props.max - props.min)) + props.min);
+		return Math.round(
+			steppedRawValue.value * (props.max - props.min) + props.min
+		);
 	} else {
-		return (steppedRawValue.value * (props.max - props.min)) + props.min;
+		return steppedRawValue.value * (props.max - props.min) + props.min;
 	}
 });
 
@@ -68,7 +94,9 @@ const calcThumbPosition = () => {
 	if (containerEl.value == null) {
 		thumbPosition.value = 0;
 	} else {
-		thumbPosition.value = (containerEl.value.offsetWidth - thumbWidth.value) * steppedRawValue.value;
+		thumbPosition.value =
+			(containerEl.value.offsetWidth - thumbWidth.value) *
+			steppedRawValue.value;
 	}
 };
 watch([steppedRawValue, containerEl], calcThumbPosition);
@@ -98,24 +126,44 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 	ev.preventDefault();
 
 	const tooltipShowing = ref(true);
-	os.popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), {
-		showing: tooltipShowing,
-		text: computed(() => {
-			return props.textConverter(finalValue.value);
-		}),
-		targetElement: thumbEl,
-	}, {}, 'closed');
+	os.popup(
+		defineAsyncComponent(() => import("@/components/MkTooltip.vue")),
+		{
+			showing: tooltipShowing,
+			text: computed(() => {
+				return props.textConverter(finalValue.value);
+			}),
+			targetElement: thumbEl,
+		},
+		{},
+		"closed"
+	);
 
-	const style = document.createElement('style');
-	style.appendChild(document.createTextNode('* { cursor: grabbing !important; } body * { pointer-events: none !important; }'));
+	const style = document.createElement("style");
+	style.appendChild(
+		document.createTextNode(
+			"* { cursor: grabbing !important; } body * { pointer-events: none !important; }"
+		)
+	);
 	document.head.appendChild(style);
 
 	const onDrag = (ev: MouseEvent | TouchEvent) => {
 		ev.preventDefault();
 		const containerRect = containerEl.value!.getBoundingClientRect();
-		const pointerX = ev.touches && ev.touches.length > 0 ? ev.touches[0].clientX : ev.clientX;
-		const pointerPositionOnContainer = pointerX - (containerRect.left + (thumbWidth.value / 2));
-		rawValue.value = Math.min(1, Math.max(0, pointerPositionOnContainer / (containerEl.value!.offsetWidth - thumbWidth.value)));
+		const pointerX =
+			ev.touches && ev.touches.length > 0
+				? ev.touches[0].clientX
+				: ev.clientX;
+		const pointerPositionOnContainer =
+			pointerX - (containerRect.left + thumbWidth.value / 2);
+		rawValue.value = Math.min(
+			1,
+			Math.max(
+				0,
+				pointerPositionOnContainer /
+					(containerEl.value!.offsetWidth - thumbWidth.value)
+			)
+		);
 	};
 
 	let beforeValue = finalValue.value;
@@ -123,21 +171,21 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 	const onMouseup = () => {
 		document.head.removeChild(style);
 		tooltipShowing.value = false;
-		window.removeEventListener('mousemove', onDrag);
-		window.removeEventListener('touchmove', onDrag);
-		window.removeEventListener('mouseup', onMouseup);
-		window.removeEventListener('touchend', onMouseup);
+		window.removeEventListener("mousemove", onDrag);
+		window.removeEventListener("touchmove", onDrag);
+		window.removeEventListener("mouseup", onMouseup);
+		window.removeEventListener("touchend", onMouseup);
 
 		// 値が変わってたら通知
 		if (beforeValue !== finalValue.value) {
-			emit('update:modelValue', finalValue.value);
+			emit("update:modelValue", finalValue.value);
 		}
 	};
 
-	window.addEventListener('mousemove', onDrag);
-	window.addEventListener('touchmove', onDrag);
-	window.addEventListener('mouseup', onMouseup, { once: true });
-	window.addEventListener('touchend', onMouseup, { once: true });
+	window.addEventListener("mousemove", onDrag);
+	window.addEventListener("touchmove", onDrag);
+	window.addEventListener("mouseup", onMouseup, { once: true });
+	window.addEventListener("touchend", onMouseup, { once: true });
 };
 </script>
 
@@ -219,7 +267,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 					bottom: 0;
 					width: $tickWidth;
 					height: 3px;
-					margin-left: - math.div($tickWidth, 2);
+					margin-left: -math.div($tickWidth, 2);
 					background: var(--divider);
 					border-radius: 999px;
 				}
@@ -245,12 +293,12 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 			> .container {
 				> .track {
 					> .highlight {
-						transition: width 0.2s cubic-bezier(0,0,0,1);
+						transition: width 0.2s cubic-bezier(0, 0, 0, 1);
 					}
 				}
 
 				> .thumb {
-					transition: left 0.2s cubic-bezier(0,0,0,1);
+					transition: left 0.2s cubic-bezier(0, 0, 0, 1);
 				}
 			}
 		}
diff --git a/packages/client/src/components/form/section.vue b/packages/client/src/components/form/section.vue
index c6e34ef1c..f2c5fa13f 100644
--- a/packages/client/src/components/form/section.vue
+++ b/packages/client/src/components/form/section.vue
@@ -1,14 +1,13 @@
 <template>
-<div class="vrtktovh _formBlock">
-	<div class="label"><slot name="label"></slot></div>
-	<div class="main _formRoot">
-		<slot></slot>
+	<div class="vrtktovh _formBlock">
+		<div class="label"><slot name="label"></slot></div>
+		<div class="main _formRoot">
+			<slot></slot>
+		</div>
 	</div>
-</div>
 </template>
 
-<script lang="ts" setup>
-</script>
+<script lang="ts" setup></script>
 
 <style lang="scss" scoped>
 .vrtktovh {
diff --git a/packages/client/src/components/form/select.vue b/packages/client/src/components/form/select.vue
index b81865d4f..20e69e13e 100644
--- a/packages/client/src/components/form/select.vue
+++ b/packages/client/src/components/form/select.vue
@@ -1,37 +1,57 @@
 <template>
-<div class="vblkjoeq">
-	<div class="label" @click="focus"><slot name="label"></slot></div>
-	<div ref="container" class="input" :class="{ inline, disabled, focused }" @click.prevent="onClick">
-		<div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div>
-		<select
-			ref="inputEl"
-			v-model="v"
-			v-adaptive-border
-			class="select"
-			:disabled="disabled"
-			:required="required"
-			:readonly="readonly"
-			:placeholder="placeholder"
-			@focus="focused = true"
-			@blur="focused = false"
-			@input="onInput"
+	<div class="vblkjoeq">
+		<div class="label" @click="focus"><slot name="label"></slot></div>
+		<div
+			ref="container"
+			class="input"
+			:class="{ inline, disabled, focused }"
+			@click.prevent="onClick"
 		>
-			<slot></slot>
-		</select>
-		<div ref="suffixEl" class="suffix"><i class="ph-caret-down ph-bold ph-lg"></i></div>
-	</div>
-	<div class="caption"><slot name="caption"></slot></div>
+			<div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div>
+			<select
+				ref="inputEl"
+				v-model="v"
+				v-adaptive-border
+				class="select"
+				:disabled="disabled"
+				:required="required"
+				:readonly="readonly"
+				:placeholder="placeholder"
+				@focus="focused = true"
+				@blur="focused = false"
+				@input="onInput"
+			>
+				<slot></slot>
+			</select>
+			<div ref="suffixEl" class="suffix">
+				<i class="ph-caret-down ph-bold ph-lg"></i>
+			</div>
+		</div>
+		<div class="caption"><slot name="caption"></slot></div>
 
-	<MkButton v-if="manualSave && changed" primary @click="updated"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-</div>
+		<MkButton v-if="manualSave && changed" primary @click="updated"
+			><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+			{{ i18n.ts.save }}</MkButton
+		>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs, VNode, useSlots } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import { i18n } from '@/i18n';
+import {
+	onMounted,
+	onUnmounted,
+	nextTick,
+	ref,
+	watch,
+	computed,
+	toRefs,
+	VNode,
+	useSlots,
+} from "vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	modelValue: string;
@@ -47,8 +67,8 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'change', _ev: KeyboardEvent): void;
-	(ev: 'update:modelValue', value: string): void;
+	(ev: "change", _ev: KeyboardEvent): void;
+	(ev: "update:modelValue", value: string): void;
 }>();
 
 const slots = useSlots();
@@ -58,32 +78,29 @@ const v = ref(modelValue.value);
 const focused = ref(false);
 const changed = ref(false);
 const invalid = ref(false);
-const filled = computed(() => v.value !== '' && v.value != null);
+const filled = computed(() => v.value !== "" && v.value != null);
 const inputEl = ref(null);
 const prefixEl = ref(null);
 const suffixEl = ref(null);
 const container = ref(null);
-const height =
-	props.small ? 36 :
-	props.large ? 40 :
-	38;
+const height = props.small ? 36 : props.large ? 40 : 38;
 
 const focus = () => inputEl.value.focus();
 const onInput = (ev) => {
 	changed.value = true;
-	emit('change', ev);
+	emit("change", ev);
 };
 
 const updated = () => {
 	changed.value = false;
-	emit('update:modelValue', v.value);
+	emit("update:modelValue", v.value);
 };
 
-watch(modelValue, newValue => {
+watch(modelValue, (newValue) => {
 	v.value = newValue;
 });
 
-watch(v, newValue => {
+watch(v, (newValue) => {
 	if (!props.manualSave) {
 		updated();
 	}
@@ -93,21 +110,27 @@ watch(v, newValue => {
 
 // このコンポーネントが作成された時、非表示状態である場合がある
 // 非表示状態だと要素の幅などは0になってしまうので、定期的に計算する
-useInterval(() => {
-	if (prefixEl.value) {
-		if (prefixEl.value.offsetWidth) {
-			inputEl.value.style.paddingLeft = prefixEl.value.offsetWidth + 'px';
+useInterval(
+	() => {
+		if (prefixEl.value) {
+			if (prefixEl.value.offsetWidth) {
+				inputEl.value.style.paddingLeft =
+					prefixEl.value.offsetWidth + "px";
+			}
 		}
-	}
-	if (suffixEl.value) {
-		if (suffixEl.value.offsetWidth) {
-			inputEl.value.style.paddingRight = suffixEl.value.offsetWidth + 'px';
+		if (suffixEl.value) {
+			if (suffixEl.value.offsetWidth) {
+				inputEl.value.style.paddingRight =
+					suffixEl.value.offsetWidth + "px";
+			}
 		}
+	},
+	100,
+	{
+		immediate: true,
+		afterMounted: true,
 	}
-}, 100, {
-	immediate: true,
-	afterMounted: true,
-});
+);
 
 onMounted(() => {
 	nextTick(() => {
@@ -135,17 +158,19 @@ const onClick = (ev: MouseEvent) => {
 
 	const scanOptions = (options: VNode[]) => {
 		for (const vnode of options) {
-			if (vnode.type === 'optgroup') {
+			if (vnode.type === "optgroup") {
 				const optgroup = vnode;
 				menu.push({
-					type: 'label',
+					type: "label",
 					text: optgroup.props.label,
 				});
 				scanOptions(optgroup.children);
-			} else if (Array.isArray(vnode.children)) { // 何故かフラグメントになってくることがある
+			} else if (Array.isArray(vnode.children)) {
+				// 何故かフラグメントになってくることがある
 				const fragment = vnode;
 				scanOptions(fragment.children);
-			} else if (vnode.props == null) { // v-if で条件が false のときにこうなる
+			} else if (vnode.props == null) {
+				// v-if で条件が false のときにこうなる
 				// nop?
 			} else {
 				const option = vnode;
@@ -272,7 +297,8 @@ const onClick = (ev: MouseEvent) => {
 		&.disabled {
 			opacity: 0.7;
 
-			&, * {
+			&,
+			* {
 				cursor: not-allowed !important;
 			}
 		}
diff --git a/packages/client/src/components/form/slot.vue b/packages/client/src/components/form/slot.vue
index 79ce8fe51..f570fa60d 100644
--- a/packages/client/src/components/form/slot.vue
+++ b/packages/client/src/components/form/slot.vue
@@ -1,15 +1,15 @@
 <template>
-<div class="adhpbeou">
-	<div class="label" @click="focus"><slot name="label"></slot></div>
-	<div class="content">
-		<slot></slot>
+	<div class="adhpbeou">
+		<div class="label" @click="focus"><slot name="label"></slot></div>
+		<div class="content">
+			<slot></slot>
+		</div>
+		<div class="caption"><slot name="caption"></slot></div>
 	</div>
-	<div class="caption"><slot name="caption"></slot></div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
+import {} from "vue";
 
 function focus() {
 	// TODO
diff --git a/packages/client/src/components/form/split.vue b/packages/client/src/components/form/split.vue
index 301a8a84e..40d1d43ac 100644
--- a/packages/client/src/components/form/split.vue
+++ b/packages/client/src/components/form/split.vue
@@ -1,23 +1,26 @@
 <template>
-<div class="terlnhxf _formBlock">
-	<slot></slot>
-</div>
+	<div class="terlnhxf _formBlock">
+		<slot></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
-const props = withDefaults(defineProps<{
-	minWidth?: number;
-}>(), {
-	minWidth: 210,
-});
+const props = withDefaults(
+	defineProps<{
+		minWidth?: number;
+	}>(),
+	{
+		minWidth: 210,
+	}
+);
 
-const minWidth = props.minWidth + 'px';
+const minWidth = props.minWidth + "px";
 </script>
 
 <style lang="scss" scoped>
 .terlnhxf {
 	display: grid;
-	grid-template-columns: repeat(auto-fill, minmax(v-bind('minWidth'), 1fr));
+	grid-template-columns: repeat(auto-fill, minmax(v-bind("minWidth"), 1fr));
 	grid-gap: 12px;
 
 	> ::v-deep(*) {
diff --git a/packages/client/src/components/form/suspense.vue b/packages/client/src/components/form/suspense.vue
index 29217f4b2..33fd03233 100644
--- a/packages/client/src/components/form/suspense.vue
+++ b/packages/client/src/components/form/suspense.vue
@@ -1,24 +1,30 @@
 <template>
-<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
-	<div v-if="pending">
-		<MkLoading/>
-	</div>
-	<div v-else-if="resolved">
-		<slot :result="result"></slot>
-	</div>
-	<div v-else>
-		<div class="wszdbhzo">
-			<div><i class="ph-warning ph-bold ph-lg"></i> {{ i18n.ts.somethingHappened }}</div>
-			<MkButton inline class="retry" @click="retry"><i class="ph-arrow-clockwise ph-bold ph-lg"></i> {{ i18n.ts.retry }}</MkButton>
+	<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
+		<div v-if="pending">
+			<MkLoading />
 		</div>
-	</div>
-</transition>
+		<div v-else-if="resolved">
+			<slot :result="result"></slot>
+		</div>
+		<div v-else>
+			<div class="wszdbhzo">
+				<div>
+					<i class="ph-warning ph-bold ph-lg"></i>
+					{{ i18n.ts.somethingHappened }}
+				</div>
+				<MkButton inline class="retry" @click="retry"
+					><i class="ph-arrow-clockwise ph-bold ph-lg"></i>
+					{{ i18n.ts.retry }}</MkButton
+				>
+			</div>
+		</div>
+	</transition>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref, watch } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n';
+import { defineComponent, PropType, ref, watch } from "vue";
+import MkButton from "@/components/MkButton.vue";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
@@ -29,7 +35,7 @@ export default defineComponent({
 		p: {
 			type: Function as PropType<() => Promise<any>>,
 			required: true,
-		}
+		},
 	},
 
 	setup(props, context) {
@@ -57,11 +63,15 @@ export default defineComponent({
 			});
 		};
 
-		watch(() => props.p, () => {
-			process();
-		}, {
-			immediate: true,
-		});
+		watch(
+			() => props.p,
+			() => {
+				process();
+			},
+			{
+				immediate: true,
+			}
+		);
 
 		const retry = () => {
 			process();
@@ -75,7 +85,7 @@ export default defineComponent({
 			retry,
 			i18n,
 		};
-	}
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/form/switch.vue b/packages/client/src/components/form/switch.vue
index 1ed00ae65..efaf488a9 100644
--- a/packages/client/src/components/form/switch.vue
+++ b/packages/client/src/components/form/switch.vue
@@ -1,29 +1,31 @@
 <template>
-<div
-	class="ziffeomt"
-	:class="{ disabled, checked }"
->
-	<input
-		ref="input"
-		type="checkbox"
-		:disabled="disabled"
-		@keydown.enter="toggle"
-	>
-	<span ref="button" v-tooltip="checked ? i18n.ts.itsOn : i18n.ts.itsOff" class="button" @click.prevent="toggle">
-		<div class="knob"></div>
-	</span>
-	<span class="label">
-		<!-- TODO: 無名slotの方は廃止 -->
-		<span @click="toggle"><slot name="label"></slot><slot></slot></span>
-		<p class="caption"><slot name="caption"></slot></p>
-	</span>
-</div>
+	<div class="ziffeomt" :class="{ disabled, checked }">
+		<input
+			ref="input"
+			type="checkbox"
+			:disabled="disabled"
+			@keydown.enter="toggle"
+		/>
+		<span
+			ref="button"
+			v-tooltip="checked ? i18n.ts.itsOn : i18n.ts.itsOff"
+			class="button"
+			@click.prevent="toggle"
+		>
+			<div class="knob"></div>
+		</span>
+		<span class="label">
+			<!-- TODO: 無名slotの方は廃止 -->
+			<span @click="toggle"><slot name="label"></slot><slot></slot></span>
+			<p class="caption"><slot name="caption"></slot></p>
+		</span>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { toRefs, Ref } from 'vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { toRefs, Ref } from "vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	modelValue: boolean | Ref<boolean>;
@@ -31,17 +33,16 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'update:modelValue', v: boolean): void;
+	(ev: "update:modelValue", v: boolean): void;
 }>();
 
 let button = $ref<HTMLElement>();
 const checked = toRefs(props).modelValue;
 const toggle = () => {
 	if (props.disabled) return;
-	emit('update:modelValue', !checked.value);
+	emit("update:modelValue", !checked.value);
 
 	if (!checked.value) {
-
 	}
 };
 </script>
diff --git a/packages/client/src/components/form/textarea.vue b/packages/client/src/components/form/textarea.vue
index 0cf61458a..19c33cfec 100644
--- a/packages/client/src/components/form/textarea.vue
+++ b/packages/client/src/components/form/textarea.vue
@@ -1,36 +1,52 @@
 <template>
-<div class="adhpbeos">
-	<div class="label" @click="focus"><slot name="label"></slot></div>
-	<div class="input" :class="{ disabled, focused, tall, pre }">
-		<textarea
-			ref="inputEl"
-			v-model="v"
-			v-adaptive-border
-			:class="{ code, _monospace: code }"
-			:disabled="disabled"
-			:required="required"
-			:readonly="readonly"
-			:placeholder="placeholder"
-			:pattern="pattern"
-			:autocomplete="autocomplete"
-			:spellcheck="spellcheck"
-			@focus="focused = true"
-			@blur="focused = false"
-			@keydown="onKeydown($event)"
-			@input="onInput"
-		></textarea>
-	</div>
-	<div class="caption"><slot name="caption"></slot></div>
+	<div class="adhpbeos">
+		<div class="label" @click="focus"><slot name="label"></slot></div>
+		<div class="input" :class="{ disabled, focused, tall, pre }">
+			<textarea
+				ref="inputEl"
+				v-model="v"
+				v-adaptive-border
+				:class="{ code, _monospace: code }"
+				:disabled="disabled"
+				:required="required"
+				:readonly="readonly"
+				:placeholder="placeholder"
+				:pattern="pattern"
+				:autocomplete="autocomplete"
+				:spellcheck="spellcheck"
+				@focus="focused = true"
+				@blur="focused = false"
+				@keydown="onKeydown($event)"
+				@input="onInput"
+			></textarea>
+		</div>
+		<div class="caption"><slot name="caption"></slot></div>
 
-	<MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-</div>
+		<MkButton
+			v-if="manualSave && changed"
+			primary
+			class="save"
+			@click="updated"
+			><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+			{{ i18n.ts.save }}</MkButton
+		>
+	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
-import { debounce } from 'throttle-debounce';
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n';
+import {
+	defineComponent,
+	onMounted,
+	onUnmounted,
+	nextTick,
+	ref,
+	watch,
+	computed,
+	toRefs,
+} from "vue";
+import { debounce } from "throttle-debounce";
+import MkButton from "@/components/MkButton.vue";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
@@ -102,7 +118,7 @@ export default defineComponent({
 		},
 	},
 
-	emits: ['change', 'keydown', 'enter', 'update:modelValue'],
+	emits: ["change", "keydown", "enter", "update:modelValue"],
 
 	setup(props, context) {
 		const { modelValue, autofocus } = toRefs(props);
@@ -110,30 +126,30 @@ export default defineComponent({
 		const focused = ref(false);
 		const changed = ref(false);
 		const invalid = ref(false);
-		const filled = computed(() => v.value !== '' && v.value != null);
+		const filled = computed(() => v.value !== "" && v.value != null);
 		const inputEl = ref(null);
 
 		const focus = () => inputEl.value.focus();
 		const onInput = (ev) => {
 			changed.value = true;
-			context.emit('change', ev);
+			context.emit("change", ev);
 		};
 		const onKeydown = (ev: KeyboardEvent) => {
-			context.emit('keydown', ev);
+			context.emit("keydown", ev);
 
-			if (ev.code === 'Enter') {
-				context.emit('enter');
+			if (ev.code === "Enter") {
+				context.emit("enter");
 			}
 		};
 
 		const updated = () => {
 			changed.value = false;
-			context.emit('update:modelValue', v.value);
+			context.emit("update:modelValue", v.value);
 		};
 
 		const debouncedUpdated = debounce(1000, updated);
 
-		watch(modelValue, newValue => {
+		watch(modelValue, (newValue) => {
 			v.value = newValue;
 		});
 
@@ -235,7 +251,8 @@ export default defineComponent({
 		&.disabled {
 			opacity: 0.7;
 
-			&, * {
+			&,
+			* {
 				cursor: not-allowed !important;
 			}
 		}
diff --git a/packages/client/src/components/global/MkA.vue b/packages/client/src/components/global/MkA.vue
index 661982787..e1a50ad35 100644
--- a/packages/client/src/components/global/MkA.vue
+++ b/packages/client/src/components/global/MkA.vue
@@ -1,26 +1,35 @@
 <template>
-<a :href="to" :class="active ? activeClass : null" @click="nav" @contextmenu.prevent.stop="onContextmenu" @click.stop>
-	<slot></slot>
-</a>
+	<a
+		:href="to"
+		:class="active ? activeClass : null"
+		@click="nav"
+		@contextmenu.prevent.stop="onContextmenu"
+		@click.stop
+	>
+		<slot></slot>
+	</a>
 </template>
 
 <script lang="ts" setup>
-import { inject } from 'vue';
-import * as os from '@/os';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
-import { url } from '@/config';
-import { popout as popout_ } from '@/scripts/popout';
-import { i18n } from '@/i18n';
-import { useRouter } from '@/router';
+import { inject } from "vue";
+import * as os from "@/os";
+import copyToClipboard from "@/scripts/copy-to-clipboard";
+import { url } from "@/config";
+import { popout as popout_ } from "@/scripts/popout";
+import { i18n } from "@/i18n";
+import { useRouter } from "@/router";
 
-const props = withDefaults(defineProps<{
-	to: string;
-	activeClass?: null | string;
-	behavior?: null | 'window' | 'browser' | 'modalWindow';
-}>(), {
-	activeClass: null,
-	behavior: null,
-});
+const props = withDefaults(
+	defineProps<{
+		to: string;
+		activeClass?: null | string;
+		behavior?: null | "window" | "browser" | "modalWindow";
+	}>(),
+	{
+		activeClass: null,
+		behavior: null,
+	}
+);
 
 const router = useRouter();
 
@@ -36,35 +45,45 @@ const active = $computed(() => {
 
 function onContextmenu(ev) {
 	const selection = window.getSelection();
-	if (selection && selection.toString() !== '') return;
-	os.contextMenu([{
-		type: 'label',
-		text: props.to,
-	}, {
-		icon: 'ph-browser ph-bold ph-lg',
-		text: i18n.ts.openInWindow,
-		action: () => {
-			os.pageWindow(props.to);
-		},
-	}, {
-		icon: 'ph-arrows-out-simple ph-bold ph-lg',
-		text: i18n.ts.showInPage,
-		action: () => {
-			router.push(props.to, 'forcePage');
-		},
-	}, null, {
-		icon: 'ph-arrow-square-out ph-bold ph-lg',
-		text: i18n.ts.openInNewTab,
-		action: () => {
-			window.open(props.to, '_blank');
-		},
-	}, {
-		icon: 'ph-link-simple ph-bold ph-lg',
-		text: i18n.ts.copyLink,
-		action: () => {
-			copyToClipboard(`${url}${props.to}`);
-		},
-	}], ev);
+	if (selection && selection.toString() !== "") return;
+	os.contextMenu(
+		[
+			{
+				type: "label",
+				text: props.to,
+			},
+			{
+				icon: "ph-browser ph-bold ph-lg",
+				text: i18n.ts.openInWindow,
+				action: () => {
+					os.pageWindow(props.to);
+				},
+			},
+			{
+				icon: "ph-arrows-out-simple ph-bold ph-lg",
+				text: i18n.ts.showInPage,
+				action: () => {
+					router.push(props.to, "forcePage");
+				},
+			},
+			null,
+			{
+				icon: "ph-arrow-square-out ph-bold ph-lg",
+				text: i18n.ts.openInNewTab,
+				action: () => {
+					window.open(props.to, "_blank");
+				},
+			},
+			{
+				icon: "ph-link-simple ph-bold ph-lg",
+				text: i18n.ts.copyLink,
+				action: () => {
+					copyToClipboard(`${url}${props.to}`);
+				},
+			},
+		],
+		ev
+	);
 }
 
 function openWindow() {
@@ -83,15 +102,15 @@ function nav(ev: MouseEvent) {
 	if (!ev.ctrlKey) {
 		ev.preventDefault();
 
-		if (props.behavior === 'browser') {
+		if (props.behavior === "browser") {
 			location.href = props.to;
 			return;
 		}
 
 		if (props.behavior) {
-			if (props.behavior === 'window') {
+			if (props.behavior === "window") {
 				return openWindow();
-			} else if (props.behavior === 'modalWindow') {
+			} else if (props.behavior === "modalWindow") {
 				return modalWindow();
 			}
 		}
@@ -100,7 +119,7 @@ function nav(ev: MouseEvent) {
 			return openWindow();
 		}
 
-		router.push(props.to, ev.ctrlKey ? 'forcePage' : null);
+		router.push(props.to, ev.ctrlKey ? "forcePage" : null);
 	}
 }
 </script>
diff --git a/packages/client/src/components/global/MkAcct.vue b/packages/client/src/components/global/MkAcct.vue
index 6c3da424c..c77ad6a4e 100644
--- a/packages/client/src/components/global/MkAcct.vue
+++ b/packages/client/src/components/global/MkAcct.vue
@@ -1,14 +1,18 @@
 <template>
-<span class="mk-acct">
-	<span class="name">@{{ user.username }}</span>
-	<span v-if="user.host || detail || $store.state.showFullAcct" class="host">@{{ user.host || host }}</span>
-</span>
+	<span class="mk-acct">
+		<span class="name">@{{ user.username }}</span>
+		<span
+			v-if="user.host || detail || $store.state.showFullAcct"
+			class="host"
+			>@{{ user.host || host }}</span
+		>
+	</span>
 </template>
 
 <script lang="ts" setup>
-import * as misskey from 'calckey-js';
-import { toUnicode } from 'punycode/';
-import { host as hostRaw } from '@/config';
+import * as misskey from "calckey-js";
+import { toUnicode } from "punycode/";
+import { host as hostRaw } from "@/config";
 
 defineProps<{
 	user: misskey.entities.UserDetailed;
diff --git a/packages/client/src/components/global/MkAd.vue b/packages/client/src/components/global/MkAd.vue
index 29639ca8d..e826e1445 100644
--- a/packages/client/src/components/global/MkAd.vue
+++ b/packages/client/src/components/global/MkAd.vue
@@ -1,24 +1,37 @@
 <template>
-	<div v-if="chosen && chosen.length > 0 && defaultStore.state.showAds" v-for="chosenItem in chosen" class="qiivuoyo">
+	<div
+		v-if="chosen && chosen.length > 0 && defaultStore.state.showAds"
+		v-for="chosenItem in chosen"
+		class="qiivuoyo"
+	>
 		<div v-if="!showMenu" class="main" :class="chosenItem.place">
 			<a :href="chosenItem.url" target="_blank">
-				<img :src="chosenItem.imageUrl">
+				<img :src="chosenItem.imageUrl" />
 			</a>
 		</div>
 	</div>
 	<div v-else-if="chosen && defaultStore.state.showAds" class="qiivuoyo">
 		<div v-if="!showMenu" class="main" :class="chosen.place">
 			<a :href="chosen.url" target="_blank">
-				<img :src="chosen.imageUrl">
-				<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="ph-info ph-bold ph-lg info-circle"></span></button>
+				<img :src="chosen.imageUrl" />
+				<button class="_button menu" @click.prevent.stop="toggleMenu">
+					<span class="ph-info ph-bold ph-lg info-circle"></span>
+				</button>
 			</a>
 		</div>
 		<div v-else class="menu">
 			<div class="body">
 				<div>Ads by {{ host }}</div>
 				<!--<MkButton class="button" primary>{{ i18n.ts._ad.like }}</MkButton>-->
-				<MkButton v-if="chosen.ratio !== 0" class="button" @click="reduceFrequency">{{ i18n.ts._ad.reduceFrequencyOfThisAd }}</MkButton>
-				<button class="_textButton" @click="toggleMenu">{{ i18n.ts._ad.back }}</button>
+				<MkButton
+					v-if="chosen.ratio !== 0"
+					class="button"
+					@click="reduceFrequency"
+					>{{ i18n.ts._ad.reduceFrequencyOfThisAd }}</MkButton
+				>
+				<button class="_textButton" @click="toggleMenu">
+					{{ i18n.ts._ad.back }}
+				</button>
 			</div>
 		</div>
 	</div>
@@ -26,15 +39,15 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import { instance } from '@/instance';
-import { host } from '@/config';
-import MkButton from '@/components/MkButton.vue';
-import { defaultStore } from '@/store';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { ref } from "vue";
+import { instance } from "@/instance";
+import { host } from "@/config";
+import MkButton from "@/components/MkButton.vue";
+import { defaultStore } from "@/store";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-type Ad = (typeof instance)['ads'][number];
+type Ad = (typeof instance)["ads"][number];
 
 const props = defineProps<{
 	prefer: string[];
@@ -51,26 +64,32 @@ const choseAd = (): Ad | null => {
 		return props.specify;
 	}
 
-	const allAds = instance.ads.map(ad => defaultStore.state.mutedAds.includes(ad.id) ? {
-		...ad,
-		ratio: 0,
-	} : ad);
+	const allAds = instance.ads.map((ad) =>
+		defaultStore.state.mutedAds.includes(ad.id)
+			? {
+					...ad,
+					ratio: 0,
+			  }
+			: ad
+	);
 
-	let ads = allAds.filter(ad => props.prefer.includes(ad.place));
+	let ads = allAds.filter((ad) => props.prefer.includes(ad.place));
 
 	if (ads.length === 0) {
-		ads = allAds.filter(ad => ad.place === 'square');
+		ads = allAds.filter((ad) => ad.place === "square");
 	}
 
-	const lowPriorityAds = ads.filter(ad => ad.ratio === 0);
-	const widgetAds = ads.filter(ad => ad.place === 'widget');
-	ads = ads.filter(ad => ad.ratio !== 0);
-	
+	const lowPriorityAds = ads.filter((ad) => ad.ratio === 0);
+	const widgetAds = ads.filter((ad) => ad.place === "widget");
+	ads = ads.filter((ad) => ad.ratio !== 0);
+
 	if (widgetAds.length !== 0) {
-			return widgetAds;
+		return widgetAds;
 	} else if (ads.length === 0) {
-		 if (lowPriorityAds.length !== 0) {
-			return lowPriorityAds[Math.floor(Math.random() * lowPriorityAds.length)];
+		if (lowPriorityAds.length !== 0) {
+			return lowPriorityAds[
+				Math.floor(Math.random() * lowPriorityAds.length)
+			];
 		} else {
 			return null;
 		}
@@ -96,7 +115,7 @@ const chosen = ref(choseAd());
 function reduceFrequency(): void {
 	if (chosen.value == null) return;
 	if (defaultStore.state.mutedAds.includes(chosen.value.id)) return;
-	defaultStore.push('mutedAds', chosen.value.id);
+	defaultStore.push("mutedAds", chosen.value.id);
 	os.success();
 	chosen.value = choseAd();
 	showMenu.value = false;
@@ -106,7 +125,13 @@ function reduceFrequency(): void {
 <style lang="scss" scoped>
 .qiivuoyo {
 	background-size: auto auto;
-	background-image: repeating-linear-gradient(45deg, transparent, transparent 8px, var(--ad) 8px, var(--ad) 14px );
+	background-image: repeating-linear-gradient(
+		45deg,
+		transparent,
+		transparent 8px,
+		var(--ad) 8px,
+		var(--ad) 14px
+	);
 
 	> .main {
 		text-align: center;
@@ -143,7 +168,7 @@ function reduceFrequency(): void {
 		}
 
 		&.widget {
-			> a ,
+			> a,
 			> a > img {
 				max-width: min(300px, 100%);
 				max-height: 300px;
@@ -153,7 +178,7 @@ function reduceFrequency(): void {
 		&.inline {
 			padding: 8px;
 
-			> a ,
+			> a,
 			> a > img {
 				max-width: min(600px, 100%);
 				max-height: 80px;
@@ -163,7 +188,7 @@ function reduceFrequency(): void {
 		&.inline-big {
 			padding: 8px;
 
-			> a ,
+			> a,
 			> a > img {
 				max-width: min(600px, 100%);
 				max-height: 250px;
@@ -171,7 +196,7 @@ function reduceFrequency(): void {
 		}
 
 		&.vertical {
-			> a ,
+			> a,
 			> a > img {
 				max-width: min(100px, 100%);
 			}
diff --git a/packages/client/src/components/global/MkAvatar.vue b/packages/client/src/components/global/MkAvatar.vue
index f2a39de61..d904ece26 100644
--- a/packages/client/src/components/global/MkAvatar.vue
+++ b/packages/client/src/components/global/MkAvatar.vue
@@ -1,72 +1,127 @@
 <template>
-<span v-if="disableLink" v-user-preview="disablePreview ? undefined : user.id" class="eiwwqkts _noSelect" :class="{ cat: user.isCat, square: $store.state.squareAvatars }" :style="{ color }" :title="acct(user)" @click="onClick">
-	<img class="inner" :src="url" decoding="async"/>
-	<MkUserOnlineIndicator v-if="showIndicator && user.instance == null" class="indicator" :user="user"/>
-</span>
-<MkA v-else v-user-preview="disablePreview ? undefined : user.id" class="eiwwqkts _noSelect" :class="{ cat: user.isCat, square: $store.state.squareAvatars }" :style="{ color }" :to="userPage(user)" :title="acct(user)" :target="target" @click.stop>
-	<img class="inner" :src="url" decoding="async"/>
-	<MkUserOnlineIndicator v-if="showIndicator && user.instance == null" class="indicator" :user="user"/>
-</MkA>
+	<span
+		v-if="disableLink"
+		v-user-preview="disablePreview ? undefined : user.id"
+		class="eiwwqkts _noSelect"
+		:class="{ cat: user.isCat, square: $store.state.squareAvatars }"
+		:style="{ color }"
+		:title="acct(user)"
+		@click="onClick"
+	>
+		<img class="inner" :src="url" decoding="async" />
+		<MkUserOnlineIndicator
+			v-if="showIndicator && user.instance == null"
+			class="indicator"
+			:user="user"
+		/>
+	</span>
+	<MkA
+		v-else
+		v-user-preview="disablePreview ? undefined : user.id"
+		class="eiwwqkts _noSelect"
+		:class="{ cat: user.isCat, square: $store.state.squareAvatars }"
+		:style="{ color }"
+		:to="userPage(user)"
+		:title="acct(user)"
+		:target="target"
+		@click.stop
+	>
+		<img class="inner" :src="url" decoding="async" />
+		<MkUserOnlineIndicator
+			v-if="showIndicator && user.instance == null"
+			class="indicator"
+			:user="user"
+		/>
+	</MkA>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, watch } from 'vue';
-import * as misskey from 'calckey-js';
-import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash';
-import { acct, userPage } from '@/filters/user';
-import MkUserOnlineIndicator from '@/components/MkUserOnlineIndicator.vue';
-import { defaultStore } from '@/store';
+import { onMounted, watch } from "vue";
+import * as misskey from "calckey-js";
+import { getStaticImageUrl } from "@/scripts/get-static-image-url";
+import { extractAvgColorFromBlurhash } from "@/scripts/extract-avg-color-from-blurhash";
+import { acct, userPage } from "@/filters/user";
+import MkUserOnlineIndicator from "@/components/MkUserOnlineIndicator.vue";
+import { defaultStore } from "@/store";
 
-const props = withDefaults(defineProps<{
-	user: misskey.entities.User;
-	target?: string | null;
-	disableLink?: boolean;
-	disablePreview?: boolean;
-	showIndicator?: boolean;
-}>(), {
-	target: null,
-	disableLink: false,
-	disablePreview: false,
-	showIndicator: false,
-});
+const props = withDefaults(
+	defineProps<{
+		user: misskey.entities.User;
+		target?: string | null;
+		disableLink?: boolean;
+		disablePreview?: boolean;
+		showIndicator?: boolean;
+	}>(),
+	{
+		target: null,
+		disableLink: false,
+		disablePreview: false,
+		showIndicator: false,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'click', v: MouseEvent): void;
+	(ev: "click", v: MouseEvent): void;
 }>();
 
-const url = $computed(() => defaultStore.state.disableShowingAnimatedImages
-	? getStaticImageUrl(props.user.avatarUrl)
-	: props.user.avatarUrl);
+const url = $computed(() =>
+	defaultStore.state.disableShowingAnimatedImages
+		? getStaticImageUrl(props.user.avatarUrl)
+		: props.user.avatarUrl
+);
 
 function onClick(ev: MouseEvent) {
-	emit('click', ev);
+	emit("click", ev);
 }
 
 let color = $ref();
 
-watch(() => props.user.avatarBlurhash, () => {
-	color = extractAvgColorFromBlurhash(props.user.avatarBlurhash);
-}, {
-	immediate: true,
-});
+watch(
+	() => props.user.avatarBlurhash,
+	() => {
+		color = extractAvgColorFromBlurhash(props.user.avatarBlurhash);
+	},
+	{
+		immediate: true,
+	}
+);
 </script>
 
 <style lang="scss" scoped>
 @keyframes earwiggleleft {
-	from { transform: rotate(37.6deg) skew(30deg); }
-	25% { transform: rotate(10deg) skew(30deg); }
-	50% { transform: rotate(20deg) skew(30deg); }
-	75% { transform: rotate(0deg) skew(30deg); }
-	to { transform: rotate(37.6deg) skew(30deg); }
+	from {
+		transform: rotate(37.6deg) skew(30deg);
+	}
+	25% {
+		transform: rotate(10deg) skew(30deg);
+	}
+	50% {
+		transform: rotate(20deg) skew(30deg);
+	}
+	75% {
+		transform: rotate(0deg) skew(30deg);
+	}
+	to {
+		transform: rotate(37.6deg) skew(30deg);
+	}
 }
 
 @keyframes earwiggleright {
-	from { transform: rotate(-37.6deg) skew(-30deg); }
-	30% { transform: rotate(-10deg) skew(-30deg); }
-	55% { transform: rotate(-20deg) skew(-30deg); }
-	75% { transform: rotate(0deg) skew(-30deg); }
-	to { transform: rotate(-37.6deg) skew(-30deg); }
+	from {
+		transform: rotate(-37.6deg) skew(-30deg);
+	}
+	30% {
+		transform: rotate(-10deg) skew(-30deg);
+	}
+	55% {
+		transform: rotate(-20deg) skew(-30deg);
+	}
+	75% {
+		transform: rotate(0deg) skew(-30deg);
+	}
+	to {
+		transform: rotate(-37.6deg) skew(-30deg);
+	}
 }
 
 .eiwwqkts {
@@ -109,11 +164,12 @@ watch(() => props.user.avatarBlurhash, () => {
 	}
 
 	&.cat {
-		&:before, &:after {
+		&:before,
+		&:after {
 			background: #ebbcba;
 			border: solid 4px currentColor;
 			box-sizing: border-box;
-			content: '';
+			content: "";
 			display: inline-block;
 			height: 50%;
 			width: 50%;
diff --git a/packages/client/src/components/global/MkEllipsis.vue b/packages/client/src/components/global/MkEllipsis.vue
index 0a46f486d..6226c12ec 100644
--- a/packages/client/src/components/global/MkEllipsis.vue
+++ b/packages/client/src/components/global/MkEllipsis.vue
@@ -24,7 +24,9 @@
 }
 
 @keyframes ellipsis {
-	0%, 80%, 100% {
+	0%,
+	80%,
+	100% {
 		opacity: 1;
 	}
 	40% {
diff --git a/packages/client/src/components/global/MkEmoji.vue b/packages/client/src/components/global/MkEmoji.vue
index 9b2d79a5a..eb08ff5c2 100644
--- a/packages/client/src/components/global/MkEmoji.vue
+++ b/packages/client/src/components/global/MkEmoji.vue
@@ -1,17 +1,32 @@
 <template>
-<img v-if="customEmoji" class="mk-emoji custom" :class="{ normal, noStyle }" :src="url" :alt="alt" :title="alt" decoding="async"/>
-<img v-else-if="char && !useOsNativeEmojis" class="mk-emoji" :src="url" :alt="alt" :title="alt" decoding="async"/>
-<span v-else-if="char && useOsNativeEmojis">{{ char }}</span>
-<span v-else>{{ emoji }}</span>
+	<img
+		v-if="customEmoji"
+		class="mk-emoji custom"
+		:class="{ normal, noStyle }"
+		:src="url"
+		:alt="alt"
+		:title="alt"
+		decoding="async"
+	/>
+	<img
+		v-else-if="char && !useOsNativeEmojis"
+		class="mk-emoji"
+		:src="url"
+		:alt="alt"
+		:title="alt"
+		decoding="async"
+	/>
+	<span v-else-if="char && useOsNativeEmojis">{{ char }}</span>
+	<span v-else>{{ emoji }}</span>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
-import { CustomEmoji } from 'calckey-js/built/entities';
-import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import { char2filePath } from '@/scripts/twemoji-base';
-import { defaultStore } from '@/store';
-import { instance } from '@/instance';
+import { computed, ref, watch } from "vue";
+import { CustomEmoji } from "calckey-js/built/entities";
+import { getStaticImageUrl } from "@/scripts/get-static-image-url";
+import { char2filePath } from "@/scripts/twemoji-base";
+import { defaultStore } from "@/store";
+import { instance } from "@/instance";
 
 const props = defineProps<{
 	emoji: string;
@@ -21,11 +36,19 @@ const props = defineProps<{
 	isReaction?: boolean;
 }>();
 
-const isCustom = computed(() => props.emoji.startsWith(':'));
-const char = computed(() => isCustom.value ? null : props.emoji);
-const useOsNativeEmojis = computed(() => defaultStore.state.useOsNativeEmojis && !props.isReaction);
+const isCustom = computed(() => props.emoji.startsWith(":"));
+const char = computed(() => (isCustom.value ? null : props.emoji));
+const useOsNativeEmojis = computed(
+	() => defaultStore.state.useOsNativeEmojis && !props.isReaction
+);
 const ce = computed(() => props.customEmojis ?? instance.emojis ?? []);
-const customEmoji = computed(() => isCustom.value ? ce.value.find(x => x.name === props.emoji.substr(1, props.emoji.length - 2)) : null);
+const customEmoji = computed(() =>
+	isCustom.value
+		? ce.value.find(
+				(x) => x.name === props.emoji.substr(1, props.emoji.length - 2)
+		  )
+		: null
+);
 const url = computed(() => {
 	if (char.value) {
 		return char2filePath(char.value);
@@ -35,7 +58,9 @@ const url = computed(() => {
 			: customEmoji.value.url;
 	}
 });
-const alt = computed(() => customEmoji.value ? `:${customEmoji.value.name}:` : char.value);
+const alt = computed(() =>
+	customEmoji.value ? `:${customEmoji.value.name}:` : char.value
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/global/MkError.vue b/packages/client/src/components/global/MkError.vue
index 266e6b253..38d6244b9 100644
--- a/packages/client/src/components/global/MkError.vue
+++ b/packages/client/src/components/global/MkError.vue
@@ -1,16 +1,25 @@
 <template>
-<transition :name="$store.state.animation ? 'zoom' : ''" appear>
-	<div class="mjndxjcg">
-		<img src="/static-assets/badges/error.png" class="_ghost" alt="Error"/>
-		<p><i class="ph-warning ph-bold ph-lg"></i> {{ i18n.ts.somethingHappened }}</p>
-		<MkButton class="button" @click="() => $emit('retry')">{{ i18n.ts.retry }}</MkButton>
-	</div>
-</transition>
+	<transition :name="$store.state.animation ? 'zoom' : ''" appear>
+		<div class="mjndxjcg">
+			<img
+				src="/static-assets/badges/error.png"
+				class="_ghost"
+				alt="Error"
+			/>
+			<p>
+				<i class="ph-warning ph-bold ph-lg"></i>
+				{{ i18n.ts.somethingHappened }}
+			</p>
+			<MkButton class="button" @click="() => $emit('retry')">{{
+				i18n.ts.retry
+			}}</MkButton>
+		</div>
+	</transition>
 </template>
 
 <script lang="ts" setup>
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n';
+import MkButton from "@/components/MkButton.vue";
+import { i18n } from "@/i18n";
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/global/MkLoading.vue b/packages/client/src/components/global/MkLoading.vue
index dc61e577b..343108f04 100644
--- a/packages/client/src/components/global/MkLoading.vue
+++ b/packages/client/src/components/global/MkLoading.vue
@@ -1,27 +1,51 @@
 <template>
-<div :class="[$style.root, { [$style.inline]: inline, [$style.colored]: colored, [$style.mini]: mini }]">
-	<div :class="$style.container" aria-hidden="true">
-		<svg :class="[$style.spinner]" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
-			<circle :class="[$style.path]" cx="25" cy="25" r="20" fill="none" stroke-width="6px" style="fill:none;stroke:currentColor;stroke-width:6px;"></circle>
-		</svg>
+	<div
+		:class="[
+			$style.root,
+			{
+				[$style.inline]: inline,
+				[$style.colored]: colored,
+				[$style.mini]: mini,
+			},
+		]"
+	>
+		<div :class="$style.container" aria-hidden="true">
+			<svg
+				:class="[$style.spinner]"
+				viewBox="0 0 50 50"
+				xmlns="http://www.w3.org/2000/svg"
+			>
+				<circle
+					:class="[$style.path]"
+					cx="25"
+					cy="25"
+					r="20"
+					fill="none"
+					stroke-width="6px"
+					style="fill: none; stroke: currentColor; stroke-width: 6px"
+				></circle>
+			</svg>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
+import {} from "vue";
 
-const props = withDefaults(defineProps<{
-	inline?: boolean;
-	colored?: boolean;
-	mini?: boolean;
-	em?: boolean;
-}>(), {
-	inline: false,
-	colored: true,
-	mini: false,
-	em: false,
-});
+const props = withDefaults(
+	defineProps<{
+		inline?: boolean;
+		colored?: boolean;
+		mini?: boolean;
+		em?: boolean;
+	}>(),
+	{
+		inline: false,
+		colored: true,
+		mini: false,
+		em: false,
+	}
+);
 </script>
 
 <style lang="scss" module>
@@ -102,5 +126,4 @@ const props = withDefaults(defineProps<{
 	stroke-linecap: round;
 	animation: dash 1.2s ease-in-out infinite;
 }
-
 </style>
diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index 19e1d88e1..c235b4835 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -1,24 +1,36 @@
 <template>
-<MfmCore :text="text" :plain="plain" :nowrap="nowrap" :author="author" :customEmojis="customEmojis" :isNote="isNote" class="havbbuyv" :class="{ nowrap }"/>
+	<MfmCore
+		:text="text"
+		:plain="plain"
+		:nowrap="nowrap"
+		:author="author"
+		:customEmojis="customEmojis"
+		:isNote="isNote"
+		class="havbbuyv"
+		:class="{ nowrap }"
+	/>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MfmCore from '@/components/mfm';
+import {} from "vue";
+import MfmCore from "@/components/mfm";
 
-const props = withDefaults(defineProps<{
-	text: string;
-	plain?: boolean;
-	nowrap?: boolean;
-	author?: any;
-	customEmojis?: any;
-	isNote?: boolean;
-}>(), {
-	plain: false,
-	nowrap: false,
-	author: null,
-	isNote: true,
-});
+const props = withDefaults(
+	defineProps<{
+		text: string;
+		plain?: boolean;
+		nowrap?: boolean;
+		author?: any;
+		customEmojis?: any;
+		isNote?: boolean;
+	}>(),
+	{
+		plain: false,
+		nowrap: false,
+		author: null,
+		isNote: true,
+	}
+);
 </script>
 
 <style lang="scss">
@@ -34,14 +46,20 @@ const props = withDefaults(defineProps<{
 	--mfm-zoom-size: 600%;
 }
 
-.mfm-x2, .mfm-x3, .mfm-x4 {
+.mfm-x2,
+.mfm-x3,
+.mfm-x4 {
 	font-size: var(--mfm-zoom-size);
 
-	.mfm-x2, .mfm-x3, .mfm-x4 {
+	.mfm-x2,
+	.mfm-x3,
+	.mfm-x4 {
 		/* only half effective */
 		font-size: calc(var(--mfm-zoom-size) / 2 + 50%);
 
-		.mfm-x2, .mfm-x3, .mfm-x4 {
+		.mfm-x2,
+		.mfm-x3,
+		.mfm-x4 {
 			/* disabled */
 			font-size: 100%;
 		}
@@ -49,103 +67,237 @@ const props = withDefaults(defineProps<{
 }
 
 @keyframes mfm-spin {
-	0% { transform: rotate(0deg); }
-	100% { transform: rotate(360deg); }
+	0% {
+		transform: rotate(0deg);
+	}
+	100% {
+		transform: rotate(360deg);
+	}
 }
 
 @keyframes mfm-spinX {
-	0% { transform: perspective(128px) rotateX(0deg); }
-	100% { transform: perspective(128px) rotateX(360deg); }
+	0% {
+		transform: perspective(128px) rotateX(0deg);
+	}
+	100% {
+		transform: perspective(128px) rotateX(360deg);
+	}
 }
 
 @keyframes mfm-spinY {
-	0% { transform: perspective(128px) rotateY(0deg); }
-	100% { transform: perspective(128px) rotateY(360deg); }
+	0% {
+		transform: perspective(128px) rotateY(0deg);
+	}
+	100% {
+		transform: perspective(128px) rotateY(360deg);
+	}
 }
 
 @keyframes mfm-jump {
-	0% { transform: translateY(0); }
-	25% { transform: translateY(-16px); }
-	50% { transform: translateY(0); }
-	75% { transform: translateY(-8px); }
-	100% { transform: translateY(0); }
+	0% {
+		transform: translateY(0);
+	}
+	25% {
+		transform: translateY(-16px);
+	}
+	50% {
+		transform: translateY(0);
+	}
+	75% {
+		transform: translateY(-8px);
+	}
+	100% {
+		transform: translateY(0);
+	}
 }
 
 @keyframes mfm-bounce {
-	0% { transform: translateY(0) scale(1, 1); }
-	25% { transform: translateY(-16px) scale(1, 1); }
-	50% { transform: translateY(0) scale(1, 1); }
-	75% { transform: translateY(0) scale(1.5, 0.75); }
-	100% { transform: translateY(0) scale(1, 1); }
+	0% {
+		transform: translateY(0) scale(1, 1);
+	}
+	25% {
+		transform: translateY(-16px) scale(1, 1);
+	}
+	50% {
+		transform: translateY(0) scale(1, 1);
+	}
+	75% {
+		transform: translateY(0) scale(1.5, 0.75);
+	}
+	100% {
+		transform: translateY(0) scale(1, 1);
+	}
 }
 
 // const val = () => `translate(${Math.floor(Math.random() * 20) - 10}px, ${Math.floor(Math.random() * 20) - 10}px)`;
 // let css = '';
 // for (let i = 0; i <= 100; i += 5) { css += `${i}% { transform: ${val()} }\n`; }
 @keyframes mfm-twitch {
-	0% { transform: translate(7px, -2px) }
-	5% { transform: translate(-3px, 1px) }
-	10% { transform: translate(-7px, -1px) }
-	15% { transform: translate(0px, -1px) }
-	20% { transform: translate(-8px, 6px) }
-	25% { transform: translate(-4px, -3px) }
-	30% { transform: translate(-4px, -6px) }
-	35% { transform: translate(-8px, -8px) }
-	40% { transform: translate(4px, 6px) }
-	45% { transform: translate(-3px, 1px) }
-	50% { transform: translate(2px, -10px) }
-	55% { transform: translate(-7px, 0px) }
-	60% { transform: translate(-2px, 4px) }
-	65% { transform: translate(3px, -8px) }
-	70% { transform: translate(6px, 7px) }
-	75% { transform: translate(-7px, -2px) }
-	80% { transform: translate(-7px, -8px) }
-	85% { transform: translate(9px, 3px) }
-	90% { transform: translate(-3px, -2px) }
-	95% { transform: translate(-10px, 2px) }
-	100% { transform: translate(-2px, -6px) }
+	0% {
+		transform: translate(7px, -2px);
+	}
+	5% {
+		transform: translate(-3px, 1px);
+	}
+	10% {
+		transform: translate(-7px, -1px);
+	}
+	15% {
+		transform: translate(0px, -1px);
+	}
+	20% {
+		transform: translate(-8px, 6px);
+	}
+	25% {
+		transform: translate(-4px, -3px);
+	}
+	30% {
+		transform: translate(-4px, -6px);
+	}
+	35% {
+		transform: translate(-8px, -8px);
+	}
+	40% {
+		transform: translate(4px, 6px);
+	}
+	45% {
+		transform: translate(-3px, 1px);
+	}
+	50% {
+		transform: translate(2px, -10px);
+	}
+	55% {
+		transform: translate(-7px, 0px);
+	}
+	60% {
+		transform: translate(-2px, 4px);
+	}
+	65% {
+		transform: translate(3px, -8px);
+	}
+	70% {
+		transform: translate(6px, 7px);
+	}
+	75% {
+		transform: translate(-7px, -2px);
+	}
+	80% {
+		transform: translate(-7px, -8px);
+	}
+	85% {
+		transform: translate(9px, 3px);
+	}
+	90% {
+		transform: translate(-3px, -2px);
+	}
+	95% {
+		transform: translate(-10px, 2px);
+	}
+	100% {
+		transform: translate(-2px, -6px);
+	}
 }
 
 // const val = () => `translate(${Math.floor(Math.random() * 6) - 3}px, ${Math.floor(Math.random() * 6) - 3}px) rotate(${Math.floor(Math.random() * 24) - 12}deg)`;
 // let css = '';
 // for (let i = 0; i <= 100; i += 5) { css += `${i}% { transform: ${val()} }\n`; }
 @keyframes mfm-shake {
-	0% { transform: translate(-3px, -1px) rotate(-8deg) }
-	5% { transform: translate(0px, -1px) rotate(-10deg) }
-	10% { transform: translate(1px, -3px) rotate(0deg) }
-	15% { transform: translate(1px, 1px) rotate(11deg) }
-	20% { transform: translate(-2px, 1px) rotate(1deg) }
-	25% { transform: translate(-1px, -2px) rotate(-2deg) }
-	30% { transform: translate(-1px, 2px) rotate(-3deg) }
-	35% { transform: translate(2px, 1px) rotate(6deg) }
-	40% { transform: translate(-2px, -3px) rotate(-9deg) }
-	45% { transform: translate(0px, -1px) rotate(-12deg) }
-	50% { transform: translate(1px, 2px) rotate(10deg) }
-	55% { transform: translate(0px, -3px) rotate(8deg) }
-	60% { transform: translate(1px, -1px) rotate(8deg) }
-	65% { transform: translate(0px, -1px) rotate(-7deg) }
-	70% { transform: translate(-1px, -3px) rotate(6deg) }
-	75% { transform: translate(0px, -2px) rotate(4deg) }
-	80% { transform: translate(-2px, -1px) rotate(3deg) }
-	85% { transform: translate(1px, -3px) rotate(-10deg) }
-	90% { transform: translate(1px, 0px) rotate(3deg) }
-	95% { transform: translate(-2px, 0px) rotate(-3deg) }
-	100% { transform: translate(2px, 1px) rotate(2deg) }
+	0% {
+		transform: translate(-3px, -1px) rotate(-8deg);
+	}
+	5% {
+		transform: translate(0px, -1px) rotate(-10deg);
+	}
+	10% {
+		transform: translate(1px, -3px) rotate(0deg);
+	}
+	15% {
+		transform: translate(1px, 1px) rotate(11deg);
+	}
+	20% {
+		transform: translate(-2px, 1px) rotate(1deg);
+	}
+	25% {
+		transform: translate(-1px, -2px) rotate(-2deg);
+	}
+	30% {
+		transform: translate(-1px, 2px) rotate(-3deg);
+	}
+	35% {
+		transform: translate(2px, 1px) rotate(6deg);
+	}
+	40% {
+		transform: translate(-2px, -3px) rotate(-9deg);
+	}
+	45% {
+		transform: translate(0px, -1px) rotate(-12deg);
+	}
+	50% {
+		transform: translate(1px, 2px) rotate(10deg);
+	}
+	55% {
+		transform: translate(0px, -3px) rotate(8deg);
+	}
+	60% {
+		transform: translate(1px, -1px) rotate(8deg);
+	}
+	65% {
+		transform: translate(0px, -1px) rotate(-7deg);
+	}
+	70% {
+		transform: translate(-1px, -3px) rotate(6deg);
+	}
+	75% {
+		transform: translate(0px, -2px) rotate(4deg);
+	}
+	80% {
+		transform: translate(-2px, -1px) rotate(3deg);
+	}
+	85% {
+		transform: translate(1px, -3px) rotate(-10deg);
+	}
+	90% {
+		transform: translate(1px, 0px) rotate(3deg);
+	}
+	95% {
+		transform: translate(-2px, 0px) rotate(-3deg);
+	}
+	100% {
+		transform: translate(2px, 1px) rotate(2deg);
+	}
 }
 
 @keyframes mfm-rubberBand {
-	from { transform: scale3d(1, 1, 1); }
-	30% { transform: scale3d(1.25, 0.75, 1); }
-	40% { transform: scale3d(0.75, 1.25, 1); }
-	50% { transform: scale3d(1.15, 0.85, 1); }
-	65% { transform: scale3d(0.95, 1.05, 1); }
-	75% { transform: scale3d(1.05, 0.95, 1); }
-	to { transform: scale3d(1, 1, 1); }
+	from {
+		transform: scale3d(1, 1, 1);
+	}
+	30% {
+		transform: scale3d(1.25, 0.75, 1);
+	}
+	40% {
+		transform: scale3d(0.75, 1.25, 1);
+	}
+	50% {
+		transform: scale3d(1.15, 0.85, 1);
+	}
+	65% {
+		transform: scale3d(0.95, 1.05, 1);
+	}
+	75% {
+		transform: scale3d(1.05, 0.95, 1);
+	}
+	to {
+		transform: scale3d(1, 1, 1);
+	}
 }
 
 @keyframes mfm-rainbow {
-	0% { filter: hue-rotate(0deg) contrast(150%) saturate(150%); }
-	100% { filter: hue-rotate(360deg) contrast(150%) saturate(150%); }
+	0% {
+		filter: hue-rotate(0deg) contrast(150%) saturate(150%);
+	}
+	100% {
+		filter: hue-rotate(360deg) contrast(150%) saturate(150%);
+	}
 }
 </style>
 
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index ccfe5b95c..ad1d80ca6 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -1,24 +1,78 @@
 <template>
-	<div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
-		<i @click="goBack()" v-if="props.displayBackButton" v-tooltip.noDelay="i18n.ts.goBack" class="icon backButton ph-caret-left ph-bold ph-lg"></i>
+	<div
+		v-if="show"
+		ref="el"
+		class="fdidabkb"
+		:class="{ slim: narrow, thin: thin_ }"
+		:style="{ background: bg }"
+		@click="onClick"
+	>
+		<i
+			@click="goBack()"
+			v-if="props.displayBackButton"
+			v-tooltip.noDelay="i18n.ts.goBack"
+			class="icon backButton ph-caret-left ph-bold ph-lg"
+		></i>
 		<div v-if="narrow" class="buttons left" @click="openAccountMenu">
-			<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
+			<MkAvatar
+				v-if="props.displayMyAvatar && $i"
+				class="avatar"
+				:user="$i"
+				:disable-preview="true"
+			/>
 		</div>
-	<template v-if="metadata">
-		<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
-			<MkAvatar v-if="metadata.avatar" class="avatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true"/>
-				<i v-else-if="metadata.icon && !narrow" class="icon" :class="metadata.icon"></i>
+		<template v-if="metadata">
+			<div
+				v-if="!hideTitle"
+				class="titleContainer"
+				@click="showTabsPopup"
+			>
+				<MkAvatar
+					v-if="metadata.avatar"
+					class="avatar"
+					:user="metadata.avatar"
+					:disable-preview="true"
+					:show-indicator="true"
+				/>
+				<i
+					v-else-if="metadata.icon && !narrow"
+					class="icon"
+					:class="metadata.icon"
+				></i>
 
 				<div class="title">
-					<MkUserName v-if="metadata.userName" :user="metadata.userName" :nowrap="true" class="title"/>
-					<div v-else-if="metadata.title && !(tabs != null && tabs.length > 0 && narrow)" class="title">{{ metadata.title }}</div>
+					<MkUserName
+						v-if="metadata.userName"
+						:user="metadata.userName"
+						:nowrap="true"
+						class="title"
+					/>
+					<div
+						v-else-if="
+							metadata.title &&
+							!(tabs != null && tabs.length > 0 && narrow)
+						"
+						class="title"
+					>
+						{{ metadata.title }}
+					</div>
 					<div v-if="!narrow && metadata.subtitle" class="subtitle">
 						{{ metadata.subtitle }}
 					</div>
 				</div>
 			</div>
 			<div ref="tabsEl" v-if="hasTabs" class="tabs">
-				<button v-for="tab in tabs" :ref="(el) => tabRefs[tab.key] = el" v-tooltip.noDelay="tab.title" class="tab _button" :class="{ active: tab.key != null && tab.key === props.tab }" @mousedown="(ev) => onTabMousedown(tab, ev)" @click="(ev) => onTabClick(tab, ev)">
+				<button
+					v-for="tab in tabs"
+					:ref="(el) => (tabRefs[tab.key] = el)"
+					v-tooltip.noDelay="tab.title"
+					class="tab _button"
+					:class="{
+						active: tab.key != null && tab.key === props.tab,
+					}"
+					@mousedown="(ev) => onTabMousedown(tab, ev)"
+					@click="(ev) => onTabClick(tab, ev)"
+				>
 					<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
 					<span class="title">{{ tab.title }}</span>
 				</button>
@@ -27,21 +81,39 @@
 		</template>
 		<div class="buttons right">
 			<template v-for="action in actions">
-				<button v-tooltip.noDelay="action.text" class="_button button" :class="{ highlighted: action.highlighted }" @click.stop="action.handler" @touchstart="preventDrag"><i :class="action.icon"></i></button>
+				<button
+					v-tooltip.noDelay="action.text"
+					class="_button button"
+					:class="{ highlighted: action.highlighted }"
+					@click.stop="action.handler"
+					@touchstart="preventDrag"
+				>
+					<i :class="action.icon"></i>
+				</button>
 			</template>
 		</div>
 	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref, inject, watch, shallowReactive, nextTick, reactive } from 'vue';
-import tinycolor from 'tinycolor2';
-import { popupMenu } from '@/os';
-import { scrollToTop } from '@/scripts/scroll';
-import { globalEvents } from '@/events';
-import { injectPageMetadata } from '@/scripts/page-metadata';
-import { $i, openAccountMenu as openAccountMenu_ } from '@/account';
-import { i18n } from '@/i18n';
+import {
+	computed,
+	onMounted,
+	onUnmounted,
+	ref,
+	inject,
+	watch,
+	shallowReactive,
+	nextTick,
+	reactive,
+} from "vue";
+import tinycolor from "tinycolor2";
+import { popupMenu } from "@/os";
+import { scrollToTop } from "@/scripts/scroll";
+import { globalEvents } from "@/events";
+import { injectPageMetadata } from "@/scripts/page-metadata";
+import { $i, openAccountMenu as openAccountMenu_ } from "@/account";
+import { i18n } from "@/i18n";
 
 type Tab = {
 	key?: string | null;
@@ -65,13 +137,13 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'update:tab', key: string);
+	(ev: "update:tab", key: string);
 }>();
 
 const metadata = injectPageMetadata();
 
-const hideTitle = inject('shouldOmitHeaderTitle', false);
-const thin_ = props.thin || inject('shouldHeaderThin', false);
+const hideTitle = inject("shouldOmitHeaderTitle", false);
+const thin_ = props.thin || inject("shouldHeaderThin", false);
 
 const el = $ref<HTMLElement | null>(null);
 const tabRefs = {};
@@ -87,9 +159,12 @@ const show = $computed(() => {
 });
 
 const openAccountMenu = (ev: MouseEvent) => {
-	openAccountMenu_({
-		withExtraOperation: true,
-	}, ev);
+	openAccountMenu_(
+		{
+			withExtraOperation: true,
+		},
+		ev
+	);
 };
 
 const showTabsPopup = (ev: MouseEvent) => {
@@ -97,7 +172,7 @@ const showTabsPopup = (ev: MouseEvent) => {
 	if (!narrow) return;
 	ev.preventDefault();
 	ev.stopPropagation();
-	const menu = props.tabs.map(tab => ({
+	const menu = props.tabs.map((tab) => ({
 		text: tab.title,
 		icon: tab.icon,
 		active: tab.key != null && tab.key === props.tab,
@@ -113,13 +188,13 @@ const preventDrag = (ev: TouchEvent) => {
 };
 
 const onClick = () => {
-	scrollToTop(el, { behavior: 'smooth' });
+	scrollToTop(el, { behavior: "smooth" });
 };
 
 function onTabMousedown(tab: Tab, ev: MouseEvent): void {
 	// ユーザビリティの観点からmousedown時にはonClickは呼ばない
 	if (tab.key) {
-		emit('update:tab', tab.key);
+		emit("update:tab", tab.key);
 	}
 }
 
@@ -130,7 +205,7 @@ function onTabClick(tab: Tab, ev: MouseEvent): void {
 		tab.onClick(ev);
 	}
 	if (tab.key) {
-		emit('update:tab', tab.key);
+		emit("update:tab", tab.key);
 	}
 }
 
@@ -139,8 +214,14 @@ function goBack(): void {
 }
 
 const calcBg = () => {
-	const rawBg = metadata?.bg || 'var(--bg)';
-	const tinyBg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);
+	const rawBg = metadata?.bg || "var(--bg)";
+	const tinyBg = tinycolor(
+		rawBg.startsWith("var(")
+			? getComputedStyle(document.documentElement).getPropertyValue(
+					rawBg.slice(4, -1)
+			  )
+			: rawBg
+	);
 	tinyBg.setAlpha(0.85);
 	bg.value = tinyBg.toRgbString();
 };
@@ -149,31 +230,39 @@ let ro: ResizeObserver | null;
 
 onMounted(() => {
 	calcBg();
-	globalEvents.on('themeChanged', calcBg);
+	globalEvents.on("themeChanged", calcBg);
 
-	watch(() => [props.tab, props.tabs], () => {
-		nextTick(() => {
-			const tabEl = tabRefs[props.tab];
-			if (tabEl && tabHighlightEl) {
-				// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
-				// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
-				const tabSizeX = tabEl.scrollWidth + 20; // + the tab's padding
-				tabEl.style = `--width: ${tabSizeX}px`;
-				setTimeout(() => {
-					const parentRect = tabsEl.getBoundingClientRect();
-					const rect = tabEl.getBoundingClientRect();
-					const left = (rect.left - parentRect.left + tabsEl?.scrollLeft);
-					tabHighlightEl.style.width = tabSizeX + 'px';
-					tabHighlightEl.style.transform = `translateX(${left}px)`;
-					window.requestAnimationFrame(() => {
-						tabsEl?.scrollTo({left: left - 60, behavior: "smooth"});
-					})
-				}, 200);
-			}
-		});
-	}, {
-		immediate: true,
-	});
+	watch(
+		() => [props.tab, props.tabs],
+		() => {
+			nextTick(() => {
+				const tabEl = tabRefs[props.tab];
+				if (tabEl && tabHighlightEl) {
+					// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
+					// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
+					const tabSizeX = tabEl.scrollWidth + 20; // + the tab's padding
+					tabEl.style = `--width: ${tabSizeX}px`;
+					setTimeout(() => {
+						const parentRect = tabsEl.getBoundingClientRect();
+						const rect = tabEl.getBoundingClientRect();
+						const left =
+							rect.left - parentRect.left + tabsEl?.scrollLeft;
+						tabHighlightEl.style.width = tabSizeX + "px";
+						tabHighlightEl.style.transform = `translateX(${left}px)`;
+						window.requestAnimationFrame(() => {
+							tabsEl?.scrollTo({
+								left: left - 60,
+								behavior: "smooth",
+							});
+						});
+					}, 200);
+				}
+			});
+		},
+		{
+			immediate: true,
+		}
+	);
 
 	if (el && el.parentElement) {
 		narrow = el.parentElement.offsetWidth < 500;
@@ -187,7 +276,7 @@ onMounted(() => {
 });
 
 onUnmounted(() => {
-	globalEvents.off('themeChanged', calcBg);
+	globalEvents.off("themeChanged", calcBg);
 	if (ro) ro.disconnect();
 });
 </script>
@@ -227,8 +316,18 @@ onUnmounted(() => {
 		}
 		> .tabs {
 			padding-inline: 12px;
-			mask: linear-gradient(to right, transparent, black 10px 80%, transparent);
-			-webkit-mask: linear-gradient(to right, transparent, black 10px 80%, transparent);
+			mask: linear-gradient(
+				to right,
+				transparent,
+				black 10px 80%,
+				transparent
+			);
+			-webkit-mask: linear-gradient(
+				to right,
+				transparent,
+				black 10px 80%,
+				transparent
+			);
 			margin-left: -10px;
 			padding-left: 22px;
 			scrollbar-width: none;
@@ -238,7 +337,8 @@ onUnmounted(() => {
 			&::-webkit-scrollbar {
 				display: none;
 			}
-			&::after { // Force right padding
+			&::after {
+				// Force right padding
 				content: "";
 				display: inline-block;
 				min-width: 20%;
@@ -393,7 +493,7 @@ onUnmounted(() => {
 			width: 38px;
 			--width: 38px;
 			overflow: hidden;
-			transition: color .2s, opacity .2s, width .2s;
+			transition: color 0.2s, opacity 0.2s, width 0.2s;
 
 			&:hover {
 				opacity: 1;
@@ -413,7 +513,7 @@ onUnmounted(() => {
 				margin-left: 8px;
 			}
 			> .title {
-				transition: opacity .2s;
+				transition: opacity 0.2s;
 			}
 		}
 
@@ -424,8 +524,8 @@ onUnmounted(() => {
 			height: 3px;
 			background: var(--accent);
 			border-radius: 999px;
-			transition: width .2s, transform .2s;
-			transition-timing-function: cubic-bezier(0,0,0,1.2);
+			transition: width 0.2s, transform 0.2s;
+			transition-timing-function: cubic-bezier(0, 0, 0, 1.2);
 			pointer-events: none;
 		}
 	}
diff --git a/packages/client/src/components/global/MkSpacer.vue b/packages/client/src/components/global/MkSpacer.vue
index 53adf0777..3dc93efdd 100644
--- a/packages/client/src/components/global/MkSpacer.vue
+++ b/packages/client/src/components/global/MkSpacer.vue
@@ -1,38 +1,44 @@
 <template>
-<div ref="root" :class="$style.root" :style="{ padding: margin + 'px' }">
-	<div ref="content" :class="$style.content">
-		<slot></slot>
+	<div ref="root" :class="$style.root" :style="{ padding: margin + 'px' }">
+		<div ref="content" :class="$style.content">
+			<slot></slot>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { inject, onMounted, onUnmounted, ref } from 'vue';
-import { deviceKind } from '@/scripts/device-kind';
+import { inject, onMounted, onUnmounted, ref } from "vue";
+import { deviceKind } from "@/scripts/device-kind";
 
-const props = withDefaults(defineProps<{
-	contentMax?: number | null;
-	marginMin?: number;
-	marginMax?: number;
-}>(), {
-	contentMax: null,
-	marginMin: 12,
-	marginMax: 24,
-});
+const props = withDefaults(
+	defineProps<{
+		contentMax?: number | null;
+		marginMin?: number;
+		marginMax?: number;
+	}>(),
+	{
+		contentMax: null,
+		marginMin: 12,
+		marginMax: 24,
+	}
+);
 
 let ro: ResizeObserver;
 let root = $ref<HTMLElement>();
 let content = $ref<HTMLElement>();
 let margin = $ref(0);
-const shouldSpacerMin = inject('shouldSpacerMin', false);
+const shouldSpacerMin = inject("shouldSpacerMin", false);
 
-const adjust = (rect: { width: number; height: number; }) => {
-	if (shouldSpacerMin || deviceKind === 'smartphone') {
+const adjust = (rect: { width: number; height: number }) => {
+	if (shouldSpacerMin || deviceKind === "smartphone") {
 		margin = props.marginMin;
 		return;
 	}
 
-	if (rect.width > (props.contentMax ?? 0) || (rect.width > 360 && window.innerWidth > 400)) {
+	if (
+		rect.width > (props.contentMax ?? 0) ||
+		(rect.width > 360 && window.innerWidth > 400)
+	) {
 		margin = props.marginMax;
 	} else {
 		margin = props.marginMin;
diff --git a/packages/client/src/components/global/MkStickyContainer.vue b/packages/client/src/components/global/MkStickyContainer.vue
index 44f4f065a..0818dd3ef 100644
--- a/packages/client/src/components/global/MkStickyContainer.vue
+++ b/packages/client/src/components/global/MkStickyContainer.vue
@@ -1,22 +1,22 @@
 <template>
-<div ref="rootEl">
-	<div ref="headerEl">
-		<slot name="header"></slot>
+	<div ref="rootEl">
+		<div ref="headerEl">
+			<slot name="header"></slot>
+		</div>
+		<div ref="bodyEl" :data-sticky-container-header-height="headerHeight">
+			<slot></slot>
+		</div>
 	</div>
-	<div ref="bodyEl" :data-sticky-container-header-height="headerHeight">
-		<slot></slot>
-	</div>
-</div>
 </template>
 
 <script lang="ts">
 // なんか動かない
 //const CURRENT_STICKY_TOP = Symbol('CURRENT_STICKY_TOP');
-const CURRENT_STICKY_TOP = 'CURRENT_STICKY_TOP';
+const CURRENT_STICKY_TOP = "CURRENT_STICKY_TOP";
 </script>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, provide, inject, Ref, ref, watch } from 'vue';
+import { onMounted, onUnmounted, provide, inject, Ref, ref, watch } from "vue";
 
 const rootEl = $ref<HTMLElement>();
 const headerEl = $ref<HTMLElement>();
@@ -43,15 +43,19 @@ onMounted(() => {
 
 	watch(parentStickyTop, calc);
 
-	watch($$(childStickyTop), () => {
-		bodyEl.style.setProperty('--stickyTop', `${childStickyTop}px`);
-	}, {
-		immediate: true,
-	});
+	watch(
+		$$(childStickyTop),
+		() => {
+			bodyEl.style.setProperty("--stickyTop", `${childStickyTop}px`);
+		},
+		{
+			immediate: true,
+		}
+	);
 
-	headerEl.style.position = 'sticky';
-	headerEl.style.top = 'var(--stickyTop, 0)';
-	headerEl.style.zIndex = '1000';
+	headerEl.style.position = "sticky";
+	headerEl.style.top = "var(--stickyTop, 0)";
+	headerEl.style.zIndex = "1000";
 
 	observer.observe(headerEl);
 });
@@ -61,6 +65,4 @@ onUnmounted(() => {
 });
 </script>
 
-<style lang="scss" module>
-
-</style>
+<style lang="scss" module></style>
diff --git a/packages/client/src/components/global/MkTime.vue b/packages/client/src/components/global/MkTime.vue
index f72b153f5..66a6416e8 100644
--- a/packages/client/src/components/global/MkTime.vue
+++ b/packages/client/src/components/global/MkTime.vue
@@ -1,38 +1,51 @@
 <template>
-<time :title="absolute">
-	<template v-if="mode === 'relative'">{{ relative }}</template>
-	<template v-else-if="mode === 'absolute'">{{ absolute }}</template>
-	<template v-else-if="mode === 'detail'">{{ absolute }} ({{ relative }})</template>
-</time>
+	<time :title="absolute">
+		<template v-if="mode === 'relative'">{{ relative }}</template>
+		<template v-else-if="mode === 'absolute'">{{ absolute }}</template>
+		<template v-else-if="mode === 'detail'"
+			>{{ absolute }} ({{ relative }})</template
+		>
+	</time>
 </template>
 
 <script lang="ts" setup>
-import { onUnmounted } from 'vue';
-import { i18n } from '@/i18n';
+import { onUnmounted } from "vue";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	time: Date | string;
-	mode?: 'relative' | 'absolute' | 'detail';
-}>(), {
-	mode: 'relative',
-});
+const props = withDefaults(
+	defineProps<{
+		time: Date | string;
+		mode?: "relative" | "absolute" | "detail";
+	}>(),
+	{
+		mode: "relative",
+	}
+);
 
-const _time = typeof props.time === 'string' ? new Date(props.time) : props.time;
+const _time =
+	typeof props.time === "string" ? new Date(props.time) : props.time;
 const absolute = _time.toLocaleString();
 
 let now = $shallowRef(new Date());
 const relative = $computed(() => {
-	const ago = (now.getTime() - _time.getTime()) / 1000/*ms*/;
-	return (
-		ago >= 31536000 ? i18n.t('_ago.yearsAgo', { n: Math.round(ago / 31536000).toString() }) :
-		ago >= 2592000 ? i18n.t('_ago.monthsAgo', { n: Math.round(ago / 2592000).toString() }) :
-		ago >= 604800 ? i18n.t('_ago.weeksAgo', { n: Math.round(ago / 604800).toString() }) :
-		ago >= 86400 ? i18n.t('_ago.daysAgo', { n: Math.round(ago / 86400).toString() }) :
-		ago >= 3600 ? i18n.t('_ago.hoursAgo', { n: Math.round(ago / 3600).toString() }) :
-		ago >= 60 ? i18n.t('_ago.minutesAgo', { n: (~~(ago / 60)).toString() }) :
-		ago >= 10 ? i18n.t('_ago.secondsAgo', { n: (~~(ago % 60)).toString() }) :
-		ago >= -1 ? i18n.ts._ago.justNow :
-		i18n.ts._ago.future);
+	const ago = (now.getTime() - _time.getTime()) / 1000; /*ms*/
+	return ago >= 31536000
+		? i18n.t("_ago.yearsAgo", { n: Math.round(ago / 31536000).toString() })
+		: ago >= 2592000
+		? i18n.t("_ago.monthsAgo", { n: Math.round(ago / 2592000).toString() })
+		: ago >= 604800
+		? i18n.t("_ago.weeksAgo", { n: Math.round(ago / 604800).toString() })
+		: ago >= 86400
+		? i18n.t("_ago.daysAgo", { n: Math.round(ago / 86400).toString() })
+		: ago >= 3600
+		? i18n.t("_ago.hoursAgo", { n: Math.round(ago / 3600).toString() })
+		: ago >= 60
+		? i18n.t("_ago.minutesAgo", { n: (~~(ago / 60)).toString() })
+		: ago >= 10
+		? i18n.t("_ago.secondsAgo", { n: (~~(ago % 60)).toString() })
+		: ago >= -1
+		? i18n.ts._ago.justNow
+		: i18n.ts._ago.future;
 });
 
 function tick() {
@@ -46,7 +59,7 @@ function tick() {
 
 let tickId: number;
 
-if (props.mode === 'relative' || props.mode === 'detail') {
+if (props.mode === "relative" || props.mode === "detail") {
 	tickId = window.requestAnimationFrame(tick);
 
 	onUnmounted(() => {
diff --git a/packages/client/src/components/global/MkUrl.vue b/packages/client/src/components/global/MkUrl.vue
index 1fe4b0269..787119104 100644
--- a/packages/client/src/components/global/MkUrl.vue
+++ b/packages/client/src/components/global/MkUrl.vue
@@ -1,30 +1,41 @@
 <template>
-<component
-	:is="self ? 'MkA' : 'a'" ref="el" class="ieqqeuvs _link" :[attr]="self ? url.substr(local.length) : url" :rel="rel" :target="target"
-	@contextmenu.stop="() => {}" @click.stop
->
-	<template v-if="!self">
-		<span class="schema">{{ schema }}//</span>
-		<span class="hostname">{{ hostname }}</span>
-		<span v-if="port != ''" class="port">:{{ port }}</span>
-	</template>
-	<template v-if="pathname === '/' && self">
-		<span class="self">{{ hostname }}</span>
-	</template>
-	<span v-if="pathname != ''" class="pathname">{{ self ? pathname.substr(1) : pathname }}</span>
-	<span class="query">{{ query }}</span>
-	<span class="hash">{{ hash }}</span>
-	<i v-if="target === '_blank'" class="ph-arrow-square-out ph-bold ph-lg icon"></i>
-</component>
+	<component
+		:is="self ? 'MkA' : 'a'"
+		ref="el"
+		class="ieqqeuvs _link"
+		:[attr]="self ? url.substr(local.length) : url"
+		:rel="rel"
+		:target="target"
+		@contextmenu.stop="() => {}"
+		@click.stop
+	>
+		<template v-if="!self">
+			<span class="schema">{{ schema }}//</span>
+			<span class="hostname">{{ hostname }}</span>
+			<span v-if="port != ''" class="port">:{{ port }}</span>
+		</template>
+		<template v-if="pathname === '/' && self">
+			<span class="self">{{ hostname }}</span>
+		</template>
+		<span v-if="pathname != ''" class="pathname">{{
+			self ? pathname.substr(1) : pathname
+		}}</span>
+		<span class="query">{{ query }}</span>
+		<span class="hash">{{ hash }}</span>
+		<i
+			v-if="target === '_blank'"
+			class="ph-arrow-square-out ph-bold ph-lg icon"
+		></i>
+	</component>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, ref } from 'vue';
-import { toUnicode as decodePunycode } from 'punycode/';
-import { url as local } from '@/config';
-import * as os from '@/os';
-import { useTooltip } from '@/scripts/use-tooltip';
-import { safeURIDecode } from '@/scripts/safe-uri-decode';
+import { defineAsyncComponent, ref } from "vue";
+import { toUnicode as decodePunycode } from "punycode/";
+import { url as local } from "@/config";
+import * as os from "@/os";
+import { useTooltip } from "@/scripts/use-tooltip";
+import { safeURIDecode } from "@/scripts/safe-uri-decode";
 
 const props = defineProps<{
 	url: string;
@@ -33,15 +44,22 @@ const props = defineProps<{
 
 const self = props.url.startsWith(local);
 const url = new URL(props.url);
-if (!['http:', 'https:'].includes(url.protocol)) throw new Error('invalid url');
+if (!["http:", "https:"].includes(url.protocol)) throw new Error("invalid url");
 const el = ref();
 
 useTooltip(el, (showing) => {
-	os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
-		showing,
-		url: props.url,
-		source: el.value,
-	}, {}, 'closed');
+	os.popup(
+		defineAsyncComponent(
+			() => import("@/components/MkUrlPreviewPopup.vue")
+		),
+		{
+			showing,
+			url: props.url,
+			source: el.value,
+		},
+		{},
+		"closed"
+	);
 });
 
 const schema = url.protocol;
@@ -50,8 +68,8 @@ const port = url.port;
 const pathname = safeURIDecode(url.pathname);
 const query = safeURIDecode(url.search);
 const hash = safeURIDecode(url.hash);
-const attr = self ? 'to' : 'href';
-const target = self ? null : '_blank';
+const attr = self ? "to" : "href";
+const target = self ? null : "_blank";
 </script>
 
 <style lang="scss" scoped>
@@ -60,7 +78,7 @@ const target = self ? null : '_blank';
 
 	> .icon {
 		padding-left: 2px;
-		font-size: .9em;
+		font-size: 0.9em;
 	}
 
 	> .self {
diff --git a/packages/client/src/components/global/MkUserName.vue b/packages/client/src/components/global/MkUserName.vue
index 4dfa91b18..a79add3c2 100644
--- a/packages/client/src/components/global/MkUserName.vue
+++ b/packages/client/src/components/global/MkUserName.vue
@@ -1,17 +1,26 @@
 <template>
-<Mfm :class="$style.root" :text="user.name || user.username" :plain="true" :nowrap="nowrap" :custom-emojis="user.emojis"/>
+	<Mfm
+		:class="$style.root"
+		:text="user.name || user.username"
+		:plain="true"
+		:nowrap="nowrap"
+		:custom-emojis="user.emojis"
+	/>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as misskey from 'calckey-js';
+import {} from "vue";
+import * as misskey from "calckey-js";
 
-const props = withDefaults(defineProps<{
-	user: misskey.entities.User;
-	nowrap?: boolean;
-}>(), {
-	nowrap: true,
-});
+const props = withDefaults(
+	defineProps<{
+		user: misskey.entities.User;
+		nowrap?: boolean;
+	}>(),
+	{
+		nowrap: true,
+	}
+);
 </script>
 
 <style lang="scss" module>
diff --git a/packages/client/src/components/global/RouterView.vue b/packages/client/src/components/global/RouterView.vue
index e21a57471..8423ce773 100644
--- a/packages/client/src/components/global/RouterView.vue
+++ b/packages/client/src/components/global/RouterView.vue
@@ -1,32 +1,44 @@
 <template>
-<KeepAlive :max="defaultStore.state.numberOfPageCache">
-	<Suspense>
-		<component :is="currentPageComponent" :key="key" v-bind="Object.fromEntries(currentPageProps)"/>
+	<KeepAlive :max="defaultStore.state.numberOfPageCache">
+		<Suspense>
+			<component
+				:is="currentPageComponent"
+				:key="key"
+				v-bind="Object.fromEntries(currentPageProps)"
+			/>
 
-		<template #fallback>
-			<MkLoading/>
-		</template>
-	</Suspense>
-</KeepAlive>
+			<template #fallback>
+				<MkLoading />
+			</template>
+		</Suspense>
+	</KeepAlive>
 </template>
 
 <script lang="ts" setup>
-import { inject, nextTick, onBeforeUnmount, onMounted, onUnmounted, provide, watch } from 'vue';
-import { Resolved, Router } from '@/nirax';
-import { defaultStore } from '@/store';
+import {
+	inject,
+	nextTick,
+	onBeforeUnmount,
+	onMounted,
+	onUnmounted,
+	provide,
+	watch,
+} from "vue";
+import { Resolved, Router } from "@/nirax";
+import { defaultStore } from "@/store";
 
 const props = defineProps<{
 	router?: Router;
 }>();
 
-const router = props.router ?? inject('router');
+const router = props.router ?? inject("router");
 
 if (router == null) {
-	throw new Error('no router provided');
+	throw new Error("no router provided");
 }
 
-const currentDepth = inject('routerCurrentDepth', 0);
-provide('routerCurrentDepth', currentDepth + 1);
+const currentDepth = inject("routerCurrentDepth", 0);
+provide("routerCurrentDepth", currentDepth + 1);
 
 function resolveNested(current: Resolved, d = 0): Resolved | null {
 	if (d === currentDepth) {
@@ -43,19 +55,22 @@ function resolveNested(current: Resolved, d = 0): Resolved | null {
 const current = resolveNested(router.current)!;
 let currentPageComponent = $shallowRef(current.route.component);
 let currentPageProps = $ref(current.props);
-let key = $ref(current.route.path + JSON.stringify(Object.fromEntries(current.props)));
+let key = $ref(
+	current.route.path + JSON.stringify(Object.fromEntries(current.props))
+);
 
 function onChange({ resolved, key: newKey }) {
 	const current = resolveNested(resolved);
 	if (current == null) return;
 	currentPageComponent = current.route.component;
 	currentPageProps = current.props;
-	key = current.route.path + JSON.stringify(Object.fromEntries(current.props));
+	key =
+		current.route.path + JSON.stringify(Object.fromEntries(current.props));
 }
 
-router.addListener('change', onChange);
+router.addListener("change", onChange);
 
 onBeforeUnmount(() => {
-	router.removeListener('change', onChange);
+	router.removeListener("change", onChange);
 });
 </script>
diff --git a/packages/client/src/components/page/page.block.vue b/packages/client/src/components/page/page.block.vue
index d7984afac..edeb33a14 100644
--- a/packages/client/src/components/page/page.block.vue
+++ b/packages/client/src/components/page/page.block.vue
@@ -1,44 +1,64 @@
 <template>
-<component :is="'x-' + block.type" :key="block.id" :block="block" :hpml="hpml" :h="h"/>
+	<component
+		:is="'x-' + block.type"
+		:key="block.id"
+		:block="block"
+		:hpml="hpml"
+		:h="h"
+	/>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from 'vue';
-import XText from './page.text.vue';
-import XSection from './page.section.vue';
-import XImage from './page.image.vue';
-import XButton from './page.button.vue';
-import XNumberInput from './page.number-input.vue';
-import XTextInput from './page.text-input.vue';
-import XTextareaInput from './page.textarea-input.vue';
-import XSwitch from './page.switch.vue';
-import XIf from './page.if.vue';
-import XTextarea from './page.textarea.vue';
-import XPost from './page.post.vue';
-import XCounter from './page.counter.vue';
-import XRadioButton from './page.radio-button.vue';
-import XCanvas from './page.canvas.vue';
-import XNote from './page.note.vue';
-import { Hpml } from '@/scripts/hpml/evaluator';
-import { Block } from '@/scripts/hpml/block';
+import { defineComponent, PropType } from "vue";
+import XText from "./page.text.vue";
+import XSection from "./page.section.vue";
+import XImage from "./page.image.vue";
+import XButton from "./page.button.vue";
+import XNumberInput from "./page.number-input.vue";
+import XTextInput from "./page.text-input.vue";
+import XTextareaInput from "./page.textarea-input.vue";
+import XSwitch from "./page.switch.vue";
+import XIf from "./page.if.vue";
+import XTextarea from "./page.textarea.vue";
+import XPost from "./page.post.vue";
+import XCounter from "./page.counter.vue";
+import XRadioButton from "./page.radio-button.vue";
+import XCanvas from "./page.canvas.vue";
+import XNote from "./page.note.vue";
+import { Hpml } from "@/scripts/hpml/evaluator";
+import { Block } from "@/scripts/hpml/block";
 
 export default defineComponent({
 	components: {
-		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter, XRadioButton, XCanvas, XNote
+		XText,
+		XSection,
+		XImage,
+		XButton,
+		XNumberInput,
+		XTextInput,
+		XTextareaInput,
+		XTextarea,
+		XPost,
+		XSwitch,
+		XIf,
+		XCounter,
+		XRadioButton,
+		XCanvas,
+		XNote,
 	},
 	props: {
 		block: {
 			type: Object as PropType<Block>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
+			required: true,
 		},
 		h: {
 			type: Number,
-			required: true
-		}
+			required: true,
+		},
 	},
 });
 </script>
diff --git a/packages/client/src/components/page/page.button.vue b/packages/client/src/components/page/page.button.vue
index e8878df8d..b3c42eb60 100644
--- a/packages/client/src/components/page/page.button.vue
+++ b/packages/client/src/components/page/page.button.vue
@@ -1,58 +1,62 @@
 <template>
-<div>
-	<MkButton class="kudkigyw" :primary="block.primary" @click="click()">{{ hpml.interpolate(block.text) }}</MkButton>
-</div>
+	<div>
+		<MkButton class="kudkigyw" :primary="block.primary" @click="click()">{{
+			hpml.interpolate(block.text)
+		}}</MkButton>
+	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, unref } from 'vue';
-import MkButton from '../MkButton.vue';
-import * as os from '@/os';
-import { ButtonBlock } from '@/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { defineComponent, PropType, unref } from "vue";
+import MkButton from "../MkButton.vue";
+import * as os from "@/os";
+import { ButtonBlock } from "@/scripts/hpml/block";
+import { Hpml } from "@/scripts/hpml/evaluator";
 
 export default defineComponent({
 	components: {
-		MkButton
+		MkButton,
 	},
 	props: {
 		block: {
 			type: Object as PropType<ButtonBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
-		}
+			required: true,
+		},
 	},
 	methods: {
 		click() {
-			if (this.block.action === 'dialog') {
+			if (this.block.action === "dialog") {
 				this.hpml.eval();
 				os.alert({
-					text: this.hpml.interpolate(this.block.content)
+					text: this.hpml.interpolate(this.block.content),
 				});
-			} else if (this.block.action === 'resetRandom') {
+			} else if (this.block.action === "resetRandom") {
 				this.hpml.updateRandomSeed(Math.random());
 				this.hpml.eval();
-			} else if (this.block.action === 'pushEvent') {
-				os.api('page-push', {
+			} else if (this.block.action === "pushEvent") {
+				os.api("page-push", {
 					pageId: this.hpml.page.id,
 					event: this.block.event,
-					...(this.block.var ? {
-						var: unref(this.hpml.vars)[this.block.var]
-					} : {})
+					...(this.block.var
+						? {
+								var: unref(this.hpml.vars)[this.block.var],
+						  }
+						: {}),
 				});
 
 				os.alert({
-					type: 'success',
-					text: this.hpml.interpolate(this.block.message)
+					type: "success",
+					text: this.hpml.interpolate(this.block.message),
 				});
-			} else if (this.block.action === 'callAiScript') {
+			} else if (this.block.action === "callAiScript") {
 				this.hpml.callAiScript(this.block.fn);
 			}
-		}
-	}
+		},
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/page/page.canvas.vue b/packages/client/src/components/page/page.canvas.vue
index 8f49b88e5..1ed96e2ac 100644
--- a/packages/client/src/components/page/page.canvas.vue
+++ b/packages/client/src/components/page/page.canvas.vue
@@ -1,25 +1,25 @@
 <template>
-<div class="ysrxegms">
-	<canvas ref="canvas" :width="block.width" :height="block.height"/>
-</div>
+	<div class="ysrxegms">
+		<canvas ref="canvas" :width="block.width" :height="block.height" />
+	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, PropType, Ref, ref } from 'vue';
-import * as os from '@/os';
-import { CanvasBlock } from '@/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { defineComponent, onMounted, PropType, Ref, ref } from "vue";
+import * as os from "@/os";
+import { CanvasBlock } from "@/scripts/hpml/block";
+import { Hpml } from "@/scripts/hpml/evaluator";
 
 export default defineComponent({
 	props: {
 		block: {
 			type: Object as PropType<CanvasBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
-		}
+			required: true,
+		},
 	},
 	setup(props, ctx) {
 		const canvas: Ref<any> = ref(null);
@@ -29,9 +29,9 @@ export default defineComponent({
 		});
 
 		return {
-			canvas
+			canvas,
 		};
-	}
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/page/page.counter.vue b/packages/client/src/components/page/page.counter.vue
index 6eeef7143..9ee49fe4e 100644
--- a/packages/client/src/components/page/page.counter.vue
+++ b/packages/client/src/components/page/page.counter.vue
@@ -1,29 +1,31 @@
 <template>
-<div>
-	<MkButton class="llumlmnx" @click="click()">{{ hpml.interpolate(block.text) }}</MkButton>
-</div>
+	<div>
+		<MkButton class="llumlmnx" @click="click()">{{
+			hpml.interpolate(block.text)
+		}}</MkButton>
+	</div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType } from 'vue';
-import MkButton from '../MkButton.vue';
-import * as os from '@/os';
-import { CounterVarBlock } from '@/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { computed, defineComponent, PropType } from "vue";
+import MkButton from "../MkButton.vue";
+import * as os from "@/os";
+import { CounterVarBlock } from "@/scripts/hpml/block";
+import { Hpml } from "@/scripts/hpml/evaluator";
 
 export default defineComponent({
 	components: {
-		MkButton
+		MkButton,
 	},
 	props: {
 		block: {
 			type: Object as PropType<CounterVarBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
-		}
+			required: true,
+		},
 	},
 	setup(props, ctx) {
 		const value = computed(() => {
@@ -31,14 +33,17 @@ export default defineComponent({
 		});
 
 		function click() {
-			props.hpml.updatePageVar(props.block.name, value.value + (props.block.inc || 1));
+			props.hpml.updatePageVar(
+				props.block.name,
+				value.value + (props.block.inc || 1)
+			);
 			props.hpml.eval();
 		}
 
 		return {
-			click
+			click,
 		};
-	}
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/page/page.if.vue b/packages/client/src/components/page/page.if.vue
index 6dc7a429a..7cc25f212 100644
--- a/packages/client/src/components/page/page.if.vue
+++ b/packages/client/src/components/page/page.if.vue
@@ -1,31 +1,37 @@
 <template>
-<div v-show="hpml.vars.value[block.var]">
-	<XBlock v-for="child in block.children" :key="child.id" :block="child" :hpml="hpml" :h="h"/>
-</div>
+	<div v-show="hpml.vars.value[block.var]">
+		<XBlock
+			v-for="child in block.children"
+			:key="child.id"
+			:block="child"
+			:hpml="hpml"
+			:h="h"
+		/>
+	</div>
 </template>
 
 <script lang="ts">
-import { IfBlock } from '@/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
-import { defineComponent, defineAsyncComponent, PropType } from 'vue';
+import { IfBlock } from "@/scripts/hpml/block";
+import { Hpml } from "@/scripts/hpml/evaluator";
+import { defineComponent, defineAsyncComponent, PropType } from "vue";
 
 export default defineComponent({
 	components: {
-		XBlock: defineAsyncComponent(() => import('./page.block.vue'))
+		XBlock: defineAsyncComponent(() => import("./page.block.vue")),
 	},
 	props: {
 		block: {
 			type: Object as PropType<IfBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
+			required: true,
 		},
 		h: {
 			type: Number,
-			required: true
-		}
+			required: true,
+		},
 	},
 });
 </script>
diff --git a/packages/client/src/components/page/page.image.vue b/packages/client/src/components/page/page.image.vue
index 8ba70c585..0b82975d9 100644
--- a/packages/client/src/components/page/page.image.vue
+++ b/packages/client/src/components/page/page.image.vue
@@ -1,22 +1,31 @@
 <template>
-<div class="lzyxtsnt">
-	<ImgWithBlurhash v-if="image" :hash="image.blurhash" :src="image.url" :alt="image.comment" :title="image.comment" :cover="false"/>
-</div>
+	<div class="lzyxtsnt">
+		<ImgWithBlurhash
+			v-if="image"
+			:hash="image.blurhash"
+			:src="image.url"
+			:alt="image.comment"
+			:title="image.comment"
+			:cover="false"
+		/>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { defineComponent, PropType } from 'vue';
-import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
-import * as os from '@/os';
-import { ImageBlock } from '@/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { defineComponent, PropType } from "vue";
+import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
+import * as os from "@/os";
+import { ImageBlock } from "@/scripts/hpml/block";
+import { Hpml } from "@/scripts/hpml/evaluator";
 
 const props = defineProps<{
-	block: PropType<ImageBlock>,
-	hpml: PropType<Hpml>,
+	block: PropType<ImageBlock>;
+	hpml: PropType<Hpml>;
 }>();
 
-const image = props.hpml.page.attachedFiles.find(x => x.id === props.block.fileId);
+const image = props.hpml.page.attachedFiles.find(
+	(x) => x.id === props.block.fileId
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/page/page.note.vue b/packages/client/src/components/page/page.note.vue
index 431f0b08d..9e10d0f63 100644
--- a/packages/client/src/components/page/page.note.vue
+++ b/packages/client/src/components/page/page.note.vue
@@ -1,16 +1,24 @@
 <template>
-<div class="voxdxuby">
-	<XNote v-if="note && !block.detailed" :key="note.id + ':normal'" v-model:note="note"/>
-	<XNoteDetailed v-if="note && block.detailed" :key="note.id + ':detail'" v-model:note="note"/>
-</div>
+	<div class="voxdxuby">
+		<XNote
+			v-if="note && !block.detailed"
+			:key="note.id + ':normal'"
+			v-model:note="note"
+		/>
+		<XNoteDetailed
+			v-if="note && block.detailed"
+			:key="note.id + ':detail'"
+			v-model:note="note"
+		/>
+	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, PropType, Ref, ref } from 'vue';
-import XNote from '@/components/MkNote.vue';
-import XNoteDetailed from '@/components/MkNoteDetailed.vue';
-import * as os from '@/os';
-import { NoteBlock } from '@/scripts/hpml/block';
+import { defineComponent, onMounted, PropType, Ref, ref } from "vue";
+import XNote from "@/components/MkNote.vue";
+import XNoteDetailed from "@/components/MkNoteDetailed.vue";
+import * as os from "@/os";
+import { NoteBlock } from "@/scripts/hpml/block";
 
 export default defineComponent({
 	components: {
@@ -20,23 +28,24 @@ export default defineComponent({
 	props: {
 		block: {
 			type: Object as PropType<NoteBlock>,
-			required: true
-		}
+			required: true,
+		},
 	},
 	setup(props, ctx) {
 		const note: Ref<Record<string, any> | null> = ref(null);
 
 		onMounted(() => {
-			os.api('notes/show', { noteId: props.block.note })
-			.then(result => {
-				note.value = result;
-			});
+			os.api("notes/show", { noteId: props.block.note }).then(
+				(result) => {
+					note.value = result;
+				}
+			);
 		});
 
 		return {
-			note
+			note,
 		};
-	}
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/page/page.number-input.vue b/packages/client/src/components/page/page.number-input.vue
index 47ff2a017..3426cf667 100644
--- a/packages/client/src/components/page/page.number-input.vue
+++ b/packages/client/src/components/page/page.number-input.vue
@@ -1,31 +1,36 @@
 <template>
-<div>
-	<MkInput class="kudkigyw" :model-value="value" type="number" @update:modelValue="updateValue($event)">
-		<template #label>{{ hpml.interpolate(block.text) }}</template>
-	</MkInput>
-</div>
+	<div>
+		<MkInput
+			class="kudkigyw"
+			:model-value="value"
+			type="number"
+			@update:modelValue="updateValue($event)"
+		>
+			<template #label>{{ hpml.interpolate(block.text) }}</template>
+		</MkInput>
+	</div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType } from 'vue';
-import MkInput from '../form/input.vue';
-import * as os from '@/os';
-import { Hpml } from '@/scripts/hpml/evaluator';
-import { NumberInputVarBlock } from '@/scripts/hpml/block';
+import { computed, defineComponent, PropType } from "vue";
+import MkInput from "../form/input.vue";
+import * as os from "@/os";
+import { Hpml } from "@/scripts/hpml/evaluator";
+import { NumberInputVarBlock } from "@/scripts/hpml/block";
 
 export default defineComponent({
 	components: {
-		MkInput
+		MkInput,
 	},
 	props: {
 		block: {
 			type: Object as PropType<NumberInputVarBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
-		}
+			required: true,
+		},
 	},
 	setup(props, ctx) {
 		const value = computed(() => {
@@ -39,9 +44,9 @@ export default defineComponent({
 
 		return {
 			value,
-			updateValue
+			updateValue,
 		};
-	}
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/page/page.post.vue b/packages/client/src/components/page/page.post.vue
index 7ab9092bd..ee30da1f0 100644
--- a/packages/client/src/components/page/page.post.vue
+++ b/packages/client/src/components/page/page.post.vue
@@ -1,21 +1,26 @@
 <template>
-<div class="ngbfujlo">
-	<MkTextarea :model-value="text" readonly style="margin: 0;"></MkTextarea>
-	<MkButton class="button" primary :disabled="posting || posted" @click="post()">
-		<i v-if="posted" class="ph-check ph-bold ph-lg"></i>
-		<i v-else class="ph-paper-plane-tilt ph-bold ph-lg"></i>
-	</MkButton>
-</div>
+	<div class="ngbfujlo">
+		<MkTextarea :model-value="text" readonly style="margin: 0"></MkTextarea>
+		<MkButton
+			class="button"
+			primary
+			:disabled="posting || posted"
+			@click="post()"
+		>
+			<i v-if="posted" class="ph-check ph-bold ph-lg"></i>
+			<i v-else class="ph-paper-plane-tilt ph-bold ph-lg"></i>
+		</MkButton>
+	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from 'vue';
-import MkTextarea from '../form/textarea.vue';
-import MkButton from '../MkButton.vue';
-import { apiUrl } from '@/config';
-import * as os from '@/os';
-import { PostBlock } from '@/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { defineComponent, PropType } from "vue";
+import MkTextarea from "../form/textarea.vue";
+import MkButton from "../MkButton.vue";
+import { apiUrl } from "@/config";
+import * as os from "@/os";
+import { PostBlock } from "@/scripts/hpml/block";
+import { Hpml } from "@/scripts/hpml/evaluator";
 
 export default defineComponent({
 	components: {
@@ -25,12 +30,12 @@ export default defineComponent({
 	props: {
 		block: {
 			type: Object as PropType<PostBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
-		}
+			required: true,
+		},
 	},
 	data() {
 		return {
@@ -40,35 +45,38 @@ export default defineComponent({
 		};
 	},
 	watch: {
-		'hpml.vars': {
+		"hpml.vars": {
 			handler() {
 				this.text = this.hpml.interpolate(this.block.text);
 			},
-			deep: true
-		}
+			deep: true,
+		},
 	},
 	methods: {
 		upload() {
 			const promise = new Promise((ok) => {
 				const canvas = this.hpml.canvases[this.block.canvasId];
-				canvas.toBlob(blob => {
+				canvas.toBlob((blob) => {
 					const formData = new FormData();
-					formData.append('file', blob);
+					formData.append("file", blob);
 					if (this.$store.state.uploadFolder) {
-						formData.append('folderId', this.$store.state.uploadFolder);
+						formData.append(
+							"folderId",
+							this.$store.state.uploadFolder
+						);
 					}
 
-					fetch(apiUrl + '/drive/files/create', {
-						method: 'POST',
+					fetch(apiUrl + "/drive/files/create", {
+						method: "POST",
 						body: formData,
 						headers: {
 							authorization: `Bearer ${this.$i.token}`,
 						},
 					})
-					.then(response => response.json())
-					.then(f => {
-						ok(f);
-					});
+						.then((response) => response.json())
+						.then((f) => {
+							ok(f);
+						});
 				});
 			});
 			os.promiseDialog(promise);
@@ -76,15 +84,17 @@ export default defineComponent({
 		},
 		async post() {
 			this.posting = true;
-			const file = this.block.attachCanvasImage ? await this.upload() : null;
-			os.apiWithDialog('notes/create', {
-				text: this.text === '' ? null : this.text,
+			const file = this.block.attachCanvasImage
+				? await this.upload()
+				: null;
+			os.apiWithDialog("notes/create", {
+				text: this.text === "" ? null : this.text,
 				fileIds: file ? [file.id] : undefined,
 			}).then(() => {
 				this.posted = true;
 			});
-		}
-	}
+		},
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/page/page.radio-button.vue b/packages/client/src/components/page/page.radio-button.vue
index 5a726da22..3d3878e4f 100644
--- a/packages/client/src/components/page/page.radio-button.vue
+++ b/packages/client/src/components/page/page.radio-button.vue
@@ -1,30 +1,37 @@
 <template>
-<div>
-	<div>{{ hpml.interpolate(block.title) }}</div>
-	<MkRadio v-for="item in block.values" :key="item" :modelValue="value" :value="item" @update:modelValue="updateValue($event)">{{ item }}</MkRadio>
-</div>
+	<div>
+		<div>{{ hpml.interpolate(block.title) }}</div>
+		<MkRadio
+			v-for="item in block.values"
+			:key="item"
+			:modelValue="value"
+			:value="item"
+			@update:modelValue="updateValue($event)"
+			>{{ item }}</MkRadio
+		>
+	</div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType } from 'vue';
-import MkRadio from '../form/radio.vue';
-import * as os from '@/os';
-import { Hpml } from '@/scripts/hpml/evaluator';
-import { RadioButtonVarBlock } from '@/scripts/hpml/block';
+import { computed, defineComponent, PropType } from "vue";
+import MkRadio from "../form/radio.vue";
+import * as os from "@/os";
+import { Hpml } from "@/scripts/hpml/evaluator";
+import { RadioButtonVarBlock } from "@/scripts/hpml/block";
 
 export default defineComponent({
 	components: {
-		MkRadio
+		MkRadio,
 	},
 	props: {
 		block: {
 			type: Object as PropType<RadioButtonVarBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
-		}
+			required: true,
+		},
 	},
 	setup(props, ctx) {
 		const value = computed(() => {
@@ -38,8 +45,8 @@ export default defineComponent({
 
 		return {
 			value,
-			updateValue
+			updateValue,
 		};
-	}
+	},
 });
 </script>
diff --git a/packages/client/src/components/page/page.section.vue b/packages/client/src/components/page/page.section.vue
index a2cd66283..04de165f1 100644
--- a/packages/client/src/components/page/page.section.vue
+++ b/packages/client/src/components/page/page.section.vue
@@ -1,35 +1,41 @@
 <template>
-<section class="sdgxphyu">
-	<component :is="'h' + h">{{ block.title }}</component>
+	<section class="sdgxphyu">
+		<component :is="'h' + h">{{ block.title }}</component>
 
-	<div class="children">
-		<XBlock v-for="child in block.children" :key="child.id" :block="child" :hpml="hpml" :h="h + 1"/>
-	</div>
-</section>
+		<div class="children">
+			<XBlock
+				v-for="child in block.children"
+				:key="child.id"
+				:block="child"
+				:hpml="hpml"
+				:h="h + 1"
+			/>
+		</div>
+	</section>
 </template>
 
 <script lang="ts">
-import { defineComponent, defineAsyncComponent, PropType } from 'vue';
-import * as os from '@/os';
-import { SectionBlock } from '@/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { defineComponent, defineAsyncComponent, PropType } from "vue";
+import * as os from "@/os";
+import { SectionBlock } from "@/scripts/hpml/block";
+import { Hpml } from "@/scripts/hpml/evaluator";
 
 export default defineComponent({
 	components: {
-		XBlock: defineAsyncComponent(() => import('./page.block.vue'))
+		XBlock: defineAsyncComponent(() => import("./page.block.vue")),
 	},
 	props: {
 		block: {
 			type: Object as PropType<SectionBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
+			required: true,
 		},
 		h: {
-			required: true
-		}
+			required: true,
+		},
 	},
 });
 </script>
diff --git a/packages/client/src/components/page/page.switch.vue b/packages/client/src/components/page/page.switch.vue
index 1ece88157..7a00694e0 100644
--- a/packages/client/src/components/page/page.switch.vue
+++ b/packages/client/src/components/page/page.switch.vue
@@ -1,29 +1,33 @@
 <template>
-<div class="hkcxmtwj">
-	<MkSwitch :model-value="value" @update:modelValue="updateValue($event)">{{ hpml.interpolate(block.text) }}</MkSwitch>
-</div>
+	<div class="hkcxmtwj">
+		<MkSwitch
+			:model-value="value"
+			@update:modelValue="updateValue($event)"
+			>{{ hpml.interpolate(block.text) }}</MkSwitch
+		>
+	</div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType } from 'vue';
-import MkSwitch from '../form/switch.vue';
-import * as os from '@/os';
-import { Hpml } from '@/scripts/hpml/evaluator';
-import { SwitchVarBlock } from '@/scripts/hpml/block';
+import { computed, defineComponent, PropType } from "vue";
+import MkSwitch from "../form/switch.vue";
+import * as os from "@/os";
+import { Hpml } from "@/scripts/hpml/evaluator";
+import { SwitchVarBlock } from "@/scripts/hpml/block";
 
 export default defineComponent({
 	components: {
-		MkSwitch
+		MkSwitch,
 	},
 	props: {
 		block: {
 			type: Object as PropType<SwitchVarBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
-		}
+			required: true,
+		},
 	},
 	setup(props, ctx) {
 		const value = computed(() => {
@@ -37,9 +41,9 @@ export default defineComponent({
 
 		return {
 			value,
-			updateValue
+			updateValue,
 		};
-	}
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/page/page.text-input.vue b/packages/client/src/components/page/page.text-input.vue
index 30a0379df..eb76d1890 100644
--- a/packages/client/src/components/page/page.text-input.vue
+++ b/packages/client/src/components/page/page.text-input.vue
@@ -1,31 +1,36 @@
 <template>
-<div>
-	<MkInput class="kudkigyw" :model-value="value" type="text" @update:modelValue="updateValue($event)">
-		<template #label>{{ hpml.interpolate(block.text) }}</template>
-	</MkInput>
-</div>
+	<div>
+		<MkInput
+			class="kudkigyw"
+			:model-value="value"
+			type="text"
+			@update:modelValue="updateValue($event)"
+		>
+			<template #label>{{ hpml.interpolate(block.text) }}</template>
+		</MkInput>
+	</div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType } from 'vue';
-import MkInput from '../form/input.vue';
-import * as os from '@/os';
-import { Hpml } from '@/scripts/hpml/evaluator';
-import { TextInputVarBlock } from '@/scripts/hpml/block';
+import { computed, defineComponent, PropType } from "vue";
+import MkInput from "../form/input.vue";
+import * as os from "@/os";
+import { Hpml } from "@/scripts/hpml/evaluator";
+import { TextInputVarBlock } from "@/scripts/hpml/block";
 
 export default defineComponent({
 	components: {
-		MkInput
+		MkInput,
 	},
 	props: {
 		block: {
 			type: Object as PropType<TextInputVarBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
-		}
+			required: true,
+		},
 	},
 	setup(props, ctx) {
 		const value = computed(() => {
@@ -39,9 +44,9 @@ export default defineComponent({
 
 		return {
 			value,
-			updateValue
+			updateValue,
 		};
-	}
+	},
 });
 </script>
 
diff --git a/packages/client/src/components/page/page.text.vue b/packages/client/src/components/page/page.text.vue
index 54f52ee05..c380f4844 100644
--- a/packages/client/src/components/page/page.text.vue
+++ b/packages/client/src/components/page/page.text.vue
@@ -1,29 +1,31 @@
 <template>
-<div class="mrdgzndn">
-	<Mfm :key="text" :text="text" :is-note="false" :i="$i"/>
-	<MkUrlPreview v-for="url in urls" :key="url" :url="url" class="url"/>
-</div>
+	<div class="mrdgzndn">
+		<Mfm :key="text" :text="text" :is-note="false" :i="$i" />
+		<MkUrlPreview v-for="url in urls" :key="url" :url="url" class="url" />
+	</div>
 </template>
 
 <script lang="ts">
-import { TextBlock } from '@/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
-import { defineAsyncComponent, defineComponent, PropType } from 'vue';
-import * as mfm from 'mfm-js';
-import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
+import { TextBlock } from "@/scripts/hpml/block";
+import { Hpml } from "@/scripts/hpml/evaluator";
+import { defineAsyncComponent, defineComponent, PropType } from "vue";
+import * as mfm from "mfm-js";
+import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
 export default defineComponent({
 	components: {
-		MkUrlPreview: defineAsyncComponent(() => import('@/components/MkUrlPreview.vue')),
+		MkUrlPreview: defineAsyncComponent(
+			() => import("@/components/MkUrlPreview.vue")
+		),
 	},
 	props: {
 		block: {
 			type: Object as PropType<TextBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
-		}
+			required: true,
+		},
 	},
 	data() {
 		return {
@@ -37,29 +39,29 @@ export default defineComponent({
 			} else {
 				return [];
 			}
-		}
+		},
 	},
 	watch: {
-		'hpml.vars': {
+		"hpml.vars": {
 			handler() {
 				this.text = this.hpml.interpolate(this.block.text);
 			},
-			deep: true
-		}
+			deep: true,
+		},
 	},
 });
 </script>
 
-	<style lang="scss" scoped>
-	.mrdgzndn {
-		&:not(:first-child) {
-			margin-top: 0.5em;
-		}
-		&:not(:last-child) {
-			margin-bottom: 0.5em;
-		}
-		> .url {
-			margin: 0.5em 0;
-		}
+<style lang="scss" scoped>
+.mrdgzndn {
+	&:not(:first-child) {
+		margin-top: 0.5em;
 	}
-	</style>
+	&:not(:last-child) {
+		margin-bottom: 0.5em;
+	}
+	> .url {
+		margin: 0.5em 0;
+	}
+}
+</style>
diff --git a/packages/client/src/components/page/page.textarea-input.vue b/packages/client/src/components/page/page.textarea-input.vue
index 6e082b2be..fab665c6d 100644
--- a/packages/client/src/components/page/page.textarea-input.vue
+++ b/packages/client/src/components/page/page.textarea-input.vue
@@ -1,32 +1,35 @@
 <template>
-<div>
-	<MkTextarea :model-value="value" @update:modelValue="updateValue($event)">
-		<template #label>{{ hpml.interpolate(block.text) }}</template>
-	</MkTextarea>
-</div>
+	<div>
+		<MkTextarea
+			:model-value="value"
+			@update:modelValue="updateValue($event)"
+		>
+			<template #label>{{ hpml.interpolate(block.text) }}</template>
+		</MkTextarea>
+	</div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType } from 'vue';
-import MkTextarea from '../form/textarea.vue';
-import * as os from '@/os';
-import { Hpml } from '@/scripts/hpml/evaluator';
-import { HpmlTextInput } from '@/scripts/hpml';
-import { TextInputVarBlock } from '@/scripts/hpml/block';
+import { computed, defineComponent, PropType } from "vue";
+import MkTextarea from "../form/textarea.vue";
+import * as os from "@/os";
+import { Hpml } from "@/scripts/hpml/evaluator";
+import { HpmlTextInput } from "@/scripts/hpml";
+import { TextInputVarBlock } from "@/scripts/hpml/block";
 
 export default defineComponent({
 	components: {
-		MkTextarea
+		MkTextarea,
 	},
 	props: {
 		block: {
 			type: Object as PropType<TextInputVarBlock>,
-			required: true
+			required: true,
 		},
 		hpml: {
 			type: Object as PropType<Hpml>,
-			required: true
-		}
+			required: true,
+		},
 	},
 	setup(props, ctx) {
 		const value = computed(() => {
@@ -40,8 +43,8 @@ export default defineComponent({
 
 		return {
 			value,
-			updateValue
+			updateValue,
 		};
-	}
+	},
 });
 </script>
diff --git a/packages/client/src/components/page/page.textarea.vue b/packages/client/src/components/page/page.textarea.vue
index 54ba8a86e..aa720321f 100644
--- a/packages/client/src/components/page/page.textarea.vue
+++ b/packages/client/src/components/page/page.textarea.vue
@@ -1,24 +1,28 @@
 <template>
-<MkTextarea :model-value="text" readonly></MkTextarea>
+	<MkTextarea :model-value="text" readonly></MkTextarea>
 </template>
 
 <script lang="ts" setup>
-import { watch } from 'vue';
-import MkTextarea from '../form/textarea.vue';
-import { TextBlock } from '@/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { watch } from "vue";
+import MkTextarea from "../form/textarea.vue";
+import { TextBlock } from "@/scripts/hpml/block";
+import { Hpml } from "@/scripts/hpml/evaluator";
 
 const props = defineProps<{
 	block: TextBlock;
 	hpml: Hpml;
 }>();
 
-let text = $ref('');
+let text = $ref("");
 
-watch(props.hpml.vars, () => {
-	text = props.hpml.interpolate(props.block.text) as string;
-}, {
-	deep: true,
-	immediate: true,
-});
+watch(
+	props.hpml.vars,
+	() => {
+		text = props.hpml.interpolate(props.block.text) as string;
+	},
+	{
+		deep: true,
+		immediate: true,
+	}
+);
 </script>
diff --git a/packages/client/src/components/page/page.vue b/packages/client/src/components/page/page.vue
index 58c43b22b..f2079c9ba 100644
--- a/packages/client/src/components/page/page.vue
+++ b/packages/client/src/components/page/page.vue
@@ -1,26 +1,42 @@
 <template>
-<div v-if="hpml" class="iroscrza" :class="{ center: page.alignCenter, serif: page.font === 'serif' }">
-	<XBlock v-for="child in page.content" :key="child.id" :block="child" :hpml="hpml" :h="2"/>
-</div>
+	<div
+		v-if="hpml"
+		class="iroscrza"
+		:class="{ center: page.alignCenter, serif: page.font === 'serif' }"
+	>
+		<XBlock
+			v-for="child in page.content"
+			:key="child.id"
+			:block="child"
+			:hpml="hpml"
+			:h="2"
+		/>
+	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, nextTick, onUnmounted, PropType } from 'vue';
-import { parse } from '@syuilo/aiscript';
-import XBlock from './page.block.vue';
-import { Hpml } from '@/scripts/hpml/evaluator';
-import { url } from '@/config';
-import { $i } from '@/account';
-import { defaultStore } from '@/store';
+import {
+	defineComponent,
+	onMounted,
+	nextTick,
+	onUnmounted,
+	PropType,
+} from "vue";
+import { parse } from "@syuilo/aiscript";
+import XBlock from "./page.block.vue";
+import { Hpml } from "@/scripts/hpml/evaluator";
+import { url } from "@/config";
+import { $i } from "@/account";
+import { defaultStore } from "@/store";
 
 export default defineComponent({
 	components: {
-		XBlock
+		XBlock,
 	},
 	props: {
 		page: {
 			type: Object as PropType<Record<string, any>>,
-			required: true
+			required: true,
 		},
 	},
 	setup(props, ctx) {
@@ -28,7 +44,7 @@ export default defineComponent({
 			randomSeed: Math.random(),
 			visitor: $i,
 			url: url,
-			enableAiScript: !defaultStore.state.disablePagesScript
+			enableAiScript: !defaultStore.state.disablePagesScript,
 		});
 
 		onMounted(() => {
@@ -45,15 +61,18 @@ export default defineComponent({
 						});*/
 						return;
 					}
-					hpml.aiscript.exec(ast).then(() => {
-						hpml.eval();
-					}).catch(err => {
-						console.error(err);
-						/*os.alert({
+					hpml.aiscript
+						.exec(ast)
+						.then(() => {
+							hpml.eval();
+						})
+						.catch((err) => {
+							console.error(err);
+							/*os.alert({
 							type: 'error',
 							text: err
 						});*/
-					});
+						});
 				} else {
 					hpml.eval();
 				}
diff --git a/packages/client/src/components/queue-chart.vue b/packages/client/src/components/queue-chart.vue
deleted file mode 100644
index 109708d1a..000000000
--- a/packages/client/src/components/queue-chart.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-<canvas ref="chartEl"></canvas>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import {
-	Chart,
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	CategoryScale,
-	LinearScale,
-	TimeScale,
-	Legend,
-	Title,
-	Tooltip,
-	SubTitle,
-	Filler,
-} from 'chart.js';
-import number from '@/filters/number';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-
-Chart.register(
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	CategoryScale,
-	LinearScale,
-	TimeScale,
-	Legend,
-	Title,
-	Tooltip,
-	SubTitle,
-	Filler,
-);
-
-const props = defineProps<{
-	domain: string,
-	connection: any,
-}>();
-
-const chartEl = ref<HTMLCanvasElement>(null);
-
-const gridColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
-
-// フォントカラー
-Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
-
-onMounted(() => {
-	const chartInstance = new Chart(chartEl.value, {
-		type: 'line',
-		data: {
-			labels: [],
-			datasets: [{
-				label: 'Process',
-				pointRadius: 0,
-				tension: 0,
-				borderWidth: 2,
-				borderJoinStyle: 'round',
-				borderColor: '#9ccfd8',
-				backgroundColor: '#9ccfd81A',
-				data: []
-			}, {
-				label: 'Active',
-				pointRadius: 0,
-				tension: 0,
-				borderWidth: 2,
-				borderJoinStyle: 'round',
-				borderColor: '#31748f',
-				backgroundColor: '#31748f1A',
-				data: []
-			}, {
-				label: 'Waiting',
-				pointRadius: 0,
-				tension: 0,
-				borderWidth: 2,
-				borderJoinStyle: 'round',
-				borderColor: '#f6c177',
-				backgroundColor: '#f6c1771A',
-				yAxisID: 'y2',
-				data: []
-			}, {
-				label: 'Delayed',
-				pointRadius: 0,
-				tension: 0,
-				borderWidth: 2,
-				borderJoinStyle: 'round',
-				borderColor: '#eb6f92',
-				borderDash: [5, 5],
-				fill: false,
-				yAxisID: 'y2',
-				data: []
-			}],
-		},
-		options: {
-			aspectRatio: 2.5,
-			layout: {
-				padding: {
-					left: 16,
-					right: 16,
-					top: 16,
-					bottom: 8,
-				},
-			},
-			scales: {
-				x: {
-					grid: {
-						display: true,
-						color: gridColor,
-						borderColor: '#1f1d2e',
-					},
-					ticks: {
-						display: false,
-						maxTicksLimit: 10
-					},
-				},
-				y: {
-					min: 0,
-					stack: 'queue',
-					stackWeight: 2,
-					grid: {
diff --git a/packages/client/src/pages/_empty_.vue b/packages/client/src/pages/_empty_.vue
index 000b6decc..3dee6cd45 100644
--- a/packages/client/src/pages/_empty_.vue
+++ b/packages/client/src/pages/_empty_.vue
@@ -1,7 +1,7 @@
 <template>
-<div></div>
+	<div></div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
+import {} from "vue";
 </script>
diff --git a/packages/client/src/pages/_error_.vue b/packages/client/src/pages/_error_.vue
index f2b2c67fb..ac0c80870 100644
--- a/packages/client/src/pages/_error_.vue
+++ b/packages/client/src/pages/_error_.vue
@@ -1,52 +1,74 @@
 <template>
-<MkLoading v-if="!loaded"/>
-<transition :name="$store.state.animation ? 'zoom' : ''" appear>
-	<div v-show="loaded" class="mjndxjch">
-		<img src="/static-assets/badges/error.png" class="_ghost" alt="Error"/>
-		<p><b><i class="ph-warning ph-bold ph-lg"></i> {{ i18n.ts.pageLoadError }}</b></p>
-		<p v-if="meta && (version === meta.version)">{{ i18n.ts.pageLoadErrorDescription }}</p>
-		<p v-else-if="serverIsDead">{{ i18n.ts.serverIsDead }}</p>
-		<template v-else>
-			<p>{{ i18n.ts.newVersionOfClientAvailable }}</p>
-			<p>{{ i18n.ts.youShouldUpgradeClient }}</p>
-			<MkButton class="button primary" @click="reload">{{ i18n.ts.reload }}</MkButton>
-		</template>
-		<p><MkA to="/docs/general/troubleshooting" class="_link">{{ i18n.ts.troubleshooting }}</MkA></p>
-		<p v-if="error" class="error">ERROR: {{ error }}</p>
-	</div>
-</transition>
+	<MkLoading v-if="!loaded" />
+	<transition :name="$store.state.animation ? 'zoom' : ''" appear>
+		<div v-show="loaded" class="mjndxjch">
+			<img
+				src="/static-assets/badges/error.png"
+				class="_ghost"
+				alt="Error"
+			/>
+			<p>
+				<b
+					><i class="ph-warning ph-bold ph-lg"></i>
+					{{ i18n.ts.pageLoadError }}</b
+				>
+			</p>
+			<p v-if="meta && version === meta.version">
+				{{ i18n.ts.pageLoadErrorDescription }}
+			</p>
+			<p v-else-if="serverIsDead">{{ i18n.ts.serverIsDead }}</p>
+			<template v-else>
+				<p>{{ i18n.ts.newVersionOfClientAvailable }}</p>
+				<p>{{ i18n.ts.youShouldUpgradeClient }}</p>
+				<MkButton class="button primary" @click="reload">{{
+					i18n.ts.reload
+				}}</MkButton>
+			</template>
+			<p>
+				<MkA to="/docs/general/troubleshooting" class="_link">{{
+					i18n.ts.troubleshooting
+				}}</MkA>
+			</p>
+			<p v-if="error" class="error">ERROR: {{ error }}</p>
+		</div>
+	</transition>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as misskey from 'calckey-js';
-import MkButton from '@/components/MkButton.vue';
-import { version } from '@/config';
-import * as os from '@/os';
-import { unisonReload } from '@/scripts/unison-reload';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import * as misskey from "calckey-js";
+import MkButton from "@/components/MkButton.vue";
+import { version } from "@/config";
+import * as os from "@/os";
+import { unisonReload } from "@/scripts/unison-reload";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const props = withDefaults(defineProps<{
-	error?: Error;
-}>(), {
-});
+const props = withDefaults(
+	defineProps<{
+		error?: Error;
+	}>(),
+	{}
+);
 
 let loaded = $ref(false);
 let serverIsDead = $ref(false);
 let meta = $ref<misskey.entities.LiteInstanceMetadata | null>(null);
 
-os.api('meta', {
+os.api("meta", {
 	detail: false,
-}).then(res => {
-	loaded = true;
-	serverIsDead = false;
-	meta = res;
-	localStorage.setItem('v', res.version);
-}, () => {
-	loaded = true;
-	serverIsDead = true;
-});
+}).then(
+	(res) => {
+		loaded = true;
+		serverIsDead = false;
+		meta = res;
+		localStorage.setItem("v", res.version);
+	},
+	() => {
+		loaded = true;
+		serverIsDead = true;
+	}
+);
 
 function reload() {
 	unisonReload();
@@ -58,7 +80,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.error,
-	icon: 'ph-warning ph-bold ph-lg',
+	icon: "ph-warning ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/_loading_.vue b/packages/client/src/pages/_loading_.vue
index 1dd2e46e1..832c05916 100644
--- a/packages/client/src/pages/_loading_.vue
+++ b/packages/client/src/pages/_loading_.vue
@@ -1,6 +1,5 @@
 <template>
-<MkLoading/>
+	<MkLoading />
 </template>
 
-<script lang="ts" setup>
-</script>
+<script lang="ts" setup></script>
diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue
index a768be59c..fa0eeff0b 100644
--- a/packages/client/src/pages/about-calckey.vue
+++ b/packages/client/src/pages/about-calckey.vue
@@ -1,82 +1,167 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<div style="overflow: clip;">
-		<MkSpacer :content-max="600" :margin-min="20">
-			<div class="_formRoot znqjceqz">
-				<div id="debug"></div>
-				<div ref="containerEl" v-panel class="_formBlock about" :class="{ playing: easterEggEngine != null }">
-					<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
-					<div class="misskey">Calckey</div>
-					<div class="version">v{{ version }}</div>
-					<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :custom-emojis="$instance.emojis" :is-reaction="false" :normal="true" :no-style="true"/></span>
-				</div>
-				<div class="_formBlock" style="text-align: center;">
-					{{ i18n.ts._aboutMisskey.about }}<br><a href="https://codeberg.org/calckey/calckey" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
-				</div>
-				<div class="_formBlock" style="text-align: center;">
-					<MkButton primary rounded inline @click="iLoveMisskey">I <Mfm text="$[jelly ❤]"/> #Calckey</MkButton>
-				</div>
-				<FormSection>
-					<div class="_formLinks">
-						<FormLink to="https://codeberg.org/calckey/calckey" external>
-							<template #icon><i class="ph-code ph-bold ph-lg"></i></template>
-							{{ i18n.ts._aboutMisskey.source }}
-							<template #suffix>Codeberg</template>
-						</FormLink>
-						<FormLink to="https://liberapay.com/ThatOneCalculator" external>
-							<template #icon><i class="ph-money ph-bold ph-lg"></i></template>
-							{{ i18n.ts._aboutMisskey.donate }}
-							<template #suffix>Donate</template>
-						</FormLink>
-						<FormLink to="https://hosted.weblate.org/engage/calckey/" external>
-							<template #icon><i class="ph-translate ph-bold ph-lg"></i></template>
-							{{ i18n.ts._aboutMisskey.translation }}
-							<template #suffix>Translate</template>
-						</FormLink>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<div style="overflow: clip">
+			<MkSpacer :content-max="600" :margin-min="20">
+				<div class="_formRoot znqjceqz">
+					<div id="debug"></div>
+					<div
+						ref="containerEl"
+						v-panel
+						class="_formBlock about"
+						:class="{ playing: easterEggEngine != null }"
+					>
+						<img
+							src="/client-assets/about-icon.png"
+							alt=""
+							class="icon"
+							draggable="false"
+							@load="iconLoaded"
+							@click="gravity"
+						/>
+						<div class="misskey">Calckey</div>
+						<div class="version">v{{ version }}</div>
+						<span
+							v-for="emoji in easterEggEmojis"
+							:key="emoji.id"
+							class="emoji"
+							:data-physics-x="emoji.left"
+							:data-physics-y="emoji.top"
+							:class="{
+								_physics_circle_: !emoji.emoji.startsWith(':'),
+							}"
+							><MkEmoji
+								class="emoji"
+								:emoji="emoji.emoji"
+								:custom-emojis="$instance.emojis"
+								:is-reaction="false"
+								:normal="true"
+								:no-style="true"
+						/></span>
 					</div>
-				</FormSection>
-				<FormSection>
-					<template #label>{{ i18n.ts._aboutMisskey.contributors }}</template>
-					<div class="_formLinks">
-						<FormLink to="/@kainoa@calckey.social"><Mfm :text="'$[sparkle @kainoa@calckey.social] (Main developer)'"/></FormLink>
-						<FormLink to="/@cleo@bz.pawdev.me"><Mfm :text="'@cleo@bz.pawdev.me (Maintainer)'"/></FormLink>
-						<FormLink to="/@panos@i.calckey.cloud"><Mfm :text="'@panos@i.calckey.cloud (Management)'"/></FormLink>
-						<FormLink to="/@freeplay@bz.pawdev.me"><Mfm :text="'@freeplay@bz.pawdev.me (UI/UX Designer)'"/></FormLink>
-						<FormLink to="https://www.youtube.com/c/Henkiwashere" external>Henki (error images artist)</FormLink>
+					<div class="_formBlock" style="text-align: center">
+						{{ i18n.ts._aboutMisskey.about }}<br /><a
+							href="https://codeberg.org/calckey/calckey"
+							target="_blank"
+							class="_link"
+							>{{ i18n.ts.learnMore }}</a
+						>
 					</div>
-					<template #caption><MkLink url="https://codeberg.org/calckey/calckey/activity">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template>
-				</FormSection>
-				<FormSection>
-					<template #label><Mfm text="$[jelly ❤]"/> {{ i18n.ts._aboutMisskey.patrons }}</template>
-					<MkSparkle>
-						<div v-for="patron in patrons" :key="patron" style="margin-bottom: 0.5rem">
-							<Mfm :text="`${patron}`"/>
+					<div class="_formBlock" style="text-align: center">
+						<MkButton primary rounded inline @click="iLoveMisskey"
+							>I <Mfm text="$[jelly ❤]" /> #Calckey</MkButton
+						>
+					</div>
+					<FormSection>
+						<div class="_formLinks">
+							<FormLink
+								to="https://codeberg.org/calckey/calckey"
+								external
+							>
+								<template #icon
+									><i class="ph-code ph-bold ph-lg"></i
+								></template>
+								{{ i18n.ts._aboutMisskey.source }}
+								<template #suffix>Codeberg</template>
+							</FormLink>
+							<FormLink
+								to="https://liberapay.com/ThatOneCalculator"
+								external
+							>
+								<template #icon
+									><i class="ph-money ph-bold ph-lg"></i
+								></template>
+								{{ i18n.ts._aboutMisskey.donate }}
+								<template #suffix>Donate</template>
+							</FormLink>
+							<FormLink
+								to="https://hosted.weblate.org/engage/calckey/"
+								external
+							>
+								<template #icon
+									><i class="ph-translate ph-bold ph-lg"></i
+								></template>
+								{{ i18n.ts._aboutMisskey.translation }}
+								<template #suffix>Translate</template>
+							</FormLink>
 						</div>
-					</MkSparkle>
-					<template #caption>{{ i18n.ts._aboutMisskey.morePatrons }}</template>
-				</FormSection>
-			</div>
-		</MkSpacer>
-	</div>
-</MkStickyContainer>
+					</FormSection>
+					<FormSection>
+						<template #label>{{
+							i18n.ts._aboutMisskey.contributors
+						}}</template>
+						<div class="_formLinks">
+							<FormLink to="/@kainoa@calckey.social"
+								><Mfm
+									:text="'$[sparkle @kainoa@calckey.social] (Main developer)'"
+							/></FormLink>
+							<FormLink to="/@cleo@bz.pawdev.me"
+								><Mfm :text="'@cleo@bz.pawdev.me (Maintainer)'"
+							/></FormLink>
+							<FormLink to="/@panos@i.calckey.cloud"
+								><Mfm
+									:text="'@panos@i.calckey.cloud (Management)'"
+							/></FormLink>
+							<FormLink to="/@freeplay@bz.pawdev.me"
+								><Mfm
+									:text="'@freeplay@bz.pawdev.me (UI/UX Designer)'"
+							/></FormLink>
+							<FormLink
+								to="https://www.youtube.com/c/Henkiwashere"
+								external
+								>Henki (error images artist)</FormLink
+							>
+						</div>
+						<template #caption
+							><MkLink
+								url="https://codeberg.org/calckey/calckey/activity"
+								>{{
+									i18n.ts._aboutMisskey.allContributors
+								}}</MkLink
+							></template
+						>
+					</FormSection>
+					<FormSection>
+						<template #label
+							><Mfm text="$[jelly ❤]" />
+							{{ i18n.ts._aboutMisskey.patrons }}</template
+						>
+						<MkSparkle>
+							<div
+								v-for="patron in patrons"
+								:key="patron"
+								style="margin-bottom: 0.5rem"
+							>
+								<Mfm :text="`${patron}`" />
+							</div>
+						</MkSparkle>
+						<template #caption>{{
+							i18n.ts._aboutMisskey.morePatrons
+						}}</template>
+					</FormSection>
+				</div>
+			</MkSpacer>
+		</div>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onBeforeUnmount } from 'vue';
-import { version } from '@/config';
-import FormLink from '@/components/form/link.vue';
-import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkLink from '@/components/MkLink.vue';
-import MkSparkle from '@/components/MkSparkle.vue';
-import { physics } from '@/scripts/physics';
-import { i18n } from '@/i18n';
-import { defaultStore } from '@/store';
-import * as os from '@/os';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { nextTick, onBeforeUnmount } from "vue";
+import { version } from "@/config";
+import FormLink from "@/components/form/link.vue";
+import FormSection from "@/components/form/section.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkLink from "@/components/MkLink.vue";
+import MkSparkle from "@/components/MkSparkle.vue";
+import { physics } from "@/scripts/physics";
+import { i18n } from "@/i18n";
+import { defaultStore } from "@/store";
+import * as os from "@/os";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const patrons = await os.api('patrons');
+const patrons = await os.api("patrons");
 
 let easterEggReady = false;
 let easterEggEmojis = $ref([]);
@@ -89,8 +174,8 @@ function iconLoaded() {
 	for (let i = 0; i < 32; i++) {
 		easterEggEmojis.push({
 			id: i.toString(),
-			top: -(128 + (Math.random() * 256)),
-			left: (Math.random() * containerWidth),
+			top: -(128 + Math.random() * 256),
+			left: Math.random() * containerWidth,
 			emoji: emojis[Math.floor(Math.random() * emojis.length)],
 		});
 	}
@@ -108,7 +193,7 @@ function gravity() {
 
 function iLoveMisskey() {
 	os.post({
-		initialText: 'I $[jelly ❤] #Calckey',
+		initialText: "I $[jelly ❤] #Calckey",
 		instant: true,
 	});
 }
@@ -138,7 +223,8 @@ definePageMetadata({
 		border-radius: var(--radius);
 
 		&.playing {
-			&, * {
+			&,
+			* {
 				user-select: none;
 			}
 
diff --git a/packages/client/src/pages/about.emojis.vue b/packages/client/src/pages/about.emojis.vue
index 2a2ac6431..90d9fb806 100644
--- a/packages/client/src/pages/about.emojis.vue
+++ b/packages/client/src/pages/about.emojis.vue
@@ -1,44 +1,62 @@
 <template>
-<div class="driuhtrh">
-	<div class="query">
-		<MkInput v-model="q" class="" :placeholder="i18n.ts.search">
-			<template #prefix><i class="ph-magnifying-glass ph-bold ph-lg"></i></template>
-		</MkInput>
+	<div class="driuhtrh">
+		<div class="query">
+			<MkInput v-model="q" class="" :placeholder="i18n.ts.search">
+				<template #prefix
+					><i class="ph-magnifying-glass ph-bold ph-lg"></i
+				></template>
+			</MkInput>
 
-		<!-- たくさんあると邪魔
+			<!-- たくさんあると邪魔
 		<div class="tags">
 			<span class="tag _button" v-for="tag in tags" :class="{ active: selectedTags.has(tag) }" @click="toggleTag(tag)">{{ tag }}</span>
 		</div>
 		-->
+		</div>
+
+		<MkFolder v-if="searchEmojis" class="emojis">
+			<template #header>{{ i18n.ts.searchResult }}</template>
+			<div class="zuvgdzyt">
+				<XEmoji
+					v-for="emoji in searchEmojis"
+					:key="emoji.name"
+					class="emoji"
+					:emoji="emoji"
+				/>
+			</div>
+		</MkFolder>
+
+		<MkFolder
+			v-for="category in customEmojiCategories"
+			:key="category"
+			class="emojis"
+		>
+			<template #header>{{ category || i18n.ts.other }}</template>
+			<div class="zuvgdzyt">
+				<XEmoji
+					v-for="emoji in customEmojis.filter(
+						(e) => e.category === category
+					)"
+					:key="emoji.name"
+					class="emoji"
+					:emoji="emoji"
+				/>
+			</div>
+		</MkFolder>
 	</div>
-
-	<MkFolder v-if="searchEmojis" class="emojis">
-		<template #header>{{ i18n.ts.searchResult }}</template>
-		<div class="zuvgdzyt">
-			<XEmoji v-for="emoji in searchEmojis" :key="emoji.name" class="emoji" :emoji="emoji"/>
-		</div>
-	</MkFolder>
-
-	<MkFolder v-for="category in customEmojiCategories" :key="category" class="emojis">
-		<template #header>{{ category || i18n.ts.other }}</template>
-		<div class="zuvgdzyt">
-			<XEmoji v-for="emoji in customEmojis.filter(e => e.category === category)" :key="emoji.name" class="emoji" :emoji="emoji"/>
-		</div>
-	</MkFolder>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, computed } from 'vue';
-import XEmoji from './emojis.emoji.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkSelect from '@/components/form/select.vue';
-import MkFolder from '@/components/MkFolder.vue';
-import MkTab from '@/components/MkTab.vue';
-import * as os from '@/os';
-import { emojiCategories, emojiTags } from '@/instance';
-import { i18n } from '@/i18n';
+import { defineComponent, computed } from "vue";
+import XEmoji from "./emojis.emoji.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkSelect from "@/components/form/select.vue";
+import MkFolder from "@/components/MkFolder.vue";
+import MkTab from "@/components/MkTab.vue";
+import * as os from "@/os";
+import { emojiCategories, emojiTags } from "@/instance";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
@@ -52,7 +70,7 @@ export default defineComponent({
 
 	data() {
 		return {
-			q: '',
+			q: "",
 			customEmojiCategories: emojiCategories,
 			customEmojis: this.$instance.emojis,
 			tags: emojiTags,
@@ -63,7 +81,9 @@ export default defineComponent({
 	},
 
 	watch: {
-		q() { this.search(); },
+		q() {
+			this.search();
+		},
 		selectedTags: {
 			handler() {
 				this.search();
@@ -74,15 +94,29 @@ export default defineComponent({
 
 	methods: {
 		search() {
-			if ((this.q === '' || this.q == null) && this.selectedTags.size === 0) {
+			if (
+				(this.q === "" || this.q == null) &&
+				this.selectedTags.size === 0
+			) {
 				this.searchEmojis = null;
 				return;
 			}
 
 			if (this.selectedTags.size === 0) {
-				this.searchEmojis = this.customEmojis.filter(emoji => emoji.name.includes(this.q) || emoji.aliases.includes(this.q));
+				this.searchEmojis = this.customEmojis.filter(
+					(emoji) =>
+						emoji.name.includes(this.q) ||
+						emoji.aliases.includes(this.q)
+				);
 			} else {
-				this.searchEmojis = this.customEmojis.filter(emoji => (emoji.name.includes(this.q) || emoji.aliases.includes(this.q)) && [...this.selectedTags].every(t => emoji.aliases.includes(t)));
+				this.searchEmojis = this.customEmojis.filter(
+					(emoji) =>
+						(emoji.name.includes(this.q) ||
+							emoji.aliases.includes(this.q)) &&
+						[...this.selectedTags].every((t) =>
+							emoji.aliases.includes(t)
+						)
+				);
 			}
 		},
 
diff --git a/packages/client/src/pages/about.federation.vue b/packages/client/src/pages/about.federation.vue
index c8f4594d6..ac4d4c876 100644
--- a/packages/client/src/pages/about.federation.vue
+++ b/packages/client/src/pages/about.federation.vue
@@ -1,88 +1,150 @@
 <template>
-<div class="taeiyria">
-	<div class="query">
-		<MkInput v-model="host" :debounce="true" class="">
-			<template #prefix><i class="ph-magnifying-glass ph-bold ph-lg"></i></template>
-			<template #label>{{ i18n.ts.host }}</template>
-		</MkInput>
-		<FormSplit style="margin-top: var(--margin);">
-			<MkSelect v-model="state">
-				<template #label>{{ i18n.ts.state }}</template>
-				<option value="all">{{ i18n.ts.all }}</option>
-				<option value="federating">{{ i18n.ts.federating }}</option>
-				<option value="subscribing">{{ i18n.ts.subscribing }}</option>
-				<option value="publishing">{{ i18n.ts.publishing }}</option>
-				<option value="suspended">{{ i18n.ts.suspended }}</option>
-				<option value="blocked">{{ i18n.ts.blocked }}</option>
-				<option value="notResponding">{{ i18n.ts.notResponding }}</option>
-			</MkSelect>
-			<MkSelect v-model="sort">
-				<template #label>{{ i18n.ts.sort }}</template>
-				<option value="+pubSub">{{ i18n.ts.pubSub }} ({{ i18n.ts.descendingOrder }})</option>
-				<option value="-pubSub">{{ i18n.ts.pubSub }} ({{ i18n.ts.ascendingOrder }})</option>
-				<option value="+notes">{{ i18n.ts.notes }} ({{ i18n.ts.descendingOrder }})</option>
-				<option value="-notes">{{ i18n.ts.notes }} ({{ i18n.ts.ascendingOrder }})</option>
-				<option value="+users">{{ i18n.ts.users }} ({{ i18n.ts.descendingOrder }})</option>
-				<option value="-users">{{ i18n.ts.users }} ({{ i18n.ts.ascendingOrder }})</option>
-				<option value="+following">{{ i18n.ts.following }} ({{ i18n.ts.descendingOrder }})</option>
-				<option value="-following">{{ i18n.ts.following }} ({{ i18n.ts.ascendingOrder }})</option>
-				<option value="+followers">{{ i18n.ts.followers }} ({{ i18n.ts.descendingOrder }})</option>
-				<option value="-followers">{{ i18n.ts.followers }} ({{ i18n.ts.ascendingOrder }})</option>
-				<option value="+caughtAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.descendingOrder }})</option>
-				<option value="-caughtAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.ascendingOrder }})</option>
-				<option value="+lastCommunicatedAt">{{ i18n.ts.lastCommunication }} ({{ i18n.ts.descendingOrder }})</option>
-				<option value="-lastCommunicatedAt">{{ i18n.ts.lastCommunication }} ({{ i18n.ts.ascendingOrder }})</option>
-			</MkSelect>
-		</FormSplit>
-	</div>
-
-	<MkPagination v-slot="{items}" ref="instances" :key="host + state" :pagination="pagination">
-		<div class="dqokceoi">
-			<MkA v-for="instance in items" :key="instance.id" v-tooltip.mfm="`Last communicated: ${new Date(instance.lastCommunicatedAt).toLocaleString()}\nStatus: ${getStatus(instance)}`" class="instance" :to="`/instance-info/${instance.host}`">
-				<MkInstanceCardMini :instance="instance"/>
-			</MkA>
+	<div class="taeiyria">
+		<div class="query">
+			<MkInput v-model="host" :debounce="true" class="">
+				<template #prefix
+					><i class="ph-magnifying-glass ph-bold ph-lg"></i
+				></template>
+				<template #label>{{ i18n.ts.host }}</template>
+			</MkInput>
+			<FormSplit style="margin-top: var(--margin)">
+				<MkSelect v-model="state">
+					<template #label>{{ i18n.ts.state }}</template>
+					<option value="all">{{ i18n.ts.all }}</option>
+					<option value="federating">{{ i18n.ts.federating }}</option>
+					<option value="subscribing">
+						{{ i18n.ts.subscribing }}
+					</option>
+					<option value="publishing">{{ i18n.ts.publishing }}</option>
+					<option value="suspended">{{ i18n.ts.suspended }}</option>
+					<option value="blocked">{{ i18n.ts.blocked }}</option>
+					<option value="notResponding">
+						{{ i18n.ts.notResponding }}
+					</option>
+				</MkSelect>
+				<MkSelect v-model="sort">
+					<template #label>{{ i18n.ts.sort }}</template>
+					<option value="+pubSub">
+						{{ i18n.ts.pubSub }} ({{ i18n.ts.descendingOrder }})
+					</option>
+					<option value="-pubSub">
+						{{ i18n.ts.pubSub }} ({{ i18n.ts.ascendingOrder }})
+					</option>
+					<option value="+notes">
+						{{ i18n.ts.notes }} ({{ i18n.ts.descendingOrder }})
+					</option>
+					<option value="-notes">
+						{{ i18n.ts.notes }} ({{ i18n.ts.ascendingOrder }})
+					</option>
+					<option value="+users">
+						{{ i18n.ts.users }} ({{ i18n.ts.descendingOrder }})
+					</option>
+					<option value="-users">
+						{{ i18n.ts.users }} ({{ i18n.ts.ascendingOrder }})
+					</option>
+					<option value="+following">
+						{{ i18n.ts.following }} ({{ i18n.ts.descendingOrder }})
+					</option>
+					<option value="-following">
+						{{ i18n.ts.following }} ({{ i18n.ts.ascendingOrder }})
+					</option>
+					<option value="+followers">
+						{{ i18n.ts.followers }} ({{ i18n.ts.descendingOrder }})
+					</option>
+					<option value="-followers">
+						{{ i18n.ts.followers }} ({{ i18n.ts.ascendingOrder }})
+					</option>
+					<option value="+caughtAt">
+						{{ i18n.ts.registeredAt }} ({{
+							i18n.ts.descendingOrder
+						}})
+					</option>
+					<option value="-caughtAt">
+						{{ i18n.ts.registeredAt }} ({{
+							i18n.ts.ascendingOrder
+						}})
+					</option>
+					<option value="+lastCommunicatedAt">
+						{{ i18n.ts.lastCommunication }} ({{
+							i18n.ts.descendingOrder
+						}})
+					</option>
+					<option value="-lastCommunicatedAt">
+						{{ i18n.ts.lastCommunication }} ({{
+							i18n.ts.ascendingOrder
+						}})
+					</option>
+				</MkSelect>
+			</FormSplit>
 		</div>
-	</MkPagination>
-</div>
+
+		<MkPagination
+			v-slot="{ items }"
+			ref="instances"
+			:key="host + state"
+			:pagination="pagination"
+		>
+			<div class="dqokceoi">
+				<MkA
+					v-for="instance in items"
+					:key="instance.id"
+					v-tooltip.mfm="
+						`Last communicated: ${new Date(
+							instance.lastCommunicatedAt
+						).toLocaleString()}\nStatus: ${getStatus(instance)}`
+					"
+					class="instance"
+					:to="`/instance-info/${instance.host}`"
+				>
+					<MkInstanceCardMini :instance="instance" />
+				</MkA>
+			</div>
+		</MkPagination>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkSelect from '@/components/form/select.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkInstanceCardMini from '@/components/MkInstanceCardMini.vue';
-import FormSplit from '@/components/form/split.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { computed } from "vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkSelect from "@/components/form/select.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkInstanceCardMini from "@/components/MkInstanceCardMini.vue";
+import FormSplit from "@/components/form/split.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-let host = $ref('');
-let state = $ref('federating');
-let sort = $ref('+pubSub');
+let host = $ref("");
+let state = $ref("federating");
+let sort = $ref("+pubSub");
 const pagination = {
-	endpoint: 'federation/instances' as const,
+	endpoint: "federation/instances" as const,
 	limit: 10,
 	offsetMode: true,
 	params: computed(() => ({
 		sort: sort,
-		host: host !== '' ? host : null,
-		...(
-			state === 'federating' ? { federating: true } :
-			state === 'subscribing' ? { subscribing: true } :
-			state === 'publishing' ? { publishing: true } :
-			state === 'suspended' ? { suspended: true } :
-			state === 'blocked' ? { blocked: true } :
-			state === 'notResponding' ? { notResponding: true } :
-			{}),
+		host: host !== "" ? host : null,
+		...(state === "federating"
+			? { federating: true }
+			: state === "subscribing"
+			? { subscribing: true }
+			: state === "publishing"
+			? { publishing: true }
+			: state === "suspended"
+			? { suspended: true }
+			: state === "blocked"
+			? { blocked: true }
+			: state === "notResponding"
+			? { notResponding: true }
+			: {}),
 	})),
 };
 
 function getStatus(instance) {
-	if (instance.isSuspended) return 'Suspended';
-	if (instance.isBlocked) return 'Blocked';
-	if (instance.isNotResponding) return 'Error';
-	return 'Alive';
+	if (instance.isSuspended) return "Suspended";
+	if (instance.isBlocked) return "Blocked";
+	if (instance.isNotResponding) return "Error";
+	return "Alive";
 }
 </script>
 
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index 0a0335a30..4b9e62cf8 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -1,172 +1,247 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="600" :margin-min="20">
-		<swiper
-			:modules="[Virtual]"
-			:space-between="20"
-			:virtual="true"
-			:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
-			@swiper="setSwiperRef"
-			@slide-change="onSlideChange"
-		>
-			<swiper-slide>
-				<div class="_formRoot">
-					<div class="_formBlock fwhjspax" :style="{ backgroundImage: `url(${ $instance.bannerUrl })` }">
-						<div class="content">
-							<img ref="instanceIcon" :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" aria-label="none" class="icon" :class="instanceIconAnimation" @click="easterEgg"/>
-							<div class="name">
-								<b>{{ $instance.name || host }}</b>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="600" :margin-min="20">
+			<swiper
+				:modules="[Virtual]"
+				:space-between="20"
+				:virtual="true"
+				:allow-touch-move="
+					!(
+						deviceKind === 'desktop' &&
+						!defaultStore.state.swipeOnDesktop
+					)
+				"
+				@swiper="setSwiperRef"
+				@slide-change="onSlideChange"
+			>
+				<swiper-slide>
+					<div class="_formRoot">
+						<div
+							class="_formBlock fwhjspax"
+							:style="{
+								backgroundImage: `url(${$instance.bannerUrl})`,
+							}"
+						>
+							<div class="content">
+								<img
+									ref="instanceIcon"
+									:src="
+										$instance.iconUrl ||
+										$instance.faviconUrl ||
+										'/favicon.ico'
+									"
+									aria-label="none"
+									class="icon"
+									:class="instanceIconAnimation"
+									@click="easterEgg"
+								/>
+								<div class="name">
+									<b>{{ $instance.name || host }}</b>
+								</div>
 							</div>
 						</div>
-					</div>
 
-					<MkKeyValue class="_formBlock">
-						<template #key>{{ i18n.ts.description }}</template>
-						<template #value>{{ $instance.description }}</template>
-					</MkKeyValue>
-
-					<FormSection>
-						<MkKeyValue class="_formBlock" :copy="version">
-							<template #key>Calckey</template>
-							<template #value>{{ version }}</template>
+						<MkKeyValue class="_formBlock">
+							<template #key>{{ i18n.ts.description }}</template>
+							<template #value>{{
+								$instance.description
+							}}</template>
 						</MkKeyValue>
-						<FormLink to="/about-calckey">{{ i18n.ts.aboutMisskey }}</FormLink>
-					</FormSection>
 
-					<FormSection>
-						<FormSplit>
-							<MkKeyValue class="_formBlock">
-								<template #key>{{ i18n.ts.administrator }}</template>
-								<template #value>{{ $instance.maintainerName }}</template>
-							</MkKeyValue>
-							<MkKeyValue class="_formBlock">
-								<template #key>{{ i18n.ts.contact }}</template>
-								<template #value>{{ $instance.maintainerEmail }}</template>
-							</MkKeyValue>
-						</FormSplit>
-						<FormLink v-if="$instance.tosUrl" :to="$instance.tosUrl" class="_formBlock" external>{{ i18n.ts.tos }}</FormLink>
-					</FormSection>
-
-					<FormSuspense :p="initStats">
 						<FormSection>
-							<template #label>{{ i18n.ts.statistics }}</template>
+							<MkKeyValue class="_formBlock" :copy="version">
+								<template #key>Calckey</template>
+								<template #value>{{ version }}</template>
+							</MkKeyValue>
+							<FormLink to="/about-calckey">{{
+								i18n.ts.aboutMisskey
+							}}</FormLink>
+						</FormSection>
+
+						<FormSection>
 							<FormSplit>
 								<MkKeyValue class="_formBlock">
-									<template #key>{{ i18n.ts.users }}</template>
-									<template #value>{{ number(stats.originalUsersCount) }}</template>
+									<template #key>{{
+										i18n.ts.administrator
+									}}</template>
+									<template #value>{{
+										$instance.maintainerName
+									}}</template>
 								</MkKeyValue>
 								<MkKeyValue class="_formBlock">
-									<template #key>{{ i18n.ts.notes }}</template>
-									<template #value>{{ number(stats.originalNotesCount) }}</template>
+									<template #key>{{
+										i18n.ts.contact
+									}}</template>
+									<template #value>{{
+										$instance.maintainerEmail
+									}}</template>
 								</MkKeyValue>
 							</FormSplit>
+							<FormLink
+								v-if="$instance.tosUrl"
+								:to="$instance.tosUrl"
+								class="_formBlock"
+								external
+								>{{ i18n.ts.tos }}</FormLink
+							>
 						</FormSection>
-					</FormSuspense>
 
-					<FormSection>
-						<template #label>Well-known resources</template>
-						<div class="_formLinks">
-							<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>
-			</swiper-slide>
-			<swiper-slide>
-				<XEmojis/>
-			</swiper-slide>
-			<swiper-slide>
-				<MkInstanceStats :chart-limit="500" :detailed="true"/>
-			</swiper-slide>
-			<swiper-slide>
-				<XFederation/>
-			</swiper-slide>
-		</swiper>
-	</MkSpacer>
-</MkStickyContainer>
+						<FormSuspense :p="initStats">
+							<FormSection>
+								<template #label>{{
+									i18n.ts.statistics
+								}}</template>
+								<FormSplit>
+									<MkKeyValue class="_formBlock">
+										<template #key>{{
+											i18n.ts.users
+										}}</template>
+										<template #value>{{
+											number(stats.originalUsersCount)
+										}}</template>
+									</MkKeyValue>
+									<MkKeyValue class="_formBlock">
+										<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="_formLinks">
+								<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>
+				</swiper-slide>
+				<swiper-slide>
+					<XEmojis />
+				</swiper-slide>
+				<swiper-slide>
+					<MkInstanceStats :chart-limit="500" :detailed="true" />
+				</swiper-slide>
+				<swiper-slide>
+					<XFederation />
+				</swiper-slide>
+			</swiper>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, watch } from 'vue';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
-import XEmojis from './about.emojis.vue';
-import XFederation from './about.federation.vue';
-import { version, instanceName , host } from '@/config';
-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 MkKeyValue from '@/components/MkKeyValue.vue';
-import MkInstanceStats from '@/components/MkInstanceStats.vue';
-import * as os from '@/os';
-import number from '@/filters/number';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { deviceKind } from '@/scripts/device-kind';
-import { iAmModerator } from '@/account';
-import { instance } from '@/instance';
-import { defaultStore } from '@/store';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
+import { ref, computed, onMounted, watch } from "vue";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
+import XEmojis from "./about.emojis.vue";
+import XFederation from "./about.federation.vue";
+import { version, instanceName, host } from "@/config";
+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 MkKeyValue from "@/components/MkKeyValue.vue";
+import MkInstanceStats from "@/components/MkInstanceStats.vue";
+import * as os from "@/os";
+import number from "@/filters/number";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { deviceKind } from "@/scripts/device-kind";
+import { iAmModerator } from "@/account";
+import { instance } from "@/instance";
+import { defaultStore } from "@/store";
+import "swiper/scss";
+import "swiper/scss/virtual";
 
-withDefaults(defineProps<{
-	initialTab?: string;
-}>(), {
-	initialTab: 'overview',
-});
+withDefaults(
+	defineProps<{
+		initialTab?: string;
+	}>(),
+	{
+		initialTab: "overview",
+	}
+);
 
 let stats = $ref(null);
 let instanceIcon = $ref<HTMLImageElement>();
-let instanceIconAnimation = 'none';
+let instanceIconAnimation = "none";
 let iconClicks = 0;
-let tabs = ['overview', 'emojis', 'charts'];
+let tabs = ["overview", "emojis", "charts"];
 let tab = $ref(tabs[0]);
-watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
-if (iAmModerator) tabs.push('federation');
+if (iAmModerator) tabs.push("federation");
 
-const initStats = () => os.api('stats', {
-}).then((res) => {
-	stats = res;
-});
+const initStats = () =>
+	os.api("stats", {}).then((res) => {
+		stats = res;
+	});
 
 const headerActions = $computed(() => []);
 
-let theTabs = [{
-	key: 'overview',
-	title: i18n.ts.overview,
-	icon: 'ph-map-trifold ph-bold ph-lg',
-}, {
-	key: 'emojis',
-	title: i18n.ts.customEmojis,
-	icon: 'ph-smiley ph-bold ph-lg',
-}, {
-	key: 'charts',
-	title: i18n.ts.charts,
-	icon: 'ph-chart-bar ph-bold ph-lg',
-}];
+let theTabs = [
+	{
+		key: "overview",
+		title: i18n.ts.overview,
+		icon: "ph-map-trifold ph-bold ph-lg",
+	},
+	{
+		key: "emojis",
+		title: i18n.ts.customEmojis,
+		icon: "ph-smiley ph-bold ph-lg",
+	},
+	{
+		key: "charts",
+		title: i18n.ts.charts,
+		icon: "ph-chart-bar ph-bold ph-lg",
+	},
+];
 
 if (iAmModerator) {
-	theTabs.push(
-		{
-			key: 'federation',
-			title: i18n.ts.federation,
-			icon: 'ph-planet ph-bold ph-lg',
-		},
-	);
+	theTabs.push({
+		key: "federation",
+		title: i18n.ts.federation,
+		icon: "ph-planet ph-bold ph-lg",
+	});
 }
 
 let headerTabs = $computed(() => theTabs);
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.instanceInfo,
-	icon: 'ph-info ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.instanceInfo,
+		icon: "ph-info ph-bold ph-lg",
+	}))
+);
 
 async function sleep(seconds) {
 	return new Promise((resolve) => setTimeout(resolve, seconds * 1000));
@@ -174,14 +249,13 @@ async function sleep(seconds) {
 
 onMounted(() => {
 	if (defaultStore.state.woozyMode) {
-		instanceIcon.src = '/static-assets/woozy.png';
+		instanceIcon.src = "/static-assets/woozy.png";
 	}
 });
 
-
 function easterEgg() {
 	iconClicks++;
-	instanceIconAnimation = 'noAnimation';
+	instanceIconAnimation = "noAnimation";
 	console.log(instanceIconAnimation);
 	sleep(0.1);
 	const normalizedCount = (iconClicks % 3) + 1;
@@ -189,14 +263,14 @@ function easterEgg() {
 	if (iconClicks % 3 === 0) {
 		defaultStore.state.woozyMode = !defaultStore.state.woozyMode;
 		sleep(0.4);
-		instanceIconAnimation = 'noAnimation';
-		instanceIconAnimation = 'doSpinY';
+		instanceIconAnimation = "noAnimation";
+		instanceIconAnimation = "doSpinY";
 		console.log(instanceIconAnimation);
 		if (iconClicks % 6 === 0) {
-			instanceIcon.src = instance.iconUrl || instance.faviconUrl || '/favicon.ico'
-		}
-		else {
-			instanceIcon.src = '/static-assets/woozy.png';
+			instanceIcon.src =
+				instance.iconUrl || instance.faviconUrl || "/favicon.ico";
+		} else {
+			instanceIcon.src = "/static-assets/woozy.png";
 		}
 	}
 }
@@ -215,55 +289,124 @@ function onSlideChange() {
 function syncSlide(index) {
 	swiperRef.slideTo(index);
 }
-
 </script>
 
 <style lang="scss" scoped>
 @keyframes iconShake1 {
-	0% { transform: translate(2px, 0px) rotate(-1deg) }
-	10% { transform: translate(2px, -3px) rotate(5deg) }
-	20% { transform: translate(-1px, -3px) rotate(3deg) }
-	30% { transform: translate(-2px, 0px) rotate(-1deg) }
-	40% { transform: translate(-2px, -1px) rotate(4deg) }
-	50% { transform: translate(-1px, -1px) rotate(1deg) }
-	60% { transform: translate(-2px, 0px) rotate(-8deg) }
-	70% { transform: translate(1px, 2px) rotate(-2deg) }
-	80% { transform: translate(-1px, 2px) rotate(4deg) }
-	90% { transform: translate(-1px, 1px) rotate(11deg) }
-	100% { transform: translate(-3px, -3px) rotate(-5deg) }
+	0% {
+		transform: translate(2px, 0px) rotate(-1deg);
+	}
+	10% {
+		transform: translate(2px, -3px) rotate(5deg);
+	}
+	20% {
+		transform: translate(-1px, -3px) rotate(3deg);
+	}
+	30% {
+		transform: translate(-2px, 0px) rotate(-1deg);
+	}
+	40% {
+		transform: translate(-2px, -1px) rotate(4deg);
+	}
+	50% {
+		transform: translate(-1px, -1px) rotate(1deg);
+	}
+	60% {
+		transform: translate(-2px, 0px) rotate(-8deg);
+	}
+	70% {
+		transform: translate(1px, 2px) rotate(-2deg);
+	}
+	80% {
+		transform: translate(-1px, 2px) rotate(4deg);
+	}
+	90% {
+		transform: translate(-1px, 1px) rotate(11deg);
+	}
+	100% {
+		transform: translate(-3px, -3px) rotate(-5deg);
+	}
 }
 
 @keyframes iconShake2 {
-	0% { transform: translate(-1px, 5px) rotate(33deg) }
-	10% { transform: translate(-2px, 7px) rotate(20deg) }
-	20% { transform: translate(8px, 5px) rotate(31deg) }
-	30% { transform: translate(-2px, 5px) rotate(3deg) }
-	40% { transform: translate(4px, 6px) rotate(16deg) }
-	50% { transform: translate(8px, -3px) rotate(19deg) }
-	60% { transform: translate(7px, -2px) rotate(0deg) }
-	70% { transform: translate(4px, 4px) rotate(8deg) }
-	80% { transform: translate(7px, -3px) rotate(13deg) }
-	90% { transform: translate(6px, 7px) rotate(4deg) }
-	100% { transform: translate(4px, -2px) rotate(-2deg) }
+	0% {
+		transform: translate(-1px, 5px) rotate(33deg);
+	}
+	10% {
+		transform: translate(-2px, 7px) rotate(20deg);
+	}
+	20% {
+		transform: translate(8px, 5px) rotate(31deg);
+	}
+	30% {
+		transform: translate(-2px, 5px) rotate(3deg);
+	}
+	40% {
+		transform: translate(4px, 6px) rotate(16deg);
+	}
+	50% {
+		transform: translate(8px, -3px) rotate(19deg);
+	}
+	60% {
+		transform: translate(7px, -2px) rotate(0deg);
+	}
+	70% {
+		transform: translate(4px, 4px) rotate(8deg);
+	}
+	80% {
+		transform: translate(7px, -3px) rotate(13deg);
+	}
+	90% {
+		transform: translate(6px, 7px) rotate(4deg);
+	}
+	100% {
+		transform: translate(4px, -2px) rotate(-2deg);
+	}
 }
 
 @keyframes iconShake3 {
-	0% { transform: translate(12px, -2px) rotate(57deg) }
-	10% { transform: translate(10px, 2px) rotate(12deg) }
-	20% { transform: translate(10px, 4px) rotate(3deg) }
-	30% { transform: translate(17px, 11px) rotate(15deg) }
-	40% { transform: translate(12px, 20px) rotate(-11deg) }
-	50% { transform: translate(5px, 12px) rotate(43deg) }
-	60% { transform: translate(16px, 8px) rotate(-4deg) }
-	70% { transform: translate(14px, 11px) rotate(22deg) }
-	80% { transform: translate(9px, 19px) rotate(-3deg) }
-	90% { transform: translate(0px, 12px) rotate(-3deg) }
-	100% { transform: translate(17px, 3px) rotate(57deg) }
+	0% {
+		transform: translate(12px, -2px) rotate(57deg);
+	}
+	10% {
+		transform: translate(10px, 2px) rotate(12deg);
+	}
+	20% {
+		transform: translate(10px, 4px) rotate(3deg);
+	}
+	30% {
+		transform: translate(17px, 11px) rotate(15deg);
+	}
+	40% {
+		transform: translate(12px, 20px) rotate(-11deg);
+	}
+	50% {
+		transform: translate(5px, 12px) rotate(43deg);
+	}
+	60% {
+		transform: translate(16px, 8px) rotate(-4deg);
+	}
+	70% {
+		transform: translate(14px, 11px) rotate(22deg);
+	}
+	80% {
+		transform: translate(9px, 19px) rotate(-3deg);
+	}
+	90% {
+		transform: translate(0px, 12px) rotate(-3deg);
+	}
+	100% {
+		transform: translate(17px, 3px) rotate(57deg);
+	}
 }
 
 @keyframes spinY {
-	0% { transform: perspective(128px) rotateY(0deg); }
-	100% { transform: perspective(128px) rotateY(360deg); }
+	0% {
+		transform: perspective(128px) rotateY(0deg);
+	}
+	100% {
+		transform: perspective(128px) rotateY(360deg);
+	}
 }
 
 .fwhjspax {
diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index 30e3d420c..7806cf23c 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -1,121 +1,197 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
-		<swiper
-			:modules="[Virtual]"
-			:space-between="20"
-			:virtual="true"
-			:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
-			@swiper="setSwiperRef"
-			@slide-change="onSlideChange"
-		>
-			<swiper-slide>
-				<div class="cxqhhsmd _formRoot">
-					<a class="_formBlock thumbnail" :href="file.url" target="_blank">
-						<MkDriveFileThumbnail class="thumbnail" :file="file" fit="contain"/>
-					</a>
-					<div class="_formBlock">
-						<MkKeyValue :copy="file.type" oneline style="margin: 1em 0;">
-							<template #key>MIME Type</template>
-							<template #value><span class="_monospace">{{ file.type }}</span></template>
-						</MkKeyValue>
-						<MkKeyValue oneline style="margin: 1em 0;">
-							<template #key>Size</template>
-							<template #value><span class="_monospace">{{ bytes(file.size) }}</span></template>
-						</MkKeyValue>
-						<MkKeyValue :copy="file.id" oneline style="margin: 1em 0;">
-							<template #key>ID</template>
-							<template #value><span class="_monospace">{{ file.id }}</span></template>
-						</MkKeyValue>
-						<MkKeyValue :copy="file.md5" oneline style="margin: 1em 0;">
-							<template #key>MD5</template>
-							<template #value><span class="_monospace">{{ file.md5 }}</span></template>
-						</MkKeyValue>
-						<MkKeyValue oneline style="margin: 1em 0;">
-							<template #key>{{ i18n.ts.createdAt }}</template>
-							<template #value><span class="_monospace"><MkTime :time="file.createdAt" mode="detail" style="display: block;"/></span></template>
-						</MkKeyValue>
-					</div>
-					<MkA v-if="file.user" class="user" :to="`/user-info/${file.user.id}`">
-						<MkUserCardMini :user="file.user"/>
-					</MkA>
-					<div class="_formBlock">
-						<MkSwitch v-model="isSensitive" @update:modelValue="toggleIsSensitive">NSFW</MkSwitch>
-					</div>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
+			<swiper
+				:modules="[Virtual]"
+				:space-between="20"
+				:virtual="true"
+				:allow-touch-move="
+					!(
+						deviceKind === 'desktop' &&
+						!defaultStore.state.swipeOnDesktop
+					)
+				"
+				@swiper="setSwiperRef"
+				@slide-change="onSlideChange"
+			>
+				<swiper-slide>
+					<div class="cxqhhsmd _formRoot">
+						<a
+							class="_formBlock thumbnail"
+							:href="file.url"
+							target="_blank"
+						>
+							<MkDriveFileThumbnail
+								class="thumbnail"
+								:file="file"
+								fit="contain"
+							/>
+						</a>
+						<div class="_formBlock">
+							<MkKeyValue
+								:copy="file.type"
+								oneline
+								style="margin: 1em 0"
+							>
+								<template #key>MIME Type</template>
+								<template #value
+									><span class="_monospace">{{
+										file.type
+									}}</span></template
+								>
+							</MkKeyValue>
+							<MkKeyValue oneline style="margin: 1em 0">
+								<template #key>Size</template>
+								<template #value
+									><span class="_monospace">{{
+										bytes(file.size)
+									}}</span></template
+								>
+							</MkKeyValue>
+							<MkKeyValue
+								:copy="file.id"
+								oneline
+								style="margin: 1em 0"
+							>
+								<template #key>ID</template>
+								<template #value
+									><span class="_monospace">{{
+										file.id
+									}}</span></template
+								>
+							</MkKeyValue>
+							<MkKeyValue
+								:copy="file.md5"
+								oneline
+								style="margin: 1em 0"
+							>
+								<template #key>MD5</template>
+								<template #value
+									><span class="_monospace">{{
+										file.md5
+									}}</span></template
+								>
+							</MkKeyValue>
+							<MkKeyValue oneline style="margin: 1em 0">
+								<template #key>{{
+									i18n.ts.createdAt
+								}}</template>
+								<template #value
+									><span class="_monospace"
+										><MkTime
+											:time="file.createdAt"
+											mode="detail"
+											style="display: block" /></span
+								></template>
+							</MkKeyValue>
+						</div>
+						<MkA
+							v-if="file.user"
+							class="user"
+							:to="`/user-info/${file.user.id}`"
+						>
+							<MkUserCardMini :user="file.user" />
+						</MkA>
+						<div class="_formBlock">
+							<MkSwitch
+								v-model="isSensitive"
+								@update:modelValue="toggleIsSensitive"
+								>NSFW</MkSwitch
+							>
+						</div>
 
-					<div class="_formBlock">
-						<MkButton danger @click="del"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
+						<div class="_formBlock">
+							<MkButton danger @click="del"
+								><i class="ph-trash ph-bold ph-lg"></i>
+								{{ i18n.ts.delete }}</MkButton
+							>
+						</div>
 					</div>
-				</div>
-			</swiper-slide>
-			<swiper-slide>
-				<div v-if="info" class="_formRoot">
-					<MkInfo v-if="!iAmAdmin" warn>{{ i18n.ts.requireAdminForView }}</MkInfo>
-					<MkKeyValue v-if="info.requestIp" class="_formBlock _monospace" :copy="info.requestIp" oneline>
-						<template #key>IP</template>
-						<template #value>{{ info.requestIp }}</template>
-					</MkKeyValue>
-					<FormSection v-if="info.requestHeaders">
-						<template #label>Headers</template>
-						<MkKeyValue v-for="(v, k) in info.requestHeaders" :key="k" class="_formBlock _monospace">
-							<template #key>{{ k }}</template>
-							<template #value>{{ v }}</template>
+				</swiper-slide>
+				<swiper-slide>
+					<div v-if="info" class="_formRoot">
+						<MkInfo v-if="!iAmAdmin" warn>{{
+							i18n.ts.requireAdminForView
+						}}</MkInfo>
+						<MkKeyValue
+							v-if="info.requestIp"
+							class="_formBlock _monospace"
+							:copy="info.requestIp"
+							oneline
+						>
+							<template #key>IP</template>
+							<template #value>{{ info.requestIp }}</template>
 						</MkKeyValue>
-					</FormSection>
-				</div>
-			</swiper-slide>
-			<swiper-slide>
-				<div class="_formRoot">
-					<MkObjectView v-if="info" tall :value="info">
-					</MkObjectView>
-				</div>
-			</swiper-slide>
-		</swiper>
-	</MkSpacer>
-</MkStickyContainer>
+						<FormSection v-if="info.requestHeaders">
+							<template #label>Headers</template>
+							<MkKeyValue
+								v-for="(v, k) in info.requestHeaders"
+								:key="k"
+								class="_formBlock _monospace"
+							>
+								<template #key>{{ k }}</template>
+								<template #value>{{ v }}</template>
+							</MkKeyValue>
+						</FormSection>
+					</div>
+				</swiper-slide>
+				<swiper-slide>
+					<div class="_formRoot">
+						<MkObjectView v-if="info" tall :value="info">
+						</MkObjectView>
+					</div>
+				</swiper-slide>
+			</swiper>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch } from 'vue';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
-import MkButton from '@/components/MkButton.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import MkObjectView from '@/components/MkObjectView.vue';
-import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import FormSection from '@/components/form/section.vue';
-import MkUserCardMini from '@/components/MkUserCardMini.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import bytes from '@/filters/bytes';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { deviceKind } from '@/scripts/device-kind';
-import { acct } from '@/filters/user';
-import { iAmAdmin, iAmModerator } from '@/account';
-import { defaultStore } from '@/store';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
+import { computed, watch } from "vue";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
+import MkButton from "@/components/MkButton.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import MkObjectView from "@/components/MkObjectView.vue";
+import MkDriveFileThumbnail from "@/components/MkDriveFileThumbnail.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import FormSection from "@/components/form/section.vue";
+import MkUserCardMini from "@/components/MkUserCardMini.vue";
+import MkInfo from "@/components/MkInfo.vue";
+import bytes from "@/filters/bytes";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { deviceKind } from "@/scripts/device-kind";
+import { acct } from "@/filters/user";
+import { iAmAdmin, iAmModerator } from "@/account";
+import { defaultStore } from "@/store";
+import "swiper/scss";
+import "swiper/scss/virtual";
 
-let tabs = ['overview'];
-if (iAmModerator) tabs.push('ip');
-tabs.push('raw');
+let tabs = ["overview"];
+if (iAmModerator) tabs.push("ip");
+tabs.push("raw");
 let tab = $ref(tabs[0]);
-watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
 let file: any = $ref(null);
 let info: any = $ref(null);
 let isSensitive: boolean = $ref(false);
 
 const props = defineProps<{
-	fileId: string,
+	fileId: string;
 }>();
 
 async function fetch() {
-	file = await os.api('drive/files/show', { fileId: props.fileId });
-	info = await os.api('admin/drive/show-file', { fileId: props.fileId });
+	file = await os.api("drive/files/show", { fileId: props.fileId });
+	info = await os.api("admin/drive/show-file", { fileId: props.fileId });
 	isSensitive = file.isSensitive;
 }
 
@@ -123,47 +199,60 @@ fetch();
 
 async function del() {
 	const { canceled } = await os.confirm({
-		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: file.name }),
+		type: "warning",
+		text: i18n.t("removeAreYouSure", { x: file.name }),
 	});
 	if (canceled) return;
 
-	os.apiWithDialog('drive/files/delete', {
+	os.apiWithDialog("drive/files/delete", {
 		fileId: file.id,
 	});
 }
 
 async function toggleIsSensitive(v) {
-	await os.api('drive/files/update', { fileId: props.fileId, isSensitive: v });
+	await os.api("drive/files/update", {
+		fileId: props.fileId,
+		isSensitive: v,
+	});
 	isSensitive = v;
 }
 
-const headerActions = $computed(() => [{
-	text: i18n.ts.openInNewTab,
-	icon: 'ph-arrow-square-out ph-bold ph-lg',
-	handler: () => {
-		window.open(file.url, '_blank');
+const headerActions = $computed(() => [
+	{
+		text: i18n.ts.openInNewTab,
+		icon: "ph-arrow-square-out ph-bold ph-lg",
+		handler: () => {
+			window.open(file.url, "_blank");
+		},
 	},
-}]);
+]);
 
-const headerTabs = $computed(() => [{
-	key: 'overview',
-	title: i18n.ts.overview,
-	icon: 'ph-info ph-bold ph-lg',
-}, iAmModerator ? {
-	key: 'ip',
-	title: 'IP',
-	icon: 'ph-receipt ph-bold ph-lg',
-} : null, {
-	key: 'raw',
-	title: 'Raw data',
-	icon: 'ph-code ph-bold ph-lg',
-}]);
+const headerTabs = $computed(() => [
+	{
+		key: "overview",
+		title: i18n.ts.overview,
+		icon: "ph-info ph-bold ph-lg",
+	},
+	iAmModerator
+		? {
+				key: "ip",
+				title: "IP",
+				icon: "ph-receipt ph-bold ph-lg",
+		  }
+		: null,
+	{
+		key: "raw",
+		title: "Raw data",
+		icon: "ph-code ph-bold ph-lg",
+	},
+]);
 
-definePageMetadata(computed(() => ({
-	title: file ? i18n.ts.file + ': ' + file.name : i18n.ts.file,
-	icon: 'ph-file ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: file ? i18n.ts.file + ": " + file.name : i18n.ts.file,
+		icon: "ph-file ph-bold ph-lg",
+	}))
+);
 
 let swiperRef = null;
 
diff --git a/packages/client/src/pages/admin/_header_.vue b/packages/client/src/pages/admin/_header_.vue
index bdb41b2d2..69fd1bc58 100644
--- a/packages/client/src/pages/admin/_header_.vue
+++ b/packages/client/src/pages/admin/_header_.vue
@@ -1,42 +1,78 @@
 <template>
-<div ref="el" class="fdidabkc" :style="{ background: bg }" @click="onClick">
-	<template v-if="metadata">
-		<div class="titleContainer" @click="showTabsPopup">
-			<i v-if="metadata.icon" class="icon" :class="metadata.icon"></i>
+	<div ref="el" class="fdidabkc" :style="{ background: bg }" @click="onClick">
+		<template v-if="metadata">
+			<div class="titleContainer" @click="showTabsPopup">
+				<i v-if="metadata.icon" class="icon" :class="metadata.icon"></i>
 
-			<div class="title">
-				<div class="title">{{ metadata.title }}</div>
+				<div class="title">
+					<div class="title">{{ metadata.title }}</div>
+				</div>
+			</div>
+			<div class="tabs">
+				<button
+					v-for="tab in tabs"
+					:ref="(el) => (tabRefs[tab.key] = el)"
+					v-tooltip.noDelay="tab.title"
+					class="tab _button"
+					:class="{
+						active: tab.key != null && tab.key === props.tab,
+					}"
+					@mousedown="(ev) => onTabMousedown(tab, ev)"
+					@click="(ev) => onTabClick(tab, ev)"
+				>
+					<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
+					<span v-if="!tab.iconOnly" class="title">{{
+						tab.title
+					}}</span>
+				</button>
+				<div ref="tabHighlightEl" class="highlight"></div>
 			</div>
-		</div>
-		<div class="tabs">
-			<button v-for="tab in tabs" :ref="(el) => tabRefs[tab.key] = el" v-tooltip.noDelay="tab.title" class="tab _button" :class="{ active: tab.key != null && tab.key === props.tab }" @mousedown="(ev) => onTabMousedown(tab, ev)" @click="(ev) => onTabClick(tab, ev)">
-				<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
-				<span v-if="!tab.iconOnly" class="title">{{ tab.title }}</span>
-			</button>
-			<div ref="tabHighlightEl" class="highlight"></div>
-		</div>
-	</template>
-	<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>
-			</template>
 		</template>
+		<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>
+				</template>
+			</template>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref, inject, watch, nextTick } from 'vue';
-import tinycolor from 'tinycolor2';
-import { popupMenu } from '@/os';
-import { url } from '@/config';
-import { scrollToTop } from '@/scripts/scroll';
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n';
-import { globalEvents } from '@/events';
-import { injectPageMetadata } from '@/scripts/page-metadata';
+import {
+	computed,
+	onMounted,
+	onUnmounted,
+	ref,
+	inject,
+	watch,
+	nextTick,
+} from "vue";
+import tinycolor from "tinycolor2";
+import { popupMenu } from "@/os";
+import { url } from "@/config";
+import { scrollToTop } from "@/scripts/scroll";
+import MkButton from "@/components/MkButton.vue";
+import { i18n } from "@/i18n";
+import { globalEvents } from "@/events";
+import { injectPageMetadata } from "@/scripts/page-metadata";
 
 type Tab = {
 	key?: string | null;
@@ -59,7 +95,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'update:tab', key: string);
+	(ev: "update:tab", key: string);
 }>();
 
 const metadata = injectPageMetadata();
@@ -77,7 +113,7 @@ const showTabsPopup = (ev: MouseEvent) => {
 	if (!hasTabs.value) return;
 	ev.preventDefault();
 	ev.stopPropagation();
-	const menu = props.tabs.map(tab => ({
+	const menu = props.tabs.map((tab) => ({
 		text: tab.title,
 		icon: tab.icon,
 		active: tab.key != null && tab.key === props.tab,
@@ -93,13 +129,13 @@ const preventDrag = (ev: TouchEvent) => {
 };
 
 const onClick = () => {
-	scrollToTop(el.value, { behavior: 'smooth' });
+	scrollToTop(el.value, { behavior: "smooth" });
 };
 
 function onTabMousedown(tab: Tab, ev: MouseEvent): void {
 	// ユーザビリティの観点からmousedown時にはonClickは呼ばない
 	if (tab.key) {
-		emit('update:tab', tab.key);
+		emit("update:tab", tab.key);
 	}
 }
 
@@ -110,40 +146,52 @@ function onTabClick(tab: Tab, ev: MouseEvent): void {
 		tab.onClick(ev);
 	}
 	if (tab.key) {
-		emit('update:tab', tab.key);
+		emit("update:tab", tab.key);
 	}
 }
 
 const calcBg = () => {
-	const rawBg = metadata?.bg || 'var(--bg)';
-	const tinyBg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);
+	const rawBg = metadata?.bg || "var(--bg)";
+	const tinyBg = tinycolor(
+		rawBg.startsWith("var(")
+			? getComputedStyle(document.documentElement).getPropertyValue(
+					rawBg.slice(4, -1)
+			  )
+			: rawBg
+	);
 	tinyBg.setAlpha(0.85);
 	bg.value = tinyBg.toRgbString();
 };
 
 onMounted(() => {
 	calcBg();
-	globalEvents.on('themeChanged', calcBg);
+	globalEvents.on("themeChanged", calcBg);
 
-	watch(() => [props.tab, props.tabs], () => {
-		nextTick(() => {
-			const tabEl = tabRefs[props.tab];
-			if (tabEl && tabHighlightEl) {
-				// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
-				// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
-				const parentRect = tabEl.parentElement.getBoundingClientRect();
-				const rect = tabEl.getBoundingClientRect();
-				tabHighlightEl.style.width = rect.width + 'px';
-				tabHighlightEl.style.left = (rect.left - parentRect.left) + 'px';
-			}
-		});
-	}, {
-		immediate: true,
-	});
+	watch(
+		() => [props.tab, props.tabs],
+		() => {
+			nextTick(() => {
+				const tabEl = tabRefs[props.tab];
+				if (tabEl && tabHighlightEl) {
+					// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
+					// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
+					const parentRect =
+						tabEl.parentElement.getBoundingClientRect();
+					const rect = tabEl.getBoundingClientRect();
+					tabHighlightEl.style.width = rect.width + "px";
+					tabHighlightEl.style.left =
+						rect.left - parentRect.left + "px";
+				}
+			});
+		},
+		{
+			immediate: true,
+		}
+	);
 });
 
 onUnmounted(() => {
-	globalEvents.off('themeChanged', calcBg);
+	globalEvents.off("themeChanged", calcBg);
 });
 </script>
 
@@ -158,7 +206,7 @@ onUnmounted(() => {
 	> .buttons {
 		--margin: 8px;
 		display: flex;
-    align-items: center;
+		align-items: center;
 		height: var(--height);
 		margin: 0 var(--margin);
 
diff --git a/packages/client/src/pages/admin/abuses.vue b/packages/client/src/pages/admin/abuses.vue
index 5d11120a1..27d8a700c 100644
--- a/packages/client/src/pages/admin/abuses.vue
+++ b/packages/client/src/pages/admin/abuses.vue
@@ -1,31 +1,65 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="900">
-		<div class="lcixvhis">
-			<div class="_section reports">
-				<div class="_content">
-					<div class="inputs" style="display: flex;">
-						<MkSelect v-model="state" style="margin: 0; flex: 1;">
-							<template #label>{{ i18n.ts.state }}</template>
-							<option value="all">{{ i18n.ts.all }}</option>
-							<option value="unresolved">{{ i18n.ts.unresolved }}</option>
-							<option value="resolved">{{ i18n.ts.resolved }}</option>
-						</MkSelect>
-						<MkSelect v-model="targetUserOrigin" style="margin: 0; flex: 1;">
-							<template #label>{{ i18n.ts.reporteeOrigin }}</template>
-							<option value="combined">{{ i18n.ts.all }}</option>
-							<option value="local">{{ i18n.ts.local }}</option>
-							<option value="remote">{{ i18n.ts.remote }}</option>
-						</MkSelect>
-						<MkSelect v-model="reporterOrigin" style="margin: 0; flex: 1;">
-							<template #label>{{ i18n.ts.reporterOrigin }}</template>
-							<option value="combined">{{ i18n.ts.all }}</option>
-							<option value="local">{{ i18n.ts.local }}</option>
-							<option value="remote">{{ i18n.ts.remote }}</option>
-						</MkSelect>
-					</div>
-					<!-- TODO
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="900">
+			<div class="lcixvhis">
+				<div class="_section reports">
+					<div class="_content">
+						<div class="inputs" style="display: flex">
+							<MkSelect
+								v-model="state"
+								style="margin: 0; flex: 1"
+							>
+								<template #label>{{ i18n.ts.state }}</template>
+								<option value="all">{{ i18n.ts.all }}</option>
+								<option value="unresolved">
+									{{ i18n.ts.unresolved }}
+								</option>
+								<option value="resolved">
+									{{ i18n.ts.resolved }}
+								</option>
+							</MkSelect>
+							<MkSelect
+								v-model="targetUserOrigin"
+								style="margin: 0; flex: 1"
+							>
+								<template #label>{{
+									i18n.ts.reporteeOrigin
+								}}</template>
+								<option value="combined">
+									{{ i18n.ts.all }}
+								</option>
+								<option value="local">
+									{{ i18n.ts.local }}
+								</option>
+								<option value="remote">
+									{{ i18n.ts.remote }}
+								</option>
+							</MkSelect>
+							<MkSelect
+								v-model="reporterOrigin"
+								style="margin: 0; flex: 1"
+							>
+								<template #label>{{
+									i18n.ts.reporterOrigin
+								}}</template>
+								<option value="combined">
+									{{ i18n.ts.all }}
+								</option>
+								<option value="local">
+									{{ i18n.ts.local }}
+								</option>
+								<option value="remote">
+									{{ i18n.ts.remote }}
+								</option>
+							</MkSelect>
+						</div>
+						<!-- TODO
 			<div class="inputs" style="display: flex; padding-top: 1.2em;">
 				<MkInput v-model="searchUsername" style="margin: 0; flex: 1;" type="text" :spellcheck="false">
 					<span>{{ i18n.ts.username }}</span>
@@ -36,37 +70,47 @@
 			</div>
 			-->
 
-					<MkPagination v-slot="{items}" ref="reports" :pagination="pagination" style="margin-top: var(--margin);">
-						<XAbuseReport v-for="report in items" :key="report.id" :report="report" @resolved="resolved"/>
-					</MkPagination>
+						<MkPagination
+							v-slot="{ items }"
+							ref="reports"
+							:pagination="pagination"
+							style="margin-top: var(--margin)"
+						>
+							<XAbuseReport
+								v-for="report in items"
+								:key="report.id"
+								:report="report"
+								@resolved="resolved"
+							/>
+						</MkPagination>
+					</div>
 				</div>
 			</div>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
+import { computed } from "vue";
 
-import MkInput from '@/components/form/input.vue';
-import MkSelect from '@/components/form/select.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import XAbuseReport from '@/components/MkAbuseReport.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import MkInput from "@/components/form/input.vue";
+import MkSelect from "@/components/form/select.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import XAbuseReport from "@/components/MkAbuseReport.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let reports = $ref<InstanceType<typeof MkPagination>>();
 
-let state = $ref('unresolved');
-let reporterOrigin = $ref('combined');
-let targetUserOrigin = $ref('combined');
-let searchUsername = $ref('');
-let searchHost = $ref('');
+let state = $ref("unresolved");
+let reporterOrigin = $ref("combined");
+let targetUserOrigin = $ref("combined");
+let searchUsername = $ref("");
+let searchHost = $ref("");
 
 const pagination = {
-	endpoint: 'admin/abuse-user-reports' as const,
+	endpoint: "admin/abuse-user-reports" as const,
 	limit: 10,
 	params: computed(() => ({
 		state,
@@ -76,7 +120,7 @@ const pagination = {
 };
 
 function resolved(reportId) {
-	reports.removeItem(item => item.id === reportId);
+	reports.removeItem((item) => item.id === reportId);
 }
 
 const headerActions = $computed(() => []);
@@ -85,7 +129,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.abuseReports,
-	icon: 'ph-warning-circle ph-bold ph-lg',
+	icon: "ph-warning-circle ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue
index 6bc0069fa..9853158de 100644
--- a/packages/client/src/pages/admin/announcements.vue
+++ b/packages/client/src/pages/admin/announcements.vue
@@ -1,106 +1,139 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="900">
-		<div class="ztgjmzrw">
-			<section v-for="announcement in announcements" class="_card _gap announcements">
-				<div class="_content announcement">
-					<MkInput v-model="announcement.title">
-						<template #label>{{ i18n.ts.title }}</template>
-					</MkInput>
-					<MkTextarea v-model="announcement.text">
-						<template #label>{{ i18n.ts.text }}</template>
-					</MkTextarea>
-					<MkInput v-model="announcement.imageUrl">
-						<template #label>{{ i18n.ts.imageUrl }}</template>
-					</MkInput>
-					<p v-if="announcement.reads">{{ i18n.t('nUsersRead', { n: announcement.reads }) }}</p>
-					<div class="buttons">
-						<MkButton class="button" inline primary @click="save(announcement)"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-						<MkButton class="button" inline @click="remove(announcement)"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.remove }}</MkButton>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="900">
+			<div class="ztgjmzrw">
+				<section
+					v-for="announcement in announcements"
+					class="_card _gap announcements"
+				>
+					<div class="_content announcement">
+						<MkInput v-model="announcement.title">
+							<template #label>{{ i18n.ts.title }}</template>
+						</MkInput>
+						<MkTextarea v-model="announcement.text">
+							<template #label>{{ i18n.ts.text }}</template>
+						</MkTextarea>
+						<MkInput v-model="announcement.imageUrl">
+							<template #label>{{ i18n.ts.imageUrl }}</template>
+						</MkInput>
+						<p v-if="announcement.reads">
+							{{
+								i18n.t("nUsersRead", { n: announcement.reads })
+							}}
+						</p>
+						<div class="buttons">
+							<MkButton
+								class="button"
+								inline
+								primary
+								@click="save(announcement)"
+								><i
+									class="ph-floppy-disk-back ph-bold ph-lg"
+								></i>
+								{{ i18n.ts.save }}</MkButton
+							>
+							<MkButton
+								class="button"
+								inline
+								@click="remove(announcement)"
+								><i class="ph-trash ph-bold ph-lg"></i>
+								{{ i18n.ts.remove }}</MkButton
+							>
+						</div>
 					</div>
-				</div>
-			</section>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+				</section>
+			</div>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let announcements: any[] = $ref([]);
 
-os.api('admin/announcements/list').then(announcementResponse => {
+os.api("admin/announcements/list").then((announcementResponse) => {
 	announcements = announcementResponse;
 });
 
 function add() {
 	announcements.unshift({
 		id: null,
-		title: '',
-		text: '',
+		title: "",
+		text: "",
 		imageUrl: null,
 	});
 }
 
 function remove(announcement) {
 	os.confirm({
-		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: announcement.title }),
+		type: "warning",
+		text: i18n.t("removeAreYouSure", { x: announcement.title }),
 	}).then(({ canceled }) => {
 		if (canceled) return;
-		announcements = announcements.filter(x => x !== announcement);
-		os.api('admin/announcements/delete', announcement);
+		announcements = announcements.filter((x) => x !== announcement);
+		os.api("admin/announcements/delete", announcement);
 	});
 }
 
 function save(announcement) {
 	if (announcement.id == null) {
-		os.api('admin/announcements/create', announcement).then(() => {
-			os.alert({
-				type: 'success',
-				text: i18n.ts.saved,
+		os.api("admin/announcements/create", announcement)
+			.then(() => {
+				os.alert({
+					type: "success",
+					text: i18n.ts.saved,
+				});
+			})
+			.catch((err) => {
+				os.alert({
+					type: "error",
+					text: err,
+				});
 			});
-		}).catch(err => {
-			os.alert({
-				type: 'error',
-				text: err,
-			});
-		});
 	} else {
-		os.api('admin/announcements/update', announcement).then(() => {
-			os.alert({
-				type: 'success',
-				text: i18n.ts.saved,
+		os.api("admin/announcements/update", announcement)
+			.then(() => {
+				os.alert({
+					type: "success",
+					text: i18n.ts.saved,
+				});
+			})
+			.catch((err) => {
+				os.alert({
+					type: "error",
+					text: err,
+				});
 			});
-		}).catch(err => {
-			os.alert({
-				type: 'error',
-				text: err,
-			});
-		});
 	}
 }
 
-const headerActions = $computed(() => [{
-	asFullButton: true,
-	icon: 'ph-plus ph-bold ph-lg',
-	text: i18n.ts.add,
-	handler: add,
-}]);
+const headerActions = $computed(() => [
+	{
+		asFullButton: true,
+		icon: "ph-plus ph-bold ph-lg",
+		text: i18n.ts.add,
+		handler: add,
+	},
+]);
 
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.announcements,
-	icon: 'ph-megaphone-simple ph-bold ph-lg',
+	icon: "ph-megaphone-simple ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/admin/bot-protection.vue b/packages/client/src/pages/admin/bot-protection.vue
index 910bd8334..f47300e05 100644
--- a/packages/client/src/pages/admin/bot-protection.vue
+++ b/packages/client/src/pages/admin/bot-protection.vue
@@ -1,60 +1,92 @@
 <template>
-<div>
-	<FormSuspense :p="init">
-		<div class="_formRoot">
-			<FormRadios v-model="provider" class="_formBlock">
-				<option :value="null">{{ i18n.ts.none }} ({{ i18n.ts.notRecommended }})</option>
-				<option value="hcaptcha">hCaptcha</option>
-				<option value="recaptcha">reCAPTCHA</option>
-			</FormRadios>
+	<div>
+		<FormSuspense :p="init">
+			<div class="_formRoot">
+				<FormRadios v-model="provider" class="_formBlock">
+					<option :value="null">
+						{{ i18n.ts.none }} ({{ i18n.ts.notRecommended }})
+					</option>
+					<option value="hcaptcha">hCaptcha</option>
+					<option value="recaptcha">reCAPTCHA</option>
+				</FormRadios>
 
-			<template v-if="provider === 'hcaptcha'">
-				<FormInput v-model="hcaptchaSiteKey" class="_formBlock">
-					<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-					<template #label>{{ i18n.ts.hcaptchaSiteKey }}</template>
-				</FormInput>
-				<FormInput v-model="hcaptchaSecretKey" class="_formBlock">
-					<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-					<template #label>{{ i18n.ts.hcaptchaSecretKey }}</template>
-				</FormInput>
-				<FormSlot class="_formBlock">
-					<template #label>{{ i18n.ts.preview }}</template>
-					<MkCaptcha provider="hcaptcha" :sitekey="hcaptchaSiteKey || '10000000-ffff-ffff-ffff-000000000001'"/>
-				</FormSlot>
-			</template>
-			<template v-else-if="provider === 'recaptcha'">
-				<FormInput v-model="recaptchaSiteKey" class="_formBlock">
-					<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-					<template #label>{{ i18n.ts.recaptchaSiteKey }}</template>
-				</FormInput>
-				<FormInput v-model="recaptchaSecretKey" class="_formBlock">
-					<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-					<template #label>{{ i18n.ts.recaptchaSecretKey }}</template>
-				</FormInput>
-				<FormSlot v-if="recaptchaSiteKey" class="_formBlock">
-					<template #label>{{ i18n.ts.preview }}</template>
-					<MkCaptcha provider="recaptcha" :sitekey="recaptchaSiteKey"/>
-				</FormSlot>
-			</template>
+				<template v-if="provider === 'hcaptcha'">
+					<FormInput v-model="hcaptchaSiteKey" class="_formBlock">
+						<template #prefix
+							><i class="ph-key ph-bold ph-lg"></i
+						></template>
+						<template #label>{{
+							i18n.ts.hcaptchaSiteKey
+						}}</template>
+					</FormInput>
+					<FormInput v-model="hcaptchaSecretKey" class="_formBlock">
+						<template #prefix
+							><i class="ph-key ph-bold ph-lg"></i
+						></template>
+						<template #label>{{
+							i18n.ts.hcaptchaSecretKey
+						}}</template>
+					</FormInput>
+					<FormSlot class="_formBlock">
+						<template #label>{{ i18n.ts.preview }}</template>
+						<MkCaptcha
+							provider="hcaptcha"
+							:sitekey="
+								hcaptchaSiteKey ||
+								'10000000-ffff-ffff-ffff-000000000001'
+							"
+						/>
+					</FormSlot>
+				</template>
+				<template v-else-if="provider === 'recaptcha'">
+					<FormInput v-model="recaptchaSiteKey" class="_formBlock">
+						<template #prefix
+							><i class="ph-key ph-bold ph-lg"></i
+						></template>
+						<template #label>{{
+							i18n.ts.recaptchaSiteKey
+						}}</template>
+					</FormInput>
+					<FormInput v-model="recaptchaSecretKey" class="_formBlock">
+						<template #prefix
+							><i class="ph-key ph-bold ph-lg"></i
+						></template>
+						<template #label>{{
+							i18n.ts.recaptchaSecretKey
+						}}</template>
+					</FormInput>
+					<FormSlot v-if="recaptchaSiteKey" class="_formBlock">
+						<template #label>{{ i18n.ts.preview }}</template>
+						<MkCaptcha
+							provider="recaptcha"
+							:sitekey="recaptchaSiteKey"
+						/>
+					</FormSlot>
+				</template>
 
-			<FormButton primary @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
-		</div>
-	</FormSuspense>
-</div>
+				<FormButton primary @click="save"
+					><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+					{{ i18n.ts.save }}</FormButton
+				>
+			</div>
+		</FormSuspense>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent } from 'vue';
-import FormRadios from '@/components/form/radios.vue';
-import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/MkButton.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import FormSlot from '@/components/form/slot.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
+import { defineAsyncComponent } from "vue";
+import FormRadios from "@/components/form/radios.vue";
+import FormInput from "@/components/form/input.vue";
+import FormButton from "@/components/MkButton.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import FormSlot from "@/components/form/slot.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
 
-const MkCaptcha = defineAsyncComponent(() => import('@/components/MkCaptcha.vue'));
+const MkCaptcha = defineAsyncComponent(
+	() => import("@/components/MkCaptcha.vue")
+);
 
 let provider = $ref(null);
 let hcaptchaSiteKey: string | null = $ref(null);
@@ -63,21 +95,25 @@ let recaptchaSiteKey: string | null = $ref(null);
 let recaptchaSecretKey: string | null = $ref(null);
 
 async function init() {
-	const meta = await os.api('admin/meta');
+	const meta = await os.api("admin/meta");
 	hcaptchaSiteKey = meta.hcaptchaSiteKey;
 	hcaptchaSecretKey = meta.hcaptchaSecretKey;
 	recaptchaSiteKey = meta.recaptchaSiteKey;
 	recaptchaSecretKey = meta.recaptchaSecretKey;
 
-	provider = meta.enableHcaptcha ? 'hcaptcha' : meta.enableRecaptcha ? 'recaptcha' : null;
+	provider = meta.enableHcaptcha
+		? "hcaptcha"
+		: meta.enableRecaptcha
+		? "recaptcha"
+		: null;
 }
 
 function save() {
-	os.apiWithDialog('admin/update-meta', {
-		enableHcaptcha: provider === 'hcaptcha',
+	os.apiWithDialog("admin/update-meta", {
+		enableHcaptcha: provider === "hcaptcha",
 		hcaptchaSiteKey,
 		hcaptchaSecretKey,
-		enableRecaptcha: provider === 'recaptcha',
+		enableRecaptcha: provider === "recaptcha",
 		recaptchaSiteKey,
 		recaptchaSecretKey,
 	}).then(() => {
diff --git a/packages/client/src/pages/admin/custom-css.vue b/packages/client/src/pages/admin/custom-css.vue
index 8c0e0459e..2362c1f93 100644
--- a/packages/client/src/pages/admin/custom-css.vue
+++ b/packages/client/src/pages/admin/custom-css.vue
@@ -1,23 +1,31 @@
 <template>
-<div class="_formRoot">
-	<FormInfo warn class="_formBlock">{{ i18n.ts.adminCustomCssWarn }}</FormInfo>
+	<div class="_formRoot">
+		<FormInfo warn class="_formBlock">{{
+			i18n.ts.adminCustomCssWarn
+		}}</FormInfo>
 
-	<FormTextarea v-model="globalCustomCss" manual-save tall class="_monospace _formBlock" style="tab-size: 2;">
-		<template #label>Instance CSS</template>
-	</FormTextarea>
-</div>
+		<FormTextarea
+			v-model="globalCustomCss"
+			manual-save
+			tall
+			class="_monospace _formBlock"
+			style="tab-size: 2"
+		>
+			<template #label>Instance CSS</template>
+		</FormTextarea>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormInfo from '@/components/MkInfo.vue';
-import * as os from '@/os';
-import { unisonReload } from '@/scripts/unison-reload';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { ref, watch } from "vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormInfo from "@/components/MkInfo.vue";
+import * as os from "@/os";
+import { unisonReload } from "@/scripts/unison-reload";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const localCustomCss = ref(localStorage.getItem('customCss') ?? '');
+const localCustomCss = ref(localStorage.getItem("customCss") ?? "");
 
 /*
 async function apply() {
@@ -43,6 +51,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.customCss,
-	icon: 'ph-code ph-bold ph-lg',
+	icon: "ph-code ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/admin/database.vue b/packages/client/src/pages/admin/database.vue
index f8d49d829..f665d3813 100644
--- a/packages/client/src/pages/admin/database.vue
+++ b/packages/client/src/pages/admin/database.vue
@@ -1,26 +1,48 @@
-<template><MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
+<template>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
 		<MkSpacer :content-max="800" :margin-min="16" :margin-max="32">
-	<FormButton primary @click="indexPosts">{{ i18n.ts.indexPosts }}</FormButton>
-	<FormSuspense v-slot="{ result: database }" :p="databasePromiseFactory">
-		<MkKeyValue v-for="table in database" :key="table[0]" oneline style="margin: 1em 0;">
-			<template #key>{{ table[0] }}</template>
-			<template #value>{{ bytes(table[1].size) }} ({{ number(table[1].count) }} recs)</template>
-		</MkKeyValue>
-	</FormSuspense>
-</MkSpacer></MkStickyContainer>
+			<FormButton primary @click="indexPosts">{{
+				i18n.ts.indexPosts
+			}}</FormButton>
+			<FormSuspense
+				v-slot="{ result: database }"
+				:p="databasePromiseFactory"
+			>
+				<MkKeyValue
+					v-for="table in database"
+					:key="table[0]"
+					oneline
+					style="margin: 1em 0"
+				>
+					<template #key>{{ table[0] }}</template>
+					<template #value
+						>{{ bytes(table[1].size) }} ({{
+							number(table[1].count)
+						}}
+						recs)</template
+					>
+				</MkKeyValue>
+			</FormSuspense>
+		</MkSpacer></MkStickyContainer
+	>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import FormButton from '@/components/MkButton.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import * as os from '@/os';
-import bytes from '@/filters/bytes';
-import number from '@/filters/number';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import FormButton from "@/components/MkButton.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import * as os from "@/os";
+import bytes from "@/filters/bytes";
+import number from "@/filters/number";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 async function indexPosts() {
 	const { canceled, result: index } = await os.inputText({
@@ -29,24 +51,28 @@ async function indexPosts() {
 	if (canceled) return;
 
 	if (index == null || index === "") {
-		await os.api('admin/search/index-all');
+		await os.api("admin/search/index-all");
 		await os.alert({
-			type: 'info',
-			text: i18n.ts.indexNotice
+			type: "info",
+			text: i18n.ts.indexNotice,
 		});
-	}
-	else {
-		await os.api('admin/search/index-all', {
-			cursor: index
+	} else {
+		await os.api("admin/search/index-all", {
+			cursor: index,
 		});
 		await os.alert({
-			type: 'info',
-			text: i18n.ts.indexNotice
+			type: "info",
+			text: i18n.ts.indexNotice,
 		});
 	}
 }
 
-const databasePromiseFactory = () => os.api('admin/get-table-stats').then(res => Object.entries(res).sort((a, b) => b[1].size - a[1].size));
+const databasePromiseFactory = () =>
+	os
+		.api("admin/get-table-stats")
+		.then((res) =>
+			Object.entries(res).sort((a, b) => b[1].size - a[1].size)
+		);
 
 const headerActions = $computed(() => []);
 
@@ -54,6 +80,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.database,
-	icon: 'ph-database ph-bold ph-lg',
+	icon: "ph-database ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/admin/email-settings.vue b/packages/client/src/pages/admin/email-settings.vue
index 00116238b..3eaee5566 100644
--- a/packages/client/src/pages/admin/email-settings.vue
+++ b/packages/client/src/pages/admin/email-settings.vue
@@ -1,73 +1,118 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
-		<FormSuspense :p="init">
-			<div class="_formRoot">
-				<FormSwitch v-model="enableEmail" class="_formBlock">
-					<template #label>{{ i18n.ts.enableEmail }} ({{ i18n.ts.recommended }})</template>
-					<template #caption>{{ i18n.ts.emailConfigInfo }}</template>
-				</FormSwitch>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+			<FormSuspense :p="init">
+				<div class="_formRoot">
+					<FormSwitch v-model="enableEmail" class="_formBlock">
+						<template #label
+							>{{ i18n.ts.enableEmail }} ({{
+								i18n.ts.recommended
+							}})</template
+						>
+						<template #caption>{{
+							i18n.ts.emailConfigInfo
+						}}</template>
+					</FormSwitch>
 
-				<template v-if="enableEmail">
-					<FormInput v-model="email" type="email" class="_formBlock">
-						<template #label>{{ i18n.ts.emailAddress }}</template>
-					</FormInput>
+					<template v-if="enableEmail">
+						<FormInput
+							v-model="email"
+							type="email"
+							class="_formBlock"
+						>
+							<template #label>{{
+								i18n.ts.emailAddress
+							}}</template>
+						</FormInput>
 
-					<FormSection>
-						<template #label>{{ i18n.ts.smtpConfig }}</template>
-						<FormSplit :min-width="280">
-							<FormInput v-model="smtpHost" class="_formBlock">
-								<template #label>{{ i18n.ts.smtpHost }}</template>
-							</FormInput>
-							<FormInput v-model="smtpPort" type="number" class="_formBlock">
-								<template #label>{{ i18n.ts.smtpPort }}</template>
-							</FormInput>
-						</FormSplit>
-						<FormSplit :min-width="280">
-							<FormInput v-model="smtpUser" class="_formBlock">
-								<template #label>{{ i18n.ts.smtpUser }}</template>
-							</FormInput>
-							<FormInput v-model="smtpPass" type="password" class="_formBlock">
-								<template #label>{{ i18n.ts.smtpPass }}</template>
-							</FormInput>
-						</FormSplit>
-						<FormInfo class="_formBlock">{{ i18n.ts.emptyToDisableSmtpAuth }}</FormInfo>
-						<FormSwitch v-model="smtpSecure" class="_formBlock">
-							<template #label>{{ i18n.ts.smtpSecure }}</template>
-							<template #caption>{{ i18n.ts.smtpSecureInfo }}</template>
-						</FormSwitch>
-					</FormSection>
-				</template>
-			</div>
-		</FormSuspense>
-	</MkSpacer>
-</MkStickyContainer>
+						<FormSection>
+							<template #label>{{ i18n.ts.smtpConfig }}</template>
+							<FormSplit :min-width="280">
+								<FormInput
+									v-model="smtpHost"
+									class="_formBlock"
+								>
+									<template #label>{{
+										i18n.ts.smtpHost
+									}}</template>
+								</FormInput>
+								<FormInput
+									v-model="smtpPort"
+									type="number"
+									class="_formBlock"
+								>
+									<template #label>{{
+										i18n.ts.smtpPort
+									}}</template>
+								</FormInput>
+							</FormSplit>
+							<FormSplit :min-width="280">
+								<FormInput
+									v-model="smtpUser"
+									class="_formBlock"
+								>
+									<template #label>{{
+										i18n.ts.smtpUser
+									}}</template>
+								</FormInput>
+								<FormInput
+									v-model="smtpPass"
+									type="password"
+									class="_formBlock"
+								>
+									<template #label>{{
+										i18n.ts.smtpPass
+									}}</template>
+								</FormInput>
+							</FormSplit>
+							<FormInfo class="_formBlock">{{
+								i18n.ts.emptyToDisableSmtpAuth
+							}}</FormInfo>
+							<FormSwitch v-model="smtpSecure" class="_formBlock">
+								<template #label>{{
+									i18n.ts.smtpSecure
+								}}</template>
+								<template #caption>{{
+									i18n.ts.smtpSecureInfo
+								}}</template>
+							</FormSwitch>
+						</FormSection>
+					</template>
+				</div>
+			</FormSuspense>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormInput from '@/components/form/input.vue';
-import FormInfo from '@/components/MkInfo.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import FormSplit from '@/components/form/split.vue';
-import FormSection from '@/components/form/section.vue';
-import * as os from '@/os';
-import { fetchInstance, instance } from '@/instance';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormInput from "@/components/form/input.vue";
+import FormInfo from "@/components/MkInfo.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import FormSplit from "@/components/form/split.vue";
+import FormSection from "@/components/form/section.vue";
+import * as os from "@/os";
+import { fetchInstance, instance } from "@/instance";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let enableEmail: boolean = $ref(false);
 let email: any = $ref(null);
 let smtpSecure: boolean = $ref(false);
-let smtpHost: string = $ref('');
+let smtpHost: string = $ref("");
 let smtpPort: number = $ref(0);
-let smtpUser: string = $ref('');
-let smtpPass: string = $ref('');
+let smtpUser: string = $ref("");
+let smtpPass: string = $ref("");
 
 async function init() {
-	const meta = await os.api('admin/meta');
+	const meta = await os.api("admin/meta");
 	enableEmail = meta.enableEmail;
 	email = meta.email;
 	smtpSecure = meta.smtpSecure;
@@ -80,19 +125,19 @@ async function init() {
 async function testEmail() {
 	const { canceled, result: destination } = await os.inputText({
 		title: i18n.ts.destination,
-		type: 'email',
+		type: "email",
 		placeholder: instance.maintainerEmail,
 	});
 	if (canceled) return;
-	os.apiWithDialog('admin/send-email', {
+	os.apiWithDialog("admin/send-email", {
 		to: destination,
-		subject: 'Test email',
-		text: 'Yo',
+		subject: "Test email",
+		text: "Yo",
 	});
 }
 
 function save() {
-	os.apiWithDialog('admin/update-meta', {
+	os.apiWithDialog("admin/update-meta", {
 		enableEmail,
 		email,
 		smtpSecure,
@@ -105,22 +150,25 @@ function save() {
 	});
 }
 
-const headerActions = $computed(() => [{
-	asFullButton: true,
-	icon: 'ph-test-tube ph-bold ph-lg',
-	text: i18n.ts.testEmail,
-	handler: testEmail,
-}, {
-	asFullButton: true,
-	icon: 'ph-check ph-bold ph-lg',
-	text: i18n.ts.save,
-	handler: save,
-}]);
+const headerActions = $computed(() => [
+	{
+		asFullButton: true,
+		icon: "ph-test-tube ph-bold ph-lg",
+		text: i18n.ts.testEmail,
+		handler: testEmail,
+	},
+	{
+		asFullButton: true,
+		icon: "ph-check ph-bold ph-lg",
+		text: i18n.ts.save,
+		handler: save,
+	},
+]);
 
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.emailServer,
-	icon: 'ph-envelope-simple-open ph-bold ph-lg',
+	icon: "ph-envelope-simple-open ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/admin/emoji-edit-dialog.vue b/packages/client/src/pages/admin/emoji-edit-dialog.vue
index 6a969b617..73c3bab34 100644
--- a/packages/client/src/pages/admin/emoji-edit-dialog.vue
+++ b/packages/client/src/pages/admin/emoji-edit-dialog.vue
@@ -1,61 +1,70 @@
 <template>
-<XModalWindow
-	ref="dialog"
-	:width="370"
-	:with-ok-button="true"
-	@close="$refs.dialog.close()"
-	@closed="$emit('closed')"
-	@ok="ok()"
->
-	<template #header>:{{ emoji.name }}:</template>
+	<XModalWindow
+		ref="dialog"
+		:width="370"
+		:with-ok-button="true"
+		@close="$refs.dialog.close()"
+		@closed="$emit('closed')"
+		@ok="ok()"
+	>
+		<template #header>:{{ emoji.name }}:</template>
 
-	<div class="_monolithic_">
-		<div class="yigymqpb _section">
-			<img :src="emoji.url" class="img"/>
-			<MkInput v-model="name" class="_formBlock">
-				<template #label>{{ i18n.ts.name }}</template>
-			</MkInput>
-			<MkInput v-model="category" class="_formBlock" :datalist="categories">
-				<template #label>{{ i18n.ts.category }}</template>
-			</MkInput>
-			<MkInput v-model="aliases" class="_formBlock">
-				<template #label>{{ i18n.ts.tags }}</template>
-				<template #caption>{{ i18n.ts.setMultipleBySeparatingWithSpace }}</template>
-			</MkInput>
-			<MkTextarea v-model="license" class="_formBlock">
-				<template #label>{{ i18n.ts.license }}</template>
-			</MkTextarea>
-			<MkButton danger @click="del()"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
+		<div class="_monolithic_">
+			<div class="yigymqpb _section">
+				<img :src="emoji.url" class="img" />
+				<MkInput v-model="name" class="_formBlock">
+					<template #label>{{ i18n.ts.name }}</template>
+				</MkInput>
+				<MkInput
+					v-model="category"
+					class="_formBlock"
+					:datalist="categories"
+				>
+					<template #label>{{ i18n.ts.category }}</template>
+				</MkInput>
+				<MkInput v-model="aliases" class="_formBlock">
+					<template #label>{{ i18n.ts.tags }}</template>
+					<template #caption>{{
+						i18n.ts.setMultipleBySeparatingWithSpace
+					}}</template>
+				</MkInput>
+				<MkTextarea v-model="license" class="_formBlock">
+					<template #label>{{ i18n.ts.license }}</template>
+				</MkTextarea>
+				<MkButton danger @click="del()"
+					><i class="ph-trash ph-bold ph-lg"></i>
+					{{ i18n.ts.delete }}</MkButton
+				>
+			</div>
 		</div>
-	</div>
-</XModalWindow>
+	</XModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import * as os from '@/os';
-import { unique } from '@/scripts/array';
-import { i18n } from '@/i18n';
-import { emojiCategories } from '@/instance';
+import {} from "vue";
+import XModalWindow from "@/components/MkModalWindow.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import * as os from "@/os";
+import { unique } from "@/scripts/array";
+import { i18n } from "@/i18n";
+import { emojiCategories } from "@/instance";
 
 const props = defineProps<{
-	emoji: any,
+	emoji: any;
 }>();
 
 let dialog = $ref(null);
 let name: string = $ref(props.emoji.name);
 let category: string = $ref(props.emoji.category);
-let aliases: string = $ref(props.emoji.aliases.join(' '));
+let aliases: string = $ref(props.emoji.aliases.join(" "));
 let categories: string[] = $ref(emojiCategories);
-let license: string = $ref(props.emoji.license ?? '');
+let license: string = $ref(props.emoji.license ?? "");
 
 const emit = defineEmits<{
-	(ev: 'done', v: { deleted?: boolean, updated?: any }): void,
-	(ev: 'closed'): void
+	(ev: "done", v: { deleted?: boolean; updated?: any }): void;
+	(ev: "closed"): void;
 }>();
 
 function ok() {
@@ -63,21 +72,21 @@ function ok() {
 }
 
 async function update() {
-	await os.apiWithDialog('admin/emoji/update', {
+	await os.apiWithDialog("admin/emoji/update", {
 		id: props.emoji.id,
 		name,
 		category,
-		aliases: aliases.split(' '),
-		license: license === '' ? null : license,
+		aliases: aliases.split(" "),
+		license: license === "" ? null : license,
 	});
 
-	emit('done', {
+	emit("done", {
 		updated: {
 			id: props.emoji.id,
 			name,
 			category,
-			aliases: aliases.split(' '),
-			license: license === '' ? null : license,
+			aliases: aliases.split(" "),
+			license: license === "" ? null : license,
 		},
 	});
 
@@ -86,15 +95,15 @@ async function update() {
 
 async function del() {
 	const { canceled } = await os.confirm({
-		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: name }),
+		type: "warning",
+		text: i18n.t("removeAreYouSure", { x: name }),
 	});
 	if (canceled) return;
 
-	os.api('admin/emoji/delete', {
+	os.api("admin/emoji/delete", {
 		id: props.emoji.id,
 	}).then(() => {
-		emit('done', {
+		emit("done", {
 			deleted: true,
 		});
 		dialog.close();
diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue
index 766fc8b49..2db08cfdd 100644
--- a/packages/client/src/pages/admin/emojis.vue
+++ b/packages/client/src/pages/admin/emojis.vue
@@ -1,89 +1,180 @@
 <template>
-<div>
-	<MkStickyContainer>
-		<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-		<MkSpacer :content-max="900">
-			<div class="ogwlenmc">
-				<div v-if="tab === 'local'" class="local">
-					<MkInput v-model="query" :debounce="true" type="search">
-						<template #prefix><i class="ph-magnifying-glass ph-bold ph-lg"></i></template>
-						<template #label>{{ i18n.ts.search }}</template>
-					</MkInput>
-					<MkSwitch v-model="selectMode" style="margin: 8px 0;">
-						<template #label>Select mode</template>
-					</MkSwitch>
-					<div v-if="selectMode" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-						<MkButton inline @click="selectAll">Select all</MkButton>
-						<MkButton inline @click="setCategoryBulk">Set category</MkButton>
-						<MkButton inline @click="addTagBulk">Add tag</MkButton>
-						<MkButton inline @click="removeTagBulk">Remove tag</MkButton>
-						<MkButton inline @click="setTagBulk">Set tag</MkButton>
-						<MkButton inline @click="setLicenseBulk">Set license</MkButton>
-						<MkButton inline danger @click="delBulk">Delete</MkButton>
-					</div>
-					<MkPagination ref="emojisPaginationComponent" :pagination="pagination">
-						<template #empty><span>{{ i18n.ts.noCustomEmojis }}</span></template>
-						<template #default="{items}">
-							<div class="ldhfsamy">
-								<button v-for="emoji in items" :key="emoji.id" class="emoji _panel _button" :class="{ selected: selectedEmojis.includes(emoji.id) }" @click="selectMode ? toggleSelect(emoji) : edit(emoji)">
-									<img :src="emoji.url" class="img" :alt="emoji.name"/>
-									<div class="body">
-										<div class="name _monospace">{{ emoji.name }}</div>
-										<div class="info">{{ emoji.category }}</div>
-									</div>
-								</button>
-							</div>
-						</template>
-					</MkPagination>
-				</div>
-
-				<div v-else-if="tab === 'remote'" class="remote">
-					<FormSplit>
-						<MkInput v-model="queryRemote" :debounce="true" type="search">
-							<template #prefix><i class="ph-magnifying-glass ph-bold ph-lg"></i></template>
+	<div>
+		<MkStickyContainer>
+			<template #header
+				><MkPageHeader
+					v-model:tab="tab"
+					:actions="headerActions"
+					:tabs="headerTabs"
+					:display-back-button="true"
+			/></template>
+			<MkSpacer :content-max="900">
+				<div class="ogwlenmc">
+					<div v-if="tab === 'local'" class="local">
+						<MkInput v-model="query" :debounce="true" type="search">
+							<template #prefix
+								><i
+									class="ph-magnifying-glass ph-bold ph-lg"
+								></i
+							></template>
 							<template #label>{{ i18n.ts.search }}</template>
 						</MkInput>
-						<MkInput v-model="host" :debounce="true">
-							<template #label>{{ i18n.ts.host }}</template>
-						</MkInput>
-					</FormSplit>
-					<MkPagination :pagination="remotePagination">
-						<template #empty><span>{{ i18n.ts.noCustomEmojis }}</span></template>
-						<template #default="{items}">
-							<div class="ldhfsamy">
-								<div v-for="emoji in items" :key="emoji.id" class="emoji _panel _button" @click="remoteMenu(emoji, $event)">
-									<img :src="emoji.url" class="img" :alt="emoji.name"/>
-									<div class="body">
-										<div class="name _monospace">{{ emoji.name }}</div>
-										<div class="info">{{ emoji.host }}</div>
+						<MkSwitch v-model="selectMode" style="margin: 8px 0">
+							<template #label>Select mode</template>
+						</MkSwitch>
+						<div
+							v-if="selectMode"
+							style="
+								display: flex;
+								gap: var(--margin);
+								flex-wrap: wrap;
+							"
+						>
+							<MkButton inline @click="selectAll"
+								>Select all</MkButton
+							>
+							<MkButton inline @click="setCategoryBulk"
+								>Set category</MkButton
+							>
+							<MkButton inline @click="addTagBulk"
+								>Add tag</MkButton
+							>
+							<MkButton inline @click="removeTagBulk"
+								>Remove tag</MkButton
+							>
+							<MkButton inline @click="setTagBulk"
+								>Set tag</MkButton
+							>
+							<MkButton inline @click="setLicenseBulk"
+								>Set license</MkButton
+							>
+							<MkButton inline danger @click="delBulk"
+								>Delete</MkButton
+							>
+						</div>
+						<MkPagination
+							ref="emojisPaginationComponent"
+							:pagination="pagination"
+						>
+							<template #empty
+								><span>{{
+									i18n.ts.noCustomEmojis
+								}}</span></template
+							>
+							<template #default="{ items }">
+								<div class="ldhfsamy">
+									<button
+										v-for="emoji in items"
+										:key="emoji.id"
+										class="emoji _panel _button"
+										:class="{
+											selected: selectedEmojis.includes(
+												emoji.id
+											),
+										}"
+										@click="
+											selectMode
+												? toggleSelect(emoji)
+												: edit(emoji)
+										"
+									>
+										<img
+											:src="emoji.url"
+											class="img"
+											:alt="emoji.name"
+										/>
+										<div class="body">
+											<div class="name _monospace">
+												{{ emoji.name }}
+											</div>
+											<div class="info">
+												{{ emoji.category }}
+											</div>
+										</div>
+									</button>
+								</div>
+							</template>
+						</MkPagination>
+					</div>
+
+					<div v-else-if="tab === 'remote'" class="remote">
+						<FormSplit>
+							<MkInput
+								v-model="queryRemote"
+								:debounce="true"
+								type="search"
+							>
+								<template #prefix
+									><i
+										class="ph-magnifying-glass ph-bold ph-lg"
+									></i
+								></template>
+								<template #label>{{ i18n.ts.search }}</template>
+							</MkInput>
+							<MkInput v-model="host" :debounce="true">
+								<template #label>{{ i18n.ts.host }}</template>
+							</MkInput>
+						</FormSplit>
+						<MkPagination :pagination="remotePagination">
+							<template #empty
+								><span>{{
+									i18n.ts.noCustomEmojis
+								}}</span></template
+							>
+							<template #default="{ items }">
+								<div class="ldhfsamy">
+									<div
+										v-for="emoji in items"
+										:key="emoji.id"
+										class="emoji _panel _button"
+										@click="remoteMenu(emoji, $event)"
+									>
+										<img
+											:src="emoji.url"
+											class="img"
+											:alt="emoji.name"
+										/>
+										<div class="body">
+											<div class="name _monospace">
+												{{ emoji.name }}
+											</div>
+											<div class="info">
+												{{ emoji.host }}
+											</div>
+										</div>
 									</div>
 								</div>
-							</div>
-						</template>
-					</MkPagination>
+							</template>
+						</MkPagination>
+					</div>
 				</div>
-			</div>
-		</MkSpacer>
-	</MkStickyContainer>
-</div>
+			</MkSpacer>
+		</MkStickyContainer>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, defineComponent, ref, toRef } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkTab from '@/components/MkTab.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import FormSplit from '@/components/form/split.vue';
-import { selectFile, selectFiles } from '@/scripts/select-file';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {
+	computed,
+	defineAsyncComponent,
+	defineComponent,
+	ref,
+	toRef,
+} from "vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkTab from "@/components/MkTab.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import FormSplit from "@/components/form/split.vue";
+import { selectFile, selectFiles } from "@/scripts/select-file";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const emojisPaginationComponent = ref<InstanceType<typeof MkPagination>>();
 
-const tab = ref('local');
+const tab = ref("local");
 const query = ref(null);
 const queryRemote = ref(null);
 const host = ref(null);
@@ -91,19 +182,22 @@ const selectMode = ref(false);
 const selectedEmojis = ref<string[]>([]);
 
 const pagination = {
-	endpoint: 'admin/emoji/list' as const,
+	endpoint: "admin/emoji/list" as const,
 	limit: 30,
 	params: computed(() => ({
-		query: (query.value && query.value !== '') ? query.value : null,
+		query: query.value && query.value !== "" ? query.value : null,
 	})),
 };
 
 const remotePagination = {
-	endpoint: 'admin/emoji/list-remote' as const,
+	endpoint: "admin/emoji/list-remote" as const,
 	limit: 30,
 	params: computed(() => ({
-		query: (queryRemote.value && queryRemote.value !== '') ? queryRemote.value : null,
-		host: (host.value && host.value !== '') ? host.value : null,
+		query:
+			queryRemote.value && queryRemote.value !== ""
+				? queryRemote.value
+				: null,
+		host: host.value && host.value !== "" ? host.value : null,
 	})),
 };
 
@@ -111,13 +205,17 @@ const selectAll = () => {
 	if (selectedEmojis.value.length > 0) {
 		selectedEmojis.value = [];
 	} else {
-		selectedEmojis.value = emojisPaginationComponent.value.items.map(item => item.id);
+		selectedEmojis.value = emojisPaginationComponent.value.items.map(
+			(item) => item.id
+		);
 	}
 };
 
 const toggleSelect = (emoji) => {
 	if (selectedEmojis.value.includes(emoji.id)) {
-		selectedEmojis.value = selectedEmojis.value.filter(x => x !== emoji.id);
+		selectedEmojis.value = selectedEmojis.value.filter(
+			(x) => x !== emoji.id
+		);
 	} else {
 		selectedEmojis.value.push(emoji.id);
 	}
@@ -126,9 +224,13 @@ const toggleSelect = (emoji) => {
 const add = async (ev: MouseEvent) => {
 	const files = await selectFiles(ev.currentTarget ?? ev.target, null);
 
-	const promise = Promise.all(files.map(file => os.api('admin/emoji/add', {
-		fileId: file.id,
-	})));
+	const promise = Promise.all(
+		files.map((file) =>
+			os.api("admin/emoji/add", {
+				fileId: file.id,
+			})
+		)
+	);
 	promise.then(() => {
 		emojisPaginationComponent.value.reload();
 	});
@@ -136,87 +238,114 @@ const add = async (ev: MouseEvent) => {
 };
 
 const edit = (emoji) => {
-	os.popup(defineAsyncComponent(() => import('./emoji-edit-dialog.vue')), {
-		emoji: emoji,
-	}, {
-		done: result => {
-			if (result.updated) {
-				emojisPaginationComponent.value.updateItem(result.updated.id, (oldEmoji: any) => ({
-					...oldEmoji,
-					...result.updated,
-				}));
-			} else if (result.deleted) {
-				emojisPaginationComponent.value.removeItem((item) => item.id === emoji.id);
-			}
+	os.popup(
+		defineAsyncComponent(() => import("./emoji-edit-dialog.vue")),
+		{
+			emoji: emoji,
 		},
-	}, 'closed');
+		{
+			done: (result) => {
+				if (result.updated) {
+					emojisPaginationComponent.value.updateItem(
+						result.updated.id,
+						(oldEmoji: any) => ({
+							...oldEmoji,
+							...result.updated,
+						})
+					);
+				} else if (result.deleted) {
+					emojisPaginationComponent.value.removeItem(
+						(item) => item.id === emoji.id
+					);
+				}
+			},
+		},
+		"closed"
+	);
 };
 
 const im = (emoji) => {
-	os.apiWithDialog('admin/emoji/copy', {
+	os.apiWithDialog("admin/emoji/copy", {
 		emojiId: emoji.id,
 	});
 };
 
 const remoteMenu = (emoji, ev: MouseEvent) => {
-	os.popupMenu([{
-		type: 'label',
-		text: ':' + emoji.name + ':',
-	}, {
-		text: i18n.ts.import,
-		icon: 'ph-plus ph-bold ph-lg',
-		action: () => { im(emoji); },
-	}], ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		[
+			{
+				type: "label",
+				text: ":" + emoji.name + ":",
+			},
+			{
+				text: i18n.ts.import,
+				icon: "ph-plus ph-bold ph-lg",
+				action: () => {
+					im(emoji);
+				},
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
 };
 
 const menu = (ev: MouseEvent) => {
-	os.popupMenu([{
-		icon: 'ph-download-simple ph-bold ph-lg',
-		text: i18n.ts.export,
-		action: async () => {
-			os.api('export-custom-emojis', {
-			})
-				.then(() => {
-					os.alert({
-						type: 'info',
-						text: i18n.ts.exportRequested,
-					});
-				}).catch((err) => {
-					os.alert({
-						type: 'error',
-						text: err.message,
-					});
-				});
-		},
-	}, {
-		icon: 'ph-upload-simple ph-bold ph-lg',
-		text: i18n.ts.import,
-		action: async () => {
-			const file = await selectFile(ev.currentTarget ?? ev.target);
-			os.api('admin/emoji/import-zip', {
-				fileId: file.id,
-			})
-				.then(() => {
-					os.alert({
-						type: 'info',
-						text: i18n.ts.importRequested,
-					});
-				}).catch((err) => {
-					os.alert({
-						type: 'error',
-						text: err.message,
-					});
-				});
-		},
-	}], ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		[
+			{
+				icon: "ph-download-simple ph-bold ph-lg",
+				text: i18n.ts.export,
+				action: async () => {
+					os.api("export-custom-emojis", {})
+						.then(() => {
+							os.alert({
+								type: "info",
+								text: i18n.ts.exportRequested,
+							});
+						})
+						.catch((err) => {
+							os.alert({
+								type: "error",
+								text: err.message,
+							});
+						});
+				},
+			},
+			{
+				icon: "ph-upload-simple ph-bold ph-lg",
+				text: i18n.ts.import,
+				action: async () => {
+					const file = await selectFile(
+						ev.currentTarget ?? ev.target
+					);
+					os.api("admin/emoji/import-zip", {
+						fileId: file.id,
+					})
+						.then(() => {
+							os.alert({
+								type: "info",
+								text: i18n.ts.importRequested,
+							});
+						})
+						.catch((err) => {
+							os.alert({
+								type: "error",
+								text: err.message,
+							});
+						});
+				},
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
 };
 
 const setCategoryBulk = async () => {
 	const { canceled, result } = await os.inputText({
-		title: 'Category',
+		title: "Category",
 	});
 	if (canceled) return;
-	await os.apiWithDialog('admin/emoji/set-category-bulk', {
+	await os.apiWithDialog("admin/emoji/set-category-bulk", {
 		ids: selectedEmojis.value,
 		category: result,
 	});
@@ -225,46 +354,46 @@ const setCategoryBulk = async () => {
 
 const addTagBulk = async () => {
 	const { canceled, result } = await os.inputText({
-		title: 'Tag',
+		title: "Tag",
 	});
 	if (canceled) return;
-	await os.apiWithDialog('admin/emoji/add-aliases-bulk', {
+	await os.apiWithDialog("admin/emoji/add-aliases-bulk", {
 		ids: selectedEmojis.value,
-		aliases: result.split(' '),
+		aliases: result.split(" "),
 	});
 	emojisPaginationComponent.value.reload();
 };
 
 const removeTagBulk = async () => {
 	const { canceled, result } = await os.inputText({
-		title: 'Tag',
+		title: "Tag",
 	});
 	if (canceled) return;
-	await os.apiWithDialog('admin/emoji/remove-aliases-bulk', {
+	await os.apiWithDialog("admin/emoji/remove-aliases-bulk", {
 		ids: selectedEmojis.value,
-		aliases: result.split(' '),
+		aliases: result.split(" "),
 	});
 	emojisPaginationComponent.value.reload();
 };
 
 const setTagBulk = async () => {
 	const { canceled, result } = await os.inputText({
-		title: 'Tag',
+		title: "Tag",
 	});
 	if (canceled) return;
-	await os.apiWithDialog('admin/emoji/set-aliases-bulk', {
+	await os.apiWithDialog("admin/emoji/set-aliases-bulk", {
 		ids: selectedEmojis.value,
-		aliases: result.split(' '),
+		aliases: result.split(" "),
 	});
 	emojisPaginationComponent.value.reload();
 };
 
 const setLicenseBulk = async () => {
 	const { canceled, result } = await os.inputParagraph({
-		title: 'License',
+		title: "License",
 	});
 	if (canceled) return;
-	await os.apiWithDialog('admin/emoji/set-license-bulk', {
+	await os.apiWithDialog("admin/emoji/set-license-bulk", {
 		ids: selectedEmojis.value,
 		license: result,
 	});
@@ -273,40 +402,48 @@ const setLicenseBulk = async () => {
 
 const delBulk = async () => {
 	const { canceled } = await os.confirm({
-		type: 'warning',
+		type: "warning",
 		text: i18n.ts.deleteConfirm,
 	});
 	if (canceled) return;
-	await os.apiWithDialog('admin/emoji/delete-bulk', {
+	await os.apiWithDialog("admin/emoji/delete-bulk", {
 		ids: selectedEmojis.value,
 	});
 	emojisPaginationComponent.value.reload();
 };
 
-const headerActions = $computed(() => [{
-	asFullButton: true,
-	icon: 'ph-plus ph-bold ph-lg',
-	text: i18n.ts.addEmoji,
-	handler: add,
-}, {
-	icon: 'ph-dots-three-outline ph-bold ph-lg',
-	handler: menu,
-}]);
+const headerActions = $computed(() => [
+	{
+		asFullButton: true,
+		icon: "ph-plus ph-bold ph-lg",
+		text: i18n.ts.addEmoji,
+		handler: add,
+	},
+	{
+		icon: "ph-dots-three-outline ph-bold ph-lg",
+		handler: menu,
+	},
+]);
 
-const headerTabs = $computed(() => [{
-	key: 'local',
-	icon: 'ph-hand-fist ph-bold ph-lg',
-	title: i18n.ts.local,
-}, {
-	key: 'remote',
-	icon: 'ph-planet ph-bold ph-lg',
-	title: i18n.ts.remote,
-}]);
+const headerTabs = $computed(() => [
+	{
+		key: "local",
+		icon: "ph-hand-fist ph-bold ph-lg",
+		title: i18n.ts.local,
+	},
+	{
+		key: "remote",
+		icon: "ph-planet ph-bold ph-lg",
+		title: i18n.ts.remote,
+	},
+]);
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.customEmojis,
-	icon: 'ph-smiley ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.customEmojis,
+		icon: "ph-smiley ph-bold ph-lg",
+	}))
+);
 </script>
 
 <style lang="scss" scoped>
@@ -321,7 +458,7 @@ definePageMetadata(computed(() => ({
 			grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
 			grid-gap: 12px;
 			margin: var(--margin) 0;
-	
+
 			> .emoji {
 				display: flex;
 				align-items: center;
diff --git a/packages/client/src/pages/admin/federation.vue b/packages/client/src/pages/admin/federation.vue
index 04294740c..325ba32be 100644
--- a/packages/client/src/pages/admin/federation.vue
+++ b/packages/client/src/pages/admin/federation.vue
@@ -1,26 +1,34 @@
 <template>
-<div>
-	<MkStickyContainer>
-		<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-		<MkSpacer :content-max="900">
-			<XFederation/>
-		</MkSpacer>
-	</MkStickyContainer>
-</div>
+	<div>
+		<MkStickyContainer>
+			<template #header
+				><MkPageHeader
+					v-model:tab="tab"
+					:actions="headerActions"
+					:tabs="headerTabs"
+					:display-back-button="true"
+			/></template>
+			<MkSpacer :content-max="900">
+				<XFederation />
+			</MkSpacer>
+		</MkStickyContainer>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
-import XFederation from '@/pages/about.federation.vue';
+import { computed } from "vue";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
+import XFederation from "@/pages/about.federation.vue";
 
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.federation,
-	icon: 'ph-planet ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.federation,
+		icon: "ph-planet ph-bold ph-lg",
+	}))
+);
 </script>
diff --git a/packages/client/src/pages/admin/files.vue b/packages/client/src/pages/admin/files.vue
index 9bae0053c..e752eb82c 100644
--- a/packages/client/src/pages/admin/files.vue
+++ b/packages/client/src/pages/admin/files.vue
@@ -1,73 +1,120 @@
 <template>
-<div>
-	<MkStickyContainer>
-		<template #header><MkPageHeader :actions="headerActions"/></template>
-		<MkSpacer :content-max="900">
-			<div class="xrmjdkdw">
-				<div>
-					<div class="inputs" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-						<MkSelect v-model="origin" style="margin: 0; flex: 1;">
-							<template #label>{{ i18n.ts.instance }}</template>
-							<option value="combined">{{ i18n.ts.all }}</option>
-							<option value="local">{{ i18n.ts.local }}</option>
-							<option value="remote">{{ i18n.ts.remote }}</option>
-						</MkSelect>
-						<MkInput v-model="searchHost" :debounce="true" type="search" style="margin: 0; flex: 1;" :disabled="pagination.params.origin === 'local'">
-							<template #label>{{ i18n.ts.host }}</template>
-						</MkInput>
+	<div>
+		<MkStickyContainer>
+			<template #header
+				><MkPageHeader :actions="headerActions"
+			/></template>
+			<MkSpacer :content-max="900">
+				<div class="xrmjdkdw">
+					<div>
+						<div
+							class="inputs"
+							style="
+								display: flex;
+								gap: var(--margin);
+								flex-wrap: wrap;
+							"
+						>
+							<MkSelect
+								v-model="origin"
+								style="margin: 0; flex: 1"
+							>
+								<template #label>{{
+									i18n.ts.instance
+								}}</template>
+								<option value="combined">
+									{{ i18n.ts.all }}
+								</option>
+								<option value="local">
+									{{ i18n.ts.local }}
+								</option>
+								<option value="remote">
+									{{ i18n.ts.remote }}
+								</option>
+							</MkSelect>
+							<MkInput
+								v-model="searchHost"
+								:debounce="true"
+								type="search"
+								style="margin: 0; flex: 1"
+								:disabled="pagination.params.origin === 'local'"
+							>
+								<template #label>{{ i18n.ts.host }}</template>
+							</MkInput>
+						</div>
+						<div
+							class="inputs"
+							style="
+								display: flex;
+								gap: var(--margin);
+								flex-wrap: wrap;
+								padding-top: 1.2em;
+							"
+						>
+							<MkInput
+								v-model="userId"
+								:debounce="true"
+								type="search"
+								style="margin: 0; flex: 1"
+							>
+								<template #label>User ID</template>
+							</MkInput>
+							<MkInput
+								v-model="type"
+								:debounce="true"
+								type="search"
+								style="margin: 0; flex: 1"
+							>
+								<template #label>MIME type</template>
+							</MkInput>
+						</div>
+						<MkFileListForAdmin
+							:pagination="pagination"
+							:view-mode="viewMode"
+						/>
 					</div>
-					<div class="inputs" style="display: flex; gap: var(--margin); flex-wrap: wrap; padding-top: 1.2em;">
-						<MkInput v-model="userId" :debounce="true" type="search" style="margin: 0; flex: 1;">
-							<template #label>User ID</template>
-						</MkInput>
-						<MkInput v-model="type" :debounce="true" type="search" style="margin: 0; flex: 1;">
-							<template #label>MIME type</template>
-						</MkInput>
-					</div>
-					<MkFileListForAdmin :pagination="pagination" :view-mode="viewMode"/>
 				</div>
-			</div>
-		</MkSpacer>
-	</MkStickyContainer>
-</div>
+			</MkSpacer>
+		</MkStickyContainer>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent } from 'vue';
-import * as Acct from 'calckey-js/built/acct';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkSelect from '@/components/form/select.vue';
-import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
-import bytes from '@/filters/bytes';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, defineAsyncComponent } from "vue";
+import * as Acct from "calckey-js/built/acct";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkSelect from "@/components/form/select.vue";
+import MkFileListForAdmin from "@/components/MkFileListForAdmin.vue";
+import bytes from "@/filters/bytes";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-let origin = $ref('local');
+let origin = $ref("local");
 let type = $ref(null);
-let searchHost = $ref('');
-let userId = $ref('');
-let viewMode = $ref('grid');
+let searchHost = $ref("");
+let userId = $ref("");
+let viewMode = $ref("grid");
 const pagination = {
-	endpoint: 'admin/drive/files' as const,
+	endpoint: "admin/drive/files" as const,
 	limit: 10,
 	params: computed(() => ({
-		type: (type && type !== '') ? type : null,
-		userId: (userId && userId !== '') ? userId : null,
+		type: type && type !== "" ? type : null,
+		userId: userId && userId !== "" ? userId : null,
 		origin: origin,
-		hostname: (searchHost && searchHost !== '') ? searchHost : null,
+		hostname: searchHost && searchHost !== "" ? searchHost : null,
 	})),
 };
 
 function clear() {
 	os.confirm({
-		type: 'warning',
+		type: "warning",
 		text: i18n.ts.clearCachedFilesConfirm,
 	}).then(({ canceled }) => {
 		if (canceled) return;
 
-		os.apiWithDialog('admin/drive/clean-remote-files', {});
+		os.apiWithDialog("admin/drive/clean-remote-files", {});
 	});
 }
 
@@ -82,34 +129,46 @@ async function find() {
 	});
 	if (canceled) return;
 
-	os.api('admin/drive/show-file', q.startsWith('http://') || q.startsWith('https://') ? { url: q.trim() } : { fileId: q.trim() }).then(file => {
-		show(file);
-	}).catch(err => {
-		if (err.code === 'NO_SUCH_FILE') {
-			os.alert({
-				type: 'error',
-				text: i18n.ts.notFound,
-			});
-		}
-	});
+	os.api(
+		"admin/drive/show-file",
+		q.startsWith("http://") || q.startsWith("https://")
+			? { url: q.trim() }
+			: { fileId: q.trim() }
+	)
+		.then((file) => {
+			show(file);
+		})
+		.catch((err) => {
+			if (err.code === "NO_SUCH_FILE") {
+				os.alert({
+					type: "error",
+					text: i18n.ts.notFound,
+				});
+			}
+		});
 }
 
-const headerActions = $computed(() => [{
-	text: i18n.ts.lookup,
-	icon: 'ph-magnifying-glass ph-bold ph-lg',
-	handler: find,
-}, {
-	text: i18n.ts.clearCachedFiles,
-	icon: 'ph-trash ph-bold ph-lg',
-	handler: clear,
-}]);
+const headerActions = $computed(() => [
+	{
+		text: i18n.ts.lookup,
+		icon: "ph-magnifying-glass ph-bold ph-lg",
+		handler: find,
+	},
+	{
+		text: i18n.ts.clearCachedFiles,
+		icon: "ph-trash ph-bold ph-lg",
+		handler: clear,
+	},
+]);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.files,
-	icon: 'ph-cloud ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.files,
+		icon: "ph-cloud ph-bold ph-lg",
+	}))
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index cbab4a640..1e4438a66 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -1,78 +1,131 @@
 <template>
-<div ref="el" class="hiyeyicy" :class="{ wide: !narrow }">
-	<div v-if="!narrow || currentPage?.route.name == null" class="nav">
-		<MkSpacer :content-max="700" :margin-min="16">
-			<div class="lxpfedzu">
-				<div class="banner">
-					<img :src="$instance.iconUrl || '/favicon.ico'" alt="" class="icon"/>
+	<div ref="el" class="hiyeyicy" :class="{ wide: !narrow }">
+		<div v-if="!narrow || currentPage?.route.name == null" class="nav">
+			<MkSpacer :content-max="700" :margin-min="16">
+				<div class="lxpfedzu">
+					<div class="banner">
+						<img
+							:src="$instance.iconUrl || '/favicon.ico'"
+							alt=""
+							class="icon"
+						/>
+					</div>
+
+					<MkInfo
+						v-if="thereIsUnresolvedAbuseReport"
+						warn
+						class="info"
+						>{{ i18n.ts.thereIsUnresolvedAbuseReportWarning }}
+						<MkA to="/admin/abuses" class="_link">{{
+							i18n.ts.check
+						}}</MkA></MkInfo
+					>
+					<MkInfo v-if="noMaintainerInformation" warn class="info"
+						>{{ i18n.ts.noMaintainerInformationWarning }}
+						<MkA to="/admin/settings" class="_link">{{
+							i18n.ts.configure
+						}}</MkA></MkInfo
+					>
+					<MkInfo v-if="noBotProtection" warn class="info"
+						>{{ i18n.ts.noBotProtectionWarning }}
+						<MkA to="/admin/security" class="_link">{{
+							i18n.ts.configure
+						}}</MkA></MkInfo
+					>
+					<MkInfo v-if="noEmailServer" warn class="info"
+						>{{ i18n.ts.noEmailServerWarning }}
+						<MkA to="/admin/email-settings" class="_link">{{
+							i18n.ts.configure
+						}}</MkA></MkInfo
+					>
+					<MkInfo v-if="updateAvailable" warn class="info"
+						>{{ i18n.ts.updateAvailable }}
+						<a
+							href="https://codeberg.org/calckey/calckey/releases"
+							target="_bank"
+							class="_link"
+							>{{ i18n.ts.check }}</a
+						></MkInfo
+					>
+
+					<MkSuperMenu :def="menuDef" :grid="narrow"></MkSuperMenu>
 				</div>
-
-				<MkInfo v-if="thereIsUnresolvedAbuseReport" warn class="info">{{ i18n.ts.thereIsUnresolvedAbuseReportWarning }} <MkA to="/admin/abuses" class="_link">{{ i18n.ts.check }}</MkA></MkInfo>
-				<MkInfo v-if="noMaintainerInformation" warn class="info">{{ i18n.ts.noMaintainerInformationWarning }} <MkA to="/admin/settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
-				<MkInfo v-if="noBotProtection" warn class="info">{{ i18n.ts.noBotProtectionWarning }} <MkA to="/admin/security" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
-				<MkInfo v-if="noEmailServer" warn class="info">{{ i18n.ts.noEmailServerWarning }} <MkA to="/admin/email-settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
-				<MkInfo v-if="updateAvailable" warn class="info">{{ i18n.ts.updateAvailable }} <a href="https://codeberg.org/calckey/calckey/releases" target="_bank" class="_link">{{ i18n.ts.check }}</a></MkInfo>
-
-				<MkSuperMenu :def="menuDef" :grid="narrow"></MkSuperMenu>
-			</div>
-		</MkSpacer>
+			</MkSpacer>
+		</div>
+		<div v-if="!(narrow && currentPage?.route.name == null)" class="main">
+			<RouterView />
+		</div>
 	</div>
-	<div v-if="!(narrow && currentPage?.route.name == null)" class="main">
-		<RouterView/>
-	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, inject, nextTick, onMounted, onUnmounted, onActivated, provide, watch, ref } from 'vue';
-import { i18n } from '@/i18n';
-import MkSuperMenu from '@/components/MkSuperMenu.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import { scroll } from '@/scripts/scroll';
-import { instance } from '@/instance';
-import { version } from '@/config';
-import { $i } from '@/account'
-import * as os from '@/os';
-import { lookupUser } from '@/scripts/lookup-user';
-import { defaultStore } from '@/store';
-import { useRouter } from '@/router';
-import { definePageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
+import {
+	defineAsyncComponent,
+	inject,
+	nextTick,
+	onMounted,
+	onUnmounted,
+	onActivated,
+	provide,
+	watch,
+	ref,
+} from "vue";
+import { i18n } from "@/i18n";
+import MkSuperMenu from "@/components/MkSuperMenu.vue";
+import MkInfo from "@/components/MkInfo.vue";
+import { scroll } from "@/scripts/scroll";
+import { instance } from "@/instance";
+import { version } from "@/config";
+import { $i } from "@/account";
+import * as os from "@/os";
+import { lookupUser } from "@/scripts/lookup-user";
+import { defaultStore } from "@/store";
+import { useRouter } from "@/router";
+import {
+	definePageMetadata,
+	provideMetadataReceiver,
+	setPageMetadata,
+} from "@/scripts/page-metadata";
 
-const isEmpty = (x: string | null) => x == null || x === '';
+const isEmpty = (x: string | null) => x == null || x === "";
 const el = ref<HTMLElement | null>(null);
 const router = useRouter();
 
 const indexInfo = {
 	title: i18n.ts.controlPanel,
-	icon: 'ph-gear-six ph-bold ph-lg',
+	icon: "ph-gear-six ph-bold ph-lg",
 	hideHeader: true,
 };
 
-provide('shouldOmitHeaderTitle', false);
+provide("shouldOmitHeaderTitle", false);
 
 let INFO = $ref(indexInfo);
 let childInfo = $ref(null);
 let narrow = $ref(false);
 let view = $ref(null);
 let pageProps = $ref({});
-let noMaintainerInformation = isEmpty(instance.maintainerName) || isEmpty(instance.maintainerEmail);
-let noBotProtection = !instance.disableRegistration && !instance.enableHcaptcha && !instance.enableRecaptcha;
+let noMaintainerInformation =
+	isEmpty(instance.maintainerName) || isEmpty(instance.maintainerEmail);
+let noBotProtection =
+	!instance.disableRegistration &&
+	!instance.enableHcaptcha &&
+	!instance.enableRecaptcha;
 let noEmailServer = !instance.enableEmail;
 let thereIsUnresolvedAbuseReport = $ref(false);
 let updateAvailable = $ref(false);
 let currentPage = $computed(() => router.currentRef.value.child);
 
-os.api('admin/abuse-user-reports', {
-	state: 'unresolved',
+os.api("admin/abuse-user-reports", {
+	state: "unresolved",
 	limit: 1,
-}).then(reports => {
+}).then((reports) => {
 	if (reports?.length > 0) thereIsUnresolvedAbuseReport = true;
 });
 
 if (defaultStore.state.showAdminUpdates) {
-	os.api('latest-version').then(res => {
-		const cleanRes = parseInt(res?.tag_name.replace(/[^0-9]/g, ''));
-		const cleanVersion = parseInt(version.replace(/[^0-9]/g, ''));
+	os.api("latest-version").then((res) => {
+		const cleanRes = parseInt(res?.tag_name.replace(/[^0-9]/g, ""));
+		const cleanVersion = parseInt(version.replace(/[^0-9]/g, ""));
 		if (cleanRes > cleanVersion) {
 			updateAvailable = true;
 		}
@@ -85,121 +138,158 @@ const ro = new ResizeObserver((entries, observer) => {
 	narrow = entries[0].borderBoxSize[0].inlineSize < NARROW_THRESHOLD;
 });
 
-const menuDef = $computed(() => [{
-	title: i18n.ts.quickAction,
-	items: [{
-		type: 'button',
-		icon: 'ph-magnifying-glass ph-bold ph-lg',
-		text: i18n.ts.lookup,
-		action: lookup,
-	}, ...(instance.disableRegistration ? [{
-		type: 'button',
-		icon: 'ph-user-plus ph-bold ph-lg',
-		text: i18n.ts.invite,
-		action: invite,
-	}] : [])],
-}, {
-	title: i18n.ts.administration,
-	items: [{
-		icon: 'ph-gauge ph-bold ph-lg',
-		text: i18n.ts.dashboard,
-		to: '/admin/overview',
-		active: currentPage?.route.name === 'overview',
-	}, {
-		icon: 'ph-users ph-bold ph-lg',
-		text: i18n.ts.users,
-		to: '/admin/users',
-		active: currentPage?.route.name === 'users',
-	}, {
-		icon: 'ph-smiley ph-bold ph-lg',
-		text: i18n.ts.customEmojis,
-		to: '/admin/emojis',
-		active: currentPage?.route.name === 'emojis',
-	}, {
-		icon: 'ph-planet ph-bold ph-lg',
-		text: i18n.ts.federation,
-		to: '/admin/federation',
-		active: currentPage?.route.name === 'federation',
-	}, {
-		icon: 'ph-clipboard-text ph-bold ph-lg',
-		text: i18n.ts.jobQueue,
-		to: '/admin/queue',
-		active: currentPage?.route.name === 'queue',
-	}, {
-		icon: 'ph-cloud ph-bold ph-lg',
-		text: i18n.ts.files,
-		to: '/admin/files',
-		active: currentPage?.route.name === 'files',
-	}, {
-		icon: 'ph-megaphone-simple ph-bold ph-lg',
-		text: i18n.ts.announcements,
-		to: '/admin/announcements',
-		active: currentPage?.route.name === 'announcements',
-	}, {
-		icon: 'ph-money ph-bold ph-lg',
-		text: i18n.ts.ads,
-		to: '/admin/ads',
-		active: currentPage?.route.name === 'ads',
-	}, {
-		icon: 'ph-warning-circle ph-bold ph-lg',
-		text: i18n.ts.abuseReports,
-		to: '/admin/abuses',
-		active: currentPage?.route.name === 'abuses',
-	}],
-}, ...($i?.isAdmin ? [{
-	title: i18n.ts.settings,
-	items: [{
-		icon: 'ph-gear-six ph-bold ph-lg',
-		text: i18n.ts.general,
-		to: '/admin/settings',
-		active: currentPage?.route.name === 'settings',
-	}, {
-		icon: 'ph-envelope-simple-open ph-bold ph-lg',
-		text: i18n.ts.emailServer,
-		to: '/admin/email-settings',
-		active: currentPage?.route.name === 'email-settings',
-	}, {
-		icon: 'ph-cloud ph-bold ph-lg',
-		text: i18n.ts.objectStorage,
-		to: '/admin/object-storage',
-		active: currentPage?.route.name === 'object-storage',
-	}, {
-		icon: 'ph-lock ph-bold ph-lg',
-		text: i18n.ts.security,
-		to: '/admin/security',
-		active: currentPage?.route.name === 'security',
-	}, {
-		icon: 'ph-flow-arrow ph-bold ph-lg',
-		text: i18n.ts.relays,
-		to: '/admin/relays',
-		active: currentPage?.route.name === 'relays',
-	}, {
-		icon: 'ph-plug ph-bold ph-lg',
-		text: i18n.ts.integration,
-		to: '/admin/integrations',
-		active: currentPage?.route.name === 'integrations',
-	}, {
-		icon: 'ph-prohibit ph-bold ph-lg',
-		text: i18n.ts.instanceBlocking,
-		to: '/admin/instance-block',
-		active: currentPage?.route.name === 'instance-block',
-	}, {
-		icon: 'ph-ghost ph-bold ph-lg',
-		text: i18n.ts.proxyAccount,
-		to: '/admin/proxy-account',
-		active: currentPage?.route.name === 'proxy-account',
+const menuDef = $computed(() => [
+	{
+		title: i18n.ts.quickAction,
+		items: [
+			{
+				type: "button",
+				icon: "ph-magnifying-glass ph-bold ph-lg",
+				text: i18n.ts.lookup,
+				action: lookup,
+			},
+			...(instance.disableRegistration
+				? [
+						{
+							type: "button",
+							icon: "ph-user-plus ph-bold ph-lg",
+							text: i18n.ts.invite,
+							action: invite,
+						},
+				  ]
+				: []),
+		],
 	},
 	{
-		icon: 'ph-database ph-bold ph-lg',
-		text: i18n.ts.database,
-		to: '/admin/database',
-		active: currentPage?.route.name === 'database',
-	}],
-}] : [])]);
+		title: i18n.ts.administration,
+		items: [
+			{
+				icon: "ph-gauge ph-bold ph-lg",
+				text: i18n.ts.dashboard,
+				to: "/admin/overview",
+				active: currentPage?.route.name === "overview",
+			},
+			{
+				icon: "ph-users ph-bold ph-lg",
+				text: i18n.ts.users,
+				to: "/admin/users",
+				active: currentPage?.route.name === "users",
+			},
+			{
+				icon: "ph-smiley ph-bold ph-lg",
+				text: i18n.ts.customEmojis,
+				to: "/admin/emojis",
+				active: currentPage?.route.name === "emojis",
+			},
+			{
+				icon: "ph-planet ph-bold ph-lg",
+				text: i18n.ts.federation,
+				to: "/admin/federation",
+				active: currentPage?.route.name === "federation",
+			},
+			{
+				icon: "ph-clipboard-text ph-bold ph-lg",
+				text: i18n.ts.jobQueue,
+				to: "/admin/queue",
+				active: currentPage?.route.name === "queue",
+			},
+			{
+				icon: "ph-cloud ph-bold ph-lg",
+				text: i18n.ts.files,
+				to: "/admin/files",
+				active: currentPage?.route.name === "files",
+			},
+			{
+				icon: "ph-megaphone-simple ph-bold ph-lg",
+				text: i18n.ts.announcements,
+				to: "/admin/announcements",
+				active: currentPage?.route.name === "announcements",
+			},
+			{
+				icon: "ph-money ph-bold ph-lg",
+				text: i18n.ts.ads,
+				to: "/admin/ads",
+				active: currentPage?.route.name === "ads",
+			},
+			{
+				icon: "ph-warning-circle ph-bold ph-lg",
+				text: i18n.ts.abuseReports,
+				to: "/admin/abuses",
+				active: currentPage?.route.name === "abuses",
+			},
+		],
+	},
+	...($i?.isAdmin
+		? [
+				{
+					title: i18n.ts.settings,
+					items: [
+						{
+							icon: "ph-gear-six ph-bold ph-lg",
+							text: i18n.ts.general,
+							to: "/admin/settings",
+							active: currentPage?.route.name === "settings",
+						},
+						{
+							icon: "ph-envelope-simple-open ph-bold ph-lg",
+							text: i18n.ts.emailServer,
+							to: "/admin/email-settings",
+							active:
+								currentPage?.route.name === "email-settings",
+						},
+						{
+							icon: "ph-cloud ph-bold ph-lg",
+							text: i18n.ts.objectStorage,
+							to: "/admin/object-storage",
+							active:
+								currentPage?.route.name === "object-storage",
+						},
+						{
+							icon: "ph-lock ph-bold ph-lg",
+							text: i18n.ts.security,
+							to: "/admin/security",
+							active: currentPage?.route.name === "security",
+						},
+						{
+							icon: "ph-flow-arrow ph-bold ph-lg",
+							text: i18n.ts.relays,
+							to: "/admin/relays",
+							active: currentPage?.route.name === "relays",
+						},
+						{
+							icon: "ph-plug ph-bold ph-lg",
+							text: i18n.ts.integration,
+							to: "/admin/integrations",
+							active: currentPage?.route.name === "integrations",
+						},
+						{
+							icon: "ph-prohibit ph-bold ph-lg",
+							text: i18n.ts.instanceBlocking,
+							to: "/admin/instance-block",
+							active:
+								currentPage?.route.name === "instance-block",
+						},
+						{
+							icon: "ph-ghost ph-bold ph-lg",
+							text: i18n.ts.proxyAccount,
+							to: "/admin/proxy-account",
+							active: currentPage?.route.name === "proxy-account",
+						},
+						{
+							icon: "ph-database ph-bold ph-lg",
+							text: i18n.ts.database,
+							to: "/admin/database",
+							active: currentPage?.route.name === "database",
+						},
+					],
+				},
+		  ]
+		: []),
+]);
 
 watch(narrow, () => {
 	if (currentPage?.route.name == null && !narrow) {
-		router.push('/admin/overview');
+		router.push("/admin/overview");
 	}
 });
 
@@ -208,7 +298,7 @@ onMounted(() => {
 
 	narrow = el.value.offsetWidth < NARROW_THRESHOLD;
 	if (currentPage?.route.name == null && !narrow) {
-		router.push('/admin/overview');
+		router.push("/admin/overview");
 	}
 });
 
@@ -216,7 +306,7 @@ onActivated(() => {
 	narrow = el.value.offsetWidth < NARROW_THRESHOLD;
 
 	if (!narrow && currentPage?.route.name == null) {
-		router.replace('/admin/overview');
+		router.replace("/admin/overview");
 	}
 });
 
@@ -226,7 +316,7 @@ onUnmounted(() => {
 
 watch(router.currentRef, (to) => {
 	if (to.route.path === "/admin" && to.child?.route.name == null && !narrow) {
-		router.replace('/admin/overview');
+		router.replace("/admin/overview");
 	}
 });
 
@@ -239,45 +329,55 @@ provideMetadataReceiver((info) => {
 });
 
 const invite = () => {
-	os.api('admin/invite').then(x => {
-		os.alert({
-			type: 'info',
-			text: x.code,
+	os.api("admin/invite")
+		.then((x) => {
+			os.alert({
+				type: "info",
+				text: x.code,
+			});
+		})
+		.catch((err) => {
+			os.alert({
+				type: "error",
+				text: err,
+			});
 		});
-	}).catch(err => {
-		os.alert({
-			type: 'error',
-			text: err,
-		});
-	});
 };
 
 const lookup = (ev) => {
-	os.popupMenu([{
-		text: i18n.ts.user,
-		icon: 'ph-user ph-bold ph-lg',
-		action: () => {
-			lookupUser();
-		},
-	}, {
-		text: i18n.ts.note,
-		icon: 'ph-pencil ph-bold ph-lg',
-		action: () => {
-			alert('TODO');
-		},
-	}, {
-		text: i18n.ts.file,
-		icon: 'ph-cloud ph-bold ph-lg',
-		action: () => {
-			alert('TODO');
-		},
-	}, {
-		text: i18n.ts.instance,
-		icon: 'ph-planet ph-bold ph-lg',
-		action: () => {
-			alert('TODO');
-		},
-	}], ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts.user,
+				icon: "ph-user ph-bold ph-lg",
+				action: () => {
+					lookupUser();
+				},
+			},
+			{
+				text: i18n.ts.note,
+				icon: "ph-pencil ph-bold ph-lg",
+				action: () => {
+					alert("TODO");
+				},
+			},
+			{
+				text: i18n.ts.file,
+				icon: "ph-cloud ph-bold ph-lg",
+				action: () => {
+					alert("TODO");
+				},
+			},
+			{
+				text: i18n.ts.instance,
+				icon: "ph-planet ph-bold ph-lg",
+				action: () => {
+					alert("TODO");
+				},
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
 };
 
 const headerActions = $computed(() => []);
diff --git a/packages/client/src/pages/admin/instance-block.vue b/packages/client/src/pages/admin/instance-block.vue
index 70edf5ce0..80231b11e 100644
--- a/packages/client/src/pages/admin/instance-block.vue
+++ b/packages/client/src/pages/admin/instance-block.vue
@@ -1,39 +1,49 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
-		<FormSuspense :p="init">
-			<FormTextarea v-model="blockedHosts" class="_formBlock">
-				<span>{{ i18n.ts.blockedInstances }}</span>
-				<template #caption>{{ i18n.ts.blockedInstancesDescription }}</template>
-			</FormTextarea>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+			<FormSuspense :p="init">
+				<FormTextarea v-model="blockedHosts" class="_formBlock">
+					<span>{{ i18n.ts.blockedInstances }}</span>
+					<template #caption>{{
+						i18n.ts.blockedInstancesDescription
+					}}</template>
+				</FormTextarea>
 
-			<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
-		</FormSuspense>
-	</MkSpacer>
-</MkStickyContainer>
+				<FormButton primary class="_formBlock" @click="save"
+					><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+					{{ i18n.ts.save }}</FormButton
+				>
+			</FormSuspense>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormButton from '@/components/MkButton.vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import FormButton from "@/components/MkButton.vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-let blockedHosts: string = $ref('');
+let blockedHosts: string = $ref("");
 
 async function init() {
-	const meta = await os.api('admin/meta');
-	blockedHosts = meta.blockedHosts.join('\n');
+	const meta = await os.api("admin/meta");
+	blockedHosts = meta.blockedHosts.join("\n");
 }
 
 function save() {
-	os.apiWithDialog('admin/update-meta', {
-		blockedHosts: blockedHosts.split('\n').map(h => h.trim()) || [],
+	os.apiWithDialog("admin/update-meta", {
+		blockedHosts: blockedHosts.split("\n").map((h) => h.trim()) || [],
 	}).then(() => {
 		fetchInstance();
 	});
@@ -45,6 +55,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.instanceBlocking,
-	icon: 'ph-prohibit ph-bold ph-lg',
+	icon: "ph-prohibit ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/admin/integrations.discord.vue b/packages/client/src/pages/admin/integrations.discord.vue
index 3f16c92c9..2bf047069 100644
--- a/packages/client/src/pages/admin/integrations.discord.vue
+++ b/packages/client/src/pages/admin/integrations.discord.vue
@@ -1,47 +1,56 @@
 <template>
-<FormSuspense :p="init">
-	<div class="_formRoot">
-		<FormSwitch v-model="enableDiscordIntegration" class="_formBlock">
-			<template #label>{{ i18n.ts.enable }}</template>
-		</FormSwitch>
+	<FormSuspense :p="init">
+		<div class="_formRoot">
+			<FormSwitch v-model="enableDiscordIntegration" class="_formBlock">
+				<template #label>{{ i18n.ts.enable }}</template>
+			</FormSwitch>
 
-		<template v-if="enableDiscordIntegration">
-			<FormInfo class="_formBlock">Callback URL: {{ `${uri}/api/dc/cb` }}</FormInfo>
+			<template v-if="enableDiscordIntegration">
+				<FormInfo class="_formBlock"
+					>Callback URL: {{ `${uri}/api/dc/cb` }}</FormInfo
+				>
 
-			<FormInput v-model="discordClientId" class="_formBlock">
-				<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-				<template #label>Client ID</template>
-			</FormInput>
+				<FormInput v-model="discordClientId" class="_formBlock">
+					<template #prefix
+						><i class="ph-key ph-bold ph-lg"></i
+					></template>
+					<template #label>Client ID</template>
+				</FormInput>
 
-			<FormInput v-model="discordClientSecret" class="_formBlock">
-				<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-				<template #label>Client Secret</template>
-			</FormInput>
-		</template>
+				<FormInput v-model="discordClientSecret" class="_formBlock">
+					<template #prefix
+						><i class="ph-key ph-bold ph-lg"></i
+					></template>
+					<template #label>Client Secret</template>
+				</FormInput>
+			</template>
 
-		<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
-	</div>
-</FormSuspense>
+			<FormButton primary class="_formBlock" @click="save"
+				><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+				{{ i18n.ts.save }}</FormButton
+			>
+		</div>
+	</FormSuspense>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/MkButton.vue';
-import FormInfo from '@/components/MkInfo.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormInput from "@/components/form/input.vue";
+import FormButton from "@/components/MkButton.vue";
+import FormInfo from "@/components/MkInfo.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
 
-let uri: string = $ref('');
+let uri: string = $ref("");
 let enableDiscordIntegration: boolean = $ref(false);
 let discordClientId: string | null = $ref(null);
 let discordClientSecret: string | null = $ref(null);
 
 async function init() {
-	const meta = await os.api('admin/meta');
+	const meta = await os.api("admin/meta");
 	uri = meta.uri;
 	enableDiscordIntegration = meta.enableDiscordIntegration;
 	discordClientId = meta.discordClientId;
@@ -49,7 +58,7 @@ async function init() {
 }
 
 function save() {
-	os.apiWithDialog('admin/update-meta', {
+	os.apiWithDialog("admin/update-meta", {
 		enableDiscordIntegration,
 		discordClientId,
 		discordClientSecret,
diff --git a/packages/client/src/pages/admin/integrations.github.vue b/packages/client/src/pages/admin/integrations.github.vue
index 186e4d70f..67c57a7dd 100644
--- a/packages/client/src/pages/admin/integrations.github.vue
+++ b/packages/client/src/pages/admin/integrations.github.vue
@@ -1,47 +1,56 @@
 <template>
-<FormSuspense :p="init">
-	<div class="_formRoot">
-		<FormSwitch v-model="enableGithubIntegration" class="_formBlock">
-			<template #label>{{ i18n.ts.enable }}</template>
-		</FormSwitch>
+	<FormSuspense :p="init">
+		<div class="_formRoot">
+			<FormSwitch v-model="enableGithubIntegration" class="_formBlock">
+				<template #label>{{ i18n.ts.enable }}</template>
+			</FormSwitch>
 
-		<template v-if="enableGithubIntegration">
-			<FormInfo class="_formBlock">Callback URL: {{ `${uri}/api/gh/cb` }}</FormInfo>
-		
-			<FormInput v-model="githubClientId" class="_formBlock">
-				<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-				<template #label>Client ID</template>
-			</FormInput>
+			<template v-if="enableGithubIntegration">
+				<FormInfo class="_formBlock"
+					>Callback URL: {{ `${uri}/api/gh/cb` }}</FormInfo
+				>
 
-			<FormInput v-model="githubClientSecret" class="_formBlock">
-				<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-				<template #label>Client Secret</template>
-			</FormInput>
-		</template>
+				<FormInput v-model="githubClientId" class="_formBlock">
+					<template #prefix
+						><i class="ph-key ph-bold ph-lg"></i
+					></template>
+					<template #label>Client ID</template>
+				</FormInput>
 
-		<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
-	</div>
-</FormSuspense>
+				<FormInput v-model="githubClientSecret" class="_formBlock">
+					<template #prefix
+						><i class="ph-key ph-bold ph-lg"></i
+					></template>
+					<template #label>Client Secret</template>
+				</FormInput>
+			</template>
+
+			<FormButton primary class="_formBlock" @click="save"
+				><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+				{{ i18n.ts.save }}</FormButton
+			>
+		</div>
+	</FormSuspense>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/MkButton.vue';
-import FormInfo from '@/components/MkInfo.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormInput from "@/components/form/input.vue";
+import FormButton from "@/components/MkButton.vue";
+import FormInfo from "@/components/MkInfo.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
 
-let uri: string = $ref('');
+let uri: string = $ref("");
 let enableGithubIntegration: boolean = $ref(false);
 let githubClientId: string | null = $ref(null);
 let githubClientSecret: string | null = $ref(null);
 
 async function init() {
-	const meta = await os.api('admin/meta');
+	const meta = await os.api("admin/meta");
 	uri = meta.uri;
 	enableGithubIntegration = meta.enableGithubIntegration;
 	githubClientId = meta.githubClientId;
@@ -49,7 +58,7 @@ async function init() {
 }
 
 function save() {
-	os.apiWithDialog('admin/update-meta', {
+	os.apiWithDialog("admin/update-meta", {
 		enableGithubIntegration,
 		githubClientId,
 		githubClientSecret,
diff --git a/packages/client/src/pages/admin/integrations.vue b/packages/client/src/pages/admin/integrations.vue
index a4d786b6f..510b32a08 100644
--- a/packages/client/src/pages/admin/integrations.vue
+++ b/packages/client/src/pages/admin/integrations.vue
@@ -1,41 +1,58 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
-		<FormSuspense :p="init">
-			<FormFolder class="_formBlock">
-				<template #icon><i class="ph-github-logo ph-bold ph-lg"></i></template>
-				<template #label>GitHub</template>
-				<template #suffix>{{ enableGithubIntegration ? i18n.ts.enabled : i18n.ts.disabled }}</template>
-				<XGithub/>
-			</FormFolder>
-			<FormFolder class="_formBlock">
-				<template #icon><i class="ph-discord-logo ph-bold ph-lg"></i></template>
-				<template #label>Discord</template>
-				<template #suffix>{{ enableDiscordIntegration ? i18n.ts.enabled : i18n.ts.disabled }}</template>
-				<XDiscord/>
-			</FormFolder>
-		</FormSuspense>
-	</MkSpacer>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+			<FormSuspense :p="init">
+				<FormFolder class="_formBlock">
+					<template #icon
+						><i class="ph-github-logo ph-bold ph-lg"></i
+					></template>
+					<template #label>GitHub</template>
+					<template #suffix>{{
+						enableGithubIntegration
+							? i18n.ts.enabled
+							: i18n.ts.disabled
+					}}</template>
+					<XGithub />
+				</FormFolder>
+				<FormFolder class="_formBlock">
+					<template #icon
+						><i class="ph-discord-logo ph-bold ph-lg"></i
+					></template>
+					<template #label>Discord</template>
+					<template #suffix>{{
+						enableDiscordIntegration
+							? i18n.ts.enabled
+							: i18n.ts.disabled
+					}}</template>
+					<XDiscord />
+				</FormFolder>
+			</FormSuspense>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XGithub from './integrations.github.vue';
-import XDiscord from './integrations.discord.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import FormFolder from '@/components/form/folder.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import XGithub from "./integrations.github.vue";
+import XDiscord from "./integrations.discord.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import FormFolder from "@/components/form/folder.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let enableTwitterIntegration: boolean = $ref(false);
 let enableGithubIntegration: boolean = $ref(false);
 let enableDiscordIntegration: boolean = $ref(false);
 
 async function init() {
-	const meta = await os.api('admin/meta');
+	const meta = await os.api("admin/meta");
 	enableTwitterIntegration = meta.enableTwitterIntegration;
 	enableGithubIntegration = meta.enableGithubIntegration;
 	enableDiscordIntegration = meta.enableDiscordIntegration;
@@ -47,6 +64,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.integration,
-	icon: 'ph-plug ph-bold ph-lg',
+	icon: "ph-plug ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/admin/metrics.vue b/packages/client/src/pages/admin/metrics.vue
index 071e5ebe7..d0b9de74b 100644
--- a/packages/client/src/pages/admin/metrics.vue
+++ b/packages/client/src/pages/admin/metrics.vue
@@ -1,57 +1,111 @@
 <template>
-<div class="_debobigegoItem">
-	<div class="_debobigegoLabel"><i class="ph-microchip ph-bold ph-lg"></i> {{ i18n.ts.cpuAndMemory }}</div>
-	<div class="_debobigegoPanel xhexznfu">
-		<div>
-			<canvas :ref="cpumem"></canvas>
+	<div class="_debobigegoItem">
+		<div class="_debobigegoLabel">
+			<i class="ph-microchip ph-bold ph-lg"></i>
+			{{ i18n.ts.cpuAndMemory }}
 		</div>
-		<div v-if="serverInfo">
-			<div class="_table">
-				<div class="_row">
-					<div class="_cell"><div class="_label">MEM total</div>{{ bytes(serverInfo.mem.total) }}</div>
-					<div class="_cell"><div class="_label">MEM used</div>{{ bytes(memUsage) }} ({{ (memUsage / serverInfo.mem.total * 100).toFixed(0) }}%)</div>
-					<div class="_cell"><div class="_label">MEM free</div>{{ bytes(serverInfo.mem.total - memUsage) }} ({{ ((serverInfo.mem.total - memUsage) / serverInfo.mem.total * 100).toFixed(0) }}%)</div>
+		<div class="_debobigegoPanel xhexznfu">
+			<div>
+				<canvas :ref="cpumem"></canvas>
+			</div>
+			<div v-if="serverInfo">
+				<div class="_table">
+					<div class="_row">
+						<div class="_cell">
+							<div class="_label">MEM total</div>
+							{{ bytes(serverInfo.mem.total) }}
+						</div>
+						<div class="_cell">
+							<div class="_label">MEM used</div>
+							{{ bytes(memUsage) }} ({{
+								(
+									(memUsage / serverInfo.mem.total) *
+									100
+								).toFixed(0)
+							}}%)
+						</div>
+						<div class="_cell">
+							<div class="_label">MEM free</div>
+							{{ bytes(serverInfo.mem.total - memUsage) }} ({{
+								(
+									((serverInfo.mem.total - memUsage) /
+										serverInfo.mem.total) *
+									100
+								).toFixed(0)
+							}}%)
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
-<div class="_debobigegoItem">
-	<div class="_debobigegoLabel"><i class="ph-hard-drives ph-bold ph-lg"></i> {{ i18n.ts.disk }}</div>
-	<div class="_debobigegoPanel xhexznfu">
-		<div>
-			<canvas :ref="disk"></canvas>
+	<div class="_debobigegoItem">
+		<div class="_debobigegoLabel">
+			<i class="ph-hard-drives ph-bold ph-lg"></i> {{ i18n.ts.disk }}
 		</div>
-		<div v-if="serverInfo">
-			<div class="_table">
-				<div class="_row">
-					<div class="_cell"><div class="_label">Disk total</div>{{ bytes(serverInfo.fs.total) }}</div>
-					<div class="_cell"><div class="_label">Disk used</div>{{ bytes(serverInfo.fs.used) }} ({{ (serverInfo.fs.used / serverInfo.fs.total * 100).toFixed(0) }}%)</div>
-					<div class="_cell"><div class="_label">Disk free</div>{{ bytes(serverInfo.fs.total - serverInfo.fs.used) }} ({{ ((serverInfo.fs.total - serverInfo.fs.used) / serverInfo.fs.total * 100).toFixed(0) }}%)</div>
+		<div class="_debobigegoPanel xhexznfu">
+			<div>
+				<canvas :ref="disk"></canvas>
+			</div>
+			<div v-if="serverInfo">
+				<div class="_table">
+					<div class="_row">
+						<div class="_cell">
+							<div class="_label">Disk total</div>
+							{{ bytes(serverInfo.fs.total) }}
+						</div>
+						<div class="_cell">
+							<div class="_label">Disk used</div>
+							{{ bytes(serverInfo.fs.used) }} ({{
+								(
+									(serverInfo.fs.used / serverInfo.fs.total) *
+									100
+								).toFixed(0)
+							}}%)
+						</div>
+						<div class="_cell">
+							<div class="_label">Disk free</div>
+							{{
+								bytes(serverInfo.fs.total - serverInfo.fs.used)
+							}}
+							({{
+								(
+									((serverInfo.fs.total -
+										serverInfo.fs.used) /
+										serverInfo.fs.total) *
+									100
+								).toFixed(0)
+							}}%)
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
-<div class="_debobigegoItem">
-	<div class="_debobigegoLabel"><i class="ph-swap ph-bold ph-lg"></i> {{ i18n.ts.network }}</div>
-	<div class="_debobigegoPanel xhexznfu">
-		<div>
-			<canvas :ref="net"></canvas>
+	<div class="_debobigegoItem">
+		<div class="_debobigegoLabel">
+			<i class="ph-swap ph-bold ph-lg"></i> {{ i18n.ts.network }}
 		</div>
-		<div v-if="serverInfo">
-			<div class="_table">
-				<div class="_row">
-					<div class="_cell"><div class="_label">Interface</div>{{ serverInfo.net.interface }}</div>
+		<div class="_debobigegoPanel xhexznfu">
+			<div>
+				<canvas :ref="net"></canvas>
+			</div>
+			<div v-if="serverInfo">
+				<div class="_table">
+					<div class="_row">
+						<div class="_cell">
+							<div class="_label">Interface</div>
+							{{ serverInfo.net.interface }}
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, markRaw } from 'vue';
+import { defineComponent, markRaw } from "vue";
 import {
 	Chart,
 	ArcElement,
@@ -66,17 +120,17 @@ import {
 	Title,
 	Tooltip,
 	SubTitle,
-} from 'chart.js';
-import MkwFederation from '../../widgets/federation.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkSelect from '@/components/form/select.vue';
-import MkInput from '@/components/form/input.vue';
-import MkContainer from '@/components/MkContainer.vue';
-import MkFolder from '@/components/MkFolder.vue';
-import { version, url } from '@/config';
-import bytes from '@/filters/bytes';
-import number from '@/filters/number';
-import { i18n } from '@/i18n';
+} from "chart.js";
+import MkwFederation from "../../widgets/federation.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkSelect from "@/components/form/select.vue";
+import MkInput from "@/components/form/input.vue";
+import MkContainer from "@/components/MkContainer.vue";
+import MkFolder from "@/components/MkFolder.vue";
+import { version, url } from "@/config";
+import bytes from "@/filters/bytes";
+import number from "@/filters/number";
+import { i18n } from "@/i18n";
 
 Chart.register(
 	ArcElement,
@@ -90,7 +144,7 @@ Chart.register(
 	Legend,
 	Title,
 	Tooltip,
-	SubTitle,
+	SubTitle
 );
 
 const alpha = (hex, a) => {
@@ -100,8 +154,8 @@ const alpha = (hex, a) => {
 	const b = parseInt(result[3], 16);
 	return `rgba(${r}, ${g}, ${b}, ${a})`;
 };
-import * as os from '@/os';
-import { stream } from '@/stream';
+import * as os from "@/os";
+import { stream } from "@/stream";
 
 export default defineComponent({
 	components: {
@@ -120,18 +174,18 @@ export default defineComponent({
 			stats: null,
 			serverInfo: null,
 			connection: null,
-			queueConnection: markRaw(stream.useChannel('queueStats')),
+			queueConnection: markRaw(stream.useChannel("queueStats")),
 			memUsage: 0,
 			chartCpuMem: null,
 			chartNet: null,
 			jobs: [],
 			logs: [],
-			logLevel: 'all',
-			logDomain: '',
+			logLevel: "all",
+			logDomain: "",
 			modLogs: [],
 			dbInfo: null,
-			overviewHeight: '1fr',
-			queueHeight: '1fr',
+			overviewHeight: "1fr",
+			queueHeight: "1fr",
 			paused: false,
 			i18n,
 		};
@@ -140,28 +194,32 @@ export default defineComponent({
 	computed: {
 		gridColor() {
 			// TODO: var(--panel)の色が暗いか明るいかで判定する
-			return this.$store.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
+			return this.$store.state.darkMode
+				? "rgba(255, 255, 255, 0.1)"
+				: "rgba(0, 0, 0, 0.1)";
 		},
 	},
 
 	mounted() {
 		this.fetchJobs();
 
-		Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
+		Chart.defaults.color = getComputedStyle(
+			document.documentElement
+		).getPropertyValue("--fg");
 
-		os.api('admin/server-info', {}).then(res => {
+		os.api("admin/server-info", {}).then((res) => {
 			this.serverInfo = res;
 
-			this.connection = markRaw(stream.useChannel('serverStats'));
-			this.connection.on('stats', this.onStats);
-			this.connection.on('statsLog', this.onStatsLog);
-			this.connection.send('requestLog', {
+			this.connection = markRaw(stream.useChannel("serverStats"));
+			this.connection.on("stats", this.onStats);
+			this.connection.on("statsLog", this.onStatsLog);
+			this.connection.send("requestLog", {
 				id: Math.random().toString().substr(2, 8),
 				length: 150,
 			});
 
 			this.$nextTick(() => {
-				this.queueConnection.send('requestLog', {
+				this.queueConnection.send("requestLog", {
 					id: Math.random().toString().substr(2, 8),
 					length: 200,
 				});
@@ -171,8 +229,8 @@ export default defineComponent({
 
 	beforeUnmount() {
 		if (this.connection) {
-			this.connection.off('stats', this.onStats);
-			this.connection.off('statsLog', this.onStatsLog);
+			this.connection.off("stats", this.onStats);
+			this.connection.off("statsLog", this.onStatsLog);
 			this.connection.dispose();
 		}
 		this.queueConnection.dispose();
@@ -181,229 +239,245 @@ export default defineComponent({
 	methods: {
 		cpumem(el) {
 			if (this.chartCpuMem != null) return;
-			this.chartCpuMem = markRaw(new Chart(el, {
-				type: 'line',
-				data: {
-					labels: [],
-					datasets: [{
-						label: 'CPU',
-						pointRadius: 0,
-						tension: 0,
-						borderWidth: 2,
-						borderColor: '#31748f',
-						backgroundColor: alpha('#31748f', 0.1),
-						data: [],
-					}, {
-						label: 'MEM (active)',
-						pointRadius: 0,
-						tension: 0,
-						borderWidth: 2,
-						borderColor: '#c4a7e7',
-						backgroundColor: alpha('#c4a7e7', 0.02),
-						data: [],
-					}, {
-						label: 'MEM (used)',
-						pointRadius: 0,
-						tension: 0,
-						borderWidth: 2,
-						borderColor: '#ebbcba',
-						borderDash: [5, 5],
-						fill: false,
-						data: [],
-					}],
-				},
-				options: {
-					aspectRatio: 3,
-					layout: {
-						padding: {
-							left: 16,
-							right: 16,
-							top: 16,
-							bottom: 0,
-						},
-					},
-					legend: {
-						position: 'bottom',
-						labels: {
-							boxWidth: 16,
-						},
-					},
-					scales: {
-						x: {
-							gridLines: {
-								display: false,
-								color: this.gridColor,
-								zeroLineColor: this.gridColor,
+			this.chartCpuMem = markRaw(
+				new Chart(el, {
+					type: "line",
+					data: {
+						labels: [],
+						datasets: [
+							{
+								label: "CPU",
+								pointRadius: 0,
+								tension: 0,
+								borderWidth: 2,
+								borderColor: "#31748f",
+								backgroundColor: alpha("#31748f", 0.1),
+								data: [],
 							},
-							ticks: {
-								display: false,
+							{
+								label: "MEM (active)",
+								pointRadius: 0,
+								tension: 0,
+								borderWidth: 2,
+								borderColor: "#c4a7e7",
+								backgroundColor: alpha("#c4a7e7", 0.02),
+								data: [],
+							},
+							{
+								label: "MEM (used)",
+								pointRadius: 0,
+								tension: 0,
+								borderWidth: 2,
+								borderColor: "#ebbcba",
+								borderDash: [5, 5],
+								fill: false,
+								data: [],
+							},
+						],
+					},
+					options: {
+						aspectRatio: 3,
+						layout: {
+							padding: {
+								left: 16,
+								right: 16,
+								top: 16,
+								bottom: 0,
 							},
 						},
-						y: {
-							position: 'right',
-							gridLines: {
-								display: true,
-								color: this.gridColor,
-								zeroLineColor: this.gridColor,
-							},
-							ticks: {
-								display: false,
-								max: 100,
+						legend: {
+							position: "bottom",
+							labels: {
+								boxWidth: 16,
 							},
 						},
+						scales: {
+							x: {
+								gridLines: {
+									display: false,
+									color: this.gridColor,
+									zeroLineColor: this.gridColor,
+								},
+								ticks: {
+									display: false,
+								},
+							},
+							y: {
+								position: "right",
+								gridLines: {
+									display: true,
+									color: this.gridColor,
+									zeroLineColor: this.gridColor,
+								},
+								ticks: {
+									display: false,
+									max: 100,
+								},
+							},
+						},
+						tooltips: {
+							intersect: false,
+							mode: "index",
+						},
 					},
-					tooltips: {
-						intersect: false,
-						mode: 'index',
-					},
-				},
-			}));
+				})
+			);
 		},
 
 		net(el) {
 			if (this.chartNet != null) return;
-			this.chartNet = markRaw(new Chart(el, {
-				type: 'line',
-				data: {
-					labels: [],
-					datasets: [{
-						label: 'In',
-						pointRadius: 0,
-						tension: 0,
-						borderWidth: 2,
-						borderColor: '#94a029',
-						backgroundColor: alpha('#94a029', 0.1),
-						data: [],
-					}, {
-						label: 'Out',
-						pointRadius: 0,
-						tension: 0,
-						borderWidth: 2,
-						borderColor: '#ff9156',
-						backgroundColor: alpha('#ff9156', 0.1),
-						data: [],
-					}],
-				},
-				options: {
-					aspectRatio: 3,
-					layout: {
-						padding: {
-							left: 16,
-							right: 16,
-							top: 16,
-							bottom: 0,
-						},
-					},
-					legend: {
-						position: 'bottom',
-						labels: {
-							boxWidth: 16,
-						},
-					},
-					scales: {
-						x: {
-							gridLines: {
-								display: false,
-								color: this.gridColor,
-								zeroLineColor: this.gridColor,
+			this.chartNet = markRaw(
+				new Chart(el, {
+					type: "line",
+					data: {
+						labels: [],
+						datasets: [
+							{
+								label: "In",
+								pointRadius: 0,
+								tension: 0,
+								borderWidth: 2,
+								borderColor: "#94a029",
+								backgroundColor: alpha("#94a029", 0.1),
+								data: [],
 							},
-							ticks: {
-								display: false,
+							{
+								label: "Out",
+								pointRadius: 0,
+								tension: 0,
+								borderWidth: 2,
+								borderColor: "#ff9156",
+								backgroundColor: alpha("#ff9156", 0.1),
+								data: [],
+							},
+						],
+					},
+					options: {
+						aspectRatio: 3,
+						layout: {
+							padding: {
+								left: 16,
+								right: 16,
+								top: 16,
+								bottom: 0,
 							},
 						},
-						y: {
-							position: 'right',
-							gridLines: {
-								display: true,
-								color: this.gridColor,
-								zeroLineColor: this.gridColor,
-							},
-							ticks: {
-								display: false,
+						legend: {
+							position: "bottom",
+							labels: {
+								boxWidth: 16,
 							},
 						},
+						scales: {
+							x: {
+								gridLines: {
+									display: false,
+									color: this.gridColor,
+									zeroLineColor: this.gridColor,
+								},
+								ticks: {
+									display: false,
+								},
+							},
+							y: {
+								position: "right",
+								gridLines: {
+									display: true,
+									color: this.gridColor,
+									zeroLineColor: this.gridColor,
+								},
+								ticks: {
+									display: false,
+								},
+							},
+						},
+						tooltips: {
+							intersect: false,
+							mode: "index",
+						},
 					},
-					tooltips: {
-						intersect: false,
-						mode: 'index',
-					},
-				},
-			}));
+				})
+			);
 		},
 
 		disk(el) {
 			if (this.chartDisk != null) return;
-			this.chartDisk = markRaw(new Chart(el, {
-				type: 'line',
-				data: {
-					labels: [],
-					datasets: [{
-						label: 'Read',
-						pointRadius: 0,
-						tension: 0,
-						borderWidth: 2,
-						borderColor: '#94a029',
-						backgroundColor: alpha('#94a029', 0.1),
-						data: [],
-					}, {
-						label: 'Write',
-						pointRadius: 0,
-						tension: 0,
-						borderWidth: 2,
-						borderColor: '#ff9156',
-						backgroundColor: alpha('#ff9156', 0.1),
-						data: [],
-					}],
-				},
-				options: {
-					aspectRatio: 3,
-					layout: {
-						padding: {
-							left: 16,
-							right: 16,
-							top: 16,
-							bottom: 0,
-						},
-					},
-					legend: {
-						position: 'bottom',
-						labels: {
-							boxWidth: 16,
-						},
-					},
-					scales: {
-						x: {
-							gridLines: {
-								display: false,
-								color: this.gridColor,
-								zeroLineColor: this.gridColor,
+			this.chartDisk = markRaw(
+				new Chart(el, {
+					type: "line",
+					data: {
+						labels: [],
+						datasets: [
+							{
+								label: "Read",
+								pointRadius: 0,
+								tension: 0,
+								borderWidth: 2,
+								borderColor: "#94a029",
+								backgroundColor: alpha("#94a029", 0.1),
+								data: [],
 							},
-							ticks: {
-								display: false,
+							{
+								label: "Write",
+								pointRadius: 0,
+								tension: 0,
+								borderWidth: 2,
+								borderColor: "#ff9156",
+								backgroundColor: alpha("#ff9156", 0.1),
+								data: [],
+							},
+						],
+					},
+					options: {
+						aspectRatio: 3,
+						layout: {
+							padding: {
+								left: 16,
+								right: 16,
+								top: 16,
+								bottom: 0,
 							},
 						},
-						y: {
-							position: 'right',
-							gridLines: {
-								display: true,
-								color: this.gridColor,
-								zeroLineColor: this.gridColor,
-							},
-							ticks: {
-								display: false,
+						legend: {
+							position: "bottom",
+							labels: {
+								boxWidth: 16,
 							},
 						},
+						scales: {
+							x: {
+								gridLines: {
+									display: false,
+									color: this.gridColor,
+									zeroLineColor: this.gridColor,
+								},
+								ticks: {
+									display: false,
+								},
+							},
+							y: {
+								position: "right",
+								gridLines: {
+									display: true,
+									color: this.gridColor,
+									zeroLineColor: this.gridColor,
+								},
+								ticks: {
+									display: false,
+								},
+							},
+						},
+						tooltips: {
+							intersect: false,
+							mode: "index",
+						},
 					},
-					tooltips: {
-						intersect: false,
-						mode: 'index',
-					},
-				},
-			}));
+				})
+			);
 		},
 
 		fetchJobs() {
-			os.api('admin/queue/deliver-delayed', {}).then(jobs => {
+			os.api("admin/queue/deliver-delayed", {}).then((jobs) => {
 				this.jobs = jobs;
 			});
 		},
@@ -412,18 +486,24 @@ export default defineComponent({
 			if (this.paused) return;
 
 			const cpu = (stats.cpu * 100).toFixed(0);
-			const memActive = (stats.mem.active / this.serverInfo.mem.total * 100).toFixed(0);
-			const memUsed = (stats.mem.used / this.serverInfo.mem.total * 100).toFixed(0);
+			const memActive = (
+				(stats.mem.active / this.serverInfo.mem.total) *
+				100
+			).toFixed(0);
+			const memUsed = (
+				(stats.mem.used / this.serverInfo.mem.total) *
+				100
+			).toFixed(0);
 			this.memUsage = stats.mem.active;
 
-			this.chartCpuMem.data.labels.push('');
+			this.chartCpuMem.data.labels.push("");
 			this.chartCpuMem.data.datasets[0].data.push(cpu);
 			this.chartCpuMem.data.datasets[1].data.push(memActive);
 			this.chartCpuMem.data.datasets[2].data.push(memUsed);
-			this.chartNet.data.labels.push('');
+			this.chartNet.data.labels.push("");
 			this.chartNet.data.datasets[0].data.push(stats.net.rx);
 			this.chartNet.data.datasets[1].data.push(stats.net.tx);
-			this.chartDisk.data.labels.push('');
+			this.chartDisk.data.labels.push("");
 			this.chartDisk.data.datasets[0].data.push(stats.fs.r);
 			this.chartDisk.data.datasets[1].data.push(stats.fs.w);
 			if (this.chartCpuMem.data.datasets[0].data.length > 150) {
diff --git a/packages/client/src/pages/admin/object-storage.vue b/packages/client/src/pages/admin/object-storage.vue
index 2847b10a6..46760b816 100644
--- a/packages/client/src/pages/admin/object-storage.vue
+++ b/packages/client/src/pages/admin/object-storage.vue
@@ -1,84 +1,158 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
-		<FormSuspense :p="init">
-			<div class="_formRoot">
-				<FormSwitch v-model="useObjectStorage" class="_formBlock">{{ i18n.ts.useObjectStorage }}</FormSwitch>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+			<FormSuspense :p="init">
+				<div class="_formRoot">
+					<FormSwitch v-model="useObjectStorage" class="_formBlock">{{
+						i18n.ts.useObjectStorage
+					}}</FormSwitch>
 
-				<template v-if="useObjectStorage">
-					<FormInput v-model="objectStorageBaseUrl" class="_formBlock">
-						<template #label>{{ i18n.ts.objectStorageBaseUrl }}</template>
-						<template #caption>{{ i18n.ts.objectStorageBaseUrlDesc }}</template>
-					</FormInput>
-
-					<FormInput v-model="objectStorageBucket" class="_formBlock">
-						<template #label>{{ i18n.ts.objectStorageBucket }}</template>
-						<template #caption>{{ i18n.ts.objectStorageBucketDesc }}</template>
-					</FormInput>
-
-					<FormInput v-model="objectStoragePrefix" class="_formBlock">
-						<template #label>{{ i18n.ts.objectStoragePrefix }}</template>
-						<template #caption>{{ i18n.ts.objectStoragePrefixDesc }}</template>
-					</FormInput>
-
-					<FormInput v-model="objectStorageEndpoint" class="_formBlock">
-						<template #label>{{ i18n.ts.objectStorageEndpoint }}</template>
-						<template #caption>{{ i18n.ts.objectStorageEndpointDesc }}</template>
-					</FormInput>
-
-					<FormInput v-model="objectStorageRegion" class="_formBlock">
-						<template #label>{{ i18n.ts.objectStorageRegion }}</template>
-						<template #caption>{{ i18n.ts.objectStorageRegionDesc }}</template>
-					</FormInput>
-
-					<FormSplit :min-width="280">
-						<FormInput v-model="objectStorageAccessKey" class="_formBlock">
-							<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-							<template #label>Access key</template>
+					<template v-if="useObjectStorage">
+						<FormInput
+							v-model="objectStorageBaseUrl"
+							class="_formBlock"
+						>
+							<template #label>{{
+								i18n.ts.objectStorageBaseUrl
+							}}</template>
+							<template #caption>{{
+								i18n.ts.objectStorageBaseUrlDesc
+							}}</template>
 						</FormInput>
 
-						<FormInput v-model="objectStorageSecretKey" class="_formBlock">
-							<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-							<template #label>Secret key</template>
+						<FormInput
+							v-model="objectStorageBucket"
+							class="_formBlock"
+						>
+							<template #label>{{
+								i18n.ts.objectStorageBucket
+							}}</template>
+							<template #caption>{{
+								i18n.ts.objectStorageBucketDesc
+							}}</template>
 						</FormInput>
-					</FormSplit>
 
-					<FormSwitch v-model="objectStorageUseSSL" class="_formBlock">
-						<template #label>{{ i18n.ts.objectStorageUseSSL }}</template>
-						<template #caption>{{ i18n.ts.objectStorageUseSSLDesc }}</template>
-					</FormSwitch>
+						<FormInput
+							v-model="objectStoragePrefix"
+							class="_formBlock"
+						>
+							<template #label>{{
+								i18n.ts.objectStoragePrefix
+							}}</template>
+							<template #caption>{{
+								i18n.ts.objectStoragePrefixDesc
+							}}</template>
+						</FormInput>
 
-					<FormSwitch v-model="objectStorageUseProxy" class="_formBlock">
-						<template #label>{{ i18n.ts.objectStorageUseProxy }}</template>
-						<template #caption>{{ i18n.ts.objectStorageUseProxyDesc }}</template>
-					</FormSwitch>
+						<FormInput
+							v-model="objectStorageEndpoint"
+							class="_formBlock"
+						>
+							<template #label>{{
+								i18n.ts.objectStorageEndpoint
+							}}</template>
+							<template #caption>{{
+								i18n.ts.objectStorageEndpointDesc
+							}}</template>
+						</FormInput>
 
-					<FormSwitch v-model="objectStorageSetPublicRead" class="_formBlock">
-						<template #label>{{ i18n.ts.objectStorageSetPublicRead }}</template>
-					</FormSwitch>
+						<FormInput
+							v-model="objectStorageRegion"
+							class="_formBlock"
+						>
+							<template #label>{{
+								i18n.ts.objectStorageRegion
+							}}</template>
+							<template #caption>{{
+								i18n.ts.objectStorageRegionDesc
+							}}</template>
+						</FormInput>
 
-					<FormSwitch v-model="objectStorageS3ForcePathStyle" class="_formBlock">
-						<template #label>s3ForcePathStyle</template>
-					</FormSwitch>
-				</template>
-			</div>
-		</FormSuspense>
-	</MkSpacer>
-</MkStickyContainer>
+						<FormSplit :min-width="280">
+							<FormInput
+								v-model="objectStorageAccessKey"
+								class="_formBlock"
+							>
+								<template #prefix
+									><i class="ph-key ph-bold ph-lg"></i
+								></template>
+								<template #label>Access key</template>
+							</FormInput>
+
+							<FormInput
+								v-model="objectStorageSecretKey"
+								class="_formBlock"
+							>
+								<template #prefix
+									><i class="ph-key ph-bold ph-lg"></i
+								></template>
+								<template #label>Secret key</template>
+							</FormInput>
+						</FormSplit>
+
+						<FormSwitch
+							v-model="objectStorageUseSSL"
+							class="_formBlock"
+						>
+							<template #label>{{
+								i18n.ts.objectStorageUseSSL
+							}}</template>
+							<template #caption>{{
+								i18n.ts.objectStorageUseSSLDesc
+							}}</template>
+						</FormSwitch>
+
+						<FormSwitch
+							v-model="objectStorageUseProxy"
+							class="_formBlock"
+						>
+							<template #label>{{
+								i18n.ts.objectStorageUseProxy
+							}}</template>
+							<template #caption>{{
+								i18n.ts.objectStorageUseProxyDesc
+							}}</template>
+						</FormSwitch>
+
+						<FormSwitch
+							v-model="objectStorageSetPublicRead"
+							class="_formBlock"
+						>
+							<template #label>{{
+								i18n.ts.objectStorageSetPublicRead
+							}}</template>
+						</FormSwitch>
+
+						<FormSwitch
+							v-model="objectStorageS3ForcePathStyle"
+							class="_formBlock"
+						>
+							<template #label>s3ForcePathStyle</template>
+						</FormSwitch>
+					</template>
+				</div>
+			</FormSuspense>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormInput from '@/components/form/input.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import FormSplit from '@/components/form/split.vue';
-import FormSection from '@/components/form/section.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormInput from "@/components/form/input.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import FormSplit from "@/components/form/split.vue";
+import FormSection from "@/components/form/section.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let useObjectStorage: boolean = $ref(false);
 let objectStorageBaseUrl: string | null = $ref(null);
@@ -95,7 +169,7 @@ let objectStorageSetPublicRead: boolean = $ref(false);
 let objectStorageS3ForcePathStyle: boolean = $ref(true);
 
 async function init() {
-	const meta = await os.api('admin/meta');
+	const meta = await os.api("admin/meta");
 	useObjectStorage = meta.useObjectStorage;
 	objectStorageBaseUrl = meta.objectStorageBaseUrl;
 	objectStorageBucket = meta.objectStorageBucket;
@@ -112,7 +186,7 @@ async function init() {
 }
 
 function save() {
-	os.apiWithDialog('admin/update-meta', {
+	os.apiWithDialog("admin/update-meta", {
 		useObjectStorage,
 		objectStorageBaseUrl,
 		objectStorageBucket,
@@ -131,17 +205,19 @@ function save() {
 	});
 }
 
-const headerActions = $computed(() => [{
-	asFullButton: true,
-	icon: 'ph-check ph-bold ph-lg',
-	text: i18n.ts.save,
-	handler: save,
-}]);
+const headerActions = $computed(() => [
+	{
+		asFullButton: true,
+		icon: "ph-check ph-bold ph-lg",
+		text: i18n.ts.save,
+		handler: save,
+	},
+]);
 
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.objectStorage,
-	icon: 'ph-cloud ph-bold ph-lg',
+	icon: "ph-cloud ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/admin/other-settings.vue b/packages/client/src/pages/admin/other-settings.vue
index 140ca4f55..1d74e752a 100644
--- a/packages/client/src/pages/admin/other-settings.vue
+++ b/packages/client/src/pages/admin/other-settings.vue
@@ -1,43 +1,48 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
-		<FormSuspense :p="init">
-			none
-		</FormSuspense>
-	</MkSpacer>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+			<FormSuspense :p="init"> none </FormSuspense>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 async function init() {
-	await os.api('admin/meta');
+	await os.api("admin/meta");
 }
 
 function save() {
-	os.apiWithDialog('admin/update-meta').then(() => {
+	os.apiWithDialog("admin/update-meta").then(() => {
 		fetchInstance();
 	});
 }
 
-const headerActions = $computed(() => [{
-	asFullButton: true,
-	icon: 'ph-check ph-bold ph-lg',
-	text: i18n.ts.save,
-	handler: save,
-}]);
+const headerActions = $computed(() => [
+	{
+		asFullButton: true,
+		icon: "ph-check ph-bold ph-lg",
+		text: i18n.ts.save,
+		handler: save,
+	},
+]);
 
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.other,
-	icon: 'ph-gear-six ph-bold ph-lg',
+	icon: "ph-gear-six ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/admin/overview.active-users.vue b/packages/client/src/pages/admin/overview.active-users.vue
index ee8f42c43..25dcac494 100644
--- a/packages/client/src/pages/admin/overview.active-users.vue
+++ b/packages/client/src/pages/admin/overview.active-users.vue
@@ -1,23 +1,29 @@
 <template>
-<div>
-	<MkLoading v-if="fetching"/>
-	<div v-show="!fetching" :class="$style.root" class="_panel">
-		<canvas ref="chartEl"></canvas>
+	<div>
+		<MkLoading v-if="fetching" />
+		<div v-show="!fetching" :class="$style.root" class="_panel">
+			<canvas ref="chartEl"></canvas>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { markRaw, version as vueVersion, onMounted, onBeforeUnmount, nextTick } from 'vue';
-import { Chart } from 'chart.js';
-import tinycolor from 'tinycolor2';
-import gradient from 'chartjs-plugin-gradient';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip';
-import { chartVLine } from '@/scripts/chart-vline';
-import { alpha } from '@/scripts/color';
-import { initChart } from '@/scripts/init-chart';
+import {
+	markRaw,
+	version as vueVersion,
+	onMounted,
+	onBeforeUnmount,
+	nextTick,
+} from "vue";
+import { Chart } from "chart.js";
+import tinycolor from "tinycolor2";
+import gradient from "chartjs-plugin-gradient";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { useChartTooltip } from "@/scripts/use-chart-tooltip";
+import { chartVLine } from "@/scripts/chart-vline";
+import { alpha } from "@/scripts/color";
+import { initChart } from "@/scripts/init-chart";
 
 initChart();
 
@@ -49,43 +55,51 @@ async function renderChart() {
 		}));
 	};
 
-	const raw = await os.api('charts/active-users', { limit: chartLimit, span: 'day' });
+	const raw = await os.api("charts/active-users", {
+		limit: chartLimit,
+		span: "day",
+	});
 
-	const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
+	const vLineColor = defaultStore.state.darkMode
+		? "rgba(255, 255, 255, 0.2)"
+		: "rgba(0, 0, 0, 0.2)";
 
-	const colorRead = '#eb6f92';
-	const colorWrite = '#f6c177';
+	const colorRead = "#eb6f92";
+	const colorWrite = "#f6c177";
 
 	const max = Math.max(...raw.read);
 
 	chartInstance = new Chart(chartEl, {
-		type: 'bar',
+		type: "bar",
 		data: {
-			datasets: [{
-				parsing: false,
-				label: 'Read',
-				data: format(raw.read).slice().reverse(),
-				pointRadius: 0,
-				borderWidth: 0,
-				borderJoinStyle: 'round',
-				borderRadius: 4,
-				backgroundColor: colorRead,
-				barPercentage: 0.7,
-				categoryPercentage: 0.5,
-				fill: true,
-			}, {
-				parsing: false,
-				label: 'Write',
-				data: format(raw.write).slice().reverse(),
-				pointRadius: 0,
-				borderWidth: 0,
-				borderJoinStyle: 'round',
-				borderRadius: 4,
-				backgroundColor: colorWrite,
-				barPercentage: 0.7,
-				categoryPercentage: 0.5,
-				fill: true,
-			}],
+			datasets: [
+				{
+					parsing: false,
+					label: "Read",
+					data: format(raw.read).slice().reverse(),
+					pointRadius: 0,
+					borderWidth: 0,
+					borderJoinStyle: "round",
+					borderRadius: 4,
+					backgroundColor: colorRead,
+					barPercentage: 0.7,
+					categoryPercentage: 0.5,
+					fill: true,
+				},
+				{
+					parsing: false,
+					label: "Write",
+					data: format(raw.write).slice().reverse(),
+					pointRadius: 0,
+					borderWidth: 0,
+					borderJoinStyle: "round",
+					borderRadius: 4,
+					backgroundColor: colorWrite,
+					barPercentage: 0.7,
+					categoryPercentage: 0.5,
+					fill: true,
+				},
+			],
 		},
 		options: {
 			aspectRatio: 2.5,
@@ -99,14 +113,14 @@ async function renderChart() {
 			},
 			scales: {
 				x: {
-					type: 'time',
+					type: "time",
 					offset: true,
 					time: {
 						stepSize: 1,
-						unit: 'day',
+						unit: "day",
 						displayFormats: {
-							day: 'M/d',
-							month: 'Y/M',
+							day: "M/d",
+							month: "Y/M",
 						},
 					},
 					grid: {
@@ -119,7 +133,7 @@ async function renderChart() {
 					},
 				},
 				y: {
-					position: 'left',
+					position: "left",
 					suggestedMax: 10,
 					grid: {
 						display: true,
@@ -132,7 +146,7 @@ async function renderChart() {
 			},
 			interaction: {
 				intersect: false,
-				mode: 'index',
+				mode: "index",
 			},
 			plugins: {
 				legend: {
@@ -140,7 +154,7 @@ async function renderChart() {
 				},
 				tooltip: {
 					enabled: false,
-					mode: 'index',
+					mode: "index",
 					animation: {
 						duration: 0,
 					},
diff --git a/packages/client/src/pages/admin/overview.ap-requests.vue b/packages/client/src/pages/admin/overview.ap-requests.vue
index e481465a1..c655336e8 100644
--- a/packages/client/src/pages/admin/overview.ap-requests.vue
+++ b/packages/client/src/pages/admin/overview.ap-requests.vue
@@ -1,34 +1,34 @@
 <template>
-<div>
-	<MkLoading v-if="fetching"/>
-	<div v-show="!fetching" :class="$style.root">
-		<div class="charts _panel">
-			<div class="chart">
-				<canvas ref="chartEl2"></canvas>
-			</div>
-			<div class="chart">
-				<canvas ref="chartEl"></canvas>
+	<div>
+		<MkLoading v-if="fetching" />
+		<div v-show="!fetching" :class="$style.root">
+			<div class="charts _panel">
+				<div class="chart">
+					<canvas ref="chartEl2"></canvas>
+				</div>
+				<div class="chart">
+					<canvas ref="chartEl"></canvas>
+				</div>
 			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import { Chart } from 'chart.js';
-import gradient from 'chartjs-plugin-gradient';
-import tinycolor from 'tinycolor2';
-import MkMiniChart from '@/components/MkMiniChart.vue';
-import * as os from '@/os';
-import number from '@/filters/number';
-import MkNumberDiff from '@/components/MkNumberDiff.vue';
-import { i18n } from '@/i18n';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip';
-import { chartVLine } from '@/scripts/chart-vline';
-import { defaultStore } from '@/store';
-import { alpha } from '@/scripts/color';
-import { initChart } from '@/scripts/init-chart';
+import { onMounted, onUnmounted, ref } from "vue";
+import { Chart } from "chart.js";
+import gradient from "chartjs-plugin-gradient";
+import tinycolor from "tinycolor2";
+import MkMiniChart from "@/components/MkMiniChart.vue";
+import * as os from "@/os";
+import number from "@/filters/number";
+import MkNumberDiff from "@/components/MkNumberDiff.vue";
+import { i18n } from "@/i18n";
+import { useChartTooltip } from "@/scripts/use-chart-tooltip";
+import { chartVLine } from "@/scripts/chart-vline";
+import { defaultStore } from "@/store";
+import { alpha } from "@/scripts/color";
+import { initChart } from "@/scripts/init-chart";
 
 initChart();
 
@@ -65,47 +65,55 @@ onMounted(async () => {
 		}));
 	};
 
-	const raw = await os.api('charts/ap-request', { limit: chartLimit, span: 'day' });
+	const raw = await os.api("charts/ap-request", {
+		limit: chartLimit,
+		span: "day",
+	});
 
-	const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
-	const succColor = '#9ccfd8';
-	const failColor = '#f6c177';
+	const vLineColor = defaultStore.state.darkMode
+		? "rgba(255, 255, 255, 0.2)"
+		: "rgba(0, 0, 0, 0.2)";
+	const succColor = "#9ccfd8";
+	const failColor = "#f6c177";
 
 	const succMax = Math.max(...raw.deliverSucceeded);
 	const failMax = Math.max(...raw.deliverFailed);
 
 	new Chart(chartEl, {
-		type: 'line',
+		type: "line",
 		data: {
-			datasets: [{
-				stack: 'a',
-				parsing: false,
-				label: 'Out: Succ',
-				data: format(raw.deliverSucceeded).slice().reverse(),
-				tension: 0.3,
-				pointRadius: 0,
-				borderWidth: 2,
-				borderColor: succColor,
-				borderJoinStyle: 'round',
-				borderRadius: 4,
-				backgroundColor: alpha(succColor, 0.35),
-				fill: true,
-				clip: 8,
-			}, {
-				stack: 'a',
-				parsing: false,
-				label: 'Out: Fail',
-				data: formatMinus(raw.deliverFailed).slice().reverse(),
-				tension: 0.3,
-				pointRadius: 0,
-				borderWidth: 2,
-				borderColor: failColor,
-				borderJoinStyle: 'round',
-				borderRadius: 4,
-				backgroundColor: alpha(failColor, 0.35),
-				fill: true,
-				clip: 8,
-			}],
+			datasets: [
+				{
+					stack: "a",
+					parsing: false,
+					label: "Out: Succ",
+					data: format(raw.deliverSucceeded).slice().reverse(),
+					tension: 0.3,
+					pointRadius: 0,
+					borderWidth: 2,
+					borderColor: succColor,
+					borderJoinStyle: "round",
+					borderRadius: 4,
+					backgroundColor: alpha(succColor, 0.35),
+					fill: true,
+					clip: 8,
+				},
+				{
+					stack: "a",
+					parsing: false,
+					label: "Out: Fail",
+					data: formatMinus(raw.deliverFailed).slice().reverse(),
+					tension: 0.3,
+					pointRadius: 0,
+					borderWidth: 2,
+					borderColor: failColor,
+					borderJoinStyle: "round",
+					borderRadius: 4,
+					backgroundColor: alpha(failColor, 0.35),
+					fill: true,
+					clip: 8,
+				},
+			],
 		},
 		options: {
 			aspectRatio: 2.5,
@@ -119,12 +127,12 @@ onMounted(async () => {
 			},
 			scales: {
 				x: {
-					type: 'time',
+					type: "time",
 					stacked: true,
 					offset: false,
 					time: {
 						stepSize: 1,
-						unit: 'day',
+						unit: "day",
 					},
 					grid: {
 						display: true,
@@ -138,7 +146,7 @@ onMounted(async () => {
 				},
 				y: {
 					stacked: true,
-					position: 'left',
+					position: "left",
 					suggestedMax: 10,
 					grid: {
 						display: true,
@@ -146,13 +154,14 @@ onMounted(async () => {
 					ticks: {
 						display: true,
 						//mirror: true,
-						callback: (value, index, values) => value < 0 ? -value : value,
+						callback: (value, index, values) =>
+							value < 0 ? -value : value,
 					},
 				},
 			},
 			interaction: {
 				intersect: false,
-				mode: 'index',
+				mode: "index",
 			},
 			elements: {
 				point: {
@@ -166,7 +175,7 @@ onMounted(async () => {
 				},
 				tooltip: {
 					enabled: false,
-					mode: 'index',
+					mode: "index",
 					animation: {
 						duration: 0,
 					},
@@ -179,23 +188,25 @@ onMounted(async () => {
 	});
 
 	new Chart(chartEl2, {
-		type: 'bar',
+		type: "bar",
 		data: {
-			datasets: [{
-				parsing: false,
-				label: 'In',
-				data: format(raw.inboxReceived).slice().reverse(),
-				tension: 0.3,
-				pointRadius: 0,
-				borderWidth: 0,
-				borderJoinStyle: 'round',
-				borderRadius: 4,
-				backgroundColor: '#c4a7e7',
-				barPercentage: 0.8,
-				categoryPercentage: 0.9,
-				fill: true,
-				clip: 8,
-			}],
+			datasets: [
+				{
+					parsing: false,
+					label: "In",
+					data: format(raw.inboxReceived).slice().reverse(),
+					tension: 0.3,
+					pointRadius: 0,
+					borderWidth: 0,
+					borderJoinStyle: "round",
+					borderRadius: 4,
+					backgroundColor: "#c4a7e7",
+					barPercentage: 0.8,
+					categoryPercentage: 0.9,
+					fill: true,
+					clip: 8,
+				},
+			],
 		},
 		options: {
 			aspectRatio: 5,
@@ -209,14 +220,14 @@ onMounted(async () => {
 			},
 			scales: {
 				x: {
-					type: 'time',
+					type: "time",
 					offset: false,
 					time: {
 						stepSize: 1,
-						unit: 'day',
+						unit: "day",
 						displayFormats: {
-							day: 'M/d',
-							month: 'Y/M',
+							day: "M/d",
+							month: "Y/M",
 						},
 					},
 					grid: {
@@ -230,7 +241,7 @@ onMounted(async () => {
 					min: getDate(chartLimit).getTime(),
 				},
 				y: {
-					position: 'left',
+					position: "left",
 					suggestedMax: 10,
 					grid: {
 						display: true,
@@ -239,7 +250,7 @@ onMounted(async () => {
 			},
 			interaction: {
 				intersect: false,
-				mode: 'index',
+				mode: "index",
 			},
 			elements: {
 				point: {
@@ -253,7 +264,7 @@ onMounted(async () => {
 				},
 				tooltip: {
 					enabled: false,
-					mode: 'index',
+					mode: "index",
 					animation: {
 						duration: 0,
 					},
@@ -284,4 +295,3 @@ onMounted(async () => {
 	}
 }
 </style>
-
diff --git a/packages/client/src/pages/admin/overview.federation.vue b/packages/client/src/pages/admin/overview.federation.vue
index b9e53d17d..ab4dd2c69 100644
--- a/packages/client/src/pages/admin/overview.federation.vue
+++ b/packages/client/src/pages/admin/overview.federation.vue
@@ -1,54 +1,69 @@
 <template>
-<div>
-	<MkLoading v-if="fetching"/>
-	<div v-show="!fetching" :class="$style.root">
-		<div v-if="topSubInstancesForPie && topPubInstancesForPie" class="pies">
-			<div class="pie deliver _panel">
-				<div class="title">Sub</div>
-				<XPie :data="topSubInstancesForPie" class="chart"/>
-				<div class="subTitle">Top 10</div>
-			</div>
-			<div class="pie inbox _panel">
-				<div class="title">Pub</div>
-				<XPie :data="topPubInstancesForPie" class="chart"/>
-				<div class="subTitle">Top 10</div>
-			</div>
-		</div>
-		<div v-if="!fetching" class="items">
-			<div class="item _panel sub">
-				<div class="icon"><i class="ph-download ph-bold ph-xl"></i></div>
-				<div class="body">
-					<div class="value">
-						{{ number(federationSubActive) }}
-						<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="federationSubActiveDiff"></MkNumberDiff>
-					</div>
-					<div class="label">Sub</div>
+	<div>
+		<MkLoading v-if="fetching" />
+		<div v-show="!fetching" :class="$style.root">
+			<div
+				v-if="topSubInstancesForPie && topPubInstancesForPie"
+				class="pies"
+			>
+				<div class="pie deliver _panel">
+					<div class="title">Sub</div>
+					<XPie :data="topSubInstancesForPie" class="chart" />
+					<div class="subTitle">Top 10</div>
+				</div>
+				<div class="pie inbox _panel">
+					<div class="title">Pub</div>
+					<XPie :data="topPubInstancesForPie" class="chart" />
+					<div class="subTitle">Top 10</div>
 				</div>
 			</div>
-			<div class="item _panel pub">
-				<div class="icon"><i class="ph-upload ph-bold ph-xl"></i></div>
-				<div class="body">
-					<div class="value">
-						{{ number(federationPubActive) }}
-						<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="federationPubActiveDiff"></MkNumberDiff>
+			<div v-if="!fetching" class="items">
+				<div class="item _panel sub">
+					<div class="icon">
+						<i class="ph-download ph-bold ph-xl"></i>
+					</div>
+					<div class="body">
+						<div class="value">
+							{{ number(federationSubActive) }}
+							<MkNumberDiff
+								v-tooltip="i18n.ts.dayOverDayChanges"
+								class="diff"
+								:value="federationSubActiveDiff"
+							></MkNumberDiff>
+						</div>
+						<div class="label">Sub</div>
+					</div>
+				</div>
+				<div class="item _panel pub">
+					<div class="icon">
+						<i class="ph-upload ph-bold ph-xl"></i>
+					</div>
+					<div class="body">
+						<div class="value">
+							{{ number(federationPubActive) }}
+							<MkNumberDiff
+								v-tooltip="i18n.ts.dayOverDayChanges"
+								class="diff"
+								:value="federationPubActiveDiff"
+							></MkNumberDiff>
+						</div>
+						<div class="label">Pub</div>
 					</div>
-					<div class="label">Pub</div>
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import XPie from './overview.pie.vue';
-import MkMiniChart from '@/components/MkMiniChart.vue';
-import * as os from '@/os';
-import number from '@/filters/number';
-import MkNumberDiff from '@/components/MkNumberDiff.vue';
-import { i18n } from '@/i18n';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip';
+import { onMounted, onUnmounted, ref } from "vue";
+import XPie from "./overview.pie.vue";
+import MkMiniChart from "@/components/MkMiniChart.vue";
+import * as os from "@/os";
+import number from "@/filters/number";
+import MkNumberDiff from "@/components/MkNumberDiff.vue";
+import { i18n } from "@/i18n";
+import { useChartTooltip } from "@/scripts/use-chart-tooltip";
 
 let topSubInstancesForPie: any = $ref(null);
 let topPubInstancesForPie: any = $ref(null);
@@ -61,29 +76,48 @@ let fetching = $ref(true);
 const { handler: externalTooltipHandler } = useChartTooltip();
 
 onMounted(async () => {
-	const chart = await os.apiGet('charts/federation', { limit: 2, span: 'day' });
+	const chart = await os.apiGet("charts/federation", {
+		limit: 2,
+		span: "day",
+	});
 	federationPubActive = chart.pubActive[0];
 	federationPubActiveDiff = chart.pubActive[0] - chart.pubActive[1];
 	federationSubActive = chart.subActive[0];
 	federationSubActiveDiff = chart.subActive[0] - chart.subActive[1];
 
-	os.apiGet('federation/stats', { limit: 10 }).then(res => {
-		topSubInstancesForPie = res.topSubInstances.map(x => ({
-			name: x.host,
-			color: x.themeColor,
-			value: x.followersCount,
-			onClick: () => {
-				os.pageWindow(`/instance-info/${x.host}`);
-			},
-		})).concat([{ name: '(other)', color: '#80808080', value: res.otherFollowersCount }]);
-		topPubInstancesForPie = res.topPubInstances.map(x => ({
-			name: x.host,
-			color: x.themeColor,
-			value: x.followingCount,
-			onClick: () => {
-				os.pageWindow(`/instance-info/${x.host}`);
-			},
-		})).concat([{ name: '(other)', color: '#80808080', value: res.otherFollowingCount }]);
+	os.apiGet("federation/stats", { limit: 10 }).then((res) => {
+		topSubInstancesForPie = res.topSubInstances
+			.map((x) => ({
+				name: x.host,
+				color: x.themeColor,
+				value: x.followersCount,
+				onClick: () => {
+					os.pageWindow(`/instance-info/${x.host}`);
+				},
+			}))
+			.concat([
+				{
+					name: "(other)",
+					color: "#80808080",
+					value: res.otherFollowersCount,
+				},
+			]);
+		topPubInstancesForPie = res.topPubInstances
+			.map((x) => ({
+				name: x.host,
+				color: x.themeColor,
+				value: x.followingCount,
+				onClick: () => {
+					os.pageWindow(`/instance-info/${x.host}`);
+				},
+			}))
+			.concat([
+				{
+					name: "(other)",
+					color: "#80808080",
+					value: res.otherFollowingCount,
+				},
+			]);
 	});
 
 	fetching = false;
@@ -92,7 +126,6 @@ onMounted(async () => {
 
 <style lang="scss" module>
 .root {
-
 	&:global {
 		> .pies {
 			display: grid;
@@ -182,4 +215,3 @@ onMounted(async () => {
 	}
 }
 </style>
-
diff --git a/packages/client/src/pages/admin/overview.heatmap.vue b/packages/client/src/pages/admin/overview.heatmap.vue
index 7628209c7..1a4984ba7 100644
--- a/packages/client/src/pages/admin/overview.heatmap.vue
+++ b/packages/client/src/pages/admin/overview.heatmap.vue
@@ -1,21 +1,27 @@
 <template>
-<div class="_panel" :class="$style.root">
-	<MkSelect v-model="src" style="margin: 0 0 12px 0;" small>
-		<option value="notes">Notes</option>
-		<option value="active-users">Active users</option>
-		<option value="ap-requests-inbox-received">Fediverse Requests: inboxReceived</option>
-		<option value="ap-requests-deliver-succeeded">Fediverse Requests: deliverSucceeded</option>
-		<option value="ap-requests-deliver-failed">Fediverse Requests: deliverFailed</option>
-	</MkSelect>
-	<MkHeatmap :src="src"/>
-</div>
+	<div class="_panel" :class="$style.root">
+		<MkSelect v-model="src" style="margin: 0 0 12px 0" small>
+			<option value="notes">Notes</option>
+			<option value="active-users">Active users</option>
+			<option value="ap-requests-inbox-received">
+				Fediverse Requests: inboxReceived
+			</option>
+			<option value="ap-requests-deliver-succeeded">
+				Fediverse Requests: deliverSucceeded
+			</option>
+			<option value="ap-requests-deliver-failed">
+				Fediverse Requests: deliverFailed
+			</option>
+		</MkSelect>
+		<MkHeatmap :src="src" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import MkHeatmap from '@/components/MkHeatmap.vue';
-import MkSelect from '@/components/form/select.vue';
+import MkHeatmap from "@/components/MkHeatmap.vue";
+import MkSelect from "@/components/form/select.vue";
 
-let src = $ref('notes');
+let src = $ref("notes");
 </script>
 
 <style lang="scss" module>
diff --git a/packages/client/src/pages/admin/overview.instances.vue b/packages/client/src/pages/admin/overview.instances.vue
index 15dbdc463..e5d0d1d32 100644
--- a/packages/client/src/pages/admin/overview.instances.vue
+++ b/packages/client/src/pages/admin/overview.instances.vue
@@ -1,28 +1,39 @@
 <template>
-<div class="wbrkwale">
-	<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
-		<MkLoading v-if="fetching"/>
-		<div v-else class="instances">
-			<MkA v-for="(instance, i) in instances" :key="instance.id" v-tooltip.mfm.noDelay="`${instance.name}\n${instance.host}\n${instance.softwareName} ${instance.softwareVersion}`" :to="`/instance-info/${instance.host}`" class="instance">
-				<MkInstanceCardMini :instance="instance"/>
-			</MkA>
-		</div>
-	</Transition>
-</div>
+	<div class="wbrkwale">
+		<Transition
+			:name="$store.state.animation ? '_transition_zoom' : ''"
+			mode="out-in"
+		>
+			<MkLoading v-if="fetching" />
+			<div v-else class="instances">
+				<MkA
+					v-for="(instance, i) in instances"
+					:key="instance.id"
+					v-tooltip.mfm.noDelay="
+						`${instance.name}\n${instance.host}\n${instance.softwareName} ${instance.softwareVersion}`
+					"
+					:to="`/instance-info/${instance.host}`"
+					class="instance"
+				>
+					<MkInstanceCardMini :instance="instance" />
+				</MkA>
+			</div>
+		</Transition>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import MkInstanceCardMini from '@/components/MkInstanceCardMini.vue';
+import { onMounted, onUnmounted, ref } from "vue";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import MkInstanceCardMini from "@/components/MkInstanceCardMini.vue";
 
 const instances = ref([]);
 const fetching = ref(true);
 
 const fetch = async () => {
-	const fetchedInstances = await os.api('federation/instances', {
-		sort: '+latestRequestReceivedAt',
+	const fetchedInstances = await os.api("federation/instances", {
+		sort: "+latestRequestReceivedAt",
 		limit: 6,
 	});
 	instances.value = fetchedInstances;
diff --git a/packages/client/src/pages/admin/overview.moderators.vue b/packages/client/src/pages/admin/overview.moderators.vue
index 1a5160172..6184cfb10 100644
--- a/packages/client/src/pages/admin/overview.moderators.vue
+++ b/packages/client/src/pages/admin/overview.moderators.vue
@@ -1,29 +1,37 @@
 <template>
-<div>
-	<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
-		<MkLoading v-if="fetching"/>
-		<div v-else :class="$style.root" class="_panel">
-			<MkA v-for="user in moderators" :key="user.id" class="user" :to="`/user-info/${user.id}`">
-				<MkAvatar :user="user" class="avatar" indicator/>
-			</MkA>
-		</div>
-	</Transition>
-</div>
+	<div>
+		<Transition
+			:name="$store.state.animation ? '_transition_zoom' : ''"
+			mode="out-in"
+		>
+			<MkLoading v-if="fetching" />
+			<div v-else :class="$style.root" class="_panel">
+				<MkA
+					v-for="user in moderators"
+					:key="user.id"
+					class="user"
+					:to="`/user-info/${user.id}`"
+				>
+					<MkAvatar :user="user" class="avatar" indicator />
+				</MkA>
+			</div>
+		</Transition>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import * as os from '@/os';
-import number from '@/filters/number';
-import { i18n } from '@/i18n';
+import { onMounted, onUnmounted, ref } from "vue";
+import * as os from "@/os";
+import number from "@/filters/number";
+import { i18n } from "@/i18n";
 
 let moderators: any = $ref(null);
 let fetching = $ref(true);
 
 onMounted(async () => {
-	moderators = await os.api('admin/show-users', {
-		sort: '+updatedAt',
-		state: 'adminOrModerator',
+	moderators = await os.api("admin/show-users", {
+		sort: "+updatedAt",
+		state: "adminOrModerator",
 		limit: 30,
 	});
 
diff --git a/packages/client/src/pages/admin/overview.pie.vue b/packages/client/src/pages/admin/overview.pie.vue
index 416e96335..9de9f5c4b 100644
--- a/packages/client/src/pages/admin/overview.pie.vue
+++ b/packages/client/src/pages/admin/overview.pie.vue
@@ -1,41 +1,50 @@
 <template>
-<canvas ref="chartEl"></canvas>
+	<canvas ref="chartEl"></canvas>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref, shallowRef } from 'vue';
-import { Chart } from 'chart.js';
-import number from '@/filters/number';
-import { defaultStore } from '@/store';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip';
-import { initChart } from '@/scripts/init-chart';
+import { onMounted, onUnmounted, ref, shallowRef } from "vue";
+import { Chart } from "chart.js";
+import number from "@/filters/number";
+import { defaultStore } from "@/store";
+import { useChartTooltip } from "@/scripts/use-chart-tooltip";
+import { initChart } from "@/scripts/init-chart";
 
 initChart();
 
 const props = defineProps<{
-	data: { name: string; value: number; color: string; onClick?: () => void }[];
+	data: {
+		name: string;
+		value: number;
+		color: string;
+		onClick?: () => void;
+	}[];
 }>();
 
 const chartEl = shallowRef<HTMLCanvasElement>(null);
 
 const { handler: externalTooltipHandler } = useChartTooltip({
-	position: 'middle',
+	position: "middle",
 });
 
 let chartInstance: Chart;
 
 onMounted(() => {
 	chartInstance = new Chart(chartEl.value, {
-		type: 'doughnut',
+		type: "doughnut",
 		data: {
-			labels: props.data.map(x => x.name),
-			datasets: [{
-				backgroundColor: props.data.map(x => x.color),
-				borderColor: getComputedStyle(document.documentElement).getPropertyValue('--panel'),
-				borderWidth: 2,
-				hoverOffset: 0,
-				data: props.data.map(x => x.value),
-			}],
+			labels: props.data.map((x) => x.name),
+			datasets: [
+				{
+					backgroundColor: props.data.map((x) => x.color),
+					borderColor: getComputedStyle(
+						document.documentElement
+					).getPropertyValue("--panel"),
+					borderWidth: 2,
+					hoverOffset: 0,
+					data: props.data.map((x) => x.value),
+				},
+			],
 		},
 		options: {
 			layout: {
@@ -47,7 +56,12 @@ onMounted(() => {
 				},
 			},
 			onClick: (ev) => {
-				const hit = chartInstance.getElementsAtEventForMode(ev, 'nearest', { intersect: true }, false)[0];
+				const hit = chartInstance.getElementsAtEventForMode(
+					ev,
+					"nearest",
+					{ intersect: true },
+					false
+				)[0];
 				if (hit && props.data[hit.index].onClick) {
 					props.data[hit.index].onClick();
 				}
@@ -58,7 +72,7 @@ onMounted(() => {
 				},
 				tooltip: {
 					enabled: false,
-					mode: 'index',
+					mode: "index",
 					animation: {
 						duration: 0,
 					},
@@ -70,6 +84,4 @@ onMounted(() => {
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/admin/overview.queue-chart.vue b/packages/client/src/pages/admin/overview.queue-chart.vue
index 15d4835a5..ebc344fa0 100644
--- a/packages/client/src/pages/admin/overview.queue-chart.vue
+++ b/packages/client/src/pages/admin/overview.queue-chart.vue
@@ -1,9 +1,9 @@
 <template>
-<canvas ref="chartEl"></canvas>
+	<canvas ref="chartEl"></canvas>
 </template>
 
 <script lang="ts" setup>
-import { defineComponent, onMounted, onUnmounted, ref } from 'vue';
+import { defineComponent, onMounted, onUnmounted, ref } from "vue";
 import {
 	Chart,
 	ArcElement,
@@ -20,11 +20,11 @@ import {
 	Tooltip,
 	SubTitle,
 	Filler,
-} from 'chart.js';
-import number from '@/filters/number';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip';
+} from "chart.js";
+import number from "@/filters/number";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { useChartTooltip } from "@/scripts/use-chart-tooltip";
 
 Chart.register(
 	ArcElement,
@@ -40,7 +40,7 @@ Chart.register(
 	Title,
 	Tooltip,
 	SubTitle,
-	Filler,
+	Filler
 );
 
 const props = defineProps<{
@@ -58,18 +58,24 @@ const alpha = (hex, a) => {
 
 const chartEl = ref<HTMLCanvasElement>(null);
 
-const gridColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
+const gridColor = defaultStore.state.darkMode
+	? "rgba(255, 255, 255, 0.1)"
+	: "rgba(0, 0, 0, 0.1)";
 
 // フォントカラー
-Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
+Chart.defaults.color = getComputedStyle(
+	document.documentElement
+).getPropertyValue("--fg");
 
 const { handler: externalTooltipHandler } = useChartTooltip();
 
 let chartInstance: Chart;
 
 const onStats = (stats) => {
-	chartInstance.data.labels.push('');
-	chartInstance.data.datasets[0].data.push(stats[props.domain].activeSincePrevTick);
+	chartInstance.data.labels.push("");
+	chartInstance.data.datasets[0].data.push(
+		stats[props.domain].activeSincePrevTick
+	);
 	chartInstance.data.datasets[1].data.push(stats[props.domain].active);
 	chartInstance.data.datasets[2].data.push(stats[props.domain].waiting);
 	chartInstance.data.datasets[3].data.push(stats[props.domain].delayed);
@@ -85,8 +91,10 @@ const onStats = (stats) => {
 
 const onStatsLog = (statsLog) => {
 	for (const stats of [...statsLog].reverse()) {
-		chartInstance.data.labels.push('');
-		chartInstance.data.datasets[0].data.push(stats[props.domain].activeSincePrevTick);
+		chartInstance.data.labels.push("");
+		chartInstance.data.datasets[0].data.push(
+			stats[props.domain].activeSincePrevTick
+		);
 		chartInstance.data.datasets[1].data.push(stats[props.domain].active);
 		chartInstance.data.datasets[2].data.push(stats[props.domain].waiting);
 		chartInstance.data.datasets[3].data.push(stats[props.domain].delayed);
@@ -103,47 +111,52 @@ const onStatsLog = (statsLog) => {
 
 onMounted(() => {
 	chartInstance = new Chart(chartEl.value, {
-		type: 'line',
+		type: "line",
 		data: {
 			labels: [],
-			datasets: [{
-				label: 'Process',
-				pointRadius: 0,
-				tension: 0.3,
-				borderWidth: 2,
-				borderJoinStyle: 'round',
-				borderColor: '#9ccfd8',
-				backgroundColor: alpha('#9ccfd8', 0.1),
-				data: [],
-			}, {
-				label: 'Active',
-				pointRadius: 0,
-				tension: 0.3,
-				borderWidth: 2,
-				borderJoinStyle: 'round',
-				borderColor: '#31748f',
-				backgroundColor: alpha('#31748f', 0.1),
-				data: [],
-			}, {
-				label: 'Waiting',
-				pointRadius: 0,
-				tension: 0.3,
-				borderWidth: 2,
-				borderJoinStyle: 'round',
-				borderColor: '#f6c177',
-				backgroundColor: alpha('#f6c177', 0.1),
-				data: [],
-			}, {
-				label: 'Delayed',
-				pointRadius: 0,
-				tension: 0.3,
-				borderWidth: 2,
-				borderJoinStyle: 'round',
-				borderColor: '#eb6f92',
-				borderDash: [5, 5],
-				fill: false,
-				data: [],
-			}],
+			datasets: [
+				{
+					label: "Process",
+					pointRadius: 0,
+					tension: 0.3,
+					borderWidth: 2,
+					borderJoinStyle: "round",
+					borderColor: "#9ccfd8",
+					backgroundColor: alpha("#9ccfd8", 0.1),
+					data: [],
+				},
+				{
+					label: "Active",
+					pointRadius: 0,
+					tension: 0.3,
+					borderWidth: 2,
+					borderJoinStyle: "round",
+					borderColor: "#31748f",
+					backgroundColor: alpha("#31748f", 0.1),
+					data: [],
+				},
+				{
+					label: "Waiting",
+					pointRadius: 0,
+					tension: 0.3,
+					borderWidth: 2,
+					borderJoinStyle: "round",
+					borderColor: "#f6c177",
+					backgroundColor: alpha("#f6c177", 0.1),
+					data: [],
+				},
+				{
+					label: "Delayed",
+					pointRadius: 0,
+					tension: 0.3,
+					borderWidth: 2,
+					borderJoinStyle: "round",
+					borderColor: "#eb6f92",
+					borderDash: [5, 5],
+					fill: false,
+					data: [],
+				},
+			],
 		},
 		options: {
 			aspectRatio: 2.5,
@@ -186,7 +199,7 @@ onMounted(() => {
 				},
 				tooltip: {
 					enabled: false,
-					mode: 'index',
+					mode: "index",
 					animation: {
 						duration: 0,
 					},
@@ -196,16 +209,14 @@ onMounted(() => {
 		},
 	});
 
-	props.connection.on('stats', onStats);
-	props.connection.on('statsLog', onStatsLog);
+	props.connection.on("stats", onStats);
+	props.connection.on("statsLog", onStatsLog);
 });
 
 onUnmounted(() => {
-	props.connection.off('stats', onStats);
-	props.connection.off('statsLog', onStatsLog);
+	props.connection.off("stats", onStats);
+	props.connection.off("statsLog", onStatsLog);
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/admin/overview.queue.chart.vue b/packages/client/src/pages/admin/overview.queue.chart.vue
index 46d030687..01a0d0ec0 100644
--- a/packages/client/src/pages/admin/overview.queue.chart.vue
+++ b/packages/client/src/pages/admin/overview.queue.chart.vue
@@ -1,17 +1,17 @@
 <template>
-<canvas ref="chartEl"></canvas>
+	<canvas ref="chartEl"></canvas>
 </template>
 
 <script lang="ts" setup>
-import { watch, onMounted, onUnmounted, ref, shallowRef } from 'vue';
-import { Chart } from 'chart.js';
-import number from '@/filters/number';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip';
-import { chartVLine } from '@/scripts/chart-vline';
-import { alpha } from '@/scripts/color';
-import { initChart } from '@/scripts/init-chart';
+import { watch, onMounted, onUnmounted, ref, shallowRef } from "vue";
+import { Chart } from "chart.js";
+import number from "@/filters/number";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { useChartTooltip } from "@/scripts/use-chart-tooltip";
+import { chartVLine } from "@/scripts/chart-vline";
+import { alpha } from "@/scripts/color";
+import { initChart } from "@/scripts/init-chart";
 
 initChart();
 
@@ -28,7 +28,7 @@ let chartInstance: Chart;
 function setData(values) {
 	if (chartInstance == null) return;
 	for (const value of values) {
-		chartInstance.data.labels.push('');
+		chartInstance.data.labels.push("");
 		chartInstance.data.datasets[0].data.push(value);
 		if (chartInstance.data.datasets[0].data.length > 100) {
 			chartInstance.data.labels.shift();
@@ -40,7 +40,7 @@ function setData(values) {
 
 function pushData(value) {
 	if (chartInstance == null) return;
-	chartInstance.data.labels.push('');
+	chartInstance.data.labels.push("");
 	chartInstance.data.datasets[0].data.push(value);
 	if (chartInstance.data.datasets[0].data.length > 100) {
 		chartInstance.data.labels.shift();
@@ -50,37 +50,49 @@ function pushData(value) {
 }
 
 const label =
-	props.type === 'process' ? 'Process' :
-	props.type === 'active' ? 'Active' :
-	props.type === 'delayed' ? 'Delayed' :
-	props.type === 'waiting' ? 'Waiting' :
-	'?' as never;
+	props.type === "process"
+		? "Process"
+		: props.type === "active"
+		? "Active"
+		: props.type === "delayed"
+		? "Delayed"
+		: props.type === "waiting"
+		? "Waiting"
+		: ("?" as never);
 
 const color =
-	props.type === 'process' ? '#c4a7e7' :
-	props.type === 'active' ? '#31748f' :
-	props.type === 'delayed' ? '#eb6f92' :
-	props.type === 'waiting' ? '#f6c177' :
-	'?' as never;
+	props.type === "process"
+		? "#c4a7e7"
+		: props.type === "active"
+		? "#31748f"
+		: props.type === "delayed"
+		? "#eb6f92"
+		: props.type === "waiting"
+		? "#f6c177"
+		: ("?" as never);
 
 onMounted(() => {
-	const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
+	const vLineColor = defaultStore.state.darkMode
+		? "rgba(255, 255, 255, 0.2)"
+		: "rgba(0, 0, 0, 0.2)";
 
 	chartInstance = new Chart(chartEl.value, {
-		type: 'line',
+		type: "line",
 		data: {
 			labels: [],
-			datasets: [{
-				label: label,
-				pointRadius: 0,
-				tension: 0.3,
-				borderWidth: 2,
-				borderJoinStyle: 'round',
-				borderColor: color,
-				backgroundColor: alpha(color, 0.2),
-				fill: true,
-				data: [],
-			}],
+			datasets: [
+				{
+					label: label,
+					pointRadius: 0,
+					tension: 0.3,
+					borderWidth: 2,
+					borderJoinStyle: "round",
+					borderColor: color,
+					backgroundColor: alpha(color, 0.2),
+					fill: true,
+					data: [],
+				},
+			],
 		},
 		options: {
 			aspectRatio: 2.5,
@@ -104,8 +116,7 @@ onMounted(() => {
 				},
 				y: {
 					min: 0,
-					grid: {
-					},
+					grid: {},
 				},
 			},
 			interaction: {
@@ -117,7 +128,7 @@ onMounted(() => {
 				},
 				tooltip: {
 					enabled: false,
-					mode: 'index',
+					mode: "index",
 					animation: {
 						duration: 0,
 					},
@@ -135,6 +146,4 @@ defineExpose({
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/admin/overview.queue.vue b/packages/client/src/pages/admin/overview.queue.vue
index 7e5888293..5b003887e 100644
--- a/packages/client/src/pages/admin/overview.queue.vue
+++ b/packages/client/src/pages/admin/overview.queue.vue
@@ -1,43 +1,55 @@
 <template>
-<div :class="$style.root">
-	<div class="_table status">
-		<div class="_row">
-			<div class="_cell" style="text-align: center;"><div class="_label">Process</div>{{ number(activeSincePrevTick) }}</div>
-			<div class="_cell" style="text-align: center;"><div class="_label">Active</div>{{ number(active) }}</div>
-			<div class="_cell" style="text-align: center;"><div class="_label">Waiting</div>{{ number(waiting) }}</div>
-			<div class="_cell" style="text-align: center;"><div class="_label">Delayed</div>{{ number(delayed) }}</div>
+	<div :class="$style.root">
+		<div class="_table status">
+			<div class="_row">
+				<div class="_cell" style="text-align: center">
+					<div class="_label">Process</div>
+					{{ number(activeSincePrevTick) }}
+				</div>
+				<div class="_cell" style="text-align: center">
+					<div class="_label">Active</div>
+					{{ number(active) }}
+				</div>
+				<div class="_cell" style="text-align: center">
+					<div class="_label">Waiting</div>
+					{{ number(waiting) }}
+				</div>
+				<div class="_cell" style="text-align: center">
+					<div class="_label">Delayed</div>
+					{{ number(delayed) }}
+				</div>
+			</div>
+		</div>
+		<div class="charts">
+			<div class="chart">
+				<div class="title">Process</div>
+				<XChart ref="chartProcess" type="process" />
+			</div>
+			<div class="chart">
+				<div class="title">Active</div>
+				<XChart ref="chartActive" type="active" />
+			</div>
+			<div class="chart">
+				<div class="title">Delayed</div>
+				<XChart ref="chartDelayed" type="delayed" />
+			</div>
+			<div class="chart">
+				<div class="title">Waiting</div>
+				<XChart ref="chartWaiting" type="waiting" />
+			</div>
 		</div>
 	</div>
-	<div class="charts">
-		<div class="chart">
-			<div class="title">Process</div>
-			<XChart ref="chartProcess" type="process"/>
-		</div>
-		<div class="chart">
-			<div class="title">Active</div>
-			<XChart ref="chartActive" type="active"/>
-		</div>
-		<div class="chart">
-			<div class="title">Delayed</div>
-			<XChart ref="chartDelayed" type="delayed"/>
-		</div>
-		<div class="chart">
-			<div class="title">Waiting</div>
-			<XChart ref="chartWaiting" type="waiting"/>
-		</div>
-	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { markRaw, onMounted, onUnmounted, ref } from 'vue';
-import XChart from './overview.queue.chart.vue';
-import number from '@/filters/number';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import { i18n } from '@/i18n';
+import { markRaw, onMounted, onUnmounted, ref } from "vue";
+import XChart from "./overview.queue.chart.vue";
+import number from "@/filters/number";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import { i18n } from "@/i18n";
 
-const connection = markRaw(stream.useChannel('queueStats'));
+const connection = markRaw(stream.useChannel("queueStats"));
 
 const activeSincePrevTick = ref(0);
 const active = ref(0);
@@ -84,17 +96,17 @@ const onStatsLog = (statsLog) => {
 };
 
 onMounted(() => {
-	connection.on('stats', onStats);
-	connection.on('statsLog', onStatsLog);
-	connection.send('requestLog', {
+	connection.on("stats", onStats);
+	connection.on("statsLog", onStatsLog);
+	connection.send("requestLog", {
 		id: Math.random().toString().substr(2, 8),
 		length: 100,
 	});
 });
 
 onUnmounted(() => {
-	connection.off('stats', onStats);
-	connection.off('statsLog', onStatsLog);
+	connection.off("stats", onStats);
+	connection.off("statsLog", onStatsLog);
 	connection.dispose();
 });
 </script>
@@ -124,4 +136,4 @@ onUnmounted(() => {
 		}
 	}
 }
-</style>	
+</style>
diff --git a/packages/client/src/pages/admin/overview.stats.vue b/packages/client/src/pages/admin/overview.stats.vue
index 797a0ba08..b6d9e0bf1 100644
--- a/packages/client/src/pages/admin/overview.stats.vue
+++ b/packages/client/src/pages/admin/overview.stats.vue
@@ -1,59 +1,90 @@
 <template>
-<div>
-	<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
-		<MkLoading v-if="fetching"/>
-		<div v-else :class="$style.root">
-			<div class="item _panel users">
-				<div class="icon"><i class="ph-users ph-bold ph-xl"></i></div>
-				<div class="body">
-					<div class="value">
-						<MkNumber :value="stats.originalUsersCount" style="margin-right: 0.5em;"/>
-						<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="usersComparedToThePrevDay"></MkNumberDiff>
+	<div>
+		<Transition
+			:name="$store.state.animation ? '_transition_zoom' : ''"
+			mode="out-in"
+		>
+			<MkLoading v-if="fetching" />
+			<div v-else :class="$style.root">
+				<div class="item _panel users">
+					<div class="icon">
+						<i class="ph-users ph-bold ph-xl"></i>
+					</div>
+					<div class="body">
+						<div class="value">
+							<MkNumber
+								:value="stats.originalUsersCount"
+								style="margin-right: 0.5em"
+							/>
+							<MkNumberDiff
+								v-tooltip="i18n.ts.dayOverDayChanges"
+								class="diff"
+								:value="usersComparedToThePrevDay"
+							></MkNumberDiff>
+						</div>
+						<div class="label">Users</div>
+					</div>
+				</div>
+				<div class="item _panel notes">
+					<div class="icon">
+						<i class="ph-pencil ph-bold ph-xl"></i>
+					</div>
+					<div class="body">
+						<div class="value">
+							<MkNumber
+								:value="stats.originalNotesCount"
+								style="margin-right: 0.5em"
+							/>
+							<MkNumberDiff
+								v-tooltip="i18n.ts.dayOverDayChanges"
+								class="diff"
+								:value="notesComparedToThePrevDay"
+							></MkNumberDiff>
+						</div>
+						<div class="label">Posts</div>
+					</div>
+				</div>
+				<div class="item _panel instances">
+					<div class="icon">
+						<i class="ph-planet ph-bold ph-xl"></i>
+					</div>
+					<div class="body">
+						<div class="value">
+							<MkNumber
+								:value="stats.instances"
+								style="margin-right: 0.5em"
+							/>
+						</div>
+						<div class="label">Instances</div>
+					</div>
+				</div>
+				<div class="item _panel online">
+					<div class="icon">
+						<i class="ph-broadcast ph-bold ph-xl"></i>
+					</div>
+					<div class="body">
+						<div class="value">
+							<MkNumber
+								:value="onlineUsersCount"
+								style="margin-right: 0.5em"
+							/>
+						</div>
+						<div class="label">Online</div>
 					</div>
-					<div class="label">Users</div>
 				</div>
 			</div>
-			<div class="item _panel notes">
-				<div class="icon"><i class="ph-pencil ph-bold ph-xl"></i></div>
-				<div class="body">
-					<div class="value">
-						<MkNumber :value="stats.originalNotesCount" style="margin-right: 0.5em;"/>
-						<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="notesComparedToThePrevDay"></MkNumberDiff>
-					</div>
-					<div class="label">Posts</div>
-				</div>
-			</div>
-			<div class="item _panel instances">
-				<div class="icon"><i class="ph-planet ph-bold ph-xl"></i></div>
-				<div class="body">
-					<div class="value">
-						<MkNumber :value="stats.instances" style="margin-right: 0.5em;"/>
-					</div>
-					<div class="label">Instances</div>
-				</div>
-			</div>
-			<div class="item _panel online">
-				<div class="icon"><i class="ph-broadcast ph-bold ph-xl"></i></div>
-				<div class="body">
-					<div class="value">
-						<MkNumber :value="onlineUsersCount" style="margin-right: 0.5em;"/>
-					</div>
-					<div class="label">Online</div>
-				</div>
-			</div>
-		</div>
-	</Transition>
-</div>
+		</Transition>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import MkMiniChart from '@/components/MkMiniChart.vue';
-import * as os from '@/os';
-import number from '@/filters/number';
-import MkNumberDiff from '@/components/MkNumberDiff.vue';
-import MkNumber from '@/components/MkNumber.vue';
-import { i18n } from '@/i18n';
+import { onMounted, onUnmounted, ref } from "vue";
+import MkMiniChart from "@/components/MkMiniChart.vue";
+import * as os from "@/os";
+import number from "@/filters/number";
+import MkNumberDiff from "@/components/MkNumberDiff.vue";
+import MkNumber from "@/components/MkNumber.vue";
+import { i18n } from "@/i18n";
 
 let stats: any = $ref(null);
 let usersComparedToThePrevDay = $ref<number>();
@@ -63,18 +94,20 @@ let fetching = $ref(true);
 
 onMounted(async () => {
 	const [_stats, _onlineUsersCount] = await Promise.all([
-		os.api('stats', {}),
-		os.api('get-online-users-count').then(res => res.count),
+		os.api("stats", {}),
+		os.api("get-online-users-count").then((res) => res.count),
 	]);
 	stats = _stats;
 	onlineUsersCount = _onlineUsersCount;
 
-	os.apiGet('charts/users', { limit: 2, span: 'day' }).then(chart => {
-		usersComparedToThePrevDay = stats.originalUsersCount - chart.local.total[1];
+	os.apiGet("charts/users", { limit: 2, span: "day" }).then((chart) => {
+		usersComparedToThePrevDay =
+			stats.originalUsersCount - chart.local.total[1];
 	});
 
-	os.apiGet('charts/notes', { limit: 2, span: 'day' }).then(chart => {
-		notesComparedToThePrevDay = stats.originalNotesCount - chart.local.total[1];
+	os.apiGet("charts/notes", { limit: 2, span: "day" }).then((chart) => {
+		notesComparedToThePrevDay =
+			stats.originalNotesCount - chart.local.total[1];
 	});
 
 	fetching = false;
@@ -128,7 +161,7 @@ onMounted(async () => {
 			&.emojis {
 				> .icon {
 					background: #ea9d3422;
-						color: #f6c177;
+					color: #f6c177;
 				}
 			}
 
diff --git a/packages/client/src/pages/admin/overview.user.vue b/packages/client/src/pages/admin/overview.user.vue
index 52f676e72..89370cee8 100644
--- a/packages/client/src/pages/admin/overview.user.vue
+++ b/packages/client/src/pages/admin/overview.user.vue
@@ -1,19 +1,26 @@
 <template>
-<MkA :class="[$style.root]" :to="`/user-info/${user.id}`">
-	<MkAvatar class="avatar" :user="user" :disable-link="true" :show-indicator="true"/>
-	<div class="body">
-		<span class="name"><MkUserName class="name" :user="user"/></span>
-		<span class="sub"><span class="acct _monospace">@{{ acct(user) }}</span></span>
-	</div>
-	<MkMiniChart v-if="chart" class="chart" :src="chart.inc"/>
-</MkA>
+	<MkA :class="[$style.root]" :to="`/user-info/${user.id}`">
+		<MkAvatar
+			class="avatar"
+			:user="user"
+			:disable-link="true"
+			:show-indicator="true"
+		/>
+		<div class="body">
+			<span class="name"><MkUserName class="name" :user="user" /></span>
+			<span class="sub"
+				><span class="acct _monospace">@{{ acct(user) }}</span></span
+			>
+		</div>
+		<MkMiniChart v-if="chart" class="chart" :src="chart.inc" />
+	</MkA>
 </template>
 
 <script lang="ts" setup>
-import * as misskey from 'calckey-js';
-import MkMiniChart from '@/components/MkMiniChart.vue';
-import * as os from '@/os';
-import { acct } from '@/filters/user';
+import * as misskey from "calckey-js";
+import MkMiniChart from "@/components/MkMiniChart.vue";
+import * as os from "@/os";
+import { acct } from "@/filters/user";
 
 const props = defineProps<{
 	user: misskey.entities.User;
@@ -21,7 +28,11 @@ const props = defineProps<{
 
 let chart = $ref(null);
 
-os.apiGet('charts/user/notes', { userId: props.user.id, limit: 16, span: 'day' }).then(res => {
+os.apiGet("charts/user/notes", {
+	userId: props.user.id,
+	limit: 16,
+	span: "day",
+}).then((res) => {
 	chart = res;
 });
 </script>
diff --git a/packages/client/src/pages/admin/overview.users.vue b/packages/client/src/pages/admin/overview.users.vue
index 5390d9d8c..9017eb2a2 100644
--- a/packages/client/src/pages/admin/overview.users.vue
+++ b/packages/client/src/pages/admin/overview.users.vue
@@ -1,30 +1,38 @@
 <template>
-<div :class="$style.root">
-	<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
-		<MkLoading v-if="fetching"/>
-		<div v-else class="users">
-			<MkA v-for="(user, i) in newUsers" :key="user.id" :to="`/user-info/${user.id}`" class="user">
-				<MkUserCardMini :user="user"/>
-			</MkA>
-		</div>
-	</Transition>
-</div>
+	<div :class="$style.root">
+		<Transition
+			:name="$store.state.animation ? '_transition_zoom' : ''"
+			mode="out-in"
+		>
+			<MkLoading v-if="fetching" />
+			<div v-else class="users">
+				<MkA
+					v-for="(user, i) in newUsers"
+					:key="user.id"
+					:to="`/user-info/${user.id}`"
+					class="user"
+				>
+					<MkUserCardMini :user="user" />
+				</MkA>
+			</div>
+		</Transition>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import MkUserCardMini from '@/components/MkUserCardMini.vue';
+import { onMounted, onUnmounted, ref } from "vue";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import MkUserCardMini from "@/components/MkUserCardMini.vue";
 
 let newUsers = $ref(null);
 let fetching = $ref(true);
 
 const fetch = async () => {
-	const _newUsers = await os.api('admin/show-users', {
+	const _newUsers = await os.api("admin/show-users", {
 		limit: 5,
-		sort: '+createdAt',
-		origin: 'local',
+		sort: "+createdAt",
+		origin: "local",
 	});
 	newUsers = _newUsers;
 	fetching = false;
diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index f5873d080..4c3391ce4 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -3,77 +3,83 @@
 		<div ref="rootEl" class="edbbcaef">
 			<MkFolder class="item">
 				<template #header>Stats</template>
-				<XStats/>
+				<XStats />
 			</MkFolder>
 
 			<MkFolder class="item">
 				<template #header>Active users</template>
-				<XActiveUsers/>
+				<XActiveUsers />
 			</MkFolder>
 
 			<MkFolder class="item">
 				<template #header>Heatmap</template>
-				<XHeatmap/>
+				<XHeatmap />
 			</MkFolder>
 
 			<MkFolder class="item">
 				<template #header>Moderators</template>
-				<XModerators/>
+				<XModerators />
 			</MkFolder>
 
 			<MkFolder class="item">
 				<template #header>Federation</template>
-				<XFederation/>
+				<XFederation />
 			</MkFolder>
 
 			<MkFolder class="item">
 				<template #header>Instances</template>
-				<XInstances/>
+				<XInstances />
 			</MkFolder>
 
 			<MkFolder class="item">
 				<template #header>Fediverse Requests</template>
-				<XApRequests/>
+				<XApRequests />
 			</MkFolder>
 
 			<MkFolder class="item">
 				<template #header>New users</template>
-				<XUsers/>
+				<XUsers />
 			</MkFolder>
 
 			<MkFolder class="item">
 				<template #header>Deliver queue</template>
-				<XQueue domain="deliver"/>
+				<XQueue domain="deliver" />
 			</MkFolder>
 
 			<MkFolder class="item">
 				<template #header>Inbox queue</template>
-				<XQueue domain="inbox"/>
+				<XQueue domain="inbox" />
 			</MkFolder>
 		</div>
 	</MkSpacer>
 </template>
 
 <script lang="ts" setup>
-import { markRaw, version as vueVersion, onMounted, onBeforeUnmount, nextTick } from 'vue';
-import XFederation from './overview.federation.vue';
-import XInstances from './overview.instances.vue';
-import XQueue from './overview.queue.vue';
-import XApRequests from './overview.ap-requests.vue';
-import XUsers from './overview.users.vue';
-import XActiveUsers from './overview.active-users.vue';
-import XStats from './overview.stats.vue';
-import XModerators from './overview.moderators.vue';
-import XHeatmap from './overview.heatmap.vue';
-import MkTagCloud from '@/components/MkTagCloud.vue';
-import { version, url } from '@/config';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { defaultStore } from '@/store';
-import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
-import MkFolder from '@/components/MkFolder.vue';
+import {
+	markRaw,
+	version as vueVersion,
+	onMounted,
+	onBeforeUnmount,
+	nextTick,
+} from "vue";
+import XFederation from "./overview.federation.vue";
+import XInstances from "./overview.instances.vue";
+import XQueue from "./overview.queue.vue";
+import XApRequests from "./overview.ap-requests.vue";
+import XUsers from "./overview.users.vue";
+import XActiveUsers from "./overview.active-users.vue";
+import XStats from "./overview.stats.vue";
+import XModerators from "./overview.moderators.vue";
+import XHeatmap from "./overview.heatmap.vue";
+import MkTagCloud from "@/components/MkTagCloud.vue";
+import { version, url } from "@/config";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { defaultStore } from "@/store";
+import MkFileListForAdmin from "@/components/MkFileListForAdmin.vue";
+import MkFolder from "@/components/MkFolder.vue";
 
 const rootEl = $shallowRef<HTMLElement>();
 let serverInfo: any = $ref(null);
@@ -85,10 +91,10 @@ let federationSubActive = $ref<number | null>(null);
 let federationSubActiveDiff = $ref<number | null>(null);
 let newUsers = $ref(null);
 let activeInstances = $shallowRef(null);
-const queueStatsConnection = markRaw(stream.useChannel('queueStats'));
+const queueStatsConnection = markRaw(stream.useChannel("queueStats"));
 const now = new Date();
 const filesPagination = {
-	endpoint: 'admin/drive/files' as const,
+	endpoint: "admin/drive/files" as const,
 	limit: 9,
 	noPaging: true,
 };
@@ -108,52 +114,68 @@ onMounted(async () => {
 	magicGrid.listen();
 	*/
 
-	os.apiGet('charts/federation', { limit: 2, span: 'day' }).then(chart => {
+	os.apiGet("charts/federation", { limit: 2, span: "day" }).then((chart) => {
 		federationPubActive = chart.pubActive[0];
 		federationPubActiveDiff = chart.pubActive[0] - chart.pubActive[1];
 		federationSubActive = chart.subActive[0];
 		federationSubActiveDiff = chart.subActive[0] - chart.subActive[1];
 	});
 
-	os.apiGet('federation/stats', { limit: 10 }).then(res => {
-		topSubInstancesForPie = res.topSubInstances.map(x => ({
-			name: x.host,
-			color: x.themeColor,
-			value: x.followersCount,
-			onClick: () => {
-				os.pageWindow(`/instance-info/${x.host}`);
-			},
-		})).concat([{ name: '(other)', color: '#80808080', value: res.otherFollowersCount }]);
-		topPubInstancesForPie = res.topPubInstances.map(x => ({
-			name: x.host,
-			color: x.themeColor,
-			value: x.followingCount,
-			onClick: () => {
-				os.pageWindow(`/instance-info/${x.host}`);
-			},
-		})).concat([{ name: '(other)', color: '#80808080', value: res.otherFollowingCount }]);
+	os.apiGet("federation/stats", { limit: 10 }).then((res) => {
+		topSubInstancesForPie = res.topSubInstances
+			.map((x) => ({
+				name: x.host,
+				color: x.themeColor,
+				value: x.followersCount,
+				onClick: () => {
+					os.pageWindow(`/instance-info/${x.host}`);
+				},
+			}))
+			.concat([
+				{
+					name: "(other)",
+					color: "#80808080",
+					value: res.otherFollowersCount,
+				},
+			]);
+		topPubInstancesForPie = res.topPubInstances
+			.map((x) => ({
+				name: x.host,
+				color: x.themeColor,
+				value: x.followingCount,
+				onClick: () => {
+					os.pageWindow(`/instance-info/${x.host}`);
+				},
+			}))
+			.concat([
+				{
+					name: "(other)",
+					color: "#80808080",
+					value: res.otherFollowingCount,
+				},
+			]);
 	});
 
-	os.api('admin/server-info').then(serverInfoResponse => {
+	os.api("admin/server-info").then((serverInfoResponse) => {
 		serverInfo = serverInfoResponse;
 	});
 
-	os.api('admin/show-users', {
+	os.api("admin/show-users", {
 		limit: 5,
-		sort: '+createdAt',
-	}).then(res => {
+		sort: "+createdAt",
+	}).then((res) => {
 		newUsers = res;
 	});
 
-	os.api('federation/instances', {
-		sort: '+latestRequestReceivedAt',
+	os.api("federation/instances", {
+		sort: "+latestRequestReceivedAt",
 		limit: 25,
-	}).then(res => {
+	}).then((res) => {
 		activeInstances = res;
 	});
 
 	nextTick(() => {
-		queueStatsConnection.send('requestLog', {
+		queueStatsConnection.send("requestLog", {
 			id: Math.random().toString().substr(2, 8),
 			length: 100,
 		});
@@ -170,7 +192,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.dashboard,
-	icon: 'ph-gauge ph-bold ph-lg',
+	icon: "ph-gauge ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/admin/promotions.vue b/packages/client/src/pages/admin/promotions.vue
index 97d5f0e2f..50e764627 100644
--- a/packages/client/src/pages/admin/promotions.vue
+++ b/packages/client/src/pages/admin/promotions.vue
@@ -1,58 +1,82 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="900">
-		<div class="uqshojas">
-			<div v-for="ad in ads" class="_panel _formRoot ad">
-				<MkAd v-if="ad.url" :specify="ad"/>
-				<MkInput v-model="ad.url" type="url" class="_formBlock">
-					<template #label>URL</template>
-				</MkInput>
-				<MkInput v-model="ad.imageUrl" class="_formBlock">
-					<template #label>{{ i18n.ts.imageUrl }}</template>
-				</MkInput>
-				<FormRadios v-model="ad.place" class="_formBlock">
-					<template #label>Form</template>
-					<option value="widget">widget</option>
-					<option value="inline">inline</option>
-					<option value="inline-big">inline-big</option>
-				</FormRadios>
-				<FormSplit>
-					<MkInput :disabled="ad.place === 'widget'" v-model="ad.ratio" type="number">
-						<template #label>{{ i18n.ts.ratio }}</template>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="900">
+			<div class="uqshojas">
+				<div v-for="ad in ads" class="_panel _formRoot ad">
+					<MkAd v-if="ad.url" :specify="ad" />
+					<MkInput v-model="ad.url" type="url" class="_formBlock">
+						<template #label>URL</template>
 					</MkInput>
-					<MkInput v-model="ad.expiresAt" type="date">
-						<template #label>{{ i18n.ts.expiration }}</template>
+					<MkInput v-model="ad.imageUrl" class="_formBlock">
+						<template #label>{{ i18n.ts.imageUrl }}</template>
 					</MkInput>
-				</FormSplit>
-				<MkTextarea v-model="ad.memo" class="_formBlock">
-					<template #label>{{ i18n.ts.memo }}</template>
-				</MkTextarea>
-				<div class="buttons _formBlock">
-					<MkButton class="button" inline primary style="margin-right: 12px;" @click="save(ad)"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-					<MkButton class="button" inline danger @click="remove(ad)"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.remove }}</MkButton>
+					<FormRadios v-model="ad.place" class="_formBlock">
+						<template #label>Form</template>
+						<option value="widget">widget</option>
+						<option value="inline">inline</option>
+						<option value="inline-big">inline-big</option>
+					</FormRadios>
+					<FormSplit>
+						<MkInput
+							:disabled="ad.place === 'widget'"
+							v-model="ad.ratio"
+							type="number"
+						>
+							<template #label>{{ i18n.ts.ratio }}</template>
+						</MkInput>
+						<MkInput v-model="ad.expiresAt" type="date">
+							<template #label>{{ i18n.ts.expiration }}</template>
+						</MkInput>
+					</FormSplit>
+					<MkTextarea v-model="ad.memo" class="_formBlock">
+						<template #label>{{ i18n.ts.memo }}</template>
+					</MkTextarea>
+					<div class="buttons _formBlock">
+						<MkButton
+							class="button"
+							inline
+							primary
+							style="margin-right: 12px"
+							@click="save(ad)"
+							><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+							{{ i18n.ts.save }}</MkButton
+						>
+						<MkButton
+							class="button"
+							inline
+							danger
+							@click="remove(ad)"
+							><i class="ph-trash ph-bold ph-lg"></i>
+							{{ i18n.ts.remove }}</MkButton
+						>
+					</div>
 				</div>
 			</div>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import FormRadios from '@/components/form/radios.vue';
-import FormSplit from '@/components/form/split.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { formatDateTimeString } from '@/scripts/format-time-string';
+import {} from "vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import FormRadios from "@/components/form/radios.vue";
+import FormSplit from "@/components/form/split.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { formatDateTimeString } from "@/scripts/format-time-string";
 
 let ads: any[] = $ref([]);
 
-os.api('admin/ad/list').then(adsResponse => {
+os.api("admin/ad/list").then((adsResponse) => {
 	ads = adsResponse;
 	// The date format should be changed to yyyy-MM-dd in order to be properly displayed
 	for (let i in ads) {
@@ -61,14 +85,17 @@ os.api('admin/ad/list').then(adsResponse => {
 });
 
 function add() {
-	const tomorrow = formatDateTimeString(new Date(new Date().setDate(new Date().getDate() + 1)), 'yyyy-MM-dd');
+	const tomorrow = formatDateTimeString(
+		new Date(new Date().setDate(new Date().getDate() + 1)),
+		"yyyy-MM-dd"
+	);
 	ads.unshift({
 		id: null,
-		memo: '',
-		place: 'widget',
-		priority: 'middle',
+		memo: "",
+		place: "widget",
+		priority: "middle",
 		ratio: 1,
-		url: '',
+		url: "",
 		imageUrl: null,
 		expiresAt: tomorrow,
 	});
@@ -76,12 +103,12 @@ function add() {
 
 function remove(ad) {
 	os.confirm({
-		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: ad.url }),
+		type: "warning",
+		text: i18n.t("removeAreYouSure", { x: ad.url }),
 	}).then(({ canceled }) => {
 		if (canceled) return;
-		ads = ads.filter(x => x !== ad);
-		os.apiWithDialog('admin/ad/delete', {
+		ads = ads.filter((x) => x !== ad);
+		os.apiWithDialog("admin/ad/delete", {
 			id: ad.id,
 		});
 	});
@@ -89,30 +116,32 @@ function remove(ad) {
 
 function save(ad) {
 	if (ad.id == null) {
-		os.apiWithDialog('admin/ad/create', {
+		os.apiWithDialog("admin/ad/create", {
 			...ad,
 			expiresAt: new Date(ad.expiresAt).getTime(),
 		});
 	} else {
-		os.apiWithDialog('admin/ad/update', {
+		os.apiWithDialog("admin/ad/update", {
 			...ad,
 			expiresAt: new Date(ad.expiresAt).getTime(),
 		});
 	}
 }
 
-const headerActions = $computed(() => [{
-	asFullButton: true,
-	icon: 'ph-plus ph-bold ph-lg',
-	text: i18n.ts.add,
-	handler: add,
-}]);
+const headerActions = $computed(() => [
+	{
+		asFullButton: true,
+		icon: "ph-plus ph-bold ph-lg",
+		text: i18n.ts.add,
+		handler: add,
+	},
+]);
 
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.ads,
-	icon: 'ph-money ph-bold ph-lg',
+	icon: "ph-money ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/admin/proxy-account.vue b/packages/client/src/pages/admin/proxy-account.vue
index aeec71d37..87b3c684e 100644
--- a/packages/client/src/pages/admin/proxy-account.vue
+++ b/packages/client/src/pages/admin/proxy-account.vue
@@ -1,44 +1,60 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
-		<FormSuspense :p="init">
-			<MkInfo class="_formBlock">{{ i18n.ts.proxyAccountDescription }}</MkInfo>
-			<MkKeyValue class="_formBlock">
-				<template #key>{{ i18n.ts.proxyAccount }}</template>
-				<template #value>{{ proxyAccount ? `@${proxyAccount.username}` : i18n.ts.none }}</template>
-			</MkKeyValue>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+			<FormSuspense :p="init">
+				<MkInfo class="_formBlock">{{
+					i18n.ts.proxyAccountDescription
+				}}</MkInfo>
+				<MkKeyValue class="_formBlock">
+					<template #key>{{ i18n.ts.proxyAccount }}</template>
+					<template #value>{{
+						proxyAccount
+							? `@${proxyAccount.username}`
+							: i18n.ts.none
+					}}</template>
+				</MkKeyValue>
 
-			<FormButton primary class="_formBlock" @click="chooseProxyAccount">{{ i18n.ts.selectAccount }}</FormButton>
-		</FormSuspense>
-	</MkSpacer>
-</MkStickyContainer>
+				<FormButton
+					primary
+					class="_formBlock"
+					@click="chooseProxyAccount"
+					>{{ i18n.ts.selectAccount }}</FormButton
+				>
+			</FormSuspense>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import FormButton from '@/components/MkButton.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import FormButton from "@/components/MkButton.vue";
+import MkInfo from "@/components/MkInfo.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let proxyAccount: any = $ref(null);
 let proxyAccountId: any = $ref(null);
 
 async function init() {
-	const meta = await os.api('admin/meta');
+	const meta = await os.api("admin/meta");
 	proxyAccountId = meta.proxyAccountId;
 	if (proxyAccountId) {
-		proxyAccount = await os.api('users/show', { userId: proxyAccountId });
+		proxyAccount = await os.api("users/show", { userId: proxyAccountId });
 	}
 }
 
 function chooseProxyAccount() {
-	os.selectUser().then(user => {
+	os.selectUser().then((user) => {
 		proxyAccount = user;
 		proxyAccountId = user.id;
 		save();
@@ -46,7 +62,7 @@ function chooseProxyAccount() {
 }
 
 function save() {
-	os.apiWithDialog('admin/update-meta', {
+	os.apiWithDialog("admin/update-meta", {
 		proxyAccountId: proxyAccountId,
 	}).then(() => {
 		fetchInstance();
@@ -59,6 +75,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.proxyAccount,
-	icon: 'ph-ghost ph-bold ph-lg',
+	icon: "ph-ghost ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/admin/queue.chart.chart.vue b/packages/client/src/pages/admin/queue.chart.chart.vue
index ba6f6505c..bb7d3c1a1 100644
--- a/packages/client/src/pages/admin/queue.chart.chart.vue
+++ b/packages/client/src/pages/admin/queue.chart.chart.vue
@@ -1,9 +1,9 @@
 <template>
-<canvas ref="chartEl"></canvas>
+	<canvas ref="chartEl"></canvas>
 </template>
 
 <script lang="ts" setup>
-import { watch, onMounted, onUnmounted, ref } from 'vue';
+import { watch, onMounted, onUnmounted, ref } from "vue";
 import {
 	Chart,
 	ArcElement,
@@ -20,11 +20,11 @@ import {
 	Tooltip,
 	SubTitle,
 	Filler,
-} from 'chart.js';
-import number from '@/filters/number';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { useChartTooltip } from '@/scripts/use-chart-tooltip';
+} from "chart.js";
+import number from "@/filters/number";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { useChartTooltip } from "@/scripts/use-chart-tooltip";
 
 Chart.register(
 	ArcElement,
@@ -40,7 +40,7 @@ Chart.register(
 	Title,
 	Tooltip,
 	SubTitle,
-	Filler,
+	Filler
 );
 
 const props = defineProps<{
@@ -57,10 +57,14 @@ const alpha = (hex, a) => {
 
 const chartEl = ref<HTMLCanvasElement>(null);
 
-const gridColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
+const gridColor = defaultStore.state.darkMode
+	? "rgba(255, 255, 255, 0.1)"
+	: "rgba(0, 0, 0, 0.1)";
 
 // フォントカラー
-Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
+Chart.defaults.color = getComputedStyle(
+	document.documentElement
+).getPropertyValue("--fg");
 
 const { handler: externalTooltipHandler } = useChartTooltip();
 
@@ -69,7 +73,7 @@ let chartInstance: Chart;
 function setData(values) {
 	if (chartInstance == null) return;
 	for (const value of values) {
-		chartInstance.data.labels.push('');
+		chartInstance.data.labels.push("");
 		chartInstance.data.datasets[0].data.push(value);
 		if (chartInstance.data.datasets[0].data.length > 200) {
 			chartInstance.data.labels.shift();
@@ -81,7 +85,7 @@ function setData(values) {
 
 function pushData(value) {
 	if (chartInstance == null) return;
-	chartInstance.data.labels.push('');
+	chartInstance.data.labels.push("");
 	chartInstance.data.datasets[0].data.push(value);
 	if (chartInstance.data.datasets[0].data.length > 200) {
 		chartInstance.data.labels.shift();
@@ -91,34 +95,44 @@ function pushData(value) {
 }
 
 const label =
-	props.type === 'process' ? 'Process' :
-	props.type === 'active' ? 'Active' :
-	props.type === 'delayed' ? 'Delayed' :
-	props.type === 'waiting' ? 'Waiting' :
-	'?' as never;
+	props.type === "process"
+		? "Process"
+		: props.type === "active"
+		? "Active"
+		: props.type === "delayed"
+		? "Delayed"
+		: props.type === "waiting"
+		? "Waiting"
+		: ("?" as never);
 
 const color =
-	props.type === 'process' ? '#9ccfd8' :
-	props.type === 'active' ? '#31748f' :
-	props.type === 'delayed' ? '#eb6f92' :
-	props.type === 'waiting' ? '#f6c177' :
-	'?' as never;
+	props.type === "process"
+		? "#9ccfd8"
+		: props.type === "active"
+		? "#31748f"
+		: props.type === "delayed"
+		? "#eb6f92"
+		: props.type === "waiting"
+		? "#f6c177"
+		: ("?" as never);
 
 onMounted(() => {
 	chartInstance = new Chart(chartEl.value, {
-		type: 'line',
+		type: "line",
 		data: {
 			labels: [],
-			datasets: [{
-				label: label,
-				pointRadius: 0,
-				tension: 0.3,
-				borderWidth: 2,
-				borderJoinStyle: 'round',
-				borderColor: color,
-				backgroundColor: alpha(color, 0.1),
-				data: [],
-			}],
+			datasets: [
+				{
+					label: label,
+					pointRadius: 0,
+					tension: 0.3,
+					borderWidth: 2,
+					borderJoinStyle: "round",
+					borderColor: color,
+					backgroundColor: alpha(color, 0.1),
+					data: [],
+				},
+			],
 		},
 		options: {
 			aspectRatio: 2.5,
@@ -135,7 +149,7 @@ onMounted(() => {
 					grid: {
 						display: true,
 						color: gridColor,
-						borderColor: 'rgb(0, 0, 0, 0)',
+						borderColor: "rgb(0, 0, 0, 0)",
 					},
 					ticks: {
 						display: false,
@@ -146,7 +160,7 @@ onMounted(() => {
 					min: 0,
 					grid: {
 						color: gridColor,
-						borderColor: 'rgb(0, 0, 0, 0)',
+						borderColor: "rgb(0, 0, 0, 0)",
 					},
 				},
 			},
@@ -159,7 +173,7 @@ onMounted(() => {
 				},
 				tooltip: {
 					enabled: false,
-					mode: 'index',
+					mode: "index",
 					animation: {
 						duration: 0,
 					},
@@ -176,6 +190,4 @@ defineExpose({
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/admin/queue.chart.vue b/packages/client/src/pages/admin/queue.chart.vue
index 186a22c43..e9d0f0655 100644
--- a/packages/client/src/pages/admin/queue.chart.vue
+++ b/packages/client/src/pages/admin/queue.chart.vue
@@ -1,52 +1,66 @@
 <template>
-<div class="pumxzjhg">
-	<div class="_table status">
-		<div class="_row">
-			<div class="_cell"><div class="_label">Process</div>{{ number(activeSincePrevTick) }}</div>
-			<div class="_cell"><div class="_label">Active</div>{{ number(active) }}</div>
-			<div class="_cell"><div class="_label">Waiting</div>{{ number(waiting) }}</div>
-			<div class="_cell"><div class="_label">Delayed</div>{{ number(delayed) }}</div>
-		</div>
-	</div>
-	<div class="charts">
-		<div class="chart">
-			<div class="title">Process</div>
-			<XChart ref="chartProcess" type="process"/>
-		</div>
-		<div class="chart">
-			<div class="title">Active</div>
-			<XChart ref="chartActive" type="active"/>
-		</div>
-		<div class="chart">
-			<div class="title">Delayed</div>
-			<XChart ref="chartDelayed" type="delayed"/>
-		</div>
-		<div class="chart">
-			<div class="title">Waiting</div>
-			<XChart ref="chartWaiting" type="waiting"/>
-		</div>
-	</div>
-	<div class="jobs">
-		<div v-if="jobs.length > 0">
-			<div v-for="job in jobs" :key="job[0]">
-				<span>{{ job[0] }}</span>
-				<span style="margin-left: 8px; opacity: 0.7;">({{ number(job[1]) }} jobs)</span>
+	<div class="pumxzjhg">
+		<div class="_table status">
+			<div class="_row">
+				<div class="_cell">
+					<div class="_label">Process</div>
+					{{ number(activeSincePrevTick) }}
+				</div>
+				<div class="_cell">
+					<div class="_label">Active</div>
+					{{ number(active) }}
+				</div>
+				<div class="_cell">
+					<div class="_label">Waiting</div>
+					{{ number(waiting) }}
+				</div>
+				<div class="_cell">
+					<div class="_label">Delayed</div>
+					{{ number(delayed) }}
+				</div>
 			</div>
 		</div>
-		<span v-else style="opacity: 0.5;">{{ i18n.ts.noJobs }}</span>
+		<div class="charts">
+			<div class="chart">
+				<div class="title">Process</div>
+				<XChart ref="chartProcess" type="process" />
+			</div>
+			<div class="chart">
+				<div class="title">Active</div>
+				<XChart ref="chartActive" type="active" />
+			</div>
+			<div class="chart">
+				<div class="title">Delayed</div>
+				<XChart ref="chartDelayed" type="delayed" />
+			</div>
+			<div class="chart">
+				<div class="title">Waiting</div>
+				<XChart ref="chartWaiting" type="waiting" />
+			</div>
+		</div>
+		<div class="jobs">
+			<div v-if="jobs.length > 0">
+				<div v-for="job in jobs" :key="job[0]">
+					<span>{{ job[0] }}</span>
+					<span style="margin-left: 8px; opacity: 0.7"
+						>({{ number(job[1]) }} jobs)</span
+					>
+				</div>
+			</div>
+			<span v-else style="opacity: 0.5">{{ i18n.ts.noJobs }}</span>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { markRaw, onMounted, onUnmounted, ref } from 'vue';
-import XChart from './queue.chart.chart.vue';
-import number from '@/filters/number';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import { i18n } from '@/i18n';
+import { markRaw, onMounted, onUnmounted, ref } from "vue";
+import XChart from "./queue.chart.chart.vue";
+import number from "@/filters/number";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import { i18n } from "@/i18n";
 
-const connection = markRaw(stream.useChannel('queueStats'));
+const connection = markRaw(stream.useChannel("queueStats"));
 
 const activeSincePrevTick = ref(0);
 const active = ref(0);
@@ -94,21 +108,28 @@ const onStatsLog = (statsLog) => {
 };
 
 onMounted(() => {
-	os.api(props.domain === 'inbox' ? 'admin/queue/inbox-delayed' : props.domain === 'deliver' ? 'admin/queue/deliver-delayed' : null, {}).then(result => {
+	os.api(
+		props.domain === "inbox"
+			? "admin/queue/inbox-delayed"
+			: props.domain === "deliver"
+			? "admin/queue/deliver-delayed"
+			: null,
+		{}
+	).then((result) => {
 		jobs.value = result;
 	});
 
-	connection.on('stats', onStats);
-	connection.on('statsLog', onStatsLog);
-	connection.send('requestLog', {
+	connection.on("stats", onStats);
+	connection.on("statsLog", onStatsLog);
+	connection.send("requestLog", {
 		id: Math.random().toString().substr(2, 8),
 		length: 200,
 	});
 });
 
 onUnmounted(() => {
-	connection.off('stats', onStats);
-	connection.off('statsLog', onStatsLog);
+	connection.off("stats", onStats);
+	connection.off("statsLog", onStatsLog);
 	connection.dispose();
 });
 </script>
@@ -144,6 +165,5 @@ onUnmounted(() => {
 		background: var(--panel);
 		border-radius: var(--radius);
 	}
-
 }
 </style>
diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue
index f4c74b706..b43da1f0a 100644
--- a/packages/client/src/pages/admin/queue.vue
+++ b/packages/client/src/pages/admin/queue.vue
@@ -1,57 +1,68 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="800">
-		<XQueue v-if="tab === 'deliver'" domain="deliver"/>
-		<XQueue v-else-if="tab === 'inbox'" domain="inbox"/>
-	</MkSpacer>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="800">
+			<XQueue v-if="tab === 'deliver'" domain="deliver" />
+			<XQueue v-else-if="tab === 'inbox'" domain="inbox" />
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { markRaw, onMounted, onBeforeUnmount, nextTick } from 'vue';
-import XQueue from './queue.chart.vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import * as config from '@/config';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { markRaw, onMounted, onBeforeUnmount, nextTick } from "vue";
+import XQueue from "./queue.chart.vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import * as config from "@/config";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-let tab = $ref('deliver');
+let tab = $ref("deliver");
 
 function clear() {
 	os.confirm({
-		type: 'warning',
+		type: "warning",
 		title: i18n.ts.clearQueueConfirmTitle,
 		text: i18n.ts.clearQueueConfirmText,
 	}).then(({ canceled }) => {
 		if (canceled) return;
 
-		os.apiWithDialog('admin/queue/clear');
+		os.apiWithDialog("admin/queue/clear");
 	});
 }
 
-const headerActions = $computed(() => [{
-	asFullButton: true,
-	icon: 'ph-arrow-square-up-right ph-bold ph-lg',
-	text: i18n.ts.dashboard,
-	handler: () => {
-		window.open(config.url + '/queue', '_blank');
+const headerActions = $computed(() => [
+	{
+		asFullButton: true,
+		icon: "ph-arrow-square-up-right ph-bold ph-lg",
+		text: i18n.ts.dashboard,
+		handler: () => {
+			window.open(config.url + "/queue", "_blank");
+		},
 	},
-}]);
+]);
 
-const headerTabs = $computed(() => [{
-	key: 'deliver',
-	title: 'Deliver',
-	icon: 'ph-upload ph-bold ph-lg',
-}, {
-	key: 'inbox',
-	title: 'Inbox',
-	icon: 'ph-download ph-bold ph-lg',
-}]);
+const headerTabs = $computed(() => [
+	{
+		key: "deliver",
+		title: "Deliver",
+		icon: "ph-upload ph-bold ph-lg",
+	},
+	{
+		key: "inbox",
+		title: "Inbox",
+		icon: "ph-download ph-bold ph-lg",
+	},
+]);
 
 definePageMetadata({
 	title: i18n.ts.jobQueue,
-	icon: 'ph-clipboard-text ph-bold ph-lg',
+	icon: "ph-clipboard-text ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/admin/relays.vue b/packages/client/src/pages/admin/relays.vue
index 232faefac..2565ac16c 100644
--- a/packages/client/src/pages/admin/relays.vue
+++ b/packages/client/src/pages/admin/relays.vue
@@ -1,82 +1,114 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="800">
-		<div v-for="relay in relays" :key="relay.inbox" class="relaycxt _panel _block" style="padding: 16px;">
-			<div>{{ relay.inbox }}</div>
-			<div class="status">
-				<i v-if="relay.status === 'accepted'" class="ph-check ph-bold ph-lg icon accepted"></i>
-				<i v-else-if="relay.status === 'rejected'" class="ph-prohibit ph-bold ph-lg icon rejected"></i>
-				<i v-else class="ph-clock ph-bold ph-lg icon requesting"></i>
-				<span>{{ i18n.t(`_relayStatus.${relay.status}`) }}</span>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="800">
+			<div
+				v-for="relay in relays"
+				:key="relay.inbox"
+				class="relaycxt _panel _block"
+				style="padding: 16px"
+			>
+				<div>{{ relay.inbox }}</div>
+				<div class="status">
+					<i
+						v-if="relay.status === 'accepted'"
+						class="ph-check ph-bold ph-lg icon accepted"
+					></i>
+					<i
+						v-else-if="relay.status === 'rejected'"
+						class="ph-prohibit ph-bold ph-lg icon rejected"
+					></i>
+					<i
+						v-else
+						class="ph-clock ph-bold ph-lg icon requesting"
+					></i>
+					<span>{{ i18n.t(`_relayStatus.${relay.status}`) }}</span>
+				</div>
+				<MkButton
+					class="button"
+					inline
+					danger
+					@click="remove(relay.inbox)"
+					><i class="ph-trash ph-bold ph-lg"></i>
+					{{ i18n.ts.remove }}</MkButton
+				>
 			</div>
-			<MkButton class="button" inline danger @click="remove(relay.inbox)"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.remove }}</MkButton>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let relays: any[] = $ref([]);
 
 async function addRelay() {
 	const { canceled, result: inbox } = await os.inputText({
 		title: i18n.ts.addRelay,
-		type: 'url',
+		type: "url",
 		placeholder: i18n.ts.inboxUrl,
 	});
 	if (canceled) return;
-	os.api('admin/relays/add', {
+	os.api("admin/relays/add", {
 		inbox,
-	}).then((relay: any) => {
-		refresh();
-	}).catch((err: any) => {
-		os.alert({
-			type: 'error',
-			text: err.message || err,
+	})
+		.then((relay: any) => {
+			refresh();
+		})
+		.catch((err: any) => {
+			os.alert({
+				type: "error",
+				text: err.message || err,
+			});
 		});
-	});
 }
 
 function remove(inbox: string) {
-	os.api('admin/relays/remove', {
+	os.api("admin/relays/remove", {
 		inbox,
-	}).then(() => {
-		refresh();
-	}).catch((err: any) => {
-		os.alert({
-			type: 'error',
-			text: err.message || err,
+	})
+		.then(() => {
+			refresh();
+		})
+		.catch((err: any) => {
+			os.alert({
+				type: "error",
+				text: err.message || err,
+			});
 		});
-	});
 }
 
 function refresh() {
-	os.api('admin/relays/list').then((relayList: any) => {
+	os.api("admin/relays/list").then((relayList: any) => {
 		relays = relayList;
 	});
 }
 
 refresh();
 
-const headerActions = $computed(() => [{
-	asFullButton: true,
-	icon: 'ph-plus ph-bold ph-lg',
-	text: i18n.ts.addRelay,
-	handler: addRelay,
-}]);
+const headerActions = $computed(() => [
+	{
+		asFullButton: true,
+		icon: "ph-plus ph-bold ph-lg",
+		text: i18n.ts.addRelay,
+		handler: addRelay,
+	},
+]);
 
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.relays,
-	icon: 'ph-flow-arrow ph-bold ph-lg',
+	icon: "ph-flow-arrow ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/admin/security.vue b/packages/client/src/pages/admin/security.vue
index 60079c8eb..b93c80361 100644
--- a/packages/client/src/pages/admin/security.vue
+++ b/packages/client/src/pages/admin/security.vue
@@ -1,146 +1,280 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
-		<FormSuspense :p="init">
-			<div class="_formRoot">
-				<FormFolder class="_formBlock">
-					<template #icon><i class="ph-robot ph-bold ph-lg"></i></template>
-					<template #label>{{ i18n.ts.botProtection }}</template>
-					<template v-if="enableHcaptcha" #suffix>hCaptcha</template>
-					<template v-else-if="enableRecaptcha" #suffix>reCAPTCHA</template>
-					<template v-else #suffix>{{ i18n.ts.none }} ({{ i18n.ts.notRecommended }})</template>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+			<FormSuspense :p="init">
+				<div class="_formRoot">
+					<FormFolder class="_formBlock">
+						<template #icon
+							><i class="ph-robot ph-bold ph-lg"></i
+						></template>
+						<template #label>{{ i18n.ts.botProtection }}</template>
+						<template v-if="enableHcaptcha" #suffix
+							>hCaptcha</template
+						>
+						<template v-else-if="enableRecaptcha" #suffix
+							>reCAPTCHA</template
+						>
+						<template v-else #suffix
+							>{{ i18n.ts.none }} ({{
+								i18n.ts.notRecommended
+							}})</template
+						>
 
-					<XBotProtection/>
-				</FormFolder>
+						<XBotProtection />
+					</FormFolder>
 
-				<FormFolder class="_formBlock">
-					<template #icon><i class="ph-eye-slash ph-bold ph-lg"></i></template>
-					<template #label>{{ i18n.ts.sensitiveMediaDetection }}</template>
-					<template v-if="sensitiveMediaDetection === 'all'" #suffix>{{ i18n.ts.all }}</template>
-					<template v-else-if="sensitiveMediaDetection === 'local'" #suffix>{{ i18n.ts.localOnly }}</template>
-					<template v-else-if="sensitiveMediaDetection === 'remote'" #suffix>{{ i18n.ts.remoteOnly }}</template>
-					<template v-else #suffix>{{ i18n.ts.none }}</template>
+					<FormFolder class="_formBlock">
+						<template #icon
+							><i class="ph-eye-slash ph-bold ph-lg"></i
+						></template>
+						<template #label>{{
+							i18n.ts.sensitiveMediaDetection
+						}}</template>
+						<template
+							v-if="sensitiveMediaDetection === 'all'"
+							#suffix
+							>{{ i18n.ts.all }}</template
+						>
+						<template
+							v-else-if="sensitiveMediaDetection === 'local'"
+							#suffix
+							>{{ i18n.ts.localOnly }}</template
+						>
+						<template
+							v-else-if="sensitiveMediaDetection === 'remote'"
+							#suffix
+							>{{ i18n.ts.remoteOnly }}</template
+						>
+						<template v-else #suffix>{{ i18n.ts.none }}</template>
 
-					<div class="_formRoot">
-						<span class="_formBlock">{{ i18n.ts._sensitiveMediaDetection.description }}</span>
+						<div class="_formRoot">
+							<span class="_formBlock">{{
+								i18n.ts._sensitiveMediaDetection.description
+							}}</span>
 
-						<FormRadios v-model="sensitiveMediaDetection" class="_formBlock">
-							<option value="none">{{ i18n.ts.none }}</option>
-							<option value="all">{{ i18n.ts.all }}</option>
-							<option value="local">{{ i18n.ts.localOnly }}</option>
-							<option value="remote">{{ i18n.ts.remoteOnly }}</option>
-						</FormRadios>
+							<FormRadios
+								v-model="sensitiveMediaDetection"
+								class="_formBlock"
+							>
+								<option value="none">{{ i18n.ts.none }}</option>
+								<option value="all">{{ i18n.ts.all }}</option>
+								<option value="local">
+									{{ i18n.ts.localOnly }}
+								</option>
+								<option value="remote">
+									{{ i18n.ts.remoteOnly }}
+								</option>
+							</FormRadios>
 
-						<FormRange v-model="sensitiveMediaDetectionSensitivity" :min="0" :max="4" :step="1" :text-converter="(v) => `${v + 1}`" class="_formBlock">
-							<template #label>{{ i18n.ts._sensitiveMediaDetection.sensitivity }}</template>
-							<template #caption>{{ i18n.ts._sensitiveMediaDetection.sensitivityDescription }}</template>
-						</FormRange>
+							<FormRange
+								v-model="sensitiveMediaDetectionSensitivity"
+								:min="0"
+								:max="4"
+								:step="1"
+								:text-converter="(v) => `${v + 1}`"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts._sensitiveMediaDetection.sensitivity
+								}}</template>
+								<template #caption>{{
+									i18n.ts._sensitiveMediaDetection
+										.sensitivityDescription
+								}}</template>
+							</FormRange>
 
-						<FormSwitch v-model="enableSensitiveMediaDetectionForVideos" class="_formBlock">
-							<template #label>{{ i18n.ts._sensitiveMediaDetection.analyzeVideos }}<span class="_beta">{{ i18n.ts.beta }}</span></template>
-							<template #caption>{{ i18n.ts._sensitiveMediaDetection.analyzeVideosDescription }}</template>
-						</FormSwitch>
+							<FormSwitch
+								v-model="enableSensitiveMediaDetectionForVideos"
+								class="_formBlock"
+							>
+								<template #label
+									>{{
+										i18n.ts._sensitiveMediaDetection
+											.analyzeVideos
+									}}<span class="_beta">{{
+										i18n.ts.beta
+									}}</span></template
+								>
+								<template #caption>{{
+									i18n.ts._sensitiveMediaDetection
+										.analyzeVideosDescription
+								}}</template>
+							</FormSwitch>
 
-						<FormSwitch v-model="setSensitiveFlagAutomatically" class="_formBlock">
-							<template #label>{{ i18n.ts._sensitiveMediaDetection.setSensitiveFlagAutomatically }} ({{ i18n.ts.notRecommended }})</template>
-							<template #caption>{{ i18n.ts._sensitiveMediaDetection.setSensitiveFlagAutomaticallyDescription }}</template>
-						</FormSwitch>
+							<FormSwitch
+								v-model="setSensitiveFlagAutomatically"
+								class="_formBlock"
+							>
+								<template #label
+									>{{
+										i18n.ts._sensitiveMediaDetection
+											.setSensitiveFlagAutomatically
+									}}
+									({{ i18n.ts.notRecommended }})</template
+								>
+								<template #caption>{{
+									i18n.ts._sensitiveMediaDetection
+										.setSensitiveFlagAutomaticallyDescription
+								}}</template>
+							</FormSwitch>
 
-						<!-- 現状 false positive が多すぎて実用に耐えない
+							<!-- 現状 false positive が多すぎて実用に耐えない
 						<FormSwitch v-model="disallowUploadWhenPredictedAsPorn" class="_formBlock">
 							<template #label>{{ i18n.ts._sensitiveMediaDetection.disallowUploadWhenPredictedAsPorn }}</template>
 						</FormSwitch>
 						-->
 
-						<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
-					</div>
-				</FormFolder>
+							<FormButton primary class="_formBlock" @click="save"
+								><i
+									class="ph-floppy-disk-back ph-bold ph-lg"
+								></i>
+								{{ i18n.ts.save }}</FormButton
+							>
+						</div>
+					</FormFolder>
 
-				<FormFolder class="_formBlock">
-					<template #label>Active Email Validation</template>
-					<template v-if="enableActiveEmailValidation" #suffix>Enabled</template>
-					<template v-else #suffix>Disabled</template>
+					<FormFolder class="_formBlock">
+						<template #label>Active Email Validation</template>
+						<template v-if="enableActiveEmailValidation" #suffix
+							>Enabled</template
+						>
+						<template v-else #suffix>Disabled</template>
 
-					<div class="_formRoot">
-						<span class="_formBlock">{{ i18n.ts.activeEmailValidationDescription }}</span>
-						<FormSwitch v-model="enableActiveEmailValidation" class="_formBlock" @update:modelValue="save">
-							<template #label>Enable</template>
-						</FormSwitch>
-					</div>
-				</FormFolder>
+						<div class="_formRoot">
+							<span class="_formBlock">{{
+								i18n.ts.activeEmailValidationDescription
+							}}</span>
+							<FormSwitch
+								v-model="enableActiveEmailValidation"
+								class="_formBlock"
+								@update:modelValue="save"
+							>
+								<template #label>Enable</template>
+							</FormSwitch>
+						</div>
+					</FormFolder>
 
-				<FormFolder class="_formBlock">
-					<template #label>Log IP address</template>
-					<template v-if="enableIpLogging" #suffix>Enabled</template>
-					<template v-else #suffix>Disabled</template>
+					<FormFolder class="_formBlock">
+						<template #label>Log IP address</template>
+						<template v-if="enableIpLogging" #suffix
+							>Enabled</template
+						>
+						<template v-else #suffix>Disabled</template>
 
-					<div class="_formRoot">
-						<FormSwitch v-model="enableIpLogging" class="_formBlock" @update:modelValue="save">
-							<template #label>Enable</template>
-						</FormSwitch>
-					</div>
-				</FormFolder>
+						<div class="_formRoot">
+							<FormSwitch
+								v-model="enableIpLogging"
+								class="_formBlock"
+								@update:modelValue="save"
+							>
+								<template #label>Enable</template>
+							</FormSwitch>
+						</div>
+					</FormFolder>
 
-				<FormFolder class="_formBlock">
-					<template #label>Summaly Proxy</template>
+					<FormFolder class="_formBlock">
+						<template #label>Summaly Proxy</template>
 
-					<div class="_formRoot">
-						<FormInput v-model="summalyProxy" class="_formBlock">
-							<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
-							<template #label>Summaly Proxy URL</template>
-						</FormInput>
+						<div class="_formRoot">
+							<FormInput
+								v-model="summalyProxy"
+								class="_formBlock"
+							>
+								<template #prefix
+									><i class="ph-link-simple ph-bold ph-lg"></i
+								></template>
+								<template #label>Summaly Proxy URL</template>
+							</FormInput>
 
-						<FormButton primary class="_formBlock" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
-					</div>
-				</FormFolder>
+							<FormButton primary class="_formBlock" @click="save"
+								><i
+									class="ph-floppy-disk-back ph-bold ph-lg"
+								></i>
+								{{ i18n.ts.save }}</FormButton
+							>
+						</div>
+					</FormFolder>
 
-				<FormFolder class="_formBlock">
-					<template #label>{{ i18n.ts.instanceSecurity }}</template>
+					<FormFolder class="_formBlock">
+						<template #label>{{
+							i18n.ts.instanceSecurity
+						}}</template>
 
-					<div class="_formRoot">
-						<FormSwitch v-if="!privateMode" v-model="secureMode">
-							<template #label>{{ i18n.ts.secureMode }}</template>
-							<template #caption>{{ i18n.ts.secureModeInfo }}</template>
-						</FormSwitch>
-						<FormSwitch v-model="privateMode">
-							<template #label>{{ i18n.ts.privateMode }}</template>
-							<template #caption>{{ i18n.ts.privateModeInfo }}</template>
-						</FormSwitch>
-						<FormTextarea v-if="privateMode" v-model="allowedHosts">
-							<template #label>{{ i18n.ts.allowedInstances }}</template>
-							<template #caption>{{ i18n.ts.allowedInstancesDescription }}</template>
-						</FormTextarea>
-						<FormButton primary class="_formBlock" @click="saveInstance"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
-					</div>
-				</FormFolder>
-			</div>
-		</FormSuspense>
-	</MkSpacer>
-</MkStickyContainer>
+						<div class="_formRoot">
+							<FormSwitch
+								v-if="!privateMode"
+								v-model="secureMode"
+							>
+								<template #label>{{
+									i18n.ts.secureMode
+								}}</template>
+								<template #caption>{{
+									i18n.ts.secureModeInfo
+								}}</template>
+							</FormSwitch>
+							<FormSwitch v-model="privateMode">
+								<template #label>{{
+									i18n.ts.privateMode
+								}}</template>
+								<template #caption>{{
+									i18n.ts.privateModeInfo
+								}}</template>
+							</FormSwitch>
+							<FormTextarea
+								v-if="privateMode"
+								v-model="allowedHosts"
+							>
+								<template #label>{{
+									i18n.ts.allowedInstances
+								}}</template>
+								<template #caption>{{
+									i18n.ts.allowedInstancesDescription
+								}}</template>
+							</FormTextarea>
+							<FormButton
+								primary
+								class="_formBlock"
+								@click="saveInstance"
+								><i
+									class="ph-floppy-disk-back ph-bold ph-lg"
+								></i>
+								{{ i18n.ts.save }}</FormButton
+							>
+						</div>
+					</FormFolder>
+				</div>
+			</FormSuspense>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XBotProtection from './bot-protection.vue';
-import FormFolder from '@/components/form/folder.vue';
-import FormRadios from '@/components/form/radios.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormInfo from '@/components/MkInfo.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import FormRange from '@/components/form/range.vue';
-import FormInput from '@/components/form/input.vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import XBotProtection from "./bot-protection.vue";
+import FormFolder from "@/components/form/folder.vue";
+import FormRadios from "@/components/form/radios.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormInfo from "@/components/MkInfo.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import FormRange from "@/components/form/range.vue";
+import FormInput from "@/components/form/input.vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-let summalyProxy: string = $ref('');
+let summalyProxy: string = $ref("");
 let enableHcaptcha: boolean = $ref(false);
 let enableRecaptcha: boolean = $ref(false);
-let sensitiveMediaDetection: string = $ref('none');
+let sensitiveMediaDetection: string = $ref("none");
 let sensitiveMediaDetectionSensitivity: number = $ref(0);
 let setSensitiveFlagAutomatically: boolean = $ref(false);
 let enableSensitiveMediaDetectionForVideos: boolean = $ref(false);
@@ -149,41 +283,53 @@ let enableActiveEmailValidation: boolean = $ref(false);
 
 let secureMode: boolean = $ref(false);
 let privateMode: boolean = $ref(false);
-let allowedHosts: string = $ref('');
+let allowedHosts: string = $ref("");
 
 async function init() {
-	const meta = await os.api('admin/meta');
+	const meta = await os.api("admin/meta");
 	summalyProxy = meta.summalyProxy;
 	enableHcaptcha = meta.enableHcaptcha;
 	enableRecaptcha = meta.enableRecaptcha;
 	sensitiveMediaDetection = meta.sensitiveMediaDetection;
 	sensitiveMediaDetectionSensitivity =
-		meta.sensitiveMediaDetectionSensitivity === 'veryLow' ? 0 :
-		meta.sensitiveMediaDetectionSensitivity === 'low' ? 1 :
-		meta.sensitiveMediaDetectionSensitivity === 'medium' ? 2 :
-		meta.sensitiveMediaDetectionSensitivity === 'high' ? 3 :
-		meta.sensitiveMediaDetectionSensitivity === 'veryHigh' ? 4 : 0;
+		meta.sensitiveMediaDetectionSensitivity === "veryLow"
+			? 0
+			: meta.sensitiveMediaDetectionSensitivity === "low"
+			? 1
+			: meta.sensitiveMediaDetectionSensitivity === "medium"
+			? 2
+			: meta.sensitiveMediaDetectionSensitivity === "high"
+			? 3
+			: meta.sensitiveMediaDetectionSensitivity === "veryHigh"
+			? 4
+			: 0;
 	setSensitiveFlagAutomatically = meta.setSensitiveFlagAutomatically;
-	enableSensitiveMediaDetectionForVideos = meta.enableSensitiveMediaDetectionForVideos;
+	enableSensitiveMediaDetectionForVideos =
+		meta.enableSensitiveMediaDetectionForVideos;
 	enableIpLogging = meta.enableIpLogging;
 	enableActiveEmailValidation = meta.enableActiveEmailValidation;
 
 	secureMode = meta.secureMode;
 	privateMode = meta.privateMode;
-	allowedHosts = meta.allowedHosts.join('\n');
+	allowedHosts = meta.allowedHosts.join("\n");
 }
 
 function save() {
-	os.apiWithDialog('admin/update-meta', {
+	os.apiWithDialog("admin/update-meta", {
 		summalyProxy,
 		sensitiveMediaDetection,
 		sensitiveMediaDetectionSensitivity:
-			sensitiveMediaDetectionSensitivity === 0 ? 'veryLow' :
-			sensitiveMediaDetectionSensitivity === 1 ? 'low' :
-			sensitiveMediaDetectionSensitivity === 2 ? 'medium' :
-			sensitiveMediaDetectionSensitivity === 3 ? 'high' :
-			sensitiveMediaDetectionSensitivity === 4 ? 'veryHigh' :
-			0,
+			sensitiveMediaDetectionSensitivity === 0
+				? "veryLow"
+				: sensitiveMediaDetectionSensitivity === 1
+				? "low"
+				: sensitiveMediaDetectionSensitivity === 2
+				? "medium"
+				: sensitiveMediaDetectionSensitivity === 3
+				? "high"
+				: sensitiveMediaDetectionSensitivity === 4
+				? "veryHigh"
+				: 0,
 		setSensitiveFlagAutomatically,
 		enableSensitiveMediaDetectionForVideos,
 		enableIpLogging,
@@ -194,10 +340,10 @@ function save() {
 }
 
 function saveInstance() {
-	os.apiWithDialog('admin/update-meta', {
+	os.apiWithDialog("admin/update-meta", {
 		secureMode,
 		privateMode,
-		allowedHosts: allowedHosts.split('\n'),
+		allowedHosts: allowedHosts.split("\n"),
 	}).then(() => {
 		fetchInstance();
 	});
@@ -209,6 +355,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.security,
-	icon: 'ph-lock ph-bold ph-lg',
+	icon: "ph-lock ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue
index 9716b4f9b..5349df805 100644
--- a/packages/client/src/pages/admin/settings.vue
+++ b/packages/client/src/pages/admin/settings.vue
@@ -1,211 +1,397 @@
 <template>
-<div>
-	<MkStickyContainer>
-		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
-			<FormSuspense :p="init">
-				<div class="_formRoot">
-					<FormInput v-model="name" class="_formBlock">
-						<template #label>{{ i18n.ts.instanceName }}</template>
-					</FormInput>
-
-					<FormTextarea v-model="description" class="_formBlock">
-						<template #label>{{ i18n.ts.instanceDescription }}</template>
-					</FormTextarea>
-
-					<FormInput v-model="tosUrl" class="_formBlock">
-						<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
-						<template #label>{{ i18n.ts.tosUrl }}</template>
-					</FormInput>
-
-					<FormSplit :min-width="300">
-						<FormInput v-model="maintainerName" class="_formBlock">
-							<template #label>{{ i18n.ts.maintainerName }}</template>
+	<div>
+		<MkStickyContainer>
+			<template #header
+				><MkPageHeader
+					:actions="headerActions"
+					:tabs="headerTabs"
+					:display-back-button="true"
+			/></template>
+			<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+				<FormSuspense :p="init">
+					<div class="_formRoot">
+						<FormInput v-model="name" class="_formBlock">
+							<template #label>{{
+								i18n.ts.instanceName
+							}}</template>
 						</FormInput>
 
-						<FormInput v-model="maintainerEmail" type="email" class="_formBlock">
-							<template #prefix><i class="ph-envelope-simple-open ph-bold ph-lg"></i></template>
-							<template #label>{{ i18n.ts.maintainerEmail }}</template>
-						</FormInput>
-					</FormSplit>
-
-					<FormTextarea v-model="pinnedUsers" class="_formBlock">
-						<template #label>{{ i18n.ts.pinnedUsers }}</template>
-						<template #caption>{{ i18n.ts.pinnedUsersDescription }}</template>
-					</FormTextarea>
-
-					<FormSection>
-						<FormSwitch v-model="enableRegistration" class="_formBlock">
-							<template #label>{{ i18n.ts.enableRegistration }}</template>
-						</FormSwitch>
-
-						<FormSwitch v-model="emailRequiredForSignup" class="_formBlock">
-							<template #label>{{ i18n.ts.emailRequiredForSignup }}</template>
-						</FormSwitch>
-					</FormSection>
-
-					<FormSection>
-						<FormSwitch v-model="enableRecommendedTimeline" class="_formBlock">{{ i18n.ts.enableRecommendedTimeline }}</FormSwitch>
-						<FormTextarea v-model="recommendedInstances" class="_formBlock">
-							<template #label>{{ i18n.ts.recommendedInstances }}</template>
-							<template #caption>{{ i18n.ts.recommendedInstancesDescription }}</template>
-						</FormTextarea>
-					</FormSection>
-
-					<FormSection>
-						<FormSwitch v-model="enableLocalTimeline" class="_formBlock">{{ i18n.ts.enableLocalTimeline }}</FormSwitch>
-						<FormSwitch v-model="enableGlobalTimeline" class="_formBlock">{{ i18n.ts.enableGlobalTimeline }}</FormSwitch>
-						<FormInfo class="_formBlock">{{ i18n.ts.disablingTimelinesInfo }}</FormInfo>
-					</FormSection>
-
-					<FormSection>
-						<MkRadios v-model="defaultReaction" class="_formBlock">
-							<template #label>{{ i18n.ts.defaultReaction }}</template>
-							<option value="⭐">
-								<MkEmoji class="emoji" emoji="⭐" style="height: 1.7em"/>
-							</option>
-							<option value="👍">
-								<MkEmoji class="emoji" emoji="👍" style="height: 1.7em"/>
-							</option>
-							<option value="❤️">
-								<MkEmoji class="emoji" emoji="❤️" style="height: 1.7em"/>
-							</option>
-							<option value="custom">
-								<FormInput v-model="defaultReactionCustom" class="_formBlock" :small="true" :placeholder="`:custom:`" style="margin: 0 0 !important"/>
-							</option>
-						</MkRadios>
-					</FormSection>
-
-					<FormSection>
-						<template #label>{{ i18n.ts.theme }}</template>
-
-						<FormInput v-model="iconUrl" class="_formBlock">
-							<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
-							<template #label>{{ i18n.ts.iconUrl }}</template>
-						</FormInput>
-
-						<FormInput v-model="bannerUrl" class="_formBlock">
-							<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
-							<template #label>{{ i18n.ts.bannerUrl }}</template>
-						</FormInput>
-
-						<FormInput v-model="logoImageUrl" class="_formBlock">
-							<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
-							<template #label>{{ i18n.ts.logoImageUrl }}</template>
-						</FormInput>
-
-						<FormInput v-model="backgroundImageUrl" class="_formBlock">
-							<template #prefix><i class="ph-link-simple ph-bold ph-lg"></i></template>
-							<template #label>{{ i18n.ts.backgroundImageUrl }}</template>
-						</FormInput>
-
-						<FormInput v-model="themeColor" class="_formBlock">
-							<template #prefix><i class="ph-palette ph-bold ph-lg"></i></template>
-							<template #label>{{ i18n.ts.themeColor }}</template>
-							<template #caption>#RRGGBB</template>
-						</FormInput>
-
-						<FormTextarea v-model="defaultLightTheme" class="_formBlock">
-							<template #label>{{ i18n.ts.instanceDefaultLightTheme }}</template>
-							<template #caption>{{ i18n.ts.instanceDefaultThemeDescription }}</template>
+						<FormTextarea v-model="description" class="_formBlock">
+							<template #label>{{
+								i18n.ts.instanceDescription
+							}}</template>
 						</FormTextarea>
 
-						<FormTextarea v-model="defaultDarkTheme" class="_formBlock">
-							<template #label>{{ i18n.ts.instanceDefaultDarkTheme }}</template>
-							<template #caption>{{ i18n.ts.instanceDefaultThemeDescription }}</template>
-						</FormTextarea>
-					</FormSection>
+						<FormInput v-model="tosUrl" class="_formBlock">
+							<template #prefix
+								><i class="ph-link-simple ph-bold ph-lg"></i
+							></template>
+							<template #label>{{ i18n.ts.tosUrl }}</template>
+						</FormInput>
 
-					<FormSection>
-						<template #label>{{ i18n.ts.splash }}</template>
-
-						<FormTextarea v-model="customMOTD" class="_formBlock">
-							<template #label>{{ i18n.ts.customMOTD }}</template>
-							<template #caption>{{ i18n.ts.customMOTDDescription }}</template>
-						</FormTextarea>
-
-						<FormTextarea v-model="customSplashIcons" class="_formBlock">
-							<template #label>{{ i18n.ts.customSplashIcons }}</template>
-							<template #caption>{{ i18n.ts.customSplashIconsDescription }}</template>
-						</FormTextarea>
-					</FormSection>
-
-					<FormSection>
-						<template #label>{{ i18n.ts.files }}</template>
-
-						<FormSwitch v-model="cacheRemoteFiles" class="_formBlock">
-							<template #label>{{ i18n.ts.cacheRemoteFiles }}</template>
-							<template #caption>{{ i18n.ts.cacheRemoteFilesDescription }}</template>
-						</FormSwitch>
-
-						<FormSplit :min-width="280">
-							<FormInput v-model="localDriveCapacityMb" type="number" class="_formBlock">
-								<template #label>{{ i18n.ts.driveCapacityPerLocalAccount }}</template>
-								<template #suffix>MB</template>
-								<template #caption>{{ i18n.ts.inMb }}</template>
+						<FormSplit :min-width="300">
+							<FormInput
+								v-model="maintainerName"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts.maintainerName
+								}}</template>
 							</FormInput>
 
-							<FormInput v-model="remoteDriveCapacityMb" type="number" :disabled="!cacheRemoteFiles" class="_formBlock">
-								<template #label>{{ i18n.ts.driveCapacityPerRemoteAccount }}</template>
-								<template #suffix>MB</template>
-								<template #caption>{{ i18n.ts.inMb }}</template>
+							<FormInput
+								v-model="maintainerEmail"
+								type="email"
+								class="_formBlock"
+							>
+								<template #prefix
+									><i
+										class="ph-envelope-simple-open ph-bold ph-lg"
+									></i
+								></template>
+								<template #label>{{
+									i18n.ts.maintainerEmail
+								}}</template>
 							</FormInput>
 						</FormSplit>
-					</FormSection>
 
-					<FormSection>
-						<template #label>ServiceWorker</template>
+						<FormTextarea v-model="pinnedUsers" class="_formBlock">
+							<template #label>{{
+								i18n.ts.pinnedUsers
+							}}</template>
+							<template #caption>{{
+								i18n.ts.pinnedUsersDescription
+							}}</template>
+						</FormTextarea>
 
-						<FormSwitch v-model="enableServiceWorker" class="_formBlock">
-							<template #label>{{ i18n.ts.enableServiceworker }}</template>
-							<template #caption>{{ i18n.ts.serviceworkerInfo }}</template>
-						</FormSwitch>
+						<FormSection>
+							<FormSwitch
+								v-model="enableRegistration"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts.enableRegistration
+								}}</template>
+							</FormSwitch>
 
-						<template v-if="enableServiceWorker">
-							<FormInput v-model="swPublicKey" class="_formBlock">
-								<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-								<template #label>Public key</template>
+							<FormSwitch
+								v-model="emailRequiredForSignup"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts.emailRequiredForSignup
+								}}</template>
+							</FormSwitch>
+						</FormSection>
+
+						<FormSection>
+							<FormSwitch
+								v-model="enableRecommendedTimeline"
+								class="_formBlock"
+								>{{
+									i18n.ts.enableRecommendedTimeline
+								}}</FormSwitch
+							>
+							<FormTextarea
+								v-model="recommendedInstances"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts.recommendedInstances
+								}}</template>
+								<template #caption>{{
+									i18n.ts.recommendedInstancesDescription
+								}}</template>
+							</FormTextarea>
+						</FormSection>
+
+						<FormSection>
+							<FormSwitch
+								v-model="enableLocalTimeline"
+								class="_formBlock"
+								>{{ i18n.ts.enableLocalTimeline }}</FormSwitch
+							>
+							<FormSwitch
+								v-model="enableGlobalTimeline"
+								class="_formBlock"
+								>{{ i18n.ts.enableGlobalTimeline }}</FormSwitch
+							>
+							<FormInfo class="_formBlock">{{
+								i18n.ts.disablingTimelinesInfo
+							}}</FormInfo>
+						</FormSection>
+
+						<FormSection>
+							<MkRadios
+								v-model="defaultReaction"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts.defaultReaction
+								}}</template>
+								<option value="⭐">
+									<MkEmoji
+										class="emoji"
+										emoji="⭐"
+										style="height: 1.7em"
+									/>
+								</option>
+								<option value="👍">
+									<MkEmoji
+										class="emoji"
+										emoji="👍"
+										style="height: 1.7em"
+									/>
+								</option>
+								<option value="❤️">
+									<MkEmoji
+										class="emoji"
+										emoji="❤️"
+										style="height: 1.7em"
+									/>
+								</option>
+								<option value="custom">
+									<FormInput
+										v-model="defaultReactionCustom"
+										class="_formBlock"
+										:small="true"
+										:placeholder="`:custom:`"
+										style="margin: 0 0 !important"
+									/>
+								</option>
+							</MkRadios>
+						</FormSection>
+
+						<FormSection>
+							<template #label>{{ i18n.ts.theme }}</template>
+
+							<FormInput v-model="iconUrl" class="_formBlock">
+								<template #prefix
+									><i class="ph-link-simple ph-bold ph-lg"></i
+								></template>
+								<template #label>{{
+									i18n.ts.iconUrl
+								}}</template>
 							</FormInput>
 
-							<FormInput v-model="swPrivateKey" class="_formBlock">
-								<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-								<template #label>Private key</template>
+							<FormInput v-model="bannerUrl" class="_formBlock">
+								<template #prefix
+									><i class="ph-link-simple ph-bold ph-lg"></i
+								></template>
+								<template #label>{{
+									i18n.ts.bannerUrl
+								}}</template>
 							</FormInput>
-						</template>
-					</FormSection>
 
-					<FormSection>
-						<template #label>DeepL Translation</template>
+							<FormInput
+								v-model="logoImageUrl"
+								class="_formBlock"
+							>
+								<template #prefix
+									><i class="ph-link-simple ph-bold ph-lg"></i
+								></template>
+								<template #label>{{
+									i18n.ts.logoImageUrl
+								}}</template>
+							</FormInput>
 
-						<FormInput v-model="deeplAuthKey" class="_formBlock">
-							<template #prefix><i class="ph-key ph-bold ph-lg"></i></template>
-							<template #label>DeepL Auth Key</template>
-						</FormInput>
-						<FormSwitch v-model="deeplIsPro" class="_formBlock">
-							<template #label>Pro account</template>
-						</FormSwitch>
-					</FormSection>
-				</div>
-			</FormSuspense>
-		</MkSpacer>
-	</MkStickyContainer>
-</div>
+							<FormInput
+								v-model="backgroundImageUrl"
+								class="_formBlock"
+							>
+								<template #prefix
+									><i class="ph-link-simple ph-bold ph-lg"></i
+								></template>
+								<template #label>{{
+									i18n.ts.backgroundImageUrl
+								}}</template>
+							</FormInput>
+
+							<FormInput v-model="themeColor" class="_formBlock">
+								<template #prefix
+									><i class="ph-palette ph-bold ph-lg"></i
+								></template>
+								<template #label>{{
+									i18n.ts.themeColor
+								}}</template>
+								<template #caption>#RRGGBB</template>
+							</FormInput>
+
+							<FormTextarea
+								v-model="defaultLightTheme"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts.instanceDefaultLightTheme
+								}}</template>
+								<template #caption>{{
+									i18n.ts.instanceDefaultThemeDescription
+								}}</template>
+							</FormTextarea>
+
+							<FormTextarea
+								v-model="defaultDarkTheme"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts.instanceDefaultDarkTheme
+								}}</template>
+								<template #caption>{{
+									i18n.ts.instanceDefaultThemeDescription
+								}}</template>
+							</FormTextarea>
+						</FormSection>
+
+						<FormSection>
+							<template #label>{{ i18n.ts.splash }}</template>
+
+							<FormTextarea
+								v-model="customMOTD"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts.customMOTD
+								}}</template>
+								<template #caption>{{
+									i18n.ts.customMOTDDescription
+								}}</template>
+							</FormTextarea>
+
+							<FormTextarea
+								v-model="customSplashIcons"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts.customSplashIcons
+								}}</template>
+								<template #caption>{{
+									i18n.ts.customSplashIconsDescription
+								}}</template>
+							</FormTextarea>
+						</FormSection>
+
+						<FormSection>
+							<template #label>{{ i18n.ts.files }}</template>
+
+							<FormSwitch
+								v-model="cacheRemoteFiles"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts.cacheRemoteFiles
+								}}</template>
+								<template #caption>{{
+									i18n.ts.cacheRemoteFilesDescription
+								}}</template>
+							</FormSwitch>
+
+							<FormSplit :min-width="280">
+								<FormInput
+									v-model="localDriveCapacityMb"
+									type="number"
+									class="_formBlock"
+								>
+									<template #label>{{
+										i18n.ts.driveCapacityPerLocalAccount
+									}}</template>
+									<template #suffix>MB</template>
+									<template #caption>{{
+										i18n.ts.inMb
+									}}</template>
+								</FormInput>
+
+								<FormInput
+									v-model="remoteDriveCapacityMb"
+									type="number"
+									:disabled="!cacheRemoteFiles"
+									class="_formBlock"
+								>
+									<template #label>{{
+										i18n.ts.driveCapacityPerRemoteAccount
+									}}</template>
+									<template #suffix>MB</template>
+									<template #caption>{{
+										i18n.ts.inMb
+									}}</template>
+								</FormInput>
+							</FormSplit>
+						</FormSection>
+
+						<FormSection>
+							<template #label>ServiceWorker</template>
+
+							<FormSwitch
+								v-model="enableServiceWorker"
+								class="_formBlock"
+							>
+								<template #label>{{
+									i18n.ts.enableServiceworker
+								}}</template>
+								<template #caption>{{
+									i18n.ts.serviceworkerInfo
+								}}</template>
+							</FormSwitch>
+
+							<template v-if="enableServiceWorker">
+								<FormInput
+									v-model="swPublicKey"
+									class="_formBlock"
+								>
+									<template #prefix
+										><i class="ph-key ph-bold ph-lg"></i
+									></template>
+									<template #label>Public key</template>
+								</FormInput>
+
+								<FormInput
+									v-model="swPrivateKey"
+									class="_formBlock"
+								>
+									<template #prefix
+										><i class="ph-key ph-bold ph-lg"></i
+									></template>
+									<template #label>Private key</template>
+								</FormInput>
+							</template>
+						</FormSection>
+
+						<FormSection>
+							<template #label>DeepL Translation</template>
+
+							<FormInput
+								v-model="deeplAuthKey"
+								class="_formBlock"
+							>
+								<template #prefix
+									><i class="ph-key ph-bold ph-lg"></i
+								></template>
+								<template #label>DeepL Auth Key</template>
+							</FormInput>
+							<FormSwitch v-model="deeplIsPro" class="_formBlock">
+								<template #label>Pro account</template>
+							</FormSwitch>
+						</FormSection>
+					</div>
+				</FormSuspense>
+			</MkSpacer>
+		</MkStickyContainer>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormInput from '@/components/form/input.vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormInfo from '@/components/MkInfo.vue';
-import FormSection from '@/components/form/section.vue';
-import FormSplit from '@/components/form/split.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import MkRadios from '@/components/form/radios.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { ref } from "vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormInput from "@/components/form/input.vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormInfo from "@/components/MkInfo.vue";
+import FormSection from "@/components/form/section.vue";
+import FormSplit from "@/components/form/split.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import MkRadios from "@/components/form/radios.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let name: string | null = $ref(null);
 let description: string | null = $ref(null);
@@ -222,10 +408,10 @@ let defaultDarkTheme: any = $ref(null);
 let enableLocalTimeline: boolean = $ref(false);
 let enableGlobalTimeline: boolean = $ref(false);
 let enableRecommendedTimeline: boolean = $ref(false);
-let pinnedUsers: string = $ref('');
-let customMOTD: string = $ref('');
-let recommendedInstances: string = $ref('');
-let customSplashIcons: string = $ref('');
+let pinnedUsers: string = $ref("");
+let customMOTD: string = $ref("");
+let recommendedInstances: string = $ref("");
+let customSplashIcons: string = $ref("");
 let cacheRemoteFiles: boolean = $ref(false);
 let localDriveCapacityMb: any = $ref(0);
 let remoteDriveCapacityMb: any = $ref(0);
@@ -234,13 +420,13 @@ let emailRequiredForSignup: boolean = $ref(false);
 let enableServiceWorker: boolean = $ref(false);
 let swPublicKey: any = $ref(null);
 let swPrivateKey: any = $ref(null);
-let deeplAuthKey: string = $ref('');
+let deeplAuthKey: string = $ref("");
 let deeplIsPro: boolean = $ref(false);
-let defaultReaction: string = $ref('');
-let defaultReactionCustom: string = $ref('');
+let defaultReaction: string = $ref("");
+let defaultReactionCustom: string = $ref("");
 
 async function init() {
-	const meta = await os.api('admin/meta');
+	const meta = await os.api("admin/meta");
 	name = meta.name;
 	description = meta.description;
 	tosUrl = meta.tosUrl;
@@ -256,10 +442,10 @@ async function init() {
 	enableLocalTimeline = !meta.disableLocalTimeline;
 	enableGlobalTimeline = !meta.disableGlobalTimeline;
 	enableRecommendedTimeline = !meta.disableRecommendedTimeline;
-	pinnedUsers = meta.pinnedUsers.join('\n');
-	customMOTD = meta.customMOTD.join('\n');
-	customSplashIcons = meta.customSplashIcons.join('\n');
-	recommendedInstances = meta.recommendedInstances.join('\n');
+	pinnedUsers = meta.pinnedUsers.join("\n");
+	customMOTD = meta.customMOTD.join("\n");
+	customSplashIcons = meta.customSplashIcons.join("\n");
+	recommendedInstances = meta.recommendedInstances.join("\n");
 	cacheRemoteFiles = meta.cacheRemoteFiles;
 	localDriveCapacityMb = meta.driveCapacityPerLocalUserMb;
 	remoteDriveCapacityMb = meta.driveCapacityPerRemoteUserMb;
@@ -270,15 +456,19 @@ async function init() {
 	swPrivateKey = meta.swPrivateKey;
 	deeplAuthKey = meta.deeplAuthKey;
 	deeplIsPro = meta.deeplIsPro;
-	defaultReaction = ['⭐', '👍', '❤️'].includes(meta.defaultReaction) ? meta.defaultReaction : 'custom';
-	defaultReactionCustom = ['⭐', '👍', '❤️'].includes(meta.defaultReaction) ? '' : meta.defaultReaction;
+	defaultReaction = ["⭐", "👍", "❤️"].includes(meta.defaultReaction)
+		? meta.defaultReaction
+		: "custom";
+	defaultReactionCustom = ["⭐", "👍", "❤️"].includes(meta.defaultReaction)
+		? ""
+		: meta.defaultReaction;
 }
 
 function save() {
-	if (defaultReaction === 'custom') {
+	if (defaultReaction === "custom") {
 		defaultReaction = defaultReactionCustom;
 	}
-	os.apiWithDialog('admin/update-meta', {
+	os.apiWithDialog("admin/update-meta", {
 		name,
 		description,
 		tosUrl,
@@ -286,18 +476,18 @@ function save() {
 		bannerUrl,
 		logoImageUrl,
 		backgroundImageUrl,
-		themeColor: themeColor === '' ? null : themeColor,
-		defaultLightTheme: defaultLightTheme === '' ? null : defaultLightTheme,
-		defaultDarkTheme: defaultDarkTheme === '' ? null : defaultDarkTheme,
+		themeColor: themeColor === "" ? null : themeColor,
+		defaultLightTheme: defaultLightTheme === "" ? null : defaultLightTheme,
+		defaultDarkTheme: defaultDarkTheme === "" ? null : defaultDarkTheme,
 		maintainerName,
 		maintainerEmail,
 		disableLocalTimeline: !enableLocalTimeline,
 		disableGlobalTimeline: !enableGlobalTimeline,
 		disableRecommendedTimeline: !enableRecommendedTimeline,
-		pinnedUsers: pinnedUsers.split('\n'),
-		customMOTD: customMOTD.split('\n'),
-		customSplashIcons: customSplashIcons.split('\n'),
-		recommendedInstances: recommendedInstances.split('\n'),
+		pinnedUsers: pinnedUsers.split("\n"),
+		customMOTD: customMOTD.split("\n"),
+		customSplashIcons: customSplashIcons.split("\n"),
+		recommendedInstances: recommendedInstances.split("\n"),
 		cacheRemoteFiles,
 		localDriveCapacityMb: parseInt(localDriveCapacityMb, 10),
 		remoteDriveCapacityMb: parseInt(remoteDriveCapacityMb, 10),
@@ -314,17 +504,19 @@ function save() {
 	});
 }
 
-const headerActions = $computed(() => [{
-	asFullButton: true,
-	icon: 'ph-check ph-bold ph-lg',
-	text: i18n.ts.save,
-	handler: save,
-}]);
+const headerActions = $computed(() => [
+	{
+		asFullButton: true,
+		icon: "ph-check ph-bold ph-lg",
+		text: i18n.ts.save,
+		handler: save,
+	},
+]);
 
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.general,
-	icon: 'ph-gear-six ph-bold ph-lg',
+	icon: "ph-gear-six ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/admin/users.vue b/packages/client/src/pages/admin/users.vue
index 96da80fcf..cf956c684 100644
--- a/packages/client/src/pages/admin/users.vue
+++ b/packages/client/src/pages/admin/users.vue
@@ -1,77 +1,146 @@
 <template>
-<div>
-	<MkStickyContainer>
-		<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-		<MkSpacer :content-max="900">
-			<div class="lknzcolw">
-				<div class="users">
-					<div class="inputs">
-						<MkSelect v-model="sort" style="flex: 1;">
-							<template #label>{{ i18n.ts.sort }}</template>
-							<option value="-createdAt">{{ i18n.ts.registeredDate }} ({{ i18n.ts.ascendingOrder }})</option>
-							<option value="+createdAt">{{ i18n.ts.registeredDate }} ({{ i18n.ts.descendingOrder }})</option>
-							<option value="-updatedAt">{{ i18n.ts.lastUsed }} ({{ i18n.ts.ascendingOrder }})</option>
-							<option value="+updatedAt">{{ i18n.ts.lastUsed }} ({{ i18n.ts.descendingOrder }})</option>
-						</MkSelect>
-						<MkSelect v-model="state" style="flex: 1;">
-							<template #label>{{ i18n.ts.state }}</template>
-							<option value="all">{{ i18n.ts.all }}</option>
-							<option value="available">{{ i18n.ts.normal }}</option>
-							<option value="admin">{{ i18n.ts.administrator }}</option>
-							<option value="moderator">{{ i18n.ts.moderator }}</option>
-							<option value="silenced">{{ i18n.ts.silence }}</option>
-							<option value="suspended">{{ i18n.ts.suspend }}</option>
-						</MkSelect>
-						<MkSelect v-model="origin" style="flex: 1;">
-							<template #label>{{ i18n.ts.instance }}</template>
-							<option value="combined">{{ i18n.ts.all }}</option>
-							<option value="local">{{ i18n.ts.local }}</option>
-							<option value="remote">{{ i18n.ts.remote }}</option>
-						</MkSelect>
-					</div>
-					<div class="inputs">
-						<MkInput v-model="searchUsername" style="flex: 1;" type="text" :spellcheck="false" @update:modelValue="$refs.users.reload()">
-							<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()">
-							<template #prefix>@</template>
-							<template #label>{{ i18n.ts.host }}</template>
-						</MkInput>
-					</div>
+	<div>
+		<MkStickyContainer>
+			<template #header
+				><MkPageHeader
+					:actions="headerActions"
+					:tabs="headerTabs"
+					:display-back-button="true"
+			/></template>
+			<MkSpacer :content-max="900">
+				<div class="lknzcolw">
+					<div class="users">
+						<div class="inputs">
+							<MkSelect v-model="sort" style="flex: 1">
+								<template #label>{{ i18n.ts.sort }}</template>
+								<option value="-createdAt">
+									{{ i18n.ts.registeredDate }} ({{
+										i18n.ts.ascendingOrder
+									}})
+								</option>
+								<option value="+createdAt">
+									{{ i18n.ts.registeredDate }} ({{
+										i18n.ts.descendingOrder
+									}})
+								</option>
+								<option value="-updatedAt">
+									{{ i18n.ts.lastUsed }} ({{
+										i18n.ts.ascendingOrder
+									}})
+								</option>
+								<option value="+updatedAt">
+									{{ i18n.ts.lastUsed }} ({{
+										i18n.ts.descendingOrder
+									}})
+								</option>
+							</MkSelect>
+							<MkSelect v-model="state" style="flex: 1">
+								<template #label>{{ i18n.ts.state }}</template>
+								<option value="all">{{ i18n.ts.all }}</option>
+								<option value="available">
+									{{ i18n.ts.normal }}
+								</option>
+								<option value="admin">
+									{{ i18n.ts.administrator }}
+								</option>
+								<option value="moderator">
+									{{ i18n.ts.moderator }}
+								</option>
+								<option value="silenced">
+									{{ i18n.ts.silence }}
+								</option>
+								<option value="suspended">
+									{{ i18n.ts.suspend }}
+								</option>
+							</MkSelect>
+							<MkSelect v-model="origin" style="flex: 1">
+								<template #label>{{
+									i18n.ts.instance
+								}}</template>
+								<option value="combined">
+									{{ i18n.ts.all }}
+								</option>
+								<option value="local">
+									{{ i18n.ts.local }}
+								</option>
+								<option value="remote">
+									{{ i18n.ts.remote }}
+								</option>
+							</MkSelect>
+						</div>
+						<div class="inputs">
+							<MkInput
+								v-model="searchUsername"
+								style="flex: 1"
+								type="text"
+								:spellcheck="false"
+								@update:modelValue="$refs.users.reload()"
+							>
+								<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()"
+							>
+								<template #prefix>@</template>
+								<template #label>{{ i18n.ts.host }}</template>
+							</MkInput>
+						</div>
 
-					<MkPagination v-slot="{items}" ref="paginationComponent" :pagination="pagination" class="users">
-						<MkA v-for="user in items" :key="user.id" v-tooltip.mfm="`Last posted: ${new Date(user.updatedAt).toLocaleString()}`" class="user" :to="`/user-info/${user.id}`">
-							<MkUserCardMini :user="user"/>
-						</MkA>
-					</MkPagination>
+						<MkPagination
+							v-slot="{ items }"
+							ref="paginationComponent"
+							:pagination="pagination"
+							class="users"
+						>
+							<MkA
+								v-for="user in items"
+								:key="user.id"
+								v-tooltip.mfm="
+									`Last posted: ${new Date(
+										user.updatedAt
+									).toLocaleString()}`
+								"
+								class="user"
+								:to="`/user-info/${user.id}`"
+							>
+								<MkUserCardMini :user="user" />
+							</MkA>
+						</MkPagination>
+					</div>
 				</div>
-			</div>
-		</MkSpacer>
-	</MkStickyContainer>
-</div>
+			</MkSpacer>
+		</MkStickyContainer>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import MkInput from '@/components/form/input.vue';
-import MkSelect from '@/components/form/select.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import * as os from '@/os';
-import { lookupUser } from '@/scripts/lookup-user';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import MkUserCardMini from '@/components/MkUserCardMini.vue';
+import { computed } from "vue";
+import MkInput from "@/components/form/input.vue";
+import MkSelect from "@/components/form/select.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import * as os from "@/os";
+import { lookupUser } from "@/scripts/lookup-user";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import MkUserCardMini from "@/components/MkUserCardMini.vue";
 
 let paginationComponent = $ref<InstanceType<typeof MkPagination>>();
 
-let sort = $ref('+createdAt');
-let state = $ref('all');
-let origin = $ref('local');
-let searchUsername = $ref('');
-let searchHost = $ref('');
+let sort = $ref("+createdAt");
+let state = $ref("all");
+let origin = $ref("local");
+let searchUsername = $ref("");
+let searchHost = $ref("");
 const pagination = {
-	endpoint: 'admin/show-users' as const,
+	endpoint: "admin/show-users" as const,
 	limit: 10,
 	params: computed(() => ({
 		sort: sort,
@@ -84,7 +153,7 @@ const pagination = {
 };
 
 function searchUser() {
-	os.selectUser().then(user => {
+	os.selectUser().then((user) => {
 		show(user);
 	});
 }
@@ -97,14 +166,14 @@ async function addUser() {
 
 	const { canceled: canceled2, result: password } = await os.inputText({
 		title: i18n.ts.password,
-		type: 'password',
+		type: "password",
 	});
 	if (canceled2) return;
 
-	os.apiWithDialog('admin/accounts/create', {
+	os.apiWithDialog("admin/accounts/create", {
 		username: username,
 		password: password,
-	}).then(res => {
+	}).then((res) => {
 		paginationComponent.reload();
 	});
 }
@@ -113,34 +182,39 @@ function show(user) {
 	os.pageWindow(`/user-info/${user.id}`);
 }
 
-const headerActions = $computed(() => [{
-	icon: 'ph-magnifying-glass ph-bold ph-lg',
-	text: i18n.ts.search,
-	handler: searchUser,
-}, {
-	asFullButton: true,
-	icon: 'ph-plus ph-bold ph-lg',
-	text: i18n.ts.addUser,
-	handler: addUser,
-}, {
-	asFullButton: true,
-	icon: 'ph-magnifying-glass ph-bold ph-lg',
-	text: i18n.ts.lookup,
-	handler: lookupUser,
-}]);
+const headerActions = $computed(() => [
+	{
+		icon: "ph-magnifying-glass ph-bold ph-lg",
+		text: i18n.ts.search,
+		handler: searchUser,
+	},
+	{
+		asFullButton: true,
+		icon: "ph-plus ph-bold ph-lg",
+		text: i18n.ts.addUser,
+		handler: addUser,
+	},
+	{
+		asFullButton: true,
+		icon: "ph-magnifying-glass ph-bold ph-lg",
+		text: i18n.ts.lookup,
+		handler: lookupUser,
+	},
+]);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.users,
-	icon: 'ph-users ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.users,
+		icon: "ph-users ph-bold ph-lg",
+	}))
+);
 </script>
 
 <style lang="scss" scoped>
 .lknzcolw {
 	> .users {
-
 		> .inputs {
 			display: flex;
 			margin-bottom: 16px;
@@ -153,7 +227,7 @@ definePageMetadata(computed(() => ({
 				}
 			}
 		}
-	
+
 		> .users {
 			margin-top: var(--margin);
 			display: grid;
diff --git a/packages/client/src/pages/announcements.vue b/packages/client/src/pages/announcements.vue
index 452ab8014..ba48f3bd0 100644
--- a/packages/client/src/pages/announcements.vue
+++ b/packages/client/src/pages/announcements.vue
@@ -1,33 +1,52 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="800">
-		<MkPagination v-slot="{items}" :pagination="pagination" class="ruryvtyk _content">
-			<section v-for="(announcement, i) in items" :key="announcement.id" class="_card announcement">
-				<div class="_title"><span v-if="$i && !announcement.isRead">🆕 </span>{{ announcement.title }}</div>
-				<div class="_content">
-					<Mfm :text="announcement.text"/>
-					<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
-				</div>
-				<div v-if="$i && !announcement.isRead" class="_footer">
-					<MkButton primary @click="read(items, announcement, i)"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.gotIt }}</MkButton>
-				</div>
-			</section>
-		</MkPagination>
-	</MkSpacer>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="800">
+			<MkPagination
+				v-slot="{ items }"
+				:pagination="pagination"
+				class="ruryvtyk _content"
+			>
+				<section
+					v-for="(announcement, i) in items"
+					:key="announcement.id"
+					class="_card announcement"
+				>
+					<div class="_title">
+						<span v-if="$i && !announcement.isRead">🆕 </span
+						>{{ announcement.title }}
+					</div>
+					<div class="_content">
+						<Mfm :text="announcement.text" />
+						<img
+							v-if="announcement.imageUrl"
+							:src="announcement.imageUrl"
+						/>
+					</div>
+					<div v-if="$i && !announcement.isRead" class="_footer">
+						<MkButton primary @click="read(items, announcement, i)"
+							><i class="ph-check ph-bold ph-lg"></i>
+							{{ i18n.ts.gotIt }}</MkButton
+						>
+					</div>
+				</section>
+			</MkPagination>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const pagination = {
-	endpoint: 'announcements' as const,
+	endpoint: "announcements" as const,
 	limit: 10,
 };
 
@@ -37,7 +56,7 @@ function read(items, announcement, i) {
 		...announcement,
 		isRead: true,
 	};
-	os.api('i/read-announcement', { announcementId: announcement.id });
+	os.api("i/read-announcement", { announcementId: announcement.id });
 }
 
 const headerActions = $computed(() => []);
@@ -46,7 +65,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.announcements,
-	icon: 'ph-megaphone-simple ph-bold ph-lg',
+	icon: "ph-megaphone-simple ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/antenna-timeline.vue b/packages/client/src/pages/antenna-timeline.vue
index f883645e3..c33eed75f 100644
--- a/packages/client/src/pages/antenna-timeline.vue
+++ b/packages/client/src/pages/antenna-timeline.vue
@@ -1,30 +1,42 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<div ref="rootEl" v-hotkey.global="keymap" v-size="{ min: [800] }" class="tqmomfks">
-		<div v-if="queue > 0" class="new"><button class="_buttonPrimary" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
-		<div class="tl _block">
-			<XTimeline
-				ref="tlEl" :key="antennaId"
-				class="tl"
-				src="antenna"
-				:antenna="antennaId"
-				:sound="true"
-				@queue="queueUpdated"
-			/>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<div
+			ref="rootEl"
+			v-hotkey.global="keymap"
+			v-size="{ min: [800] }"
+			class="tqmomfks"
+		>
+			<div v-if="queue > 0" class="new">
+				<button class="_buttonPrimary" @click="top()">
+					{{ i18n.ts.newNoteRecived }}
+				</button>
+			</div>
+			<div class="tl _block">
+				<XTimeline
+					ref="tlEl"
+					:key="antennaId"
+					class="tl"
+					src="antenna"
+					:antenna="antennaId"
+					:sound="true"
+					@queue="queueUpdated"
+				/>
+			</div>
 		</div>
-	</div>
-</MkStickyContainer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, watch } from 'vue';
-import XTimeline from '@/components/MkTimeline.vue';
-import { scroll } from '@/scripts/scroll';
-import * as os from '@/os';
-import { useRouter } from '@/router';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
+import { computed, inject, watch } from "vue";
+import XTimeline from "@/components/MkTimeline.vue";
+import { scroll } from "@/scripts/scroll";
+import * as os from "@/os";
+import { useRouter } from "@/router";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
 
 const router = useRouter();
 
@@ -37,7 +49,7 @@ let queue = $ref(0);
 let rootEl = $ref<HTMLElement>();
 let tlEl = $ref<InstanceType<typeof XTimeline>>();
 const keymap = $computed(() => ({
-	't': focus,
+	t: focus,
 }));
 
 function queueUpdated(q) {
@@ -62,15 +74,15 @@ function settings() {
 }
 
 async function doMarkRead() {
-	const ret = await os.api('antennas/mark-read', {
+	const ret = await os.api("antennas/mark-read", {
 		antennaId: props.antennaId,
 	});
 
 	if (ret) {
-		return true
+		return true;
 	}
 
-	throw new Error('Failed to mark all as read');
+	throw new Error("Failed to mark all as read");
 }
 
 async function markRead() {
@@ -81,32 +93,50 @@ function focus() {
 	tlEl.focus();
 }
 
-watch(() => props.antennaId, async () => {
-	antenna = await os.api('antennas/show', {
-		antennaId: props.antennaId,
-	});
-}, { immediate: true });
+watch(
+	() => props.antennaId,
+	async () => {
+		antenna = await os.api("antennas/show", {
+			antennaId: props.antennaId,
+		});
+	},
+	{ immediate: true }
+);
 
-const headerActions = $computed(() => antenna ? [{
-	icon: 'ph-calendar-blank ph-bold ph-lg',
-	text: i18n.ts.jumpToSpecifiedDate,
-	handler: timetravel,
-}, {
-	icon: 'ph-gear-six ph-bold ph-lg',
-	text: i18n.ts.settings,
-	handler: settings,
-}, {
-	icon: 'ph-check ph-bold ph-lg',
-	text: i18n.ts.markAllAsRead,
-	handler: markRead,
-}] : []);
+const headerActions = $computed(() =>
+	antenna
+		? [
+				{
+					icon: "ph-calendar-blank ph-bold ph-lg",
+					text: i18n.ts.jumpToSpecifiedDate,
+					handler: timetravel,
+				},
+				{
+					icon: "ph-gear-six ph-bold ph-lg",
+					text: i18n.ts.settings,
+					handler: settings,
+				},
+				{
+					icon: "ph-check ph-bold ph-lg",
+					text: i18n.ts.markAllAsRead,
+					handler: markRead,
+				},
+		  ]
+		: []
+);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => antenna ? {
-	title: antenna.name,
-	icon: 'ph-flying-saucer ph-bold ph-lg',
-} : null));
+definePageMetadata(
+	computed(() =>
+		antenna
+			? {
+					title: antenna.name,
+					icon: "ph-flying-saucer ph-bold ph-lg",
+			  }
+			: null
+	)
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/api-console.vue b/packages/client/src/pages/api-console.vue
index 0707f52f9..214145d37 100644
--- a/packages/client/src/pages/api-console.vue
+++ b/packages/client/src/pages/api-console.vue
@@ -1,78 +1,109 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="700">
-		<div class="_formRoot">
-			<div class="_formBlock">
-				<MkInput v-model="endpoint" :datalist="endpoints" class="_formBlock" @update:modelValue="onEndpointChange()">
-					<template #label>Endpoint</template>
-				</MkInput>
-				<MkTextarea v-model="body" class="_formBlock" code>
-					<template #label>Params (JSON or JSON5)</template>
-				</MkTextarea>
-				<MkSwitch v-model="withCredential" class="_formBlock">
-					With credential
-				</MkSwitch>
-				<MkButton class="_formBlock" primary :disabled="sending" @click="send">
-					<template v-if="sending"><MkEllipsis/></template>
-					<template v-else><i class="ph-paper-plane-tilt ph-bold ph-lg"></i> Send</template>
-				</MkButton>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="700">
+			<div class="_formRoot">
+				<div class="_formBlock">
+					<MkInput
+						v-model="endpoint"
+						:datalist="endpoints"
+						class="_formBlock"
+						@update:modelValue="onEndpointChange()"
+					>
+						<template #label>Endpoint</template>
+					</MkInput>
+					<MkTextarea v-model="body" class="_formBlock" code>
+						<template #label>Params (JSON or JSON5)</template>
+					</MkTextarea>
+					<MkSwitch v-model="withCredential" class="_formBlock">
+						With credential
+					</MkSwitch>
+					<MkButton
+						class="_formBlock"
+						primary
+						:disabled="sending"
+						@click="send"
+					>
+						<template v-if="sending"><MkEllipsis /></template>
+						<template v-else
+							><i class="ph-paper-plane-tilt ph-bold ph-lg"></i>
+							Send</template
+						>
+					</MkButton>
+				</div>
+				<div v-if="res" class="_formBlock">
+					<MkTextarea v-model="res" code readonly tall>
+						<template #label>Response</template>
+					</MkTextarea>
+				</div>
 			</div>
-			<div v-if="res" class="_formBlock">
-				<MkTextarea v-model="res" code readonly tall>
-					<template #label>Response</template>
-				</MkTextarea>
-			</div>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import JSON5 from 'json5';
-import { Endpoints } from 'calckey-js';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import * as os from '@/os';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { ref } from "vue";
+import JSON5 from "json5";
+import { Endpoints } from "calckey-js";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import * as os from "@/os";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const body = ref('{}');
-const endpoint = ref('');
+const body = ref("{}");
+const endpoint = ref("");
 const endpoints = ref<any[]>([]);
 const sending = ref(false);
-const res = ref('');
+const res = ref("");
 const withCredential = ref(true);
 
-os.api('endpoints').then(endpointResponse => {
+os.api("endpoints").then((endpointResponse) => {
 	endpoints.value = endpointResponse;
 });
 
 function send() {
 	sending.value = true;
 	const requestBody = JSON5.parse(body.value);
-	os.api(endpoint.value as keyof Endpoints, requestBody, requestBody.i || (withCredential.value ? undefined : null)).then(resp => {
-		sending.value = false;
-		res.value = JSON5.stringify(resp, null, 2);
-	}, err => {
-		sending.value = false;
-		res.value = JSON5.stringify(err, null, 2);
-	});
+	os.api(
+		endpoint.value as keyof Endpoints,
+		requestBody,
+		requestBody.i || (withCredential.value ? undefined : null)
+	).then(
+		(resp) => {
+			sending.value = false;
+			res.value = JSON5.stringify(resp, null, 2);
+		},
+		(err) => {
+			sending.value = false;
+			res.value = JSON5.stringify(err, null, 2);
+		}
+	);
 }
 
 function onEndpointChange() {
-	os.api('endpoint', { endpoint: endpoint.value }, withCredential.value ? undefined : null).then(resp => {
+	os.api(
+		"endpoint",
+		{ endpoint: endpoint.value },
+		withCredential.value ? undefined : null
+	).then((resp) => {
 		const endpointBody = {};
 		for (const p of resp.params) {
 			endpointBody[p.name] =
-				p.type === 'String' ? '' :
-				p.type === 'Number' ? 0 :
-				p.type === 'Boolean' ? false :
-				p.type === 'Array' ? [] :
-				p.type === 'Object' ? {} :
-				null;
+				p.type === "String"
+					? ""
+					: p.type === "Number"
+					? 0
+					: p.type === "Boolean"
+					? false
+					: p.type === "Array"
+					? []
+					: p.type === "Object"
+					? {}
+					: null;
 		}
 		body.value = JSON5.stringify(endpointBody, null, 2);
 	});
@@ -83,7 +114,7 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
-	title: 'API console',
-	icon: 'ph-terminal-window ph-bold ph-lg',
+	title: "API console",
+	icon: "ph-terminal-window ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/apps.vue b/packages/client/src/pages/apps.vue
index 377c692e9..0ef511027 100644
--- a/packages/client/src/pages/apps.vue
+++ b/packages/client/src/pages/apps.vue
@@ -1,87 +1,121 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<div style="overflow: clip;">
-		<MkSpacer :content-max="600" :margin-min="20">
-			<div class="_formRoot">
-				<FormSection>
-					<template #label>{{ i18n.ts._apps.crossPlatform }}</template>
-					<div class="_formBlock" style="text-align: center;">
-						<pwa-install/>
-						<MkButton primary rounded inline @click="installPwa">{{ i18n.ts._apps.pwa }}</MkButton>
-					</div>
-					<div class="_formLinks">
-						<FormLink to="https://kaiteki.app" external>
-							<template #icon>
-								<i class="ph-android-logo ph-bold ph-xl"/>
-								<i class="ph-windows-logo ph-bold ph-xl"/>
-								<i class="ph-linux-logo ph-bold ph-xl"/>
-							</template>
-							{{ i18n.ts._apps.kaiteki }}
-							<template #suffix>{{ i18n.ts._apps.firstClass }}, {{ i18n.ts._apps.free }}</template>
-						</FormLink>
-					</div>
-				</FormSection>
-				<FormSection>
-					<template #label>{{ i18n.ts._apps.mobile }}</template>
-					<div class="_formLinks">
-						<FormLink to="https://play.google.com/store/apps/details?id=jp.panta.misskeyandroidclient" external>
-							<template #icon>
-								<i class="ph-android-logo ph-bold ph-xl"/>
-							</template>
-							{{ i18n.ts._apps.milktea }}
-							<template #suffix>{{ i18n.ts._apps.firstClass }}, {{ i18n.ts._apps.free }}</template>
-						</FormLink>
-						<FormLink to="https://testflight.apple.com/join/xNdgUbh6" external>
-							<template #icon>
-								<i class="ph-apple-logo ph-bold ph-xl"/>
-							</template>
-							{{ i18n.ts._apps.mona }}
-							<template #suffix>{{ i18n.ts._apps.thirdClass }}, {{ i18n.ts._apps.free }}</template>
-						</FormLink>
-					</div>
-				</FormSection>
-				<FormSection>
-					<template #label>{{ i18n.ts.desktop }}</template>
-					<div class="_formLinks">
-						<FormLink to="https://thedesk.top/" external>
-							<template #icon>
-								<i class="ph-apple-logo ph-bold ph-xl"/>
-								<i class="ph-windows-logo ph-bold ph-xl"/>
-								<i class="ph-linux-logo ph-bold ph-xl"/>
-							</template>
-							{{ i18n.ts._apps.theDesk }}
-							<template #suffix>{{ i18n.ts._apps.secondClass }}, {{ i18n.ts._apps.free }}</template>
-						</FormLink>
-						<FormLink to="https://uboar.github.io/missli/" external>
-							<template #icon>
-								<i class="ph-globe ph-bold ph-xl"/>
-							</template>
-							{{ i18n.ts._apps.missLi }}
-							<template #suffix>{{ i18n.ts._apps.secondClass }}, {{ i18n.ts._apps.free }}</template>
-						</FormLink>
-					</div>
-				</FormSection>
-			</div>
-		</MkSpacer>
-	</div>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<div style="overflow: clip">
+			<MkSpacer :content-max="600" :margin-min="20">
+				<div class="_formRoot">
+					<FormSection>
+						<template #label>{{
+							i18n.ts._apps.crossPlatform
+						}}</template>
+						<div class="_formBlock" style="text-align: center">
+							<pwa-install />
+							<MkButton
+								primary
+								rounded
+								inline
+								@click="installPwa"
+								>{{ i18n.ts._apps.pwa }}</MkButton
+							>
+						</div>
+						<div class="_formLinks">
+							<FormLink to="https://kaiteki.app" external>
+								<template #icon>
+									<i class="ph-android-logo ph-bold ph-xl" />
+									<i class="ph-windows-logo ph-bold ph-xl" />
+									<i class="ph-linux-logo ph-bold ph-xl" />
+								</template>
+								{{ i18n.ts._apps.kaiteki }}
+								<template #suffix
+									>{{ i18n.ts._apps.firstClass }},
+									{{ i18n.ts._apps.free }}</template
+								>
+							</FormLink>
+						</div>
+					</FormSection>
+					<FormSection>
+						<template #label>{{ i18n.ts._apps.mobile }}</template>
+						<div class="_formLinks">
+							<FormLink
+								to="https://play.google.com/store/apps/details?id=jp.panta.misskeyandroidclient"
+								external
+							>
+								<template #icon>
+									<i class="ph-android-logo ph-bold ph-xl" />
+								</template>
+								{{ i18n.ts._apps.milktea }}
+								<template #suffix
+									>{{ i18n.ts._apps.firstClass }},
+									{{ i18n.ts._apps.free }}</template
+								>
+							</FormLink>
+							<FormLink
+								to="https://testflight.apple.com/join/xNdgUbh6"
+								external
+							>
+								<template #icon>
+									<i class="ph-apple-logo ph-bold ph-xl" />
+								</template>
+								{{ i18n.ts._apps.mona }}
+								<template #suffix
+									>{{ i18n.ts._apps.thirdClass }},
+									{{ i18n.ts._apps.free }}</template
+								>
+							</FormLink>
+						</div>
+					</FormSection>
+					<FormSection>
+						<template #label>{{ i18n.ts.desktop }}</template>
+						<div class="_formLinks">
+							<FormLink to="https://thedesk.top/" external>
+								<template #icon>
+									<i class="ph-apple-logo ph-bold ph-xl" />
+									<i class="ph-windows-logo ph-bold ph-xl" />
+									<i class="ph-linux-logo ph-bold ph-xl" />
+								</template>
+								{{ i18n.ts._apps.theDesk }}
+								<template #suffix
+									>{{ i18n.ts._apps.secondClass }},
+									{{ i18n.ts._apps.free }}</template
+								>
+							</FormLink>
+							<FormLink
+								to="https://uboar.github.io/missli/"
+								external
+							>
+								<template #icon>
+									<i class="ph-globe ph-bold ph-xl" />
+								</template>
+								{{ i18n.ts._apps.missLi }}
+								<template #suffix
+									>{{ i18n.ts._apps.secondClass }},
+									{{ i18n.ts._apps.free }}</template
+								>
+							</FormLink>
+						</div>
+					</FormSection>
+				</div>
+			</MkSpacer>
+		</div>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import FormLink from '@/components/form/link.vue';
-import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import '@khmyznikov/pwa-install';
+import FormLink from "@/components/form/link.vue";
+import FormSection from "@/components/form/section.vue";
+import MkButton from "@/components/MkButton.vue";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import "@khmyznikov/pwa-install";
 
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
 function installPwa(ev: MouseEvent) {
-	const pwaInstall = document.getElementsByTagName('pwa-install')[0];
+	const pwaInstall = document.getElementsByTagName("pwa-install")[0];
 	pwaInstall.showDialog();
 }
 
diff --git a/packages/client/src/pages/auth.form.vue b/packages/client/src/pages/auth.form.vue
index 9d57a8c92..189650f30 100644
--- a/packages/client/src/pages/auth.form.vue
+++ b/packages/client/src/pages/auth.form.vue
@@ -1,33 +1,39 @@
 <template>
-<section class="_section">
-	<div class="_title">{{ i18n.t('_auth.shareAccess', { name: app.name }) }}</div>
-	<div class="_content">
-		<h2>{{ app.name }}</h2>
-		<p class="id">{{ app.id }}</p>
-		<p class="description">{{ app.description }}</p>
-	</div>
-	<div class="_content">
-		<h2>{{ i18n.ts._auth.permissionAsk }}</h2>
-		<ul>
-			<li v-for="p in app.permission" :key="p">{{ i18n.t(`_permissions.${p}`) }}</li>
-		</ul>
-	</div>
-	<div class="_footer">
-		<MkButton inline @click="cancel">{{ i18n.ts.cancel }}</MkButton>
-		<MkButton inline primary @click="accept">{{ i18n.ts.accept }}</MkButton>
-	</div>
-</section>
+	<section class="_section">
+		<div class="_title">
+			{{ i18n.t("_auth.shareAccess", { name: app.name }) }}
+		</div>
+		<div class="_content">
+			<h2>{{ app.name }}</h2>
+			<p class="id">{{ app.id }}</p>
+			<p class="description">{{ app.description }}</p>
+		</div>
+		<div class="_content">
+			<h2>{{ i18n.ts._auth.permissionAsk }}</h2>
+			<ul>
+				<li v-for="p in app.permission" :key="p">
+					{{ i18n.t(`_permissions.${p}`) }}
+				</li>
+			</ul>
+		</div>
+		<div class="_footer">
+			<MkButton inline @click="cancel">{{ i18n.ts.cancel }}</MkButton>
+			<MkButton inline primary @click="accept">{{
+				i18n.ts.accept
+			}}</MkButton>
+		</div>
+	</section>
 </template>
 
 <script lang="ts" setup>
-import { defineComponent } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { defineComponent } from "vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 const emit = defineEmits<{
-	(ev: 'denied'): void;
-	(ev: 'accepted'): void;
+	(ev: "denied"): void;
+	(ev: "accepted"): void;
 }>();
 
 const props = defineProps<{
@@ -45,18 +51,18 @@ const props = defineProps<{
 const app = props.session.app;
 
 function cancel() {
-	os.api('auth/deny', {
+	os.api("auth/deny", {
 		token: props.session.token,
 	}).then(() => {
-		emit('denied');
+		emit("denied");
 	});
 }
 
 function accept() {
-	os.api('auth/accept', {
+	os.api("auth/accept", {
 		token: props.session.token,
 	}).then(() => {
-		emit('accepted');
+		emit("accepted");
 	});
 }
 </script>
diff --git a/packages/client/src/pages/auth.vue b/packages/client/src/pages/auth.vue
index 34508610c..8762f54c8 100644
--- a/packages/client/src/pages/auth.vue
+++ b/packages/client/src/pages/auth.vue
@@ -1,113 +1,154 @@
 <template>
-<div v-if="$i && fetching" class="">
-	<MkLoading/>
-</div>
-<div v-else-if="$i">
-	<XForm
-		v-if="state == 'waiting'"
-		ref="form"
-		class="form"
-		:session="session"
-		@denied="state = 'denied'"
-		@accepted="accepted"
-	/>
-	<div v-if="state == 'denied'" class="denied">
-		<h1>{{ i18n.ts._auth.denied }}</h1>
+	<div v-if="$i && fetching" class="">
+		<MkLoading />
 	</div>
-	<div v-if="state == 'accepted'" class="accepted">
-		<h1>{{ session.app.isAuthorized ? i18n.t('already-authorized') : i18n.ts.allowed }}</h1>
-		<p v-if="session.app.callbackUrl && !auth_code">{{ i18n.ts._auth.callback }}<MkEllipsis/></p>
-		<MkKeyValue v-if="session.app.callbackUrl && auth_code" :copy="auth_code">
-			<template #key>{{ i18n.ts._auth.copyAsk }}</template>
-			<template #value>{{ auth_code }}</template>
-		</MkKeyValue>
-		<p v-if="!session.app.callbackUrl">{{ i18n.ts._auth.pleaseGoBack }}</p>
+	<div v-else-if="$i">
+		<XForm
+			v-if="state == 'waiting'"
+			ref="form"
+			class="form"
+			:session="session"
+			@denied="state = 'denied'"
+			@accepted="accepted"
+		/>
+		<div v-if="state == 'denied'" class="denied">
+			<h1>{{ i18n.ts._auth.denied }}</h1>
+		</div>
+		<div v-if="state == 'accepted'" class="accepted">
+			<h1>
+				{{
+					session.app.isAuthorized
+						? i18n.t("already-authorized")
+						: i18n.ts.allowed
+				}}
+			</h1>
+			<p v-if="session.app.callbackUrl && !auth_code">
+				{{ i18n.ts._auth.callback }}<MkEllipsis />
+			</p>
+			<MkKeyValue
+				v-if="session.app.callbackUrl && auth_code"
+				:copy="auth_code"
+			>
+				<template #key>{{ i18n.ts._auth.copyAsk }}</template>
+				<template #value>{{ auth_code }}</template>
+			</MkKeyValue>
+			<p v-if="!session.app.callbackUrl">
+				{{ i18n.ts._auth.pleaseGoBack }}
+			</p>
+		</div>
+		<div v-if="state == 'fetch-session-error'" class="error">
+			<p>{{ i18n.ts.somethingHappened }}</p>
+		</div>
 	</div>
-	<div v-if="state == 'fetch-session-error'" class="error">
-		<p>{{ i18n.ts.somethingHappened }}</p>
+	<div v-else class="signin">
+		<MkSignin @login="onLogin" />
 	</div>
-</div>
-<div v-else class="signin">
-	<MkSignin @login="onLogin"/>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import XForm from './auth.form.vue';
-import MkSignin from '@/components/MkSignin.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import * as os from '@/os';
-import { login } from '@/account';
-import { i18n } from '@/i18n';
+import { defineComponent } from "vue";
+import XForm from "./auth.form.vue";
+import MkSignin from "@/components/MkSignin.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import * as os from "@/os";
+import { login } from "@/account";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
 		XForm,
 		MkSignin,
-		MkKeyValue
+		MkKeyValue,
 	},
-	props: ['token'],
+	props: ["token"],
 	data() {
 		return {
 			state: null,
 			session: null,
 			fetching: true,
 			i18n,
-			auth_code: null
+			auth_code: null,
 		};
 	},
 	mounted() {
 		if (!this.$i) return;
 
 		// Fetch session
-		os.api('auth/session/show', {
+		os.api("auth/session/show", {
 			token: this.token,
-		}).then(session => {
-			this.session = session;
-			this.fetching = false;
+		})
+			.then((session) => {
+				this.session = session;
+				this.fetching = false;
 
-			// 既に連携していた場合
-			if (this.session.app.isAuthorized) {
-				os.api('auth/accept', {
-					token: this.session.token,
-				}).then(() => {
-					this.accepted();
-				});
-			} else {
-				this.state = 'waiting';
-			}
-		}).catch(error => {
-			this.state = 'fetch-session-error';
-			this.fetching = false;
-		});
+				// 既に連携していた場合
+				if (this.session.app.isAuthorized) {
+					os.api("auth/accept", {
+						token: this.session.token,
+					}).then(() => {
+						this.accepted();
+					});
+				} else {
+					this.state = "waiting";
+				}
+			})
+			.catch((error) => {
+				this.state = "fetch-session-error";
+				this.fetching = false;
+			});
 	},
 	methods: {
 		accepted() {
-			this.state = 'accepted';
-			const getUrlParams = () => window.location.search.substring(1).split('&').reduce((result, query) => { const [k, v] = query.split('='); result[k] = decodeURI(v); return result; }, {});
-			const isMastodon = !!getUrlParams().mastodon
+			this.state = "accepted";
+			const getUrlParams = () =>
+				window.location.search
+					.substring(1)
+					.split("&")
+					.reduce((result, query) => {
+						const [k, v] = query.split("=");
+						result[k] = decodeURI(v);
+						return result;
+					}, {});
+			const isMastodon = !!getUrlParams().mastodon;
 			if (this.session.app.callbackUrl && isMastodon) {
 				const callbackUrl = new URL(this.session.app.callbackUrl);
 				callbackUrl.searchParams.append("code", this.session.token);
-				if (!!getUrlParams().state) callbackUrl.searchParams.append("state", getUrlParams().state);
+				if (!!getUrlParams().state)
+					callbackUrl.searchParams.append(
+						"state",
+						getUrlParams().state
+					);
 				location.href = callbackUrl.toString();
 			} else if (this.session.app.callbackUrl) {
 				const url = new URL(this.session.app.callbackUrl);
-				if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:'].includes(url.protocol)) throw new Error('invalid url');
-				if (this.session.app.callbackUrl === "urn:ietf:wg:oauth:2.0:oob") {
+				if (
+					[
+						"javascript:",
+						"file:",
+						"data:",
+						"mailto:",
+						"tel:",
+					].includes(url.protocol)
+				)
+					throw new Error("invalid url");
+				if (
+					this.session.app.callbackUrl === "urn:ietf:wg:oauth:2.0:oob"
+				) {
 					this.auth_code = this.session.token;
 				} else {
-					location.href = `${this.session.app.callbackUrl}?token=${this.session.token}&code=${this.session.token}&state=${getUrlParams().state || ''}`;
+					location.href = `${this.session.app.callbackUrl}?token=${
+						this.session.token
+					}&code=${this.session.token}&state=${
+						getUrlParams().state || ""
+					}`;
 				}
 			}
-		}, onLogin(res) {
+		},
+		onLogin(res) {
 			login(res.i);
 		},
 	},
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/channel-editor.vue b/packages/client/src/pages/channel-editor.vue
index 3aca69f3d..433c87c38 100644
--- a/packages/client/src/pages/channel-editor.vue
+++ b/packages/client/src/pages/channel-editor.vue
@@ -1,41 +1,54 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="700">
-		<div class="_formRoot">
-			<MkInput v-model="name" class="_formBlock">
-				<template #label>{{ i18n.ts.name }}</template>
-			</MkInput>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="700">
+			<div class="_formRoot">
+				<MkInput v-model="name" class="_formBlock">
+					<template #label>{{ i18n.ts.name }}</template>
+				</MkInput>
 
-			<MkTextarea v-model="description" class="_formBlock">
-				<template #label>{{ i18n.ts.description }}</template>
-			</MkTextarea>
+				<MkTextarea v-model="description" class="_formBlock">
+					<template #label>{{ i18n.ts.description }}</template>
+				</MkTextarea>
 
-			<div class="banner">
-				<MkButton v-if="bannerId == null" @click="setBannerImage"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts._channel.setBanner }}</MkButton>
-				<div v-else-if="bannerUrl">
-					<img :src="bannerUrl" style="width: 100%;"/>
-					<MkButton @click="removeBannerImage()"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts._channel.removeBanner }}</MkButton>
+				<div class="banner">
+					<MkButton v-if="bannerId == null" @click="setBannerImage"
+						><i class="ph-plus ph-bold ph-lg"></i>
+						{{ i18n.ts._channel.setBanner }}</MkButton
+					>
+					<div v-else-if="bannerUrl">
+						<img :src="bannerUrl" style="width: 100%" />
+						<MkButton @click="removeBannerImage()"
+							><i class="ph-trash ph-bold ph-lg"></i>
+							{{ i18n.ts._channel.removeBanner }}</MkButton
+						>
+					</div>
+				</div>
+				<div class="_formBlock">
+					<MkButton primary @click="save()"
+						><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+						{{
+							channelId ? i18n.ts.save : i18n.ts.create
+						}}</MkButton
+					>
 				</div>
 			</div>
-			<div class="_formBlock">
-				<MkButton primary @click="save()"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ channelId ? i18n.ts.save : i18n.ts.create }}</MkButton>
-			</div>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, watch } from 'vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import { selectFile } from '@/scripts/select-file';
-import * as os from '@/os';
-import { useRouter } from '@/router';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
+import { computed, inject, watch } from "vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import { selectFile } from "@/scripts/select-file";
+import * as os from "@/os";
+import { useRouter } from "@/router";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
 
 const router = useRouter();
 
@@ -49,20 +62,25 @@ let description = $ref(null);
 let bannerUrl = $ref<string | null>(null);
 let bannerId = $ref<string | null>(null);
 
-watch(() => bannerId, async () => {
-	if (bannerId == null) {
-		bannerUrl = null;
-	} else {
-		bannerUrl = (await os.api('drive/files/show', {
-			fileId: bannerId,
-		})).url;
+watch(
+	() => bannerId,
+	async () => {
+		if (bannerId == null) {
+			bannerUrl = null;
+		} else {
+			bannerUrl = (
+				await os.api("drive/files/show", {
+					fileId: bannerId,
+				})
+			).url;
+		}
 	}
-});
+);
 
 async function fetchChannel() {
 	if (props.channelId == null) return;
 
-	channel = await os.api('channels/show', {
+	channel = await os.api("channels/show", {
 		channelId: props.channelId,
 	});
 
@@ -83,11 +101,11 @@ function save() {
 
 	if (props.channelId) {
 		params.channelId = props.channelId;
-		os.api('channels/update', params).then(() => {
+		os.api("channels/update", params).then(() => {
 			os.success();
 		});
 	} else {
-		os.api('channels/create', params).then(created => {
+		os.api("channels/create", params).then((created) => {
 			os.success();
 			router.push(`/channels/${created.id}`);
 		});
@@ -95,7 +113,7 @@ function save() {
 }
 
 function setBannerImage(evt) {
-	selectFile(evt.currentTarget ?? evt.target, null).then(file => {
+	selectFile(evt.currentTarget ?? evt.target, null).then((file) => {
 		bannerId = file.id;
 	});
 }
@@ -108,15 +126,19 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => props.channelId ? {
-	title: i18n.ts._channel.edit,
-	icon: 'ph-television ph-bold ph-lg',
-} : {
-	title: i18n.ts._channel.create,
-	icon: 'ph-television ph-bold ph-lg',
-}));
+definePageMetadata(
+	computed(() =>
+		props.channelId
+			? {
+					title: i18n.ts._channel.edit,
+					icon: "ph-television ph-bold ph-lg",
+			  }
+			: {
+					title: i18n.ts._channel.create,
+					icon: "ph-television ph-bold ph-lg",
+			  }
+	)
+);
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/channel.vue b/packages/client/src/pages/channel.vue
index e1524974d..4c9124ae2 100644
--- a/packages/client/src/pages/channel.vue
+++ b/packages/client/src/pages/channel.vue
@@ -1,47 +1,116 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="700">
-		<div v-if="channel">
-			<div class="wpgynlbz _panel _gap" :class="{ hide: !showBanner }">
-				<XChannelFollowButton :channel="channel" :full="true" class="subscribe"/>
-				<button class="_button toggle" @click="() => showBanner = !showBanner">
-					<template v-if="showBanner"><i class="ph-caret-up ph-bold ph-lg"></i></template>
-					<template v-else><i class="ph-caret-down ph-bold ph-lg"></i></template>
-				</button>
-				<div v-if="!showBanner" class="hideOverlay">
-				</div>
-				<div :style="{ backgroundImage: channel.bannerUrl ? `url(${channel.bannerUrl})` : null }" class="banner">
-					<div class="status">
-						<div><i class="ph-users ph-bold ph-lg ph-fw ph-lg"></i><I18n :src="i18n.ts._channel.usersCount" tag="span" style="margin-left: 4px;"><template #n><b>{{ channel.usersCount }}</b></template></I18n></div>
-						<div><i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i><I18n :src="i18n.ts._channel.notesCount" tag="span" style="margin-left: 4px;"><template #n><b>{{ channel.notesCount }}</b></template></I18n></div>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700">
+			<div v-if="channel">
+				<div
+					class="wpgynlbz _panel _gap"
+					:class="{ hide: !showBanner }"
+				>
+					<XChannelFollowButton
+						:channel="channel"
+						:full="true"
+						class="subscribe"
+					/>
+					<button
+						class="_button toggle"
+						@click="() => (showBanner = !showBanner)"
+					>
+						<template v-if="showBanner"
+							><i class="ph-caret-up ph-bold ph-lg"></i
+						></template>
+						<template v-else
+							><i class="ph-caret-down ph-bold ph-lg"></i
+						></template>
+					</button>
+					<div v-if="!showBanner" class="hideOverlay"></div>
+					<div
+						:style="{
+							backgroundImage: channel.bannerUrl
+								? `url(${channel.bannerUrl})`
+								: null,
+						}"
+						class="banner"
+					>
+						<div class="status">
+							<div>
+								<i
+									class="ph-users ph-bold ph-lg ph-fw ph-lg"
+								></i
+								><I18n
+									:src="i18n.ts._channel.usersCount"
+									tag="span"
+									style="margin-left: 4px"
+									><template #n
+										><b>{{
+											channel.usersCount
+										}}</b></template
+									></I18n
+								>
+							</div>
+							<div>
+								<i
+									class="ph-pencil ph-bold ph-lg ph-fw ph-lg"
+								></i
+								><I18n
+									:src="i18n.ts._channel.notesCount"
+									tag="span"
+									style="margin-left: 4px"
+									><template #n
+										><b>{{
+											channel.notesCount
+										}}</b></template
+									></I18n
+								>
+							</div>
+						</div>
+						<div class="fade"></div>
+					</div>
+					<div v-if="channel.description" class="description">
+						<Mfm
+							:text="channel.description"
+							:is-note="false"
+							:i="$i"
+						/>
 					</div>
-					<div class="fade"></div>
-				</div>
-				<div v-if="channel.description" class="description">
-					<Mfm :text="channel.description" :is-note="false" :i="$i"/>
 				</div>
+
+				<XPostForm
+					v-if="$i"
+					:channel="channel"
+					class="post-form _panel _gap"
+					fixed
+				/>
+
+				<XTimeline
+					:key="channelId"
+					class="_gap"
+					src="channel"
+					:channel="channelId"
+					@before="before"
+					@after="after"
+				/>
 			</div>
-
-			<XPostForm v-if="$i" :channel="channel" class="post-form _panel _gap" fixed/>
-
-			<XTimeline :key="channelId" class="_gap" src="channel" :channel="channelId" @before="before" @after="after"/>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, watch } from 'vue';
-import MkContainer from '@/components/MkContainer.vue';
-import XPostForm from '@/components/MkPostForm.vue';
-import XTimeline from '@/components/MkTimeline.vue';
-import XChannelFollowButton from '@/components/MkChannelFollowButton.vue';
-import * as os from '@/os';
-import { useRouter } from '@/router';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, inject, watch } from "vue";
+import MkContainer from "@/components/MkContainer.vue";
+import XPostForm from "@/components/MkPostForm.vue";
+import XTimeline from "@/components/MkTimeline.vue";
+import XChannelFollowButton from "@/components/MkChannelFollowButton.vue";
+import * as os from "@/os";
+import { useRouter } from "@/router";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const router = useRouter();
 
@@ -52,37 +121,44 @@ const props = defineProps<{
 let channel = $ref(null);
 let showBanner = $ref(true);
 
-watch(() => props.channelId, async () => {
-	channel = await os.api('channels/show', {
-		channelId: props.channelId,
-	});
-}, { immediate: true });
+watch(
+	() => props.channelId,
+	async () => {
+		channel = await os.api("channels/show", {
+			channelId: props.channelId,
+		});
+	},
+	{ immediate: true }
+);
 
 function edit() {
 	router.push(`/channels/${channel?.id}/edit`);
 }
 
-const headerActions = $computed(() =>  [
-	...(
-		channel
-		&& channel?.userId === $i?.id
+const headerActions = $computed(() => [
+	...(channel && channel?.userId === $i?.id
 		? [
-			{
-				icon: 'ph-gear-six ph-bold ph-lg',
-				text: i18n.ts.edit,
-				handler: edit,
-			}
-		]
-		: []
-	),
+				{
+					icon: "ph-gear-six ph-bold ph-lg",
+					text: i18n.ts.edit,
+					handler: edit,
+				},
+		  ]
+		: []),
 ]);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => channel ? {
-	title: channel.name,
-	icon: 'ph-television ph-bold ph-lg',
-} : null));
+definePageMetadata(
+	computed(() =>
+		channel
+			? {
+					title: channel.name,
+					icon: "ph-television ph-bold ph-lg",
+			  }
+			: null
+	)
+);
 </script>
 
 <style lang="scss" scoped>
@@ -99,7 +175,7 @@ definePageMetadata(computed(() => channel ? {
 	> .toggle {
 		position: absolute;
 		z-index: 2;
-    top: 8px;
+		top: 8px;
 		right: 8px;
 		font-size: 1.2em;
 		width: 48px;
@@ -107,12 +183,12 @@ definePageMetadata(computed(() => channel ? {
 		color: #fff;
 		background: rgba(0, 0, 0, 0.5);
 		border-radius: 100%;
-		
+
 		> i {
 			vertical-align: middle;
 		}
 	}
-	
+
 	> .banner {
 		position: relative;
 		height: 200px;
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index 7d96e6018..2d8eeefcf 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -1,105 +1,149 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="700">
-		<swiper
-			:modules="[Virtual]"
-			:space-between="20"
-			:virtual="true"
-			:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
-			@swiper="setSwiperRef"
-			@slide-change="onSlideChange"
-		>
-			<swiper-slide>
-				<div class="_content grwlizim featured">
-					<MkPagination v-slot="{items}" :pagination="featuredPagination">
-						<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
-					</MkPagination>
-				</div>
-			</swiper-slide>
-			<swiper-slide>
-				<div class="_content grwlizim following">
-					<MkPagination v-slot="{items}" :pagination="followingPagination">
-						<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
-					</MkPagination>
-				</div>
-			</swiper-slide>
-			<swiper-slide>
-				<div class="_content grwlizim owned">
-					<MkButton class="new" @click="create()"><i class="ph-plus ph-bold ph-lg"></i></MkButton>
-					<MkPagination v-slot="{items}" :pagination="ownedPagination">
-						<MkChannelPreview v-for="channel in items" :key="channel.id" class="_gap" :channel="channel"/>
-					</MkPagination>
-				</div>
-			</swiper-slide>
-		</swiper>
-	</MkSpacer>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="700">
+			<swiper
+				:modules="[Virtual]"
+				:space-between="20"
+				:virtual="true"
+				:allow-touch-move="
+					!(
+						deviceKind === 'desktop' &&
+						!defaultStore.state.swipeOnDesktop
+					)
+				"
+				@swiper="setSwiperRef"
+				@slide-change="onSlideChange"
+			>
+				<swiper-slide>
+					<div class="_content grwlizim featured">
+						<MkPagination
+							v-slot="{ items }"
+							:pagination="featuredPagination"
+						>
+							<MkChannelPreview
+								v-for="channel in items"
+								:key="channel.id"
+								class="_gap"
+								:channel="channel"
+							/>
+						</MkPagination>
+					</div>
+				</swiper-slide>
+				<swiper-slide>
+					<div class="_content grwlizim following">
+						<MkPagination
+							v-slot="{ items }"
+							:pagination="followingPagination"
+						>
+							<MkChannelPreview
+								v-for="channel in items"
+								:key="channel.id"
+								class="_gap"
+								:channel="channel"
+							/>
+						</MkPagination>
+					</div>
+				</swiper-slide>
+				<swiper-slide>
+					<div class="_content grwlizim owned">
+						<MkButton class="new" @click="create()"
+							><i class="ph-plus ph-bold ph-lg"></i
+						></MkButton>
+						<MkPagination
+							v-slot="{ items }"
+							:pagination="ownedPagination"
+						>
+							<MkChannelPreview
+								v-for="channel in items"
+								:key="channel.id"
+								class="_gap"
+								:channel="channel"
+							/>
+						</MkPagination>
+					</div>
+				</swiper-slide>
+			</swiper>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineComponent, inject, watch } from 'vue';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
-import MkChannelPreview from '@/components/MkChannelPreview.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkButton from '@/components/MkButton.vue';
-import { useRouter } from '@/router';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { deviceKind } from '@/scripts/device-kind';
-import { i18n } from '@/i18n';
-import { defaultStore } from '@/store';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
+import { computed, defineComponent, inject, watch } from "vue";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
+import MkChannelPreview from "@/components/MkChannelPreview.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkButton from "@/components/MkButton.vue";
+import { useRouter } from "@/router";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { deviceKind } from "@/scripts/device-kind";
+import { i18n } from "@/i18n";
+import { defaultStore } from "@/store";
+import "swiper/scss";
+import "swiper/scss/virtual";
 
 const router = useRouter();
 
-const tabs = ['featured', 'following', 'owned'];
+const tabs = ["featured", "following", "owned"];
 let tab = $ref(tabs[0]);
-watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
 const featuredPagination = {
-	endpoint: 'channels/featured' as const,
+	endpoint: "channels/featured" as const,
 	limit: 10,
 	noPaging: false,
 };
 const followingPagination = {
-	endpoint: 'channels/followed' as const,
+	endpoint: "channels/followed" as const,
 	limit: 10,
 };
 const ownedPagination = {
-	endpoint: 'channels/owned' as const,
+	endpoint: "channels/owned" as const,
 	limit: 10,
 };
 
 function create() {
-	router.push('/channels/new');
+	router.push("/channels/new");
 }
 
-const headerActions = $computed(() => [{
-	icon: 'ph-plus ph-bold ph-lg',
-	text: i18n.ts.create,
-	handler: create,
-}]);
+const headerActions = $computed(() => [
+	{
+		icon: "ph-plus ph-bold ph-lg",
+		text: i18n.ts.create,
+		handler: create,
+	},
+]);
 
-const headerTabs = $computed(() => [{
-	key: 'featured',
-	title: i18n.ts._channel.featured,
-	icon: 'ph-fire-simple ph-bold ph-lg',
-}, {
-	key: 'following',
-	title: i18n.ts._channel.following,
-	icon: 'ph-heart ph-bold ph-lg',
-}, {
-	key: 'owned',
-	title: i18n.ts._channel.owned,
-	icon: 'ph-crown-simple ph-bold ph-lg',
-}]);
+const headerTabs = $computed(() => [
+	{
+		key: "featured",
+		title: i18n.ts._channel.featured,
+		icon: "ph-fire-simple ph-bold ph-lg",
+	},
+	{
+		key: "following",
+		title: i18n.ts._channel.following,
+		icon: "ph-heart ph-bold ph-lg",
+	},
+	{
+		key: "owned",
+		title: i18n.ts._channel.owned,
+		icon: "ph-crown-simple ph-bold ph-lg",
+	},
+]);
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.channel,
-	icon: 'ph-television ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.channel,
+		icon: "ph-television ph-bold ph-lg",
+	}))
+);
 
 let swiperRef = null;
 
diff --git a/packages/client/src/pages/clip.vue b/packages/client/src/pages/clip.vue
index eb58b4769..bd6788b51 100644
--- a/packages/client/src/pages/clip.vue
+++ b/packages/client/src/pages/clip.vue
@@ -1,108 +1,136 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions"/></template>
-	<MkSpacer :content-max="800">
-		<div v-if="clip">
-			<div class="okzinsic _panel">
-				<div v-if="clip.description" class="description">
-					<Mfm :text="clip.description" :is-note="false" :i="$i"/>
+	<MkStickyContainer>
+		<template #header><MkPageHeader :actions="headerActions" /></template>
+		<MkSpacer :content-max="800">
+			<div v-if="clip">
+				<div class="okzinsic _panel">
+					<div v-if="clip.description" class="description">
+						<Mfm
+							:text="clip.description"
+							:is-note="false"
+							:i="$i"
+						/>
+					</div>
+					<div class="user">
+						<MkAvatar
+							:user="clip.user"
+							class="avatar"
+							:show-indicator="true"
+						/>
+						<MkUserName :user="clip.user" :nowrap="false" />
+					</div>
 				</div>
-				<div class="user">
-					<MkAvatar :user="clip.user" class="avatar" :show-indicator="true"/> <MkUserName :user="clip.user" :nowrap="false"/>
-				</div>
-			</div>
 
-			<XNotes :pagination="pagination" :detail="true"/>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+				<XNotes :pagination="pagination" :detail="true" />
+			</div>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, provide } from 'vue';
-import type * as misskey from 'calckey-js';
-import XNotes from '@/components/MkNotes.vue';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import * as os from '@/os';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, watch, provide } from "vue";
+import type * as misskey from "calckey-js";
+import XNotes from "@/components/MkNotes.vue";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import * as os from "@/os";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const props = defineProps<{
-	clipId: string,
+	clipId: string;
 }>();
 
 let clip: misskey.entities.Clip = $ref<misskey.entities.Clip>();
 const pagination = {
-	endpoint: 'clips/notes' as const,
+	endpoint: "clips/notes" as const,
 	limit: 10,
 	params: computed(() => ({
 		clipId: props.clipId,
 	})),
 };
 
-const isOwned: boolean | null = $computed<boolean | null>(() => $i && clip && ($i.id === clip.userId));
+const isOwned: boolean | null = $computed<boolean | null>(
+	() => $i && clip && $i.id === clip.userId
+);
 
-watch(() => props.clipId, async () => {
-	clip = await os.api('clips/show', {
-		clipId: props.clipId,
-	});
-}, {
-	immediate: true,
-});
-
-provide('currentClipPage', $$(clip));
-
-const headerActions = $computed(() => clip && isOwned ? [{
-	icon: 'ph-pencil ph-bold ph-lg',
-	text: i18n.ts.edit,
-	handler: async (): Promise<void> => {
-		const { canceled, result } = await os.form(clip.name, {
-			name: {
-				type: 'string',
-				label: i18n.ts.name,
-				default: clip.name,
-			},
-			description: {
-				type: 'string',
-				required: false,
-				multiline: true,
-				label: i18n.ts.description,
-				default: clip.description,
-			},
-			isPublic: {
-				type: 'boolean',
-				label: i18n.ts.public,
-				default: clip.isPublic,
-			},
-		});
-		if (canceled) return;
-
-		os.apiWithDialog('clips/update', {
-			clipId: clip.id,
-			...result,
+watch(
+	() => props.clipId,
+	async () => {
+		clip = await os.api("clips/show", {
+			clipId: props.clipId,
 		});
 	},
-}, {
-	icon: 'ph-trash ph-bold ph-lg',
-	text: i18n.ts.delete,
-	danger: true,
-	handler: async (): Promise<void> => {
-		const { canceled } = await os.confirm({
-			type: 'warning',
-			text: i18n.t('deleteAreYouSure', { x: clip.name }),
-		});
-		if (canceled) return;
+	{
+		immediate: true,
+	}
+);
 
-		await os.apiWithDialog('clips/delete', {
-			clipId: clip.id,
-		});
-	},
-}] : null);
+provide("currentClipPage", $$(clip));
 
-definePageMetadata(computed(() => clip ? {
-	title: clip.name,
-	icon: 'ph-paperclip ph-bold ph-lg',
-} : null));
+const headerActions = $computed(() =>
+	clip && isOwned
+		? [
+				{
+					icon: "ph-pencil ph-bold ph-lg",
+					text: i18n.ts.edit,
+					handler: async (): Promise<void> => {
+						const { canceled, result } = await os.form(clip.name, {
+							name: {
+								type: "string",
+								label: i18n.ts.name,
+								default: clip.name,
+							},
+							description: {
+								type: "string",
+								required: false,
+								multiline: true,
+								label: i18n.ts.description,
+								default: clip.description,
+							},
+							isPublic: {
+								type: "boolean",
+								label: i18n.ts.public,
+								default: clip.isPublic,
+							},
+						});
+						if (canceled) return;
+
+						os.apiWithDialog("clips/update", {
+							clipId: clip.id,
+							...result,
+						});
+					},
+				},
+				{
+					icon: "ph-trash ph-bold ph-lg",
+					text: i18n.ts.delete,
+					danger: true,
+					handler: async (): Promise<void> => {
+						const { canceled } = await os.confirm({
+							type: "warning",
+							text: i18n.t("deleteAreYouSure", { x: clip.name }),
+						});
+						if (canceled) return;
+
+						await os.apiWithDialog("clips/delete", {
+							clipId: clip.id,
+						});
+					},
+				},
+		  ]
+		: null
+);
+
+definePageMetadata(
+	computed(() =>
+		clip
+			? {
+					title: clip.name,
+					icon: "ph-paperclip ph-bold ph-lg",
+			  }
+			: null
+	)
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/drive.vue b/packages/client/src/pages/drive.vue
index bd38e9e42..8aeb97b46 100644
--- a/packages/client/src/pages/drive.vue
+++ b/packages/client/src/pages/drive.vue
@@ -1,15 +1,15 @@
 <template>
-<div>
-	<XDrive ref="drive" @cd="x => folder = x"/>
-</div>
+	<div>
+		<XDrive ref="drive" @cd="(x) => (folder = x)" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import XDrive from '@/components/MkDrive.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed } from "vue";
+import XDrive from "@/components/MkDrive.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let folder = $ref(null);
 
@@ -17,9 +17,11 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => ({
-	title: folder ? folder.name : i18n.ts.drive,
-	icon: 'ph-cloud ph-bold ph-lg',
-	hideHeader: true,
-})));
+definePageMetadata(
+	computed(() => ({
+		title: folder ? folder.name : i18n.ts.drive,
+		icon: "ph-cloud ph-bold ph-lg",
+		hideHeader: true,
+	}))
+);
 </script>
diff --git a/packages/client/src/pages/emojis.emoji.vue b/packages/client/src/pages/emojis.emoji.vue
index e88eda5b2..c8b7d6442 100644
--- a/packages/client/src/pages/emojis.emoji.vue
+++ b/packages/client/src/pages/emojis.emoji.vue
@@ -1,46 +1,55 @@
 <template>
-<button class="zuvgdzyu _button" @click="menu">
-	<img :src="emoji.url" class="img" :alt="emoji.name"/>
-	<div class="body">
-		<div class="name _monospace">{{ emoji.name }}</div>
-		<div class="info">{{ emoji.aliases.join(" ") }}</div>
-	</div>
-</button>
+	<button class="zuvgdzyu _button" @click="menu">
+		<img :src="emoji.url" class="img" :alt="emoji.name" />
+		<div class="body">
+			<div class="name _monospace">{{ emoji.name }}</div>
+			<div class="info">{{ emoji.aliases.join(" ") }}</div>
+		</div>
+	</button>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as os from '@/os';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import * as os from "@/os";
+import copyToClipboard from "@/scripts/copy-to-clipboard";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	emoji: Record<string, unknown>; // TODO
 }>();
 
 function menu(ev) {
-	os.popupMenu([{
-		type: "label",
-		text: ":" + props.emoji.name + ":",
-	}, {
-		text: i18n.ts.copy,
-		icon: "ph-clipboard-text ph-bold ph-lg",
-		action: () => {
-			copyToClipboard(`:${props.emoji.name}:`);
-			os.success();
-		},
-	}, {
-		text: i18n.ts.license,
-		icon: "ph-info ph-bold ph-lg",
-		action: () => {
-			os.apiGet("emoji", { name: props.emoji.name }).then(res => {
-				os.alert({
-					type: "info",
-					text: `${res.license || i18n.ts.notSet}`,
-				});
-			});
-		},
-	}], ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		[
+			{
+				type: "label",
+				text: ":" + props.emoji.name + ":",
+			},
+			{
+				text: i18n.ts.copy,
+				icon: "ph-clipboard-text ph-bold ph-lg",
+				action: () => {
+					copyToClipboard(`:${props.emoji.name}:`);
+					os.success();
+				},
+			},
+			{
+				text: i18n.ts.license,
+				icon: "ph-info ph-bold ph-lg",
+				action: () => {
+					os.apiGet("emoji", { name: props.emoji.name }).then(
+						(res) => {
+							os.alert({
+								type: "info",
+								text: `${res.license || i18n.ts.notSet}`,
+							});
+						}
+					);
+				},
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
 }
 </script>
 
diff --git a/packages/client/src/pages/explore.featured.vue b/packages/client/src/pages/explore.featured.vue
index 0f66307ab..2d21bfcb4 100644
--- a/packages/client/src/pages/explore.featured.vue
+++ b/packages/client/src/pages/explore.featured.vue
@@ -1,38 +1,41 @@
 <template>
-<MkSpacer :content-max="800">
-	<MkTab v-model="tab" style="margin-bottom: var(--margin);">
-		<option value="local">{{ i18n.ts.local }}</option>
-		<option value="remote">{{ i18n.ts.remote }}</option>
-	</MkTab>
-	<XNotes v-if="tab === 'local'" :pagination="paginationForLocal"/>
-	<XNotes v-else-if="tab === 'remote'" :pagination="paginationForRemote"/>
-</MkSpacer>
+	<MkSpacer :content-max="800">
+		<MkTab v-model="tab" style="margin-bottom: var(--margin)">
+			<option value="local">{{ i18n.ts.local }}</option>
+			<option value="remote">{{ i18n.ts.remote }}</option>
+		</MkTab>
+		<XNotes v-if="tab === 'local'" :pagination="paginationForLocal" />
+		<XNotes
+			v-else-if="tab === 'remote'"
+			:pagination="paginationForRemote"
+		/>
+	</MkSpacer>
 </template>
 
 <script lang="ts" setup>
-import XNotes from '@/components/MkNotes.vue';
-import MkTab from '@/components/MkTab.vue';
-import { i18n } from '@/i18n';
+import XNotes from "@/components/MkNotes.vue";
+import MkTab from "@/components/MkTab.vue";
+import { i18n } from "@/i18n";
 
 const paginationForLocal = {
-	endpoint: 'notes/featured' as const,
+	endpoint: "notes/featured" as const,
 	limit: 10,
-	origin: 'local',
+	origin: "local",
 	offsetMode: true,
 	params: {
 		days: 14,
-	}
+	},
 };
 
 const paginationForRemote = {
-	endpoint: 'notes/featured' as const,
+	endpoint: "notes/featured" as const,
 	limit: 20,
 	offsetMode: true,
 	params: {
-		origin: 'remote',
+		origin: "remote",
 		days: 7,
-	}
-}
+	},
+};
 
 // const paginationForRemote = {
 // 	endpoint: 'notes/polls/recommendation' as const,
@@ -40,5 +43,5 @@ const paginationForRemote = {
 // 	offsetMode: true,
 // };
 
-let tab = $ref('local');
+let tab = $ref("local");
 </script>
diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue
index d810b3115..378801532 100644
--- a/packages/client/src/pages/explore.users.vue
+++ b/packages/client/src/pages/explore.users.vue
@@ -1,139 +1,253 @@
-
 4.8 KiB
 <template>
-<MkSpacer :content-max="1200">
-	<MkTab v-model="origin" style="margin-bottom: var(--margin);">
-		<option value="local">{{ i18n.ts.local }}</option>
-		<option value="remote">{{ i18n.ts.remote }}</option>
-	</MkTab>
-	<div v-if="origin === 'local'">
-		<template v-if="tag == null">
-			<MkFolder class="_gap" persist-key="explore-pinned-users">
-				<template #header><i class="ph-bookmark ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedUsers }}</template>
-				<XUserList :pagination="pinnedUsers"/>
-			</MkFolder>
-			<MkFolder v-if="$i != null" class="_gap" persist-key="explore-popular-users">
-				<template #header><i class="ph-chart-line-up ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
-				<XUserList :pagination="popularUsers"/>
-			</MkFolder>
-			<MkFolder v-if="$i != null" class="_gap" persist-key="explore-recently-updated-users">
-				<template #header><i class="ph-activity ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
-				<XUserList :pagination="recentlyUpdatedUsers"/>
-			</MkFolder>
-			<MkFolder v-if="$i != null" class="_gap" persist-key="explore-recently-registered-users">
-				<template #header><i class="ph-butterfly ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyRegisteredUsers }}</template>
-				<XUserList :pagination="recentlyRegisteredUsers"/>
-			</MkFolder>
-		</template>
-	</div>
-	<div v-else>
-		<MkFolder ref="tagsEl" :foldable="true" :expanded="false" class="_gap">
-			<template #header><i class="ph-compass ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularTags }}</template>
+	<MkSpacer :content-max="1200">
+		<MkTab v-model="origin" style="margin-bottom: var(--margin)">
+			<option value="local">{{ i18n.ts.local }}</option>
+			<option value="remote">{{ i18n.ts.remote }}</option>
+		</MkTab>
+		<div v-if="origin === 'local'">
+			<template v-if="tag == null">
+				<MkFolder class="_gap" persist-key="explore-pinned-users">
+					<template #header
+						><i
+							class="ph-bookmark ph-bold ph-lg ph-fw"
+							style="margin-right: 0.5em"
+						></i
+						>{{ i18n.ts.pinnedUsers }}</template
+					>
+					<XUserList :pagination="pinnedUsers" />
+				</MkFolder>
+				<MkFolder
+					v-if="$i != null"
+					class="_gap"
+					persist-key="explore-popular-users"
+				>
+					<template #header
+						><i
+							class="ph-chart-line-up ph-bold ph-lg ph-fw"
+							style="margin-right: 0.5em"
+						></i
+						>{{ i18n.ts.popularUsers }}</template
+					>
+					<XUserList :pagination="popularUsers" />
+				</MkFolder>
+				<MkFolder
+					v-if="$i != null"
+					class="_gap"
+					persist-key="explore-recently-updated-users"
+				>
+					<template #header
+						><i
+							class="ph-activity ph-bold ph-lg ph-fw"
+							style="margin-right: 0.5em"
+						></i
+						>{{ i18n.ts.recentlyUpdatedUsers }}</template
+					>
+					<XUserList :pagination="recentlyUpdatedUsers" />
+				</MkFolder>
+				<MkFolder
+					v-if="$i != null"
+					class="_gap"
+					persist-key="explore-recently-registered-users"
+				>
+					<template #header
+						><i
+							class="ph-butterfly ph-bold ph-lg ph-fw"
+							style="margin-right: 0.5em"
+						></i
+						>{{ i18n.ts.recentlyRegisteredUsers }}</template
+					>
+					<XUserList :pagination="recentlyRegisteredUsers" />
+				</MkFolder>
+			</template>
+		</div>
+		<div v-else>
+			<MkFolder
+				ref="tagsEl"
+				:foldable="true"
+				:expanded="false"
+				class="_gap"
+			>
+				<template #header
+					><i
+						class="ph-compass ph-bold ph-lg ph-fw"
+						style="margin-right: 0.5em"
+					></i
+					>{{ i18n.ts.popularTags }}</template
+				>
 
-			<div class="vxjfqztj">
-				<MkA v-for="tag in tagsLocal" :key="'local:' + tag.tag" :to="`/explore/tags/${tag.tag}`" class="local">{{ tag.tag }}</MkA>
-				<MkA v-for="tag in tagsRemote" :key="'remote:' + tag.tag" :to="`/explore/tags/${tag.tag}`">{{ tag.tag }}</MkA>
-			</div>
-		</MkFolder>
+				<div class="vxjfqztj">
+					<MkA
+						v-for="tag in tagsLocal"
+						:key="'local:' + tag.tag"
+						:to="`/explore/tags/${tag.tag}`"
+						class="local"
+						>{{ tag.tag }}</MkA
+					>
+					<MkA
+						v-for="tag in tagsRemote"
+						:key="'remote:' + tag.tag"
+						:to="`/explore/tags/${tag.tag}`"
+						>{{ tag.tag }}</MkA
+					>
+				</div>
+			</MkFolder>
 
-		<MkFolder v-if="tag != null" :key="`${tag}`" class="_gap">
-			<template #header><i class="ph-hash ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ tag }}</template>
-			<XUserList :pagination="tagUsers"/>
-		</MkFolder>
+			<MkFolder v-if="tag != null" :key="`${tag}`" class="_gap">
+				<template #header
+					><i
+						class="ph-hash ph-bold ph-lg ph-fw"
+						style="margin-right: 0.5em"
+					></i
+					>{{ tag }}</template
+				>
+				<XUserList :pagination="tagUsers" />
+			</MkFolder>
 
-		<template v-if="tag == null && $i != null">
-			<MkFolder class="_gap">
-				<template #header><i class="ph-chart-line-up ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularUsers }}</template>
-				<XUserList :pagination="popularUsersF"/>
-			</MkFolder>
-			<MkFolder class="_gap">
-				<template #header><i class="ph-activity ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyUpdatedUsers }}</template>
-				<XUserList :pagination="recentlyUpdatedUsersF"/>
-			</MkFolder>
-			<MkFolder class="_gap">
-				<template #header><i class="ph-rocke-launch ph-bold ph-lg ph-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.recentlyDiscoveredUsers }}</template>
-				<XUserList :pagination="recentlyRegisteredUsersF"/>
-			</MkFolder>
-		</template>
-	</div>
-</MkSpacer>
+			<template v-if="tag == null && $i != null">
+				<MkFolder class="_gap">
+					<template #header
+						><i
+							class="ph-chart-line-up ph-bold ph-lg ph-fw"
+							style="margin-right: 0.5em"
+						></i
+						>{{ i18n.ts.popularUsers }}</template
+					>
+					<XUserList :pagination="popularUsersF" />
+				</MkFolder>
+				<MkFolder class="_gap">
+					<template #header
+						><i
+							class="ph-activity ph-bold ph-lg ph-fw"
+							style="margin-right: 0.5em"
+						></i
+						>{{ i18n.ts.recentlyUpdatedUsers }}</template
+					>
+					<XUserList :pagination="recentlyUpdatedUsersF" />
+				</MkFolder>
+				<MkFolder class="_gap">
+					<template #header
+						><i
+							class="ph-rocke-launch ph-bold ph-lg ph-fw"
+							style="margin-right: 0.5em"
+						></i
+						>{{ i18n.ts.recentlyDiscoveredUsers }}</template
+					>
+					<XUserList :pagination="recentlyRegisteredUsersF" />
+				</MkFolder>
+			</template>
+		</div>
+	</MkSpacer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch } from 'vue';
-import XUserList from '@/components/MkUserList.vue';
-import MkFolder from '@/components/MkFolder.vue';
-import MkTab from '@/components/MkTab.vue';
-import number from '@/filters/number';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { $i } from '@/account';
-import { instance } from '@/instance';
+import { computed, watch } from "vue";
+import XUserList from "@/components/MkUserList.vue";
+import MkFolder from "@/components/MkFolder.vue";
+import MkTab from "@/components/MkTab.vue";
+import number from "@/filters/number";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { $i } from "@/account";
+import { instance } from "@/instance";
 
 const props = defineProps<{
-		tag?: string;
-	}>();
+	tag?: string;
+}>();
 
-let origin = $ref('local');
+let origin = $ref("local");
 let tagsEl = $ref<InstanceType<typeof MkFolder>>();
 let tagsLocal = $ref([]);
 let tagsRemote = $ref([]);
 
-watch(() => props.tag, () => {
-	if (tagsEl) tagsEl.toggleContent(props.tag == null);
-});
+watch(
+	() => props.tag,
+	() => {
+		if (tagsEl) tagsEl.toggleContent(props.tag == null);
+	}
+);
 
 const tagUsers = $computed(() => ({
-	endpoint: 'hashtags/users' as const,
+	endpoint: "hashtags/users" as const,
 	limit: 30,
 	params: {
 		tag: props.tag,
-		origin: 'combined',
-		sort: '+follower',
+		origin: "combined",
+		sort: "+follower",
 	},
 }));
 
-const pinnedUsers = { endpoint: 'pinned-users' };
-const popularUsers = { endpoint: 'users', limit: 10, noPaging: true, params: {
-	state: 'alive',
-	origin: 'local',
-	sort: '+follower',
-} };
-const recentlyUpdatedUsers = { endpoint: 'users', limit: 10, noPaging: true, params: {
-	origin: 'local',
-	sort: '+updatedAt',
-} };
-const recentlyRegisteredUsers = { endpoint: 'users', limit: 10, noPaging: true, params: {
-	origin: 'local',
-	state: 'alive',
-	sort: '+createdAt',
-} };
-const popularUsersF = { endpoint: 'users', limit: 10, noPaging: true, params: {
-	state: 'alive',
-	origin: 'remote',
-	sort: '+follower',
-} };
-const recentlyUpdatedUsersF = { endpoint: 'users', limit: 10, noPaging: true, params: {
-	origin: 'combined',
-	sort: '+updatedAt',
-} };
-const recentlyRegisteredUsersF = { endpoint: 'users', limit: 10, noPaging: true, params: {
-	origin: 'combined',
-	sort: '+createdAt',
-} };
+const pinnedUsers = { endpoint: "pinned-users" };
+const popularUsers = {
+	endpoint: "users",
+	limit: 10,
+	noPaging: true,
+	params: {
+		state: "alive",
+		origin: "local",
+		sort: "+follower",
+	},
+};
+const recentlyUpdatedUsers = {
+	endpoint: "users",
+	limit: 10,
+	noPaging: true,
+	params: {
+		origin: "local",
+		sort: "+updatedAt",
+	},
+};
+const recentlyRegisteredUsers = {
+	endpoint: "users",
+	limit: 10,
+	noPaging: true,
+	params: {
+		origin: "local",
+		state: "alive",
+		sort: "+createdAt",
+	},
+};
+const popularUsersF = {
+	endpoint: "users",
+	limit: 10,
+	noPaging: true,
+	params: {
+		state: "alive",
+		origin: "remote",
+		sort: "+follower",
+	},
+};
+const recentlyUpdatedUsersF = {
+	endpoint: "users",
+	limit: 10,
+	noPaging: true,
+	params: {
+		origin: "combined",
+		sort: "+updatedAt",
+	},
+};
+const recentlyRegisteredUsersF = {
+	endpoint: "users",
+	limit: 10,
+	noPaging: true,
+	params: {
+		origin: "combined",
+		sort: "+createdAt",
+	},
+};
 
-os.api('hashtags/list', {
-	sort: '+attachedLocalUsers',
+os.api("hashtags/list", {
+	sort: "+attachedLocalUsers",
 	attachedToLocalUserOnly: true,
 	limit: 30,
-}).then(tags => {
+}).then((tags) => {
 	tagsLocal = tags;
 });
-os.api('hashtags/list', {
-	sort: '+attachedRemoteUsers',
+os.api("hashtags/list", {
+	sort: "+attachedRemoteUsers",
 	attachedToRemoteUserOnly: true,
 	limit: 30,
-}).then(tags => {
+}).then((tags) => {
 	tagsRemote = tags;
 });
 </script>
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index cbc53f066..0915d6ac8 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -1,72 +1,90 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<div class="lznhrdub">
-		<MkSpacer :content-max="1200">
-			<swiper
-				:modules="[Virtual]"
-				:space-between="20"
-				:virtual="true"
-				:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
-				@swiper="setSwiperRef"
-				@slide-change="onSlideChange"
-			>
-				<swiper-slide>
-					<XFeatured/>
-				</swiper-slide>
-				<swiper-slide>
-					<XUsers/>
-				</swiper-slide>
-			</swiper>
-		</MkSpacer>
-	</div>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+		/></template>
+		<div class="lznhrdub">
+			<MkSpacer :content-max="1200">
+				<swiper
+					:modules="[Virtual]"
+					:space-between="20"
+					:virtual="true"
+					:allow-touch-move="
+						!(
+							deviceKind === 'desktop' &&
+							!defaultStore.state.swipeOnDesktop
+						)
+					"
+					@swiper="setSwiperRef"
+					@slide-change="onSlideChange"
+				>
+					<swiper-slide>
+						<XFeatured />
+					</swiper-slide>
+					<swiper-slide>
+						<XUsers />
+					</swiper-slide>
+				</swiper>
+			</MkSpacer>
+		</div>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, onMounted } from 'vue';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
-import XFeatured from './explore.featured.vue';
-import XUsers from './explore.users.vue';
-import type MkFolder from '@/components/MkFolder.vue';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { deviceKind } from '@/scripts/device-kind';
-import { i18n } from '@/i18n';
-import { defaultStore } from '@/store';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
+import { computed, watch, onMounted } from "vue";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
+import XFeatured from "./explore.featured.vue";
+import XUsers from "./explore.users.vue";
+import type MkFolder from "@/components/MkFolder.vue";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { deviceKind } from "@/scripts/device-kind";
+import { i18n } from "@/i18n";
+import { defaultStore } from "@/store";
+import "swiper/scss";
+import "swiper/scss/virtual";
 
 const props = defineProps<{
 	tag?: string;
 }>();
 
-const tabs = ['featured', 'users'];
+const tabs = ["featured", "users"];
 let tab = $ref(tabs[0]);
-watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
 let tagsEl = $ref<InstanceType<typeof MkFolder>>();
 
-watch(() => props.tag, () => {
-	if (tagsEl) tagsEl.toggleContent(props.tag == null);
-});
+watch(
+	() => props.tag,
+	() => {
+		if (tagsEl) tagsEl.toggleContent(props.tag == null);
+	}
+);
 
 const headerActions = $computed(() => []);
 
-const headerTabs = $computed(() => [{
-	key: 'featured',
-	icon: 'ph-lightning ph-bold ph-lg',
-	title: i18n.ts.featured,
-}, {
-	key: 'users',
-	icon: 'ph-users ph-bold ph-lg',
-	title: i18n.ts.users,
-}]);
+const headerTabs = $computed(() => [
+	{
+		key: "featured",
+		icon: "ph-lightning ph-bold ph-lg",
+		title: i18n.ts.featured,
+	},
+	{
+		key: "users",
+		icon: "ph-users ph-bold ph-lg",
+		title: i18n.ts.users,
+	},
+]);
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.explore,
-	icon: 'ph-compass ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.explore,
+		icon: "ph-compass ph-bold ph-lg",
+	}))
+);
 
 let swiperRef = null;
 
@@ -86,5 +104,4 @@ function syncSlide(index) {
 onMounted(() => {
 	syncSlide(tabs.indexOf(swiperRef.activeIndex));
 });
-
 </script>
diff --git a/packages/client/src/pages/favorites.vue b/packages/client/src/pages/favorites.vue
index 1fca212c2..84b5979ba 100644
--- a/packages/client/src/pages/favorites.vue
+++ b/packages/client/src/pages/favorites.vue
@@ -22,7 +22,11 @@
 						:no-gap="false"
 						:ad="false"
 					>
-						<XNote :key="item.id" :note="item.note" :class="$style.note" />
+						<XNote
+							:key="item.id"
+							:note="item.note"
+							:class="$style.note"
+						/>
 					</XList>
 				</template>
 			</MkPagination>
diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue
index 289a43bd4..2aac52163 100644
--- a/packages/client/src/pages/follow-requests.vue
+++ b/packages/client/src/pages/follow-requests.vue
@@ -1,62 +1,102 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader/></template>
-	<MkSpacer :content-max="800">
-		<MkPagination ref="paginationComponent" :pagination="pagination">
-			<template #empty>
-				<div class="_fullinfo">
-					<img src="/static-assets/badges/info.png" class="_ghost"/>
-					<div>{{ i18n.ts.noFollowRequests }}</div>
-				</div>
-			</template>
-			<template #default="{items}">
-				<div class="mk-follow-requests">
-					<div v-for="req in items" :key="req.id" class="user _panel">
-						<MkAvatar class="avatar" :user="req.follower" :show-indicator="true"/>
-						<div class="body">
-							<div class="name">
-								<MkA v-user-preview="req.follower.id" class="name" :to="userPage(req.follower)"><MkUserName :user="req.follower"/></MkA>
-								<p class="acct">@{{ acct(req.follower) }}</p>
-							</div>
-							<div v-if="req.follower.description" class="description" :title="req.follower.description">
-								<Mfm :text="req.follower.description" :is-note="false" :author="req.follower" :i="$i" :custom-emojis="req.follower.emojis" :plain="true" :nowrap="true"/>
-							</div>
-							<div class="actions">
-								<button class="_button" @click="accept(req.follower)"><i class="ph-check ph-bold ph-lg"></i></button>
-								<button class="_button" @click="reject(req.follower)"><i class="ph-x ph-bold ph-lg"></i></button>
+	<MkStickyContainer>
+		<template #header><MkPageHeader /></template>
+		<MkSpacer :content-max="800">
+			<MkPagination ref="paginationComponent" :pagination="pagination">
+				<template #empty>
+					<div class="_fullinfo">
+						<img
+							src="/static-assets/badges/info.png"
+							class="_ghost"
+						/>
+						<div>{{ i18n.ts.noFollowRequests }}</div>
+					</div>
+				</template>
+				<template #default="{ items }">
+					<div class="mk-follow-requests">
+						<div
+							v-for="req in items"
+							:key="req.id"
+							class="user _panel"
+						>
+							<MkAvatar
+								class="avatar"
+								:user="req.follower"
+								:show-indicator="true"
+							/>
+							<div class="body">
+								<div class="name">
+									<MkA
+										v-user-preview="req.follower.id"
+										class="name"
+										:to="userPage(req.follower)"
+										><MkUserName :user="req.follower"
+									/></MkA>
+									<p class="acct">
+										@{{ acct(req.follower) }}
+									</p>
+								</div>
+								<div
+									v-if="req.follower.description"
+									class="description"
+									:title="req.follower.description"
+								>
+									<Mfm
+										:text="req.follower.description"
+										:is-note="false"
+										:author="req.follower"
+										:i="$i"
+										:custom-emojis="req.follower.emojis"
+										:plain="true"
+										:nowrap="true"
+									/>
+								</div>
+								<div class="actions">
+									<button
+										class="_button"
+										@click="accept(req.follower)"
+									>
+										<i class="ph-check ph-bold ph-lg"></i>
+									</button>
+									<button
+										class="_button"
+										@click="reject(req.follower)"
+									>
+										<i class="ph-x ph-bold ph-lg"></i>
+									</button>
+								</div>
 							</div>
 						</div>
 					</div>
-				</div>
-			</template>
-		</MkPagination>
-	</MkSpacer>
-</MkStickyContainer>
+				</template>
+			</MkPagination>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue';
-import MkPagination from '@/components/MkPagination.vue';
-import { userPage, acct } from '@/filters/user';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { ref, computed } from "vue";
+import MkPagination from "@/components/MkPagination.vue";
+import { userPage, acct } from "@/filters/user";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const paginationComponent = ref<InstanceType<typeof MkPagination>>();
 
 const pagination = {
-	endpoint: 'following/requests/list' as const,
+	endpoint: "following/requests/list" as const,
 	limit: 10,
 };
 
 function accept(user) {
-	os.api('following/requests/accept', { userId: user.id }).then(() => {
+	os.api("following/requests/accept", { userId: user.id }).then(() => {
 		paginationComponent.value.reload();
 	});
 }
 
 function reject(user) {
-	os.api('following/requests/reject', { userId: user.id }).then(() => {
+	os.api("following/requests/reject", { userId: user.id }).then(() => {
 		paginationComponent.value.reload();
 	});
 }
@@ -65,10 +105,12 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.followRequests,
-	icon: 'ph-hand-waving ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.followRequests,
+		icon: "ph-hand-waving ph-bold ph-lg",
+	}))
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/follow.vue b/packages/client/src/pages/follow.vue
index 57ef57660..6af698fa9 100644
--- a/packages/client/src/pages/follow.vue
+++ b/packages/client/src/pages/follow.vue
@@ -1,19 +1,18 @@
 <template>
-<div class="mk-follow-page">
-</div>
+	<div class="mk-follow-page"></div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as Acct from 'calckey-js/built/acct';
-import * as os from '@/os';
-import { mainRouter } from '@/router';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import * as Acct from "calckey-js/built/acct";
+import * as os from "@/os";
+import { mainRouter } from "@/router";
+import { i18n } from "@/i18n";
 
 async function follow(user): Promise<void> {
 	const { canceled } = await os.confirm({
-		type: 'question',
-		text: i18n.t('followConfirm', { name: user.name || user.username }),
+		type: "question",
+		text: i18n.t("followConfirm", { name: user.name || user.username }),
 	});
 
 	if (canceled) {
@@ -21,39 +20,39 @@ async function follow(user): Promise<void> {
 		return;
 	}
 
-	os.apiWithDialog('following/create', {
+	os.apiWithDialog("following/create", {
 		userId: user.id,
 	});
 }
 
-const acct = new URL(location.href).searchParams.get('acct');
+const acct = new URL(location.href).searchParams.get("acct");
 if (acct == null) {
-	throw new Error('acct required');
+	throw new Error("acct required");
 }
 
 let promise;
 
-if (acct.startsWith('https://')) {
-	promise = os.api('ap/show', {
+if (acct.startsWith("https://")) {
+	promise = os.api("ap/show", {
 		uri: acct,
 	});
-	promise.then(res => {
-		if (res.type === 'User') {
+	promise.then((res) => {
+		if (res.type === "User") {
 			follow(res.object);
-		} else if (res.type === 'Note') {
+		} else if (res.type === "Note") {
 			mainRouter.push(`/notes/${res.object.id}`);
 		} else {
 			os.alert({
-				type: 'error',
-				text: 'Not a user',
+				type: "error",
+				text: "Not a user",
 			}).then(() => {
 				window.close();
 			});
 		}
 	});
 } else {
-	promise = os.api('users/show', Acct.parse(acct));
-	promise.then(user => {
+	promise = os.api("users/show", Acct.parse(acct));
+	promise.then((user) => {
 		follow(user);
 	});
 }
diff --git a/packages/client/src/pages/gallery/edit.vue b/packages/client/src/pages/gallery/edit.vue
index c2b93d6a0..f03201cac 100644
--- a/packages/client/src/pages/gallery/edit.vue
+++ b/packages/client/src/pages/gallery/edit.vue
@@ -1,47 +1,78 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="800" :margin-min="16" :margin-max="32">
-		<FormSuspense :p="init">
-			<FormInput v-model="title">
-				<template #label>{{ i18n.ts.title }}</template>
-			</FormInput>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="800" :margin-min="16" :margin-max="32">
+			<FormSuspense :p="init">
+				<FormInput v-model="title">
+					<template #label>{{ i18n.ts.title }}</template>
+				</FormInput>
 
-			<FormTextarea v-model="description" :max="500">
-				<template #label>{{ i18n.ts.description }}</template>
-			</FormTextarea>
+				<FormTextarea v-model="description" :max="500">
+					<template #label>{{ i18n.ts.description }}</template>
+				</FormTextarea>
 
-			<div class="">
-				<div v-for="file in files" :key="file.id" class="wqugxsfx" :style="{ backgroundImage: file ? `url(${ file.thumbnailUrl })` : null }">
-					<div class="name">{{ file.name }}</div>
-					<button v-tooltip="i18n.ts.remove" class="remove _button" @click="remove(file)"><i class="ph-x ph-bold ph-lg"></i></button>
+				<div class="">
+					<div
+						v-for="file in files"
+						:key="file.id"
+						class="wqugxsfx"
+						:style="{
+							backgroundImage: file
+								? `url(${file.thumbnailUrl})`
+								: null,
+						}"
+					>
+						<div class="name">{{ file.name }}</div>
+						<button
+							v-tooltip="i18n.ts.remove"
+							class="remove _button"
+							@click="remove(file)"
+						>
+							<i class="ph-x ph-bold ph-lg"></i>
+						</button>
+					</div>
+					<FormButton primary @click="selectFile"
+						><i class="ph-plus ph-bold ph-lg"></i>
+						{{ i18n.ts.attachFile }}</FormButton
+					>
 				</div>
-				<FormButton primary @click="selectFile"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.attachFile }}</FormButton>
-			</div>
 
-			<FormSwitch v-model="isSensitive">{{ i18n.ts.markAsSensitive }}</FormSwitch>
+				<FormSwitch v-model="isSensitive">{{
+					i18n.ts.markAsSensitive
+				}}</FormSwitch>
 
-			<FormButton v-if="postId" primary @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
-			<FormButton v-else primary @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.publish }}</FormButton>
+				<FormButton v-if="postId" primary @click="save"
+					><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+					{{ i18n.ts.save }}</FormButton
+				>
+				<FormButton v-else primary @click="save"
+					><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+					{{ i18n.ts.publish }}</FormButton
+				>
 
-			<FormButton v-if="postId" danger @click="del"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</FormButton>
-		</FormSuspense>
-	</MkSpacer>
-</MkStickyContainer>
+				<FormButton v-if="postId" danger @click="del"
+					><i class="ph-trash ph-bold ph-lg"></i>
+					{{ i18n.ts.delete }}</FormButton
+				>
+			</FormSuspense>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, watch } from 'vue';
-import FormButton from '@/components/MkButton.vue';
-import FormInput from '@/components/form/input.vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import { selectFiles } from '@/scripts/select-file';
-import * as os from '@/os';
-import { useRouter } from '@/router';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
+import { computed, inject, watch } from "vue";
+import FormButton from "@/components/MkButton.vue";
+import FormInput from "@/components/form/input.vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import { selectFiles } from "@/scripts/select-file";
+import * as os from "@/os";
+import { useRouter } from "@/router";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
 
 const router = useRouter();
 
@@ -56,30 +87,30 @@ let title = $ref(null);
 let isSensitive = $ref(false);
 
 function selectFile(evt) {
-	selectFiles(evt.currentTarget ?? evt.target, null).then(selected => {
+	selectFiles(evt.currentTarget ?? evt.target, null).then((selected) => {
 		files = files.concat(selected);
 	});
 }
 
 function remove(file) {
-	files = files.filter(f => f.id !== file.id);
+	files = files.filter((f) => f.id !== file.id);
 }
 
 async function save() {
 	if (props.postId) {
-		await os.apiWithDialog('gallery/posts/update', {
+		await os.apiWithDialog("gallery/posts/update", {
 			postId: props.postId,
 			title: title,
 			description: description,
-			fileIds: files.map(file => file.id),
+			fileIds: files.map((file) => file.id),
 			isSensitive: isSensitive,
 		});
 		router.push(`/gallery/${props.postId}`);
 	} else {
-		const created = await os.apiWithDialog('gallery/posts/create', {
+		const created = await os.apiWithDialog("gallery/posts/create", {
 			title: title,
 			description: description,
-			fileIds: files.map(file => file.id),
+			fileIds: files.map((file) => file.id),
 			isSensitive: isSensitive,
 		});
 		router.push(`/gallery/${created.id}`);
@@ -88,38 +119,53 @@ async function save() {
 
 async function del() {
 	const { canceled } = await os.confirm({
-		type: 'warning',
+		type: "warning",
 		text: i18n.ts.deleteConfirm,
 	});
 	if (canceled) return;
-	await os.apiWithDialog('gallery/posts/delete', {
+	await os.apiWithDialog("gallery/posts/delete", {
 		postId: props.postId,
 	});
-	router.push('/gallery');
+	router.push("/gallery");
 }
 
-watch(() => props.postId, () => {
-	init = () => props.postId ? os.api('gallery/posts/show', {
-		postId: props.postId,
-	}).then(post => {
-		files = post.files;
-		title = post.title;
-		description = post.description;
-		isSensitive = post.isSensitive;
-	}) : Promise.resolve(null);
-}, { immediate: true });
+watch(
+	() => props.postId,
+	() => {
+		init = () =>
+			props.postId
+				? os
+						.api("gallery/posts/show", {
+							postId: props.postId,
+						})
+						.then((post) => {
+							files = post.files;
+							title = post.title;
+							description = post.description;
+							isSensitive = post.isSensitive;
+						})
+				: Promise.resolve(null);
+	},
+	{ immediate: true }
+);
 
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => props.postId ? {
-	title: i18n.ts.edit,
-	icon: 'ph-pencil ph-bold ph-lg',
-} : {
-	title: i18n.ts.postToGallery,
-	icon: 'ph-pencil ph-bold ph-lg',
-}));
+definePageMetadata(
+	computed(() =>
+		props.postId
+			? {
+					title: i18n.ts.edit,
+					icon: "ph-pencil ph-bold ph-lg",
+			  }
+			: {
+					title: i18n.ts.postToGallery,
+					icon: "ph-pencil ph-bold ph-lg",
+			  }
+	)
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index 2845ce957..d4794ffbc 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -1,67 +1,121 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="1200">
-		<swiper
-			:modules="[Virtual]"
-			:space-between="20"
-			:virtual="true"
-			:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
-			@swiper="setSwiperRef"
-			@slide-change="onSlideChange"
-		>
-			<swiper-slide>
-				<MkFolder class="_gap">
-					<template #header><i class="ph-clock ph-bold ph-lg"></i> {{ i18n.ts.recentPosts }}</template>
-					<MkPagination v-slot="{items}" :pagination="recentPostsPagination" :disable-auto-load="true">
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="1200">
+			<swiper
+				:modules="[Virtual]"
+				:space-between="20"
+				:virtual="true"
+				:allow-touch-move="
+					!(
+						deviceKind === 'desktop' &&
+						!defaultStore.state.swipeOnDesktop
+					)
+				"
+				@swiper="setSwiperRef"
+				@slide-change="onSlideChange"
+			>
+				<swiper-slide>
+					<MkFolder class="_gap">
+						<template #header
+							><i class="ph-clock ph-bold ph-lg"></i>
+							{{ i18n.ts.recentPosts }}</template
+						>
+						<MkPagination
+							v-slot="{ items }"
+							:pagination="recentPostsPagination"
+							:disable-auto-load="true"
+						>
+							<div class="vfpdbgtk">
+								<MkGalleryPostPreview
+									v-for="post in items"
+									:key="post.id"
+									:post="post"
+									class="post"
+								/>
+							</div>
+						</MkPagination>
+					</MkFolder>
+					<MkFolder class="_gap">
+						<template #header
+							><i class="ph-fire-simple ph-bold ph-lg"></i>
+							{{ i18n.ts.popularPosts }}</template
+						>
+						<MkPagination
+							v-slot="{ items }"
+							:pagination="popularPostsPagination"
+							:disable-auto-load="true"
+						>
+							<div class="vfpdbgtk">
+								<MkGalleryPostPreview
+									v-for="post in items"
+									:key="post.id"
+									:post="post"
+									class="post"
+								/>
+							</div>
+						</MkPagination>
+					</MkFolder>
+				</swiper-slide>
+				<swiper-slide>
+					<MkPagination
+						v-slot="{ items }"
+						:pagination="likedPostsPagination"
+					>
 						<div class="vfpdbgtk">
-							<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
+							<MkGalleryPostPreview
+								v-for="like in items"
+								:key="like.id"
+								:post="like.post"
+								class="post"
+							/>
 						</div>
 					</MkPagination>
-				</MkFolder>
-				<MkFolder class="_gap">
-					<template #header><i class="ph-fire-simple ph-bold ph-lg"></i> {{ i18n.ts.popularPosts }}</template>
-					<MkPagination v-slot="{items}" :pagination="popularPostsPagination" :disable-auto-load="true">
+				</swiper-slide>
+				<swiper-slide>
+					<MkA to="/gallery/new" class="_link" style="margin: 16px"
+						><i class="ph-plus ph-bold ph-lg"></i>
+						{{ i18n.ts.postToGallery }}</MkA
+					>
+					<MkPagination
+						v-slot="{ items }"
+						:pagination="myPostsPagination"
+					>
 						<div class="vfpdbgtk">
-							<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
+							<MkGalleryPostPreview
+								v-for="post in items"
+								:key="post.id"
+								:post="post"
+								class="post"
+							/>
 						</div>
 					</MkPagination>
-				</MkFolder>
-			</swiper-slide>
-			<swiper-slide>
-				<MkPagination v-slot="{items}" :pagination="likedPostsPagination">
-					<div class="vfpdbgtk">
-						<MkGalleryPostPreview v-for="like in items" :key="like.id" :post="like.post" class="post"/>
-					</div>
-				</MkPagination>
-			</swiper-slide>
-			<swiper-slide>
-				<MkA to="/gallery/new" class="_link" style="margin: 16px;"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.postToGallery }}</MkA>
-				<MkPagination v-slot="{items}" :pagination="myPostsPagination">
-					<div class="vfpdbgtk">
-						<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
-					</div>
-				</MkPagination>
-			</swiper-slide>
-		</swiper>
-	</MkSpacer>
-</MkStickyContainer>
+				</swiper-slide>
+			</swiper>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineComponent, watch, onMounted } from 'vue';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
-import MkFolder from '@/components/MkFolder.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { deviceKind } from '@/scripts/device-kind';
-import { i18n } from '@/i18n';
-import { useRouter } from '@/router';
-import { defaultStore } from '@/store';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
+import { computed, defineComponent, watch, onMounted } from "vue";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
+import MkFolder from "@/components/MkFolder.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkGalleryPostPreview from "@/components/MkGalleryPostPreview.vue";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { deviceKind } from "@/scripts/device-kind";
+import { i18n } from "@/i18n";
+import { useRouter } from "@/router";
+import { defaultStore } from "@/store";
+import "swiper/scss";
+import "swiper/scss/virtual";
 
 const router = useRouter();
 
@@ -69,58 +123,67 @@ const props = defineProps<{
 	tag?: string;
 }>();
 
-const tabs = ['explore', 'liked', 'my'];
+const tabs = ["explore", "liked", "my"];
 let tab = $ref(tabs[0]);
-watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
 let tagsRef = $ref();
 
 const recentPostsPagination = {
-	endpoint: 'gallery/posts' as const,
+	endpoint: "gallery/posts" as const,
 	limit: 6,
 };
 const popularPostsPagination = {
-	endpoint: 'gallery/featured' as const,
+	endpoint: "gallery/featured" as const,
 	limit: 5,
 };
 const myPostsPagination = {
-	endpoint: 'i/gallery/posts' as const,
+	endpoint: "i/gallery/posts" as const,
 	limit: 5,
 };
 const likedPostsPagination = {
-	endpoint: 'i/gallery/likes' as const,
+	endpoint: "i/gallery/likes" as const,
 	limit: 5,
 };
 
-watch(() => props.tag, () => {
-	if (tagsRef) tagsRef.tags.toggleContent(props.tag == null);
-});
+watch(
+	() => props.tag,
+	() => {
+		if (tagsRef) tagsRef.tags.toggleContent(props.tag == null);
+	}
+);
 
-const headerActions = $computed(() => [{
-	icon: 'ph-plus ph-bold ph-lg',
-	text: i18n.ts.create,
-	handler: () => {
-		router.push('/gallery/new');
+const headerActions = $computed(() => [
+	{
+		icon: "ph-plus ph-bold ph-lg",
+		text: i18n.ts.create,
+		handler: () => {
+			router.push("/gallery/new");
+		},
 	},
-}]);
+]);
 
-const headerTabs = $computed(() => [{
-	key: 'explore',
-	title: i18n.ts.gallery,
-	icon: 'ph-image-square ph-bold ph-lg',
-}, {
-	key: 'liked',
-	title: i18n.ts._gallery.liked,
-	icon: 'ph-heart ph-bold ph-lg',
-}, {
-	key: 'my',
-	title: i18n.ts._gallery.my,
-	icon: 'ph-crown-simple ph-bold ph-lg',
-}]);
+const headerTabs = $computed(() => [
+	{
+		key: "explore",
+		title: i18n.ts.gallery,
+		icon: "ph-image-square ph-bold ph-lg",
+	},
+	{
+		key: "liked",
+		title: i18n.ts._gallery.liked,
+		icon: "ph-heart ph-bold ph-lg",
+	},
+	{
+		key: "my",
+		title: i18n.ts._gallery.my,
+		icon: "ph-crown-simple ph-bold ph-lg",
+	},
+]);
 
 definePageMetadata({
 	title: i18n.ts.gallery,
-	icon: 'ph-image-square ph-bold ph-lg',
+	icon: "ph-image-square ph-bold ph-lg",
 });
 
 let swiperRef = null;
@@ -151,7 +214,6 @@ onMounted(() => {
 	margin: 0 var(--margin);
 
 	> .post {
-
 	}
 }
 </style>
diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue
index dd2a445ab..0c104b4c7 100644
--- a/packages/client/src/pages/gallery/post.vue
+++ b/packages/client/src/pages/gallery/post.vue
@@ -1,73 +1,163 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="1000" :margin-min="16" :margin-max="32">
-		<div class="_root">
-			<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
-				<div v-if="post" class="rkxwuolj">
-					<div class="files">
-						<div v-for="file in post.files" :key="file.id" class="file">
-							<img :src="file.url"/>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="1000" :margin-min="16" :margin-max="32">
+			<div class="_root">
+				<transition
+					:name="$store.state.animation ? 'fade' : ''"
+					mode="out-in"
+				>
+					<div v-if="post" class="rkxwuolj">
+						<div class="files">
+							<div
+								v-for="file in post.files"
+								:key="file.id"
+								class="file"
+							>
+								<img :src="file.url" />
+							</div>
 						</div>
+						<div class="body _block">
+							<div class="title">{{ post.title }}</div>
+							<div class="description">
+								<Mfm :text="post.description" />
+							</div>
+							<div class="info">
+								<i class="ph-clock ph-bold ph-lg"></i>
+								<MkTime :time="post.createdAt" mode="detail" />
+							</div>
+							<div class="actions">
+								<div class="like">
+									<MkButton
+										v-if="post.isLiked"
+										v-tooltip="i18n.ts._gallery.unlike"
+										class="button"
+										primary
+										@click="unlike()"
+										><i class="ph-heart ph-fill ph-lg"></i
+										><span
+											v-if="post.likedCount > 0"
+											class="count"
+											>{{ post.likedCount }}</span
+										></MkButton
+									>
+									<MkButton
+										v-else
+										v-tooltip="i18n.ts._gallery.like"
+										class="button"
+										@click="like()"
+										><i class="ph-heart ph-bold"></i
+										><span
+											v-if="post.likedCount > 0"
+											class="count"
+											>{{ post.likedCount }}</span
+										></MkButton
+									>
+								</div>
+								<div class="other">
+									<button
+										v-if="$i && $i.id === post.user.id"
+										v-tooltip="i18n.ts.edit"
+										v-click-anime
+										class="_button"
+										@click="edit"
+									>
+										<i
+											class="ph-pencil ph-bold ph-lg ph-fw ph-lg"
+										></i>
+									</button>
+									<button
+										v-tooltip="i18n.ts.shareWithNote"
+										v-click-anime
+										class="_button"
+										@click="shareWithNote"
+									>
+										<i
+											class="ph-repeat ph-bold ph-lg ph-fw ph-lg"
+										></i>
+									</button>
+									<button
+										v-if="shareAvailable()"
+										v-tooltip="i18n.ts.share"
+										v-click-anime
+										class="_button"
+										@click="share"
+									>
+										<i
+											class="ph-share-network ph-bold ph-lg ph-fw ph-lg"
+										></i>
+									</button>
+								</div>
+							</div>
+							<div class="user">
+								<MkAvatar :user="post.user" class="avatar" />
+								<div class="name">
+									<MkUserName
+										:user="post.user"
+										style="display: block"
+									/>
+									<MkAcct :user="post.user" />
+								</div>
+								<MkFollowButton
+									v-if="!$i || $i.id != post.user.id"
+									:user="post.user"
+									:inline="true"
+									:transparent="false"
+									:full="true"
+									large
+									class="koudoku"
+								/>
+							</div>
+						</div>
+						<MkAd :prefer="['horizontal', 'horizontal-big']" />
+						<MkContainer
+							:max-height="300"
+							:foldable="true"
+							class="other"
+						>
+							<template #header
+								><i class="ph-clock ph-bold ph-lg"></i>
+								{{ i18n.ts.recentPosts }}</template
+							>
+							<MkPagination
+								v-slot="{ items }"
+								:pagination="otherPostsPagination"
+							>
+								<div class="sdrarzaf">
+									<MkGalleryPostPreview
+										v-for="post in items"
+										:key="post.id"
+										:post="post"
+										class="post"
+									/>
+								</div>
+							</MkPagination>
+						</MkContainer>
 					</div>
-					<div class="body _block">
-						<div class="title">{{ post.title }}</div>
-						<div class="description"><Mfm :text="post.description"/></div>
-						<div class="info">
-							<i class="ph-clock ph-bold ph-lg"></i> <MkTime :time="post.createdAt" mode="detail"/>
-						</div>
-						<div class="actions">
-							<div class="like">
-								<MkButton v-if="post.isLiked" v-tooltip="i18n.ts._gallery.unlike" class="button" primary @click="unlike()"><i class="ph-heart ph-fill ph-lg"></i><span v-if="post.likedCount > 0" class="count">{{ post.likedCount }}</span></MkButton>
-								<MkButton v-else v-tooltip="i18n.ts._gallery.like" class="button" @click="like()"><i class="ph-heart ph-bold"></i><span v-if="post.likedCount > 0" class="count">{{ post.likedCount }}</span></MkButton>
-							</div>
-							<div class="other">
-								<button v-if="$i && $i.id === post.user.id" v-tooltip="i18n.ts.edit" v-click-anime class="_button" @click="edit"><i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i></button>
-								<button v-tooltip="i18n.ts.shareWithNote" v-click-anime class="_button" @click="shareWithNote"><i class="ph-repeat ph-bold ph-lg ph-fw ph-lg"></i></button>
-								<button v-if="shareAvailable()" v-tooltip="i18n.ts.share" v-click-anime class="_button" @click="share"><i class="ph-share-network ph-bold ph-lg ph-fw ph-lg"></i></button>
-							</div>
-						</div>
-						<div class="user">
-							<MkAvatar :user="post.user" class="avatar"/>
-							<div class="name">
-								<MkUserName :user="post.user" style="display: block;"/>
-								<MkAcct :user="post.user"/>
-							</div>
-							<MkFollowButton v-if="!$i || $i.id != post.user.id" :user="post.user" :inline="true" :transparent="false" :full="true" large class="koudoku"/>
-						</div>
-					</div>
-					<MkAd :prefer="['horizontal', 'horizontal-big']"/>
-					<MkContainer :max-height="300" :foldable="true" class="other">
-						<template #header><i class="ph-clock ph-bold ph-lg"></i> {{ i18n.ts.recentPosts }}</template>
-						<MkPagination v-slot="{items}" :pagination="otherPostsPagination">
-							<div class="sdrarzaf">
-								<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
-							</div>
-						</MkPagination>
-					</MkContainer>
-				</div>
-				<MkError v-else-if="error" @retry="fetch()"/>
-				<MkLoading v-else/>
-			</transition>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+					<MkError v-else-if="error" @retry="fetch()" />
+					<MkLoading v-else />
+				</transition>
+			</div>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineComponent, inject, watch } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import MkContainer from '@/components/MkContainer.vue';
-import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
-import MkFollowButton from '@/components/MkFollowButton.vue';
-import { url } from '@/config';
-import { useRouter } from '@/router';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { shareAvailable } from '@/scripts/share-available';
+import { computed, defineComponent, inject, watch } from "vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import MkContainer from "@/components/MkContainer.vue";
+import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkGalleryPostPreview from "@/components/MkGalleryPostPreview.vue";
+import MkFollowButton from "@/components/MkFollowButton.vue";
+import { url } from "@/config";
+import { useRouter } from "@/router";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { shareAvailable } from "@/scripts/share-available";
 
 const router = useRouter();
 
@@ -78,7 +168,7 @@ const props = defineProps<{
 let post = $ref(null);
 let error = $ref(null);
 const otherPostsPagination = {
-	endpoint: 'users/gallery/posts' as const,
+	endpoint: "users/gallery/posts" as const,
 	limit: 6,
 	params: computed(() => ({
 		userId: post.user.id,
@@ -87,13 +177,15 @@ const otherPostsPagination = {
 
 function fetchPost() {
 	post = null;
-	os.api('gallery/posts/show', {
+	os.api("gallery/posts/show", {
 		postId: props.postId,
-	}).then(_post => {
-		post = _post;
-	}).catch(_error => {
-		error = _error;
-	});
+	})
+		.then((_post) => {
+			post = _post;
+		})
+		.catch((_error) => {
+			error = _error;
+		});
 }
 
 function share() {
@@ -111,7 +203,7 @@ function shareWithNote() {
 }
 
 function like() {
-	os.apiWithDialog('gallery/posts/like', {
+	os.apiWithDialog("gallery/posts/like", {
 		postId: props.postId,
 	}).then(() => {
 		post.isLiked = true;
@@ -120,7 +212,7 @@ function like() {
 }
 
 async function unlike() {
-	os.api('gallery/posts/unlike', {
+	os.api("gallery/posts/unlike", {
 		postId: props.postId,
 	}).then(() => {
 		post.isLiked = false;
@@ -134,18 +226,26 @@ function edit() {
 
 watch(() => props.postId, fetchPost, { immediate: true });
 
-const headerActions = $computed(() => [{
-	icon: 'ph-pencil ph-bold ph-lg',
-	text: i18n.ts.edit,
-	handler: edit,
-}]);
+const headerActions = $computed(() => [
+	{
+		icon: "ph-pencil ph-bold ph-lg",
+		text: i18n.ts.edit,
+		handler: edit,
+	},
+]);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => post ? {
-	title: post.title,
-	avatar: post.user,
-} : null));
+definePageMetadata(
+	computed(() =>
+		post
+			? {
+					title: post.title,
+					avatar: post.user,
+			  }
+			: null
+	)
+);
 </script>
 
 <style lang="scss" scoped>
@@ -255,7 +355,6 @@ definePageMetadata(computed(() => post ? {
 	margin: var(--margin);
 
 	> .post {
-
 	}
 }
 </style>
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index f84e3b014..5c8147351 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -1,164 +1,356 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer v-if="instance" :content-max="600" :margin-min="16" :margin-max="32">
-		<swiper
-			:modules="[Virtual]"
-			:space-between="20"
-			:virtual="true"
-			:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
-			@swiper="setSwiperRef"
-			@slide-change="onSlideChange"
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+		/></template>
+		<MkSpacer
+			v-if="instance"
+			:content-max="600"
+			:margin-min="16"
+			:margin-max="32"
 		>
-			<swiper-slide>
-				<div class="_formRoot">
-					<div class="fnfelxur">
-						<img :src="faviconUrl" alt="" class="icon"/>
-						<span class="name">{{ instance.name || `(${i18n.ts.unknown})` }}</span>
-					</div>
-					<MkKeyValue :copy="host" oneline style="margin: 1em 0;">
-						<template #key>Host</template>
-						<template #value><span class="_monospace"><MkLink :url="`https://${host}`">{{ host }}</MkLink></span></template>
-					</MkKeyValue>
-					<MkKeyValue oneline style="margin: 1em 0;">
-						<template #key>{{ i18n.ts.software }}</template>
-						<template #value><span class="_monospace">{{ instance.softwareName || `(${i18n.ts.unknown})` }} / {{ instance.softwareVersion || `(${i18n.ts.unknown})` }}</span></template>
-					</MkKeyValue>
-					<MkKeyValue oneline style="margin: 1em 0;">
-						<template #key>{{ i18n.ts.administrator }}</template>
-						<template #value>{{ instance.maintainerName || `(${i18n.ts.unknown})` }} ({{ instance.maintainerEmail || `(${i18n.ts.unknown})` }})</template>
-					</MkKeyValue>
-					<MkKeyValue>
-						<template #key>{{ i18n.ts.description }}</template>
-						<template #value>{{ instance.description }}</template>
-					</MkKeyValue>
-
-					<FormSection v-if="iAmModerator">
-						<template #label>Moderation</template>
-						<FormSuspense :p="init">
-							<FormSwitch v-model="suspended" class="_formBlock" @update:modelValue="toggleSuspend">{{ i18n.ts.stopActivityDelivery }}</FormSwitch>
-							<FormSwitch v-model="isBlocked" class="_formBlock" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</FormSwitch>
-						</FormSuspense>
-						<MkButton @click="refreshMetadata"><i class="ph-arrows-clockwise ph-bold ph-lg"></i> Refresh metadata</MkButton>
-					</FormSection>
-
-					<FormSection>
-						<MkKeyValue oneline style="margin: 1em 0;">
-							<template #key>{{ i18n.ts.registeredAt }}</template>
-							<template #value><MkTime mode="detail" :time="instance.caughtAt"/></template>
-						</MkKeyValue>
-						<MkKeyValue oneline style="margin: 1em 0;">
-							<template #key>{{ i18n.ts.updatedAt }}</template>
-							<template #value><MkTime mode="detail" :time="instance.infoUpdatedAt"/></template>
-						</MkKeyValue>
-						<MkKeyValue oneline style="margin: 1em 0;">
-							<template #key>{{ i18n.ts.latestRequestSentAt }}</template>
-							<template #value><MkTime v-if="instance.latestRequestSentAt" :time="instance.latestRequestSentAt"/><span v-else>N/A</span></template>
-						</MkKeyValue>
-						<MkKeyValue oneline style="margin: 1em 0;">
-							<template #key>{{ i18n.ts.latestStatus }}</template>
-							<template #value>{{ instance.latestStatus ? instance.latestStatus : 'N/A' }}</template>
-						</MkKeyValue>
-						<MkKeyValue oneline style="margin: 1em 0;">
-							<template #key>{{ i18n.ts.latestRequestReceivedAt }}</template>
-							<template #value><MkTime v-if="instance.latestRequestReceivedAt" :time="instance.latestRequestReceivedAt"/><span v-else>N/A</span></template>
-						</MkKeyValue>
-					</FormSection>
-
-					<FormSection>
-						<MkKeyValue oneline style="margin: 1em 0;">
-							<template #key>Following (Pub)</template>
-							<template #value>{{ number(instance.followingCount) }}</template>
-						</MkKeyValue>
-						<MkKeyValue oneline style="margin: 1em 0;">
-							<template #key>Followers (Sub)</template>
-							<template #value>{{ number(instance.followersCount) }}</template>
-						</MkKeyValue>
-					</FormSection>
-
-					<FormSection>
-						<template #label>Well-known resources</template>
-						<FormLink :to="`https://${host}/.well-known/host-meta`" external style="margin-bottom: 8px;">host-meta</FormLink>
-						<FormLink :to="`https://${host}/.well-known/host-meta.json`" external style="margin-bottom: 8px;">host-meta.json</FormLink>
-						<FormLink :to="`https://${host}/.well-known/nodeinfo`" external style="margin-bottom: 8px;">nodeinfo</FormLink>
-						<FormLink :to="`https://${host}/robots.txt`" external style="margin-bottom: 8px;">robots.txt</FormLink>
-						<FormLink :to="`https://${host}/manifest.json`" external style="margin-bottom: 8px;">manifest.json</FormLink>
-					</FormSection>
-				</div>
-			</swiper-slide>
-			<swiper-slide>
-				<div class="_formRoot">
-					<div class="cmhjzshl">
-						<div class="selects">
-							<MkSelect v-model="chartSrc" style="margin: 0 10px 0 0; flex: 1;">
-								<option value="instance-requests">{{ i18n.ts._instanceCharts.requests }}</option>
-								<option value="instance-users">{{ i18n.ts._instanceCharts.users }}</option>
-								<option value="instance-users-total">{{ i18n.ts._instanceCharts.usersTotal }}</option>
-								<option value="instance-notes">{{ i18n.ts._instanceCharts.notes }}</option>
-								<option value="instance-notes-total">{{ i18n.ts._instanceCharts.notesTotal }}</option>
-								<option value="instance-ff">{{ i18n.ts._instanceCharts.ff }}</option>
-								<option value="instance-ff-total">{{ i18n.ts._instanceCharts.ffTotal }}</option>
-								<option value="instance-drive-usage">{{ i18n.ts._instanceCharts.cacheSize }}</option>
-								<option value="instance-drive-usage-total">{{ i18n.ts._instanceCharts.cacheSizeTotal }}</option>
-								<option value="instance-drive-files">{{ i18n.ts._instanceCharts.files }}</option>
-								<option value="instance-drive-files-total">{{ i18n.ts._instanceCharts.filesTotal }}</option>
-							</MkSelect>
+			<swiper
+				:modules="[Virtual]"
+				:space-between="20"
+				:virtual="true"
+				:allow-touch-move="
+					!(
+						deviceKind === 'desktop' &&
+						!defaultStore.state.swipeOnDesktop
+					)
+				"
+				@swiper="setSwiperRef"
+				@slide-change="onSlideChange"
+			>
+				<swiper-slide>
+					<div class="_formRoot">
+						<div class="fnfelxur">
+							<img :src="faviconUrl" alt="" class="icon" />
+							<span class="name">{{
+								instance.name || `(${i18n.ts.unknown})`
+							}}</span>
 						</div>
-						<div class="charts">
-							<div class="label">{{ i18n.t('recentNHours', { n: 90 }) }}</div>
-							<MkChart class="chart" :src="chartSrc" span="hour" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
-							<div class="label">{{ i18n.t('recentNDays', { n: 90 }) }}</div>
-							<MkChart class="chart" :src="chartSrc" span="day" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
+						<MkKeyValue :copy="host" oneline style="margin: 1em 0">
+							<template #key>Host</template>
+							<template #value
+								><span class="_monospace"
+									><MkLink :url="`https://${host}`">{{
+										host
+									}}</MkLink></span
+								></template
+							>
+						</MkKeyValue>
+						<MkKeyValue oneline style="margin: 1em 0">
+							<template #key>{{ i18n.ts.software }}</template>
+							<template #value
+								><span class="_monospace"
+									>{{
+										instance.softwareName ||
+										`(${i18n.ts.unknown})`
+									}}
+									/
+									{{
+										instance.softwareVersion ||
+										`(${i18n.ts.unknown})`
+									}}</span
+								></template
+							>
+						</MkKeyValue>
+						<MkKeyValue oneline style="margin: 1em 0">
+							<template #key>{{
+								i18n.ts.administrator
+							}}</template>
+							<template #value
+								>{{
+									instance.maintainerName ||
+									`(${i18n.ts.unknown})`
+								}}
+								({{
+									instance.maintainerEmail ||
+									`(${i18n.ts.unknown})`
+								}})</template
+							>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>{{ i18n.ts.description }}</template>
+							<template #value>{{
+								instance.description
+							}}</template>
+						</MkKeyValue>
+
+						<FormSection v-if="iAmModerator">
+							<template #label>Moderation</template>
+							<FormSuspense :p="init">
+								<FormSwitch
+									v-model="suspended"
+									class="_formBlock"
+									@update:modelValue="toggleSuspend"
+									>{{
+										i18n.ts.stopActivityDelivery
+									}}</FormSwitch
+								>
+								<FormSwitch
+									v-model="isBlocked"
+									class="_formBlock"
+									@update:modelValue="toggleBlock"
+									>{{ i18n.ts.blockThisInstance }}</FormSwitch
+								>
+							</FormSuspense>
+							<MkButton @click="refreshMetadata"
+								><i
+									class="ph-arrows-clockwise ph-bold ph-lg"
+								></i>
+								Refresh metadata</MkButton
+							>
+						</FormSection>
+
+						<FormSection>
+							<MkKeyValue oneline style="margin: 1em 0">
+								<template #key>{{
+									i18n.ts.registeredAt
+								}}</template>
+								<template #value
+									><MkTime
+										mode="detail"
+										:time="instance.caughtAt"
+								/></template>
+							</MkKeyValue>
+							<MkKeyValue oneline style="margin: 1em 0">
+								<template #key>{{
+									i18n.ts.updatedAt
+								}}</template>
+								<template #value
+									><MkTime
+										mode="detail"
+										:time="instance.infoUpdatedAt"
+								/></template>
+							</MkKeyValue>
+							<MkKeyValue oneline style="margin: 1em 0">
+								<template #key>{{
+									i18n.ts.latestRequestSentAt
+								}}</template>
+								<template #value
+									><MkTime
+										v-if="instance.latestRequestSentAt"
+										:time="instance.latestRequestSentAt"
+									/><span v-else>N/A</span></template
+								>
+							</MkKeyValue>
+							<MkKeyValue oneline style="margin: 1em 0">
+								<template #key>{{
+									i18n.ts.latestStatus
+								}}</template>
+								<template #value>{{
+									instance.latestStatus
+										? instance.latestStatus
+										: "N/A"
+								}}</template>
+							</MkKeyValue>
+							<MkKeyValue oneline style="margin: 1em 0">
+								<template #key>{{
+									i18n.ts.latestRequestReceivedAt
+								}}</template>
+								<template #value
+									><MkTime
+										v-if="instance.latestRequestReceivedAt"
+										:time="instance.latestRequestReceivedAt"
+									/><span v-else>N/A</span></template
+								>
+							</MkKeyValue>
+						</FormSection>
+
+						<FormSection>
+							<MkKeyValue oneline style="margin: 1em 0">
+								<template #key>Following (Pub)</template>
+								<template #value>{{
+									number(instance.followingCount)
+								}}</template>
+							</MkKeyValue>
+							<MkKeyValue oneline style="margin: 1em 0">
+								<template #key>Followers (Sub)</template>
+								<template #value>{{
+									number(instance.followersCount)
+								}}</template>
+							</MkKeyValue>
+						</FormSection>
+
+						<FormSection>
+							<template #label>Well-known resources</template>
+							<FormLink
+								:to="`https://${host}/.well-known/host-meta`"
+								external
+								style="margin-bottom: 8px"
+								>host-meta</FormLink
+							>
+							<FormLink
+								:to="`https://${host}/.well-known/host-meta.json`"
+								external
+								style="margin-bottom: 8px"
+								>host-meta.json</FormLink
+							>
+							<FormLink
+								:to="`https://${host}/.well-known/nodeinfo`"
+								external
+								style="margin-bottom: 8px"
+								>nodeinfo</FormLink
+							>
+							<FormLink
+								:to="`https://${host}/robots.txt`"
+								external
+								style="margin-bottom: 8px"
+								>robots.txt</FormLink
+							>
+							<FormLink
+								:to="`https://${host}/manifest.json`"
+								external
+								style="margin-bottom: 8px"
+								>manifest.json</FormLink
+							>
+						</FormSection>
+					</div>
+				</swiper-slide>
+				<swiper-slide>
+					<div class="_formRoot">
+						<div class="cmhjzshl">
+							<div class="selects">
+								<MkSelect
+									v-model="chartSrc"
+									style="margin: 0 10px 0 0; flex: 1"
+								>
+									<option value="instance-requests">
+										{{ i18n.ts._instanceCharts.requests }}
+									</option>
+									<option value="instance-users">
+										{{ i18n.ts._instanceCharts.users }}
+									</option>
+									<option value="instance-users-total">
+										{{ i18n.ts._instanceCharts.usersTotal }}
+									</option>
+									<option value="instance-notes">
+										{{ i18n.ts._instanceCharts.notes }}
+									</option>
+									<option value="instance-notes-total">
+										{{ i18n.ts._instanceCharts.notesTotal }}
+									</option>
+									<option value="instance-ff">
+										{{ i18n.ts._instanceCharts.ff }}
+									</option>
+									<option value="instance-ff-total">
+										{{ i18n.ts._instanceCharts.ffTotal }}
+									</option>
+									<option value="instance-drive-usage">
+										{{ i18n.ts._instanceCharts.cacheSize }}
+									</option>
+									<option value="instance-drive-usage-total">
+										{{
+											i18n.ts._instanceCharts
+												.cacheSizeTotal
+										}}
+									</option>
+									<option value="instance-drive-files">
+										{{ i18n.ts._instanceCharts.files }}
+									</option>
+									<option value="instance-drive-files-total">
+										{{ i18n.ts._instanceCharts.filesTotal }}
+									</option>
+								</MkSelect>
+							</div>
+							<div class="charts">
+								<div class="label">
+									{{ i18n.t("recentNHours", { n: 90 }) }}
+								</div>
+								<MkChart
+									class="chart"
+									:src="chartSrc"
+									span="hour"
+									:limit="90"
+									:args="{ host: host }"
+									:detailed="true"
+								></MkChart>
+								<div class="label">
+									{{ i18n.t("recentNDays", { n: 90 }) }}
+								</div>
+								<MkChart
+									class="chart"
+									:src="chartSrc"
+									span="day"
+									:limit="90"
+									:args="{ host: host }"
+									:detailed="true"
+								></MkChart>
+							</div>
 						</div>
 					</div>
-				</div>
-			</swiper-slide>
-			<swiper-slide>
-				<div class="_formRoot">
-					<MkPagination v-slot="{items}" :pagination="usersPagination" style="display: grid; grid-template-columns: repeat(auto-fill,minmax(270px,1fr)); grid-gap: 12px;">
-						<MkA v-for="user in items" :key="user.id" v-tooltip.mfm="`Last posted: ${new Date(user.updatedAt).toLocaleString()}`" class="user" :to="`/user-info/${user.id}`">
-							<MkUserCardMini :user="user"/>
-						</MkA>
-					</MkPagination>
-				</div>
-			</swiper-slide>
-			<swiper-slide>
-				<div class="_formRoot">
-					<MkObjectView tall :value="instance">
-					</MkObjectView>
-				</div>
-			</swiper-slide>
-		</swiper>
-	</MkSpacer>
-</MkStickyContainer>
+				</swiper-slide>
+				<swiper-slide>
+					<div class="_formRoot">
+						<MkPagination
+							v-slot="{ items }"
+							:pagination="usersPagination"
+							style="
+								display: grid;
+								grid-template-columns: repeat(
+									auto-fill,
+									minmax(270px, 1fr)
+								);
+								grid-gap: 12px;
+							"
+						>
+							<MkA
+								v-for="user in items"
+								:key="user.id"
+								v-tooltip.mfm="
+									`Last posted: ${new Date(
+										user.updatedAt
+									).toLocaleString()}`
+								"
+								class="user"
+								:to="`/user-info/${user.id}`"
+							>
+								<MkUserCardMini :user="user" />
+							</MkA>
+						</MkPagination>
+					</div>
+				</swiper-slide>
+				<swiper-slide>
+					<div class="_formRoot">
+						<MkObjectView tall :value="instance"> </MkObjectView>
+					</div>
+				</swiper-slide>
+			</swiper>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { watch } from 'vue';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
-import type * as misskey from 'calckey-js';
-import MkChart from '@/components/MkChart.vue';
-import MkObjectView from '@/components/MkObjectView.vue';
-import FormLink from '@/components/form/link.vue';
-import MkLink from '@/components/MkLink.vue';
-import MkButton from '@/components/MkButton.vue';
-import FormSection from '@/components/form/section.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import MkSelect from '@/components/form/select.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import * as os from '@/os';
-import number from '@/filters/number';
-import { iAmModerator } from '@/account';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { deviceKind } from '@/scripts/device-kind';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import MkUserCardMini from '@/components/MkUserCardMini.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
-import { getProxiedImageUrlNullable } from '@/scripts/media-proxy';
+import { watch } from "vue";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
+import type * as misskey from "calckey-js";
+import MkChart from "@/components/MkChart.vue";
+import MkObjectView from "@/components/MkObjectView.vue";
+import FormLink from "@/components/form/link.vue";
+import MkLink from "@/components/MkLink.vue";
+import MkButton from "@/components/MkButton.vue";
+import FormSection from "@/components/form/section.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import MkSelect from "@/components/form/select.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import * as os from "@/os";
+import number from "@/filters/number";
+import { iAmModerator } from "@/account";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { deviceKind } from "@/scripts/device-kind";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import MkUserCardMini from "@/components/MkUserCardMini.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import "swiper/scss";
+import "swiper/scss/virtual";
+import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
 
 type AugmentedInstanceMetadata = misskey.entities.DetailedInstanceMetadata & {
 	blockedHosts: string[];
@@ -171,12 +363,12 @@ const props = defineProps<{
 	host: string;
 }>();
 
-let tabs = ['overview'];
-if (iAmModerator) tabs.push('chart', 'users', 'raw');
+let tabs = ["overview"];
+if (iAmModerator) tabs.push("chart", "users", "raw");
 let tab = $ref(tabs[0]);
-watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
-let chartSrc = $ref('instance-requests');
+let chartSrc = $ref("instance-requests");
 let meta = $ref<AugmentedInstanceMetadata | null>(null);
 let instance = $ref<AugmentedInstance | null>(null);
 let suspended = $ref(false);
@@ -184,29 +376,29 @@ let isBlocked = $ref(false);
 let faviconUrl = $ref(null);
 
 const usersPagination = {
-	endpoint: iAmModerator ? 'admin/show-users' : 'users' as const,
+	endpoint: iAmModerator ? "admin/show-users" : ("users" as const),
 	limit: 10,
 	params: {
-		sort: '+updatedAt',
-		state: 'all',
+		sort: "+updatedAt",
+		state: "all",
 		hostname: props.host,
 	},
 	offsetMode: true,
 };
 
 async function init() {
-	meta = await os.api('admin/meta');
+	meta = await os.api("admin/meta");
 }
 
 async function fetch() {
-	instance = (await os.api('federation/show-instance', {
+	instance = (await os.api("federation/show-instance", {
 		host: props.host,
 	})) as AugmentedInstance;
 	suspended = instance.isSuspended;
 	isBlocked = instance.isBlocked;
 	faviconUrl =
-		getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ??
-		getProxiedImageUrlNullable(instance.iconUrl, 'preview');
+		getProxiedImageUrlNullable(instance.faviconUrl, "preview") ??
+		getProxiedImageUrlNullable(instance.iconUrl, "preview");
 }
 
 async function toggleBlock() {
@@ -220,58 +412,64 @@ async function toggleBlock() {
 	} else {
 		blockedHosts = meta.blockedHosts.filter((x) => x !== instance!.host);
 	}
-	await os.api('admin/update-meta', {
+	await os.api("admin/update-meta", {
 		blockedHosts,
 	});
 }
 
 async function toggleSuspend(v) {
-	await os.api('admin/federation/update-instance', {
+	await os.api("admin/federation/update-instance", {
 		host: instance.host,
 		isSuspended: suspended,
 	});
 }
 
 function refreshMetadata() {
-	os.api('admin/federation/refresh-remote-instance-metadata', {
+	os.api("admin/federation/refresh-remote-instance-metadata", {
 		host: instance.host,
 	});
 	os.alert({
-		text: 'Refresh requested',
+		text: "Refresh requested",
 	});
 }
 
 fetch();
 
-const headerActions = $computed(() => [{
-	text: `https://${props.host}`,
-	icon: 'ph-arrow-square-out ph-bold ph-lg',
-	handler: () => {
-		window.open(`https://${props.host}`, '_blank');
+const headerActions = $computed(() => [
+	{
+		text: `https://${props.host}`,
+		icon: "ph-arrow-square-out ph-bold ph-lg",
+		handler: () => {
+			window.open(`https://${props.host}`, "_blank");
+		},
 	},
-}]);
+]);
 
-let theTabs = [{
-	key: 'overview',
-	title: i18n.ts.overview,
-	icon: 'ph-info ph-bold ph-lg',
-}];
+let theTabs = [
+	{
+		key: "overview",
+		title: i18n.ts.overview,
+		icon: "ph-info ph-bold ph-lg",
+	},
+];
 
 if (iAmModerator) {
 	theTabs.push(
 		{
-			key: 'chart',
+			key: "chart",
 			title: i18n.ts.charts,
-			icon: 'ph-chart-bar ph-bold ph-lg',
-		}, {
-			key: 'users',
-			title: i18n.ts.users,
-			icon: 'ph-users ph-bold ph-lg',
-		}, {
-			key: 'raw',
-			title: 'Raw',
-			icon: 'ph-code ph-bold ph-lg',
+			icon: "ph-chart-bar ph-bold ph-lg",
 		},
+		{
+			key: "users",
+			title: i18n.ts.users,
+			icon: "ph-users ph-bold ph-lg",
+		},
+		{
+			key: "raw",
+			title: "Raw",
+			icon: "ph-code ph-bold ph-lg",
+		}
 	);
 }
 
@@ -279,7 +477,7 @@ let headerTabs = $computed(() => theTabs);
 
 definePageMetadata({
 	title: props.host,
-	icon: 'ph-hard-drives ph-bold ph-lg',
+	icon: "ph-hard-drives ph-bold ph-lg",
 });
 
 let swiperRef = null;
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index b2fed66de..768c58cc6 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -1,106 +1,162 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<div>
-		<MkSpacer :content-max="800">
-			<swiper
-				:modules="[Virtual]"
-				:space-between="20"
-				:virtual="true"
-				:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
-				@swiper="setSwiperRef"
-				@slide-change="onSlideChange"
-			>
-				<swiper-slide>
-					<div class="_content yweeujhr dms">
-						<MkButton primary class="start" v-if="!isMobile" @click="startUser"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
-						<MkPagination v-slot="{items}" :pagination="dmsPagination">
-							<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block" :message="message"/>
-						</MkPagination>
-					</div>
-				</swiper-slide>
-				<swiper-slide>
-					<div class="_content yweeujhr groups">
-						<div v-if="!isMobile" class="groupsbuttons">
-							<MkButton primary class="start" :link="true" to="/my/groups"><i class="ph-user-circle-gear ph-bold ph-lg"></i> {{ i18n.ts.manageGroups }}</MkButton>
-							<MkButton primary class="start" @click="startGroup"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+		/></template>
+		<div>
+			<MkSpacer :content-max="800">
+				<swiper
+					:modules="[Virtual]"
+					:space-between="20"
+					:virtual="true"
+					:allow-touch-move="
+						!(
+							deviceKind === 'desktop' &&
+							!defaultStore.state.swipeOnDesktop
+						)
+					"
+					@swiper="setSwiperRef"
+					@slide-change="onSlideChange"
+				>
+					<swiper-slide>
+						<div class="_content yweeujhr dms">
+							<MkButton
+								primary
+								class="start"
+								v-if="!isMobile"
+								@click="startUser"
+								><i class="ph-plus ph-bold ph-lg"></i>
+								{{ i18n.ts.startMessaging }}</MkButton
+							>
+							<MkPagination
+								v-slot="{ items }"
+								:pagination="dmsPagination"
+							>
+								<MkChatPreview
+									v-for="message in items"
+									:key="message.id"
+									class="yweeujhr message _block"
+									:message="message"
+								/>
+							</MkPagination>
 						</div>
-						<MkPagination v-slot="{items}" :pagination="groupsPagination">
-							<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block" :message="message"/>
-						</MkPagination>
-					</div>
-				</swiper-slide>
-			</swiper>
-		</MkSpacer>
-	</div>
-</MkStickyContainer>
+					</swiper-slide>
+					<swiper-slide>
+						<div class="_content yweeujhr groups">
+							<div v-if="!isMobile" class="groupsbuttons">
+								<MkButton
+									primary
+									class="start"
+									:link="true"
+									to="/my/groups"
+									><i
+										class="ph-user-circle-gear ph-bold ph-lg"
+									></i>
+									{{ i18n.ts.manageGroups }}</MkButton
+								>
+								<MkButton
+									primary
+									class="start"
+									@click="startGroup"
+									><i class="ph-plus ph-bold ph-lg"></i>
+									{{ i18n.ts.startMessaging }}</MkButton
+								>
+							</div>
+							<MkPagination
+								v-slot="{ items }"
+								:pagination="groupsPagination"
+							>
+								<MkChatPreview
+									v-for="message in items"
+									:key="message.id"
+									class="yweeujhr message _block"
+									:message="message"
+								/>
+							</MkPagination>
+						</div>
+					</swiper-slide>
+				</swiper>
+			</MkSpacer>
+		</div>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { ref, markRaw, onMounted, onUnmounted, watch } from 'vue';
-import * as Acct from 'calckey-js/built/acct';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
-import MkButton from '@/components/MkButton.vue';
-import MkChatPreview from '@/components/MkChatPreview.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import { useRouter } from '@/router';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { $i } from '@/account';
-import { deviceKind } from '@/scripts/device-kind';
-import { defaultStore } from '@/store';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
+import { ref, markRaw, onMounted, onUnmounted, watch } from "vue";
+import * as Acct from "calckey-js/built/acct";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
+import MkButton from "@/components/MkButton.vue";
+import MkChatPreview from "@/components/MkChatPreview.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import { useRouter } from "@/router";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { $i } from "@/account";
+import { deviceKind } from "@/scripts/device-kind";
+import { defaultStore } from "@/store";
+import "swiper/scss";
+import "swiper/scss/virtual";
 
 const router = useRouter();
 
 let messages = $ref([]);
 let connection = $ref(null);
 
-const tabs = ['dms', 'groups'];
+const tabs = ["dms", "groups"];
 let tab = $ref(tabs[0]);
-watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
 const MOBILE_THRESHOLD = 500;
-const isMobile = ref(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD);
-window.addEventListener('resize', () => {
-	isMobile.value = deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD;
+const isMobile = ref(
+	deviceKind === "smartphone" || window.innerWidth <= MOBILE_THRESHOLD
+);
+window.addEventListener("resize", () => {
+	isMobile.value =
+		deviceKind === "smartphone" || window.innerWidth <= MOBILE_THRESHOLD;
 });
 
-const headerActions = $computed(() => [{
-	asFullButton: true,
-	icon: 'ph-plus ph-bold ph-lg',
-	text: i18n.ts.addUser,
-	handler: startMenu,
-}]);
+const headerActions = $computed(() => [
+	{
+		asFullButton: true,
+		icon: "ph-plus ph-bold ph-lg",
+		text: i18n.ts.addUser,
+		handler: startMenu,
+	},
+]);
 
-const headerTabs = $computed(() => [{
-	key: 'dms',
-	title: i18n.ts._messaging.dms,
-	icon: 'ph-user ph-bold ph-lg',
-}, {
-	key: 'groups',
-	title: i18n.ts._messaging.groups,
-	icon: 'ph-users-three ph-bold ph-lg',
-}]);
+const headerTabs = $computed(() => [
+	{
+		key: "dms",
+		title: i18n.ts._messaging.dms,
+		icon: "ph-user ph-bold ph-lg",
+	},
+	{
+		key: "groups",
+		title: i18n.ts._messaging.groups,
+		icon: "ph-users-three ph-bold ph-lg",
+	},
+]);
 
 definePageMetadata({
 	title: i18n.ts.messaging,
-	icon: 'ph-chats-teardrop ph-bold ph-lg',
+	icon: "ph-chats-teardrop ph-bold ph-lg",
 });
 
 const dmsPagination = {
-	endpoint: 'messaging/history' as const,
+	endpoint: "messaging/history" as const,
 	limit: 15,
 	params: {
 		group: false,
 	},
 };
 const groupsPagination = {
-	endpoint: 'messaging/history' as const,
+	endpoint: "messaging/history" as const,
 	limit: 5,
 	params: {
 		group: true,
@@ -109,20 +165,26 @@ const groupsPagination = {
 
 function onMessage(message): void {
 	if (message.recipientId) {
-		messages = messages.filter(m => !(
-			(m.recipientId === message.recipientId && m.userId === message.userId) ||
-				(m.recipientId === message.userId && m.userId === message.recipientId)));
+		messages = messages.filter(
+			(m) =>
+				!(
+					(m.recipientId === message.recipientId &&
+						m.userId === message.userId) ||
+					(m.recipientId === message.userId &&
+						m.userId === message.recipientId)
+				)
+		);
 
 		messages.unshift(message);
 	} else if (message.groupId) {
-		messages = messages.filter(m => m.groupId !== message.groupId);
+		messages = messages.filter((m) => m.groupId !== message.groupId);
 		messages.unshift(message);
 	}
 }
 
 function onRead(ids): void {
 	for (const id of ids) {
-		const found = messages.find(m => m.id === id);
+		const found = messages.find((m) => m.id === id);
 		if (found) {
 			if (found.recipientId) {
 				found.isRead = true;
@@ -134,30 +196,39 @@ function onRead(ids): void {
 }
 
 function startMenu(ev) {
-	os.popupMenu([{
-		text: i18n.ts.messagingWithUser,
-		icon: 'ph-user ph-bold ph-lg',
-		action: () => { startUser(); },
-	}, {
-		text: i18n.ts.messagingWithGroup,
-		icon: 'ph-users-three ph-bold ph-lg',
-		action: () => { startGroup(); },
-	}], ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts.messagingWithUser,
+				icon: "ph-user ph-bold ph-lg",
+				action: () => {
+					startUser();
+				},
+			},
+			{
+				text: i18n.ts.messagingWithGroup,
+				icon: "ph-users-three ph-bold ph-lg",
+				action: () => {
+					startGroup();
+				},
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
 }
 
-
 async function startUser(): void {
-	os.selectUser().then(user => {
+	os.selectUser().then((user) => {
 		router.push(`/my/messaging/${Acct.toString(user)}`);
 	});
 }
 
 async function startGroup(): void {
-	const groups1 = await os.api('users/groups/owned');
-	const groups2 = await os.api('users/groups/joined');
+	const groups1 = await os.api("users/groups/owned");
+	const groups2 = await os.api("users/groups/joined");
 	if (groups1.length === 0 && groups2.length === 0) {
 		os.alert({
-			type: 'warning',
+			type: "warning",
 			title: i18n.ts.youHaveNoGroups,
 			text: i18n.ts.joinOrCreateGroup,
 		});
@@ -165,8 +236,9 @@ async function startGroup(): void {
 	}
 	const { canceled, result: group } = await os.select({
 		title: i18n.ts.group,
-		items: groups1.concat(groups2).map(group => ({
-			value: group, text: group.name,
+		items: groups1.concat(groups2).map((group) => ({
+			value: group,
+			text: group.name,
 		})),
 	});
 	if (canceled) return;
@@ -191,18 +263,26 @@ function syncSlide(index) {
 onMounted(() => {
 	syncSlide(tabs.indexOf(swiperRef.activeIndex));
 
-	connection = markRaw(stream.useChannel('messagingIndex'));
+	connection = markRaw(stream.useChannel("messagingIndex"));
 
-	connection.on('message', onMessage);
-	connection.on('read', onRead);
+	connection.on("message", onMessage);
+	connection.on("read", onRead);
 
-	os.api('messaging/history', { group: false, limit: 5 }).then(userMessages => {
-		os.api('messaging/history', { group: true, limit: 5 }).then(groupMessages => {
-			const _messages = userMessages.concat(groupMessages);
-			_messages.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
-			messages = _messages;
-		});
-	});
+	os.api("messaging/history", { group: false, limit: 5 }).then(
+		(userMessages) => {
+			os.api("messaging/history", { group: true, limit: 5 }).then(
+				(groupMessages) => {
+					const _messages = userMessages.concat(groupMessages);
+					_messages.sort(
+						(a, b) =>
+							new Date(b.createdAt).getTime() -
+							new Date(a.createdAt).getTime()
+					);
+					messages = _messages;
+				}
+			);
+		}
+	);
 });
 
 onUnmounted(() => {
@@ -210,17 +290,17 @@ onUnmounted(() => {
 });
 </script>
 
-	<style lang="scss" scoped>
-	.yweeujhr {
-		> .start {
-			margin: 0 auto var(--margin) auto;
-		}
-
-		> .groupsbuttons {
-			max-width: 100%;
-			display: flex;
-			justify-content: center;
-			margin-bottom: 1rem;
-		}
+<style lang="scss" scoped>
+.yweeujhr {
+	> .start {
+		margin: 0 auto var(--margin) auto;
 	}
-	</style>
+
+	> .groupsbuttons {
+		max-width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-bottom: 1rem;
+	}
+}
+</style>
diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue
index 4e7fa30a6..4bc12ce9a 100644
--- a/packages/client/src/pages/messaging/messaging-room.form.vue
+++ b/packages/client/src/pages/messaging/messaging-room.form.vue
@@ -1,45 +1,64 @@
 <template>
-<div
-	class="pemppnzi _block"
-	@dragover.stop="onDragover"
-	@drop.stop="onDrop"
->
-	<textarea
-		ref="textEl"
-		v-model="text"
-		:placeholder="i18n.ts.inputMessageHere"
-		@keydown="onKeydown"
-		@compositionupdate="onCompositionUpdate"
-		@paste="onPaste"
-	></textarea>
-	<footer>
-		<div v-if="file" class="file" @click="file = null">{{ file.name }}</div>
-		<div class="buttons">
-			<button class="_button" @click="chooseFile"><i class="ph-upload ph-bold ph-lg"></i></button>
-			<button class="_button" @click="insertEmoji"><i class="ph-smiley ph-bold ph-lg"></i></button>
-			<button class="send _button" :disabled="!canSend || sending" :title="i18n.ts.send" @click="send">
-				<template v-if="!sending"><i class="ph-paper-plane-tilt ph-bold ph-lg"></i></template><template v-if="sending"><i class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i></template>
-			</button>
-		</div>
-	</footer>
-	<input ref="fileEl" type="file" @change="onChangeFile"/>
-</div>
+	<div
+		class="pemppnzi _block"
+		@dragover.stop="onDragover"
+		@drop.stop="onDrop"
+	>
+		<textarea
+			ref="textEl"
+			v-model="text"
+			:placeholder="i18n.ts.inputMessageHere"
+			@keydown="onKeydown"
+			@compositionupdate="onCompositionUpdate"
+			@paste="onPaste"
+		></textarea>
+		<footer>
+			<div v-if="file" class="file" @click="file = null">
+				{{ file.name }}
+			</div>
+			<div class="buttons">
+				<button class="_button" @click="chooseFile">
+					<i class="ph-upload ph-bold ph-lg"></i>
+				</button>
+				<button class="_button" @click="insertEmoji">
+					<i class="ph-smiley ph-bold ph-lg"></i>
+				</button>
+				<button
+					class="send _button"
+					:disabled="!canSend || sending"
+					:title="i18n.ts.send"
+					@click="send"
+				>
+					<template v-if="!sending"
+						><i
+							class="ph-paper-plane-tilt ph-bold ph-lg"
+						></i></template
+					><template v-if="sending"
+						><i
+							class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"
+						></i
+					></template>
+				</button>
+			</div>
+		</footer>
+		<input ref="fileEl" type="file" @change="onChangeFile" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, watch } from 'vue';
-import * as Misskey from 'calckey-js';
-import autosize from 'autosize';
+import { onMounted, watch } from "vue";
+import * as Misskey from "calckey-js";
+import autosize from "autosize";
 //import insertTextAtCursor from 'insert-text-at-cursor';
-import { throttle } from 'throttle-debounce';
-import { Autocomplete } from '@/scripts/autocomplete';
-import { formatTimeString } from '@/scripts/format-time-string';
-import { selectFile } from '@/scripts/select-file';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import { uploadFile } from '@/scripts/upload';
+import { throttle } from "throttle-debounce";
+import { Autocomplete } from "@/scripts/autocomplete";
+import { formatTimeString } from "@/scripts/format-time-string";
+import { selectFile } from "@/scripts/select-file";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { uploadFile } from "@/scripts/upload";
 
 const props = defineProps<{
 	user?: Misskey.entities.UserDetailed | null;
@@ -49,15 +68,22 @@ const props = defineProps<{
 let textEl = $ref<HTMLTextAreaElement>();
 let fileEl = $ref<HTMLInputElement>();
 
-let text = $ref<string>('');
+let text = $ref<string>("");
 let file = $ref<Misskey.entities.DriveFile | null>(null);
 let sending = $ref(false);
 const typing = throttle(3000, () => {
-	stream.send('typingOnMessaging', props.user ? { partner: props.user.id } : { group: props.group?.id });
+	stream.send(
+		"typingOnMessaging",
+		props.user ? { partner: props.user.id } : { group: props.group?.id }
+	);
 });
 
-let draftKey = $computed(() => props.user ? 'user:' + props.user.id : 'group:' + props.group?.id);
-let canSend = $computed(() => (text != null && text.trim() !== '') || file != null);
+let draftKey = $computed(() =>
+	props.user ? "user:" + props.user.id : "group:" + props.group?.id
+);
+let canSend = $computed(
+	() => (text != null && text.trim() !== "") || file != null
+);
 
 watch([$$(text), $$(file)], saveDraft);
 
@@ -68,18 +94,22 @@ async function onPaste(ev: ClipboardEvent) {
 	const items = clipboardData.items;
 
 	if (items.length === 1) {
-		if (items[0].kind === 'file') {
+		if (items[0].kind === "file") {
 			const pastedFile = items[0].getAsFile();
 			if (!pastedFile) return;
-			const lio = pastedFile.name.lastIndexOf('.');
-			const ext = lio >= 0 ? pastedFile.name.slice(lio) : '';
-			const formatted = formatTimeString(new Date(pastedFile.lastModified), defaultStore.state.pastedFileName).replace(/{{number}}/g, '1') + ext;
+			const lio = pastedFile.name.lastIndexOf(".");
+			const ext = lio >= 0 ? pastedFile.name.slice(lio) : "";
+			const formatted =
+				formatTimeString(
+					new Date(pastedFile.lastModified),
+					defaultStore.state.pastedFileName
+				).replace(/{{number}}/g, "1") + ext;
 			if (formatted) upload(pastedFile, formatted);
 		}
 	} else {
-		if (items[0].kind === 'file') {
+		if (items[0].kind === "file") {
 			os.alert({
-				type: 'error',
+				type: "error",
 				text: i18n.ts.onlyOneFileCanBeAttached,
 			});
 		}
@@ -89,11 +119,12 @@ async function onPaste(ev: ClipboardEvent) {
 function onDragover(ev: DragEvent) {
 	if (!ev.dataTransfer) return;
 
-	const isFile = ev.dataTransfer.items[0].kind === 'file';
+	const isFile = ev.dataTransfer.items[0].kind === "file";
 	const isDriveFile = ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FILE_;
 	if (isFile || isDriveFile) {
 		ev.preventDefault();
-		ev.dataTransfer.dropEffect = ev.dataTransfer.effectAllowed === 'all' ? 'copy' : 'move';
+		ev.dataTransfer.dropEffect =
+			ev.dataTransfer.effectAllowed === "all" ? "copy" : "move";
 	}
 }
 
@@ -108,7 +139,7 @@ function onDrop(ev: DragEvent): void {
 	} else if (ev.dataTransfer.files.length > 1) {
 		ev.preventDefault();
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: i18n.ts.onlyOneFileCanBeAttached,
 		});
 		return;
@@ -116,7 +147,7 @@ function onDrop(ev: DragEvent): void {
 
 	//#region ドライブのファイル
 	const driveFile = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
-	if (driveFile != null && driveFile !== '') {
+	if (driveFile != null && driveFile !== "") {
 		file = JSON.parse(driveFile);
 		ev.preventDefault();
 	}
@@ -125,18 +156,23 @@ function onDrop(ev: DragEvent): void {
 
 function onKeydown(ev: KeyboardEvent) {
 	typing();
-	let sendOnEnter = localStorage.getItem('enterSendsMessage') === 'true' || defaultStore.state.enterSendsMessage;
+	let sendOnEnter =
+		localStorage.getItem("enterSendsMessage") === "true" ||
+		defaultStore.state.enterSendsMessage;
 	if (sendOnEnter) {
-		if ((ev.key === 'Enter') && (ev.ctrlKey || ev.metaKey)) {
-			textEl.value += '\n';
-		}
-		else if (ev.key === 'Enter' && !ev.shiftKey && !('ontouchstart' in document.documentElement) && canSend) {
+		if (ev.key === "Enter" && (ev.ctrlKey || ev.metaKey)) {
+			textEl.value += "\n";
+		} else if (
+			ev.key === "Enter" &&
+			!ev.shiftKey &&
+			!("ontouchstart" in document.documentElement) &&
+			canSend
+		) {
 			ev.preventDefault();
 			send();
 		}
-	}
-	else {
-		if ((ev.key === 'Enter') && (ev.ctrlKey || ev.metaKey) && canSend) {
+	} else {
+		if (ev.key === "Enter" && (ev.ctrlKey || ev.metaKey) && canSend) {
 			ev.preventDefault();
 			send();
 		}
@@ -148,9 +184,11 @@ function onCompositionUpdate() {
 }
 
 function chooseFile(ev: MouseEvent) {
-	selectFile(ev.currentTarget ?? ev.target, i18n.ts.selectFile).then(selectedFile => {
-		file = selectedFile;
-	});
+	selectFile(ev.currentTarget ?? ev.target, i18n.ts.selectFile).then(
+		(selectedFile) => {
+			file = selectedFile;
+		}
+	);
 }
 
 function onChangeFile() {
@@ -158,35 +196,40 @@ function onChangeFile() {
 }
 
 function upload(fileToUpload: File, name?: string) {
-	uploadFile(fileToUpload, defaultStore.state.uploadFolder, name).then(res => {
-		file = res;
-	});
+	uploadFile(fileToUpload, defaultStore.state.uploadFolder, name).then(
+		(res) => {
+			file = res;
+		}
+	);
 }
 
 function send() {
 	sending = true;
-	os.api('messaging/messages/create', {
+	os.api("messaging/messages/create", {
 		userId: props.user ? props.user.id : undefined,
 		groupId: props.group ? props.group.id : undefined,
 		text: text ? text : undefined,
 		fileId: file ? file.id : undefined,
-	}).then(message => {
-		clear();
-	}).catch(err => {
-		console.error(err);
-	}).then(() => {
-		sending = false;
-	});
+	})
+		.then((message) => {
+			clear();
+		})
+		.catch((err) => {
+			console.error(err);
+		})
+		.then(() => {
+			sending = false;
+		});
 }
 
 function clear() {
-	text = '';
+	text = "";
 	file = null;
 	deleteDraft();
 }
 
 function saveDraft() {
-	const drafts = JSON.parse(localStorage.getItem('message_drafts') || '{}');
+	const drafts = JSON.parse(localStorage.getItem("message_drafts") || "{}");
 
 	drafts[draftKey] = {
 		updatedAt: new Date(),
@@ -196,15 +239,15 @@ function saveDraft() {
 		},
 	};
 
-	localStorage.setItem('message_drafts', JSON.stringify(drafts));
+	localStorage.setItem("message_drafts", JSON.stringify(drafts));
 }
 
 function deleteDraft() {
-	const drafts = JSON.parse(localStorage.getItem('message_drafts') || '{}');
+	const drafts = JSON.parse(localStorage.getItem("message_drafts") || "{}");
 
 	delete drafts[draftKey];
 
-	localStorage.setItem('message_drafts', JSON.stringify(drafts));
+	localStorage.setItem("message_drafts", JSON.stringify(drafts));
 }
 
 async function insertEmoji(ev: MouseEvent) {
@@ -218,7 +261,9 @@ onMounted(() => {
 	new Autocomplete(textEl, $$(text));
 
 	// 書きかけの投稿を復元
-	const draft = JSON.parse(localStorage.getItem('message_drafts') || '{}')[draftKey];
+	const draft = JSON.parse(localStorage.getItem("message_drafts") || "{}")[
+		draftKey
+	];
 	if (draft) {
 		text = draft.data.text;
 		file = draft.data.file;
@@ -277,7 +322,7 @@ defineExpose({
 		list-style: none;
 
 		&:after {
-			content: '';
+			content: "";
 			display: block;
 			clear: both;
 		}
@@ -354,7 +399,7 @@ defineExpose({
 		}
 	}
 
-	input[type=file] {
+	input[type="file"] {
 		display: none;
 	}
 }
diff --git a/packages/client/src/pages/messaging/messaging-room.message.vue b/packages/client/src/pages/messaging/messaging-room.message.vue
index d28128506..e8cffc061 100644
--- a/packages/client/src/pages/messaging/messaging-room.message.vue
+++ b/packages/client/src/pages/messaging/messaging-room.message.vue
@@ -1,50 +1,93 @@
 <template>
-<div v-size="{ max: [400, 500] }" class="thvuemwp" :class="{ isMe }">
-	<MkAvatar v-if="!isMe" class="avatar" :user="message.user" :show-indicator="true"/>
-	<div class="content">
-		<div class="balloon" :class="{ noText: message.text == null }">
-			<button v-if="isMe" class="delete-button" :title="i18n.ts.delete" @click="del">
-				<img src="/client-assets/remove.png" alt="Delete"/>
-			</button>
-			<div v-if="!message.isDeleted" class="content">
-				<Mfm v-if="message.text" ref="text" class="text" :text="message.text" :i="$i"/>
+	<div v-size="{ max: [400, 500] }" class="thvuemwp" :class="{ isMe }">
+		<MkAvatar
+			v-if="!isMe"
+			class="avatar"
+			:user="message.user"
+			:show-indicator="true"
+		/>
+		<div class="content">
+			<div class="balloon" :class="{ noText: message.text == null }">
+				<button
+					v-if="isMe"
+					class="delete-button"
+					:title="i18n.ts.delete"
+					@click="del"
+				>
+					<img src="/client-assets/remove.png" alt="Delete" />
+				</button>
+				<div v-if="!message.isDeleted" class="content">
+					<Mfm
+						v-if="message.text"
+						ref="text"
+						class="text"
+						:text="message.text"
+						:i="$i"
+					/>
+				</div>
+				<div v-else class="content">
+					<p class="is-deleted">{{ i18n.ts.deleted }}</p>
+				</div>
 			</div>
-			<div v-else class="content">
-				<p class="is-deleted">{{ i18n.ts.deleted }}</p>
+			<div v-if="message.file" class="file" width="400px">
+				<XMediaList
+					v-if="
+						message.file.type.split('/')[0] == 'image' ||
+						message.file.type.split('/')[0] == 'video'
+					"
+					:in-dm="true"
+					width="400px"
+					:media-list="[message.file]"
+					style="border-radius: 5px"
+				/>
+				<a
+					v-else
+					:href="message.file.url"
+					rel="noopener"
+					target="_blank"
+					:title="message.file.name"
+				>
+					<p>{{ message.file.name }}</p>
+				</a>
 			</div>
+			<div></div>
+			<MkUrlPreview
+				v-for="url in urls"
+				:key="url"
+				:url="url"
+				style="margin: 8px 0"
+			/>
+			<footer>
+				<template v-if="isGroup">
+					<span v-if="message.reads.length > 0" class="read"
+						>{{ i18n.ts.messageRead }}
+						{{ message.reads.length }}</span
+					>
+				</template>
+				<template v-else>
+					<span v-if="isMe && message.isRead" class="read">{{
+						i18n.ts.messageRead
+					}}</span>
+				</template>
+				<MkTime :time="message.createdAt" />
+				<template v-if="message.is_edited"
+					><i class="ph-pencil ph-bold ph-lg"></i
+				></template>
+			</footer>
 		</div>
-		<div v-if="message.file" class="file" width="400px">
-			<XMediaList v-if="message.file.type.split('/')[0] == 'image' || message.file.type.split('/')[0] == 'video'" :in-dm="true" width="400px" :media-list="[message.file]" style="border-radius: 5px"/>
-			<a v-else :href="message.file.url" rel="noopener" target="_blank" :title="message.file.name">
-				<p>{{ message.file.name }}</p>
-			</a>
-		</div>
-		<div></div>
-		<MkUrlPreview v-for="url in urls" :key="url" :url="url" style="margin: 8px 0;"/>
-		<footer>
-			<template v-if="isGroup">
-				<span v-if="message.reads.length > 0" class="read">{{ i18n.ts.messageRead }} {{ message.reads.length }}</span>
-			</template>
-			<template v-else>
-				<span v-if="isMe && message.isRead" class="read">{{ i18n.ts.messageRead }}</span>
-			</template>
-			<MkTime :time="message.createdAt"/>
-			<template v-if="message.is_edited"><i class="ph-pencil ph-bold ph-lg"></i></template>
-		</footer>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as mfm from 'mfm-js';
-import type * as Misskey from 'calckey-js';
-import XMediaList from '@/components/MkMediaList.vue';
-import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
-import MkUrlPreview from '@/components/MkUrlPreview.vue';
-import * as os from '@/os';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import * as mfm from "mfm-js";
+import type * as Misskey from "calckey-js";
+import XMediaList from "@/components/MkMediaList.vue";
+import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
+import MkUrlPreview from "@/components/MkUrlPreview.vue";
+import * as os from "@/os";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	message: Misskey.entities.MessagingMessage;
@@ -52,10 +95,12 @@ const props = defineProps<{
 }>();
 
 const isMe = $computed(() => props.message.userId === $i?.id);
-const urls = $computed(() => props.message.text ? extractUrlFromMfm(mfm.parse(props.message.text)) : []);
+const urls = $computed(() =>
+	props.message.text ? extractUrlFromMfm(mfm.parse(props.message.text)) : []
+);
 
 function del(): void {
-	os.api('messaging/messages/delete', {
+	os.api("messaging/messages/delete", {
 		messageId: props.message.id,
 	});
 }
@@ -274,13 +319,13 @@ function del(): void {
 				}
 
 				> .content {
-
 					> p.is-deleted {
 						color: rgba(#fff, 0.5);
 					}
 
 					> .text {
-						&, ::v-deep(*) {
+						&,
+						::v-deep(*) {
 							color: var(--fgOnAccent) !important;
 						}
 					}
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 17532cebd..ed3b4e227 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -1,71 +1,116 @@
 <template>
-<div
-	ref="rootEl"
-	class="_section"
-	@dragover.prevent.stop="onDragover"
-	@drop.prevent.stop="onDrop"
->
-	<div class="_content mk-messaging-room">
-		<MkSpacer :content-max="800">
-			<div class="body">
-				<MkPagination v-if="pagination" ref="pagingComponent" :key="userAcct || groupId" :pagination="pagination">
-					<template #empty>
-						<div class="_fullinfo">
-							<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>
-							<div>{{ i18n.ts.noMessagesYet }}</div>
-						</div>
-					</template>
-					<template #default="{ items: messages, fetching: pFetching }">
-						<XList
-							v-if="messages.length > 0"
-							v-slot="{ item: message }"
-							:class="{ messages: true, 'deny-move-transition': pFetching }"
-							:items="messages"
-							direction="up"
-							reversed
-						>
-							<XMessage :key="message.id" :message="message" :is-group="group != null"/>
-						</XList>
-					</template>
-				</MkPagination>
-			</div>
-			<footer>
-				<div v-if="typers.length > 0" class="typers">
-					<I18n :src="i18n.ts.typingUsers" text-tag="span" class="users">
-						<template #users>
-							<b v-for="typer in typers" :key="typer.id" class="user">{{ typer.username }}</b>
+	<div
+		ref="rootEl"
+		class="_section"
+		@dragover.prevent.stop="onDragover"
+		@drop.prevent.stop="onDrop"
+	>
+		<div class="_content mk-messaging-room">
+			<MkSpacer :content-max="800">
+				<div class="body">
+					<MkPagination
+						v-if="pagination"
+						ref="pagingComponent"
+						:key="userAcct || groupId"
+						:pagination="pagination"
+					>
+						<template #empty>
+							<div class="_fullinfo">
+								<img
+									src="/static-assets/badges/info.png"
+									class="_ghost"
+									alt="Info"
+								/>
+								<div>{{ i18n.ts.noMessagesYet }}</div>
+							</div>
 						</template>
-					</I18n>
-					<MkEllipsis/>
+						<template
+							#default="{ items: messages, fetching: pFetching }"
+						>
+							<XList
+								v-if="messages.length > 0"
+								v-slot="{ item: message }"
+								:class="{
+									messages: true,
+									'deny-move-transition': pFetching,
+								}"
+								:items="messages"
+								direction="up"
+								reversed
+							>
+								<XMessage
+									:key="message.id"
+									:message="message"
+									:is-group="group != null"
+								/>
+							</XList>
+						</template>
+					</MkPagination>
 				</div>
-				<transition :name="animation ? 'fade' : ''">
-					<div v-show="showIndicator" class="new-message">
-						<button class="_buttonPrimary" @click="onIndicatorClick"><i class="fas ph-fw ph-lg ph-arrow-circle-down ph-bold ph-lg"></i>{{ i18n.ts.newMessageExists }}</button>
+				<footer>
+					<div v-if="typers.length > 0" class="typers">
+						<I18n
+							:src="i18n.ts.typingUsers"
+							text-tag="span"
+							class="users"
+						>
+							<template #users>
+								<b
+									v-for="typer in typers"
+									:key="typer.id"
+									class="user"
+									>{{ typer.username }}</b
+								>
+							</template>
+						</I18n>
+						<MkEllipsis />
 					</div>
-				</transition>
-				<XForm v-if="!fetching" ref="formEl" :user="user" :group="group" class="form"/>
-			</footer>
-		</MkSpacer>
+					<transition :name="animation ? 'fade' : ''">
+						<div v-show="showIndicator" class="new-message">
+							<button
+								class="_buttonPrimary"
+								@click="onIndicatorClick"
+							>
+								<i
+									class="fas ph-fw ph-lg ph-arrow-circle-down ph-bold ph-lg"
+								></i
+								>{{ i18n.ts.newMessageExists }}
+							</button>
+						</div>
+					</transition>
+					<XForm
+						v-if="!fetching"
+						ref="formEl"
+						:user="user"
+						:group="group"
+						class="form"
+					/>
+				</footer>
+			</MkSpacer>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, onMounted, nextTick, onBeforeUnmount } from 'vue';
-import * as Misskey from 'calckey-js';
-import * as Acct from 'calckey-js/built/acct';
-import XMessage from './messaging-room.message.vue';
-import XForm from './messaging-room.form.vue';
-import XList from '@/components/MkDateSeparatedList.vue';
-import MkPagination, { Paging } from '@/components/MkPagination.vue';
-import { isBottomVisible, onScrollBottom, scrollToBottom } from '@/scripts/scroll';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import * as sound from '@/scripts/sound';
-import { i18n } from '@/i18n';
-import { $i } from '@/account';
-import { defaultStore } from '@/store';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, watch, onMounted, nextTick, onBeforeUnmount } from "vue";
+import * as Misskey from "calckey-js";
+import * as Acct from "calckey-js/built/acct";
+import XMessage from "./messaging-room.message.vue";
+import XForm from "./messaging-room.form.vue";
+import XList from "@/components/MkDateSeparatedList.vue";
+import MkPagination, { Paging } from "@/components/MkPagination.vue";
+import {
+	isBottomVisible,
+	onScrollBottom,
+	scrollToBottom,
+} from "@/scripts/scroll";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import * as sound from "@/scripts/sound";
+import { i18n } from "@/i18n";
+import { $i } from "@/account";
+import { defaultStore } from "@/store";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const props = defineProps<{
 	userAcct?: string;
@@ -80,11 +125,11 @@ let fetching = $ref(true);
 let user: Misskey.entities.UserDetailed | null = $ref(null);
 let group: Misskey.entities.UserGroup | null = $ref(null);
 let typers: Misskey.entities.User[] = $ref([]);
-let connection: Misskey.ChannelConnection<Misskey.Channels['messaging']> | null = $ref(null);
+let connection: Misskey.ChannelConnection<
+	Misskey.Channels["messaging"]
+> | null = $ref(null);
 let showIndicator = $ref(false);
-const {
-	animation,
-} = defaultStore.reactiveState;
+const { animation } = defaultStore.reactiveState;
 
 let pagination: Paging | null = $ref(null);
 
@@ -98,11 +143,14 @@ async function fetch() {
 
 	if (props.userAcct) {
 		const acct = Acct.parse(props.userAcct);
-		user = await os.api('users/show', { username: acct.username, host: acct.host || undefined });
+		user = await os.api("users/show", {
+			username: acct.username,
+			host: acct.host || undefined,
+		});
 		group = null;
 
 		pagination = {
-			endpoint: 'messaging/messages',
+			endpoint: "messaging/messages",
 			limit: 20,
 			params: {
 				userId: user.id,
@@ -110,15 +158,15 @@ async function fetch() {
 			reversed: true,
 			pageEl: $$(rootEl).value,
 		};
-		connection = stream.useChannel('messaging', {
+		connection = stream.useChannel("messaging", {
 			otherparty: user.id,
 		});
 	} else {
 		user = null;
-		group = await os.api('users/groups/show', { groupId: props.groupId });
+		group = await os.api("users/groups/show", { groupId: props.groupId });
 
 		pagination = {
-			endpoint: 'messaging/messages',
+			endpoint: "messaging/messages",
 			limit: 20,
 			params: {
 				groupId: group?.id,
@@ -126,19 +174,19 @@ async function fetch() {
 			reversed: true,
 			pageEl: $$(rootEl).value,
 		};
-		connection = stream.useChannel('messaging', {
+		connection = stream.useChannel("messaging", {
 			group: group?.id,
 		});
 	}
 
-	connection.on('message', onMessage);
-	connection.on('read', onRead);
-	connection.on('deleted', onDeleted);
-	connection.on('typers', _typers => {
-		typers = _typers.filter(u => u.id !== $i?.id);
+	connection.on("message", onMessage);
+	connection.on("read", onRead);
+	connection.on("deleted", onDeleted);
+	connection.on("typers", (_typers) => {
+		typers = _typers.filter((u) => u.id !== $i?.id);
 	});
 
-	document.addEventListener('visibilitychange', onVisibilitychange);
+	document.addEventListener("visibilitychange", onVisibilitychange);
 
 	nextTick(() => {
 		// thisScrollToBottom();
@@ -151,13 +199,14 @@ async function fetch() {
 function onDragover(ev: DragEvent) {
 	if (!ev.dataTransfer) return;
 
-	const isFile = ev.dataTransfer.items[0].kind === 'file';
+	const isFile = ev.dataTransfer.items[0].kind === "file";
 	const isDriveFile = ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FILE_;
 
 	if (isFile || isDriveFile) {
-		ev.dataTransfer.dropEffect = ev.dataTransfer.effectAllowed === 'all' ? 'copy' : 'move';
+		ev.dataTransfer.dropEffect =
+			ev.dataTransfer.effectAllowed === "all" ? "copy" : "move";
 	} else {
-		ev.dataTransfer.dropEffect = 'none';
+		ev.dataTransfer.dropEffect = "none";
 	}
 }
 
@@ -170,7 +219,7 @@ function onDrop(ev: DragEvent): void {
 		return;
 	} else if (ev.dataTransfer.files.length > 1) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: i18n.ts.onlyOneFileCanBeAttached,
 		});
 		return;
@@ -178,7 +227,7 @@ function onDrop(ev: DragEvent): void {
 
 	//#region ドライブのファイル
 	const driveFile = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
-	if (driveFile != null && driveFile !== '') {
+	if (driveFile != null && driveFile !== "") {
 		const file = JSON.parse(driveFile);
 		formEl.file = file;
 	}
@@ -186,13 +235,13 @@ function onDrop(ev: DragEvent): void {
 }
 
 function onMessage(message) {
-	sound.play('chat');
+	sound.play("chat");
 
 	const _isBottom = isBottomVisible(rootEl, 64);
 
 	pagingComponent.prepend(message);
 	if (message.userId !== $i?.id && !document.hidden) {
-		connection?.send('read', {
+		connection?.send("read", {
 			id: message.id,
 		});
 	}
@@ -212,8 +261,10 @@ function onRead(x) {
 	if (user) {
 		if (!Array.isArray(x)) x = [x];
 		for (const id of x) {
-			if (pagingComponent.items.some(y => y.id === id)) {
-				const exist = pagingComponent.items.map(y => y.id).indexOf(id);
+			if (pagingComponent.items.some((y) => y.id === id)) {
+				const exist = pagingComponent.items
+					.map((y) => y.id)
+					.indexOf(id);
 				pagingComponent.items[exist] = {
 					...pagingComponent.items[exist],
 					isRead: true,
@@ -222,8 +273,10 @@ function onRead(x) {
 		}
 	} else if (group) {
 		for (const id of x.ids) {
-			if (pagingComponent.items.some(y => y.id === id)) {
-				const exist = pagingComponent.items.map(y => y.id).indexOf(id);
+			if (pagingComponent.items.some((y) => y.id === id)) {
+				const exist = pagingComponent.items
+					.map((y) => y.id)
+					.indexOf(id);
 				pagingComponent.items[exist] = {
 					...pagingComponent.items[exist],
 					reads: [...pagingComponent.items[exist].reads, x.userId],
@@ -234,15 +287,17 @@ function onRead(x) {
 }
 
 function onDeleted(id) {
-	const msg = pagingComponent.items.find(m => m.id === id);
+	const msg = pagingComponent.items.find((m) => m.id === id);
 	if (msg) {
-		pagingComponent.items = pagingComponent.items.filter(m => m.id !== msg.id);
+		pagingComponent.items = pagingComponent.items.filter(
+			(m) => m.id !== msg.id
+		);
 	}
 }
 
 function thisScrollToBottom() {
-	if (window.location.href.includes('my/messaging/')) {
-		scrollToBottom($$(rootEl).value, { behavior: 'smooth' });
+	if (window.location.href.includes("my/messaging/")) {
+		scrollToBottom($$(rootEl).value, { behavior: "smooth" });
 	}
 }
 
@@ -266,7 +321,7 @@ function onVisibilitychange() {
 	if (document.hidden) return;
 	for (const message of pagingComponent.items) {
 		if (message.userId !== $i?.id && !message.isRead) {
-			connection?.send('read', {
+			connection?.send("read", {
 				id: message.id,
 			});
 		}
@@ -275,21 +330,22 @@ function onVisibilitychange() {
 
 onMounted(() => {
 	fetch();
-	definePageMetadata(computed(() => ({
-		title: group != null ? group.name : user?.name,
-		icon: 'ph-chats-teardrop ph-bold ph-lg',
-	})));
+	definePageMetadata(
+		computed(() => ({
+			title: group != null ? group.name : user?.name,
+			icon: "ph-chats-teardrop ph-bold ph-lg",
+		}))
+	);
 });
 
 onBeforeUnmount(() => {
 	connection?.dispose();
-	document.removeEventListener('visibilitychange', onVisibilitychange);
+	document.removeEventListener("visibilitychange", onVisibilitychange);
 	if (scrollRemove) scrollRemove();
 });
 </script>
 
 <style lang="scss" scoped>
-
 XMessage:last-of-type {
 	margin-bottom: 4rem;
 }
@@ -389,11 +445,13 @@ XMessage:last-of-type {
 	}
 }
 
-.fade-enter-active, .fade-leave-active {
+.fade-enter-active,
+.fade-leave-active {
 	transition: opacity 0.1s;
 }
 
-.fade-enter-from, .fade-leave-to {
+.fade-enter-from,
+.fade-leave-to {
 	transition: opacity 0.5s;
 	opacity: 0;
 }
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 061bf9b2f..1f3f0bea2 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -1,121 +1,143 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader/></template>
-	<MkSpacer :content-max="800">
-		<div class="mwysmxbg">
-			<div>{{ i18n.ts._mfm.intro }}</div>
-			<br/>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.mention }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.mentionDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_mention"/>
-						<MkTextarea v-model="preview_mention"><template #label>MFM</template></MkTextarea>
+	<MkStickyContainer>
+		<template #header><MkPageHeader /></template>
+		<MkSpacer :content-max="800">
+			<div class="mwysmxbg">
+				<div>{{ i18n.ts._mfm.intro }}</div>
+				<br />
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.mention }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.mentionDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_mention" />
+							<MkTextarea v-model="preview_mention"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.hashtag }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.hashtagDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_hashtag"/>
-						<MkTextarea v-model="preview_hashtag"><template #label>MFM</template></MkTextarea>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.hashtag }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.hashtagDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_hashtag" />
+							<MkTextarea v-model="preview_hashtag"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.link }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.linkDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_link"/>
-						<MkTextarea v-model="preview_link"><template #label>MFM</template></MkTextarea>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.link }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.linkDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_link" />
+							<MkTextarea v-model="preview_link"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.emoji }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.emojiDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_emoji"/>
-						<MkTextarea v-model="preview_emoji"><template #label>MFM</template></MkTextarea>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.emoji }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.emojiDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_emoji" />
+							<MkTextarea v-model="preview_emoji"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.bold }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.boldDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_bold"/>
-						<MkTextarea v-model="preview_bold"><template #label>MFM</template></MkTextarea>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.bold }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.boldDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_bold" />
+							<MkTextarea v-model="preview_bold"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.small }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.smallDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_small"/>
-						<MkTextarea v-model="preview_small"><template #label>MFM</template></MkTextarea>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.small }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.smallDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_small" />
+							<MkTextarea v-model="preview_small"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.quote }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.quoteDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_quote"/>
-						<MkTextarea v-model="preview_quote"><template #label>MFM</template></MkTextarea>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.quote }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.quoteDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_quote" />
+							<MkTextarea v-model="preview_quote"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.center }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.centerDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_center"/>
-						<MkTextarea v-model="preview_center"><template #label>MFM</template></MkTextarea>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.center }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.centerDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_center" />
+							<MkTextarea v-model="preview_center"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.inlineCode }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.inlineCodeDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_inlineCode"/>
-						<MkTextarea v-model="preview_inlineCode"><template #label>MFM</template></MkTextarea>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.inlineCode }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.inlineCodeDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_inlineCode" />
+							<MkTextarea v-model="preview_inlineCode"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.blockCode }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.blockCodeDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_blockCode"/>
-						<MkTextarea v-model="preview_blockCode"><template #label>MFM</template></MkTextarea>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.blockCode }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.blockCodeDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_blockCode" />
+							<MkTextarea v-model="preview_blockCode"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.inlineMath }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.inlineMathDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_inlineMath"/>
-						<MkTextarea v-model="preview_inlineMath"><template #label>MFM</template></MkTextarea>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.inlineMath }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.inlineMathDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_inlineMath" />
+							<MkTextarea v-model="preview_inlineMath"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
-			</div>
-			<!-- deprecated
+				<!-- deprecated
 		<div class="section _block">
 			<div class="title">{{ i18n.ts._mfm.search }}</div>
 			<div class="content">
@@ -127,221 +149,267 @@
 			</div>
 		</div>
 		-->
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.flip }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.flipDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_flip"/>
-						<MkTextarea v-model="preview_flip"><template #label>MFM</template></MkTextarea>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.flip }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.flipDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_flip" />
+							<MkTextarea v-model="preview_flip"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.font }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.fontDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_font" />
+							<MkTextarea v-model="preview_font"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.x2 }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.x2Description }}</p>
+						<div class="preview">
+							<Mfm :text="preview_x2" />
+							<MkTextarea v-model="preview_x2"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.x3 }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.x3Description }}</p>
+						<div class="preview">
+							<Mfm :text="preview_x3" />
+							<MkTextarea v-model="preview_x3"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.x4 }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.x4Description }}</p>
+						<div class="preview">
+							<Mfm :text="preview_x4" />
+							<MkTextarea v-model="preview_x4"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.blur }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.blurDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_blur" />
+							<MkTextarea v-model="preview_blur"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.jelly }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.jellyDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_jelly" />
+							<MkTextarea v-model="preview_jelly"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.tada }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.tadaDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_tada" />
+							<MkTextarea v-model="preview_tada"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.jump }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.jumpDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_jump" />
+							<MkTextarea v-model="preview_jump"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.bounce }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.bounceDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_bounce" />
+							<MkTextarea v-model="preview_bounce"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.spin }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.spinDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_spin" />
+							<MkTextarea v-model="preview_spin"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.shake }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.shakeDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_shake" />
+							<MkTextarea v-model="preview_shake"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.twitch }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.twitchDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_twitch" />
+							<MkTextarea v-model="preview_twitch"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.rainbow }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.rainbowDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_rainbow" />
+							<MkTextarea v-model="preview_rainbow"
+								><template #label>MFM</template></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.sparkle }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.sparkleDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_sparkle" />
+							<MkTextarea v-model="preview_sparkle"
+								><span>MFM</span></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.rotate }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.rotateDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_rotate" />
+							<MkTextarea v-model="preview_rotate"
+								><span>MFM</span></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.plain }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.plainDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_plain" />
+							<MkTextarea v-model="preview_plain"
+								><span>MFM</span></MkTextarea
+							>
+						</div>
 					</div>
 				</div>
 			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.font }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.fontDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_font"/>
-						<MkTextarea v-model="preview_font"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.x2 }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.x2Description }}</p>
-					<div class="preview">
-						<Mfm :text="preview_x2"/>
-						<MkTextarea v-model="preview_x2"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.x3 }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.x3Description }}</p>
-					<div class="preview">
-						<Mfm :text="preview_x3"/>
-						<MkTextarea v-model="preview_x3"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.x4 }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.x4Description }}</p>
-					<div class="preview">
-						<Mfm :text="preview_x4"/>
-						<MkTextarea v-model="preview_x4"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.blur }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.blurDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_blur"/>
-						<MkTextarea v-model="preview_blur"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.jelly }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.jellyDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_jelly"/>
-						<MkTextarea v-model="preview_jelly"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.tada }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.tadaDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_tada"/>
-						<MkTextarea v-model="preview_tada"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.jump }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.jumpDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_jump"/>
-						<MkTextarea v-model="preview_jump"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.bounce }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.bounceDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_bounce"/>
-						<MkTextarea v-model="preview_bounce"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.spin }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.spinDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_spin"/>
-						<MkTextarea v-model="preview_spin"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.shake }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.shakeDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_shake"/>
-						<MkTextarea v-model="preview_shake"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.twitch }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.twitchDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_twitch"/>
-						<MkTextarea v-model="preview_twitch"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.rainbow }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.rainbowDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_rainbow"/>
-						<MkTextarea v-model="preview_rainbow"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.sparkle }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.sparkleDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_sparkle"/>
-						<MkTextarea v-model="preview_sparkle"><span>MFM</span></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.rotate }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.rotateDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_rotate"/>
-						<MkTextarea v-model="preview_rotate"><span>MFM</span></MkTextarea>
-					</div>
-				</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.plain }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.plainDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_plain"/>
-						<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
-					</div>
-				</div>
-			</div>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { defineComponent } from 'vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
-import { instance } from '@/instance';
+import { defineComponent } from "vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
+import { instance } from "@/instance";
 
-let preview_mention = $ref('@example');
-let preview_hashtag = $ref('#test');
+let preview_mention = $ref("@example");
+let preview_hashtag = $ref("#test");
 let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://example.com)`);
-let preview_emoji = $ref(instance.emojis.length ? `:${instance.emojis[0].name}:` : ':emojiname:');
+let preview_emoji = $ref(
+	instance.emojis.length ? `:${instance.emojis[0].name}:` : ":emojiname:"
+);
 let preview_bold = $ref(`**${i18n.ts._mfm.dummy}**`);
 let preview_small = $ref(`<small>${i18n.ts._mfm.dummy}</small>`);
 let preview_center = $ref(`<center>${i18n.ts._mfm.dummy}</center>`);
 let preview_inlineCode = $ref('`<: "Hello, world!"`');
-let preview_blockCode = $ref('```\n~ (#i, 100) {\n\t<: ? ((i % 15) = 0) "FizzBuzz"\n\t\t.? ((i % 3) = 0) "Fizz"\n\t\t.? ((i % 5) = 0) "Buzz"\n\t\t. i\n}\n```');
-let preview_inlineMath = $ref('\\(x= \\frac{-b\' \\pm \\sqrt{(b\')^2-ac}}{a}\\)');
+let preview_blockCode = $ref(
+	'```\n~ (#i, 100) {\n\t<: ? ((i % 15) = 0) "FizzBuzz"\n\t\t.? ((i % 3) = 0) "Fizz"\n\t\t.? ((i % 5) = 0) "Buzz"\n\t\t. i\n}\n```'
+);
+let preview_inlineMath = $ref("\\(x= \\frac{-b' \\pm \\sqrt{(b')^2-ac}}{a}\\)");
 let preview_quote = $ref(`> ${i18n.ts._mfm.dummy}`);
 let preview_search = $ref(`${i18n.ts._mfm.dummy} 検索`);
-let preview_jelly = $ref('$[jelly 🍮] $[jelly.speed=5s 🍮]');
-let preview_tada = $ref('$[tada 🍮] $[tada.speed=5s 🍮]');
-let preview_jump = $ref('$[jump 🍮] $[jump.speed=5s 🍮]');
-let preview_bounce = $ref('$[bounce 🍮] $[bounce.speed=5s 🍮]');
-let preview_shake = $ref('$[shake 🍮] $[shake.speed=5s 🍮]');
-let preview_twitch = $ref('$[twitch 🍮] $[twitch.speed=5s 🍮]');
-let preview_spin = $ref('$[spin 🍮] $[spin.left 🍮] $[spin.alternate 🍮]\n$[spin.x 🍮] $[spin.x,left 🍮] $[spin.x,alternate 🍮]\n$[spin.y 🍮] $[spin.y,left 🍮] $[spin.y,alternate 🍮]\n\n$[spin.speed=5s 🍮]');
-let preview_flip = $ref(`$[flip ${i18n.ts._mfm.dummy}]\n$[flip.v ${i18n.ts._mfm.dummy}]\n$[flip.h,v ${i18n.ts._mfm.dummy}]`);
-let preview_font = $ref(`$[font.serif ${i18n.ts._mfm.dummy}]\n$[font.monospace ${i18n.ts._mfm.dummy}]\n$[font.cursive ${i18n.ts._mfm.dummy}]\n$[font.fantasy ${i18n.ts._mfm.dummy}]`);
-let preview_x2 = $ref('$[x2 🍮]');
-let preview_x3 = $ref('$[x3 🍮]');
-let preview_x4 = $ref('$[x4 🍮]');
+let preview_jelly = $ref("$[jelly 🍮] $[jelly.speed=5s 🍮]");
+let preview_tada = $ref("$[tada 🍮] $[tada.speed=5s 🍮]");
+let preview_jump = $ref("$[jump 🍮] $[jump.speed=5s 🍮]");
+let preview_bounce = $ref("$[bounce 🍮] $[bounce.speed=5s 🍮]");
+let preview_shake = $ref("$[shake 🍮] $[shake.speed=5s 🍮]");
+let preview_twitch = $ref("$[twitch 🍮] $[twitch.speed=5s 🍮]");
+let preview_spin = $ref(
+	"$[spin 🍮] $[spin.left 🍮] $[spin.alternate 🍮]\n$[spin.x 🍮] $[spin.x,left 🍮] $[spin.x,alternate 🍮]\n$[spin.y 🍮] $[spin.y,left 🍮] $[spin.y,alternate 🍮]\n\n$[spin.speed=5s 🍮]"
+);
+let preview_flip = $ref(
+	`$[flip ${i18n.ts._mfm.dummy}]\n$[flip.v ${i18n.ts._mfm.dummy}]\n$[flip.h,v ${i18n.ts._mfm.dummy}]`
+);
+let preview_font = $ref(
+	`$[font.serif ${i18n.ts._mfm.dummy}]\n$[font.monospace ${i18n.ts._mfm.dummy}]\n$[font.cursive ${i18n.ts._mfm.dummy}]\n$[font.fantasy ${i18n.ts._mfm.dummy}]`
+);
+let preview_x2 = $ref("$[x2 🍮]");
+let preview_x3 = $ref("$[x3 🍮]");
+let preview_x4 = $ref("$[x4 🍮]");
 let preview_blur = $ref(`$[blur ${i18n.ts._mfm.dummy}]`);
-let preview_rainbow = $ref('$[rainbow 🍮] $[rainbow.speed=5s 🍮]');
-let preview_sparkle = $ref('$[sparkle 🍮]');
-let preview_rotate = $ref('$[rotate 🍮]');
-let preview_plain = $ref('<plain>**bold** @mention #hashtag `code` $[x2 🍮]</plain>');
+let preview_rainbow = $ref("$[rainbow 🍮] $[rainbow.speed=5s 🍮]");
+let preview_sparkle = $ref("$[sparkle 🍮]");
+let preview_rotate = $ref("$[rotate 🍮]");
+let preview_plain = $ref(
+	"<plain>**bold** @mention #hashtag `code` $[x2 🍮]</plain>"
+);
 
 definePageMetadata({
 	title: i18n.ts._mfm.cheatSheet,
-	icon: 'ph-question ph-bold ph-lg',
+	icon: "ph-question ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/miauth.vue b/packages/client/src/pages/miauth.vue
index a71c7b9a5..bf4c2542f 100644
--- a/packages/client/src/pages/miauth.vue
+++ b/packages/client/src/pages/miauth.vue
@@ -1,51 +1,63 @@
 <template>
-<MkSpacer :content-max="800">
-	<div v-if="$i">
-		<div v-if="state == 'waiting'" class="waiting _section">
-			<div class="_content">
-				<MkLoading/>
+	<MkSpacer :content-max="800">
+		<div v-if="$i">
+			<div v-if="state == 'waiting'" class="waiting _section">
+				<div class="_content">
+					<MkLoading />
+				</div>
+			</div>
+			<div v-if="state == 'denied'" class="denied _section">
+				<div class="_content">
+					<p>{{ i18n.ts._auth.denied }}</p>
+				</div>
+			</div>
+			<div v-else-if="state == 'accepted'" class="accepted _section">
+				<div class="_content">
+					<p v-if="callback">
+						{{ i18n.ts._auth.callback }}<MkEllipsis />
+					</p>
+					<p v-else>{{ i18n.ts._auth.pleaseGoBack }}</p>
+				</div>
+			</div>
+			<div v-else class="_section">
+				<div v-if="name" class="_title">
+					{{ i18n.t("_auth.shareAccess", { name: name }) }}
+				</div>
+				<div v-else class="_title">
+					{{ i18n.ts._auth.shareAccessAsk }}
+				</div>
+				<div class="_content">
+					<p>{{ i18n.ts._auth.permissionAsk }}</p>
+					<ul>
+						<li v-for="p in _permissions" :key="p">
+							{{ i18n.t(`_permissions.${p}`) }}
+						</li>
+					</ul>
+				</div>
+				<div class="_footer">
+					<MkButton inline @click="deny">{{
+						i18n.ts.cancel
+					}}</MkButton>
+					<MkButton inline primary @click="accept">{{
+						i18n.ts.accept
+					}}</MkButton>
+				</div>
 			</div>
 		</div>
-		<div v-if="state == 'denied'" class="denied _section">
-			<div class="_content">
-				<p>{{ i18n.ts._auth.denied }}</p>
-			</div>
+		<div v-else class="signin">
+			<MkSignin @login="onLogin" />
 		</div>
-		<div v-else-if="state == 'accepted'" class="accepted _section">
-			<div class="_content">
-				<p v-if="callback">{{ i18n.ts._auth.callback }}<MkEllipsis/></p>
-				<p v-else>{{ i18n.ts._auth.pleaseGoBack }}</p>
-			</div>
-		</div>
-		<div v-else class="_section">
-			<div v-if="name" class="_title">{{ i18n.t('_auth.shareAccess', { name: name }) }}</div>
-			<div v-else class="_title">{{ i18n.ts._auth.shareAccessAsk }}</div>
-			<div class="_content">
-				<p>{{ i18n.ts._auth.permissionAsk }}</p>
-				<ul>
-					<li v-for="p in _permissions" :key="p">{{ i18n.t(`_permissions.${p}`) }}</li>
-				</ul>
-			</div>
-			<div class="_footer">
-				<MkButton inline @click="deny">{{ i18n.ts.cancel }}</MkButton>
-				<MkButton inline primary @click="accept">{{ i18n.ts.accept }}</MkButton>
-			</div>
-		</div>
-	</div>
-	<div v-else class="signin">
-		<MkSignin @login="onLogin"/>
-	</div>
-</MkSpacer>
+	</MkSpacer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkSignin from '@/components/MkSignin.vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { $i, login } from '@/account';
-import { appendQuery, query } from '@/scripts/url';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import MkSignin from "@/components/MkSignin.vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { $i, login } from "@/account";
+import { appendQuery, query } from "@/scripts/url";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	session: string;
@@ -55,31 +67,39 @@ const props = defineProps<{
 	permission: string; // コンマ区切り
 }>();
 
-const _permissions = props.permission.split(',');
+const _permissions = props.permission.split(",");
 
 let state = $ref<string | null>(null);
 
 async function accept(): Promise<void> {
-	state = 'waiting';
-	await os.api('miauth/gen-token', {
+	state = "waiting";
+	await os.api("miauth/gen-token", {
 		session: props.session,
 		name: props.name,
 		iconUrl: props.icon,
 		permission: _permissions,
 	});
 
-	state = 'accepted';
+	state = "accepted";
 	if (props.callback) {
 		const cbUrl = new URL(props.callback);
-		if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:'].includes(cbUrl.protocol)) throw new Error('invalid url');
-		location.href = appendQuery(props.callback, query({
-			session: props.session,
-		}));
+		if (
+			["javascript:", "file:", "data:", "mailto:", "tel:"].includes(
+				cbUrl.protocol
+			)
+		)
+			throw new Error("invalid url");
+		location.href = appendQuery(
+			props.callback,
+			query({
+				session: props.session,
+			})
+		);
 	}
 }
 
 function deny(): void {
-	state = 'denied';
+	state = "denied";
 }
 
 function onLogin(res): void {
@@ -87,6 +107,4 @@ function onLogin(res): void {
 }
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/my-antennas/create.vue b/packages/client/src/pages/my-antennas/create.vue
index 121c91300..c0d838629 100644
--- a/packages/client/src/pages/my-antennas/create.vue
+++ b/packages/client/src/pages/my-antennas/create.vue
@@ -1,20 +1,20 @@
 <template>
-<div class="geegznzt">
-	<XAntenna :antenna="draft" @created="onAntennaCreated"/>
-</div>
+	<div class="geegznzt">
+		<XAntenna :antenna="draft" @created="onAntennaCreated" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import XAntenna from './editor.vue';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { useRouter } from '@/router';
+import XAntenna from "./editor.vue";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { useRouter } from "@/router";
 
 const router = useRouter();
 
 let draft = $ref({
-	name: '',
-	src: 'all',
+	name: "",
+	src: "all",
 	userListId: null,
 	userGroupId: null,
 	users: [],
@@ -28,15 +28,13 @@ let draft = $ref({
 });
 
 function onAntennaCreated() {
-	router.push('/my/antennas');
+	router.push("/my/antennas");
 }
 
 definePageMetadata({
 	title: i18n.ts.manageAntennas,
-	icon: 'ph-flying-saucer ph-bold ph-lg',
+	icon: "ph-flying-saucer ph-bold ph-lg",
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/my-antennas/edit.vue b/packages/client/src/pages/my-antennas/edit.vue
index 7ba6c9776..97c433f90 100644
--- a/packages/client/src/pages/my-antennas/edit.vue
+++ b/packages/client/src/pages/my-antennas/edit.vue
@@ -1,32 +1,38 @@
 <template>
-<div class="">
-	<XAntenna v-if="antenna" :antenna="antenna" @updated="onAntennaUpdated"/>
-</div>
+	<div class="">
+		<XAntenna
+			v-if="antenna"
+			:antenna="antenna"
+			@updated="onAntennaUpdated"
+		/>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { inject, watch } from 'vue';
-import XAntenna from './editor.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { useRouter } from '@/router';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { inject, watch } from "vue";
+import XAntenna from "./editor.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { useRouter } from "@/router";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const router = useRouter();
 
 let antenna: any = $ref(null);
 
 const props = defineProps<{
-	antennaId: string
+	antennaId: string;
 }>();
 
 function onAntennaUpdated() {
-	router.push('/my/antennas');
+	router.push("/my/antennas");
 }
 
-os.api('antennas/show', { antennaId: props.antennaId }).then((antennaResponse) => {
-	antenna = antennaResponse;
-});
+os.api("antennas/show", { antennaId: props.antennaId }).then(
+	(antennaResponse) => {
+		antenna = antennaResponse;
+	}
+);
 
 const headerActions = $computed(() => []);
 
@@ -34,10 +40,8 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.manageAntennas,
-	icon: 'ph-flying-saucer ph-bold ph-lg',
+	icon: "ph-flying-saucer ph-bold ph-lg",
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/my-antennas/editor.vue b/packages/client/src/pages/my-antennas/editor.vue
index 55249f879..27889b4d9 100644
--- a/packages/client/src/pages/my-antennas/editor.vue
+++ b/packages/client/src/pages/my-antennas/editor.vue
@@ -1,83 +1,151 @@
 <template>
-<div class="shaynizk">
-	<div class="form">
-		<MkInput v-model="name" class="_formBlock">
-			<template #label>{{ i18n.ts.name }}</template>
-		</MkInput>
-		<MkSelect v-model="src" class="_formBlock">
-			<template #label>{{ i18n.ts.antennaSource }}</template>
-			<option value="all">{{ i18n.ts._antennaSources.all }}</option>
-			<!--<option value="home">{{ i18n.ts._antennaSources.homeTimeline }}</option>-->
-			<option value="users">{{ i18n.ts._antennaSources.users }}</option>
-			<!--<option value="list">{{ i18n.ts._antennaSources.userList }}</option>-->
-			<!--<option value="group">{{ i18n.ts._antennaSources.userGroup }}</option>-->
-			<option value="instances">{{ i18n.ts._antennaSources.instances }}</option>
-		</MkSelect>
-		<MkSelect v-if="src === 'list'" v-model="userListId" class="_formBlock">
-			<template #label>{{ i18n.ts.userList }}</template>
-			<option v-for="list in userLists" :key="list.id" :value="list.id">{{ list.name }}</option>
-		</MkSelect>
-		<MkSelect v-else-if="src === 'group'" v-model="userGroupId" class="_formBlock">
-			<template #label>{{ i18n.ts.userGroup }}</template>
-			<option v-for="group in userGroups" :key="group.id" :value="group.id">{{ group.name }}</option>
-		</MkSelect>
-		<MkTextarea v-else-if="src === 'users'" v-model="users" class="_formBlock">
-			<template #label>{{ i18n.ts.users }}</template>
-			<template #caption>{{ i18n.ts.antennaUsersDescription }} <button class="_textButton" @click="addUser">{{ i18n.ts.addUser }}</button></template>
-		</MkTextarea>
-		<MkTextarea v-else-if="src === 'instances'" v-model="instances" class="_formBlock">
-			<template #label>{{ i18n.ts.instances }}</template>
-			<template #caption>{{ i18n.ts.antennaInstancesDescription }} <button class="_textButton" @click="addInstance">{{ i18n.ts.addInstance }}</button></template>
-		</MkTextarea>
-		<MkSwitch v-model="withReplies" class="_formBlock">{{ i18n.ts.withReplies }}</MkSwitch>
-		<MkTextarea v-model="keywords" class="_formBlock">
-			<template #label>{{ i18n.ts.antennaKeywords }}</template>
-			<template #caption>{{ i18n.ts.antennaKeywordsDescription }}</template>
-		</MkTextarea>
-		<MkTextarea v-model="excludeKeywords" class="_formBlock">
-			<template #label>{{ i18n.ts.antennaExcludeKeywords }}</template>
-			<template #caption>{{ i18n.ts.antennaKeywordsDescription }}</template>
-		</MkTextarea>
-		<MkSwitch v-model="caseSensitive" class="_formBlock">{{ i18n.ts.caseSensitive }}</MkSwitch>
-		<MkSwitch v-model="withFile" class="_formBlock">{{ i18n.ts.withFileAntenna }}</MkSwitch>
-		<MkSwitch v-model="notify" class="_formBlock">{{ i18n.ts.notifyAntenna }}</MkSwitch>
+	<div class="shaynizk">
+		<div class="form">
+			<MkInput v-model="name" class="_formBlock">
+				<template #label>{{ i18n.ts.name }}</template>
+			</MkInput>
+			<MkSelect v-model="src" class="_formBlock">
+				<template #label>{{ i18n.ts.antennaSource }}</template>
+				<option value="all">{{ i18n.ts._antennaSources.all }}</option>
+				<!--<option value="home">{{ i18n.ts._antennaSources.homeTimeline }}</option>-->
+				<option value="users">
+					{{ i18n.ts._antennaSources.users }}
+				</option>
+				<!--<option value="list">{{ i18n.ts._antennaSources.userList }}</option>-->
+				<!--<option value="group">{{ i18n.ts._antennaSources.userGroup }}</option>-->
+				<option value="instances">
+					{{ i18n.ts._antennaSources.instances }}
+				</option>
+			</MkSelect>
+			<MkSelect
+				v-if="src === 'list'"
+				v-model="userListId"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.userList }}</template>
+				<option
+					v-for="list in userLists"
+					:key="list.id"
+					:value="list.id"
+				>
+					{{ list.name }}
+				</option>
+			</MkSelect>
+			<MkSelect
+				v-else-if="src === 'group'"
+				v-model="userGroupId"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.userGroup }}</template>
+				<option
+					v-for="group in userGroups"
+					:key="group.id"
+					:value="group.id"
+				>
+					{{ group.name }}
+				</option>
+			</MkSelect>
+			<MkTextarea
+				v-else-if="src === 'users'"
+				v-model="users"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.users }}</template>
+				<template #caption
+					>{{ i18n.ts.antennaUsersDescription }}
+					<button class="_textButton" @click="addUser">
+						{{ i18n.ts.addUser }}
+					</button></template
+				>
+			</MkTextarea>
+			<MkTextarea
+				v-else-if="src === 'instances'"
+				v-model="instances"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.instances }}</template>
+				<template #caption
+					>{{ i18n.ts.antennaInstancesDescription }}
+					<button class="_textButton" @click="addInstance">
+						{{ i18n.ts.addInstance }}
+					</button></template
+				>
+			</MkTextarea>
+			<MkSwitch v-model="withReplies" class="_formBlock">{{
+				i18n.ts.withReplies
+			}}</MkSwitch>
+			<MkTextarea v-model="keywords" class="_formBlock">
+				<template #label>{{ i18n.ts.antennaKeywords }}</template>
+				<template #caption>{{
+					i18n.ts.antennaKeywordsDescription
+				}}</template>
+			</MkTextarea>
+			<MkTextarea v-model="excludeKeywords" class="_formBlock">
+				<template #label>{{ i18n.ts.antennaExcludeKeywords }}</template>
+				<template #caption>{{
+					i18n.ts.antennaKeywordsDescription
+				}}</template>
+			</MkTextarea>
+			<MkSwitch v-model="caseSensitive" class="_formBlock">{{
+				i18n.ts.caseSensitive
+			}}</MkSwitch>
+			<MkSwitch v-model="withFile" class="_formBlock">{{
+				i18n.ts.withFileAntenna
+			}}</MkSwitch>
+			<MkSwitch v-model="notify" class="_formBlock">{{
+				i18n.ts.notifyAntenna
+			}}</MkSwitch>
+		</div>
+		<div class="actions">
+			<MkButton inline primary @click="saveAntenna()"
+				><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+				{{ i18n.ts.save }}</MkButton
+			>
+			<MkButton
+				v-if="antenna.id != null"
+				inline
+				danger
+				@click="deleteAntenna()"
+				><i class="ph-trash ph-bold ph-lg"></i>
+				{{ i18n.ts.delete }}</MkButton
+			>
+		</div>
 	</div>
-	<div class="actions">
-		<MkButton inline primary @click="saveAntenna()"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-		<MkButton v-if="antenna.id != null" inline danger @click="deleteAntenna()"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
-	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { watch } from 'vue';
-import * as Acct from 'calckey-js/built/acct';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import MkSelect from '@/components/form/select.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { watch } from "vue";
+import * as Acct from "calckey-js/built/acct";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import MkSelect from "@/components/form/select.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
-	antenna: any
+	antenna: any;
 }>();
 
 const emit = defineEmits<{
-	(ev: 'created'): void,
-	(ev: 'updated'): void,
-	(ev: 'deleted'): void,
+	(ev: "created"): void;
+	(ev: "updated"): void;
+	(ev: "deleted"): void;
 }>();
 
 let name: string = $ref(props.antenna.name);
 let src: string = $ref(props.antenna.src);
 let userListId: any = $ref(props.antenna.userListId);
 let userGroupId: any = $ref(props.antenna.userGroupId);
-let users: string = $ref(props.antenna.users.join('\n'));
-let instances: string = $ref(props.antenna.instances.join('\n'));
-let keywords: string = $ref(props.antenna.keywords.map(x => x.join(' ')).join('\n'));
-let excludeKeywords: string = $ref(props.antenna.excludeKeywords.map(x => x.join(' ')).join('\n'));
+let users: string = $ref(props.antenna.users.join("\n"));
+let instances: string = $ref(props.antenna.instances.join("\n"));
+let keywords: string = $ref(
+	props.antenna.keywords.map((x) => x.join(" ")).join("\n")
+);
+let excludeKeywords: string = $ref(
+	props.antenna.excludeKeywords.map((x) => x.join(" ")).join("\n")
+);
 let caseSensitive: boolean = $ref(props.antenna.caseSensitive);
 let withReplies: boolean = $ref(props.antenna.withReplies);
 let withFile: boolean = $ref(props.antenna.withFile);
@@ -85,18 +153,21 @@ let notify: boolean = $ref(props.antenna.notify);
 let userLists: any = $ref(null);
 let userGroups: any = $ref(null);
 
-watch(() => src, async () => {
-	if (src === 'list' && userLists === null) {
-		userLists = await os.api('users/lists/list');
-	}
+watch(
+	() => src,
+	async () => {
+		if (src === "list" && userLists === null) {
+			userLists = await os.api("users/lists/list");
+		}
 
-	if (src === 'group' && userGroups === null) {
-		const groups1 = await os.api('users/groups/owned');
-		const groups2 = await os.api('users/groups/joined');
+		if (src === "group" && userGroups === null) {
+			const groups1 = await os.api("users/groups/owned");
+			const groups2 = await os.api("users/groups/joined");
 
-		userGroups = [...groups1, ...groups2];
+			userGroups = [...groups1, ...groups2];
+		}
 	}
-});
+);
 
 async function saveAntenna() {
 	const antennaData = {
@@ -108,39 +179,51 @@ async function saveAntenna() {
 		withFile,
 		notify,
 		caseSensitive,
-		users: users.trim().split('\n').map(x => x.trim()),
-		instances: instances.trim().split('\n').map(x => x.trim()),
-		keywords: keywords.trim().split('\n').map(x => x.trim().split(' ')),
-		excludeKeywords: excludeKeywords.trim().split('\n').map(x => x.trim().split(' ')),
+		users: users
+			.trim()
+			.split("\n")
+			.map((x) => x.trim()),
+		instances: instances
+			.trim()
+			.split("\n")
+			.map((x) => x.trim()),
+		keywords: keywords
+			.trim()
+			.split("\n")
+			.map((x) => x.trim().split(" ")),
+		excludeKeywords: excludeKeywords
+			.trim()
+			.split("\n")
+			.map((x) => x.trim().split(" ")),
 	};
 
 	if (props.antenna.id == null) {
-		await os.apiWithDialog('antennas/create', antennaData);
-		emit('created');
+		await os.apiWithDialog("antennas/create", antennaData);
+		emit("created");
 	} else {
-		antennaData['antennaId'] = props.antenna.id;
-		await os.apiWithDialog('antennas/update', antennaData);
-		emit('updated');
+		antennaData["antennaId"] = props.antenna.id;
+		await os.apiWithDialog("antennas/update", antennaData);
+		emit("updated");
 	}
 }
 
 async function deleteAntenna() {
 	const { canceled } = await os.confirm({
-		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: props.antenna.name }),
+		type: "warning",
+		text: i18n.t("removeAreYouSure", { x: props.antenna.name }),
 	});
 	if (canceled) return;
 
-	await os.api('antennas/delete', {
+	await os.api("antennas/delete", {
 		antennaId: props.antenna.id,
 	});
 
 	os.success();
-	emit('deleted');
+	emit("deleted");
 }
 
 function addUser() {
-	os.selectUser().then(user => {
+	os.selectUser().then((user) => {
 		users = users.trim();
 		users += `\n@${Acct.toString(user as any)}`;
 		users = users.trim();
@@ -148,9 +231,9 @@ function addUser() {
 }
 
 function addInstance() {
-	os.selectInstance().then(instance => {
+	os.selectInstance().then((instance) => {
 		instances = instances.trim();
-		instances += '\n' + instance.host;
+		instances += "\n" + instance.host;
 		instances = instances.trim();
 	});
 }
diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue
index 8339f2bcc..cc3262a79 100644
--- a/packages/client/src/pages/my-antennas/index.vue
+++ b/packages/client/src/pages/my-antennas/index.vue
@@ -1,36 +1,66 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="700">
-		<div class="ieepwinx">
-			<MkButton :link="true" to="/my/antennas/create" primary class="add"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700">
+			<div class="ieepwinx">
+				<MkButton
+					:link="true"
+					to="/my/antennas/create"
+					primary
+					class="add"
+					><i class="ph-plus ph-bold ph-lg"></i>
+					{{ i18n.ts.add }}</MkButton
+				>
 
-			<div class="">
-				<MkPagination v-slot="{items}" ref="list" :pagination="pagination">
-					<div v-for="antenna in items" :key="antenna.id">
-						<MkA class="uopelskx" :link="true" :to="`/timeline/antenna/${antenna.id}`">
-							<i class="ph-flying-saucer ph-bold ph-lg"></i><i :class="`${antenna.hasUnreadNote ? 'ph-circle ph-fill' : 'ph-check'} ph-xs notify-icon`"></i>
-						</MkA>
-						<MkA class="ljoevbzj" :to="`/my/antennas/${antenna.id}`">
-							<div class="name">{{ antenna.name }}</div>
-						</MkA>
-					</div>
-				</MkPagination>
+				<div class="">
+					<MkPagination
+						v-slot="{ items }"
+						ref="list"
+						:pagination="pagination"
+					>
+						<div v-for="antenna in items" :key="antenna.id">
+							<MkA
+								class="uopelskx"
+								:link="true"
+								:to="`/timeline/antenna/${antenna.id}`"
+							>
+								<i class="ph-flying-saucer ph-bold ph-lg"></i
+								><i
+									:class="`${
+										antenna.hasUnreadNote
+											? 'ph-circle ph-fill'
+											: 'ph-check'
+									} ph-xs notify-icon`"
+								></i>
+							</MkA>
+							<MkA
+								class="ljoevbzj"
+								:to="`/my/antennas/${antenna.id}`"
+							>
+								<div class="name">{{ antenna.name }}</div>
+							</MkA>
+						</div>
+					</MkPagination>
+				</div>
 			</div>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { onActivated, onDeactivated, ref } from 'vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { onActivated, onDeactivated, ref } from "vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkButton from "@/components/MkButton.vue";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const pagination = {
-	endpoint: 'antennas/list' as const,
+	endpoint: "antennas/list" as const,
 	limit: 250,
 };
 
@@ -38,7 +68,7 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-const list = ref<typeof MkPagination|null>(null);
+const list = ref<typeof MkPagination | null>(null);
 
 let isCached: boolean = false;
 let refreshTimer: number | null = null;
@@ -49,7 +79,7 @@ const refresh = () => {
 	}
 
 	isCached = true;
-	refreshTimer = setTimeout(refresh, 15000)
+	refreshTimer = setTimeout(refresh, 15000);
 };
 
 onActivated(() => {
@@ -65,13 +95,12 @@ onDeactivated(() => {
 
 definePageMetadata({
 	title: i18n.ts.manageAntennas,
-	icon: 'ph-flying-saucer ph-bold ph-lg',
+	icon: "ph-flying-saucer ph-bold ph-lg",
 });
 </script>
 
 <style lang="scss" scoped>
 .ieepwinx {
-
 	> .add {
 		margin: 0 auto 16px auto;
 	}
@@ -108,9 +137,9 @@ definePageMetadata({
 	}
 
 	.notify-icon {
-    position: relative;
-    top: -1em;
-    left: -0.5em;
+		position: relative;
+		top: -1em;
+		left: -0.5em;
 
 		&.ph-circle ph-fill {
 			color: var(--indicator);
diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue
index 4fa6d6bdc..1c950a3f1 100644
--- a/packages/client/src/pages/my-clips/index.vue
+++ b/packages/client/src/pages/my-clips/index.vue
@@ -1,31 +1,51 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="700">
-		<div class="qtcaoidl">
-			<MkButton primary class="add" @click="create"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700">
+			<div class="qtcaoidl">
+				<MkButton primary class="add" @click="create"
+					><i class="ph-plus ph-bold ph-lg"></i>
+					{{ i18n.ts.add }}</MkButton
+				>
 
-			<MkPagination v-slot="{items}" ref="pagingComponent" :pagination="pagination" class="list">
-				<MkA v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap">
-					<b>{{ item.name }}</b>
-					<div v-if="item.description" class="description">{{ item.description }}</div>
-				</MkA>
-			</MkPagination>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+				<MkPagination
+					v-slot="{ items }"
+					ref="pagingComponent"
+					:pagination="pagination"
+					class="list"
+				>
+					<MkA
+						v-for="item in items"
+						:key="item.id"
+						:to="`/clips/${item.id}`"
+						class="item _panel _gap"
+					>
+						<b>{{ item.name }}</b>
+						<div v-if="item.description" class="description">
+							{{ item.description }}
+						</div>
+					</MkA>
+				</MkPagination>
+			</div>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const pagination = {
-	endpoint: 'clips/list' as const,
+	endpoint: "clips/list" as const,
 	limit: 10,
 };
 
@@ -34,24 +54,24 @@ const pagingComponent = $ref<InstanceType<typeof MkPagination>>();
 async function create() {
 	const { canceled, result } = await os.form(i18n.ts.createNewClip, {
 		name: {
-			type: 'string',
+			type: "string",
 			label: i18n.ts.name,
 		},
 		description: {
-			type: 'string',
+			type: "string",
 			required: false,
 			multiline: true,
 			label: i18n.ts.description,
 		},
 		isPublic: {
-			type: 'boolean',
+			type: "boolean",
 			label: i18n.ts.public,
 			default: false,
 		},
 	});
 	if (canceled) return;
 
-	os.apiWithDialog('clips/create', result);
+	os.apiWithDialog("clips/create", result);
 
 	pagingComponent.reload();
 }
@@ -70,9 +90,9 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.clip,
-	icon: 'ph-paperclip ph-bold ph-lg',
+	icon: "ph-paperclip ph-bold ph-lg",
 	action: {
-		icon: 'ph-plus ph-bold ph-lg',
+		icon: "ph-plus ph-bold ph-lg",
 		handler: create,
 	},
 });
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index 1ea23847d..192572db1 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -1,27 +1,38 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions"/></template>
-	<div class="mk-group-page">
-		<div class="_section members _gap">
-			<div class="_content">
-				<div class="users">
-					<div v-for="user in users" :key="user.id" class="user _panel">
-						<MkAvatar :user="user" class="avatar" :show-indicator="true" />
-						<div class="body">
-							<MkUserName :user="user" class="name" />
-							<MkAcct :user="user" class="acct" />
-						</div>
-						<div class="action">
-							<button class="_button" @click="removeUser(user)">
-								<i class="ph-x ph-bold ph-lg"></i>
-							</button>
+	<MkStickyContainer>
+		<template #header><MkPageHeader :actions="headerActions" /></template>
+		<div class="mk-group-page">
+			<div class="_section members _gap">
+				<div class="_content">
+					<div class="users">
+						<div
+							v-for="user in users"
+							:key="user.id"
+							class="user _panel"
+						>
+							<MkAvatar
+								:user="user"
+								class="avatar"
+								:show-indicator="true"
+							/>
+							<div class="body">
+								<MkUserName :user="user" class="name" />
+								<MkAcct :user="user" class="acct" />
+							</div>
+							<div class="action">
+								<button
+									class="_button"
+									@click="removeUser(user)"
+								>
+									<i class="ph-x ph-bold ph-lg"></i>
+								</button>
+							</div>
 						</div>
 					</div>
 				</div>
 			</div>
 		</div>
-	</div>
-</MkStickyContainer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
@@ -124,29 +135,31 @@ definePageMetadata(
 	computed(() => ({
 		title: i18n.ts.members,
 		icon: "ph-users-three ph-bold ph-lg",
-	})),
+	}))
 );
 
 const headerActions = $computed(() => [
 	{
-		icon: 'ph-plus ph-bold ph-lg',
+		icon: "ph-plus ph-bold ph-lg",
 		text: i18n.ts.invite,
 		handler: invite,
-	}, {
-		icon: 'ph-cursor-text ph-bold ph-lg',
+	},
+	{
+		icon: "ph-cursor-text ph-bold ph-lg",
 		text: i18n.ts.rename,
 		handler: renameGroup,
-	}, {
-		icon: 'ph-arrows-left-right ph-bold ph-lg',
+	},
+	{
+		icon: "ph-arrows-left-right ph-bold ph-lg",
 		text: i18n.ts.transfer,
 		handler: transfer,
-	}, {
-		icon: 'ph-trash ph-bold ph-lg',
+	},
+	{
+		icon: "ph-trash ph-bold ph-lg",
 		text: i18n.ts.delete,
 		handler: deleteGroup,
 	},
 ]);
-
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index 6ecb70bb6..4c411e71a 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -1,57 +1,79 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :display-back-button="true"/></template>
-	<MkSpacer :content-max="800" :margin-min="20">
-		<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.createGroup }}</MkButton>
-		<MkPagination v-slot="{items}" ref="owned" :pagination="ownedPagination">
-			<div v-for="group in items" :key="group.id" class="_card">
-				<div class="_title"><MkA :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</MkA></div>
-				<div class="_content">
-					<MkAvatars :user-ids="group.userIds"/>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="800" :margin-min="20">
+			<MkButton
+				primary
+				style="margin: 0 auto var(--margin) auto"
+				@click="create"
+				><i class="ph-plus ph-bold ph-lg"></i>
+				{{ i18n.ts.createGroup }}</MkButton
+			>
+			<MkPagination
+				v-slot="{ items }"
+				ref="owned"
+				:pagination="ownedPagination"
+			>
+				<div v-for="group in items" :key="group.id" class="_card">
+					<div class="_title">
+						<MkA :to="`/my/groups/${group.id}`" class="_link">{{
+							group.name
+						}}</MkA>
+					</div>
+					<div class="_content">
+						<MkAvatars :user-ids="group.userIds" />
+					</div>
 				</div>
-			</div>
-		</MkPagination>
-		<MkPagination v-slot="{items}" ref="joined" :pagination="joinedPagination">
-			<div v-for="group in items" :key="group.id" class="_card">
-				<div class="_title">{{ group.name }}</div>
-				<div class="_content">
-					<MkAvatars :user-ids="group.userIds"/>
+			</MkPagination>
+			<MkPagination
+				v-slot="{ items }"
+				ref="joined"
+				:pagination="joinedPagination"
+			>
+				<div v-for="group in items" :key="group.id" class="_card">
+					<div class="_title">{{ group.name }}</div>
+					<div class="_content">
+						<MkAvatars :user-ids="group.userIds" />
+					</div>
+					<div class="_footer">
+						<MkButton danger @click="leave(group)">{{
+							i18n.ts.leaveGroup
+						}}</MkButton>
+					</div>
 				</div>
-				<div class="_footer">
-					<MkButton danger @click="leave(group)">{{ i18n.ts.leaveGroup }}</MkButton>
-				</div>
-			</div>
-		</MkPagination>
-	</MkSpacer>
-</MkStickyContainer>
+			</MkPagination>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkAvatars from '@/components/MkAvatars.vue';
-import * as os from '@/os';
+import { computed, ref } from "vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkAvatars from "@/components/MkAvatars.vue";
+import * as os from "@/os";
 import { definePageMetadata } from "@/scripts/page-metadata";
-import { i18n } from '@/i18n';
-import MkStickyContainer from '@/components/global/MkStickyContainer.vue';
+import { i18n } from "@/i18n";
+import MkStickyContainer from "@/components/global/MkStickyContainer.vue";
 
-const owned = ref('owned');
-const joined = ref('joined');
+const owned = ref("owned");
+const joined = ref("joined");
 
 const ownedPagination = {
-	endpoint: 'users/groups/owned' as const,
+	endpoint: "users/groups/owned" as const,
 	limit: 10,
 };
 
 const joinedPagination = {
-	endpoint: 'users/groups/joined' as const,
+	endpoint: "users/groups/joined" as const,
 	limit: 10,
 };
 
 const headerActions = $computed(() => [
 	{
-		icon: 'ph-plus ph-bold ph-lg',
+		icon: "ph-plus ph-bold ph-lg",
 		text: i18n.ts.createGroup,
 		handler: create,
 	},
@@ -61,7 +83,7 @@ definePageMetadata(
 	computed(() => ({
 		title: i18n.ts.groups,
 		icon: "ph-users-three ph-bold ph-lg",
-	})),
+	}))
 );
 
 async function create() {
@@ -69,18 +91,18 @@ async function create() {
 		title: i18n.ts.groupName,
 	});
 	if (canceled) return;
-	await os.api('users/groups/create', { name: name });
+	await os.api("users/groups/create", { name: name });
 	owned.value.reload();
 	os.success();
 }
 
 async function leave(group) {
 	const { canceled } = await os.confirm({
-		type: 'warning',
-		text: i18n.t('leaveGroupConfirm', { name: group.name }),
+		type: "warning",
+		text: i18n.t("leaveGroupConfirm", { name: group.name }),
 	});
 	if (canceled) return;
-	os.apiWithDialog('users/groups/leave', {
+	os.apiWithDialog("users/groups/leave", {
 		groupId: group.id,
 	}).then(() => {
 		joined.value.reload();
@@ -98,7 +120,7 @@ async function leave(group) {
 	._content {
 		padding: 20px;
 
-		>.defgtij {
+		> .defgtij {
 			padding: 0;
 		}
 	}
diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue
index 995682019..6ecfd12f4 100644
--- a/packages/client/src/pages/my-lists/index.vue
+++ b/packages/client/src/pages/my-lists/index.vue
@@ -1,37 +1,58 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="700">
-		<div class="qkcjvfiv">
-			<div class="buttonWrapper">
-				<MkButton primary class="add" @click="create"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.createList }}</MkButton>
-				<MkButton @click="deleteAll"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.deleteAll }}</MkButton>
-			</div>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700">
+			<div class="qkcjvfiv">
+				<div class="buttonWrapper">
+					<MkButton primary class="add" @click="create"
+						><i class="ph-plus ph-bold ph-lg"></i>
+						{{ i18n.ts.createList }}</MkButton
+					>
+					<MkButton @click="deleteAll"
+						><i class="ph-trash ph-bold ph-lg"></i>
+						{{ i18n.ts.deleteAll }}</MkButton
+					>
+				</div>
 
-			<MkPagination v-slot="{items}" ref="pagingComponent" :pagination="pagination" class="lists _content">
-				<MkA v-for="list in items" :key="list.id" class="list _panel" :to="`/my/lists/${ list.id }`">
-					<div class="name">{{ list.name }}</div>
-					<MkAvatars :user-ids="list.userIds"/>
-				</MkA>
-			</MkPagination>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+				<MkPagination
+					v-slot="{ items }"
+					ref="pagingComponent"
+					:pagination="pagination"
+					class="lists _content"
+				>
+					<MkA
+						v-for="list in items"
+						:key="list.id"
+						class="list _panel"
+						:to="`/my/lists/${list.id}`"
+					>
+						<div class="name">{{ list.name }}</div>
+						<MkAvatars :user-ids="list.userIds" />
+					</MkA>
+				</MkPagination>
+			</div>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkAvatars from '@/components/MkAvatars.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkAvatars from "@/components/MkAvatars.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const pagingComponent = $ref<InstanceType<typeof MkPagination>>();
 
 const pagination = {
-	endpoint: 'users/lists/list' as const,
+	endpoint: "users/lists/list" as const,
 	limit: 10,
 };
 
@@ -40,18 +61,18 @@ async function create() {
 		title: i18n.ts.enterListName,
 	});
 	if (canceled) return;
-	await os.apiWithDialog('users/lists/create', { name: name });
+	await os.apiWithDialog("users/lists/create", { name: name });
 	pagingComponent.reload();
 }
 
 async function deleteAll() {
 	const { canceled } = await os.confirm({
-		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: 'all lists' }),
+		type: "warning",
+		text: i18n.t("removeAreYouSure", { x: "all lists" }),
 	});
 	if (canceled) return;
 
-	await os.api('users/lists/delete-all');
+	await os.api("users/lists/delete-all");
 	os.success();
 }
 
@@ -61,9 +82,9 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.manageLists,
-	icon: 'ph-list-bullets ph-bold ph-lg',
+	icon: "ph-list-bullets ph-bold ph-lg",
 	action: {
-		icon: 'ph-plus ph-bold ph-lg',
+		icon: "ph-plus ph-bold ph-lg",
 		handler: create,
 	},
 });
diff --git a/packages/client/src/pages/my-lists/list.vue b/packages/client/src/pages/my-lists/list.vue
index e3c211fc2..e90776dcb 100644
--- a/packages/client/src/pages/my-lists/list.vue
+++ b/packages/client/src/pages/my-lists/list.vue
@@ -1,49 +1,76 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="700">
-		<div class="mk-list-page">
-			<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
-				<div v-if="list" class="_section">
-					<div class="_content">
-						<MkButton inline @click="addUser()">{{ i18n.ts.addUser }}</MkButton>
-						<MkButton inline @click="renameList()">{{ i18n.ts.rename }}</MkButton>
-						<MkButton inline @click="deleteList()">{{ i18n.ts.delete }}</MkButton>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="700">
+			<div class="mk-list-page">
+				<transition
+					:name="$store.state.animation ? 'zoom' : ''"
+					mode="out-in"
+				>
+					<div v-if="list" class="_section">
+						<div class="_content">
+							<MkButton inline @click="addUser()">{{
+								i18n.ts.addUser
+							}}</MkButton>
+							<MkButton inline @click="renameList()">{{
+								i18n.ts.rename
+							}}</MkButton>
+							<MkButton inline @click="deleteList()">{{
+								i18n.ts.delete
+							}}</MkButton>
+						</div>
 					</div>
-				</div>
-			</transition>
+				</transition>
 
-			<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
-				<div v-if="list" class="_section members _gap">
-					<div class="_title">{{ i18n.ts.members }}</div>
-					<div class="_content">
-						<div class="users">
-							<div v-for="user in users" :key="user.id" class="user _panel">
-								<MkAvatar :user="user" class="avatar" :show-indicator="true"/>
-								<div class="body">
-									<MkUserName :user="user" class="name"/>
-									<MkAcct :user="user" class="acct"/>
-								</div>
-								<div class="action">
-									<button class="_button" @click="removeUser(user)"><i class="ph-x ph-bold ph-lg"></i></button>
+				<transition
+					:name="$store.state.animation ? 'zoom' : ''"
+					mode="out-in"
+				>
+					<div v-if="list" class="_section members _gap">
+						<div class="_title">{{ i18n.ts.members }}</div>
+						<div class="_content">
+							<div class="users">
+								<div
+									v-for="user in users"
+									:key="user.id"
+									class="user _panel"
+								>
+									<MkAvatar
+										:user="user"
+										class="avatar"
+										:show-indicator="true"
+									/>
+									<div class="body">
+										<MkUserName :user="user" class="name" />
+										<MkAcct :user="user" class="acct" />
+									</div>
+									<div class="action">
+										<button
+											class="_button"
+											@click="removeUser(user)"
+										>
+											<i class="ph-x ph-bold ph-lg"></i>
+										</button>
+									</div>
 								</div>
 							</div>
 						</div>
 					</div>
-				</div>
-			</transition>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+				</transition>
+			</div>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { mainRouter } from '@/router';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
+import { computed, watch } from "vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { mainRouter } from "@/router";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	listId: string;
@@ -53,21 +80,21 @@ let list = $ref(null);
 let users = $ref([]);
 
 function fetchList() {
-	os.api('users/lists/show', {
+	os.api("users/lists/show", {
 		listId: props.listId,
-	}).then(_list => {
+	}).then((_list) => {
 		list = _list;
-		os.api('users/show', {
+		os.api("users/show", {
 			userIds: list.userIds,
-		}).then(_users => {
+		}).then((_users) => {
 			users = _users;
 		});
 	});
 }
 
 function addUser() {
-	os.selectUser().then(user => {
-		os.apiWithDialog('users/lists/push', {
+	os.selectUser().then((user) => {
+		os.apiWithDialog("users/lists/push", {
 			listId: list.id,
 			userId: user.id,
 		}).then(() => {
@@ -77,11 +104,11 @@ function addUser() {
 }
 
 function removeUser(user) {
-	os.api('users/lists/pull', {
+	os.api("users/lists/pull", {
 		listId: list.id,
 		userId: user.id,
 	}).then(() => {
-		users = users.filter(x => x.id !== user.id);
+		users = users.filter((x) => x.id !== user.id);
 	});
 }
 
@@ -92,7 +119,7 @@ async function renameList() {
 	});
 	if (canceled) return;
 
-	await os.api('users/lists/update', {
+	await os.api("users/lists/update", {
 		listId: list.id,
 		name: name,
 	});
@@ -102,16 +129,16 @@ async function renameList() {
 
 async function deleteList() {
 	const { canceled } = await os.confirm({
-		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: list.name }),
+		type: "warning",
+		text: i18n.t("removeAreYouSure", { x: list.name }),
 	});
 	if (canceled) return;
 
-	await os.api('users/lists/delete', {
+	await os.api("users/lists/delete", {
 		listId: list.id,
 	});
 	os.success();
-	mainRouter.push('/my/lists');
+	mainRouter.push("/my/lists");
 }
 
 watch(() => props.listId, fetchList, { immediate: true });
@@ -120,10 +147,16 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => list ? {
-	title: list.name,
-	icon: 'ph-list-bullets ph-bold ph-lg',
-} : null));
+definePageMetadata(
+	computed(() =>
+		list
+			? {
+					title: list.name,
+					icon: "ph-list-bullets ph-bold ph-lg",
+			  }
+			: null
+	)
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/not-found.vue b/packages/client/src/pages/not-found.vue
index d6f701b56..d4ec84cff 100644
--- a/packages/client/src/pages/not-found.vue
+++ b/packages/client/src/pages/not-found.vue
@@ -1,15 +1,19 @@
 <template>
-<div class="ipledcug">
-	<div class="_fullinfo">
-		<img src="/static-assets/badges/not-found.png" class="_ghost" alt="Not found"/>
-		<div>{{ i18n.ts.notFoundDescription }}</div>
+	<div class="ipledcug">
+		<div class="_fullinfo">
+			<img
+				src="/static-assets/badges/not-found.png"
+				class="_ghost"
+				alt="Not found"
+			/>
+			<div>{{ i18n.ts.notFoundDescription }}</div>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const headerActions = $computed(() => []);
 
@@ -17,6 +21,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.notFound,
-	icon: 'ph-warning ph-bold ph-lg',
+	icon: "ph-warning ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index cff6b252b..29c18c12e 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -1,56 +1,110 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="800" :marginMin="6">
-		<div class="fcuexfpr">
-			<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
-				<div v-if="note" class="note">
-					<div v-if="showNext" class="_gap">
-						<XNotes class="_content" :pagination="nextPagination" :no-gap="true"/>
-					</div>
-
-					<div class="main _gap">
-						<MkButton v-if="!showNext && hasNext" class="load next" @click="showNext = true"><i class="ph-caret-up ph-bold ph-lg"></i></MkButton>
-						<div class="note _gap">
-							<MkRemoteCaution v-if="note.user.host != null" :href="note.url ?? note.uri"/>
-							<XNoteDetailed :key="note.id" v-model:note="note" class="note"/>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="800" :marginMin="6">
+			<div class="fcuexfpr">
+				<transition
+					:name="$store.state.animation ? 'fade' : ''"
+					mode="out-in"
+				>
+					<div v-if="note" class="note">
+						<div v-if="showNext" class="_gap">
+							<XNotes
+								class="_content"
+								:pagination="nextPagination"
+								:no-gap="true"
+							/>
 						</div>
-						<div v-if="clips && clips.length > 0" class="_content clips _gap">
-							<div class="title">{{ i18n.ts.clip }}</div>
-							<MkA v-for="item in clips" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap">
-								<b>{{ item.name }}</b>
-								<div v-if="item.description" class="description">{{ item.description }}</div>
-								<div class="user">
-									<MkAvatar :user="item.user" class="avatar" :show-indicator="true"/> <MkUserName :user="item.user" :nowrap="false"/>
-								</div>
-							</MkA>
-						</div>
-						<MkButton v-if="!showPrev && hasPrev" class="load prev" @click="showPrev = true"><i class="ph-caret-down ph-bold ph-lg"></i></MkButton>
-					</div>
 
-					<div v-if="showPrev" class="_gap">
-						<XNotes class="_content" :pagination="prevPagination" :no-gap="true"/>
+						<div class="main _gap">
+							<MkButton
+								v-if="!showNext && hasNext"
+								class="load next"
+								@click="showNext = true"
+								><i class="ph-caret-up ph-bold ph-lg"></i
+							></MkButton>
+							<div class="note _gap">
+								<MkRemoteCaution
+									v-if="note.user.host != null"
+									:href="note.url ?? note.uri"
+								/>
+								<XNoteDetailed
+									:key="note.id"
+									v-model:note="note"
+									class="note"
+								/>
+							</div>
+							<div
+								v-if="clips && clips.length > 0"
+								class="_content clips _gap"
+							>
+								<div class="title">{{ i18n.ts.clip }}</div>
+								<MkA
+									v-for="item in clips"
+									:key="item.id"
+									:to="`/clips/${item.id}`"
+									class="item _panel _gap"
+								>
+									<b>{{ item.name }}</b>
+									<div
+										v-if="item.description"
+										class="description"
+									>
+										{{ item.description }}
+									</div>
+									<div class="user">
+										<MkAvatar
+											:user="item.user"
+											class="avatar"
+											:show-indicator="true"
+										/>
+										<MkUserName
+											:user="item.user"
+											:nowrap="false"
+										/>
+									</div>
+								</MkA>
+							</div>
+							<MkButton
+								v-if="!showPrev && hasPrev"
+								class="load prev"
+								@click="showPrev = true"
+								><i class="ph-caret-down ph-bold ph-lg"></i
+							></MkButton>
+						</div>
+
+						<div v-if="showPrev" class="_gap">
+							<XNotes
+								class="_content"
+								:pagination="prevPagination"
+								:no-gap="true"
+							/>
+						</div>
 					</div>
-				</div>
-				<MkError v-else-if="error" @retry="fetch()"/>
-				<MkLoading v-else/>
-			</transition>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+					<MkError v-else-if="error" @retry="fetch()" />
+					<MkLoading v-else />
+				</transition>
+			</div>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineComponent, watch } from 'vue';
-import * as misskey from 'calckey-js';
-import XNote from '@/components/MkNote.vue';
-import XNoteDetailed from '@/components/MkNoteDetailed.vue';
-import XNotes from '@/components/MkNotes.vue';
-import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
+import { computed, defineComponent, watch } from "vue";
+import * as misskey from "calckey-js";
+import XNote from "@/components/MkNote.vue";
+import XNoteDetailed from "@/components/MkNoteDetailed.vue";
+import XNotes from "@/components/MkNotes.vue";
+import MkRemoteCaution from "@/components/MkRemoteCaution.vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	noteId: string;
@@ -65,22 +119,30 @@ let showNext = $ref(false);
 let error = $ref();
 
 const prevPagination = {
-	endpoint: 'users/notes' as const,
+	endpoint: "users/notes" as const,
 	limit: 10,
-	params: computed(() => note ? ({
-		userId: note.userId,
-		untilId: note.id,
-	}) : null),
+	params: computed(() =>
+		note
+			? {
+					userId: note.userId,
+					untilId: note.id,
+			  }
+			: null
+	),
 };
 
 const nextPagination = {
 	reversed: true,
-	endpoint: 'users/notes' as const,
+	endpoint: "users/notes" as const,
 	limit: 10,
-	params: computed(() => note ? ({
-		userId: note.userId,
-		sinceId: note.id,
-	}) : null),
+	params: computed(() =>
+		note
+			? {
+					userId: note.userId,
+					sinceId: note.id,
+			  }
+			: null
+	),
 };
 
 function fetchNote() {
@@ -89,32 +151,34 @@ function fetchNote() {
 	showPrev = false;
 	showNext = false;
 	note = null;
-	os.api('notes/show', {
+	os.api("notes/show", {
 		noteId: props.noteId,
-	}).then(res => {
-		note = res;
-		Promise.all([
-			os.api('notes/clips', {
-				noteId: note.id,
-			}),
-			os.api('users/notes', {
-				userId: note.userId,
-				untilId: note.id,
-				limit: 1,
-			}),
-			os.api('users/notes', {
-				userId: note.userId,
-				sinceId: note.id,
-				limit: 1,
-			}),
-		]).then(([_clips, prev, next]) => {
-			clips = _clips;
-			hasPrev = prev.length !== 0;
-			hasNext = next.length !== 0;
+	})
+		.then((res) => {
+			note = res;
+			Promise.all([
+				os.api("notes/clips", {
+					noteId: note.id,
+				}),
+				os.api("users/notes", {
+					userId: note.userId,
+					untilId: note.id,
+					limit: 1,
+				}),
+				os.api("users/notes", {
+					userId: note.userId,
+					sinceId: note.id,
+					limit: 1,
+				}),
+			]).then(([_clips, prev, next]) => {
+				clips = _clips;
+				hasPrev = prev.length !== 0;
+				hasNext = next.length !== 0;
+			});
+		})
+		.catch((err) => {
+			error = err;
 		});
-	}).catch(err => {
-		error = err;
-	});
 }
 
 watch(() => props.noteId, fetchNote, {
@@ -125,16 +189,22 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => note ? {
-	title: i18n.ts.note,
-	subtitle: new Date(note.createdAt).toLocaleString(),
-	avatar: note.user,
-	path: `/notes/${note.id}`,
-	share: {
-		title: i18n.t('noteOf', { user: note.user.name }),
-		text: note.text,
-	},
-} : null));
+definePageMetadata(
+	computed(() =>
+		note
+			? {
+					title: i18n.ts.note,
+					subtitle: new Date(note.createdAt).toLocaleString(),
+					avatar: note.user,
+					path: `/notes/${note.id}`,
+					share: {
+						title: i18n.t("noteOf", { user: note.user.name }),
+						text: note.text,
+					},
+			  }
+			: null
+	)
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index e587a1f78..7a61df0ba 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -1,137 +1,173 @@
 <template>
-<MkStickyContainer>
-	<template #header>
-		<MkPageHeader
-			v-model:tab="tab"
-			:actions="headerActions"
-			:tabs="headerTabs"
-			:display-my-avatar="true"
-		/>
-	</template>
-	<MkSpacer :content-max="800">
-		<swiper
-			:modules="[Virtual]"
-			:space-between="20"
-			:virtual="true"
-			:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
-			@swiper="setSwiperRef"
-			@slide-change="onSlideChange"
-		>
-			<swiper-slide>
-				<XNotifications class="notifications" :include-types="includeTypes" :unread-only="false"/>
-			</swiper-slide>
-			<swiper-slide>
-				<XNotifications class="notifications" :include-types="includeTypes" :unread-only="true"/>
-			</swiper-slide>
-			<swiper-slide>
-				<XNotes :pagination="mentionsPagination"/>
-			</swiper-slide>
-			<swiper-slide>
-				<XNotes :pagination="directNotesPagination"/>
-			</swiper-slide>
-		</swiper>
-	</MkSpacer>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header>
+			<MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-my-avatar="true"
+			/>
+		</template>
+		<MkSpacer :content-max="800">
+			<swiper
+				:modules="[Virtual]"
+				:space-between="20"
+				:virtual="true"
+				:allow-touch-move="
+					!(
+						deviceKind === 'desktop' &&
+						!defaultStore.state.swipeOnDesktop
+					)
+				"
+				@swiper="setSwiperRef"
+				@slide-change="onSlideChange"
+			>
+				<swiper-slide>
+					<XNotifications
+						class="notifications"
+						:include-types="includeTypes"
+						:unread-only="false"
+					/>
+				</swiper-slide>
+				<swiper-slide>
+					<XNotifications
+						class="notifications"
+						:include-types="includeTypes"
+						:unread-only="true"
+					/>
+				</swiper-slide>
+				<swiper-slide>
+					<XNotes :pagination="mentionsPagination" />
+				</swiper-slide>
+				<swiper-slide>
+					<XNotes :pagination="directNotesPagination" />
+				</swiper-slide>
+			</swiper>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
-import { notificationTypes } from 'calckey-js';
-import XNotifications from '@/components/MkNotifications.vue';
-import XNotes from '@/components/MkNotes.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { deviceKind } from '@/scripts/device-kind';
-import { defaultStore } from '@/store';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
+import { computed, ref, watch } from "vue";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
+import { notificationTypes } from "calckey-js";
+import XNotifications from "@/components/MkNotifications.vue";
+import XNotes from "@/components/MkNotes.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { deviceKind } from "@/scripts/device-kind";
+import { defaultStore } from "@/store";
+import "swiper/scss";
+import "swiper/scss/virtual";
 
-const tabs = ['all', 'unread', 'mentions', 'directNotes'];
+const tabs = ["all", "unread", "mentions", "directNotes"];
 let tab = $ref(tabs[0]);
-watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
 let includeTypes = $ref<string[] | null>(null);
-let unreadOnly = $computed(() => tab === 'unread');
-os.api('notifications/mark-all-as-read');
+let unreadOnly = $computed(() => tab === "unread");
+os.api("notifications/mark-all-as-read");
 
 const MOBILE_THRESHOLD = 500;
 const isMobile = ref(
-	deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD
+	deviceKind === "smartphone" || window.innerWidth <= MOBILE_THRESHOLD
 );
-window.addEventListener('resize', () => {
+window.addEventListener("resize", () => {
 	isMobile.value =
-		deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD;
+		deviceKind === "smartphone" || window.innerWidth <= MOBILE_THRESHOLD;
 });
 
 const mentionsPagination = {
-	endpoint: 'notes/mentions' as const,
+	endpoint: "notes/mentions" as const,
 	limit: 10,
 };
 
 const directNotesPagination = {
-	endpoint: 'notes/mentions' as const,
+	endpoint: "notes/mentions" as const,
 	limit: 10,
 	params: {
-		visibility: 'specified',
+		visibility: "specified",
 	},
 };
 
 function setFilter(ev) {
-	const typeItems = notificationTypes.map(t => ({
+	const typeItems = notificationTypes.map((t) => ({
 		text: i18n.t(`_notification._types.${t}`),
 		active: includeTypes && includeTypes.includes(t),
 		action: () => {
 			includeTypes = [t];
 		},
 	}));
-	const items = includeTypes != null ? [{
-		icon: 'ph-x ph-bold ph-lg',
-		text: i18n.ts.clear,
-		action: () => {
-			includeTypes = null;
-		},
-	}, null, ...typeItems] : typeItems;
+	const items =
+		includeTypes != null
+			? [
+					{
+						icon: "ph-x ph-bold ph-lg",
+						text: i18n.ts.clear,
+						action: () => {
+							includeTypes = null;
+						},
+					},
+					null,
+					...typeItems,
+			  ]
+			: typeItems;
 	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
-const headerActions = $computed(() => [tab === 'all' ? {
-	text: i18n.ts.filter,
-	icon: 'ph-funnel ph-bold ph-lg',
-	highlighted: includeTypes != null,
-	handler: setFilter,
-} : undefined, tab === 'all' ? {
-	text: i18n.ts.markAllAsRead,
-	icon: 'ph-check ph-bold ph-lg',
-	handler: () => {
-		os.apiWithDialog('notifications/mark-all-as-read');
+const headerActions = $computed(() =>
+	[
+		tab === "all"
+			? {
+					text: i18n.ts.filter,
+					icon: "ph-funnel ph-bold ph-lg",
+					highlighted: includeTypes != null,
+					handler: setFilter,
+			  }
+			: undefined,
+		tab === "all"
+			? {
+					text: i18n.ts.markAllAsRead,
+					icon: "ph-check ph-bold ph-lg",
+					handler: () => {
+						os.apiWithDialog("notifications/mark-all-as-read");
+					},
+			  }
+			: undefined,
+	].filter((x) => x !== undefined)
+);
+
+const headerTabs = $computed(() => [
+	{
+		key: "all",
+		title: i18n.ts.all,
+		icon: "ph-bell ph-bold ph-lg",
 	},
-} : undefined].filter(x => x !== undefined));
+	{
+		key: "unread",
+		title: i18n.ts.unread,
+		icon: "ph-circle-wavy-warning ph-bold ph-lg",
+	},
+	{
+		key: "mentions",
+		title: i18n.ts.mentions,
+		icon: "ph-at ph-bold ph-lg",
+	},
+	{
+		key: "directNotes",
+		title: i18n.ts.directNotes,
+		icon: "ph-envelope-simple-open ph-bold ph-lg",
+	},
+]);
 
-const headerTabs = $computed(() => [{
-	key: 'all',
-	title: i18n.ts.all,
-	icon: 'ph-bell ph-bold ph-lg',
-}, {
-	key: 'unread',
-	title: i18n.ts.unread,
-	icon: 'ph-circle-wavy-warning ph-bold ph-lg',
-}, {
-	key: 'mentions',
-	title: i18n.ts.mentions,
-	icon: 'ph-at ph-bold ph-lg',
-}, {
-	key: 'directNotes',
-	title: i18n.ts.directNotes,
-	icon: 'ph-envelope-simple-open ph-bold ph-lg',
-}]);
-
-definePageMetadata(computed(() => ({
-	title: i18n.ts.notifications,
-	icon: 'ph-bell ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.notifications,
+		icon: "ph-bell ph-bold ph-lg",
+	}))
+);
 
 let swiperRef = null;
 
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.button.vue b/packages/client/src/pages/page-editor/els/page-editor.el.button.vue
index 1d25e5493..bd3c0e638 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.button.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.button.vue
@@ -1,67 +1,126 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-lightning ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.button }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.button }}</template>
-
-	<section class="xfhsjczc">
-		<MkInput v-model="value.text"><template #label>{{ i18n.ts._pages.blocks._button.text }}</template></MkInput>
-		<MkSwitch v-model="value.primary"><span>{{ i18n.ts._pages.blocks._button.colored }}</span></MkSwitch>
-		<MkSelect v-model="value.action">
-			<template #label>{{ i18n.ts._pages.blocks._button.action }}</template>
-			<option value="dialog">{{ i18n.ts._pages.blocks._button._action.dialog }}</option>
-			<option value="resetRandom">{{ i18n.ts._pages.blocks._button._action.resetRandom }}</option>
-			<option value="pushEvent">{{ i18n.ts._pages.blocks._button._action.pushEvent }}</option>
-			<option value="callAiScript">{{ i18n.ts._pages.blocks._button._action.callAiScript }}</option>
-		</MkSelect>
-		<template v-if="value.action === 'dialog'">
-			<MkInput v-model="value.content"><template #label>{{ i18n.ts._pages.blocks._button._action._dialog.content }}</template></MkInput>
-		</template>
-		<template v-else-if="value.action === 'pushEvent'">
-			<MkInput v-model="value.event"><template #label>{{ i18n.ts._pages.blocks._button._action._pushEvent.event }}</template></MkInput>
-			<MkInput v-model="value.message"><template #label>{{ i18n.ts._pages.blocks._button._action._pushEvent.message }}</template></MkInput>
-			<MkSelect v-model="value.var">
-				<template #label>{{ i18n.ts._pages.blocks._button._action._pushEvent.variable }}</template>
-				<option :value="null">{{ i18n.t('_pages.blocks._button._action._pushEvent.no-variable') }}</option>
-				<option v-for="v in hpml.getVarsByType()" :value="v.name">{{ v.name }}</option>
-				<optgroup :label="i18n.ts._pages.script.pageVariables">
-					<option v-for="v in hpml.getPageVarsByType()" :value="v">{{ v }}</option>
-				</optgroup>
-				<optgroup :label="i18n.ts._pages.script.enviromentVariables">
-					<option v-for="v in hpml.getEnvVarsByType()" :value="v">{{ v }}</option>
-				</optgroup>
+		<section class="xfhsjczc">
+			<MkInput v-model="value.text"
+				><template #label>{{
+					i18n.ts._pages.blocks._button.text
+				}}</template></MkInput
+			>
+			<MkSwitch v-model="value.primary"
+				><span>{{
+					i18n.ts._pages.blocks._button.colored
+				}}</span></MkSwitch
+			>
+			<MkSelect v-model="value.action">
+				<template #label>{{
+					i18n.ts._pages.blocks._button.action
+				}}</template>
+				<option value="dialog">
+					{{ i18n.ts._pages.blocks._button._action.dialog }}
+				</option>
+				<option value="resetRandom">
+					{{ i18n.ts._pages.blocks._button._action.resetRandom }}
+				</option>
+				<option value="pushEvent">
+					{{ i18n.ts._pages.blocks._button._action.pushEvent }}
+				</option>
+				<option value="callAiScript">
+					{{ i18n.ts._pages.blocks._button._action.callAiScript }}
+				</option>
 			</MkSelect>
-		</template>
-		<template v-else-if="value.action === 'callAiScript'">
-			<MkInput v-model="value.fn"><template #label>{{ i18n.ts._pages.blocks._button._action._callAiScript.functionName }}</template></MkInput>
-		</template>
-	</section>
-</XContainer>
+			<template v-if="value.action === 'dialog'">
+				<MkInput v-model="value.content"
+					><template #label>{{
+						i18n.ts._pages.blocks._button._action._dialog.content
+					}}</template></MkInput
+				>
+			</template>
+			<template v-else-if="value.action === 'pushEvent'">
+				<MkInput v-model="value.event"
+					><template #label>{{
+						i18n.ts._pages.blocks._button._action._pushEvent.event
+					}}</template></MkInput
+				>
+				<MkInput v-model="value.message"
+					><template #label>{{
+						i18n.ts._pages.blocks._button._action._pushEvent.message
+					}}</template></MkInput
+				>
+				<MkSelect v-model="value.var">
+					<template #label>{{
+						i18n.ts._pages.blocks._button._action._pushEvent
+							.variable
+					}}</template>
+					<option :value="null">
+						{{
+							i18n.t(
+								"_pages.blocks._button._action._pushEvent.no-variable"
+							)
+						}}
+					</option>
+					<option v-for="v in hpml.getVarsByType()" :value="v.name">
+						{{ v.name }}
+					</option>
+					<optgroup :label="i18n.ts._pages.script.pageVariables">
+						<option
+							v-for="v in hpml.getPageVarsByType()"
+							:value="v"
+						>
+							{{ v }}
+						</option>
+					</optgroup>
+					<optgroup
+						:label="i18n.ts._pages.script.enviromentVariables"
+					>
+						<option v-for="v in hpml.getEnvVarsByType()" :value="v">
+							{{ v }}
+						</option>
+					</optgroup>
+				</MkSelect>
+			</template>
+			<template v-else-if="value.action === 'callAiScript'">
+				<MkInput v-model="value.fn"
+					><template #label>{{
+						i18n.ts._pages.blocks._button._action._callAiScript
+							.functionName
+					}}</template></MkInput
+				>
+			</template>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import {} from "vue";
+import XContainer from "../page-editor.container.vue";
+import MkSelect from "@/components/form/select.vue";
+import MkInput from "@/components/form/input.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import { i18n } from "@/i18n";
 
-import { } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import MkSelect from '@/components/form/select.vue';
-import MkInput from '@/components/form/input.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import { i18n } from '@/i18n';
-
-withDefaults(defineProps<{
-	value: any,
-	hpml: any
-}>(), {
-	value: {
-		text: '',
-		action: 'dialog',
-		content: null,
-		event: null,
-		message: null,
-		primary: false,
-		var: null,
-		fn: null
+withDefaults(
+	defineProps<{
+		value: any;
+		hpml: any;
+	}>(),
+	{
+		value: {
+			text: "",
+			action: "dialog",
+			content: null,
+			event: null,
+			message: null,
+			primary: false,
+			var: null,
+			fn: null,
+		},
 	}
-});
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.canvas.vue b/packages/client/src/pages/page-editor/els/page-editor.el.canvas.vue
index c92835789..390904438 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.canvas.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.canvas.vue
@@ -1,39 +1,51 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-paint-brush-household ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.canvas }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-paint-brush-household ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.canvas }}</template>
-
-	<section style="padding: 0 16px 0 16px;">
-		<MkInput v-model="value.name">
-			<template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template>
-			<template #label>{{ i18n.ts._pages.blocks._canvas.id }}</template>
-		</MkInput>
-		<MkInput v-model="value.width" type="number">
-			<template #label>{{ i18n.ts._pages.blocks._canvas.width }}</template>
-			<template #suffix>px</template>
-		</MkInput>
-		<MkInput v-model="value.height" type="number">
-			<template #label>{{ i18n.ts._pages.blocks._canvas.height }}</template>
-			<template #suffix>px</template>
-		</MkInput>
-	</section>
-</XContainer>
+		<section style="padding: 0 16px 0 16px">
+			<MkInput v-model="value.name">
+				<template #prefix
+					><i class="ph-magic-wand ph-bold ph-lg"></i
+				></template>
+				<template #label>{{
+					i18n.ts._pages.blocks._canvas.id
+				}}</template>
+			</MkInput>
+			<MkInput v-model="value.width" type="number">
+				<template #label>{{
+					i18n.ts._pages.blocks._canvas.width
+				}}</template>
+				<template #suffix>px</template>
+			</MkInput>
+			<MkInput v-model="value.height" type="number">
+				<template #label>{{
+					i18n.ts._pages.blocks._canvas.height
+				}}</template>
+				<template #suffix>px</template>
+			</MkInput>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import {} from "vue";
+import XContainer from "../page-editor.container.vue";
+import MkInput from "@/components/form/input.vue";
+import { i18n } from "@/i18n";
 
-import { } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import MkInput from '@/components/form/input.vue';
-import { i18n } from '@/i18n';
-
-withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		name: '',
-		width: 300,
-		height: 200
+withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			name: "",
+			width: 300,
+			height: 200,
+		},
 	}
-});
+);
 </script>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue b/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue
index 5b0c2a266..8a387a181 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue
@@ -1,35 +1,47 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-lightning ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.counter }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.counter }}</template>
-
-	<section style="padding: 0 16px 0 16px;">
-		<MkInput v-model="value.name">
-			<template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template>
-			<template #label>{{ i18n.ts._pages.blocks._counter.name }}</template>
-		</MkInput>
-		<MkInput v-model="value.text">
-			<template #label>{{ i18n.ts._pages.blocks._counter.text }}</template>
-		</MkInput>
-		<MkInput v-model="value.inc" type="number">
-			<template #label>{{ i18n.ts._pages.blocks._counter.inc }}</template>
-		</MkInput>
-	</section>
-</XContainer>
+		<section style="padding: 0 16px 0 16px">
+			<MkInput v-model="value.name">
+				<template #prefix
+					><i class="ph-magic-wand ph-bold ph-lg"></i
+				></template>
+				<template #label>{{
+					i18n.ts._pages.blocks._counter.name
+				}}</template>
+			</MkInput>
+			<MkInput v-model="value.text">
+				<template #label>{{
+					i18n.ts._pages.blocks._counter.text
+				}}</template>
+			</MkInput>
+			<MkInput v-model="value.inc" type="number">
+				<template #label>{{
+					i18n.ts._pages.blocks._counter.inc
+				}}</template>
+			</MkInput>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import {} from "vue";
+import XContainer from "../page-editor.container.vue";
+import MkInput from "@/components/form/input.vue";
+import { i18n } from "@/i18n";
 
-import { } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import MkInput from '@/components/form/input.vue';
-import { i18n } from '@/i18n';
-
-withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		name: ''
+withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			name: "",
+		},
 	}
-});
+);
 </script>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.if.vue b/packages/client/src/pages/page-editor/els/page-editor.el.if.vue
index 6e4525e4b..b4a262f9e 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.if.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.if.vue
@@ -1,57 +1,78 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-question ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.if }}</template
+		>
+		<template #func>
+			<button class="_button" @click="add()">
+				<i class="ph-plus ph-bold ph-lg"></i>
+			</button>
+		</template>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-question ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.if }}</template>
-	<template #func>
-		<button class="_button" @click="add()">
-			<i class="ph-plus ph-bold ph-lg"></i>
-		</button>
-	</template>
+		<section class="romcojzs">
+			<MkSelect v-model="value.var">
+				<template #label>{{
+					i18n.ts._pages.blocks._if.variable
+				}}</template>
+				<option
+					v-for="v in hpml.getVarsByType('boolean')"
+					:value="v.name"
+				>
+					{{ v.name }}
+				</option>
+				<optgroup :label="i18n.ts._pages.script.pageVariables">
+					<option
+						v-for="v in hpml.getPageVarsByType('boolean')"
+						:value="v"
+					>
+						{{ v }}
+					</option>
+				</optgroup>
+				<optgroup :label="i18n.ts._pages.script.enviromentVariables">
+					<option
+						v-for="v in hpml.getEnvVarsByType('boolean')"
+						:value="v"
+					>
+						{{ v }}
+					</option>
+				</optgroup>
+			</MkSelect>
 
-	<section class="romcojzs">
-		<MkSelect v-model="value.var">
-			<template #label>{{ i18n.ts._pages.blocks._if.variable }}</template>
-			<option v-for="v in hpml.getVarsByType('boolean')" :value="v.name">{{ v.name }}</option>
-			<optgroup :label="i18n.ts._pages.script.pageVariables">
-				<option v-for="v in hpml.getPageVarsByType('boolean')" :value="v">{{ v }}</option>
-			</optgroup>
-			<optgroup :label="i18n.ts._pages.script.enviromentVariables">
-				<option v-for="v in hpml.getEnvVarsByType('boolean')" :value="v">{{ v }}</option>
-			</optgroup>
-		</MkSelect>
-
-		<XBlocks v-model="value.children" class="children" :hpml="hpml"/>
-	</section>
-</XContainer>
+			<XBlocks v-model="value.children" class="children" :hpml="hpml" />
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import { defineAsyncComponent, inject } from "vue";
+import { v4 as uuid } from "uuid";
+import XContainer from "../page-editor.container.vue";
+import MkSelect from "@/components/form/select.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-import { defineAsyncComponent, inject } from 'vue';
-import { v4 as uuid } from 'uuid';
-import XContainer from '../page-editor.container.vue';
-import MkSelect from '@/components/form/select.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+const XBlocks = defineAsyncComponent(() => import("../page-editor.blocks.vue"));
 
-const XBlocks = defineAsyncComponent(() => import('../page-editor.blocks.vue'));
-
-const props = withDefaults(defineProps<{
-	value: any,
-	hpml: any
-}>(), {
-	value: {
-		children: [],
-		var: null
+const props = withDefaults(
+	defineProps<{
+		value: any;
+		hpml: any;
+	}>(),
+	{
+		value: {
+			children: [],
+			var: null,
+		},
 	}
-});
+);
 
-const getPageBlockList = inject<(any) => any>('getPageBlockList');
+const getPageBlockList = inject<(any) => any>("getPageBlockList");
 
 async function add() {
 	const { canceled, result: type } = await os.select({
 		title: i18n.ts._pages.chooseBlock,
-		groupedItems: getPageBlockList()
+		groupedItems: getPageBlockList(),
 	});
 	if (canceled) return;
 
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.image.vue b/packages/client/src/pages/page-editor/els/page-editor.el.image.vue
index 81d4a10bf..023df8048 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.image.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.image.vue
@@ -1,34 +1,44 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-image ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.image }}</template
+		>
+		<template #func>
+			<button @click="choose()">
+				<i class="ph-folder-notch-open ph-bold ph-lg"></i>
+			</button>
+		</template>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-image ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.image }}</template>
-	<template #func>
-		<button @click="choose()">
-			<i class="ph-folder-notch-open ph-bold ph-lg"></i>
-		</button>
-	</template>
-
-	<section class="oyyftmcf">
-		<MkDriveFileThumbnail v-if="file" class="preview" :file="file" fit="contain" @click="choose()"/>
-	</section>
-</XContainer>
+		<section class="oyyftmcf">
+			<MkDriveFileThumbnail
+				v-if="file"
+				class="preview"
+				:file="file"
+				fit="contain"
+				@click="choose()"
+			/>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import { onMounted } from "vue";
+import XContainer from "../page-editor.container.vue";
+import MkDriveFileThumbnail from "@/components/MkDriveFileThumbnail.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-import { onMounted } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-
-const props = withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		fileId: null
+const props = withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			fileId: null,
+		},
 	}
-});
+);
 
 let file: any = $ref(null);
 
@@ -43,9 +53,9 @@ onMounted(async () => {
 	if (props.value.fileId == null) {
 		await choose();
 	} else {
-		os.api('drive/files/show', {
-			fileId: props.value.fileId
-		}).then(fileResponse => {
+		os.api("drive/files/show", {
+			fileId: props.value.fileId,
+		}).then((fileResponse) => {
 			file = fileResponse;
 		});
 	}
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.note.vue b/packages/client/src/pages/page-editor/els/page-editor.el.note.vue
index 323ac93a8..b9618501b 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.note.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.note.vue
@@ -1,53 +1,79 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-sticker ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.note }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-sticker ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.note }}</template>
+		<section style="padding: 0 16px 0 16px">
+			<MkInput v-model="id">
+				<template #label>{{ i18n.ts._pages.blocks._note.id }}</template>
+				<template #caption>{{
+					i18n.ts._pages.blocks._note.idDescription
+				}}</template>
+			</MkInput>
+			<MkSwitch v-model="value.detailed"
+				><span>{{
+					i18n.ts._pages.blocks._note.detailed
+				}}</span></MkSwitch
+			>
 
-	<section style="padding: 0 16px 0 16px;">
-		<MkInput v-model="id">
-			<template #label>{{ i18n.ts._pages.blocks._note.id }}</template>
-			<template #caption>{{ i18n.ts._pages.blocks._note.idDescription }}</template>
-		</MkInput>
-		<MkSwitch v-model="value.detailed"><span>{{ i18n.ts._pages.blocks._note.detailed }}</span></MkSwitch>
-
-		<XNote v-if="note && !value.detailed" :key="note.id + ':normal'" v-model:note="note" style="margin-bottom: 16px;"/>
-		<XNoteDetailed v-if="note && value.detailed" :key="note.id + ':detail'" v-model:note="note" style="margin-bottom: 16px;"/>
-	</section>
-</XContainer>
+			<XNote
+				v-if="note && !value.detailed"
+				:key="note.id + ':normal'"
+				v-model:note="note"
+				style="margin-bottom: 16px"
+			/>
+			<XNoteDetailed
+				v-if="note && value.detailed"
+				:key="note.id + ':detail'"
+				v-model:note="note"
+				style="margin-bottom: 16px"
+			/>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import { watch } from "vue";
+import XContainer from "../page-editor.container.vue";
+import MkInput from "@/components/form/input.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import XNote from "@/components/MkNote.vue";
+import XNoteDetailed from "@/components/MkNoteDetailed.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-import { watch } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import MkInput from '@/components/form/input.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import XNote from '@/components/MkNote.vue';
-import XNoteDetailed from '@/components/MkNoteDetailed.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-
-const props = withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		note: null,
-		detailed: false
+const props = withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			note: null,
+			detailed: false,
+		},
 	}
-});
+);
 
 let id: any = $ref(props.value.note);
 let note: any = $ref(null);
 
-watch(id, async () => {
-	if (id && (id.startsWith('http://') || id.startsWith('https://'))) {
-		props.value.note = (id.endsWith('/') ? id.slice(0, -1) : id).split('/').pop();
-	} else {
-		props.value.note = id;
-	}
+watch(
+	id,
+	async () => {
+		if (id && (id.startsWith("http://") || id.startsWith("https://"))) {
+			props.value.note = (id.endsWith("/") ? id.slice(0, -1) : id)
+				.split("/")
+				.pop();
+		} else {
+			props.value.note = id;
+		}
 
-	note = await os.api('notes/show', { noteId: props.value.note });
-}, {
-	immediate: true
-});
+		note = await os.api("notes/show", { noteId: props.value.note });
+	},
+	{
+		immediate: true,
+	}
+);
 </script>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.number-input.vue b/packages/client/src/pages/page-editor/els/page-editor.el.number-input.vue
index 98d23cb45..aab3ba55f 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.number-input.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.number-input.vue
@@ -1,35 +1,47 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-lightning ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.numberInput }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.numberInput }}</template>
-
-	<section style="padding: 0 16px 0 16px;">
-		<MkInput v-model="value.name">
-			<template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template>
-			<template #label>{{ i18n.ts._pages.blocks._numberInput.name }}</template>
-		</MkInput>
-		<MkInput v-model="value.text">
-			<template #label>{{ i18n.ts._pages.blocks._numberInput.text }}</template>
-		</MkInput>
-		<MkInput v-model="value.default" type="number">
-			<template #label>{{ i18n.ts._pages.blocks._numberInput.default }}</template>
-		</MkInput>
-	</section>
-</XContainer>
+		<section style="padding: 0 16px 0 16px">
+			<MkInput v-model="value.name">
+				<template #prefix
+					><i class="ph-magic-wand ph-bold ph-lg"></i
+				></template>
+				<template #label>{{
+					i18n.ts._pages.blocks._numberInput.name
+				}}</template>
+			</MkInput>
+			<MkInput v-model="value.text">
+				<template #label>{{
+					i18n.ts._pages.blocks._numberInput.text
+				}}</template>
+			</MkInput>
+			<MkInput v-model="value.default" type="number">
+				<template #label>{{
+					i18n.ts._pages.blocks._numberInput.default
+				}}</template>
+			</MkInput>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import {} from "vue";
+import XContainer from "../page-editor.container.vue";
+import MkInput from "@/components/form/input.vue";
+import { i18n } from "@/i18n";
 
-import { } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import MkInput from '@/components/form/input.vue';
-import { i18n } from '@/i18n';
-
-withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		name: ''
+withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			name: "",
+		},
 	}
-});
+);
 </script>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.post.vue b/packages/client/src/pages/page-editor/els/page-editor.el.post.vue
index 9828c99d1..27129d65c 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.post.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.post.vue
@@ -1,32 +1,48 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-paper-plane-tilt ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.post }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-paper-plane-tilt ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.post }}</template>
-
-	<section style="padding: 16px;">
-		<MkTextarea v-model="value.text"><template #label>{{ i18n.ts._pages.blocks._post.text }}</template></MkTextarea>
-		<MkSwitch v-model="value.attachCanvasImage"><span>{{ i18n.ts._pages.blocks._post.attachCanvasImage }}</span></MkSwitch>
-		<MkInput v-if="value.attachCanvasImage" v-model="value.canvasId"><template #label>{{ i18n.ts._pages.blocks._post.canvasId }}</template></MkInput>
-	</section>
-</XContainer>
+		<section style="padding: 16px">
+			<MkTextarea v-model="value.text"
+				><template #label>{{
+					i18n.ts._pages.blocks._post.text
+				}}</template></MkTextarea
+			>
+			<MkSwitch v-model="value.attachCanvasImage"
+				><span>{{
+					i18n.ts._pages.blocks._post.attachCanvasImage
+				}}</span></MkSwitch
+			>
+			<MkInput v-if="value.attachCanvasImage" v-model="value.canvasId"
+				><template #label>{{
+					i18n.ts._pages.blocks._post.canvasId
+				}}</template></MkInput
+			>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import {} from "vue";
+import XContainer from "../page-editor.container.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import MkInput from "@/components/form/input.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import { i18n } from "@/i18n";
 
-import { } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import MkInput from '@/components/form/input.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import { i18n } from '@/i18n';
-
-withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		text: '',
-		attachCanvasImage: false,
-		canvasId: ''
+withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			text: "",
+			attachCanvasImage: false,
+			canvasId: "",
+		},
 	}
-});
+);
 </script>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.radio-button.vue b/packages/client/src/pages/page-editor/els/page-editor.el.radio-button.vue
index 852c3d60c..62254b7d9 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.radio-button.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.radio-button.vue
@@ -1,40 +1,66 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-lightning ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.radioButton }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.radioButton }}</template>
-
-	<section style="padding: 0 16px 16px 16px;">
-		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._radioButton.name }}</template></MkInput>
-		<MkInput v-model="value.title"><template #label>{{ i18n.ts._pages.blocks._radioButton.title }}</template></MkInput>
-		<MkTextarea v-model="values"><template #label>{{ i18n.ts._pages.blocks._radioButton.values }}</template></MkTextarea>
-		<MkInput v-model="value.default"><template #label>{{ i18n.ts._pages.blocks._radioButton.default }}</template></MkInput>
-	</section>
-</XContainer>
+		<section style="padding: 0 16px 16px 16px">
+			<MkInput v-model="value.name"
+				><template #prefix
+					><i class="ph-magic-wand ph-bold ph-lg"></i></template
+				><template #label>{{
+					i18n.ts._pages.blocks._radioButton.name
+				}}</template></MkInput
+			>
+			<MkInput v-model="value.title"
+				><template #label>{{
+					i18n.ts._pages.blocks._radioButton.title
+				}}</template></MkInput
+			>
+			<MkTextarea v-model="values"
+				><template #label>{{
+					i18n.ts._pages.blocks._radioButton.values
+				}}</template></MkTextarea
+			>
+			<MkInput v-model="value.default"
+				><template #label>{{
+					i18n.ts._pages.blocks._radioButton.default
+				}}</template></MkInput
+			>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import { watch } from "vue";
+import XContainer from "../page-editor.container.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import MkInput from "@/components/form/input.vue";
+import { i18n } from "@/i18n";
 
-import { watch } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import MkInput from '@/components/form/input.vue';
-import { i18n } from '@/i18n';
-
-const props = withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		name: '',
-		title: '',
-		values: []
+const props = withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			name: "",
+			title: "",
+			values: [],
+		},
 	}
-});
+);
 
-let values: string = $ref(props.value.values.join('\n'));
+let values: string = $ref(props.value.values.join("\n"));
 
-watch(values, () => {
-	props.value.values = values.split('\n');
-}, {
-	deep: true
-});
+watch(
+	values,
+	() => {
+		props.value.values = values.split("\n");
+	},
+	{
+		deep: true,
+	}
+);
 </script>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.section.vue b/packages/client/src/pages/page-editor/els/page-editor.el.section.vue
index ee88d8a05..3db5a7d0f 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.section.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.section.vue
@@ -1,48 +1,52 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-sticker ph-bold ph-lg"></i>
+			{{ value.title }}</template
+		>
+		<template #func>
+			<button class="_button" @click="rename()">
+				<i class="ph-pencil ph-bold ph-lg"></i>
+			</button>
+			<button class="_button" @click="add()">
+				<i class="ph-plus ph-bold ph-lg"></i>
+			</button>
+		</template>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-sticker ph-bold ph-lg"></i> {{ value.title }}</template>
-	<template #func>
-		<button class="_button" @click="rename()">
-			<i class="ph-pencil ph-bold ph-lg"></i>
-		</button>
-		<button class="_button" @click="add()">
-			<i class="ph-plus ph-bold ph-lg"></i>
-		</button>
-	</template>
-
-	<section class="ilrvjyvi">
-		<XBlocks v-model="value.children" class="children" :hpml="hpml"/>
-	</section>
-</XContainer>
+		<section class="ilrvjyvi">
+			<XBlocks v-model="value.children" class="children" :hpml="hpml" />
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import { defineAsyncComponent, inject, onMounted } from "vue";
+import { v4 as uuid } from "uuid";
+import XContainer from "../page-editor.container.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-import { defineAsyncComponent, inject, onMounted } from 'vue';
-import { v4 as uuid } from 'uuid';
-import XContainer from '../page-editor.container.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+const XBlocks = defineAsyncComponent(() => import("../page-editor.blocks.vue"));
 
-const XBlocks = defineAsyncComponent(() => import('../page-editor.blocks.vue'));
-
-const props = withDefaults(defineProps<{
-	value: any,
-	hpml: any
-}>(), {
-	value: {
-		title: null,
-		children: []
+const props = withDefaults(
+	defineProps<{
+		value: any;
+		hpml: any;
+	}>(),
+	{
+		value: {
+			title: null,
+			children: [],
+		},
 	}
-});
+);
 
-const getPageBlockList = inject<(any) => any>('getPageBlockList');
+const getPageBlockList = inject<(any) => any>("getPageBlockList");
 
 async function rename() {
 	const { canceled, result: title } = await os.inputText({
-		title: 'Enter title',
-		default: props.value.title
+		title: "Enter title",
+		default: props.value.title,
 	});
 	if (canceled) return;
 	props.value.title = title;
@@ -51,7 +55,7 @@ async function rename() {
 async function add() {
 	const { canceled, result: type } = await os.select({
 		title: i18n.ts._pages.chooseBlock,
-		groupedItems: getPageBlockList()
+		groupedItems: getPageBlockList(),
 	});
 	if (canceled) return;
 
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.switch.vue b/packages/client/src/pages/page-editor/els/page-editor.el.switch.vue
index cc7aabbfe..78302e9b9 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.switch.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.switch.vue
@@ -1,31 +1,49 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-lightning ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.switch }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.switch }}</template>
-
-	<section class="kjuadyyj">
-		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._switch.name }}</template></MkInput>
-		<MkInput v-model="value.text"><template #label>{{ i18n.ts._pages.blocks._switch.text }}</template></MkInput>
-		<MkSwitch v-model="value.default"><span>{{ i18n.ts._pages.blocks._switch.default }}</span></MkSwitch>
-	</section>
-</XContainer>
+		<section class="kjuadyyj">
+			<MkInput v-model="value.name"
+				><template #prefix
+					><i class="ph-magic-wand ph-bold ph-lg"></i></template
+				><template #label>{{
+					i18n.ts._pages.blocks._switch.name
+				}}</template></MkInput
+			>
+			<MkInput v-model="value.text"
+				><template #label>{{
+					i18n.ts._pages.blocks._switch.text
+				}}</template></MkInput
+			>
+			<MkSwitch v-model="value.default"
+				><span>{{
+					i18n.ts._pages.blocks._switch.default
+				}}</span></MkSwitch
+			>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import {} from "vue";
+import XContainer from "../page-editor.container.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import MkInput from "@/components/form/input.vue";
+import { i18n } from "@/i18n";
 
-import { } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import MkInput from '@/components/form/input.vue';
-import { i18n } from '@/i18n';
-
-withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		name: ''
+withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			name: "",
+		},
 	}
-});
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.text-input.vue b/packages/client/src/pages/page-editor/els/page-editor.el.text-input.vue
index f1a6fbd8d..e2b14b8fb 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.text-input.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.text-input.vue
@@ -1,28 +1,46 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-lightning ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.textInput }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.textInput }}</template>
-
-	<section style="padding: 0 16px 0 16px;">
-		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._textInput.name }}</template></MkInput>
-		<MkInput v-model="value.text"><template #label>{{ i18n.ts._pages.blocks._textInput.text }}</template></MkInput>
-		<MkInput v-model="value.default" type="text"><template #label>{{ i18n.ts._pages.blocks._textInput.default }}</template></MkInput>
-	</section>
-</XContainer>
+		<section style="padding: 0 16px 0 16px">
+			<MkInput v-model="value.name"
+				><template #prefix
+					><i class="ph-magic-wand ph-bold ph-lg"></i></template
+				><template #label>{{
+					i18n.ts._pages.blocks._textInput.name
+				}}</template></MkInput
+			>
+			<MkInput v-model="value.text"
+				><template #label>{{
+					i18n.ts._pages.blocks._textInput.text
+				}}</template></MkInput
+			>
+			<MkInput v-model="value.default" type="text"
+				><template #label>{{
+					i18n.ts._pages.blocks._textInput.default
+				}}</template></MkInput
+			>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import {} from "vue";
+import XContainer from "../page-editor.container.vue";
+import MkInput from "@/components/form/input.vue";
+import { i18n } from "@/i18n";
 
-import { } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import MkInput from '@/components/form/input.vue';
-import { i18n } from '@/i18n';
-
-withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		name: ''
+withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			name: "",
+		},
 	}
-});
+);
 </script>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.text.vue b/packages/client/src/pages/page-editor/els/page-editor.el.text.vue
index bbe01c9ed..08572b3ee 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.text.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.text.vue
@@ -1,27 +1,31 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-align-left ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.text }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-align-left ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.text }}</template>
-
-	<section class="vckmsadr">
-		<textarea v-model="value.text"></textarea>
-	</section>
-</XContainer>
+		<section class="vckmsadr">
+			<textarea v-model="value.text"></textarea>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import {} from "vue";
+import XContainer from "../page-editor.container.vue";
+import { i18n } from "@/i18n";
 
-import { } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import { i18n } from '@/i18n';
-
-withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		text: ''
+withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			text: "",
+		},
 	}
-});
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.textarea-input.vue b/packages/client/src/pages/page-editor/els/page-editor.el.textarea-input.vue
index e48512815..5f020f713 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.textarea-input.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.textarea-input.vue
@@ -1,29 +1,47 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-lightning ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.textareaInput }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.textareaInput }}</template>
-
-	<section style="padding: 0 16px 16px 16px;">
-		<MkInput v-model="value.name"><template #prefix><i class="ph-magic-wand ph-bold ph-lg"></i></template><template #label>{{ i18n.ts._pages.blocks._textareaInput.name }}</template></MkInput>
-		<MkInput v-model="value.text"><template #label>{{ i18n.ts._pages.blocks._textareaInput.text }}</template></MkInput>
-		<MkTextarea v-model="value.default"><template #label>{{ i18n.ts._pages.blocks._textareaInput.default }}</template></MkTextarea>
-	</section>
-</XContainer>
+		<section style="padding: 0 16px 16px 16px">
+			<MkInput v-model="value.name"
+				><template #prefix
+					><i class="ph-magic-wand ph-bold ph-lg"></i></template
+				><template #label>{{
+					i18n.ts._pages.blocks._textareaInput.name
+				}}</template></MkInput
+			>
+			<MkInput v-model="value.text"
+				><template #label>{{
+					i18n.ts._pages.blocks._textareaInput.text
+				}}</template></MkInput
+			>
+			<MkTextarea v-model="value.default"
+				><template #label>{{
+					i18n.ts._pages.blocks._textareaInput.default
+				}}</template></MkTextarea
+			>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import {} from "vue";
+import XContainer from "../page-editor.container.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import MkInput from "@/components/form/input.vue";
+import { i18n } from "@/i18n";
 
-import { } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import MkInput from '@/components/form/input.vue';
-import { i18n } from '@/i18n';
-
-withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		name: ''
+withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			name: "",
+		},
 	}
-});
+);
 </script>
diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.textarea.vue b/packages/client/src/pages/page-editor/els/page-editor.el.textarea.vue
index cdae20a2e..3c956f091 100644
--- a/packages/client/src/pages/page-editor/els/page-editor.el.textarea.vue
+++ b/packages/client/src/pages/page-editor/els/page-editor.el.textarea.vue
@@ -1,27 +1,31 @@
 <template>
+	<XContainer :draggable="true" @remove="() => $emit('remove')">
+		<template #header
+			><i class="ph-align-left ph-bold ph-lg"></i>
+			{{ i18n.ts._pages.blocks.textarea }}</template
+		>
 
-<XContainer :draggable="true" @remove="() => $emit('remove')">
-	<template #header><i class="ph-align-left ph-bold ph-lg"></i> {{ i18n.ts._pages.blocks.textarea }}</template>
-
-	<section class="ihymsbbe">
-		<textarea v-model="value.text"></textarea>
-	</section>
-</XContainer>
+		<section class="ihymsbbe">
+			<textarea v-model="value.text"></textarea>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts" setup>
+import {} from "vue";
+import XContainer from "../page-editor.container.vue";
+import { i18n } from "@/i18n";
 
-import { } from 'vue';
-import XContainer from '../page-editor.container.vue';
-import { i18n } from '@/i18n';
-
-withDefaults(defineProps<{
-	value: any
-}>(), {
-	value: {
-		text: ''
+withDefaults(
+	defineProps<{
+		value: any;
+	}>(),
+	{
+		value: {
+			text: "",
+		},
 	}
-});
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/page-editor/page-editor.blocks.vue b/packages/client/src/pages/page-editor/page-editor.blocks.vue
index dc363fe25..2200b4a37 100644
--- a/packages/client/src/pages/page-editor/page-editor.blocks.vue
+++ b/packages/client/src/pages/page-editor/page-editor.blocks.vue
@@ -1,47 +1,77 @@
 <template>
-<XDraggable v-model="blocks" tag="div" item-key="id" handle=".drag-handle" :group="{ name: 'blocks' }" animation="150" swap-threshold="0.5">
-	<template #item="{element}">
-		<component :is="'x-' + element.type" :value="element" :hpml="hpml" @update:value="updateItem" @remove="() => removeItem(element)"/>
-	</template>
-</XDraggable>
+	<XDraggable
+		v-model="blocks"
+		tag="div"
+		item-key="id"
+		handle=".drag-handle"
+		:group="{ name: 'blocks' }"
+		animation="150"
+		swap-threshold="0.5"
+	>
+		<template #item="{ element }">
+			<component
+				:is="'x-' + element.type"
+				:value="element"
+				:hpml="hpml"
+				@update:value="updateItem"
+				@remove="() => removeItem(element)"
+			/>
+		</template>
+	</XDraggable>
 </template>
 
 <script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
-import XSection from './els/page-editor.el.section.vue';
-import XText from './els/page-editor.el.text.vue';
-import XTextarea from './els/page-editor.el.textarea.vue';
-import XImage from './els/page-editor.el.image.vue';
-import XButton from './els/page-editor.el.button.vue';
-import XTextInput from './els/page-editor.el.text-input.vue';
-import XTextareaInput from './els/page-editor.el.textarea-input.vue';
-import XNumberInput from './els/page-editor.el.number-input.vue';
-import XSwitch from './els/page-editor.el.switch.vue';
-import XIf from './els/page-editor.el.if.vue';
-import XPost from './els/page-editor.el.post.vue';
-import XCounter from './els/page-editor.el.counter.vue';
-import XRadioButton from './els/page-editor.el.radio-button.vue';
-import XCanvas from './els/page-editor.el.canvas.vue';
-import XNote from './els/page-editor.el.note.vue';
-import * as os from '@/os';
+import { defineComponent, defineAsyncComponent } from "vue";
+import XSection from "./els/page-editor.el.section.vue";
+import XText from "./els/page-editor.el.text.vue";
+import XTextarea from "./els/page-editor.el.textarea.vue";
+import XImage from "./els/page-editor.el.image.vue";
+import XButton from "./els/page-editor.el.button.vue";
+import XTextInput from "./els/page-editor.el.text-input.vue";
+import XTextareaInput from "./els/page-editor.el.textarea-input.vue";
+import XNumberInput from "./els/page-editor.el.number-input.vue";
+import XSwitch from "./els/page-editor.el.switch.vue";
+import XIf from "./els/page-editor.el.if.vue";
+import XPost from "./els/page-editor.el.post.vue";
+import XCounter from "./els/page-editor.el.counter.vue";
+import XRadioButton from "./els/page-editor.el.radio-button.vue";
+import XCanvas from "./els/page-editor.el.canvas.vue";
+import XNote from "./els/page-editor.el.note.vue";
+import * as os from "@/os";
 
 export default defineComponent({
 	components: {
-		XDraggable: defineAsyncComponent(() => import('vuedraggable').then(x => x.default)),
-		XSection, XText, XImage, XButton, XTextarea, XTextInput, XTextareaInput, XNumberInput, XSwitch, XIf, XPost, XCounter, XRadioButton, XCanvas, XNote
+		XDraggable: defineAsyncComponent(() =>
+			import("vuedraggable").then((x) => x.default)
+		),
+		XSection,
+		XText,
+		XImage,
+		XButton,
+		XTextarea,
+		XTextInput,
+		XTextareaInput,
+		XNumberInput,
+		XSwitch,
+		XIf,
+		XPost,
+		XCounter,
+		XRadioButton,
+		XCanvas,
+		XNote,
 	},
 
 	props: {
 		modelValue: {
 			type: Array,
-			required: true
+			required: true,
 		},
 		hpml: {
 			required: true,
 		},
 	},
 
-	emits: ['update:modelValue'],
+	emits: ["update:modelValue"],
 
 	computed: {
 		blocks: {
@@ -49,30 +79,30 @@ export default defineComponent({
 				return this.modelValue;
 			},
 			set(value) {
-				this.$emit('update:modelValue', value);
-			}
-		}
+				this.$emit("update:modelValue", value);
+			},
+		},
 	},
 
 	methods: {
 		updateItem(v) {
-			const i = this.blocks.findIndex(x => x.id === v.id);
+			const i = this.blocks.findIndex((x) => x.id === v.id);
 			const newValue = [
 				...this.blocks.slice(0, i),
 				v,
-				...this.blocks.slice(i + 1)
+				...this.blocks.slice(i + 1),
 			];
-			this.$emit('update:modelValue', newValue);
+			this.$emit("update:modelValue", newValue);
 		},
 
 		removeItem(el) {
-			const i = this.blocks.findIndex(x => x.id === el.id);
+			const i = this.blocks.findIndex((x) => x.id === el.id);
 			const newValue = [
 				...this.blocks.slice(0, i),
-				...this.blocks.slice(i + 1)
+				...this.blocks.slice(i + 1),
 			];
-			this.$emit('update:modelValue', newValue);
+			this.$emit("update:modelValue", newValue);
 		},
-	}
+	},
 });
 </script>
diff --git a/packages/client/src/pages/page-editor/page-editor.container.vue b/packages/client/src/pages/page-editor/page-editor.container.vue
index af0c588b3..400c705d6 100644
--- a/packages/client/src/pages/page-editor/page-editor.container.vue
+++ b/packages/client/src/pages/page-editor/page-editor.container.vue
@@ -1,32 +1,50 @@
 <template>
-<div class="cpjygsrt" :class="{ error: error != null, warn: warn != null }">
-	<header>
-		<div class="title"><slot name="header"></slot></div>
-		<div class="buttons">
-			<slot name="func"></slot>
-			<button v-if="removable" class="_button" @click="remove()">
-				<i class="ph-trash ph-bold ph-lg"></i>
-			</button>
-			<button v-if="draggable" class="drag-handle _button">
-				<i class="ph-list ph-bold ph-lg"></i>
-			</button>
-			<button class="_button" @click="toggleContent(!showBody)">
-				<template v-if="showBody"><i class="ph-caret-up ph-bold ph-lg"></i></template>
-				<template v-else><i class="ph-caret-down ph-bold ph-lg"></i></template>
-			</button>
+	<div class="cpjygsrt" :class="{ error: error != null, warn: warn != null }">
+		<header>
+			<div class="title"><slot name="header"></slot></div>
+			<div class="buttons">
+				<slot name="func"></slot>
+				<button v-if="removable" class="_button" @click="remove()">
+					<i class="ph-trash ph-bold ph-lg"></i>
+				</button>
+				<button v-if="draggable" class="drag-handle _button">
+					<i class="ph-list ph-bold ph-lg"></i>
+				</button>
+				<button class="_button" @click="toggleContent(!showBody)">
+					<template v-if="showBody"
+						><i class="ph-caret-up ph-bold ph-lg"></i
+					></template>
+					<template v-else
+						><i class="ph-caret-down ph-bold ph-lg"></i
+					></template>
+				</button>
+			</div>
+		</header>
+		<p v-show="showBody" v-if="error != null" class="error">
+			{{
+				i18n.t("_pages.script.typeError", {
+					slot: error.arg + 1,
+					expect: i18n.t(`script.types.${error.expect}`),
+					actual: i18n.t(`script.types.${error.actual}`),
+				})
+			}}
+		</p>
+		<p v-show="showBody" v-if="warn != null" class="warn">
+			{{
+				i18n.t("_pages.script.thereIsEmptySlot", {
+					slot: warn.slot + 1,
+				})
+			}}
+		</p>
+		<div v-show="showBody" class="body">
+			<slot></slot>
 		</div>
-	</header>
-	<p v-show="showBody" v-if="error != null" class="error">{{ i18n.t('_pages.script.typeError', { slot: error.arg + 1, expect: i18n.t(`script.types.${error.expect}`), actual: i18n.t(`script.types.${error.actual}`) }) }}</p>
-	<p v-show="showBody" v-if="warn != null" class="warn">{{ i18n.t('_pages.script.thereIsEmptySlot', { slot: warn.slot + 1 }) }}</p>
-	<div v-show="showBody" class="body">
-		<slot></slot>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import { i18n } from '@/i18n';
+import { defineComponent } from "vue";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	props: {
@@ -51,7 +69,7 @@ export default defineComponent({
 			default: null,
 		},
 	},
-	emits: ['toggle', 'remove'],
+	emits: ["toggle", "remove"],
 	data() {
 		return {
 			showBody: this.expanded,
@@ -61,10 +79,10 @@ export default defineComponent({
 	methods: {
 		toggleContent(show: boolean) {
 			this.showBody = show;
-			this.$emit('toggle', show);
+			this.$emit("toggle", show);
 		},
 		remove() {
-			this.$emit('remove');
+			this.$emit("remove");
 		},
 	},
 });
@@ -147,7 +165,8 @@ export default defineComponent({
 	}
 
 	> .body {
-		::v-deep(.juejbjww), ::v-deep(.eiipwacr) {
+		::v-deep(.juejbjww),
+		::v-deep(.eiipwacr) {
 			&:not(.inline):first-child {
 				margin-top: 28px;
 			}
diff --git a/packages/client/src/pages/page-editor/page-editor.script-block.vue b/packages/client/src/pages/page-editor/page-editor.script-block.vue
index 2f437cf8b..7d88ec7e7 100644
--- a/packages/client/src/pages/page-editor/page-editor.script-block.vue
+++ b/packages/client/src/pages/page-editor/page-editor.script-block.vue
@@ -1,95 +1,189 @@
 <template>
+	<XContainer
+		:removable="removable"
+		:error="error"
+		:warn="warn"
+		:draggable="draggable"
+		@remove="() => $emit('remove')"
+	>
+		<template #header
+			><i v-if="icon" :class="icon"></i>
+			<template v-if="title"
+				>{{ title }}
+				<span v-if="typeText" class="turmquns"
+					>({{ typeText }})</span
+				></template
+			><template v-else-if="typeText">{{ typeText }}</template></template
+		>
+		<template #func>
+			<button class="_button" @click="changeType()">
+				<i class="ph-pencil ph-bold ph-lg"></i>
+			</button>
+		</template>
 
-<XContainer :removable="removable" :error="error" :warn="warn" :draggable="draggable" @remove="() => $emit('remove')">
-	<template #header><i v-if="icon" :class="icon"></i> <template v-if="title">{{ title }} <span v-if="typeText" class="turmquns">({{ typeText }})</span></template><template v-else-if="typeText">{{ typeText }}</template></template>
-	<template #func>
-		<button class="_button" @click="changeType()">
-			<i class="ph-pencil ph-bold ph-lg"></i>
-		</button>
-	</template>
-
-	<section v-if="modelValue.type === null" class="pbglfege" @click="changeType()">
-		{{ i18n.ts._pages.script.emptySlot }}
-	</section>
-	<section v-else-if="modelValue.type === 'text'" class="tbwccoaw">
-		<input v-model="modelValue.value"/>
-	</section>
-	<section v-else-if="modelValue.type === 'multiLineText'" class="tbwccoaw">
-		<textarea v-model="modelValue.value"></textarea>
-	</section>
-	<section v-else-if="modelValue.type === 'textList'" class="tbwccoaw">
-		<textarea v-model="modelValue.value" :placeholder="i18n.ts._pages.script.blocks._textList.info"></textarea>
-	</section>
-	<section v-else-if="modelValue.type === 'number'" class="tbwccoaw">
-		<input v-model="modelValue.value" type="number"/>
-	</section>
-	<section v-else-if="modelValue.type === 'ref'" class="hpdwcrvs">
-		<select v-model="modelValue.value">
-			<option v-for="v in hpml.getVarsByType(getExpectedType ? getExpectedType() : null).filter(x => x.name !== name)" :value="v.name">{{ v.name }}</option>
-			<optgroup :label="i18n.ts._pages.script.argVariables">
-				<option v-for="v in fnSlots" :value="v.name">{{ v.name }}</option>
-			</optgroup>
-			<optgroup :label="i18n.ts._pages.script.pageVariables">
-				<option v-for="v in hpml.getPageVarsByType(getExpectedType ? getExpectedType() : null)" :value="v">{{ v }}</option>
-			</optgroup>
-			<optgroup :label="i18n.ts._pages.script.enviromentVariables">
-				<option v-for="v in hpml.getEnvVarsByType(getExpectedType ? getExpectedType() : null)" :value="v">{{ v }}</option>
-			</optgroup>
-		</select>
-	</section>
-	<section v-else-if="modelValue.type === 'aiScriptVar'" class="tbwccoaw">
-		<input v-model="modelValue.value"/>
-	</section>
-	<section v-else-if="modelValue.type === 'fn'" class="" style="padding:0 16px 16px 16px;">
-		<MkTextarea v-model="slots">
-			<template #label>{{ i18n.ts._pages.script.blocks._fn.slots }}</template>
-			<template #caption>{{ i18n.t('_pages.script.blocks._fn.slots-info') }}</template>
-		</MkTextarea>
-		<XV v-if="modelValue.value.expression" v-model="modelValue.value.expression" :title="i18n.t(`_pages.script.blocks._fn.arg1`)" :get-expected-type="() => null" :hpml="hpml" :fn-slots="modelValue.value.slots" :name="name"/>
-	</section>
-	<section v-else-if="modelValue.type.startsWith('fn:')" class="" style="padding:16px;">
-		<XV v-for="(x, i) in modelValue.args" :key="i" v-model="modelValue.args[i]" :title="hpml.getVarByName(modelValue.type.split(':')[1]).value.slots[i].name" :get-expected-type="() => null" :hpml="hpml" :name="name"/>
-	</section>
-	<section v-else class="" style="padding:16px;">
-		<XV v-for="(x, i) in modelValue.args" :key="i" v-model="modelValue.args[i]" :title="i18n.t(`_pages.script.blocks._${modelValue.type}.arg${i + 1}`)" :get-expected-type="() => _getExpectedType(i)" :hpml="hpml" :name="name" :fn-slots="fnSlots"/>
-	</section>
-</XContainer>
+		<section
+			v-if="modelValue.type === null"
+			class="pbglfege"
+			@click="changeType()"
+		>
+			{{ i18n.ts._pages.script.emptySlot }}
+		</section>
+		<section v-else-if="modelValue.type === 'text'" class="tbwccoaw">
+			<input v-model="modelValue.value" />
+		</section>
+		<section
+			v-else-if="modelValue.type === 'multiLineText'"
+			class="tbwccoaw"
+		>
+			<textarea v-model="modelValue.value"></textarea>
+		</section>
+		<section v-else-if="modelValue.type === 'textList'" class="tbwccoaw">
+			<textarea
+				v-model="modelValue.value"
+				:placeholder="i18n.ts._pages.script.blocks._textList.info"
+			></textarea>
+		</section>
+		<section v-else-if="modelValue.type === 'number'" class="tbwccoaw">
+			<input v-model="modelValue.value" type="number" />
+		</section>
+		<section v-else-if="modelValue.type === 'ref'" class="hpdwcrvs">
+			<select v-model="modelValue.value">
+				<option
+					v-for="v in hpml
+						.getVarsByType(
+							getExpectedType ? getExpectedType() : null
+						)
+						.filter((x) => x.name !== name)"
+					:value="v.name"
+				>
+					{{ v.name }}
+				</option>
+				<optgroup :label="i18n.ts._pages.script.argVariables">
+					<option v-for="v in fnSlots" :value="v.name">
+						{{ v.name }}
+					</option>
+				</optgroup>
+				<optgroup :label="i18n.ts._pages.script.pageVariables">
+					<option
+						v-for="v in hpml.getPageVarsByType(
+							getExpectedType ? getExpectedType() : null
+						)"
+						:value="v"
+					>
+						{{ v }}
+					</option>
+				</optgroup>
+				<optgroup :label="i18n.ts._pages.script.enviromentVariables">
+					<option
+						v-for="v in hpml.getEnvVarsByType(
+							getExpectedType ? getExpectedType() : null
+						)"
+						:value="v"
+					>
+						{{ v }}
+					</option>
+				</optgroup>
+			</select>
+		</section>
+		<section v-else-if="modelValue.type === 'aiScriptVar'" class="tbwccoaw">
+			<input v-model="modelValue.value" />
+		</section>
+		<section
+			v-else-if="modelValue.type === 'fn'"
+			class=""
+			style="padding: 0 16px 16px 16px"
+		>
+			<MkTextarea v-model="slots">
+				<template #label>{{
+					i18n.ts._pages.script.blocks._fn.slots
+				}}</template>
+				<template #caption>{{
+					i18n.t("_pages.script.blocks._fn.slots-info")
+				}}</template>
+			</MkTextarea>
+			<XV
+				v-if="modelValue.value.expression"
+				v-model="modelValue.value.expression"
+				:title="i18n.t(`_pages.script.blocks._fn.arg1`)"
+				:get-expected-type="() => null"
+				:hpml="hpml"
+				:fn-slots="modelValue.value.slots"
+				:name="name"
+			/>
+		</section>
+		<section
+			v-else-if="modelValue.type.startsWith('fn:')"
+			class=""
+			style="padding: 16px"
+		>
+			<XV
+				v-for="(x, i) in modelValue.args"
+				:key="i"
+				v-model="modelValue.args[i]"
+				:title="
+					hpml.getVarByName(modelValue.type.split(':')[1]).value
+						.slots[i].name
+				"
+				:get-expected-type="() => null"
+				:hpml="hpml"
+				:name="name"
+			/>
+		</section>
+		<section v-else class="" style="padding: 16px">
+			<XV
+				v-for="(x, i) in modelValue.args"
+				:key="i"
+				v-model="modelValue.args[i]"
+				:title="
+					i18n.t(
+						`_pages.script.blocks._${modelValue.type}.arg${i + 1}`
+					)
+				"
+				:get-expected-type="() => _getExpectedType(i)"
+				:hpml="hpml"
+				:name="name"
+				:fn-slots="fnSlots"
+			/>
+		</section>
+	</XContainer>
 </template>
 
 <script lang="ts">
-
-import { defineAsyncComponent, defineComponent } from 'vue';
-import { v4 as uuid } from 'uuid';
-import XContainer from './page-editor.container.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import { blockDefs } from '@/scripts/hpml/index';
-import * as os from '@/os';
-import { isLiteralValue } from '@/scripts/hpml/expr';
-import { funcDefs } from '@/scripts/hpml/lib';
-import { i18n } from '@/i18n';
+import { defineAsyncComponent, defineComponent } from "vue";
+import { v4 as uuid } from "uuid";
+import XContainer from "./page-editor.container.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import { blockDefs } from "@/scripts/hpml/index";
+import * as os from "@/os";
+import { isLiteralValue } from "@/scripts/hpml/expr";
+import { funcDefs } from "@/scripts/hpml/lib";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
-		XContainer, MkTextarea,
-		XV: defineAsyncComponent(() => import('./page-editor.script-block.vue')),
+		XContainer,
+		MkTextarea,
+		XV: defineAsyncComponent(
+			() => import("./page-editor.script-block.vue")
+		),
 	},
 
-	inject: ['getScriptBlockList'],
+	inject: ["getScriptBlockList"],
 
 	props: {
 		getExpectedType: {
 			required: false,
-			default: null
+			default: null,
 		},
 		modelValue: {
-			required: true
+			required: true,
 		},
 		title: {
-			required: false
+			required: false,
 		},
 		removable: {
 			required: false,
-			default: false
+			default: false,
 		},
 		hpml: {
 			required: true,
@@ -102,15 +196,15 @@ export default defineComponent({
 		},
 		draggable: {
 			required: false,
-			default: false
-		}
+			default: false,
+		},
 	},
 
 	data() {
 		return {
 			error: null,
 			warn: null,
-			slots: '',
+			slots: "",
 			i18n,
 		};
 	},
@@ -118,12 +212,14 @@ export default defineComponent({
 	computed: {
 		icon(): any {
 			if (this.modelValue.type === null) return null;
-			if (this.modelValue.type.startsWith('fn:')) return 'ph-plug ph-bold ph-lg';
-			return blockDefs.find(x => x.type === this.modelValue.type).icon;
+			if (this.modelValue.type.startsWith("fn:"))
+				return "ph-plug ph-bold ph-lg";
+			return blockDefs.find((x) => x.type === this.modelValue.type).icon;
 		},
 		typeText(): any {
 			if (this.modelValue.type === null) return null;
-			if (this.modelValue.type.startsWith('fn:')) return this.modelValue.type.split(':')[1];
+			if (this.modelValue.type.startsWith("fn:"))
+				return this.modelValue.type.split(":")[1];
 			return i18n.t(`_pages.script.blocks.${this.modelValue.type}`);
 		},
 	},
@@ -131,94 +227,125 @@ export default defineComponent({
 	watch: {
 		slots: {
 			handler() {
-				this.modelValue.value.slots = this.slots.split('\n').map(x => ({
-					name: x,
-					type: null
-				}));
+				this.modelValue.value.slots = this.slots
+					.split("\n")
+					.map((x) => ({
+						name: x,
+						type: null,
+					}));
 			},
-			deep: true
-		}
+			deep: true,
+		},
 	},
 
 	created() {
 		if (this.modelValue.value == null) this.modelValue.value = null;
 
-		if (this.modelValue.value && this.modelValue.value.slots) this.slots = this.modelValue.value.slots.map(x => x.name).join('\n');
+		if (this.modelValue.value && this.modelValue.value.slots)
+			this.slots = this.modelValue.value.slots
+				.map((x) => x.name)
+				.join("\n");
 
-		this.$watch(() => this.modelValue.type, (t) => {
-			this.warn = null;
+		this.$watch(
+			() => this.modelValue.type,
+			(t) => {
+				this.warn = null;
 
-			if (this.modelValue.type === 'fn') {
-				const id = uuid();
-				this.modelValue.value = {
-					slots: [],
-					expression: { id, type: null }
-				};
-				return;
-			}
+				if (this.modelValue.type === "fn") {
+					const id = uuid();
+					this.modelValue.value = {
+						slots: [],
+						expression: { id, type: null },
+					};
+					return;
+				}
 
-			if (this.modelValue.type && this.modelValue.type.startsWith('fn:')) {
-				const fnName = this.modelValue.type.split(':')[1];
-				const fn = this.hpml.getVarByName(fnName);
+				if (
+					this.modelValue.type &&
+					this.modelValue.type.startsWith("fn:")
+				) {
+					const fnName = this.modelValue.type.split(":")[1];
+					const fn = this.hpml.getVarByName(fnName);
+
+					const empties = [];
+					for (let i = 0; i < fn.value.slots.length; i++) {
+						const id = uuid();
+						empties.push({ id, type: null });
+					}
+					this.modelValue.args = empties;
+					return;
+				}
+
+				if (isLiteralValue(this.modelValue)) return;
 
 				const empties = [];
-				for (let i = 0; i < fn.value.slots.length; i++) {
+				for (
+					let i = 0;
+					i < funcDefs[this.modelValue.type].in.length;
+					i++
+				) {
 					const id = uuid();
 					empties.push({ id, type: null });
 				}
 				this.modelValue.args = empties;
-				return;
-			}
 
-			if (isLiteralValue(this.modelValue)) return;
-
-			const empties = [];
-			for (let i = 0; i < funcDefs[this.modelValue.type].in.length; i++) {
-				const id = uuid();
-				empties.push({ id, type: null });
-			}
-			this.modelValue.args = empties;
-
-			for (let i = 0; i < funcDefs[this.modelValue.type].in.length; i++) {
-				const inType = funcDefs[this.modelValue.type].in[i];
-				if (typeof inType !== 'number') {
-					if (inType === 'number') this.modelValue.args[i].type = 'number';
-					if (inType === 'string') this.modelValue.args[i].type = 'text';
+				for (
+					let i = 0;
+					i < funcDefs[this.modelValue.type].in.length;
+					i++
+				) {
+					const inType = funcDefs[this.modelValue.type].in[i];
+					if (typeof inType !== "number") {
+						if (inType === "number")
+							this.modelValue.args[i].type = "number";
+						if (inType === "string")
+							this.modelValue.args[i].type = "text";
+					}
 				}
 			}
-		});
+		);
 
-		this.$watch(() => this.modelValue.args, (args) => {
-			if (args == null) {
-				this.warn = null;
-				return;
+		this.$watch(
+			() => this.modelValue.args,
+			(args) => {
+				if (args == null) {
+					this.warn = null;
+					return;
+				}
+				const emptySlotIndex = args.findIndex((x) => x.type === null);
+				if (emptySlotIndex !== -1 && emptySlotIndex < args.length) {
+					this.warn = {
+						slot: emptySlotIndex,
+					};
+				} else {
+					this.warn = null;
+				}
+			},
+			{
+				deep: true,
 			}
-			const emptySlotIndex = args.findIndex(x => x.type === null);
-			if (emptySlotIndex !== -1 && emptySlotIndex < args.length) {
-				this.warn = {
-					slot: emptySlotIndex
-				};
-			} else {
-				this.warn = null;
-			}
-		}, {
-			deep: true
-		});
+		);
 
-		this.$watch(() => this.hpml.variables, () => {
-			if (this.type != null && this.modelValue) {
-				this.error = this.hpml.typeCheck(this.modelValue);
+		this.$watch(
+			() => this.hpml.variables,
+			() => {
+				if (this.type != null && this.modelValue) {
+					this.error = this.hpml.typeCheck(this.modelValue);
+				}
+			},
+			{
+				deep: true,
 			}
-		}, {
-			deep: true
-		});
+		);
 	},
 
 	methods: {
 		async changeType() {
 			const { canceled, result: type } = await os.select({
 				title: i18n.ts._pages.selectType,
-				groupedItems: this.getScriptBlockList(this.getExpectedType ? this.getExpectedType() : null)
+				groupedItems: this.getScriptBlockList(
+					this.getExpectedType ? this.getExpectedType() : null
+				),
 			});
 			if (canceled) return;
 			this.modelValue.type = type;
@@ -226,8 +353,8 @@ export default defineComponent({
 
 		_getExpectedType(slot: number) {
 			return this.hpml.getExpectedType(this.modelValue, slot);
-		}
-	}
+		},
+	},
 });
 </script>
 
diff --git a/packages/client/src/pages/page-editor/page-editor.vue b/packages/client/src/pages/page-editor/page-editor.vue
index 185b4347a..da951b720 100644
--- a/packages/client/src/pages/page-editor/page-editor.vue
+++ b/packages/client/src/pages/page-editor/page-editor.vue
@@ -1,108 +1,189 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="700">
-		<div class="jqqmcavi">
-			<MkButton v-if="pageId" class="button" inline link :to="`/@${ author.username }/pages/${ currentName }`"><i class="ph-arrow-square-out ph-bold ph-lg"></i> {{ i18n.ts._pages.viewPage }}</MkButton>
-			<MkButton v-if="!readonly" inline primary class="button" @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-			<MkButton v-if="pageId" inline class="button" @click="duplicate"><i class="ph-clipboard-text ph-bold ph-lg"></i> {{ i18n.ts.duplicate }}</MkButton>
-			<MkButton v-if="pageId && !readonly" inline class="button" danger @click="del"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
-		</div>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="700">
+			<div class="jqqmcavi">
+				<MkButton
+					v-if="pageId"
+					class="button"
+					inline
+					link
+					:to="`/@${author.username}/pages/${currentName}`"
+					><i class="ph-arrow-square-out ph-bold ph-lg"></i>
+					{{ i18n.ts._pages.viewPage }}</MkButton
+				>
+				<MkButton
+					v-if="!readonly"
+					inline
+					primary
+					class="button"
+					@click="save"
+					><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+					{{ i18n.ts.save }}</MkButton
+				>
+				<MkButton v-if="pageId" inline class="button" @click="duplicate"
+					><i class="ph-clipboard-text ph-bold ph-lg"></i>
+					{{ i18n.ts.duplicate }}</MkButton
+				>
+				<MkButton
+					v-if="pageId && !readonly"
+					inline
+					class="button"
+					danger
+					@click="del"
+					><i class="ph-trash ph-bold ph-lg"></i>
+					{{ i18n.ts.delete }}</MkButton
+				>
+			</div>
 
-		<div v-if="tab === 'settings'">
-			<div class="_formRoot">
-				<MkInput v-model="title" class="_formBlock">
-					<template #label>{{ i18n.ts._pages.title }}</template>
-				</MkInput>
+			<div v-if="tab === 'settings'">
+				<div class="_formRoot">
+					<MkInput v-model="title" class="_formBlock">
+						<template #label>{{ i18n.ts._pages.title }}</template>
+					</MkInput>
 
-				<MkInput v-model="summary" class="_formBlock">
-					<template #label>{{ i18n.ts._pages.summary }}</template>
-				</MkInput>
+					<MkInput v-model="summary" class="_formBlock">
+						<template #label>{{ i18n.ts._pages.summary }}</template>
+					</MkInput>
 
-				<MkInput v-model="name" class="_formBlock">
-					<template #prefix>{{ url }}/@{{ author.username }}/pages/</template>
-					<template #label>{{ i18n.ts._pages.url }}</template>
-				</MkInput>
+					<MkInput v-model="name" class="_formBlock">
+						<template #prefix
+							>{{ url }}/@{{ author.username }}/pages/</template
+						>
+						<template #label>{{ i18n.ts._pages.url }}</template>
+					</MkInput>
 
-				<MkSwitch v-model="isPublic" class="_formBlock">{{ i18n.ts.public }}</MkSwitch>
-				<MkSwitch v-model="alignCenter" class="_formBlock">{{ i18n.ts._pages.alignCenter }}</MkSwitch>
+					<MkSwitch v-model="isPublic" class="_formBlock">{{
+						i18n.ts.public
+					}}</MkSwitch>
+					<MkSwitch v-model="alignCenter" class="_formBlock">{{
+						i18n.ts._pages.alignCenter
+					}}</MkSwitch>
 
-				<MkSelect v-model="font" class="_formBlock">
-					<template #label>{{ i18n.ts._pages.font }}</template>
-					<option value="serif">{{ i18n.ts._pages.fontSerif }}</option>
-					<option value="sans-serif">{{ i18n.ts._pages.fontSansSerif }}</option>
-				</MkSelect>
+					<MkSelect v-model="font" class="_formBlock">
+						<template #label>{{ i18n.ts._pages.font }}</template>
+						<option value="serif">
+							{{ i18n.ts._pages.fontSerif }}
+						</option>
+						<option value="sans-serif">
+							{{ i18n.ts._pages.fontSansSerif }}
+						</option>
+					</MkSelect>
 
-				<MkSwitch v-model="hideTitleWhenPinned" class="_formBlock">{{ i18n.ts._pages.hideTitleWhenPinned }}</MkSwitch>
+					<MkSwitch
+						v-model="hideTitleWhenPinned"
+						class="_formBlock"
+						>{{ i18n.ts._pages.hideTitleWhenPinned }}</MkSwitch
+					>
 
-				<div class="eyeCatch">
-					<MkButton v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts._pages.eyeCatchingImageSet }}</MkButton>
-					<div v-else-if="eyeCatchingImage">
-						<img :src="eyeCatchingImage.url" :alt="eyeCatchingImage.name" style="max-width: 100%;"/>
-						<MkButton v-if="!readonly" @click="removeEyeCatchingImage()"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts._pages.eyeCatchingImageRemove }}</MkButton>
+					<div class="eyeCatch">
+						<MkButton
+							v-if="eyeCatchingImageId == null && !readonly"
+							@click="setEyeCatchingImage"
+							><i class="ph-plus ph-bold ph-lg"></i>
+							{{ i18n.ts._pages.eyeCatchingImageSet }}</MkButton
+						>
+						<div v-else-if="eyeCatchingImage">
+							<img
+								:src="eyeCatchingImage.url"
+								:alt="eyeCatchingImage.name"
+								style="max-width: 100%"
+							/>
+							<MkButton
+								v-if="!readonly"
+								@click="removeEyeCatchingImage()"
+								><i class="ph-trash ph-bold ph-lg"></i>
+								{{
+									i18n.ts._pages.eyeCatchingImageRemove
+								}}</MkButton
+							>
+						</div>
 					</div>
 				</div>
 			</div>
-		</div>
 
-		<div v-else-if="tab === 'contents'">
-			<div>
-				<XBlocks v-model="content" class="content" :hpml="hpml"/>
-				<MkButton v-if="!readonly" @click="add()"><i class="ph-plus ph-bold ph-lg"></i></MkButton>
+			<div v-else-if="tab === 'contents'">
+				<div>
+					<XBlocks v-model="content" class="content" :hpml="hpml" />
+					<MkButton v-if="!readonly" @click="add()"
+						><i class="ph-plus ph-bold ph-lg"></i
+					></MkButton>
+				</div>
 			</div>
-		</div>
 
-		<div v-else-if="tab === 'variables'">
-			<div class="qmuvgica">
-				<XDraggable v-show="variables.length > 0" v-model="variables" tag="div" class="variables" item-key="name" handle=".drag-handle" :group="{ name: 'variables' }" animation="150" swap-threshold="0.5">
-					<template #item="{element}">
-						<XVariable
-							:model-value="element"
-							:removable="true"
-							:hpml="hpml"
-							:name="element.name"
-							:title="element.name"
-							:draggable="true"
-							@remove="() => removeVariable(element)"
-						/>
-					</template>
-				</XDraggable>
+			<div v-else-if="tab === 'variables'">
+				<div class="qmuvgica">
+					<XDraggable
+						v-show="variables.length > 0"
+						v-model="variables"
+						tag="div"
+						class="variables"
+						item-key="name"
+						handle=".drag-handle"
+						:group="{ name: 'variables' }"
+						animation="150"
+						swap-threshold="0.5"
+					>
+						<template #item="{ element }">
+							<XVariable
+								:model-value="element"
+								:removable="true"
+								:hpml="hpml"
+								:name="element.name"
+								:title="element.name"
+								:draggable="true"
+								@remove="() => removeVariable(element)"
+							/>
+						</template>
+					</XDraggable>
 
-				<MkButton v-if="!readonly" class="add" @click="addVariable()"><i class="ph-plus ph-bold ph-lg"></i></MkButton>
+					<MkButton
+						v-if="!readonly"
+						class="add"
+						@click="addVariable()"
+						><i class="ph-plus ph-bold ph-lg"></i
+					></MkButton>
+				</div>
 			</div>
-		</div>
 
-		<div v-else-if="tab === 'script'">
-			<div>
-				<MkTextarea v-model="script" class="_code"/>
+			<div v-else-if="tab === 'script'">
+				<div>
+					<MkTextarea v-model="script" class="_code" />
+				</div>
 			</div>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, computed, provide, watch } from 'vue';
-import { v4 as uuid } from 'uuid';
-import XVariable from './page-editor.script-block.vue';
-import XBlocks from './page-editor.blocks.vue';
-import MkTextarea from '@/components/form/textarea.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkSelect from '@/components/form/select.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import MkInput from '@/components/form/input.vue';
-import { blockDefs } from '@/scripts/hpml/index';
-import { HpmlTypeChecker } from '@/scripts/hpml/type-checker';
-import { url } from '@/config';
-import { collectPageVars } from '@/scripts/collect-page-vars';
-import * as os from '@/os';
-import { selectFile } from '@/scripts/select-file';
-import { mainRouter } from '@/router';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { $i } from '@/account';
+import { defineAsyncComponent, computed, provide, watch } from "vue";
+import { v4 as uuid } from "uuid";
+import XVariable from "./page-editor.script-block.vue";
+import XBlocks from "./page-editor.blocks.vue";
+import MkTextarea from "@/components/form/textarea.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkSelect from "@/components/form/select.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import MkInput from "@/components/form/input.vue";
+import { blockDefs } from "@/scripts/hpml/index";
+import { HpmlTypeChecker } from "@/scripts/hpml/type-checker";
+import { url } from "@/config";
+import { collectPageVars } from "@/scripts/collect-page-vars";
+import * as os from "@/os";
+import { selectFile } from "@/scripts/select-file";
+import { mainRouter } from "@/router";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { $i } from "@/account";
 
-const XDraggable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
+const XDraggable = defineAsyncComponent(() =>
+	import("vuedraggable").then((x) => x.default)
+);
 
 const props = defineProps<{
 	initPageId?: string;
@@ -110,35 +191,35 @@ const props = defineProps<{
 	initUser?: string;
 }>();
 
-let tab = $ref('settings');
+let tab = $ref("settings");
 let author = $ref($i);
 let readonly = $ref(false);
 let page = $ref(null);
 let pageId = $ref(null);
 let currentName = $ref(null);
-let title = $ref('');
+let title = $ref("");
 let summary = $ref(null);
 let name = $ref(Date.now().toString());
 let eyeCatchingImage = $ref(null);
 let eyeCatchingImageId = $ref(null);
-let font = $ref('sans-serif');
+let font = $ref("sans-serif");
 let content = $ref([]);
 let alignCenter = $ref(false);
 let isPublic = $ref(true);
 let hideTitleWhenPinned = $ref(false);
 let variables = $ref([]);
 let hpml = $ref(null);
-let script = $ref('');
+let script = $ref("");
 
-provide('readonly', readonly);
-provide('getScriptBlockList', getScriptBlockList);
-provide('getPageBlockList', getPageBlockList);
+provide("readonly", readonly);
+provide("getScriptBlockList", getScriptBlockList);
+provide("getPageBlockList", getPageBlockList);
 
 watch($$(eyeCatchingImageId), async () => {
 	if (eyeCatchingImageId == null) {
 		eyeCatchingImage = null;
 	} else {
-		eyeCatchingImage = await os.api('drive/files/show', {
+		eyeCatchingImage = await os.api("drive/files/show", {
 			fileId: eyeCatchingImageId,
 		});
 	}
@@ -163,18 +244,18 @@ function getSaveOptions() {
 function save() {
 	const options = getSaveOptions();
 
-	const onError = err => {
-		if (err.id === '3d81ceae-475f-4600-b2a8-2bc116157532') {
-			if (err.info.param === 'name') {
+	const onError = (err) => {
+		if (err.id === "3d81ceae-475f-4600-b2a8-2bc116157532") {
+			if (err.info.param === "name") {
 				os.alert({
-					type: 'error',
+					type: "error",
 					title: i18n.ts._pages.invalidNameTitle,
 					text: i18n.ts._pages.invalidNameText,
 				});
 			}
-		} else if (err.code === 'NAME_ALREADY_EXISTS') {
+		} else if (err.code === "NAME_ALREADY_EXISTS") {
 			os.alert({
-				type: 'error',
+				type: "error",
 				text: i18n.ts._pages.nameAlreadyExists,
 			});
 		}
@@ -182,54 +263,56 @@ function save() {
 
 	if (pageId) {
 		options.pageId = pageId;
-		os.api('pages/update', options)
-		.then(page => {
-			currentName = name.trim();
-			os.alert({
-				type: 'success',
-				text: i18n.ts._pages.updated,
-			});
-		}).catch(onError);
+		os.api("pages/update", options)
+			.then((page) => {
+				currentName = name.trim();
+				os.alert({
+					type: "success",
+					text: i18n.ts._pages.updated,
+				});
+			})
+			.catch(onError);
 	} else {
-		os.api('pages/create', options)
-		.then(created => {
-			pageId = created.id;
-			currentName = name.trim();
-			os.alert({
-				type: 'success',
-				text: i18n.ts._pages.created,
-			});
-			mainRouter.push(`/pages/edit/${pageId}`);
-		}).catch(onError);
+		os.api("pages/create", options)
+			.then((created) => {
+				pageId = created.id;
+				currentName = name.trim();
+				os.alert({
+					type: "success",
+					text: i18n.ts._pages.created,
+				});
+				mainRouter.push(`/pages/edit/${pageId}`);
+			})
+			.catch(onError);
 	}
 }
 
 function del() {
 	os.confirm({
-		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: title.trim() }),
+		type: "warning",
+		text: i18n.t("removeAreYouSure", { x: title.trim() }),
 	}).then(({ canceled }) => {
 		if (canceled) return;
-		os.api('pages/delete', {
+		os.api("pages/delete", {
 			pageId: pageId,
 		}).then(() => {
 			os.alert({
-				type: 'success',
+				type: "success",
 				text: i18n.ts._pages.deleted,
 			});
-			mainRouter.push('/pages');
+			mainRouter.push("/pages");
 		});
 	});
 }
 
 function duplicate() {
-	title = title + ' - copy';
-	name = name + '-copy';
-	os.api('pages/create', getSaveOptions()).then(created => {
+	title = title + " - copy";
+	name = name + "-copy";
+	os.api("pages/create", getSaveOptions()).then((created) => {
 		pageId = created.id;
 		currentName = name.trim();
 		os.alert({
-			type: 'success',
+			type: "success",
 			text: i18n.ts._pages.created,
 		});
 		mainRouter.push(`/pages/edit/${pageId}`);
@@ -258,7 +341,7 @@ async function addVariable() {
 
 	if (hpml.isUsedName(name)) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: i18n.ts._pages.variableNameIsAlreadyUsed,
 		});
 		return;
@@ -269,47 +352,66 @@ async function addVariable() {
 }
 
 function removeVariable(v) {
-	variables = variables.filter(x => x.name !== v.name);
+	variables = variables.filter((x) => x.name !== v.name);
 }
 
 function getPageBlockList() {
-	return [{
-		label: i18n.ts._pages.contentBlocks,
-		items: [
-			{ 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: 'textarea', text: i18n.ts._pages.blocks.textarea },
-			{ value: 'note', text: i18n.ts._pages.blocks.note },
-			{ value: 'canvas', text: i18n.ts._pages.blocks.canvas },
-		],
-	}, {
-		label: i18n.ts._pages.inputBlocks,
-		items: [
-			{ value: 'button', text: i18n.ts._pages.blocks.button },
-			{ value: 'radioButton', text: i18n.ts._pages.blocks.radioButton },
-			{ value: 'textInput', text: i18n.ts._pages.blocks.textInput },
-			{ value: 'textareaInput', text: i18n.ts._pages.blocks.textareaInput },
-			{ value: 'numberInput', text: i18n.ts._pages.blocks.numberInput },
-			{ value: 'switch', text: i18n.ts._pages.blocks.switch },
-			{ value: 'counter', text: i18n.ts._pages.blocks.counter },
-		],
-	}, {
-		label: i18n.ts._pages.specialBlocks,
-		items: [
-			{ value: 'if', text: i18n.ts._pages.blocks.if },
-			{ value: 'post', text: i18n.ts._pages.blocks.post },
-		],
-	}];
+	return [
+		{
+			label: i18n.ts._pages.contentBlocks,
+			items: [
+				{ 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: "textarea", text: i18n.ts._pages.blocks.textarea },
+				{ value: "note", text: i18n.ts._pages.blocks.note },
+				{ value: "canvas", text: i18n.ts._pages.blocks.canvas },
+			],
+		},
+		{
+			label: i18n.ts._pages.inputBlocks,
+			items: [
+				{ value: "button", text: i18n.ts._pages.blocks.button },
+				{
+					value: "radioButton",
+					text: i18n.ts._pages.blocks.radioButton,
+				},
+				{ value: "textInput", text: i18n.ts._pages.blocks.textInput },
+				{
+					value: "textareaInput",
+					text: i18n.ts._pages.blocks.textareaInput,
+				},
+				{
+					value: "numberInput",
+					text: i18n.ts._pages.blocks.numberInput,
+				},
+				{ value: "switch", text: i18n.ts._pages.blocks.switch },
+				{ value: "counter", text: i18n.ts._pages.blocks.counter },
+			],
+		},
+		{
+			label: i18n.ts._pages.specialBlocks,
+			items: [
+				{ value: "if", text: i18n.ts._pages.blocks.if },
+				{ value: "post", text: i18n.ts._pages.blocks.post },
+			],
+		},
+	];
 }
 
 function getScriptBlockList(type: string = null) {
 	const list = [];
 
-	const blocks = blockDefs.filter(block => type == null || block.out == null || block.out === type || typeof block.out === 'number');
+	const blocks = blockDefs.filter(
+		(block) =>
+			type == null ||
+			block.out == null ||
+			block.out === type ||
+			typeof block.out === "number"
+	);
 
 	for (const block of blocks) {
-		const category = list.find(x => x.category === block.category);
+		const category = list.find((x) => x.category === block.category);
 		if (category) {
 			category.items.push({
 				value: block.type,
@@ -319,20 +421,22 @@ function getScriptBlockList(type: string = null) {
 			list.push({
 				category: block.category,
 				label: i18n.t(`_pages.script.categories.${block.category}`),
-				items: [{
-					value: block.type,
-					text: i18n.t(`_pages.script.blocks.${block.type}`),
-				}],
+				items: [
+					{
+						value: block.type,
+						text: i18n.t(`_pages.script.blocks.${block.type}`),
+					},
+				],
 			});
 		}
 	}
 
-	const userFns = variables.filter(x => x.type === 'fn');
+	const userFns = variables.filter((x) => x.type === "fn");
 	if (userFns.length > 0) {
 		list.unshift({
-			label: i18n.t('_pages.script.categories.fn'),
-			items: userFns.map(v => ({
-				value: 'fn:' + v.name,
+			label: i18n.t("_pages.script.categories.fn"),
+			items: userFns.map((v) => ({
+				value: "fn:" + v.name,
 				text: v.name,
 			})),
 		});
@@ -342,7 +446,7 @@ function getScriptBlockList(type: string = null) {
 }
 
 function setEyeCatchingImage(img) {
-	selectFile(img.currentTarget ?? img.target, null).then(file => {
+	selectFile(img.currentTarget ?? img.target, null).then((file) => {
 		eyeCatchingImageId = file.id;
 	});
 }
@@ -354,20 +458,28 @@ function removeEyeCatchingImage() {
 async function init() {
 	hpml = new HpmlTypeChecker();
 
-	watch($$(variables), () => {
-		hpml.variables = variables;
-	}, { deep: true });
+	watch(
+		$$(variables),
+		() => {
+			hpml.variables = variables;
+		},
+		{ deep: true }
+	);
 
-	watch($$(content), () => {
-		hpml.pageVars = collectPageVars(content);
-	}, { deep: true });
+	watch(
+		$$(content),
+		() => {
+			hpml.pageVars = collectPageVars(content);
+		},
+		{ deep: true }
+	);
 
 	if (props.initPageId) {
-		page = await os.api('pages/show', {
+		page = await os.api("pages/show", {
 			pageId: props.initPageId,
 		});
 	} else if (props.initPageName && props.initUser) {
-		page = await os.api('pages/show', {
+		page = await os.api("pages/show", {
 			name: props.initPageName,
 			username: props.initUser,
 		});
@@ -391,11 +503,13 @@ async function init() {
 		eyeCatchingImageId = page.eyeCatchingImageId;
 	} else {
 		const id = uuid();
-		content = [{
-			id,
-			type: 'text',
-			text: '',
-		}];
+		content = [
+			{
+				id,
+				type: "text",
+				text: "",
+			},
+		];
 	}
 }
 
@@ -403,37 +517,43 @@ init();
 
 const headerActions = $computed(() => []);
 
-const headerTabs = $computed(() => [{
-	key: 'settings',
-	title: i18n.ts._pages.pageSetting,
-	icon: 'ph-gear-six ph-bold ph-lg',
-}, {
-	key: 'contents',
-	title: i18n.ts._pages.contents,
-	icon: 'ph-sticker ph-bold ph-lg',
-}, {
-	key: 'variables',
-	title: i18n.ts._pages.variables,
-	icon: 'ph-magic-wand ph-bold ph-lg',
-}, {
-	key: 'script',
-	title: i18n.ts.script,
-	icon: 'ph-code ph-bold ph-lg',
-}]);
+const headerTabs = $computed(() => [
+	{
+		key: "settings",
+		title: i18n.ts._pages.pageSetting,
+		icon: "ph-gear-six ph-bold ph-lg",
+	},
+	{
+		key: "contents",
+		title: i18n.ts._pages.contents,
+		icon: "ph-sticker ph-bold ph-lg",
+	},
+	{
+		key: "variables",
+		title: i18n.ts._pages.variables,
+		icon: "ph-magic-wand ph-bold ph-lg",
+	},
+	{
+		key: "script",
+		title: i18n.ts.script,
+		icon: "ph-code ph-bold ph-lg",
+	},
+]);
 
-definePageMetadata(computed(() => {
-	let title = i18n.ts._pages.newPage;
-	if (props.initPageId) {
-		title = i18n.ts._pages.editPage;
-	}
-	else if (props.initPageName && props.initUser) {
-		title = i18n.ts._pages.readPage;
-	}
-	return {
-		title: title,
-		icon: 'ph-pencil ph-bold ph-lg',
-	};
-}));
+definePageMetadata(
+	computed(() => {
+		let title = i18n.ts._pages.newPage;
+		if (props.initPageId) {
+			title = i18n.ts._pages.editPage;
+		} else if (props.initPageName && props.initUser) {
+			title = i18n.ts._pages.readPage;
+		}
+		return {
+			title: title,
+			icon: "ph-pencil ph-bold ph-lg",
+		};
+	})
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue
index 1c5c7f1f7..d5d7d5bf8 100644
--- a/packages/client/src/pages/page.vue
+++ b/packages/client/src/pages/page.vue
@@ -1,52 +1,165 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="800">
-		<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
-			<div v-if="page" :key="page.id" v-size="{ max: [450] }" class="xcukqgmh">
-				<div class="footer">
-					<div><i class="ph-alarm ph-bold"/> {{ i18n.ts.createdAt }}: <MkTime :time="page.createdAt" mode="detail"/></div>
-					<div v-if="page.createdAt != page.updatedAt"><i class="ph-alarm ph-bold"></i> {{ i18n.ts.updatedAt }}: <MkTime :time="page.updatedAt" mode="detail"/></div>
-				</div>
-				<div class="_block main">
-					<div class="banner">
-						<div class="banner-image">
-							<div class="header">
-								<h1>{{ page.title }}</h1>
-							</div>
-							<div class="menu-actions">
-								<button v-tooltip="i18n.ts.copyUrl" @click="copyUrl" class="menu _button"><i class="ph-link-simple ph-bold ph-lg"/></button>
-								<MkA v-tooltip="i18n.ts._pages.viewSource" :to="`/@${username}/pages/${pageName}/view-source`" class="menu _button" style="transform: translateY(2px);"><i class="ph-code ph-bold ph-lg"/></MkA>
-								<template v-if="$i && $i.id === page.userId">
-									<MkA v-tooltip="i18n.ts._pages.editPage" class="menu _button" :to="`/pages/edit/${page.id}`" style="transform: translateY(2px);"><i class="ph-pencil ph-bold ph-lg"/></MkA>
-									<button v-if="$i.pinnedPageId === page.id" v-tooltip="i18n.ts.unpin" class="menu _button" @click="pin(false)"><i class="ph-push-pin-slash ph-bold ph-lg"/></button>
-									<button v-else v-tooltip="i18n.ts.pin" class="menu _button" @click="pin(true)"><i class="ph-push-pin ph-bold ph-lg"/></button>
-								</template>
-							</div>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="800">
+			<transition
+				:name="$store.state.animation ? 'fade' : ''"
+				mode="out-in"
+			>
+				<div
+					v-if="page"
+					:key="page.id"
+					v-size="{ max: [450] }"
+					class="xcukqgmh"
+				>
+					<div class="footer">
+						<div>
+							<i class="ph-alarm ph-bold" />
+							{{ i18n.ts.createdAt }}:
+							<MkTime :time="page.createdAt" mode="detail" />
+						</div>
+						<div v-if="page.createdAt != page.updatedAt">
+							<i class="ph-alarm ph-bold"></i>
+							{{ i18n.ts.updatedAt }}:
+							<MkTime :time="page.updatedAt" mode="detail" />
 						</div>
 					</div>
-					<div class="content">
-						<XPage :page="page"/>
-					</div>
-					<div class="actions">
-						<div class="like">
-							<MkButton v-if="page.isLiked" v-tooltip="i18n.ts._pages.unlike" class="button" primary @click="unlike()"><i class="ph-heart ph-fill ph-lg"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
-							<MkButton v-else v-tooltip="i18n.ts._pages.like" class="button" @click="like()"><i class="ph-heart ph-bold"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
-						</div>
-						<div class="other">
-							<button v-tooltip="i18n.ts.shareWithNote" v-click-anime class="_button" @click="shareWithNote"><i class="ph-repeat ph-bold ph-lg ph-fw ph-lg"></i></button>
-							<button v-if="shareAvailable()" v-tooltip="i18n.ts.share" v-click-anime class="_button" @click="share"><i class="ph-share-network ph-bold ph-lg ph-fw ph-lg"></i></button>
-						</div>
-						<div class="user">
-							<MkAvatar :user="page.user" class="avatar"/>
-							<div class="name">
-								<MkUserName :user="page.user" style="display: block;"/>
-								<MkAcct :user="page.user"/>
+					<div class="_block main">
+						<div class="banner">
+							<div class="banner-image">
+								<div class="header">
+									<h1>{{ page.title }}</h1>
+								</div>
+								<div class="menu-actions">
+									<button
+										v-tooltip="i18n.ts.copyUrl"
+										@click="copyUrl"
+										class="menu _button"
+									>
+										<i
+											class="ph-link-simple ph-bold ph-lg"
+										/>
+									</button>
+									<MkA
+										v-tooltip="i18n.ts._pages.viewSource"
+										:to="`/@${username}/pages/${pageName}/view-source`"
+										class="menu _button"
+										style="transform: translateY(2px)"
+										><i class="ph-code ph-bold ph-lg"
+									/></MkA>
+									<template
+										v-if="$i && $i.id === page.userId"
+									>
+										<MkA
+											v-tooltip="i18n.ts._pages.editPage"
+											class="menu _button"
+											:to="`/pages/edit/${page.id}`"
+											style="transform: translateY(2px)"
+											><i class="ph-pencil ph-bold ph-lg"
+										/></MkA>
+										<button
+											v-if="$i.pinnedPageId === page.id"
+											v-tooltip="i18n.ts.unpin"
+											class="menu _button"
+											@click="pin(false)"
+										>
+											<i
+												class="ph-push-pin-slash ph-bold ph-lg"
+											/>
+										</button>
+										<button
+											v-else
+											v-tooltip="i18n.ts.pin"
+											class="menu _button"
+											@click="pin(true)"
+										>
+											<i
+												class="ph-push-pin ph-bold ph-lg"
+											/>
+										</button>
+									</template>
+								</div>
 							</div>
-							<MkFollowButton v-if="!$i || $i.id != page.user.id" :user="page.user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
 						</div>
-					</div>
-					<!-- <div class="links">
+						<div class="content">
+							<XPage :page="page" />
+						</div>
+						<div class="actions">
+							<div class="like">
+								<MkButton
+									v-if="page.isLiked"
+									v-tooltip="i18n.ts._pages.unlike"
+									class="button"
+									primary
+									@click="unlike()"
+									><i class="ph-heart ph-fill ph-lg"></i
+									><span
+										v-if="page.likedCount > 0"
+										class="count"
+										>{{ page.likedCount }}</span
+									></MkButton
+								>
+								<MkButton
+									v-else
+									v-tooltip="i18n.ts._pages.like"
+									class="button"
+									@click="like()"
+									><i class="ph-heart ph-bold"></i
+									><span
+										v-if="page.likedCount > 0"
+										class="count"
+										>{{ page.likedCount }}</span
+									></MkButton
+								>
+							</div>
+							<div class="other">
+								<button
+									v-tooltip="i18n.ts.shareWithNote"
+									v-click-anime
+									class="_button"
+									@click="shareWithNote"
+								>
+									<i
+										class="ph-repeat ph-bold ph-lg ph-fw ph-lg"
+									></i>
+								</button>
+								<button
+									v-if="shareAvailable()"
+									v-tooltip="i18n.ts.share"
+									v-click-anime
+									class="_button"
+									@click="share"
+								>
+									<i
+										class="ph-share-network ph-bold ph-lg ph-fw ph-lg"
+									></i>
+								</button>
+							</div>
+							<div class="user">
+								<MkAvatar :user="page.user" class="avatar" />
+								<div class="name">
+									<MkUserName
+										:user="page.user"
+										style="display: block"
+									/>
+									<MkAcct :user="page.user" />
+								</div>
+								<MkFollowButton
+									v-if="!$i || $i.id != page.user.id"
+									:user="page.user"
+									:inline="true"
+									:transparent="false"
+									:full="true"
+									class="koudoku"
+								/>
+							</div>
+						</div>
+						<!-- <div class="links">
 						<MkA :to="`/@${username}/pages/${pageName}/view-source`" class="link">{{ i18n.ts._pages.viewSource }}</MkA>
 						<template v-if="$i && $i.id === page.userId">
 							<MkA :to="`/pages/edit/${page.id}`" class="link">{{ i18n.ts._pages.editThisPage }}</MkA>
@@ -54,36 +167,52 @@
 							<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"
+						:expanded="false"
+						class="other"
+					>
+						<template #header
+							><i class="ph-clock ph-bold ph-lg"></i>
+							{{ i18n.ts.recentPosts }}</template
+						>
+						<MkPagination
+							v-slot="{ items }"
+							:pagination="otherPostsPagination"
+						>
+							<MkPagePreview
+								v-for="page in items"
+								:key="page.id"
+								:page="page"
+								class="_gap"
+							/>
+						</MkPagination>
+					</MkContainer>
 				</div>
-				<MkAd :prefer="['horizontal', 'horizontal-big']"/>
-				<MkContainer :max-height="300" :foldable="true" :expanded="false" class="other">
-					<template #header><i class="ph-clock ph-bold ph-lg"></i> {{ i18n.ts.recentPosts }}</template>
-					<MkPagination v-slot="{items}" :pagination="otherPostsPagination">
-						<MkPagePreview v-for="page in items" :key="page.id" :page="page" class="_gap"/>
-					</MkPagination>
-				</MkContainer>
-			</div>
-			<MkError v-else-if="error" @retry="fetchPage()"/>
-			<MkLoading v-else/>
-		</transition>
-	</MkSpacer>
-</MkStickyContainer>
+				<MkError v-else-if="error" @retry="fetchPage()" />
+				<MkLoading v-else />
+			</transition>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch } from 'vue';
-import XPage from '@/components/page/page.vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { url } from '@/config';
-import MkFollowButton from '@/components/MkFollowButton.vue';
-import MkContainer from '@/components/MkContainer.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkPagePreview from '@/components/MkPagePreview.vue';
-import { i18n } from '@/i18n';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { shareAvailable } from '@/scripts/share-available';
+import { computed, watch } from "vue";
+import XPage from "@/components/page/page.vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { url } from "@/config";
+import MkFollowButton from "@/components/MkFollowButton.vue";
+import MkContainer from "@/components/MkContainer.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkPagePreview from "@/components/MkPagePreview.vue";
+import { i18n } from "@/i18n";
+import copyToClipboard from "@/scripts/copy-to-clipboard";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { shareAvailable } from "@/scripts/share-available";
 
 const props = defineProps<{
 	pageName: string;
@@ -94,25 +223,27 @@ let page = $ref(null);
 let bgImg = $ref(null);
 let error = $ref(null);
 const otherPostsPagination = {
-	endpoint: 'users/pages' as const,
+	endpoint: "users/pages" as const,
 	limit: 6,
 	params: computed(() => ({
 		userId: page.user.id,
 	})),
 };
-const path = $computed(() => props.username + '/' + props.pageName);
+const path = $computed(() => props.username + "/" + props.pageName);
 
 function fetchPage() {
 	page = null;
-	os.api('pages/show', {
+	os.api("pages/show", {
 		name: props.pageName,
 		username: props.username,
-	}).then(_page => {
-		page = _page;
-		bgImg = getBgImg();
-	}).catch(err => {
-		error = err;
-	});
+	})
+		.then((_page) => {
+			page = _page;
+			bgImg = getBgImg();
+		})
+		.catch((err) => {
+			error = err;
+		});
 }
 
 function copyUrl() {
@@ -123,9 +254,8 @@ function copyUrl() {
 function getBgImg(): string {
 	if (page.eyeCatchingImage != null) {
 		return `url(${page.eyeCatchingImage.url})`;
-	}
-	else {
-		return 'linear-gradient(to bottom right, #31748f, #9ccfd8)'
+	} else {
+		return "linear-gradient(to bottom right, #31748f, #9ccfd8)";
 	}
 }
 
@@ -139,12 +269,14 @@ function share() {
 
 function shareWithNote() {
 	os.post({
-		initialText: `${page.title || page.name} ${url}/@${page.user.username}/pages/${page.name}`,
+		initialText: `${page.title || page.name} ${url}/@${
+			page.user.username
+		}/pages/${page.name}`,
 	});
 }
 
 function like() {
-	os.api('pages/like', {
+	os.api("pages/like", {
 		pageId: page.id,
 	}).then(() => {
 		page.isLiked = true;
@@ -153,7 +285,7 @@ function like() {
 }
 
 async function unlike() {
-	os.api('pages/unlike', {
+	os.api("pages/unlike", {
 		pageId: page.id,
 	}).then(() => {
 		page.isLiked = false;
@@ -162,7 +294,7 @@ async function unlike() {
 }
 
 function pin(pin) {
-	os.apiWithDialog('i/update', {
+	os.apiWithDialog("i/update", {
 		pinnedPageId: pin ? page.id : null,
 	});
 }
@@ -173,15 +305,21 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => page ? {
-	title: computed(() => page.title || page.name),
-	avatar: page.user,
-	path: `/@${page.user.username}/pages/${page.name}`,
-	share: {
-		title: page.title || page.name,
-		text: page.summary,
-	},
-} : null));
+definePageMetadata(
+	computed(() =>
+		page
+			? {
+					title: computed(() => page.title || page.name),
+					avatar: page.user,
+					path: `/@${page.user.username}/pages/${page.name}`,
+					share: {
+						title: page.title || page.name,
+						text: page.summary,
+					},
+			  }
+			: null
+	)
+);
 </script>
 
 <style lang="scss" scoped>
@@ -196,7 +334,6 @@ definePageMetadata(computed(() => page ? {
 
 .xcukqgmh {
 	> .main {
-
 		> * {
 			margin: 1rem;
 		}
@@ -211,7 +348,7 @@ definePageMetadata(computed(() => page ? {
 				height: 150px;
 				background-position: center;
 				background-size: cover;
-				background-image: v-bind('bgImg');
+				background-image: v-bind("bgImg");
 
 				> .header {
 					padding: 16px;
diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index 5aaf76834..938c8d229 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -1,106 +1,151 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="700">
-		<swiper
-			:modules="[Virtual]"
-			:space-between="20"
-			:virtual="true"
-			:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
-			@swiper="setSwiperRef"
-			@slide-change="onSlideChange"
-		>
-			<swiper-slide>
-				<div class="rknalgpo">
-					<MkPagination v-slot="{items}" :pagination="featuredPagesPagination">
-						<MkPagePreview v-for="page in items" :key="page.id" class="ckltabjg" :page="page"/>
-					</MkPagination>
-				</div>
-			</swiper-slide>
-			<swiper-slide>
-				<div class="rknalgpo liked">
-					<MkPagination v-slot="{items}" :pagination="likedPagesPagination">
-						<MkPagePreview v-for="like in items" :key="like.page.id" class="ckltabjg" :page="like.page"/>
-					</MkPagination>
-				</div>
-			</swiper-slide>
-			<swiper-slide>
-				<div class="rknalgpo my">
-					<div class="buttoncontainer">
-						<MkButton class="new primary" @click="create()"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts._pages.newPage }}</MkButton>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="700">
+			<swiper
+				:modules="[Virtual]"
+				:space-between="20"
+				:virtual="true"
+				:allow-touch-move="
+					!(
+						deviceKind === 'desktop' &&
+						!defaultStore.state.swipeOnDesktop
+					)
+				"
+				@swiper="setSwiperRef"
+				@slide-change="onSlideChange"
+			>
+				<swiper-slide>
+					<div class="rknalgpo">
+						<MkPagination
+							v-slot="{ items }"
+							:pagination="featuredPagesPagination"
+						>
+							<MkPagePreview
+								v-for="page in items"
+								:key="page.id"
+								class="ckltabjg"
+								:page="page"
+							/>
+						</MkPagination>
 					</div>
-					<MkPagination v-slot="{items}" :pagination="myPagesPagination">
-						<MkPagePreview v-for="page in items" :key="page.id" class="ckltabjg" :page="page"/>
-					</MkPagination>
-				</div>
-			</swiper-slide>
-		</swiper>
-	</MkSpacer>
-</MkStickyContainer>
+				</swiper-slide>
+				<swiper-slide>
+					<div class="rknalgpo liked">
+						<MkPagination
+							v-slot="{ items }"
+							:pagination="likedPagesPagination"
+						>
+							<MkPagePreview
+								v-for="like in items"
+								:key="like.page.id"
+								class="ckltabjg"
+								:page="like.page"
+							/>
+						</MkPagination>
+					</div>
+				</swiper-slide>
+				<swiper-slide>
+					<div class="rknalgpo my">
+						<div class="buttoncontainer">
+							<MkButton class="new primary" @click="create()"
+								><i class="ph-plus ph-bold ph-lg"></i>
+								{{ i18n.ts._pages.newPage }}</MkButton
+							>
+						</div>
+						<MkPagination
+							v-slot="{ items }"
+							:pagination="myPagesPagination"
+						>
+							<MkPagePreview
+								v-for="page in items"
+								:key="page.id"
+								class="ckltabjg"
+								:page="page"
+							/>
+						</MkPagination>
+					</div>
+				</swiper-slide>
+			</swiper>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, onMounted } from 'vue';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
-import MkPagePreview from '@/components/MkPagePreview.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkButton from '@/components/MkButton.vue';
-import { useRouter } from '@/router';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { deviceKind } from '@/scripts/device-kind';
-import { defaultStore } from '@/store';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
+import { computed, watch, onMounted } from "vue";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
+import MkPagePreview from "@/components/MkPagePreview.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkButton from "@/components/MkButton.vue";
+import { useRouter } from "@/router";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { deviceKind } from "@/scripts/device-kind";
+import { defaultStore } from "@/store";
+import "swiper/scss";
+import "swiper/scss/virtual";
 
 const router = useRouter();
 
-let tab = $ref('featured');
-const tabs = ['featured', 'liked', 'my'];
-watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+let tab = $ref("featured");
+const tabs = ["featured", "liked", "my"];
+watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
 const featuredPagesPagination = {
-	endpoint: 'pages/featured' as const,
+	endpoint: "pages/featured" as const,
 	limit: 10,
 };
 const likedPagesPagination = {
-	endpoint: 'i/page-likes' as const,
+	endpoint: "i/page-likes" as const,
 	limit: 10,
 };
 const myPagesPagination = {
-	endpoint: 'i/pages' as const,
+	endpoint: "i/pages" as const,
 	limit: 10,
 };
 
 function create() {
-	router.push('/pages/new');
+	router.push("/pages/new");
 }
 
-const headerActions = $computed(() => [{
-	icon: 'ph-plus ph-bold ph-lg',
-	text: i18n.ts.create,
-	handler: create,
-}]);
+const headerActions = $computed(() => [
+	{
+		icon: "ph-plus ph-bold ph-lg",
+		text: i18n.ts.create,
+		handler: create,
+	},
+]);
 
-const headerTabs = $computed(() => [{
-	key: 'featured',
-	title: i18n.ts._pages.featured,
-	icon: 'ph-fire-simple ph-bold ph-lg',
-}, {
-	key: 'liked',
-	title: i18n.ts._pages.liked,
-	icon: 'ph-heart ph-bold ph-lg',
-}, {
-	key: 'my',
-	title: i18n.ts._pages.my,
-	icon: 'ph-crown-simple ph-bold ph-lg',
-}]);
+const headerTabs = $computed(() => [
+	{
+		key: "featured",
+		title: i18n.ts._pages.featured,
+		icon: "ph-fire-simple ph-bold ph-lg",
+	},
+	{
+		key: "liked",
+		title: i18n.ts._pages.liked,
+		icon: "ph-heart ph-bold ph-lg",
+	},
+	{
+		key: "my",
+		title: i18n.ts._pages.my,
+		icon: "ph-crown-simple ph-bold ph-lg",
+	},
+]);
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.pages,
-	icon: 'ph-file-text ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.pages,
+		icon: "ph-file-text ph-bold ph-lg",
+	}))
+);
 
 let swiperRef = null;
 
@@ -124,7 +169,6 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .rknalgpo {
-
 	> .buttoncontainer {
 		display: grid;
 		justify-content: center;
diff --git a/packages/client/src/pages/preview.vue b/packages/client/src/pages/preview.vue
index 4fda74806..41e662ff8 100644
--- a/packages/client/src/pages/preview.vue
+++ b/packages/client/src/pages/preview.vue
@@ -1,23 +1,25 @@
 <template>
-<div class="graojtoi">
-	<MkSample/>
-</div>
+	<div class="graojtoi">
+		<MkSample />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import MkSample from '@/components/MkSample.vue';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed } from "vue";
+import MkSample from "@/components/MkSample.vue";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => ({
-	title: i18n.ts.preview,
-	icon: 'ph-eye ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.ts.preview,
+		icon: "ph-eye ph-bold ph-lg",
+	}))
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/registry.keys.vue b/packages/client/src/pages/registry.keys.vue
index 4217e4079..bdc258489 100644
--- a/packages/client/src/pages/registry.keys.vue
+++ b/packages/client/src/pages/registry.keys.vue
@@ -1,54 +1,68 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="600" :margin-min="16">
-		<FormSplit>
-			<MkKeyValue class="_formBlock">
-				<template #key>{{ i18n.ts._registry.domain }}</template>
-				<template #value>{{ i18n.ts.system }}</template>
-			</MkKeyValue>
-			<MkKeyValue class="_formBlock">
-				<template #key>{{ i18n.ts._registry.scope }}</template>
-				<template #value>{{ scope.join('/') }}</template>
-			</MkKeyValue>
-		</FormSplit>
-		
-		<MkButton primary @click="createKey">{{ i18n.ts._registry.createKey }}</MkButton>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="600" :margin-min="16">
+			<FormSplit>
+				<MkKeyValue class="_formBlock">
+					<template #key>{{ i18n.ts._registry.domain }}</template>
+					<template #value>{{ i18n.ts.system }}</template>
+				</MkKeyValue>
+				<MkKeyValue class="_formBlock">
+					<template #key>{{ i18n.ts._registry.scope }}</template>
+					<template #value>{{ scope.join("/") }}</template>
+				</MkKeyValue>
+			</FormSplit>
 
-		<FormSection v-if="keys">
-			<template #label>{{ i18n.ts.keys }}</template>
-			<div class="_formLinks">
-				<FormLink v-for="key in keys" :to="`/registry/value/system/${scope.join('/')}/${key[0]}`" class="_monospace">{{ key[0] }}<template #suffix>{{ key[1].toUpperCase() }}</template></FormLink>
-			</div>
-		</FormSection>
-	</MkSpacer>
-</MkStickyContainer>
+			<MkButton primary @click="createKey">{{
+				i18n.ts._registry.createKey
+			}}</MkButton>
+
+			<FormSection v-if="keys">
+				<template #label>{{ i18n.ts.keys }}</template>
+				<div class="_formLinks">
+					<FormLink
+						v-for="key in keys"
+						:to="`/registry/value/system/${scope.join('/')}/${
+							key[0]
+						}`"
+						class="_monospace"
+						>{{ key[0]
+						}}<template #suffix>{{
+							key[1].toUpperCase()
+						}}</template></FormLink
+					>
+				</div>
+			</FormSection>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue';
-import JSON5 from 'json5';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import FormLink from '@/components/form/link.vue';
-import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import FormSplit from '@/components/form/split.vue';
+import { ref, watch } from "vue";
+import JSON5 from "json5";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import FormLink from "@/components/form/link.vue";
+import FormSection from "@/components/form/section.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import FormSplit from "@/components/form/split.vue";
 
 const props = defineProps<{
 	path: string;
 }>();
 
-const scope = $computed(() => props.path.split('/'));
+const scope = $computed(() => props.path.split("/"));
 
 let keys = $ref(null);
 
 function fetchKeys() {
-	os.api('i/registry/keys-with-type', {
+	os.api("i/registry/keys-with-type", {
 		scope: scope,
-	}).then(res => {
+	}).then((res) => {
 		keys = Object.entries(res).sort((a, b) => a[0].localeCompare(b[0]));
 	});
 }
@@ -56,23 +70,23 @@ function fetchKeys() {
 async function createKey() {
 	const { canceled, result } = await os.form(i18n.ts._registry.createKey, {
 		key: {
-			type: 'string',
+			type: "string",
 			label: i18n.ts._registry.key,
 		},
 		value: {
-			type: 'string',
+			type: "string",
 			multiline: true,
 			label: i18n.ts.value,
 		},
 		scope: {
-			type: 'string',
+			type: "string",
 			label: i18n.ts._registry.scope,
-			default: scope.join('/'),
+			default: scope.join("/"),
 		},
 	});
 	if (canceled) return;
-	os.apiWithDialog('i/registry/set', {
-		scope: result.scope.split('/'),
+	os.apiWithDialog("i/registry/set", {
+		scope: result.scope.split("/"),
 		key: result.key,
 		value: JSON5.parse(result.value),
 	}).then(() => {
@@ -88,9 +102,8 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.registry,
-	icon: 'ph-gear-six ph-bold ph-lg',
+	icon: "ph-gear-six ph-bold ph-lg",
 });
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/registry.value.vue b/packages/client/src/pages/registry.value.vue
index 2057dee29..b95061c7e 100644
--- a/packages/client/src/pages/registry.value.vue
+++ b/packages/client/src/pages/registry.value.vue
@@ -1,73 +1,89 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="600" :margin-min="16">
-		<FormInfo warn>{{ i18n.ts.editTheseSettingsMayBreakAccount }}</FormInfo>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="600" :margin-min="16">
+			<FormInfo warn>{{
+				i18n.ts.editTheseSettingsMayBreakAccount
+			}}</FormInfo>
+
+			<template v-if="value">
+				<FormSplit>
+					<MkKeyValue class="_formBlock">
+						<template #key>{{ i18n.ts._registry.domain }}</template>
+						<template #value>{{ i18n.ts.system }}</template>
+					</MkKeyValue>
+					<MkKeyValue class="_formBlock">
+						<template #key>{{ i18n.ts._registry.scope }}</template>
+						<template #value>{{ scope.join("/") }}</template>
+					</MkKeyValue>
+					<MkKeyValue class="_formBlock">
+						<template #key>{{ i18n.ts._registry.key }}</template>
+						<template #value>{{ key }}</template>
+					</MkKeyValue>
+				</FormSplit>
+
+				<FormTextarea
+					v-model="valueForEditor"
+					tall
+					class="_formBlock _monospace"
+				>
+					<template #label>{{ i18n.ts.value }} (JSON)</template>
+				</FormTextarea>
+
+				<MkButton class="_formBlock" primary @click="save"
+					><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+					{{ i18n.ts.save }}</MkButton
+				>
 
-		<template v-if="value">
-			<FormSplit>
 				<MkKeyValue class="_formBlock">
-					<template #key>{{ i18n.ts._registry.domain }}</template>
-					<template #value>{{ i18n.ts.system }}</template>
+					<template #key>{{ i18n.ts.updatedAt }}</template>
+					<template #value
+						><MkTime :time="value.updatedAt" mode="detail"
+					/></template>
 				</MkKeyValue>
-				<MkKeyValue class="_formBlock">
-					<template #key>{{ i18n.ts._registry.scope }}</template>
-					<template #value>{{ scope.join('/') }}</template>
-				</MkKeyValue>
-				<MkKeyValue class="_formBlock">
-					<template #key>{{ i18n.ts._registry.key }}</template>
-					<template #value>{{ key }}</template>
-				</MkKeyValue>
-			</FormSplit>
-			
-			<FormTextarea v-model="valueForEditor" tall class="_formBlock _monospace">
-				<template #label>{{ i18n.ts.value }} (JSON)</template>
-			</FormTextarea>
 
-			<MkButton class="_formBlock" primary @click="save"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-
-			<MkKeyValue class="_formBlock">
-				<template #key>{{ i18n.ts.updatedAt }}</template>
-				<template #value><MkTime :time="value.updatedAt" mode="detail"/></template>
-			</MkKeyValue>
-
-			<MkButton danger @click="del"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
-		</template>
-	</MkSpacer>
-</MkStickyContainer>
+				<MkButton danger @click="del"
+					><i class="ph-trash ph-bold ph-lg"></i>
+					{{ i18n.ts.delete }}</MkButton
+				>
+			</template>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue';
-import JSON5 from 'json5';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import FormLink from '@/components/form/link.vue';
-import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormSplit from '@/components/form/split.vue';
-import FormInfo from '@/components/MkInfo.vue';
+import { ref, watch } from "vue";
+import JSON5 from "json5";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import FormLink from "@/components/form/link.vue";
+import FormSection from "@/components/form/section.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormSplit from "@/components/form/split.vue";
+import FormInfo from "@/components/MkInfo.vue";
 
 const props = defineProps<{
 	path: string;
 }>();
 
-const scope = $computed(() => props.path.split('/').slice(0, -1));
-const key = $computed(() => props.path.split('/').at(-1));
+const scope = $computed(() => props.path.split("/").slice(0, -1));
+const key = $computed(() => props.path.split("/").at(-1));
 
 let value = $ref(null);
 let valueForEditor = $ref(null);
 
 function fetchValue() {
-	os.api('i/registry/get-detail', {
+	os.api("i/registry/get-detail", {
 		scope,
 		key,
-	}).then(res => {
+	}).then((res) => {
 		value = res;
-		valueForEditor = JSON5.stringify(res.value, null, '\t');
+		valueForEditor = JSON5.stringify(res.value, null, "\t");
 	});
 }
 
@@ -76,17 +92,17 @@ async function save() {
 		JSON5.parse(valueForEditor);
 	} catch (err) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: i18n.ts.invalidValue,
 		});
 		return;
 	}
 	os.confirm({
-		type: 'warning',
+		type: "warning",
 		text: i18n.ts.saveConfirm,
 	}).then(({ canceled }) => {
 		if (canceled) return;
-		os.apiWithDialog('i/registry/set', {
+		os.apiWithDialog("i/registry/set", {
 			scope,
 			key,
 			value: JSON5.parse(valueForEditor),
@@ -96,11 +112,11 @@ async function save() {
 
 function del() {
 	os.confirm({
-		type: 'warning',
+		type: "warning",
 		text: i18n.ts.deleteConfirm,
 	}).then(({ canceled }) => {
 		if (canceled) return;
-		os.apiWithDialog('i/registry/remove', {
+		os.apiWithDialog("i/registry/remove", {
 			scope,
 			key,
 		});
@@ -115,9 +131,8 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.registry,
-	icon: 'ph-gear-six ph-bold ph-lg',
+	icon: "ph-gear-six ph-bold ph-lg",
 });
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/registry.vue b/packages/client/src/pages/registry.vue
index dc286d5cf..7bb300c99 100644
--- a/packages/client/src/pages/registry.vue
+++ b/packages/client/src/pages/registry.vue
@@ -1,56 +1,67 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="600" :margin-min="16">
-		<MkButton primary @click="createKey">{{ i18n.ts._registry.createKey }}</MkButton>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="600" :margin-min="16">
+			<MkButton primary @click="createKey">{{
+				i18n.ts._registry.createKey
+			}}</MkButton>
 
-		<FormSection v-if="scopes">
-			<template #label>{{ i18n.ts.system }}</template>
-			<div class="_formLinks">
-				<FormLink v-for="scope in scopes" :to="`/registry/keys/system/${scope.join('/')}`" class="_monospace">{{ scope.join('/') }}</FormLink>
-			</div>
-		</FormSection>
-	</MkSpacer>
-</MkStickyContainer>
+			<FormSection v-if="scopes">
+				<template #label>{{ i18n.ts.system }}</template>
+				<div class="_formLinks">
+					<FormLink
+						v-for="scope in scopes"
+						:to="`/registry/keys/system/${scope.join('/')}`"
+						class="_monospace"
+						>{{ scope.join("/") }}</FormLink
+					>
+				</div>
+			</FormSection>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue';
-import JSON5 from 'json5';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import FormLink from '@/components/form/link.vue';
-import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/MkButton.vue';
+import { ref, watch } from "vue";
+import JSON5 from "json5";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import FormLink from "@/components/form/link.vue";
+import FormSection from "@/components/form/section.vue";
+import MkButton from "@/components/MkButton.vue";
 
 let scopes = $ref(null);
 
 function fetchScopes() {
-	os.api('i/registry/scopes').then(res => {
-		scopes = res.slice().sort((a, b) => a.join('/').localeCompare(b.join('/')));
+	os.api("i/registry/scopes").then((res) => {
+		scopes = res
+			.slice()
+			.sort((a, b) => a.join("/").localeCompare(b.join("/")));
 	});
 }
 
 async function createKey() {
 	const { canceled, result } = await os.form(i18n.ts._registry.createKey, {
 		key: {
-			type: 'string',
+			type: "string",
 			label: i18n.ts._registry.key,
 		},
 		value: {
-			type: 'string',
+			type: "string",
 			multiline: true,
 			label: i18n.ts.value,
 		},
 		scope: {
-			type: 'string',
+			type: "string",
 			label: i18n.ts._registry.scope,
 		},
 	});
 	if (canceled) return;
-	os.apiWithDialog('i/registry/set', {
-		scope: result.scope.split('/'),
+	os.apiWithDialog("i/registry/set", {
+		scope: result.scope.split("/"),
 		key: result.key,
 		value: JSON5.parse(result.value),
 	}).then(() => {
@@ -66,9 +77,8 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.registry,
-	icon: 'ph-gear-six ph-bold ph-lg',
+	icon: "ph-gear-six ph-bold ph-lg",
 });
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/reset-password.vue b/packages/client/src/pages/reset-password.vue
index 6726671bb..3f57e8902 100644
--- a/packages/client/src/pages/reset-password.vue
+++ b/packages/client/src/pages/reset-password.vue
@@ -1,46 +1,68 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer v-if="token" :content-max="700" :margin-min="16" :margin-max="32">
-		<div class="_formRoot">
-			<FormInput v-model="password" type="password" class="_formBlock">
-				<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
-				<template #label>{{ i18n.ts.newPassword }}</template>
-			</FormInput>
-		
-			<FormButton primary class="_formBlock" @click="save">{{ i18n.ts.save }}</FormButton>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer
+			v-if="token"
+			:content-max="700"
+			:margin-min="16"
+			:margin-max="32"
+		>
+			<div class="_formRoot">
+				<FormInput
+					v-model="password"
+					type="password"
+					class="_formBlock"
+				>
+					<template #prefix
+						><i class="ph-lock ph-bold ph-lg"></i
+					></template>
+					<template #label>{{ i18n.ts.newPassword }}</template>
+				</FormInput>
+
+				<FormButton primary class="_formBlock" @click="save">{{
+					i18n.ts.save
+				}}</FormButton>
+			</div>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, onMounted } from 'vue';
-import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { mainRouter } from '@/router';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { defineAsyncComponent, onMounted } from "vue";
+import FormInput from "@/components/form/input.vue";
+import FormButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { mainRouter } from "@/router";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const props = defineProps<{
 	token?: string;
 }>();
 
-let password = $ref('');
+let password = $ref("");
 
 async function save() {
-	await os.apiWithDialog('reset-password', {
+	await os.apiWithDialog("reset-password", {
 		token: props.token,
 		password: password,
 	});
-	mainRouter.push('/');
+	mainRouter.push("/");
 }
 
 onMounted(() => {
 	if (props.token == null) {
-		os.popup(defineAsyncComponent(() => import('@/components/MkForgotPassword.vue')), {}, {}, 'closed');
-		mainRouter.push('/');
+		os.popup(
+			defineAsyncComponent(
+				() => import("@/components/MkForgotPassword.vue")
+			),
+			{},
+			{},
+			"closed"
+		);
+		mainRouter.push("/");
 	}
 });
 
@@ -50,10 +72,8 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.resetPassword,
-	icon: 'ph-lock ph-bold ph-lg',
+	icon: "ph-lock ph-bold ph-lg",
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/scratchpad.vue b/packages/client/src/pages/scratchpad.vue
index 7d423e7dd..06c6a8c27 100644
--- a/packages/client/src/pages/scratchpad.vue
+++ b/packages/client/src/pages/scratchpad.vue
@@ -1,94 +1,121 @@
 <template>
-<div class="iltifgqe">
-	<div class="editor _panel _gap">
-		<PrismEditor v-model="code" class="_code code" style="height: 30vh" :highlight="highlighter" :line-numbers="false"/>
-		<MkButton style="position: absolute; top: 8px; right: 8px;" primary @click="run()"><i class="ph-play ph-bold ph-lg"></i></MkButton>
-	</div>
-
-	<MkContainer :foldable="true" class="_gap">
-		<template #header>{{ i18n.ts.output }}</template>
-		<div class="bepmlvbi">
-			<div v-for="log in logs" :key="log.id" class="log" :class="{ print: log.print }">{{ log.text }}</div>
+	<div class="iltifgqe">
+		<div class="editor _panel _gap">
+			<PrismEditor
+				v-model="code"
+				class="_code code"
+				style="height: 30vh"
+				:highlight="highlighter"
+				:line-numbers="false"
+			/>
+			<MkButton
+				style="position: absolute; top: 8px; right: 8px"
+				primary
+				@click="run()"
+				><i class="ph-play ph-bold ph-lg"></i
+			></MkButton>
 		</div>
-	</MkContainer>
 
-	<div class="_gap">
-		{{ i18n.ts.scratchpadDescription }}
+		<MkContainer :foldable="true" class="_gap">
+			<template #header>{{ i18n.ts.output }}</template>
+			<div class="bepmlvbi">
+				<div
+					v-for="log in logs"
+					:key="log.id"
+					class="log"
+					:class="{ print: log.print }"
+				>
+					{{ log.text }}
+				</div>
+			</div>
+		</MkContainer>
+
+		<div class="_gap">
+			{{ i18n.ts.scratchpadDescription }}
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue';
-import 'prismjs';
-import { highlight, languages } from 'prismjs/components/prism-core';
-import 'prismjs/components/prism-clike';
-import 'prismjs/components/prism-javascript';
-import 'prismjs/themes/prism-okaidia.css';
-import { PrismEditor } from 'vue-prism-editor';
-import 'vue-prism-editor/dist/prismeditor.min.css';
-import { AiScript, parse, utils } from '@syuilo/aiscript';
-import MkContainer from '@/components/MkContainer.vue';
-import MkButton from '@/components/MkButton.vue';
-import { createAiScriptEnv } from '@/scripts/aiscript/api';
-import * as os from '@/os';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { ref, watch } from "vue";
+import "prismjs";
+import { highlight, languages } from "prismjs/components/prism-core";
+import "prismjs/components/prism-clike";
+import "prismjs/components/prism-javascript";
+import "prismjs/themes/prism-okaidia.css";
+import { PrismEditor } from "vue-prism-editor";
+import "vue-prism-editor/dist/prismeditor.min.css";
+import { AiScript, parse, utils } from "@syuilo/aiscript";
+import MkContainer from "@/components/MkContainer.vue";
+import MkButton from "@/components/MkButton.vue";
+import { createAiScriptEnv } from "@/scripts/aiscript/api";
+import * as os from "@/os";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const code = ref('');
+const code = ref("");
 const logs = ref<any[]>([]);
 
-const saved = localStorage.getItem('scratchpad');
+const saved = localStorage.getItem("scratchpad");
 if (saved) {
 	code.value = saved;
 }
 
 watch(code, () => {
-	localStorage.setItem('scratchpad', code.value);
+	localStorage.setItem("scratchpad", code.value);
 });
 
 async function run() {
 	logs.value = [];
-	const aiscript = new AiScript(createAiScriptEnv({
-		storageKey: 'scratchpad',
-		token: $i?.token,
-	}), {
-		in: (q) => {
-			return new Promise(ok => {
-				os.inputText({
-					title: q,
-				}).then(({ canceled, result: a }) => {
-					ok(a);
+	const aiscript = new AiScript(
+		createAiScriptEnv({
+			storageKey: "scratchpad",
+			token: $i?.token,
+		}),
+		{
+			in: (q) => {
+				return new Promise((ok) => {
+					os.inputText({
+						title: q,
+					}).then(({ canceled, result: a }) => {
+						ok(a);
+					});
 				});
-			});
-		},
-		out: (value) => {
-			logs.value.push({
-				id: Math.random(),
-				text: value.type === 'str' ? value.value : utils.valToString(value),
-				print: true,
-			});
-		},
-		log: (type, params) => {
-			switch (type) {
-				case 'end': logs.value.push({
+			},
+			out: (value) => {
+				logs.value.push({
 					id: Math.random(),
-					text: utils.valToString(params.val, true),
-					print: false,
-				}); break;
-				default: break;
-			}
-		},
-	});
+					text:
+						value.type === "str"
+							? value.value
+							: utils.valToString(value),
+					print: true,
+				});
+			},
+			log: (type, params) => {
+				switch (type) {
+					case "end":
+						logs.value.push({
+							id: Math.random(),
+							text: utils.valToString(params.val, true),
+							print: false,
+						});
+						break;
+					default:
+						break;
+				}
+			},
+		}
+	);
 
 	let ast;
 	try {
 		ast = parse(code.value);
 	} catch (error) {
 		os.alert({
-			type: 'error',
-			text: 'Syntax error :(',
+			type: "error",
+			text: "Syntax error :(",
 		});
 		return;
 	}
@@ -96,14 +123,14 @@ async function run() {
 		await aiscript.exec(ast);
 	} catch (error: any) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: error.message,
 		});
 	}
 }
 
 function highlighter(code) {
-	return highlight(code, languages.js, 'javascript');
+	return highlight(code, languages.js, "javascript");
 }
 
 const headerActions = $computed(() => []);
@@ -112,7 +139,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.scratchpad,
-	icon: 'ph-terminal-window ph-bold ph-lg',
+	icon: "ph-terminal-window ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index 6213d0d78..f900caad4 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -1,37 +1,52 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="800">
-		<swiper
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="800">
+			<swiper
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
-				:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
+				:allow-touch-move="
+					!(
+						deviceKind === 'desktop' &&
+						!defaultStore.state.swipeOnDesktop
+					)
+				"
 				@swiper="setSwiperRef"
 				@slide-change="onSlideChange"
 			>
 				<swiper-slide>
-					<XNotes ref="notes" :pagination="notesPagination"/>
+					<XNotes ref="notes" :pagination="notesPagination" />
 				</swiper-slide>
 				<swiper-slide>
-					<XUserList ref="users" class="_gap" :pagination="usersPagination"/>
+					<XUserList
+						ref="users"
+						class="_gap"
+						:pagination="usersPagination"
+					/>
 				</swiper-slide>
 			</swiper>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, onMounted } from 'vue';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
-import XNotes from '@/components/MkNotes.vue';
-import XUserList from '@/components/MkUserList.vue';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { defaultStore } from '@/store';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
+import { computed, watch, onMounted } from "vue";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
+import XNotes from "@/components/MkNotes.vue";
+import XUserList from "@/components/MkUserList.vue";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { defaultStore } from "@/store";
+import "swiper/scss";
+import "swiper/scss/virtual";
 
 const props = defineProps<{
 	query: string;
@@ -39,7 +54,7 @@ const props = defineProps<{
 }>();
 
 const notesPagination = {
-	endpoint: 'notes/search' as const,
+	endpoint: "notes/search" as const,
 	limit: 10,
 	params: computed(() => ({
 		query: props.query,
@@ -48,29 +63,32 @@ const notesPagination = {
 };
 
 const usersPagination = {
-	endpoint: 'users/search' as const,
+	endpoint: "users/search" as const,
 	limit: 10,
 	params: computed(() => ({
 		query: props.query,
-		origin: 'combined',
+		origin: "combined",
 	})),
 };
 
-const tabs = ['notes', 'users'];
+const tabs = ["notes", "users"];
 let tab = $ref(tabs[0]);
-watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
+watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
 const headerActions = $computed(() => []);
 
-const headerTabs = $computed(() => [ {
-	key: 'notes',
-	icon: 'ph-magnifying-glass ph-bold ph-lg',
-	title: i18n.ts.notes,
-}, {
-	key: 'users',
-	icon: 'ph-users ph-bold ph-lg',
-	title: i18n.ts.users,
-}]);
+const headerTabs = $computed(() => [
+	{
+		key: "notes",
+		icon: "ph-magnifying-glass ph-bold ph-lg",
+		title: i18n.ts.notes,
+	},
+	{
+		key: "users",
+		icon: "ph-users ph-bold ph-lg",
+		title: i18n.ts.users,
+	},
+]);
 
 let swiperRef = null;
 
@@ -91,8 +109,10 @@ onMounted(() => {
 	syncSlide(tabs.indexOf(swiperRef.activeIndex));
 });
 
-definePageMetadata(computed(() => ({
-	title: i18n.t('searchWith', { q: props.query }),
-	icon: 'ph-magnifying-glass ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: i18n.t("searchWith", { q: props.query }),
+		icon: "ph-magnifying-glass ph-bold ph-lg",
+	}))
+);
 </script>
diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue
index acbd17480..4d856c86c 100644
--- a/packages/client/src/pages/settings/2fa.vue
+++ b/packages/client/src/pages/settings/2fa.vue
@@ -1,97 +1,167 @@
 <template>
-<div>
-	<MkButton v-if="!twoFactorData && !$i.twoFactorEnabled" @click="register">{{ i18n.ts._2fa.registerDevice }}</MkButton>
-	<template v-if="$i.twoFactorEnabled">
-		<p>{{ i18n.ts._2fa.alreadyRegistered }}</p>
-		<MkButton @click="unregister">{{ i18n.ts.unregister }}</MkButton>
-	</template>
+	<div>
+		<MkButton
+			v-if="!twoFactorData && !$i.twoFactorEnabled"
+			@click="register"
+			>{{ i18n.ts._2fa.registerDevice }}</MkButton
+		>
+		<template v-if="$i.twoFactorEnabled">
+			<p>{{ i18n.ts._2fa.alreadyRegistered }}</p>
+			<MkButton @click="unregister">{{ i18n.ts.unregister }}</MkButton>
+		</template>
 
-	<template v-if="supportsCredentials">
-		<hr class="totp-method-sep">
+		<template v-if="supportsCredentials">
+			<hr class="totp-method-sep" />
 
-		<h2 class="heading">{{ i18n.ts.securityKey }}</h2>
-		<p>{{ i18n.ts._2fa.securityKeyInfo }}</p>
-		<div class="key-list">
-			<div v-for="key in $i.securityKeysList" class="key">
-				<h3>{{ key.name }}</h3>
-				<div class="last-used">{{ i18n.ts.lastUsed }}<MkTime :time="key.lastUsed"/></div>
-				<MkButton @click="unregisterKey(key)">{{ i18n.ts.unregister }}</MkButton>
+			<h2 class="heading">{{ i18n.ts.securityKey }}</h2>
+			<p>{{ i18n.ts._2fa.securityKeyInfo }}</p>
+			<div class="key-list">
+				<div v-for="key in $i.securityKeysList" class="key">
+					<h3>{{ key.name }}</h3>
+					<div class="last-used">
+						{{ i18n.ts.lastUsed }}<MkTime :time="key.lastUsed" />
+					</div>
+					<MkButton @click="unregisterKey(key)">{{
+						i18n.ts.unregister
+					}}</MkButton>
+				</div>
 			</div>
+
+			<MkSwitch
+				v-if="$i.securityKeysList.length > 0"
+				v-model="usePasswordLessLogin"
+				@update:modelValue="updatePasswordLessLogin"
+				>{{ i18n.ts.passwordLessLogin }}</MkSwitch
+			>
+
+			<MkInfo
+				v-if="registration && registration.error"
+				style="margin-bottom: 1rem"
+				warn
+				>{{ i18n.ts.error }}: {{ registration.error }}</MkInfo
+			>
+			<MkButton
+				v-if="!registration || registration.error"
+				@click="addSecurityKey"
+				>{{ i18n.ts._2fa.registerKey }}</MkButton
+			>
+
+			<ol v-if="registration && !registration.error">
+				<li v-if="registration.stage >= 0">
+					{{ i18n.ts.tapSecurityKey }}
+					<i
+						v-if="registration.saving && registration.stage == 0"
+						class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"
+					></i>
+				</li>
+				<li v-if="registration.stage >= 1">
+					<MkForm
+						:disabled="
+							registration.stage != 1 || registration.saving
+						"
+					>
+						<MkInput v-model="keyName" :max="30">
+							<template #label>{{
+								i18n.ts.securityKeyName
+							}}</template>
+						</MkInput>
+						<MkButton
+							:disabled="keyName.length == 0"
+							@click="registerKey"
+							>{{ i18n.ts.registerSecurityKey }}</MkButton
+						>
+						<i
+							v-if="
+								registration.saving && registration.stage == 1
+							"
+							class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"
+						></i>
+					</MkForm>
+				</li>
+			</ol>
+		</template>
+		<div v-if="twoFactorData && !$i.twoFactorEnabled">
+			<ol style="margin: 0; padding: 0 0 0 1em">
+				<li>
+					<I18n :src="i18n.ts._2fa.step1" tag="span">
+						<template #a>
+							<a
+								href="https://authpass.app/"
+								rel="noopener"
+								target="_blank"
+								class="_link"
+								>AuthPass</a
+							>
+						</template>
+						<template #b>
+							<a
+								href="https://support.google.com/accounts/answer/1066447"
+								rel="noopener"
+								target="_blank"
+								class="_link"
+								>Google Authenticator</a
+							>
+						</template>
+					</I18n>
+				</li>
+				<li>
+					{{ i18n.ts._2fa.step2 }}<br /><img
+						:src="twoFactorData.qr"
+					/>
+					<p>
+						{{ i18n.ts._2fa.step2Url }}<br />{{ twoFactorData.url }}
+					</p>
+				</li>
+				<li>
+					{{ i18n.ts._2fa.step3 }}<br />
+					<MkInput
+						v-model="token"
+						type="text"
+						pattern="^[0-9]{6}$"
+						autocomplete="off"
+						:spellcheck="false"
+						><template #label>{{
+							i18n.ts.token
+						}}</template></MkInput
+					>
+					<MkButton primary @click="submit">{{
+						i18n.ts.done
+					}}</MkButton>
+				</li>
+			</ol>
+			<MkInfo>{{ i18n.ts._2fa.step4 }}</MkInfo>
 		</div>
-
-		<MkSwitch v-if="$i.securityKeysList.length > 0" v-model="usePasswordLessLogin" @update:modelValue="updatePasswordLessLogin">{{ i18n.ts.passwordLessLogin }}</MkSwitch>
-
-		<MkInfo v-if="registration && registration.error" style="margin-bottom: 1rem;" warn>{{ i18n.ts.error }}: {{ registration.error }}</MkInfo>
-		<MkButton v-if="!registration || registration.error" @click="addSecurityKey">{{ i18n.ts._2fa.registerKey }}</MkButton>
-
-		<ol v-if="registration && !registration.error">
-			<li v-if="registration.stage >= 0">
-				{{ i18n.ts.tapSecurityKey }}
-				<i v-if="registration.saving && registration.stage == 0" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
-			</li>
-			<li v-if="registration.stage >= 1">
-				<MkForm :disabled="registration.stage != 1 || registration.saving">
-					<MkInput v-model="keyName" :max="30">
-						<template #label>{{ i18n.ts.securityKeyName }}</template>
-					</MkInput>
-					<MkButton :disabled="keyName.length == 0" @click="registerKey">{{ i18n.ts.registerSecurityKey }}</MkButton>
-					<i v-if="registration.saving && registration.stage == 1" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
-				</MkForm>
-			</li>
-		</ol>
-	</template>
-	<div v-if="twoFactorData && !$i.twoFactorEnabled">
-		<ol style="margin: 0; padding: 0 0 0 1em;">
-			<li>
-				<I18n :src="i18n.ts._2fa.step1" tag="span">
-					<template #a>
-						<a href="https://authpass.app/" rel="noopener" target="_blank" class="_link">AuthPass</a>
-					</template>
-					<template #b>
-						<a href="https://support.google.com/accounts/answer/1066447" rel="noopener" target="_blank" class="_link">Google Authenticator</a>
-					</template>
-				</I18n>
-			</li>
-			<li>{{ i18n.ts._2fa.step2 }}<br><img :src="twoFactorData.qr"><p>{{ i18n.ts._2fa.step2Url }}<br>{{ twoFactorData.url }}</p></li>
-			<li>
-				{{ i18n.ts._2fa.step3 }}<br>
-				<MkInput v-model="token" type="text" pattern="^[0-9]{6}$" autocomplete="off" :spellcheck="false"><template #label>{{ i18n.ts.token }}</template></MkInput>
-				<MkButton primary @click="submit">{{ i18n.ts.done }}</MkButton>
-			</li>
-		</ol>
-		<MkInfo>{{ i18n.ts._2fa.step4 }}</MkInfo>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import { hostname } from '@/config';
-import { byteify, hexify, stringify } from '@/scripts/2fa';
-import MkButton from '@/components/MkButton.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import MkInput from '@/components/form/input.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import * as os from '@/os';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
+import { ref } from "vue";
+import { hostname } from "@/config";
+import { byteify, hexify, stringify } from "@/scripts/2fa";
+import MkButton from "@/components/MkButton.vue";
+import MkInfo from "@/components/MkInfo.vue";
+import MkInput from "@/components/form/input.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import * as os from "@/os";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
 
 const twoFactorData = ref<any>(null);
 const supportsCredentials = ref(!!navigator.credentials);
 const usePasswordLessLogin = ref($i!.usePasswordLessLogin);
 const registration = ref<any>(null);
-const keyName = ref('');
+const keyName = ref("");
 const token = ref(null);
 
 function register() {
 	os.inputText({
 		title: i18n.ts.password,
-		type: 'password'
+		type: "password",
 	}).then(({ canceled, result: password }) => {
 		if (canceled) return;
-		os.api('i/2fa/register', {
-			password: password
-		}).then(data => {
+		os.api("i/2fa/register", {
+			password: password,
+		}).then((data) => {
 			twoFactorData.value = data;
 		});
 	});
@@ -100,45 +170,53 @@ function register() {
 function unregister() {
 	os.inputText({
 		title: i18n.ts.password,
-		type: 'password'
+		type: "password",
 	}).then(({ canceled, result: password }) => {
 		if (canceled) return;
-		os.api('i/2fa/unregister', {
-			password: password
-		}).then(() => {
-			usePasswordLessLogin.value = false;
-			updatePasswordLessLogin();
-		}).then(() => {
-			os.success();
-			$i!.twoFactorEnabled = false;
-		});
+		os.api("i/2fa/unregister", {
+			password: password,
+		})
+			.then(() => {
+				usePasswordLessLogin.value = false;
+				updatePasswordLessLogin();
+			})
+			.then(() => {
+				os.success();
+				$i!.twoFactorEnabled = false;
+			});
 	});
 }
 
 function submit() {
-	os.api('i/2fa/done', {
-		token: token.value
-	}).then(() => {
-		os.success();
-		$i!.twoFactorEnabled = true;
-	}).catch(err => {
-		os.alert({
-			type: 'error',
-			text: err,
+	os.api("i/2fa/done", {
+		token: token.value,
+	})
+		.then(() => {
+			os.success();
+			$i!.twoFactorEnabled = true;
+		})
+		.catch((err) => {
+			os.alert({
+				type: "error",
+				text: err,
+			});
 		});
-	});
 }
 
 function registerKey() {
 	registration.value.saving = true;
-	os.api('i/2fa/key-done', {
+	os.api("i/2fa/key-done", {
 		password: registration.value.password,
 		name: keyName.value,
 		challengeId: registration.value.challengeId,
 		// we convert each 16 bits to a string to serialise
-		clientDataJSON: stringify(registration.value.credential.response.clientDataJSON),
-		attestationObject: hexify(registration.value.credential.response.attestationObject)
-	}).then(key => {
+		clientDataJSON: stringify(
+			registration.value.credential.response.clientDataJSON
+		),
+		attestationObject: hexify(
+			registration.value.credential.response.attestationObject
+		),
+	}).then((key) => {
 		registration.value = null;
 		key!.lastUsed = new Date();
 		os.success();
@@ -148,69 +226,75 @@ function registerKey() {
 function unregisterKey(key) {
 	os.inputText({
 		title: i18n.ts.password,
-		type: 'password'
+		type: "password",
 	}).then(({ canceled, result: password }) => {
 		if (canceled) return;
-		return os.api('i/2fa/remove-key', {
-			password,
-			credentialId: key.id
-		}).then(() => {
-			usePasswordLessLogin.value = false;
-			updatePasswordLessLogin();
-		}).then(() => {
-			os.success();
-		});
+		return os
+			.api("i/2fa/remove-key", {
+				password,
+				credentialId: key.id,
+			})
+			.then(() => {
+				usePasswordLessLogin.value = false;
+				updatePasswordLessLogin();
+			})
+			.then(() => {
+				os.success();
+			});
 	});
 }
 
 function addSecurityKey() {
 	os.inputText({
 		title: i18n.ts.password,
-		type: 'password'
+		type: "password",
 	}).then(({ canceled, result: password }) => {
 		if (canceled) return;
-		os.api('i/2fa/register-key', {
-			password
-		}).then(reg => {
-			registration.value = {
-				password,
-				challengeId: reg!.challengeId,
-				stage: 0,
-				publicKeyOptions: {
-					challenge: byteify(reg!.challenge, 'base64'),
-					rp: {
-						id: hostname,
-						name: 'Calckey'
+		os.api("i/2fa/register-key", {
+			password,
+		})
+			.then((reg) => {
+				registration.value = {
+					password,
+					challengeId: reg!.challengeId,
+					stage: 0,
+					publicKeyOptions: {
+						challenge: byteify(reg!.challenge, "base64"),
+						rp: {
+							id: hostname,
+							name: "Calckey",
+						},
+						user: {
+							id: byteify($i!.id, "ascii"),
+							name: $i!.username,
+							displayName: $i!.name,
+						},
+						pubKeyCredParams: [{ alg: -7, type: "public-key" }],
+						timeout: 60000,
+						attestation: "direct",
 					},
-					user: {
-						id: byteify($i!.id, 'ascii'),
-						name: $i!.username,
-						displayName: $i!.name,
-					},
-					pubKeyCredParams: [{ alg: -7, type: 'public-key' }],
-					timeout: 60000,
-					attestation: 'direct'
-				},
-				saving: true
-			};
-			return navigator.credentials.create({
-				publicKey: registration.value.publicKeyOptions
+					saving: true,
+				};
+				return navigator.credentials.create({
+					publicKey: registration.value.publicKeyOptions,
+				});
+			})
+			.then((credential) => {
+				registration.value.credential = credential;
+				registration.value.saving = false;
+				registration.value.stage = 1;
+			})
+			.catch((err) => {
+				console.warn("Error while registering?", err);
+				registration.value.error = err.message;
+				registration.value.stage = -1;
 			});
-		}).then(credential => {
-			registration.value.credential = credential;
-			registration.value.saving = false;
-			registration.value.stage = 1;
-		}).catch(err => {
-			console.warn('Error while registering?', err);
-			registration.value.error = err.message;
-			registration.value.stage = -1;
-		});
 	});
 }
 
 async function updatePasswordLessLogin() {
-	await os.api('i/2fa/password-less', {
-		value: !!usePasswordLessLogin.value
+	await os.api("i/2fa/password-less", {
+		value: !!usePasswordLessLogin.value,
 	});
 }
 </script>
diff --git a/packages/client/src/pages/settings/account-info.vue b/packages/client/src/pages/settings/account-info.vue
index 0f8ae6725..faaee07db 100644
--- a/packages/client/src/pages/settings/account-info.vue
+++ b/packages/client/src/pages/settings/account-info.vue
@@ -1,148 +1,194 @@
 <template>
-<div class="_formRoot">
-	<MkKeyValue>
-		<template #key>ID</template>
-		<template #value><span class="_monospace">{{ $i.id }}</span></template>
-	</MkKeyValue>
-
-	<FormSection>
+	<div class="_formRoot">
 		<MkKeyValue>
-			<template #key>{{ i18n.ts.registeredDate }}</template>
-			<template #value><MkTime :time="$i.createdAt" mode="detail"/></template>
+			<template #key>ID</template>
+			<template #value
+				><span class="_monospace">{{ $i.id }}</span></template
+			>
 		</MkKeyValue>
-	</FormSection>
 
-	<FormSection v-if="stats">
-		<template #label>{{ i18n.ts.statistics }}</template>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.notesCount }}</template>
-			<template #value>{{ number(stats.notesCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.repliesCount }}</template>
-			<template #value>{{ number(stats.repliesCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.renotesCount }}</template>
-			<template #value>{{ number(stats.renotesCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.repliedCount }}</template>
-			<template #value>{{ number(stats.repliedCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.renotedCount }}</template>
-			<template #value>{{ number(stats.renotedCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.pollVotesCount }}</template>
-			<template #value>{{ number(stats.pollVotesCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.pollVotedCount }}</template>
-			<template #value>{{ number(stats.pollVotedCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.sentReactionsCount }}</template>
-			<template #value>{{ number(stats.sentReactionsCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.receivedReactionsCount }}</template>
-			<template #value>{{ number(stats.receivedReactionsCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.noteFavoritesCount }}</template>
-			<template #value>{{ number(stats.noteFavoritesCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.followingCount }}</template>
-			<template #value>{{ number(stats.followingCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.followingCount }} ({{ i18n.ts.local }})</template>
-			<template #value>{{ number(stats.localFollowingCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.followingCount }} ({{ i18n.ts.remote }})</template>
-			<template #value>{{ number(stats.remoteFollowingCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.followersCount }}</template>
-			<template #value>{{ number(stats.followersCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.followersCount }} ({{ i18n.ts.local }})</template>
-			<template #value>{{ number(stats.localFollowersCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.followersCount }} ({{ i18n.ts.remote }})</template>
-			<template #value>{{ number(stats.remoteFollowersCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.pageLikesCount }}</template>
-			<template #value>{{ number(stats.pageLikesCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.pageLikedCount }}</template>
-			<template #value>{{ number(stats.pageLikedCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.driveFilesCount }}</template>
-			<template #value>{{ number(stats.driveFilesCount) }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>{{ i18n.ts.driveUsage }}</template>
-			<template #value>{{ bytes(stats.driveUsage) }}</template>
-		</MkKeyValue>
-	</FormSection>
+		<FormSection>
+			<MkKeyValue>
+				<template #key>{{ i18n.ts.registeredDate }}</template>
+				<template #value
+					><MkTime :time="$i.createdAt" mode="detail"
+				/></template>
+			</MkKeyValue>
+		</FormSection>
 
-	<FormSection>
-		<template #label>{{ i18n.ts.other }}</template>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>emailVerified</template>
-			<template #value>{{ $i.emailVerified ? i18n.ts.yes : i18n.ts.no }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>twoFactorEnabled</template>
-			<template #value>{{ $i.twoFactorEnabled ? i18n.ts.yes : i18n.ts.no }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>securityKeys</template>
-			<template #value>{{ $i.securityKeys ? i18n.ts.yes : i18n.ts.no }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>usePasswordLessLogin</template>
-			<template #value>{{ $i.usePasswordLessLogin ? i18n.ts.yes : i18n.ts.no }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>isModerator</template>
-			<template #value>{{ $i.isModerator ? i18n.ts.yes : i18n.ts.no }}</template>
-		</MkKeyValue>
-		<MkKeyValue oneline style="margin: 1em 0;">
-			<template #key>isAdmin</template>
-			<template #value>{{ $i.isAdmin ? i18n.ts.yes : i18n.ts.no }}</template>
-		</MkKeyValue>
-	</FormSection>
-</div>
+		<FormSection v-if="stats">
+			<template #label>{{ i18n.ts.statistics }}</template>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.notesCount }}</template>
+				<template #value>{{ number(stats.notesCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.repliesCount }}</template>
+				<template #value>{{ number(stats.repliesCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.renotesCount }}</template>
+				<template #value>{{ number(stats.renotesCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.repliedCount }}</template>
+				<template #value>{{ number(stats.repliedCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.renotedCount }}</template>
+				<template #value>{{ number(stats.renotedCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.pollVotesCount }}</template>
+				<template #value>{{ number(stats.pollVotesCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.pollVotedCount }}</template>
+				<template #value>{{ number(stats.pollVotedCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.sentReactionsCount }}</template>
+				<template #value>{{
+					number(stats.sentReactionsCount)
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.receivedReactionsCount }}</template>
+				<template #value>{{
+					number(stats.receivedReactionsCount)
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.noteFavoritesCount }}</template>
+				<template #value>{{
+					number(stats.noteFavoritesCount)
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.followingCount }}</template>
+				<template #value>{{ number(stats.followingCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key
+					>{{ i18n.ts.followingCount }} ({{
+						i18n.ts.local
+					}})</template
+				>
+				<template #value>{{
+					number(stats.localFollowingCount)
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key
+					>{{ i18n.ts.followingCount }} ({{
+						i18n.ts.remote
+					}})</template
+				>
+				<template #value>{{
+					number(stats.remoteFollowingCount)
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.followersCount }}</template>
+				<template #value>{{ number(stats.followersCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key
+					>{{ i18n.ts.followersCount }} ({{
+						i18n.ts.local
+					}})</template
+				>
+				<template #value>{{
+					number(stats.localFollowersCount)
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key
+					>{{ i18n.ts.followersCount }} ({{
+						i18n.ts.remote
+					}})</template
+				>
+				<template #value>{{
+					number(stats.remoteFollowersCount)
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.pageLikesCount }}</template>
+				<template #value>{{ number(stats.pageLikesCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.pageLikedCount }}</template>
+				<template #value>{{ number(stats.pageLikedCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.driveFilesCount }}</template>
+				<template #value>{{ number(stats.driveFilesCount) }}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>{{ i18n.ts.driveUsage }}</template>
+				<template #value>{{ bytes(stats.driveUsage) }}</template>
+			</MkKeyValue>
+		</FormSection>
+
+		<FormSection>
+			<template #label>{{ i18n.ts.other }}</template>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>emailVerified</template>
+				<template #value>{{
+					$i.emailVerified ? i18n.ts.yes : i18n.ts.no
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>twoFactorEnabled</template>
+				<template #value>{{
+					$i.twoFactorEnabled ? i18n.ts.yes : i18n.ts.no
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>securityKeys</template>
+				<template #value>{{
+					$i.securityKeys ? i18n.ts.yes : i18n.ts.no
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>usePasswordLessLogin</template>
+				<template #value>{{
+					$i.usePasswordLessLogin ? i18n.ts.yes : i18n.ts.no
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>isModerator</template>
+				<template #value>{{
+					$i.isModerator ? i18n.ts.yes : i18n.ts.no
+				}}</template>
+			</MkKeyValue>
+			<MkKeyValue oneline style="margin: 1em 0">
+				<template #key>isAdmin</template>
+				<template #value>{{
+					$i.isAdmin ? i18n.ts.yes : i18n.ts.no
+				}}</template>
+			</MkKeyValue>
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
-import FormSection from '@/components/form/section.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import * as os from '@/os';
-import number from '@/filters/number';
-import bytes from '@/filters/bytes';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { onMounted, ref } from "vue";
+import FormSection from "@/components/form/section.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import * as os from "@/os";
+import number from "@/filters/number";
+import bytes from "@/filters/bytes";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const stats = ref<any>({});
 
 onMounted(() => {
-	os.api('users/stats', {
+	os.api("users/stats", {
 		userId: $i!.id,
-	}).then(response => {
+	}).then((response) => {
 		stats.value = response;
 	});
 });
@@ -153,6 +199,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.accountInfo,
-	icon: 'ph-info ph-bold ph-lg',
+	icon: "ph-info ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/accounts.vue b/packages/client/src/pages/settings/accounts.vue
index 3f90c4b33..ec2cd2477 100644
--- a/packages/client/src/pages/settings/accounts.vue
+++ b/packages/client/src/pages/settings/accounts.vue
@@ -1,73 +1,105 @@
 <template>
-<div class="_formRoot">
-	<FormSuspense :p="init">
-		<FormButton primary @click="addAccount"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.addAccount }}</FormButton>
+	<div class="_formRoot">
+		<FormSuspense :p="init">
+			<FormButton primary @click="addAccount"
+				><i class="ph-plus ph-bold ph-lg"></i>
+				{{ i18n.ts.addAccount }}</FormButton
+			>
 
-		<div v-for="account in accounts" :key="account.id" class="_panel _button lcjjdxlm" @click="menu(account, $event)">
-			<div class="avatar">
-				<MkAvatar :user="account" class="avatar"/>
-			</div>
-			<div class="body">
-				<div class="name">
-					<MkUserName :user="account"/>
+			<div
+				v-for="account in accounts"
+				:key="account.id"
+				class="_panel _button lcjjdxlm"
+				@click="menu(account, $event)"
+			>
+				<div class="avatar">
+					<MkAvatar :user="account" class="avatar" />
 				</div>
-				<div class="acct">
-					<MkAcct :user="account"/>
+				<div class="body">
+					<div class="name">
+						<MkUserName :user="account" />
+					</div>
+					<div class="acct">
+						<MkAcct :user="account" />
+					</div>
 				</div>
 			</div>
-		</div>
-	</FormSuspense>
-</div>
+		</FormSuspense>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, ref } from 'vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import FormButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { getAccounts, addAccount as addAccounts, removeAccount as _removeAccount, login, $i } from '@/account';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { defineAsyncComponent, ref } from "vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import FormButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import {
+	getAccounts,
+	addAccount as addAccounts,
+	removeAccount as _removeAccount,
+	login,
+	$i,
+} from "@/account";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const storedAccounts = ref<any>(null);
 const accounts = ref<any>(null);
 
 const init = async () => {
-	getAccounts().then(accounts => {
-		storedAccounts.value = accounts.filter(x => x.id !== $i!.id);
+	getAccounts()
+		.then((accounts) => {
+			storedAccounts.value = accounts.filter((x) => x.id !== $i!.id);
 
-		console.log(storedAccounts.value);
+			console.log(storedAccounts.value);
 
-		return os.api('users/show', {
-			userIds: storedAccounts.value.map(x => x.id),
+			return os.api("users/show", {
+				userIds: storedAccounts.value.map((x) => x.id),
+			});
+		})
+		.then((response) => {
+			accounts.value = response;
+			console.log(accounts.value);
 		});
-	}).then(response => {
-		accounts.value = response;
-		console.log(accounts.value);
-	});
 };
 
 function menu(account, ev) {
-	os.popupMenu([{
-		text: i18n.ts.switch,
-		icon: 'ph-swap ph-bold ph-lg',
-		action: () => switchAccount(account),
-	}, {
-		text: i18n.ts.remove,
-		icon: 'ph-trash ph-bold ph-lg',
-		danger: true,
-		action: () => removeAccount(account),
-	}], ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts.switch,
+				icon: "ph-swap ph-bold ph-lg",
+				action: () => switchAccount(account),
+			},
+			{
+				text: i18n.ts.remove,
+				icon: "ph-trash ph-bold ph-lg",
+				danger: true,
+				action: () => removeAccount(account),
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
 }
 
 function addAccount(ev) {
-	os.popupMenu([{
-		text: i18n.ts.existingAccount,
-		action: () => { addExistingAccount(); },
-	}, {
-		text: i18n.ts.createAccount,
-		action: () => { createAccount(); },
-	}], ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts.existingAccount,
+				action: () => {
+					addExistingAccount();
+				},
+			},
+			{
+				text: i18n.ts.createAccount,
+				action: () => {
+					createAccount();
+				},
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
 }
 
 function removeAccount(account) {
@@ -75,26 +107,36 @@ function removeAccount(account) {
 }
 
 function addExistingAccount() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {}, {
-		done: res => {
-			addAccounts(res.id, res.i);
-			os.success();
+	os.popup(
+		defineAsyncComponent(() => import("@/components/MkSigninDialog.vue")),
+		{},
+		{
+			done: (res) => {
+				addAccounts(res.id, res.i);
+				os.success();
+			},
 		},
-	}, 'closed');
+		"closed"
+	);
 }
 
 function createAccount() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkSignupDialog.vue')), {}, {
-		done: res => {
-			addAccounts(res.id, res.i);
-			switchAccountWithToken(res.i);
+	os.popup(
+		defineAsyncComponent(() => import("@/components/MkSignupDialog.vue")),
+		{},
+		{
+			done: (res) => {
+				addAccounts(res.id, res.i);
+				switchAccountWithToken(res.i);
+			},
 		},
-	}, 'closed');
+		"closed"
+	);
 }
 
 async function switchAccount(account: any) {
 	const fetchedAccounts: any[] = await getAccounts();
-	const token = fetchedAccounts.find(x => x.id === account.id).token;
+	const token = fetchedAccounts.find((x) => x.id === account.id).token;
 	switchAccountWithToken(token);
 }
 
@@ -108,7 +150,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.accounts,
-	icon: 'ph-users ph-bold ph-lg',
+	icon: "ph-users ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/api.vue b/packages/client/src/pages/settings/api.vue
index 0c3cd38f5..a694c456f 100644
--- a/packages/client/src/pages/settings/api.vue
+++ b/packages/client/src/pages/settings/api.vue
@@ -1,38 +1,54 @@
 <template>
-<div class="_formRoot">
-	<FormButton primary class="_formBlock" @click="generateToken">{{ i18n.ts.generateAccessToken }}</FormButton>
-	<FormLink to="/settings/apps" class="_formBlock">{{ i18n.ts.manageAccessTokens }}</FormLink>
-	<FormLink to="/api-console" :behavior="isDesktop ? 'window' : null" class="_formBlock">API console</FormLink>
-</div>
+	<div class="_formRoot">
+		<FormButton primary class="_formBlock" @click="generateToken">{{
+			i18n.ts.generateAccessToken
+		}}</FormButton>
+		<FormLink to="/settings/apps" class="_formBlock">{{
+			i18n.ts.manageAccessTokens
+		}}</FormLink>
+		<FormLink
+			to="/api-console"
+			:behavior="isDesktop ? 'window' : null"
+			class="_formBlock"
+			>API console</FormLink
+		>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, ref } from 'vue';
-import FormLink from '@/components/form/link.vue';
-import FormButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { defineAsyncComponent, ref } from "vue";
+import FormLink from "@/components/form/link.vue";
+import FormButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const isDesktop = ref(window.innerWidth >= 1100);
 
 function generateToken() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkTokenGenerateWindow.vue')), {}, {
-		done: async result => {
-			const { name, permissions } = result;
-			const { token } = await os.api('miauth/gen-token', {
-				session: null,
-				name: name,
-				permission: permissions,
-			});
+	os.popup(
+		defineAsyncComponent(
+			() => import("@/components/MkTokenGenerateWindow.vue")
+		),
+		{},
+		{
+			done: async (result) => {
+				const { name, permissions } = result;
+				const { token } = await os.api("miauth/gen-token", {
+					session: null,
+					name: name,
+					permission: permissions,
+				});
 
-			os.alert({
-				type: 'success',
-				title: i18n.ts.token,
-				text: token,
-			});
+				os.alert({
+					type: "success",
+					title: i18n.ts.token,
+					text: token,
+				});
+			},
 		},
-	}, 'closed');
+		"closed"
+	);
 }
 
 const headerActions = $computed(() => []);
@@ -40,7 +56,7 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
-	title: 'API',
-	icon: 'ph-key ph-bold ph-lg',
+	title: "API",
+	icon: "ph-key ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/apps.vue b/packages/client/src/pages/settings/apps.vue
index 608200c82..f42bb77ba 100644
--- a/packages/client/src/pages/settings/apps.vue
+++ b/packages/client/src/pages/settings/apps.vue
@@ -1,61 +1,78 @@
 <template>
-<div class="_formRoot">
-	<FormPagination ref="list" :pagination="pagination">
-		<template #empty>
-			<div class="_fullinfo">
-				<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>
-				<div>{{ i18n.ts.nothing }}</div>
-			</div>
-		</template>
-		<template #default="{items}">
-			<div v-for="token in items" :key="token.id" class="_panel bfomjevm">
-				<img v-if="token.iconUrl" class="icon" :src="token.iconUrl" alt=""/>
-				<div class="body">
-					<div class="name">{{ token.name }}</div>
-					<div class="description">{{ token.description }}</div>
-					<div class="_keyValue">
-						<div>{{ i18n.ts.installedDate }}:</div>
-						<div><MkTime :time="token.createdAt"/></div>
-					</div>
-					<div class="_keyValue">
-						<div>{{ i18n.ts.lastUsedDate }}:</div>
-						<div><MkTime :time="token.lastUsedAt"/></div>
-					</div>
-					<div class="actions">
-						<button class="_button" @click="revoke(token)"><i class="ph-trash ph-bold ph-lg"></i></button>
-					</div>
-					<details>
-						<summary>{{ i18n.ts.details }}</summary>
-						<ul>
-							<li v-for="p in token.permission" :key="p">{{ i18n.t(`_permissions.${p}`) }}</li>
-						</ul>
-					</details>
+	<div class="_formRoot">
+		<FormPagination ref="list" :pagination="pagination">
+			<template #empty>
+				<div class="_fullinfo">
+					<img
+						src="/static-assets/badges/info.png"
+						class="_ghost"
+						alt="Info"
+					/>
+					<div>{{ i18n.ts.nothing }}</div>
 				</div>
-			</div>
-		</template>
-	</FormPagination>
-</div>
+			</template>
+			<template #default="{ items }">
+				<div
+					v-for="token in items"
+					:key="token.id"
+					class="_panel bfomjevm"
+				>
+					<img
+						v-if="token.iconUrl"
+						class="icon"
+						:src="token.iconUrl"
+						alt=""
+					/>
+					<div class="body">
+						<div class="name">{{ token.name }}</div>
+						<div class="description">{{ token.description }}</div>
+						<div class="_keyValue">
+							<div>{{ i18n.ts.installedDate }}:</div>
+							<div><MkTime :time="token.createdAt" /></div>
+						</div>
+						<div class="_keyValue">
+							<div>{{ i18n.ts.lastUsedDate }}:</div>
+							<div><MkTime :time="token.lastUsedAt" /></div>
+						</div>
+						<div class="actions">
+							<button class="_button" @click="revoke(token)">
+								<i class="ph-trash ph-bold ph-lg"></i>
+							</button>
+						</div>
+						<details>
+							<summary>{{ i18n.ts.details }}</summary>
+							<ul>
+								<li v-for="p in token.permission" :key="p">
+									{{ i18n.t(`_permissions.${p}`) }}
+								</li>
+							</ul>
+						</details>
+					</div>
+				</div>
+			</template>
+		</FormPagination>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import FormPagination from '@/components/MkPagination.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { ref } from "vue";
+import FormPagination from "@/components/MkPagination.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const list = ref<any>(null);
 
 const pagination = {
-	endpoint: 'i/apps' as const,
+	endpoint: "i/apps" as const,
 	limit: 100,
 	params: {
-		sort: '+lastUsedAt',
+		sort: "+lastUsedAt",
 	},
 };
 
 function revoke(token) {
-	os.api('i/revoke-token', { tokenId: token.id }).then(() => {
+	os.api("i/revoke-token", { tokenId: token.id }).then(() => {
 		list.value.reload();
 	});
 }
@@ -66,7 +83,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.installedApps,
-	icon: 'ph-plug ph-bold ph-lg',
+	icon: "ph-plug ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/custom-css.vue b/packages/client/src/pages/settings/custom-css.vue
index fe24de237..e24ff33a9 100644
--- a/packages/client/src/pages/settings/custom-css.vue
+++ b/packages/client/src/pages/settings/custom-css.vue
@@ -1,29 +1,35 @@
 <template>
-<div class="_formRoot">
-	<FormInfo warn class="_formBlock">{{ i18n.ts.customCssWarn }}</FormInfo>
+	<div class="_formRoot">
+		<FormInfo warn class="_formBlock">{{ i18n.ts.customCssWarn }}</FormInfo>
 
-	<FormTextarea v-model="localCustomCss" manual-save tall class="_monospace _formBlock" style="tab-size: 2;">
-		<template #label>CSS</template>
-	</FormTextarea>
-</div>
+		<FormTextarea
+			v-model="localCustomCss"
+			manual-save
+			tall
+			class="_monospace _formBlock"
+			style="tab-size: 2"
+		>
+			<template #label>CSS</template>
+		</FormTextarea>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormInfo from '@/components/MkInfo.vue';
-import * as os from '@/os';
-import { unisonReload } from '@/scripts/unison-reload';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { ref, watch } from "vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormInfo from "@/components/MkInfo.vue";
+import * as os from "@/os";
+import { unisonReload } from "@/scripts/unison-reload";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const localCustomCss = ref(localStorage.getItem('customCss') ?? '');
+const localCustomCss = ref(localStorage.getItem("customCss") ?? "");
 
 async function apply() {
-	localStorage.setItem('customCss', localCustomCss.value);
+	localStorage.setItem("customCss", localCustomCss.value);
 
 	const { canceled } = await os.confirm({
-		type: 'info',
+		type: "info",
 		text: i18n.ts.reloadToApplySetting,
 	});
 	if (canceled) return;
@@ -41,6 +47,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.customCss,
-	icon: 'ph-code ph-bold ph-lg',
+	icon: "ph-code ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/custom-katex-macro.vue b/packages/client/src/pages/settings/custom-katex-macro.vue
index e572ab6a7..88a8e2cae 100644
--- a/packages/client/src/pages/settings/custom-katex-macro.vue
+++ b/packages/client/src/pages/settings/custom-katex-macro.vue
@@ -1,36 +1,53 @@
 <template>
-<div class="_formRoot">
-	<FormInfo class="_formBlock">{{ i18n.ts.customKaTeXMacroDescription }}</FormInfo>
+	<div class="_formRoot">
+		<FormInfo class="_formBlock">{{
+			i18n.ts.customKaTeXMacroDescription
+		}}</FormInfo>
 
-	<FormTextarea v-model="localCustomKaTeXMacro" manual-save tall class="_monospace _formBlock" style="tab-size: 2;">
-		<template #label>{{ i18n.ts.customKaTeXMacro }}</template>
-	</FormTextarea>
+		<FormTextarea
+			v-model="localCustomKaTeXMacro"
+			manual-save
+			tall
+			class="_monospace _formBlock"
+			style="tab-size: 2"
+		>
+			<template #label>{{ i18n.ts.customKaTeXMacro }}</template>
+		</FormTextarea>
 
-	<FormSwitch v-model="enableCustomKaTeXMacro" class="_formBlock">{{ i18n.ts.enableCustomKaTeXMacro }}</FormSwitch>
-</div>
+		<FormSwitch v-model="enableCustomKaTeXMacro" class="_formBlock">{{
+			i18n.ts.enableCustomKaTeXMacro
+		}}</FormSwitch>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch, computed } from 'vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormInfo from '@/components/MkInfo.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import * as os from '@/os';
-import { unisonReload } from '@/scripts/unison-reload';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { parseKaTeXMacros } from '@/scripts/katex-macro';
-import { defaultStore } from '@/store';
+import { ref, watch, computed } from "vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormInfo from "@/components/MkInfo.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import * as os from "@/os";
+import { unisonReload } from "@/scripts/unison-reload";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { parseKaTeXMacros } from "@/scripts/katex-macro";
+import { defaultStore } from "@/store";
 
-const localCustomKaTeXMacro = ref(localStorage.getItem('customKaTeXMacro') ?? '');
-const enableCustomKaTeXMacro = computed(defaultStore.makeGetterSetter('enableCustomKaTeXMacro'));
+const localCustomKaTeXMacro = ref(
+	localStorage.getItem("customKaTeXMacro") ?? ""
+);
+const enableCustomKaTeXMacro = computed(
+	defaultStore.makeGetterSetter("enableCustomKaTeXMacro")
+);
 
 async function apply() {
-	localStorage.setItem('customKaTeXMacro', localCustomKaTeXMacro.value);
-	localStorage.setItem('customKaTeXMacroParsed', parseKaTeXMacros(localCustomKaTeXMacro.value));
+	localStorage.setItem("customKaTeXMacro", localCustomKaTeXMacro.value);
+	localStorage.setItem(
+		"customKaTeXMacroParsed",
+		parseKaTeXMacros(localCustomKaTeXMacro.value)
+	);
 
 	const { canceled } = await os.confirm({
-		type: 'info',
+		type: "info",
 		text: i18n.ts.reloadToApplySetting,
 	});
 	if (canceled) return;
@@ -48,6 +65,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.customKaTeXMacro,
-	icon: 'ph-radical ph-bold ph-lg',
+	icon: "ph-radical ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/deck.vue b/packages/client/src/pages/settings/deck.vue
index aa44985dd..821c5ed07 100644
--- a/packages/client/src/pages/settings/deck.vue
+++ b/packages/client/src/pages/settings/deck.vue
@@ -1,32 +1,39 @@
 <template>
-<div class="_formRoot">
-	<FormSwitch v-model="navWindow">{{ i18n.ts.defaultNavigationBehaviour }}: {{ i18n.ts.openInWindow }}</FormSwitch>
+	<div class="_formRoot">
+		<FormSwitch v-model="navWindow"
+			>{{ i18n.ts.defaultNavigationBehaviour }}:
+			{{ i18n.ts.openInWindow }}</FormSwitch
+		>
 
-	<FormSwitch v-model="alwaysShowMainColumn" class="_formBlock">{{ i18n.ts._deck.alwaysShowMainColumn }}</FormSwitch>
+		<FormSwitch v-model="alwaysShowMainColumn" class="_formBlock">{{
+			i18n.ts._deck.alwaysShowMainColumn
+		}}</FormSwitch>
 
-	<FormRadios v-model="columnAlign" class="_formBlock">
-		<template #label>{{ i18n.ts._deck.columnAlign }}</template>
-		<option value="left">{{ i18n.ts.left }}</option>
-		<option value="center">{{ i18n.ts.center }}</option>
-	</FormRadios>
-</div>
+		<FormRadios v-model="columnAlign" class="_formBlock">
+			<template #label>{{ i18n.ts._deck.columnAlign }}</template>
+			<option value="left">{{ i18n.ts.left }}</option>
+			<option value="center">{{ i18n.ts.center }}</option>
+		</FormRadios>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch } from 'vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormLink from '@/components/form/link.vue';
-import FormRadios from '@/components/form/radios.vue';
-import FormInput from '@/components/form/input.vue';
-import { deckStore } from '@/ui/deck/deck-store';
-import * as os from '@/os';
-import { unisonReload } from '@/scripts/unison-reload';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, watch } from "vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormLink from "@/components/form/link.vue";
+import FormRadios from "@/components/form/radios.vue";
+import FormInput from "@/components/form/input.vue";
+import { deckStore } from "@/ui/deck/deck-store";
+import * as os from "@/os";
+import { unisonReload } from "@/scripts/unison-reload";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const navWindow = computed(deckStore.makeGetterSetter('navWindow'));
-const alwaysShowMainColumn = computed(deckStore.makeGetterSetter('alwaysShowMainColumn'));
-const columnAlign = computed(deckStore.makeGetterSetter('columnAlign'));
+const navWindow = computed(deckStore.makeGetterSetter("navWindow"));
+const alwaysShowMainColumn = computed(
+	deckStore.makeGetterSetter("alwaysShowMainColumn")
+);
+const columnAlign = computed(deckStore.makeGetterSetter("columnAlign"));
 
 const headerActions = $computed(() => []);
 
@@ -34,6 +41,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.deck,
-	icon: 'ph-layout ph-bold ph-lg',
+	icon: "ph-layout ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/delete-account.vue b/packages/client/src/pages/settings/delete-account.vue
index 044219f43..574806c08 100644
--- a/packages/client/src/pages/settings/delete-account.vue
+++ b/packages/client/src/pages/settings/delete-account.vue
@@ -1,24 +1,36 @@
 <template>
-<div class="_formRoot">
-	<FormInfo warn class="_formBlock">{{ i18n.ts._accountDelete.mayTakeTime }}</FormInfo>
-	<FormInfo class="_formBlock">{{ i18n.ts._accountDelete.sendEmail }}</FormInfo>
-	<FormButton v-if="!$i.isDeleted" danger class="_formBlock" @click="deleteAccount">{{ i18n.ts._accountDelete.requestAccountDelete }}</FormButton>
-	<FormButton v-else disabled>{{ i18n.ts._accountDelete.inProgress }}</FormButton>
-</div>
+	<div class="_formRoot">
+		<FormInfo warn class="_formBlock">{{
+			i18n.ts._accountDelete.mayTakeTime
+		}}</FormInfo>
+		<FormInfo class="_formBlock">{{
+			i18n.ts._accountDelete.sendEmail
+		}}</FormInfo>
+		<FormButton
+			v-if="!$i.isDeleted"
+			danger
+			class="_formBlock"
+			@click="deleteAccount"
+			>{{ i18n.ts._accountDelete.requestAccountDelete }}</FormButton
+		>
+		<FormButton v-else disabled>{{
+			i18n.ts._accountDelete.inProgress
+		}}</FormButton>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import FormInfo from '@/components/MkInfo.vue';
-import FormButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { signout } from '@/account';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import FormInfo from "@/components/MkInfo.vue";
+import FormButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { signout } from "@/account";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 async function deleteAccount() {
 	{
 		const { canceled } = await os.confirm({
-			type: 'warning',
+			type: "warning",
 			text: i18n.ts.deleteAccountConfirm,
 		});
 		if (canceled) return;
@@ -26,11 +38,11 @@ async function deleteAccount() {
 
 	const { canceled, result: password } = await os.inputText({
 		title: i18n.ts.password,
-		type: 'password',
+		type: "password",
 	});
 	if (canceled) return;
 
-	await os.apiWithDialog('i/delete-account', {
+	await os.apiWithDialog("i/delete-account", {
 		password: password,
 	});
 
@@ -47,6 +59,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts._accountDelete.accountDelete,
-	icon: 'ph-warning ph-bold ph-lg',
+	icon: "ph-warning ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/drive.vue b/packages/client/src/pages/settings/drive.vue
index a0c944dcc..42961fdbe 100644
--- a/packages/client/src/pages/settings/drive.vue
+++ b/packages/client/src/pages/settings/drive.vue
@@ -1,64 +1,92 @@
 <template>
-<div class="_formRoot">
-	<FormSection v-if="!fetching">
-		<template #label>{{ i18n.ts.usageAmount }}</template>
-		<div class="_formBlock uawsfosz">
-			<div class="meter"><div :style="meterStyle"></div></div>
-		</div>
-		<FormSplit>
-			<MkKeyValue class="_formBlock">
-				<template #key>{{ i18n.ts.capacity }}</template>
-				<template #value>{{ bytes(capacity, 1) }}</template>
-			</MkKeyValue>
-			<MkKeyValue class="_formBlock">
-				<template #key>{{ i18n.ts.inUse }}</template>
-				<template #value>{{ bytes(usage, 1) }}</template>
-			</MkKeyValue>
-		</FormSplit>
-	</FormSection>
+	<div class="_formRoot">
+		<FormSection v-if="!fetching">
+			<template #label>{{ i18n.ts.usageAmount }}</template>
+			<div class="_formBlock uawsfosz">
+				<div class="meter"><div :style="meterStyle"></div></div>
+			</div>
+			<FormSplit>
+				<MkKeyValue class="_formBlock">
+					<template #key>{{ i18n.ts.capacity }}</template>
+					<template #value>{{ bytes(capacity, 1) }}</template>
+				</MkKeyValue>
+				<MkKeyValue class="_formBlock">
+					<template #key>{{ i18n.ts.inUse }}</template>
+					<template #value>{{ bytes(usage, 1) }}</template>
+				</MkKeyValue>
+			</FormSplit>
+		</FormSection>
 
-	<FormSection>
-		<template #label>{{ i18n.ts.statistics }}</template>
-		<MkChart src="per-user-drive" :args="{ user: $i }" span="day" :limit="7 * 5" :bar="true" :stacked="true" :detailed="false" :aspect-ratio="6"/>
-	</FormSection>
+		<FormSection>
+			<template #label>{{ i18n.ts.statistics }}</template>
+			<MkChart
+				src="per-user-drive"
+				:args="{ user: $i }"
+				span="day"
+				:limit="7 * 5"
+				:bar="true"
+				:stacked="true"
+				:detailed="false"
+				:aspect-ratio="6"
+			/>
+		</FormSection>
 
-	<FormSection>
-		<FormButton @click="chooseUploadFolder()">
-			{{ i18n.ts.uploadFolder }}
-			<template #suffix>{{ uploadFolder ? uploadFolder.name : '-' }}</template>
-			<template #suffixIcon><i class="ph-folder-notch-open ph-bold ph-lg"></i></template>
-		</FormButton>
-		<FormSwitch v-model="keepOriginalUploading" class="_formBlock">
-			<template #label>{{ i18n.ts.keepOriginalUploading }}</template>
-			<template #caption>{{ i18n.ts.keepOriginalUploadingDescription }}</template>
-		</FormSwitch>
-		<FormSwitch v-model="alwaysMarkNsfw" class="_formBlock" @update:modelValue="saveProfile()">
-			<template #label>{{ i18n.ts.alwaysMarkSensitive }}</template>
-		</FormSwitch>
-		<FormSwitch v-model="autoSensitive" class="_formBlock" @update:modelValue="saveProfile()">
-			<template #label>{{ i18n.ts.enableAutoSensitive }}<span class="_beta">{{ i18n.ts.beta }}</span></template>
-			<template #caption>{{ i18n.ts.enableAutoSensitiveDescription }}</template>
-		</FormSwitch>
-	</FormSection>
-</div>
+		<FormSection>
+			<FormButton @click="chooseUploadFolder()">
+				{{ i18n.ts.uploadFolder }}
+				<template #suffix>{{
+					uploadFolder ? uploadFolder.name : "-"
+				}}</template>
+				<template #suffixIcon
+					><i class="ph-folder-notch-open ph-bold ph-lg"></i
+				></template>
+			</FormButton>
+			<FormSwitch v-model="keepOriginalUploading" class="_formBlock">
+				<template #label>{{ i18n.ts.keepOriginalUploading }}</template>
+				<template #caption>{{
+					i18n.ts.keepOriginalUploadingDescription
+				}}</template>
+			</FormSwitch>
+			<FormSwitch
+				v-model="alwaysMarkNsfw"
+				class="_formBlock"
+				@update:modelValue="saveProfile()"
+			>
+				<template #label>{{ i18n.ts.alwaysMarkSensitive }}</template>
+			</FormSwitch>
+			<FormSwitch
+				v-model="autoSensitive"
+				class="_formBlock"
+				@update:modelValue="saveProfile()"
+			>
+				<template #label
+					>{{ i18n.ts.enableAutoSensitive
+					}}<span class="_beta">{{ i18n.ts.beta }}</span></template
+				>
+				<template #caption>{{
+					i18n.ts.enableAutoSensitiveDescription
+				}}</template>
+			</FormSwitch>
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
-import tinycolor from 'tinycolor2';
-import FormLink from '@/components/form/link.vue';
-import FormButton from '@/components/MkButton.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormSection from '@/components/form/section.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import FormSplit from '@/components/form/split.vue';
-import * as os from '@/os';
-import bytes from '@/filters/bytes';
-import { defaultStore } from '@/store';
-import MkChart from '@/components/MkChart.vue';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { $i } from '@/account';
+import { computed, ref } from "vue";
+import tinycolor from "tinycolor2";
+import FormLink from "@/components/form/link.vue";
+import FormButton from "@/components/MkButton.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormSection from "@/components/form/section.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import FormSplit from "@/components/form/split.vue";
+import * as os from "@/os";
+import bytes from "@/filters/bytes";
+import { defaultStore } from "@/store";
+import MkChart from "@/components/MkChart.vue";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { $i } from "@/account";
 
 const fetching = ref(true);
 const usage = ref<any>(null);
@@ -69,37 +97,39 @@ let autoSensitive = $ref($i.autoSensitive);
 
 const meterStyle = computed(() => {
 	return {
-		width: `${usage.value / capacity.value * 100}%`,
+		width: `${(usage.value / capacity.value) * 100}%`,
 		background: tinycolor({
-			h: 180 - (usage.value / capacity.value * 180),
+			h: 180 - (usage.value / capacity.value) * 180,
 			s: 0.7,
 			l: 0.5,
 		}),
 	};
 });
 
-const keepOriginalUploading = computed(defaultStore.makeGetterSetter('keepOriginalUploading'));
+const keepOriginalUploading = computed(
+	defaultStore.makeGetterSetter("keepOriginalUploading")
+);
 
-os.api('drive').then(info => {
+os.api("drive").then((info) => {
 	capacity.value = info.capacity;
 	usage.value = info.usage;
 	fetching.value = false;
 });
 
 if (defaultStore.state.uploadFolder) {
-	os.api('drive/folders/show', {
+	os.api("drive/folders/show", {
 		folderId: defaultStore.state.uploadFolder,
-	}).then(response => {
+	}).then((response) => {
 		uploadFolder.value = response;
 	});
 }
 
 function chooseUploadFolder() {
-	os.selectDriveFolder(false).then(async folder => {
-		defaultStore.set('uploadFolder', folder ? folder.id : null);
+	os.selectDriveFolder(false).then(async (folder) => {
+		defaultStore.set("uploadFolder", folder ? folder.id : null);
 		os.success();
 		if (defaultStore.state.uploadFolder) {
-			uploadFolder.value = await os.api('drive/folders/show', {
+			uploadFolder.value = await os.api("drive/folders/show", {
 				folderId: defaultStore.state.uploadFolder,
 			});
 		} else {
@@ -109,7 +139,7 @@ function chooseUploadFolder() {
 }
 
 function saveProfile() {
-	os.api('i/update', {
+	os.api("i/update", {
 		alwaysMarkNsfw: !!alwaysMarkNsfw,
 		autoSensitive: !!autoSensitive,
 	});
@@ -121,16 +151,14 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.drive,
-	icon: 'ph-cloud ph-bold ph-lg',
+	icon: "ph-cloud ph-bold ph-lg",
 });
 </script>
 
 <style lang="scss" scoped>
-
 @use "sass:math";
 
 .uawsfosz {
-
 	> .meter {
 		$size: 12px;
 		background: rgba(0, 0, 0, 0.1);
diff --git a/packages/client/src/pages/settings/email.vue b/packages/client/src/pages/settings/email.vue
index bd8b76e6d..fef21c1f5 100644
--- a/packages/client/src/pages/settings/email.vue
+++ b/packages/client/src/pages/settings/email.vue
@@ -1,58 +1,79 @@
 <template>
-<div class="_formRoot">
-	<FormSection>
-		<template #label>{{ i18n.ts.emailAddress }}</template>
-		<FormInput v-model="emailAddress" type="email" manual-save>
-			<template #prefix><i class="ph-envelope-simple-open ph-bold ph-lg"></i></template>
-			<template v-if="$i.email && !$i.emailVerified" #caption>{{ i18n.ts.verificationEmailSent }}</template>
-			<template v-else-if="emailAddress === $i.email && $i.emailVerified" #caption><i class="ph-check ph-bold ph-lg" style="color: var(--success);"></i> {{ i18n.ts.emailVerified }}</template>
-		</FormInput>
-	</FormSection>
+	<div class="_formRoot">
+		<FormSection>
+			<template #label>{{ i18n.ts.emailAddress }}</template>
+			<FormInput v-model="emailAddress" type="email" manual-save>
+				<template #prefix
+					><i class="ph-envelope-simple-open ph-bold ph-lg"></i
+				></template>
+				<template v-if="$i.email && !$i.emailVerified" #caption>{{
+					i18n.ts.verificationEmailSent
+				}}</template>
+				<template
+					v-else-if="emailAddress === $i.email && $i.emailVerified"
+					#caption
+					><i
+						class="ph-check ph-bold ph-lg"
+						style="color: var(--success)"
+					></i>
+					{{ i18n.ts.emailVerified }}</template
+				>
+			</FormInput>
+		</FormSection>
 
-	<FormSection>
-		<FormSwitch :model-value="$i.receiveAnnouncementEmail" @update:modelValue="onChangeReceiveAnnouncementEmail">
-			{{ i18n.ts.receiveAnnouncementFromInstance }}
-		</FormSwitch>
-	</FormSection>
+		<FormSection>
+			<FormSwitch
+				:model-value="$i.receiveAnnouncementEmail"
+				@update:modelValue="onChangeReceiveAnnouncementEmail"
+			>
+				{{ i18n.ts.receiveAnnouncementFromInstance }}
+			</FormSwitch>
+		</FormSection>
 
-	<FormSection>
-		<template #label>{{ i18n.ts.emailNotification }}</template>
-		<FormSwitch v-model="emailNotification_mention" class="_formBlock">
-			{{ i18n.ts._notification._types.mention }}
-		</FormSwitch>
-		<FormSwitch v-model="emailNotification_reply" class="_formBlock">
-			{{ i18n.ts._notification._types.reply }}
-		</FormSwitch>
-		<FormSwitch v-model="emailNotification_quote" class="_formBlock">
-			{{ i18n.ts._notification._types.quote }}
-		</FormSwitch>
-		<FormSwitch v-model="emailNotification_follow" class="_formBlock">
-			{{ i18n.ts._notification._types.follow }}
-		</FormSwitch>
-		<FormSwitch v-model="emailNotification_receiveFollowRequest" class="_formBlock">
-			{{ i18n.ts._notification._types.receiveFollowRequest }}
-		</FormSwitch>
-		<FormSwitch v-model="emailNotification_groupInvited" class="_formBlock">
-			{{ i18n.ts._notification._types.groupInvited }}
-		</FormSwitch>
-	</FormSection>
-</div>
+		<FormSection>
+			<template #label>{{ i18n.ts.emailNotification }}</template>
+			<FormSwitch v-model="emailNotification_mention" class="_formBlock">
+				{{ i18n.ts._notification._types.mention }}
+			</FormSwitch>
+			<FormSwitch v-model="emailNotification_reply" class="_formBlock">
+				{{ i18n.ts._notification._types.reply }}
+			</FormSwitch>
+			<FormSwitch v-model="emailNotification_quote" class="_formBlock">
+				{{ i18n.ts._notification._types.quote }}
+			</FormSwitch>
+			<FormSwitch v-model="emailNotification_follow" class="_formBlock">
+				{{ i18n.ts._notification._types.follow }}
+			</FormSwitch>
+			<FormSwitch
+				v-model="emailNotification_receiveFollowRequest"
+				class="_formBlock"
+			>
+				{{ i18n.ts._notification._types.receiveFollowRequest }}
+			</FormSwitch>
+			<FormSwitch
+				v-model="emailNotification_groupInvited"
+				class="_formBlock"
+			>
+				{{ i18n.ts._notification._types.groupInvited }}
+			</FormSwitch>
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, watch } from 'vue';
-import FormSection from '@/components/form/section.vue';
-import FormInput from '@/components/form/input.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import * as os from '@/os';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { onMounted, ref, watch } from "vue";
+import FormSection from "@/components/form/section.vue";
+import FormInput from "@/components/form/input.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import * as os from "@/os";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const emailAddress = ref($i!.email);
 
 const onChangeReceiveAnnouncementEmail = (v) => {
-	os.api('i/update', {
+	os.api("i/update", {
 		receiveAnnouncementEmail: v,
 	});
 };
@@ -60,39 +81,65 @@ const onChangeReceiveAnnouncementEmail = (v) => {
 const saveEmailAddress = () => {
 	os.inputText({
 		title: i18n.ts.password,
-		type: 'password',
+		type: "password",
 	}).then(({ canceled, result: password }) => {
 		if (canceled) return;
-		os.apiWithDialog('i/update-email', {
+		os.apiWithDialog("i/update-email", {
 			password: password,
 			email: emailAddress.value,
 		});
 	});
 };
 
-const emailNotification_mention = ref($i!.emailNotificationTypes.includes('mention'));
-const emailNotification_reply = ref($i!.emailNotificationTypes.includes('reply'));
-const emailNotification_quote = ref($i!.emailNotificationTypes.includes('quote'));
-const emailNotification_follow = ref($i!.emailNotificationTypes.includes('follow'));
-const emailNotification_receiveFollowRequest = ref($i!.emailNotificationTypes.includes('receiveFollowRequest'));
-const emailNotification_groupInvited = ref($i!.emailNotificationTypes.includes('groupInvited'));
+const emailNotification_mention = ref(
+	$i!.emailNotificationTypes.includes("mention")
+);
+const emailNotification_reply = ref(
+	$i!.emailNotificationTypes.includes("reply")
+);
+const emailNotification_quote = ref(
+	$i!.emailNotificationTypes.includes("quote")
+);
+const emailNotification_follow = ref(
+	$i!.emailNotificationTypes.includes("follow")
+);
+const emailNotification_receiveFollowRequest = ref(
+	$i!.emailNotificationTypes.includes("receiveFollowRequest")
+);
+const emailNotification_groupInvited = ref(
+	$i!.emailNotificationTypes.includes("groupInvited")
+);
 
 const saveNotificationSettings = () => {
-	os.api('i/update', {
+	os.api("i/update", {
 		emailNotificationTypes: [
-			...[emailNotification_mention.value ? 'mention' : null],
-			...[emailNotification_reply.value ? 'reply' : null],
-			...[emailNotification_quote.value ? 'quote' : null],
-			...[emailNotification_follow.value ? 'follow' : null],
-			...[emailNotification_receiveFollowRequest.value ? 'receiveFollowRequest' : null],
-			...[emailNotification_groupInvited.value ? 'groupInvited' : null],
-		].filter(x => x != null),
+			...[emailNotification_mention.value ? "mention" : null],
+			...[emailNotification_reply.value ? "reply" : null],
+			...[emailNotification_quote.value ? "quote" : null],
+			...[emailNotification_follow.value ? "follow" : null],
+			...[
+				emailNotification_receiveFollowRequest.value
+					? "receiveFollowRequest"
+					: null,
+			],
+			...[emailNotification_groupInvited.value ? "groupInvited" : null],
+		].filter((x) => x != null),
 	});
 };
 
-watch([emailNotification_mention, emailNotification_reply, emailNotification_quote, emailNotification_follow, emailNotification_receiveFollowRequest, emailNotification_groupInvited], () => {
-	saveNotificationSettings();
-});
+watch(
+	[
+		emailNotification_mention,
+		emailNotification_reply,
+		emailNotification_quote,
+		emailNotification_follow,
+		emailNotification_receiveFollowRequest,
+		emailNotification_groupInvited,
+	],
+	() => {
+		saveNotificationSettings();
+	}
+);
 
 onMounted(() => {
 	watch(emailAddress, () => {
@@ -106,6 +153,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.email,
-	icon: 'ph-envelope-simple-open ph-bold ph-lg',
+	icon: "ph-envelope-simple-open ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index bef23a15e..b8cdb3fd9 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -1,132 +1,235 @@
 <template>
-<div class="_formRoot">
-	<FormSelect v-model="lang" class="_formBlock">
-		<template #label>{{ i18n.ts.uiLanguage }}</template>
-		<option v-for="x in langs" :key="x[0]" :value="x[0]">{{ x[1] }}</option>
-		<template #caption>
-			<I18n :src="i18n.ts.i18nInfo" tag="span">
-				<template #link>
-					<MkLink url="https://hosted.weblate.org/engage/calckey/">Weblate</MkLink>
-				</template>
-			</I18n>
-		</template>
-	</FormSelect>
-
-	<FormRadios v-model="overridedDeviceKind" class="_formBlock">
-		<template #label>{{ i18n.ts.overridedDeviceKind }}</template>
-		<option :value="null">{{ i18n.ts.auto }}</option>
-		<option value="smartphone"><i class="ph-device-mobile ph-bold ph-lg"/> {{ i18n.ts.smartphone }}</option>
-		<option value="tablet"><i class="ph-device-tablet ph-bold ph-lg"/> {{ i18n.ts.tablet }}</option>
-		<option value="desktop"><i class="ph-desktop ph-bold ph-lg"/> {{ i18n.ts.desktop }}</option>
-	</FormRadios>
-
-	<FormRadios v-model="showLocalPostsInTimeline" class="_formBlock">
-		<template #label>{{ i18n.ts.showLocalPosts }}</template>
-		<option value="home"><i class="ph-house ph-bold ph-lg"/> {{ i18n.ts.homeTimeline }}</option>
-		<option value="social"><i class="ph-handshake ph-bold ph-lg"/> {{ i18n.ts.socialTimeline }}</option>
-	</FormRadios>
-
-	<FormSwitch v-model="showFixedPostForm" class="_formBlock">{{ i18n.ts.showFixedPostForm }}</FormSwitch>
-
-	<FormSection>
-		<template #label>{{ i18n.ts.behavior }}</template>
-		<FormSwitch v-model="imageNewTab" class="_formBlock">{{ i18n.ts.openImageInNewTab }}</FormSwitch>
-		<FormSwitch v-model="enableInfiniteScroll" class="_formBlock">{{ i18n.ts.enableInfiniteScroll }}</FormSwitch>
-		<FormSwitch v-model="useReactionPickerForContextMenu" class="_formBlock">{{ i18n.ts.useReactionPickerForContextMenu }}</FormSwitch>
-		<FormSwitch v-model="swipeOnDesktop" class="_formBlock">{{ i18n.ts.swipeOnDesktop }}</FormSwitch>
-		<FormSwitch v-model="enterSendsMessage" class="_formBlock">{{ i18n.ts.enterSendsMessage }}</FormSwitch>
-		<FormSwitch v-model="disablePagesScript" class="_formBlock">{{ i18n.ts.disablePagesScript }}</FormSwitch>
-
-		<FormSelect v-model="serverDisconnectedBehavior" class="_formBlock">
-			<template #label>{{ i18n.ts.whenServerDisconnected }}</template>
-			<option value="reload">{{ i18n.ts._serverDisconnectedBehavior.reload }}</option>
-			<option value="dialog">{{ i18n.ts._serverDisconnectedBehavior.dialog }}</option>
-			<option value="quiet">{{ i18n.ts._serverDisconnectedBehavior.quiet }}</option>
-			<option value="nothing">{{ i18n.ts._serverDisconnectedBehavior.nothing }}</option>
+	<div class="_formRoot">
+		<FormSelect v-model="lang" class="_formBlock">
+			<template #label>{{ i18n.ts.uiLanguage }}</template>
+			<option v-for="x in langs" :key="x[0]" :value="x[0]">
+				{{ x[1] }}
+			</option>
+			<template #caption>
+				<I18n :src="i18n.ts.i18nInfo" tag="span">
+					<template #link>
+						<MkLink url="https://hosted.weblate.org/engage/calckey/"
+							>Weblate</MkLink
+						>
+					</template>
+				</I18n>
+			</template>
 		</FormSelect>
-	</FormSection>
 
-	<FormSection>
-		<template #label>{{ i18n.ts.appearance }}</template>
-		<FormSwitch v-model="showAds" class="_formBlock">{{ i18n.ts.showAds }}</FormSwitch>
-		<FormSwitch v-model="disableAnimatedMfm" class="_formBlock">{{ i18n.ts.disableAnimatedMfm }}</FormSwitch>
-		<FormSwitch v-model="reduceAnimation" class="_formBlock">{{ i18n.ts.reduceUiAnimation }}</FormSwitch>
-		<FormSwitch v-model="useBlurEffect" class="_formBlock">{{ i18n.ts.useBlurEffect }}</FormSwitch>
-		<FormSwitch v-model="useBlurEffectForModal" class="_formBlock">{{ i18n.ts.useBlurEffectForModal }}</FormSwitch>
-		<FormSwitch v-model="showGapBetweenNotesInTimeline" class="_formBlock">{{ i18n.ts.showGapBetweenNotesInTimeline }}</FormSwitch>
-		<FormSwitch v-model="loadRawImages" class="_formBlock">{{ i18n.ts.loadRawImages }}</FormSwitch>
-		<FormSwitch v-model="disableShowingAnimatedImages" class="_formBlock">{{ i18n.ts.disableShowingAnimatedImages }}</FormSwitch>
-		<FormSwitch v-model="squareAvatars" class="_formBlock">{{ i18n.ts.squareAvatars }}</FormSwitch>
-		<FormSwitch v-model="seperateRenoteQuote" class="_formBlock">{{ i18n.ts.seperateRenoteQuote }}</FormSwitch>
-		<FormSwitch v-model="useSystemFont" class="_formBlock">{{ i18n.ts.useSystemFont }}</FormSwitch>
-		<FormSwitch v-model="useOsNativeEmojis" class="_formBlock">
-			{{ i18n.ts.useOsNativeEmojis }}
-			<div><Mfm :key="useOsNativeEmojis" text="🍮🍦🍭🍩🍰🍫🍬🥞🍪"/></div>
-		</FormSwitch>
-		<FormSwitch v-model="disableDrawer" class="_formBlock">{{ i18n.ts.disableDrawer }}</FormSwitch>
-		<FormSwitch v-model="showUpdates" class="_formBlock">{{ i18n.ts.showUpdates }}</FormSwitch>
-		<FormSwitch v-if="$i?.isAdmin" v-model="showAdminUpdates" class="_formBlock">{{ i18n.ts.showAdminUpdates }}</FormSwitch>
-
-		<FormRadios v-model="fontSize" class="_formBlock">
-			<template #label>{{ i18n.ts.fontSize }}</template>
-			<option :value="null"><span style="font-size: 14px;">Aa</span></option>
-			<option value="1"><span style="font-size: 15px;">Aa</span></option>
-			<option value="2"><span style="font-size: 16px;">Aa</span></option>
-			<option value="3"><span style="font-size: 17px;">Aa</span></option>
+		<FormRadios v-model="overridedDeviceKind" class="_formBlock">
+			<template #label>{{ i18n.ts.overridedDeviceKind }}</template>
+			<option :value="null">{{ i18n.ts.auto }}</option>
+			<option value="smartphone">
+				<i class="ph-device-mobile ph-bold ph-lg" />
+				{{ i18n.ts.smartphone }}
+			</option>
+			<option value="tablet">
+				<i class="ph-device-tablet ph-bold ph-lg" />
+				{{ i18n.ts.tablet }}
+			</option>
+			<option value="desktop">
+				<i class="ph-desktop ph-bold ph-lg" /> {{ i18n.ts.desktop }}
+			</option>
 		</FormRadios>
-	</FormSection>
 
-	<FormSelect v-model="instanceTicker" class="_formBlock">
-		<template #label>{{ i18n.ts.instanceTicker }}</template>
-		<option value="none">{{ i18n.ts._instanceTicker.none }}</option>
-		<option value="remote">{{ i18n.ts._instanceTicker.remote }}</option>
-		<option value="always">{{ i18n.ts._instanceTicker.always }}</option>
-	</FormSelect>
+		<FormRadios v-model="showLocalPostsInTimeline" class="_formBlock">
+			<template #label>{{ i18n.ts.showLocalPosts }}</template>
+			<option value="home">
+				<i class="ph-house ph-bold ph-lg" /> {{ i18n.ts.homeTimeline }}
+			</option>
+			<option value="social">
+				<i class="ph-handshake ph-bold ph-lg" />
+				{{ i18n.ts.socialTimeline }}
+			</option>
+		</FormRadios>
 
-	<FormSelect v-model="nsfw" class="_formBlock">
-		<template #label>{{ i18n.ts.nsfw }}</template>
-		<option value="respect">{{ i18n.ts._nsfw.respect }}</option>
-		<option value="ignore">{{ i18n.ts._nsfw.ignore }}</option>
-		<option value="force">{{ i18n.ts._nsfw.force }}</option>
-	</FormSelect>
+		<FormSwitch v-model="showFixedPostForm" class="_formBlock">{{
+			i18n.ts.showFixedPostForm
+		}}</FormSwitch>
 
-	<FormRange v-model="numberOfPageCache" :min="1" :max="10" :step="1" easing class="_formBlock">
-		<template #label>{{ i18n.ts.numberOfPageCache }}</template>
-		<template #caption>{{ i18n.ts.numberOfPageCacheDescription }}</template>
-	</FormRange>
+		<FormSection>
+			<template #label>{{ i18n.ts.behavior }}</template>
+			<FormSwitch v-model="imageNewTab" class="_formBlock">{{
+				i18n.ts.openImageInNewTab
+			}}</FormSwitch>
+			<FormSwitch v-model="enableInfiniteScroll" class="_formBlock">{{
+				i18n.ts.enableInfiniteScroll
+			}}</FormSwitch>
+			<FormSwitch
+				v-model="useReactionPickerForContextMenu"
+				class="_formBlock"
+				>{{ i18n.ts.useReactionPickerForContextMenu }}</FormSwitch
+			>
+			<FormSwitch v-model="swipeOnDesktop" class="_formBlock">{{
+				i18n.ts.swipeOnDesktop
+			}}</FormSwitch>
+			<FormSwitch v-model="enterSendsMessage" class="_formBlock">{{
+				i18n.ts.enterSendsMessage
+			}}</FormSwitch>
+			<FormSwitch v-model="disablePagesScript" class="_formBlock">{{
+				i18n.ts.disablePagesScript
+			}}</FormSwitch>
 
-	<FormLink to="/settings/deck" class="_formBlock">{{ i18n.ts.deck }}</FormLink>
+			<FormSelect v-model="serverDisconnectedBehavior" class="_formBlock">
+				<template #label>{{ i18n.ts.whenServerDisconnected }}</template>
+				<option value="reload">
+					{{ i18n.ts._serverDisconnectedBehavior.reload }}
+				</option>
+				<option value="dialog">
+					{{ i18n.ts._serverDisconnectedBehavior.dialog }}
+				</option>
+				<option value="quiet">
+					{{ i18n.ts._serverDisconnectedBehavior.quiet }}
+				</option>
+				<option value="nothing">
+					{{ i18n.ts._serverDisconnectedBehavior.nothing }}
+				</option>
+			</FormSelect>
+		</FormSection>
 
-	<FormLink to="/settings/custom-css" class="_formBlock"><template #icon><i class="ph-code ph-bold ph-lg"></i></template>{{ i18n.ts.customCss }}</FormLink>
+		<FormSection>
+			<template #label>{{ i18n.ts.appearance }}</template>
+			<FormSwitch v-model="showAds" class="_formBlock">{{
+				i18n.ts.showAds
+			}}</FormSwitch>
+			<FormSwitch v-model="disableAnimatedMfm" class="_formBlock">{{
+				i18n.ts.disableAnimatedMfm
+			}}</FormSwitch>
+			<FormSwitch v-model="reduceAnimation" class="_formBlock">{{
+				i18n.ts.reduceUiAnimation
+			}}</FormSwitch>
+			<FormSwitch v-model="useBlurEffect" class="_formBlock">{{
+				i18n.ts.useBlurEffect
+			}}</FormSwitch>
+			<FormSwitch v-model="useBlurEffectForModal" class="_formBlock">{{
+				i18n.ts.useBlurEffectForModal
+			}}</FormSwitch>
+			<FormSwitch
+				v-model="showGapBetweenNotesInTimeline"
+				class="_formBlock"
+				>{{ i18n.ts.showGapBetweenNotesInTimeline }}</FormSwitch
+			>
+			<FormSwitch v-model="loadRawImages" class="_formBlock">{{
+				i18n.ts.loadRawImages
+			}}</FormSwitch>
+			<FormSwitch
+				v-model="disableShowingAnimatedImages"
+				class="_formBlock"
+				>{{ i18n.ts.disableShowingAnimatedImages }}</FormSwitch
+			>
+			<FormSwitch v-model="squareAvatars" class="_formBlock">{{
+				i18n.ts.squareAvatars
+			}}</FormSwitch>
+			<FormSwitch v-model="seperateRenoteQuote" class="_formBlock">{{
+				i18n.ts.seperateRenoteQuote
+			}}</FormSwitch>
+			<FormSwitch v-model="useSystemFont" class="_formBlock">{{
+				i18n.ts.useSystemFont
+			}}</FormSwitch>
+			<FormSwitch v-model="useOsNativeEmojis" class="_formBlock">
+				{{ i18n.ts.useOsNativeEmojis }}
+				<div>
+					<Mfm :key="useOsNativeEmojis" text="🍮🍦🍭🍩🍰🍫🍬🥞🍪" />
+				</div>
+			</FormSwitch>
+			<FormSwitch v-model="disableDrawer" class="_formBlock">{{
+				i18n.ts.disableDrawer
+			}}</FormSwitch>
+			<FormSwitch v-model="showUpdates" class="_formBlock">{{
+				i18n.ts.showUpdates
+			}}</FormSwitch>
+			<FormSwitch
+				v-if="$i?.isAdmin"
+				v-model="showAdminUpdates"
+				class="_formBlock"
+				>{{ i18n.ts.showAdminUpdates }}</FormSwitch
+			>
 
-	<FormLink to="/settings/custom-katex-macro" class="_formBlock"><template #icon><i class="ph-radical ph-bold ph-lg"></i></template>{{ i18n.ts.customKaTeXMacro }}</FormLink>
-</div>
+			<FormRadios v-model="fontSize" class="_formBlock">
+				<template #label>{{ i18n.ts.fontSize }}</template>
+				<option :value="null">
+					<span style="font-size: 14px">Aa</span>
+				</option>
+				<option value="1">
+					<span style="font-size: 15px">Aa</span>
+				</option>
+				<option value="2">
+					<span style="font-size: 16px">Aa</span>
+				</option>
+				<option value="3">
+					<span style="font-size: 17px">Aa</span>
+				</option>
+			</FormRadios>
+		</FormSection>
+
+		<FormSelect v-model="instanceTicker" class="_formBlock">
+			<template #label>{{ i18n.ts.instanceTicker }}</template>
+			<option value="none">{{ i18n.ts._instanceTicker.none }}</option>
+			<option value="remote">{{ i18n.ts._instanceTicker.remote }}</option>
+			<option value="always">{{ i18n.ts._instanceTicker.always }}</option>
+		</FormSelect>
+
+		<FormSelect v-model="nsfw" class="_formBlock">
+			<template #label>{{ i18n.ts.nsfw }}</template>
+			<option value="respect">{{ i18n.ts._nsfw.respect }}</option>
+			<option value="ignore">{{ i18n.ts._nsfw.ignore }}</option>
+			<option value="force">{{ i18n.ts._nsfw.force }}</option>
+		</FormSelect>
+
+		<FormRange
+			v-model="numberOfPageCache"
+			:min="1"
+			:max="10"
+			:step="1"
+			easing
+			class="_formBlock"
+		>
+			<template #label>{{ i18n.ts.numberOfPageCache }}</template>
+			<template #caption>{{
+				i18n.ts.numberOfPageCacheDescription
+			}}</template>
+		</FormRange>
+
+		<FormLink to="/settings/deck" class="_formBlock">{{
+			i18n.ts.deck
+		}}</FormLink>
+
+		<FormLink to="/settings/custom-css" class="_formBlock"
+			><template #icon><i class="ph-code ph-bold ph-lg"></i></template
+			>{{ i18n.ts.customCss }}</FormLink
+		>
+
+		<FormLink to="/settings/custom-katex-macro" class="_formBlock"
+			><template #icon><i class="ph-radical ph-bold ph-lg"></i></template
+			>{{ i18n.ts.customKaTeXMacro }}</FormLink
+		>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
-import { $i } from '@/account';
-import FormSwitch from '@/components/form/switch.vue';
-import FormSelect from '@/components/form/select.vue';
-import FormRadios from '@/components/form/radios.vue';
-import FormRange from '@/components/form/range.vue';
-import FormSection from '@/components/form/section.vue';
-import FormLink from '@/components/form/link.vue';
-import MkLink from '@/components/MkLink.vue';
-import { langs } from '@/config';
-import { defaultStore } from '@/store';
-import * as os from '@/os';
-import { unisonReload } from '@/scripts/unison-reload';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, ref, watch } from "vue";
+import { $i } from "@/account";
+import FormSwitch from "@/components/form/switch.vue";
+import FormSelect from "@/components/form/select.vue";
+import FormRadios from "@/components/form/radios.vue";
+import FormRange from "@/components/form/range.vue";
+import FormSection from "@/components/form/section.vue";
+import FormLink from "@/components/form/link.vue";
+import MkLink from "@/components/MkLink.vue";
+import { langs } from "@/config";
+import { defaultStore } from "@/store";
+import * as os from "@/os";
+import { unisonReload } from "@/scripts/unison-reload";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const lang = ref(localStorage.getItem('lang'));
-const fontSize = ref(localStorage.getItem('fontSize'));
-const useSystemFont = ref(localStorage.getItem('useSystemFont') != null);
+const lang = ref(localStorage.getItem("lang"));
+const fontSize = ref(localStorage.getItem("fontSize"));
+const useSystemFont = ref(localStorage.getItem("useSystemFont") != null);
 
 async function reloadAsk() {
 	const { canceled } = await os.confirm({
-		type: 'info',
+		type: "info",
 		text: i18n.ts.reloadToApplySetting,
 	});
 	if (canceled) return;
@@ -134,73 +237,122 @@ async function reloadAsk() {
 	unisonReload();
 }
 
-const overridedDeviceKind = computed(defaultStore.makeGetterSetter('overridedDeviceKind'));
-const showLocalPostsInTimeline = computed(defaultStore.makeGetterSetter('showLocalPostsInTimeline'));
-const serverDisconnectedBehavior = computed(defaultStore.makeGetterSetter('serverDisconnectedBehavior'));
-const reduceAnimation = computed(defaultStore.makeGetterSetter('animation', v => !v, v => !v));
-const useBlurEffectForModal = computed(defaultStore.makeGetterSetter('useBlurEffectForModal'));
-const useBlurEffect = computed(defaultStore.makeGetterSetter('useBlurEffect'));
-const showGapBetweenNotesInTimeline = computed(defaultStore.makeGetterSetter('showGapBetweenNotesInTimeline'));
-const showAds = computed(defaultStore.makeGetterSetter('showAds'));
-const disableAnimatedMfm = computed(defaultStore.makeGetterSetter('animatedMfm', v => !v, v => !v));
-const useOsNativeEmojis = computed(defaultStore.makeGetterSetter('useOsNativeEmojis'));
-const disableDrawer = computed(defaultStore.makeGetterSetter('disableDrawer'));
-const disableShowingAnimatedImages = computed(defaultStore.makeGetterSetter('disableShowingAnimatedImages'));
-const loadRawImages = computed(defaultStore.makeGetterSetter('loadRawImages'));
-const imageNewTab = computed(defaultStore.makeGetterSetter('imageNewTab'));
-const nsfw = computed(defaultStore.makeGetterSetter('nsfw'));
-const disablePagesScript = computed(defaultStore.makeGetterSetter('disablePagesScript'));
-const showFixedPostForm = computed(defaultStore.makeGetterSetter('showFixedPostForm'));
-const numberOfPageCache = computed(defaultStore.makeGetterSetter('numberOfPageCache'));
-const instanceTicker = computed(defaultStore.makeGetterSetter('instanceTicker'));
-const enableInfiniteScroll = computed(defaultStore.makeGetterSetter('enableInfiniteScroll'));
-const enterSendsMessage = computed(defaultStore.makeGetterSetter('enterSendsMessage'));
-const useReactionPickerForContextMenu = computed(defaultStore.makeGetterSetter('useReactionPickerForContextMenu'));
-const seperateRenoteQuote = computed(defaultStore.makeGetterSetter('seperateRenoteQuote'));
-const squareAvatars = computed(defaultStore.makeGetterSetter('squareAvatars'));
-const showUpdates = computed(defaultStore.makeGetterSetter('showUpdates'));
-const swipeOnDesktop = computed(defaultStore.makeGetterSetter('swipeOnDesktop'));
-const showAdminUpdates = computed(defaultStore.makeGetterSetter('showAdminUpdates'));
+const overridedDeviceKind = computed(
+	defaultStore.makeGetterSetter("overridedDeviceKind")
+);
+const showLocalPostsInTimeline = computed(
+	defaultStore.makeGetterSetter("showLocalPostsInTimeline")
+);
+const serverDisconnectedBehavior = computed(
+	defaultStore.makeGetterSetter("serverDisconnectedBehavior")
+);
+const reduceAnimation = computed(
+	defaultStore.makeGetterSetter(
+		"animation",
+		(v) => !v,
+		(v) => !v
+	)
+);
+const useBlurEffectForModal = computed(
+	defaultStore.makeGetterSetter("useBlurEffectForModal")
+);
+const useBlurEffect = computed(defaultStore.makeGetterSetter("useBlurEffect"));
+const showGapBetweenNotesInTimeline = computed(
+	defaultStore.makeGetterSetter("showGapBetweenNotesInTimeline")
+);
+const showAds = computed(defaultStore.makeGetterSetter("showAds"));
+const disableAnimatedMfm = computed(
+	defaultStore.makeGetterSetter(
+		"animatedMfm",
+		(v) => !v,
+		(v) => !v
+	)
+);
+const useOsNativeEmojis = computed(
+	defaultStore.makeGetterSetter("useOsNativeEmojis")
+);
+const disableDrawer = computed(defaultStore.makeGetterSetter("disableDrawer"));
+const disableShowingAnimatedImages = computed(
+	defaultStore.makeGetterSetter("disableShowingAnimatedImages")
+);
+const loadRawImages = computed(defaultStore.makeGetterSetter("loadRawImages"));
+const imageNewTab = computed(defaultStore.makeGetterSetter("imageNewTab"));
+const nsfw = computed(defaultStore.makeGetterSetter("nsfw"));
+const disablePagesScript = computed(
+	defaultStore.makeGetterSetter("disablePagesScript")
+);
+const showFixedPostForm = computed(
+	defaultStore.makeGetterSetter("showFixedPostForm")
+);
+const numberOfPageCache = computed(
+	defaultStore.makeGetterSetter("numberOfPageCache")
+);
+const instanceTicker = computed(
+	defaultStore.makeGetterSetter("instanceTicker")
+);
+const enableInfiniteScroll = computed(
+	defaultStore.makeGetterSetter("enableInfiniteScroll")
+);
+const enterSendsMessage = computed(
+	defaultStore.makeGetterSetter("enterSendsMessage")
+);
+const useReactionPickerForContextMenu = computed(
+	defaultStore.makeGetterSetter("useReactionPickerForContextMenu")
+);
+const seperateRenoteQuote = computed(
+	defaultStore.makeGetterSetter("seperateRenoteQuote")
+);
+const squareAvatars = computed(defaultStore.makeGetterSetter("squareAvatars"));
+const showUpdates = computed(defaultStore.makeGetterSetter("showUpdates"));
+const swipeOnDesktop = computed(
+	defaultStore.makeGetterSetter("swipeOnDesktop")
+);
+const showAdminUpdates = computed(
+	defaultStore.makeGetterSetter("showAdminUpdates")
+);
 
 watch(lang, () => {
-	localStorage.setItem('lang', lang.value as string);
-	localStorage.removeItem('locale');
+	localStorage.setItem("lang", lang.value as string);
+	localStorage.removeItem("locale");
 });
 
 watch(fontSize, () => {
 	if (fontSize.value == null) {
-		localStorage.removeItem('fontSize');
+		localStorage.removeItem("fontSize");
 	} else {
-		localStorage.setItem('fontSize', fontSize.value);
+		localStorage.setItem("fontSize", fontSize.value);
 	}
 });
 
 watch(useSystemFont, () => {
 	if (useSystemFont.value) {
-		localStorage.setItem('useSystemFont', 't');
+		localStorage.setItem("useSystemFont", "t");
 	} else {
-		localStorage.removeItem('useSystemFont');
+		localStorage.removeItem("useSystemFont");
 	}
 });
 
-watch([
-	lang,
-	fontSize,
-	useSystemFont,
-	enableInfiniteScroll,
-	squareAvatars,
-	showGapBetweenNotesInTimeline,
-	instanceTicker,
-	overridedDeviceKind,
-	showLocalPostsInTimeline,
-	showAds,
-	showUpdates,
-	swipeOnDesktop,
-	seperateRenoteQuote,
-	showAdminUpdates,
-], async () => {
-	await reloadAsk();
-});
+watch(
+	[
+		lang,
+		fontSize,
+		useSystemFont,
+		enableInfiniteScroll,
+		squareAvatars,
+		showGapBetweenNotesInTimeline,
+		instanceTicker,
+		overridedDeviceKind,
+		showLocalPostsInTimeline,
+		showAds,
+		showUpdates,
+		swipeOnDesktop,
+		seperateRenoteQuote,
+		showAdminUpdates,
+	],
+	async () => {
+		await reloadAsk();
+	}
+);
 
 const headerActions = $computed(() => []);
 
@@ -208,6 +360,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.general,
-	icon: 'ph-gear-six ph-bold ph-lg',
+	icon: "ph-gear-six ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index 93acb131a..18fcc0400 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -1,92 +1,186 @@
 <template>
-<div class="_formRoot">
-	<FormSection>
-		<template #label>{{ i18n.ts._exportOrImport.allNotes }}</template>
-		<FormFolder>
-			<template #label>{{ i18n.ts.export }}</template>
-			<template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="exportNotes()"><i class="ph-download-simple ph-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
-		</FormFolder>
-		<FormFolder class="_formBlock">
-			<template #label>{{ i18n.ts.import }}</template>
-			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
-			<FormSwitch v-model="signatureCheck" class="_formBlock">
-				Mastodon import? (not Akkoma!)
-			</FormSwitch>
-			<MkButton primary :class="$style.button" inline @click="importPosts($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
-		</FormFolder>
-	</FormSection>
-	<FormSection>
-		<template #label>{{ i18n.ts._exportOrImport.followingList }}</template>
-		<FormFolder class="_formBlock">
-			<template #label>{{ i18n.ts.export }}</template>
-			<template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>
-			<FormSwitch v-model="excludeMutingUsers" class="_formBlock">
-				{{ i18n.ts._exportOrImport.excludeMutingUsers }}
-			</FormSwitch>
-			<FormSwitch v-model="excludeInactiveUsers" class="_formBlock">
-				{{ i18n.ts._exportOrImport.excludeInactiveUsers }}
-			</FormSwitch>
-			<MkButton primary :class="$style.button" inline @click="exportFollowing()"><i class="ph-download-simple ph-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
-		</FormFolder>
-		<FormFolder class="_formBlock">
-			<template #label>{{ i18n.ts.import }}</template>
-			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="importFollowing($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
-		</FormFolder>
-	</FormSection>
-	<FormSection>
-		<template #label>{{ i18n.ts._exportOrImport.userLists }}</template>
-		<FormFolder class="_formBlock">
-			<template #label>{{ i18n.ts.export }}</template>
-			<template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="exportUserLists()"><i class="ph-download-simple ph-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
-		</FormFolder>
-		<FormFolder class="_formBlock">
-			<template #label>{{ i18n.ts.import }}</template>
-			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="importUserLists($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
-		</FormFolder>
-	</FormSection>
-	<FormSection>
-		<template #label>{{ i18n.ts._exportOrImport.muteList }}</template>
-		<FormFolder class="_formBlock">
-			<template #label>{{ i18n.ts.export }}</template>
-			<template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="exportMuting()"><i class="ph-download-simple ph-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
-		</FormFolder>
-		<FormFolder class="_formBlock">
-			<template #label>{{ i18n.ts.import }}</template>
-			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="importMuting($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
-		</FormFolder>
-	</FormSection>
-	<FormSection>
-		<template #label>{{ i18n.ts._exportOrImport.blockingList }}</template>
-		<FormFolder class="_formBlock">
-			<template #label>{{ i18n.ts.export }}</template>
-			<template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="exportBlocking()"><i class="ph-download-simple ph-bold ph-lg"></i> {{ i18n.ts.export }}</MkButton>
-		</FormFolder>
-		<FormFolder class="_formBlock">
-			<template #label>{{ i18n.ts.import }}</template>
-			<template #icon><i class="ph-upload-simple ph-bold ph-lg"></i></template>
-			<MkButton primary :class="$style.button" inline @click="importBlocking($event)"><i class="ph-upload-simple ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
-		</FormFolder>
-	</FormSection>
-</div>
+	<div class="_formRoot">
+		<FormSection>
+			<template #label>{{ i18n.ts._exportOrImport.allNotes }}</template>
+			<FormFolder>
+				<template #label>{{ i18n.ts.export }}</template>
+				<template #icon
+					><i class="ph-download-simple ph-bold ph-lg"></i
+				></template>
+				<MkButton
+					primary
+					:class="$style.button"
+					inline
+					@click="exportNotes()"
+					><i class="ph-download-simple ph-bold ph-lg"></i>
+					{{ i18n.ts.export }}</MkButton
+				>
+			</FormFolder>
+			<FormFolder class="_formBlock">
+				<template #label>{{ i18n.ts.import }}</template>
+				<template #icon
+					><i class="ph-upload-simple ph-bold ph-lg"></i
+				></template>
+				<FormSwitch v-model="signatureCheck" class="_formBlock">
+					Mastodon import? (not Akkoma!)
+				</FormSwitch>
+				<MkButton
+					primary
+					:class="$style.button"
+					inline
+					@click="importPosts($event)"
+					><i class="ph-upload-simple ph-bold ph-lg"></i>
+					{{ i18n.ts.import }}</MkButton
+				>
+			</FormFolder>
+		</FormSection>
+		<FormSection>
+			<template #label>{{
+				i18n.ts._exportOrImport.followingList
+			}}</template>
+			<FormFolder class="_formBlock">
+				<template #label>{{ i18n.ts.export }}</template>
+				<template #icon
+					><i class="ph-download-simple ph-bold ph-lg"></i
+				></template>
+				<FormSwitch v-model="excludeMutingUsers" class="_formBlock">
+					{{ i18n.ts._exportOrImport.excludeMutingUsers }}
+				</FormSwitch>
+				<FormSwitch v-model="excludeInactiveUsers" class="_formBlock">
+					{{ i18n.ts._exportOrImport.excludeInactiveUsers }}
+				</FormSwitch>
+				<MkButton
+					primary
+					:class="$style.button"
+					inline
+					@click="exportFollowing()"
+					><i class="ph-download-simple ph-bold ph-lg"></i>
+					{{ i18n.ts.export }}</MkButton
+				>
+			</FormFolder>
+			<FormFolder class="_formBlock">
+				<template #label>{{ i18n.ts.import }}</template>
+				<template #icon
+					><i class="ph-upload-simple ph-bold ph-lg"></i
+				></template>
+				<MkButton
+					primary
+					:class="$style.button"
+					inline
+					@click="importFollowing($event)"
+					><i class="ph-upload-simple ph-bold ph-lg"></i>
+					{{ i18n.ts.import }}</MkButton
+				>
+			</FormFolder>
+		</FormSection>
+		<FormSection>
+			<template #label>{{ i18n.ts._exportOrImport.userLists }}</template>
+			<FormFolder class="_formBlock">
+				<template #label>{{ i18n.ts.export }}</template>
+				<template #icon
+					><i class="ph-download-simple ph-bold ph-lg"></i
+				></template>
+				<MkButton
+					primary
+					:class="$style.button"
+					inline
+					@click="exportUserLists()"
+					><i class="ph-download-simple ph-bold ph-lg"></i>
+					{{ i18n.ts.export }}</MkButton
+				>
+			</FormFolder>
+			<FormFolder class="_formBlock">
+				<template #label>{{ i18n.ts.import }}</template>
+				<template #icon
+					><i class="ph-upload-simple ph-bold ph-lg"></i
+				></template>
+				<MkButton
+					primary
+					:class="$style.button"
+					inline
+					@click="importUserLists($event)"
+					><i class="ph-upload-simple ph-bold ph-lg"></i>
+					{{ i18n.ts.import }}</MkButton
+				>
+			</FormFolder>
+		</FormSection>
+		<FormSection>
+			<template #label>{{ i18n.ts._exportOrImport.muteList }}</template>
+			<FormFolder class="_formBlock">
+				<template #label>{{ i18n.ts.export }}</template>
+				<template #icon
+					><i class="ph-download-simple ph-bold ph-lg"></i
+				></template>
+				<MkButton
+					primary
+					:class="$style.button"
+					inline
+					@click="exportMuting()"
+					><i class="ph-download-simple ph-bold ph-lg"></i>
+					{{ i18n.ts.export }}</MkButton
+				>
+			</FormFolder>
+			<FormFolder class="_formBlock">
+				<template #label>{{ i18n.ts.import }}</template>
+				<template #icon
+					><i class="ph-upload-simple ph-bold ph-lg"></i
+				></template>
+				<MkButton
+					primary
+					:class="$style.button"
+					inline
+					@click="importMuting($event)"
+					><i class="ph-upload-simple ph-bold ph-lg"></i>
+					{{ i18n.ts.import }}</MkButton
+				>
+			</FormFolder>
+		</FormSection>
+		<FormSection>
+			<template #label>{{
+				i18n.ts._exportOrImport.blockingList
+			}}</template>
+			<FormFolder class="_formBlock">
+				<template #label>{{ i18n.ts.export }}</template>
+				<template #icon
+					><i class="ph-download-simple ph-bold ph-lg"></i
+				></template>
+				<MkButton
+					primary
+					:class="$style.button"
+					inline
+					@click="exportBlocking()"
+					><i class="ph-download-simple ph-bold ph-lg"></i>
+					{{ i18n.ts.export }}</MkButton
+				>
+			</FormFolder>
+			<FormFolder class="_formBlock">
+				<template #label>{{ i18n.ts.import }}</template>
+				<template #icon
+					><i class="ph-upload-simple ph-bold ph-lg"></i
+				></template>
+				<MkButton
+					primary
+					:class="$style.button"
+					inline
+					@click="importBlocking($event)"
+					><i class="ph-upload-simple ph-bold ph-lg"></i>
+					{{ i18n.ts.import }}</MkButton
+				>
+			</FormFolder>
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import FormSection from '@/components/form/section.vue';
-import FormFolder from '@/components/form/folder.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import * as os from '@/os';
-import { selectFile } from '@/scripts/select-file';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { ref } from "vue";
+import MkButton from "@/components/MkButton.vue";
+import FormSection from "@/components/form/section.vue";
+import FormFolder from "@/components/form/folder.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import * as os from "@/os";
+import { selectFile } from "@/scripts/select-file";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const excludeMutingUsers = ref(false);
 const signatureCheck = ref(false);
@@ -94,72 +188,86 @@ const excludeInactiveUsers = ref(false);
 
 const onExportSuccess = () => {
 	os.alert({
-		type: 'info',
+		type: "info",
 		text: i18n.ts.exportRequested,
 	});
 };
 
 const onImportSuccess = () => {
 	os.alert({
-		type: 'info',
+		type: "info",
 		text: i18n.ts.importRequested,
 	});
 };
 
 const onError = (ev) => {
 	os.alert({
-		type: 'error',
+		type: "error",
 		text: ev.message,
 	});
 };
 
 const exportNotes = () => {
-	os.api('i/export-notes', {}).then(onExportSuccess).catch(onError);
+	os.api("i/export-notes", {}).then(onExportSuccess).catch(onError);
 };
 
 const importPosts = async (ev) => {
 	const file = await selectFile(ev.currentTarget ?? ev.target);
-	os.api('i/import-posts', { fileId: file.id, signatureCheck: signatureCheck.value }).then(onImportSuccess).catch(onError);
+	os.api("i/import-posts", {
+		fileId: file.id,
+		signatureCheck: signatureCheck.value,
+	})
+		.then(onImportSuccess)
+		.catch(onError);
 };
 
 const exportFollowing = () => {
-	os.api('i/export-following', {
+	os.api("i/export-following", {
 		excludeMuting: excludeMutingUsers.value,
 		excludeInactive: excludeInactiveUsers.value,
 	})
-	.then(onExportSuccess).catch(onError);
+		.then(onExportSuccess)
+		.catch(onError);
 };
 
 const exportBlocking = () => {
-	os.api('i/export-blocking', {}).then(onExportSuccess).catch(onError);
+	os.api("i/export-blocking", {}).then(onExportSuccess).catch(onError);
 };
 
 const exportUserLists = () => {
-	os.api('i/export-user-lists', {}).then(onExportSuccess).catch(onError);
+	os.api("i/export-user-lists", {}).then(onExportSuccess).catch(onError);
 };
 
 const exportMuting = () => {
-	os.api('i/export-mute', {}).then(onExportSuccess).catch(onError);
+	os.api("i/export-mute", {}).then(onExportSuccess).catch(onError);
 };
 
 const importFollowing = async (ev) => {
 	const file = await selectFile(ev.currentTarget ?? ev.target);
-	os.api('i/import-following', { fileId: file.id }).then(onImportSuccess).catch(onError);
+	os.api("i/import-following", { fileId: file.id })
+		.then(onImportSuccess)
+		.catch(onError);
 };
 
 const importUserLists = async (ev) => {
 	const file = await selectFile(ev.currentTarget ?? ev.target);
-	os.api('i/import-user-lists', { fileId: file.id }).then(onImportSuccess).catch(onError);
+	os.api("i/import-user-lists", { fileId: file.id })
+		.then(onImportSuccess)
+		.catch(onError);
 };
 
 const importMuting = async (ev) => {
 	const file = await selectFile(ev.currentTarget ?? ev.target);
-	os.api('i/import-muting', { fileId: file.id }).then(onImportSuccess).catch(onError);
+	os.api("i/import-muting", { fileId: file.id })
+		.then(onImportSuccess)
+		.catch(onError);
 };
 
 const importBlocking = async (ev) => {
 	const file = await selectFile(ev.currentTarget ?? ev.target);
-	os.api('i/import-blocking', { fileId: file.id }).then(onImportSuccess).catch(onError);
+	os.api("i/import-blocking", { fileId: file.id })
+		.then(onImportSuccess)
+		.catch(onError);
 };
 
 const headerActions = $computed(() => []);
@@ -168,7 +276,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.importAndExport,
-	icon: 'ph-package ph-bold ph-lg',
+	icon: "ph-package ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue
index b672b7011..a3c748271 100644
--- a/packages/client/src/pages/settings/index.vue
+++ b/packages/client/src/pages/settings/index.vue
@@ -1,42 +1,76 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" :display-back-button="true"/></template>
-	<MkSpacer :content-max="900" :margin-min="20" :margin-max="32">
-		<div ref="el" class="vvcocwet" :class="{ wide: !narrow }">
-			<div class="body">
-				<div v-if="!narrow || currentPage?.route.name == null" class="nav">
-					<div class="baaadecd">
-						<MkInfo v-if="emailNotConfigured" warn class="info">{{ i18n.ts.emailNotConfiguredWarning }} <MkA to="/settings/email" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
-						<MkSuperMenu :def="menuDef" :grid="narrow"></MkSuperMenu>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="900" :margin-min="20" :margin-max="32">
+			<div ref="el" class="vvcocwet" :class="{ wide: !narrow }">
+				<div class="body">
+					<div
+						v-if="!narrow || currentPage?.route.name == null"
+						class="nav"
+					>
+						<div class="baaadecd">
+							<MkInfo v-if="emailNotConfigured" warn class="info"
+								>{{ i18n.ts.emailNotConfiguredWarning }}
+								<MkA to="/settings/email" class="_link">{{
+									i18n.ts.configure
+								}}</MkA></MkInfo
+							>
+							<MkSuperMenu
+								:def="menuDef"
+								:grid="narrow"
+							></MkSuperMenu>
+						</div>
 					</div>
-				</div>
-				<div v-if="!(narrow && currentPage?.route.name == null)" class="main">
-					<div class="bkzroven">
-						<RouterView/>
+					<div
+						v-if="!(narrow && currentPage?.route.name == null)"
+						class="main"
+					>
+						<div class="bkzroven">
+							<RouterView />
+						</div>
 					</div>
 				</div>
 			</div>
-		</div>
-	</MkSpacer>
-</mkstickycontainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script setup lang="ts">
-import { computed, defineAsyncComponent, inject, nextTick, onActivated, onMounted, onUnmounted, provide, ref, watch } from 'vue';
-import { i18n } from '@/i18n';
-import MkInfo from '@/components/MkInfo.vue';
-import MkSuperMenu from '@/components/MkSuperMenu.vue';
-import { scroll } from '@/scripts/scroll';
-import { signout , $i } from '@/account';
-import { unisonReload } from '@/scripts/unison-reload';
-import { instance } from '@/instance';
-import { useRouter } from '@/router';
-import { definePageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
-import * as os from '@/os';
+import {
+	computed,
+	defineAsyncComponent,
+	inject,
+	nextTick,
+	onActivated,
+	onMounted,
+	onUnmounted,
+	provide,
+	ref,
+	watch,
+} from "vue";
+import { i18n } from "@/i18n";
+import MkInfo from "@/components/MkInfo.vue";
+import MkSuperMenu from "@/components/MkSuperMenu.vue";
+import { scroll } from "@/scripts/scroll";
+import { signout, $i } from "@/account";
+import { unisonReload } from "@/scripts/unison-reload";
+import { instance } from "@/instance";
+import { useRouter } from "@/router";
+import {
+	definePageMetadata,
+	provideMetadataReceiver,
+	setPageMetadata,
+} from "@/scripts/page-metadata";
+import * as os from "@/os";
 
 const indexInfo = {
 	title: i18n.ts.settings,
-	icon: 'ph-gear-six ph-bold ph-lg',
+	icon: "ph-gear-six ph-bold ph-lg",
 	hideHeader: true,
 };
 const INFO = ref(indexInfo);
@@ -55,158 +89,191 @@ const ro = new ResizeObserver((entries, observer) => {
 	narrow = entries[0].borderBoxSize[0].inlineSize < NARROW_THRESHOLD;
 });
 
-const menuDef = computed(() => [{
-	title: i18n.ts.basicSettings,
-	items: [{
-		icon: 'ph-user ph-bold ph-lg',
-		text: i18n.ts.profile,
-		to: '/settings/profile',
-		active: currentPage?.route.name === 'profile',
-	}, {
-		icon: 'ph-lock-open ph-bold ph-lg',
-		text: i18n.ts.privacy,
-		to: '/settings/privacy',
-		active: currentPage?.route.name === 'privacy',
-	}, {
-		icon: 'ph-smiley ph-bold ph-lg',
-		text: i18n.ts.reaction,
-		to: '/settings/reaction',
-		active: currentPage?.route.name === 'reaction',
-	}, {
-		icon: 'ph-cloud ph-bold ph-lg',
-		text: i18n.ts.drive,
-		to: '/settings/drive',
-		active: currentPage?.route.name === 'drive',
-	}, {
-		icon: 'ph-bell ph-bold ph-lg',
-		text: i18n.ts.notifications,
-		to: '/settings/notifications',
-		active: currentPage?.route.name === 'notifications',
-	}, {
-		icon: 'ph-envelope-simple-open ph-bold ph-lg',
-		text: i18n.ts.email,
-		to: '/settings/email',
-		active: currentPage?.route.name === 'email',
-	}, {
-		icon: 'ph-share-network ph-bold ph-lg',
-		text: i18n.ts.integration,
-		to: '/settings/integration',
-		active: currentPage?.route.name === 'integration',
-	}, {
-		icon: 'ph-lock ph-bold ph-lg',
-		text: i18n.ts.security,
-		to: '/settings/security',
-		active: currentPage?.route.name === 'security',
-	}],
-}, {
-	title: i18n.ts.clientSettings,
-	items: [{
-		icon: 'ph-gear-six ph-bold ph-lg',
-		text: i18n.ts.general,
-		to: '/settings/general',
-		active: currentPage?.route.name === 'general',
-	}, {
-		icon: 'ph-palette ph-bold ph-lg',
-		text: i18n.ts.theme,
-		to: '/settings/theme',
-		active: currentPage?.route.name === 'theme',
-	}, {
-		icon: 'ph-list ph-bold ph-lg',
-		text: i18n.ts.navbar,
-		to: '/settings/navbar',
-		active: currentPage?.route.name === 'navbar',
-	}, {
-		icon: 'ph-traffic-signal ph-bold ph-lg',
-		text: i18n.ts.statusbar,
-		to: '/settings/statusbar',
-		active: currentPage?.route.name === 'statusbar',
-	}, {
-		icon: 'ph-speaker-high ph-bold ph-lg',
-		text: i18n.ts.sounds,
-		to: '/settings/sounds',
-		active: currentPage?.route.name === 'sounds',
-	}, {
-		icon: 'ph-plug ph-bold ph-lg',
-		text: i18n.ts.plugins,
-		to: '/settings/plugin',
-		active: currentPage?.route.name === 'plugin',
-	}],
-}, {
-	title: i18n.ts.otherSettings,
-	items: [{
-		icon: 'ph-airplane-takeoff ph-bold ph-lg',
-		text: i18n.ts.migration,
-		to: '/settings/migration',
-		active: currentPage?.route.name === 'migration',
-	}, {
-		icon: 'ph-package ph-bold ph-lg',
-		text: i18n.ts.importAndExport,
-		to: '/settings/import-export',
-		active: currentPage?.route.name === 'import-export',
-	}, {
-		icon: 'ph-speaker-none ph-bold ph-lg',
-		text: i18n.ts.instanceMute,
-		to: '/settings/instance-mute',
-		active: currentPage?.route.name === 'instance-mute',
-	}, {
-		icon: 'ph-prohibit ph-bold ph-lg',
-		text: i18n.ts.muteAndBlock,
-		to: '/settings/mute-block',
-		active: currentPage?.route.name === 'mute-block',
-	}, {
-		icon: 'ph-speaker-x ph-bold ph-lg',
-		text: i18n.ts.wordMute,
-		to: '/settings/word-mute',
-		active: currentPage?.route.name === 'word-mute',
-	}, {
-		icon: 'ph-key ph-bold ph-lg',
-		text: 'API',
-		to: '/settings/api',
-		active: currentPage?.route.name === 'api',
-	}, {
-		icon: 'ph-lightning ph-bold ph-lg',
-		text: 'Webhook',
-		to: '/settings/webhook',
-		active: currentPage?.route.name === 'webhook',
-	}, {
-		icon: 'ph-dots-three-outline ph-bold ph-lg',
-		text: i18n.ts.other,
-		to: '/settings/other',
-		active: currentPage?.route.name === 'other',
-	}],
-}, {
-	items: [{
-		icon: 'ph-floppy-disk ph-bold ph-lg',
-		text: i18n.ts.preferencesBackups,
-		to: '/settings/preferences-backups',
-		active: currentPage?.route.name === 'preferences-backups',
-	}, {
-		type: 'button',
-		icon: 'ph-trash ph-bold ph-lg',
-		text: i18n.ts.clearCache,
-		action: () => {
-			localStorage.removeItem('locale');
-			localStorage.removeItem('theme');
-			unisonReload();
-		},
-	}, {
-		type: 'button',
-		icon: 'ph-sign-in ph-bold ph-lg fa-flip-horizontal',
-		text: i18n.ts.logout,
-		action: async () => {
-			const { canceled } = await os.confirm({
-				type: 'warning',
-				text: i18n.ts.logoutConfirm,
-			});
-			if (canceled) return;
-			signout();
-		},
-		danger: true,
-	}],
-}]);
+const menuDef = computed(() => [
+	{
+		title: i18n.ts.basicSettings,
+		items: [
+			{
+				icon: "ph-user ph-bold ph-lg",
+				text: i18n.ts.profile,
+				to: "/settings/profile",
+				active: currentPage?.route.name === "profile",
+			},
+			{
+				icon: "ph-lock-open ph-bold ph-lg",
+				text: i18n.ts.privacy,
+				to: "/settings/privacy",
+				active: currentPage?.route.name === "privacy",
+			},
+			{
+				icon: "ph-smiley ph-bold ph-lg",
+				text: i18n.ts.reaction,
+				to: "/settings/reaction",
+				active: currentPage?.route.name === "reaction",
+			},
+			{
+				icon: "ph-cloud ph-bold ph-lg",
+				text: i18n.ts.drive,
+				to: "/settings/drive",
+				active: currentPage?.route.name === "drive",
+			},
+			{
+				icon: "ph-bell ph-bold ph-lg",
+				text: i18n.ts.notifications,
+				to: "/settings/notifications",
+				active: currentPage?.route.name === "notifications",
+			},
+			{
+				icon: "ph-envelope-simple-open ph-bold ph-lg",
+				text: i18n.ts.email,
+				to: "/settings/email",
+				active: currentPage?.route.name === "email",
+			},
+			{
+				icon: "ph-share-network ph-bold ph-lg",
+				text: i18n.ts.integration,
+				to: "/settings/integration",
+				active: currentPage?.route.name === "integration",
+			},
+			{
+				icon: "ph-lock ph-bold ph-lg",
+				text: i18n.ts.security,
+				to: "/settings/security",
+				active: currentPage?.route.name === "security",
+			},
+		],
+	},
+	{
+		title: i18n.ts.clientSettings,
+		items: [
+			{
+				icon: "ph-gear-six ph-bold ph-lg",
+				text: i18n.ts.general,
+				to: "/settings/general",
+				active: currentPage?.route.name === "general",
+			},
+			{
+				icon: "ph-palette ph-bold ph-lg",
+				text: i18n.ts.theme,
+				to: "/settings/theme",
+				active: currentPage?.route.name === "theme",
+			},
+			{
+				icon: "ph-list ph-bold ph-lg",
+				text: i18n.ts.navbar,
+				to: "/settings/navbar",
+				active: currentPage?.route.name === "navbar",
+			},
+			{
+				icon: "ph-traffic-signal ph-bold ph-lg",
+				text: i18n.ts.statusbar,
+				to: "/settings/statusbar",
+				active: currentPage?.route.name === "statusbar",
+			},
+			{
+				icon: "ph-speaker-high ph-bold ph-lg",
+				text: i18n.ts.sounds,
+				to: "/settings/sounds",
+				active: currentPage?.route.name === "sounds",
+			},
+			{
+				icon: "ph-plug ph-bold ph-lg",
+				text: i18n.ts.plugins,
+				to: "/settings/plugin",
+				active: currentPage?.route.name === "plugin",
+			},
+		],
+	},
+	{
+		title: i18n.ts.otherSettings,
+		items: [
+			{
+				icon: "ph-airplane-takeoff ph-bold ph-lg",
+				text: i18n.ts.migration,
+				to: "/settings/migration",
+				active: currentPage?.route.name === "migration",
+			},
+			{
+				icon: "ph-package ph-bold ph-lg",
+				text: i18n.ts.importAndExport,
+				to: "/settings/import-export",
+				active: currentPage?.route.name === "import-export",
+			},
+			{
+				icon: "ph-speaker-none ph-bold ph-lg",
+				text: i18n.ts.instanceMute,
+				to: "/settings/instance-mute",
+				active: currentPage?.route.name === "instance-mute",
+			},
+			{
+				icon: "ph-prohibit ph-bold ph-lg",
+				text: i18n.ts.muteAndBlock,
+				to: "/settings/mute-block",
+				active: currentPage?.route.name === "mute-block",
+			},
+			{
+				icon: "ph-speaker-x ph-bold ph-lg",
+				text: i18n.ts.wordMute,
+				to: "/settings/word-mute",
+				active: currentPage?.route.name === "word-mute",
+			},
+			{
+				icon: "ph-key ph-bold ph-lg",
+				text: "API",
+				to: "/settings/api",
+				active: currentPage?.route.name === "api",
+			},
+			{
+				icon: "ph-lightning ph-bold ph-lg",
+				text: "Webhook",
+				to: "/settings/webhook",
+				active: currentPage?.route.name === "webhook",
+			},
+			{
+				icon: "ph-dots-three-outline ph-bold ph-lg",
+				text: i18n.ts.other,
+				to: "/settings/other",
+				active: currentPage?.route.name === "other",
+			},
+		],
+	},
+	{
+		items: [
+			{
+				icon: "ph-floppy-disk ph-bold ph-lg",
+				text: i18n.ts.preferencesBackups,
+				to: "/settings/preferences-backups",
+				active: currentPage?.route.name === "preferences-backups",
+			},
+			{
+				type: "button",
+				icon: "ph-trash ph-bold ph-lg",
+				text: i18n.ts.clearCache,
+				action: () => {
+					localStorage.removeItem("locale");
+					localStorage.removeItem("theme");
+					unisonReload();
+				},
+			},
+			{
+				type: "button",
+				icon: "ph-sign-in ph-bold ph-lg fa-flip-horizontal",
+				text: i18n.ts.logout,
+				action: async () => {
+					const { canceled } = await os.confirm({
+						type: "warning",
+						text: i18n.ts.logoutConfirm,
+					});
+					if (canceled) return;
+					signout();
+				},
+				danger: true,
+			},
+		],
+	},
+]);
 
-watch($$(narrow), () => {
-});
+watch($$(narrow), () => {});
 
 onMounted(() => {
 	ro.observe(el.value);
@@ -214,7 +281,7 @@ onMounted(() => {
 	narrow = el.value.offsetWidth < NARROW_THRESHOLD;
 
 	if (!narrow && currentPage?.route.name == null) {
-		router.replace('/settings/profile');
+		router.replace("/settings/profile");
 	}
 });
 
@@ -222,7 +289,7 @@ onActivated(() => {
 	narrow = el.value.offsetWidth < NARROW_THRESHOLD;
 
 	if (!narrow && currentPage?.route.name == null) {
-		router.replace('/settings/profile');
+		router.replace("/settings/profile");
 	}
 });
 
@@ -231,12 +298,18 @@ onUnmounted(() => {
 });
 
 watch(router.currentRef, (to) => {
-	if (to.route.name === "settings" && to.child?.route.name == null && !narrow) {
-		router.replace('/settings/profile');
+	if (
+		to.route.name === "settings" &&
+		to.child?.route.name == null &&
+		!narrow
+	) {
+		router.replace("/settings/profile");
 	}
 });
 
-const emailNotConfigured = computed(() => instance.enableEmail && ($i.email == null || !$i.emailVerified));
+const emailNotConfigured = computed(
+	() => instance.enableEmail && ($i.email == null || !$i.emailVerified)
+);
 
 provideMetadataReceiver((info) => {
 	if (info == null) {
diff --git a/packages/client/src/pages/settings/instance-mute.vue b/packages/client/src/pages/settings/instance-mute.vue
index c4ce06d6e..4c8ce7a3d 100644
--- a/packages/client/src/pages/settings/instance-mute.vue
+++ b/packages/client/src/pages/settings/instance-mute.vue
@@ -1,41 +1,53 @@
 <template>
-<div class="_formRoot">
-	<MkInfo>{{ i18n.ts._instanceMute.title }}</MkInfo>
-	<FormTextarea v-model="instanceMutes" class="_formBlock">
-		<template #label>{{ i18n.ts._instanceMute.heading }}</template>
-		<template #caption>{{ i18n.ts._instanceMute.instanceMuteDescription }}<br>{{ i18n.ts._instanceMute.instanceMuteDescription2 }}</template>
-	</FormTextarea>
-	<MkButton primary :disabled="!changed" class="_formBlock" @click="save()"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-</div>
+	<div class="_formRoot">
+		<MkInfo>{{ i18n.ts._instanceMute.title }}</MkInfo>
+		<FormTextarea v-model="instanceMutes" class="_formBlock">
+			<template #label>{{ i18n.ts._instanceMute.heading }}</template>
+			<template #caption
+				>{{ i18n.ts._instanceMute.instanceMuteDescription }}<br />{{
+					i18n.ts._instanceMute.instanceMuteDescription2
+				}}</template
+			>
+		</FormTextarea>
+		<MkButton
+			primary
+			:disabled="!changed"
+			class="_formBlock"
+			@click="save()"
+			><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+			{{ i18n.ts.save }}</MkButton
+		>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { ref, watch } from "vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import MkInfo from "@/components/MkInfo.vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const instanceMutes = ref($i!.mutedInstances.join('\n'));
+const instanceMutes = ref($i!.mutedInstances.join("\n"));
 const changed = ref(false);
 
 async function save() {
 	let mutes = instanceMutes.value
-		.trim().split('\n')
-		.map(el => el.trim())
-		.filter(el => el);
+		.trim()
+		.split("\n")
+		.map((el) => el.trim())
+		.filter((el) => el);
 
-	await os.api('i/update', {
+	await os.api("i/update", {
 		mutedInstances: mutes,
 	});
 
 	changed.value = false;
 
 	// Refresh filtered list to signal to the user how they've been saved
-	instanceMutes.value = mutes.join('\n');
+	instanceMutes.value = mutes.join("\n");
 }
 
 watch(instanceMutes, () => {
@@ -48,6 +60,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.instanceMute,
-	icon: 'ph-speaker-none ph-bold ph-lg',
+	icon: "ph-speaker-none ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/integration.vue b/packages/client/src/pages/settings/integration.vue
index e85137390..4a413e378 100644
--- a/packages/client/src/pages/settings/integration.vue
+++ b/packages/client/src/pages/settings/integration.vue
@@ -1,30 +1,66 @@
 <template>
-<div class="_formRoot">
-	<FormSection v-if="instance.enableDiscordIntegration">
-		<template #label><i class="ph-discord-logo ph-bold ph-lg"></i> Discord</template>
-		<p v-if="integrations.discord">{{ i18n.ts.connectedTo }}: <a :href="`https://discord.com/users/${integrations.discord.id}`" rel="nofollow noopener" target="_blank">@{{ integrations.discord.username }}#{{ integrations.discord.discriminator }}</a></p>
-		<MkButton v-if="integrations.discord" danger @click="disconnectDiscord">{{ i18n.ts.disconnectService }}</MkButton>
-		<MkButton v-else primary @click="connectDiscord">{{ i18n.ts.connectService }}</MkButton>
-	</FormSection>
+	<div class="_formRoot">
+		<FormSection v-if="instance.enableDiscordIntegration">
+			<template #label
+				><i class="ph-discord-logo ph-bold ph-lg"></i> Discord</template
+			>
+			<p v-if="integrations.discord">
+				{{ i18n.ts.connectedTo }}:
+				<a
+					:href="`https://discord.com/users/${integrations.discord.id}`"
+					rel="nofollow noopener"
+					target="_blank"
+					>@{{ integrations.discord.username }}#{{
+						integrations.discord.discriminator
+					}}</a
+				>
+			</p>
+			<MkButton
+				v-if="integrations.discord"
+				danger
+				@click="disconnectDiscord"
+				>{{ i18n.ts.disconnectService }}</MkButton
+			>
+			<MkButton v-else primary @click="connectDiscord">{{
+				i18n.ts.connectService
+			}}</MkButton>
+		</FormSection>
 
-	<FormSection v-if="instance.enableGithubIntegration">
-		<template #label><i class="ph-github-logo ph-bold ph-lg"></i> GitHub</template>
-		<p v-if="integrations.github">{{ i18n.ts.connectedTo }}: <a :href="`https://github.com/${integrations.github.login}`" rel="nofollow noopener" target="_blank">@{{ integrations.github.login }}</a></p>
-		<MkButton v-if="integrations.github" danger @click="disconnectGithub">{{ i18n.ts.disconnectService }}</MkButton>
-		<MkButton v-else primary @click="connectGithub">{{ i18n.ts.connectService }}</MkButton>
-	</FormSection>
-</div>
+		<FormSection v-if="instance.enableGithubIntegration">
+			<template #label
+				><i class="ph-github-logo ph-bold ph-lg"></i> GitHub</template
+			>
+			<p v-if="integrations.github">
+				{{ i18n.ts.connectedTo }}:
+				<a
+					:href="`https://github.com/${integrations.github.login}`"
+					rel="nofollow noopener"
+					target="_blank"
+					>@{{ integrations.github.login }}</a
+				>
+			</p>
+			<MkButton
+				v-if="integrations.github"
+				danger
+				@click="disconnectGithub"
+				>{{ i18n.ts.disconnectService }}</MkButton
+			>
+			<MkButton v-else primary @click="connectGithub">{{
+				i18n.ts.connectService
+			}}</MkButton>
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref, watch } from 'vue';
-import { apiUrl } from '@/config';
-import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/MkButton.vue';
-import { $i } from '@/account';
-import { instance } from '@/instance';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, onMounted, ref, watch } from "vue";
+import { apiUrl } from "@/config";
+import FormSection from "@/components/form/section.vue";
+import MkButton from "@/components/MkButton.vue";
+import { $i } from "@/account";
+import { instance } from "@/instance";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const twitterForm = ref<Window | null>(null);
 const discordForm = ref<Window | null>(null);
@@ -33,40 +69,42 @@ const githubForm = ref<Window | null>(null);
 const integrations = computed(() => $i!.integrations);
 
 function openWindow(service: string, type: string) {
-	return window.open(`${apiUrl}/${type}/${service}`,
+	return window.open(
+		`${apiUrl}/${type}/${service}`,
 		`${service}_${type}_window`,
-		'height=570, width=520',
+		"height=570, width=520"
 	);
 }
 
 function connectTwitter() {
-	twitterForm.value = openWindow('twitter', 'connect');
+	twitterForm.value = openWindow("twitter", "connect");
 }
 
 function disconnectTwitter() {
-	openWindow('twitter', 'disconnect');
+	openWindow("twitter", "disconnect");
 }
 
 function connectDiscord() {
-	discordForm.value = openWindow('discord', 'connect');
+	discordForm.value = openWindow("discord", "connect");
 }
 
 function disconnectDiscord() {
-	openWindow('discord', 'disconnect');
+	openWindow("discord", "disconnect");
 }
 
 function connectGithub() {
-	githubForm.value = openWindow('github', 'connect');
+	githubForm.value = openWindow("github", "connect");
 }
 
 function disconnectGithub() {
-	openWindow('github', 'disconnect');
+	openWindow("github", "disconnect");
 }
 
 onMounted(() => {
-	document.cookie = `igi=${$i!.token}; path=/;` +
-		' max-age=31536000;' +
-		(document.location.protocol.startsWith('https') ? ' secure' : '');
+	document.cookie =
+		`igi=${$i!.token}; path=/;` +
+		" max-age=31536000;" +
+		(document.location.protocol.startsWith("https") ? " secure" : "");
 
 	watch(integrations, () => {
 		if (integrations.value.twitter) {
@@ -87,6 +125,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.integration,
-	icon: 'ph-share-network ph-bold ph-lg',
+	icon: "ph-share-network ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/migration.vue b/packages/client/src/pages/settings/migration.vue
index 49d244091..1dcc44f91 100644
--- a/packages/client/src/pages/settings/migration.vue
+++ b/packages/client/src/pages/settings/migration.vue
@@ -1,68 +1,78 @@
 <template>
-<div class="_formRoot">
-	<FormSection>
-		<template #label>{{ i18n.ts.moveTo }}</template>
-		<FormInput v-model="moveToAccount" class="_formBlock">
-			<template #prefix><i class="ph-airplane-takeoff ph-bold ph-lg"></i></template>
-			<template #label>{{ i18n.ts.moveToLabel }}</template>
-		</FormInput>
-		<FormButton primary danger @click="move(moveToAccount)">
-			{{ i18n.ts.moveAccount }}
-		</FormButton>
-		<div class="description">{{ i18n.ts.moveAccountDescription }}</div>
-	</FormSection>
+	<div class="_formRoot">
+		<FormSection>
+			<template #label>{{ i18n.ts.moveTo }}</template>
+			<FormInput v-model="moveToAccount" class="_formBlock">
+				<template #prefix
+					><i class="ph-airplane-takeoff ph-bold ph-lg"></i
+				></template>
+				<template #label>{{ i18n.ts.moveToLabel }}</template>
+			</FormInput>
+			<FormButton primary danger @click="move(moveToAccount)">
+				{{ i18n.ts.moveAccount }}
+			</FormButton>
+			<div class="description">{{ i18n.ts.moveAccountDescription }}</div>
+		</FormSection>
 
-	<FormSection>
-		<template #label>{{ i18n.ts.moveFrom }}</template>
-		<FormInput v-model="accountAlias" class="_formBlock">
-			<template #prefix><i class="ph-airplane-landing ph-bold ph-lg"></i></template>
-			<template #label>{{ i18n.ts.moveFromLabel }}</template>
-		</FormInput>
-		<FormButton class="button" inline primary @click="save(accountAlias.toString())">
-			<i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}
-		</FormButton>
-		<div class="description">{{ i18n.ts.moveFromDescription }}</div>
-	</FormSection>
-</div>
+		<FormSection>
+			<template #label>{{ i18n.ts.moveFrom }}</template>
+			<FormInput v-model="accountAlias" class="_formBlock">
+				<template #prefix
+					><i class="ph-airplane-landing ph-bold ph-lg"></i
+				></template>
+				<template #label>{{ i18n.ts.moveFromLabel }}</template>
+			</FormInput>
+			<FormButton
+				class="button"
+				inline
+				primary
+				@click="save(accountAlias.toString())"
+			>
+				<i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+				{{ i18n.ts.save }}
+			</FormButton>
+			<div class="description">{{ i18n.ts.moveFromDescription }}</div>
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import FormSection from '@/components/form/section.vue';
-import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import FormSection from "@/components/form/section.vue";
+import FormInput from "@/components/form/input.vue";
+import FormButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-let moveToAccount = $ref('');
-let accountAlias = $ref('');
+let moveToAccount = $ref("");
+let accountAlias = $ref("");
 
 async function save(account): Promise<void> {
-	os.apiWithDialog('i/known-as', {
+	os.apiWithDialog("i/known-as", {
 		alsoKnownAs: account,
 	});
 }
 
 async function move(account): Promise<void> {
 	const confirm = await os.confirm({
-		type: 'warning',
-		text: i18n.t('migrationConfirm', { account: account.toString() }),
+		type: "warning",
+		text: i18n.t("migrationConfirm", { account: account.toString() }),
 	});
 	if (confirm.canceled) return;
-	os.apiWithDialog('i/move', {
+	os.apiWithDialog("i/move", {
 		moveToAccount: account,
 	});
 }
 
 definePageMetadata({
 	title: i18n.ts.security,
-	icon: 'ph-lock ph-bold ph-lg',
+	icon: "ph-lock ph-bold ph-lg",
 });
 </script>
 
 <style lang="scss">
 .description {
-	font-size: .85em;
+	font-size: 0.85em;
 	padding: 1rem;
 }
 </style>
diff --git a/packages/client/src/pages/settings/mute-block.vue b/packages/client/src/pages/settings/mute-block.vue
index c081e6bc2..81e9ec875 100644
--- a/packages/client/src/pages/settings/mute-block.vue
+++ b/packages/client/src/pages/settings/mute-block.vue
@@ -1,52 +1,64 @@
 <template>
-<div class="_formRoot">
-	<MkTab v-model="tab" style="margin-bottom: var(--margin);">
-		<option value="mute">{{ i18n.ts.mutedUsers }}</option>
-		<option value="block">{{ i18n.ts.blockedUsers }}</option>
-	</MkTab>
-	<div v-if="tab === 'mute'">
-		<MkPagination :pagination="mutingPagination" class="muting">
-			<template #empty><FormInfo>{{ i18n.ts.noUsers }}</FormInfo></template>
-			<template #default="{items}">
-				<FormLink v-for="mute in items" :key="mute.id" :to="userPage(mute.mutee)">
-					<MkAcct :user="mute.mutee"/>
-				</FormLink>
-			</template>
-		</MkPagination>
+	<div class="_formRoot">
+		<MkTab v-model="tab" style="margin-bottom: var(--margin)">
+			<option value="mute">{{ i18n.ts.mutedUsers }}</option>
+			<option value="block">{{ i18n.ts.blockedUsers }}</option>
+		</MkTab>
+		<div v-if="tab === 'mute'">
+			<MkPagination :pagination="mutingPagination" class="muting">
+				<template #empty
+					><FormInfo>{{ i18n.ts.noUsers }}</FormInfo></template
+				>
+				<template #default="{ items }">
+					<FormLink
+						v-for="mute in items"
+						:key="mute.id"
+						:to="userPage(mute.mutee)"
+					>
+						<MkAcct :user="mute.mutee" />
+					</FormLink>
+				</template>
+			</MkPagination>
+		</div>
+		<div v-if="tab === 'block'">
+			<MkPagination :pagination="blockingPagination" class="blocking">
+				<template #empty
+					><FormInfo>{{ i18n.ts.noUsers }}</FormInfo></template
+				>
+				<template #default="{ items }">
+					<FormLink
+						v-for="block in items"
+						:key="block.id"
+						:to="userPage(block.blockee)"
+					>
+						<MkAcct :user="block.blockee" />
+					</FormLink>
+				</template>
+			</MkPagination>
+		</div>
 	</div>
-	<div v-if="tab === 'block'">
-		<MkPagination :pagination="blockingPagination" class="blocking">
-			<template #empty><FormInfo>{{ i18n.ts.noUsers }}</FormInfo></template>
-			<template #default="{items}">
-				<FormLink v-for="block in items" :key="block.id" :to="userPage(block.blockee)">
-					<MkAcct :user="block.blockee"/>
-				</FormLink>
-			</template>
-		</MkPagination>
-	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkPagination from '@/components/MkPagination.vue';
-import MkTab from '@/components/MkTab.vue';
-import FormInfo from '@/components/MkInfo.vue';
-import FormLink from '@/components/form/link.vue';
-import { userPage } from '@/filters/user';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import MkPagination from "@/components/MkPagination.vue";
+import MkTab from "@/components/MkTab.vue";
+import FormInfo from "@/components/MkInfo.vue";
+import FormLink from "@/components/form/link.vue";
+import { userPage } from "@/filters/user";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-let tab = $ref('mute');
+let tab = $ref("mute");
 
 const mutingPagination = {
-	endpoint: 'mute/list' as const,
+	endpoint: "mute/list" as const,
 	limit: 10,
 };
 
 const blockingPagination = {
-	endpoint: 'blocking/list' as const,
+	endpoint: "blocking/list" as const,
 	limit: 10,
 };
 
@@ -56,6 +68,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.muteAndBlock,
-	icon: 'ph-prohibit ph-bold ph-lg',
+	icon: "ph-prohibit ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/navbar.vue b/packages/client/src/pages/settings/navbar.vue
index bea7609ac..10aeb9732 100644
--- a/packages/client/src/pages/settings/navbar.vue
+++ b/packages/client/src/pages/settings/navbar.vue
@@ -1,42 +1,59 @@
 <template>
-<div class="_formRoot">
-	<FormTextarea v-model="items" tall manual-save class="_formBlock">
-		<template #label>{{ i18n.ts.navbar }}</template>
-		<template #caption><button class="_textButton" @click="addItem">{{ i18n.ts.addItem }}</button></template>
-	</FormTextarea>
+	<div class="_formRoot">
+		<FormTextarea v-model="items" tall manual-save class="_formBlock">
+			<template #label>{{ i18n.ts.navbar }}</template>
+			<template #caption
+				><button class="_textButton" @click="addItem">
+					{{ i18n.ts.addItem }}
+				</button></template
+			>
+		</FormTextarea>
 
-	<FormRadios v-model="menuDisplay" class="_formBlock">
-		<template #label>{{ i18n.ts.display }}</template>
-		<option value="sideFull">{{ i18n.ts._menuDisplay.sideFull }}</option>
-		<option value="sideIcon">{{ i18n.ts._menuDisplay.sideIcon }}</option>
-		<!-- <option value="top">{{ i18n.ts._menuDisplay.top }}</option> -->
-		<!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ i18n.ts._menuDisplay.hide }}</MkRadio>--> <!-- TODO: サイドバーを完全に隠せるようにすると、別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 -->
-	</FormRadios>
+		<FormRadios v-model="menuDisplay" class="_formBlock">
+			<template #label>{{ i18n.ts.display }}</template>
+			<option value="sideFull">
+				{{ i18n.ts._menuDisplay.sideFull }}
+			</option>
+			<option value="sideIcon">
+				{{ i18n.ts._menuDisplay.sideIcon }}
+			</option>
+			<!-- <option value="top">{{ i18n.ts._menuDisplay.top }}</option> -->
+			<!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ i18n.ts._menuDisplay.hide }}</MkRadio>-->
+			<!-- TODO: サイドバーを完全に隠せるようにすると、別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 -->
+		</FormRadios>
 
-	<FormButton danger class="_formBlock" @click="reset()"><i class="ph-arrow-clockwise ph-bold ph-lg"></i> {{ i18n.ts.default }}</FormButton>
-</div>
+		<FormButton danger class="_formBlock" @click="reset()"
+			><i class="ph-arrow-clockwise ph-bold ph-lg"></i>
+			{{ i18n.ts.default }}</FormButton
+		>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormRadios from '@/components/form/radios.vue';
-import FormButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { navbarItemDef } from '@/navbar';
-import { defaultStore } from '@/store';
-import { unisonReload } from '@/scripts/unison-reload';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, ref, watch } from "vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormRadios from "@/components/form/radios.vue";
+import FormButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { navbarItemDef } from "@/navbar";
+import { defaultStore } from "@/store";
+import { unisonReload } from "@/scripts/unison-reload";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const items = ref(defaultStore.state.menu.join('\n'));
+const items = ref(defaultStore.state.menu.join("\n"));
 
-const split = computed(() => items.value.trim().split('\n').filter(x => x.trim() !== ''));
-const menuDisplay = computed(defaultStore.makeGetterSetter('menuDisplay'));
+const split = computed(() =>
+	items.value
+		.trim()
+		.split("\n")
+		.filter((x) => x.trim() !== "")
+);
+const menuDisplay = computed(defaultStore.makeGetterSetter("menuDisplay"));
 
 async function reloadAsk() {
 	const { canceled } = await os.confirm({
-		type: 'info',
+		type: "info",
 		text: i18n.ts.reloadToApplySetting,
 	});
 	if (canceled) return;
@@ -45,27 +62,34 @@ async function reloadAsk() {
 }
 
 async function addItem() {
-	const menu = Object.keys(navbarItemDef).filter(k => !defaultStore.state.menu.includes(k));
+	const menu = Object.keys(navbarItemDef).filter(
+		(k) => !defaultStore.state.menu.includes(k)
+	);
 	const { canceled, result: item } = await os.select({
 		title: i18n.ts.addItem,
-		items: [...menu.map(k => ({
-			value: k, text: i18n.ts[navbarItemDef[k].title],
-		})), {
-			value: '-', text: i18n.ts.divider,
-		}],
+		items: [
+			...menu.map((k) => ({
+				value: k,
+				text: i18n.ts[navbarItemDef[k].title],
+			})),
+			{
+				value: "-",
+				text: i18n.ts.divider,
+			},
+		],
 	});
 	if (canceled) return;
-	items.value = [...split.value, item].join('\n');
+	items.value = [...split.value, item].join("\n");
 }
 
 async function save() {
-	defaultStore.set('menu', split.value);
+	defaultStore.set("menu", split.value);
 	await reloadAsk();
 }
 
 function reset() {
-	defaultStore.reset('menu');
-	items.value = defaultStore.state.menu.join('\n');
+	defaultStore.reset("menu");
+	items.value = defaultStore.state.menu.join("\n");
 }
 
 watch(items, async () => {
@@ -82,6 +106,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.navbar,
-	icon: 'ph-list-bullets ph-bold ph-lg',
+	icon: "ph-list-bullets ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/notifications.vue b/packages/client/src/pages/settings/notifications.vue
index 586da9e15..57a054d4a 100644
--- a/packages/client/src/pages/settings/notifications.vue
+++ b/packages/client/src/pages/settings/notifications.vue
@@ -1,82 +1,124 @@
 <template>
-<div class="_formRoot">
-	<FormButton class="_formBlock" @click="configure"><template #icon><i class="ph-gear-six ph-bold ph-lg"></i></template>{{ i18n.ts.notificationSetting }}</FormButton>
-	<FormSection>
-		<ForFormButtonmLink class="_formBlock" @click="readAllNotifications">{{ i18n.ts.markAsReadAllNotifications }}</ForFormButtonmLink>
-		<FormButton class="_formBlock" @click="readAllUnreadNotes">{{ i18n.ts.markAsReadAllUnreadNotes }}</FormButton>
-		<FormButton class="_formBlock" @click="readAllMessagingMessages">{{ i18n.ts.markAsReadAllTalkMessages }}</FormButton>
-	</FormSection>
-	<FormSection>
-		<template #label>{{ i18n.ts.pushNotification }}</template>
+	<div class="_formRoot">
+		<FormButton class="_formBlock" @click="configure"
+			><template #icon><i class="ph-gear-six ph-bold ph-lg"></i></template
+			>{{ i18n.ts.notificationSetting }}</FormButton
+		>
+		<FormSection>
+			<ForFormButtonmLink
+				class="_formBlock"
+				@click="readAllNotifications"
+				>{{ i18n.ts.markAsReadAllNotifications }}</ForFormButtonmLink
+			>
+			<FormButton class="_formBlock" @click="readAllUnreadNotes">{{
+				i18n.ts.markAsReadAllUnreadNotes
+			}}</FormButton>
+			<FormButton class="_formBlock" @click="readAllMessagingMessages">{{
+				i18n.ts.markAsReadAllTalkMessages
+			}}</FormButton>
+		</FormSection>
+		<FormSection>
+			<template #label>{{ i18n.ts.pushNotification }}</template>
 
-		<div class="_gaps_m">
-			<MkPushNotificationAllowButton ref="allowButton"/>
-			<MkSwitch :disabled="!pushRegistrationInServer" :model-value="sendReadMessage" @update:model-value="onChangeSendReadMessage">
-				<template #label>{{ i18n.ts.sendPushNotificationReadMessage }}</template>
-				<template #caption>
-					<I18n :src="i18n.ts.sendPushNotificationReadMessageCaption">
-						<template #emptyPushNotificationMessage>{{ i18n.ts._notification.emptyPushNotificationMessage }}</template>
-					</I18n>
-				</template>
-			</MkSwitch>
-		</div>
-	</FormSection>
-</div>
+			<div class="_gaps_m">
+				<MkPushNotificationAllowButton ref="allowButton" />
+				<MkSwitch
+					:disabled="!pushRegistrationInServer"
+					:model-value="sendReadMessage"
+					@update:model-value="onChangeSendReadMessage"
+				>
+					<template #label>{{
+						i18n.ts.sendPushNotificationReadMessage
+					}}</template>
+					<template #caption>
+						<I18n
+							:src="
+								i18n.ts.sendPushNotificationReadMessageCaption
+							"
+						>
+							<template #emptyPushNotificationMessage>{{
+								i18n.ts._notification
+									.emptyPushNotificationMessage
+							}}</template>
+						</I18n>
+					</template>
+				</MkSwitch>
+			</div>
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent } from 'vue';
-import { notificationTypes } from 'calckey-js';
-import FormButton from '@/components/MkButton.vue';
-import FormLink from '@/components/form/link.vue';
-import FormSection from '@/components/form/section.vue';
-import * as os from '@/os';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import MkPushNotificationAllowButton from '@/components/MkPushNotificationAllowButton.vue';
+import { defineAsyncComponent } from "vue";
+import { notificationTypes } from "calckey-js";
+import FormButton from "@/components/MkButton.vue";
+import FormLink from "@/components/form/link.vue";
+import FormSection from "@/components/form/section.vue";
+import * as os from "@/os";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import MkPushNotificationAllowButton from "@/components/MkPushNotificationAllowButton.vue";
 
-let allowButton = $shallowRef<InstanceType<typeof MkPushNotificationAllowButton>>();
-let pushRegistrationInServer = $computed(() => allowButton?.pushRegistrationInServer);
-let sendReadMessage = $computed(() => pushRegistrationInServer?.sendReadMessage || false);
+let allowButton =
+	$shallowRef<InstanceType<typeof MkPushNotificationAllowButton>>();
+let pushRegistrationInServer = $computed(
+	() => allowButton?.pushRegistrationInServer
+);
+let sendReadMessage = $computed(
+	() => pushRegistrationInServer?.sendReadMessage || false
+);
 
 async function readAllUnreadNotes() {
-	await os.api('i/read-all-unread-notes');
+	await os.api("i/read-all-unread-notes");
 }
 
 async function readAllMessagingMessages() {
-	await os.api('i/read-all-messaging-messages');
+	await os.api("i/read-all-messaging-messages");
 }
 
 async function readAllNotifications() {
-	await os.api('notifications/mark-all-as-read');
+	await os.api("notifications/mark-all-as-read");
 }
 
 function configure() {
-	const includingTypes = notificationTypes.filter(x => !$i!.mutingNotificationTypes.includes(x));
-	os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSettingWindow.vue')), {
-		includingTypes,
-		showGlobalToggle: false,
-	}, {
-		done: async (res) => {
-			const { includingTypes: value } = res;
-			await os.apiWithDialog('i/update', {
-				mutingNotificationTypes: notificationTypes.filter(x => !value.includes(x)),
-			}).then(i => {
-				$i!.mutingNotificationTypes = i.mutingNotificationTypes;
-			});
+	const includingTypes = notificationTypes.filter(
+		(x) => !$i!.mutingNotificationTypes.includes(x)
+	);
+	os.popup(
+		defineAsyncComponent(
+			() => import("@/components/MkNotificationSettingWindow.vue")
+		),
+		{
+			includingTypes,
+			showGlobalToggle: false,
 		},
-	}, 'closed');
+		{
+			done: async (res) => {
+				const { includingTypes: value } = res;
+				await os
+					.apiWithDialog("i/update", {
+						mutingNotificationTypes: notificationTypes.filter(
+							(x) => !value.includes(x)
+						),
+					})
+					.then((i) => {
+						$i!.mutingNotificationTypes = i.mutingNotificationTypes;
+					});
+			},
+		},
+		"closed"
+	);
 }
 
 function onChangeSendReadMessage(v: boolean) {
 	if (!pushRegistrationInServer) return;
 
-	os.apiWithDialog('sw/update-registration', {
+	os.apiWithDialog("sw/update-registration", {
 		endpoint: pushRegistrationInServer.endpoint,
 		sendReadMessage: v,
-	}).then(res => {
-		if (!allowButton)	return;
+	}).then((res) => {
+		if (!allowButton) return;
 		allowButton.pushRegistrationInServer = res;
 	});
 }
@@ -87,6 +129,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.notifications,
-	icon: 'ph-bell ph-bold ph-lg',
+	icon: "ph-bell ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/other.vue b/packages/client/src/pages/settings/other.vue
index 1782024f8..6a069493f 100644
--- a/packages/client/src/pages/settings/other.vue
+++ b/packages/client/src/pages/settings/other.vue
@@ -1,37 +1,49 @@
 <template>
-<div class="_formRoot">
-	<FormSwitch v-model="$i.injectFeaturedNote" class="_formBlock" @update:modelValue="onChangeInjectFeaturedNote">
-		{{ i18n.ts.showFeaturedNotesInTimeline }}
-	</FormSwitch>
+	<div class="_formRoot">
+		<FormSwitch
+			v-model="$i.injectFeaturedNote"
+			class="_formBlock"
+			@update:modelValue="onChangeInjectFeaturedNote"
+		>
+			{{ i18n.ts.showFeaturedNotesInTimeline }}
+		</FormSwitch>
 
-	<!--
+		<!--
 	<FormSwitch v-model="reportError" class="_formBlock">{{ i18n.ts.sendErrorReports }}<template #caption>{{ i18n.ts.sendErrorReportsDescription }}</template></FormSwitch>
 	-->
 
-	<FormLink to="/settings/account-info" class="_formBlock">{{ i18n.ts.accountInfo }}</FormLink>
+		<FormLink to="/settings/account-info" class="_formBlock">{{
+			i18n.ts.accountInfo
+		}}</FormLink>
 
-	<FormLink to="/registry" class="_formBlock"><template #icon><i class="ph-gear-six ph-bold ph-lg"></i></template>{{ i18n.ts.registry }}</FormLink>
+		<FormLink to="/registry" class="_formBlock"
+			><template #icon><i class="ph-gear-six ph-bold ph-lg"></i></template
+			>{{ i18n.ts.registry }}</FormLink
+		>
 
-	<FormLink to="/settings/delete-account" class="_formBlock"><template #icon><i class="ph-warning ph-bold ph-lg"></i></template>{{ i18n.ts.closeAccount }}</FormLink>
-</div>
+		<FormLink to="/settings/delete-account" class="_formBlock"
+			><template #icon><i class="ph-warning ph-bold ph-lg"></i></template
+			>{{ i18n.ts.closeAccount }}</FormLink
+		>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent } from 'vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormLink from '@/components/form/link.vue';
-import MkButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { popup } from '@/os';
-import { defaultStore } from '@/store';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, defineAsyncComponent } from "vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormLink from "@/components/form/link.vue";
+import MkButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { popup } from "@/os";
+import { defaultStore } from "@/store";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const reportError = computed(defaultStore.makeGetterSetter('reportError'));
+const reportError = computed(defaultStore.makeGetterSetter("reportError"));
 
 function onChangeInjectFeaturedNote(v) {
-	os.api('i/update', {
+	os.api("i/update", {
 		injectFeaturedNote: v,
 	}).then((i) => {
 		$i!.injectFeaturedNote = i.injectFeaturedNote;
@@ -44,6 +56,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.other,
-	icon: 'ph-dots-three-outline ph-bold ph-lg',
+	icon: "ph-dots-three-outline ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/plugin.install.vue b/packages/client/src/pages/settings/plugin.install.vue
index 25895c93f..ab678cf99 100644
--- a/packages/client/src/pages/settings/plugin.install.vue
+++ b/packages/client/src/pages/settings/plugin.install.vue
@@ -1,42 +1,50 @@
 <template>
-<div class="_formRoot">
-	<FormInfo warn class="_formBlock">{{ i18n.ts._plugin.installWarn }}</FormInfo>
+	<div class="_formRoot">
+		<FormInfo warn class="_formBlock">{{
+			i18n.ts._plugin.installWarn
+		}}</FormInfo>
 
-	<FormTextarea v-model="code" tall class="_formBlock">
-		<template #label>{{ i18n.ts.code }}</template>
-	</FormTextarea>
+		<FormTextarea v-model="code" tall class="_formBlock">
+			<template #label>{{ i18n.ts.code }}</template>
+		</FormTextarea>
 
-	<div class="_formBlock">
-		<FormButton :disabled="code == null" primary inline @click="install"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.install }}</FormButton>
+		<div class="_formBlock">
+			<FormButton :disabled="code == null" primary inline @click="install"
+				><i class="ph-check ph-bold ph-lg"></i>
+				{{ i18n.ts.install }}</FormButton
+			>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, nextTick, ref } from 'vue';
-import { AiScript, parse } from '@syuilo/aiscript';
-import { serialize } from '@syuilo/aiscript/built/serializer';
-import { v4 as uuid } from 'uuid';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormButton from '@/components/MkButton.vue';
-import FormInfo from '@/components/MkInfo.vue';
-import * as os from '@/os';
-import { ColdDeviceStorage } from '@/store';
-import { unisonReload } from '@/scripts/unison-reload';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { defineAsyncComponent, nextTick, ref } from "vue";
+import { AiScript, parse } from "@syuilo/aiscript";
+import { serialize } from "@syuilo/aiscript/built/serializer";
+import { v4 as uuid } from "uuid";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormButton from "@/components/MkButton.vue";
+import FormInfo from "@/components/MkInfo.vue";
+import * as os from "@/os";
+import { ColdDeviceStorage } from "@/store";
+import { unisonReload } from "@/scripts/unison-reload";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const code = ref(null);
 
 function installPlugin({ id, meta, ast, token }) {
-	ColdDeviceStorage.set('plugins', ColdDeviceStorage.get('plugins').concat({
-		...meta,
-		id,
-		active: true,
-		configData: {},
-		token: token,
-		ast: ast,
-	}));
+	ColdDeviceStorage.set(
+		"plugins",
+		ColdDeviceStorage.get("plugins").concat({
+			...meta,
+			id,
+			active: true,
+			configData: {},
+			token: token,
+			ast: ast,
+		})
+	);
 }
 
 async function install() {
@@ -45,8 +53,8 @@ async function install() {
 		ast = parse(code.value);
 	} catch (err) {
 		os.alert({
-			type: 'error',
-			text: 'Syntax error :(',
+			type: "error",
+			text: "Syntax error :(",
 		});
 		return;
 	}
@@ -54,8 +62,8 @@ async function install() {
 	const meta = AiScript.collectMetadata(ast);
 	if (meta == null) {
 		os.alert({
-			type: 'error',
-			text: 'No metadata found :(',
+			type: "error",
+			text: "No metadata found :(",
 		});
 		return;
 	}
@@ -63,44 +71,65 @@ async function install() {
 	const metadata = meta.get(null);
 	if (metadata == null) {
 		os.alert({
-			type: 'error',
-			text: 'No metadata found :(',
+			type: "error",
+			text: "No metadata found :(",
 		});
 		return;
 	}
 
-	const { name, version, author, description, permissions, config } = metadata;
+	const { name, version, author, description, permissions, config } =
+		metadata;
 	if (name == null || version == null || author == null) {
 		os.alert({
-			type: 'error',
-			text: 'Required property not found :(',
+			type: "error",
+			text: "Required property not found :(",
 		});
 		return;
 	}
 
-	const token = permissions == null || permissions.length === 0 ? null : await new Promise((res, rej) => {
-		os.popup(defineAsyncComponent(() => import('@/components/MkTokenGenerateWindow.vue')), {
-			title: i18n.ts.tokenRequested,
-			information: i18n.ts.pluginTokenRequestedDescription,
-			initialName: name,
-			initialPermissions: permissions,
-		}, {
-			done: async result => {
-				const { name, permissions } = result;
-				const { token } = await os.api('miauth/gen-token', {
-					session: null,
-					name: name,
-					permission: permissions,
-				});
-				res(token);
-			},
-		}, 'closed');
-	});
+	const token =
+		permissions == null || permissions.length === 0
+			? null
+			: await new Promise((res, rej) => {
+					os.popup(
+						defineAsyncComponent(
+							() =>
+								import("@/components/MkTokenGenerateWindow.vue")
+						),
+						{
+							title: i18n.ts.tokenRequested,
+							information:
+								i18n.ts.pluginTokenRequestedDescription,
+							initialName: name,
+							initialPermissions: permissions,
+						},
+						{
+							done: async (result) => {
+								const { name, permissions } = result;
+								const { token } = await os.api(
+									"miauth/gen-token",
+									{
+										session: null,
+										name: name,
+										permission: permissions,
+									}
+								);
+								res(token);
+							},
+						},
+						"closed"
+					);
+			  });
 
 	installPlugin({
 		id: uuid(),
 		meta: {
-			name, version, author, description, permissions, config,
+			name,
+			version,
+			author,
+			description,
+			permissions,
+			config,
 		},
 		token,
 		ast: serialize(ast),
@@ -119,6 +148,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts._plugin.install,
-	icon: 'ph-download-simple ph-bold ph-lg',
+	icon: "ph-download-simple ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/plugin.vue b/packages/client/src/pages/settings/plugin.vue
index 7949bff03..6120c483e 100644
--- a/packages/client/src/pages/settings/plugin.vue
+++ b/packages/client/src/pages/settings/plugin.vue
@@ -1,53 +1,84 @@
 <template>
-<div class="_formRoot">
-	<FormLink to="/settings/plugin/install"><template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>{{ i18n.ts._plugin.install }}</FormLink>
+	<div class="_formRoot">
+		<FormLink to="/settings/plugin/install"
+			><template #icon
+				><i class="ph-download-simple ph-bold ph-lg"></i></template
+			>{{ i18n.ts._plugin.install }}</FormLink
+		>
 
-	<FormSection>
-		<template #label>{{ i18n.ts.manage }}</template>
-		<div v-for="plugin in plugins" :key="plugin.id" class="_formBlock _panel" style="padding: 20px;">
-			<span style="display: flex;"><b>{{ plugin.name }}</b><span style="margin-left: auto;">v{{ plugin.version }}</span></span>
+		<FormSection>
+			<template #label>{{ i18n.ts.manage }}</template>
+			<div
+				v-for="plugin in plugins"
+				:key="plugin.id"
+				class="_formBlock _panel"
+				style="padding: 20px"
+			>
+				<span style="display: flex"
+					><b>{{ plugin.name }}</b
+					><span style="margin-left: auto"
+						>v{{ plugin.version }}</span
+					></span
+				>
 
-			<FormSwitch class="_formBlock" :model-value="plugin.active" @update:modelValue="changeActive(plugin, $event)">{{ i18n.ts.makeActive }}</FormSwitch>
+				<FormSwitch
+					class="_formBlock"
+					:model-value="plugin.active"
+					@update:modelValue="changeActive(plugin, $event)"
+					>{{ i18n.ts.makeActive }}</FormSwitch
+				>
 
-			<MkKeyValue class="_formBlock">
-				<template #key>{{ i18n.ts.author }}</template>
-				<template #value>{{ plugin.author }}</template>
-			</MkKeyValue>
-			<MkKeyValue class="_formBlock">
-				<template #key>{{ i18n.ts.description }}</template>
-				<template #value>{{ plugin.description }}</template>
-			</MkKeyValue>
-			<MkKeyValue class="_formBlock">
-				<template #key>{{ i18n.ts.permission }}</template>
-				<template #value>{{ plugin.permission }}</template>
-			</MkKeyValue>
+				<MkKeyValue class="_formBlock">
+					<template #key>{{ i18n.ts.author }}</template>
+					<template #value>{{ plugin.author }}</template>
+				</MkKeyValue>
+				<MkKeyValue class="_formBlock">
+					<template #key>{{ i18n.ts.description }}</template>
+					<template #value>{{ plugin.description }}</template>
+				</MkKeyValue>
+				<MkKeyValue class="_formBlock">
+					<template #key>{{ i18n.ts.permission }}</template>
+					<template #value>{{ plugin.permission }}</template>
+				</MkKeyValue>
 
-			<div style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-				<MkButton v-if="plugin.config" inline @click="config(plugin)"><i class="ph-gear-six ph-bold ph-lg"></i> {{ i18n.ts.settings }}</MkButton>
-				<MkButton inline danger @click="uninstall(plugin)"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.uninstall }}</MkButton>
+				<div style="display: flex; gap: var(--margin); flex-wrap: wrap">
+					<MkButton
+						v-if="plugin.config"
+						inline
+						@click="config(plugin)"
+						><i class="ph-gear-six ph-bold ph-lg"></i>
+						{{ i18n.ts.settings }}</MkButton
+					>
+					<MkButton inline danger @click="uninstall(plugin)"
+						><i class="ph-trash ph-bold ph-lg"></i>
+						{{ i18n.ts.uninstall }}</MkButton
+					>
+				</div>
 			</div>
-		</div>
-	</FormSection>
-</div>
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, ref } from 'vue';
-import FormLink from '@/components/form/link.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import * as os from '@/os';
-import { ColdDeviceStorage } from '@/store';
-import { unisonReload } from '@/scripts/unison-reload';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { nextTick, ref } from "vue";
+import FormLink from "@/components/form/link.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormSection from "@/components/form/section.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import * as os from "@/os";
+import { ColdDeviceStorage } from "@/store";
+import { unisonReload } from "@/scripts/unison-reload";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const plugins = ref(ColdDeviceStorage.get('plugins'));
+const plugins = ref(ColdDeviceStorage.get("plugins"));
 
 function uninstall(plugin) {
-	ColdDeviceStorage.set('plugins', plugins.value.filter(x => x.id !== plugin.id));
+	ColdDeviceStorage.set(
+		"plugins",
+		plugins.value.filter((x) => x.id !== plugin.id)
+	);
 	os.success();
 	nextTick(() => {
 		unisonReload();
@@ -64,9 +95,9 @@ async function config(plugin) {
 	const { canceled, result } = await os.form(plugin.name, config);
 	if (canceled) return;
 
-	const coldPlugins = ColdDeviceStorage.get('plugins');
-	coldPlugins.find(p => p.id === plugin.id)!.configData = result;
-	ColdDeviceStorage.set('plugins', coldPlugins);
+	const coldPlugins = ColdDeviceStorage.get("plugins");
+	coldPlugins.find((p) => p.id === plugin.id)!.configData = result;
+	ColdDeviceStorage.set("plugins", coldPlugins);
 
 	nextTick(() => {
 		location.reload();
@@ -74,9 +105,9 @@ async function config(plugin) {
 }
 
 function changeActive(plugin, active) {
-	const coldPlugins = ColdDeviceStorage.get('plugins');
-	coldPlugins.find(p => p.id === plugin.id)!.active = active;
-	ColdDeviceStorage.set('plugins', coldPlugins);
+	const coldPlugins = ColdDeviceStorage.get("plugins");
+	coldPlugins.find((p) => p.id === plugin.id)!.active = active;
+	ColdDeviceStorage.set("plugins", coldPlugins);
 
 	nextTick(() => {
 		location.reload();
@@ -89,10 +120,8 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.plugins,
-	icon: 'ph-plug ph-bold ph-lg',
+	icon: "ph-plug ph-bold ph-lg",
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index b9bc979f7..b58a42597 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -1,113 +1,145 @@
 <template>
-<div class="_formRoot">
-	<div :class="$style.buttons">
-		<MkButton inline primary @click="saveNew">{{ ts._preferencesBackups.saveNew }}</MkButton>
-		<MkButton inline @click="loadFile">{{ ts._preferencesBackups.loadFile }}</MkButton>
-	</div>
-
-	<FormSection>
-		<template #label>{{ ts._preferencesBackups.list }}</template>
-		<template v-if="profiles && Object.keys(profiles).length > 0">
-			<div
-				v-for="(profile, id) in profiles"
-				:key="id"
-				class="_formBlock _panel"
-				:class="$style.profile"
-				@click="$event => menu($event, id)"
-				@contextmenu.prevent.stop="$event => menu($event, id)"
-			>
-				<div :class="$style.profileName">{{ profile.name }}</div>
-				<div :class="$style.profileTime">{{ t('_preferencesBackups.createdAt', { date: (new Date(profile.createdAt)).toLocaleDateString(), time: (new Date(profile.createdAt)).toLocaleTimeString() }) }}</div>
-				<div v-if="profile.updatedAt" :class="$style.profileTime">{{ t('_preferencesBackups.updatedAt', { date: (new Date(profile.updatedAt)).toLocaleDateString(), time: (new Date(profile.updatedAt)).toLocaleTimeString() }) }}</div>
-			</div>
-		</template>
-		<div v-else-if="profiles">
-			<MkInfo>{{ ts._preferencesBackups.noBackups }}</MkInfo>
+	<div class="_formRoot">
+		<div :class="$style.buttons">
+			<MkButton inline primary @click="saveNew">{{
+				ts._preferencesBackups.saveNew
+			}}</MkButton>
+			<MkButton inline @click="loadFile">{{
+				ts._preferencesBackups.loadFile
+			}}</MkButton>
 		</div>
-		<MkLoading v-else/>
-	</FormSection>
-</div>
+
+		<FormSection>
+			<template #label>{{ ts._preferencesBackups.list }}</template>
+			<template v-if="profiles && Object.keys(profiles).length > 0">
+				<div
+					v-for="(profile, id) in profiles"
+					:key="id"
+					class="_formBlock _panel"
+					:class="$style.profile"
+					@click="($event) => menu($event, id)"
+					@contextmenu.prevent.stop="($event) => menu($event, id)"
+				>
+					<div :class="$style.profileName">{{ profile.name }}</div>
+					<div :class="$style.profileTime">
+						{{
+							t("_preferencesBackups.createdAt", {
+								date: new Date(
+									profile.createdAt
+								).toLocaleDateString(),
+								time: new Date(
+									profile.createdAt
+								).toLocaleTimeString(),
+							})
+						}}
+					</div>
+					<div v-if="profile.updatedAt" :class="$style.profileTime">
+						{{
+							t("_preferencesBackups.updatedAt", {
+								date: new Date(
+									profile.updatedAt
+								).toLocaleDateString(),
+								time: new Date(
+									profile.updatedAt
+								).toLocaleTimeString(),
+							})
+						}}
+					</div>
+				</div>
+			</template>
+			<div v-else-if="profiles">
+				<MkInfo>{{ ts._preferencesBackups.noBackups }}</MkInfo>
+			</div>
+			<MkLoading v-else />
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, useCssModule } from 'vue';
-import { v4 as uuid } from 'uuid';
-import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import * as os from '@/os';
-import { ColdDeviceStorage, defaultStore } from '@/store';
-import { unisonReload } from '@/scripts/unison-reload';
-import { stream } from '@/stream';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { version, host } from '@/config';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, onMounted, onUnmounted, useCssModule } from "vue";
+import { v4 as uuid } from "uuid";
+import FormSection from "@/components/form/section.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInfo from "@/components/MkInfo.vue";
+import * as os from "@/os";
+import { ColdDeviceStorage, defaultStore } from "@/store";
+import { unisonReload } from "@/scripts/unison-reload";
+import { stream } from "@/stream";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { version, host } from "@/config";
+import { definePageMetadata } from "@/scripts/page-metadata";
 const { t, ts } = i18n;
 
 useCssModule();
 
-const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
-	'menu',
-	'visibility',
-	'localOnly',
-	'statusbars',
-	'widgets',
-	'tl',
-	'overridedDeviceKind',
-	'showLocalPostsInTimeline',
-	'serverDisconnectedBehavior',
-	'nsfw',
-	'showAds',
-	'animation',
-	'animatedMfm',
-	'loadRawImages',
-	'imageNewTab',
-	'disableShowingAnimatedImages',
-	'disablePagesScript',
-	'enterSendsMessage',
-	'useOsNativeEmojis',
-	'disableDrawer',
-	'useBlurEffectForModal',
-	'useBlurEffect',
-	'showFixedPostForm',
-	'enableInfiniteScroll',
-	'useReactionPickerForContextMenu',
-	'showGapBetweenNotesInTimeline',
-	'instanceTicker',
-	'reactionPickerSize',
-	'reactionPickerWidth',
-	'reactionPickerHeight',
-	'reactionPickerUseDrawerForMobile',
-	'defaultSideView',
-	'menuDisplay',
-	'reportError',
-	'squareAvatars',
-	'numberOfPageCache',
-	'showUpdates',
-	'swipeOnDesktop',
-	'showAdminUpdates',
-	'enableCustomKaTeXMacro',
+const defaultStoreSaveKeys: (keyof (typeof defaultStore)["state"])[] = [
+	"menu",
+	"visibility",
+	"localOnly",
+	"statusbars",
+	"widgets",
+	"tl",
+	"overridedDeviceKind",
+	"showLocalPostsInTimeline",
+	"serverDisconnectedBehavior",
+	"nsfw",
+	"showAds",
+	"animation",
+	"animatedMfm",
+	"loadRawImages",
+	"imageNewTab",
+	"disableShowingAnimatedImages",
+	"disablePagesScript",
+	"enterSendsMessage",
+	"useOsNativeEmojis",
+	"disableDrawer",
+	"useBlurEffectForModal",
+	"useBlurEffect",
+	"showFixedPostForm",
+	"enableInfiniteScroll",
+	"useReactionPickerForContextMenu",
+	"showGapBetweenNotesInTimeline",
+	"instanceTicker",
+	"reactionPickerSize",
+	"reactionPickerWidth",
+	"reactionPickerHeight",
+	"reactionPickerUseDrawerForMobile",
+	"defaultSideView",
+	"menuDisplay",
+	"reportError",
+	"squareAvatars",
+	"numberOfPageCache",
+	"showUpdates",
+	"swipeOnDesktop",
+	"showAdminUpdates",
+	"enableCustomKaTeXMacro",
 ];
 const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [
-	'lightTheme',
-	'darkTheme',
-	'syncDeviceDarkMode',
-	'plugins',
-	'mediaVolume',
-	'sound_masterVolume',
-	'sound_note',
-	'sound_noteMy',
-	'sound_notification',
-	'sound_chat',
-	'sound_chatBg',
-	'sound_antenna',
-	'sound_channel',
+	"lightTheme",
+	"darkTheme",
+	"syncDeviceDarkMode",
+	"plugins",
+	"mediaVolume",
+	"sound_masterVolume",
+	"sound_note",
+	"sound_noteMy",
+	"sound_notification",
+	"sound_chat",
+	"sound_chatBg",
+	"sound_antenna",
+	"sound_channel",
 ];
 
-const scope = ['clientPreferencesProfiles'];
+const scope = ["clientPreferencesProfiles"];
 
-const profileProps = ['name', 'createdAt', 'updatedAt', 'misskeyVersion', 'settings'];
+const profileProps = [
+	"name",
+	"createdAt",
+	"updatedAt",
+	"misskeyVersion",
+	"settings",
+];
 
 type Profile = {
 	name: string;
@@ -119,49 +151,54 @@ type Profile = {
 		hot: Record<keyof typeof defaultStoreSaveKeys, unknown>;
 		cold: Record<keyof typeof coldDeviceStorageSaveKeys, unknown>;
 		fontSize: string | null;
-		useSystemFont: 't' | null;
+		useSystemFont: "t" | null;
 		wallpaper: string | null;
 	};
 };
 
-const connection = $i && stream.useChannel('main');
+const connection = $i && stream.useChannel("main");
 
 let profiles = $ref<Record<string, Profile> | null>(null);
 
-os.api('i/registry/get-all', { scope })
-	.then(res => {
-		profiles = res || {};
-	});
+os.api("i/registry/get-all", { scope }).then((res) => {
+	profiles = res || {};
+});
 
 function isObject(value: unknown): value is Record<string, unknown> {
-	return value != null && typeof value === 'object' && !Array.isArray(value);
+	return value != null && typeof value === "object" && !Array.isArray(value);
 }
 
 function validate(profile: unknown): void {
-	if (!isObject(profile)) throw new Error('not an object');
+	if (!isObject(profile)) throw new Error("not an object");
 
 	// Check if unnecessary properties exist
-	if (Object.keys(profile).some(key => !profileProps.includes(key))) throw new Error('Unnecessary properties exist');
+	if (Object.keys(profile).some((key) => !profileProps.includes(key)))
+		throw new Error("Unnecessary properties exist");
+
+	if (!profile.name) throw new Error("Missing required prop: name");
+	if (!profile.misskeyVersion)
+		throw new Error("Missing required prop: misskeyVersion");
 
-	if (!profile.name) throw new Error('Missing required prop: name');
-	if (!profile.misskeyVersion) throw new Error('Missing required prop: misskeyVersion');
-	
 	// Check if createdAt and updatedAt is Date
 	// https://zenn.dev/lollipop_onl/articles/eoz-judge-js-invalid-date
-	if (!profile.createdAt || Number.isNaN(new Date(profile.createdAt).getTime())) throw new Error('createdAt is falsy or not Date');
+	if (
+		!profile.createdAt ||
+		Number.isNaN(new Date(profile.createdAt).getTime())
+	)
+		throw new Error("createdAt is falsy or not Date");
 	if (profile.updatedAt) {
 		if (Number.isNaN(new Date(profile.updatedAt).getTime())) {
-			throw new Error('updatedAt is not Date');
+			throw new Error("updatedAt is not Date");
 		}
 	} else if (profile.updatedAt !== null) {
-		throw new Error('updatedAt is not null');
+		throw new Error("updatedAt is not null");
 	}
 
-	if (!profile.settings) throw new Error('Missing required prop: settings');
-	if (!isObject(profile.settings)) throw new Error('Invalid prop: settings');
+	if (!profile.settings) throw new Error("Missing required prop: settings");
+	if (!isObject(profile.settings)) throw new Error("Invalid prop: settings");
 }
 
-function getSettings(): Profile['settings'] {
+function getSettings(): Profile["settings"] {
 	const hot = {} as Record<keyof typeof defaultStoreSaveKeys, unknown>;
 	for (const key of defaultStoreSaveKeys) {
 		hot[key] = defaultStore.state[key];
@@ -175,9 +212,9 @@ function getSettings(): Profile['settings'] {
 	return {
 		hot,
 		cold,
-		fontSize: localStorage.getItem('fontSize'),
-		useSystemFont: localStorage.getItem('useSystemFont') as 't' | null,
-		wallpaper: localStorage.getItem('wallpaper'),
+		fontSize: localStorage.getItem("fontSize"),
+		useSystemFont: localStorage.getItem("useSystemFont") as "t" | null,
+		wallpaper: localStorage.getItem("wallpaper"),
 	};
 }
 
@@ -189,28 +226,32 @@ async function saveNew(): Promise<void> {
 	});
 	if (canceled) return;
 
-	if (Object.values(profiles).some(x => x.name === name)) {
+	if (Object.values(profiles).some((x) => x.name === name)) {
 		return os.alert({
 			title: ts._preferencesBackups.cannotSave,
-			text: t('_preferencesBackups.nameAlreadyExists', { name }),
+			text: t("_preferencesBackups.nameAlreadyExists", { name }),
 		});
 	}
 
 	const id = uuid();
 	const profile: Profile = {
 		name,
-		createdAt: (new Date()).toISOString(),
+		createdAt: new Date().toISOString(),
 		updatedAt: null,
 		misskeyVersion: version,
 		host,
 		settings: getSettings(),
 	};
-	await os.apiWithDialog('i/registry/set', { scope, key: id, value: profile });
+	await os.apiWithDialog("i/registry/set", {
+		scope,
+		key: id,
+		value: profile,
+	});
 }
 
 function loadFile(): void {
-	const input = document.createElement('input');
-	input.type = 'file';
+	const input = document.createElement("input");
+	input.type = "file";
 	input.multiple = false;
 	input.onchange = async () => {
 		if (!profiles) return;
@@ -218,9 +259,9 @@ function loadFile(): void {
 
 		const file = input.files[0];
 
-		if (file.type !== 'application/json') {
+		if (file.type !== "application/json") {
 			return os.alert({
-				type: 'error',
+				type: "error",
 				title: ts._preferencesBackups.cannotLoad,
 				text: ts._preferencesBackups.invalidFile,
 			});
@@ -232,14 +273,18 @@ function loadFile(): void {
 			validate(profile);
 		} catch (err) {
 			return os.alert({
-				type: 'error',
+				type: "error",
 				title: ts._preferencesBackups.cannotLoad,
 				text: err?.message,
 			});
 		}
 
 		const id = uuid();
-		await os.apiWithDialog('i/registry/set', { scope, key: id, value: profile });
+		await os.apiWithDialog("i/registry/set", {
+			scope,
+			key: id,
+			value: profile,
+		});
 
 		// 一応廃棄
 		(window as any).__misskey_input_ref__ = null;
@@ -258,9 +303,9 @@ async function applyProfile(id: string): Promise<void> {
 	const profile = profiles[id];
 
 	const { canceled: cancel1 } = await os.confirm({
-		type: 'warning',
+		type: "warning",
 		title: ts._preferencesBackups.apply,
-		text: t('_preferencesBackups.applyConfirm', { name: profile.name }),
+		text: t("_preferencesBackups.applyConfirm", { name: profile.name }),
 	});
 	if (cancel1) return;
 
@@ -274,7 +319,7 @@ async function applyProfile(id: string): Promise<void> {
 			defaultStore.set(key, settings.hot[key]);
 		}
 	}
-	
+
 	// coldDeviceStorage
 	for (const key of coldDeviceStorageSaveKeys) {
 		if (settings.cold[key] !== undefined) {
@@ -284,27 +329,27 @@ async function applyProfile(id: string): Promise<void> {
 
 	// fontSize
 	if (settings.fontSize) {
-		localStorage.setItem('fontSize', settings.fontSize);
+		localStorage.setItem("fontSize", settings.fontSize);
 	} else {
-		localStorage.removeItem('fontSize');
+		localStorage.removeItem("fontSize");
 	}
 
 	// useSystemFont
 	if (settings.useSystemFont) {
-		localStorage.setItem('useSystemFont', settings.useSystemFont);
+		localStorage.setItem("useSystemFont", settings.useSystemFont);
 	} else {
-		localStorage.removeItem('useSystemFont');
+		localStorage.removeItem("useSystemFont");
 	}
 
 	// wallpaper
 	if (settings.wallpaper != null) {
-		localStorage.setItem('wallpaper', settings.wallpaper);
+		localStorage.setItem("wallpaper", settings.wallpaper);
 	} else {
-		localStorage.removeItem('wallpaper');
+		localStorage.removeItem("wallpaper");
 	}
 
 	const { canceled: cancel2 } = await os.confirm({
-		type: 'info',
+		type: "info",
 		text: ts.reloadToApplySetting,
 	});
 	if (cancel2) return;
@@ -316,13 +361,13 @@ async function deleteProfile(id: string): Promise<void> {
 	if (!profiles) return;
 
 	const { canceled } = await os.confirm({
-		type: 'info',
+		type: "info",
 		title: ts.delete,
-		text: t('deleteAreYouSure', { x: profiles[id].name }),
+		text: t("deleteAreYouSure", { x: profiles[id].name }),
 	});
 	if (canceled) return;
 
-	await os.apiWithDialog('i/registry/remove', { scope, key: id });
+	await os.apiWithDialog("i/registry/remove", { scope, key: id });
 	delete profiles[id];
 }
 
@@ -332,21 +377,25 @@ async function save(id: string): Promise<void> {
 	const { name, createdAt } = profiles[id];
 
 	const { canceled } = await os.confirm({
-		type: 'info',
+		type: "info",
 		title: ts._preferencesBackups.save,
-		text: t('_preferencesBackups.saveConfirm', { name }),
+		text: t("_preferencesBackups.saveConfirm", { name }),
 	});
 	if (canceled) return;
 
 	const profile: Profile = {
 		name,
 		createdAt,
-		updatedAt: (new Date()).toISOString(),
+		updatedAt: new Date().toISOString(),
 		misskeyVersion: version,
 		host,
 		settings: getSettings(),
 	};
-	await os.apiWithDialog('i/registry/set', { scope, key: id, value: profile });
+	await os.apiWithDialog("i/registry/set", {
+		scope,
+		key: id,
+		value: profile,
+	});
 }
 
 async function rename(id: string): Promise<void> {
@@ -357,74 +406,106 @@ async function rename(id: string): Promise<void> {
 	});
 	if (cancel1 || profiles[id].name === name) return;
 
-	if (Object.values(profiles).some(x => x.name === name)) {
+	if (Object.values(profiles).some((x) => x.name === name)) {
 		return os.alert({
 			title: ts._preferencesBackups.cannotSave,
-			text: t('_preferencesBackups.nameAlreadyExists', { name }),
+			text: t("_preferencesBackups.nameAlreadyExists", { name }),
 		});
 	}
 
 	const registry = Object.assign({}, { ...profiles[id] });
 
 	const { canceled: cancel2 } = await os.confirm({
-		type: 'info',
+		type: "info",
 		title: ts._preferencesBackups.rename,
-		text: t('_preferencesBackups.renameConfirm', { old: registry.name, new: name }),
+		text: t("_preferencesBackups.renameConfirm", {
+			old: registry.name,
+			new: name,
+		}),
 	});
 	if (cancel2) return;
 
 	registry.name = name;
-	await os.apiWithDialog('i/registry/set', { scope, key: id, value: registry });
+	await os.apiWithDialog("i/registry/set", {
+		scope,
+		key: id,
+		value: registry,
+	});
 }
 
 function menu(ev: MouseEvent, profileId: string) {
 	if (!profiles) return;
 
-	return os.popupMenu([{
-		text: ts._preferencesBackups.apply,
-		icon: 'ph-caret-circle-down ph-bold ph-lg',
-		action: () => applyProfile(profileId),
-	}, {
-		type: 'a',
-		text: ts.download,
-		icon: 'ph-download-simple ph-bold ph-lg',
-		href: URL.createObjectURL(new Blob([JSON.stringify(profiles[profileId], null, 2)], { type: 'application/json' })),
-		download: `${profiles[profileId].name}.json`,
-	}, null, {
-		text: ts.rename,
-		icon: 'ph-cursor-text ph-bold ph-lg',
-		action: () => rename(profileId),
-	}, {
-		text: ts._preferencesBackups.save,
-		icon: 'ph-floppy-disk ph-bold ph-lg',
-		action: () => save(profileId),
-	}, null, {
-		text: ts._preferencesBackups.delete,
-		icon: 'ph-trash ph-bold ph-lg',
-		action: () => deleteProfile(profileId),
-		danger: true,
-	}], ev.currentTarget ?? ev.target);
+	return os.popupMenu(
+		[
+			{
+				text: ts._preferencesBackups.apply,
+				icon: "ph-caret-circle-down ph-bold ph-lg",
+				action: () => applyProfile(profileId),
+			},
+			{
+				type: "a",
+				text: ts.download,
+				icon: "ph-download-simple ph-bold ph-lg",
+				href: URL.createObjectURL(
+					new Blob([JSON.stringify(profiles[profileId], null, 2)], {
+						type: "application/json",
+					})
+				),
+				download: `${profiles[profileId].name}.json`,
+			},
+			null,
+			{
+				text: ts.rename,
+				icon: "ph-cursor-text ph-bold ph-lg",
+				action: () => rename(profileId),
+			},
+			{
+				text: ts._preferencesBackups.save,
+				icon: "ph-floppy-disk ph-bold ph-lg",
+				action: () => save(profileId),
+			},
+			null,
+			{
+				text: ts._preferencesBackups.delete,
+				icon: "ph-trash ph-bold ph-lg",
+				action: () => deleteProfile(profileId),
+				danger: true,
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
 }
 
 onMounted(() => {
 	// streamingのuser storage updateイベントを監視して更新
-	connection?.on('registryUpdated', ({ scope: recievedScope, key, value }) => {
-		if (!recievedScope || recievedScope.length !== scope.length || recievedScope[0] !== scope[0]) return;
-		if (!profiles) return;
+	connection?.on(
+		"registryUpdated",
+		({ scope: recievedScope, key, value }) => {
+			if (
+				!recievedScope ||
+				recievedScope.length !== scope.length ||
+				recievedScope[0] !== scope[0]
+			)
+				return;
+			if (!profiles) return;
 
-		profiles[key] = value;
-	});
+			profiles[key] = value;
+		}
+	);
 });
 
 onUnmounted(() => {
-	connection?.off('registryUpdated');
+	connection?.off("registryUpdated");
 });
 
-definePageMetadata(computed(() => ({
-	title: ts.preferencesBackups,
-	icon: 'ph-floppy-disk ph-bold ph-lg',
-	bg: 'var(--bg)',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: ts.preferencesBackups,
+		icon: "ph-floppy-disk ph-bold ph-lg",
+		bg: "var(--bg)",
+	}))
+);
 </script>
 
 <style lang="scss" module>
@@ -443,8 +524,8 @@ definePageMetadata(computed(() => ({
 	}
 
 	&Time {
-		font-size: .85em;
-		opacity: .7;
+		font-size: 0.85em;
+		opacity: 0.7;
 	}
 }
 </style>
diff --git a/packages/client/src/pages/settings/privacy.vue b/packages/client/src/pages/settings/privacy.vue
index 0a8de0b38..c3ab41a64 100644
--- a/packages/client/src/pages/settings/privacy.vue
+++ b/packages/client/src/pages/settings/privacy.vue
@@ -1,68 +1,142 @@
 <template>
-<div class="_formRoot">
-	<FormSwitch v-model="isLocked" class="_formBlock" @update:modelValue="save()">{{ i18n.ts.makeFollowManuallyApprove }}<template #caption>{{ i18n.ts.lockedAccountInfo }}</template></FormSwitch>
-	<FormSwitch v-if="isLocked" v-model="autoAcceptFollowed" class="_formBlock" @update:modelValue="save()">{{ i18n.ts.autoAcceptFollowed }}</FormSwitch>
+	<div class="_formRoot">
+		<FormSwitch
+			v-model="isLocked"
+			class="_formBlock"
+			@update:modelValue="save()"
+			>{{ i18n.ts.makeFollowManuallyApprove
+			}}<template #caption>{{
+				i18n.ts.lockedAccountInfo
+			}}</template></FormSwitch
+		>
+		<FormSwitch
+			v-if="isLocked"
+			v-model="autoAcceptFollowed"
+			class="_formBlock"
+			@update:modelValue="save()"
+			>{{ i18n.ts.autoAcceptFollowed }}</FormSwitch
+		>
 
-	<FormSwitch v-model="publicReactions" class="_formBlock" @update:modelValue="save()">
-		{{ i18n.ts.makeReactionsPublic }}
-		<template #caption>{{ i18n.ts.makeReactionsPublicDescription }}</template>
-	</FormSwitch>
+		<FormSwitch
+			v-model="publicReactions"
+			class="_formBlock"
+			@update:modelValue="save()"
+		>
+			{{ i18n.ts.makeReactionsPublic }}
+			<template #caption>{{
+				i18n.ts.makeReactionsPublicDescription
+			}}</template>
+		</FormSwitch>
 
-	<FormSelect v-model="ffVisibility" class="_formBlock" @update:modelValue="save()">
-		<template #label>{{ i18n.ts.ffVisibility }}</template>
-		<option value="public">{{ i18n.ts._ffVisibility.public }}</option>
-		<option value="followers">{{ i18n.ts._ffVisibility.followers }}</option>
-		<option value="private">{{ i18n.ts._ffVisibility.private }}</option>
-		<template #caption>{{ i18n.ts.ffVisibilityDescription }}</template>
-	</FormSelect>
+		<FormSelect
+			v-model="ffVisibility"
+			class="_formBlock"
+			@update:modelValue="save()"
+		>
+			<template #label>{{ i18n.ts.ffVisibility }}</template>
+			<option value="public">{{ i18n.ts._ffVisibility.public }}</option>
+			<option value="followers">
+				{{ i18n.ts._ffVisibility.followers }}
+			</option>
+			<option value="private">{{ i18n.ts._ffVisibility.private }}</option>
+			<template #caption>{{ i18n.ts.ffVisibilityDescription }}</template>
+		</FormSelect>
 
-	<FormSwitch v-model="hideOnlineStatus" class="_formBlock" @update:modelValue="save()">
-		{{ i18n.ts.hideOnlineStatus }}
-		<template #caption>{{ i18n.ts.hideOnlineStatusDescription }}</template>
-	</FormSwitch>
-	<FormSwitch v-model="noCrawle" class="_formBlock" @update:modelValue="save()">
-		{{ i18n.ts.noCrawle }}
-		<template #caption>{{ i18n.ts.noCrawleDescription }}</template>
-	</FormSwitch>
-	<FormSwitch v-model="isExplorable" class="_formBlock" @update:modelValue="save()">
-		{{ i18n.ts.makeExplorable }}
-		<template #caption>{{ i18n.ts.makeExplorableDescription }}</template>
-	</FormSwitch>
+		<FormSwitch
+			v-model="hideOnlineStatus"
+			class="_formBlock"
+			@update:modelValue="save()"
+		>
+			{{ i18n.ts.hideOnlineStatus }}
+			<template #caption>{{
+				i18n.ts.hideOnlineStatusDescription
+			}}</template>
+		</FormSwitch>
+		<FormSwitch
+			v-model="noCrawle"
+			class="_formBlock"
+			@update:modelValue="save()"
+		>
+			{{ i18n.ts.noCrawle }}
+			<template #caption>{{ i18n.ts.noCrawleDescription }}</template>
+		</FormSwitch>
+		<FormSwitch
+			v-model="isExplorable"
+			class="_formBlock"
+			@update:modelValue="save()"
+		>
+			{{ i18n.ts.makeExplorable }}
+			<template #caption>{{
+				i18n.ts.makeExplorableDescription
+			}}</template>
+		</FormSwitch>
 
-	<FormSection>
-		<FormSwitch v-model="rememberNoteVisibility" class="_formBlock" @update:modelValue="save()">{{ i18n.ts.rememberNoteVisibility }}</FormSwitch>
-		<FormFolder v-if="!rememberNoteVisibility" class="_formBlock">
-			<template #label>{{ i18n.ts.defaultNoteVisibility }}</template>
-			<template v-if="defaultNoteVisibility === 'public'" #suffix>{{ i18n.ts._visibility.public }}</template>
-			<template v-else-if="defaultNoteVisibility === 'home'" #suffix>{{ i18n.ts._visibility.home }}</template>
-			<template v-else-if="defaultNoteVisibility === 'followers'" #suffix>{{ i18n.ts._visibility.followers }}</template>
-			<template v-else-if="defaultNoteVisibility === 'specified'" #suffix>{{ i18n.ts._visibility.specified }}</template>
+		<FormSection>
+			<FormSwitch
+				v-model="rememberNoteVisibility"
+				class="_formBlock"
+				@update:modelValue="save()"
+				>{{ i18n.ts.rememberNoteVisibility }}</FormSwitch
+			>
+			<FormFolder v-if="!rememberNoteVisibility" class="_formBlock">
+				<template #label>{{ i18n.ts.defaultNoteVisibility }}</template>
+				<template v-if="defaultNoteVisibility === 'public'" #suffix>{{
+					i18n.ts._visibility.public
+				}}</template>
+				<template
+					v-else-if="defaultNoteVisibility === 'home'"
+					#suffix
+					>{{ i18n.ts._visibility.home }}</template
+				>
+				<template
+					v-else-if="defaultNoteVisibility === 'followers'"
+					#suffix
+					>{{ i18n.ts._visibility.followers }}</template
+				>
+				<template
+					v-else-if="defaultNoteVisibility === 'specified'"
+					#suffix
+					>{{ i18n.ts._visibility.specified }}</template
+				>
 
-			<FormSelect v-model="defaultNoteVisibility" class="_formBlock">
-				<option value="public">{{ i18n.ts._visibility.public }}</option>
-				<option value="home">{{ i18n.ts._visibility.home }}</option>
-				<option value="followers">{{ i18n.ts._visibility.followers }}</option>
-				<option value="specified">{{ i18n.ts._visibility.specified }}</option>
-			</FormSelect>
-			<FormSwitch v-model="defaultNoteLocalOnly" class="_formBlock">{{ i18n.ts._visibility.localOnly }}</FormSwitch>
-		</FormFolder>
-	</FormSection>
+				<FormSelect v-model="defaultNoteVisibility" class="_formBlock">
+					<option value="public">
+						{{ i18n.ts._visibility.public }}
+					</option>
+					<option value="home">{{ i18n.ts._visibility.home }}</option>
+					<option value="followers">
+						{{ i18n.ts._visibility.followers }}
+					</option>
+					<option value="specified">
+						{{ i18n.ts._visibility.specified }}
+					</option>
+				</FormSelect>
+				<FormSwitch v-model="defaultNoteLocalOnly" class="_formBlock">{{
+					i18n.ts._visibility.localOnly
+				}}</FormSwitch>
+			</FormFolder>
+		</FormSection>
 
-	<FormSwitch v-model="keepCw" class="_formBlock" @update:modelValue="save()">{{ i18n.ts.keepCw }}</FormSwitch>
-</div>
+		<FormSwitch
+			v-model="keepCw"
+			class="_formBlock"
+			@update:modelValue="save()"
+			>{{ i18n.ts.keepCw }}</FormSwitch
+		>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormSelect from '@/components/form/select.vue';
-import FormSection from '@/components/form/section.vue';
-import FormFolder from '@/components/form/folder.vue';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import { $i } from '@/account';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormSelect from "@/components/form/select.vue";
+import FormSection from "@/components/form/section.vue";
+import FormFolder from "@/components/form/folder.vue";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { $i } from "@/account";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let isLocked = $ref($i.isLocked);
 let autoAcceptFollowed = $ref($i.autoAcceptFollowed);
@@ -72,13 +146,19 @@ let hideOnlineStatus = $ref($i.hideOnlineStatus);
 let publicReactions = $ref($i.publicReactions);
 let ffVisibility = $ref($i.ffVisibility);
 
-let defaultNoteVisibility = $computed(defaultStore.makeGetterSetter('defaultNoteVisibility'));
-let defaultNoteLocalOnly = $computed(defaultStore.makeGetterSetter('defaultNoteLocalOnly'));
-let rememberNoteVisibility = $computed(defaultStore.makeGetterSetter('rememberNoteVisibility'));
-let keepCw = $computed(defaultStore.makeGetterSetter('keepCw'));
+let defaultNoteVisibility = $computed(
+	defaultStore.makeGetterSetter("defaultNoteVisibility")
+);
+let defaultNoteLocalOnly = $computed(
+	defaultStore.makeGetterSetter("defaultNoteLocalOnly")
+);
+let rememberNoteVisibility = $computed(
+	defaultStore.makeGetterSetter("rememberNoteVisibility")
+);
+let keepCw = $computed(defaultStore.makeGetterSetter("keepCw"));
 
 function save() {
-	os.api('i/update', {
+	os.api("i/update", {
 		isLocked: !!isLocked,
 		autoAcceptFollowed: !!autoAcceptFollowed,
 		noCrawle: !!noCrawle,
@@ -95,6 +175,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.privacy,
-	icon: 'ph-lock-open ph-bold ph-lg',
+	icon: "ph-lock-open ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/profile.vue b/packages/client/src/pages/settings/profile.vue
index 4e51a339b..83062144c 100644
--- a/packages/client/src/pages/settings/profile.vue
+++ b/packages/client/src/pages/settings/profile.vue
@@ -1,89 +1,185 @@
 <template>
-<div class="_formRoot">
-	<div v-if="saveButton == true">
-		<MkButton primary @click="save">{{ i18n.ts.save }}</MkButton>
-	</div>
-	<br/>
-	<div class="llvierxe" :style="{ backgroundImage: $i.bannerUrl ? `url(${ $i.bannerUrl })` : null }">
-		<div class="avatar">
-			<MkAvatar class="avatar" :user="$i" :disable-link="true" @click="changeAvatar"/>
-			<MkButton primary rounded class="avatarEdit" @click="changeAvatar">{{ i18n.ts._profile.changeAvatar }}</MkButton>
+	<div class="_formRoot">
+		<div v-if="saveButton == true">
+			<MkButton primary @click="save">{{ i18n.ts.save }}</MkButton>
 		</div>
-		<MkButton primary rounded class="bannerEdit" @click="changeBanner">{{ i18n.ts._profile.changeBanner }}</MkButton>
-	</div>
-
-	<FormInput v-model="profile.name" :max="30" manual-save class="_formBlock">
-		<template #label>{{ i18n.ts._profile.name }}</template>
-	</FormInput>
-
-	<FormTextarea v-model="profile.description" :max="500" tall manual-save class="_formBlock">
-		<template #label>{{ i18n.ts._profile.description }}</template>
-		<template #caption>{{ i18n.ts._profile.youCanIncludeHashtags }}</template>
-	</FormTextarea>
-
-	<FormInput v-model="profile.location" manual-save class="_formBlock">
-		<template #label>{{ i18n.ts.location }}</template>
-		<template #prefix><i class="ph-map-pin ph-bold ph-lg"></i></template>
-		<template #caption>{{ i18n.ts._profile.locationDescription }}</template>
-	</FormInput>
-
-	<FormInput v-model="profile.birthday" type="date" manual-save class="_formBlock">
-		<template #label>{{ i18n.ts.birthday }}</template>
-		<template #prefix><i class="ph-cake ph-bold ph-lg"></i></template>
-	</FormInput>
-
-	<FormSelect v-model="profile.lang" class="_formBlock">
-		<template #label>{{ i18n.ts.language }}</template>
-		<option v-for="x in Object.keys(langmap)" :key="x" :value="x">{{ langmap[x].nativeName }}</option>
-	</FormSelect>
-
-	<FormSlot class="_formBlock">
-		<FormFolder>
-			<template #icon><i class="ph-table ph-bold ph-lg"></i></template>
-			<template #label>{{ i18n.ts._profile.metadataEdit }}</template>
-
-			<div class="_formRoot">
-				<FormSplit v-for="(record, i) in fields" :min-width="250" class="_formBlock">
-					<FormInput v-model="record.name" small>
-						<template #label>{{ i18n.ts._profile.metadataLabel }} #{{ i + 1 }}</template>
-					</FormInput>
-					<FormInput v-model="record.value" small>
-						<template #label>{{ i18n.ts._profile.metadataContent }} #{{ i + 1 }}</template>
-					</FormInput>
-				</FormSplit>
-				<MkButton :disabled="fields.length >= 16" inline style="margin-right: 8px;" @click="addField"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.add }}</MkButton>
-				<MkButton inline primary @click="saveFields"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
+		<br />
+		<div
+			class="llvierxe"
+			:style="{
+				backgroundImage: $i.bannerUrl ? `url(${$i.bannerUrl})` : null,
+			}"
+		>
+			<div class="avatar">
+				<MkAvatar
+					class="avatar"
+					:user="$i"
+					:disable-link="true"
+					@click="changeAvatar"
+				/>
+				<MkButton
+					primary
+					rounded
+					class="avatarEdit"
+					@click="changeAvatar"
+					>{{ i18n.ts._profile.changeAvatar }}</MkButton
+				>
 			</div>
-		</FormFolder>
-		<template #caption>{{ i18n.ts._profile.metadataDescription }}</template>
-	</FormSlot>
+			<MkButton
+				primary
+				rounded
+				class="bannerEdit"
+				@click="changeBanner"
+				>{{ i18n.ts._profile.changeBanner }}</MkButton
+			>
+		</div>
 
-	<FormSwitch v-model="profile.isCat" class="_formBlock">{{ i18n.ts.flagAsCat }}<template #caption>{{ i18n.ts.flagAsCatDescription }}</template></FormSwitch>
-	<FormSwitch v-if="profile.isCat" v-model="profile.speakAsCat" class="_formBlock">{{ i18n.ts.flagSpeakAsCat }}<template #caption>{{ i18n.ts.flagSpeakAsCatDescription }}</template></FormSwitch>
-	<FormSwitch v-model="profile.showTimelineReplies" class="_formBlock">{{ i18n.ts.flagShowTimelineReplies }}<template #caption>{{ i18n.ts.flagShowTimelineRepliesDescription }} {{ i18n.ts.reflectMayTakeTime }}</template></FormSwitch>
-	<FormSwitch v-model="profile.isBot" class="_formBlock">{{ i18n.ts.flagAsBot }}<template #caption>{{ i18n.ts.flagAsBotDescription }}</template></FormSwitch>
-	<div v-if="saveButton == true">
-		<MkButton primary @click="save">{{ i18n.ts.save }}</MkButton>
+		<FormInput
+			v-model="profile.name"
+			:max="30"
+			manual-save
+			class="_formBlock"
+		>
+			<template #label>{{ i18n.ts._profile.name }}</template>
+		</FormInput>
+
+		<FormTextarea
+			v-model="profile.description"
+			:max="500"
+			tall
+			manual-save
+			class="_formBlock"
+		>
+			<template #label>{{ i18n.ts._profile.description }}</template>
+			<template #caption>{{
+				i18n.ts._profile.youCanIncludeHashtags
+			}}</template>
+		</FormTextarea>
+
+		<FormInput v-model="profile.location" manual-save class="_formBlock">
+			<template #label>{{ i18n.ts.location }}</template>
+			<template #prefix
+				><i class="ph-map-pin ph-bold ph-lg"></i
+			></template>
+			<template #caption>{{
+				i18n.ts._profile.locationDescription
+			}}</template>
+		</FormInput>
+
+		<FormInput
+			v-model="profile.birthday"
+			type="date"
+			manual-save
+			class="_formBlock"
+		>
+			<template #label>{{ i18n.ts.birthday }}</template>
+			<template #prefix><i class="ph-cake ph-bold ph-lg"></i></template>
+		</FormInput>
+
+		<FormSelect v-model="profile.lang" class="_formBlock">
+			<template #label>{{ i18n.ts.language }}</template>
+			<option v-for="x in Object.keys(langmap)" :key="x" :value="x">
+				{{ langmap[x].nativeName }}
+			</option>
+		</FormSelect>
+
+		<FormSlot class="_formBlock">
+			<FormFolder>
+				<template #icon
+					><i class="ph-table ph-bold ph-lg"></i
+				></template>
+				<template #label>{{ i18n.ts._profile.metadataEdit }}</template>
+
+				<div class="_formRoot">
+					<FormSplit
+						v-for="(record, i) in fields"
+						:min-width="250"
+						class="_formBlock"
+					>
+						<FormInput v-model="record.name" small>
+							<template #label
+								>{{ i18n.ts._profile.metadataLabel }} #{{
+									i + 1
+								}}</template
+							>
+						</FormInput>
+						<FormInput v-model="record.value" small>
+							<template #label
+								>{{ i18n.ts._profile.metadataContent }} #{{
+									i + 1
+								}}</template
+							>
+						</FormInput>
+					</FormSplit>
+					<MkButton
+						:disabled="fields.length >= 16"
+						inline
+						style="margin-right: 8px"
+						@click="addField"
+						><i class="ph-plus ph-bold ph-lg"></i>
+						{{ i18n.ts.add }}</MkButton
+					>
+					<MkButton inline primary @click="saveFields"
+						><i class="ph-check ph-bold ph-lg"></i>
+						{{ i18n.ts.save }}</MkButton
+					>
+				</div>
+			</FormFolder>
+			<template #caption>{{
+				i18n.ts._profile.metadataDescription
+			}}</template>
+		</FormSlot>
+
+		<FormSwitch v-model="profile.isCat" class="_formBlock"
+			>{{ i18n.ts.flagAsCat
+			}}<template #caption>{{
+				i18n.ts.flagAsCatDescription
+			}}</template></FormSwitch
+		>
+		<FormSwitch
+			v-if="profile.isCat"
+			v-model="profile.speakAsCat"
+			class="_formBlock"
+			>{{ i18n.ts.flagSpeakAsCat
+			}}<template #caption>{{
+				i18n.ts.flagSpeakAsCatDescription
+			}}</template></FormSwitch
+		>
+		<FormSwitch v-model="profile.showTimelineReplies" class="_formBlock"
+			>{{ i18n.ts.flagShowTimelineReplies
+			}}<template #caption
+				>{{ i18n.ts.flagShowTimelineRepliesDescription }}
+				{{ i18n.ts.reflectMayTakeTime }}</template
+			></FormSwitch
+		>
+		<FormSwitch v-model="profile.isBot" class="_formBlock"
+			>{{ i18n.ts.flagAsBot
+			}}<template #caption>{{
+				i18n.ts.flagAsBotDescription
+			}}</template></FormSwitch
+		>
+		<div v-if="saveButton == true">
+			<MkButton primary @click="save">{{ i18n.ts.save }}</MkButton>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, watch } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import FormInput from '@/components/form/input.vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormSelect from '@/components/form/select.vue';
-import FormSplit from '@/components/form/split.vue';
-import FormFolder from '@/components/form/folder.vue';
-import FormSlot from '@/components/form/slot.vue';
-import { selectFile } from '@/scripts/select-file';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { $i } from '@/account';
-import { langmap } from '@/scripts/langmap';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { reactive, watch } from "vue";
+import MkButton from "@/components/MkButton.vue";
+import FormInput from "@/components/form/input.vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormSelect from "@/components/form/select.vue";
+import FormSplit from "@/components/form/split.vue";
+import FormFolder from "@/components/form/folder.vue";
+import FormSlot from "@/components/form/slot.vue";
+import { selectFile } from "@/scripts/select-file";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { $i } from "@/account";
+import { langmap } from "@/scripts/langmap";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const profile = reactive({
 	name: $i?.name,
@@ -97,24 +193,33 @@ const profile = reactive({
 	showTimelineReplies: $i?.showTimelineReplies,
 });
 
-const props = withDefaults(defineProps<{
-	saveButton?: boolean,
-}>(), {});
+const props = withDefaults(
+	defineProps<{
+		saveButton?: boolean;
+	}>(),
+	{}
+);
 
 let saveButton = $ref(props.saveButton ?? false);
 
-watch(() => profile, () => {
-	save();
-}, {
-	deep: true,
-});
+watch(
+	() => profile,
+	() => {
+		save();
+	},
+	{
+		deep: true,
+	}
+);
 
-const fields = reactive($i.fields.map(field => ({ name: field.name, value: field.value })));
+const fields = reactive(
+	$i.fields.map((field) => ({ name: field.name, value: field.value }))
+);
 
 function addField() {
 	fields.push({
-		name: '',
-		value: '',
+		name: "",
+		value: "",
 	});
 }
 
@@ -123,13 +228,15 @@ while (fields.length < 4) {
 }
 
 function saveFields() {
-	os.apiWithDialog('i/update', {
-		fields: fields.filter(field => field.name !== '' && field.value !== ''),
+	os.apiWithDialog("i/update", {
+		fields: fields.filter(
+			(field) => field.name !== "" && field.value !== ""
+		),
 	});
 }
 
 function save() {
-	os.apiWithDialog('i/update', {
+	os.apiWithDialog("i/update", {
 		name: profile.name || null,
 		description: profile.description || null,
 		location: profile.location || null,
@@ -143,49 +250,53 @@ function save() {
 }
 
 function changeAvatar(ev) {
-	selectFile(ev.currentTarget ?? ev.target, i18n.ts.avatar).then(async (file) => {
-		let originalOrCropped = file;
+	selectFile(ev.currentTarget ?? ev.target, i18n.ts.avatar).then(
+		async (file) => {
+			let originalOrCropped = file;
 
-		const { canceled } = await os.yesno({
-			type: 'question',
-			text: i18n.t('cropImageAsk'),
-		});
-
-		if (!canceled) {
-			originalOrCropped = await os.cropImage(file, {
-				aspectRatio: 1,
+			const { canceled } = await os.yesno({
+				type: "question",
+				text: i18n.t("cropImageAsk"),
 			});
-		}
 
-		const i = await os.apiWithDialog('i/update', {
-			avatarId: originalOrCropped.id,
-		});
-		$i.avatarId = i.avatarId;
-		$i.avatarUrl = i.avatarUrl;
-	});
+			if (!canceled) {
+				originalOrCropped = await os.cropImage(file, {
+					aspectRatio: 1,
+				});
+			}
+
+			const i = await os.apiWithDialog("i/update", {
+				avatarId: originalOrCropped.id,
+			});
+			$i.avatarId = i.avatarId;
+			$i.avatarUrl = i.avatarUrl;
+		}
+	);
 }
 
 function changeBanner(ev) {
-	selectFile(ev.currentTarget ?? ev.target, i18n.ts.banner).then(async (file) => {
-		let originalOrCropped = file;
+	selectFile(ev.currentTarget ?? ev.target, i18n.ts.banner).then(
+		async (file) => {
+			let originalOrCropped = file;
 
-		const { canceled } = await os.yesno({
-			type: 'question',
-			text: i18n.t('cropImageAsk'),
-		});
-
-		if (!canceled) {
-			originalOrCropped = await os.cropImage(file, {
-				aspectRatio: 2,
+			const { canceled } = await os.yesno({
+				type: "question",
+				text: i18n.t("cropImageAsk"),
 			});
-		}
 
-		const i = await os.apiWithDialog('i/update', {
-			bannerId: originalOrCropped.id,
-		});
-		$i.bannerId = i.bannerId;
-		$i.bannerUrl = i.bannerUrl;
-	});
+			if (!canceled) {
+				originalOrCropped = await os.cropImage(file, {
+					aspectRatio: 2,
+				});
+			}
+
+			const i = await os.apiWithDialog("i/update", {
+				bannerId: originalOrCropped.id,
+			});
+			$i.bannerId = i.bannerId;
+			$i.bannerUrl = i.bannerUrl;
+		}
+	);
 }
 
 const headerActions = $computed(() => []);
@@ -194,7 +305,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.profile,
-	icon: 'ph-user ph-bold ph-lg',
+	icon: "ph-user ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index ace283fc4..22c6f289b 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -1,103 +1,149 @@
 <template>
-<div class="_formRoot">
-	<FromSlot class="_formBlock">
-		<template #label>{{ i18n.ts.reactionSettingDescription }}</template>
-		<div v-panel style="border-radius: 6px;">
-			<XDraggable v-model="reactions" class="zoaiodol" :item-key="item => item" animation="150" delay="100" delay-on-touch-only="true">
-				<template #item="{element}">
-					<button class="_button item" @click="remove(element, $event)">
-						<MkEmoji :emoji="element" :normal="true"/>
-					</button>
-				</template>
-				<template #footer>
-					<button class="_button add" @click="chooseEmoji"><i class="ph-plus ph-bold ph-lg"></i></button>
-				</template>
-			</XDraggable>
-		</div>
-		<template #caption>{{ i18n.ts.reactionSettingDescription2 }} <button class="_textButton" @click="preview">{{ i18n.ts.preview }}</button></template>
-	</FromSlot>
+	<div class="_formRoot">
+		<FromSlot class="_formBlock">
+			<template #label>{{ i18n.ts.reactionSettingDescription }}</template>
+			<div v-panel style="border-radius: 6px">
+				<XDraggable
+					v-model="reactions"
+					class="zoaiodol"
+					:item-key="(item) => item"
+					animation="150"
+					delay="100"
+					delay-on-touch-only="true"
+				>
+					<template #item="{ element }">
+						<button
+							class="_button item"
+							@click="remove(element, $event)"
+						>
+							<MkEmoji :emoji="element" :normal="true" />
+						</button>
+					</template>
+					<template #footer>
+						<button class="_button add" @click="chooseEmoji">
+							<i class="ph-plus ph-bold ph-lg"></i>
+						</button>
+					</template>
+				</XDraggable>
+			</div>
+			<template #caption
+				>{{ i18n.ts.reactionSettingDescription2 }}
+				<button class="_textButton" @click="preview">
+					{{ i18n.ts.preview }}
+				</button></template
+			>
+		</FromSlot>
 
-	<FormRadios v-model="reactionPickerSize" class="_formBlock">
-		<template #label>{{ i18n.ts.size }}</template>
-		<option :value="1">{{ i18n.ts.small }}</option>
-		<option :value="2">{{ i18n.ts.medium }}</option>
-		<option :value="3">{{ i18n.ts.large }}</option>
-	</FormRadios>
-	<FormRadios v-model="reactionPickerWidth" class="_formBlock">
-		<template #label>{{ i18n.ts.numberOfColumn }}</template>
-		<option :value="1">5</option>
-		<option :value="2">6</option>
-		<option :value="3">7</option>
-		<option :value="4">8</option>
-		<option :value="5">9</option>
-	</FormRadios>
-	<FormRadios v-model="reactionPickerHeight" class="_formBlock">
-		<template #label>{{ i18n.ts.height }}</template>
-		<option :value="1">{{ i18n.ts.small }}</option>
-		<option :value="2">{{ i18n.ts.medium }}</option>
-		<option :value="3">{{ i18n.ts.large }}</option>
-		<option :value="4">{{ i18n.ts.large }}+</option>
-	</FormRadios>
+		<FormRadios v-model="reactionPickerSize" class="_formBlock">
+			<template #label>{{ i18n.ts.size }}</template>
+			<option :value="1">{{ i18n.ts.small }}</option>
+			<option :value="2">{{ i18n.ts.medium }}</option>
+			<option :value="3">{{ i18n.ts.large }}</option>
+		</FormRadios>
+		<FormRadios v-model="reactionPickerWidth" class="_formBlock">
+			<template #label>{{ i18n.ts.numberOfColumn }}</template>
+			<option :value="1">5</option>
+			<option :value="2">6</option>
+			<option :value="3">7</option>
+			<option :value="4">8</option>
+			<option :value="5">9</option>
+		</FormRadios>
+		<FormRadios v-model="reactionPickerHeight" class="_formBlock">
+			<template #label>{{ i18n.ts.height }}</template>
+			<option :value="1">{{ i18n.ts.small }}</option>
+			<option :value="2">{{ i18n.ts.medium }}</option>
+			<option :value="3">{{ i18n.ts.large }}</option>
+			<option :value="4">{{ i18n.ts.large }}+</option>
+		</FormRadios>
 
-	<FormSwitch v-model="reactionPickerUseDrawerForMobile" class="_formBlock">
-		{{ i18n.ts.useDrawerReactionPickerForMobile }}
-		<template #caption>{{ i18n.ts.needReloadToApply }}</template>
-	</FormSwitch>
+		<FormSwitch
+			v-model="reactionPickerUseDrawerForMobile"
+			class="_formBlock"
+		>
+			{{ i18n.ts.useDrawerReactionPickerForMobile }}
+			<template #caption>{{ i18n.ts.needReloadToApply }}</template>
+		</FormSwitch>
 
-	<FormSection>
-		<div style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-			<FormButton inline @click="preview"><i class="ph-eye ph-bold ph-lg"></i> {{ i18n.ts.preview }}</FormButton>
-			<FormButton inline danger @click="setDefault"><i class="ph-arrow-counter-clockwise ph-bold ph-lg"></i> {{ i18n.ts.default }}</FormButton>
-		</div>
-	</FormSection>
-</div>
+		<FormSection>
+			<div style="display: flex; gap: var(--margin); flex-wrap: wrap">
+				<FormButton inline @click="preview"
+					><i class="ph-eye ph-bold ph-lg"></i>
+					{{ i18n.ts.preview }}</FormButton
+				>
+				<FormButton inline danger @click="setDefault"
+					><i class="ph-arrow-counter-clockwise ph-bold ph-lg"></i>
+					{{ i18n.ts.default }}</FormButton
+				>
+			</div>
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, watch } from 'vue';
-import XDraggable from 'vuedraggable';
-import FormInput from '@/components/form/input.vue';
-import FormRadios from '@/components/form/radios.vue';
-import FromSlot from '@/components/form/slot.vue';
-import FormButton from '@/components/MkButton.vue';
-import FormSection from '@/components/form/section.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { deepClone } from '@/scripts/clone';
+import { defineAsyncComponent, watch } from "vue";
+import XDraggable from "vuedraggable";
+import FormInput from "@/components/form/input.vue";
+import FormRadios from "@/components/form/radios.vue";
+import FromSlot from "@/components/form/slot.vue";
+import FormButton from "@/components/MkButton.vue";
+import FormSection from "@/components/form/section.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { deepClone } from "@/scripts/clone";
 
 let reactions = $ref(deepClone(defaultStore.state.reactions));
 
-const reactionPickerSize = $computed(defaultStore.makeGetterSetter('reactionPickerSize'));
-const reactionPickerWidth = $computed(defaultStore.makeGetterSetter('reactionPickerWidth'));
-const reactionPickerHeight = $computed(defaultStore.makeGetterSetter('reactionPickerHeight'));
-const reactionPickerUseDrawerForMobile = $computed(defaultStore.makeGetterSetter('reactionPickerUseDrawerForMobile'));
+const reactionPickerSize = $computed(
+	defaultStore.makeGetterSetter("reactionPickerSize")
+);
+const reactionPickerWidth = $computed(
+	defaultStore.makeGetterSetter("reactionPickerWidth")
+);
+const reactionPickerHeight = $computed(
+	defaultStore.makeGetterSetter("reactionPickerHeight")
+);
+const reactionPickerUseDrawerForMobile = $computed(
+	defaultStore.makeGetterSetter("reactionPickerUseDrawerForMobile")
+);
 
 function save() {
-	defaultStore.set('reactions', reactions);
+	defaultStore.set("reactions", reactions);
 }
 
 function remove(reaction, ev: MouseEvent) {
-	os.popupMenu([{
-		text: i18n.ts.remove,
-		action: () => {
-			reactions = reactions.filter(x => x !== reaction);
-		},
-	}], ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts.remove,
+				action: () => {
+					reactions = reactions.filter((x) => x !== reaction);
+				},
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
 }
 
 function preview(ev: MouseEvent) {
-	os.popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerDialog.vue')), {
-		asReactionPicker: true,
-		src: ev.currentTarget ?? ev.target,
-	}, {}, 'closed');
+	os.popup(
+		defineAsyncComponent(
+			() => import("@/components/MkEmojiPickerDialog.vue")
+		),
+		{
+			asReactionPicker: true,
+			src: ev.currentTarget ?? ev.target,
+		},
+		{},
+		"closed"
+	);
 }
 
 async function setDefault() {
 	const { canceled } = await os.confirm({
-		type: 'warning',
+		type: "warning",
 		text: i18n.ts.resetAreYouSure,
 	});
 	if (canceled) return;
@@ -108,18 +154,22 @@ async function setDefault() {
 function chooseEmoji(ev: MouseEvent) {
 	os.pickEmoji(ev.currentTarget ?? ev.target, {
 		showPinned: false,
-	}).then(emoji => {
+	}).then((emoji) => {
 		if (!reactions.includes(emoji)) {
 			reactions.push(emoji);
 		}
 	});
 }
 
-watch($$(reactions), () => {
-	save();
-}, {
-	deep: true,
-});
+watch(
+	$$(reactions),
+	() => {
+		save();
+	},
+	{
+		deep: true,
+	}
+);
 
 const headerActions = $computed(() => []);
 
@@ -127,9 +177,9 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.reaction,
-	icon: 'ph-smiley ph-bold ph-lg',
+	icon: "ph-smiley ph-bold ph-lg",
 	action: {
-		icon: 'ph-eye ph-bold ph-lg',
+		icon: "ph-eye ph-bold ph-lg",
 		handler: preview,
 	},
 });
diff --git a/packages/client/src/pages/settings/security.vue b/packages/client/src/pages/settings/security.vue
index 86632234f..be4f275f1 100644
--- a/packages/client/src/pages/settings/security.vue
+++ b/packages/client/src/pages/settings/security.vue
@@ -1,85 +1,105 @@
 <template>
-<div class="_formRoot">
-	<FormSection>
-		<template #label>{{ i18n.ts.password }}</template>
-		<FormButton primary @click="change()">{{ i18n.ts.changePassword }}</FormButton>
-	</FormSection>
+	<div class="_formRoot">
+		<FormSection>
+			<template #label>{{ i18n.ts.password }}</template>
+			<FormButton primary @click="change()">{{
+				i18n.ts.changePassword
+			}}</FormButton>
+		</FormSection>
 
-	<FormSection>
-		<template #label>{{ i18n.ts.twoStepAuthentication }}</template>
-		<X2fa/>
-	</FormSection>
+		<FormSection>
+			<template #label>{{ i18n.ts.twoStepAuthentication }}</template>
+			<X2fa />
+		</FormSection>
 
-	<FormSection>
-		<template #label>{{ i18n.ts.signinHistory }}</template>
-		<MkPagination :pagination="pagination" disable-auto-load>
-			<template #default="{items}">
-				<div>
-					<div v-for="item in items" :key="item.id" v-panel class="timnmucd">
-						<header>
-							<i v-if="item.success" class="ph-check ph-bold ph-lg icon succ"></i>
-							<i v-else class="ph-circle-wavy-warning ph-bold ph-lg icon fail"></i>
-							<code class="ip _monospace">{{ item.ip }}</code>
-							<MkTime :time="item.createdAt" class="time"/>
-						</header>
+		<FormSection>
+			<template #label>{{ i18n.ts.signinHistory }}</template>
+			<MkPagination :pagination="pagination" disable-auto-load>
+				<template #default="{ items }">
+					<div>
+						<div
+							v-for="item in items"
+							:key="item.id"
+							v-panel
+							class="timnmucd"
+						>
+							<header>
+								<i
+									v-if="item.success"
+									class="ph-check ph-bold ph-lg icon succ"
+								></i>
+								<i
+									v-else
+									class="ph-circle-wavy-warning ph-bold ph-lg icon fail"
+								></i>
+								<code class="ip _monospace">{{ item.ip }}</code>
+								<MkTime :time="item.createdAt" class="time" />
+							</header>
+						</div>
 					</div>
-				</div>
-			</template>
-		</MkPagination>
-	</FormSection>
+				</template>
+			</MkPagination>
+		</FormSection>
 
-	<FormSection>
-		<FormSlot>
-			<FormButton danger @click="regenerateToken"><i class="ph-arrows-clockwise ph-bold ph-lg"></i> {{ i18n.ts.regenerateLoginToken }}</FormButton>
-			<template #caption>{{ i18n.ts.regenerateLoginTokenDescription }}</template>
-		</FormSlot>
-	</FormSection>
-</div>
+		<FormSection>
+			<FormSlot>
+				<FormButton danger @click="regenerateToken"
+					><i class="ph-arrows-clockwise ph-bold ph-lg"></i>
+					{{ i18n.ts.regenerateLoginToken }}</FormButton
+				>
+				<template #caption>{{
+					i18n.ts.regenerateLoginTokenDescription
+				}}</template>
+			</FormSlot>
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import X2fa from './2fa.vue';
-import FormSection from '@/components/form/section.vue';
-import FormSlot from '@/components/form/slot.vue';
-import FormButton from '@/components/MkButton.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import X2fa from "./2fa.vue";
+import FormSection from "@/components/form/section.vue";
+import FormSlot from "@/components/form/slot.vue";
+import FormButton from "@/components/MkButton.vue";
+import MkPagination from "@/components/MkPagination.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const pagination = {
-	endpoint: 'i/signin-history' as const,
+	endpoint: "i/signin-history" as const,
 	limit: 5,
 };
 
 async function change(): Promise<void> {
-	const { canceled: canceled1, result: currentPassword } = await os.inputText({
-		title: i18n.ts.currentPassword,
-		type: 'password',
-	});
+	const { canceled: canceled1, result: currentPassword } = await os.inputText(
+		{
+			title: i18n.ts.currentPassword,
+			type: "password",
+		}
+	);
 	if (canceled1) return;
 
 	const { canceled: canceled2, result: newPassword } = await os.inputText({
 		title: i18n.ts.newPassword,
-		type: 'password',
+		type: "password",
 	});
 	if (canceled2) return;
 
 	const { canceled: canceled3, result: newPassword2 } = await os.inputText({
 		title: i18n.ts.newPasswordRetype,
-		type: 'password',
+		type: "password",
 	});
 	if (canceled3) return;
 
 	if (newPassword !== newPassword2) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: i18n.ts.retypedNotMatch,
 		});
 		return;
 	}
 
-	os.apiWithDialog('i/change-password', {
+	os.apiWithDialog("i/change-password", {
 		currentPassword,
 		newPassword,
 	});
@@ -88,10 +108,10 @@ async function change(): Promise<void> {
 function regenerateToken(): void {
 	os.inputText({
 		title: i18n.ts.password,
-		type: 'password',
+		type: "password",
 	}).then(({ canceled, result: password }) => {
 		if (canceled) return;
-		os.api('i/regenerate_token', {
+		os.api("i/regenerate_token", {
 			password: password,
 		});
 	});
@@ -103,7 +123,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.security,
-	icon: 'ph-lock ph-bold ph-lg',
+	icon: "ph-lock ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/settings/sounds.vue b/packages/client/src/pages/settings/sounds.vue
index afacf770b..81596a40b 100644
--- a/packages/client/src/pages/settings/sounds.vue
+++ b/packages/client/src/pages/settings/sounds.vue
@@ -1,62 +1,84 @@
 <template>
-<div class="_formRoot">
-	<FormRange v-model="masterVolume" :min="0" :max="1" :step="0.05" :text-converter="(v) => `${Math.floor(v * 100)}%`" class="_formBlock">
-		<template #label>{{ i18n.ts.masterVolume }}</template>
-	</FormRange>
+	<div class="_formRoot">
+		<FormRange
+			v-model="masterVolume"
+			:min="0"
+			:max="1"
+			:step="0.05"
+			:text-converter="(v) => `${Math.floor(v * 100)}%`"
+			class="_formBlock"
+		>
+			<template #label>{{ i18n.ts.masterVolume }}</template>
+		</FormRange>
 
-	<FormSection>
-		<template #label>{{ i18n.ts.sounds }}</template>
-		<FormButton v-for="type in Object.keys(sounds)" :key="type" style="margin-bottom: 8px;" @click="edit(type)">
-			{{ i18n.t('_sfx.' + type) }}
-			<template #suffix>{{ sounds[type].type || i18n.ts.none }}</template>
-			<template #suffixIcon><i class="ph-caret-down ph-bold ph-lg"></i></template>
-		</FormButton>
-	</FormSection>
+		<FormSection>
+			<template #label>{{ i18n.ts.sounds }}</template>
+			<FormButton
+				v-for="type in Object.keys(sounds)"
+				:key="type"
+				style="margin-bottom: 8px"
+				@click="edit(type)"
+			>
+				{{ i18n.t("_sfx." + type) }}
+				<template #suffix>{{
+					sounds[type].type || i18n.ts.none
+				}}</template>
+				<template #suffixIcon
+					><i class="ph-caret-down ph-bold ph-lg"></i
+				></template>
+			</FormButton>
+		</FormSection>
 
-	<FormButton danger class="_formBlock" @click="reset()"><i class="ph-arrow-clockwise ph-bold ph-lg"></i> {{ i18n.ts.default }}</FormButton>
-</div>
+		<FormButton danger class="_formBlock" @click="reset()"
+			><i class="ph-arrow-clockwise ph-bold ph-lg"></i>
+			{{ i18n.ts.default }}</FormButton
+		>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
-import FormRange from '@/components/form/range.vue';
-import FormButton from '@/components/MkButton.vue';
-import FormSection from '@/components/form/section.vue';
-import * as os from '@/os';
-import { ColdDeviceStorage } from '@/store';
-import { playFile } from '@/scripts/sound';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, ref } from "vue";
+import FormRange from "@/components/form/range.vue";
+import FormButton from "@/components/MkButton.vue";
+import FormSection from "@/components/form/section.vue";
+import * as os from "@/os";
+import { ColdDeviceStorage } from "@/store";
+import { playFile } from "@/scripts/sound";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const masterVolume = computed({
 	get: () => {
-		return ColdDeviceStorage.get('sound_masterVolume');
+		return ColdDeviceStorage.get("sound_masterVolume");
 	},
 	set: (value) => {
-		ColdDeviceStorage.set('sound_masterVolume', value);
+		ColdDeviceStorage.set("sound_masterVolume", value);
 	},
 });
 
-const volumeIcon = computed(() => masterVolume.value === 0 ? 'ph-speaker-none ph-bold ph-lg' : 'ph-speaker-high ph-bold ph-lg');
+const volumeIcon = computed(() =>
+	masterVolume.value === 0
+		? "ph-speaker-none ph-bold ph-lg"
+		: "ph-speaker-high ph-bold ph-lg"
+);
 
 const sounds = ref({
-	note: ColdDeviceStorage.get('sound_note'),
-	noteMy: ColdDeviceStorage.get('sound_noteMy'),
-	notification: ColdDeviceStorage.get('sound_notification'),
-	chat: ColdDeviceStorage.get('sound_chat'),
-	chatBg: ColdDeviceStorage.get('sound_chatBg'),
-	antenna: ColdDeviceStorage.get('sound_antenna'),
-	channel: ColdDeviceStorage.get('sound_channel'),
+	note: ColdDeviceStorage.get("sound_note"),
+	noteMy: ColdDeviceStorage.get("sound_noteMy"),
+	notification: ColdDeviceStorage.get("sound_notification"),
+	chat: ColdDeviceStorage.get("sound_chat"),
+	chatBg: ColdDeviceStorage.get("sound_chatBg"),
+	antenna: ColdDeviceStorage.get("sound_antenna"),
+	channel: ColdDeviceStorage.get("sound_channel"),
 });
 
-const soundsTypes = await os.api('get-sounds')
-
+const soundsTypes = await os.api("get-sounds");
 
 async function edit(type) {
-	const { canceled, result } = await os.form(i18n.t('_sfx.' + type), {
+	const { canceled, result } = await os.form(i18n.t("_sfx." + type), {
 		type: {
-			type: 'enum',
-			enum: soundsTypes.map(x => ({
+			type: "enum",
+			enum: soundsTypes.map((x) => ({
 				value: x,
 				label: x == null ? i18n.ts.none : x,
 			})),
@@ -64,7 +86,7 @@ async function edit(type) {
 			default: sounds.value[type].type,
 		},
 		volume: {
-			type: 'range',
+			type: "range",
 			min: 0,
 			max: 1,
 			step: 0.05,
@@ -73,7 +95,7 @@ async function edit(type) {
 			default: sounds.value[type].volume,
 		},
 		listen: {
-			type: 'button',
+			type: "button",
 			content: i18n.ts.listen,
 			action: (_, values) => {
 				playFile(values.type, values.volume);
@@ -87,14 +109,14 @@ async function edit(type) {
 		volume: result.volume,
 	};
 
-	ColdDeviceStorage.set('sound_' + type, v);
+	ColdDeviceStorage.set("sound_" + type, v);
 	sounds.value[type] = v;
 }
 
 function reset() {
 	for (const sound of Object.keys(sounds.value)) {
-		const v = ColdDeviceStorage.default['sound_' + sound];
-		ColdDeviceStorage.set('sound_' + sound, v);
+		const v = ColdDeviceStorage.default["sound_" + sound];
+		ColdDeviceStorage.set("sound_" + sound, v);
 		sounds.value[sound] = v;
 	}
 }
@@ -105,6 +127,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.sounds,
-	icon: 'ph-speaker-high ph-bold ph-lg',
+	icon: "ph-speaker-high ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/statusbar.statusbar.vue b/packages/client/src/pages/settings/statusbar.statusbar.vue
index 608222386..b64f16717 100644
--- a/packages/client/src/pages/settings/statusbar.statusbar.vue
+++ b/packages/client/src/pages/settings/statusbar.statusbar.vue
@@ -1,140 +1,211 @@
 <template>
-<div class="_formRoot">
-	<FormSelect v-model="statusbar.type" placeholder="Please select" class="_formBlock">
-		<template #label>{{ i18n.ts.type }}</template>
-		<option value="rss">RSS</option>
-		<option value="federation">Federation</option>
-		<option value="userList">User list timeline</option>
-	</FormSelect>
-
-	<MkInput v-model="statusbar.name" manual-save class="_formBlock">
-		<template #label>{{ i18n.ts.label }}</template>
-	</MkInput>
-
-	<MkSwitch v-model="statusbar.black" class="_formBlock">
-		<template #label>Black</template>
-	</MkSwitch>
-
-	<FormRadios v-model="statusbar.size" class="_formBlock">
-		<template #label>{{ i18n.ts.size }}</template>
-		<option value="verySmall">{{ i18n.ts.small }}+</option>
-		<option value="small">{{ i18n.ts.small }}</option>
-		<option value="medium">{{ i18n.ts.medium }}</option>
-		<option value="large">{{ i18n.ts.large }}</option>
-		<option value="veryLarge">{{ i18n.ts.large }}+</option>
-	</FormRadios>
-
-	<template v-if="statusbar.type === 'rss'">
-		<MkInput v-model="statusbar.props.url" manual-save class="_formBlock" type="url">
-			<template #label>URL</template>
-		</MkInput>
-		<MkSwitch v-model="statusbar.props.shuffle" class="_formBlock">
-			<template #label>{{ i18n.ts.shuffle }}</template>
-		</MkSwitch>
-		<MkInput v-model="statusbar.props.refreshIntervalSec" manual-save class="_formBlock" type="number">
-			<template #label>{{ i18n.ts.refreshInterval }}</template>
-		</MkInput>
-		<FormRange v-model="statusbar.props.marqueeDuration" :min="5" :max="150" :step="1" class="_formBlock">
-			<template #label>{{ i18n.ts.speed }}</template>
-			<template #caption>{{ i18n.ts.fast }} &lt;-&gt; {{ i18n.ts.slow }}</template>
-		</FormRange>
-		<MkSwitch v-model="statusbar.props.marqueeReverse" class="_formBlock">
-			<template #label>{{ i18n.ts.reverse }}</template>
-		</MkSwitch>
-	</template>
-	<template v-else-if="statusbar.type === 'federation'">
-		<MkInput v-model="statusbar.props.refreshIntervalSec" manual-save class="_formBlock" type="number">
-			<template #label>{{ i18n.ts.refreshInterval }}</template>
-		</MkInput>
-		<FormRange v-model="statusbar.props.marqueeDuration" :min="5" :max="150" :step="1" class="_formBlock">
-			<template #label>{{ i18n.ts.speed }}</template>
-			<template #caption>{{ i18n.ts.fast }} &lt;-&gt; {{ i18n.ts.slow }}</template>
-		</FormRange>
-		<MkSwitch v-model="statusbar.props.marqueeReverse" class="_formBlock">
-			<template #label>{{ i18n.ts.reverse }}</template>
-		</MkSwitch>
-		<MkSwitch v-model="statusbar.props.colored" class="_formBlock">
-			<template #label>{{ i18n.ts.colored }}</template>
-		</MkSwitch>
-	</template>
-	<template v-else-if="statusbar.type === 'userList' && userLists != null">
-		<FormSelect v-model="statusbar.props.userListId" class="_formBlock">
-			<template #label>{{ i18n.ts.userList }}</template>
-			<option v-for="list in userLists" :value="list.id">{{ list.name }}</option>
+	<div class="_formRoot">
+		<FormSelect
+			v-model="statusbar.type"
+			placeholder="Please select"
+			class="_formBlock"
+		>
+			<template #label>{{ i18n.ts.type }}</template>
+			<option value="rss">RSS</option>
+			<option value="federation">Federation</option>
+			<option value="userList">User list timeline</option>
 		</FormSelect>
-		<MkInput v-model="statusbar.props.refreshIntervalSec" manual-save class="_formBlock" type="number">
-			<template #label>{{ i18n.ts.refreshInterval }}</template>
-		</MkInput>
-		<FormRange v-model="statusbar.props.marqueeDuration" :min="5" :max="150" :step="1" class="_formBlock">
-			<template #label>{{ i18n.ts.speed }}</template>
-			<template #caption>{{ i18n.ts.fast }} &lt;-&gt; {{ i18n.ts.slow }}</template>
-		</FormRange>
-		<MkSwitch v-model="statusbar.props.marqueeReverse" class="_formBlock">
-			<template #label>{{ i18n.ts.reverse }}</template>
-		</MkSwitch>
-	</template>
 
-	<div style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-		<FormButton danger @click="del">{{ i18n.ts.remove }}</FormButton>
+		<MkInput v-model="statusbar.name" manual-save class="_formBlock">
+			<template #label>{{ i18n.ts.label }}</template>
+		</MkInput>
+
+		<MkSwitch v-model="statusbar.black" class="_formBlock">
+			<template #label>Black</template>
+		</MkSwitch>
+
+		<FormRadios v-model="statusbar.size" class="_formBlock">
+			<template #label>{{ i18n.ts.size }}</template>
+			<option value="verySmall">{{ i18n.ts.small }}+</option>
+			<option value="small">{{ i18n.ts.small }}</option>
+			<option value="medium">{{ i18n.ts.medium }}</option>
+			<option value="large">{{ i18n.ts.large }}</option>
+			<option value="veryLarge">{{ i18n.ts.large }}+</option>
+		</FormRadios>
+
+		<template v-if="statusbar.type === 'rss'">
+			<MkInput
+				v-model="statusbar.props.url"
+				manual-save
+				class="_formBlock"
+				type="url"
+			>
+				<template #label>URL</template>
+			</MkInput>
+			<MkSwitch v-model="statusbar.props.shuffle" class="_formBlock">
+				<template #label>{{ i18n.ts.shuffle }}</template>
+			</MkSwitch>
+			<MkInput
+				v-model="statusbar.props.refreshIntervalSec"
+				manual-save
+				class="_formBlock"
+				type="number"
+			>
+				<template #label>{{ i18n.ts.refreshInterval }}</template>
+			</MkInput>
+			<FormRange
+				v-model="statusbar.props.marqueeDuration"
+				:min="5"
+				:max="150"
+				:step="1"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.speed }}</template>
+				<template #caption
+					>{{ i18n.ts.fast }} &lt;-&gt; {{ i18n.ts.slow }}</template
+				>
+			</FormRange>
+			<MkSwitch
+				v-model="statusbar.props.marqueeReverse"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.reverse }}</template>
+			</MkSwitch>
+		</template>
+		<template v-else-if="statusbar.type === 'federation'">
+			<MkInput
+				v-model="statusbar.props.refreshIntervalSec"
+				manual-save
+				class="_formBlock"
+				type="number"
+			>
+				<template #label>{{ i18n.ts.refreshInterval }}</template>
+			</MkInput>
+			<FormRange
+				v-model="statusbar.props.marqueeDuration"
+				:min="5"
+				:max="150"
+				:step="1"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.speed }}</template>
+				<template #caption
+					>{{ i18n.ts.fast }} &lt;-&gt; {{ i18n.ts.slow }}</template
+				>
+			</FormRange>
+			<MkSwitch
+				v-model="statusbar.props.marqueeReverse"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.reverse }}</template>
+			</MkSwitch>
+			<MkSwitch v-model="statusbar.props.colored" class="_formBlock">
+				<template #label>{{ i18n.ts.colored }}</template>
+			</MkSwitch>
+		</template>
+		<template
+			v-else-if="statusbar.type === 'userList' && userLists != null"
+		>
+			<FormSelect v-model="statusbar.props.userListId" class="_formBlock">
+				<template #label>{{ i18n.ts.userList }}</template>
+				<option v-for="list in userLists" :value="list.id">
+					{{ list.name }}
+				</option>
+			</FormSelect>
+			<MkInput
+				v-model="statusbar.props.refreshIntervalSec"
+				manual-save
+				class="_formBlock"
+				type="number"
+			>
+				<template #label>{{ i18n.ts.refreshInterval }}</template>
+			</MkInput>
+			<FormRange
+				v-model="statusbar.props.marqueeDuration"
+				:min="5"
+				:max="150"
+				:step="1"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.speed }}</template>
+				<template #caption
+					>{{ i18n.ts.fast }} &lt;-&gt; {{ i18n.ts.slow }}</template
+				>
+			</FormRange>
+			<MkSwitch
+				v-model="statusbar.props.marqueeReverse"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.reverse }}</template>
+			</MkSwitch>
+		</template>
+
+		<div style="display: flex; gap: var(--margin); flex-wrap: wrap">
+			<FormButton danger @click="del">{{ i18n.ts.remove }}</FormButton>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, reactive, ref, watch } from 'vue';
-import FormSelect from '@/components/form/select.vue';
-import MkInput from '@/components/form/input.vue';
-import MkSwitch from '@/components/form/switch.vue';
-import FormRadios from '@/components/form/radios.vue';
-import FormButton from '@/components/MkButton.vue';
-import FormRange from '@/components/form/range.vue';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import { deepClone } from '@/scripts/clone';
+import { computed, reactive, ref, watch } from "vue";
+import FormSelect from "@/components/form/select.vue";
+import MkInput from "@/components/form/input.vue";
+import MkSwitch from "@/components/form/switch.vue";
+import FormRadios from "@/components/form/radios.vue";
+import FormButton from "@/components/MkButton.vue";
+import FormRange from "@/components/form/range.vue";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { deepClone } from "@/scripts/clone";
 
 const props = defineProps<{
 	_id: string;
 	userLists: any[] | null;
 }>();
 
-const statusbar = reactive(deepClone(defaultStore.state.statusbars.find(x => x.id === props._id)));
+const statusbar = reactive(
+	deepClone(defaultStore.state.statusbars.find((x) => x.id === props._id))
+);
 
-watch(() => statusbar.type, () => {
-	if (statusbar.type === 'rss') {
-		statusbar.name = 'NEWS';
-		statusbar.props.url = 'http://feeds.afpbb.com/rss/afpbb/afpbbnews';
-		statusbar.props.shuffle = true;
-		statusbar.props.refreshIntervalSec = 120;
-		statusbar.props.display = 'marquee';
-		statusbar.props.marqueeDuration = 100;
-		statusbar.props.marqueeReverse = false;
-	} else if (statusbar.type === 'federation') {
-		statusbar.name = 'FEDERATION';
-		statusbar.props.refreshIntervalSec = 120;
-		statusbar.props.display = 'marquee';
-		statusbar.props.marqueeDuration = 100;
-		statusbar.props.marqueeReverse = false;
-		statusbar.props.colored = false;
-	} else if (statusbar.type === 'userList') {
-		statusbar.name = 'LIST TL';
-		statusbar.props.refreshIntervalSec = 120;
-		statusbar.props.display = 'marquee';
-		statusbar.props.marqueeDuration = 100;
-		statusbar.props.marqueeReverse = false;
+watch(
+	() => statusbar.type,
+	() => {
+		if (statusbar.type === "rss") {
+			statusbar.name = "NEWS";
+			statusbar.props.url = "http://feeds.afpbb.com/rss/afpbb/afpbbnews";
+			statusbar.props.shuffle = true;
+			statusbar.props.refreshIntervalSec = 120;
+			statusbar.props.display = "marquee";
+			statusbar.props.marqueeDuration = 100;
+			statusbar.props.marqueeReverse = false;
+		} else if (statusbar.type === "federation") {
+			statusbar.name = "FEDERATION";
+			statusbar.props.refreshIntervalSec = 120;
+			statusbar.props.display = "marquee";
+			statusbar.props.marqueeDuration = 100;
+			statusbar.props.marqueeReverse = false;
+			statusbar.props.colored = false;
+		} else if (statusbar.type === "userList") {
+			statusbar.name = "LIST TL";
+			statusbar.props.refreshIntervalSec = 120;
+			statusbar.props.display = "marquee";
+			statusbar.props.marqueeDuration = 100;
+			statusbar.props.marqueeReverse = false;
+		}
 	}
-});
+);
 
 watch(statusbar, save);
 
 async function save() {
-	const i = defaultStore.state.statusbars.findIndex(x => x.id === props._id);
+	const i = defaultStore.state.statusbars.findIndex(
+		(x) => x.id === props._id
+	);
 	const statusbars = deepClone(defaultStore.state.statusbars);
 	statusbars[i] = deepClone(statusbar);
-	defaultStore.set('statusbars', statusbars);
+	defaultStore.set("statusbars", statusbars);
 }
 
 function del() {
-	defaultStore.set('statusbars', defaultStore.state.statusbars.filter(x => x.id !== props._id));
+	defaultStore.set(
+		"statusbars",
+		defaultStore.state.statusbars.filter((x) => x.id !== props._id)
+	);
 }
 </script>
diff --git a/packages/client/src/pages/settings/statusbar.vue b/packages/client/src/pages/settings/statusbar.vue
index dd12576ac..96a80e8c6 100644
--- a/packages/client/src/pages/settings/statusbar.vue
+++ b/packages/client/src/pages/settings/statusbar.vue
@@ -1,43 +1,43 @@
 <template>
-<div class="_formRoot">
-	<FormFolder v-for="x in statusbars" :key="x.id" class="_formBlock">
-		<template #label>{{ x.type ?? i18n.ts.notSet }}</template>
-		<template #suffix>{{ x.name }}</template>
-		<XStatusbar :_id="x.id" :user-lists="userLists"/>
-	</FormFolder>
-	<FormButton primary @click="add">{{ i18n.ts.add }}</FormButton>
-</div>
+	<div class="_formRoot">
+		<FormFolder v-for="x in statusbars" :key="x.id" class="_formBlock">
+			<template #label>{{ x.type ?? i18n.ts.notSet }}</template>
+			<template #suffix>{{ x.name }}</template>
+			<XStatusbar :_id="x.id" :user-lists="userLists" />
+		</FormFolder>
+		<FormButton primary @click="add">{{ i18n.ts.add }}</FormButton>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref, watch } from 'vue';
-import { v4 as uuid } from 'uuid';
-import XStatusbar from './statusbar.statusbar.vue';
-import FormRadios from '@/components/form/radios.vue';
-import FormFolder from '@/components/form/folder.vue';
-import FormButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { unisonReload } from '@/scripts/unison-reload';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, onMounted, ref, watch } from "vue";
+import { v4 as uuid } from "uuid";
+import XStatusbar from "./statusbar.statusbar.vue";
+import FormRadios from "@/components/form/radios.vue";
+import FormFolder from "@/components/form/folder.vue";
+import FormButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { unisonReload } from "@/scripts/unison-reload";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const statusbars = defaultStore.reactiveState.statusbars;
 
 let userLists = $ref();
 
 onMounted(() => {
-	os.api('users/lists/list').then(res => {
+	os.api("users/lists/list").then((res) => {
 		userLists = res;
 	});
 });
 
 async function add() {
-	defaultStore.push('statusbars', {
+	defaultStore.push("statusbars", {
 		id: uuid(),
 		type: null,
 		black: false,
-		size: 'medium',
+		size: "medium",
 		props: {},
 	});
 }
@@ -48,7 +48,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.statusbar,
-	icon: 'ph-list-bullets ph-bold ph-lg',
-	bg: 'var(--bg)',
+	icon: "ph-list-bullets ph-bold ph-lg",
+	bg: "var(--bg)",
 });
 </script>
diff --git a/packages/client/src/pages/settings/theme.install.vue b/packages/client/src/pages/settings/theme.install.vue
index 03dcd24c1..0428de0f7 100644
--- a/packages/client/src/pages/settings/theme.install.vue
+++ b/packages/client/src/pages/settings/theme.install.vue
@@ -1,26 +1,42 @@
 <template>
-<div class="_formRoot">
-	<FormTextarea v-model="installThemeCode" class="_formBlock">
-		<template #label>{{ i18n.ts._theme.code }}</template>
-	</FormTextarea>
+	<div class="_formRoot">
+		<FormTextarea v-model="installThemeCode" class="_formBlock">
+			<template #label>{{ i18n.ts._theme.code }}</template>
+		</FormTextarea>
 
-	<div class="_formBlock" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-		<FormButton :disabled="installThemeCode == null" inline @click="() => preview(installThemeCode)"><i class="ph-eye ph-bold ph-lg"></i> {{ i18n.ts.preview }}</FormButton>
-		<FormButton :disabled="installThemeCode == null" primary inline @click="() => install(installThemeCode)"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.install }}</FormButton>
+		<div
+			class="_formBlock"
+			style="display: flex; gap: var(--margin); flex-wrap: wrap"
+		>
+			<FormButton
+				:disabled="installThemeCode == null"
+				inline
+				@click="() => preview(installThemeCode)"
+				><i class="ph-eye ph-bold ph-lg"></i>
+				{{ i18n.ts.preview }}</FormButton
+			>
+			<FormButton
+				:disabled="installThemeCode == null"
+				primary
+				inline
+				@click="() => install(installThemeCode)"
+				><i class="ph-check ph-bold ph-lg"></i>
+				{{ i18n.ts.install }}</FormButton
+			>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import JSON5 from 'json5';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormButton from '@/components/MkButton.vue';
-import { applyTheme, validateTheme } from '@/scripts/theme';
-import * as os from '@/os';
-import { addTheme, getThemes } from '@/theme-store';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import JSON5 from "json5";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormButton from "@/components/MkButton.vue";
+import { applyTheme, validateTheme } from "@/scripts/theme";
+import * as os from "@/os";
+import { addTheme, getThemes } from "@/theme-store";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let installThemeCode = $ref(null);
 
@@ -31,21 +47,21 @@ function parseThemeCode(code: string) {
 		theme = JSON5.parse(code);
 	} catch (err) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: i18n.ts._theme.invalid,
 		});
 		return false;
 	}
 	if (!validateTheme(theme)) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: i18n.ts._theme.invalid,
 		});
 		return false;
 	}
-	if (getThemes().some(t => t.id === theme.id)) {
+	if (getThemes().some((t) => t.id === theme.id)) {
 		os.alert({
-			type: 'info',
+			type: "info",
 			text: i18n.ts._theme.alreadyInstalled,
 		});
 		return false;
@@ -64,8 +80,8 @@ async function install(code: string): Promise<void> {
 	if (!theme) return;
 	await addTheme(theme);
 	os.alert({
-		type: 'success',
-		text: i18n.t('_theme.installed', { name: theme.name }),
+		type: "success",
+		text: i18n.t("_theme.installed", { name: theme.name }),
 	});
 }
 
@@ -75,6 +91,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts._theme.install,
-	icon: 'ph-download-simple ph-bold ph-lg',
+	icon: "ph-download-simple ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/theme.manage.vue b/packages/client/src/pages/settings/theme.manage.vue
index b0742b279..a1b675ea5 100644
--- a/packages/client/src/pages/settings/theme.manage.vue
+++ b/packages/client/src/pages/settings/theme.manage.vue
@@ -1,58 +1,90 @@
 <template>
-<div class="_formRoot">
-	<FormSelect v-model="selectedThemeId" class="_formBlock">
-		<template #label>{{ i18n.ts.theme }}</template>
-		<optgroup :label="i18n.ts._theme.installedThemes">
-			<option v-for="x in installedThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
-		</optgroup>
-		<optgroup :label="i18n.ts._theme.builtinThemes">
-			<option v-for="x in builtinThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
-		</optgroup>
-	</FormSelect>
-	<template v-if="selectedTheme">
-		<FormInput readonly :model-value="selectedTheme.author" class="_formBlock">
-			<template #label>{{ i18n.ts.author }}</template>
-		</FormInput>
-		<FormTextarea v-if="selectedTheme.desc" readonly :model-value="selectedTheme.desc" class="_formBlock">
-			<template #label>{{ i18n.ts._theme.description }}</template>
-		</FormTextarea>
-		<FormTextarea readonly tall :model-value="selectedThemeCode" class="_formBlock">
-			<template #label>{{ i18n.ts._theme.code }}</template>
-			<template #caption><button class="_textButton" @click="copyThemeCode()">{{ i18n.ts.copy }}</button></template>
-		</FormTextarea>
-		<FormButton v-if="!builtinThemes.some(t => t.id == selectedTheme.id)" class="_formBlock" danger @click="uninstall()"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.uninstall }}</FormButton>
-	</template>
-</div>
+	<div class="_formRoot">
+		<FormSelect v-model="selectedThemeId" class="_formBlock">
+			<template #label>{{ i18n.ts.theme }}</template>
+			<optgroup :label="i18n.ts._theme.installedThemes">
+				<option v-for="x in installedThemes" :key="x.id" :value="x.id">
+					{{ x.name }}
+				</option>
+			</optgroup>
+			<optgroup :label="i18n.ts._theme.builtinThemes">
+				<option v-for="x in builtinThemes" :key="x.id" :value="x.id">
+					{{ x.name }}
+				</option>
+			</optgroup>
+		</FormSelect>
+		<template v-if="selectedTheme">
+			<FormInput
+				readonly
+				:model-value="selectedTheme.author"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.author }}</template>
+			</FormInput>
+			<FormTextarea
+				v-if="selectedTheme.desc"
+				readonly
+				:model-value="selectedTheme.desc"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts._theme.description }}</template>
+			</FormTextarea>
+			<FormTextarea
+				readonly
+				tall
+				:model-value="selectedThemeCode"
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts._theme.code }}</template>
+				<template #caption
+					><button class="_textButton" @click="copyThemeCode()">
+						{{ i18n.ts.copy }}
+					</button></template
+				>
+			</FormTextarea>
+			<FormButton
+				v-if="!builtinThemes.some((t) => t.id == selectedTheme.id)"
+				class="_formBlock"
+				danger
+				@click="uninstall()"
+				><i class="ph-trash ph-bold ph-lg"></i>
+				{{ i18n.ts.uninstall }}</FormButton
+			>
+		</template>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
-import JSON5 from 'json5';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormSelect from '@/components/form/select.vue';
-import FormInput from '@/components/form/input.vue';
-import FormButton from '@/components/MkButton.vue';
-import { Theme, getBuiltinThemesRef } from '@/scripts/theme';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
-import * as os from '@/os';
-import { getThemes, removeTheme } from '@/theme-store';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, ref } from "vue";
+import JSON5 from "json5";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormSelect from "@/components/form/select.vue";
+import FormInput from "@/components/form/input.vue";
+import FormButton from "@/components/MkButton.vue";
+import { Theme, getBuiltinThemesRef } from "@/scripts/theme";
+import copyToClipboard from "@/scripts/copy-to-clipboard";
+import * as os from "@/os";
+import { getThemes, removeTheme } from "@/theme-store";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const installedThemes = ref(getThemes());
 const builtinThemes = getBuiltinThemesRef();
 const selectedThemeId = ref(null);
 
-const themes = computed(() => [ ...installedThemes.value, ...builtinThemes.value ]);
+const themes = computed(() => [
+	...installedThemes.value,
+	...builtinThemes.value,
+]);
 
 const selectedTheme = computed(() => {
 	if (selectedThemeId.value == null) return null;
-	return themes.value.find(x => x.id === selectedThemeId.value);
+	return themes.value.find((x) => x.id === selectedThemeId.value);
 });
 
 const selectedThemeCode = computed(() => {
 	if (selectedTheme.value == null) return null;
-	return JSON5.stringify(selectedTheme.value, null, '\t');
+	return JSON5.stringify(selectedTheme.value, null, "\t");
 });
 
 function copyThemeCode() {
@@ -62,7 +94,9 @@ function copyThemeCode() {
 
 function uninstall() {
 	removeTheme(selectedTheme.value as Theme);
-	installedThemes.value = installedThemes.value.filter(t => t.id !== selectedThemeId.value);
+	installedThemes.value = installedThemes.value.filter(
+		(t) => t.id !== selectedThemeId.value
+	);
 	selectedThemeId.value = null;
 	os.success();
 }
@@ -73,6 +107,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts._theme.manage,
-	icon: 'ph-folder-notch-open ph-bold ph-lg',
+	icon: "ph-folder-notch-open ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/theme.vue b/packages/client/src/pages/settings/theme.vue
index 15c65bd10..67e940fa1 100644
--- a/packages/client/src/pages/settings/theme.vue
+++ b/packages/client/src/pages/settings/theme.vue
@@ -1,139 +1,250 @@
 <template>
-<div class="_formRoot rsljpzjq">
-	<div v-adaptive-border class="rfqxtzch _panel _formBlock">
-		<div class="toggle">
-			<div class="toggleWrapper">
-				<input id="dn" v-model="darkMode" type="checkbox" class="dn"/>
-				<label for="dn" class="toggle">
-					<span class="before">{{ i18n.ts.light }}</span>
-					<span class="after">{{ i18n.ts.dark }}</span>
-					<span class="toggle__handler">
-						<span class="crater crater--1"></span>
-						<span class="crater crater--2"></span>
-						<span class="crater crater--3"></span>
-					</span>
-					<span class="star star--1"></span>
-					<span class="star star--2"></span>
-					<span class="star star--3"></span>
-					<span class="star star--4"></span>
-					<span class="star star--5"></span>
-					<span class="star star--6"></span>
-				</label>
+	<div class="_formRoot rsljpzjq">
+		<div v-adaptive-border class="rfqxtzch _panel _formBlock">
+			<div class="toggle">
+				<div class="toggleWrapper">
+					<input
+						id="dn"
+						v-model="darkMode"
+						type="checkbox"
+						class="dn"
+					/>
+					<label for="dn" class="toggle">
+						<span class="before">{{ i18n.ts.light }}</span>
+						<span class="after">{{ i18n.ts.dark }}</span>
+						<span class="toggle__handler">
+							<span class="crater crater--1"></span>
+							<span class="crater crater--2"></span>
+							<span class="crater crater--3"></span>
+						</span>
+						<span class="star star--1"></span>
+						<span class="star star--2"></span>
+						<span class="star star--3"></span>
+						<span class="star star--4"></span>
+						<span class="star star--5"></span>
+						<span class="star star--6"></span>
+					</label>
+				</div>
+			</div>
+			<div class="sync">
+				<FormSwitch v-model="syncDeviceDarkMode">{{
+					i18n.ts.syncDeviceDarkMode
+				}}</FormSwitch>
 			</div>
 		</div>
-		<div class="sync">
-			<FormSwitch v-model="syncDeviceDarkMode">{{ i18n.ts.syncDeviceDarkMode }}</FormSwitch>
+
+		<div class="selects _formBlock">
+			<FormSelect v-model="lightThemeId" large class="select">
+				<template #label>{{ i18n.ts.themeForLightMode }}</template>
+				<template #prefix
+					><i class="ph-sun ph-bold ph-lg"></i
+				></template>
+				<option
+					v-if="instanceLightTheme"
+					:key="'instance:' + instanceLightTheme.id"
+					:value="instanceLightTheme.id"
+				>
+					{{ instanceLightTheme.name }}
+				</option>
+				<optgroup
+					v-if="installedLightThemes.length > 0"
+					:label="i18n.ts._theme.installedThemes"
+				>
+					<option
+						v-for="x in installedLightThemes"
+						:key="'installed:' + x.id"
+						:value="x.id"
+					>
+						{{ x.name }}
+					</option>
+				</optgroup>
+				<optgroup :label="i18n.ts._theme.builtinThemes">
+					<option
+						v-for="x in builtinLightThemes"
+						:key="'builtin:' + x.id"
+						:value="x.id"
+					>
+						{{ x.name }}
+					</option>
+				</optgroup>
+			</FormSelect>
+			<FormSelect v-model="darkThemeId" large class="select">
+				<template #label>{{ i18n.ts.themeForDarkMode }}</template>
+				<template #prefix
+					><i class="ph-moon ph-bold ph-lg"></i
+				></template>
+				<option
+					v-if="instanceDarkTheme"
+					:key="'instance:' + instanceDarkTheme.id"
+					:value="instanceDarkTheme.id"
+				>
+					{{ instanceDarkTheme.name }}
+				</option>
+				<optgroup
+					v-if="installedDarkThemes.length > 0"
+					:label="i18n.ts._theme.installedThemes"
+				>
+					<option
+						v-for="x in installedDarkThemes"
+						:key="'installed:' + x.id"
+						:value="x.id"
+					>
+						{{ x.name }}
+					</option>
+				</optgroup>
+				<optgroup :label="i18n.ts._theme.builtinThemes">
+					<option
+						v-for="x in builtinDarkThemes"
+						:key="'builtin:' + x.id"
+						:value="x.id"
+					>
+						{{ x.name }}
+					</option>
+				</optgroup>
+			</FormSelect>
 		</div>
+
+		<FormSection>
+			<div class="_formLinksGrid">
+				<FormLink to="/settings/theme/manage"
+					><template #icon
+						><i
+							class="ph-folder-notch-open ph-bold ph-lg"
+						></i></template
+					>{{ i18n.ts._theme.manage
+					}}<template #suffix>{{ themesCount }}</template></FormLink
+				>
+				<FormLink to="https://assets.misskey.io/theme/list" external
+					><template #icon
+						><i class="ph-planet ph-bold ph-lg"></i></template
+					>{{ i18n.ts._theme.explore }}</FormLink
+				>
+				<FormLink to="/settings/theme/install"
+					><template #icon
+						><i
+							class="ph-download-simple ph-bold ph-lg"
+						></i></template
+					>{{ i18n.ts._theme.install }}</FormLink
+				>
+				<FormLink to="/theme-editor"
+					><template #icon
+						><i
+							class="ph-paint-brush-broad ph-bold ph-lg"
+						></i></template
+					>{{ i18n.ts._theme.make }}</FormLink
+				>
+			</div>
+		</FormSection>
+
+		<FormButton
+			v-if="wallpaper == null"
+			class="_formBlock"
+			@click="setWallpaper"
+			>{{ i18n.ts.setWallpaper }}</FormButton
+		>
+		<FormButton v-else class="_formBlock" @click="wallpaper = null">{{
+			i18n.ts.removeWallpaper
+		}}</FormButton>
 	</div>
-
-	<div class="selects _formBlock">
-		<FormSelect v-model="lightThemeId" large class="select">
-			<template #label>{{ i18n.ts.themeForLightMode }}</template>
-			<template #prefix><i class="ph-sun ph-bold ph-lg"></i></template>
-			<option v-if="instanceLightTheme" :key="'instance:' + instanceLightTheme.id" :value="instanceLightTheme.id">{{ instanceLightTheme.name }}</option>
-			<optgroup v-if="installedLightThemes.length > 0" :label="i18n.ts._theme.installedThemes">
-				<option v-for="x in installedLightThemes" :key="'installed:' + x.id" :value="x.id">{{ x.name }}</option>
-			</optgroup>
-			<optgroup :label="i18n.ts._theme.builtinThemes">
-				<option v-for="x in builtinLightThemes" :key="'builtin:' + x.id" :value="x.id">{{ x.name }}</option>
-			</optgroup>
-		</FormSelect>
-		<FormSelect v-model="darkThemeId" large class="select">
-			<template #label>{{ i18n.ts.themeForDarkMode }}</template>
-			<template #prefix><i class="ph-moon ph-bold ph-lg"></i></template>
-			<option v-if="instanceDarkTheme" :key="'instance:' + instanceDarkTheme.id" :value="instanceDarkTheme.id">{{ instanceDarkTheme.name }}</option>
-			<optgroup v-if="installedDarkThemes.length > 0" :label="i18n.ts._theme.installedThemes">
-				<option v-for="x in installedDarkThemes" :key="'installed:' + x.id" :value="x.id">{{ x.name }}</option>
-			</optgroup>
-			<optgroup :label="i18n.ts._theme.builtinThemes">
-				<option v-for="x in builtinDarkThemes" :key="'builtin:' + x.id" :value="x.id">{{ x.name }}</option>
-			</optgroup>
-		</FormSelect>
-	</div>
-
-	<FormSection>
-		<div class="_formLinksGrid">
-			<FormLink to="/settings/theme/manage"><template #icon><i class="ph-folder-notch-open ph-bold ph-lg"></i></template>{{ i18n.ts._theme.manage }}<template #suffix>{{ themesCount }}</template></FormLink>
-			<FormLink to="https://assets.misskey.io/theme/list" external><template #icon><i class="ph-planet ph-bold ph-lg"></i></template>{{ i18n.ts._theme.explore }}</FormLink>
-			<FormLink to="/settings/theme/install"><template #icon><i class="ph-download-simple ph-bold ph-lg"></i></template>{{ i18n.ts._theme.install }}</FormLink>
-			<FormLink to="/theme-editor"><template #icon><i class="ph-paint-brush-broad ph-bold ph-lg"></i></template>{{ i18n.ts._theme.make }}</FormLink>
-		</div>
-	</FormSection>
-
-	<FormButton v-if="wallpaper == null" class="_formBlock" @click="setWallpaper">{{ i18n.ts.setWallpaper }}</FormButton>
-	<FormButton v-else class="_formBlock" @click="wallpaper = null">{{ i18n.ts.removeWallpaper }}</FormButton>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onActivated, ref, watch } from 'vue';
-import JSON5 from 'json5';
-import FormSwitch from '@/components/form/switch.vue';
-import FormSelect from '@/components/form/select.vue';
-import FormSection from '@/components/form/section.vue';
-import FormLink from '@/components/form/link.vue';
-import FormButton from '@/components/MkButton.vue';
-import { getBuiltinThemesRef } from '@/scripts/theme';
-import { selectFile } from '@/scripts/select-file';
-import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
-import { ColdDeviceStorage , defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import { instance } from '@/instance';
-import { uniqueBy } from '@/scripts/array';
-import { fetchThemes, getThemes } from '@/theme-store';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed, onActivated, ref, watch } from "vue";
+import JSON5 from "json5";
+import FormSwitch from "@/components/form/switch.vue";
+import FormSelect from "@/components/form/select.vue";
+import FormSection from "@/components/form/section.vue";
+import FormLink from "@/components/form/link.vue";
+import FormButton from "@/components/MkButton.vue";
+import { getBuiltinThemesRef } from "@/scripts/theme";
+import { selectFile } from "@/scripts/select-file";
+import { isDeviceDarkmode } from "@/scripts/is-device-darkmode";
+import { ColdDeviceStorage, defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { instance } from "@/instance";
+import { uniqueBy } from "@/scripts/array";
+import { fetchThemes, getThemes } from "@/theme-store";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const installedThemes = ref(getThemes());
 const builtinThemes = getBuiltinThemesRef();
 
-const instanceDarkTheme = computed(() => instance.defaultDarkTheme ? JSON5.parse(instance.defaultDarkTheme) : null);
-const installedDarkThemes = computed(() => installedThemes.value.filter(t => t.base === 'dark' || t.kind === 'dark'));
-const builtinDarkThemes = computed(() => builtinThemes.value.filter(t => t.base === 'dark' || t.kind === 'dark'));
-const instanceLightTheme = computed(() => instance.defaultLightTheme ? JSON5.parse(instance.defaultLightTheme) : null);
-const installedLightThemes = computed(() => installedThemes.value.filter(t => t.base === 'light' || t.kind === 'light'));
-const builtinLightThemes = computed(() => builtinThemes.value.filter(t => t.base === 'light' || t.kind === 'light'));
-const themes = computed(() => uniqueBy([ instanceDarkTheme.value, instanceLightTheme.value, ...builtinThemes.value, ...installedThemes.value ].filter(x => x != null), theme => theme.id));
+const instanceDarkTheme = computed(() =>
+	instance.defaultDarkTheme ? JSON5.parse(instance.defaultDarkTheme) : null
+);
+const installedDarkThemes = computed(() =>
+	installedThemes.value.filter((t) => t.base === "dark" || t.kind === "dark")
+);
+const builtinDarkThemes = computed(() =>
+	builtinThemes.value.filter((t) => t.base === "dark" || t.kind === "dark")
+);
+const instanceLightTheme = computed(() =>
+	instance.defaultLightTheme ? JSON5.parse(instance.defaultLightTheme) : null
+);
+const installedLightThemes = computed(() =>
+	installedThemes.value.filter(
+		(t) => t.base === "light" || t.kind === "light"
+	)
+);
+const builtinLightThemes = computed(() =>
+	builtinThemes.value.filter((t) => t.base === "light" || t.kind === "light")
+);
+const themes = computed(() =>
+	uniqueBy(
+		[
+			instanceDarkTheme.value,
+			instanceLightTheme.value,
+			...builtinThemes.value,
+			...installedThemes.value,
+		].filter((x) => x != null),
+		(theme) => theme.id
+	)
+);
 
-const darkTheme = ColdDeviceStorage.ref('darkTheme');
+const darkTheme = ColdDeviceStorage.ref("darkTheme");
 const darkThemeId = computed({
 	get() {
 		return darkTheme.value.id;
 	},
 	set(id) {
-		const t = themes.value.find(x => x.id === id);
-		if (t) { // テーマエディタでテーマを作成したときなどは、themesに反映されないため undefined になる
-			ColdDeviceStorage.set('darkTheme', t);
+		const t = themes.value.find((x) => x.id === id);
+		if (t) {
+			// テーマエディタでテーマを作成したときなどは、themesに反映されないため undefined になる
+			ColdDeviceStorage.set("darkTheme", t);
 		}
 	},
 });
-const lightTheme = ColdDeviceStorage.ref('lightTheme');
+const lightTheme = ColdDeviceStorage.ref("lightTheme");
 const lightThemeId = computed({
 	get() {
 		return lightTheme.value.id;
 	},
 	set(id) {
-		const t = themes.value.find(x => x.id === id);
-		if (t) { // テーマエディタでテーマを作成したときなどは、themesに反映されないため undefined になる
-			ColdDeviceStorage.set('lightTheme', t);
+		const t = themes.value.find((x) => x.id === id);
+		if (t) {
+			// テーマエディタでテーマを作成したときなどは、themesに反映されないため undefined になる
+			ColdDeviceStorage.set("lightTheme", t);
 		}
 	},
 });
-const darkMode = computed(defaultStore.makeGetterSetter('darkMode'));
-const syncDeviceDarkMode = computed(ColdDeviceStorage.makeGetterSetter('syncDeviceDarkMode'));
-const wallpaper = ref(localStorage.getItem('wallpaper'));
+const darkMode = computed(defaultStore.makeGetterSetter("darkMode"));
+const syncDeviceDarkMode = computed(
+	ColdDeviceStorage.makeGetterSetter("syncDeviceDarkMode")
+);
+const wallpaper = ref(localStorage.getItem("wallpaper"));
 const themesCount = installedThemes.value.length;
 
 watch(syncDeviceDarkMode, () => {
 	if (syncDeviceDarkMode.value) {
-		defaultStore.set('darkMode', isDeviceDarkmode());
+		defaultStore.set("darkMode", isDeviceDarkmode());
 	}
 });
 
 watch(wallpaper, () => {
 	if (wallpaper.value == null) {
-		localStorage.removeItem('wallpaper');
+		localStorage.removeItem("wallpaper");
 	} else {
-		localStorage.setItem('wallpaper', wallpaper.value);
+		localStorage.setItem("wallpaper", wallpaper.value);
 	}
 	location.reload();
 });
@@ -149,7 +260,7 @@ fetchThemes().then(() => {
 });
 
 function setWallpaper(event) {
-	selectFile(event.currentTarget ?? event.target, null).then(file => {
+	selectFile(event.currentTarget ?? event.target, null).then((file) => {
 		wallpaper.value = file.url;
 	});
 }
@@ -160,7 +271,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.theme,
-	icon: 'ph-palette ph-bold ph-lg',
+	icon: "ph-palette ph-bold ph-lg",
 });
 </script>
 
@@ -176,7 +287,8 @@ definePageMetadata({
 		&.disabled {
 			opacity: 0.7;
 
-			&, * {
+			&,
+			* {
 				cursor: not-allowed !important;
 			}
 		}
@@ -200,11 +312,13 @@ definePageMetadata({
 			position: relative;
 			width: 90px;
 			height: 50px;
-			background-color: #83D8FF;
+			background-color: #83d8ff;
 			border-radius: 90px - 6;
-			transition: background-color 200ms cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
+			transition: background-color 200ms
+				cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
 
-			> .before, > .after {
+			> .before,
+			> .after {
 				position: absolute;
 				top: 15px;
 				transition: color 1s ease;
@@ -229,15 +343,15 @@ definePageMetadata({
 			left: 3px;
 			width: 50px - 6;
 			height: 50px - 6;
-			background-color: #FFCF96;
+			background-color: #ffcf96;
 			border-radius: 50px;
-			box-shadow: 0 2px 6px rgba(0,0,0,.3);
+			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.3);
 			transition: all 400ms cubic-bezier(0.68, -0.55, 0.265, 1.55) !important;
-			transform:  rotate(-45deg);
+			transform: rotate(-45deg);
 
 			.crater {
 				position: absolute;
-				background-color: #E8CDA5;
+				background-color: #e8cda5;
 				opacity: 0;
 				transition: opacity 200ms ease-in-out !important;
 				border-radius: 100%;
@@ -309,7 +423,7 @@ definePageMetadata({
 			z-index: 0;
 			width: 2px;
 			height: 2px;
-			transform: translate3d(3px,0,0);
+			transform: translate3d(3px, 0, 0);
 		}
 
 		.star--5 {
@@ -318,7 +432,7 @@ definePageMetadata({
 			z-index: 0;
 			width: 3px;
 			height: 3px;
-			transform: translate3d(3px,0,0);
+			transform: translate3d(3px, 0, 0);
 		}
 
 		.star--6 {
@@ -327,12 +441,12 @@ definePageMetadata({
 			z-index: 0;
 			width: 2px;
 			height: 2px;
-			transform: translate3d(3px,0,0);
+			transform: translate3d(3px, 0, 0);
 		}
 
 		input:checked {
 			+ .toggle {
-				background-color: #749DD6;
+				background-color: #749dd6;
 
 				> .before {
 					color: var(--fg);
@@ -343,10 +457,12 @@ definePageMetadata({
 				}
 
 				.toggle__handler {
-					background-color: #FFE5B5;
+					background-color: #ffe5b5;
 					transform: translate3d(40px, 0, 0) rotate(0);
 
-					.crater { opacity: 1; }
+					.crater {
+						opacity: 1;
+					}
 				}
 
 				.star--1 {
@@ -370,19 +486,22 @@ definePageMetadata({
 				.star--5,
 				.star--6 {
 					opacity: 1;
-					transform: translate3d(0,0,0);
+					transform: translate3d(0, 0, 0);
 				}
 
 				.star--4 {
-					transition: all 300ms 200ms cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
+					transition: all 300ms 200ms
+						cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
 				}
 
 				.star--5 {
-					transition: all 300ms 300ms cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
+					transition: all 300ms 300ms
+						cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
 				}
 
 				.star--6 {
-					transition: all 300ms 400ms cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
+					transition: all 300ms 400ms
+						cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
 				}
 			}
 		}
diff --git a/packages/client/src/pages/settings/webhook.edit.vue b/packages/client/src/pages/settings/webhook.edit.vue
index 7c4cc3460..7d7a2759c 100644
--- a/packages/client/src/pages/settings/webhook.edit.vue
+++ b/packages/client/src/pages/settings/webhook.edit.vue
@@ -1,53 +1,73 @@
 <template>
-<div class="_formRoot">
-	<FormInput v-model="name" class="_formBlock">
-		<template #label>Name</template>
-	</FormInput>
+	<div class="_formRoot">
+		<FormInput v-model="name" class="_formBlock">
+			<template #label>Name</template>
+		</FormInput>
 
-	<FormInput v-model="url" type="url" class="_formBlock">
-		<template #label>URL</template>
-	</FormInput>
+		<FormInput v-model="url" type="url" class="_formBlock">
+			<template #label>URL</template>
+		</FormInput>
 
-	<FormInput v-model="secret" class="_formBlock">
-		<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
-		<template #label>Secret</template>
-	</FormInput>
+		<FormInput v-model="secret" class="_formBlock">
+			<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
+			<template #label>Secret</template>
+		</FormInput>
 
-	<FormSection>
-		<template #label>Events</template>
+		<FormSection>
+			<template #label>Events</template>
 
-		<FormSwitch v-model="event_follow" class="_formBlock">Follow</FormSwitch>
-		<FormSwitch v-model="event_followed" class="_formBlock">Followed</FormSwitch>
-		<FormSwitch v-model="event_note" class="_formBlock">Note</FormSwitch>
-		<FormSwitch v-model="event_reply" class="_formBlock">Reply</FormSwitch>
-		<FormSwitch v-model="event_renote" class="_formBlock">Renote</FormSwitch>
-		<FormSwitch v-model="event_reaction" class="_formBlock">Reaction</FormSwitch>
-		<FormSwitch v-model="event_mention" class="_formBlock">Mention</FormSwitch>
-	</FormSection>
+			<FormSwitch v-model="event_follow" class="_formBlock"
+				>Follow</FormSwitch
+			>
+			<FormSwitch v-model="event_followed" class="_formBlock"
+				>Followed</FormSwitch
+			>
+			<FormSwitch v-model="event_note" class="_formBlock"
+				>Note</FormSwitch
+			>
+			<FormSwitch v-model="event_reply" class="_formBlock"
+				>Reply</FormSwitch
+			>
+			<FormSwitch v-model="event_renote" class="_formBlock"
+				>Renote</FormSwitch
+			>
+			<FormSwitch v-model="event_reaction" class="_formBlock"
+				>Reaction</FormSwitch
+			>
+			<FormSwitch v-model="event_mention" class="_formBlock"
+				>Mention</FormSwitch
+			>
+		</FormSection>
 
-	<FormSwitch v-model="active" class="_formBlock">Active</FormSwitch>
+		<FormSwitch v-model="active" class="_formBlock">Active</FormSwitch>
 
-	<div class="_formBlock" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-		<FormButton primary inline @click="save"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.save }}</FormButton>
+		<div
+			class="_formBlock"
+			style="display: flex; gap: var(--margin); flex-wrap: wrap"
+		>
+			<FormButton primary inline @click="save"
+				><i class="ph-check ph-bold ph-lg"></i>
+				{{ i18n.ts.save }}</FormButton
+			>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormInput from '@/components/form/input.vue';
-import FormSection from '@/components/form/section.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import FormInput from "@/components/form/input.vue";
+import FormSection from "@/components/form/section.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const props = defineProps<{
 	webhookId: string;
 }>();
 
-const webhook = await os.api('i/webhooks/show', {
+const webhook = await os.api("i/webhooks/show", {
 	webhookId: props.webhookId,
 });
 
@@ -56,25 +76,25 @@ let url = $ref(webhook.url);
 let secret = $ref(webhook.secret);
 let active = $ref(webhook.active);
 
-let event_follow = $ref(webhook.on.includes('follow'));
-let event_followed = $ref(webhook.on.includes('followed'));
-let event_note = $ref(webhook.on.includes('note'));
-let event_reply = $ref(webhook.on.includes('reply'));
-let event_renote = $ref(webhook.on.includes('renote'));
-let event_reaction = $ref(webhook.on.includes('reaction'));
-let event_mention = $ref(webhook.on.includes('mention'));
+let event_follow = $ref(webhook.on.includes("follow"));
+let event_followed = $ref(webhook.on.includes("followed"));
+let event_note = $ref(webhook.on.includes("note"));
+let event_reply = $ref(webhook.on.includes("reply"));
+let event_renote = $ref(webhook.on.includes("renote"));
+let event_reaction = $ref(webhook.on.includes("reaction"));
+let event_mention = $ref(webhook.on.includes("mention"));
 
 async function save(): Promise<void> {
 	const events = [];
-	if (event_follow) events.push('follow');
-	if (event_followed) events.push('followed');
-	if (event_note) events.push('note');
-	if (event_reply) events.push('reply');
-	if (event_renote) events.push('renote');
-	if (event_reaction) events.push('reaction');
-	if (event_mention) events.push('mention');
+	if (event_follow) events.push("follow");
+	if (event_followed) events.push("followed");
+	if (event_note) events.push("note");
+	if (event_reply) events.push("reply");
+	if (event_renote) events.push("renote");
+	if (event_reaction) events.push("reaction");
+	if (event_mention) events.push("mention");
 
-	os.apiWithDialog('i/webhooks/update', {
+	os.apiWithDialog("i/webhooks/update", {
 		name,
 		url,
 		secret,
@@ -88,7 +108,7 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
-	title: 'Edit webhook',
-	icon: 'ph-lightning ph-bold ph-lg',
+	title: "Edit webhook",
+	icon: "ph-lightning ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/webhook.new.vue b/packages/client/src/pages/settings/webhook.new.vue
index ab16ccecd..ea45312d5 100644
--- a/packages/client/src/pages/settings/webhook.new.vue
+++ b/packages/client/src/pages/settings/webhook.new.vue
@@ -1,49 +1,69 @@
 <template>
-<div class="_formRoot">
-	<FormInput v-model="name" class="_formBlock">
-		<template #label>Name</template>
-	</FormInput>
+	<div class="_formRoot">
+		<FormInput v-model="name" class="_formBlock">
+			<template #label>Name</template>
+		</FormInput>
 
-	<FormInput v-model="url" type="url" class="_formBlock">
-		<template #label>URL</template>
-	</FormInput>
+		<FormInput v-model="url" type="url" class="_formBlock">
+			<template #label>URL</template>
+		</FormInput>
 
-	<FormInput v-model="secret" class="_formBlock">
-		<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
-		<template #label>Secret</template>
-	</FormInput>
+		<FormInput v-model="secret" class="_formBlock">
+			<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
+			<template #label>Secret</template>
+		</FormInput>
 
-	<FormSection>
-		<template #label>Events</template>
+		<FormSection>
+			<template #label>Events</template>
 
-		<FormSwitch v-model="event_follow" class="_formBlock">Follow</FormSwitch>
-		<FormSwitch v-model="event_followed" class="_formBlock">Followed</FormSwitch>
-		<FormSwitch v-model="event_note" class="_formBlock">Note</FormSwitch>
-		<FormSwitch v-model="event_reply" class="_formBlock">Reply</FormSwitch>
-		<FormSwitch v-model="event_renote" class="_formBlock">Renote</FormSwitch>
-		<FormSwitch v-model="event_reaction" class="_formBlock">Reaction</FormSwitch>
-		<FormSwitch v-model="event_mention" class="_formBlock">Mention</FormSwitch>
-	</FormSection>
+			<FormSwitch v-model="event_follow" class="_formBlock"
+				>Follow</FormSwitch
+			>
+			<FormSwitch v-model="event_followed" class="_formBlock"
+				>Followed</FormSwitch
+			>
+			<FormSwitch v-model="event_note" class="_formBlock"
+				>Note</FormSwitch
+			>
+			<FormSwitch v-model="event_reply" class="_formBlock"
+				>Reply</FormSwitch
+			>
+			<FormSwitch v-model="event_renote" class="_formBlock"
+				>Renote</FormSwitch
+			>
+			<FormSwitch v-model="event_reaction" class="_formBlock"
+				>Reaction</FormSwitch
+			>
+			<FormSwitch v-model="event_mention" class="_formBlock"
+				>Mention</FormSwitch
+			>
+		</FormSection>
 
-	<div class="_formBlock" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
-		<FormButton primary inline @click="create"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.create }}</FormButton>
+		<div
+			class="_formBlock"
+			style="display: flex; gap: var(--margin); flex-wrap: wrap"
+		>
+			<FormButton primary inline @click="create"
+				><i class="ph-check ph-bold ph-lg"></i>
+				{{ i18n.ts.create }}</FormButton
+			>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormInput from '@/components/form/input.vue';
-import FormSection from '@/components/form/section.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormButton from '@/components/MkButton.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import FormInput from "@/components/form/input.vue";
+import FormSection from "@/components/form/section.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormButton from "@/components/MkButton.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-let name = $ref('');
-let url = $ref('');
-let secret = $ref('');
+let name = $ref("");
+let url = $ref("");
+let secret = $ref("");
 
 let event_follow = $ref(true);
 let event_followed = $ref(true);
@@ -55,15 +75,15 @@ let event_mention = $ref(true);
 
 async function create(): Promise<void> {
 	const events = [];
-	if (event_follow) events.push('follow');
-	if (event_followed) events.push('followed');
-	if (event_note) events.push('note');
-	if (event_reply) events.push('reply');
-	if (event_renote) events.push('renote');
-	if (event_reaction) events.push('reaction');
-	if (event_mention) events.push('mention');
+	if (event_follow) events.push("follow");
+	if (event_followed) events.push("followed");
+	if (event_note) events.push("note");
+	if (event_reply) events.push("reply");
+	if (event_renote) events.push("renote");
+	if (event_reaction) events.push("reaction");
+	if (event_mention) events.push("mention");
 
-	os.apiWithDialog('i/webhooks/create', {
+	os.apiWithDialog("i/webhooks/create", {
 		name,
 		url,
 		secret,
@@ -76,7 +96,7 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
-	title: 'Create new webhook',
-	icon: 'ph-lightning ph-bold ph-lg',
+	title: "Create new webhook",
+	icon: "ph-lightning ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/webhook.vue b/packages/client/src/pages/settings/webhook.vue
index bf5f8ca4a..14309a120 100644
--- a/packages/client/src/pages/settings/webhook.vue
+++ b/packages/client/src/pages/settings/webhook.vue
@@ -1,44 +1,68 @@
 <template>
-<div class="_formRoot">
-	<FormSection>
-		<FormLink :to="`/settings/webhook/new`">
-			Create webhook
-		</FormLink>
-	</FormSection>
+	<div class="_formRoot">
+		<FormSection>
+			<FormLink :to="`/settings/webhook/new`"> Create webhook </FormLink>
+		</FormSection>
 
-	<FormSection>
-		<MkPagination :pagination="pagination">
-			<template #default="{items}">
-				<FormLink v-for="webhook in items" :key="webhook.id" :to="`/settings/webhook/edit/${webhook.id}`" class="_formBlock">
-					<template #icon>
-						<i v-if="webhook.active === false" class="ph-pause-circle ph-bold ph-lg"></i>
-						<i v-else-if="webhook.latestStatus === null" class="ph-circle ph-fill"></i>
-						<i v-else-if="[200, 201, 204].includes(webhook.latestStatus)" class="ph-check ph-bold ph-lg" :style="{ color: 'var(--success)' }"></i>
-						<i v-else class="ph-warning ph-bold ph-lg" :style="{ color: 'var(--error)' }"></i>
-					</template>
-					{{ webhook.name || webhook.url }}
-					<template #suffix>
-						<MkTime v-if="webhook.latestSentAt" :time="webhook.latestSentAt"></MkTime>
-					</template>
-				</FormLink>
-			</template>
-		</MkPagination>
-	</FormSection>
-</div>
+		<FormSection>
+			<MkPagination :pagination="pagination">
+				<template #default="{ items }">
+					<FormLink
+						v-for="webhook in items"
+						:key="webhook.id"
+						:to="`/settings/webhook/edit/${webhook.id}`"
+						class="_formBlock"
+					>
+						<template #icon>
+							<i
+								v-if="webhook.active === false"
+								class="ph-pause-circle ph-bold ph-lg"
+							></i>
+							<i
+								v-else-if="webhook.latestStatus === null"
+								class="ph-circle ph-fill"
+							></i>
+							<i
+								v-else-if="
+									[200, 201, 204].includes(
+										webhook.latestStatus
+									)
+								"
+								class="ph-check ph-bold ph-lg"
+								:style="{ color: 'var(--success)' }"
+							></i>
+							<i
+								v-else
+								class="ph-warning ph-bold ph-lg"
+								:style="{ color: 'var(--error)' }"
+							></i>
+						</template>
+						{{ webhook.name || webhook.url }}
+						<template #suffix>
+							<MkTime
+								v-if="webhook.latestSentAt"
+								:time="webhook.latestSentAt"
+							></MkTime>
+						</template>
+					</FormLink>
+				</template>
+			</MkPagination>
+		</FormSection>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkPagination from '@/components/MkPagination.vue';
-import FormSection from '@/components/form/section.vue';
-import FormLink from '@/components/form/link.vue';
-import { userPage } from '@/filters/user';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import MkPagination from "@/components/MkPagination.vue";
+import FormSection from "@/components/form/section.vue";
+import FormLink from "@/components/form/link.vue";
+import { userPage } from "@/filters/user";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const pagination = {
-	endpoint: 'i/webhooks/list' as const,
+	endpoint: "i/webhooks/list" as const,
 	limit: 10,
 };
 
@@ -47,7 +71,7 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
-	title: 'Webhook',
-	icon: 'ph-lightning ph-bold ph-lg',
+	title: "Webhook",
+	icon: "ph-lightning ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/settings/word-mute.vue b/packages/client/src/pages/settings/word-mute.vue
index 744ab0395..9c69358bf 100644
--- a/packages/client/src/pages/settings/word-mute.vue
+++ b/packages/client/src/pages/settings/word-mute.vue
@@ -1,62 +1,86 @@
 <template>
-<div class="_formRoot">
-	<MkTab v-model="tab" class="_formBlock">
-		<option value="soft">{{ i18n.ts._wordMute.soft }}</option>
-		<option value="hard">{{ i18n.ts._wordMute.hard }}</option>
-	</MkTab>
-	<div class="_formBlock">
-		<div v-show="tab === 'soft'">
-			<MkInfo class="_formBlock">{{ i18n.ts._wordMute.softDescription }}</MkInfo>
-			<FormTextarea v-model="softMutedWords" class="_formBlock">
-				<span>{{ i18n.ts._wordMute.muteWords }}</span>
-				<template #caption>{{ i18n.ts._wordMute.muteWordsDescription }}<br>{{ i18n.ts._wordMute.muteWordsDescription2 }}</template>
-			</FormTextarea>
-		</div>
-		<div v-show="tab === 'hard'">
-			<MkInfo class="_formBlock">{{ i18n.ts._wordMute.hardDescription }} {{ i18n.ts.reflectMayTakeTime }}</MkInfo>
-			<FormTextarea v-model="hardMutedWords" class="_formBlock">
-				<span>{{ i18n.ts._wordMute.muteWords }}</span>
-				<template #caption>{{ i18n.ts._wordMute.muteWordsDescription }}<br>{{ i18n.ts._wordMute.muteWordsDescription2 }}</template>
-			</FormTextarea>
-			<MkKeyValue v-if="hardWordMutedNotesCount != null" class="_formBlock">
-				<template #key>{{ i18n.ts._wordMute.mutedNotes }}</template>
-				<template #value>{{ number(hardWordMutedNotesCount) }}</template>
-			</MkKeyValue>
+	<div class="_formRoot">
+		<MkTab v-model="tab" class="_formBlock">
+			<option value="soft">{{ i18n.ts._wordMute.soft }}</option>
+			<option value="hard">{{ i18n.ts._wordMute.hard }}</option>
+		</MkTab>
+		<div class="_formBlock">
+			<div v-show="tab === 'soft'">
+				<MkInfo class="_formBlock">{{
+					i18n.ts._wordMute.softDescription
+				}}</MkInfo>
+				<FormTextarea v-model="softMutedWords" class="_formBlock">
+					<span>{{ i18n.ts._wordMute.muteWords }}</span>
+					<template #caption
+						>{{ i18n.ts._wordMute.muteWordsDescription }}<br />{{
+							i18n.ts._wordMute.muteWordsDescription2
+						}}</template
+					>
+				</FormTextarea>
+			</div>
+			<div v-show="tab === 'hard'">
+				<MkInfo class="_formBlock"
+					>{{ i18n.ts._wordMute.hardDescription }}
+					{{ i18n.ts.reflectMayTakeTime }}</MkInfo
+				>
+				<FormTextarea v-model="hardMutedWords" class="_formBlock">
+					<span>{{ i18n.ts._wordMute.muteWords }}</span>
+					<template #caption
+						>{{ i18n.ts._wordMute.muteWordsDescription }}<br />{{
+							i18n.ts._wordMute.muteWordsDescription2
+						}}</template
+					>
+				</FormTextarea>
+				<MkKeyValue
+					v-if="hardWordMutedNotesCount != null"
+					class="_formBlock"
+				>
+					<template #key>{{ i18n.ts._wordMute.mutedNotes }}</template>
+					<template #value>{{
+						number(hardWordMutedNotesCount)
+					}}</template>
+				</MkKeyValue>
+			</div>
 		</div>
+		<MkButton primary inline :disabled="!changed" @click="save()"
+			><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+			{{ i18n.ts.save }}</MkButton
+		>
 	</div>
-	<MkButton primary inline :disabled="!changed" @click="save()"><i class="ph-floppy-disk-back ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import MkTab from '@/components/MkTab.vue';
-import * as os from '@/os';
-import number from '@/filters/number';
-import { defaultStore } from '@/store';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { ref, watch } from "vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInfo from "@/components/MkInfo.vue";
+import MkTab from "@/components/MkTab.vue";
+import * as os from "@/os";
+import number from "@/filters/number";
+import { defaultStore } from "@/store";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-const render = (mutedWords) => mutedWords.map(x => {
-	if (Array.isArray(x)) {
-		return x.join(' ');
-	} else {
-		return x;
-	}
-}).join('\n');
+const render = (mutedWords) =>
+	mutedWords
+		.map((x) => {
+			if (Array.isArray(x)) {
+				return x.join(" ");
+			} else {
+				return x;
+			}
+		})
+		.join("\n");
 
-const tab = ref('soft');
+const tab = ref("soft");
 const softMutedWords = ref(render(defaultStore.state.mutedWords));
 const hardMutedWords = ref(render($i!.mutedWords));
 const hardWordMutedNotesCount = ref(null);
 const changed = ref(false);
 
-os.api('i/get-word-muted-notes-count', {}).then(response => {
+os.api("i/get-word-muted-notes-count", {}).then((response) => {
 	hardWordMutedNotesCount.value = response?.count;
 });
 
@@ -71,7 +95,11 @@ watch(hardMutedWords, () => {
 async function save() {
 	const parseMutes = (mutes, tab) => {
 		// split into lines, remove empty lines and unnecessary whitespace
-		let lines = mutes.trim().split('\n').map(line => line.trim()).filter(line => line !== '');
+		let lines = mutes
+			.trim()
+			.split("\n")
+			.map((line) => line.trim())
+			.filter((line) => line !== "");
 
 		// check each line if it is a RegExp or not
 		for (let i = 0; i < lines.length; i++) {
@@ -85,15 +113,21 @@ async function save() {
 				} catch (err: any) {
 					// invalid syntax: do not save, do not reset changed flag
 					os.alert({
-						type: 'error',
+						type: "error",
 						title: i18n.ts.regexpError,
-						text: i18n.t('regexpErrorDescription', { tab, line: i + 1 }) + '\n' + err.toString(),
+						text:
+							i18n.t("regexpErrorDescription", {
+								tab,
+								line: i + 1,
+							}) +
+							"\n" +
+							err.toString(),
 					});
 					// re-throw error so these invalid settings are not saved
 					throw err;
 				}
 			} else {
-				lines[i] = line.split(' ');
+				lines[i] = line.split(" ");
 			}
 		}
 
@@ -109,8 +143,8 @@ async function save() {
 		return;
 	}
 
-	defaultStore.set('mutedWords', softMutes);
-	await os.api('i/update', {
+	defaultStore.set("mutedWords", softMutes);
+	await os.api("i/update", {
 		mutedWords: hardMutes,
 	});
 
@@ -123,6 +157,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.wordMute,
-	icon: 'ph-speaker-x ph-bold ph-lg',
+	icon: "ph-speaker-x ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/pages/share.vue b/packages/client/src/pages/share.vue
index c073c2690..5b4231ff8 100644
--- a/packages/client/src/pages/share.vue
+++ b/packages/client/src/pages/share.vue
@@ -1,144 +1,175 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="800">
-		<XPostForm
-			v-if="state === 'writing'"
-			fixed
-			:instant="true"
-			:initial-text="initialText"
-			:initial-visibility="visibility"
-			:initial-files="files"
-			:initial-local-only="localOnly"
-			:reply="reply"
-			:renote="renote"
-			:initial-visible-users="visibleUsers"
-			class="_panel"
-			@posted="state = 'posted'"
-		/>
-		<MkButton v-else-if="state === 'posted'" primary class="close" @click="close()">{{ i18n.ts.close }}</MkButton>
-	</MkSpacer>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="800">
+			<XPostForm
+				v-if="state === 'writing'"
+				fixed
+				:instant="true"
+				:initial-text="initialText"
+				:initial-visibility="visibility"
+				:initial-files="files"
+				:initial-local-only="localOnly"
+				:reply="reply"
+				:renote="renote"
+				:initial-visible-users="visibleUsers"
+				class="_panel"
+				@posted="state = 'posted'"
+			/>
+			<MkButton
+				v-else-if="state === 'posted'"
+				primary
+				class="close"
+				@click="close()"
+				>{{ i18n.ts.close }}</MkButton
+			>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
 // SPECIFICATION: https://misskey-hub.net/docs/features/share-form.html
 
-import { } from 'vue';
-import { noteVisibilities } from 'calckey-js';
-import * as Acct from 'calckey-js/built/acct';
-import * as Misskey from 'calckey-js';
-import MkButton from '@/components/MkButton.vue';
-import XPostForm from '@/components/MkPostForm.vue';
-import * as os from '@/os';
-import { mainRouter } from '@/router';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import { noteVisibilities } from "calckey-js";
+import * as Acct from "calckey-js/built/acct";
+import * as Misskey from "calckey-js";
+import MkButton from "@/components/MkButton.vue";
+import XPostForm from "@/components/MkPostForm.vue";
+import * as os from "@/os";
+import { mainRouter } from "@/router";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
 
 const urlParams = new URLSearchParams(window.location.search);
-const localOnlyQuery = urlParams.get('localOnly');
-const visibilityQuery = urlParams.get('visibility');
+const localOnlyQuery = urlParams.get("localOnly");
+const visibilityQuery = urlParams.get("visibility");
 
-let state = $ref('fetching' as 'fetching' | 'writing' | 'posted');
-let title = $ref(urlParams.get('title'));
-const text = urlParams.get('text');
-const url = urlParams.get('url');
+let state = $ref("fetching" as "fetching" | "writing" | "posted");
+let title = $ref(urlParams.get("title"));
+const text = urlParams.get("text");
+const url = urlParams.get("url");
 let initialText = $ref(null as string | null);
 let reply = $ref(null as Misskey.entities.Note | null);
 let renote = $ref(null as Misskey.entities.Note | null);
-let visibility = $ref(noteVisibilities.includes(visibilityQuery) ? visibilityQuery : null);
-let localOnly = $ref(localOnlyQuery === '0' ? false : localOnlyQuery === '1' ? true : null);
+let visibility = $ref(
+	noteVisibilities.includes(visibilityQuery) ? visibilityQuery : null
+);
+let localOnly = $ref(
+	localOnlyQuery === "0" ? false : localOnlyQuery === "1" ? true : null
+);
 let files = $ref([] as Misskey.entities.DriveFile[]);
 let visibleUsers = $ref([] as Misskey.entities.User[]);
 
 async function init() {
-	let noteText = '';
+	let noteText = "";
 	if (title) noteText += `[ ${title} ]\n`;
 	// Googleニュース対策
-	if (text?.startsWith(`${title}.\n`)) noteText += text.replace(`${title}.\n`, '');
+	if (text?.startsWith(`${title}.\n`))
+		noteText += text.replace(`${title}.\n`, "");
 	else if (text && title !== text) noteText += `${text}\n`;
 	if (url) noteText += `${url}`;
 	initialText = noteText.trim();
 
-	if (visibility === 'specified') {
-		const visibleUserIds = urlParams.get('visibleUserIds');
-		const visibleAccts = urlParams.get('visibleAccts');
+	if (visibility === "specified") {
+		const visibleUserIds = urlParams.get("visibleUserIds");
+		const visibleAccts = urlParams.get("visibleAccts");
 		await Promise.all(
 			[
-				...(visibleUserIds ? visibleUserIds.split(',').map(userId => ({ userId })) : []),
-				...(visibleAccts ? visibleAccts.split(',').map(Acct.parse) : []),
+				...(visibleUserIds
+					? visibleUserIds.split(",").map((userId) => ({ userId }))
+					: []),
+				...(visibleAccts
+					? visibleAccts.split(",").map(Acct.parse)
+					: []),
 			]
-			// TypeScriptの指示通りに変換する
-			.map(q => 'username' in q ? { username: q.username, host: q.host === null ? undefined : q.host } : q)
-			.map(q => os.api('users/show', q)
-				.then(user => {
-					visibleUsers.push(user);
-				}, () => {
-					console.error(`Invalid user query: ${JSON.stringify(q)}`);
-				}),
-			),
+				// TypeScriptの指示通りに変換する
+				.map((q) =>
+					"username" in q
+						? {
+								username: q.username,
+								host: q.host === null ? undefined : q.host,
+						  }
+						: q
+				)
+				.map((q) =>
+					os.api("users/show", q).then(
+						(user) => {
+							visibleUsers.push(user);
+						},
+						() => {
+							console.error(
+								`Invalid user query: ${JSON.stringify(q)}`
+							);
+						}
+					)
+				)
 		);
 	}
 
 	try {
 		//#region Reply
-		const replyId = urlParams.get('replyId');
-		const replyUri = urlParams.get('replyUri');
+		const replyId = urlParams.get("replyId");
+		const replyUri = urlParams.get("replyUri");
 		if (replyId) {
-			reply = await os.api('notes/show', {
+			reply = await os.api("notes/show", {
 				noteId: replyId,
 			});
 		} else if (replyUri) {
-			const obj = await os.api('ap/show', {
+			const obj = await os.api("ap/show", {
 				uri: replyUri,
 			});
-			if (obj.type === 'Note') {
+			if (obj.type === "Note") {
 				reply = obj.object;
 			}
 		}
 		//#endregion
 
 		//#region Renote
-		const renoteId = urlParams.get('renoteId');
-		const renoteUri = urlParams.get('renoteUri');
+		const renoteId = urlParams.get("renoteId");
+		const renoteUri = urlParams.get("renoteUri");
 		if (renoteId) {
-			renote = await os.api('notes/show', {
+			renote = await os.api("notes/show", {
 				noteId: renoteId,
 			});
 		} else if (renoteUri) {
-			const obj = await os.api('ap/show', {
+			const obj = await os.api("ap/show", {
 				uri: renoteUri,
 			});
-			if (obj.type === 'Note') {
+			if (obj.type === "Note") {
 				renote = obj.object;
 			}
 		}
 		//#endregion
 
 		//#region Drive files
-		const fileIds = urlParams.get('fileIds');
+		const fileIds = urlParams.get("fileIds");
 		if (fileIds) {
 			await Promise.all(
-				fileIds.split(',')
-				.map(fileId => os.api('drive/files/show', { fileId })
-					.then(file => {
-						files.push(file);
-					}, () => {
-						console.error(`Failed to fetch a file ${fileId}`);
-					}),
-				),
+				fileIds.split(",").map((fileId) =>
+					os.api("drive/files/show", { fileId }).then(
+						(file) => {
+							files.push(file);
+						},
+						() => {
+							console.error(`Failed to fetch a file ${fileId}`);
+						}
+					)
+				)
 			);
 		}
 		//#endregion
 	} catch (err) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			title: err.message,
 			text: err.name,
 		});
 	}
 
-	state = 'writing';
+	state = "writing";
 }
 
 init();
@@ -148,7 +179,7 @@ function close(): void {
 
 	// 閉じなければ100ms後タイムラインに
 	window.setTimeout(() => {
-		mainRouter.push('/');
+		mainRouter.push("/");
 	}, 100);
 }
 
@@ -158,7 +189,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.share,
-	icon: 'ph-share-network ph-bold ph-lg',
+	icon: "ph-share-network ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/signup-complete.vue b/packages/client/src/pages/signup-complete.vue
index 7c11d4c81..db06799ba 100644
--- a/packages/client/src/pages/signup-complete.vue
+++ b/packages/client/src/pages/signup-complete.vue
@@ -1,15 +1,15 @@
 <template>
-<div>
-	{{ i18n.ts.processing }}
-</div>
+	<div>
+		{{ i18n.ts.processing }}
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import * as os from '@/os';
-import { login } from '@/account';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { onMounted } from "vue";
+import * as os from "@/os";
+import { login } from "@/account";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const props = defineProps<{
 	code: string;
@@ -17,13 +17,13 @@ const props = defineProps<{
 
 onMounted(async () => {
 	await os.alert({
-		type: 'info',
-		text: i18n.t('clickToFinishEmailVerification', { ok: i18n.ts.gotIt }),
+		type: "info",
+		text: i18n.t("clickToFinishEmailVerification", { ok: i18n.ts.gotIt }),
 	});
-	const res = await os.apiWithDialog('signup-pending', {
+	const res = await os.apiWithDialog("signup-pending", {
 		code: props.code,
 	});
-	login(res.i, '/');
+	login(res.i, "/");
 });
 
 const headerActions = $computed(() => []);
@@ -32,10 +32,8 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.signup,
-	icon: 'ph-user ph-bold ph-lg',
+	icon: "ph-user ph-bold ph-lg",
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue
index 7570deb41..390b6a0ba 100644
--- a/packages/client/src/pages/tag.vue
+++ b/packages/client/src/pages/tag.vue
@@ -1,23 +1,25 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="800">
-		<XNotes class="_content" :pagination="pagination"/>
-	</MkSpacer>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="800">
+			<XNotes class="_content" :pagination="pagination" />
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import XNotes from '@/components/MkNotes.vue';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed } from "vue";
+import XNotes from "@/components/MkNotes.vue";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const props = defineProps<{
 	tag: string;
 }>();
 
 const pagination = {
-	endpoint: 'notes/search-by-tag' as const,
+	endpoint: "notes/search-by-tag" as const,
 	limit: 10,
 	params: computed(() => ({
 		tag: props.tag,
@@ -28,8 +30,10 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => ({
-	title: props.tag,
-	icon: 'ph-hash ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: props.tag,
+		icon: "ph-hash ph-bold ph-lg",
+	}))
+);
 </script>
diff --git a/packages/client/src/pages/theme-editor.vue b/packages/client/src/pages/theme-editor.vue
index 7643da986..28a50f925 100644
--- a/packages/client/src/pages/theme-editor.vue
+++ b/packages/client/src/pages/theme-editor.vue
@@ -1,126 +1,245 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="800" :margin-min="16" :margin-max="32">
-		<div class="cwepdizn _formRoot">
-			<FormFolder :default-open="true" class="_formBlock">
-				<template #label>{{ i18n.ts.backgroundColor }}</template>
-				<div class="cwepdizn-colors">
-					<div class="row">
-						<button v-for="color in bgColors.filter(x => x.kind === 'light')" :key="color.color" class="color _button" :class="{ active: theme.props.bg === color.color }" @click="setBgColor(color)">
-							<div class="preview" :style="{ background: color.forPreview }"></div>
-						</button>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="800" :margin-min="16" :margin-max="32">
+			<div class="cwepdizn _formRoot">
+				<FormFolder :default-open="true" class="_formBlock">
+					<template #label>{{ i18n.ts.backgroundColor }}</template>
+					<div class="cwepdizn-colors">
+						<div class="row">
+							<button
+								v-for="color in bgColors.filter(
+									(x) => x.kind === 'light'
+								)"
+								:key="color.color"
+								class="color _button"
+								:class="{
+									active: theme.props.bg === color.color,
+								}"
+								@click="setBgColor(color)"
+							>
+								<div
+									class="preview"
+									:style="{ background: color.forPreview }"
+								></div>
+							</button>
+						</div>
+						<div class="row">
+							<button
+								v-for="color in bgColors.filter(
+									(x) => x.kind === 'dark'
+								)"
+								:key="color.color"
+								class="color _button"
+								:class="{
+									active: theme.props.bg === color.color,
+								}"
+								@click="setBgColor(color)"
+							>
+								<div
+									class="preview"
+									:style="{ background: color.forPreview }"
+								></div>
+							</button>
+						</div>
 					</div>
-					<div class="row">
-						<button v-for="color in bgColors.filter(x => x.kind === 'dark')" :key="color.color" class="color _button" :class="{ active: theme.props.bg === color.color }" @click="setBgColor(color)">
-							<div class="preview" :style="{ background: color.forPreview }"></div>
-						</button>
+				</FormFolder>
+
+				<FormFolder :default-open="true" class="_formBlock">
+					<template #label>{{ i18n.ts.accentColor }}</template>
+					<div class="cwepdizn-colors">
+						<div class="row">
+							<button
+								v-for="color in accentColors"
+								:key="color"
+								class="color rounded _button"
+								:class="{
+									active: theme.props.accent === color,
+								}"
+								@click="setAccentColor(color)"
+							>
+								<div
+									class="preview"
+									:style="{ background: color }"
+								></div>
+							</button>
+						</div>
 					</div>
-				</div>
-			</FormFolder>
+				</FormFolder>
 
-			<FormFolder :default-open="true" class="_formBlock">
-				<template #label>{{ i18n.ts.accentColor }}</template>
-				<div class="cwepdizn-colors">
-					<div class="row">
-						<button v-for="color in accentColors" :key="color" class="color rounded _button" :class="{ active: theme.props.accent === color }" @click="setAccentColor(color)">
-							<div class="preview" :style="{ background: color }"></div>
-						</button>
+				<FormFolder :default-open="true" class="_formBlock">
+					<template #label>{{ i18n.ts.textColor }}</template>
+					<div class="cwepdizn-colors">
+						<div class="row">
+							<button
+								v-for="color in fgColors"
+								:key="color"
+								class="color char _button"
+								:class="{
+									active:
+										theme.props.fg === color.forLight ||
+										theme.props.fg === color.forDark,
+								}"
+								@click="setFgColor(color)"
+							>
+								<div
+									class="preview"
+									:style="{
+										color: color.forPreview
+											? color.forPreview
+											: theme.base === 'light'
+											? '#5f5f5f'
+											: '#dadada',
+									}"
+								>
+									A
+								</div>
+							</button>
+						</div>
 					</div>
-				</div>
-			</FormFolder>
+				</FormFolder>
 
-			<FormFolder :default-open="true" class="_formBlock">
-				<template #label>{{ i18n.ts.textColor }}</template>
-				<div class="cwepdizn-colors">
-					<div class="row">
-						<button v-for="color in fgColors" :key="color" class="color char _button" :class="{ active: (theme.props.fg === color.forLight) || (theme.props.fg === color.forDark) }" @click="setFgColor(color)">
-							<div class="preview" :style="{ color: color.forPreview ? color.forPreview : theme.base === 'light' ? '#5f5f5f' : '#dadada' }">A</div>
-						</button>
+				<FormFolder :default-open="false" class="_formBlock">
+					<template #icon
+						><i class="ph-code ph-bold ph-lg"></i
+					></template>
+					<template #label>{{ i18n.ts.editCode }}</template>
+
+					<div class="_formRoot">
+						<FormTextarea
+							v-model="themeCode"
+							tall
+							class="_formBlock"
+						>
+							<template #label>{{
+								i18n.ts._theme.code
+							}}</template>
+						</FormTextarea>
+						<FormButton
+							primary
+							class="_formBlock"
+							@click="applyThemeCode"
+							>{{ i18n.ts.apply }}</FormButton
+						>
 					</div>
-				</div>
-			</FormFolder>
+				</FormFolder>
 
-			<FormFolder :default-open="false" class="_formBlock">
-				<template #icon><i class="ph-code ph-bold ph-lg"></i></template>
-				<template #label>{{ i18n.ts.editCode }}</template>
+				<FormFolder :default-open="false" class="_formBlock">
+					<template #label>{{ i18n.ts.addDescription }}</template>
 
-				<div class="_formRoot">
-					<FormTextarea v-model="themeCode" tall class="_formBlock">
-						<template #label>{{ i18n.ts._theme.code }}</template>
-					</FormTextarea>
-					<FormButton primary class="_formBlock" @click="applyThemeCode">{{ i18n.ts.apply }}</FormButton>
-				</div>
-			</FormFolder>
-
-			<FormFolder :default-open="false" class="_formBlock">
-				<template #label>{{ i18n.ts.addDescription }}</template>
-
-				<div class="_formRoot">
-					<FormTextarea v-model="description">
-						<template #label>{{ i18n.ts._theme.description }}</template>
-					</FormTextarea>
-				</div>
-			</FormFolder>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+					<div class="_formRoot">
+						<FormTextarea v-model="description">
+							<template #label>{{
+								i18n.ts._theme.description
+							}}</template>
+						</FormTextarea>
+					</div>
+				</FormFolder>
+			</div>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { watch } from 'vue';
-import { toUnicode } from 'punycode/';
-import tinycolor from 'tinycolor2';
-import { v4 as uuid } from 'uuid';
-import JSON5 from 'json5';
+import { watch } from "vue";
+import { toUnicode } from "punycode/";
+import tinycolor from "tinycolor2";
+import { v4 as uuid } from "uuid";
+import JSON5 from "json5";
 
-import FormButton from '@/components/MkButton.vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormFolder from '@/components/form/folder.vue';
+import FormButton from "@/components/MkButton.vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormFolder from "@/components/form/folder.vue";
 
-import { $i } from '@/account';
-import { Theme, applyTheme } from '@/scripts/theme';
-import lightTheme from '@/themes/_light.json5';
-import darkTheme from '@/themes/_dark.json5';
-import { host } from '@/config';
-import * as os from '@/os';
-import { ColdDeviceStorage, defaultStore } from '@/store';
-import { addTheme } from '@/theme-store';
-import { i18n } from '@/i18n';
-import { useLeaveGuard } from '@/scripts/use-leave-guard';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { $i } from "@/account";
+import { Theme, applyTheme } from "@/scripts/theme";
+import lightTheme from "@/themes/_light.json5";
+import darkTheme from "@/themes/_dark.json5";
+import { host } from "@/config";
+import * as os from "@/os";
+import { ColdDeviceStorage, defaultStore } from "@/store";
+import { addTheme } from "@/theme-store";
+import { i18n } from "@/i18n";
+import { useLeaveGuard } from "@/scripts/use-leave-guard";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 const bgColors = [
-	{ color: '#f5f5f5', kind: 'light', forPreview: '#f5f5f5' },
-	{ color: '#f0eee9', kind: 'light', forPreview: '#f3e2b9' },
-	{ color: '#e9eff0', kind: 'light', forPreview: '#bfe3e8' },
-	{ color: '#f0e9ee', kind: 'light', forPreview: '#f1d1e8' },
-	{ color: '#dce2e0', kind: 'light', forPreview: '#a4dccc' },
-	{ color: '#e2e0dc', kind: 'light', forPreview: '#d8c7a5' },
-	{ color: '#d5dbe0', kind: 'light', forPreview: '#b0cae0' },
-	{ color: '#dad5d5', kind: 'light', forPreview: '#d6afaf' },
-	{ color: '#2b2b2b', kind: 'dark', forPreview: '#444444' },
-	{ color: '#362e29', kind: 'dark', forPreview: '#735c4d' },
-	{ color: '#303629', kind: 'dark', forPreview: '#506d2f' },
-	{ color: '#293436', kind: 'dark', forPreview: '#258192' },
-	{ color: '#2e2936', kind: 'dark', forPreview: '#504069' },
-	{ color: '#252722', kind: 'dark', forPreview: '#3c462f' },
-	{ color: '#212525', kind: 'dark', forPreview: '#303e3e' },
-	{ color: '#191919', kind: 'dark', forPreview: '#272727' },
+	{ color: "#f5f5f5", kind: "light", forPreview: "#f5f5f5" },
+	{ color: "#f0eee9", kind: "light", forPreview: "#f3e2b9" },
+	{ color: "#e9eff0", kind: "light", forPreview: "#bfe3e8" },
+	{ color: "#f0e9ee", kind: "light", forPreview: "#f1d1e8" },
+	{ color: "#dce2e0", kind: "light", forPreview: "#a4dccc" },
+	{ color: "#e2e0dc", kind: "light", forPreview: "#d8c7a5" },
+	{ color: "#d5dbe0", kind: "light", forPreview: "#b0cae0" },
+	{ color: "#dad5d5", kind: "light", forPreview: "#d6afaf" },
+	{ color: "#2b2b2b", kind: "dark", forPreview: "#444444" },
+	{ color: "#362e29", kind: "dark", forPreview: "#735c4d" },
+	{ color: "#303629", kind: "dark", forPreview: "#506d2f" },
+	{ color: "#293436", kind: "dark", forPreview: "#258192" },
+	{ color: "#2e2936", kind: "dark", forPreview: "#504069" },
+	{ color: "#252722", kind: "dark", forPreview: "#3c462f" },
+	{ color: "#212525", kind: "dark", forPreview: "#303e3e" },
+	{ color: "#191919", kind: "dark", forPreview: "#272727" },
 ] as const;
-const accentColors = ['#e36749', '#f29924', '#98c934', '#34c9a9', '#34a1c9', '#606df7', '#8d34c9', '#e84d83'];
+const accentColors = [
+	"#e36749",
+	"#f29924",
+	"#98c934",
+	"#34c9a9",
+	"#34a1c9",
+	"#606df7",
+	"#8d34c9",
+	"#e84d83",
+];
 const fgColors = [
-	{ color: 'none', forLight: '#5f5f5f', forDark: '#dadada', forPreview: null },
-	{ color: 'red', forLight: '#7f6666', forDark: '#e4d1d1', forPreview: '#ca4343' },
-	{ color: 'yellow', forLight: '#736955', forDark: '#e0d5c0', forPreview: '#d49923' },
-	{ color: 'green', forLight: '#586d5b', forDark: '#d1e4d4', forPreview: '#4cbd5c' },
-	{ color: 'cyan', forLight: '#5d7475', forDark: '#d1e3e4', forPreview: '#2abdc3' },
-	{ color: 'blue', forLight: '#676880', forDark: '#d1d2e4', forPreview: '#7275d8' },
-	{ color: 'pink', forLight: '#84667d', forDark: '#e4d1e0', forPreview: '#b12390' },
+	{
+		color: "none",
+		forLight: "#5f5f5f",
+		forDark: "#dadada",
+		forPreview: null,
+	},
+	{
+		color: "red",
+		forLight: "#7f6666",
+		forDark: "#e4d1d1",
+		forPreview: "#ca4343",
+	},
+	{
+		color: "yellow",
+		forLight: "#736955",
+		forDark: "#e0d5c0",
+		forPreview: "#d49923",
+	},
+	{
+		color: "green",
+		forLight: "#586d5b",
+		forDark: "#d1e4d4",
+		forPreview: "#4cbd5c",
+	},
+	{
+		color: "cyan",
+		forLight: "#5d7475",
+		forDark: "#d1e3e4",
+		forPreview: "#2abdc3",
+	},
+	{
+		color: "blue",
+		forLight: "#676880",
+		forDark: "#d1d2e4",
+		forPreview: "#7275d8",
+	},
+	{
+		color: "pink",
+		forLight: "#84667d",
+		forDark: "#e4d1e0",
+		forPreview: "#b12390",
+	},
 ];
 
 let theme = $ref<Partial<Theme>>({
-	base: 'light',
+	base: "light",
 	props: lightTheme.props,
 });
 let description = $ref<string | null>(null);
@@ -130,15 +249,15 @@ let changed = $ref(false);
 useLeaveGuard($$(changed));
 
 function showPreview() {
-	os.pageWindow('/preview');
+	os.pageWindow("/preview");
 }
 
-function setBgColor(color: typeof bgColors[number]) {
+function setBgColor(color: (typeof bgColors)[number]) {
 	if (theme.base !== color.kind) {
-		const base = color.kind === 'dark' ? darkTheme : lightTheme;
+		const base = color.kind === "dark" ? darkTheme : lightTheme;
 		for (const prop of Object.keys(base.props)) {
-			if (prop === 'accent') continue;
-			if (prop === 'fg') continue;
+			if (prop === "accent") continue;
+			if (prop === "fg") continue;
 			theme.props[prop] = base.props[prop];
 		}
 	}
@@ -146,7 +265,12 @@ function setBgColor(color: typeof bgColors[number]) {
 	theme.props.bg = color.color;
 
 	if (theme.props.fg) {
-		const matchedFgColor = fgColors.find(x => [tinycolor(x.forLight).toRgbString(), tinycolor(x.forDark).toRgbString()].includes(tinycolor(theme.props.fg).toRgbString()));
+		const matchedFgColor = fgColors.find((x) =>
+			[
+				tinycolor(x.forLight).toRgbString(),
+				tinycolor(x.forDark).toRgbString(),
+			].includes(tinycolor(theme.props.fg).toRgbString())
+		);
 		if (matchedFgColor) setFgColor(matchedFgColor);
 	}
 }
@@ -156,11 +280,11 @@ function setAccentColor(color) {
 }
 
 function setFgColor(color) {
-	theme.props.fg = theme.base === 'light' ? color.forLight : color.forDark;
+	theme.props.fg = theme.base === "light" ? color.forLight : color.forDark;
 }
 
 function apply() {
-	themeCode = JSON5.stringify(theme, null, '\t');
+	themeCode = JSON5.stringify(theme, null, "\t");
 	applyTheme(theme, false);
 	changed = true;
 }
@@ -172,7 +296,7 @@ function applyThemeCode() {
 		parsed = JSON5.parse(themeCode);
 	} catch (err) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: i18n.ts._theme.invalid,
 		});
 		return;
@@ -195,36 +319,39 @@ async function saveAs() {
 	await addTheme(theme);
 	applyTheme(theme);
 	if (defaultStore.state.darkMode) {
-		ColdDeviceStorage.set('darkTheme', theme);
+		ColdDeviceStorage.set("darkTheme", theme);
 	} else {
-		ColdDeviceStorage.set('lightTheme', theme);
+		ColdDeviceStorage.set("lightTheme", theme);
 	}
 	changed = false;
 	os.alert({
-		type: 'success',
-		text: i18n.t('_theme.installed', { name: theme.name }),
+		type: "success",
+		text: i18n.t("_theme.installed", { name: theme.name }),
 	});
 }
 
 watch($$(theme), apply, { deep: true });
 
-const headerActions = $computed(() => [{
-	asFullButton: true,
-	icon: 'ph-eye ph-bold ph-lg',
-	text: i18n.ts.preview,
-	handler: showPreview,
-}, {
-	asFullButton: true,
-	icon: 'ph-check ph-bold ph-lg',
-	text: i18n.ts.saveAs,
-	handler: saveAs,
-}]);
+const headerActions = $computed(() => [
+	{
+		asFullButton: true,
+		icon: "ph-eye ph-bold ph-lg",
+		text: i18n.ts.preview,
+		handler: showPreview,
+	},
+	{
+		asFullButton: true,
+		icon: "ph-check ph-bold ph-lg",
+		text: i18n.ts.saveAs,
+		handler: saveAs,
+	},
+]);
 
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.themeEditor,
-	icon: 'ph-palette ph-bold ph-lg',
+	icon: "ph-palette ph-bold ph-lg",
 });
 </script>
 
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 9c326ad05..e3f8a0083 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -1,27 +1,27 @@
 <template>
-<MkStickyContainer>
-	<template #header>
-		<MkPageHeader
-			v-model:tab="src"
-			:actions="headerActions"
-			:tabs="headerTabs"
-			:display-my-avatar="true"
-		/>
-	</template>
-	<MkSpacer :content-max="800">
-		<div ref="rootEl" v-hotkey.global="keymap" class="cmuxhskf">
-			<XPostForm
-				v-if="$store.reactiveState.showFixedPostForm.value"
-				class="post-form _block"
-				fixed
+	<MkStickyContainer>
+		<template #header>
+			<MkPageHeader
+				v-model:tab="src"
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-my-avatar="true"
 			/>
+		</template>
+		<MkSpacer :content-max="800">
+			<div ref="rootEl" v-hotkey.global="keymap" class="cmuxhskf">
+				<XPostForm
+					v-if="$store.reactiveState.showFixedPostForm.value"
+					class="post-form _block"
+					fixed
+				/>
 
-			<div v-if="queue > 0" class="new">
-				<button class="_buttonPrimary" @click="top()">
-					{{ i18n.ts.newNoteRecived }}
-				</button>
-			</div>
-			<!-- <div v-if="!isMobile" class="tl _block">
+				<div v-if="queue > 0" class="new">
+					<button class="_buttonPrimary" @click="top()">
+						{{ i18n.ts.newNoteRecived }}
+					</button>
+				</div>
+				<!-- <div v-if="!isMobile" class="tl _block">
 				<XTimeline
 					ref="tl"
 					:key="src"
@@ -31,56 +31,61 @@
 					@queue="queueUpdated"
 				/>
 			</div> *v-else on next div* -->
-			<div class="tl _block">
-				<swiper
-					:modules="[Virtual]"
-					:space-between="20"
-					:virtual="true"
-					:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
-					@swiper="setSwiperRef"
-					@slide-change="onSlideChange"
-				>
-					<swiper-slide
-						v-for="index in timelines"
-						:key="index"
-						:virtual-index="index"
+				<div class="tl _block">
+					<swiper
+						:modules="[Virtual]"
+						:space-between="20"
+						:virtual="true"
+						:allow-touch-move="
+							!(
+								deviceKind === 'desktop' &&
+								!defaultStore.state.swipeOnDesktop
+							)
+						"
+						@swiper="setSwiperRef"
+						@slide-change="onSlideChange"
 					>
-						<XTimeline
-							ref="tl"
-							:key="src"
-							class="tl"
-							:src="src"
-							:sound="true"
-							@queue="queueUpdated"
-						/>
-					</swiper-slide>
-				</swiper>
+						<swiper-slide
+							v-for="index in timelines"
+							:key="index"
+							:virtual-index="index"
+						>
+							<XTimeline
+								ref="tl"
+								:key="src"
+								class="tl"
+								:src="src"
+								:sound="true"
+								@queue="queueUpdated"
+							/>
+						</swiper-slide>
+					</swiper>
+				</div>
 			</div>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, ref, onMounted } from 'vue';
-import { Virtual } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/vue';
-import XTutorial from '@/components/MkTutorialDialog.vue';
-import XTimeline from '@/components/MkTimeline.vue';
-import XPostForm from '@/components/MkPostForm.vue';
-import { scroll } from '@/scripts/scroll';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import { instance } from '@/instance';
-import { $i } from '@/account';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { deviceKind } from '@/scripts/device-kind';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
+import { computed, watch, ref, onMounted } from "vue";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
+import XTutorial from "@/components/MkTutorialDialog.vue";
+import XTimeline from "@/components/MkTimeline.vue";
+import XPostForm from "@/components/MkPostForm.vue";
+import { scroll } from "@/scripts/scroll";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { instance } from "@/instance";
+import { $i } from "@/account";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { deviceKind } from "@/scripts/device-kind";
+import "swiper/scss";
+import "swiper/scss/virtual";
 
 if (defaultStore.reactiveState.tutorial.value !== -1) {
-	os.popup(XTutorial, {}, {}, 'closed');
+	os.popup(XTutorial, {}, {}, "closed");
 }
 
 const isLocalTimelineAvailable =
@@ -96,38 +101,44 @@ const keymap = {
 
 let timelines = [];
 
-if (isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home') {
-	timelines.push('social');
+if (
+	isLocalTimelineAvailable &&
+	defaultStore.state.showLocalPostsInTimeline === "home"
+) {
+	timelines.push("social");
 } else {
-	timelines.push('home');
+	timelines.push("home");
 }
 
 if (isLocalTimelineAvailable) {
-	timelines.push('local');
+	timelines.push("local");
 }
 
-if (isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home') {
-	timelines.push('home');
+if (
+	isLocalTimelineAvailable &&
+	defaultStore.state.showLocalPostsInTimeline === "home"
+) {
+	timelines.push("home");
 } else if (isLocalTimelineAvailable) {
-	timelines.push('social');
+	timelines.push("social");
 }
 
 if (isRecommendedTimelineAvailable) {
-	timelines.push('recommended');
+	timelines.push("recommended");
 }
 if (isGlobalTimelineAvailable) {
-	timelines.push('global');
+	timelines.push("global");
 }
 
 const MOBILE_THRESHOLD = 500;
 
 // デスクトップでウィンドウを狭くしたときモバイルUIが表示されて欲しいことはあるので deviceKind === 'desktop' の判定は行わない
 const isMobile = ref(
-	deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD,
+	deviceKind === "smartphone" || window.innerWidth <= MOBILE_THRESHOLD
 );
-window.addEventListener('resize', () => {
+window.addEventListener("resize", () => {
 	isMobile.value =
-		(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD);
+		deviceKind === "smartphone" || window.innerWidth <= MOBILE_THRESHOLD;
 });
 
 const tlComponent = $ref<InstanceType<typeof XTimeline>>();
@@ -153,43 +164,51 @@ function top(): void {
 }
 
 async function chooseList(ev: MouseEvent): Promise<void> {
-	const lists = await os.api('users/lists/list');
-	const items = [{
-		type: 'link' as const,
-		text: i18n.ts.manageLists,
-		icon: 'ph-faders-horizontal ph-bold ph-lg',
-		to: '/my/lists',
-	}].concat(lists.map((list) => ({
-		type: 'link' as const,
-		text: list.name,
-		icon: '',
-		to: `/timeline/list/${list.id}`,
-	})));
+	const lists = await os.api("users/lists/list");
+	const items = [
+		{
+			type: "link" as const,
+			text: i18n.ts.manageLists,
+			icon: "ph-faders-horizontal ph-bold ph-lg",
+			to: "/my/lists",
+		},
+	].concat(
+		lists.map((list) => ({
+			type: "link" as const,
+			text: list.name,
+			icon: "",
+			to: `/timeline/list/${list.id}`,
+		}))
+	);
 	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
 async function chooseAntenna(ev: MouseEvent): Promise<void> {
-	const antennas = await os.api('antennas/list');
-	const items = [{
-		type: 'link' as const,
-		indicate: false,
-		text: i18n.ts.manageAntennas,
-		icon: 'ph-faders-horizontal ph-bold ph-lg',
-		to: '/my/antennas',
-	}].concat(antennas.map((antenna) => ({
-		type: 'link' as const,
-		text: antenna.name,
-		icon: '',
-		indicate: antenna.hasUnreadNote,
-		to: `/timeline/antenna/${antenna.id}`,
-	})));
+	const antennas = await os.api("antennas/list");
+	const items = [
+		{
+			type: "link" as const,
+			indicate: false,
+			text: i18n.ts.manageAntennas,
+			icon: "ph-faders-horizontal ph-bold ph-lg",
+			to: "/my/antennas",
+		},
+	].concat(
+		antennas.map((antenna) => ({
+			type: "link" as const,
+			text: antenna.name,
+			icon: "",
+			indicate: antenna.hasUnreadNote,
+			to: `/timeline/antenna/${antenna.id}`,
+		}))
+	);
 	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
 function saveSrc(
-	newSrc: 'home' | 'local' | 'recommended' | 'social' | 'global',
+	newSrc: "home" | "local" | "recommended" | "social" | "global"
 ): void {
-	defaultStore.set('tl', {
+	defaultStore.set("tl", {
 		...defaultStore.state.tl,
 		src: newSrc,
 	});
@@ -210,14 +229,14 @@ function focus(): void {
 
 const headerActions = $computed(() => [
 	{
-		icon: 'ph-list-bullets ph-bold ph-lg',
+		icon: "ph-list-bullets ph-bold ph-lg",
 		title: i18n.ts.lists,
 		text: i18n.ts.lists,
 		iconOnly: true,
 		handler: chooseList,
 	},
 	{
-		icon: 'ph-flying-saucer ph-bold ph-lg',
+		icon: "ph-flying-saucer ph-bold ph-lg",
 		title: i18n.ts.antennas,
 		text: i18n.ts.antennas,
 		iconOnly: true,
@@ -233,70 +252,73 @@ const headerActions = $computed(() => [
 // Swap home timeline with social's functionality
 
 const headerTabs = $computed(() => [
-	...(isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home'
+	...(isLocalTimelineAvailable &&
+	defaultStore.state.showLocalPostsInTimeline === "home"
 		? [
-			{
-				key: 'social',
-				title: i18n.ts._timelines.home,
-				icon: 'ph-house ph-bold ph-lg',
-				iconOnly: true,
-			},
-		]
+				{
+					key: "social",
+					title: i18n.ts._timelines.home,
+					icon: "ph-house ph-bold ph-lg",
+					iconOnly: true,
+				},
+		  ]
 		: [
-			{
-				key: 'home',
-				title: i18n.ts._timelines.home,
-				icon: 'ph-house ph-bold ph-lg',
-				iconOnly: true,
-			}
-		]),
+				{
+					key: "home",
+					title: i18n.ts._timelines.home,
+					icon: "ph-house ph-bold ph-lg",
+					iconOnly: true,
+				},
+		  ]),
 	...(isLocalTimelineAvailable
 		? [
-			{
-				key: 'local',
-				title: i18n.ts._timelines.local,
-				icon: 'ph-users ph-bold ph-lg',
-				iconOnly: true,
-			},
-		]
+				{
+					key: "local",
+					title: i18n.ts._timelines.local,
+					icon: "ph-users ph-bold ph-lg",
+					iconOnly: true,
+				},
+		  ]
 		: []),
-	...(isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home'
+	...(isLocalTimelineAvailable &&
+	defaultStore.state.showLocalPostsInTimeline === "home"
 		? [
-			{
-				key: 'home',
-				title: i18n.ts._timelines.social,
-				icon: 'ph-handshake ph-bold ph-lg',
-				iconOnly: true,
-			},
-		]
-		: isLocalTimelineAvailable ? [
- 			{
-				key: 'social',
-				title: i18n.ts._timelines.social,
-				icon: 'ph-handshake ph-bold ph-lg',
-				iconOnly: true,
-			},
-		]
+				{
+					key: "home",
+					title: i18n.ts._timelines.social,
+					icon: "ph-handshake ph-bold ph-lg",
+					iconOnly: true,
+				},
+		  ]
+		: isLocalTimelineAvailable
+		? [
+				{
+					key: "social",
+					title: i18n.ts._timelines.social,
+					icon: "ph-handshake ph-bold ph-lg",
+					iconOnly: true,
+				},
+		  ]
 		: []),
 	...(isRecommendedTimelineAvailable
 		? [
-			{
-				key: 'recommended',
-				title: i18n.ts._timelines.recommended,
-				icon: 'ph-thumbs-up ph-bold ph-lg',
-				iconOnly: true,
-			},
-		]
+				{
+					key: "recommended",
+					title: i18n.ts._timelines.recommended,
+					icon: "ph-thumbs-up ph-bold ph-lg",
+					iconOnly: true,
+				},
+		  ]
 		: []),
 	...(isGlobalTimelineAvailable
 		? [
-			{
-				key: 'global',
-				title: i18n.ts._timelines.global,
-				icon: 'ph-planet ph-bold ph-lg',
-				iconOnly: true,
-			},
-		]
+				{
+					key: "global",
+					title: i18n.ts._timelines.global,
+					icon: "ph-planet ph-bold ph-lg",
+					iconOnly: true,
+				},
+		  ]
 		: []),
 ]);
 
@@ -304,20 +326,22 @@ definePageMetadata(
 	computed(() => ({
 		title: i18n.ts.timeline,
 		icon:
-			src === 'local'
-				? 'ph-users ph-bold ph-lg'
-				: src === 'social' && defaultStore.state.showLocalPostsInTimeline === 'home'
-					? 'ph-house ph-bold ph-lg'
-					: src === 'social'
-						? 'ph-handshake ph-bold ph-lg'
-						: src === 'recommended'
-							? 'ph-thumbs-up ph-bold ph-lg'
-							: src === 'global'
-								? 'ph-planet ph-bold ph-lg'
-								: src === 'home' && defaultStore.state.showLocalPostsInTimeline === 'home'
-									? 'ph-handshake ph-bold ph-lg'
-									: 'ph-house ph-bold ph-lg',
-	})),
+			src === "local"
+				? "ph-users ph-bold ph-lg"
+				: src === "social" &&
+				  defaultStore.state.showLocalPostsInTimeline === "home"
+				? "ph-house ph-bold ph-lg"
+				: src === "social"
+				? "ph-handshake ph-bold ph-lg"
+				: src === "recommended"
+				? "ph-thumbs-up ph-bold ph-lg"
+				: src === "global"
+				? "ph-planet ph-bold ph-lg"
+				: src === "home" &&
+				  defaultStore.state.showLocalPostsInTimeline === "home"
+				? "ph-handshake ph-bold ph-lg"
+				: "ph-house ph-bold ph-lg",
+	}))
 );
 
 let swiperRef: any = null;
@@ -336,9 +360,10 @@ function syncSlide(index) {
 }
 
 onMounted(() => {
-	syncSlide(timelines.indexOf(defaultStore.state.tl?.src || swiperRef.activeIndex));
+	syncSlide(
+		timelines.indexOf(defaultStore.state.tl?.src || swiperRef.activeIndex)
+	);
 });
-
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/user-info.vue b/packages/client/src/pages/user-info.vue
index f2fcd6665..12321c2ba 100644
--- a/packages/client/src/pages/user-info.vue
+++ b/packages/client/src/pages/user-info.vue
@@ -1,190 +1,369 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
-		<FormSuspense :p="init">
-			<div v-if="tab === 'overview'" class="_formRoot">
-				<div class="_formBlock aeakzknw">
-					<MkAvatar class="avatar" :user="user" :show-indicator="true"/>
-					<div class="body">
-						<span class="name"><MkUserName class="name" :user="user"/></span>
-						<span class="sub"><span class="acct _monospace">@{{ acct(user) }}</span></span>
-						<span class="state">
-							<span v-if="suspended" class="suspended">Suspended</span>
-							<span v-if="silenced" class="silenced">Silenced</span>
-							<span v-if="moderator" class="moderator">Moderator</span>
-						</span>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
+			<FormSuspense :p="init">
+				<div v-if="tab === 'overview'" class="_formRoot">
+					<div class="_formBlock aeakzknw">
+						<MkAvatar
+							class="avatar"
+							:user="user"
+							:show-indicator="true"
+						/>
+						<div class="body">
+							<span class="name"
+								><MkUserName class="name" :user="user"
+							/></span>
+							<span class="sub"
+								><span class="acct _monospace"
+									>@{{ acct(user) }}</span
+								></span
+							>
+							<span class="state">
+								<span v-if="suspended" class="suspended"
+									>Suspended</span
+								>
+								<span v-if="silenced" class="silenced"
+									>Silenced</span
+								>
+								<span v-if="moderator" class="moderator"
+									>Moderator</span
+								>
+							</span>
+						</div>
 					</div>
-				</div>
 
-				<MkInfo v-if="user.username.includes('.')" class="_formBlock">{{ i18n.ts.isSystemAccount }}</MkInfo>
+					<MkInfo
+						v-if="user.username.includes('.')"
+						class="_formBlock"
+						>{{ i18n.ts.isSystemAccount }}</MkInfo
+					>
 
-				<div v-if="user.url" class="_formLinksGrid _formBlock">
-					<FormLink :to="userPage(user)">Profile</FormLink>
-					<FormLink :to="user.url" :external="true">Profile (remote)</FormLink>
-				</div>
-				<FormLink v-else class="_formBlock" :to="userPage(user)">Profile</FormLink>
+					<div v-if="user.url" class="_formLinksGrid _formBlock">
+						<FormLink :to="userPage(user)">Profile</FormLink>
+						<FormLink :to="user.url" :external="true"
+							>Profile (remote)</FormLink
+						>
+					</div>
+					<FormLink v-else class="_formBlock" :to="userPage(user)"
+						>Profile</FormLink
+					>
 
-				<FormLink v-if="user.host" class="_formBlock" :to="`/instance-info/${user.host}`">{{ i18n.ts.instanceInfo }}</FormLink>
+					<FormLink
+						v-if="user.host"
+						class="_formBlock"
+						:to="`/instance-info/${user.host}`"
+						>{{ i18n.ts.instanceInfo }}</FormLink
+					>
 
-				<div class="_formBlock">
-					<MkKeyValue :copy="user.id" oneline style="margin: 1em 0;">
-						<template #key>ID</template>
-						<template #value><span class="_monospace">{{ user.id }}</span></template>
-					</MkKeyValue>
-					<!-- 要る？
+					<div class="_formBlock">
+						<MkKeyValue
+							:copy="user.id"
+							oneline
+							style="margin: 1em 0"
+						>
+							<template #key>ID</template>
+							<template #value
+								><span class="_monospace">{{
+									user.id
+								}}</span></template
+							>
+						</MkKeyValue>
+						<!-- 要る？
 					<MkKeyValue v-if="ips.length > 0" :copy="user.id" oneline style="margin: 1em 0;">
 						<template #key>IP (recent)</template>
 						<template #value><span class="_monospace">{{ ips[0].ip }}</span></template>
 					</MkKeyValue>
 					-->
-					<MkKeyValue oneline style="margin: 1em 0;">
-						<template #key>{{ i18n.ts.createdAt }}</template>
-						<template #value><span class="_monospace"><MkTime :time="user.createdAt" :mode="'detail'"/></span></template>
-					</MkKeyValue>
-					<MkKeyValue v-if="info" oneline style="margin: 1em 0;">
-						<template #key>{{ i18n.ts.lastActiveDate }}</template>
-						<template #value><span class="_monospace"><MkTime :time="info.lastActiveDate" :mode="'detail'"/></span></template>
-					</MkKeyValue>
-					<MkKeyValue v-if="info" oneline style="margin: 1em 0;">
-						<template #key>{{ i18n.ts.email }}</template>
-						<template #value><span class="_monospace">{{ info.email }}</span></template>
-					</MkKeyValue>
-				</div>
-
-				<FormSection>
-					<template #label>ActivityPub</template>
-
-					<div class="_formBlock">
-						<MkKeyValue v-if="user.host" oneline style="margin: 1em 0;">
-							<template #key>{{ i18n.ts.instanceInfo }}</template>
-							<template #value><MkA :to="`/instance-info/${user.host}`" class="_link">{{ user.host }} <i class="ph-caret-right ph-bold ph-lg"></i></MkA></template>
+						<MkKeyValue oneline style="margin: 1em 0">
+							<template #key>{{ i18n.ts.createdAt }}</template>
+							<template #value
+								><span class="_monospace"
+									><MkTime
+										:time="user.createdAt"
+										:mode="'detail'" /></span
+							></template>
 						</MkKeyValue>
-						<MkKeyValue v-else oneline style="margin: 1em 0;">
-							<template #key>{{ i18n.ts.instanceInfo }}</template>
-							<template #value>(Local user)</template>
+						<MkKeyValue v-if="info" oneline style="margin: 1em 0">
+							<template #key>{{
+								i18n.ts.lastActiveDate
+							}}</template>
+							<template #value
+								><span class="_monospace"
+									><MkTime
+										:time="info.lastActiveDate"
+										:mode="'detail'" /></span
+							></template>
 						</MkKeyValue>
-						<MkKeyValue oneline style="margin: 1em 0;">
-							<template #key>{{ i18n.ts.updatedAt }}</template>
-							<template #value><MkTime v-if="user.lastFetchedAt" mode="detail" :time="user.lastFetchedAt"/><span v-else>N/A</span></template>
-						</MkKeyValue>
-						<MkKeyValue v-if="ap" oneline style="margin: 1em 0;">
-							<template #key>Type</template>
-							<template #value><span class="_monospace">{{ ap.type }}</span></template>
+						<MkKeyValue v-if="info" oneline style="margin: 1em 0">
+							<template #key>{{ i18n.ts.email }}</template>
+							<template #value
+								><span class="_monospace">{{
+									info.email
+								}}</span></template
+							>
 						</MkKeyValue>
 					</div>
 
-					<FormButton v-if="user.host != null" class="_formBlock" @click="updateRemoteUser"><i class="ph-arrows-clockwise ph-bold ph-lg"></i> {{ i18n.ts.updateRemoteUser }}</FormButton>
+					<FormSection>
+						<template #label>ActivityPub</template>
 
-					<FormFolder class="_formBlock">
-						<template #label>Raw</template>
-
-						<MkObjectView v-if="ap" tall :value="ap">
-						</MkObjectView>
-					</FormFolder>
-				</FormSection>
-			</div>
-			<div v-else-if="tab === 'moderation'" class="_formRoot">
-				<FormSwitch v-if="user.host == null && $i.isAdmin && (moderator || !user.isAdmin)" v-model="moderator" class="_formBlock" @update:modelValue="toggleModerator">{{ i18n.ts.moderator }}</FormSwitch>
-				<FormSwitch v-model="silenced" class="_formBlock" @update:modelValue="toggleSilence">{{ i18n.ts.silence }}</FormSwitch>
-				<FormSwitch v-model="suspended" class="_formBlock" @update:modelValue="toggleSuspend">{{ i18n.ts.suspend }}</FormSwitch>
-				{{ i18n.ts.reflectMayTakeTime }}
-				<div class="_formBlock">
-					<FormButton v-if="user.host == null && iAmModerator" inline style="margin-right: 8px;" @click="resetPassword"><i class="ph-key ph-bold ph-lg"></i> {{ i18n.ts.resetPassword }}</FormButton>
-					<FormButton v-if="$i.isAdmin" inline danger @click="deleteAccount">{{ i18n.ts.deleteAccount }}</FormButton>
-				</div>
-				<FormTextarea v-model="moderationNote" manual-save class="_formBlock">
-					<template #label>Moderation note</template>
-				</FormTextarea>
-				<FormFolder class="_formBlock">
-					<template #label>IP</template>
-					<MkInfo v-if="!iAmAdmin" warn>{{ i18n.ts.requireAdminForView }}</MkInfo>
-					<MkInfo v-else>The date is the IP address was first acknowledged.</MkInfo>
-					<template v-if="iAmAdmin && ips">
-						<div v-for="record in ips" :key="record.ip" class="_monospace" :class="$style.ip" style="margin: 1em 0;">
-							<span class="date">{{ record.createdAt }}</span>
-							<span class="ip">{{ record.ip }}</span>
+						<div class="_formBlock">
+							<MkKeyValue
+								v-if="user.host"
+								oneline
+								style="margin: 1em 0"
+							>
+								<template #key>{{
+									i18n.ts.instanceInfo
+								}}</template>
+								<template #value
+									><MkA
+										:to="`/instance-info/${user.host}`"
+										class="_link"
+										>{{ user.host }}
+										<i
+											class="ph-caret-right ph-bold ph-lg"
+										></i></MkA
+								></template>
+							</MkKeyValue>
+							<MkKeyValue v-else oneline style="margin: 1em 0">
+								<template #key>{{
+									i18n.ts.instanceInfo
+								}}</template>
+								<template #value>(Local user)</template>
+							</MkKeyValue>
+							<MkKeyValue oneline style="margin: 1em 0">
+								<template #key>{{
+									i18n.ts.updatedAt
+								}}</template>
+								<template #value
+									><MkTime
+										v-if="user.lastFetchedAt"
+										mode="detail"
+										:time="user.lastFetchedAt"
+									/><span v-else>N/A</span></template
+								>
+							</MkKeyValue>
+							<MkKeyValue v-if="ap" oneline style="margin: 1em 0">
+								<template #key>Type</template>
+								<template #value
+									><span class="_monospace">{{
+										ap.type
+									}}</span></template
+								>
+							</MkKeyValue>
 						</div>
-					</template>
-				</FormFolder>
-				<FormFolder class="_formBlock">
-					<template #label>{{ i18n.ts.files }}</template>
 
-					<MkFileListForAdmin :pagination="filesPagination" view-mode="grid"/>
-				</FormFolder>
-				<FormSection>
-					<template #label>Drive Capacity Override</template>
+						<FormButton
+							v-if="user.host != null"
+							class="_formBlock"
+							@click="updateRemoteUser"
+							><i class="ph-arrows-clockwise ph-bold ph-lg"></i>
+							{{ i18n.ts.updateRemoteUser }}</FormButton
+						>
 
-					<FormInput v-if="user.host == null" v-model="driveCapacityOverrideMb" inline :manual-save="true" type="number" :placeholder="i18n.t('defaultValueIs', { value: instance.driveCapacityPerLocalUserMb })" @update:model-value="applyDriveCapacityOverride">
-						<template #label>{{ i18n.ts.driveCapOverrideLabel }}</template>
-						<template #suffix>MB</template>
-						<template #caption>
-							{{ i18n.ts.driveCapOverrideCaption }}
-						</template>
-					</FormInput>
-				</FormSection>
-			</div>
-			<div v-else-if="tab === 'chart'" class="_formRoot">
-				<div class="cmhjzshm">
-					<div class="selects">
-						<MkSelect v-model="chartSrc" style="margin: 0 10px 0 0; flex: 1;">
-							<option value="per-user-notes">{{ i18n.ts.notes }}</option>
-						</MkSelect>
+						<FormFolder class="_formBlock">
+							<template #label>Raw</template>
+
+							<MkObjectView v-if="ap" tall :value="ap">
+							</MkObjectView>
+						</FormFolder>
+					</FormSection>
+				</div>
+				<div v-else-if="tab === 'moderation'" class="_formRoot">
+					<FormSwitch
+						v-if="
+							user.host == null &&
+							$i.isAdmin &&
+							(moderator || !user.isAdmin)
+						"
+						v-model="moderator"
+						class="_formBlock"
+						@update:modelValue="toggleModerator"
+						>{{ i18n.ts.moderator }}</FormSwitch
+					>
+					<FormSwitch
+						v-model="silenced"
+						class="_formBlock"
+						@update:modelValue="toggleSilence"
+						>{{ i18n.ts.silence }}</FormSwitch
+					>
+					<FormSwitch
+						v-model="suspended"
+						class="_formBlock"
+						@update:modelValue="toggleSuspend"
+						>{{ i18n.ts.suspend }}</FormSwitch
+					>
+					{{ i18n.ts.reflectMayTakeTime }}
+					<div class="_formBlock">
+						<FormButton
+							v-if="user.host == null && iAmModerator"
+							inline
+							style="margin-right: 8px"
+							@click="resetPassword"
+							><i class="ph-key ph-bold ph-lg"></i>
+							{{ i18n.ts.resetPassword }}</FormButton
+						>
+						<FormButton
+							v-if="$i.isAdmin"
+							inline
+							danger
+							@click="deleteAccount"
+							>{{ i18n.ts.deleteAccount }}</FormButton
+						>
 					</div>
-					<div class="charts">
-						<div class="label">{{ i18n.t('recentNHours', { n: 90 }) }}</div>
-						<MkChart class="chart" :src="chartSrc" span="hour" :limit="90" :args="{ user, withoutAll: true }" :detailed="true"></MkChart>
-						<div class="label">{{ i18n.t('recentNDays', { n: 90 }) }}</div>
-						<MkChart class="chart" :src="chartSrc" span="day" :limit="90" :args="{ user, withoutAll: true }" :detailed="true"></MkChart>
+					<FormTextarea
+						v-model="moderationNote"
+						manual-save
+						class="_formBlock"
+					>
+						<template #label>Moderation note</template>
+					</FormTextarea>
+					<FormFolder class="_formBlock">
+						<template #label>IP</template>
+						<MkInfo v-if="!iAmAdmin" warn>{{
+							i18n.ts.requireAdminForView
+						}}</MkInfo>
+						<MkInfo v-else
+							>The date is the IP address was first
+							acknowledged.</MkInfo
+						>
+						<template v-if="iAmAdmin && ips">
+							<div
+								v-for="record in ips"
+								:key="record.ip"
+								class="_monospace"
+								:class="$style.ip"
+								style="margin: 1em 0"
+							>
+								<span class="date">{{ record.createdAt }}</span>
+								<span class="ip">{{ record.ip }}</span>
+							</div>
+						</template>
+					</FormFolder>
+					<FormFolder class="_formBlock">
+						<template #label>{{ i18n.ts.files }}</template>
+
+						<MkFileListForAdmin
+							:pagination="filesPagination"
+							view-mode="grid"
+						/>
+					</FormFolder>
+					<FormSection>
+						<template #label>Drive Capacity Override</template>
+
+						<FormInput
+							v-if="user.host == null"
+							v-model="driveCapacityOverrideMb"
+							inline
+							:manual-save="true"
+							type="number"
+							:placeholder="
+								i18n.t('defaultValueIs', {
+									value: instance.driveCapacityPerLocalUserMb,
+								})
+							"
+							@update:model-value="applyDriveCapacityOverride"
+						>
+							<template #label>{{
+								i18n.ts.driveCapOverrideLabel
+							}}</template>
+							<template #suffix>MB</template>
+							<template #caption>
+								{{ i18n.ts.driveCapOverrideCaption }}
+							</template>
+						</FormInput>
+					</FormSection>
+				</div>
+				<div v-else-if="tab === 'chart'" class="_formRoot">
+					<div class="cmhjzshm">
+						<div class="selects">
+							<MkSelect
+								v-model="chartSrc"
+								style="margin: 0 10px 0 0; flex: 1"
+							>
+								<option value="per-user-notes">
+									{{ i18n.ts.notes }}
+								</option>
+							</MkSelect>
+						</div>
+						<div class="charts">
+							<div class="label">
+								{{ i18n.t("recentNHours", { n: 90 }) }}
+							</div>
+							<MkChart
+								class="chart"
+								:src="chartSrc"
+								span="hour"
+								:limit="90"
+								:args="{ user, withoutAll: true }"
+								:detailed="true"
+							></MkChart>
+							<div class="label">
+								{{ i18n.t("recentNDays", { n: 90 }) }}
+							</div>
+							<MkChart
+								class="chart"
+								:src="chartSrc"
+								span="day"
+								:limit="90"
+								:args="{ user, withoutAll: true }"
+								:detailed="true"
+							></MkChart>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div v-else-if="tab === 'raw'" class="_formRoot">
-				<MkObjectView v-if="info && $i.isAdmin" tall :value="info">
-				</MkObjectView>
+				<div v-else-if="tab === 'raw'" class="_formRoot">
+					<MkObjectView v-if="info && $i.isAdmin" tall :value="info">
+					</MkObjectView>
 
-				<MkObjectView tall :value="user">
-				</MkObjectView>
-			</div>
-		</FormSuspense>
-	</MkSpacer>
-</MkStickyContainer>
+					<MkObjectView tall :value="user"> </MkObjectView>
+				</div>
+			</FormSuspense>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch } from 'vue';
-import * as misskey from 'calckey-js';
-import MkChart from '@/components/MkChart.vue';
-import MkObjectView from '@/components/MkObjectView.vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormSwitch from '@/components/form/switch.vue';
-import FormLink from '@/components/form/link.vue';
-import FormSection from '@/components/form/section.vue';
-import FormButton from '@/components/MkButton.vue';
-import FormInput from '@/components/form/input.vue';
-import FormSplit from '@/components/form/split.vue';
-import FormFolder from '@/components/form/folder.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import MkSelect from '@/components/form/select.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import * as os from '@/os';
-import number from '@/filters/number';
-import bytes from '@/filters/bytes';
-import { url } from '@/config';
-import { userPage, acct } from '@/filters/user';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
-import { iAmAdmin, iAmModerator } from '@/account';
-import { instance } from '@/instance';
+import { computed, watch } from "vue";
+import * as misskey from "calckey-js";
+import MkChart from "@/components/MkChart.vue";
+import MkObjectView from "@/components/MkObjectView.vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import FormLink from "@/components/form/link.vue";
+import FormSection from "@/components/form/section.vue";
+import FormButton from "@/components/MkButton.vue";
+import FormInput from "@/components/form/input.vue";
+import FormSplit from "@/components/form/split.vue";
+import FormFolder from "@/components/form/folder.vue";
+import MkKeyValue from "@/components/MkKeyValue.vue";
+import MkSelect from "@/components/form/select.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import MkFileListForAdmin from "@/components/MkFileListForAdmin.vue";
+import MkInfo from "@/components/MkInfo.vue";
+import * as os from "@/os";
+import number from "@/filters/number";
+import bytes from "@/filters/bytes";
+import { url } from "@/config";
+import { userPage, acct } from "@/filters/user";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
+import { iAmAdmin, iAmModerator } from "@/account";
+import { instance } from "@/instance";
 
 const props = defineProps<{
 	userId: string;
 }>();
 
-let tab = $ref('overview');
-let chartSrc = $ref('per-user-notes');
+let tab = $ref("overview");
+let chartSrc = $ref("per-user-notes");
 let user = $ref<null | misskey.entities.UserDetailed>();
 let init = $ref<ReturnType<typeof createFetcher>>();
 let info = $ref();
@@ -194,9 +373,9 @@ let moderator = $ref(false);
 let silenced = $ref(false);
 let suspended = $ref(false);
 let driveCapacityOverrideMb: number | null = $ref(0);
-let moderationNote = $ref('');
+let moderationNote = $ref("");
 const filesPagination = {
-	endpoint: 'admin/drive/files' as const,
+	endpoint: "admin/drive/files" as const,
 	limit: 10,
 	params: computed(() => ({
 		userId: props.userId,
@@ -205,33 +384,46 @@ const filesPagination = {
 
 function createFetcher() {
 	if (iAmModerator) {
-		return () => Promise.all([os.api('users/show', {
-			userId: props.userId,
-		}), os.api('admin/show-user', {
-			userId: props.userId,
-		}), iAmAdmin ? os.api('admin/get-user-ips', {
-			userId: props.userId,
-		}) : Promise.resolve(null)]).then(([_user, _info, _ips]) => {
-			user = _user;
-			info = _info;
-			ips = _ips;
-			moderator = info.isModerator;
-			silenced = info.isSilenced;
-			suspended = info.isSuspended;
-			driveCapacityOverrideMb = user.driveCapacityOverrideMb;
-			moderationNote = info.moderationNote;
+		return () =>
+			Promise.all([
+				os.api("users/show", {
+					userId: props.userId,
+				}),
+				os.api("admin/show-user", {
+					userId: props.userId,
+				}),
+				iAmAdmin
+					? os.api("admin/get-user-ips", {
+							userId: props.userId,
+					  })
+					: Promise.resolve(null),
+			]).then(([_user, _info, _ips]) => {
+				user = _user;
+				info = _info;
+				ips = _ips;
+				moderator = info.isModerator;
+				silenced = info.isSilenced;
+				suspended = info.isSuspended;
+				driveCapacityOverrideMb = user.driveCapacityOverrideMb;
+				moderationNote = info.moderationNote;
 
-			watch($$(moderationNote), async () => {
-				await os.api('admin/update-user-note', { userId: user.id, text: moderationNote });
-				await refreshUser();
+				watch($$(moderationNote), async () => {
+					await os.api("admin/update-user-note", {
+						userId: user.id,
+						text: moderationNote,
+					});
+					await refreshUser();
+				});
 			});
-		});
 	} else {
-		return () => os.api('users/show', {
-			userId: props.userId,
-		}).then((res) => {
-			user = res;
-		});
+		return () =>
+			os
+				.api("users/show", {
+					userId: props.userId,
+				})
+				.then((res) => {
+					user = res;
+				});
 	}
 }
 
@@ -240,65 +432,73 @@ function refreshUser() {
 }
 
 async function updateRemoteUser() {
-	await os.apiWithDialog('federation/update-remote-user', { userId: user.id });
+	await os.apiWithDialog("federation/update-remote-user", {
+		userId: user.id,
+	});
 	refreshUser();
 }
 
 async function resetPassword() {
-	const { password } = await os.api('admin/reset-password', {
+	const { password } = await os.api("admin/reset-password", {
 		userId: user.id,
 	});
 
 	os.alert({
-		type: 'success',
-		text: i18n.t('newPasswordIs', { password }),
+		type: "success",
+		text: i18n.t("newPasswordIs", { password }),
 	});
 }
 
 async function toggleSilence(v) {
 	const confirm = await os.confirm({
-		type: 'warning',
+		type: "warning",
 		text: v ? i18n.ts.silenceConfirm : i18n.ts.unsilenceConfirm,
 	});
 	if (confirm.canceled) {
 		silenced = !v;
 	} else {
-		await os.api(v ? 'admin/silence-user' : 'admin/unsilence-user', { userId: user.id });
+		await os.api(v ? "admin/silence-user" : "admin/unsilence-user", {
+			userId: user.id,
+		});
 		await refreshUser();
 	}
 }
 
 async function toggleSuspend(v) {
 	const confirm = await os.confirm({
-		type: 'warning',
+		type: "warning",
 		text: v ? i18n.ts.suspendConfirm : i18n.ts.unsuspendConfirm,
 	});
 	if (confirm.canceled) {
 		suspended = !v;
 	} else {
-		await os.api(v ? 'admin/suspend-user' : 'admin/unsuspend-user', { userId: user.id });
+		await os.api(v ? "admin/suspend-user" : "admin/unsuspend-user", {
+			userId: user.id,
+		});
 		await refreshUser();
 	}
 }
 
 async function toggleModerator(v) {
-	await os.api(v ? 'admin/moderators/add' : 'admin/moderators/remove', { userId: user.id });
+	await os.api(v ? "admin/moderators/add" : "admin/moderators/remove", {
+		userId: user.id,
+	});
 	await refreshUser();
 }
 
 async function deleteAllFiles() {
 	const confirm = await os.confirm({
-		type: 'warning',
+		type: "warning",
 		text: i18n.ts.deleteAllFilesConfirm,
 	});
 	if (confirm.canceled) return;
 	const process = async () => {
-		await os.api('admin/delete-all-files-of-a-user', { userId: user.id });
+		await os.api("admin/delete-all-files-of-a-user", { userId: user.id });
 		os.success();
 	};
-	await process().catch(err => {
+	await process().catch((err) => {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: err.toString(),
 		});
 	});
@@ -311,11 +511,14 @@ async function applyDriveCapacityOverride() {
 		driveCapOrMb = null;
 	}
 	try {
-		await os.apiWithDialog('admin/drive-capacity-override', { userId: user.id, overrideMb: driveCapOrMb });
+		await os.apiWithDialog("admin/drive-capacity-override", {
+			userId: user.id,
+			overrideMb: driveCapOrMb,
+		});
 		await refreshUser();
 	} catch (err) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: err.toString(),
 		});
 	}
@@ -323,66 +526,81 @@ async function applyDriveCapacityOverride() {
 
 async function deleteAccount() {
 	const confirm = await os.confirm({
-		type: 'warning',
+		type: "warning",
 		text: i18n.ts.deleteAccountConfirm,
 	});
 	if (confirm.canceled) return;
 
 	const typed = await os.inputText({
-		text: i18n.t('typeToConfirm', { x: user?.username }),
+		text: i18n.t("typeToConfirm", { x: user?.username }),
 	});
 	if (typed.canceled) return;
 
 	if (typed.result === user?.username) {
-		await os.apiWithDialog('admin/delete-account', {
+		await os.apiWithDialog("admin/delete-account", {
 			userId: user.id,
 		});
 	} else {
 		os.alert({
-			type: 'error',
-			text: 'input not match',
+			type: "error",
+			text: "input not match",
 		});
 	}
 }
 
-watch(() => props.userId, () => {
-	init = createFetcher();
-}, {
-	immediate: true,
-});
+watch(
+	() => props.userId,
+	() => {
+		init = createFetcher();
+	},
+	{
+		immediate: true,
+	}
+);
 
 watch($$(user), () => {
-	os.api('ap/get', {
+	os.api("ap/get", {
 		uri: user.uri ?? `${url}/users/${user.id}`,
-	}).then(res => {
+	}).then((res) => {
 		ap = res;
 	});
 });
 
 const headerActions = $computed(() => []);
 
-const headerTabs = $computed(() => [{
-	key: 'overview',
-	title: i18n.ts.overview,
-	icon: 'ph-info ph-bold ph-lg',
-}, iAmModerator ? {
-	key: 'moderation',
-	title: i18n.ts.moderation,
-	icon: 'ph-shield ph-bold ph-lg',
-} : null, {
-	key: 'chart',
-	title: i18n.ts.charts,
-	icon: 'ph-chart-bar ph-bold ph-lg',
-}, {
-	key: 'raw',
-	title: 'Raw',
-	icon: 'ph-code ph-bold ph-lg',
-}].filter(x => x != null));
+const headerTabs = $computed(() =>
+	[
+		{
+			key: "overview",
+			title: i18n.ts.overview,
+			icon: "ph-info ph-bold ph-lg",
+		},
+		iAmModerator
+			? {
+					key: "moderation",
+					title: i18n.ts.moderation,
+					icon: "ph-shield ph-bold ph-lg",
+			  }
+			: null,
+		{
+			key: "chart",
+			title: i18n.ts.charts,
+			icon: "ph-chart-bar ph-bold ph-lg",
+		},
+		{
+			key: "raw",
+			title: "Raw",
+			icon: "ph-code ph-bold ph-lg",
+		},
+	].filter((x) => x != null)
+);
 
-definePageMetadata(computed(() => ({
-	title: user ? acct(user) : i18n.ts.userInfo,
-	icon: 'ph-info ph-bold ph-lg',
-})));
+definePageMetadata(
+	computed(() => ({
+		title: user ? acct(user) : i18n.ts.userInfo,
+		icon: "ph-info ph-bold ph-lg",
+	}))
+);
 </script>
 
 <style lang="scss" scoped>
@@ -429,7 +647,9 @@ definePageMetadata(computed(() => ({
 				display: none;
 			}
 
-			> .suspended, > .silenced, > .moderator {
+			> .suspended,
+			> .silenced,
+			> .moderator {
 				display: inline-block;
 				border: solid 1px;
 				border-radius: 6px;
diff --git a/packages/client/src/pages/user-list-timeline.vue b/packages/client/src/pages/user-list-timeline.vue
index 42c8960b4..2fd82500e 100644
--- a/packages/client/src/pages/user-list-timeline.vue
+++ b/packages/client/src/pages/user-list-timeline.vue
@@ -1,30 +1,37 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<div ref="rootEl" v-size="{ min: [800] }" class="eqqrhokj">
-		<div v-if="queue > 0" class="new"><button class="_buttonPrimary" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
-		<div class="tl _block">
-			<XTimeline
-				ref="tlEl" :key="listId"
-				class="tl"
-				src="list"
-				:list="listId"
-				:sound="true"
-				@queue="queueUpdated"
-			/>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<div ref="rootEl" v-size="{ min: [800] }" class="eqqrhokj">
+			<div v-if="queue > 0" class="new">
+				<button class="_buttonPrimary" @click="top()">
+					{{ i18n.ts.newNoteRecived }}
+				</button>
+			</div>
+			<div class="tl _block">
+				<XTimeline
+					ref="tlEl"
+					:key="listId"
+					class="tl"
+					src="list"
+					:list="listId"
+					:sound="true"
+					@queue="queueUpdated"
+				/>
+			</div>
 		</div>
-	</div>
-</MkStickyContainer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, inject } from 'vue';
-import XTimeline from '@/components/MkTimeline.vue';
-import { scroll } from '@/scripts/scroll';
-import * as os from '@/os';
-import { useRouter } from '@/router';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
+import { computed, watch, inject } from "vue";
+import XTimeline from "@/components/MkTimeline.vue";
+import { scroll } from "@/scripts/scroll";
+import * as os from "@/os";
+import { useRouter } from "@/router";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
 
 const router = useRouter();
 
@@ -37,11 +44,15 @@ let queue = $ref(0);
 let tlEl = $ref<InstanceType<typeof XTimeline>>();
 let rootEl = $ref<HTMLElement>();
 
-watch(() => props.listId, async () => {
-	list = await os.api('users/lists/show', {
-		listId: props.listId,
-	});
-}, { immediate: true });
+watch(
+	() => props.listId,
+	async () => {
+		list = await os.api("users/lists/show", {
+			listId: props.listId,
+		});
+	},
+	{ immediate: true }
+);
 
 function queueUpdated(q) {
 	queue = q;
@@ -64,22 +75,35 @@ async function timetravel() {
 	tlEl.timetravel(date);
 }
 
-const headerActions = $computed(() => list ? [{
-	icon: 'ph-calendar-blank ph-bold ph-lg',
-	text: i18n.ts.jumpToSpecifiedDate,
-	handler: timetravel,
-}, {
-	icon: 'ph-gear-six ph-bold ph-lg',
-	text: i18n.ts.settings,
-	handler: settings,
-}] : []);
+const headerActions = $computed(() =>
+	list
+		? [
+				{
+					icon: "ph-calendar-blank ph-bold ph-lg",
+					text: i18n.ts.jumpToSpecifiedDate,
+					handler: timetravel,
+				},
+				{
+					icon: "ph-gear-six ph-bold ph-lg",
+					text: i18n.ts.settings,
+					handler: settings,
+				},
+		  ]
+		: []
+);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => list ? {
-	title: list.name,
-	icon: 'ph-list-bullets ph-bold ph-lg',
-} : null));
+definePageMetadata(
+	computed(() =>
+		list
+			? {
+					title: list.name,
+					icon: "ph-list-bullets ph-bold ph-lg",
+			  }
+			: null
+	)
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/user/clips.vue b/packages/client/src/pages/user/clips.vue
index 7c8925962..5eb57484b 100644
--- a/packages/client/src/pages/user/clips.vue
+++ b/packages/client/src/pages/user/clips.vue
@@ -1,27 +1,39 @@
 <template>
-<MkSpacer :content-max="800">
-	<div class="pages-user-clips">
-		<MkPagination v-slot="{items}" ref="list" :pagination="pagination" class="list">
-			<MkA v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap">
-				<b>{{ item.name }}</b>
-				<div v-if="item.description" class="description">{{ item.description }}</div>
-			</MkA>
-		</MkPagination>
-	</div>
-</MkSpacer>
+	<MkSpacer :content-max="800">
+		<div class="pages-user-clips">
+			<MkPagination
+				v-slot="{ items }"
+				ref="list"
+				:pagination="pagination"
+				class="list"
+			>
+				<MkA
+					v-for="item in items"
+					:key="item.id"
+					:to="`/clips/${item.id}`"
+					class="item _panel _gap"
+				>
+					<b>{{ item.name }}</b>
+					<div v-if="item.description" class="description">
+						{{ item.description }}
+					</div>
+				</MkA>
+			</MkPagination>
+		</div>
+	</MkSpacer>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import * as misskey from 'calckey-js';
-import MkPagination from '@/components/MkPagination.vue';
+import { computed } from "vue";
+import * as misskey from "calckey-js";
+import MkPagination from "@/components/MkPagination.vue";
 
 const props = defineProps<{
 	user: misskey.entities.User;
 }>();
 
 const pagination = {
-	endpoint: 'users/clips' as const,
+	endpoint: "users/clips" as const,
 	limit: 20,
 	params: computed(() => ({
 		userId: props.user.id,
diff --git a/packages/client/src/pages/user/follow-list.vue b/packages/client/src/pages/user/follow-list.vue
index d543e2bb4..b4715d8c9 100644
--- a/packages/client/src/pages/user/follow-list.vue
+++ b/packages/client/src/pages/user/follow-list.vue
@@ -1,26 +1,40 @@
 <template>
-<div>
-	<MkPagination v-slot="{items}" ref="list" :pagination="type === 'following' ? followingPagination : followersPagination" class="mk-following-or-followers">
-		<div class="users">
-			<MkUserInfo v-for="user in items.map(x => type === 'following' ? x.followee : x.follower)" :key="user.id" class="user" :user="user"/>
-		</div>
-	</MkPagination>
-</div>
+	<div>
+		<MkPagination
+			v-slot="{ items }"
+			ref="list"
+			:pagination="
+				type === 'following' ? followingPagination : followersPagination
+			"
+			class="mk-following-or-followers"
+		>
+			<div class="users">
+				<MkUserInfo
+					v-for="user in items.map((x) =>
+						type === 'following' ? x.followee : x.follower
+					)"
+					:key="user.id"
+					class="user"
+					:user="user"
+				/>
+			</div>
+		</MkPagination>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import * as misskey from 'calckey-js';
-import MkUserInfo from '@/components/MkUserInfo.vue';
-import MkPagination from '@/components/MkPagination.vue';
+import { computed } from "vue";
+import * as misskey from "calckey-js";
+import MkUserInfo from "@/components/MkUserInfo.vue";
+import MkPagination from "@/components/MkPagination.vue";
 
 const props = defineProps<{
 	user: misskey.entities.User;
-	type: 'following' | 'followers';
+	type: "following" | "followers";
 }>();
 
 const followingPagination = {
-	endpoint: 'users/following' as const,
+	endpoint: "users/following" as const,
 	limit: 20,
 	params: computed(() => ({
 		userId: props.user.id,
@@ -28,7 +42,7 @@ const followingPagination = {
 };
 
 const followersPagination = {
-	endpoint: 'users/followers' as const,
+	endpoint: "users/followers" as const,
 	limit: 20,
 	params: computed(() => ({
 		userId: props.user.id,
diff --git a/packages/client/src/pages/user/followers.vue b/packages/client/src/pages/user/followers.vue
index 5fbf38985..b22922719 100644
--- a/packages/client/src/pages/user/followers.vue
+++ b/packages/client/src/pages/user/followers.vue
@@ -1,31 +1,42 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="1000">
-		<transition name="fade" mode="out-in">
-			<div v-if="user">
-				<XFollowList :user="user" type="followers"/>
-			</div>
-			<MkError v-else-if="error" @retry="fetchUser()"/>
-			<MkLoading v-else/>
-		</transition>
-	</MkSpacer>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="1000">
+			<transition name="fade" mode="out-in">
+				<div v-if="user">
+					<XFollowList :user="user" type="followers" />
+				</div>
+				<MkError v-else-if="error" @retry="fetchUser()" />
+				<MkLoading v-else />
+			</transition>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, computed, inject, onMounted, onUnmounted, watch } from 'vue';
-import * as Acct from 'calckey-js/built/acct';
-import * as misskey from 'calckey-js';
-import XFollowList from './follow-list.vue';
-import * as os from '@/os';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
+import {
+	defineAsyncComponent,
+	computed,
+	inject,
+	onMounted,
+	onUnmounted,
+	watch,
+} from "vue";
+import * as Acct from "calckey-js/built/acct";
+import * as misskey from "calckey-js";
+import XFollowList from "./follow-list.vue";
+import * as os from "@/os";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	acct: string;
-}>(), {
-});
+const props = withDefaults(
+	defineProps<{
+		acct: string;
+	}>(),
+	{}
+);
 
 let user = $ref<null | misskey.entities.UserDetailed>(null);
 let error = $ref(null);
@@ -33,11 +44,13 @@ let error = $ref(null);
 function fetchUser(): void {
 	if (props.acct == null) return;
 	user = null;
-	os.api('users/show', Acct.parse(props.acct)).then(u => {
-		user = u;
-	}).catch(err => {
-		error = err;
-	});
+	os.api("users/show", Acct.parse(props.acct))
+		.then((u) => {
+			user = u;
+		})
+		.catch((err) => {
+			error = err;
+		});
 }
 
 watch(() => props.acct, fetchUser, {
@@ -48,14 +61,21 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => user ? {
-	icon: 'ph-user ph-bold ph-lg',
-	title: user.name ? `${user.name} (@${user.username})` : `@${user.username}`,
-	subtitle: i18n.ts.followers,
-	userName: user,
-	avatar: user,
-} : null));
+definePageMetadata(
+	computed(() =>
+		user
+			? {
+					icon: "ph-user ph-bold ph-lg",
+					title: user.name
+						? `${user.name} (@${user.username})`
+						: `@${user.username}`,
+					subtitle: i18n.ts.followers,
+					userName: user,
+					avatar: user,
+			  }
+			: null
+	)
+);
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/user/following.vue b/packages/client/src/pages/user/following.vue
index c970668f4..be994f835 100644
--- a/packages/client/src/pages/user/following.vue
+++ b/packages/client/src/pages/user/following.vue
@@ -1,31 +1,42 @@
 <template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :content-max="1000">
-		<transition name="fade" mode="out-in">
-			<div v-if="user">
-				<XFollowList :user="user" type="following"/>
-			</div>
-			<MkError v-else-if="error" @retry="fetchUser()"/>
-			<MkLoading v-else/>
-		</transition>
-	</MkSpacer>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+		/></template>
+		<MkSpacer :content-max="1000">
+			<transition name="fade" mode="out-in">
+				<div v-if="user">
+					<XFollowList :user="user" type="following" />
+				</div>
+				<MkError v-else-if="error" @retry="fetchUser()" />
+				<MkLoading v-else />
+			</transition>
+		</MkSpacer>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, computed, inject, onMounted, onUnmounted, watch } from 'vue';
-import * as Acct from 'calckey-js/built/acct';
-import * as misskey from 'calckey-js';
-import XFollowList from './follow-list.vue';
-import * as os from '@/os';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
+import {
+	defineAsyncComponent,
+	computed,
+	inject,
+	onMounted,
+	onUnmounted,
+	watch,
+} from "vue";
+import * as Acct from "calckey-js/built/acct";
+import * as misskey from "calckey-js";
+import XFollowList from "./follow-list.vue";
+import * as os from "@/os";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	acct: string;
-}>(), {
-});
+const props = withDefaults(
+	defineProps<{
+		acct: string;
+	}>(),
+	{}
+);
 
 let user = $ref<null | misskey.entities.UserDetailed>(null);
 let error = $ref(null);
@@ -33,11 +44,13 @@ let error = $ref(null);
 function fetchUser(): void {
 	if (props.acct == null) return;
 	user = null;
-	os.api('users/show', Acct.parse(props.acct)).then(u => {
-		user = u;
-	}).catch(err => {
-		error = err;
-	});
+	os.api("users/show", Acct.parse(props.acct))
+		.then((u) => {
+			user = u;
+		})
+		.catch((err) => {
+			error = err;
+		});
 }
 
 watch(() => props.acct, fetchUser, {
@@ -48,14 +61,21 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => user ? {
-	icon: 'ph-user ph-bold ph-lg',
-	title: user.name ? `${user.name} (@${user.username})` : `@${user.username}`,
-	subtitle: i18n.ts.following,
-	userName: user,
-	avatar: user,
-} : null));
+definePageMetadata(
+	computed(() =>
+		user
+			? {
+					icon: "ph-user ph-bold ph-lg",
+					title: user.name
+						? `${user.name} (@${user.username})`
+						: `@${user.username}`,
+					subtitle: i18n.ts.following,
+					userName: user,
+					avatar: user,
+			  }
+			: null
+	)
+);
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/user/gallery.vue b/packages/client/src/pages/user/gallery.vue
index f8ad1340f..47a4ab74c 100644
--- a/packages/client/src/pages/user/gallery.vue
+++ b/packages/client/src/pages/user/gallery.vue
@@ -1,26 +1,33 @@
 <template>
-<MkSpacer :content-max="800">
-	<MkPagination v-slot="{items}" :pagination="pagination">
-		<div class="jrnovfpt">
-			<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
-		</div>
-	</MkPagination>
-</MkSpacer>
+	<MkSpacer :content-max="800">
+		<MkPagination v-slot="{ items }" :pagination="pagination">
+			<div class="jrnovfpt">
+				<MkGalleryPostPreview
+					v-for="post in items"
+					:key="post.id"
+					:post="post"
+					class="post"
+				/>
+			</div>
+		</MkPagination>
+	</MkSpacer>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import * as misskey from 'calckey-js';
-import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
-import MkPagination from '@/components/MkPagination.vue';
+import { computed } from "vue";
+import * as misskey from "calckey-js";
+import MkGalleryPostPreview from "@/components/MkGalleryPostPreview.vue";
+import MkPagination from "@/components/MkPagination.vue";
 
-const props = withDefaults(defineProps<{
-	user: misskey.entities.User;
-}>(), {
-});
+const props = withDefaults(
+	defineProps<{
+		user: misskey.entities.User;
+	}>(),
+	{}
+);
 
 const pagination = {
-	endpoint: 'users/gallery/posts' as const,
+	endpoint: "users/gallery/posts" as const,
 	limit: 6,
 	params: computed(() => ({
 		userId: props.user.id,
diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index a42bb0736..3fa01d9c0 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -1,149 +1,338 @@
 <template>
-<MkSpacer :content-max="narrow ? 800 : 1100">
-	<div ref="rootEl" v-size="{ max: [500] }" class="ftskorzw" :class="{ wide: !narrow }">
-		<div class="main">
-			<!-- TODO -->
-			<!-- <div class="punished" v-if="user.isSuspended"><i class="ph-warning ph-bold ph-lg" style="margin-right: 8px;"></i> {{ i18n.ts.userSuspended }}</div> -->
-			<!-- <div class="punished" v-if="user.isSilenced"><i class="ph-warning ph-bold ph-lg" style="margin-right: 8px;"></i> {{ i18n.ts.userSilenced }}</div> -->
+	<MkSpacer :content-max="narrow ? 800 : 1100">
+		<div
+			ref="rootEl"
+			v-size="{ max: [500] }"
+			class="ftskorzw"
+			:class="{ wide: !narrow }"
+		>
+			<div class="main">
+				<!-- TODO -->
+				<!-- <div class="punished" v-if="user.isSuspended"><i class="ph-warning ph-bold ph-lg" style="margin-right: 8px;"></i> {{ i18n.ts.userSuspended }}</div> -->
+				<!-- <div class="punished" v-if="user.isSilenced"><i class="ph-warning ph-bold ph-lg" style="margin-right: 8px;"></i> {{ i18n.ts.userSilenced }}</div> -->
 
-			<div class="profile">
-				<MkMoved v-if="user.movedToUri" :host="user.movedToUri.host" :acct="user.movedToUri.username"/>
-				<MkRemoteCaution v-if="user.host != null" :href="user.url" class="warn"/>
+				<div class="profile">
+					<MkMoved
+						v-if="user.movedToUri"
+						:host="user.movedToUri.host"
+						:acct="user.movedToUri.username"
+					/>
+					<MkRemoteCaution
+						v-if="user.host != null"
+						:href="user.url"
+						class="warn"
+					/>
 
-				<div :key="user.id" class="_block main">
-					<div class="banner-container" :style="style">
-						<div ref="bannerEl" class="banner" :style="style"></div>
-						<div class="fade"></div>
+					<div :key="user.id" class="_block main">
+						<div class="banner-container" :style="style">
+							<div
+								ref="bannerEl"
+								class="banner"
+								:style="style"
+							></div>
+							<div class="fade"></div>
+							<div class="title">
+								<div class="nameCollumn">
+									<MkUserName
+										class="name"
+										:user="user"
+										:nowrap="true"
+									/>
+									<span
+										v-if="
+											$i &&
+											$i.id != user.id &&
+											user.isFollowed
+										"
+										class="followed"
+										>{{ i18n.ts.followsYou }}</span
+									>
+								</div>
+								<div class="bottom">
+									<span class="username"
+										><MkAcct :user="user" :detail="true"
+									/></span>
+									<span
+										v-if="user.isAdmin"
+										:title="i18n.ts.isAdmin"
+										style="color: var(--badge)"
+										><i
+											class="ph-bookmark-simple ph-fill ph-lg"
+										></i
+									></span>
+									<span
+										v-if="!user.isAdmin && user.isModerator"
+										:title="i18n.ts.isModerator"
+										style="color: var(--badge)"
+										><i
+											class="ph-bookmark-simple ph-bold"
+										></i
+									></span>
+									<span
+										v-if="user.isLocked"
+										:title="i18n.ts.isLocked"
+										><i class="ph-lock ph-bold ph-lg"></i
+									></span>
+									<span
+										v-if="user.isBot"
+										:title="i18n.ts.isBot"
+										><i class="ph-robot ph-bold ph-lg"></i
+									></span>
+								</div>
+							</div>
+						</div>
+						<MkAvatar
+							class="avatar"
+							:user="user"
+							:disable-preview="true"
+							:show-indicator="true"
+						/>
 						<div class="title">
 							<div class="nameCollumn">
-								<MkUserName class="name" :user="user" :nowrap="true"/>
-								<span v-if="$i && $i.id != user.id && user.isFollowed" class="followed">{{ i18n.ts.followsYou }}</span>
+								<MkUserName
+									class="name"
+									:user="user"
+									:nowrap="true"
+								/>
+								<span
+									v-if="
+										$i &&
+										$i.id != user.id &&
+										user.isFollowed
+									"
+									class="followed"
+									>{{ i18n.ts.followsYou }}</span
+								>
 							</div>
 							<div class="bottom">
-								<span class="username"><MkAcct :user="user" :detail="true"/></span>
-								<span v-if="user.isAdmin" :title="i18n.ts.isAdmin" style="color: var(--badge);"><i class="ph-bookmark-simple ph-fill ph-lg"></i></span>
-								<span v-if="!user.isAdmin && user.isModerator" :title="i18n.ts.isModerator" style="color: var(--badge);"><i class="ph-bookmark-simple ph-bold"></i></span>
-								<span v-if="user.isLocked" :title="i18n.ts.isLocked"><i class="ph-lock ph-bold ph-lg"></i></span>
-								<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ph-robot ph-bold ph-lg"></i></span>
+								<span class="username"
+									><MkAcct :user="user" :detail="true"
+								/></span>
+								<span
+									v-if="user.isAdmin"
+									:title="i18n.ts.isAdmin"
+									style="color: var(--badge)"
+									><i
+										class="ph-bookmark-simple ph-fill ph-lg"
+									></i
+								></span>
+								<span
+									v-if="!user.isAdmin && user.isModerator"
+									:title="i18n.ts.isModerator"
+									style="color: var(--badge)"
+									><i class="ph-bookmark-simple ph-bold"></i
+								></span>
+								<span
+									v-if="user.isLocked"
+									:title="i18n.ts.isLocked"
+									><i class="ph-lock ph-bold ph-lg"></i
+								></span>
+								<span v-if="user.isBot" :title="i18n.ts.isBot"
+									><i class="ph-robot ph-bold ph-lg"></i
+								></span>
 							</div>
 						</div>
-					</div>
-					<MkAvatar class="avatar" :user="user" :disable-preview="true" :show-indicator="true"/>
-					<div class="title">
-						<div class="nameCollumn">
-							<MkUserName class="name" :user="user" :nowrap="true"/>
-							<span v-if="$i && $i.id != user.id && user.isFollowed" class="followed">{{ i18n.ts.followsYou }}</span>
+						<div class="follow-container">
+							<div class="actions">
+								<MkFollowButton
+									v-if="$i != null && $i.id != user.id"
+									:user="user"
+									@refresh="emit('refresh')"
+									:inline="true"
+									:transparent="false"
+									:full="!narrow"
+									class="koudoku"
+								/>
+								<button class="menu _button" @click="menu">
+									<i
+										class="ph-dots-three-outline ph-bold ph-lg"
+									></i>
+								</button>
+								<!-- <MkFollowButton v-else-if="$i == null" :user="user" :remote="true" :inline="true" :transparent="false" :full="true" class="koudoku"/> -->
+							</div>
 						</div>
-						<div class="bottom">
-							<span class="username"><MkAcct :user="user" :detail="true"/></span>
-							<span v-if="user.isAdmin" :title="i18n.ts.isAdmin" style="color: var(--badge);"><i class="ph-bookmark-simple ph-fill ph-lg"></i></span>
-							<span v-if="!user.isAdmin && user.isModerator" :title="i18n.ts.isModerator" style="color: var(--badge);"><i class="ph-bookmark-simple ph-bold"></i></span>
-							<span v-if="user.isLocked" :title="i18n.ts.isLocked"><i class="ph-lock ph-bold ph-lg"></i></span>
-							<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ph-robot ph-bold ph-lg"></i></span>
+						<div class="description">
+							<Mfm
+								v-if="user.description"
+								:text="user.description"
+								:is-note="false"
+								:author="user"
+								:i="$i"
+								:custom-emojis="user.emojis"
+							/>
+							<p v-else class="empty">
+								{{ i18n.ts.noAccountDescription }}
+							</p>
 						</div>
-					</div>
-					<div class="follow-container">
-						<div class="actions">
-							<MkFollowButton v-if="$i != null && $i.id != user.id" :user="user" @refresh="emit('refresh')" :inline="true" :transparent="false" :full="!narrow" class="koudoku"/>
-							<button class="menu _button" @click="menu"><i class="ph-dots-three-outline ph-bold ph-lg"></i></button>
-							<!-- <MkFollowButton v-else-if="$i == null" :user="user" :remote="true" :inline="true" :transparent="false" :full="true" class="koudoku"/> -->
+						<div class="fields system">
+							<dl v-if="user.location" class="field">
+								<dt class="name">
+									<i
+										class="ph-map-pin ph-bold ph-lg ph-fw ph-lg"
+									></i>
+									{{ i18n.ts.location }}
+								</dt>
+								<dd class="value">
+									{{ user.location }}{{ timeForThem }}
+								</dd>
+							</dl>
+							<dl v-if="user.birthday" class="field">
+								<dt class="name">
+									<i
+										class="ph-cake ph-bold ph-lg ph-fw ph-lg"
+									></i>
+									{{ i18n.ts.birthday }}
+								</dt>
+								<dd class="value">
+									{{
+										user.birthday
+											.replace("-", "/")
+											.replace("-", "/")
+									}}
+									({{ i18n.t("yearsOld", { age }) }})
+								</dd>
+							</dl>
+							<dl class="field">
+								<dt class="name">
+									<i
+										class="ph-calendar-blank ph-bold ph-lg ph-fw ph-lg"
+									></i>
+									{{ i18n.ts.registeredDate }}
+								</dt>
+								<dd class="value">
+									{{
+										new Date(
+											user.createdAt
+										).toLocaleString()
+									}}
+									(<MkTime :time="user.createdAt" />)
+								</dd>
+							</dl>
+						</div>
+						<div v-if="user.fields.length > 0" class="fields">
+							<dl
+								v-for="(field, i) in user.fields"
+								:key="i"
+								class="field"
+							>
+								<dt class="name">
+									<Mfm
+										:text="field.name"
+										:plain="true"
+										:custom-emojis="user.emojis"
+										:colored="false"
+									/>
+								</dt>
+								<dd class="value">
+									<Mfm
+										:text="field.value"
+										:author="user"
+										:i="$i"
+										:custom-emojis="user.emojis"
+										:colored="false"
+									/>
+								</dd>
+							</dl>
+						</div>
+						<div class="status">
+							<MkA
+								v-click-anime
+								:to="userPage(user)"
+								:class="{ active: page === 'index' }"
+							>
+								<b>{{ number(user.notesCount) }}</b>
+								<span>{{ i18n.ts.notes }}</span>
+							</MkA>
+							<MkA
+								v-click-anime
+								:to="userPage(user, 'following')"
+								:class="{ active: page === 'following' }"
+							>
+								<b>{{ number(user.followingCount) }}</b>
+								<span>{{ i18n.ts.following }}</span>
+							</MkA>
+							<MkA
+								v-click-anime
+								:to="userPage(user, 'followers')"
+								:class="{ active: page === 'followers' }"
+							>
+								<b>{{ number(user.followersCount) }}</b>
+								<span>{{ i18n.ts.followers }}</span>
+							</MkA>
 						</div>
-					</div>
-					<div class="description">
-						<Mfm v-if="user.description" :text="user.description" :is-note="false" :author="user" :i="$i" :custom-emojis="user.emojis"/>
-						<p v-else class="empty">{{ i18n.ts.noAccountDescription }}</p>
-					</div>
-					<div class="fields system">
-						<dl v-if="user.location" class="field">
-							<dt class="name"><i class="ph-map-pin ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.location }}</dt>
-							<dd class="value">{{ user.location }}{{ timeForThem }}</dd>
-						</dl>
-						<dl v-if="user.birthday" class="field">
-							<dt class="name"><i class="ph-cake ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.birthday }}</dt>
-							<dd class="value">{{ user.birthday.replace('-', '/').replace('-', '/') }} ({{ i18n.t('yearsOld', { age }) }})</dd>
-						</dl>
-						<dl class="field">
-							<dt class="name"><i class="ph-calendar-blank ph-bold ph-lg ph-fw ph-lg"></i> {{ i18n.ts.registeredDate }}</dt>
-							<dd class="value">{{ new Date(user.createdAt).toLocaleString() }} (<MkTime :time="user.createdAt"/>)</dd>
-						</dl>
-					</div>
-					<div v-if="user.fields.length > 0" class="fields">
-						<dl v-for="(field, i) in user.fields" :key="i" class="field">
-							<dt class="name">
-								<Mfm :text="field.name" :plain="true" :custom-emojis="user.emojis" :colored="false"/>
-							</dt>
-							<dd class="value">
-								<Mfm :text="field.value" :author="user" :i="$i" :custom-emojis="user.emojis" :colored="false"/>
-							</dd>
-						</dl>
-					</div>
-					<div class="status">
-						<MkA v-click-anime :to="userPage(user)" :class="{ active: page === 'index' }">
-							<b>{{ number(user.notesCount) }}</b>
-							<span>{{ i18n.ts.notes }}</span>
-						</MkA>
-						<MkA v-click-anime :to="userPage(user, 'following')" :class="{ active: page === 'following' }">
-							<b>{{ number(user.followingCount) }}</b>
-							<span>{{ i18n.ts.following }}</span>
-						</MkA>
-						<MkA v-click-anime :to="userPage(user, 'followers')" :class="{ active: page === 'followers' }">
-							<b>{{ number(user.followersCount) }}</b>
-							<span>{{ i18n.ts.followers }}</span>
-						</MkA>
 					</div>
 				</div>
-			</div>
 
-			<div class="contents">
-				<div v-if="user.pinnedNotes.length > 0" class="_gap">
-					<XNote v-for="note in user.pinnedNotes" :key="note.id" class="note _block" :note="note" :pinned="true"/>
+				<div class="contents">
+					<div v-if="user.pinnedNotes.length > 0" class="_gap">
+						<XNote
+							v-for="note in user.pinnedNotes"
+							:key="note.id"
+							class="note _block"
+							:note="note"
+							:pinned="true"
+						/>
+					</div>
+					<MkInfo
+						v-else-if="$i && $i.id === user.id"
+						style="margin: 12px 0"
+						>{{ i18n.ts.userPagePinTip }}</MkInfo
+					>
+					<template v-if="narrow">
+						<XPhotos :key="user.id" :user="user" />
+						<XActivity
+							:key="user.id"
+							:user="user"
+							style="margin-top: var(--margin)"
+						/>
+					</template>
+				</div>
+				<div>
+					<XUserTimeline :user="user" />
 				</div>
-				<MkInfo v-else-if="$i && $i.id === user.id" style="margin: 12px 0;">{{ i18n.ts.userPagePinTip }}</MkInfo>
-				<template v-if="narrow">
-					<XPhotos :key="user.id" :user="user"/>
-					<XActivity :key="user.id" :user="user" style="margin-top: var(--margin);"/>
-				</template>
 			</div>
-			<div>
-				<XUserTimeline :user="user"/>
+			<div v-if="!narrow" class="sub">
+				<XPhotos :key="user.id" :user="user" />
+				<XActivity
+					:key="user.id"
+					:user="user"
+					style="margin-top: var(--margin)"
+				/>
 			</div>
 		</div>
-		<div v-if="!narrow" class="sub">
-			<XPhotos :key="user.id" :user="user"/>
-			<XActivity :key="user.id" :user="user" style="margin-top: var(--margin);"/>
-		</div>
-	</div>
-</MkSpacer>
+	</MkSpacer>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, onMounted, onUnmounted } from 'vue';
-import calcAge from 's-age';
-import cityTimezones from 'city-timezones';
-import XUserTimeline from './index.timeline.vue';
-import type * as misskey from 'calckey-js';
-import XNote from '@/components/MkNote.vue';
-import MkFollowButton from '@/components/MkFollowButton.vue';
-import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import MkMoved from '@/components/MkMoved.vue';
-import { getScrollPosition } from '@/scripts/scroll';
-import { getUserMenu } from '@/scripts/get-user-menu';
-import number from '@/filters/number';
-import { userPage } from '@/filters/user';
-import * as os from '@/os';
-import { useRouter } from '@/router';
-import { i18n } from '@/i18n';
-import { $i } from '@/account';
+import { defineAsyncComponent, onMounted, onUnmounted } from "vue";
+import calcAge from "s-age";
+import cityTimezones from "city-timezones";
+import XUserTimeline from "./index.timeline.vue";
+import type * as misskey from "calckey-js";
+import XNote from "@/components/MkNote.vue";
+import MkFollowButton from "@/components/MkFollowButton.vue";
+import MkRemoteCaution from "@/components/MkRemoteCaution.vue";
+import MkInfo from "@/components/MkInfo.vue";
+import MkMoved from "@/components/MkMoved.vue";
+import { getScrollPosition } from "@/scripts/scroll";
+import { getUserMenu } from "@/scripts/get-user-menu";
+import number from "@/filters/number";
+import { userPage } from "@/filters/user";
+import * as os from "@/os";
+import { useRouter } from "@/router";
+import { i18n } from "@/i18n";
+import { $i } from "@/account";
 
-const XPhotos = defineAsyncComponent(() => import('./index.photos.vue'));
-const XActivity = defineAsyncComponent(() => import('./index.activity.vue'));
+const XPhotos = defineAsyncComponent(() => import("./index.photos.vue"));
+const XActivity = defineAsyncComponent(() => import("./index.activity.vue"));
 
-const emit = defineEmits(['refresh']);
-const props = withDefaults(defineProps<{
-	user: misskey.entities.UserDetailed;
-}>(), {
-});
+const emit = defineEmits(["refresh"]);
+const props = withDefaults(
+	defineProps<{
+		user: misskey.entities.UserDetailed;
+	}>(),
+	{}
+);
 
 const router = useRouter();
 
@@ -155,7 +344,7 @@ let bannerEl = $ref<null | HTMLElement>(null);
 const style = $computed(() => {
 	if (props.user.bannerUrl == null) return {};
 	return {
-		backgroundImage: `url(${ props.user.bannerUrl })`,
+		backgroundImage: `url(${props.user.bannerUrl})`,
 	};
 });
 
@@ -164,15 +353,25 @@ const age = $computed(() => {
 });
 
 const timeForThem = $computed(() => {
-	const tzInfo = cityTimezones.lookupViaCity(props.user.location!.replace(/\s.*/,''));
+	const tzInfo = cityTimezones.lookupViaCity(
+		props.user.location!.replace(/\s.*/, "")
+	);
 	if (tzInfo.length == 0) return "";
 	const tz = tzInfo[0].timezone;
-	const theirTime = new Date().toLocaleString("en-US", { timeZone: tz, hour12: false });
-	return ` (${theirTime.split(",")[1].trim().split(":")[0]}:${theirTime.split(" ")[1].slice(-5,-3)})`;
-})
+	const theirTime = new Date().toLocaleString("en-US", {
+		timeZone: tz,
+		hour12: false,
+	});
+	return ` (${theirTime.split(",")[1].trim().split(":")[0]}:${theirTime
+		.split(" ")[1]
+		.slice(-5, -3)})`;
+});
 
 function menu(ev) {
-	os.popupMenu(getUserMenu(props.user, router), ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		getUserMenu(props.user, router),
+		ev.currentTarget ?? ev.target
+	);
 }
 
 function parallaxLoop() {
@@ -207,16 +406,13 @@ onUnmounted(() => {
 
 <style lang="scss" scoped>
 .ftskorzw {
-
 	> .main {
-
 		> .punished {
 			font-size: 0.8em;
 			padding: 16px;
 		}
 
 		> .profile {
-
 			> .main {
 				position: relative;
 				overflow: hidden;
@@ -244,7 +440,7 @@ onUnmounted(() => {
 							background-size: cover;
 							background-position: center;
 							pointer-events: none;
-							opacity: .1;
+							opacity: 0.1;
 							filter: var(--blur, blur(10px));
 						}
 					}
@@ -255,7 +451,10 @@ onUnmounted(() => {
 						left: 0;
 						width: 100%;
 						height: 78px;
-						background: linear-gradient(transparent, rgba(#000, 0.7));
+						background: linear-gradient(
+							transparent,
+							rgba(#000, 0.7)
+						);
 					}
 
 					> .followed {
@@ -304,24 +503,23 @@ onUnmounted(() => {
 						> .nameCollumn {
 							display: block;
 							> .name {
-							margin: 0;
-							line-height: 32px;
-							font-weight: bold;
-							font-size: 1.8em;
-							text-shadow: 0 0 8px var(--shadow);
-						}
-
-						> .followed {
-							position: relative;
-							top: -4px;
-							left: 4px;
-							padding: 4px 8px;
-							color: #fff;
-							background: rgba(0, 0, 0, 0.6);
-							font-size: 0.7em;
-							border-radius: 24px;
-						}
+								margin: 0;
+								line-height: 32px;
+								font-weight: bold;
+								font-size: 1.8em;
+								text-shadow: 0 0 8px var(--shadow);
+							}
 
+							> .followed {
+								position: relative;
+								top: -4px;
+								left: 4px;
+								padding: 4px 8px;
+								color: #fff;
+								background: rgba(0, 0, 0, 0.6);
+								font-size: 0.7em;
+								border-radius: 24px;
+							}
 						}
 
 						> .bottom {
@@ -353,7 +551,10 @@ onUnmounted(() => {
 						left: 0;
 						width: 100%;
 						height: 78px;
-						background: linear-gradient(transparent, rgba(#000, 0.7));
+						background: linear-gradient(
+							transparent,
+							rgba(#000, 0.7)
+						);
 					}
 
 					> .actions {
@@ -418,8 +619,8 @@ onUnmounted(() => {
 					border-bottom: solid 0.5px var(--divider);
 
 					> .nameCollumn {
-							display: block;
-							> .name {
+						display: block;
+						> .name {
 							margin: 0;
 							align-content: center;
 							line-height: 32px;
@@ -438,19 +639,18 @@ onUnmounted(() => {
 							font-size: 0.7em;
 							border-radius: 24px;
 						}
+					}
 
-						}
-
-						> .followedWindow {
-							position: relative;
-							top: -25px;
-							left: 80px;
-							padding: 4px 8px;
-							color: #fff;
-							background: rgba(0, 0, 0, 0.6);
-							font-size: 0.7em;
-							border-radius: 24px;
-						}
+					> .followedWindow {
+						position: relative;
+						top: -25px;
+						left: 80px;
+						padding: 4px 8px;
+						color: #fff;
+						background: rgba(0, 0, 0, 0.6);
+						font-size: 0.7em;
+						border-radius: 24px;
+					}
 
 					> .bottom {
 						> * {
@@ -600,7 +800,7 @@ onUnmounted(() => {
 				}
 
 				> .description {
-          top: -55px;
+					top: -55px;
 					position: relative;
 				}
 
diff --git a/packages/client/src/pages/user/index.activity.vue b/packages/client/src/pages/user/index.activity.vue
index b51ab60ad..1e57ece13 100644
--- a/packages/client/src/pages/user/index.activity.vue
+++ b/packages/client/src/pages/user/index.activity.vue
@@ -1,43 +1,63 @@
 <template>
-<MkContainer>
-	<template #header><i class="ph-chart-bar ph-bold ph-lg" style="margin-right: 0.5em;"></i>{{ i18n.ts.activity }}</template>
-	<template #func>
-		<button class="_button" @click="showMenu">
-			<i class="ph-dots-three-outline ph-bold ph-lg"></i>
-		</button>
-	</template>
+	<MkContainer>
+		<template #header
+			><i
+				class="ph-chart-bar ph-bold ph-lg"
+				style="margin-right: 0.5em"
+			></i
+			>{{ i18n.ts.activity }}</template
+		>
+		<template #func>
+			<button class="_button" @click="showMenu">
+				<i class="ph-dots-three-outline ph-bold ph-lg"></i>
+			</button>
+		</template>
 
-	<div style="padding: 8px;">
-		<MkChart :src="chartSrc" :args="{ user, withoutAll: true }" span="day" :limit="limit" :bar="true" :stacked="true" :detailed="false" :aspect-ratio="5"/>
-	</div>
-</MkContainer>
+		<div style="padding: 8px">
+			<MkChart
+				:src="chartSrc"
+				:args="{ user, withoutAll: true }"
+				span="day"
+				:limit="limit"
+				:bar="true"
+				:stacked="true"
+				:detailed="false"
+				:aspect-ratio="5"
+			/>
+		</div>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as misskey from 'calckey-js';
-import MkContainer from '@/components/MkContainer.vue';
-import MkChart from '@/components/MkChart.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import * as misskey from "calckey-js";
+import MkContainer from "@/components/MkContainer.vue";
+import MkChart from "@/components/MkChart.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-const props = withDefaults(defineProps<{
-	user: misskey.entities.User;
-	limit?: number;
-}>(), {
-	limit: 50,
-});
+const props = withDefaults(
+	defineProps<{
+		user: misskey.entities.User;
+		limit?: number;
+	}>(),
+	{
+		limit: 50,
+	}
+);
 
-let chartSrc = $ref('per-user-notes');
+let chartSrc = $ref("per-user-notes");
 
 function showMenu(ev: MouseEvent) {
-	os.popupMenu([{
-		text: i18n.ts.notes,
-		active: true,
-		action: () => {
-			chartSrc = 'per-user-notes';
-		},
-	},/*, {
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts.notes,
+				active: true,
+				action: () => {
+					chartSrc = "per-user-notes";
+				},
+			} /*, {
 		text: i18n.ts.following,
 		action: () => {
 			chartSrc = 'per-user-following';
@@ -47,6 +67,9 @@ function showMenu(ev: MouseEvent) {
 		action: () => {
 			chartSrc = 'per-user-followers';
 		}
-	}*/], ev.currentTarget ?? ev.target);
+	}*/,
+		],
+		ev.currentTarget ?? ev.target
+	);
 }
 </script>
diff --git a/packages/client/src/pages/user/index.photos.vue b/packages/client/src/pages/user/index.photos.vue
index 5418d1f9d..5b1753560 100644
--- a/packages/client/src/pages/user/index.photos.vue
+++ b/packages/client/src/pages/user/index.photos.vue
@@ -1,43 +1,54 @@
 <template>
-<MkContainer id="photos-container" :max-height="300" :foldable="true">
-	<template #header><i class="ph-image ph-bold ph-lg" style="margin-right: 0.5em;"></i>{{ i18n.ts.images }}</template>
-	<div class="ujigsodd">
-		<MkLoading v-if="fetching"/>
-		<div v-if="!fetching && images.length > 0" class="stream">
-			<MkA
-				v-for="image in images"
-				:key="image.note.id + image.file.id"
-				class="img"
-				:to="notePage(image.note)"
-			>
-				<ImgWithBlurhash :hash="image.file.blurhash" :src="thumbnail(image.file)" :title="image.file.name"/>
-			</MkA>
+	<MkContainer id="photos-container" :max-height="300" :foldable="true">
+		<template #header
+			><i class="ph-image ph-bold ph-lg" style="margin-right: 0.5em"></i
+			>{{ i18n.ts.images }}</template
+		>
+		<div class="ujigsodd">
+			<MkLoading v-if="fetching" />
+			<div v-if="!fetching && images.length > 0" class="stream">
+				<MkA
+					v-for="image in images"
+					:key="image.note.id + image.file.id"
+					class="img"
+					:to="notePage(image.note)"
+				>
+					<ImgWithBlurhash
+						:hash="image.file.blurhash"
+						:src="thumbnail(image.file)"
+						:title="image.file.name"
+					/>
+				</MkA>
+			</div>
+			<p v-if="!fetching && images.length == 0" class="empty">
+				{{ i18n.ts.nothing }}
+			</p>
 		</div>
-		<p v-if="!fetching && images.length == 0" class="empty">{{ i18n.ts.nothing }}</p>
-	</div>
-</MkContainer>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import * as misskey from 'calckey-js';
-import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import { notePage } from '@/filters/note';
-import * as os from '@/os';
-import MkContainer from '@/components/MkContainer.vue';
-import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
+import { onMounted } from "vue";
+import * as misskey from "calckey-js";
+import { getStaticImageUrl } from "@/scripts/get-static-image-url";
+import { notePage } from "@/filters/note";
+import * as os from "@/os";
+import MkContainer from "@/components/MkContainer.vue";
+import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	user: misskey.entities.UserDetailed;
 }>();
 
 let fetching = $ref(true);
-let images = $ref<{
-	note: misskey.entities.Note;
-	file: misskey.entities.DriveFile;
-}[]>([]);
+let images = $ref<
+	{
+		note: misskey.entities.Note;
+		file: misskey.entities.DriveFile;
+	}[]
+>([]);
 
 function thumbnail(image: misskey.entities.DriveFile): string {
 	return defaultStore.state.disableShowingAnimatedImages
@@ -47,19 +58,19 @@ function thumbnail(image: misskey.entities.DriveFile): string {
 
 onMounted(() => {
 	const image = [
-		'image/jpeg',
-		'image/png',
-		'image/gif',
-		'image/apng',
-		'image/vnd.mozilla.apng',
-		'image/avif',
+		"image/jpeg",
+		"image/png",
+		"image/gif",
+		"image/apng",
+		"image/vnd.mozilla.apng",
+		"image/avif",
 	];
-	os.api('users/notes', {
+	os.api("users/notes", {
 		userId: props.user.id,
 		fileType: image,
-		excludeNsfw: defaultStore.state.nsfw !== 'ignore',
+		excludeNsfw: defaultStore.state.nsfw !== "ignore",
 		limit: 10,
-	}).then(notes => {
+	}).then((notes) => {
 		for (const note of notes) {
 			for (const file of note.files) {
 				images.push({
diff --git a/packages/client/src/pages/user/index.timeline.vue b/packages/client/src/pages/user/index.timeline.vue
index 095b5cf31..1792b6357 100644
--- a/packages/client/src/pages/user/index.timeline.vue
+++ b/packages/client/src/pages/user/index.timeline.vue
@@ -1,23 +1,23 @@
 <template>
-<MkStickyContainer>
-	<template #header>
-		<MkTab v-model="include" :class="$style.tab">
-			<option :value="null">{{ i18n.ts.notes }}</option>
-			<option value="replies">{{ i18n.ts.notesAndReplies }}</option>
-			<option value="files">{{ i18n.ts.withFiles }}</option>
-		</MkTab>
-	</template>
-	<XNotes :no-gap="true" :pagination="pagination"/>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header>
+			<MkTab v-model="include" :class="$style.tab">
+				<option :value="null">{{ i18n.ts.notes }}</option>
+				<option value="replies">{{ i18n.ts.notesAndReplies }}</option>
+				<option value="files">{{ i18n.ts.withFiles }}</option>
+			</MkTab>
+		</template>
+		<XNotes :no-gap="true" :pagination="pagination" />
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue';
-import * as misskey from 'calckey-js';
-import XNotes from '@/components/MkNotes.vue';
-import MkTab from '@/components/MkTab.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { ref, computed } from "vue";
+import * as misskey from "calckey-js";
+import XNotes from "@/components/MkNotes.vue";
+import MkTab from "@/components/MkTab.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	user: misskey.entities.UserDetailed;
@@ -26,12 +26,12 @@ const props = defineProps<{
 const include = ref<string | null>(null);
 
 const pagination = {
-	endpoint: 'users/notes' as const,
+	endpoint: "users/notes" as const,
 	limit: 10,
 	params: computed(() => ({
 		userId: props.user.id,
-		includeReplies: include.value === 'replies',
-		withFiles: include.value === 'files',
+		includeReplies: include.value === "replies",
+		withFiles: include.value === "files",
 	})),
 };
 </script>
diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue
index 32369c63d..2452f1de4 100644
--- a/packages/client/src/pages/user/index.vue
+++ b/packages/client/src/pages/user/index.vue
@@ -1,48 +1,52 @@
 <template>
-<MkStickyContainer>
-	<template #header>
-		<MkPageHeader
-			v-model:tab="tab"
-			:actions="headerActions"
-			:tabs="headerTabs"
-			:display-back-button="true"
-		/>
-	</template>
-	<div>
-		<transition name="fade" mode="out-in">
-			<div v-if="user">
-				<XHome v-if="tab === 'home'" :user="user" @refresh="fetchUser()"/>
-				<XReactions v-else-if="tab === 'reactions'" :user="user"/>
-				<XClips v-else-if="tab === 'clips'" :user="user"/>
-				<XPages v-else-if="tab === 'pages'" :user="user"/>
-				<XGallery v-else-if="tab === 'gallery'" :user="user"/>
-			</div>
-			<MkError v-else-if="error" @retry="fetchUser()"/>
-			<MkLoading v-else/>
-		</transition>
-	</div>
-</MkStickyContainer>
+	<MkStickyContainer>
+		<template #header>
+			<MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+			/>
+		</template>
+		<div>
+			<transition name="fade" mode="out-in">
+				<div v-if="user">
+					<XHome
+						v-if="tab === 'home'"
+						:user="user"
+						@refresh="fetchUser()"
+					/>
+					<XReactions v-else-if="tab === 'reactions'" :user="user" />
+					<XClips v-else-if="tab === 'clips'" :user="user" />
+					<XPages v-else-if="tab === 'pages'" :user="user" />
+					<XGallery v-else-if="tab === 'gallery'" :user="user" />
+				</div>
+				<MkError v-else-if="error" @retry="fetchUser()" />
+				<MkLoading v-else />
+			</transition>
+		</div>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, computed, watch } from 'vue';
-import calcAge from 's-age';
-import * as Acct from 'calckey-js/built/acct';
-import type * as misskey from 'calckey-js';
-import { getScrollPosition } from '@/scripts/scroll';
-import number from '@/filters/number';
-import { userPage, acct as getAcct } from '@/filters/user';
-import * as os from '@/os';
-import { useRouter } from '@/router';
-import { definePageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
-import { $i } from '@/account';
+import { defineAsyncComponent, computed, watch } from "vue";
+import calcAge from "s-age";
+import * as Acct from "calckey-js/built/acct";
+import type * as misskey from "calckey-js";
+import { getScrollPosition } from "@/scripts/scroll";
+import number from "@/filters/number";
+import { userPage, acct as getAcct } from "@/filters/user";
+import * as os from "@/os";
+import { useRouter } from "@/router";
+import { definePageMetadata } from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
+import { $i } from "@/account";
 
-const XHome = defineAsyncComponent(() => import('./home.vue'));
-const XReactions = defineAsyncComponent(() => import('./reactions.vue'));
-const XClips = defineAsyncComponent(() => import('./clips.vue'));
-const XPages = defineAsyncComponent(() => import('./pages.vue'));
-const XGallery = defineAsyncComponent(() => import('./gallery.vue'));
+const XHome = defineAsyncComponent(() => import("./home.vue"));
+const XReactions = defineAsyncComponent(() => import("./reactions.vue"));
+const XClips = defineAsyncComponent(() => import("./clips.vue"));
+const XPages = defineAsyncComponent(() => import("./pages.vue"));
+const XGallery = defineAsyncComponent(() => import("./gallery.vue"));
 
 const props = withDefaults(
 	defineProps<{
@@ -50,8 +54,8 @@ const props = withDefaults(
 		page?: string;
 	}>(),
 	{
-		page: 'home',
-	},
+		page: "home",
+	}
 );
 
 const router = useRouter();
@@ -63,7 +67,7 @@ let error = $ref(null);
 function fetchUser(): void {
 	if (props.acct == null) return;
 	user = null;
-	os.api('users/show', Acct.parse(props.acct))
+	os.api("users/show", Acct.parse(props.acct))
 		.then((u) => {
 			user = u;
 		})
@@ -81,52 +85,61 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() =>
 	user
 		? [
-			{
-				key: 'home',
-				title: i18n.ts.overview,
-				icon: 'ph-user ph-bold ph-lg',
-			},
-			...(($i && $i.id === user.id) || user.publicReactions
-				? [{
-					key: 'reactions',
-					title: i18n.ts.reaction,
-					icon: 'ph-smiley ph-bold ph-lg',
-				}] : []),
-			...(user.instance == null ? [{
-				key: 'clips',
-				title: i18n.ts.clips,
-				icon: 'ph-paperclip ph-bold ph-lg',
-			}, {
-				key: 'pages',
-				title: i18n.ts.pages,
-				icon: 'ph-file-text ph-bold ph-lg',
-			}, {
-				key: 'gallery',
-				title: i18n.ts.gallery,
-				icon: 'ph-image-square ph-bold ph-lg',
-			}] : []),
-		]
-		: null,
+				{
+					key: "home",
+					title: i18n.ts.overview,
+					icon: "ph-user ph-bold ph-lg",
+				},
+				...(($i && $i.id === user.id) || user.publicReactions
+					? [
+							{
+								key: "reactions",
+								title: i18n.ts.reaction,
+								icon: "ph-smiley ph-bold ph-lg",
+							},
+					  ]
+					: []),
+				...(user.instance == null
+					? [
+							{
+								key: "clips",
+								title: i18n.ts.clips,
+								icon: "ph-paperclip ph-bold ph-lg",
+							},
+							{
+								key: "pages",
+								title: i18n.ts.pages,
+								icon: "ph-file-text ph-bold ph-lg",
+							},
+							{
+								key: "gallery",
+								title: i18n.ts.gallery,
+								icon: "ph-image-square ph-bold ph-lg",
+							},
+					  ]
+					: []),
+		  ]
+		: null
 );
 
 definePageMetadata(
 	computed(() =>
 		user
 			? {
-				icon: 'ph-user ph-bold ph-lg',
-				title: user.name
-					? `${user.name} (@${user.username})`
-					: `@${user.username}`,
-				subtitle: `@${getAcct(user)}`,
-				userName: user,
-				avatar: user,
-				path: `/@${user.username}`,
-				share: {
-					title: user.name,
-				},
-			}
-			: null,
-	),
+					icon: "ph-user ph-bold ph-lg",
+					title: user.name
+						? `${user.name} (@${user.username})`
+						: `@${user.username}`,
+					subtitle: `@${getAcct(user)}`,
+					userName: user,
+					avatar: user,
+					path: `/@${user.username}`,
+					share: {
+						title: user.name,
+					},
+			  }
+			: null
+	)
 );
 </script>
 
diff --git a/packages/client/src/pages/user/pages.vue b/packages/client/src/pages/user/pages.vue
index 89aa63f1b..ff9777adc 100644
--- a/packages/client/src/pages/user/pages.vue
+++ b/packages/client/src/pages/user/pages.vue
@@ -1,23 +1,28 @@
 <template>
-<MkSpacer :content-max="800">
-	<MkPagination v-slot="{items}" ref="list" :pagination="pagination">
-		<MkPagePreview v-for="page in items" :key="page.id" :page="page" class="_gap"/>
-	</MkPagination>
-</MkSpacer>
+	<MkSpacer :content-max="800">
+		<MkPagination v-slot="{ items }" ref="list" :pagination="pagination">
+			<MkPagePreview
+				v-for="page in items"
+				:key="page.id"
+				:page="page"
+				class="_gap"
+			/>
+		</MkPagination>
+	</MkSpacer>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import * as misskey from 'calckey-js';
-import MkPagePreview from '@/components/MkPagePreview.vue';
-import MkPagination from '@/components/MkPagination.vue';
+import { computed } from "vue";
+import * as misskey from "calckey-js";
+import MkPagePreview from "@/components/MkPagePreview.vue";
+import MkPagination from "@/components/MkPagination.vue";
 
 const props = defineProps<{
 	user: misskey.entities.User;
 }>();
 
 const pagination = {
-	endpoint: 'users/pages' as const,
+	endpoint: "users/pages" as const,
 	limit: 20,
 	params: computed(() => ({
 		userId: props.user.id,
@@ -25,6 +30,4 @@ const pagination = {
 };
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/user/reactions.vue b/packages/client/src/pages/user/reactions.vue
index 1a6568a9d..4ae147244 100644
--- a/packages/client/src/pages/user/reactions.vue
+++ b/packages/client/src/pages/user/reactions.vue
@@ -1,31 +1,41 @@
 <template>
-<MkSpacer :content-max="800">
-	<MkPagination v-slot="{items}" ref="list" :pagination="pagination">
-		<div v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap afdcfbfb">
-			<div class="header">
-				<MkAvatar class="avatar" :user="user"/>
-				<MkReactionIcon class="reaction" :reaction="item.type" :custom-emojis="item.note.emojis" :no-style="true"/>
-				<MkTime :time="item.createdAt" class="createdAt"/>
+	<MkSpacer :content-max="800">
+		<MkPagination v-slot="{ items }" ref="list" :pagination="pagination">
+			<div
+				v-for="item in items"
+				:key="item.id"
+				:to="`/clips/${item.id}`"
+				class="item _panel _gap afdcfbfb"
+			>
+				<div class="header">
+					<MkAvatar class="avatar" :user="user" />
+					<MkReactionIcon
+						class="reaction"
+						:reaction="item.type"
+						:custom-emojis="item.note.emojis"
+						:no-style="true"
+					/>
+					<MkTime :time="item.createdAt" class="createdAt" />
+				</div>
+				<MkNote :key="item.id" :note="item.note" />
 			</div>
-			<MkNote :key="item.id" :note="item.note"/>
-		</div>
-	</MkPagination>
-</MkSpacer>
+		</MkPagination>
+	</MkSpacer>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import * as misskey from 'calckey-js';
-import MkPagination from '@/components/MkPagination.vue';
-import MkNote from '@/components/MkNote.vue';
-import MkReactionIcon from '@/components/MkReactionIcon.vue';
+import { computed } from "vue";
+import * as misskey from "calckey-js";
+import MkPagination from "@/components/MkPagination.vue";
+import MkNote from "@/components/MkNote.vue";
+import MkReactionIcon from "@/components/MkReactionIcon.vue";
 
 const props = defineProps<{
 	user: misskey.entities.User;
 }>();
 
 const pagination = {
-	endpoint: 'users/reactions' as const,
+	endpoint: "users/reactions" as const,
 	limit: 20,
 	params: computed(() => ({
 		userId: props.user.id,
diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue
index cdbdeb8fb..f40e2a82b 100644
--- a/packages/client/src/pages/welcome.entrance.a.vue
+++ b/packages/client/src/pages/welcome.entrance.a.vue
@@ -1,68 +1,115 @@
 <template>
-<div v-if="meta" class="rsqzvsbo">
-	<div class="top">
-		<MkFeaturedPhotos class="bg"/>
-		<XTimeline class="tl"/>
-		<div class="shape1"></div>
-		<div class="shape2"></div>
-		<img src="/client-assets/misskey.svg" class="misskey"/>
-		<div class="emojis">
-			<MkEmoji :normal="true" :no-style="true" emoji="⭐"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="❤️"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="😆"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="🤔"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="😮"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="🎉"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="💢"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="😥"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="😇"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="🥴"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="🍮"/>
-		</div>
-		<div class="main">
-			<img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" alt="" class="icon"/>
-			<button class="_button _acrylic menu" @click="showMenu"><i class="ph-dots-three-outline ph-bold ph-lg"></i></button>
-			<div class="fg">
-				<h1>
-					<img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl">
-					<span v-else class="text">{{ instanceName }}</span>
-				</h1>
-				<div class="about">
-					<div class="desc" v-html="meta.description || i18n.ts.headlineMisskey"></div>
-				</div>
-				<div class="action">
-					<MkButton inline rounded gradate data-cy-signup style="margin-right: 12px;" @click="signup()">{{ i18n.ts.signup }}</MkButton>
-					<MkButton inline rounded data-cy-signin @click="signin()">{{ i18n.ts.login }}</MkButton>
-					<MkButton inline rounded style="margin-left: 12px; margin-top: 12px;" onclick="window.location.href='/explore'">Explore</MkButton>
+	<div v-if="meta" class="rsqzvsbo">
+		<div class="top">
+			<MkFeaturedPhotos class="bg" />
+			<XTimeline class="tl" />
+			<div class="shape1"></div>
+			<div class="shape2"></div>
+			<img src="/client-assets/misskey.svg" class="misskey" />
+			<div class="emojis">
+				<MkEmoji :normal="true" :no-style="true" emoji="⭐" />
+				<MkEmoji :normal="true" :no-style="true" emoji="❤️" />
+				<MkEmoji :normal="true" :no-style="true" emoji="😆" />
+				<MkEmoji :normal="true" :no-style="true" emoji="🤔" />
+				<MkEmoji :normal="true" :no-style="true" emoji="😮" />
+				<MkEmoji :normal="true" :no-style="true" emoji="🎉" />
+				<MkEmoji :normal="true" :no-style="true" emoji="💢" />
+				<MkEmoji :normal="true" :no-style="true" emoji="😥" />
+				<MkEmoji :normal="true" :no-style="true" emoji="😇" />
+				<MkEmoji :normal="true" :no-style="true" emoji="🥴" />
+				<MkEmoji :normal="true" :no-style="true" emoji="🍮" />
+			</div>
+			<div class="main">
+				<img
+					:src="
+						$instance.iconUrl ||
+						$instance.faviconUrl ||
+						'/favicon.ico'
+					"
+					alt=""
+					class="icon"
+				/>
+				<button class="_button _acrylic menu" @click="showMenu">
+					<i class="ph-dots-three-outline ph-bold ph-lg"></i>
+				</button>
+				<div class="fg">
+					<h1>
+						<img
+							class="logo"
+							v-if="meta.logoImageUrl"
+							:src="meta.logoImageUrl"
+						/>
+						<span v-else class="text">{{ instanceName }}</span>
+					</h1>
+					<div class="about">
+						<div
+							class="desc"
+							v-html="meta.description || i18n.ts.headlineMisskey"
+						></div>
+					</div>
+					<div class="action">
+						<MkButton
+							inline
+							rounded
+							gradate
+							data-cy-signup
+							style="margin-right: 12px"
+							@click="signup()"
+							>{{ i18n.ts.signup }}</MkButton
+						>
+						<MkButton
+							inline
+							rounded
+							data-cy-signin
+							@click="signin()"
+							>{{ i18n.ts.login }}</MkButton
+						>
+						<MkButton
+							inline
+							rounded
+							style="margin-left: 12px; margin-top: 12px"
+							onclick="window.location.href='/explore'"
+							>Explore</MkButton
+						>
+					</div>
 				</div>
 			</div>
-		</div>
-		<div v-if="instances" class="federation">
-			<MarqueeText :duration="40">
-				<MkA v-for="instance in instances" :key="instance.id" :class="$style.federationInstance" @click="signup()">
-					<img v-if="instance.iconUrl" class="icon" :src="instance.iconUrl" alt=""/>
-					<span class="name _monospace">{{ instance.host }}</span>
-				</MkA>
-			</MarqueeText>
+			<div v-if="instances" class="federation">
+				<MarqueeText :duration="40">
+					<MkA
+						v-for="instance in instances"
+						:key="instance.id"
+						:class="$style.federationInstance"
+						@click="signup()"
+					>
+						<img
+							v-if="instance.iconUrl"
+							class="icon"
+							:src="instance.iconUrl"
+							alt=""
+						/>
+						<span class="name _monospace">{{ instance.host }}</span>
+					</MkA>
+				</MarqueeText>
+			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import { toUnicode } from 'punycode/';
-import XTimeline from './welcome.timeline.vue';
-import MarqueeText from '@/components/MkMarquee.vue';
-import XSigninDialog from '@/components/MkSigninDialog.vue';
-import XSignupDialog from '@/components/MkSignupDialog.vue';
-import MkButton from '@/components/MkButton.vue';
-import XNote from '@/components/MkNote.vue';
-import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
-import { host, instanceName } from '@/config';
-import * as os from '@/os';
-import number from '@/filters/number';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import { toUnicode } from "punycode/";
+import XTimeline from "./welcome.timeline.vue";
+import MarqueeText from "@/components/MkMarquee.vue";
+import XSigninDialog from "@/components/MkSigninDialog.vue";
+import XSignupDialog from "@/components/MkSignupDialog.vue";
+import MkButton from "@/components/MkButton.vue";
+import XNote from "@/components/MkNote.vue";
+import MkFeaturedPhotos from "@/components/MkFeaturedPhotos.vue";
+import { host, instanceName } from "@/config";
+import * as os from "@/os";
+import number from "@/filters/number";
+import { i18n } from "@/i18n";
 
 let meta = $ref();
 let stats = $ref();
@@ -70,58 +117,74 @@ let tags = $ref();
 let onlineUsersCount = $ref();
 let instances = $ref();
 
-os.api('meta', { detail: true }).then(_meta => {
+os.api("meta", { detail: true }).then((_meta) => {
 	meta = _meta;
 });
 
-os.api('stats').then(_stats => {
+os.api("stats").then((_stats) => {
 	stats = _stats;
 });
 
-os.api('get-online-users-count').then(res => {
+os.api("get-online-users-count").then((res) => {
 	onlineUsersCount = res.count;
 });
 
-os.api('hashtags/list', {
-	sort: '+mentionedLocalUsers',
+os.api("hashtags/list", {
+	sort: "+mentionedLocalUsers",
 	limit: 8,
-}).then(_tags => {
+}).then((_tags) => {
 	tags = _tags;
 });
 
-os.api('federation/instances', {
-	sort: '+pubSub',
+os.api("federation/instances", {
+	sort: "+pubSub",
 	limit: 20,
-}).then(_instances => {
+}).then((_instances) => {
 	instances = _instances;
 });
 
 function signin() {
-	os.popup(XSigninDialog, {
-		autoSet: true,
-	}, {}, 'closed');
+	os.popup(
+		XSigninDialog,
+		{
+			autoSet: true,
+		},
+		{},
+		"closed"
+	);
 }
 
 function signup() {
-	os.popup(XSignupDialog, {
-		autoSet: true,
-	}, {}, 'closed');
+	os.popup(
+		XSignupDialog,
+		{
+			autoSet: true,
+		},
+		{},
+		"closed"
+	);
 }
 
 function showMenu(ev) {
-	os.popupMenu([{
-		text: i18n.ts.instanceInfo,
-		icon: 'ph-info ph-bold ph-lg',
-		action: () => {
-			os.pageWindow('/about');
-		},
-	}, {
-		text: i18n.ts.aboutMisskey,
-		icon: 'ph-info ph-bold ph-lg',
-		action: () => {
-			os.pageWindow('/about-calckey');
-		},
-	}], ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts.instanceInfo,
+				icon: "ph-info ph-bold ph-lg",
+				action: () => {
+					os.pageWindow("/about");
+				},
+			},
+			{
+				text: i18n.ts.aboutMisskey,
+				icon: "ph-info ph-bold ph-lg",
+				action: () => {
+					os.pageWindow("/about-calckey");
+				},
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
 }
 </script>
 
@@ -151,8 +214,20 @@ function showMenu(ev) {
 			width: 500px;
 			height: calc(100% - 128px);
 			overflow: hidden;
-			-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);
-			mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);
+			-webkit-mask-image: linear-gradient(
+				0deg,
+				rgba(0, 0, 0, 0) 0%,
+				rgba(0, 0, 0, 1) 128px,
+				rgba(0, 0, 0, 1) calc(100% - 128px),
+				rgba(0, 0, 0, 0) 100%
+			);
+			mask-image: linear-gradient(
+				0deg,
+				rgba(0, 0, 0, 0) 0%,
+				rgba(0, 0, 0, 1) 128px,
+				rgba(0, 0, 0, 1) calc(100% - 128px),
+				rgba(0, 0, 0, 0) 100%
+			);
 
 			@media (max-width: 1200px) {
 				display: none;
diff --git a/packages/client/src/pages/welcome.entrance.b.vue b/packages/client/src/pages/welcome.entrance.b.vue
index 9dc9e14fc..82651aeda 100644
--- a/packages/client/src/pages/welcome.entrance.b.vue
+++ b/packages/client/src/pages/welcome.entrance.b.vue
@@ -1,52 +1,85 @@
 <template>
-<div v-if="meta" class="rsqzvsbo">
-	<div class="top">
-		<MkFeaturedPhotos class="bg"/>
-		<XTimeline class="tl"/>
-		<div class="shape"></div>
-		<div class="main">
-			<h1>
-				<img v-if="meta.logoImageUrl" class="logo" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span>
-			</h1>
-			<div class="about">
-				<div class="desc" v-html="meta.description || i18n.ts.headlineMisskey"></div>
-			</div>
-			<div class="action">
-				<MkButton class="signup" inline gradate @click="signup()">{{ i18n.ts.signup }}</MkButton>
-				<MkButton class="signin" inline @click="signin()">{{ i18n.ts.login }}</MkButton>
-			</div>
-			<div v-if="onlineUsersCount && stats" class="status">
-				<div>
-					<I18n :src="i18n.ts.nUsers" text-tag="span" class="users">
-						<template #n><b>{{ number(stats.originalUsersCount) }}</b></template>
-					</I18n>
-					<I18n :src="i18n.ts.nNotes" text-tag="span" class="notes">
-						<template #n><b>{{ number(stats.originalNotesCount) }}</b></template>
+	<div v-if="meta" class="rsqzvsbo">
+		<div class="top">
+			<MkFeaturedPhotos class="bg" />
+			<XTimeline class="tl" />
+			<div class="shape"></div>
+			<div class="main">
+				<h1>
+					<img
+						v-if="meta.logoImageUrl"
+						class="logo"
+						:src="meta.logoImageUrl"
+					/><span v-else class="text">{{ instanceName }}</span>
+				</h1>
+				<div class="about">
+					<div
+						class="desc"
+						v-html="meta.description || i18n.ts.headlineMisskey"
+					></div>
+				</div>
+				<div class="action">
+					<MkButton class="signup" inline gradate @click="signup()">{{
+						i18n.ts.signup
+					}}</MkButton>
+					<MkButton class="signin" inline @click="signin()">{{
+						i18n.ts.login
+					}}</MkButton>
+				</div>
+				<div v-if="onlineUsersCount && stats" class="status">
+					<div>
+						<I18n
+							:src="i18n.ts.nUsers"
+							text-tag="span"
+							class="users"
+						>
+							<template #n
+								><b>{{
+									number(stats.originalUsersCount)
+								}}</b></template
+							>
+						</I18n>
+						<I18n
+							:src="i18n.ts.nNotes"
+							text-tag="span"
+							class="notes"
+						>
+							<template #n
+								><b>{{
+									number(stats.originalNotesCount)
+								}}</b></template
+							>
+						</I18n>
+					</div>
+					<I18n
+						:src="i18n.ts.onlineUsersCount"
+						text-tag="span"
+						class="online"
+					>
+						<template #n
+							><b>{{ onlineUsersCount }}</b></template
+						>
 					</I18n>
 				</div>
-				<I18n :src="i18n.ts.onlineUsersCount" text-tag="span" class="online">
-					<template #n><b>{{ onlineUsersCount }}</b></template>
-				</I18n>
 			</div>
+			<img src="/client-assets/misskey.svg" class="misskey" />
 		</div>
-		<img src="/client-assets/misskey.svg" class="misskey"/>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import { toUnicode } from 'punycode/';
-import XSigninDialog from '@/components/MkSigninDialog.vue';
-import XSignupDialog from '@/components/MkSignupDialog.vue';
-import MkButton from '@/components/MkButton.vue';
-import XNote from '@/components/MkNote.vue';
-import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
-import XTimeline from './welcome.timeline.vue';
-import { host, instanceName } from '@/config';
-import * as os from '@/os';
-import number from '@/filters/number';
-import { i18n } from '@/i18n';
+import { defineComponent } from "vue";
+import { toUnicode } from "punycode/";
+import XSigninDialog from "@/components/MkSigninDialog.vue";
+import XSignupDialog from "@/components/MkSignupDialog.vue";
+import MkButton from "@/components/MkButton.vue";
+import XNote from "@/components/MkNote.vue";
+import MkFeaturedPhotos from "@/components/MkFeaturedPhotos.vue";
+import XTimeline from "./welcome.timeline.vue";
+import { host, instanceName } from "@/config";
+import * as os from "@/os";
+import number from "@/filters/number";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
@@ -69,63 +102,84 @@ export default defineComponent({
 	},
 
 	created() {
-		os.api('meta', { detail: true }).then(meta => {
+		os.api("meta", { detail: true }).then((meta) => {
 			this.meta = meta;
 		});
 
-		os.api('stats').then(stats => {
+		os.api("stats").then((stats) => {
 			this.stats = stats;
 		});
 
-		os.api('get-online-users-count').then(res => {
+		os.api("get-online-users-count").then((res) => {
 			this.onlineUsersCount = res.count;
 		});
 
-		os.api('hashtags/list', {
-			sort: '+mentionedLocalUsers',
-			limit: 8
-		}).then(tags => {
+		os.api("hashtags/list", {
+			sort: "+mentionedLocalUsers",
+			limit: 8,
+		}).then((tags) => {
 			this.tags = tags;
 		});
 	},
 
 	methods: {
 		signin() {
-			os.popup(XSigninDialog, {
-				autoSet: true
-			}, {}, 'closed');
+			os.popup(
+				XSigninDialog,
+				{
+					autoSet: true,
+				},
+				{},
+				"closed"
+			);
 		},
 
 		signup() {
-			os.popup(XSignupDialog, {
-				autoSet: true
-			}, {}, 'closed');
+			os.popup(
+				XSignupDialog,
+				{
+					autoSet: true,
+				},
+				{},
+				"closed"
+			);
 		},
 
 		showMenu(ev) {
-			os.popupMenu([{
-				text: i18n.t('aboutX', { x: instanceName }),
-				icon: 'ph-info ph-bold ph-lg',
-				action: () => {
-					os.pageWindow('/about');
-				}
-			}, {
-				text: i18n.ts.aboutMisskey,
-				icon: 'ph-info ph-bold ph-lg',
-				action: () => {
-					os.pageWindow('/about-calckey');
-				}
-			}, null, {
-				text: i18n.ts.help,
-				icon: 'ph-question ph-bold ph-lg',
-				action: () => {
-					window.open(`https://misskey-hub.net/help.md`, '_blank');
-				}
-			}], ev.currentTarget ?? ev.target);
+			os.popupMenu(
+				[
+					{
+						text: i18n.t("aboutX", { x: instanceName }),
+						icon: "ph-info ph-bold ph-lg",
+						action: () => {
+							os.pageWindow("/about");
+						},
+					},
+					{
+						text: i18n.ts.aboutMisskey,
+						icon: "ph-info ph-bold ph-lg",
+						action: () => {
+							os.pageWindow("/about-calckey");
+						},
+					},
+					null,
+					{
+						text: i18n.ts.help,
+						icon: "ph-question ph-bold ph-lg",
+						action: () => {
+							window.open(
+								`https://misskey-hub.net/help.md`,
+								"_blank"
+							);
+						},
+					},
+				],
+				ev.currentTarget ?? ev.target
+			);
 		},
 
-		number
-	}
+		number,
+	},
 });
 </script>
 
@@ -152,8 +206,20 @@ export default defineComponent({
 			width: 500px;
 			height: calc(100% - 128px);
 			overflow: hidden;
-			-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);
-			mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);
+			-webkit-mask-image: linear-gradient(
+				0deg,
+				rgba(0, 0, 0, 0) 0%,
+				rgba(0, 0, 0, 1) 128px,
+				rgba(0, 0, 0, 1) calc(100% - 128px),
+				rgba(0, 0, 0, 0) 100%
+			);
+			mask-image: linear-gradient(
+				0deg,
+				rgba(0, 0, 0, 0) 0%,
+				rgba(0, 0, 0, 1) 128px,
+				rgba(0, 0, 0, 1) calc(100% - 128px),
+				rgba(0, 0, 0, 0) 100%
+			);
 		}
 
 		> .shape {
diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue
index 635bd9e55..69c1d5142 100644
--- a/packages/client/src/pages/welcome.entrance.c.vue
+++ b/packages/client/src/pages/welcome.entrance.c.vue
@@ -1,72 +1,111 @@
 <template>
-<div v-if="meta" class="rsqzvsbo">
-	<div class="top">
-		<MkFeaturedPhotos class="bg"/>
-		<div class="fade"></div>
-		<div class="emojis">
-			<MkEmoji :normal="true" :no-style="true" emoji="👍"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="❤"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="😆"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="🎉"/>
-			<MkEmoji :normal="true" :no-style="true" emoji="🍮"/>
-		</div>
-		<div class="main">
-			<img src="/client-assets/misskey.svg" class="misskey"/>
-			<div class="form _panel">
-				<div class="bg">
-					<div class="fade"></div>
-				</div>
-				<div class="fg">
-					<h1>
-						<img v-if="meta.logoImageUrl" class="logo" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span>
-					</h1>
-					<div class="about">
-						<div class="desc" v-html="meta.description || i18n.ts.headlineMisskey"></div>
+	<div v-if="meta" class="rsqzvsbo">
+		<div class="top">
+			<MkFeaturedPhotos class="bg" />
+			<div class="fade"></div>
+			<div class="emojis">
+				<MkEmoji :normal="true" :no-style="true" emoji="👍" />
+				<MkEmoji :normal="true" :no-style="true" emoji="❤" />
+				<MkEmoji :normal="true" :no-style="true" emoji="😆" />
+				<MkEmoji :normal="true" :no-style="true" emoji="🎉" />
+				<MkEmoji :normal="true" :no-style="true" emoji="🍮" />
+			</div>
+			<div class="main">
+				<img src="/client-assets/misskey.svg" class="misskey" />
+				<div class="form _panel">
+					<div class="bg">
+						<div class="fade"></div>
 					</div>
-					<div class="action">
-						<MkButton inline gradate @click="signup()">{{ i18n.ts.signup }}</MkButton>
-						<MkButton inline @click="signin()">{{ i18n.ts.login }}</MkButton>
-					</div>
-					<div v-if="onlineUsersCount && stats" class="status">
-						<div>
-							<I18n :src="i18n.ts.nUsers" text-tag="span" class="users">
-								<template #n><b>{{ number(stats.originalUsersCount) }}</b></template>
-							</I18n>
-							<I18n :src="i18n.ts.nNotes" text-tag="span" class="notes">
-								<template #n><b>{{ number(stats.originalNotesCount) }}</b></template>
+					<div class="fg">
+						<h1>
+							<img
+								v-if="meta.logoImageUrl"
+								class="logo"
+								:src="meta.logoImageUrl"
+							/><span v-else class="text">{{
+								instanceName
+							}}</span>
+						</h1>
+						<div class="about">
+							<div
+								class="desc"
+								v-html="
+									meta.description || i18n.ts.headlineMisskey
+								"
+							></div>
+						</div>
+						<div class="action">
+							<MkButton inline gradate @click="signup()">{{
+								i18n.ts.signup
+							}}</MkButton>
+							<MkButton inline @click="signin()">{{
+								i18n.ts.login
+							}}</MkButton>
+						</div>
+						<div v-if="onlineUsersCount && stats" class="status">
+							<div>
+								<I18n
+									:src="i18n.ts.nUsers"
+									text-tag="span"
+									class="users"
+								>
+									<template #n
+										><b>{{
+											number(stats.originalUsersCount)
+										}}</b></template
+									>
+								</I18n>
+								<I18n
+									:src="i18n.ts.nNotes"
+									text-tag="span"
+									class="notes"
+								>
+									<template #n
+										><b>{{
+											number(stats.originalNotesCount)
+										}}</b></template
+									>
+								</I18n>
+							</div>
+							<I18n
+								:src="i18n.ts.onlineUsersCount"
+								text-tag="span"
+								class="online"
+							>
+								<template #n
+									><b>{{ onlineUsersCount }}</b></template
+								>
 							</I18n>
 						</div>
-						<I18n :src="i18n.ts.onlineUsersCount" text-tag="span" class="online">
-							<template #n><b>{{ onlineUsersCount }}</b></template>
-						</I18n>
+						<button class="_button _acrylic menu" @click="showMenu">
+							<i class="ph-dots-three-outline ph-bold ph-lg"></i>
+						</button>
 					</div>
-					<button class="_button _acrylic menu" @click="showMenu"><i class="ph-dots-three-outline ph-bold ph-lg"></i></button>
 				</div>
+				<nav class="nav">
+					<MkA to="/announcements">{{ i18n.ts.announcements }}</MkA>
+					<MkA to="/explore">{{ i18n.ts.explore }}</MkA>
+					<MkA to="/channels">{{ i18n.ts.channel }}</MkA>
+					<MkA to="/featured">{{ i18n.ts.featured }}</MkA>
+				</nav>
 			</div>
-			<nav class="nav">
-				<MkA to="/announcements">{{ i18n.ts.announcements }}</MkA>
-				<MkA to="/explore">{{ i18n.ts.explore }}</MkA>
-				<MkA to="/channels">{{ i18n.ts.channel }}</MkA>
-				<MkA to="/featured">{{ i18n.ts.featured }}</MkA>
-			</nav>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import { toUnicode } from 'punycode/';
-import XTimeline from './welcome.timeline.vue';
-import XSigninDialog from '@/components/MkSigninDialog.vue';
-import XSignupDialog from '@/components/MkSignupDialog.vue';
-import MkButton from '@/components/MkButton.vue';
-import XNote from '@/components/MkNote.vue';
-import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
-import { host, instanceName } from '@/config';
-import * as os from '@/os';
-import number from '@/filters/number';
-import { i18n } from '@/i18n';
+import { defineComponent } from "vue";
+import { toUnicode } from "punycode/";
+import XTimeline from "./welcome.timeline.vue";
+import XSigninDialog from "@/components/MkSigninDialog.vue";
+import XSignupDialog from "@/components/MkSignupDialog.vue";
+import MkButton from "@/components/MkButton.vue";
+import XNote from "@/components/MkNote.vue";
+import MkFeaturedPhotos from "@/components/MkFeaturedPhotos.vue";
+import { host, instanceName } from "@/config";
+import * as os from "@/os";
+import number from "@/filters/number";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
@@ -89,53 +128,69 @@ export default defineComponent({
 	},
 
 	created() {
-		os.api('meta', { detail: true }).then(meta => {
+		os.api("meta", { detail: true }).then((meta) => {
 			this.meta = meta;
 		});
 
-		os.api('stats').then(stats => {
+		os.api("stats").then((stats) => {
 			this.stats = stats;
 		});
 
-		os.api('get-online-users-count').then(res => {
+		os.api("get-online-users-count").then((res) => {
 			this.onlineUsersCount = res.count;
 		});
 
-		os.api('hashtags/list', {
-			sort: '+mentionedLocalUsers',
+		os.api("hashtags/list", {
+			sort: "+mentionedLocalUsers",
 			limit: 8,
-		}).then(tags => {
+		}).then((tags) => {
 			this.tags = tags;
 		});
 	},
 
 	methods: {
 		signin() {
-			os.popup(XSigninDialog, {
-				autoSet: true,
-			}, {}, 'closed');
+			os.popup(
+				XSigninDialog,
+				{
+					autoSet: true,
+				},
+				{},
+				"closed"
+			);
 		},
 
 		signup() {
-			os.popup(XSignupDialog, {
-				autoSet: true,
-			}, {}, 'closed');
+			os.popup(
+				XSignupDialog,
+				{
+					autoSet: true,
+				},
+				{},
+				"closed"
+			);
 		},
 
 		showMenu(ev) {
-			os.popupMenu([{
-				text: i18n.t('aboutX', { x: instanceName }),
-				icon: 'ph-info ph-bold ph-lg',
-				action: () => {
-					os.pageWindow('/about');
-				},
-			}, {
-				text: i18n.ts.aboutMisskey,
-				icon: 'ph-info ph-bold ph-lg',
-				action: () => {
-					os.pageWindow('/about-calckey');
-				},
-			}], ev.currentTarget ?? ev.target);
+			os.popupMenu(
+				[
+					{
+						text: i18n.t("aboutX", { x: instanceName }),
+						icon: "ph-info ph-bold ph-lg",
+						action: () => {
+							os.pageWindow("/about");
+						},
+					},
+					{
+						text: i18n.ts.aboutMisskey,
+						icon: "ph-info ph-bold ph-lg",
+						action: () => {
+							os.pageWindow("/about-calckey");
+						},
+					},
+				],
+				ev.currentTarget ?? ev.target
+			);
 		},
 		number,
 	},
@@ -216,7 +271,11 @@ export default defineComponent({
 						left: 0;
 						width: 100%;
 						height: 128px;
-						background: linear-gradient(0deg, var(--panel), var(--X15));
+						background: linear-gradient(
+							0deg,
+							var(--panel),
+							var(--X15)
+						);
 					}
 				}
 
diff --git a/packages/client/src/pages/welcome.setup.vue b/packages/client/src/pages/welcome.setup.vue
index bc89a0860..97008e204 100644
--- a/packages/client/src/pages/welcome.setup.vue
+++ b/packages/client/src/pages/welcome.setup.vue
@@ -1,63 +1,85 @@
 <template>
-<form class="mk-setup" @submit.prevent="submit()">
-	<h1>Welcome to Calckey!</h1>
-	<div class="_formRoot">
-		<p>{{ i18n.ts.intro }}</p>
-		<MkInput v-model="username" pattern="^[a-zA-Z0-9_]{1,20}$" :spellcheck="false" required data-cy-admin-username class="_formBlock">
-			<template #label>{{ i18n.ts.username }}</template>
-			<template #prefix>@</template>
-			<template #suffix>@{{ host }}</template>
-		</MkInput>
-		<MkInput v-model="password" type="password" data-cy-admin-password class="_formBlock">
-			<template #label>{{ i18n.ts.password }}</template>
-			<template #prefix><i class="ph-lock ph-bold ph-lg"></i></template>
-		</MkInput>
-		<div class="bottom _formBlock">
-			<MkButton gradate type="submit" :disabled="submitting" data-cy-admin-ok>
-				{{ submitting ? i18n.ts.processing : i18n.ts.done }}<MkEllipsis v-if="submitting"/>
-			</MkButton>
+	<form class="mk-setup" @submit.prevent="submit()">
+		<h1>Welcome to Calckey!</h1>
+		<div class="_formRoot">
+			<p>{{ i18n.ts.intro }}</p>
+			<MkInput
+				v-model="username"
+				pattern="^[a-zA-Z0-9_]{1,20}$"
+				:spellcheck="false"
+				required
+				data-cy-admin-username
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.username }}</template>
+				<template #prefix>@</template>
+				<template #suffix>@{{ host }}</template>
+			</MkInput>
+			<MkInput
+				v-model="password"
+				type="password"
+				data-cy-admin-password
+				class="_formBlock"
+			>
+				<template #label>{{ i18n.ts.password }}</template>
+				<template #prefix
+					><i class="ph-lock ph-bold ph-lg"></i
+				></template>
+			</MkInput>
+			<div class="bottom _formBlock">
+				<MkButton
+					gradate
+					type="submit"
+					:disabled="submitting"
+					data-cy-admin-ok
+				>
+					{{ submitting ? i18n.ts.processing : i18n.ts.done
+					}}<MkEllipsis v-if="submitting" />
+				</MkButton>
+			</div>
 		</div>
-	</div>
-</form>
+	</form>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInput from '@/components/form/input.vue';
-import { host } from '@/config';
-import * as os from '@/os';
-import { login } from '@/account';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import MkButton from "@/components/MkButton.vue";
+import MkInput from "@/components/form/input.vue";
+import { host } from "@/config";
+import * as os from "@/os";
+import { login } from "@/account";
+import { i18n } from "@/i18n";
 
-let username = $ref('');
-let password = $ref('');
+let username = $ref("");
+let password = $ref("");
 let submitting = $ref(false);
 
 function submit() {
 	if (submitting) return;
 	submitting = true;
-	os.api('admin/accounts/create', {
+	os.api("admin/accounts/create", {
 		username: username,
 		password: password,
-	}).then(res => {
-		os.api('admin/accounts/hosted').then(res => {
-			if (res != null && res === true) {
-				os.alert({
-					type: 'success',
-					title: 'Thank you!',
-					text: 'Your hosting provider has set your settings for you. Enjoy your new instance!',
-				});
-			}
+	})
+		.then((res) => {
+			os.api("admin/accounts/hosted").then((res) => {
+				if (res != null && res === true) {
+					os.alert({
+						type: "success",
+						title: "Thank you!",
+						text: "Your hosting provider has set your settings for you. Enjoy your new instance!",
+					});
+				}
+			});
+			return login(res?.token);
+		})
+		.catch(() => {
+			submitting = false;
+			os.alert({
+				type: "error",
+				text: i18n.ts.somethingHappened,
+			});
 		});
-		return login(res?.token);
-	}).catch(() => {
-		submitting = false;
-		os.alert({
-			type: 'error',
-			text: i18n.ts.somethingHappened,
-		});
-	});
 }
 </script>
 
diff --git a/packages/client/src/pages/welcome.timeline.vue b/packages/client/src/pages/welcome.timeline.vue
index 220a8edde..f90976bf2 100644
--- a/packages/client/src/pages/welcome.timeline.vue
+++ b/packages/client/src/pages/welcome.timeline.vue
@@ -1,38 +1,53 @@
 <template>
-<div class="civpbkhh">
-	<div ref="scroll" class="scrollbox" v-bind:class="{ scroll: isScrolling }">
-		<div v-for="note in notes" class="note">
-			<div class="content _panel">
-				<div class="body">
-					<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left ph-bold ph-lg"></i></MkA>
-					<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
-					<!-- <MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA> -->
-				</div>
-				<div v-if="note.files.length > 0" class="richcontent">
-					<XMediaList :media-list="note.files"/>
-				</div>
-				<div v-if="note.poll">
-					<XPoll :note="note" :readOnly="true"/>
+	<div class="civpbkhh">
+		<div
+			ref="scroll"
+			class="scrollbox"
+			v-bind:class="{ scroll: isScrolling }"
+		>
+			<div v-for="note in notes" class="note">
+				<div class="content _panel">
+					<div class="body">
+						<MkA
+							v-if="note.replyId"
+							class="reply"
+							:to="`/notes/${note.replyId}`"
+							><i class="ph-arrow-bend-up-left ph-bold ph-lg"></i
+						></MkA>
+						<Mfm
+							v-if="note.text"
+							:text="note.text"
+							:author="note.user"
+							:i="$i"
+							:custom-emojis="note.emojis"
+						/>
+						<!-- <MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA> -->
+					</div>
+					<div v-if="note.files.length > 0" class="richcontent">
+						<XMediaList :media-list="note.files" />
+					</div>
+					<div v-if="note.poll">
+						<XPoll :note="note" :readOnly="true" />
+					</div>
 				</div>
+				<XReactionsViewer ref="reactionsViewer" :note="note" />
 			</div>
-			<XReactionsViewer ref="reactionsViewer" :note="note"/>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import XReactionsViewer from '@/components/MkReactionsViewer.vue';
-import XMediaList from '@/components/MkMediaList.vue';
-import XPoll from '@/components/MkPoll.vue';
-import * as os from '@/os';
+import { defineComponent } from "vue";
+import XReactionsViewer from "@/components/MkReactionsViewer.vue";
+import XMediaList from "@/components/MkMediaList.vue";
+import XPoll from "@/components/MkPoll.vue";
+import * as os from "@/os";
 
 export default defineComponent({
 	components: {
 		XReactionsViewer,
 		XMediaList,
-		XPoll
+		XPoll,
 	},
 
 	data() {
@@ -43,7 +58,7 @@ export default defineComponent({
 	},
 
 	created() {
-		os.api('notes/featured').then(notes => {
+		os.api("notes/featured").then((notes) => {
 			this.notes = notes;
 		});
 	},
@@ -52,7 +67,7 @@ export default defineComponent({
 		if (this.$refs.scroll.clientHeight > window.innerHeight) {
 			this.isScrolling = true;
 		}
-	}
+	},
 });
 </script>
 
diff --git a/packages/client/src/pages/welcome.vue b/packages/client/src/pages/welcome.vue
index a1c3fc2ab..564c6d13a 100644
--- a/packages/client/src/pages/welcome.vue
+++ b/packages/client/src/pages/welcome.vue
@@ -1,21 +1,21 @@
 <template>
-<div v-if="meta">
-	<XSetup v-if="meta.requireSetup"/>
-	<XEntrance v-else/>
-</div>
+	<div v-if="meta">
+		<XSetup v-if="meta.requireSetup" />
+		<XEntrance v-else />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import XSetup from './welcome.setup.vue';
-import XEntrance from './welcome.entrance.a.vue';
-import { instanceName } from '@/config';
-import * as os from '@/os';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import { computed } from "vue";
+import XSetup from "./welcome.setup.vue";
+import XEntrance from "./welcome.entrance.a.vue";
+import { instanceName } from "@/config";
+import * as os from "@/os";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
 let meta = $ref(null);
 
-os.api('meta', { detail: true }).then(res => {
+os.api("meta", { detail: true }).then((res) => {
 	meta = res;
 });
 
@@ -23,8 +23,10 @@ const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
-definePageMetadata(computed(() => ({
-	title: instanceName,
-	icon: null,
-})));
+definePageMetadata(
+	computed(() => ({
+		title: instanceName,
+		icon: null,
+	}))
+);
 </script>
diff --git a/packages/client/src/ui/_common_/common.vue b/packages/client/src/ui/_common_/common.vue
index 38ad0591b..c47b0f85e 100644
--- a/packages/client/src/ui/_common_/common.vue
+++ b/packages/client/src/ui/_common_/common.vue
@@ -1,57 +1,66 @@
 <template>
-<component
-	:is="popup.component"
-	v-for="popup in popups"
-	:key="popup.id"
-	v-bind="popup.props"
-	v-on="popup.events"
-/>
+	<component
+		:is="popup.component"
+		v-for="popup in popups"
+		:key="popup.id"
+		v-bind="popup.props"
+		v-on="popup.events"
+	/>
 
-<XUpload v-if="uploads.length > 0"/>
+	<XUpload v-if="uploads.length > 0" />
 
-<XStreamIndicator/>
+	<XStreamIndicator />
 
-<!-- <div v-if="pendingApiRequestsCount > 0" id="wait"></div> -->
+	<!-- <div v-if="pendingApiRequestsCount > 0" id="wait"></div> -->
 
-<div v-if="dev" id="devTicker"><span>DEV BUILD</span></div>
+	<div v-if="dev" id="devTicker"><span>DEV BUILD</span></div>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent } from 'vue';
-import { swInject } from './sw-inject';
-import { popup, popups, pendingApiRequestsCount } from '@/os';
-import { uploads } from '@/scripts/upload';
-import * as sound from '@/scripts/sound';
-import { $i } from '@/account';
-import { stream } from '@/stream';
+import { defineAsyncComponent } from "vue";
+import { swInject } from "./sw-inject";
+import { popup, popups, pendingApiRequestsCount } from "@/os";
+import { uploads } from "@/scripts/upload";
+import * as sound from "@/scripts/sound";
+import { $i } from "@/account";
+import { stream } from "@/stream";
 
-const XStreamIndicator = defineAsyncComponent(() => import('./stream-indicator.vue'));
-const XUpload = defineAsyncComponent(() => import('./upload.vue'));
+const XStreamIndicator = defineAsyncComponent(
+	() => import("./stream-indicator.vue")
+);
+const XUpload = defineAsyncComponent(() => import("./upload.vue"));
 
 const dev = _DEV_;
 
-const onNotification = notification => {
+const onNotification = (notification) => {
 	if ($i.mutingNotificationTypes.includes(notification.type)) return;
 
-	if (document.visibilityState === 'visible') {
-		stream.send('readNotification', {
+	if (document.visibilityState === "visible") {
+		stream.send("readNotification", {
 			id: notification.id,
 		});
 
-		popup(defineAsyncComponent(() => import('@/components/MkNotificationToast.vue')), {
-			notification,
-		}, {}, 'closed');
+		popup(
+			defineAsyncComponent(
+				() => import("@/components/MkNotificationToast.vue")
+			),
+			{
+				notification,
+			},
+			{},
+			"closed"
+		);
 	}
 
-	sound.play('notification');
+	sound.play("notification");
 };
 
 if ($i) {
-	const connection = stream.useChannel('main', null, 'UI');
-	connection.on('notification', onNotification);
+	const connection = stream.useChannel("main", null, "UI");
+	connection.on("notification", onNotification);
 
 	//#region Listen message from SW
-	if ('serviceWorker' in navigator) {
+	if ("serviceWorker" in navigator) {
 		swInject();
 	}
 }
@@ -59,9 +68,15 @@ if ($i) {
 
 <style lang="scss">
 @keyframes dev-ticker-blink {
-	0% { opacity: 1; }
-	50% { opacity: 0; }
-	100% { opacity: 1; }
+	0% {
+		opacity: 1;
+	}
+	50% {
+		opacity: 0;
+	}
+	100% {
+		opacity: 1;
+	}
 }
 
 @keyframes progress-spinner {
diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue
index 71bf05b66..43c91d147 100644
--- a/packages/client/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue
@@ -1,57 +1,138 @@
 <template>
-<div class="kmwsukvl">
-	<div class="body">
-		<div class="top">
-			<div class="banner" :user="$i" :style="{ backgroundImage: `url(${ $i.bannerUrl })` }"></div>
-			<button v-click-anime v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="item _button account" @click="openAccountMenu">
-				<MkAvatar :user="$i" class="icon"/><!-- <MkAcct class="text" :user="$i"/> -->
-			</button>
-		</div>
-		<div class="middle">
-			<MkA v-click-anime class="item index" active-class="active" to="/" exact>
-				<i class="icon ph-house ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.timeline }}</span>
-			</MkA>
-			<template v-for="item in menu">
-				<div v-if="item === '-'" class="divider"></div>
-				<component :is="navbarItemDef[item].to ? 'MkA' : 'button'" v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)" v-click-anime class="item _button" :class="[item, { active: navbarItemDef[item].active }]" active-class="active" :to="navbarItemDef[item].to" v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}">
-					<i class="icon ph-fw ph-lg" :class="navbarItemDef[item].icon"></i><span class="text">{{ i18n.ts[navbarItemDef[item].title] }}</span>
-					<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="icon ph-circle ph-fill"></i></span>
-				</component>
-			</template>
-			<div class="divider"></div>
-			<MkA v-if="$i.isAdmin || $i.isModerator" v-click-anime class="item" active-class="active" to="/admin">
-				<i class="icon ph-door ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
-			</MkA>
-			<button v-click-anime class="item _button" @click="more">
-				<i class="icon ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
-				<span v-if="otherMenuItemIndicated" class="indicator"><i class="icon ph-circle ph-fill"></i></span>
-			</button>
-			<MkA v-click-anime class="item" active-class="active" to="/settings">
-				<i class="icon ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
-			</MkA>
-		</div>
-		<div class="bottom">
-			<button class="item _button post" data-cy-open-post-form @click="os.post">
-				<i class="icon ph-pencil ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.note }}</span>
-			</button>
-			<button v-tooltip.noDelay.right="i18n.ts.help" class="item _button help" @click="openHelpMenu">
-				<i class="help icon ph-info ph-bold ph-xl ph-fw"></i>
-			</button>
+	<div class="kmwsukvl">
+		<div class="body">
+			<div class="top">
+				<div
+					class="banner"
+					:user="$i"
+					:style="{ backgroundImage: `url(${$i.bannerUrl})` }"
+				></div>
+				<button
+					v-click-anime
+					v-tooltip.noDelay.right="
+						`${i18n.ts.account}: @${$i.username}`
+					"
+					class="item _button account"
+					@click="openAccountMenu"
+				>
+					<MkAvatar
+						:user="$i"
+						class="icon"
+					/><!-- <MkAcct class="text" :user="$i"/> -->
+				</button>
+			</div>
+			<div class="middle">
+				<MkA
+					v-click-anime
+					class="item index"
+					active-class="active"
+					to="/"
+					exact
+				>
+					<i class="icon ph-house ph-bold ph-lg ph-fw ph-lg"></i
+					><span class="text">{{ i18n.ts.timeline }}</span>
+				</MkA>
+				<template v-for="item in menu">
+					<div v-if="item === '-'" class="divider"></div>
+					<component
+						:is="navbarItemDef[item].to ? 'MkA' : 'button'"
+						v-else-if="
+							navbarItemDef[item] &&
+							navbarItemDef[item].show !== false
+						"
+						v-click-anime
+						class="item _button"
+						:class="[item, { active: navbarItemDef[item].active }]"
+						active-class="active"
+						:to="navbarItemDef[item].to"
+						v-on="
+							navbarItemDef[item].action
+								? { click: navbarItemDef[item].action }
+								: {}
+						"
+					>
+						<i
+							class="icon ph-fw ph-lg"
+							:class="navbarItemDef[item].icon"
+						></i
+						><span class="text">{{
+							i18n.ts[navbarItemDef[item].title]
+						}}</span>
+						<span
+							v-if="navbarItemDef[item].indicated"
+							class="indicator"
+							><i class="icon ph-circle ph-fill"></i
+						></span>
+					</component>
+				</template>
+				<div class="divider"></div>
+				<MkA
+					v-if="$i.isAdmin || $i.isModerator"
+					v-click-anime
+					class="item"
+					active-class="active"
+					to="/admin"
+				>
+					<i class="icon ph-door ph-bold ph-lg ph-fw ph-lg"></i
+					><span class="text">{{ i18n.ts.controlPanel }}</span>
+				</MkA>
+				<button v-click-anime class="item _button" @click="more">
+					<i
+						class="icon ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"
+					></i
+					><span class="text">{{ i18n.ts.more }}</span>
+					<span v-if="otherMenuItemIndicated" class="indicator"
+						><i class="icon ph-circle ph-fill"></i
+					></span>
+				</button>
+				<MkA
+					v-click-anime
+					class="item"
+					active-class="active"
+					to="/settings"
+				>
+					<i class="icon ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i
+					><span class="text">{{ i18n.ts.settings }}</span>
+				</MkA>
+			</div>
+			<div class="bottom">
+				<button
+					class="item _button post"
+					data-cy-open-post-form
+					@click="os.post"
+				>
+					<i class="icon ph-pencil ph-bold ph-lg ph-fw ph-lg"></i
+					><span class="text">{{ i18n.ts.note }}</span>
+				</button>
+				<button
+					v-tooltip.noDelay.right="i18n.ts.help"
+					class="item _button help"
+					@click="openHelpMenu"
+				>
+					<i class="help icon ph-info ph-bold ph-xl ph-fw"></i>
+				</button>
+			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, defineComponent, ref, toRef, watch } from 'vue';
-import * as os from '@/os';
-import { navbarItemDef } from '@/navbar';
-import { openAccountMenu as openAccountMenu_ } from '@/account';
-import { openHelpMenu_ } from '@/scripts/helpMenu'
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
+import {
+	computed,
+	defineAsyncComponent,
+	defineComponent,
+	ref,
+	toRef,
+	watch,
+} from "vue";
+import * as os from "@/os";
+import { navbarItemDef } from "@/navbar";
+import { openAccountMenu as openAccountMenu_ } from "@/account";
+import { openHelpMenu_ } from "@/scripts/helpMenu";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
 
-const menu = toRef(defaultStore.state, 'menu');
+const menu = toRef(defaultStore.state, "menu");
 const otherMenuItemIndicated = computed(() => {
 	for (const def in navbarItemDef) {
 		if (menu.value.includes(def)) continue;
@@ -61,9 +142,12 @@ const otherMenuItemIndicated = computed(() => {
 });
 
 function openAccountMenu(ev: MouseEvent) {
-	openAccountMenu_({
-		withExtraOperation: true,
-	}, ev);
+	openAccountMenu_(
+		{
+			withExtraOperation: true,
+		},
+		ev
+	);
 }
 
 function openHelpMenu(ev: MouseEvent) {
@@ -71,8 +155,12 @@ function openHelpMenu(ev: MouseEvent) {
 }
 
 function more() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {}, {
-	}, 'closed');
+	os.popup(
+		defineAsyncComponent(() => import("@/components/MkLaunchPad.vue")),
+		{},
+		{},
+		"closed"
+	);
 }
 </script>
 
@@ -99,8 +187,16 @@ function more() {
 				height: 100%;
 				background-size: cover;
 				background-position: center center;
-				-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 15%, rgba(0,0,0,0.75) 100%);
-				mask-image: linear-gradient(0deg, rgba(0,0,0,0) 15%, rgba(0,0,0,0.75) 100%);
+				-webkit-mask-image: linear-gradient(
+					0deg,
+					rgba(0, 0, 0, 0) 15%,
+					rgba(0, 0, 0, 0.75) 100%
+				);
+				mask-image: linear-gradient(
+					0deg,
+					rgba(0, 0, 0, 0) 15%,
+					rgba(0, 0, 0, 0.75) 100%
+				);
 			}
 
 			> .account {
@@ -147,10 +243,15 @@ function more() {
 					right: 0;
 					bottom: 0;
 					border-radius: 999px;
-					background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
+					background: linear-gradient(
+						90deg,
+						var(--buttonGradateA),
+						var(--buttonGradateB)
+					);
 				}
 
-				&:hover, &.active {
+				&:hover,
+				&.active {
 					&:before {
 						background: var(--accentLighten);
 					}
@@ -169,19 +270,19 @@ function more() {
 			}
 
 			> .help {
-					position: relative;
-					display: block;
-					text-align: center;
-					width: 100%;
-					margin-top: 1rem;
-					color: var(--navFg);
+				position: relative;
+				display: block;
+				text-align: center;
+				width: 100%;
+				margin-top: 1rem;
+				color: var(--navFg);
 
-					> .icon {
-						display: inline-block;
-						width: 38px;
-						aspect-ratio: 1;
-					}
+				> .icon {
+					display: inline-block;
+					width: 38px;
+					aspect-ratio: 1;
 				}
+			}
 
 			> .instance {
 				position: relative;
@@ -256,7 +357,8 @@ function more() {
 					color: var(--navActive);
 				}
 
-				&:hover, &.active {
+				&:hover,
+				&.active {
 					&:before {
 						content: "";
 						display: block;
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 589868699..023b4d493 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -1,75 +1,156 @@
 <template>
-<div class="mvcprjjd" :class="{ iconOnly }">
-	<div class="body">
-		<div class="top">
-			<div class="banner" :user="$i" :style="{ backgroundImage: `url(${ $i.bannerUrl })` }"></div>
-			<button v-click-anime v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="item _button account" @click="openAccountMenu">
-				<MkAvatar :user="$i" class="icon"/><!-- <MkAcct class="text" :user="$i"/> -->
-			</button>
-		</div>
-		<div class="middle">
-			<MkA v-click-anime v-tooltip.noDelay.right="i18n.ts.timeline" class="item index" active-class="active" to="/" exact>
-				<i class="icon ph-house ph-bold ph-fw ph-lg"></i><span class="text">{{ i18n.ts.timeline }}</span>
-			</MkA>
-			<template v-for="item in menu">
-				<div v-if="item === '-'" class="divider"></div>
-				<component
-					:is="navbarItemDef[item].to ? 'MkA' : 'button'"
-					v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)"
+	<div class="mvcprjjd" :class="{ iconOnly }">
+		<div class="body">
+			<div class="top">
+				<div
+					class="banner"
+					:user="$i"
+					:style="{ backgroundImage: `url(${$i.bannerUrl})` }"
+				></div>
+				<button
 					v-click-anime
-					v-tooltip.noDelay.right="i18n.ts[navbarItemDef[item].title]"
-					class="item _button"
-					:class="[item, { active: navbarItemDef[item].active }]"
-					active-class="active"
-					:to="navbarItemDef[item].to"
-					v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}"
+					v-tooltip.noDelay.right="
+						`${i18n.ts.account}: @${$i.username}`
+					"
+					class="item _button account"
+					@click="openAccountMenu"
 				>
-					<i class="icon ph-fw ph-lg" :class="navbarItemDef[item].icon"></i><span class="text">{{ i18n.ts[navbarItemDef[item].title] }}</span>
-					<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="icon ph-circle ph-fill"></i></span>
-				</component>
-			</template>
-			<div class="divider"></div>
-			<MkA v-if="$i.isAdmin || $i.isModerator" v-click-anime v-tooltip.noDelay.right="i18n.ts.controlPanel" class="item _button" active-class="active" to="/admin">
-				<span v-if="thereIsUnresolvedAbuseReport || noMaintainerInformation || noBotProtection || noEmailServer || updateAvailable" class="indicator"></span><i class="icon ph-door ph-bold ph-fw ph-lg"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
-			</MkA>
-			<button v-click-anime class="item _button" @click="more">
-				<i class="icon ph-dots-three-outline ph-bold ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
-				<span v-if="otherMenuItemIndicated" class="indicator"><i class="icon ph-circle ph-fill"></i></span>
-			</button>
-			<MkA v-click-anime v-tooltip.noDelay.right="i18n.ts.settings" class="item _button" active-class="active" to="/settings">
-				<i class="icon ph-gear-six ph-bold ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
-			</MkA>
-		</div>
-		<div class="bottom">
-			<button v-tooltip.noDelay.right="i18n.ts.note" class="item _button post" data-cy-open-post-form @click="os.post">
-				<i class="icon ph-pencil ph-bold ph-fw ph-lg"></i><span class="text">{{ i18n.ts.note }}</span>
-			</button>
-			<button v-tooltip.noDelay.right="i18n.ts.help" class="item _button help" @click="openHelpMenu">
-				<i class="help icon ph-info ph-bold ph-xl ph-fw"></i>
-			</button>
-			<!-- <button v-click-anime v-tooltip.noDelay.right="$instance.name ?? i18n.ts.instance" class="item _button instance" @click="openInstanceMenu">
+					<MkAvatar
+						:user="$i"
+						class="icon"
+					/><!-- <MkAcct class="text" :user="$i"/> -->
+				</button>
+			</div>
+			<div class="middle">
+				<MkA
+					v-click-anime
+					v-tooltip.noDelay.right="i18n.ts.timeline"
+					class="item index"
+					active-class="active"
+					to="/"
+					exact
+				>
+					<i class="icon ph-house ph-bold ph-fw ph-lg"></i
+					><span class="text">{{ i18n.ts.timeline }}</span>
+				</MkA>
+				<template v-for="item in menu">
+					<div v-if="item === '-'" class="divider"></div>
+					<component
+						:is="navbarItemDef[item].to ? 'MkA' : 'button'"
+						v-else-if="
+							navbarItemDef[item] &&
+							navbarItemDef[item].show !== false
+						"
+						v-click-anime
+						v-tooltip.noDelay.right="
+							i18n.ts[navbarItemDef[item].title]
+						"
+						class="item _button"
+						:class="[item, { active: navbarItemDef[item].active }]"
+						active-class="active"
+						:to="navbarItemDef[item].to"
+						v-on="
+							navbarItemDef[item].action
+								? { click: navbarItemDef[item].action }
+								: {}
+						"
+					>
+						<i
+							class="icon ph-fw ph-lg"
+							:class="navbarItemDef[item].icon"
+						></i
+						><span class="text">{{
+							i18n.ts[navbarItemDef[item].title]
+						}}</span>
+						<span
+							v-if="navbarItemDef[item].indicated"
+							class="indicator"
+							><i class="icon ph-circle ph-fill"></i
+						></span>
+					</component>
+				</template>
+				<div class="divider"></div>
+				<MkA
+					v-if="$i.isAdmin || $i.isModerator"
+					v-click-anime
+					v-tooltip.noDelay.right="i18n.ts.controlPanel"
+					class="item _button"
+					active-class="active"
+					to="/admin"
+				>
+					<span
+						v-if="
+							thereIsUnresolvedAbuseReport ||
+							noMaintainerInformation ||
+							noBotProtection ||
+							noEmailServer ||
+							updateAvailable
+						"
+						class="indicator"
+					></span
+					><i class="icon ph-door ph-bold ph-fw ph-lg"></i
+					><span class="text">{{ i18n.ts.controlPanel }}</span>
+				</MkA>
+				<button v-click-anime class="item _button" @click="more">
+					<i
+						class="icon ph-dots-three-outline ph-bold ph-fw ph-lg"
+					></i
+					><span class="text">{{ i18n.ts.more }}</span>
+					<span v-if="otherMenuItemIndicated" class="indicator"
+						><i class="icon ph-circle ph-fill"></i
+					></span>
+				</button>
+				<MkA
+					v-click-anime
+					v-tooltip.noDelay.right="i18n.ts.settings"
+					class="item _button"
+					active-class="active"
+					to="/settings"
+				>
+					<i class="icon ph-gear-six ph-bold ph-fw ph-lg"></i
+					><span class="text">{{ i18n.ts.settings }}</span>
+				</MkA>
+			</div>
+			<div class="bottom">
+				<button
+					v-tooltip.noDelay.right="i18n.ts.note"
+					class="item _button post"
+					data-cy-open-post-form
+					@click="os.post"
+				>
+					<i class="icon ph-pencil ph-bold ph-fw ph-lg"></i
+					><span class="text">{{ i18n.ts.note }}</span>
+				</button>
+				<button
+					v-tooltip.noDelay.right="i18n.ts.help"
+					class="item _button help"
+					@click="openHelpMenu"
+				>
+					<i class="help icon ph-info ph-bold ph-xl ph-fw"></i>
+				</button>
+				<!-- <button v-click-anime v-tooltip.noDelay.right="$instance.name ?? i18n.ts.instance" class="item _button instance" @click="openInstanceMenu">
 				<img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" alt="" class="icon"/>
 			</button> -->
-			<!-- <button v-click-anime v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="item _button account" @click="openAccountMenu">
+				<!-- <button v-click-anime v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="item _button account" @click="openAccountMenu">
 				<MkAvatar :user="$i" class="account"/><MkAcct class="text" :user="$i"/>
 			</button> -->
+			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, ref, watch } from 'vue';
-import * as os from '@/os';
-import { navbarItemDef } from '@/navbar';
-import { $i, openAccountMenu as openAccountMenu_ } from '@/account';
-import { openHelpMenu_ } from '@/scripts/helpMenu'
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-import { instance } from '@/instance';
-import { version } from '@/config';
+import { computed, defineAsyncComponent, ref, watch } from "vue";
+import * as os from "@/os";
+import { navbarItemDef } from "@/navbar";
+import { $i, openAccountMenu as openAccountMenu_ } from "@/account";
+import { openHelpMenu_ } from "@/scripts/helpMenu";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { instance } from "@/instance";
+import { version } from "@/config";
 
-const isEmpty = (x: string | null) => x == null || x === '';
+const isEmpty = (x: string | null) => x == null || x === "";
 
 const iconOnly = ref(false);
 
@@ -83,36 +164,42 @@ const otherMenuItemIndicated = computed(() => {
 });
 
 const calcViewState = () => {
-	iconOnly.value = (window.innerWidth <= 1279) || (defaultStore.state.menuDisplay === 'sideIcon');
+	iconOnly.value =
+		window.innerWidth <= 1279 ||
+		defaultStore.state.menuDisplay === "sideIcon";
 };
 
 calcViewState();
 
-window.addEventListener('resize', calcViewState);
+window.addEventListener("resize", calcViewState);
 
 watch(defaultStore.reactiveState.menuDisplay, () => {
 	calcViewState();
 });
 
-let noMaintainerInformation = isEmpty(instance.maintainerName) || isEmpty(instance.maintainerEmail);
-let noBotProtection = !instance.disableRegistration && !instance.enableHcaptcha && !instance.enableRecaptcha;
+let noMaintainerInformation =
+	isEmpty(instance.maintainerName) || isEmpty(instance.maintainerEmail);
+let noBotProtection =
+	!instance.disableRegistration &&
+	!instance.enableHcaptcha &&
+	!instance.enableRecaptcha;
 let noEmailServer = !instance.enableEmail;
 let thereIsUnresolvedAbuseReport = $ref(false);
 let updateAvailable = $ref(false);
 
 if ($i?.isAdmin) {
-	os.api('admin/abuse-user-reports', {
-		state: 'unresolved',
+	os.api("admin/abuse-user-reports", {
+		state: "unresolved",
 		limit: 1,
-	}).then(reports => {
+	}).then((reports) => {
 		if (reports?.length > 0) thereIsUnresolvedAbuseReport = true;
 	});
 }
 
 if (defaultStore.state.showAdminUpdates) {
-	os.api('latest-version').then(res => {
-		const cleanRes = parseInt(res?.tag_name.replace(/[^0-9]/g, ''));
-		const cleanVersion = parseInt(version.replace(/[^0-9]/g, ''));
+	os.api("latest-version").then((res) => {
+		const cleanRes = parseInt(res?.tag_name.replace(/[^0-9]/g, ""));
+		const cleanVersion = parseInt(version.replace(/[^0-9]/g, ""));
 		if (cleanRes > cleanVersion) {
 			updateAvailable = true;
 		}
@@ -120,9 +207,12 @@ if (defaultStore.state.showAdminUpdates) {
 }
 
 function openAccountMenu(ev: MouseEvent) {
-	openAccountMenu_({
-		withExtraOperation: true,
-	}, ev);
+	openAccountMenu_(
+		{
+			withExtraOperation: true,
+		},
+		ev
+	);
 }
 
 function openHelpMenu(ev: MouseEvent) {
@@ -130,10 +220,14 @@ function openHelpMenu(ev: MouseEvent) {
 }
 
 function more(ev: MouseEvent) {
-	os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
-		src: ev.currentTarget ?? ev.target,
-	}, {
-	}, 'closed');
+	os.popup(
+		defineAsyncComponent(() => import("@/components/MkLaunchPad.vue")),
+		{
+			src: ev.currentTarget ?? ev.target,
+		},
+		{},
+		"closed"
+	);
 }
 </script>
 
@@ -184,8 +278,16 @@ function more(ev: MouseEvent) {
 					height: 100%;
 					background-size: cover;
 					background-position: center center;
-					-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 15%, rgba(0,0,0,0.75) 100%);
-					mask-image: linear-gradient(0deg, rgba(0,0,0,0) 15%, rgba(0,0,0,0.75) 100%);
+					-webkit-mask-image: linear-gradient(
+						0deg,
+						rgba(0, 0, 0, 0) 15%,
+						rgba(0, 0, 0, 0.75) 100%
+					);
+					mask-image: linear-gradient(
+						0deg,
+						rgba(0, 0, 0, 0) 15%,
+						rgba(0, 0, 0, 0.75) 100%
+					);
 				}
 
 				> .account {
@@ -232,21 +334,27 @@ function more(ev: MouseEvent) {
 						right: 0;
 						bottom: 0;
 						border-radius: 999px;
-						background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
+						background: linear-gradient(
+							90deg,
+							var(--buttonGradateA),
+							var(--buttonGradateB)
+						);
 					}
 
-					&:hover, &.active {
+					&:hover,
+					&.active {
 						&:before {
 							background: var(--accentLighten);
 							transition: all 0.4s ease;
 						}
 					}
 
-					> .icon, > .text {
+					> .icon,
+					> .text {
 						position: relative;
 						left: 3rem;
 						color: var(--fgOnAccent);
-						transform: translateY(0em)
+						transform: translateY(0em);
 					}
 
 					> .text {
@@ -337,7 +445,8 @@ function more(ev: MouseEvent) {
 						color: var(--navActive);
 					}
 
-					&:hover, &.active {
+					&:hover,
+					&.active {
 						color: var(--accent);
 						transition: all 0.4s ease;
 
@@ -419,10 +528,15 @@ function more(ev: MouseEvent) {
 						width: 52px;
 						aspect-ratio: 1/1;
 						border-radius: 100%;
-						background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
+						background: linear-gradient(
+							90deg,
+							var(--buttonGradateA),
+							var(--buttonGradateB)
+						);
 					}
 
-					&:hover, &.active {
+					&:hover,
+					&.active {
 						&:before {
 							background: var(--accentLighten);
 							transition: all 0.4s ease;
@@ -432,7 +546,7 @@ function more(ev: MouseEvent) {
 					> .icon {
 						position: relative;
 						color: var(--fgOnAccent);
-						transform: translate(0.15em, 0em)
+						transform: translate(0.15em, 0em);
 					}
 
 					> .text {
@@ -506,7 +620,8 @@ function more(ev: MouseEvent) {
 						animation: blink 1s infinite;
 					}
 
-					&:hover, &.active {
+					&:hover,
+					&.active {
 						text-decoration: none;
 						color: var(--accent);
 						transition: all 0.4s ease;
@@ -526,7 +641,8 @@ function more(ev: MouseEvent) {
 							background: var(--accentedBg);
 						}
 
-						> .icon, > .text {
+						> .icon,
+						> .text {
 							opacity: 1;
 						}
 					}
diff --git a/packages/client/src/ui/_common_/statusbar-federation.vue b/packages/client/src/ui/_common_/statusbar-federation.vue
index 2896cc09c..2bb06bc38 100644
--- a/packages/client/src/ui/_common_/statusbar-federation.vue
+++ b/packages/client/src/ui/_common_/statusbar-federation.vue
@@ -1,36 +1,55 @@
 <template>
-<span v-if="!fetching" class="nmidsaqw">
-	<template v-if="display === 'marquee'">
-		<transition name="change" mode="default">
-			<MarqueeText :key="key" :duration="marqueeDuration" :reverse="marqueeReverse">
-				<span v-for="instance in instances" :key="instance.id" class="item" :class="{ colored }" :style="{ background: colored ? instance.themeColor : null }">
-					<img class="icon" :src="getInstanceIcon(instance)" alt=""/>
-					<MkA :to="`/instance-info/${instance.host}`" class="host _monospace">
-						{{ instance.host }}
-					</MkA>
-					<span class="divider"></span>
-				</span>
-			</MarqueeText>
-		</transition>
-	</template>
-	<template v-else-if="display === 'oneByOne'">
-		<!-- TODO -->
-	</template>
-</span>
+	<span v-if="!fetching" class="nmidsaqw">
+		<template v-if="display === 'marquee'">
+			<transition name="change" mode="default">
+				<MarqueeText
+					:key="key"
+					:duration="marqueeDuration"
+					:reverse="marqueeReverse"
+				>
+					<span
+						v-for="instance in instances"
+						:key="instance.id"
+						class="item"
+						:class="{ colored }"
+						:style="{
+							background: colored ? instance.themeColor : null,
+						}"
+					>
+						<img
+							class="icon"
+							:src="getInstanceIcon(instance)"
+							alt=""
+						/>
+						<MkA
+							:to="`/instance-info/${instance.host}`"
+							class="host _monospace"
+						>
+							{{ instance.host }}
+						</MkA>
+						<span class="divider"></span>
+					</span>
+				</MarqueeText>
+			</transition>
+		</template>
+		<template v-else-if="display === 'oneByOne'">
+			<!-- TODO -->
+		</template>
+	</span>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, ref, toRef, watch } from 'vue';
-import * as misskey from 'calckey-js';
-import MarqueeText from '@/components/MkMarquee.vue';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import { getNoteSummary } from '@/scripts/get-note-summary';
-import { notePage } from '@/filters/note';
-import { getProxiedImageUrlNullable } from '@/scripts/media-proxy';
+import { computed, defineAsyncComponent, ref, toRef, watch } from "vue";
+import * as misskey from "calckey-js";
+import MarqueeText from "@/components/MkMarquee.vue";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import { getNoteSummary } from "@/scripts/get-note-summary";
+import { notePage } from "@/filters/note";
+import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
 
 const props = defineProps<{
-	display?: 'marquee' | 'oneByOne';
+	display?: "marquee" | "oneByOne";
 	colored?: boolean;
 	marqueeDuration?: number;
 	marqueeReverse?: boolean;
@@ -43,10 +62,10 @@ const fetching = ref(true);
 let key = $ref(0);
 
 const tick = () => {
-	os.api('federation/instances', {
-		sort: '+lastCommunicatedAt',
+	os.api("federation/instances", {
+		sort: "+lastCommunicatedAt",
 		limit: 30,
-	}).then(res => {
+	}).then((res) => {
 		instances.value = res;
 		fetching.value = false;
 		key++;
@@ -59,22 +78,27 @@ useInterval(tick, Math.max(5000, props.refreshIntervalSec * 1000), {
 });
 
 function getInstanceIcon(instance): string {
-	return getProxiedImageUrlNullable(instance.iconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? '/client-assets/dummy.png';
+	return (
+		getProxiedImageUrlNullable(instance.iconUrl, "preview") ??
+		getProxiedImageUrlNullable(instance.faviconUrl, "preview") ??
+		"/client-assets/dummy.png"
+	);
 }
 </script>
 
 <style lang="scss" scoped>
-.change-enter-active, .change-leave-active {
+.change-enter-active,
+.change-leave-active {
 	position: absolute;
 	top: 0;
-  transition: all 1s ease;
+	transition: all 1s ease;
 }
 .change-enter-from {
-  opacity: 0;
+	opacity: 0;
 	transform: translateY(-100%);
 }
 .change-leave-to {
-  opacity: 0;
+	opacity: 0;
 	transform: translateY(100%);
 }
 
diff --git a/packages/client/src/ui/_common_/statusbar-rss.vue b/packages/client/src/ui/_common_/statusbar-rss.vue
index e75e13bb4..606f3f1bd 100644
--- a/packages/client/src/ui/_common_/statusbar-rss.vue
+++ b/packages/client/src/ui/_common_/statusbar-rss.vue
@@ -1,31 +1,42 @@
 <template>
-<span v-if="!fetching" class="xbhtxfms">
-	<template v-if="display === 'marquee'">
-		<transition name="change" mode="default">
-			<MarqueeText :key="key" :duration="marqueeDuration" :reverse="marqueeReverse">
-				<span v-for="item in items" class="item">
-					<a class="link" :href="item.link" rel="nofollow noopener" target="_blank" :title="item.title">{{ item.title }}</a><span class="divider"></span>
-				</span>
-			</MarqueeText>
-		</transition>
-	</template>
-	<template v-else-if="display === 'oneByOne'">
-		<!-- TODO -->
-	</template>
-</span>
+	<span v-if="!fetching" class="xbhtxfms">
+		<template v-if="display === 'marquee'">
+			<transition name="change" mode="default">
+				<MarqueeText
+					:key="key"
+					:duration="marqueeDuration"
+					:reverse="marqueeReverse"
+				>
+					<span v-for="item in items" class="item">
+						<a
+							class="link"
+							:href="item.link"
+							rel="nofollow noopener"
+							target="_blank"
+							:title="item.title"
+							>{{ item.title }}</a
+						><span class="divider"></span>
+					</span>
+				</MarqueeText>
+			</transition>
+		</template>
+		<template v-else-if="display === 'oneByOne'">
+			<!-- TODO -->
+		</template>
+	</span>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, ref, toRef, watch } from 'vue';
-import MarqueeText from '@/components/MkMarquee.vue';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import { shuffle } from '@/scripts/shuffle';
+import { computed, defineAsyncComponent, ref, toRef, watch } from "vue";
+import MarqueeText from "@/components/MkMarquee.vue";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import { shuffle } from "@/scripts/shuffle";
 
 const props = defineProps<{
 	url?: string;
 	shuffle?: boolean;
-	display?: 'marquee' | 'oneByOne';
+	display?: "marquee" | "oneByOne";
 	marqueeDuration?: number;
 	marqueeReverse?: boolean;
 	oneByOneInterval?: number;
@@ -37,8 +48,8 @@ const fetching = ref(true);
 let key = $ref(0);
 
 const tick = () => {
-	fetch(`/api/fetch-rss?url=${props.url}`, {}).then(res => {
-		res.json().then(feed => {
+	fetch(`/api/fetch-rss?url=${props.url}`, {}).then((res) => {
+		res.json().then((feed) => {
 			if (props.shuffle) {
 				shuffle(feed.items);
 			}
@@ -56,17 +67,18 @@ useInterval(tick, Math.max(5000, props.refreshIntervalSec * 1000), {
 </script>
 
 <style lang="scss" scoped>
-.change-enter-active, .change-leave-active {
+.change-enter-active,
+.change-leave-active {
 	position: absolute;
 	top: 0;
-  transition: all 1s ease;
+	transition: all 1s ease;
 }
 .change-enter-from {
-  opacity: 0;
+	opacity: 0;
 	transform: translateY(-100%);
 }
 .change-leave-to {
-  opacity: 0;
+	opacity: 0;
 	transform: translateY(100%);
 }
 
diff --git a/packages/client/src/ui/_common_/statusbar-user-list.vue b/packages/client/src/ui/_common_/statusbar-user-list.vue
index 094ab421c..f32b7f809 100644
--- a/packages/client/src/ui/_common_/statusbar-user-list.vue
+++ b/packages/client/src/ui/_common_/statusbar-user-list.vue
@@ -1,36 +1,50 @@
 <template>
-<span v-if="!fetching" class="osdsvwzy">
-	<template v-if="display === 'marquee'">
-		<transition name="change" mode="default">
-			<MarqueeText :key="key" :duration="marqueeDuration" :reverse="marqueeReverse">
-				<span v-for="note in notes" :key="note.id" class="item">
-					<img class="avatar" :src="note.user.avatarUrl" decoding="async"/>
-					<MkA class="text" :to="notePage(note)">
-						<Mfm class="text" :text="getNoteSummary(note)" :plain="true" :nowrap="true" :custom-emojis="note.emojis"/>
-					</MkA>
-					<span class="divider"></span>
-				</span>
-			</MarqueeText>
-		</transition>
-	</template>
-	<template v-else-if="display === 'oneByOne'">
-		<!-- TODO -->
-	</template>
-</span>
+	<span v-if="!fetching" class="osdsvwzy">
+		<template v-if="display === 'marquee'">
+			<transition name="change" mode="default">
+				<MarqueeText
+					:key="key"
+					:duration="marqueeDuration"
+					:reverse="marqueeReverse"
+				>
+					<span v-for="note in notes" :key="note.id" class="item">
+						<img
+							class="avatar"
+							:src="note.user.avatarUrl"
+							decoding="async"
+						/>
+						<MkA class="text" :to="notePage(note)">
+							<Mfm
+								class="text"
+								:text="getNoteSummary(note)"
+								:plain="true"
+								:nowrap="true"
+								:custom-emojis="note.emojis"
+							/>
+						</MkA>
+						<span class="divider"></span>
+					</span>
+				</MarqueeText>
+			</transition>
+		</template>
+		<template v-else-if="display === 'oneByOne'">
+			<!-- TODO -->
+		</template>
+	</span>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, ref, toRef, watch } from 'vue';
-import * as misskey from 'calckey-js';
-import MarqueeText from '@/components/MkMarquee.vue';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import { getNoteSummary } from '@/scripts/get-note-summary';
-import { notePage } from '@/filters/note';
+import { computed, defineAsyncComponent, ref, toRef, watch } from "vue";
+import * as misskey from "calckey-js";
+import MarqueeText from "@/components/MkMarquee.vue";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import { getNoteSummary } from "@/scripts/get-note-summary";
+import { notePage } from "@/filters/note";
 
 const props = defineProps<{
 	userListId?: string;
-	display?: 'marquee' | 'oneByOne';
+	display?: "marquee" | "oneByOne";
 	marqueeDuration?: number;
 	marqueeReverse?: boolean;
 	oneByOneInterval?: number;
@@ -43,9 +57,9 @@ let key = $ref(0);
 
 const tick = () => {
 	if (props.userListId == null) return;
-	os.api('notes/user-list-timeline', {
+	os.api("notes/user-list-timeline", {
 		listId: props.userListId,
-	}).then(res => {
+	}).then((res) => {
 		notes.value = res;
 		fetching.value = false;
 		key++;
@@ -61,17 +75,18 @@ useInterval(tick, Math.max(5000, props.refreshIntervalSec * 1000), {
 </script>
 
 <style lang="scss" scoped>
-.change-enter-active, .change-leave-active {
+.change-enter-active,
+.change-leave-active {
 	position: absolute;
 	top: 0;
-  transition: all 1s ease;
+	transition: all 1s ease;
 }
 .change-enter-from {
-  opacity: 0;
+	opacity: 0;
 	transform: translateY(-100%);
 }
 .change-leave-to {
-  opacity: 0;
+	opacity: 0;
 	transform: translateY(100%);
 }
 
diff --git a/packages/client/src/ui/_common_/statusbars.vue b/packages/client/src/ui/_common_/statusbars.vue
index 114ca5be8..bef61317e 100644
--- a/packages/client/src/ui/_common_/statusbars.vue
+++ b/packages/client/src/ui/_common_/statusbars.vue
@@ -1,29 +1,64 @@
 <template>
-<div class="dlrsnxqu">
-	<div
-		v-for="x in defaultStore.reactiveState.statusbars.value" :key="x.id" class="item" :class="[{ black: x.black }, {
-			verySmall: x.size === 'verySmall',
-			small: x.size === 'small',
-			medium: x.size === 'medium',
-			large: x.size === 'large',
-			veryLarge: x.size === 'veryLarge',
-		}]"
-	>
-		<span class="name">{{ x.name }}</span>
-		<XRss v-if="x.type === 'rss'" class="body" :refresh-interval-sec="x.props.refreshIntervalSec" :marquee-duration="x.props.marqueeDuration" :marquee-reverse="x.props.marqueeReverse" :display="x.props.display" :url="x.props.url" :shuffle="x.props.shuffle"/>
-		<XFederation v-else-if="x.type === 'federation'" class="body" :refresh-interval-sec="x.props.refreshIntervalSec" :marquee-duration="x.props.marqueeDuration" :marquee-reverse="x.props.marqueeReverse" :display="x.props.display" :colored="x.props.colored"/>
-		<XUserList v-else-if="x.type === 'userList'" class="body" :refresh-interval-sec="x.props.refreshIntervalSec" :marquee-duration="x.props.marqueeDuration" :marquee-reverse="x.props.marqueeReverse" :display="x.props.display" :user-list-id="x.props.userListId"/>
+	<div class="dlrsnxqu">
+		<div
+			v-for="x in defaultStore.reactiveState.statusbars.value"
+			:key="x.id"
+			class="item"
+			:class="[
+				{ black: x.black },
+				{
+					verySmall: x.size === 'verySmall',
+					small: x.size === 'small',
+					medium: x.size === 'medium',
+					large: x.size === 'large',
+					veryLarge: x.size === 'veryLarge',
+				},
+			]"
+		>
+			<span class="name">{{ x.name }}</span>
+			<XRss
+				v-if="x.type === 'rss'"
+				class="body"
+				:refresh-interval-sec="x.props.refreshIntervalSec"
+				:marquee-duration="x.props.marqueeDuration"
+				:marquee-reverse="x.props.marqueeReverse"
+				:display="x.props.display"
+				:url="x.props.url"
+				:shuffle="x.props.shuffle"
+			/>
+			<XFederation
+				v-else-if="x.type === 'federation'"
+				class="body"
+				:refresh-interval-sec="x.props.refreshIntervalSec"
+				:marquee-duration="x.props.marqueeDuration"
+				:marquee-reverse="x.props.marqueeReverse"
+				:display="x.props.display"
+				:colored="x.props.colored"
+			/>
+			<XUserList
+				v-else-if="x.type === 'userList'"
+				class="body"
+				:refresh-interval-sec="x.props.refreshIntervalSec"
+				:marquee-duration="x.props.marqueeDuration"
+				:marquee-reverse="x.props.marqueeReverse"
+				:display="x.props.display"
+				:user-list-id="x.props.userListId"
+			/>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, ref, toRef, watch } from 'vue';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-const XRss = defineAsyncComponent(() => import('./statusbar-rss.vue'));
-const XFederation = defineAsyncComponent(() => import('./statusbar-federation.vue'));
-const XUserList = defineAsyncComponent(() => import('./statusbar-user-list.vue'));
+import { computed, defineAsyncComponent, ref, toRef, watch } from "vue";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+const XRss = defineAsyncComponent(() => import("./statusbar-rss.vue"));
+const XFederation = defineAsyncComponent(
+	() => import("./statusbar-federation.vue")
+);
+const XUserList = defineAsyncComponent(
+	() => import("./statusbar-user-list.vue")
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/ui/_common_/stream-indicator.vue b/packages/client/src/ui/_common_/stream-indicator.vue
index a855de8ab..a3d06295c 100644
--- a/packages/client/src/ui/_common_/stream-indicator.vue
+++ b/packages/client/src/ui/_common_/stream-indicator.vue
@@ -1,17 +1,26 @@
 <template>
-<div v-if="hasDisconnected && $store.state.serverDisconnectedBehavior === 'quiet'" class="nsbbhtug" @click="resetDisconnected">
-	<div>{{ i18n.ts.disconnectedFromServer }}</div>
-	<div class="command">
-		<button class="_textButton" @click="reload">{{ i18n.ts.reload }}</button>
-		<button class="_textButton">{{ i18n.ts.doNothing }}</button>
+	<div
+		v-if="
+			hasDisconnected &&
+			$store.state.serverDisconnectedBehavior === 'quiet'
+		"
+		class="nsbbhtug"
+		@click="resetDisconnected"
+	>
+		<div>{{ i18n.ts.disconnectedFromServer }}</div>
+		<div class="command">
+			<button class="_textButton" @click="reload">
+				{{ i18n.ts.reload }}
+			</button>
+			<button class="_textButton">{{ i18n.ts.doNothing }}</button>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onUnmounted } from 'vue';
-import { stream } from '@/stream';
-import { i18n } from '@/i18n';
+import { onUnmounted } from "vue";
+import { stream } from "@/stream";
+import { i18n } from "@/i18n";
 
 let hasDisconnected = $ref(false);
 
@@ -27,10 +36,10 @@ function reload() {
 	location.reload();
 }
 
-stream.on('_disconnected_', onDisconnected);
+stream.on("_disconnected_", onDisconnected);
 
 onUnmounted(() => {
-	stream.off('_disconnected_', onDisconnected);
+	stream.off("_disconnected_", onDisconnected);
 });
 </script>
 
diff --git a/packages/client/src/ui/_common_/upload.vue b/packages/client/src/ui/_common_/upload.vue
index 6c7787f99..272b81ba1 100644
--- a/packages/client/src/ui/_common_/upload.vue
+++ b/packages/client/src/ui/_common_/upload.vue
@@ -1,29 +1,67 @@
 <template>
-<div class="mk-uploader _acrylic" :style="{ zIndex }">
-	<ol v-if="uploads.length > 0">
-		<li v-for="ctx in uploads" :key="ctx.id">
-			<div class="img" :style="{ backgroundImage: `url(${ ctx.img })` }"></div>
-			<div class="top">
-				<p class="name"><i class="ph-circle-notch ph-bold ph-lg fa-pulse"></i>{{ ctx.name }}</p>
-				<p class="status">
-					<span v-if="ctx.progressValue === undefined" class="initing">{{ i18n.ts.waiting }}<MkEllipsis/></span>
-					<span v-if="ctx.progressValue !== undefined" class="kb">{{ String(Math.floor(ctx.progressValue / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }}<i>KB</i> / {{ String(Math.floor(ctx.progressMax / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }}<i>KB</i></span>
-					<span v-if="ctx.progressValue !== undefined" class="percentage">{{ Math.floor((ctx.progressValue / ctx.progressMax) * 100) }}</span>
-				</p>
-			</div>
-			<progress :value="ctx.progressValue || 0" :max="ctx.progressMax || 0" :class="{ initing: ctx.progressValue === undefined, waiting: ctx.progressValue !== undefined && ctx.progressValue === ctx.progressMax }"></progress>
-		</li>
-	</ol>
-</div>
+	<div class="mk-uploader _acrylic" :style="{ zIndex }">
+		<ol v-if="uploads.length > 0">
+			<li v-for="ctx in uploads" :key="ctx.id">
+				<div
+					class="img"
+					:style="{ backgroundImage: `url(${ctx.img})` }"
+				></div>
+				<div class="top">
+					<p class="name">
+						<i class="ph-circle-notch ph-bold ph-lg fa-pulse"></i
+						>{{ ctx.name }}
+					</p>
+					<p class="status">
+						<span
+							v-if="ctx.progressValue === undefined"
+							class="initing"
+							>{{ i18n.ts.waiting }}<MkEllipsis
+						/></span>
+						<span v-if="ctx.progressValue !== undefined" class="kb"
+							>{{
+								String(
+									Math.floor(ctx.progressValue / 1024)
+								).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,")
+							}}<i>KB</i> /
+							{{
+								String(
+									Math.floor(ctx.progressMax / 1024)
+								).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,")
+							}}<i>KB</i></span
+						>
+						<span
+							v-if="ctx.progressValue !== undefined"
+							class="percentage"
+							>{{
+								Math.floor(
+									(ctx.progressValue / ctx.progressMax) * 100
+								)
+							}}</span
+						>
+					</p>
+				</div>
+				<progress
+					:value="ctx.progressValue || 0"
+					:max="ctx.progressMax || 0"
+					:class="{
+						initing: ctx.progressValue === undefined,
+						waiting:
+							ctx.progressValue !== undefined &&
+							ctx.progressValue === ctx.progressMax,
+					}"
+				></progress>
+			</li>
+		</ol>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import * as os from '@/os';
-import { uploads } from '@/scripts/upload';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import * as os from "@/os";
+import { uploads } from "@/scripts/upload";
+import { i18n } from "@/i18n";
 
-const zIndex = os.claimZIndex('high');
+const zIndex = os.claimZIndex("high");
 </script>
 
 <style lang="scss" scoped>
@@ -38,92 +76,92 @@ const zIndex = os.claimZIndex('high');
 	border-radius: 8px;
 }
 .mk-uploader:empty {
-  display: none;
+	display: none;
 }
 .mk-uploader > ol {
-  display: block;
-  margin: 0;
-  padding: 0;
-  list-style: none;
+	display: block;
+	margin: 0;
+	padding: 0;
+	list-style: none;
 }
 .mk-uploader > ol > li {
-  display: grid;
-  margin: 8px 0 0 0;
-  padding: 0;
-  height: 36px;
-  width: 100%;
-  border-top: solid 8px transparent;
-  grid-template-columns: 36px calc(100% - 44px);
-  grid-template-rows: 1fr 8px;
-  column-gap: 8px;
-  box-sizing: content-box;
+	display: grid;
+	margin: 8px 0 0 0;
+	padding: 0;
+	height: 36px;
+	width: 100%;
+	border-top: solid 8px transparent;
+	grid-template-columns: 36px calc(100% - 44px);
+	grid-template-rows: 1fr 8px;
+	column-gap: 8px;
+	box-sizing: content-box;
 }
 .mk-uploader > ol > li:first-child {
-  margin: 0;
-  box-shadow: none;
-  border-top: none;
+	margin: 0;
+	box-shadow: none;
+	border-top: none;
 }
 .mk-uploader > ol > li > .img {
-  display: block;
-  background-size: cover;
-  background-position: center center;
-  grid-column: 1/2;
-  grid-row: 1/3;
+	display: block;
+	background-size: cover;
+	background-position: center center;
+	grid-column: 1/2;
+	grid-row: 1/3;
 }
 .mk-uploader > ol > li > .top {
-  display: flex;
-  grid-column: 2/3;
-  grid-row: 1/2;
+	display: flex;
+	grid-column: 2/3;
+	grid-row: 1/2;
 }
 .mk-uploader > ol > li > .top > .name {
-  display: block;
-  padding: 0 8px 0 0;
-  margin: 0;
-  font-size: 0.8em;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  flex-shrink: 1;
+	display: block;
+	padding: 0 8px 0 0;
+	margin: 0;
+	font-size: 0.8em;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	flex-shrink: 1;
 }
 .mk-uploader > ol > li > .top > .name > i {
-  margin-right: 4px;
+	margin-right: 4px;
 }
 .mk-uploader > ol > li > .top > .status {
-  display: block;
-  margin: 0 0 0 auto;
-  padding: 0;
-  font-size: 0.8em;
-  flex-shrink: 0;
+	display: block;
+	margin: 0 0 0 auto;
+	padding: 0;
+	font-size: 0.8em;
+	flex-shrink: 0;
 }
 .mk-uploader > ol > li > .top > .status > .initing {
 }
 .mk-uploader > ol > li > .top > .status > .kb {
 }
 .mk-uploader > ol > li > .top > .status > .percentage {
-  display: inline-block;
-  width: 48px;
-  text-align: right;
+	display: inline-block;
+	width: 48px;
+	text-align: right;
 }
 .mk-uploader > ol > li > .top > .status > .percentage:after {
-  content: '%';
+	content: "%";
 }
 .mk-uploader > ol > li > progress {
-  display: block;
-  background: transparent;
-  border: none;
-  border-radius: 4px;
-  overflow: hidden;
-  grid-column: 2/3;
-  grid-row: 2/3;
-  z-index: 2;
+	display: block;
+	background: transparent;
+	border: none;
+	border-radius: 4px;
+	overflow: hidden;
+	grid-column: 2/3;
+	grid-row: 2/3;
+	z-index: 2;
 	width: 100%;
 	height: 8px;
 }
 .mk-uploader > ol > li > progress::-webkit-progress-value {
-  background: var(--accent);
+	background: var(--accent);
 }
 .mk-uploader > ol > li > progress::-webkit-progress-bar {
-  //background: var(--accentAlpha01);
+	//background: var(--accentAlpha01);
 	background: transparent;
 }
 </style>
diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue
index 38579678d..5c3e6b702 100644
--- a/packages/client/src/ui/classic.header.vue
+++ b/packages/client/src/ui/classic.header.vue
@@ -1,52 +1,109 @@
 <template>
-<div class="azykntjl">
-	<div class="body">
-		<div class="left">
-			<MkA v-click-anime v-tooltip="i18n.ts.timeline" class="item index" active-class="active" to="/" exact>
-				<i class="ph-house ph-bold ph-lg ph-fw ph-lg"></i>
-			</MkA>
-			<template v-for="item in menu">
-				<div v-if="item === '-'" class="divider"></div>
-				<component :is="navbarItemDef[item].to ? 'MkA' : 'button'" v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)" v-click-anime v-tooltip="$ts[navbarItemDef[item].title]" class="item _button" :class="item" active-class="active" :to="navbarItemDef[item].to" v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}">
-					<i class="ph-fw ph-lg" :class="navbarItemDef[item].icon"></i>
-					<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="ph-circle ph-fill"></i></span>
-				</component>
-			</template>
-			<div class="divider"></div>
-			<MkA v-if="$i.isAdmin || $i.isModerator" v-click-anime v-tooltip="i18n.ts.controlPanel" class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null">
-				<i class="ph-door ph-bold ph-lg ph-fw ph-lg"></i>
-			</MkA>
-			<button v-click-anime class="item _button" @click="more">
-				<i class="ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i>
-				<span v-if="otherNavItemIndicated" class="indicator"><i class="ph-circle ph-fill"></i></span>
-			</button>
-		</div>
-		<div class="right">
-			<MkA v-click-anime v-tooltip="i18n.ts.settings" class="item" active-class="active" to="/settings" :behavior="settingsWindowed ? 'modalWindow' : null">
-				<i class="ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i>
-			</MkA>
-			<button v-click-anime class="item _button account" @click="openAccountMenu">
-				<MkAvatar :user="$i" class="avatar"/><MkAcct class="acct" :user="$i"/>
-			</button>
-			<div class="post" @click="post">
-				<MkButton class="button" gradate full rounded>
-					<i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i>
-				</MkButton>
+	<div class="azykntjl">
+		<div class="body">
+			<div class="left">
+				<MkA
+					v-click-anime
+					v-tooltip="i18n.ts.timeline"
+					class="item index"
+					active-class="active"
+					to="/"
+					exact
+				>
+					<i class="ph-house ph-bold ph-lg ph-fw ph-lg"></i>
+				</MkA>
+				<template v-for="item in menu">
+					<div v-if="item === '-'" class="divider"></div>
+					<component
+						:is="navbarItemDef[item].to ? 'MkA' : 'button'"
+						v-else-if="
+							navbarItemDef[item] &&
+							navbarItemDef[item].show !== false
+						"
+						v-click-anime
+						v-tooltip="$ts[navbarItemDef[item].title]"
+						class="item _button"
+						:class="item"
+						active-class="active"
+						:to="navbarItemDef[item].to"
+						v-on="
+							navbarItemDef[item].action
+								? { click: navbarItemDef[item].action }
+								: {}
+						"
+					>
+						<i
+							class="ph-fw ph-lg"
+							:class="navbarItemDef[item].icon"
+						></i>
+						<span
+							v-if="navbarItemDef[item].indicated"
+							class="indicator"
+							><i class="ph-circle ph-fill"></i
+						></span>
+					</component>
+				</template>
+				<div class="divider"></div>
+				<MkA
+					v-if="$i.isAdmin || $i.isModerator"
+					v-click-anime
+					v-tooltip="i18n.ts.controlPanel"
+					class="item"
+					active-class="active"
+					to="/admin"
+					:behavior="settingsWindowed ? 'modalWindow' : null"
+				>
+					<i class="ph-door ph-bold ph-lg ph-fw ph-lg"></i>
+				</MkA>
+				<button v-click-anime class="item _button" @click="more">
+					<i
+						class="ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"
+					></i>
+					<span v-if="otherNavItemIndicated" class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</button>
+			</div>
+			<div class="right">
+				<MkA
+					v-click-anime
+					v-tooltip="i18n.ts.settings"
+					class="item"
+					active-class="active"
+					to="/settings"
+					:behavior="settingsWindowed ? 'modalWindow' : null"
+				>
+					<i class="ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i>
+				</MkA>
+				<button
+					v-click-anime
+					class="item _button account"
+					@click="openAccountMenu"
+				>
+					<MkAvatar :user="$i" class="avatar" /><MkAcct
+						class="acct"
+						:user="$i"
+					/>
+				</button>
+				<div class="post" @click="post">
+					<MkButton class="button" gradate full rounded>
+						<i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i>
+					</MkButton>
+				</div>
 			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
-import { defineAsyncComponent, defineComponent } from 'vue';
-import { host } from '@/config';
-import { search } from '@/scripts/search';
-import * as os from '@/os';
-import { navbarItemDef } from '@/navbar';
-import { openAccountMenu } from '@/account';
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n';
+import { defineAsyncComponent, defineComponent } from "vue";
+import { host } from "@/config";
+import { search } from "@/scripts/search";
+import * as os from "@/os";
+import { navbarItemDef } from "@/navbar";
+import { openAccountMenu } from "@/account";
+import MkButton from "@/components/MkButton.vue";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
@@ -79,19 +136,19 @@ export default defineComponent({
 	},
 
 	watch: {
-		'$store.reactiveState.menuDisplay.value'() {
+		"$store.reactiveState.menuDisplay.value"() {
 			this.calcViewState();
 		},
 	},
 
 	created() {
-		window.addEventListener('resize', this.calcViewState);
+		window.addEventListener("resize", this.calcViewState);
 		this.calcViewState();
 	},
 
 	methods: {
 		calcViewState() {
-			this.settingsWindowed = (window.innerWidth > 1400);
+			this.settingsWindowed = window.innerWidth > 1400;
 		},
 
 		post() {
@@ -103,17 +160,26 @@ export default defineComponent({
 		},
 
 		more(ev) {
-			os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
-				src: ev.currentTarget ?? ev.target,
-				anchor: { x: 'center', y: 'bottom' },
-			}, {
-			}, 'closed');
+			os.popup(
+				defineAsyncComponent(
+					() => import("@/components/MkLaunchPad.vue")
+				),
+				{
+					src: ev.currentTarget ?? ev.target,
+					anchor: { x: "center", y: "bottom" },
+				},
+				{},
+				"closed"
+			);
 		},
 
 		openAccountMenu: (ev) => {
-			openAccountMenu({
-				withExtraOperation: true,
-			}, ev);
+			openAccountMenu(
+				{
+					withExtraOperation: true,
+				},
+				ev
+			);
 		},
 	},
 });
@@ -139,7 +205,6 @@ export default defineComponent({
 
 		> .right,
 		> .left {
-
 			> .item {
 				position: relative;
 				font-size: 0.9em;
@@ -190,7 +255,7 @@ export default defineComponent({
 
 			> .post {
 				display: inline-block;
-			
+
 				> .button {
 					width: 40px;
 					height: 40px;
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index 62a4a4b1b..b70a3c984 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -1,56 +1,114 @@
 <template>
-<div class="npcljfve" :class="{ iconOnly }">
-	<button v-click-anime class="item _button account" @click="openAccountMenu">
-		<MkAvatar :user="$i" class="avatar"/><MkAcct class="text" :user="$i"/>
-	</button>
-	<div class="post" data-cy-open-post-form @click="post">
-		<MkButton class="button" gradate full rounded>
-			<i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i><span v-if="!iconOnly" class="text">{{ i18n.ts.note }}</span>
-		</MkButton>
-	</div>
-	<div class="divider"></div>
-	<MkA v-click-anime class="item index" active-class="active" to="/" exact>
-		<i class="ph-house ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.timeline }}</span>
-	</MkA>
-	<template v-for="item in menu">
-		<div v-if="item === '-'" class="divider"></div>
-		<component :is="navbarItemDef[item].to ? 'MkA' : 'button'" v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)" v-click-anime class="item _button" :class="item" active-class="active" :to="navbarItemDef[item].to" v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}">
-			<i class="ph-fw ph-lg" :class="navbarItemDef[item].icon"></i><span class="text">{{ $ts[navbarItemDef[item].title] }}</span>
-			<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="ph-circle ph-fill"></i></span>
-		</component>
-	</template>
-	<div class="divider"></div>
-	<MkA v-if="$i.isAdmin || $i.isModerator" v-click-anime class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null">
-		<i class="ph-door ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
-	</MkA>
-	<button v-click-anime class="item _button" @click="more">
-		<i class="ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.more }}</span>
-		<span v-if="otherNavItemIndicated" class="indicator"><i class="ph-circle ph-fill"></i></span>
-	</button>
-	<MkA v-click-anime class="item" active-class="active" to="/settings" :behavior="settingsWindowed ? 'modalWindow' : null">
-		<i class="ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i><span class="text">{{ i18n.ts.settings }}</span>
-	</MkA>
-	<div class="divider"></div>
-	<div class="about">
-		<MkA v-click-anime class="link" @click="openInstanceMenu">
-			<img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" class="_ghost"/>
+	<div class="npcljfve" :class="{ iconOnly }">
+		<button
+			v-click-anime
+			class="item _button account"
+			@click="openAccountMenu"
+		>
+			<MkAvatar :user="$i" class="avatar" /><MkAcct
+				class="text"
+				:user="$i"
+			/>
+		</button>
+		<div class="post" data-cy-open-post-form @click="post">
+			<MkButton class="button" gradate full rounded>
+				<i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i
+				><span v-if="!iconOnly" class="text">{{ i18n.ts.note }}</span>
+			</MkButton>
+		</div>
+		<div class="divider"></div>
+		<MkA
+			v-click-anime
+			class="item index"
+			active-class="active"
+			to="/"
+			exact
+		>
+			<i class="ph-house ph-bold ph-lg ph-fw ph-lg"></i
+			><span class="text">{{ i18n.ts.timeline }}</span>
 		</MkA>
+		<template v-for="item in menu">
+			<div v-if="item === '-'" class="divider"></div>
+			<component
+				:is="navbarItemDef[item].to ? 'MkA' : 'button'"
+				v-else-if="
+					navbarItemDef[item] && navbarItemDef[item].show !== false
+				"
+				v-click-anime
+				class="item _button"
+				:class="item"
+				active-class="active"
+				:to="navbarItemDef[item].to"
+				v-on="
+					navbarItemDef[item].action
+						? { click: navbarItemDef[item].action }
+						: {}
+				"
+			>
+				<i class="ph-fw ph-lg" :class="navbarItemDef[item].icon"></i
+				><span class="text">{{ $ts[navbarItemDef[item].title] }}</span>
+				<span v-if="navbarItemDef[item].indicated" class="indicator"
+					><i class="ph-circle ph-fill"></i
+				></span>
+			</component>
+		</template>
+		<div class="divider"></div>
+		<MkA
+			v-if="$i.isAdmin || $i.isModerator"
+			v-click-anime
+			class="item"
+			active-class="active"
+			to="/admin"
+			:behavior="settingsWindowed ? 'modalWindow' : null"
+		>
+			<i class="ph-door ph-bold ph-lg ph-fw ph-lg"></i
+			><span class="text">{{ i18n.ts.controlPanel }}</span>
+		</MkA>
+		<button v-click-anime class="item _button" @click="more">
+			<i class="ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i
+			><span class="text">{{ i18n.ts.more }}</span>
+			<span v-if="otherNavItemIndicated" class="indicator"
+				><i class="ph-circle ph-fill"></i
+			></span>
+		</button>
+		<MkA
+			v-click-anime
+			class="item"
+			active-class="active"
+			to="/settings"
+			:behavior="settingsWindowed ? 'modalWindow' : null"
+		>
+			<i class="ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i
+			><span class="text">{{ i18n.ts.settings }}</span>
+		</MkA>
+		<div class="divider"></div>
+		<div class="about">
+			<MkA v-click-anime class="link" @click="openInstanceMenu">
+				<img
+					:src="
+						$instance.iconUrl ||
+						$instance.faviconUrl ||
+						'/favicon.ico'
+					"
+					class="_ghost"
+				/>
+			</MkA>
+		</div>
+		<!--<MisskeyLogo class="misskey"/>-->
 	</div>
-	<!--<MisskeyLogo class="misskey"/>-->
-</div>
 </template>
 
 <script lang="ts">
-import { defineAsyncComponent, defineComponent } from 'vue';
-import { host } from '@/config';
-import { search } from '@/scripts/search';
-import * as os from '@/os';
-import { navbarItemDef } from '@/navbar';
-import { openAccountMenu } from '@/account';
-import MkButton from '@/components/MkButton.vue';
-import { StickySidebar } from '@/scripts/sticky-sidebar';
+import { defineAsyncComponent, defineComponent } from "vue";
+import { host } from "@/config";
+import { search } from "@/scripts/search";
+import * as os from "@/os";
+import { navbarItemDef } from "@/navbar";
+import { openAccountMenu } from "@/account";
+import MkButton from "@/components/MkButton.vue";
+import { StickySidebar } from "@/scripts/sticky-sidebar";
 //import MisskeyLogo from '@assets/client/misskey.svg';
-import { i18n } from '@/i18n';
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
@@ -85,33 +143,39 @@ export default defineComponent({
 	},
 
 	watch: {
-		'$store.reactiveState.menuDisplay.value'() {
+		"$store.reactiveState.menuDisplay.value"() {
 			this.calcViewState();
 		},
 
 		iconOnly() {
 			this.$nextTick(() => {
-				this.$emit('change-view-mode');
+				this.$emit("change-view-mode");
 			});
 		},
 	},
 
 	created() {
-		window.addEventListener('resize', this.calcViewState);
+		window.addEventListener("resize", this.calcViewState);
 		this.calcViewState();
 	},
 
 	mounted() {
 		const sticky = new StickySidebar(this.$el.parentElement, 16);
-		window.addEventListener('scroll', () => {
-			sticky.calc(window.scrollY);
-		}, { passive: true });
+		window.addEventListener(
+			"scroll",
+			() => {
+				sticky.calc(window.scrollY);
+			},
+			{ passive: true }
+		);
 	},
 
 	methods: {
 		calcViewState() {
-			this.iconOnly = (window.innerWidth <= 1400) || (this.$store.state.menuDisplay === 'sideIcon');
-			this.settingsWindowed = (window.innerWidth > 1400);
+			this.iconOnly =
+				window.innerWidth <= 1400 ||
+				this.$store.state.menuDisplay === "sideIcon";
+			this.settingsWindowed = window.innerWidth > 1400;
 		},
 
 		post() {
@@ -123,61 +187,90 @@ export default defineComponent({
 		},
 
 		more(ev) {
-			os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
-				src: ev.currentTarget ?? ev.target,
-			}, {}, 'closed');
+			os.popup(
+				defineAsyncComponent(
+					() => import("@/components/MkLaunchPad.vue")
+				),
+				{
+					src: ev.currentTarget ?? ev.target,
+				},
+				{},
+				"closed"
+			);
 		},
 
 		openAccountMenu: (ev) => {
-			openAccountMenu({
-				withExtraOperation: true,
-			}, ev);
+			openAccountMenu(
+				{
+					withExtraOperation: true,
+				},
+				ev
+			);
 		},
 	},
 });
 
 function openInstanceMenu(ev: MouseEvent) {
-	os.popupMenu([{
-		text: instance.name ?? host,
-		type: 'label',
-	}, {
-		type: 'link',
-		text: i18n.ts.instanceInfo,
-		icon: 'ph-info ph-bold ph-lg',
-		to: '/about',
-	}, null, {
-		type: 'parent',
-		text: i18n.ts.help,
-		icon: 'ph-question ph-bold ph-lg',
-		children: [{
-			type: 'link',
-			to: '/mfm-cheat-sheet',
-			text: i18n.ts._mfm.cheatSheet,
-			icon: 'ph-code ph-bold ph-lg',
-		}, {
-			type: 'link',
-			to: '/scratchpad',
-			text: i18n.ts.scratchpad,
-			icon: 'ph-terminal-window ph-bold ph-lg',
-		}, {
-			type: 'link',
-			to: '/api-console',
-			text: 'API Console',
-			icon: 'ph-terminal-window ph-bold ph-lg',
-		}, null, {
-			text: i18n.ts.document,
-			icon: 'ph-question ph-bold ph-lg',
-			action: () => {
-				window.open('https://misskey-hub.net/help.html', '_blank');
+	os.popupMenu(
+		[
+			{
+				text: instance.name ?? host,
+				type: "label",
 			},
-		}],
-	}, {
-		type: 'link',
-		text: i18n.ts.aboutMisskey,
-		to: '/about-calckey',
-	}], ev.currentTarget ?? ev.target, {
-		align: 'left',
-	});
+			{
+				type: "link",
+				text: i18n.ts.instanceInfo,
+				icon: "ph-info ph-bold ph-lg",
+				to: "/about",
+			},
+			null,
+			{
+				type: "parent",
+				text: i18n.ts.help,
+				icon: "ph-question ph-bold ph-lg",
+				children: [
+					{
+						type: "link",
+						to: "/mfm-cheat-sheet",
+						text: i18n.ts._mfm.cheatSheet,
+						icon: "ph-code ph-bold ph-lg",
+					},
+					{
+						type: "link",
+						to: "/scratchpad",
+						text: i18n.ts.scratchpad,
+						icon: "ph-terminal-window ph-bold ph-lg",
+					},
+					{
+						type: "link",
+						to: "/api-console",
+						text: "API Console",
+						icon: "ph-terminal-window ph-bold ph-lg",
+					},
+					null,
+					{
+						text: i18n.ts.document,
+						icon: "ph-question ph-bold ph-lg",
+						action: () => {
+							window.open(
+								"https://misskey-hub.net/help.html",
+								"_blank"
+							);
+						},
+					},
+				],
+			},
+			{
+				type: "link",
+				text: i18n.ts.aboutMisskey,
+				to: "/about-calckey",
+			},
+		],
+		ev.currentTarget ?? ev.target,
+		{
+			align: "left",
+		}
+	);
 }
 </script>
 
diff --git a/packages/client/src/ui/classic.vue b/packages/client/src/ui/classic.vue
index 4992ae3c4..a721ffd0b 100644
--- a/packages/client/src/ui/classic.vue
+++ b/packages/client/src/ui/classic.vue
@@ -1,58 +1,78 @@
 <template>
-<div class="gbhvwtnk" :class="{ wallpaper }" :style="`--globalHeaderHeight:${globalHeaderHeight}px`">
-	<XHeaderMenu v-if="showMenuOnTop" v-get-size="(w, h) => globalHeaderHeight = h"/>
+	<div
+		class="gbhvwtnk"
+		:class="{ wallpaper }"
+		:style="`--globalHeaderHeight:${globalHeaderHeight}px`"
+	>
+		<XHeaderMenu
+			v-if="showMenuOnTop"
+			v-get-size="(w, h) => (globalHeaderHeight = h)"
+		/>
 
-	<div class="columns" :class="{ fullView, withGlobalHeader: showMenuOnTop }">
-		<div v-if="!showMenuOnTop" class="sidebar">
-			<XSidebar/>
-		</div>
-		<div v-else ref="widgetsLeft" class="widgets left">
-			<XWidgets :place="'left'" @mounted="attachSticky(widgetsLeft)"/>
-		</div>
-
-		<main class="main" :style="{ background: pageMetadata?.value?.bg }" @contextmenu.stop="onContextmenu">
-			<div class="content">
-				<RouterView/>
-			</div>
-		</main>
-
-		<div v-if="isDesktop" ref="widgetsRight" class="widgets right">
-			<XWidgets :place="null" @mounted="attachSticky(widgetsRight)"/>
-		</div>
-	</div>
-
-	<transition :name="$store.state.animation ? 'tray-back' : ''">
 		<div
-			v-if="widgetsShowing"
-			class="tray-back _modalBg"
-			@click="widgetsShowing = false"
-			@touchstart.passive="widgetsShowing = false"
-		></div>
-	</transition>
+			class="columns"
+			:class="{ fullView, withGlobalHeader: showMenuOnTop }"
+		>
+			<div v-if="!showMenuOnTop" class="sidebar">
+				<XSidebar />
+			</div>
+			<div v-else ref="widgetsLeft" class="widgets left">
+				<XWidgets
+					:place="'left'"
+					@mounted="attachSticky(widgetsLeft)"
+				/>
+			</div>
 
-	<transition :name="$store.state.animation ? 'tray' : ''">
-		<XWidgets v-if="widgetsShowing" class="tray"/>
-	</transition>
+			<main
+				class="main"
+				:style="{ background: pageMetadata?.value?.bg }"
+				@contextmenu.stop="onContextmenu"
+			>
+				<div class="content">
+					<RouterView />
+				</div>
+			</main>
 
-	<XCommon/>
-</div>
+			<div v-if="isDesktop" ref="widgetsRight" class="widgets right">
+				<XWidgets :place="null" @mounted="attachSticky(widgetsRight)" />
+			</div>
+		</div>
+
+		<transition :name="$store.state.animation ? 'tray-back' : ''">
+			<div
+				v-if="widgetsShowing"
+				class="tray-back _modalBg"
+				@click="widgetsShowing = false"
+				@touchstart.passive="widgetsShowing = false"
+			></div>
+		</transition>
+
+		<transition :name="$store.state.animation ? 'tray' : ''">
+			<XWidgets v-if="widgetsShowing" class="tray" />
+		</transition>
+
+		<XCommon />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, markRaw, ref, onMounted, provide } from 'vue';
-import XSidebar from './classic.sidebar.vue';
-import XCommon from './_common_/common.vue';
-import type { ComputedRef } from 'vue';
-import type { PageMetadata } from '@/scripts/page-metadata';
-import { instanceName } from '@/config';
-import { StickySidebar } from '@/scripts/sticky-sidebar';
-import * as os from '@/os';
-import { mainRouter } from '@/router';
-import { provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
-const XHeaderMenu = defineAsyncComponent(() => import('./classic.header.vue'));
-const XWidgets = defineAsyncComponent(() => import('./classic.widgets.vue'));
+import { defineAsyncComponent, markRaw, ref, onMounted, provide } from "vue";
+import XSidebar from "./classic.sidebar.vue";
+import XCommon from "./_common_/common.vue";
+import type { ComputedRef } from "vue";
+import type { PageMetadata } from "@/scripts/page-metadata";
+import { instanceName } from "@/config";
+import { StickySidebar } from "@/scripts/sticky-sidebar";
+import * as os from "@/os";
+import { mainRouter } from "@/router";
+import {
+	provideMetadataReceiver,
+	setPageMetadata,
+} from "@/scripts/page-metadata";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+const XHeaderMenu = defineAsyncComponent(() => import("./classic.header.vue"));
+const XWidgets = defineAsyncComponent(() => import("./classic.widgets.vue"));
 
 const DESKTOP_THRESHOLD = 1100;
 
@@ -62,86 +82,123 @@ let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 let widgetsShowing = $ref(false);
 let fullView = $ref(false);
 let globalHeaderHeight = $ref(0);
-const wallpaper = localStorage.getItem('wallpaper') != null;
-const showMenuOnTop = $computed(() => defaultStore.state.menuDisplay === 'top');
+const wallpaper = localStorage.getItem("wallpaper") != null;
+const showMenuOnTop = $computed(() => defaultStore.state.menuDisplay === "top");
 let live2d = $ref<HTMLIFrameElement>();
 let widgetsLeft = $ref();
 let widgetsRight = $ref();
 
-provide('router', mainRouter);
+provide("router", mainRouter);
 provideMetadataReceiver((info) => {
 	pageMetadata = info;
 	if (pageMetadata.value) {
 		document.title = `${pageMetadata.value.title} | ${instanceName}`;
 	}
 });
-provide('shouldHeaderThin', showMenuOnTop);
-provide('shouldSpacerMin', true);
+provide("shouldHeaderThin", showMenuOnTop);
+provide("shouldSpacerMin", true);
 
 function attachSticky(el) {
-	const sticky = new StickySidebar(el, defaultStore.state.menuDisplay === 'top' ? 0 : 16, defaultStore.state.menuDisplay === 'top' ? 60 : 0); // TODO: ヘッダーの高さを60pxと決め打ちしているのを直す
-	window.addEventListener('scroll', () => {
-		sticky.calc(window.scrollY);
-	}, { passive: true });
+	const sticky = new StickySidebar(
+		el,
+		defaultStore.state.menuDisplay === "top" ? 0 : 16,
+		defaultStore.state.menuDisplay === "top" ? 60 : 0
+	); // TODO: ヘッダーの高さを60pxと決め打ちしているのを直す
+	window.addEventListener(
+		"scroll",
+		() => {
+			sticky.calc(window.scrollY);
+		},
+		{ passive: true }
+	);
 }
 
 function top() {
-	window.scroll({ top: 0, behavior: 'smooth' });
+	window.scroll({ top: 0, behavior: "smooth" });
 }
 
 function onContextmenu(ev: MouseEvent) {
 	const isLink = (el: HTMLElement) => {
-		if (el.tagName === 'A') return true;
+		if (el.tagName === "A") return true;
 		if (el.parentElement) {
 			return isLink(el.parentElement);
 		}
 	};
 	if (isLink(ev.target)) return;
-	if (['INPUT', 'TEXTAREA', 'IMG', 'VIDEO', 'CANVAS'].includes(ev.target.tagName) || ev.target.attributes['contenteditable']) return;
-	if (window.getSelection().toString() !== '') return;
+	if (
+		["INPUT", "TEXTAREA", "IMG", "VIDEO", "CANVAS"].includes(
+			ev.target.tagName
+		) ||
+		ev.target.attributes["contenteditable"]
+	)
+		return;
+	if (window.getSelection().toString() !== "") return;
 	const path = mainRouter.getCurrentPath();
-	os.contextMenu([{
-		type: 'label',
-		text: path,
-	}, {
-		icon: fullView ? 'ph-arrows-in-simple ph-bold ph-lg' : 'ph-arrows-out-simple ph-bold ph-lg',
-		text: fullView ? i18n.ts.quitFullView : i18n.ts.fullView,
-		action: () => {
-			fullView = !fullView;
-		},
-	}, {
-		icon: 'ph-browser ph-bold ph-lg',
-		text: i18n.ts.openInWindow,
-		action: () => {
-			os.pageWindow(path);
-		},
-	}], ev);
+	os.contextMenu(
+		[
+			{
+				type: "label",
+				text: path,
+			},
+			{
+				icon: fullView
+					? "ph-arrows-in-simple ph-bold ph-lg"
+					: "ph-arrows-out-simple ph-bold ph-lg",
+				text: fullView ? i18n.ts.quitFullView : i18n.ts.fullView,
+				action: () => {
+					fullView = !fullView;
+				},
+			},
+			{
+				icon: "ph-browser ph-bold ph-lg",
+				text: i18n.ts.openInWindow,
+				action: () => {
+					os.pageWindow(path);
+				},
+			},
+		],
+		ev
+	);
 }
 
 if (window.innerWidth < 1024) {
-	localStorage.setItem('ui', 'default');
+	localStorage.setItem("ui", "default");
 	location.reload();
 }
 
-document.documentElement.style.overflowY = 'scroll';
+document.documentElement.style.overflowY = "scroll";
 
 if (defaultStore.state.widgets.length === 0) {
-	defaultStore.set('widgets', [{
-		name: 'calendar',
-		id: 'a', place: null, data: {},
-	}, {
-		name: 'notifications',
-		id: 'b', place: null, data: {},
-	}, {
-		name: 'trends',
-		id: 'c', place: null, data: {},
-	}]);
+	defaultStore.set("widgets", [
+		{
+			name: "calendar",
+			id: "a",
+			place: null,
+			data: {},
+		},
+		{
+			name: "notifications",
+			id: "b",
+			place: null,
+			data: {},
+		},
+		{
+			name: "trends",
+			id: "c",
+			place: null,
+			data: {},
+		},
+	]);
 }
 
 onMounted(() => {
-	window.addEventListener('resize', () => {
-		isDesktop = (window.innerWidth >= DESKTOP_THRESHOLD);
-	}, { passive: true });
+	window.addEventListener(
+		"resize",
+		() => {
+			isDesktop = window.innerWidth >= DESKTOP_THRESHOLD;
+		},
+		{ passive: true }
+	);
 });
 </script>
 
@@ -150,7 +207,8 @@ onMounted(() => {
 .tray-leave-active {
 	opacity: 1;
 	transform: translateX(0);
-	transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1), opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
+	transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1),
+		opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
 }
 .tray-enter-from,
 .tray-leave-active {
@@ -189,7 +247,7 @@ onMounted(() => {
 
 		&.fullView {
 			margin: 0;
-		
+
 			> .sidebar {
 				display: none;
 			}
diff --git a/packages/client/src/ui/classic.widgets.vue b/packages/client/src/ui/classic.widgets.vue
index 0f0854a05..2c7f16ece 100644
--- a/packages/client/src/ui/classic.widgets.vue
+++ b/packages/client/src/ui/classic.widgets.vue
@@ -1,29 +1,56 @@
 <template>
 	<div class="ddiqwdnk">
-		<MkAd class="a" :prefer="['widget']"/>
-		<XWidgets class="widgets" :edit="editMode" :widgets="$store.reactiveState.widgets.value.filter(w => w.place === place)" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
-		<button v-if="editMode" class="_textButton edit" style="font-size: 0.9em;" @click="editMode = false"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}</button>
-		<button v-else class="_textButton edit" style="font-size: 0.9em;" @click="editMode = true"><i class="ph-pencil ph-bold ph-lg"></i> {{ i18n.ts.editWidgets }}</button>
+		<MkAd class="a" :prefer="['widget']" />
+		<XWidgets
+			class="widgets"
+			:edit="editMode"
+			:widgets="
+				$store.reactiveState.widgets.value.filter(
+					(w) => w.place === place
+				)
+			"
+			@add-widget="addWidget"
+			@remove-widget="removeWidget"
+			@update-widget="updateWidget"
+			@update-widgets="updateWidgets"
+			@exit="editMode = false"
+		/>
+		<button
+			v-if="editMode"
+			class="_textButton edit"
+			style="font-size: 0.9em"
+			@click="editMode = false"
+		>
+			<i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}
+		</button>
+		<button
+			v-else
+			class="_textButton edit"
+			style="font-size: 0.9em"
+			@click="editMode = true"
+		>
+			<i class="ph-pencil ph-bold ph-lg"></i> {{ i18n.ts.editWidgets }}
+		</button>
 	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
-import XWidgets from '@/components/MkWidgets.vue';
-import { i18n } from '@/i18n';
+import { defineComponent, defineAsyncComponent } from "vue";
+import XWidgets from "@/components/MkWidgets.vue";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
-		XWidgets
+		XWidgets,
 	},
 
 	props: {
 		place: {
 			type: String,
-		}
+		},
 	},
 
-	emits: ['mounted'],
+	emits: ["mounted"],
 
 	data() {
 		return {
@@ -33,35 +60,50 @@ export default defineComponent({
 	},
 
 	mounted() {
-		this.$emit('mounted', this.$el);
+		this.$emit("mounted", this.$el);
 	},
 
 	methods: {
 		addWidget(widget) {
-			this.$store.set('widgets', [{
-				...widget,
-				place: this.place,
-			}, ...this.$store.state.widgets]);
+			this.$store.set("widgets", [
+				{
+					...widget,
+					place: this.place,
+				},
+				...this.$store.state.widgets,
+			]);
 		},
 
 		removeWidget(widget) {
-			this.$store.set('widgets', this.$store.state.widgets.filter(w => w.id !== widget.id));
+			this.$store.set(
+				"widgets",
+				this.$store.state.widgets.filter((w) => w.id !== widget.id)
+			);
 		},
 
 		updateWidget({ id, data }) {
-			this.$store.set('widgets', this.$store.state.widgets.map(w => w.id === id ? {
-				...w,
-				data,
-			} : w));
+			this.$store.set(
+				"widgets",
+				this.$store.state.widgets.map((w) =>
+					w.id === id
+						? {
+								...w,
+								data,
+						  }
+						: w
+				)
+			);
 		},
 
 		updateWidgets(widgets) {
-			this.$store.set('widgets', [
-				...this.$store.state.widgets.filter(w => w.place !== this.place),
-				...widgets
+			this.$store.set("widgets", [
+				...this.$store.state.widgets.filter(
+					(w) => w.place !== this.place
+				),
+				...widgets,
 			]);
-		}
-	}
+		},
+	},
 });
 </script>
 
diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index 137496c8e..debf5d0e4 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -1,97 +1,188 @@
 <template>
-<div
-	class="mk-deck" :class="[{ isMobile }]"
->
-	<XSidebar v-if="!isMobile"/>
+	<div class="mk-deck" :class="[{ isMobile }]">
+		<XSidebar v-if="!isMobile" />
 
-	<div class="main">
-		<XStatusBars class="statusbars"/>
-		<div ref="columnsEl" class="columns" :class="deckStore.reactiveState.columnAlign.value" @contextmenu.self.prevent="onContextmenu">
-			<template v-for="ids in layout">
-				<!-- sectionを利用しているのは、deck.vue側でcolumnに対してfirst-of-typeを効かせるため -->
-				<section
-					v-if="ids.length > 1"
-					class="folder column"
-					:style="columns.filter(c => ids.includes(c.id)).some(c => c.flexible) ? { flex: 1, minWidth: '350px' } : { width: Math.max(...columns.filter(c => ids.includes(c.id)).map(c => c.width)) + 'px' }"
-				>
-					<DeckColumnCore v-for="id in ids" :ref="id" :key="id" :column="columns.find(c => c.id === id)" :is-stacked="true" @parent-focus="moveFocus(id, $event)"/>
-				</section>
-				<DeckColumnCore
-					v-else
-					:ref="ids[0]"
-					:key="ids[0]"
-					class="column"
-					:column="columns.find(c => c.id === ids[0])"
-					:is-stacked="false"
-					:style="columns.find(c => c.id === ids[0])!.flexible ? { flex: 1, minWidth: '350px' } : { width: columns.find(c => c.id === ids[0])!.width + 'px' }"
-					@parent-focus="moveFocus(ids[0], $event)"
-				/>
-			</template>
-			<div v-if="layout.length === 0" class="intro _panel">
-				<div>{{ i18n.ts._deck.introduction }}</div>
-				<MkButton primary class="add" @click="addColumn">{{ i18n.ts._deck.addColumn }}</MkButton>
-				<div>{{ i18n.ts._deck.introduction2 }}</div>
-			</div>
-			<div class="sideMenu">
-				<div class="top">
-					<button v-tooltip.noDelay.left="`${i18n.ts._deck.profile}: ${deckStore.state.profile}`" class="_button button" @click="changeProfile"><i class="ph-caret-down ph-bold ph-lg"></i></button>
-					<button v-if="deckStore.state.profile !== 'default'" v-tooltip.noDelay.left="i18n.ts._deck.deleteProfile" class="_button button" @click="deleteProfile"><i class="ph-trash ph-bold ph-lg"></i></button>
+		<div class="main">
+			<XStatusBars class="statusbars" />
+			<div
+				ref="columnsEl"
+				class="columns"
+				:class="deckStore.reactiveState.columnAlign.value"
+				@contextmenu.self.prevent="onContextmenu"
+			>
+				<template v-for="ids in layout">
+					<!-- sectionを利用しているのは、deck.vue側でcolumnに対してfirst-of-typeを効かせるため -->
+					<section
+						v-if="ids.length > 1"
+						class="folder column"
+						:style="
+							columns
+								.filter((c) => ids.includes(c.id))
+								.some((c) => c.flexible)
+								? { flex: 1, minWidth: '350px' }
+								: {
+										width:
+											Math.max(
+												...columns
+													.filter((c) =>
+														ids.includes(c.id)
+													)
+													.map((c) => c.width)
+											) + 'px',
+								  }
+						"
+					>
+						<DeckColumnCore
+							v-for="id in ids"
+							:ref="id"
+							:key="id"
+							:column="columns.find((c) => c.id === id)"
+							:is-stacked="true"
+							@parent-focus="moveFocus(id, $event)"
+						/>
+					</section>
+					<DeckColumnCore
+						v-else
+						:ref="ids[0]"
+						:key="ids[0]"
+						class="column"
+						:column="columns.find((c) => c.id === ids[0])"
+						:is-stacked="false"
+						:style="columns.find(c => c.id === ids[0])!.flexible ? { flex: 1, minWidth: '350px' } : { width: columns.find(c => c.id === ids[0])!.width + 'px' }"
+						@parent-focus="moveFocus(ids[0], $event)"
+					/>
+				</template>
+				<div v-if="layout.length === 0" class="intro _panel">
+					<div>{{ i18n.ts._deck.introduction }}</div>
+					<MkButton primary class="add" @click="addColumn">{{
+						i18n.ts._deck.addColumn
+					}}</MkButton>
+					<div>{{ i18n.ts._deck.introduction2 }}</div>
 				</div>
-				<div class="middle">
-					<button v-tooltip.noDelay.left="i18n.ts._deck.addColumn" class="_button button new" @click="addColumn"><i class="ph-plus ph-bold ph-lg"></i></button>
-				</div>
-				<div class="bottom">
-					<button v-tooltip.noDelay.left="i18n.ts.settings" class="_button button settings" @click="showSettings"><i class="ph-gear-six ph-bold ph-lg"></i></button>
+				<div class="sideMenu">
+					<div class="top">
+						<button
+							v-tooltip.noDelay.left="
+								`${i18n.ts._deck.profile}: ${deckStore.state.profile}`
+							"
+							class="_button button"
+							@click="changeProfile"
+						>
+							<i class="ph-caret-down ph-bold ph-lg"></i>
+						</button>
+						<button
+							v-if="deckStore.state.profile !== 'default'"
+							v-tooltip.noDelay.left="i18n.ts._deck.deleteProfile"
+							class="_button button"
+							@click="deleteProfile"
+						>
+							<i class="ph-trash ph-bold ph-lg"></i>
+						</button>
+					</div>
+					<div class="middle">
+						<button
+							v-tooltip.noDelay.left="i18n.ts._deck.addColumn"
+							class="_button button new"
+							@click="addColumn"
+						>
+							<i class="ph-plus ph-bold ph-lg"></i>
+						</button>
+					</div>
+					<div class="bottom">
+						<button
+							v-tooltip.noDelay.left="i18n.ts.settings"
+							class="_button button settings"
+							@click="showSettings"
+						>
+							<i class="ph-gear-six ph-bold ph-lg"></i>
+						</button>
+					</div>
 				</div>
 			</div>
 		</div>
+
+		<div v-if="isMobile" class="buttons">
+			<button
+				class="button nav _button"
+				@click="drawerMenuShowing = true"
+			>
+				<i class="ph-list ph-bold ph-lg"></i
+				><span v-if="menuIndicated" class="indicator"
+					><i class="ph-circle ph-fill"></i
+				></span>
+			</button>
+			<button class="button home _button" @click="mainRouter.push('/')">
+				<i class="ph-house ph-bold ph-lg"></i>
+			</button>
+			<button
+				class="button notifications _button"
+				@click="mainRouter.push('/my/notifications')"
+			>
+				<i class="ph-bell ph-bold ph-lg"></i
+				><span v-if="$i?.hasUnreadNotification" class="indicator"
+					><i class="ph-circle ph-fill"></i
+				></span>
+			</button>
+			<button class="button post _button" @click="os.post()">
+				<i class="ph-pencil ph-bold ph-lg"></i>
+			</button>
+		</div>
+
+		<transition :name="$store.state.animation ? 'menu-back' : ''">
+			<div
+				v-if="drawerMenuShowing"
+				class="menu-back _modalBg"
+				@click="drawerMenuShowing = false"
+				@touchstart.passive="drawerMenuShowing = false"
+			></div>
+		</transition>
+
+		<transition :name="$store.state.animation ? 'menu' : ''">
+			<XDrawerMenu v-if="drawerMenuShowing" class="menu" />
+		</transition>
+
+		<XCommon />
 	</div>
-
-	<div v-if="isMobile" class="buttons">
-		<button class="button nav _button" @click="drawerMenuShowing = true"><i class="ph-list ph-bold ph-lg"></i><span v-if="menuIndicated" class="indicator"><i class="ph-circle ph-fill"></i></span></button>
-		<button class="button home _button" @click="mainRouter.push('/')"><i class="ph-house ph-bold ph-lg"></i></button>
-		<button class="button notifications _button" @click="mainRouter.push('/my/notifications')"><i class="ph-bell ph-bold ph-lg"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="ph-circle ph-fill"></i></span></button>
-		<button class="button post _button" @click="os.post()"><i class="ph-pencil ph-bold ph-lg"></i></button>
-	</div>
-
-	<transition :name="$store.state.animation ? 'menu-back' : ''">
-		<div
-			v-if="drawerMenuShowing"
-			class="menu-back _modalBg"
-			@click="drawerMenuShowing = false"
-			@touchstart.passive="drawerMenuShowing = false"
-		></div>
-	</transition>
-
-	<transition :name="$store.state.animation ? 'menu' : ''">
-		<XDrawerMenu v-if="drawerMenuShowing" class="menu"/>
-	</transition>
-
-	<XCommon/>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, onMounted, provide, ref, watch } 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';
-import DeckColumnCore from '@/ui/deck/column-core.vue';
-import XSidebar from '@/ui/_common_/navbar.vue';
-import XDrawerMenu from '@/ui/_common_/navbar-for-mobile.vue';
-import MkButton from '@/components/MkButton.vue';
-import { getScrollContainer } from '@/scripts/scroll';
-import * as os from '@/os';
-import { navbarItemDef } from '@/navbar';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
-import { mainRouter } from '@/router';
-import { unisonReload } from '@/scripts/unison-reload';
-const XStatusBars = defineAsyncComponent(() => import('@/ui/_common_/statusbars.vue'));
+import {
+	computed,
+	defineAsyncComponent,
+	onMounted,
+	provide,
+	ref,
+	watch,
+} 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";
+import DeckColumnCore from "@/ui/deck/column-core.vue";
+import XSidebar from "@/ui/_common_/navbar.vue";
+import XDrawerMenu from "@/ui/_common_/navbar-for-mobile.vue";
+import MkButton from "@/components/MkButton.vue";
+import { getScrollContainer } from "@/scripts/scroll";
+import * as os from "@/os";
+import { navbarItemDef } from "@/navbar";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { mainRouter } from "@/router";
+import { unisonReload } from "@/scripts/unison-reload";
+const XStatusBars = defineAsyncComponent(
+	() => import("@/ui/_common_/statusbars.vue")
+);
 
 mainRouter.navHook = (path, flag): boolean => {
-	if (flag === 'forcePage') return false;
-	const noMainColumn = !deckStore.state.columns.some(x => x.type === 'main');
+	if (flag === "forcePage") return false;
+	const noMainColumn = !deckStore.state.columns.some(
+		(x) => x.type === "main"
+	);
 	if (deckStore.state.navWindow || noMainColumn) {
 		os.pageWindow(path);
 		return true;
@@ -100,13 +191,13 @@ mainRouter.navHook = (path, flag): boolean => {
 };
 
 const isMobile = ref(window.innerWidth <= 500);
-window.addEventListener('resize', () => {
+window.addEventListener("resize", () => {
 	isMobile.value = window.innerWidth <= 500;
 });
 
 const drawerMenuShowing = ref(false);
 
-const route = 'TODO';
+const route = "TODO";
 watch(route, () => {
 	drawerMenuShowing.value = false;
 });
@@ -122,27 +213,28 @@ const menuIndicated = computed(() => {
 });
 
 function showSettings() {
-	os.pageWindow('/settings/deck');
+	os.pageWindow("/settings/deck");
 }
 
 let columnsEl = $ref<HTMLElement>();
 
 const addColumn = async (ev) => {
 	const columns = [
-		'main',
-		'widgets',
-		'notifications',
-		'tl',
-		'antenna',
-		'list',
-		'mentions',
-		'direct',
+		"main",
+		"widgets",
+		"notifications",
+		"tl",
+		"antenna",
+		"list",
+		"mentions",
+		"direct",
 	];
 
 	const { canceled, result: column } = await os.select({
 		title: i18n.ts._deck.addColumn,
-		items: columns.map(column => ({
-			value: column, text: i18n.t('_deck._columns.' + column),
+		items: columns.map((column) => ({
+			value: column,
+			text: i18n.t("_deck._columns." + column),
 		})),
 	});
 	if (canceled) return;
@@ -150,75 +242,92 @@ const addColumn = async (ev) => {
 	addColumnToStore({
 		type: column,
 		id: uuid(),
-		name: i18n.t('_deck._columns.' + column),
+		name: i18n.t("_deck._columns." + column),
 		width: 330,
 	});
 };
 
 const onContextmenu = (ev) => {
-	os.contextMenu([{
-		text: i18n.ts._deck.addColumn,
-		action: addColumn,
-	}], ev);
+	os.contextMenu(
+		[
+			{
+				text: i18n.ts._deck.addColumn,
+				action: addColumn,
+			},
+		],
+		ev
+	);
 };
 
-document.documentElement.style.overflowY = 'hidden';
-document.documentElement.style.scrollBehavior = 'auto';
-window.addEventListener('wheel', (ev) => {
+document.documentElement.style.overflowY = "hidden";
+document.documentElement.style.scrollBehavior = "auto";
+window.addEventListener("wheel", (ev) => {
 	if (ev.target === columnsEl && ev.deltaX === 0) {
 		columnsEl.scrollLeft += ev.deltaY;
-	} else if (getScrollContainer(ev.target as HTMLElement) == null && ev.deltaX === 0) {
+	} else if (
+		getScrollContainer(ev.target as HTMLElement) == null &&
+		ev.deltaX === 0
+	) {
 		columnsEl.scrollLeft += ev.deltaY;
 	}
 });
 loadDeck();
 
-function moveFocus(id: string, direction: 'up' | 'down' | 'left' | 'right') {
+function moveFocus(id: string, direction: "up" | "down" | "left" | "right") {
 	// TODO??
 }
 
 function changeProfile(ev: MouseEvent) {
-	const items = ref([{
-		text: deckStore.state.profile,
-		active: true.valueOf,
-	}]);
-	getProfiles().then(profiles => {
-		items.value = [{
+	const items = ref([
+		{
 			text: deckStore.state.profile,
 			active: true.valueOf,
-		}, ...(profiles.filter(k => k !== deckStore.state.profile).map(k => ({
-			text: k,
-			action: () => {
-				deckStore.set('profile', k);
-				unisonReload();
+		},
+	]);
+	getProfiles().then((profiles) => {
+		items.value = [
+			{
+				text: deckStore.state.profile,
+				active: true.valueOf,
 			},
-		}))), null, {
-			text: i18n.ts._deck.newProfile,
-			icon: 'ph-plus ph-bold ph-lg',
-			action: async () => {
-				const { canceled, result: name } = await os.inputText({
-					title: i18n.ts._deck.profile,
-					allowEmpty: false,
-				});
-				if (canceled) return;
+			...profiles
+				.filter((k) => k !== deckStore.state.profile)
+				.map((k) => ({
+					text: k,
+					action: () => {
+						deckStore.set("profile", k);
+						unisonReload();
+					},
+				})),
+			null,
+			{
+				text: i18n.ts._deck.newProfile,
+				icon: "ph-plus ph-bold ph-lg",
+				action: async () => {
+					const { canceled, result: name } = await os.inputText({
+						title: i18n.ts._deck.profile,
+						allowEmpty: false,
+					});
+					if (canceled) return;
 
-				deckStore.set('profile', name);
-				unisonReload();
+					deckStore.set("profile", name);
+					unisonReload();
+				},
 			},
-		}];
+		];
 	});
 	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
 async function deleteProfile() {
 	const { canceled } = await os.confirm({
-		type: 'warning',
-		text: i18n.t('deleteAreYouSure', { x: deckStore.state.profile }),
+		type: "warning",
+		text: i18n.t("deleteAreYouSure", { x: deckStore.state.profile }),
 	});
 	if (canceled) return;
 
 	deleteProfile_(deckStore.state.profile);
-	deckStore.set('profile', 'default');
+	deckStore.set("profile", "default");
 	unisonReload();
 }
 </script>
@@ -228,7 +337,8 @@ async function deleteProfile() {
 .menu-leave-active {
 	opacity: 1;
 	transform: translateX(0);
-	transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1), opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
+	transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1),
+		opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
 }
 .menu-enter-from,
 .menu-leave-active {
@@ -299,7 +409,8 @@ async function deleteProfile() {
 					flex-direction: column;
 
 					> *:not(:last-of-type) {
-						border-bottom: solid var(--deckDividerThickness) var(--bg);
+						border-bottom: solid var(--deckDividerThickness)
+							var(--bg);
 					}
 				}
 			}
@@ -324,7 +435,9 @@ async function deleteProfile() {
 				justify-content: center;
 				width: 44px;
 
-				> .top, > .middle, > .bottom {
+				> .top,
+				> .middle,
+				> .bottom {
 					> .button {
 						display: block;
 						width: 100%;
diff --git a/packages/client/src/ui/deck/antenna-column.vue b/packages/client/src/ui/deck/antenna-column.vue
index d06b79c96..9dba7bd48 100644
--- a/packages/client/src/ui/deck/antenna-column.vue
+++ b/packages/client/src/ui/deck/antenna-column.vue
@@ -1,20 +1,32 @@
 <template>
-<XColumn :menu="menu" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
-	<template #header>
-		<i class="ph-television ph-bold ph-lg"></i><span style="margin-left: 8px;">{{ column.name }}</span>
-	</template>
+	<XColumn
+		:menu="menu"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="($event) => emit('parent-focus', $event)"
+	>
+		<template #header>
+			<i class="ph-television ph-bold ph-lg"></i
+			><span style="margin-left: 8px">{{ column.name }}</span>
+		</template>
 
-	<XTimeline v-if="column.antennaId" ref="timeline" src="antenna" :antenna="column.antennaId" @after="() => emit('loaded')"/>
-</XColumn>
+		<XTimeline
+			v-if="column.antennaId"
+			ref="timeline"
+			src="antenna"
+			:antenna="column.antennaId"
+			@after="() => emit('loaded')"
+		/>
+	</XColumn>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import XColumn from './column.vue';
-import { updateColumn, Column } from './deck-store';
-import XTimeline from '@/components/MkTimeline.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { onMounted } from "vue";
+import XColumn from "./column.vue";
+import { updateColumn, Column } from "./deck-store";
+import XTimeline from "@/components/MkTimeline.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	column: Column;
@@ -22,8 +34,8 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'loaded'): void;
-	(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
+	(ev: "loaded"): void;
+	(ev: "parent-focus", direction: "up" | "down" | "left" | "right"): void;
 }>();
 
 let timeline = $ref<InstanceType<typeof XTimeline>>();
@@ -35,11 +47,12 @@ onMounted(() => {
 });
 
 async function setAntenna() {
-	const antennas = await os.api('antennas/list');
+	const antennas = await os.api("antennas/list");
 	const { canceled, result: antenna } = await os.select({
 		title: i18n.ts.selectAntenna,
-		items: antennas.map(x => ({
-			value: x, text: x.name,
+		items: antennas.map((x) => ({
+			value: x,
+			text: x.name,
 		})),
 		default: props.column.antennaId,
 	});
@@ -49,11 +62,13 @@ async function setAntenna() {
 	});
 }
 
-const menu = [{
-	icon: 'ph-pencil ph-bold ph-lg',
-	text: i18n.ts.selectAntenna,
-	action: setAntenna,
-}];
+const menu = [
+	{
+		icon: "ph-pencil ph-bold ph-lg",
+		text: i18n.ts.selectAntenna,
+		action: setAntenna,
+	},
+];
 
 /*
 function focus() {
@@ -66,5 +81,4 @@ defineExpose({
 */
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/ui/deck/column-core.vue b/packages/client/src/ui/deck/column-core.vue
index 30c0dc5e1..4a4afcb07 100644
--- a/packages/client/src/ui/deck/column-core.vue
+++ b/packages/client/src/ui/deck/column-core.vue
@@ -1,27 +1,67 @@
 <template>
-<!-- TODO: リファクタの余地がありそう -->
-<div v-if="!column">たぶん見えちゃいけないやつ</div>
-<XMainColumn v-else-if="column.type === 'main'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
-<XWidgetsColumn v-else-if="column.type === 'widgets'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
-<XNotificationsColumn v-else-if="column.type === 'notifications'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
-<XTlColumn v-else-if="column.type === 'tl'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
-<XListColumn v-else-if="column.type === 'list'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
-<XAntennaColumn v-else-if="column.type === 'antenna'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
-<XMentionsColumn v-else-if="column.type === 'mentions'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
-<XDirectColumn v-else-if="column.type === 'direct'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
+	<!-- TODO: リファクタの余地がありそう -->
+	<div v-if="!column">たぶん見えちゃいけないやつ</div>
+	<XMainColumn
+		v-else-if="column.type === 'main'"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="emit('parent-focus', $event)"
+	/>
+	<XWidgetsColumn
+		v-else-if="column.type === 'widgets'"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="emit('parent-focus', $event)"
+	/>
+	<XNotificationsColumn
+		v-else-if="column.type === 'notifications'"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="emit('parent-focus', $event)"
+	/>
+	<XTlColumn
+		v-else-if="column.type === 'tl'"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="emit('parent-focus', $event)"
+	/>
+	<XListColumn
+		v-else-if="column.type === 'list'"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="emit('parent-focus', $event)"
+	/>
+	<XAntennaColumn
+		v-else-if="column.type === 'antenna'"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="emit('parent-focus', $event)"
+	/>
+	<XMentionsColumn
+		v-else-if="column.type === 'mentions'"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="emit('parent-focus', $event)"
+	/>
+	<XDirectColumn
+		v-else-if="column.type === 'direct'"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="emit('parent-focus', $event)"
+	/>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XMainColumn from './main-column.vue';
-import XTlColumn from './tl-column.vue';
-import XAntennaColumn from './antenna-column.vue';
-import XListColumn from './list-column.vue';
-import XNotificationsColumn from './notifications-column.vue';
-import XWidgetsColumn from './widgets-column.vue';
-import XMentionsColumn from './mentions-column.vue';
-import XDirectColumn from './direct-column.vue';
-import { Column } from './deck-store';
+import {} from "vue";
+import XMainColumn from "./main-column.vue";
+import XTlColumn from "./tl-column.vue";
+import XAntennaColumn from "./antenna-column.vue";
+import XListColumn from "./list-column.vue";
+import XNotificationsColumn from "./notifications-column.vue";
+import XWidgetsColumn from "./widgets-column.vue";
+import XMentionsColumn from "./mentions-column.vue";
+import XDirectColumn from "./direct-column.vue";
+import { Column } from "./deck-store";
 
 defineProps<{
 	column?: Column;
@@ -29,6 +69,6 @@ defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
+	(ev: "parent-focus", direction: "up" | "down" | "left" | "right"): void;
 }>();
 </script>
diff --git a/packages/client/src/ui/deck/column.vue b/packages/client/src/ui/deck/column.vue
index 058d47544..425f00293 100644
--- a/packages/client/src/ui/deck/column.vue
+++ b/packages/client/src/ui/deck/column.vue
@@ -1,91 +1,131 @@
 <template>
-<!-- sectionを利用しているのは、deck.vue側でcolumnに対してfirst-of-typeを効かせるため -->
-<section
-	v-hotkey="keymap" class="dnpfarvg _narrow_"
-	:class="{ paged: isMainColumn, naked, active, isStacked, draghover, dragging, dropready }"
-	@dragover.prevent.stop="onDragover"
-	@dragleave="onDragleave"
-	@drop.prevent.stop="onDrop"
->
-	<header
-		:class="{ indicated }"
-		draggable="true"
-		@click="goTop"
-		@dragstart="onDragstart"
-		@dragend="onDragend"
-		@contextmenu.prevent.stop="onContextmenu"
+	<!-- sectionを利用しているのは、deck.vue側でcolumnに対してfirst-of-typeを効かせるため -->
+	<section
+		v-hotkey="keymap"
+		class="dnpfarvg _narrow_"
+		:class="{
+			paged: isMainColumn,
+			naked,
+			active,
+			isStacked,
+			draghover,
+			dragging,
+			dropready,
+		}"
+		@dragover.prevent.stop="onDragover"
+		@dragleave="onDragleave"
+		@drop.prevent.stop="onDrop"
 	>
-		<button v-if="isStacked && !isMainColumn" class="toggleActive _button" @click="toggleActive">
-			<template v-if="active"><i class="ph-caret-up ph-bold ph-lg"></i></template>
-			<template v-else><i class="ph-caret-down ph-bold ph-lg"></i></template>
-		</button>
-		<div class="action">
-			<slot name="action"></slot>
+		<header
+			:class="{ indicated }"
+			draggable="true"
+			@click="goTop"
+			@dragstart="onDragstart"
+			@dragend="onDragend"
+			@contextmenu.prevent.stop="onContextmenu"
+		>
+			<button
+				v-if="isStacked && !isMainColumn"
+				class="toggleActive _button"
+				@click="toggleActive"
+			>
+				<template v-if="active"
+					><i class="ph-caret-up ph-bold ph-lg"></i
+				></template>
+				<template v-else
+					><i class="ph-caret-down ph-bold ph-lg"></i
+				></template>
+			</button>
+			<div class="action">
+				<slot name="action"></slot>
+			</div>
+			<span class="header"><slot name="header"></slot></span>
+			<button
+				v-tooltip="i18n.ts.settings"
+				class="menu _button"
+				@click.stop="showSettingsMenu"
+			>
+				<i class="ph-dots-three-outline-vertical ph-bold ph-lg"></i>
+			</button>
+		</header>
+		<div v-show="active" ref="body">
+			<slot></slot>
 		</div>
-		<span class="header"><slot name="header"></slot></span>
-		<button v-tooltip="i18n.ts.settings" class="menu _button" @click.stop="showSettingsMenu"><i class="ph-dots-three-outline-vertical ph-bold ph-lg"></i></button>
-	</header>
-	<div v-show="active" ref="body">
-		<slot></slot>
-	</div>
-</section>
+	</section>
 </template>
 
 <script lang="ts" setup>
-import { onBeforeUnmount, onMounted, provide, Ref, watch } from 'vue';
-import { updateColumn, swapLeftColumn, swapRightColumn, swapUpColumn, swapDownColumn, stackLeftColumn, popRightColumn, removeColumn, swapColumn, Column , deckStore } from './deck-store';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { MenuItem } from '@/types/menu';
+import { onBeforeUnmount, onMounted, provide, Ref, watch } from "vue";
+import {
+	updateColumn,
+	swapLeftColumn,
+	swapRightColumn,
+	swapUpColumn,
+	swapDownColumn,
+	stackLeftColumn,
+	popRightColumn,
+	removeColumn,
+	swapColumn,
+	Column,
+	deckStore,
+} from "./deck-store";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { MenuItem } from "@/types/menu";
 
-provide('shouldHeaderThin', true);
-provide('shouldOmitHeaderTitle', true);
-provide('shouldSpacerMin', true);
+provide("shouldHeaderThin", true);
+provide("shouldOmitHeaderTitle", true);
+provide("shouldSpacerMin", true);
 
-const props = withDefaults(defineProps<{
-	column: Column;
-	isStacked?: boolean;
-	naked?: boolean;
-	indicated?: boolean;
-	menu?: MenuItem[];
-}>(), {
-	isStacked: false,
-	naked: false,
-	indicated: false,
-});
+const props = withDefaults(
+	defineProps<{
+		column: Column;
+		isStacked?: boolean;
+		naked?: boolean;
+		indicated?: boolean;
+		menu?: MenuItem[];
+	}>(),
+	{
+		isStacked: false,
+		naked: false,
+		indicated: false,
+	}
+);
 
 const emit = defineEmits<{
-	(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
-	(ev: 'change-active-state', v: boolean): void;
+	(ev: "parent-focus", direction: "up" | "down" | "left" | "right"): void;
+	(ev: "change-active-state", v: boolean): void;
 }>();
 
 let body = $ref<HTMLDivElement>();
 
 let dragging = $ref(false);
-watch($$(dragging), v => os.deckGlobalEvents.emit(v ? 'column.dragStart' : 'column.dragEnd'));
+watch($$(dragging), (v) =>
+	os.deckGlobalEvents.emit(v ? "column.dragStart" : "column.dragEnd")
+);
 
 let draghover = $ref(false);
 let dropready = $ref(false);
 
-const isMainColumn = $computed(() => props.column.type === 'main');
+const isMainColumn = $computed(() => props.column.type === "main");
 const active = $computed(() => props.column.active !== false);
-watch($$(active), v => emit('change-active-state', v));
+watch($$(active), (v) => emit("change-active-state", v));
 
 const keymap = $computed(() => ({
-	'shift+up': () => emit('parent-focus', 'up'),
-	'shift+down': () => emit('parent-focus', 'down'),
-	'shift+left': () => emit('parent-focus', 'left'),
-	'shift+right': () => emit('parent-focus', 'right'),
+	"shift+up": () => emit("parent-focus", "up"),
+	"shift+down": () => emit("parent-focus", "down"),
+	"shift+left": () => emit("parent-focus", "left"),
+	"shift+right": () => emit("parent-focus", "right"),
 }));
 
 onMounted(() => {
-	os.deckGlobalEvents.on('column.dragStart', onOtherDragStart);
-	os.deckGlobalEvents.on('column.dragEnd', onOtherDragEnd);
+	os.deckGlobalEvents.on("column.dragStart", onOtherDragStart);
+	os.deckGlobalEvents.on("column.dragEnd", onOtherDragEnd);
 });
 
 onBeforeUnmount(() => {
-	os.deckGlobalEvents.off('column.dragStart', onOtherDragStart);
-	os.deckGlobalEvents.off('column.dragEnd', onOtherDragEnd);
+	os.deckGlobalEvents.off("column.dragStart", onOtherDragStart);
+	os.deckGlobalEvents.off("column.dragEnd", onOtherDragEnd);
 });
 
 function onOtherDragStart() {
@@ -104,79 +144,97 @@ function toggleActive() {
 }
 
 function getMenu() {
-	let items = [{
-		icon: 'ph-gear-six ph-bold ph-lg',
-		text: i18n.ts._deck.configureColumn,
-		action: async () => {
-			const { canceled, result } = await os.form(props.column.name, {
-				name: {
-					type: 'string',
-					label: i18n.ts.name,
-					default: props.column.name,
+	let items = [
+		{
+			icon: "ph-gear-six ph-bold ph-lg",
+			text: i18n.ts._deck.configureColumn,
+			action: async () => {
+				const { canceled, result } = await os.form(props.column.name, {
+					name: {
+						type: "string",
+						label: i18n.ts.name,
+						default: props.column.name,
+					},
+					width: {
+						type: "number",
+						label: i18n.ts.width,
+						default: props.column.width,
+					},
+					flexible: {
+						type: "boolean",
+						label: i18n.ts.flexible,
+						default: props.column.flexible,
+					},
+				});
+				if (canceled) return;
+				updateColumn(props.column.id, result);
+			},
+		},
+		{
+			type: "parent",
+			text: i18n.ts.move + "...",
+			icon: "ph-arrows-out-cardinal ph-bold ph-lg",
+			children: [
+				{
+					icon: "ph-caret-left ph-bold ph-lg",
+					text: i18n.ts._deck.swapLeft,
+					action: () => {
+						swapLeftColumn(props.column.id);
+					},
 				},
-				width: {
-					type: 'number',
-					label: i18n.ts.width,
-					default: props.column.width,
+				{
+					icon: "ph-caret-right ph-bold ph-lg",
+					text: i18n.ts._deck.swapRight,
+					action: () => {
+						swapRightColumn(props.column.id);
+					},
 				},
-				flexible: {
-					type: 'boolean',
-					label: i18n.ts.flexible,
-					default: props.column.flexible,
-				},
-			});
-			if (canceled) return;
-			updateColumn(props.column.id, result);
+				props.isStacked
+					? {
+							icon: "ph-caret-up ph-bold ph-lg",
+							text: i18n.ts._deck.swapUp,
+							action: () => {
+								swapUpColumn(props.column.id);
+							},
+					  }
+					: undefined,
+				props.isStacked
+					? {
+							icon: "ph-caret-down ph-bold ph-lg",
+							text: i18n.ts._deck.swapDown,
+							action: () => {
+								swapDownColumn(props.column.id);
+							},
+					  }
+					: undefined,
+			],
 		},
-	}, {
-		type: 'parent',
-		text: i18n.ts.move + '...',
-		icon: 'ph-arrows-out-cardinal ph-bold ph-lg',
-		children: [{
-			icon: 'ph-caret-left ph-bold ph-lg',
-			text: i18n.ts._deck.swapLeft,
+		{
+			icon: "ph-copy ph-bold ph-lg",
+			text: i18n.ts._deck.stackLeft,
 			action: () => {
-				swapLeftColumn(props.column.id);
+				stackLeftColumn(props.column.id);
 			},
-		}, {
-			icon: 'ph-caret-right ph-bold ph-lg',
-			text: i18n.ts._deck.swapRight,
-			action: () => {
-				swapRightColumn(props.column.id);
-			},
-		}, props.isStacked ? {
-			icon: 'ph-caret-up ph-bold ph-lg',
-			text: i18n.ts._deck.swapUp,
-			action: () => {
-				swapUpColumn(props.column.id);
-			},
-		} : undefined, props.isStacked ? {
-			icon: 'ph-caret-down ph-bold ph-lg',
-			text: i18n.ts._deck.swapDown,
-			action: () => {
-				swapDownColumn(props.column.id);
-			},
-		} : undefined],
-	}, {
-		icon: 'ph-copy ph-bold ph-lg',
-		text: i18n.ts._deck.stackLeft,
-		action: () => {
-			stackLeftColumn(props.column.id);
 		},
-	}, props.isStacked ? {
-		icon: 'ph-browser ph-bold ph-lg',
-		text: i18n.ts._deck.popRight,
-		action: () => {
-			popRightColumn(props.column.id);
+		props.isStacked
+			? {
+					icon: "ph-browser ph-bold ph-lg",
+					text: i18n.ts._deck.popRight,
+					action: () => {
+						popRightColumn(props.column.id);
+					},
+			  }
+			: undefined,
+		null,
+		{
+			icon: "ph-trash ph-bold ph-lg",
+			text: i18n.ts.remove,
+			danger: true,
+			action: () => {
+				removeColumn(props.column.id);
+			},
 		},
-	} : undefined, null, {
-		icon: 'ph-trash ph-bold ph-lg',
-		text: i18n.ts.remove,
-		danger: true,
-		action: () => {
-			removeColumn(props.column.id);
-		},
-	}];
+	];
 
 	if (props.menu) {
 		items.unshift(null);
@@ -197,12 +255,12 @@ function onContextmenu(ev: MouseEvent) {
 function goTop() {
 	body.scrollTo({
 		top: 0,
-		behavior: 'smooth',
+		behavior: "smooth",
 	});
 }
 
 function onDragstart(ev) {
-	ev.dataTransfer.effectAllowed = 'move';
+	ev.dataTransfer.effectAllowed = "move";
 	ev.dataTransfer.setData(_DATA_TRANSFER_DECK_COLUMN_, props.column.id);
 
 	// Chromeのバグで、Dragstartハンドラ内ですぐにDOMを変更する(=リアクティブなプロパティを変更する)とDragが終了してしまう
@@ -220,11 +278,12 @@ function onDragover(ev) {
 	// 自分自身がドラッグされている場合
 	if (dragging) {
 		// 自分自身にはドロップさせない
-		ev.dataTransfer.dropEffect = 'none';
+		ev.dataTransfer.dropEffect = "none";
 	} else {
-		const isDeckColumn = ev.dataTransfer.types[0] === _DATA_TRANSFER_DECK_COLUMN_;
+		const isDeckColumn =
+			ev.dataTransfer.types[0] === _DATA_TRANSFER_DECK_COLUMN_;
 
-		ev.dataTransfer.dropEffect = isDeckColumn ? 'move' : 'none';
+		ev.dataTransfer.dropEffect = isDeckColumn ? "move" : "none";
 
 		if (isDeckColumn) draghover = true;
 	}
@@ -236,10 +295,10 @@ function onDragleave() {
 
 function onDrop(ev) {
 	draghover = false;
-	os.deckGlobalEvents.emit('column.dragEnd');
+	os.deckGlobalEvents.emit("column.dragEnd");
 
 	const id = ev.dataTransfer.getData(_DATA_TRANSFER_DECK_COLUMN_);
-	if (id != null && id !== '') {
+	if (id != null && id !== "") {
 		swapColumn(props.column.id, id);
 	}
 }
@@ -249,7 +308,7 @@ function onDrop(ev) {
 .dnpfarvg {
 	header {
 		.ph-lg {
-			vertical-align: -.24em;
+			vertical-align: -0.24em;
 		}
 	}
 }
@@ -340,7 +399,8 @@ function onDrop(ev) {
 		box-shadow: 0 1px 0 0 var(--panelHeaderDivider);
 		cursor: pointer;
 
-		&, * {
+		&,
+		* {
 			user-select: none;
 		}
 
@@ -377,7 +437,8 @@ function onDrop(ev) {
 			}
 		}
 
-		> .toggleActive, > .action {
+		> .toggleActive,
+		> .action {
 			margin-left: -16px;
 		}
 
diff --git a/packages/client/src/ui/deck/direct-column.vue b/packages/client/src/ui/deck/direct-column.vue
index cf84ad517..67ebca16f 100644
--- a/packages/client/src/ui/deck/direct-column.vue
+++ b/packages/client/src/ui/deck/direct-column.vue
@@ -1,16 +1,26 @@
 <template>
-<XColumn :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
-	<template #header><i class="ph-envelope-simple-open ph-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
+	<XColumn
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="($event) => emit('parent-focus', $event)"
+	>
+		<template #header
+			><i
+				class="ph-envelope-simple-open ph-bold ph-lg"
+				style="margin-right: 8px"
+			></i
+			>{{ column.name }}</template
+		>
 
-	<XNotes :pagination="pagination"/>
-</XColumn>
+		<XNotes :pagination="pagination" />
+	</XColumn>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XColumn from './column.vue';
-import XNotes from '@/components/MkNotes.vue';
-import { Column } from './deck-store';
+import {} from "vue";
+import XColumn from "./column.vue";
+import XNotes from "@/components/MkNotes.vue";
+import { Column } from "./deck-store";
 
 defineProps<{
 	column: Column;
@@ -18,14 +28,14 @@ defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
+	(ev: "parent-focus", direction: "up" | "down" | "left" | "right"): void;
 }>();
 
 const pagination = {
-	endpoint: 'notes/mentions' as const,
+	endpoint: "notes/mentions" as const,
 	limit: 10,
 	params: {
-		visibility: 'specified'
+		visibility: "specified",
 	},
 };
 </script>
diff --git a/packages/client/src/ui/deck/list-column.vue b/packages/client/src/ui/deck/list-column.vue
index 9247285fd..e4c820d6f 100644
--- a/packages/client/src/ui/deck/list-column.vue
+++ b/packages/client/src/ui/deck/list-column.vue
@@ -1,20 +1,32 @@
 <template>
-<XColumn :menu="menu" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
-	<template #header>
-		<i class="ph-list-bullets ph-bold ph-lg"></i><span style="margin-left: 8px;">{{ column.name }}</span>
-	</template>
+	<XColumn
+		:menu="menu"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="($event) => emit('parent-focus', $event)"
+	>
+		<template #header>
+			<i class="ph-list-bullets ph-bold ph-lg"></i
+			><span style="margin-left: 8px">{{ column.name }}</span>
+		</template>
 
-	<XTimeline v-if="column.listId" ref="timeline" src="list" :list="column.listId" @after="() => emit('loaded')"/>
-</XColumn>
+		<XTimeline
+			v-if="column.listId"
+			ref="timeline"
+			src="list"
+			:list="column.listId"
+			@after="() => emit('loaded')"
+		/>
+	</XColumn>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XColumn from './column.vue';
-import { updateColumn, Column } from './deck-store';
-import XTimeline from '@/components/MkTimeline.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import XColumn from "./column.vue";
+import { updateColumn, Column } from "./deck-store";
+import XTimeline from "@/components/MkTimeline.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	column: Column;
@@ -22,8 +34,8 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'loaded'): void;
-	(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
+	(ev: "loaded"): void;
+	(ev: "parent-focus", direction: "up" | "down" | "left" | "right"): void;
 }>();
 
 let timeline = $ref<InstanceType<typeof XTimeline>>();
@@ -33,11 +45,12 @@ if (props.column.listId == null) {
 }
 
 async function setList() {
-	const lists = await os.api('users/lists/list');
+	const lists = await os.api("users/lists/list");
 	const { canceled, result: list } = await os.select({
 		title: i18n.ts.selectList,
-		items: lists.map(x => ({
-			value: x, text: x.name,
+		items: lists.map((x) => ({
+			value: x,
+			text: x.name,
 		})),
 		default: props.column.listId,
 	});
@@ -47,12 +60,13 @@ async function setList() {
 	});
 }
 
-const menu = [{
-	icon: 'ph-pencil ph-bold ph-lg',
-	text: i18n.ts.selectList,
-	action: setList,
-}];
+const menu = [
+	{
+		icon: "ph-pencil ph-bold ph-lg",
+		text: i18n.ts.selectList,
+		action: setList,
+	},
+];
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/ui/deck/main-column.vue b/packages/client/src/ui/deck/main-column.vue
index 358a4a9be..357395a4e 100644
--- a/packages/client/src/ui/deck/main-column.vue
+++ b/packages/client/src/ui/deck/main-column.vue
@@ -1,24 +1,36 @@
 <template>
-<XColumn v-if="deckStore.state.alwaysShowMainColumn || mainRouter.currentRoute.value.name !== 'index'" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
-	<template #header>
-		<template v-if="pageMetadata?.value">
-			<i :class="pageMetadata?.value.icon"></i>
-			{{ pageMetadata?.value.title }}
+	<XColumn
+		v-if="
+			deckStore.state.alwaysShowMainColumn ||
+			mainRouter.currentRoute.value.name !== 'index'
+		"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="($event) => emit('parent-focus', $event)"
+	>
+		<template #header>
+			<template v-if="pageMetadata?.value">
+				<i :class="pageMetadata?.value.icon"></i>
+				{{ pageMetadata?.value.title }}
+			</template>
 		</template>
-	</template>
 
-	<RouterView @contextmenu.stop="onContextmenu"/>
-</XColumn>
+		<RouterView @contextmenu.stop="onContextmenu" />
+	</XColumn>
 </template>
 
 <script lang="ts" setup>
-import { ComputedRef, provide } from 'vue';
-import XColumn from './column.vue';
-import { deckStore, Column } from '@/ui/deck/deck-store';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
-import { mainRouter } from '@/router';
-import { PageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
+import { ComputedRef, provide } from "vue";
+import XColumn from "./column.vue";
+import { deckStore, Column } from "@/ui/deck/deck-store";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { mainRouter } from "@/router";
+import {
+	PageMetadata,
+	provideMetadataReceiver,
+	setPageMetadata,
+} from "@/scripts/page-metadata";
 
 defineProps<{
 	column: Column;
@@ -26,12 +38,12 @@ defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
+	(ev: "parent-focus", direction: "up" | "down" | "left" | "right"): void;
 }>();
 
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 
-provide('router', mainRouter);
+provide("router", mainRouter);
 provideMetadataReceiver((info) => {
 	pageMetadata = info;
 });
@@ -45,24 +57,36 @@ function onContextmenu(ev: MouseEvent) {
 	if (!ev.target) return;
 
 	const isLink = (el: HTMLElement) => {
-		if (el.tagName === 'A') return true;
+		if (el.tagName === "A") return true;
 		if (el.parentElement) {
 			return isLink(el.parentElement);
 		}
 	};
 	if (isLink(ev.target as HTMLElement)) return;
-	if (['INPUT', 'TEXTAREA', 'IMG', 'VIDEO', 'CANVAS'].includes((ev.target as HTMLElement).tagName) || (ev.target as HTMLElement).attributes['contenteditable']) return;
-	if (window.getSelection()?.toString() !== '') return;
+	if (
+		["INPUT", "TEXTAREA", "IMG", "VIDEO", "CANVAS"].includes(
+			(ev.target as HTMLElement).tagName
+		) ||
+		(ev.target as HTMLElement).attributes["contenteditable"]
+	)
+		return;
+	if (window.getSelection()?.toString() !== "") return;
 	const path = mainRouter.currentRoute.value.path;
-	os.contextMenu([{
-		type: 'label',
-		text: path,
-	}, {
-		icon: 'ph-browser ph-bold ph-lg',
-		text: i18n.ts.openInWindow,
-		action: () => {
-			os.pageWindow(path);
-		},
-	}], ev);
+	os.contextMenu(
+		[
+			{
+				type: "label",
+				text: path,
+			},
+			{
+				icon: "ph-browser ph-bold ph-lg",
+				text: i18n.ts.openInWindow,
+				action: () => {
+					os.pageWindow(path);
+				},
+			},
+		],
+		ev
+	);
 }
 </script>
diff --git a/packages/client/src/ui/deck/mentions-column.vue b/packages/client/src/ui/deck/mentions-column.vue
index 5510416d1..83eff7297 100644
--- a/packages/client/src/ui/deck/mentions-column.vue
+++ b/packages/client/src/ui/deck/mentions-column.vue
@@ -1,16 +1,23 @@
 <template>
-<XColumn :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
-	<template #header><i class="ph-at ph-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
+	<XColumn
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="($event) => emit('parent-focus', $event)"
+	>
+		<template #header
+			><i class="ph-at ph-bold ph-lg" style="margin-right: 8px"></i
+			>{{ column.name }}</template
+		>
 
-	<XNotes :pagination="pagination"/>
-</XColumn>
+		<XNotes :pagination="pagination" />
+	</XColumn>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XColumn from './column.vue';
-import XNotes from '@/components/MkNotes.vue';
-import { Column } from './deck-store';
+import {} from "vue";
+import XColumn from "./column.vue";
+import XNotes from "@/components/MkNotes.vue";
+import { Column } from "./deck-store";
 
 defineProps<{
 	column: Column;
@@ -18,11 +25,11 @@ defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
+	(ev: "parent-focus", direction: "up" | "down" | "left" | "right"): void;
 }>();
 
 const pagination = {
-	endpoint: 'notes/mentions' as const,
+	endpoint: "notes/mentions" as const,
 	limit: 10,
 };
 </script>
diff --git a/packages/client/src/ui/deck/notifications-column.vue b/packages/client/src/ui/deck/notifications-column.vue
index 7e0e85a46..d003f08ef 100644
--- a/packages/client/src/ui/deck/notifications-column.vue
+++ b/packages/client/src/ui/deck/notifications-column.vue
@@ -1,19 +1,27 @@
 <template>
-<XColumn :column="column" :is-stacked="isStacked" :menu="menu" @parent-focus="$event => emit('parent-focus', $event)">
-	<template #header><i class="ph-bell ph-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
+	<XColumn
+		:column="column"
+		:is-stacked="isStacked"
+		:menu="menu"
+		@parent-focus="($event) => emit('parent-focus', $event)"
+	>
+		<template #header
+			><i class="ph-bell ph-bold ph-lg" style="margin-right: 8px"></i
+			>{{ column.name }}</template
+		>
 
-	<XNotifications :include-types="column.includingTypes"/>
-</XColumn>
+		<XNotifications :include-types="column.includingTypes" />
+	</XColumn>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent } from 'vue';
-import XColumn from './column.vue';
-import { updateColumn } from './deck-store';
-import type { Column } from './deck-store';
-import XNotifications from '@/components/MkNotifications.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { defineAsyncComponent } from "vue";
+import XColumn from "./column.vue";
+import { updateColumn } from "./deck-store";
+import type { Column } from "./deck-store";
+import XNotifications from "@/components/MkNotifications.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	column: Column;
@@ -21,25 +29,34 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
+	(ev: "parent-focus", direction: "up" | "down" | "left" | "right"): void;
 }>();
 
 function func(): void {
-	os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSettingWindow.vue')), {
-		includingTypes: props.column.includingTypes,
-	}, {
-		done: async (res) => {
-			const { includingTypes } = res;
-			updateColumn(props.column.id, {
-				includingTypes: includingTypes,
-			});
+	os.popup(
+		defineAsyncComponent(
+			() => import("@/components/MkNotificationSettingWindow.vue")
+		),
+		{
+			includingTypes: props.column.includingTypes,
 		},
-	}, 'closed');
+		{
+			done: async (res) => {
+				const { includingTypes } = res;
+				updateColumn(props.column.id, {
+					includingTypes: includingTypes,
+				});
+			},
+		},
+		"closed"
+	);
 }
 
-const menu = [{
-	icon: 'ph-pencil ph-bold ph-lg',
-	text: i18n.ts.notificationSetting,
-	action: func,
-}];
+const menu = [
+	{
+		icon: "ph-pencil ph-bold ph-lg",
+		text: i18n.ts.notificationSetting,
+		action: func,
+	},
+];
 </script>
diff --git a/packages/client/src/ui/deck/tl-column.vue b/packages/client/src/ui/deck/tl-column.vue
index 280ab6c35..7e801dc99 100644
--- a/packages/client/src/ui/deck/tl-column.vue
+++ b/packages/client/src/ui/deck/tl-column.vue
@@ -1,33 +1,57 @@
 <template>
-<XColumn :menu="menu" :column="column" :is-stacked="isStacked" :indicated="indicated" @change-active-state="onChangeActiveState" @parent-focus="$event => emit('parent-focus', $event)">
-	<template #header>
-		<i v-if="column.tl === 'home'" class="ph-house ph-bold ph-lg"></i>
-		<i v-else-if="column.tl === 'local'" class="ph-chats-circle ph-bold ph-lg"></i>
-		<i v-else-if="column.tl === 'social'" class="ph-share-network ph-bold ph-lg"></i>
-		<i v-else-if="column.tl === 'global'" class="ph-planet ph-bold ph-lg"></i>
-		<span style="margin-left: 8px;">{{ column.name }}</span>
-	</template>
+	<XColumn
+		:menu="menu"
+		:column="column"
+		:is-stacked="isStacked"
+		:indicated="indicated"
+		@change-active-state="onChangeActiveState"
+		@parent-focus="($event) => emit('parent-focus', $event)"
+	>
+		<template #header>
+			<i v-if="column.tl === 'home'" class="ph-house ph-bold ph-lg"></i>
+			<i
+				v-else-if="column.tl === 'local'"
+				class="ph-chats-circle ph-bold ph-lg"
+			></i>
+			<i
+				v-else-if="column.tl === 'social'"
+				class="ph-share-network ph-bold ph-lg"
+			></i>
+			<i
+				v-else-if="column.tl === 'global'"
+				class="ph-planet ph-bold ph-lg"
+			></i>
+			<span style="margin-left: 8px">{{ column.name }}</span>
+		</template>
 
-	<div v-if="disabled" class="iwaalbte">
-		<p>
-			<i class="ph-minus-circle ph-bold ph-lg"></i>
-			{{ i18n.t('disabled-timeline.title') }}
-		</p>
-		<p class="desc">{{ i18n.t('disabled-timeline.description') }}</p>
-	</div>
-	<XTimeline v-else-if="column.tl" ref="timeline" :key="column.tl" :src="column.tl" @after="() => emit('loaded')" @queue="queueUpdated" @note="onNote"/>
-</XColumn>
+		<div v-if="disabled" class="iwaalbte">
+			<p>
+				<i class="ph-minus-circle ph-bold ph-lg"></i>
+				{{ i18n.t("disabled-timeline.title") }}
+			</p>
+			<p class="desc">{{ i18n.t("disabled-timeline.description") }}</p>
+		</div>
+		<XTimeline
+			v-else-if="column.tl"
+			ref="timeline"
+			:key="column.tl"
+			:src="column.tl"
+			@after="() => emit('loaded')"
+			@queue="queueUpdated"
+			@note="onNote"
+		/>
+	</XColumn>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import XColumn from './column.vue';
-import { removeColumn, updateColumn, Column } from './deck-store';
-import XTimeline from '@/components/MkTimeline.vue';
-import * as os from '@/os';
-import { $i } from '@/account';
-import { instance } from '@/instance';
-import { i18n } from '@/i18n';
+import { onMounted } from "vue";
+import XColumn from "./column.vue";
+import { removeColumn, updateColumn, Column } from "./deck-store";
+import XTimeline from "@/components/MkTimeline.vue";
+import * as os from "@/os";
+import { $i } from "@/account";
+import { instance } from "@/instance";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	column: Column;
@@ -35,8 +59,8 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'loaded'): void;
-	(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
+	(ev: "loaded"): void;
+	(ev: "parent-focus", direction: "up" | "down" | "left" | "right"): void;
 }>();
 
 let disabled = $ref(false);
@@ -47,27 +71,43 @@ onMounted(() => {
 	if (props.column.tl == null) {
 		setType();
 	} else if ($i) {
-		disabled = !$i.isModerator && !$i.isAdmin && (
-			instance.disableLocalTimeline && ['local', 'social'].includes(props.column.tl) ||
-			instance.disableRecommendedTimeline && ['recommended'].includes(props.column.tl) ||
-			instance.disableGlobalTimeline && ['global'].includes(props.column.tl));
+		disabled =
+			!$i.isModerator &&
+			!$i.isAdmin &&
+			((instance.disableLocalTimeline &&
+				["local", "social"].includes(props.column.tl)) ||
+				(instance.disableRecommendedTimeline &&
+					["recommended"].includes(props.column.tl)) ||
+				(instance.disableGlobalTimeline &&
+					["global"].includes(props.column.tl)));
 	}
 });
 
 async function setType() {
 	const { canceled, result: src } = await os.select({
 		title: i18n.ts.timeline,
-		items: [{
-			value: 'home' as const, text: i18n.ts._timelines.home,
-		}, {
-			value: 'local' as const, text: i18n.ts._timelines.local,
-		}, {
-			value: 'recommended' as const, text: i18n.ts._timelines.recommended,
-		}, {
-			value: 'social' as const, text: i18n.ts._timelines.social,
-		}, {
-			value: 'global' as const, text: i18n.ts._timelines.global,
-		}],
+		items: [
+			{
+				value: "home" as const,
+				text: i18n.ts._timelines.home,
+			},
+			{
+				value: "local" as const,
+				text: i18n.ts._timelines.local,
+			},
+			{
+				value: "recommended" as const,
+				text: i18n.ts._timelines.recommended,
+			},
+			{
+				value: "social" as const,
+				text: i18n.ts._timelines.social,
+			},
+			{
+				value: "global" as const,
+				text: i18n.ts._timelines.global,
+			},
+		],
 	});
 	if (canceled) {
 		if (props.column.tl == null) {
@@ -100,11 +140,13 @@ function onChangeActiveState(state) {
 	}
 }
 
-const menu = [{
-	icon: 'ph-pencil ph-bold ph-lg',
-	text: i18n.ts.timeline,
-	action: setType,
-}];
+const menu = [
+	{
+		icon: "ph-pencil ph-bold ph-lg",
+		text: i18n.ts.timeline,
+		action: setType,
+	},
+];
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/ui/deck/widgets-column.vue b/packages/client/src/ui/deck/widgets-column.vue
index 50a53ec63..8bfd40cf4 100644
--- a/packages/client/src/ui/deck/widgets-column.vue
+++ b/packages/client/src/ui/deck/widgets-column.vue
@@ -1,20 +1,48 @@
 <template>
-	<XColumn :menu="menu" :naked="true" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
-		<template #header><i class="ph-browser ph-bold ph-lg" style="margin-right: 8px;"></i>{{ column.name }}</template>
+	<XColumn
+		:menu="menu"
+		:naked="true"
+		:column="column"
+		:is-stacked="isStacked"
+		@parent-focus="($event) => emit('parent-focus', $event)"
+	>
+		<template #header
+			><i class="ph-browser ph-bold ph-lg" style="margin-right: 8px"></i
+			>{{ column.name }}</template
+		>
 		<div class="wtdtxvec">
-			<MkAd class="a" :prefer="['widget']"/>
-			<div v-if="!(column.widgets && column.widgets.length > 0) && !edit" class="intro">{{ i18n.ts._deck.widgetsIntroduction }}</div>
-			<XWidgets :edit="edit" :widgets="column.widgets" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="edit = false"/>
+			<MkAd class="a" :prefer="['widget']" />
+			<div
+				v-if="!(column.widgets && column.widgets.length > 0) && !edit"
+				class="intro"
+			>
+				{{ i18n.ts._deck.widgetsIntroduction }}
+			</div>
+			<XWidgets
+				:edit="edit"
+				:widgets="column.widgets"
+				@add-widget="addWidget"
+				@remove-widget="removeWidget"
+				@update-widget="updateWidget"
+				@update-widgets="updateWidgets"
+				@exit="edit = false"
+			/>
 		</div>
 	</XColumn>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XColumn from './column.vue';
-import { addColumnWidget, Column, removeColumnWidget, setColumnWidgets, updateColumnWidget } from './deck-store';
-import XWidgets from '@/components/MkWidgets.vue';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import XColumn from "./column.vue";
+import {
+	addColumnWidget,
+	Column,
+	removeColumnWidget,
+	setColumnWidgets,
+	updateColumnWidget,
+} from "./deck-store";
+import XWidgets from "@/components/MkWidgets.vue";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	column: Column;
@@ -22,7 +50,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
+	(ev: "parent-focus", direction: "up" | "down" | "left" | "right"): void;
 }>();
 
 let edit = $ref(false);
@@ -47,11 +75,13 @@ function func() {
 	edit = !edit;
 }
 
-const menu = [{
-	icon: 'ph-pencil ph-bold ph-lg',
-	text: i18n.ts.editWidgets,
-	action: func,
-}];
+const menu = [
+	{
+		icon: "ph-pencil ph-bold ph-lg",
+		text: i18n.ts.editWidgets,
+		action: func,
+	},
+];
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 391234097..2fb0adb3a 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -1,114 +1,197 @@
 <template>
-<div class="dkgtipfy" :class="{ wallpaper, isMobile }">
-	<XSidebar v-if="!isMobile" class="sidebar"/>
+	<div class="dkgtipfy" :class="{ wallpaper, isMobile }">
+		<XSidebar v-if="!isMobile" class="sidebar" />
 
-	<MkStickyContainer class="contents">
-		<template #header><XStatusBars :class="$style.statusbars"/></template>
-		<main id="maincontent" style="min-width: 0;" :style="{ background: pageMetadata?.value?.bg }" @contextmenu.stop="onContextmenu">
-			<div :class="$style.content">
-				<RouterView/>
-			</div>
-			<div :class="$style.spacer"></div>
-		</main>
-	</MkStickyContainer>
+		<MkStickyContainer class="contents">
+			<template #header
+				><XStatusBars :class="$style.statusbars"
+			/></template>
+			<main
+				id="maincontent"
+				style="min-width: 0"
+				:style="{ background: pageMetadata?.value?.bg }"
+				@contextmenu.stop="onContextmenu"
+			>
+				<div :class="$style.content">
+					<RouterView />
+				</div>
+				<div :class="$style.spacer"></div>
+			</main>
+		</MkStickyContainer>
 
-	<div v-if="isDesktop" ref="widgetsEl" class="widgets">
-		<XWidgets @mounted="attachSticky"/>
+		<div v-if="isDesktop" ref="widgetsEl" class="widgets">
+			<XWidgets @mounted="attachSticky" />
+		</div>
+
+		<button
+			v-if="!isDesktop && !isMobile"
+			class="widgetButton _button"
+			@click="widgetsShowing = true"
+		>
+			<i class="ph-stack ph-bold ph-lg"></i>
+		</button>
+
+		<div v-if="isMobile" class="buttons">
+			<button
+				class="button nav _button"
+				@click="drawerMenuShowing = true"
+			>
+				<div class="button-wrapper">
+					<i class="ph-list ph-bold ph-lg"></i
+					><span v-if="menuIndicated" class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</div>
+			</button>
+			<button
+				class="button home _button"
+				@click="
+					mainRouter.currentRoute.value.name === 'index'
+						? top()
+						: mainRouter.push('/');
+					updateButtonState();
+				"
+			>
+				<div
+					class="button-wrapper"
+					:class="buttonAnimIndex === 0 ? 'on' : ''"
+				>
+					<i class="ph-house ph-bold ph-lg"></i>
+				</div>
+			</button>
+			<button
+				class="button notifications _button"
+				@click="
+					mainRouter.push('/my/notifications');
+					updateButtonState();
+				"
+			>
+				<div
+					class="button-wrapper"
+					:class="buttonAnimIndex === 1 ? 'on' : ''"
+				>
+					<i class="ph-bell ph-bold ph-lg"></i
+					><span v-if="$i?.hasUnreadNotification" class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</div>
+			</button>
+			<button
+				class="button messaging _button"
+				@click="
+					mainRouter.push('/my/messaging');
+					updateButtonState();
+				"
+			>
+				<div
+					class="button-wrapper"
+					:class="buttonAnimIndex === 2 ? 'on' : ''"
+				>
+					<i class="ph-chats-teardrop ph-bold ph-lg"></i
+					><span
+						v-if="$i?.hasUnreadMessagingMessage"
+						class="indicator"
+						><i class="ph-circle ph-fill"></i
+					></span>
+				</div>
+			</button>
+			<button
+				class="button widget _button"
+				@click="widgetsShowing = true"
+			>
+				<div class="button-wrapper">
+					<i class="ph-stack ph-bold ph-lg"></i>
+				</div>
+			</button>
+		</div>
+
+		<button
+			v-if="isMobile && mainRouter.currentRoute.value.name === 'index'"
+			ref="postButton"
+			class="postButton button post _button"
+			@click="os.post()"
+		>
+			<i class="ph-pencil ph-bold ph-lg"></i>
+		</button>
+		<button
+			v-if="
+				isMobile && mainRouter.currentRoute.value.name === 'messaging'
+			"
+			ref="postButton"
+			class="postButton button post _button"
+			@click="messagingStart"
+		>
+			<i class="ph-user-plus ph-bold ph-lg"></i>
+		</button>
+
+		<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
+			<div
+				v-if="drawerMenuShowing"
+				class="menuDrawer-back _modalBg"
+				@click="drawerMenuShowing = false"
+				@touchstart.passive="drawerMenuShowing = false"
+			></div>
+		</transition>
+
+		<transition :name="$store.state.animation ? 'menuDrawer' : ''">
+			<XDrawerMenu v-if="drawerMenuShowing" class="menuDrawer" />
+		</transition>
+
+		<transition :name="$store.state.animation ? 'widgetsDrawer-back' : ''">
+			<div
+				v-if="widgetsShowing"
+				class="widgetsDrawer-back _modalBg"
+				@click="widgetsShowing = false"
+				@touchstart.passive="widgetsShowing = false"
+			></div>
+		</transition>
+
+		<transition :name="$store.state.animation ? 'widgetsDrawer' : ''">
+			<XWidgets v-if="widgetsShowing" class="widgetsDrawer" />
+		</transition>
+
+		<XCommon />
 	</div>
-
-	<button v-if="!isDesktop && !isMobile" class="widgetButton _button" @click="widgetsShowing = true"><i class="ph-stack ph-bold ph-lg"></i></button>
-
-	<div v-if="isMobile" class="buttons">
-		<button class="button nav _button" @click="drawerMenuShowing = true">
-			<div class="button-wrapper">
-				<i class="ph-list ph-bold ph-lg"></i><span v-if="menuIndicated" class="indicator"><i class="ph-circle ph-fill"></i></span>
-			</div>
-		</button>
-		<button class="button home _button" @click="mainRouter.currentRoute.value.name === 'index' ? top() : mainRouter.push('/'); updateButtonState();">
-			<div class="button-wrapper" :class="buttonAnimIndex === 0 ? 'on' : ''">
-				<i class="ph-house ph-bold ph-lg"></i>
-			</div>
-		</button>
-		<button class="button notifications _button" @click="mainRouter.push('/my/notifications'); updateButtonState();">
-			<div class="button-wrapper" :class="buttonAnimIndex === 1 ? 'on' : ''">
-				<i class="ph-bell ph-bold ph-lg"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="ph-circle ph-fill"></i></span>
-			</div>
-		</button>
-		<button class="button messaging _button" @click="mainRouter.push('/my/messaging'); updateButtonState();">
-			<div class="button-wrapper" :class="buttonAnimIndex === 2 ? 'on' : ''">
-				<i class="ph-chats-teardrop ph-bold ph-lg"></i><span v-if="$i?.hasUnreadMessagingMessage" class="indicator"><i class="ph-circle ph-fill"></i></span>
-			</div>
-		</button>
-		<button class="button widget _button" @click="widgetsShowing = true">
-			<div class="button-wrapper">
-				<i class="ph-stack ph-bold ph-lg"></i>
-			</div>
-		</button>
-	</div>
-
-	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'index'" ref="postButton" class="postButton button post _button" @click="os.post()"><i class="ph-pencil ph-bold ph-lg"></i></button>
-	<button v-if="isMobile && mainRouter.currentRoute.value.name === 'messaging'" ref="postButton" class="postButton button post _button" @click="messagingStart"><i class="ph-user-plus ph-bold ph-lg"></i></button>
-
-	<transition :name="$store.state.animation ? 'menuDrawer-back' : ''">
-		<div
-			v-if="drawerMenuShowing"
-			class="menuDrawer-back _modalBg"
-			@click="drawerMenuShowing = false"
-			@touchstart.passive="drawerMenuShowing = false"
-		></div>
-	</transition>
-
-	<transition :name="$store.state.animation ? 'menuDrawer' : ''">
-		<XDrawerMenu v-if="drawerMenuShowing" class="menuDrawer"/>
-	</transition>
-
-	<transition :name="$store.state.animation ? 'widgetsDrawer-back' : ''">
-		<div
-			v-if="widgetsShowing"
-			class="widgetsDrawer-back _modalBg"
-			@click="widgetsShowing = false"
-			@touchstart.passive="widgetsShowing = false"
-		></div>
-	</transition>
-
-	<transition :name="$store.state.animation ? 'widgetsDrawer' : ''">
-		<XWidgets v-if="widgetsShowing" class="widgetsDrawer"/>
-	</transition>
-
-	<XCommon/>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, provide, onMounted, computed, ref } from 'vue';
-import XCommon from './_common_/common.vue';
-import * as Acct from 'calckey-js/built/acct';
-import type { ComputedRef } from 'vue';
-import type { PageMetadata } from '@/scripts/page-metadata';
-import { instanceName } from '@/config';
-import { StickySidebar } from '@/scripts/sticky-sidebar';
-import XDrawerMenu from '@/ui/_common_/navbar-for-mobile.vue';
-import * as os from '@/os';
-import { defaultStore } from '@/store';
-import { navbarItemDef } from '@/navbar';
-import { i18n } from '@/i18n';
-import { $i } from '@/account';
-import { mainRouter } from '@/router';
-import { provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
-import { deviceKind } from '@/scripts/device-kind';
+import { defineAsyncComponent, provide, onMounted, computed, ref } from "vue";
+import XCommon from "./_common_/common.vue";
+import * as Acct from "calckey-js/built/acct";
+import type { ComputedRef } from "vue";
+import type { PageMetadata } from "@/scripts/page-metadata";
+import { instanceName } from "@/config";
+import { StickySidebar } from "@/scripts/sticky-sidebar";
+import XDrawerMenu from "@/ui/_common_/navbar-for-mobile.vue";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { navbarItemDef } from "@/navbar";
+import { i18n } from "@/i18n";
+import { $i } from "@/account";
+import { mainRouter } from "@/router";
+import {
+	provideMetadataReceiver,
+	setPageMetadata,
+} from "@/scripts/page-metadata";
+import { deviceKind } from "@/scripts/device-kind";
 
-const XWidgets = defineAsyncComponent(() => import('./universal.widgets.vue'));
-const XSidebar = defineAsyncComponent(() => import('@/ui/_common_/navbar.vue'));
-const XStatusBars = defineAsyncComponent(() => import('@/ui/_common_/statusbars.vue'));
+const XWidgets = defineAsyncComponent(() => import("./universal.widgets.vue"));
+const XSidebar = defineAsyncComponent(() => import("@/ui/_common_/navbar.vue"));
+const XStatusBars = defineAsyncComponent(
+	() => import("@/ui/_common_/statusbars.vue")
+);
 
 const DESKTOP_THRESHOLD = 1100;
 const MOBILE_THRESHOLD = 500;
 
 // デスクトップでウィンドウを狭くしたときモバイルUIが表示されて欲しいことはあるので deviceKind === 'desktop' の判定は行わない
 const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD);
-const isMobile = ref(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD);
-window.addEventListener('resize', () => {
-	isMobile.value = deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD;
+const isMobile = ref(
+	deviceKind === "smartphone" || window.innerWidth <= MOBILE_THRESHOLD
+);
+window.addEventListener("resize", () => {
+	isMobile.value =
+		deviceKind === "smartphone" || window.innerWidth <= MOBILE_THRESHOLD;
 });
 
 const buttonAnimIndex = ref(0);
@@ -119,7 +202,7 @@ const widgetsEl = $ref<HTMLElement>();
 const postButton = $ref<HTMLElement>();
 const widgetsShowing = $ref(false);
 
-provide('router', mainRouter);
+provide("router", mainRouter);
 provideMetadataReceiver((info) => {
 	pageMetadata = info;
 	if (pageMetadata.value) {
@@ -129,7 +212,7 @@ provideMetadataReceiver((info) => {
 
 const menuIndicated = computed(() => {
 	for (const def in navbarItemDef) {
-		if (def === 'notifications') continue; // 通知は下にボタンとして表示されてるから
+		if (def === "notifications") continue; // 通知は下にボタンとして表示されてるから
 		if (navbarItemDef[def].indicated) return true;
 	}
 	return false;
@@ -137,15 +220,15 @@ const menuIndicated = computed(() => {
 
 function updateButtonState(): void {
 	let routerState = window.location.pathname;
-	if (routerState === '/') {
+	if (routerState === "/") {
 		buttonAnimIndex.value = 0;
 		return;
 	}
-	if (routerState.includes('/my/notifications')) {
+	if (routerState.includes("/my/notifications")) {
 		buttonAnimIndex.value = 1;
 		return;
 	}
-	if (routerState.includes('/my/messaging')) {
+	if (routerState.includes("/my/messaging")) {
 		buttonAnimIndex.value = 2;
 		return;
 	}
@@ -155,55 +238,77 @@ function updateButtonState(): void {
 
 updateButtonState();
 
-mainRouter.on('change', () => {
+mainRouter.on("change", () => {
 	drawerMenuShowing.value = false;
 	updateButtonState();
 });
 
-document.documentElement.style.overflowY = 'scroll';
+document.documentElement.style.overflowY = "scroll";
 
 if (defaultStore.state.widgets.length === 0) {
-	defaultStore.set('widgets', [{
-		name: 'calendar',
-		id: 'a', place: 'right', data: {},
-	}, {
-		name: 'notifications',
-		id: 'b', place: 'right', data: {},
-	}, {
-		name: 'trends',
-		id: 'c', place: 'right', data: {},
-	}]);
+	defaultStore.set("widgets", [
+		{
+			name: "calendar",
+			id: "a",
+			place: "right",
+			data: {},
+		},
+		{
+			name: "notifications",
+			id: "b",
+			place: "right",
+			data: {},
+		},
+		{
+			name: "trends",
+			id: "c",
+			place: "right",
+			data: {},
+		},
+	]);
 }
 
 function messagingStart(ev) {
-	os.popupMenu([{
-		text: i18n.ts.messagingWithUser,
-		icon: 'ph-user ph-bold ph-lg',
-		action: () => { startUser(); },
-	}, {
-		text: i18n.ts.messagingWithGroup,
-		icon: 'ph-users-three ph-bold ph-lg',
-		action: () => { startGroup(); },
-	}, {
-		text: i18n.ts.manageGroups,
-		icon: 'ph-user-circle-gear ph-bold ph-lg',
-		action: () => { mainRouter.push('/my/groups'); },
-	}], ev.currentTarget ?? ev.target);
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts.messagingWithUser,
+				icon: "ph-user ph-bold ph-lg",
+				action: () => {
+					startUser();
+				},
+			},
+			{
+				text: i18n.ts.messagingWithGroup,
+				icon: "ph-users-three ph-bold ph-lg",
+				action: () => {
+					startGroup();
+				},
+			},
+			{
+				text: i18n.ts.manageGroups,
+				icon: "ph-user-circle-gear ph-bold ph-lg",
+				action: () => {
+					mainRouter.push("/my/groups");
+				},
+			},
+		],
+		ev.currentTarget ?? ev.target
+	);
 }
 
-
 async function startUser(): void {
-	os.selectUser().then(user => {
+	os.selectUser().then((user) => {
 		mainRouter.push(`/my/messaging/${Acct.toString(user)}`);
 	});
 }
 
 async function startGroup(): void {
-	const groups1 = await os.api('users/groups/owned');
-	const groups2 = await os.api('users/groups/joined');
+	const groups1 = await os.api("users/groups/owned");
+	const groups2 = await os.api("users/groups/joined");
 	if (groups1.length === 0 && groups2.length === 0) {
 		os.alert({
-			type: 'warning',
+			type: "warning",
 			title: i18n.ts.youHaveNoGroups,
 			text: i18n.ts.joinOrCreateGroup,
 		});
@@ -211,8 +316,9 @@ async function startGroup(): void {
 	}
 	const { canceled, result: group } = await os.select({
 		title: i18n.ts.group,
-		items: groups1.concat(groups2).map(group => ({
-			value: group, text: group.name,
+		items: groups1.concat(groups2).map((group) => ({
+			value: group,
+			text: group.name,
 		})),
 	});
 	if (canceled) return;
@@ -221,47 +327,68 @@ async function startGroup(): void {
 
 onMounted(() => {
 	if (!isDesktop.value) {
-		window.addEventListener('resize', () => {
-			if (window.innerWidth >= DESKTOP_THRESHOLD) isDesktop.value = true;
-		}, { passive: true });
+		window.addEventListener(
+			"resize",
+			() => {
+				if (window.innerWidth >= DESKTOP_THRESHOLD)
+					isDesktop.value = true;
+			},
+			{ passive: true }
+		);
 	}
 });
 
 const onContextmenu = (ev: MouseEvent) => {
 	const isLink = (el: HTMLElement) => {
-		if (el.tagName === 'A') return true;
+		if (el.tagName === "A") return true;
 		if (el.parentElement) {
 			return isLink(el.parentElement);
 		}
 	};
 	if (isLink(ev.target)) return;
-	if (['INPUT', 'TEXTAREA', 'IMG', 'VIDEO', 'CANVAS'].includes(ev.target.tagName) || ev.target.attributes['contenteditable']) return;
-	if (window.getSelection()?.toString() !== '') return;
+	if (
+		["INPUT", "TEXTAREA", "IMG", "VIDEO", "CANVAS"].includes(
+			ev.target.tagName
+		) ||
+		ev.target.attributes["contenteditable"]
+	)
+		return;
+	if (window.getSelection()?.toString() !== "") return;
 	const path = mainRouter.getCurrentPath();
-	os.contextMenu([{
-		type: 'label',
-		text: path,
-	}, {
-		icon: 'ph-browser ph-bold ph-lg',
-		text: i18n.ts.openInWindow,
-		action: () => {
-			os.pageWindow(path);
-		},
-	}], ev);
+	os.contextMenu(
+		[
+			{
+				type: "label",
+				text: path,
+			},
+			{
+				icon: "ph-browser ph-bold ph-lg",
+				text: i18n.ts.openInWindow,
+				action: () => {
+					os.pageWindow(path);
+				},
+			},
+		],
+		ev
+	);
 };
 
 const attachSticky = (el: any) => {
 	const sticky = new StickySidebar(widgetsEl);
-	window.addEventListener('scroll', () => {
-		sticky.calc(window.scrollY);
-	}, { passive: true });
+	window.addEventListener(
+		"scroll",
+		() => {
+			sticky.calc(window.scrollY);
+		},
+		{ passive: true }
+	);
 };
 
 function top() {
-	window.scroll({ top: 0, behavior: 'smooth' });
+	window.scroll({ top: 0, behavior: "smooth" });
 }
 
-const wallpaper = localStorage.getItem('wallpaper') != null;
+const wallpaper = localStorage.getItem("wallpaper") != null;
 console.log(mainRouter.currentRoute.value.name);
 </script>
 
@@ -270,7 +397,8 @@ console.log(mainRouter.currentRoute.value.name);
 .widgetsDrawer-leave-active {
 	opacity: 1;
 	transform: translateX(0);
-	transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1), opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
+	transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1),
+		opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
 }
 .widgetsDrawer-enter-from,
 .widgetsDrawer-leave-active {
@@ -292,7 +420,8 @@ console.log(mainRouter.currentRoute.value.name);
 .menuDrawer-leave-active {
 	opacity: 1;
 	transform: translateX(0);
-	transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1), opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
+	transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1),
+		opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
 }
 .menuDrawer-enter-from,
 .menuDrawer-leave-active {
@@ -366,7 +495,8 @@ console.log(mainRouter.currentRoute.value.name);
 		background: var(--bg);
 	}
 
-	> .postButton, .widgetButton {
+	> .postButton,
+	.widgetButton {
 		bottom: var(--stickyBottom);
 		right: 1.5rem;
 		height: 4rem;
diff --git a/packages/client/src/ui/universal.widgets.vue b/packages/client/src/ui/universal.widgets.vue
index 2daa6916f..8144d3aae 100644
--- a/packages/client/src/ui/universal.widgets.vue
+++ b/packages/client/src/ui/universal.widgets.vue
@@ -1,49 +1,84 @@
 <template>
 	<div class="efzpzdvf">
-		<MkAd class="a" :prefer="['widget']"/>
-		<XWidgets :edit="editMode" :widgets="defaultStore.reactiveState.widgets.value" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
-		<button v-if="editMode" class="_textButton" style="font-size: 0.9em;" @click="editMode = false"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}</button>
-		<button v-else class="_textButton mk-widget-edit" style="font-size: 0.9em;" @click="editMode = true"><i class="ph-pencil ph-bold ph-lg"></i> {{ i18n.ts.editWidgets }}</button>
+		<MkAd class="a" :prefer="['widget']" />
+		<XWidgets
+			:edit="editMode"
+			:widgets="defaultStore.reactiveState.widgets.value"
+			@add-widget="addWidget"
+			@remove-widget="removeWidget"
+			@update-widget="updateWidget"
+			@update-widgets="updateWidgets"
+			@exit="editMode = false"
+		/>
+		<button
+			v-if="editMode"
+			class="_textButton"
+			style="font-size: 0.9em"
+			@click="editMode = false"
+		>
+			<i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts.editWidgetsExit }}
+		</button>
+		<button
+			v-else
+			class="_textButton mk-widget-edit"
+			style="font-size: 0.9em"
+			@click="editMode = true"
+		>
+			<i class="ph-pencil ph-bold ph-lg"></i> {{ i18n.ts.editWidgets }}
+		</button>
 	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import XWidgets from '@/components/MkWidgets.vue';
-import { i18n } from '@/i18n';
-import { defaultStore } from '@/store';
+import { onMounted } from "vue";
+import XWidgets from "@/components/MkWidgets.vue";
+import { i18n } from "@/i18n";
+import { defaultStore } from "@/store";
 
 const emit = defineEmits<{
-	(ev: 'mounted', el: Element): void;
+	(ev: "mounted", el: Element): void;
 }>();
 
 let editMode = $ref(false);
 let rootEl = $ref<HTMLDivElement>();
 
 onMounted(() => {
-	emit('mounted', rootEl);
+	emit("mounted", rootEl);
 });
 
 function addWidget(widget) {
-	defaultStore.set('widgets', [{
-		...widget,
-		place: null,
-	}, ...defaultStore.state.widgets]);
+	defaultStore.set("widgets", [
+		{
+			...widget,
+			place: null,
+		},
+		...defaultStore.state.widgets,
+	]);
 }
 
 function removeWidget(widget) {
-	defaultStore.set('widgets', defaultStore.state.widgets.filter(w => w.id !== widget.id));
+	defaultStore.set(
+		"widgets",
+		defaultStore.state.widgets.filter((w) => w.id !== widget.id)
+	);
 }
 
 function updateWidget({ id, data }) {
-	defaultStore.set('widgets', defaultStore.state.widgets.map(w => w.id === id ? {
-		...w,
-		data,
-	} : w));
+	defaultStore.set(
+		"widgets",
+		defaultStore.state.widgets.map((w) =>
+			w.id === id
+				? {
+						...w,
+						data,
+				  }
+				: w
+		)
+	);
 }
 
 function updateWidgets(widgets) {
-	defaultStore.set('widgets', widgets);
+	defaultStore.set("widgets", widgets);
 }
 </script>
 
diff --git a/packages/client/src/ui/visitor.vue b/packages/client/src/ui/visitor.vue
index 767c9ddbb..a00813415 100644
--- a/packages/client/src/ui/visitor.vue
+++ b/packages/client/src/ui/visitor.vue
@@ -1,14 +1,14 @@
 <template>
-<DesignB/>
-<XCommon/>
+	<DesignB />
+	<XCommon />
 </template>
 
 <script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
-import DesignA from './visitor/a.vue';
-import DesignB from './visitor/b.vue';
-import XCommon from './_common_/common.vue';
-import { i18n } from '@/i18n';
+import { defineComponent, defineAsyncComponent } from "vue";
+import DesignA from "./visitor/a.vue";
+import DesignB from "./visitor/b.vue";
+import XCommon from "./_common_/common.vue";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
diff --git a/packages/client/src/ui/visitor/a.vue b/packages/client/src/ui/visitor/a.vue
index 1481b80a0..3894a991d 100644
--- a/packages/client/src/ui/visitor/a.vue
+++ b/packages/client/src/ui/visitor/a.vue
@@ -1,51 +1,91 @@
 <template>
-<div class="mk-app">
-	<div v-if="mainRouter.currentRoute?.name === 'index'" class="banner" :style="{ backgroundImage: `url(${ $instance.bannerUrl })` }">
-		<div>
-			<h1 v-if="meta"><img v-if="meta.logoImageUrl" class="logo" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span></h1>
-			<div v-if="meta" class="about">
-				<div class="desc" v-html="meta.description || i18n.ts.introMisskey"></div>
-			</div>
-			<div class="action">
-				<button class="_button primary" @click="signup()">{{ i18n.ts.signup }}</button>
-				<button class="_button" @click="signin()">{{ i18n.ts.login }}</button>
+	<div class="mk-app">
+		<div
+			v-if="mainRouter.currentRoute?.name === 'index'"
+			class="banner"
+			:style="{ backgroundImage: `url(${$instance.bannerUrl})` }"
+		>
+			<div>
+				<h1 v-if="meta">
+					<img
+						v-if="meta.logoImageUrl"
+						class="logo"
+						:src="meta.logoImageUrl"
+					/><span v-else class="text">{{ instanceName }}</span>
+				</h1>
+				<div v-if="meta" class="about">
+					<div
+						class="desc"
+						v-html="meta.description || i18n.ts.introMisskey"
+					></div>
+				</div>
+				<div class="action">
+					<button class="_button primary" @click="signup()">
+						{{ i18n.ts.signup }}
+					</button>
+					<button class="_button" @click="signin()">
+						{{ i18n.ts.login }}
+					</button>
+				</div>
 			</div>
 		</div>
-	</div>
-	<div v-else class="banner-mini" :style="{ backgroundImage: `url(${ $instance.bannerUrl })` }">
-		<div>
-			<h1 v-if="meta"><img v-if="meta.logoImageUrl" class="logo" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span></h1>
+		<div
+			v-else
+			class="banner-mini"
+			:style="{ backgroundImage: `url(${$instance.bannerUrl})` }"
+		>
+			<div>
+				<h1 v-if="meta">
+					<img
+						v-if="meta.logoImageUrl"
+						class="logo"
+						:src="meta.logoImageUrl"
+					/><span v-else class="text">{{ instanceName }}</span>
+				</h1>
+			</div>
 		</div>
-	</div>
 
-	<div class="main">
-		<div ref="contents" class="contents" :class="{ wallpaper }">
-			<header v-show="mainRouter.currentRoute?.name !== 'index'" ref="header" class="header">
-				<XHeader :info="pageInfo"/>
-			</header>
-			<main ref="main">
-				<RouterView/>
-			</main>
-			<div class="powered-by">
-				<b><MkA to="/">{{ host }}</MkA></b>
-				<small>Powered by <a href="https://codeberg.org/calckey/calckey" target="_blank">Calckey</a></small>
+		<div class="main">
+			<div ref="contents" class="contents" :class="{ wallpaper }">
+				<header
+					v-show="mainRouter.currentRoute?.name !== 'index'"
+					ref="header"
+					class="header"
+				>
+					<XHeader :info="pageInfo" />
+				</header>
+				<main ref="main">
+					<RouterView />
+				</main>
+				<div class="powered-by">
+					<b
+						><MkA to="/">{{ host }}</MkA></b
+					>
+					<small
+						>Powered by
+						<a
+							href="https://codeberg.org/calckey/calckey"
+							target="_blank"
+							>Calckey</a
+						></small
+					>
+				</div>
 			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
-import XHeader from './header.vue';
-import { host, instanceName } from '@/config';
-import { search } from '@/scripts/search';
-import * as os from '@/os';
-import MkPagination from '@/components/MkPagination.vue';
-import MkButton from '@/components/MkButton.vue';
-import { ColdDeviceStorage } from '@/store';
-import { mainRouter } from '@/router';
-import { i18n } from '@/i18n';
+import { defineComponent, defineAsyncComponent } from "vue";
+import XHeader from "./header.vue";
+import { host, instanceName } from "@/config";
+import { search } from "@/scripts/search";
+import * as os from "@/os";
+import MkPagination from "@/components/MkPagination.vue";
+import MkButton from "@/components/MkButton.vue";
+import { ColdDeviceStorage } from "@/store";
+import { mainRouter } from "@/router";
+import { i18n } from "@/i18n";
 
 const DESKTOP_THRESHOLD = 1100;
 
@@ -64,7 +104,7 @@ export default defineComponent({
 			meta: null,
 			narrow: window.innerWidth < 1280,
 			announcements: {
-				endpoint: 'announcements',
+				endpoint: "announcements",
 				limit: 10,
 			},
 			mainRouter,
@@ -76,29 +116,34 @@ export default defineComponent({
 	computed: {
 		keymap(): any {
 			return {
-				'd': () => {
-					if (ColdDeviceStorage.get('syncDeviceDarkMode')) return;
-					this.$store.set('darkMode', !this.$store.state.darkMode);
+				d: () => {
+					if (ColdDeviceStorage.get("syncDeviceDarkMode")) return;
+					this.$store.set("darkMode", !this.$store.state.darkMode);
 				},
-				's': search,
-				'h|/': this.help,
+				s: search,
+				"h|/": this.help,
 			};
 		},
 	},
 
 	created() {
-		document.documentElement.style.overflowY = 'scroll';
+		document.documentElement.style.overflowY = "scroll";
 
-		os.api('meta', { detail: true }).then(meta => {
+		os.api("meta", { detail: true }).then((meta) => {
 			this.meta = meta;
 		});
 	},
 
 	mounted() {
 		if (!this.isDesktop) {
-			window.addEventListener('resize', () => {
-				if (window.innerWidth >= DESKTOP_THRESHOLD) this.isDesktop = true;
-			}, { passive: true });
+			window.addEventListener(
+				"resize",
+				() => {
+					if (window.innerWidth >= DESKTOP_THRESHOLD)
+						this.isDesktop = true;
+				},
+				{ passive: true }
+			);
 		}
 	},
 
@@ -112,21 +157,20 @@ export default defineComponent({
 
 		changePage(page) {
 			if (page == null) return;
-			
+
 			if (page[symbols.PAGE_INFO]) {
-				
 				this.pageInfo = page[symbols.PAGE_INFO];
 			}
 		},
 
 		top() {
-			window.scroll({ top: 0, behavior: 'smooth' });
+			window.scroll({ top: 0, behavior: "smooth" });
 		},
 
 		help() {
 			// TODO(thatonecalculator): popup with keybinds
 			// window.open('https://misskey-hub.net/docs/keyboard-shortcut.md', '_blank');
-			console.log('d = dark/light mode, s = search, p = post :3');
+			console.log("d = dark/light mode, s = search, p = post :3");
 		},
 	},
 });
@@ -150,7 +194,7 @@ export default defineComponent({
 			* {
 				color: #fff;
 			}
-					
+
 			> h1 {
 				margin: 0;
 				padding: 96px 32px 0 32px;
@@ -172,7 +216,7 @@ export default defineComponent({
 
 			> .action {
 				padding-bottom: 64px;
-				
+
 				> button {
 					display: inline-block;
 					padding: 10px 20px;
@@ -213,9 +257,8 @@ export default defineComponent({
 			}
 
 			> header {
-				
 			}
-					
+
 			> h1 {
 				margin: 0;
 				padding: 32px;
@@ -258,5 +301,4 @@ export default defineComponent({
 }
 </style>
 
-<style lang="scss">
-</style>
+<style lang="scss"></style>
diff --git a/packages/client/src/ui/visitor/b.vue b/packages/client/src/ui/visitor/b.vue
index 3e72584a0..ba2206a48 100644
--- a/packages/client/src/ui/visitor/b.vue
+++ b/packages/client/src/ui/visitor/b.vue
@@ -1,71 +1,103 @@
 <template>
-<div class="mk-app">
-	<div v-if="!narrow && !root" class="side">
-		<XKanban class="kanban" full/>
-	</div>
+	<div class="mk-app">
+		<div v-if="!narrow && !root" class="side">
+			<XKanban class="kanban" full />
+		</div>
 
-	<div class="main">
-		<XKanban v-if="narrow && !root" class="banner" :powered-by="root"/>
+		<div class="main">
+			<XKanban v-if="narrow && !root" class="banner" :powered-by="root" />
 
-		<div class="contents">
-			<XHeader v-if="!root" class="header" :info="pageInfo"/>
-			<main>
-				<RouterView/>
-			</main>
-			<div v-if="!root" class="powered-by">
-				<b><MkA to="/">{{ host }}</MkA></b>
-				<small>Powered by <a href="https://codeberg.org/calckey/calckey" target="_blank">Calckey</a></small>
+			<div class="contents">
+				<XHeader v-if="!root" class="header" :info="pageInfo" />
+				<main>
+					<RouterView />
+				</main>
+				<div v-if="!root" class="powered-by">
+					<b
+						><MkA to="/">{{ host }}</MkA></b
+					>
+					<small
+						>Powered by
+						<a
+							href="https://codeberg.org/calckey/calckey"
+							target="_blank"
+							>Calckey</a
+						></small
+					>
+				</div>
 			</div>
 		</div>
-	</div>
 
-	<transition :name="$store.state.animation ? 'tray-back' : ''">
-		<div
-			v-if="showMenu"
-			class="menu-back _modalBg"
-			@click="showMenu = false"
-			@touchstart.passive="showMenu = false"
-		></div>
-	</transition>
+		<transition :name="$store.state.animation ? 'tray-back' : ''">
+			<div
+				v-if="showMenu"
+				class="menu-back _modalBg"
+				@click="showMenu = false"
+				@touchstart.passive="showMenu = false"
+			></div>
+		</transition>
 
-	<transition :name="$store.state.animation ? 'tray' : ''">
-		<div v-if="showMenu" class="menu">
-			<MkA to="/" class="link" active-class="active"><i class="ph-house ph-bold ph-lg icon"></i>{{ i18n.ts.home }}</MkA>
-			<MkA to="/explore" class="link" active-class="active"><i class="ph-compass ph-bold ph-lg icon"></i>{{ i18n.ts.explore }}</MkA>
-			<MkA to="/channels" class="link" active-class="active"><i class="ph-television ph-bold ph-lg icon"></i>{{ i18n.ts.channel }}</MkA>
-			<MkA to="/pages" class="link" active-class="active"><i class="ph-file-text ph-bold ph-lg icon"></i>{{ i18n.ts.pages }}</MkA>
-			<MkA to="/gallery" class="link" active-class="active"><i class="ph-image-square ph-bold ph-lg icon"></i>{{ i18n.ts.gallery }}</MkA>
-			<div class="action">
-				<button class="_buttonPrimary" @click="signup()">{{ i18n.ts.signup }}</button>
-				<button class="_button" @click="signin()">{{ i18n.ts.login }}</button>
+		<transition :name="$store.state.animation ? 'tray' : ''">
+			<div v-if="showMenu" class="menu">
+				<MkA to="/" class="link" active-class="active"
+					><i class="ph-house ph-bold ph-lg icon"></i
+					>{{ i18n.ts.home }}</MkA
+				>
+				<MkA to="/explore" class="link" active-class="active"
+					><i class="ph-compass ph-bold ph-lg icon"></i
+					>{{ i18n.ts.explore }}</MkA
+				>
+				<MkA to="/channels" class="link" active-class="active"
+					><i class="ph-television ph-bold ph-lg icon"></i
+					>{{ i18n.ts.channel }}</MkA
+				>
+				<MkA to="/pages" class="link" active-class="active"
+					><i class="ph-file-text ph-bold ph-lg icon"></i
+					>{{ i18n.ts.pages }}</MkA
+				>
+				<MkA to="/gallery" class="link" active-class="active"
+					><i class="ph-image-square ph-bold ph-lg icon"></i
+					>{{ i18n.ts.gallery }}</MkA
+				>
+				<div class="action">
+					<button class="_buttonPrimary" @click="signup()">
+						{{ i18n.ts.signup }}
+					</button>
+					<button class="_button" @click="signin()">
+						{{ i18n.ts.login }}
+					</button>
+				</div>
 			</div>
-		</div>
-	</transition>
-</div>
+		</transition>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ComputedRef, onMounted, provide } from 'vue';
-import XHeader from './header.vue';
-import XKanban from './kanban.vue';
-import { host, instanceName } from '@/config';
-import { search } from '@/scripts/search';
-import * as os from '@/os';
-import { instance } from '@/instance';
-import MkPagination from '@/components/MkPagination.vue';
-import XSigninDialog from '@/components/MkSigninDialog.vue';
-import XSignupDialog from '@/components/MkSignupDialog.vue';
-import MkButton from '@/components/MkButton.vue';
-import { ColdDeviceStorage, defaultStore } from '@/store';
-import { mainRouter } from '@/router';
-import { PageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
-import { i18n } from '@/i18n';
+import { ComputedRef, onMounted, provide } from "vue";
+import XHeader from "./header.vue";
+import XKanban from "./kanban.vue";
+import { host, instanceName } from "@/config";
+import { search } from "@/scripts/search";
+import * as os from "@/os";
+import { instance } from "@/instance";
+import MkPagination from "@/components/MkPagination.vue";
+import XSigninDialog from "@/components/MkSigninDialog.vue";
+import XSignupDialog from "@/components/MkSignupDialog.vue";
+import MkButton from "@/components/MkButton.vue";
+import { ColdDeviceStorage, defaultStore } from "@/store";
+import { mainRouter } from "@/router";
+import {
+	PageMetadata,
+	provideMetadataReceiver,
+	setPageMetadata,
+} from "@/scripts/page-metadata";
+import { i18n } from "@/i18n";
 
 const DESKTOP_THRESHOLD = 1000;
 
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 
-provide('router', mainRouter);
+provide("router", mainRouter);
 provideMetadataReceiver((info) => {
 	pageMetadata = info;
 	if (pageMetadata.value) {
@@ -74,10 +106,13 @@ provideMetadataReceiver((info) => {
 });
 
 const announcements = {
-	endpoint: 'announcements',
+	endpoint: "announcements",
 	limit: 10,
 };
-const isTimelineAvailable = !instance.disableLocalTimeline || !instance.disableRecommendedTimeline || !instance.disableGlobalTimeline;
+const isTimelineAvailable =
+	!instance.disableLocalTimeline ||
+	!instance.disableRecommendedTimeline ||
+	!instance.disableGlobalTimeline;
 let showMenu = $ref(false);
 let isDesktop = $ref(window.innerWidth >= DESKTOP_THRESHOLD);
 let narrow = $ref(window.innerWidth < 1280);
@@ -85,37 +120,51 @@ let meta = $ref();
 
 const keymap = $computed(() => {
 	return {
-		'd': () => {
-			if (ColdDeviceStorage.get('syncDeviceDarkMode')) return;
-			defaultStore.set('darkMode', !defaultStore.state.darkMode);
+		d: () => {
+			if (ColdDeviceStorage.get("syncDeviceDarkMode")) return;
+			defaultStore.set("darkMode", !defaultStore.state.darkMode);
 		},
-		's': search,
+		s: search,
 	};
 });
 
-const root = $computed(() => mainRouter.currentRoute.value.name === 'index');
+const root = $computed(() => mainRouter.currentRoute.value.name === "index");
 
-os.api('meta', { detail: true }).then(res => {
+os.api("meta", { detail: true }).then((res) => {
 	meta = res;
 });
 
 function signin() {
-	os.popup(XSigninDialog, {
-		autoSet: true,
-	}, {}, 'closed');
+	os.popup(
+		XSigninDialog,
+		{
+			autoSet: true,
+		},
+		{},
+		"closed"
+	);
 }
 
 function signup() {
-	os.popup(XSignupDialog, {
-		autoSet: true,
-	}, {}, 'closed');
+	os.popup(
+		XSignupDialog,
+		{
+			autoSet: true,
+		},
+		{},
+		"closed"
+	);
 }
 
 onMounted(() => {
 	if (!isDesktop) {
-		window.addEventListener('resize', () => {
-			if (window.innerWidth >= DESKTOP_THRESHOLD) isDesktop = true;
-		}, { passive: true });
+		window.addEventListener(
+			"resize",
+			() => {
+				if (window.innerWidth >= DESKTOP_THRESHOLD) isDesktop = true;
+			},
+			{ passive: true }
+		);
 	}
 });
 
@@ -129,7 +178,8 @@ defineExpose({
 .tray-leave-active {
 	opacity: 1;
 	transform: translateX(0);
-	transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1), opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
+	transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1),
+		opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
 }
 .tray-enter-from,
 .tray-leave-active {
diff --git a/packages/client/src/ui/visitor/header.vue b/packages/client/src/ui/visitor/header.vue
index 00522134a..e79bd288e 100644
--- a/packages/client/src/ui/visitor/header.vue
+++ b/packages/client/src/ui/visitor/header.vue
@@ -1,59 +1,122 @@
 <template>
-<div class="sqxihjet">
-	<div v-if="narrow === false" class="wide">
-		<div class="content">
-			<MkA to="/" class="link" active-class="active"><i class="ph-house ph-bold ph-lg icon"></i>{{ i18n.ts.home }}</MkA>
-			<MkA v-if="isTimelineAvailable" to="/timeline" class="link" active-class="active"><i class="ph-chats-circle ph-bold ph-lg icon"></i>{{ i18n.ts.timeline }}</MkA>
-			<MkA to="/explore" class="link" active-class="active"><i class="ph-compass ph-bold ph-lg icon"></i>{{ i18n.ts.explore }}</MkA>
-			<MkA to="/channels" class="link" active-class="active"><i class="ph-television ph-bold ph-lg icon"></i>{{ i18n.ts.channel }}</MkA>
-			<MkA to="/pages" class="link" active-class="active"><i class="ph-file-text ph-bold ph-lg icon"></i>{{ i18n.ts.pages }}</MkA>
-			<MkA to="/gallery" class="link" active-class="active"><i class="ph-image-square ph-bold ph-lg icon"></i>{{ i18n.ts.gallery }}</MkA>
-			<div v-if="info" class="page active link">
-				<div class="title">
-					<i v-if="info.icon" class="icon" :class="info.icon"></i>
-					<MkAvatar v-else-if="info.avatar" class="avatar" :user="info.avatar" :disable-preview="true" :show-indicator="true"/>
-					<span v-if="info.title" class="text">{{ info.title }}</span>
-					<MkUserName v-else-if="info.userName" :user="info.userName" :nowrap="false" class="text"/>
+	<div class="sqxihjet">
+		<div v-if="narrow === false" class="wide">
+			<div class="content">
+				<MkA to="/" class="link" active-class="active"
+					><i class="ph-house ph-bold ph-lg icon"></i
+					>{{ i18n.ts.home }}</MkA
+				>
+				<MkA
+					v-if="isTimelineAvailable"
+					to="/timeline"
+					class="link"
+					active-class="active"
+					><i class="ph-chats-circle ph-bold ph-lg icon"></i
+					>{{ i18n.ts.timeline }}</MkA
+				>
+				<MkA to="/explore" class="link" active-class="active"
+					><i class="ph-compass ph-bold ph-lg icon"></i
+					>{{ i18n.ts.explore }}</MkA
+				>
+				<MkA to="/channels" class="link" active-class="active"
+					><i class="ph-television ph-bold ph-lg icon"></i
+					>{{ i18n.ts.channel }}</MkA
+				>
+				<MkA to="/pages" class="link" active-class="active"
+					><i class="ph-file-text ph-bold ph-lg icon"></i
+					>{{ i18n.ts.pages }}</MkA
+				>
+				<MkA to="/gallery" class="link" active-class="active"
+					><i class="ph-image-square ph-bold ph-lg icon"></i
+					>{{ i18n.ts.gallery }}</MkA
+				>
+				<div v-if="info" class="page active link">
+					<div class="title">
+						<i v-if="info.icon" class="icon" :class="info.icon"></i>
+						<MkAvatar
+							v-else-if="info.avatar"
+							class="avatar"
+							:user="info.avatar"
+							:disable-preview="true"
+							:show-indicator="true"
+						/>
+						<span v-if="info.title" class="text">{{
+							info.title
+						}}</span>
+						<MkUserName
+							v-else-if="info.userName"
+							:user="info.userName"
+							:nowrap="false"
+							class="text"
+						/>
+					</div>
+					<button
+						v-if="info.action"
+						class="_button action"
+						@click.stop="info.action.handler"
+					>
+						<!-- TODO -->
+					</button>
+				</div>
+				<div class="right">
+					<button class="_button search" @click="search()">
+						<i class="ph-magnifying-glass ph-bold ph-lg icon"></i
+						><span>{{ i18n.ts.search }}</span>
+					</button>
+					<button class="_buttonPrimary signup" @click="signup()">
+						{{ i18n.ts.signup }}
+					</button>
+					<button class="_button login" @click="signin()">
+						{{ i18n.ts.login }}
+					</button>
 				</div>
-				<button v-if="info.action" class="_button action" @click.stop="info.action.handler"><!-- TODO --></button>
-			</div>
-			<div class="right">
-				<button class="_button search" @click="search()"><i class="ph-magnifying-glass ph-bold ph-lg icon"></i><span>{{ i18n.ts.search }}</span></button>
-				<button class="_buttonPrimary signup" @click="signup()">{{ i18n.ts.signup }}</button>
-				<button class="_button login" @click="signin()">{{ i18n.ts.login }}</button>
 			</div>
 		</div>
-	</div>
-	<div v-else-if="narrow === true" class="narrow">
-		<button class="menu _button" @click="$parent.showMenu = true">
-			<i class="ph-list ph-bold ph-lg icon"></i>
-		</button>
-		<div v-if="info" class="title">
-			<i v-if="info.icon" class="icon" :class="info.icon"></i>
-			<MkAvatar v-else-if="info.avatar" class="avatar" :user="info.avatar" :disable-preview="true" :show-indicator="true"/>
-			<span v-if="info.title" class="text">{{ info.title }}</span>
-			<MkUserName v-else-if="info.userName" :user="info.userName" :nowrap="false" class="text"/>
+		<div v-else-if="narrow === true" class="narrow">
+			<button class="menu _button" @click="$parent.showMenu = true">
+				<i class="ph-list ph-bold ph-lg icon"></i>
+			</button>
+			<div v-if="info" class="title">
+				<i v-if="info.icon" class="icon" :class="info.icon"></i>
+				<MkAvatar
+					v-else-if="info.avatar"
+					class="avatar"
+					:user="info.avatar"
+					:disable-preview="true"
+					:show-indicator="true"
+				/>
+				<span v-if="info.title" class="text">{{ info.title }}</span>
+				<MkUserName
+					v-else-if="info.userName"
+					:user="info.userName"
+					:nowrap="false"
+					class="text"
+				/>
+			</div>
+			<button
+				v-if="info && info.action"
+				class="action _button"
+				@click.stop="info.action.handler"
+			>
+				<!-- TODO -->
+			</button>
 		</div>
-		<button v-if="info && info.action" class="action _button" @click.stop="info.action.handler">
-			<!-- TODO -->
-		</button>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import XSigninDialog from '@/components/MkSigninDialog.vue';
-import XSignupDialog from '@/components/MkSignupDialog.vue';
-import * as os from '@/os';
-import { instance } from '@/instance';
-import { search } from '@/scripts/search';
-import { i18n } from '@/i18n';
+import { defineComponent } from "vue";
+import XSigninDialog from "@/components/MkSigninDialog.vue";
+import XSignupDialog from "@/components/MkSignupDialog.vue";
+import * as os from "@/os";
+import { instance } from "@/instance";
+import { search } from "@/scripts/search";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	props: {
 		info: {
-			required: true
+			required: true,
 		},
 	},
 
@@ -62,7 +125,10 @@ export default defineComponent({
 			narrow: null,
 			showMenu: false,
 			i18n,
-			isTimelineAvailable: !instance.disableLocalTimeline || !instance.disableRecommendedTimeline || !instance.disableGlobalTimeline,
+			isTimelineAvailable:
+				!instance.disableLocalTimeline ||
+				!instance.disableRecommendedTimeline ||
+				!instance.disableGlobalTimeline,
 		};
 	},
 
@@ -72,19 +138,29 @@ export default defineComponent({
 
 	methods: {
 		signin() {
-			os.popup(XSigninDialog, {
-				autoSet: true
-			}, {}, 'closed');
+			os.popup(
+				XSigninDialog,
+				{
+					autoSet: true,
+				},
+				{},
+				"closed"
+			);
 		},
 
 		signup() {
-			os.popup(XSignupDialog, {
-				autoSet: true
-			}, {}, 'closed');
+			os.popup(
+				XSignupDialog,
+				{
+					autoSet: true,
+				},
+				{},
+				"closed"
+			);
 		},
 
-		search
-	}
+		search,
+	},
 });
 </script>
 
diff --git a/packages/client/src/ui/visitor/kanban.vue b/packages/client/src/ui/visitor/kanban.vue
index 28b222697..1391bfb67 100644
--- a/packages/client/src/ui/visitor/kanban.vue
+++ b/packages/client/src/ui/visitor/kanban.vue
@@ -1,50 +1,96 @@
 <template>
-<div class="rwqkcmrc" :style="{ backgroundImage: transparent ? 'none' : `url(${ $instance.backgroundImageUrl })` }">
-	<div class="back" :class="{ transparent }"></div>
-	<div class="contents">
-		<div class="wrapper">
-			<h1 v-if="meta" :class="{ full }">
-				<MkA to="/" class="link"><img v-if="meta.logoImageUrl" class="logo" :src="meta.logoImageUrl" alt="logo"><span v-else class="text">{{ instanceName }}</span></MkA>
-			</h1>
-			<template v-if="full">
-				<div v-if="meta" class="about">
-					<div class="desc" v-html="meta.description || i18n.ts.introMisskey"></div>
-				</div>
-				<div class="action">
-					<button class="_buttonPrimary" @click="signup()">{{ i18n.ts.signup }}</button>
-					<button class="_button" @click="signin()">{{ i18n.ts.login }}</button>
-				</div>
-				<div class="announcements panel">
-					<header>{{ i18n.ts.announcements }}</header>
-					<MkPagination v-slot="{items}" :pagination="announcements" class="list">
-						<section v-for="announcement in items" :key="announcement.id" class="item">
-							<div class="title">{{ announcement.title }}</div>
-							<div class="content">
-								<Mfm :text="announcement.text"/>
-								<img v-if="announcement.imageUrl" :src="announcement.imageUrl" alt="announcement image"/>
-							</div>
-						</section>
-					</MkPagination>
-				</div>
-				<div v-if="poweredBy" class="powered-by">
-					<b><MkA to="/">{{ host }}</MkA></b>
-					<small>Powered by <a href="https://codeberg.org/calckey/calckey" target="_blank">Calckey</a></small>
-				</div>
-			</template>
+	<div
+		class="rwqkcmrc"
+		:style="{
+			backgroundImage: transparent
+				? 'none'
+				: `url(${$instance.backgroundImageUrl})`,
+		}"
+	>
+		<div class="back" :class="{ transparent }"></div>
+		<div class="contents">
+			<div class="wrapper">
+				<h1 v-if="meta" :class="{ full }">
+					<MkA to="/" class="link"
+						><img
+							v-if="meta.logoImageUrl"
+							class="logo"
+							:src="meta.logoImageUrl"
+							alt="logo"
+						/><span v-else class="text">{{
+							instanceName
+						}}</span></MkA
+					>
+				</h1>
+				<template v-if="full">
+					<div v-if="meta" class="about">
+						<div
+							class="desc"
+							v-html="meta.description || i18n.ts.introMisskey"
+						></div>
+					</div>
+					<div class="action">
+						<button class="_buttonPrimary" @click="signup()">
+							{{ i18n.ts.signup }}
+						</button>
+						<button class="_button" @click="signin()">
+							{{ i18n.ts.login }}
+						</button>
+					</div>
+					<div class="announcements panel">
+						<header>{{ i18n.ts.announcements }}</header>
+						<MkPagination
+							v-slot="{ items }"
+							:pagination="announcements"
+							class="list"
+						>
+							<section
+								v-for="announcement in items"
+								:key="announcement.id"
+								class="item"
+							>
+								<div class="title">
+									{{ announcement.title }}
+								</div>
+								<div class="content">
+									<Mfm :text="announcement.text" />
+									<img
+										v-if="announcement.imageUrl"
+										:src="announcement.imageUrl"
+										alt="announcement image"
+									/>
+								</div>
+							</section>
+						</MkPagination>
+					</div>
+					<div v-if="poweredBy" class="powered-by">
+						<b
+							><MkA to="/">{{ host }}</MkA></b
+						>
+						<small
+							>Powered by
+							<a
+								href="https://codeberg.org/calckey/calckey"
+								target="_blank"
+								>Calckey</a
+							></small
+						>
+					</div>
+				</template>
+			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
-import { host, instanceName } from '@/config';
-import * as os from '@/os';
-import MkPagination from '@/components/MkPagination.vue';
-import XSigninDialog from '@/components/MkSigninDialog.vue';
-import XSignupDialog from '@/components/MkSignupDialog.vue';
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n';
+import { defineComponent, defineAsyncComponent } from "vue";
+import { host, instanceName } from "@/config";
+import * as os from "@/os";
+import MkPagination from "@/components/MkPagination.vue";
+import XSigninDialog from "@/components/MkSigninDialog.vue";
+import XSignupDialog from "@/components/MkSignupDialog.vue";
+import MkButton from "@/components/MkButton.vue";
+import { i18n } from "@/i18n";
 
 export default defineComponent({
 	components: {
@@ -78,7 +124,7 @@ export default defineComponent({
 			meta: null,
 			narrow: window.innerWidth < 1280,
 			announcements: {
-				endpoint: 'announcements',
+				endpoint: "announcements",
 				limit: 10,
 			},
 			i18n,
@@ -86,22 +132,32 @@ export default defineComponent({
 	},
 
 	created() {
-		os.api('meta', { detail: true }).then(meta => {
+		os.api("meta", { detail: true }).then((meta) => {
 			this.meta = meta;
 		});
 	},
 
 	methods: {
 		signin() {
-			os.popup(XSigninDialog, {
-				autoSet: true,
-			}, {}, 'closed');
+			os.popup(
+				XSigninDialog,
+				{
+					autoSet: true,
+				},
+				{},
+				"closed"
+			);
 		},
 
 		signup() {
-			os.popup(XSignupDialog, {
-				autoSet: true,
-			}, {}, 'closed');
+			os.popup(
+				XSignupDialog,
+				{
+					autoSet: true,
+				},
+				{},
+				"closed"
+			);
 		},
 	},
 });
@@ -147,7 +203,8 @@ export default defineComponent({
 				background: rgba(0, 0, 0, 0.5);
 				border-radius: var(--radius);
 
-				&, * {
+				&,
+				* {
 					color: #fff !important;
 				}
 			}
diff --git a/packages/client/src/ui/zen.vue b/packages/client/src/ui/zen.vue
index c915f8242..cb2354a2e 100644
--- a/packages/client/src/ui/zen.vue
+++ b/packages/client/src/ui/zen.vue
@@ -1,21 +1,25 @@
 <template>
-<div class="mk-app">
-	<RouterView/>
+	<div class="mk-app">
+		<RouterView />
 
-	<XCommon/>
-</div>
+		<XCommon />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { provide, ComputedRef } from 'vue';
-import XCommon from './_common_/common.vue';
-import { mainRouter } from '@/router';
-import { PageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
-import { instanceName } from '@/config';
+import { provide, ComputedRef } from "vue";
+import XCommon from "./_common_/common.vue";
+import { mainRouter } from "@/router";
+import {
+	PageMetadata,
+	provideMetadataReceiver,
+	setPageMetadata,
+} from "@/scripts/page-metadata";
+import { instanceName } from "@/config";
 
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 
-provide('router', mainRouter);
+provide("router", mainRouter);
 provideMetadataReceiver((info) => {
 	pageMetadata = info;
 	if (pageMetadata.value) {
@@ -23,7 +27,7 @@ provideMetadataReceiver((info) => {
 	}
 });
 
-document.documentElement.style.overflowY = 'scroll';
+document.documentElement.style.overflowY = "scroll";
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/widgets/activity.calendar.vue b/packages/client/src/widgets/activity.calendar.vue
index 2fcb7255c..d7081a27c 100644
--- a/packages/client/src/widgets/activity.calendar.vue
+++ b/packages/client/src/widgets/activity.calendar.vue
@@ -1,37 +1,58 @@
 <template>
-<svg viewBox="0 0 21 7">
-	<rect v-for="record in activity" class="day"
-		width="1" height="1"
-		:x="record.x" :y="record.date.weekday"
-		rx="1" ry="1"
-		fill="transparent">
-		<title>{{ record.date.year }}/{{ record.date.month + 1 }}/{{ record.date.day }}</title>
-	</rect>
-	<rect v-for="record in activity" class="day"
-		:width="record.v" :height="record.v"
-		:x="record.x + ((1 - record.v) / 2)" :y="record.date.weekday + ((1 - record.v) / 2)"
-		rx="1" ry="1"
-		:fill="record.color"
-		style="pointer-events: none;"/>
-	<rect class="today"
-		width="1" height="1"
-		:x="activity[0].x" :y="activity[0].date.weekday"
-		rx="1" ry="1"
-		fill="none"
-		stroke-width="0.1"
-		stroke="#eb6f92"/>
-</svg>
+	<svg viewBox="0 0 21 7">
+		<rect
+			v-for="record in activity"
+			class="day"
+			width="1"
+			height="1"
+			:x="record.x"
+			:y="record.date.weekday"
+			rx="1"
+			ry="1"
+			fill="transparent"
+		>
+			<title>
+				{{ record.date.year }}/{{ record.date.month + 1 }}/{{
+					record.date.day
+				}}
+			</title>
+		</rect>
+		<rect
+			v-for="record in activity"
+			class="day"
+			:width="record.v"
+			:height="record.v"
+			:x="record.x + (1 - record.v) / 2"
+			:y="record.date.weekday + (1 - record.v) / 2"
+			rx="1"
+			ry="1"
+			:fill="record.color"
+			style="pointer-events: none"
+		/>
+		<rect
+			class="today"
+			width="1"
+			height="1"
+			:x="activity[0].x"
+			:y="activity[0].date.weekday"
+			rx="1"
+			ry="1"
+			fill="none"
+			stroke-width="0.1"
+			stroke="#eb6f92"
+		/>
+	</svg>
 </template>
 
 <script lang="ts" setup>
 const props = defineProps<{
-	activity: any[]
+	activity: any[];
 }>();
 
 for (const d of props.activity) {
 	d.total = d.notes + d.replies + d.renotes;
 }
-const peak = Math.max(...props.activity.map(d => d.total));
+const peak = Math.max(...props.activity.map((d) => d.total));
 
 const now = new Date();
 const year = now.getFullYear();
@@ -47,7 +68,7 @@ props.activity.slice().forEach((d, i) => {
 		year: date.getFullYear(),
 		month: date.getMonth(),
 		day: date.getDate(),
-		weekday: date.getDay()
+		weekday: date.getDay(),
 	};
 
 	d.v = peak === 0 ? 0 : d.total / (peak / 2);
@@ -55,7 +76,7 @@ props.activity.slice().forEach((d, i) => {
 	// TODO: Make Rose Pine
 	const ch = d.date.weekday === 0 || d.date.weekday === 6 ? 275 : 170;
 	const cs = d.v * 100;
-	const cl = 15 + ((1 - d.v) * 80);
+	const cl = 15 + (1 - d.v) * 80;
 	d.color = `hsl(${ch}, ${cs}%, ${cl}%)`;
 
 	if (d.date.weekday === 0) x--;
diff --git a/packages/client/src/widgets/activity.chart.vue b/packages/client/src/widgets/activity.chart.vue
index f24125aa3..d854ec733 100644
--- a/packages/client/src/widgets/activity.chart.vue
+++ b/packages/client/src/widgets/activity.chart.vue
@@ -1,32 +1,39 @@
 <template>
-<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`" @mousedown.prevent="onMousedown">
-	<polyline
-		:points="pointsNote"
-		fill="none"
-		stroke-width="1"
-		stroke="#c4a7e7"/>
-	<polyline
-		:points="pointsReply"
-		fill="none"
-		stroke-width="1"
-		stroke="#eb6f92"/>
-	<polyline
-		:points="pointsRenote"
-		fill="none"
-		stroke-width="1"
-		stroke="#ebbcba"/>
-	<polyline
-		:points="pointsTotal"
-		fill="none"
-		stroke-width="1"
-		stroke="#6e6a86"
-		stroke-dasharray="2 2"/>
-</svg>
+	<svg
+		:viewBox="`0 0 ${viewBoxX} ${viewBoxY}`"
+		@mousedown.prevent="onMousedown"
+	>
+		<polyline
+			:points="pointsNote"
+			fill="none"
+			stroke-width="1"
+			stroke="#c4a7e7"
+		/>
+		<polyline
+			:points="pointsReply"
+			fill="none"
+			stroke-width="1"
+			stroke="#eb6f92"
+		/>
+		<polyline
+			:points="pointsRenote"
+			fill="none"
+			stroke-width="1"
+			stroke="#ebbcba"
+		/>
+		<polyline
+			:points="pointsTotal"
+			fill="none"
+			stroke-width="1"
+			stroke="#6e6a86"
+			stroke-dasharray="2 2"
+		/>
+	</svg>
 </template>
 
 <script lang="ts" setup>
 const props = defineProps<{
-	activity: any[]
+	activity: any[];
 }>();
 
 let viewBoxX: number = $ref(147);
@@ -39,15 +46,15 @@ let pointsRenote: any = $ref(null);
 let pointsTotal: any = $ref(null);
 
 function dragListen(fn) {
-	window.addEventListener('mousemove', fn);
-	window.addEventListener('mouseleave', dragClear.bind(null, fn));
-	window.addEventListener('mouseup', dragClear.bind(null, fn));
+	window.addEventListener("mousemove", fn);
+	window.addEventListener("mouseleave", dragClear.bind(null, fn));
+	window.addEventListener("mouseup", dragClear.bind(null, fn));
 }
 
 function dragClear(fn) {
-	window.removeEventListener('mousemove', fn);
-	window.removeEventListener('mouseleave', dragClear);
-	window.removeEventListener('mouseup', dragClear);
+	window.removeEventListener("mousemove", fn);
+	window.removeEventListener("mouseleave", dragClear);
+	window.removeEventListener("mouseup", dragClear);
 }
 
 function onMousedown(ev) {
@@ -57,26 +64,45 @@ function onMousedown(ev) {
 	const basePos = pos;
 
 	// 動かした時
-	dragListen(me => {
+	dragListen((me) => {
 		let moveLeft = me.clientX - clickX;
 		let moveTop = me.clientY - clickY;
 
-		zoom = Math.max(1, baseZoom + (-moveTop / 20));
+		zoom = Math.max(1, baseZoom + -moveTop / 20);
 		pos = Math.min(0, basePos + moveLeft);
-		if (pos < -(((props.activity.length - 1) * zoom) - viewBoxX)) pos = -(((props.activity.length - 1) * zoom) - viewBoxX);
+		if (pos < -((props.activity.length - 1) * zoom - viewBoxX))
+			pos = -((props.activity.length - 1) * zoom - viewBoxX);
 
 		render();
 	});
 }
 
 function render() {
-	const peak = Math.max(...props.activity.map(d => d.total));
+	const peak = Math.max(...props.activity.map((d) => d.total));
 	if (peak !== 0) {
 		const activity = props.activity.slice().reverse();
-		pointsNote = activity.map((d, i) => `${(i * zoom) + pos},${(1 - (d.notes / peak)) * viewBoxY}`).join(' ');
-		pointsReply = activity.map((d, i) => `${(i * zoom) + pos},${(1 - (d.replies / peak)) * viewBoxY}`).join(' ');
-		pointsRenote = activity.map((d, i) => `${(i * zoom) + pos},${(1 - (d.renotes / peak)) * viewBoxY}`).join(' ');
-		pointsTotal = activity.map((d, i) => `${(i * zoom) + pos},${(1 - (d.total / peak)) * viewBoxY}`).join(' ');
+		pointsNote = activity
+			.map(
+				(d, i) => `${i * zoom + pos},${(1 - d.notes / peak) * viewBoxY}`
+			)
+			.join(" ");
+		pointsReply = activity
+			.map(
+				(d, i) =>
+					`${i * zoom + pos},${(1 - d.replies / peak) * viewBoxY}`
+			)
+			.join(" ");
+		pointsRenote = activity
+			.map(
+				(d, i) =>
+					`${i * zoom + pos},${(1 - d.renotes / peak) * viewBoxY}`
+			)
+			.join(" ");
+		pointsTotal = activity
+			.map(
+				(d, i) => `${i * zoom + pos},${(1 - d.total / peak) * viewBoxY}`
+			)
+			.join(" ");
 	}
 }
 </script>
diff --git a/packages/client/src/widgets/activity.vue b/packages/client/src/widgets/activity.vue
index f514458b9..b148d3934 100644
--- a/packages/client/src/widgets/activity.vue
+++ b/packages/client/src/widgets/activity.vue
@@ -1,42 +1,64 @@
 <template>
-<MkContainer :show-header="widgetProps.showHeader" :naked="widgetProps.transparent" class="mkw-activity">
-	<template #header><i class="ph-chart-bar ph-bold ph-lg"></i>{{ i18n.ts._widgets.activity }}</template>
-	<template #func><button class="_button" @click="toggleView()"><i class="ph-sort-ascending ph-bold ph-lg"></i></button></template>
+	<MkContainer
+		:show-header="widgetProps.showHeader"
+		:naked="widgetProps.transparent"
+		class="mkw-activity"
+	>
+		<template #header
+			><i class="ph-chart-bar ph-bold ph-lg"></i
+			>{{ i18n.ts._widgets.activity }}</template
+		>
+		<template #func
+			><button class="_button" @click="toggleView()">
+				<i class="ph-sort-ascending ph-bold ph-lg"></i></button
+		></template>
 
-	<div>
-		<MkLoading v-if="fetching"/>
-		<template v-else>
-			<XCalendar v-show="widgetProps.view === 0" :activity="[].concat(activity)"/>
-			<XChart v-show="widgetProps.view === 1" :activity="[].concat(activity)"/>
-		</template>
-	</div>
-</MkContainer>
+		<div>
+			<MkLoading v-if="fetching" />
+			<template v-else>
+				<XCalendar
+					v-show="widgetProps.view === 0"
+					:activity="[].concat(activity)"
+				/>
+				<XChart
+					v-show="widgetProps.view === 1"
+					:activity="[].concat(activity)"
+				/>
+			</template>
+		</div>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, reactive, ref, watch } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import XCalendar from './activity.calendar.vue';
-import XChart from './activity.chart.vue';
-import { GetFormResultType } from '@/scripts/form';
-import * as os from '@/os';
-import MkContainer from '@/components/MkContainer.vue';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
+import { onMounted, onUnmounted, reactive, ref, watch } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import XCalendar from "./activity.calendar.vue";
+import XChart from "./activity.chart.vue";
+import { GetFormResultType } from "@/scripts/form";
+import * as os from "@/os";
+import MkContainer from "@/components/MkContainer.vue";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
 
-const name = 'activity';
+const name = "activity";
 
 const widgetPropsDef = {
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	transparent: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 	view: {
-		type: 'number' as const,
+		type: "number" as const,
 		default: 0,
 		hidden: true,
 	},
@@ -47,13 +69,14 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure, save } = useWidgetPropsManager(name,
+const { widgetProps, configure, save } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const activity = ref(null);
@@ -68,11 +91,11 @@ const toggleView = () => {
 	save();
 };
 
-os.apiGet('charts/user/notes', {
+os.apiGet("charts/user/notes", {
 	userId: $i.id,
-	span: 'day',
+	span: "day",
 	limit: 7 * 21,
-}).then(res => {
+}).then((res) => {
 	activity.value = res.diffs.normal.map((_, i) => ({
 		total: res.diffs.normal[i] + res.diffs.reply[i] + res.diffs.renote[i],
 		notes: res.diffs.normal[i],
diff --git a/packages/client/src/widgets/aiscript.vue b/packages/client/src/widgets/aiscript.vue
index d0eddacbb..78a30a159 100644
--- a/packages/client/src/widgets/aiscript.vue
+++ b/packages/client/src/widgets/aiscript.vue
@@ -1,39 +1,58 @@
 <template>
-<MkContainer :show-header="widgetProps.showHeader" class="mkw-aiscript">
-	<template #header><i class="ph-terminal-window ph-bold ph-lg"></i>{{ i18n.ts._widgets.aiscript }}</template>
+	<MkContainer :show-header="widgetProps.showHeader" class="mkw-aiscript">
+		<template #header
+			><i class="ph-terminal-window ph-bold ph-lg"></i
+			>{{ i18n.ts._widgets.aiscript }}</template
+		>
 
-	<div class="uylguesu _monospace">
-		<textarea v-model="widgetProps.script" placeholder="(1 + 1)"></textarea>
-		<button class="_buttonPrimary" @click="run">RUN</button>
-		<div class="logs">
-			<div v-for="log in logs" :key="log.id" class="log" :class="{ print: log.print }">{{ log.text }}</div>
+		<div class="uylguesu _monospace">
+			<textarea
+				v-model="widgetProps.script"
+				placeholder="(1 + 1)"
+			></textarea>
+			<button class="_buttonPrimary" @click="run">RUN</button>
+			<div class="logs">
+				<div
+					v-for="log in logs"
+					:key="log.id"
+					class="log"
+					:class="{ print: log.print }"
+				>
+					{{ log.text }}
+				</div>
+			</div>
 		</div>
-	</div>
-</MkContainer>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref, watch } from 'vue';
-import { AiScript, parse, utils } from '@syuilo/aiscript';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import * as os from '@/os';
-import MkContainer from '@/components/MkContainer.vue';
-import { createAiScriptEnv } from '@/scripts/aiscript/api';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
+import { onMounted, onUnmounted, ref, watch } from "vue";
+import { AiScript, parse, utils } from "@syuilo/aiscript";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import * as os from "@/os";
+import MkContainer from "@/components/MkContainer.vue";
+import { createAiScriptEnv } from "@/scripts/aiscript/api";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
 
-const name = 'aiscript';
+const name = "aiscript";
 
 const widgetPropsDef = {
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	script: {
-		type: 'string' as const,
+		type: "string" as const,
 		multiline: true,
-		default: '(1 + 1)',
+		default: "(1 + 1)",
 		hidden: true,
 	},
 };
@@ -43,62 +62,74 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
-const logs = ref<{
-	id: string;
-	text: string;
-	print: boolean;
-}[]>([]);
+const logs = ref<
+	{
+		id: string;
+		text: string;
+		print: boolean;
+	}[]
+>([]);
 
 const run = async () => {
 	logs.value = [];
-	const aiscript = new AiScript(createAiScriptEnv({
-		storageKey: 'widget',
-		token: $i?.token,
-	}), {
-		in: (q) => {
-			return new Promise(ok => {
-				os.inputText({
-					title: q,
-				}).then(({ canceled, result: a }) => {
-					ok(a);
+	const aiscript = new AiScript(
+		createAiScriptEnv({
+			storageKey: "widget",
+			token: $i?.token,
+		}),
+		{
+			in: (q) => {
+				return new Promise((ok) => {
+					os.inputText({
+						title: q,
+					}).then(({ canceled, result: a }) => {
+						ok(a);
+					});
 				});
-			});
-		},
-		out: (value) => {
-			logs.value.push({
-				id: Math.random().toString(),
-				text: value.type === 'str' ? value.value : utils.valToString(value),
-				print: true,
-			});
-		},
-		log: (type, params) => {
-			switch (type) {
-				case 'end': logs.value.push({
+			},
+			out: (value) => {
+				logs.value.push({
 					id: Math.random().toString(),
-					text: utils.valToString(params.val, true),
-					print: false,
-				}); break;
-				default: break;
-			}
-		},
-	});
+					text:
+						value.type === "str"
+							? value.value
+							: utils.valToString(value),
+					print: true,
+				});
+			},
+			log: (type, params) => {
+				switch (type) {
+					case "end":
+						logs.value.push({
+							id: Math.random().toString(),
+							text: utils.valToString(params.val, true),
+							print: false,
+						});
+						break;
+					default:
+						break;
+				}
+			},
+		}
+	);
 
 	let ast;
 	try {
 		ast = parse(widgetProps.script);
 	} catch (err) {
 		os.alert({
-			type: 'error',
-			text: 'Syntax error :(',
+			type: "error",
+			text: "Syntax error :(",
 		});
 		return;
 	}
@@ -106,7 +137,7 @@ const run = async () => {
 		await aiscript.exec(ast);
 	} catch (err) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: err,
 		});
 	}
diff --git a/packages/client/src/widgets/button.vue b/packages/client/src/widgets/button.vue
index f0148d7f4..9e524f295 100644
--- a/packages/client/src/widgets/button.vue
+++ b/packages/client/src/widgets/button.vue
@@ -1,34 +1,40 @@
 <template>
-<div class="mkw-button">
-	<MkButton :primary="widgetProps.colored" full @click="run">
-		{{ widgetProps.label }}
-	</MkButton>
-</div>
+	<div class="mkw-button">
+		<MkButton :primary="widgetProps.colored" full @click="run">
+			{{ widgetProps.label }}
+		</MkButton>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref, watch } from 'vue';
-import { AiScript, parse, utils } from '@syuilo/aiscript';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import * as os from '@/os';
-import { createAiScriptEnv } from '@/scripts/aiscript/api';
-import { $i } from '@/account';
-import MkButton from '@/components/MkButton.vue';
+import { onMounted, onUnmounted, ref, watch } from "vue";
+import { AiScript, parse, utils } from "@syuilo/aiscript";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import * as os from "@/os";
+import { createAiScriptEnv } from "@/scripts/aiscript/api";
+import { $i } from "@/account";
+import MkButton from "@/components/MkButton.vue";
 
-const name = 'button';
+const name = "button";
 
 const widgetPropsDef = {
 	label: {
-		type: 'string' as const,
-		default: 'BUTTON',
+		type: "string" as const,
+		default: "BUTTON",
 	},
 	colored: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	script: {
-		type: 'string' as const,
+		type: "string" as const,
 		multiline: true,
 		default: 'Mk:dialog("hello" "world")',
 	},
@@ -39,44 +45,48 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const run = async () => {
-	const aiscript = new AiScript(createAiScriptEnv({
-		storageKey: 'widget',
-		token: $i?.token,
-	}), {
-		in: (q) => {
-			return new Promise(ok => {
-				os.inputText({
-					title: q,
-				}).then(({ canceled, result: a }) => {
-					ok(a);
+	const aiscript = new AiScript(
+		createAiScriptEnv({
+			storageKey: "widget",
+			token: $i?.token,
+		}),
+		{
+			in: (q) => {
+				return new Promise((ok) => {
+					os.inputText({
+						title: q,
+					}).then(({ canceled, result: a }) => {
+						ok(a);
+					});
 				});
-			});
-		},
-		out: (value) => {
-			// nop
-		},
-		log: (type, params) => {
-			// nop
-		},
-	});
+			},
+			out: (value) => {
+				// nop
+			},
+			log: (type, params) => {
+				// nop
+			},
+		}
+	);
 
 	let ast;
 	try {
 		ast = parse(widgetProps.script);
 	} catch (err) {
 		os.alert({
-			type: 'error',
-			text: 'Syntax error :(',
+			type: "error",
+			text: "Syntax error :(",
 		});
 		return;
 	}
@@ -84,7 +94,7 @@ const run = async () => {
 		await aiscript.exec(ast);
 	} catch (err) {
 		os.alert({
-			type: 'error',
+			type: "error",
 			text: err,
 		});
 	}
diff --git a/packages/client/src/widgets/calendar.vue b/packages/client/src/widgets/calendar.vue
index 52e39138d..655308d50 100644
--- a/packages/client/src/widgets/calendar.vue
+++ b/packages/client/src/widgets/calendar.vue
@@ -1,49 +1,66 @@
 <template>
-<div class="mkw-calendar" :class="{ _panel: !widgetProps.transparent }">
-	<div class="calendar" :class="{ isHoliday }">
-		<p class="month-and-year">
-			<span class="year">{{ i18n.t('yearX', { year }) }}</span>
-			<span class="month">{{ i18n.t('monthX', { month }) }}</span>
-		</p>
-		<p v-if="month === 1 && day === 1" class="day">🎉{{ i18n.t('dayX', { day }) }}<span style="display: inline-block; transform: scaleX(-1);">🎉</span></p>
-		<p v-else class="day">{{ i18n.t('dayX', { day }) }}</p>
-		<p class="week-day">{{ weekDay }}</p>
-	</div>
-	<div class="info">
-		<div>
-			<p>{{ i18n.ts.today }}: <b>{{ dayP.toFixed(1) }}%</b></p>
-			<div class="meter">
-				<div class="val" :style="{ width: `${dayP}%` }"></div>
-			</div>
+	<div class="mkw-calendar" :class="{ _panel: !widgetProps.transparent }">
+		<div class="calendar" :class="{ isHoliday }">
+			<p class="month-and-year">
+				<span class="year">{{ i18n.t("yearX", { year }) }}</span>
+				<span class="month">{{ i18n.t("monthX", { month }) }}</span>
+			</p>
+			<p v-if="month === 1 && day === 1" class="day">
+				🎉{{ i18n.t("dayX", { day })
+				}}<span style="display: inline-block; transform: scaleX(-1)"
+					>🎉</span
+				>
+			</p>
+			<p v-else class="day">{{ i18n.t("dayX", { day }) }}</p>
+			<p class="week-day">{{ weekDay }}</p>
 		</div>
-		<div>
-			<p>{{ i18n.ts.thisMonth }}: <b>{{ monthP.toFixed(1) }}%</b></p>
-			<div class="meter">
-				<div class="val" :style="{ width: `${monthP}%` }"></div>
+		<div class="info">
+			<div>
+				<p>
+					{{ i18n.ts.today }}: <b>{{ dayP.toFixed(1) }}%</b>
+				</p>
+				<div class="meter">
+					<div class="val" :style="{ width: `${dayP}%` }"></div>
+				</div>
 			</div>
-		</div>
-		<div>
-			<p>{{ i18n.ts.thisYear }}: <b>{{ yearP.toFixed(1) }}%</b></p>
-			<div class="meter">
-				<div class="val" :style="{ width: `${yearP}%` }"></div>
+			<div>
+				<p>
+					{{ i18n.ts.thisMonth }}: <b>{{ monthP.toFixed(1) }}%</b>
+				</p>
+				<div class="meter">
+					<div class="val" :style="{ width: `${monthP}%` }"></div>
+				</div>
+			</div>
+			<div>
+				<p>
+					{{ i18n.ts.thisYear }}: <b>{{ yearP.toFixed(1) }}%</b>
+				</p>
+				<div class="meter">
+					<div class="val" :style="{ width: `${yearP}%` }"></div>
+				</div>
 			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onUnmounted, ref } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import { i18n } from '@/i18n';
-import { useInterval } from '@/scripts/use-interval';
+import { onUnmounted, ref } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import { i18n } from "@/i18n";
+import { useInterval } from "@/scripts/use-interval";
 
-const name = 'calendar';
+const name = "calendar";
 
 const widgetPropsDef = {
 	transparent: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 };
@@ -53,19 +70,20 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const year = ref(0);
 const month = ref(0);
 const day = ref(0);
-const weekDay = ref('');
+const weekDay = ref("");
 const yearP = ref(0);
 const monthP = ref(0);
 const dayP = ref(0);
@@ -90,15 +108,17 @@ const tick = () => {
 	][now.getDay()];
 
 	const dayNumer = now.getTime() - new Date(ny, nm, nd).getTime();
-	const dayDenom = 1000/*ms*/ * 60/*s*/ * 60/*m*/ * 24/*h*/;
+	const dayDenom = 1000 /*ms*/ * 60 /*s*/ * 60 /*m*/ * 24; /*h*/
 	const monthNumer = now.getTime() - new Date(ny, nm, 1).getTime();
-	const monthDenom = new Date(ny, nm + 1, 1).getTime() - new Date(ny, nm, 1).getTime();
+	const monthDenom =
+		new Date(ny, nm + 1, 1).getTime() - new Date(ny, nm, 1).getTime();
 	const yearNumer = now.getTime() - new Date(ny, 0, 1).getTime();
-	const yearDenom = new Date(ny + 1, 0, 1).getTime() - new Date(ny, 0, 1).getTime();
+	const yearDenom =
+		new Date(ny + 1, 0, 1).getTime() - new Date(ny, 0, 1).getTime();
 
-	dayP.value = dayNumer / dayDenom * 100;
-	monthP.value = monthNumer / monthDenom * 100;
-	yearP.value = yearNumer / yearDenom * 100;
+	dayP.value = (dayNumer / dayDenom) * 100;
+	monthP.value = (monthNumer / monthDenom) * 100;
+	yearP.value = (yearNumer / yearDenom) * 100;
 
 	isHoliday.value = now.getDay() === 0 || now.getDay() === 6;
 };
@@ -136,12 +156,14 @@ defineExpose<WidgetComponentExpose>({
 			}
 		}
 
-		> .month-and-year, > .week-day {
+		> .month-and-year,
+		> .week-day {
 			margin: 0;
 			line-height: 18px;
 			font-size: 0.9em;
 
-			> .year, > .month {
+			> .year,
+			> .month {
 				margin: 0 4px;
 			}
 		}
@@ -186,7 +208,7 @@ defineExpose<WidgetComponentExpose>({
 
 				> .val {
 					height: 4px;
-					transition: width .3s cubic-bezier(0.23, 1, 0.32, 1);
+					transition: width 0.3s cubic-bezier(0.23, 1, 0.32, 1);
 				}
 			}
 
diff --git a/packages/client/src/widgets/clock.vue b/packages/client/src/widgets/clock.vue
index dc99b6631..60b90a4b9 100644
--- a/packages/client/src/widgets/clock.vue
+++ b/packages/client/src/widgets/clock.vue
@@ -1,114 +1,188 @@
 <template>
-<MkContainer :naked="widgetProps.transparent" :show-header="false" class="mkw-clock">
-	<div class="vubelbmv" :class="widgetProps.size">
-		<div v-if="widgetProps.label === 'tz' || widgetProps.label === 'timeAndTz'" class="_monospace label a abbrev">{{ tzAbbrev }}</div>
-		<MkAnalogClock
-			class="clock"
-			:thickness="widgetProps.thickness"
-			:offset="tzOffset"
-			:graduations="widgetProps.graduations"
-			:fade-graduations="widgetProps.fadeGraduations"
-			:twentyfour="widgetProps.twentyFour"
-			:s-animation="widgetProps.sAnimation"
-		/>
-		<MkDigitalClock v-if="widgetProps.label === 'time' || widgetProps.label === 'timeAndTz'" class="_monospace label c time" :show-s="false" :offset="tzOffset"/>
-		<div v-if="widgetProps.label === 'tz' || widgetProps.label === 'timeAndTz'" class="_monospace label d offset">{{ tzOffsetLabel }}</div>
-	</div>
-</MkContainer>
+	<MkContainer
+		:naked="widgetProps.transparent"
+		:show-header="false"
+		class="mkw-clock"
+	>
+		<div class="vubelbmv" :class="widgetProps.size">
+			<div
+				v-if="
+					widgetProps.label === 'tz' ||
+					widgetProps.label === 'timeAndTz'
+				"
+				class="_monospace label a abbrev"
+			>
+				{{ tzAbbrev }}
+			</div>
+			<MkAnalogClock
+				class="clock"
+				:thickness="widgetProps.thickness"
+				:offset="tzOffset"
+				:graduations="widgetProps.graduations"
+				:fade-graduations="widgetProps.fadeGraduations"
+				:twentyfour="widgetProps.twentyFour"
+				:s-animation="widgetProps.sAnimation"
+			/>
+			<MkDigitalClock
+				v-if="
+					widgetProps.label === 'time' ||
+					widgetProps.label === 'timeAndTz'
+				"
+				class="_monospace label c time"
+				:show-s="false"
+				:offset="tzOffset"
+			/>
+			<div
+				v-if="
+					widgetProps.label === 'tz' ||
+					widgetProps.label === 'timeAndTz'
+				"
+				class="_monospace label d offset"
+			>
+				{{ tzOffsetLabel }}
+			</div>
+		</div>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import MkContainer from '@/components/MkContainer.vue';
-import MkAnalogClock from '@/components/MkAnalogClock.vue';
-import MkDigitalClock from '@/components/MkDigitalClock.vue';
-import { timezones } from '@/scripts/timezones';
-import { i18n } from '@/i18n';
+import {} from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import MkContainer from "@/components/MkContainer.vue";
+import MkAnalogClock from "@/components/MkAnalogClock.vue";
+import MkDigitalClock from "@/components/MkDigitalClock.vue";
+import { timezones } from "@/scripts/timezones";
+import { i18n } from "@/i18n";
 
-const name = 'clock';
+const name = "clock";
 
 const widgetPropsDef = {
 	transparent: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 	size: {
-		type: 'radio' as const,
-		default: 'medium',
-		options: [{
-			value: 'small', label: i18n.ts.small,
-		}, {
-			value: 'medium', label: i18n.ts.medium,
-		}, {
-			value: 'large', label: i18n.ts.large,
-		}],
+		type: "radio" as const,
+		default: "medium",
+		options: [
+			{
+				value: "small",
+				label: i18n.ts.small,
+			},
+			{
+				value: "medium",
+				label: i18n.ts.medium,
+			},
+			{
+				value: "large",
+				label: i18n.ts.large,
+			},
+		],
 	},
 	thickness: {
-		type: 'radio' as const,
+		type: "radio" as const,
 		default: 0.2,
-		options: [{
-			value: 0.1, label: 'thin',
-		}, {
-			value: 0.2, label: 'medium',
-		}, {
-			value: 0.3, label: 'thick',
-		}],
+		options: [
+			{
+				value: 0.1,
+				label: "thin",
+			},
+			{
+				value: 0.2,
+				label: "medium",
+			},
+			{
+				value: 0.3,
+				label: "thick",
+			},
+		],
 	},
 	graduations: {
-		type: 'radio' as const,
-		default: 'numbers',
-		options: [{
-			value: 'none', label: 'None',
-		}, {
-			value: 'dots', label: 'Dots',
-		}, {
-			value: 'numbers', label: 'Numbers',
-		}],
+		type: "radio" as const,
+		default: "numbers",
+		options: [
+			{
+				value: "none",
+				label: "None",
+			},
+			{
+				value: "dots",
+				label: "Dots",
+			},
+			{
+				value: "numbers",
+				label: "Numbers",
+			},
+		],
 	},
 	fadeGraduations: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	sAnimation: {
-		type: 'radio' as const,
-		default: 'elastic',
-		options: [{
-			value: 'none', label: 'None',
-		}, {
-			value: 'elastic', label: 'Elastic',
-		}, {
-			value: 'easeOut', label: 'Ease out',
-		}],
+		type: "radio" as const,
+		default: "elastic",
+		options: [
+			{
+				value: "none",
+				label: "None",
+			},
+			{
+				value: "elastic",
+				label: "Elastic",
+			},
+			{
+				value: "easeOut",
+				label: "Ease out",
+			},
+		],
 	},
 	twentyFour: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 	label: {
-		type: 'radio' as const,
-		default: 'none',
-		options: [{
-			value: 'none', label: 'None',
-		}, {
-			value: 'time', label: 'Time',
-		}, {
-			value: 'tz', label: 'TZ',
-		}, {
-			value: 'timeAndTz', label: 'Time + TZ',
-		}],
+		type: "radio" as const,
+		default: "none",
+		options: [
+			{
+				value: "none",
+				label: "None",
+			},
+			{
+				value: "time",
+				label: "Time",
+			},
+			{
+				value: "tz",
+				label: "TZ",
+			},
+			{
+				value: "timeAndTz",
+				label: "Time + TZ",
+			},
+		],
 	},
 	timezone: {
-		type: 'enum' as const,
+		type: "enum" as const,
 		default: null,
-		enum: [...timezones.map((tz) => ({
-			label: tz.name,
-			value: tz.name.toLowerCase(),
-		})), {
-			label: '(auto)',
-			value: null,
-		}],
+		enum: [
+			...timezones.map((tz) => ({
+				label: tz.name,
+				value: tz.name.toLowerCase(),
+			})),
+			{
+				label: "(auto)",
+				value: null,
+			},
+		],
 	},
 };
 
@@ -117,24 +191,47 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
-const tzAbbrev = $computed(() => (widgetProps.timezone === null
-	? timezones.find((tz) => tz.name.toLowerCase() === Intl.DateTimeFormat().resolvedOptions().timeZone.toLowerCase())?.abbrev
-	: timezones.find((tz) => tz.name.toLowerCase() === widgetProps.timezone)?.abbrev) ?? '?');
+const tzAbbrev = $computed(
+	() =>
+		(widgetProps.timezone === null
+			? timezones.find(
+					(tz) =>
+						tz.name.toLowerCase() ===
+						Intl.DateTimeFormat()
+							.resolvedOptions()
+							.timeZone.toLowerCase()
+			  )?.abbrev
+			: timezones.find(
+					(tz) => tz.name.toLowerCase() === widgetProps.timezone
+			  )?.abbrev) ?? "?"
+);
 
-const tzOffset = $computed(() => widgetProps.timezone === null
-	? 0 - new Date().getTimezoneOffset()
-	: timezones.find((tz) => tz.name.toLowerCase() === widgetProps.timezone)?.offset ?? 0);
+const tzOffset = $computed(() =>
+	widgetProps.timezone === null
+		? 0 - new Date().getTimezoneOffset()
+		: timezones.find((tz) => tz.name.toLowerCase() === widgetProps.timezone)
+				?.offset ?? 0
+);
 
-const tzOffsetLabel = $computed(() => (tzOffset >= 0 ? '+' : '-') + Math.floor(tzOffset / 60).toString().padStart(2, '0') + ':' + (tzOffset % 60).toString().padStart(2, '0'));
+const tzOffsetLabel = $computed(
+	() =>
+		(tzOffset >= 0 ? "+" : "-") +
+		Math.floor(tzOffset / 60)
+			.toString()
+			.padStart(2, "0") +
+		":" +
+		(tzOffset % 60).toString().padStart(2, "0")
+);
 
 defineExpose<WidgetComponentExpose>({
 	name,
diff --git a/packages/client/src/widgets/digital-clock.vue b/packages/client/src/widgets/digital-clock.vue
index d2bfd523f..d0b6b4fd1 100644
--- a/packages/client/src/widgets/digital-clock.vue
+++ b/packages/client/src/widgets/digital-clock.vue
@@ -1,50 +1,65 @@
 <template>
-<div class="mkw-digitalClock _monospace" :class="{ _panel: !widgetProps.transparent }" :style="{ fontSize: `${widgetProps.fontSize}em` }">
-	<div v-if="widgetProps.showLabel" class="label">{{ tzAbbrev }}</div>
-	<div class="time">
-		<MkDigitalClock :show-ms="widgetProps.showMs" :offset="tzOffset"/>
+	<div
+		class="mkw-digitalClock _monospace"
+		:class="{ _panel: !widgetProps.transparent }"
+		:style="{ fontSize: `${widgetProps.fontSize}em` }"
+	>
+		<div v-if="widgetProps.showLabel" class="label">{{ tzAbbrev }}</div>
+		<div class="time">
+			<MkDigitalClock :show-ms="widgetProps.showMs" :offset="tzOffset" />
+		</div>
+		<div v-if="widgetProps.showLabel" class="label">
+			{{ tzOffsetLabel }}
+		</div>
 	</div>
-	<div v-if="widgetProps.showLabel" class="label">{{ tzOffsetLabel }}</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onUnmounted, ref, watch } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import { timezones } from '@/scripts/timezones';
-import MkDigitalClock from '@/components/MkDigitalClock.vue';
+import { onUnmounted, ref, watch } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import { timezones } from "@/scripts/timezones";
+import MkDigitalClock from "@/components/MkDigitalClock.vue";
 
-const name = 'digitalClock';
+const name = "digitalClock";
 
 const widgetPropsDef = {
 	transparent: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 	fontSize: {
-		type: 'number' as const,
+		type: "number" as const,
 		default: 1.5,
 		step: 0.1,
 	},
 	showMs: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	showLabel: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	timezone: {
-		type: 'enum' as const,
+		type: "enum" as const,
 		default: null,
-		enum: [...timezones.map((tz) => ({
-			label: tz.name,
-			value: tz.name.toLowerCase(),
-		})), {
-			label: '(auto)',
-			value: null,
-		}],
+		enum: [
+			...timezones.map((tz) => ({
+				label: tz.name,
+				value: tz.name.toLowerCase(),
+			})),
+			{
+				label: "(auto)",
+				value: null,
+			},
+		],
 	},
 };
 
@@ -53,24 +68,47 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
-const tzAbbrev = $computed(() => (widgetProps.timezone === null
-	? timezones.find((tz) => tz.name.toLowerCase() === Intl.DateTimeFormat().resolvedOptions().timeZone.toLowerCase())?.abbrev
-	: timezones.find((tz) => tz.name.toLowerCase() === widgetProps.timezone)?.abbrev) ?? '?');
+const tzAbbrev = $computed(
+	() =>
+		(widgetProps.timezone === null
+			? timezones.find(
+					(tz) =>
+						tz.name.toLowerCase() ===
+						Intl.DateTimeFormat()
+							.resolvedOptions()
+							.timeZone.toLowerCase()
+			  )?.abbrev
+			: timezones.find(
+					(tz) => tz.name.toLowerCase() === widgetProps.timezone
+			  )?.abbrev) ?? "?"
+);
 
-const tzOffset = $computed(() => widgetProps.timezone === null
-	? 0 - new Date().getTimezoneOffset()
-	: timezones.find((tz) => tz.name.toLowerCase() === widgetProps.timezone)?.offset ?? 0);
+const tzOffset = $computed(() =>
+	widgetProps.timezone === null
+		? 0 - new Date().getTimezoneOffset()
+		: timezones.find((tz) => tz.name.toLowerCase() === widgetProps.timezone)
+				?.offset ?? 0
+);
 
-const tzOffsetLabel = $computed(() => (tzOffset >= 0 ? '+' : '-') + Math.floor(tzOffset / 60).toString().padStart(2, '0') + ':' + (tzOffset % 60).toString().padStart(2, '0'));
+const tzOffsetLabel = $computed(
+	() =>
+		(tzOffset >= 0 ? "+" : "-") +
+		Math.floor(tzOffset / 60)
+			.toString()
+			.padStart(2, "0") +
+		":" +
+		(tzOffset % 60).toString().padStart(2, "0")
+);
 
 defineExpose<WidgetComponentExpose>({
 	name,
diff --git a/packages/client/src/widgets/federation.vue b/packages/client/src/widgets/federation.vue
index e2937de5e..51c0e0d75 100644
--- a/packages/client/src/widgets/federation.vue
+++ b/packages/client/src/widgets/federation.vue
@@ -1,39 +1,74 @@
 <template>
-<MkContainer :show-header="widgetProps.showHeader" :foldable="foldable" :scrollable="scrollable" class="mkw-federation">
-	<template #header><i class="ph-planet ph-bold ph-lg"></i>{{ i18n.ts._widgets.federation }}</template>
+	<MkContainer
+		:show-header="widgetProps.showHeader"
+		:foldable="foldable"
+		:scrollable="scrollable"
+		class="mkw-federation"
+	>
+		<template #header
+			><i class="ph-planet ph-bold ph-lg"></i
+			>{{ i18n.ts._widgets.federation }}</template
+		>
 
-	<div class="wbrkwalb">
-		<MkLoading v-if="fetching"/>
-		<transition-group v-else tag="div" :name="$store.state.animation ? 'chart' : ''" class="instances">
-			<div v-for="(instance, i) in instances" :key="instance.id" class="instance">
-				<img :src="getInstanceIcon(instance)" alt=""/>
-				<div class="body">
-					<a class="a" :href="'https://' + instance.host" target="_blank" :title="instance.host">{{ instance.host }}</a>
-					<p>{{ instance.softwareName || '?' }} {{ instance.softwareVersion }}</p>
+		<div class="wbrkwalb">
+			<MkLoading v-if="fetching" />
+			<transition-group
+				v-else
+				tag="div"
+				:name="$store.state.animation ? 'chart' : ''"
+				class="instances"
+			>
+				<div
+					v-for="(instance, i) in instances"
+					:key="instance.id"
+					class="instance"
+				>
+					<img :src="getInstanceIcon(instance)" alt="" />
+					<div class="body">
+						<a
+							class="a"
+							:href="'https://' + instance.host"
+							target="_blank"
+							:title="instance.host"
+							>{{ instance.host }}</a
+						>
+						<p>
+							{{ instance.softwareName || "?" }}
+							{{ instance.softwareVersion }}
+						</p>
+					</div>
+					<MkMiniChart
+						class="chart"
+						:src="charts[i].requests.received"
+					/>
 				</div>
-				<MkMiniChart class="chart" :src="charts[i].requests.received"/>
-			</div>
-		</transition-group>
-	</div>
-</MkContainer>
+			</transition-group>
+		</div>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import MkContainer from '@/components/MkContainer.vue';
-import MkMiniChart from '@/components/MkMiniChart.vue';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import { i18n } from '@/i18n';
-import { getProxiedImageUrlNullable } from '@/scripts/media-proxy';
+import { onMounted, onUnmounted, ref } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import MkContainer from "@/components/MkContainer.vue";
+import MkMiniChart from "@/components/MkMiniChart.vue";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import { i18n } from "@/i18n";
+import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
 
-const name = 'federation';
+const name = "federation";
 
 const widgetPropsDef = {
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 };
@@ -43,13 +78,18 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps> & { foldable?: boolean; scrollable?: boolean; }>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; foldable?: boolean; scrollable?: boolean; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{
+	widget?: Widget<WidgetProps>;
+	foldable?: boolean;
+	scrollable?: boolean;
+}>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const instances = ref([]);
@@ -57,11 +97,19 @@ const charts = ref([]);
 const fetching = ref(true);
 
 const fetch = async () => {
-	const fetchedInstances = await os.api('federation/instances', {
-		sort: '+lastCommunicatedAt',
+	const fetchedInstances = await os.api("federation/instances", {
+		sort: "+lastCommunicatedAt",
 		limit: 5,
 	});
-	const fetchedCharts = await Promise.all(fetchedInstances.map(i => os.apiGet('charts/instance', { host: i.host, limit: 16, span: 'hour' })));
+	const fetchedCharts = await Promise.all(
+		fetchedInstances.map((i) =>
+			os.apiGet("charts/instance", {
+				host: i.host,
+				limit: 16,
+				span: "hour",
+			})
+		)
+	);
 	instances.value = fetchedInstances;
 	charts.value = fetchedCharts;
 	fetching.value = false;
@@ -73,7 +121,11 @@ useInterval(fetch, 1000 * 60, {
 });
 
 function getInstanceIcon(instance): string {
-	return getProxiedImageUrlNullable(instance.iconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? '/client-assets/dummy.png';
+	return (
+		getProxiedImageUrlNullable(instance.iconUrl, "preview") ??
+		getProxiedImageUrlNullable(instance.faviconUrl, "preview") ??
+		"/client-assets/dummy.png"
+	);
 }
 
 defineExpose<WidgetComponentExpose>({
diff --git a/packages/client/src/widgets/instance-cloud.vue b/packages/client/src/widgets/instance-cloud.vue
index 3cb579c28..b9d4a0805 100644
--- a/packages/client/src/widgets/instance-cloud.vue
+++ b/packages/client/src/widgets/instance-cloud.vue
@@ -1,33 +1,44 @@
 <template>
-<MkContainer :naked="widgetProps.transparent" :show-header="false" class="mkw-instance-cloud">
-	<div class="">
-		<MkTagCloud v-if="activeInstances">
-			<li v-for="instance in activeInstances" :key="instance.id">
-				<a @click.prevent="onInstanceClick(instance)">
-					<img style="width: 32px;" :src="getInstanceIcon(instance)">
-				</a>
-			</li>
-		</MkTagCloud>
-	</div>
-</MkContainer>
+	<MkContainer
+		:naked="widgetProps.transparent"
+		:show-header="false"
+		class="mkw-instance-cloud"
+	>
+		<div class="">
+			<MkTagCloud v-if="activeInstances">
+				<li v-for="instance in activeInstances" :key="instance.id">
+					<a @click.prevent="onInstanceClick(instance)">
+						<img
+							style="width: 32px"
+							:src="getInstanceIcon(instance)"
+						/>
+					</a>
+				</li>
+			</MkTagCloud>
+		</div>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import { useWidgetPropsManager, WidgetComponentEmits, WidgetComponentProps } from './widget';
-import type { Widget, WidgetComponentExpose } from './widget';
-import type { GetFormResultType } from '@/scripts/form';
-import MkContainer from '@/components/MkContainer.vue';
-import MkTagCloud from '@/components/MkTagCloud.vue';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import { getProxiedImageUrlNullable } from '@/scripts/media-proxy';
+import {} from "vue";
+import {
+	useWidgetPropsManager,
+	WidgetComponentEmits,
+	WidgetComponentProps,
+} from "./widget";
+import type { Widget, WidgetComponentExpose } from "./widget";
+import type { GetFormResultType } from "@/scripts/form";
+import MkContainer from "@/components/MkContainer.vue";
+import MkTagCloud from "@/components/MkTagCloud.vue";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
 
-const name = 'instanceCloud';
+const name = "instanceCloud";
 
 const widgetPropsDef = {
 	transparent: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 };
@@ -37,13 +48,14 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 let cloud = $ref<InstanceType<typeof MkTagCloud> | null>();
@@ -53,21 +65,29 @@ function onInstanceClick(i) {
 	os.pageWindow(`/instance-info/${i.host}`);
 }
 
-useInterval(() => {
-	os.api('federation/instances', {
-		sort: '+lastCommunicatedAt',
-		limit: 25,
-	}).then(res => {
-		activeInstances = res;
-		if (cloud) cloud.update();
-	});
-}, 1000 * 60 * 3, {
-	immediate: true,
-	afterMounted: true,
-});
+useInterval(
+	() => {
+		os.api("federation/instances", {
+			sort: "+lastCommunicatedAt",
+			limit: 25,
+		}).then((res) => {
+			activeInstances = res;
+			if (cloud) cloud.update();
+		});
+	},
+	1000 * 60 * 3,
+	{
+		immediate: true,
+		afterMounted: true,
+	}
+);
 
 function getInstanceIcon(instance): string {
-	return getProxiedImageUrlNullable(instance.iconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? '/client-assets/dummy.png';
+	return (
+		getProxiedImageUrlNullable(instance.iconUrl, "preview") ??
+		getProxiedImageUrlNullable(instance.faviconUrl, "preview") ??
+		"/client-assets/dummy.png"
+	);
 }
 
 defineExpose<WidgetComponentExpose>({
@@ -77,6 +97,4 @@ defineExpose<WidgetComponentExpose>({
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/packages/client/src/widgets/job-queue.vue b/packages/client/src/widgets/job-queue.vue
index 7f04aca59..1757bd684 100644
--- a/packages/client/src/widgets/job-queue.vue
+++ b/packages/client/src/widgets/job-queue.vue
@@ -1,69 +1,152 @@
 <template>
-<div class="mkw-jobQueue _monospace" :class="{ _panel: !widgetProps.transparent }">
-	<div class="inbox">
-		<div class="label">Inbox queue<i v-if="current.inbox.waiting > 0" class="ph-warning ph-bold ph-lg icon"></i></div>
-		<div class="values">
-			<div>
-				<div>Process</div>
-				<div :class="{ inc: current.inbox.activeSincePrevTick > prev.inbox.activeSincePrevTick, dec: current.inbox.activeSincePrevTick < prev.inbox.activeSincePrevTick }">{{ number(current.inbox.activeSincePrevTick) }}</div>
+	<div
+		class="mkw-jobQueue _monospace"
+		:class="{ _panel: !widgetProps.transparent }"
+	>
+		<div class="inbox">
+			<div class="label">
+				Inbox queue<i
+					v-if="current.inbox.waiting > 0"
+					class="ph-warning ph-bold ph-lg icon"
+				></i>
 			</div>
-			<div>
-				<div>Active</div>
-				<div :class="{ inc: current.inbox.active > prev.inbox.active, dec: current.inbox.active < prev.inbox.active }">{{ number(current.inbox.active) }}</div>
+			<div class="values">
+				<div>
+					<div>Process</div>
+					<div
+						:class="{
+							inc:
+								current.inbox.activeSincePrevTick >
+								prev.inbox.activeSincePrevTick,
+							dec:
+								current.inbox.activeSincePrevTick <
+								prev.inbox.activeSincePrevTick,
+						}"
+					>
+						{{ number(current.inbox.activeSincePrevTick) }}
+					</div>
+				</div>
+				<div>
+					<div>Active</div>
+					<div
+						:class="{
+							inc: current.inbox.active > prev.inbox.active,
+							dec: current.inbox.active < prev.inbox.active,
+						}"
+					>
+						{{ number(current.inbox.active) }}
+					</div>
+				</div>
+				<div>
+					<div>Delayed</div>
+					<div
+						:class="{
+							inc: current.inbox.delayed > prev.inbox.delayed,
+							dec: current.inbox.delayed < prev.inbox.delayed,
+						}"
+					>
+						{{ number(current.inbox.delayed) }}
+					</div>
+				</div>
+				<div>
+					<div>Waiting</div>
+					<div
+						:class="{
+							inc: current.inbox.waiting > prev.inbox.waiting,
+							dec: current.inbox.waiting < prev.inbox.waiting,
+						}"
+					>
+						{{ number(current.inbox.waiting) }}
+					</div>
+				</div>
 			</div>
-			<div>
-				<div>Delayed</div>
-				<div :class="{ inc: current.inbox.delayed > prev.inbox.delayed, dec: current.inbox.delayed < prev.inbox.delayed }">{{ number(current.inbox.delayed) }}</div>
+		</div>
+		<div class="deliver">
+			<div class="label">
+				Deliver queue<i
+					v-if="current.deliver.waiting > 0"
+					class="ph-warning ph-bold ph-lg icon"
+				></i>
 			</div>
-			<div>
-				<div>Waiting</div>
-				<div :class="{ inc: current.inbox.waiting > prev.inbox.waiting, dec: current.inbox.waiting < prev.inbox.waiting }">{{ number(current.inbox.waiting) }}</div>
+			<div class="values">
+				<div>
+					<div>Process</div>
+					<div
+						:class="{
+							inc:
+								current.deliver.activeSincePrevTick >
+								prev.deliver.activeSincePrevTick,
+							dec:
+								current.deliver.activeSincePrevTick <
+								prev.deliver.activeSincePrevTick,
+						}"
+					>
+						{{ number(current.deliver.activeSincePrevTick) }}
+					</div>
+				</div>
+				<div>
+					<div>Active</div>
+					<div
+						:class="{
+							inc: current.deliver.active > prev.deliver.active,
+							dec: current.deliver.active < prev.deliver.active,
+						}"
+					>
+						{{ number(current.deliver.active) }}
+					</div>
+				</div>
+				<div>
+					<div>Delayed</div>
+					<div
+						:class="{
+							inc: current.deliver.delayed > prev.deliver.delayed,
+							dec: current.deliver.delayed < prev.deliver.delayed,
+						}"
+					>
+						{{ number(current.deliver.delayed) }}
+					</div>
+				</div>
+				<div>
+					<div>Waiting</div>
+					<div
+						:class="{
+							inc: current.deliver.waiting > prev.deliver.waiting,
+							dec: current.deliver.waiting < prev.deliver.waiting,
+						}"
+					>
+						{{ number(current.deliver.waiting) }}
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>
-	<div class="deliver">
-		<div class="label">Deliver queue<i v-if="current.deliver.waiting > 0" class="ph-warning ph-bold ph-lg icon"></i></div>
-		<div class="values">
-			<div>
-				<div>Process</div>
-				<div :class="{ inc: current.deliver.activeSincePrevTick > prev.deliver.activeSincePrevTick, dec: current.deliver.activeSincePrevTick < prev.deliver.activeSincePrevTick }">{{ number(current.deliver.activeSincePrevTick) }}</div>
-			</div>
-			<div>
-				<div>Active</div>
-				<div :class="{ inc: current.deliver.active > prev.deliver.active, dec: current.deliver.active < prev.deliver.active }">{{ number(current.deliver.active) }}</div>
-			</div>
-			<div>
-				<div>Delayed</div>
-				<div :class="{ inc: current.deliver.delayed > prev.deliver.delayed, dec: current.deliver.delayed < prev.deliver.delayed }">{{ number(current.deliver.delayed) }}</div>
-			</div>
-			<div>
-				<div>Waiting</div>
-				<div :class="{ inc: current.deliver.waiting > prev.deliver.waiting, dec: current.deliver.waiting < prev.deliver.waiting }">{{ number(current.deliver.waiting) }}</div>
-			</div>
-		</div>
-	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, reactive, ref } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import { stream } from '@/stream';
-import number from '@/filters/number';
-import * as sound from '@/scripts/sound';
-import * as os from '@/os';
-import { deepClone } from '@/scripts/clone';
+import { onMounted, onUnmounted, reactive, ref } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import { stream } from "@/stream";
+import number from "@/filters/number";
+import * as sound from "@/scripts/sound";
+import * as os from "@/os";
+import { deepClone } from "@/scripts/clone";
 
-const name = 'jobQueue';
+const name = "jobQueue";
 
 const widgetPropsDef = {
 	transparent: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 	sound: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 };
@@ -73,16 +156,17 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
-const connection = stream.useChannel('queueStats');
+const connection = stream.useChannel("queueStats");
 const current = reactive({
 	inbox: {
 		activeSincePrevTick: 0,
@@ -98,21 +182,25 @@ const current = reactive({
 	},
 });
 const prev = reactive({} as typeof current);
-const jammedSound = sound.setVolume(sound.getAudio('syuilo/queue-jammed'), 1);
+const jammedSound = sound.setVolume(sound.getAudio("syuilo/queue-jammed"), 1);
 
-for (const domain of ['inbox', 'deliver']) {
+for (const domain of ["inbox", "deliver"]) {
 	prev[domain] = deepClone(current[domain]);
 }
 
 const onStats = (stats) => {
-	for (const domain of ['inbox', 'deliver']) {
+	for (const domain of ["inbox", "deliver"]) {
 		prev[domain] = deepClone(current[domain]);
 		current[domain].activeSincePrevTick = stats[domain].activeSincePrevTick;
 		current[domain].active = stats[domain].active;
 		current[domain].waiting = stats[domain].waiting;
 		current[domain].delayed = stats[domain].delayed;
 
-		if (current[domain].waiting > 0 && widgetProps.sound && jammedSound.paused) {
+		if (
+			current[domain].waiting > 0 &&
+			widgetProps.sound &&
+			jammedSound.paused
+		) {
 			jammedSound.play();
 		}
 	}
@@ -124,17 +212,17 @@ const onStatsLog = (statsLog) => {
 	}
 };
 
-connection.on('stats', onStats);
-connection.on('statsLog', onStatsLog);
+connection.on("stats", onStats);
+connection.on("statsLog", onStatsLog);
 
-connection.send('requestLog', {
+connection.send("requestLog", {
 	id: Math.random().toString().substr(2, 8),
 	length: 1,
 });
 
 onUnmounted(() => {
-	connection.off('stats', onStats);
-	connection.off('statsLog', onStatsLog);
+	connection.off("stats", onStats);
+	connection.off("statsLog", onStatsLog);
 	connection.dispose();
 });
 
@@ -147,8 +235,12 @@ defineExpose<WidgetComponentExpose>({
 
 <style lang="scss" scoped>
 @keyframes warnBlink {
-	0% { opacity: 1; }
-	50% { opacity: 0; }
+	0% {
+		opacity: 1;
+	}
+	50% {
+		opacity: 0;
+	}
 }
 
 .mkw-jobQueue {
diff --git a/packages/client/src/widgets/memo.vue b/packages/client/src/widgets/memo.vue
index 140a1960b..06f2e1bd9 100644
--- a/packages/client/src/widgets/memo.vue
+++ b/packages/client/src/widgets/memo.vue
@@ -1,28 +1,47 @@
 <template>
-<MkContainer :show-header="widgetProps.showHeader" class="mkw-memo">
-	<template #header><i class="ph-sticker ph-bold ph-lg"></i>{{ i18n.ts._widgets.memo }}</template>
+	<MkContainer :show-header="widgetProps.showHeader" class="mkw-memo">
+		<template #header
+			><i class="ph-sticker ph-bold ph-lg"></i
+			>{{ i18n.ts._widgets.memo }}</template
+		>
 
-	<div class="otgbylcu">
-		<textarea v-model="text" :placeholder="i18n.ts.placeholder" @input="onChange"></textarea>
-		<button :disabled="!changed" class="_buttonPrimary" @click="saveMemo">{{ i18n.ts.save }}</button>
-	</div>
-</MkContainer>
+		<div class="otgbylcu">
+			<textarea
+				v-model="text"
+				:placeholder="i18n.ts.placeholder"
+				@input="onChange"
+			></textarea>
+			<button
+				:disabled="!changed"
+				class="_buttonPrimary"
+				@click="saveMemo"
+			>
+				{{ i18n.ts.save }}
+			</button>
+		</div>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, reactive, ref, watch } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import * as os from '@/os';
-import MkContainer from '@/components/MkContainer.vue';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
+import { onMounted, onUnmounted, reactive, ref, watch } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import * as os from "@/os";
+import MkContainer from "@/components/MkContainer.vue";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
 
-const name = 'memo';
+const name = "memo";
 
 const widgetPropsDef = {
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 };
@@ -32,13 +51,14 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // Currently, due to a limitation of vue, imported types cannot be passed to generics.
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const text = ref<string | null>(defaultStore.state.memo);
@@ -46,7 +66,7 @@ const changed = ref(false);
 let timeoutId;
 
 const saveMemo = () => {
-	defaultStore.set('memo', text.value);
+	defaultStore.set("memo", text.value);
 	changed.value = false;
 };
 
@@ -56,9 +76,12 @@ const onChange = () => {
 	timeoutId = window.setTimeout(saveMemo, 1000);
 };
 
-watch(() => defaultStore.reactiveState.memo, newText => {
-	text.value = newText.value;
-});
+watch(
+	() => defaultStore.reactiveState.memo,
+	(newText) => {
+		text.value = newText.value;
+	}
+);
 
 defineExpose<WidgetComponentExpose>({
 	name,
diff --git a/packages/client/src/widgets/notifications.vue b/packages/client/src/widgets/notifications.vue
index 9cdbb94c0..48fb9278a 100644
--- a/packages/client/src/widgets/notifications.vue
+++ b/packages/client/src/widgets/notifications.vue
@@ -1,35 +1,57 @@
 <template>
-<MkContainer :style="`height: ${widgetProps.height}px;`" :show-header="widgetProps.showHeader" :scrollable="true" class="mkw-notifications">
-	<template #header><i class="ph-bell ph-bold ph-lg"></i>{{ i18n.ts.notifications }}</template>
-	<template #func><button class="_button" @click="os.apiWithDialog('notifications/mark-all-as-read');"><i class="ph-check ph-bold ph-lg"></i></button><button class="_button" @click="configureNotification()"><i class="ph-gear-six ph-bold ph-lg"></i></button></template>
-	<div>
-		<XNotifications :include-types="widgetProps.includingTypes"/>
-	</div>
-</MkContainer>
+	<MkContainer
+		:style="`height: ${widgetProps.height}px;`"
+		:show-header="widgetProps.showHeader"
+		:scrollable="true"
+		class="mkw-notifications"
+	>
+		<template #header
+			><i class="ph-bell ph-bold ph-lg"></i
+			>{{ i18n.ts.notifications }}</template
+		>
+		<template #func
+			><button
+				class="_button"
+				@click="os.apiWithDialog('notifications/mark-all-as-read')"
+			>
+				<i class="ph-check ph-bold ph-lg"></i></button
+			><button class="_button" @click="configureNotification()">
+				<i class="ph-gear-six ph-bold ph-lg"></i></button
+		></template>
+		<div>
+			<XNotifications :include-types="widgetProps.includingTypes" />
+		</div>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import MkContainer from '@/components/MkContainer.vue';
-import XNotifications from '@/components/MkNotifications.vue';
-import * as os from '@/os';
-import { i18n } from '@/i18n';
+import { defineAsyncComponent } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import MkContainer from "@/components/MkContainer.vue";
+import XNotifications from "@/components/MkNotifications.vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
 
-const name = 'notifications';
+const name = "notifications";
 
 const widgetPropsDef = {
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	height: {
-		type: 'number' as const,
+		type: "number" as const,
 		default: 300,
 	},
 	includingTypes: {
-		type: 'array' as const,
+		type: "array" as const,
 		hidden: true,
 		default: null,
 	},
@@ -40,25 +62,33 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure, save } = useWidgetPropsManager(name,
+const { widgetProps, configure, save } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const configureNotification = () => {
-	os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSettingWindow.vue')), {
-		includingTypes: widgetProps.includingTypes,
-	}, {
-		done: async (res) => {
-			const { includingTypes } = res;
-			widgetProps.includingTypes = includingTypes;
-			save();
+	os.popup(
+		defineAsyncComponent(
+			() => import("@/components/MkNotificationSettingWindow.vue")
+		),
+		{
+			includingTypes: widgetProps.includingTypes,
 		},
-	}, 'closed');
+		{
+			done: async (res) => {
+				const { includingTypes } = res;
+				widgetProps.includingTypes = includingTypes;
+				save();
+			},
+		},
+		"closed"
+	);
 };
 
 defineExpose<WidgetComponentExpose>({
diff --git a/packages/client/src/widgets/online-users.vue b/packages/client/src/widgets/online-users.vue
index ed885bf13..5ec197bcd 100644
--- a/packages/client/src/widgets/online-users.vue
+++ b/packages/client/src/widgets/online-users.vue
@@ -1,24 +1,43 @@
 <template>
-<div class="mkw-onlineUsers" :class="{ _panel: !widgetProps.transparent, pad: !widgetProps.transparent }">
-	<I18n v-if="onlineUsersCount" :src="i18n.ts.onlineUsersCount" text-tag="span" class="text">
-		<template #n><b>{{ onlineUsersCount }}</b></template>
-	</I18n>
-</div>
+	<div
+		class="mkw-onlineUsers"
+		:class="{
+			_panel: !widgetProps.transparent,
+			pad: !widgetProps.transparent,
+		}"
+	>
+		<I18n
+			v-if="onlineUsersCount"
+			:src="i18n.ts.onlineUsersCount"
+			text-tag="span"
+			class="text"
+		>
+			<template #n
+				><b>{{ onlineUsersCount }}</b></template
+			>
+		</I18n>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import { i18n } from '@/i18n';
+import { onMounted, onUnmounted, ref } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import { i18n } from "@/i18n";
 
-const name = 'onlineUsers';
+const name = "onlineUsers";
 
 const widgetPropsDef = {
 	transparent: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 };
@@ -28,19 +47,20 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const onlineUsersCount = ref(0);
 
 const tick = () => {
-	os.api('get-online-users-count').then(res => {
+	os.api("get-online-users-count").then((res) => {
 		onlineUsersCount.value = res.count;
 	});
 };
diff --git a/packages/client/src/widgets/photos.vue b/packages/client/src/widgets/photos.vue
index bc18cd815..ef160f8c6 100644
--- a/packages/client/src/widgets/photos.vue
+++ b/packages/client/src/widgets/photos.vue
@@ -1,40 +1,56 @@
 <template>
-<MkContainer :show-header="widgetProps.showHeader" :naked="widgetProps.transparent" :class="$style.root" :data-transparent="widgetProps.transparent ? true : null" class="mkw-photos">
-	<template #header><i class="ph-camera ph-bold ph-lg"></i>{{ i18n.ts._widgets.photos }}</template>
+	<MkContainer
+		:show-header="widgetProps.showHeader"
+		:naked="widgetProps.transparent"
+		:class="$style.root"
+		:data-transparent="widgetProps.transparent ? true : null"
+		class="mkw-photos"
+	>
+		<template #header
+			><i class="ph-camera ph-bold ph-lg"></i
+			>{{ i18n.ts._widgets.photos }}</template
+		>
 
-	<div class="">
-		<MkLoading v-if="fetching"/>
-		<div v-else :class="$style.stream">
-			<div
-				v-for="(image, i) in images" :key="i"
-				:class="$style.img"
-				:style="`background-image: url(${thumbnail(image)})`"
-			></div>
+		<div class="">
+			<MkLoading v-if="fetching" />
+			<div v-else :class="$style.stream">
+				<div
+					v-for="(image, i) in images"
+					:key="i"
+					:class="$style.img"
+					:style="`background-image: url(${thumbnail(image)})`"
+				></div>
+			</div>
 		</div>
-	</div>
-</MkContainer>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, reactive, ref } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import { stream } from '@/stream';
-import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import * as os from '@/os';
-import MkContainer from '@/components/MkContainer.vue';
-import { defaultStore } from '@/store';
-import { i18n } from '@/i18n';
+import { onMounted, onUnmounted, reactive, ref } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import { stream } from "@/stream";
+import { getStaticImageUrl } from "@/scripts/get-static-image-url";
+import * as os from "@/os";
+import MkContainer from "@/components/MkContainer.vue";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
 
-const name = 'photos';
+const name = "photos";
 
 const widgetPropsDef = {
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	transparent: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 };
@@ -44,16 +60,17 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
-const connection = stream.useChannel('main');
+const connection = stream.useChannel("main");
 const images = ref([]);
 const fetching = ref(true);
 
@@ -70,15 +87,15 @@ const thumbnail = (image: any): string => {
 		: image.thumbnailUrl;
 };
 
-os.api('drive/stream', {
-	type: 'image/*',
+os.api("drive/stream", {
+	type: "image/*",
 	limit: 9,
-}).then(res => {
+}).then((res) => {
 	images.value = res;
 	fetching.value = false;
 });
 
-connection.on('driveFileCreated', onDriveFileCreated);
+connection.on("driveFileCreated", onDriveFileCreated);
 onUnmounted(() => {
 	connection.dispose();
 });
diff --git a/packages/client/src/widgets/post-form.vue b/packages/client/src/widgets/post-form.vue
index f1708775b..e44f23fbb 100644
--- a/packages/client/src/widgets/post-form.vue
+++ b/packages/client/src/widgets/post-form.vue
@@ -1,30 +1,36 @@
 <template>
-<XPostForm class="_panel mkw-postForm" :fixed="true" :autofocus="false"/>
+	<XPostForm class="_panel mkw-postForm" :fixed="true" :autofocus="false" />
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import { GetFormResultType } from '@/scripts/form';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import XPostForm from '@/components/MkPostForm.vue';
+import {} from "vue";
+import { GetFormResultType } from "@/scripts/form";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import XPostForm from "@/components/MkPostForm.vue";
 
-const name = 'postForm';
+const name = "postForm";
 
-const widgetPropsDef = {
-};
+const widgetPropsDef = {};
 
 type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 defineExpose<WidgetComponentExpose>({
diff --git a/packages/client/src/widgets/rss-ticker.vue b/packages/client/src/widgets/rss-ticker.vue
index 788c3c5c8..0126f2169 100644
--- a/packages/client/src/widgets/rss-ticker.vue
+++ b/packages/client/src/widgets/rss-ticker.vue
@@ -1,65 +1,89 @@
 <template>
-<MkContainer :naked="widgetProps.transparent" :show-header="widgetProps.showHeader" class="mkw-rss-ticker">
-	<template #header><i class="ph-rss ph-bold ph-lg"></i>RSS</template>
-	<template #func><button class="_button" @click="configure"><i class="ph-gear-six ph-bold ph-lg"></i></button></template>
+	<MkContainer
+		:naked="widgetProps.transparent"
+		:show-header="widgetProps.showHeader"
+		class="mkw-rss-ticker"
+	>
+		<template #header><i class="ph-rss ph-bold ph-lg"></i>RSS</template>
+		<template #func
+			><button class="_button" @click="configure">
+				<i class="ph-gear-six ph-bold ph-lg"></i></button
+		></template>
 
-	<div class="ekmkgxbk">
-		<MkLoading v-if="fetching"/>
-		<div v-else class="feed">
-			<transition name="change" mode="default">
-				<MarqueeText :key="key" :duration="widgetProps.duration" :reverse="widgetProps.reverse">
-					<span v-for="item in items" class="item">
-						<a class="link" :href="item.link" rel="nofollow noopener" target="_blank" :title="item.title">{{ item.title }}</a><span class="divider"></span>
-					</span>
-				</MarqueeText>
-			</transition>
+		<div class="ekmkgxbk">
+			<MkLoading v-if="fetching" />
+			<div v-else class="feed">
+				<transition name="change" mode="default">
+					<MarqueeText
+						:key="key"
+						:duration="widgetProps.duration"
+						:reverse="widgetProps.reverse"
+					>
+						<span v-for="item in items" class="item">
+							<a
+								class="link"
+								:href="item.link"
+								rel="nofollow noopener"
+								target="_blank"
+								:title="item.title"
+								>{{ item.title }}</a
+							><span class="divider"></span>
+						</span>
+					</MarqueeText>
+				</transition>
+			</div>
 		</div>
-	</div>
-</MkContainer>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref, watch } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import MarqueeText from '@/components/MkMarquee.vue';
-import { GetFormResultType } from '@/scripts/form';
-import * as os from '@/os';
-import MkContainer from '@/components/MkContainer.vue';
-import { useInterval } from '@/scripts/use-interval';
-import { shuffle } from '@/scripts/shuffle';
+import { onMounted, onUnmounted, ref, watch } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import MarqueeText from "@/components/MkMarquee.vue";
+import { GetFormResultType } from "@/scripts/form";
+import * as os from "@/os";
+import MkContainer from "@/components/MkContainer.vue";
+import { useInterval } from "@/scripts/use-interval";
+import { shuffle } from "@/scripts/shuffle";
 
-const name = 'rssTicker';
+const name = "rssTicker";
 
 const widgetPropsDef = {
 	url: {
-		type: 'string' as const,
-		default: 'http://feeds.afpbb.com/rss/afpbb/afpbbnews',
+		type: "string" as const,
+		default: "http://feeds.afpbb.com/rss/afpbb/afpbbnews",
 	},
 	shuffle: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	refreshIntervalSec: {
-		type: 'number' as const,
+		type: "number" as const,
 		default: 60,
 	},
 	duration: {
-		type: 'range' as const,
+		type: "range" as const,
 		default: 70,
 		step: 1,
 		min: 5,
 		max: 200,
 	},
 	reverse: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 	transparent: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 };
@@ -69,13 +93,14 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const items = ref([]);
@@ -83,8 +108,8 @@ const fetching = ref(true);
 let key = $ref(0);
 
 const tick = () => {
-	fetch(`/api/fetch-rss?url=${widgetProps.url}`, {}).then(res => {
-		res.json().then(feed => {
+	fetch(`/api/fetch-rss?url=${widgetProps.url}`, {}).then((res) => {
+		res.json().then((feed) => {
 			if (widgetProps.shuffle) {
 				shuffle(feed.items);
 			}
@@ -110,17 +135,18 @@ defineExpose<WidgetComponentExpose>({
 </script>
 
 <style lang="scss" scoped>
-.change-enter-active, .change-leave-active {
+.change-enter-active,
+.change-leave-active {
 	position: absolute;
 	top: 0;
-  transition: all 1s ease;
+	transition: all 1s ease;
 }
 .change-enter-from {
-  opacity: 0;
+	opacity: 0;
 	transform: translateY(-100%);
 }
 .change-leave-to {
-  opacity: 0;
+	opacity: 0;
 	transform: translateY(100%);
 }
 
diff --git a/packages/client/src/widgets/rss.vue b/packages/client/src/widgets/rss.vue
index 236d348a9..370ec2023 100644
--- a/packages/client/src/widgets/rss.vue
+++ b/packages/client/src/widgets/rss.vue
@@ -1,34 +1,51 @@
 <template>
-<MkContainer :show-header="widgetProps.showHeader" class="mkw-rss">
-	<template #header><i class="ph-rss ph-bold ph-lg"></i>RSS</template>
-	<template #func><button class="_button" @click="configure"><i class="ph-gear-six ph-bold ph-lg"></i></button></template>
+	<MkContainer :show-header="widgetProps.showHeader" class="mkw-rss">
+		<template #header><i class="ph-rss ph-bold ph-lg"></i>RSS</template>
+		<template #func
+			><button class="_button" @click="configure">
+				<i class="ph-gear-six ph-bold ph-lg"></i></button
+		></template>
 
-	<div class="ekmkgxbj">
-		<MkLoading v-if="fetching"/>
-		<div v-else class="feed">
-			<a v-for="item in items" class="item" :href="item.link" rel="nofollow noopener" target="_blank" :title="item.title">{{ item.title }}</a>
+		<div class="ekmkgxbj">
+			<MkLoading v-if="fetching" />
+			<div v-else class="feed">
+				<a
+					v-for="item in items"
+					class="item"
+					:href="item.link"
+					rel="nofollow noopener"
+					target="_blank"
+					:title="item.title"
+					>{{ item.title }}</a
+				>
+			</div>
 		</div>
-	</div>
-</MkContainer>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref, watch } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import * as os from '@/os';
-import MkContainer from '@/components/MkContainer.vue';
-import { useInterval } from '@/scripts/use-interval';
+import { onMounted, onUnmounted, ref, watch } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import * as os from "@/os";
+import MkContainer from "@/components/MkContainer.vue";
+import { useInterval } from "@/scripts/use-interval";
 
-const name = 'rss';
+const name = "rss";
 
 const widgetPropsDef = {
 	url: {
-		type: 'string' as const,
-		default: 'http://feeds.afpbb.com/rss/afpbb/afpbbnews',
+		type: "string" as const,
+		default: "http://feeds.afpbb.com/rss/afpbb/afpbbnews",
 	},
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 };
@@ -38,21 +55,22 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const items = ref([]);
 const fetching = ref(true);
 
 const tick = () => {
-	fetch(`/api/fetch-rss?url=${widgetProps.url}`, {}).then(res => {
-		res.json().then(feed => {
+	fetch(`/api/fetch-rss?url=${widgetProps.url}`, {}).then((res) => {
+		res.json().then((feed) => {
 			items.value = feed.items;
 			fetching.value = false;
 		});
diff --git a/packages/client/src/widgets/server-metric/cpu-mem.vue b/packages/client/src/widgets/server-metric/cpu-mem.vue
index 00c3a10c9..76ef290f6 100644
--- a/packages/client/src/widgets/server-metric/cpu-mem.vue
+++ b/packages/client/src/widgets/server-metric/cpu-mem.vue
@@ -1,81 +1,93 @@
 <template>
-<div class="lcfyofjk">
-	<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
-		<defs>
-			<linearGradient :id="cpuGradientId" x1="0" x2="0" y1="1" y2="0">
-				<stop offset="0%" stop-color="hsl(180, 80%, 70%)"></stop>
-				<stop offset="100%" stop-color="hsl(0, 80%, 70%)"></stop>
-			</linearGradient>
-			<mask :id="cpuMaskId" x="0" y="0" :width="viewBoxX" :height="viewBoxY">
-				<polygon
-					:points="cpuPolygonPoints"
-					fill="#fff"
-					fill-opacity="0.5"
-				/>
-				<polyline
-					:points="cpuPolylinePoints"
-					fill="none"
-					stroke="#fff"
-					stroke-width="1"
-				/>
-				<circle
-					:cx="cpuHeadX"
-					:cy="cpuHeadY"
-					r="1.5"
-					fill="#fff"
-				/>
-			</mask>
-		</defs>
-		<rect
-			x="-2" y="-2"
-			:width="viewBoxX + 4" :height="viewBoxY + 4"
-			:style="`stroke: none; fill: url(#${ cpuGradientId }); mask: url(#${ cpuMaskId })`"
-		/>
-		<text x="1" y="5">CPU <tspan>{{ cpuP }}%</tspan></text>
-	</svg>
-	<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
-		<defs>
-			<linearGradient :id="memGradientId" x1="0" x2="0" y1="1" y2="0">
-				<stop offset="0%" stop-color="hsl(180, 80%, 70%)"></stop>
-				<stop offset="100%" stop-color="hsl(0, 80%, 70%)"></stop>
-			</linearGradient>
-			<mask :id="memMaskId" x="0" y="0" :width="viewBoxX" :height="viewBoxY">
-				<polygon
-					:points="memPolygonPoints"
-					fill="#fff"
-					fill-opacity="0.5"
-				/>
-				<polyline
-					:points="memPolylinePoints"
-					fill="none"
-					stroke="#fff"
-					stroke-width="1"
-				/>
-				<circle
-					:cx="memHeadX"
-					:cy="memHeadY"
-					r="1.5"
-					fill="#fff"
-				/>
-			</mask>
-		</defs>
-		<rect
-			x="-2" y="-2"
-			:width="viewBoxX + 4" :height="viewBoxY + 4"
-			:style="`stroke: none; fill: url(#${ memGradientId }); mask: url(#${ memMaskId })`"
-		/>
-		<text x="1" y="5">MEM <tspan>{{ memP }}%</tspan></text>
-	</svg>
-</div>
+	<div class="lcfyofjk">
+		<svg :viewBox="`0 0 ${viewBoxX} ${viewBoxY}`">
+			<defs>
+				<linearGradient :id="cpuGradientId" x1="0" x2="0" y1="1" y2="0">
+					<stop offset="0%" stop-color="hsl(180, 80%, 70%)"></stop>
+					<stop offset="100%" stop-color="hsl(0, 80%, 70%)"></stop>
+				</linearGradient>
+				<mask
+					:id="cpuMaskId"
+					x="0"
+					y="0"
+					:width="viewBoxX"
+					:height="viewBoxY"
+				>
+					<polygon
+						:points="cpuPolygonPoints"
+						fill="#fff"
+						fill-opacity="0.5"
+					/>
+					<polyline
+						:points="cpuPolylinePoints"
+						fill="none"
+						stroke="#fff"
+						stroke-width="1"
+					/>
+					<circle :cx="cpuHeadX" :cy="cpuHeadY" r="1.5" fill="#fff" />
+				</mask>
+			</defs>
+			<rect
+				x="-2"
+				y="-2"
+				:width="viewBoxX + 4"
+				:height="viewBoxY + 4"
+				:style="`stroke: none; fill: url(#${cpuGradientId}); mask: url(#${cpuMaskId})`"
+			/>
+			<text x="1" y="5">
+				CPU
+				<tspan>{{ cpuP }}%</tspan>
+			</text>
+		</svg>
+		<svg :viewBox="`0 0 ${viewBoxX} ${viewBoxY}`">
+			<defs>
+				<linearGradient :id="memGradientId" x1="0" x2="0" y1="1" y2="0">
+					<stop offset="0%" stop-color="hsl(180, 80%, 70%)"></stop>
+					<stop offset="100%" stop-color="hsl(0, 80%, 70%)"></stop>
+				</linearGradient>
+				<mask
+					:id="memMaskId"
+					x="0"
+					y="0"
+					:width="viewBoxX"
+					:height="viewBoxY"
+				>
+					<polygon
+						:points="memPolygonPoints"
+						fill="#fff"
+						fill-opacity="0.5"
+					/>
+					<polyline
+						:points="memPolylinePoints"
+						fill="none"
+						stroke="#fff"
+						stroke-width="1"
+					/>
+					<circle :cx="memHeadX" :cy="memHeadY" r="1.5" fill="#fff" />
+				</mask>
+			</defs>
+			<rect
+				x="-2"
+				y="-2"
+				:width="viewBoxX + 4"
+				:height="viewBoxY + 4"
+				:style="`stroke: none; fill: url(#${memGradientId}); mask: url(#${memMaskId})`"
+			/>
+			<text x="1" y="5">
+				MEM
+				<tspan>{{ memP }}%</tspan>
+			</text>
+		</svg>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onBeforeUnmount } from 'vue';
-import { v4 as uuid } from 'uuid';
+import { onMounted, onBeforeUnmount } from "vue";
+import { v4 as uuid } from "uuid";
 
 const props = defineProps<{
-	connection: any,
-	meta: any
+	connection: any;
+	meta: any;
 }>();
 
 let viewBoxX: number = $ref(50);
@@ -85,41 +97,55 @@ const cpuGradientId = uuid();
 const cpuMaskId = uuid();
 const memGradientId = uuid();
 const memMaskId = uuid();
-let cpuPolylinePoints: string = $ref('');
-let memPolylinePoints: string = $ref('');
-let cpuPolygonPoints: string = $ref('');
-let memPolygonPoints: string = $ref('');
+let cpuPolylinePoints: string = $ref("");
+let memPolylinePoints: string = $ref("");
+let cpuPolygonPoints: string = $ref("");
+let memPolygonPoints: string = $ref("");
 let cpuHeadX: any = $ref(null);
 let cpuHeadY: any = $ref(null);
 let memHeadX: any = $ref(null);
 let memHeadY: any = $ref(null);
-let cpuP: string = $ref('');
-let memP: string = $ref('');
+let cpuP: string = $ref("");
+let memP: string = $ref("");
 
 onMounted(() => {
-	props.connection.on('stats', onStats);
-	props.connection.on('statsLog', onStatsLog);
-	props.connection.send('requestLog', {
-		id: Math.random().toString().substr(2, 8)
+	props.connection.on("stats", onStats);
+	props.connection.on("statsLog", onStatsLog);
+	props.connection.send("requestLog", {
+		id: Math.random().toString().substr(2, 8),
 	});
 });
 
 onBeforeUnmount(() => {
-	props.connection.off('stats', onStats);
-	props.connection.off('statsLog', onStatsLog);
+	props.connection.off("stats", onStats);
+	props.connection.off("statsLog", onStatsLog);
 });
 
 function onStats(connStats) {
 	stats.push(connStats);
 	if (stats.length > 50) stats.shift();
 
-	let cpuPolylinePointsStats = stats.map((s, i) => [viewBoxX - ((stats.length - 1) - i), (1 - s.cpu) * viewBoxY]);
-	let memPolylinePointsStats = stats.map((s, i) => [viewBoxX - ((stats.length - 1) - i), (1 - (s.mem.active / props.meta.mem.total)) * viewBoxY]);
-	cpuPolylinePoints = cpuPolylinePointsStats.map(xy => `${xy[0]},${xy[1]}`).join(' ');
-	memPolylinePoints = memPolylinePointsStats.map(xy => `${xy[0]},${xy[1]}`).join(' ');
+	let cpuPolylinePointsStats = stats.map((s, i) => [
+		viewBoxX - (stats.length - 1 - i),
+		(1 - s.cpu) * viewBoxY,
+	]);
+	let memPolylinePointsStats = stats.map((s, i) => [
+		viewBoxX - (stats.length - 1 - i),
+		(1 - s.mem.active / props.meta.mem.total) * viewBoxY,
+	]);
+	cpuPolylinePoints = cpuPolylinePointsStats
+		.map((xy) => `${xy[0]},${xy[1]}`)
+		.join(" ");
+	memPolylinePoints = memPolylinePointsStats
+		.map((xy) => `${xy[0]},${xy[1]}`)
+		.join(" ");
 
-	cpuPolygonPoints = `${viewBoxX - (stats.length - 1)},${viewBoxY} ${cpuPolylinePoints} ${viewBoxX},${viewBoxY}`;
-	memPolygonPoints = `${viewBoxX - (stats.length - 1)},${viewBoxY} ${memPolylinePoints} ${viewBoxX},${viewBoxY}`;
+	cpuPolygonPoints = `${
+		viewBoxX - (stats.length - 1)
+	},${viewBoxY} ${cpuPolylinePoints} ${viewBoxX},${viewBoxY}`;
+	memPolygonPoints = `${
+		viewBoxX - (stats.length - 1)
+	},${viewBoxY} ${memPolylinePoints} ${viewBoxX},${viewBoxY}`;
 
 	cpuHeadX = cpuPolylinePointsStats[cpuPolylinePointsStats.length - 1][0];
 	cpuHeadY = cpuPolylinePointsStats[cpuPolylinePointsStats.length - 1][1];
@@ -127,7 +153,7 @@ function onStats(connStats) {
 	memHeadY = memPolylinePointsStats[memPolylinePointsStats.length - 1][1];
 
 	cpuP = (connStats.cpu * 100).toFixed(0);
-	memP = (connStats.mem.active / props.meta.mem.total * 100).toFixed(0);
+	memP = ((connStats.mem.active / props.meta.mem.total) * 100).toFixed(0);
 }
 
 function onStatsLog(statsLog) {
diff --git a/packages/client/src/widgets/server-metric/cpu.vue b/packages/client/src/widgets/server-metric/cpu.vue
index cafebeb1d..5aa4d2698 100644
--- a/packages/client/src/widgets/server-metric/cpu.vue
+++ b/packages/client/src/widgets/server-metric/cpu.vue
@@ -1,21 +1,21 @@
 <template>
-<div class="vrvdvrys">
-	<XPie class="pie" :value="usage"/>
-	<div>
-		<p><i class="ph-microchip ph-bold ph-lg"></i>CPU</p>
-		<p>{{ meta.cpu.cores }} Logical cores</p>
-		<p>{{ meta.cpu.model }}</p>
+	<div class="vrvdvrys">
+		<XPie class="pie" :value="usage" />
+		<div>
+			<p><i class="ph-microchip ph-bold ph-lg"></i>CPU</p>
+			<p>{{ meta.cpu.cores }} Logical cores</p>
+			<p>{{ meta.cpu.model }}</p>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onBeforeUnmount } from 'vue';
-import XPie from './pie.vue';
+import { onMounted, onBeforeUnmount } from "vue";
+import XPie from "./pie.vue";
 
 const props = defineProps<{
-	connection: any,
-	meta: any
+	connection: any;
+	meta: any;
 }>();
 
 let usage: number = $ref(0);
@@ -25,11 +25,11 @@ function onStats(stats) {
 }
 
 onMounted(() => {
-	props.connection.on('stats', onStats);
+	props.connection.on("stats", onStats);
 });
 
 onBeforeUnmount(() => {
-	props.connection.off('stats', onStats);
+	props.connection.off("stats", onStats);
 });
 </script>
 
diff --git a/packages/client/src/widgets/server-metric/disk.vue b/packages/client/src/widgets/server-metric/disk.vue
index b16e5db60..67ea398c1 100644
--- a/packages/client/src/widgets/server-metric/disk.vue
+++ b/packages/client/src/widgets/server-metric/disk.vue
@@ -1,19 +1,19 @@
 <template>
-<div class="zbwaqsat">
-	<XPie class="pie" :value="usage"/>
-	<div>
-		<p><i class="ph-hard-drives ph-bold ph-lg"></i>Disk</p>
-		<p>Total: {{ bytes(total, 1) }}</p>
-		<p>Free: {{ bytes(available, 1) }}</p>
-		<p>Used: {{ bytes(used, 1) }}</p>
+	<div class="zbwaqsat">
+		<XPie class="pie" :value="usage" />
+		<div>
+			<p><i class="ph-hard-drives ph-bold ph-lg"></i>Disk</p>
+			<p>Total: {{ bytes(total, 1) }}</p>
+			<p>Free: {{ bytes(available, 1) }}</p>
+			<p>Used: {{ bytes(used, 1) }}</p>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import XPie from './pie.vue';
-import bytes from '@/filters/bytes';
+import {} from "vue";
+import XPie from "./pie.vue";
+import bytes from "@/filters/bytes";
 
 const props = defineProps<{
 	meta: any; // TODO
diff --git a/packages/client/src/widgets/server-metric/index.vue b/packages/client/src/widgets/server-metric/index.vue
index 58a41f2e6..96dd3333d 100644
--- a/packages/client/src/widgets/server-metric/index.vue
+++ b/packages/client/src/widgets/server-metric/index.vue
@@ -1,45 +1,80 @@
 <template>
-<MkContainer :show-header="widgetProps.showHeader" :naked="widgetProps.transparent">
-	<template #header><i class="ph-hard-drives ph-bold ph-lg"></i>{{ i18n.ts._widgets.serverMetric }}</template>
-	<template #func><button class="_button" @click="toggleView()"><i class="ph-sort-ascending ph-bold ph-lg"></i></button></template>
+	<MkContainer
+		:show-header="widgetProps.showHeader"
+		:naked="widgetProps.transparent"
+	>
+		<template #header
+			><i class="ph-hard-drives ph-bold ph-lg"></i
+			>{{ i18n.ts._widgets.serverMetric }}</template
+		>
+		<template #func
+			><button class="_button" @click="toggleView()">
+				<i class="ph-sort-ascending ph-bold ph-lg"></i></button
+		></template>
 
-	<div v-if="meta" class="mkw-serverMetric">
-		<XCpuMemory v-if="widgetProps.view === 0" :connection="connection" :meta="meta"/>
-		<XNet v-else-if="widgetProps.view === 1" :connection="connection" :meta="meta"/>
-		<XCpu v-else-if="widgetProps.view === 2" :connection="connection" :meta="meta"/>
-		<XMemory v-else-if="widgetProps.view === 3" :connection="connection" :meta="meta"/>
-		<XDisk v-else-if="widgetProps.view === 4" :connection="connection" :meta="meta"/>
-	</div>
-</MkContainer>
+		<div v-if="meta" class="mkw-serverMetric">
+			<XCpuMemory
+				v-if="widgetProps.view === 0"
+				:connection="connection"
+				:meta="meta"
+			/>
+			<XNet
+				v-else-if="widgetProps.view === 1"
+				:connection="connection"
+				:meta="meta"
+			/>
+			<XCpu
+				v-else-if="widgetProps.view === 2"
+				:connection="connection"
+				:meta="meta"
+			/>
+			<XMemory
+				v-else-if="widgetProps.view === 3"
+				:connection="connection"
+				:meta="meta"
+			/>
+			<XDisk
+				v-else-if="widgetProps.view === 4"
+				:connection="connection"
+				:meta="meta"
+			/>
+		</div>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from '../widget';
-import XCpuMemory from './cpu-mem.vue';
-import XNet from './net.vue';
-import XCpu from './cpu.vue';
-import XMemory from './mem.vue';
-import XDisk from './disk.vue';
-import MkContainer from '@/components/MkContainer.vue';
-import { GetFormResultType } from '@/scripts/form';
-import * as os from '@/os';
-import { stream } from '@/stream';
-import { i18n } from '@/i18n';
+import { onMounted, onUnmounted, ref } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "../widget";
+import XCpuMemory from "./cpu-mem.vue";
+import XNet from "./net.vue";
+import XCpu from "./cpu.vue";
+import XMemory from "./mem.vue";
+import XDisk from "./disk.vue";
+import MkContainer from "@/components/MkContainer.vue";
+import { GetFormResultType } from "@/scripts/form";
+import * as os from "@/os";
+import { stream } from "@/stream";
+import { i18n } from "@/i18n";
 
-const name = 'serverMetric';
+const name = "serverMetric";
 
 const widgetPropsDef = {
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	transparent: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 	view: {
-		type: 'number' as const,
+		type: "number" as const,
 		default: 0,
 		hidden: true,
 	},
@@ -50,18 +85,19 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure, save } = useWidgetPropsManager(name,
+const { widgetProps, configure, save } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const meta = ref(null);
 
-os.api('server-info', {}).then(res => {
+os.api("server-info", {}).then((res) => {
 	meta.value = res;
 });
 
@@ -74,7 +110,7 @@ const toggleView = () => {
 	save();
 };
 
-const connection = stream.useChannel('serverStats');
+const connection = stream.useChannel("serverStats");
 onUnmounted(() => {
 	connection.dispose();
 });
diff --git a/packages/client/src/widgets/server-metric/mem.vue b/packages/client/src/widgets/server-metric/mem.vue
index 11ab1b2bf..e3ef00d5e 100644
--- a/packages/client/src/widgets/server-metric/mem.vue
+++ b/packages/client/src/widgets/server-metric/mem.vue
@@ -1,23 +1,23 @@
 <template>
-<div class="zlxnikvl">
-	<XPie class="pie" :value="usage"/>
-	<div>
-		<p><i class="ph-cpu ph-bold ph-lg"></i>RAM</p>
-		<p>Total: {{ bytes(total, 1) }}</p>
-		<p>Used: {{ bytes(used, 1) }}</p>
-		<p>Free: {{ bytes(free, 1) }}</p>
+	<div class="zlxnikvl">
+		<XPie class="pie" :value="usage" />
+		<div>
+			<p><i class="ph-cpu ph-bold ph-lg"></i>RAM</p>
+			<p>Total: {{ bytes(total, 1) }}</p>
+			<p>Used: {{ bytes(used, 1) }}</p>
+			<p>Free: {{ bytes(free, 1) }}</p>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onBeforeUnmount } from 'vue';
-import XPie from './pie.vue';
-import bytes from '@/filters/bytes';
+import { onMounted, onBeforeUnmount } from "vue";
+import XPie from "./pie.vue";
+import bytes from "@/filters/bytes";
 
 const props = defineProps<{
-	connection: any,
-	meta: any
+	connection: any;
+	meta: any;
 }>();
 
 let usage: number = $ref(0);
@@ -33,11 +33,11 @@ function onStats(stats) {
 }
 
 onMounted(() => {
-	props.connection.on('stats', onStats);
+	props.connection.on("stats", onStats);
 });
 
 onBeforeUnmount(() => {
-	props.connection.off('stats', onStats);
+	props.connection.off("stats", onStats);
 });
 </script>
 
diff --git a/packages/client/src/widgets/server-metric/net.vue b/packages/client/src/widgets/server-metric/net.vue
index b698953f9..648880c24 100644
--- a/packages/client/src/widgets/server-metric/net.vue
+++ b/packages/client/src/widgets/server-metric/net.vue
@@ -1,64 +1,60 @@
 <template>
-<div class="oxxrhrto">
-	<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
-		<polygon
-			:points="inPolygonPoints"
-			fill="#94a029"
-			fill-opacity="0.5"
-		/>
-		<polyline
-			:points="inPolylinePoints"
-			fill="none"
-			stroke="#94a029"
-			stroke-width="1"
-		/>
-		<circle
-			:cx="inHeadX"
-			:cy="inHeadY"
-			r="1.5"
-			fill="#94a029"
-		/>
-		<text x="1" y="5">NET rx <tspan>{{ bytes(inRecent) }}</tspan></text>
-	</svg>
-	<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
-		<polygon
-			:points="outPolygonPoints"
-			fill="#ff9156"
-			fill-opacity="0.5"
-		/>
-		<polyline
-			:points="outPolylinePoints"
-			fill="none"
-			stroke="#ff9156"
-			stroke-width="1"
-		/>
-		<circle
-			:cx="outHeadX"
-			:cy="outHeadY"
-			r="1.5"
-			fill="#ff9156"
-		/>
-		<text x="1" y="5">NET tx <tspan>{{ bytes(outRecent) }}</tspan></text>
-	</svg>
-</div>
+	<div class="oxxrhrto">
+		<svg :viewBox="`0 0 ${viewBoxX} ${viewBoxY}`">
+			<polygon
+				:points="inPolygonPoints"
+				fill="#94a029"
+				fill-opacity="0.5"
+			/>
+			<polyline
+				:points="inPolylinePoints"
+				fill="none"
+				stroke="#94a029"
+				stroke-width="1"
+			/>
+			<circle :cx="inHeadX" :cy="inHeadY" r="1.5" fill="#94a029" />
+			<text x="1" y="5">
+				NET rx
+				<tspan>{{ bytes(inRecent) }}</tspan>
+			</text>
+		</svg>
+		<svg :viewBox="`0 0 ${viewBoxX} ${viewBoxY}`">
+			<polygon
+				:points="outPolygonPoints"
+				fill="#ff9156"
+				fill-opacity="0.5"
+			/>
+			<polyline
+				:points="outPolylinePoints"
+				fill="none"
+				stroke="#ff9156"
+				stroke-width="1"
+			/>
+			<circle :cx="outHeadX" :cy="outHeadY" r="1.5" fill="#ff9156" />
+			<text x="1" y="5">
+				NET tx
+				<tspan>{{ bytes(outRecent) }}</tspan>
+			</text>
+		</svg>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onBeforeUnmount } from 'vue';
-import bytes from '@/filters/bytes';
+import { onMounted, onBeforeUnmount } from "vue";
+import bytes from "@/filters/bytes";
 
 const props = defineProps<{
-	connection: any,
-	meta: any
+	connection: any;
+	meta: any;
 }>();
 
 let viewBoxX: number = $ref(50);
 let viewBoxY: number = $ref(30);
 let stats: any[] = $ref([]);
-let inPolylinePoints: string = $ref('');
-let outPolylinePoints: string = $ref('');
-let inPolygonPoints: string = $ref('');
-let outPolygonPoints: string = $ref('');
+let inPolylinePoints: string = $ref("");
+let outPolylinePoints: string = $ref("");
+let inPolygonPoints: string = $ref("");
+let outPolygonPoints: string = $ref("");
 let inHeadX: any = $ref(null);
 let inHeadY: any = $ref(null);
 let outHeadX: any = $ref(null);
@@ -67,32 +63,49 @@ let inRecent: number = $ref(0);
 let outRecent: number = $ref(0);
 
 onMounted(() => {
-	props.connection.on('stats', onStats);
-	props.connection.on('statsLog', onStatsLog);
-	props.connection.send('requestLog', {
-		id: Math.random().toString().substr(2, 8)
+	props.connection.on("stats", onStats);
+	props.connection.on("statsLog", onStatsLog);
+	props.connection.send("requestLog", {
+		id: Math.random().toString().substr(2, 8),
 	});
 });
 
 onBeforeUnmount(() => {
-	props.connection.off('stats', onStats);
-	props.connection.off('statsLog', onStatsLog);
+	props.connection.off("stats", onStats);
+	props.connection.off("statsLog", onStatsLog);
 });
 
 function onStats(connStats) {
 	stats.push(connStats);
 	if (stats.length > 50) stats.shift();
 
-	const inPeak = Math.max(1024 * 64, Math.max(...stats.map(s => s.net.rx)));
-	const outPeak = Math.max(1024 * 64, Math.max(...stats.map(s => s.net.tx)));
+	const inPeak = Math.max(1024 * 64, Math.max(...stats.map((s) => s.net.rx)));
+	const outPeak = Math.max(
+		1024 * 64,
+		Math.max(...stats.map((s) => s.net.tx))
+	);
 
-	let inPolylinePointsStats = stats.map((s, i) => [viewBoxX - ((stats.length - 1) - i), (1 - (s.net.rx / inPeak)) * viewBoxY]);
-	let outPolylinePointsStats = stats.map((s, i) => [viewBoxX - ((stats.length - 1) - i), (1 - (s.net.tx / outPeak)) * viewBoxY]);
-	inPolylinePoints = inPolylinePointsStats.map(xy => `${xy[0]},${xy[1]}`).join(' ');
-	outPolylinePoints = outPolylinePointsStats.map(xy => `${xy[0]},${xy[1]}`).join(' ');
+	let inPolylinePointsStats = stats.map((s, i) => [
+		viewBoxX - (stats.length - 1 - i),
+		(1 - s.net.rx / inPeak) * viewBoxY,
+	]);
+	let outPolylinePointsStats = stats.map((s, i) => [
+		viewBoxX - (stats.length - 1 - i),
+		(1 - s.net.tx / outPeak) * viewBoxY,
+	]);
+	inPolylinePoints = inPolylinePointsStats
+		.map((xy) => `${xy[0]},${xy[1]}`)
+		.join(" ");
+	outPolylinePoints = outPolylinePointsStats
+		.map((xy) => `${xy[0]},${xy[1]}`)
+		.join(" ");
 
-	inPolygonPoints = `${viewBoxX - (stats.length - 1)},${viewBoxY} ${inPolylinePoints} ${viewBoxX},${viewBoxY}`;
-	outPolygonPoints = `${viewBoxX - (stats.length - 1)},${viewBoxY} ${outPolylinePoints} ${viewBoxX},${viewBoxY}`;
+	inPolygonPoints = `${
+		viewBoxX - (stats.length - 1)
+	},${viewBoxY} ${inPolylinePoints} ${viewBoxX},${viewBoxY}`;
+	outPolygonPoints = `${
+		viewBoxX - (stats.length - 1)
+	},${viewBoxY} ${outPolylinePoints} ${viewBoxX},${viewBoxY}`;
 
 	inHeadX = inPolylinePointsStats[inPolylinePointsStats.length - 1][0];
 	inHeadY = inPolylinePointsStats[inPolylinePointsStats.length - 1][1];
diff --git a/packages/client/src/widgets/server-metric/pie.vue b/packages/client/src/widgets/server-metric/pie.vue
index 868dbc048..9edbfc94e 100644
--- a/packages/client/src/widgets/server-metric/pie.vue
+++ b/packages/client/src/widgets/server-metric/pie.vue
@@ -1,27 +1,31 @@
 <template>
-<svg class="hsalcinq" viewBox="0 0 1 1" preserveAspectRatio="none">
-	<circle
-		:r="r"
-		cx="50%" cy="50%"
-		fill="none"
-		stroke-width="0.1"
-		stroke="rgba(0, 0, 0, 0.05)"
-	/>
-	<circle
-		:r="r"
-		cx="50%" cy="50%"
-		:stroke-dasharray="Math.PI * (r * 2)"
-		:stroke-dashoffset="strokeDashoffset"
-		fill="none"
-		stroke-width="0.1"
-		:stroke="color"
-	/>
-	<text x="50%" y="50%" dy="0.05" text-anchor="middle">{{ (value * 100).toFixed(0) }}%</text>
-</svg>
+	<svg class="hsalcinq" viewBox="0 0 1 1" preserveAspectRatio="none">
+		<circle
+			:r="r"
+			cx="50%"
+			cy="50%"
+			fill="none"
+			stroke-width="0.1"
+			stroke="rgba(0, 0, 0, 0.05)"
+		/>
+		<circle
+			:r="r"
+			cx="50%"
+			cy="50%"
+			:stroke-dasharray="Math.PI * (r * 2)"
+			:stroke-dashoffset="strokeDashoffset"
+			fill="none"
+			stroke-width="0.1"
+			:stroke="color"
+		/>
+		<text x="50%" y="50%" dy="0.05" text-anchor="middle">
+			{{ (value * 100).toFixed(0) }}%
+		</text>
+	</svg>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
+import {} from "vue";
 
 const props = defineProps<{
 	value: number;
@@ -29,8 +33,10 @@ const props = defineProps<{
 
 const r = 0.45;
 
-const color = $computed(() => `hsl(${180 - (props.value * 180)}, 80%, 70%)`);
-const strokeDashoffset = $computed(() => (1 - props.value) * (Math.PI * (r * 2)));
+const color = $computed(() => `hsl(${180 - props.value * 180}, 80%, 70%)`);
+const strokeDashoffset = $computed(
+	() => (1 - props.value) * (Math.PI * (r * 2))
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/widgets/slideshow.vue b/packages/client/src/widgets/slideshow.vue
index 128b0f35b..fa0c1c9e0 100644
--- a/packages/client/src/widgets/slideshow.vue
+++ b/packages/client/src/widgets/slideshow.vue
@@ -1,33 +1,50 @@
 <template>
-<div class="kvausudm _panel mkw-slideshow" :style="{ height: widgetProps.height + 'px' }">
-	<div @click="choose">
-		<p v-if="widgetProps.folderId == null">
-			{{ i18n.ts.folder }}
-		</p>
-		<p v-if="widgetProps.folderId != null && images.length === 0 && !fetching">{{ i18n.t('no-image') }}</p>
-		<div ref="slideA" class="slide a"></div>
-		<div ref="slideB" class="slide b"></div>
+	<div
+		class="kvausudm _panel mkw-slideshow"
+		:style="{ height: widgetProps.height + 'px' }"
+	>
+		<div @click="choose">
+			<p v-if="widgetProps.folderId == null">
+				{{ i18n.ts.folder }}
+			</p>
+			<p
+				v-if="
+					widgetProps.folderId != null &&
+					images.length === 0 &&
+					!fetching
+				"
+			>
+				{{ i18n.t("no-image") }}
+			</p>
+			<div ref="slideA" class="slide a"></div>
+			<div ref="slideB" class="slide b"></div>
+		</div>
 	</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onMounted, onUnmounted, reactive, ref } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import { i18n } from '@/i18n';
+import { nextTick, onMounted, onUnmounted, reactive, ref } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import { i18n } from "@/i18n";
 
-const name = 'slideshow';
+const name = "slideshow";
 
 const widgetPropsDef = {
 	height: {
-		type: 'number' as const,
+		type: "number" as const,
 		default: 300,
 	},
 	folderId: {
-		type: 'string' as const,
+		type: "string" as const,
 		default: null,
 		hidden: true,
 	},
@@ -38,13 +55,14 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure, save } = useWidgetPropsManager(name,
+const { widgetProps, configure, save } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const images = ref([]);
@@ -56,39 +74,39 @@ const change = () => {
 	if (images.value.length === 0) return;
 
 	const index = Math.floor(Math.random() * images.value.length);
-	const img = `url(${ images.value[index].url })`;
+	const img = `url(${images.value[index].url})`;
 
 	slideB.value.style.backgroundImage = img;
 
-	slideB.value.classList.add('anime');
+	slideB.value.classList.add("anime");
 	window.setTimeout(() => {
 		// 既にこのウィジェットがunmountされていたら要素がない
 		if (slideA.value == null) return;
 
 		slideA.value.style.backgroundImage = img;
 
-		slideB.value.classList.remove('anime');
+		slideB.value.classList.remove("anime");
 	}, 1000);
 };
 
 const fetch = () => {
 	fetching.value = true;
 
-	os.api('drive/files', {
+	os.api("drive/files", {
 		folderId: widgetProps.folderId,
-		type: 'image/*',
+		type: "image/*",
 		limit: 100,
-	}).then(res => {
+	}).then((res) => {
 		images.value = res;
 		fetching.value = false;
-		slideA.value.style.backgroundImage = '';
-		slideB.value.style.backgroundImage = '';
+		slideA.value.style.backgroundImage = "";
+		slideB.value.style.backgroundImage = "";
 		change();
 	});
 };
 
 const choose = () => {
-	os.selectDriveFolder(false).then(folder => {
+	os.selectDriveFolder(false).then((folder) => {
 		if (folder == null) {
 			return;
 		}
diff --git a/packages/client/src/widgets/timeline.vue b/packages/client/src/widgets/timeline.vue
index f0e7232bf..6ae74b813 100644
--- a/packages/client/src/widgets/timeline.vue
+++ b/packages/client/src/widgets/timeline.vue
@@ -1,57 +1,110 @@
 <template>
-<MkContainer :show-header="widgetProps.showHeader" :style="`height: ${widgetProps.height}px;`" :scrollable="true" class="mkw-timeline">
-	<template #header>
-		<button class="_button" @click="choose">
-			<i v-if="widgetProps.src === 'home'" class="ph-house ph-bold ph-lg"></i>
-			<i v-else-if="widgetProps.src === 'local'" class="ph-chats-circle ph-bold ph-lg"></i>
-			<i v-else-if="widgetProps.src === 'social'" class="ph-share-network ph-bold ph-lg"></i>
-			<i v-else-if="widgetProps.src === 'global'" class="ph-planet ph-bold ph-lg"></i>
-			<i v-else-if="widgetProps.src === 'list'" class="ph-list-bullets ph-bold ph-lg"></i>
-			<i v-else-if="widgetProps.src === 'antenna'" class="ph-television ph-bold ph-lg"></i>
-			<span style="margin-left: 8px;">{{ widgetProps.src === 'list' ? widgetProps.list.name : widgetProps.src === 'antenna' ? widgetProps.antenna.name : i18n.t('_timelines.' + widgetProps.src) }}</span>
-			<i :class="menuOpened ? 'ph-caret-up ph-bold ph-lg' : 'ph-caret-down ph-bold ph-lg'" style="margin-left: 8px;"></i>
-		</button>
-	</template>
+	<MkContainer
+		:show-header="widgetProps.showHeader"
+		:style="`height: ${widgetProps.height}px;`"
+		:scrollable="true"
+		class="mkw-timeline"
+	>
+		<template #header>
+			<button class="_button" @click="choose">
+				<i
+					v-if="widgetProps.src === 'home'"
+					class="ph-house ph-bold ph-lg"
+				></i>
+				<i
+					v-else-if="widgetProps.src === 'local'"
+					class="ph-chats-circle ph-bold ph-lg"
+				></i>
+				<i
+					v-else-if="widgetProps.src === 'social'"
+					class="ph-share-network ph-bold ph-lg"
+				></i>
+				<i
+					v-else-if="widgetProps.src === 'global'"
+					class="ph-planet ph-bold ph-lg"
+				></i>
+				<i
+					v-else-if="widgetProps.src === 'list'"
+					class="ph-list-bullets ph-bold ph-lg"
+				></i>
+				<i
+					v-else-if="widgetProps.src === 'antenna'"
+					class="ph-television ph-bold ph-lg"
+				></i>
+				<span style="margin-left: 8px">{{
+					widgetProps.src === "list"
+						? widgetProps.list.name
+						: widgetProps.src === "antenna"
+						? widgetProps.antenna.name
+						: i18n.t("_timelines." + widgetProps.src)
+				}}</span>
+				<i
+					:class="
+						menuOpened
+							? 'ph-caret-up ph-bold ph-lg'
+							: 'ph-caret-down ph-bold ph-lg'
+					"
+					style="margin-left: 8px"
+				></i>
+			</button>
+		</template>
 
-	<div>
-		<XTimeline :key="widgetProps.src === 'list' ? `list:${widgetProps.list.id}` : widgetProps.src === 'antenna' ? `antenna:${widgetProps.antenna.id}` : widgetProps.src" :src="widgetProps.src" :list="widgetProps.list ? widgetProps.list.id : null" :antenna="widgetProps.antenna ? widgetProps.antenna.id : null"/>
-	</div>
-</MkContainer>
+		<div>
+			<XTimeline
+				:key="
+					widgetProps.src === 'list'
+						? `list:${widgetProps.list.id}`
+						: widgetProps.src === 'antenna'
+						? `antenna:${widgetProps.antenna.id}`
+						: widgetProps.src
+				"
+				:src="widgetProps.src"
+				:list="widgetProps.list ? widgetProps.list.id : null"
+				:antenna="widgetProps.antenna ? widgetProps.antenna.id : null"
+			/>
+		</div>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, reactive, ref, watch } from 'vue';
-import { GetFormResultType } from '@/scripts/form';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import * as os from '@/os';
-import MkContainer from '@/components/MkContainer.vue';
-import XTimeline from '@/components/MkTimeline.vue';
-import { $i } from '@/account';
-import { i18n } from '@/i18n';
+import { onMounted, onUnmounted, reactive, ref, watch } from "vue";
+import { GetFormResultType } from "@/scripts/form";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import * as os from "@/os";
+import MkContainer from "@/components/MkContainer.vue";
+import XTimeline from "@/components/MkTimeline.vue";
+import { $i } from "@/account";
+import { i18n } from "@/i18n";
 
-const name = 'timeline';
+const name = "timeline";
 
 const widgetPropsDef = {
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	height: {
-		type: 'number' as const,
+		type: "number" as const,
 		default: 300,
 	},
 	src: {
-		type: 'string' as const,
-		default: 'home',
+		type: "string" as const,
+		default: "home",
 		hidden: true,
 	},
 	antenna: {
-		type: 'object' as const,
+		type: "object" as const,
 		default: null,
 		hidden: true,
 	},
 	list: {
-		type: 'object' as const,
+		type: "object" as const,
 		default: null,
 		hidden: true,
 	},
@@ -62,13 +115,14 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure, save } = useWidgetPropsManager(name,
+const { widgetProps, configure, save } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const menuOpened = ref(false);
@@ -81,42 +135,62 @@ const setSrc = (src) => {
 const choose = async (ev) => {
 	menuOpened.value = true;
 	const [antennas, lists] = await Promise.all([
-		os.api('antennas/list'),
-		os.api('users/lists/list')
+		os.api("antennas/list"),
+		os.api("users/lists/list"),
 	]);
-	const antennaItems = antennas.map(antenna => ({
+	const antennaItems = antennas.map((antenna) => ({
 		text: antenna.name,
-		icon: 'ph-flying-saucer ph-bold ph-lg',
+		icon: "ph-flying-saucer ph-bold ph-lg",
 		action: () => {
 			widgetProps.antenna = antenna;
-			setSrc('antenna');
-		}
+			setSrc("antenna");
+		},
 	}));
-	const listItems = lists.map(list => ({
+	const listItems = lists.map((list) => ({
 		text: list.name,
-		icon: 'ph-list-bullets ph-bold ph-lg',
+		icon: "ph-list-bullets ph-bold ph-lg",
 		action: () => {
 			widgetProps.list = list;
-			setSrc('list');
-		}
+			setSrc("list");
+		},
 	}));
-	os.popupMenu([{
-		text: i18n.ts._timelines.home,
-		icon: 'ph-house ph-bold ph-lg',
-		action: () => { setSrc('home'); }
-	}, {
-		text: i18n.ts._timelines.local,
-		icon: 'ph-chats-teardrop ph-bold ph-lg',
-		action: () => { setSrc('local'); }
-	}, {
-		text: i18n.ts._timelines.social,
-		icon: 'ph-share-network ph-bold ph-lg',
-		action: () => { setSrc('social'); }
-	}, {
-		text: i18n.ts._timelines.global,
-		icon: 'ph-planet ph-bold ph-lg',
-		action: () => { setSrc('global'); }
-	}, antennaItems.length > 0 ? null : undefined, ...antennaItems, listItems.length > 0 ? null : undefined, ...listItems], ev.currentTarget ?? ev.target).then(() => {
+	os.popupMenu(
+		[
+			{
+				text: i18n.ts._timelines.home,
+				icon: "ph-house ph-bold ph-lg",
+				action: () => {
+					setSrc("home");
+				},
+			},
+			{
+				text: i18n.ts._timelines.local,
+				icon: "ph-chats-teardrop ph-bold ph-lg",
+				action: () => {
+					setSrc("local");
+				},
+			},
+			{
+				text: i18n.ts._timelines.social,
+				icon: "ph-share-network ph-bold ph-lg",
+				action: () => {
+					setSrc("social");
+				},
+			},
+			{
+				text: i18n.ts._timelines.global,
+				icon: "ph-planet ph-bold ph-lg",
+				action: () => {
+					setSrc("global");
+				},
+			},
+			antennaItems.length > 0 ? null : undefined,
+			...antennaItems,
+			listItems.length > 0 ? null : undefined,
+			...listItems,
+		],
+		ev.currentTarget ?? ev.target
+	).then(() => {
 		menuOpened.value = false;
 	});
 };
diff --git a/packages/client/src/widgets/trends.vue b/packages/client/src/widgets/trends.vue
index 4789293d6..6bf5c0b97 100644
--- a/packages/client/src/widgets/trends.vue
+++ b/packages/client/src/widgets/trends.vue
@@ -1,37 +1,62 @@
 <template>
-<MkContainer :show-header="widgetProps.showHeader" class="mkw-trends">
-	<template #header><i class="ph-hash ph-bold ph-lg"></i>{{ i18n.ts._widgets.trends }}</template>
+	<MkContainer :show-header="widgetProps.showHeader" class="mkw-trends">
+		<template #header
+			><i class="ph-hash ph-bold ph-lg"></i
+			>{{ i18n.ts._widgets.trends }}</template
+		>
 
-	<div class="wbrkwala">
-		<MkLoading v-if="fetching"/>
-		<transition-group v-else tag="div" :name="$store.state.animation ? 'chart' : ''" class="tags">
-			<div v-for="stat in stats" :key="stat.tag">
-				<div class="tag">
-					<MkA class="a" :to="`/tags/${ encodeURIComponent(stat.tag) }`" :title="stat.tag">#{{ stat.tag }}</MkA>
-					<p>{{ i18n.t('nUsersMentioned', { n: stat.usersCount }) }}</p>
+		<div class="wbrkwala">
+			<MkLoading v-if="fetching" />
+			<transition-group
+				v-else
+				tag="div"
+				:name="$store.state.animation ? 'chart' : ''"
+				class="tags"
+			>
+				<div v-for="stat in stats" :key="stat.tag">
+					<div class="tag">
+						<MkA
+							class="a"
+							:to="`/tags/${encodeURIComponent(stat.tag)}`"
+							:title="stat.tag"
+							>#{{ stat.tag }}</MkA
+						>
+						<p>
+							{{
+								i18n.t("nUsersMentioned", {
+									n: stat.usersCount,
+								})
+							}}
+						</p>
+					</div>
+					<MkMiniChart class="chart" :src="stat.chart" />
 				</div>
-				<MkMiniChart class="chart" :src="stat.chart"/>
-			</div>
-		</transition-group>
-	</div>
-</MkContainer>
+			</transition-group>
+		</div>
+	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import MkContainer from '@/components/MkContainer.vue';
-import MkMiniChart from '@/components/MkMiniChart.vue';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import { i18n } from '@/i18n';
+import { onMounted, onUnmounted, ref } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import MkContainer from "@/components/MkContainer.vue";
+import MkMiniChart from "@/components/MkMiniChart.vue";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import { i18n } from "@/i18n";
 
-const name = 'hashtags';
+const name = "hashtags";
 
 const widgetPropsDef = {
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 };
@@ -41,20 +66,21 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 const stats = ref([]);
 const fetching = ref(true);
 
 const fetch = () => {
-	os.api('hashtags/trend').then(res => {
+	os.api("hashtags/trend").then((res) => {
 		stats.value = res;
 		fetching.value = false;
 	});
diff --git a/packages/client/src/widgets/unix-clock.vue b/packages/client/src/widgets/unix-clock.vue
index cf85ac782..190bcd092 100644
--- a/packages/client/src/widgets/unix-clock.vue
+++ b/packages/client/src/widgets/unix-clock.vue
@@ -1,38 +1,50 @@
 <template>
-<div class="mkw-unixClock _monospace" :class="{ _panel: !widgetProps.transparent }" :style="{ fontSize: `${widgetProps.fontSize}em` }">
-	<div v-if="widgetProps.showLabel" class="label">UNIX Epoch</div>
-	<div class="time">
-		<span v-text="ss"></span>
-		<span v-if="widgetProps.showMs" class="colon" :class="{ showColon }">:</span>
-		<span v-if="widgetProps.showMs" v-text="ms"></span>
+	<div
+		class="mkw-unixClock _monospace"
+		:class="{ _panel: !widgetProps.transparent }"
+		:style="{ fontSize: `${widgetProps.fontSize}em` }"
+	>
+		<div v-if="widgetProps.showLabel" class="label">UNIX Epoch</div>
+		<div class="time">
+			<span v-text="ss"></span>
+			<span v-if="widgetProps.showMs" class="colon" :class="{ showColon }"
+				>:</span
+			>
+			<span v-if="widgetProps.showMs" v-text="ms"></span>
+		</div>
+		<div v-if="widgetProps.showLabel" class="label">UTC</div>
 	</div>
-	<div v-if="widgetProps.showLabel" class="label">UTC</div>
-</div>
 </template>
 
 <script lang="ts" setup>
-import { onUnmounted, ref, watch } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
-import { GetFormResultType } from '@/scripts/form';
+import { onUnmounted, ref, watch } from "vue";
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
 
-const name = 'unixClock';
+const name = "unixClock";
 
 const widgetPropsDef = {
 	transparent: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: false,
 	},
 	fontSize: {
-		type: 'number' as const,
+		type: "number" as const,
 		default: 1.5,
 		step: 0.1,
 	},
 	showMs: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	showLabel: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 };
@@ -42,18 +54,19 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
-const { widgetProps, configure } = useWidgetPropsManager(name,
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 
 let intervalId;
-const ss = ref('');
-const ms = ref('');
+const ss = ref("");
+const ms = ref("");
 const showColon = ref(false);
 let prevSec: string | null = null;
 
@@ -68,17 +81,23 @@ watch(showColon, (v) => {
 const tick = () => {
 	const now = new Date();
 	ss.value = Math.floor(now.getTime() / 1000).toString();
-	ms.value = Math.floor(now.getTime() % 1000 / 10).toString().padStart(2, '0');
+	ms.value = Math.floor((now.getTime() % 1000) / 10)
+		.toString()
+		.padStart(2, "0");
 	if (ss.value !== prevSec) showColon.value = true;
 	prevSec = ss.value;
 };
 
 tick();
 
-watch(() => widgetProps.showMs, () => {
-	if (intervalId) window.clearInterval(intervalId);
-	intervalId = window.setInterval(tick, widgetProps.showMs ? 10 : 1000);
-}, { immediate: true });
+watch(
+	() => widgetProps.showMs,
+	() => {
+		if (intervalId) window.clearInterval(intervalId);
+		intervalId = window.setInterval(tick, widgetProps.showMs ? 10 : 1000);
+	},
+	{ immediate: true }
+);
 
 onUnmounted(() => {
 	window.clearInterval(intervalId);
diff --git a/packages/client/src/widgets/user-list.vue b/packages/client/src/widgets/user-list.vue
index 441845549..515c58c47 100644
--- a/packages/client/src/widgets/user-list.vue
+++ b/packages/client/src/widgets/user-list.vue
@@ -1,38 +1,50 @@
 <template>
 	<MkContainer :show-header="widgetProps.showHeader" class="mkw-userList">
-		<template #header><i class="ph-user-list ph-bold ph-lg"></i> {{ list ? list.name : i18n.ts._widgets.userList }}</template>
-		<template #func="{ buttonStyleClass }"><button class="_button" :class="buttonStyleClass" @click="configure()"><i class="ph-gear-six ph-bold ph-lg"></i></button></template>
+		<template #header
+			><i class="ph-user-list ph-bold ph-lg"></i>
+			{{ list ? list.name : i18n.ts._widgets.userList }}</template
+		>
+		<template #func="{ buttonStyleClass }"
+			><button
+				class="_button"
+				:class="buttonStyleClass"
+				@click="configure()"
+			>
+				<i class="ph-gear-six ph-bold ph-lg"></i></button
+		></template>
 
 		<div class="wsdlkfj">
 			<div v-if="widgetProps.listId == null" class="init">
-				<MkButton primary @click="chooseList">{{ i18n.ts._widgets._userList.chooseList }}</MkButton>
+				<MkButton primary @click="chooseList">{{
+					i18n.ts._widgets._userList.chooseList
+				}}</MkButton>
 			</div>
-			<MkLoading v-else-if="fetching"/>
+			<MkLoading v-else-if="fetching" />
 			<div v-else class="users">
-				<MkAvatars :user-ids="users" class="userAvatars"/>
+				<MkAvatars :user-ids="users" class="userAvatars" />
 			</div>
 		</div>
 	</MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { useWidgetPropsManager, Widget, WidgetComponentExpose } from './widget';
-import { GetFormResultType } from '@/scripts/form';
-import MkContainer from '@/components/MkContainer.vue';
-import MkAvatars from '@/components/MkAvatars.vue';
-import * as os from '@/os';
-import { useInterval } from '@/scripts/use-interval';
-import { i18n } from '@/i18n';
-import MkButton from '@/components/MkButton.vue';
+import { useWidgetPropsManager, Widget, WidgetComponentExpose } from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import MkContainer from "@/components/MkContainer.vue";
+import MkAvatars from "@/components/MkAvatars.vue";
+import * as os from "@/os";
+import { useInterval } from "@/scripts/use-interval";
+import { i18n } from "@/i18n";
+import MkButton from "@/components/MkButton.vue";
 
-const name = 'userList';
+const name = "userList";
 const widgetPropsDef = {
 	showHeader: {
-		type: 'boolean' as const,
+		type: "boolean" as const,
 		default: true,
 	},
 	listId: {
-		type: 'string' as const,
+		type: "string" as const,
 		default: null,
 		hidden: true,
 	},
@@ -41,22 +53,24 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 // 現時点ではvueの制限によりimportしたtypeをジェネリックに渡せない
 //const props = defineProps<WidgetComponentProps<WidgetProps>>();
 //const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-const props = defineProps<{ widget?: Widget<WidgetProps>; }>();
-const emit = defineEmits<{ (ev: 'updateProps', props: WidgetProps); }>();
-const { widgetProps, configure, save } = useWidgetPropsManager(name,
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
+const { widgetProps, configure, save } = useWidgetPropsManager(
+	name,
 	widgetPropsDef,
 	props,
-	emit,
+	emit
 );
 let list = $ref();
 let users = $ref([]);
 let fetching = $ref(true);
 async function chooseList() {
-	const lists = await os.api('users/lists/list');
+	const lists = await os.api("users/lists/list");
 	const { canceled, result: list } = await os.select({
 		title: i18n.ts.selectList,
-		items: lists.map(x => ({
-			value: x, text: x.name,
+		items: lists.map((x) => ({
+			value: x,
+			text: x.name,
 		})),
 		default: widgetProps.listId,
 	});
@@ -70,13 +84,13 @@ const fetch = () => {
 		fetching = false;
 		return;
 	}
-	os.api('users/lists/show', {
+	os.api("users/lists/show", {
 		listId: widgetProps.listId,
-	}).then(_list => {
+	}).then((_list) => {
 		list = _list;
-		os.api('users/show', {
+		os.api("users/show", {
 			userIds: list.userIds,
-		}).then(_users => {
+		}).then((_users) => {
 			users = list.userIds;
 			fetching = false;
 		});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b7b0b3123..dad391189 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -788,6 +788,12 @@ importers:
       photoswipe:
         specifier: 5.3.4
         version: 5.3.4
+      prettier:
+        specifier: 2.8.7
+        version: 2.8.7
+      prettier-plugin-vue:
+        specifier: 1.1.6
+        version: 1.1.6
       prismjs:
         specifier: 1.29.0
         version: 1.29.0
@@ -12363,6 +12369,18 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  /prettier-plugin-vue@1.1.6:
+    resolution: {integrity: sha512-trQ/oY+6hSsGe2zPIFThXMIM0TbxMEbk2VOrKjwHWuSz7OEo0rnumbz9a47OxVPCaAnGY9vZG8qDTiTmk9bq0A==}
+    dependencies:
+      prettier: 2.8.7
+    dev: true
+
+  /prettier@2.8.7:
+    resolution: {integrity: sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    dev: true
+
   /pretty-bytes@5.6.0:
     resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
     engines: {node: '>=6'}

From 4cf87ca92fa4a6091a8c248f1e21edd0f435c3f1 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 17:25:24 -0700
Subject: [PATCH 422/582] fix: typo

---
 packages/client/src/components/form/range.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/form/range.vue b/packages/client/src/components/form/range.vue
index e5ec44f68..3d307579c 100644
--- a/packages/client/src/components/form/range.vue
+++ b/packages/client/src/components/form/range.vue
@@ -267,7 +267,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 					bottom: 0;
 					width: $tickWidth;
 					height: 3px;
-					margin-left: -math.div($tickWidth, 2);
+					margin-left: math.div($tickWidth, 2);
 					background: var(--divider);
 					border-radius: 999px;
 				}

From a5c4d0a7bdf59ceb38fa8c5778f161e1d19c1e41 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 17:35:10 -0700
Subject: [PATCH 423/582] Revert "Incorporate calckey-js into calckey
 repository (#9820)"

This reverts commit 37c0423da6bce9b86b8f4f9a5b78f640166dd3d5.
---
 Dockerfile                                 |     2 -
 package.json                               |     1 +
 packages/backend/package.json              |     2 +-
 packages/calckey-js/.editorconfig          |     7 -
 packages/calckey-js/.eslintignore          |     7 -
 packages/calckey-js/.eslintrc.js           |    65 -
 packages/calckey-js/.gitignore             |   113 -
 packages/calckey-js/CHANGELOG.md           |    29 -
 packages/calckey-js/LICENSE                |    21 -
 packages/calckey-js/README.md              |     7 -
 packages/calckey-js/api-extractor.json     |   364 -
 packages/calckey-js/codecov.yml            |     2 -
 packages/calckey-js/etc/calckey-js.api.md  |  2696 -----
 packages/calckey-js/etc/misskey-js.api.md  |  2681 -----
 packages/calckey-js/jest.config.ts         |   195 -
 packages/calckey-js/package-lock.json      | 10662 -------------------
 packages/calckey-js/package.json           |    47 -
 packages/calckey-js/src/acct.ts            |    14 -
 packages/calckey-js/src/api.ts             |   127 -
 packages/calckey-js/src/api.types.ts       |  1081 --
 packages/calckey-js/src/consts.ts          |    60 -
 packages/calckey-js/src/entities.ts        |   490 -
 packages/calckey-js/src/index.ts           |    20 -
 packages/calckey-js/src/streaming.ts       |   393 -
 packages/calckey-js/src/streaming.types.ts |   181 -
 packages/calckey-js/test-d/api.ts          |    48 -
 packages/calckey-js/test-d/streaming.ts    |    32 -
 packages/calckey-js/test/api.ts            |   222 -
 packages/calckey-js/test/streaming.ts      |   181 -
 packages/calckey-js/tsconfig.json          |    25 -
 packages/client/package.json               |     2 +-
 packages/client/vite.config.ts             |     3 -
 packages/sw/package.json                   |     2 +-
 pnpm-lock.yaml                             |  2403 +----
 pnpm-workspace.yaml                        |     1 -
 35 files changed, 79 insertions(+), 22107 deletions(-)
 delete mode 100644 packages/calckey-js/.editorconfig
 delete mode 100644 packages/calckey-js/.eslintignore
 delete mode 100644 packages/calckey-js/.eslintrc.js
 delete mode 100644 packages/calckey-js/.gitignore
 delete mode 100644 packages/calckey-js/CHANGELOG.md
 delete mode 100644 packages/calckey-js/LICENSE
 delete mode 100644 packages/calckey-js/README.md
 delete mode 100644 packages/calckey-js/api-extractor.json
 delete mode 100644 packages/calckey-js/codecov.yml
 delete mode 100644 packages/calckey-js/etc/calckey-js.api.md
 delete mode 100644 packages/calckey-js/etc/misskey-js.api.md
 delete mode 100644 packages/calckey-js/jest.config.ts
 delete mode 100644 packages/calckey-js/package-lock.json
 delete mode 100644 packages/calckey-js/package.json
 delete mode 100644 packages/calckey-js/src/acct.ts
 delete mode 100644 packages/calckey-js/src/api.ts
 delete mode 100644 packages/calckey-js/src/api.types.ts
 delete mode 100644 packages/calckey-js/src/consts.ts
 delete mode 100644 packages/calckey-js/src/entities.ts
 delete mode 100644 packages/calckey-js/src/index.ts
 delete mode 100644 packages/calckey-js/src/streaming.ts
 delete mode 100644 packages/calckey-js/src/streaming.types.ts
 delete mode 100644 packages/calckey-js/test-d/api.ts
 delete mode 100644 packages/calckey-js/test-d/streaming.ts
 delete mode 100644 packages/calckey-js/test/api.ts
 delete mode 100644 packages/calckey-js/test/streaming.ts
 delete mode 100644 packages/calckey-js/tsconfig.json

diff --git a/Dockerfile b/Dockerfile
index bdf11a9df..1a1a0aac6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,6 @@ COPY package.json pnpm*.yaml ./
 COPY packages/backend/package.json packages/backend/package.json
 COPY packages/client/package.json packages/client/package.json
 COPY packages/sw/package.json packages/sw/package.json
-COPY packages/calckey-js/package.json packages/calckey-js/package.json
 COPY packages/backend/native-utils/package.json packages/backend/native-utils/package.json
 COPY packages/backend/native-utils/npm/linux-x64-musl/package.json packages/backend/native-utils/npm/linux-x64-musl/package.json
 COPY packages/backend/native-utils/npm/linux-arm64-musl/package.json packages/backend/native-utils/npm/linux-arm64-musl/package.json
@@ -44,7 +43,6 @@ COPY --from=build /calckey/node_modules /calckey/node_modules
 COPY --from=build /calckey/packages/backend/node_modules /calckey/packages/backend/node_modules
 COPY --from=build /calckey/packages/sw/node_modules /calckey/packages/sw/node_modules
 COPY --from=build /calckey/packages/client/node_modules /calckey/packages/client/node_modules
-COPY --from=build /calckey/packages/calckey-js/node_modules /calckey/packages/calckey-js/node_modules
 
 # Copy the finished compiled files
 COPY --from=build /calckey/built /calckey/built
diff --git a/package.json b/package.json
index 3a324fa0b..d2030de0f 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
 		"@bull-board/ui": "^4.10.2",
 		"@napi-rs/cli": "^2.15.0",
 		"@tensorflow/tfjs": "^3.21.0",
+		"calckey-js": "^0.0.22",
 		"js-yaml": "4.1.0",
 		"seedrandom": "^3.0.5"
 	},
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 9139d24ee..61ba601cd 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -49,7 +49,7 @@
 		"blurhash": "1.1.5",
 		"bull": "4.10.2",
 		"cacheable-lookup": "7.0.0",
-		"calckey-js": "workspace:*",
+		"calckey-js": "^0.0.22",
 		"cbor": "8.1.0",
 		"chalk": "5.2.0",
 		"chalk-template": "0.4.0",
diff --git a/packages/calckey-js/.editorconfig b/packages/calckey-js/.editorconfig
deleted file mode 100644
index da178f070..000000000
--- a/packages/calckey-js/.editorconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-root = true
-
-[*]
-indent_style = tab
-indent_size = 2
-charset = utf-8
-insert_final_newline = true
diff --git a/packages/calckey-js/.eslintignore b/packages/calckey-js/.eslintignore
deleted file mode 100644
index f22128f04..000000000
--- a/packages/calckey-js/.eslintignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules
-/built
-/coverage
-/.eslintrc.js
-/jest.config.ts
-/test
-/test-d
diff --git a/packages/calckey-js/.eslintrc.js b/packages/calckey-js/.eslintrc.js
deleted file mode 100644
index 164cf1fbe..000000000
--- a/packages/calckey-js/.eslintrc.js
+++ /dev/null
@@ -1,65 +0,0 @@
-module.exports = {
-	root: true,
-	parser: "@typescript-eslint/parser",
-	parserOptions: {
-		tsconfigRootDir: __dirname,
-		project: ["./tsconfig.json"],
-	},
-	plugins: ["@typescript-eslint"],
-	extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
-	rules: {
-		indent: [
-			"error",
-			"tab",
-			{
-				SwitchCase: 1,
-				MemberExpression: "off",
-				flatTernaryExpressions: true,
-				ArrayExpression: "first",
-				ObjectExpression: "first",
-			},
-		],
-		"eol-last": ["error", "always"],
-		semi: ["error", "always"],
-		quotes: ["error", "single"],
-		"comma-dangle": ["error", "always-multiline"],
-		"keyword-spacing": [
-			"error",
-			{
-				before: true,
-				after: true,
-			},
-		],
-		"key-spacing": [
-			"error",
-			{
-				beforeColon: false,
-				afterColon: true,
-			},
-		],
-		"space-infix-ops": ["error"],
-		"space-before-blocks": ["error", "always"],
-		"object-curly-spacing": ["error", "always"],
-		"nonblock-statement-body-position": ["error", "beside"],
-		eqeqeq: ["error", "always", { null: "ignore" }],
-		"no-multiple-empty-lines": ["error", { max: 1 }],
-		"no-multi-spaces": ["error"],
-		"no-var": ["error"],
-		"prefer-arrow-callback": ["error"],
-		"no-throw-literal": ["error"],
-		"no-param-reassign": ["warn"],
-		"no-constant-condition": ["warn"],
-		"no-empty-pattern": ["warn"],
-		"@typescript-eslint/no-unnecessary-condition": ["error"],
-		"@typescript-eslint/no-inferrable-types": ["warn"],
-		"@typescript-eslint/no-non-null-assertion": ["warn"],
-		"@typescript-eslint/explicit-function-return-type": ["warn"],
-		"@typescript-eslint/no-misused-promises": [
-			"error",
-			{
-				checksVoidReturn: false,
-			},
-		],
-		"@typescript-eslint/consistent-type-imports": "error",
-	},
-};
diff --git a/packages/calckey-js/.gitignore b/packages/calckey-js/.gitignore
deleted file mode 100644
index 8a97abf3a..000000000
--- a/packages/calckey-js/.gitignore
+++ /dev/null
@@ -1,113 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# Next.js build output
-.next
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and *not* Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# App
-temp
-# built
-
-# Yarn
-.yarn/*
-.pnp.cjs
-.pnp.loader.mjs
diff --git a/packages/calckey-js/CHANGELOG.md b/packages/calckey-js/CHANGELOG.md
deleted file mode 100644
index 88a5c2461..000000000
--- a/packages/calckey-js/CHANGELOG.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# 0.0.14
-- remove needless Object.freeze()
-
-# 0.0.13
-- expose ChannelConnection and Channels types
-
-# 0.0.12
-- fix a bug that cannot connect to streaming
-
-# 0.0.11
-- update user type
-- add missing main stream types
-
-# 0.0.10
-- add consts
-
-# 0.0.9
-- add list of api permission
-- Update Note type
-
-# 0.0.8
-- add type definition for `messagingMessage` event to main stream channel
-- Update Note type
-
-# 0.0.7
-- Notificationsの型を修正
-- MessagingMessageの型を修正
-- UserLiteの型を修正
-- apiでネイティブfetchを格納する際に無名関数でラップするように
diff --git a/packages/calckey-js/LICENSE b/packages/calckey-js/LICENSE
deleted file mode 100644
index 11c1f9ce2..000000000
--- a/packages/calckey-js/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021-2022 syuilo and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/packages/calckey-js/README.md b/packages/calckey-js/README.md
deleted file mode 100644
index b7a699285..000000000
--- a/packages/calckey-js/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calckey.js
-
-Fork of Misskey.js for Calckey
-
-https://www.npmjs.com/package/calckey-js
-
-![Parody of the Javascript logo with "CK" instead of "JS"](https://codeberg.org/repo-avatars/80771-4d86135f67b9a460cdd1be9e91648e5f)
\ No newline at end of file
diff --git a/packages/calckey-js/api-extractor.json b/packages/calckey-js/api-extractor.json
deleted file mode 100644
index a95281a6d..000000000
--- a/packages/calckey-js/api-extractor.json
+++ /dev/null
@@ -1,364 +0,0 @@
-/**
- * Config file for API Extractor.  For more info, please visit: https://api-extractor.com
- */
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-
-  /**
-   * Optionally specifies another JSON config file that this file extends from.  This provides a way for
-   * standard settings to be shared across multiple projects.
-   *
-   * If the path starts with "./" or "../", the path is resolved relative to the folder of the file that contains
-   * the "extends" field.  Otherwise, the first path segment is interpreted as an NPM package name, and will be
-   * resolved using NodeJS require().
-   *
-   * SUPPORTED TOKENS: none
-   * DEFAULT VALUE: ""
-   */
-  // "extends": "./shared/api-extractor-base.json"
-  // "extends": "my-package/include/api-extractor-base.json"
-
-  /**
-   * Determines the "<projectFolder>" token that can be used with other config file settings.  The project folder
-   * typically contains the tsconfig.json and package.json config files, but the path is user-defined.
-   *
-   * The path is resolved relative to the folder of the config file that contains the setting.
-   *
-   * The default value for "projectFolder" is the token "<lookup>", which means the folder is determined by traversing
-   * parent folders, starting from the folder containing api-extractor.json, and stopping at the first folder
-   * that contains a tsconfig.json file.  If a tsconfig.json file cannot be found in this way, then an error
-   * will be reported.
-   *
-   * SUPPORTED TOKENS: <lookup>
-   * DEFAULT VALUE: "<lookup>"
-   */
-  // "projectFolder": "..",
-
-  /**
-   * (REQUIRED) Specifies the .d.ts file to be used as the starting point for analysis.  API Extractor
-   * analyzes the symbols exported by this module.
-   *
-   * The file extension must be ".d.ts" and not ".ts".
-   *
-   * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-   * prepend a folder token such as "<projectFolder>".
-   *
-   * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-   */
-  "mainEntryPointFilePath": "<projectFolder>/built/index.d.ts",
-
-  /**
-   * A list of NPM package names whose exports should be treated as part of this package.
-   *
-   * For example, suppose that Webpack is used to generate a distributed bundle for the project "library1",
-   * and another NPM package "library2" is embedded in this bundle.  Some types from library2 may become part
-   * of the exported API for library1, but by default API Extractor would generate a .d.ts rollup that explicitly
-   * imports library2.  To avoid this, we can specify:
-   *
-   *   "bundledPackages": [ "library2" ],
-   *
-   * This would direct API Extractor to embed those types directly in the .d.ts rollup, as if they had been
-   * local files for library1.
-   */
-  "bundledPackages": [],
-
-  /**
-   * Determines how the TypeScript compiler engine will be invoked by API Extractor.
-   */
-  "compiler": {
-    /**
-     * Specifies the path to the tsconfig.json file to be used by API Extractor when analyzing the project.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * Note: This setting will be ignored if "overrideTsconfig" is used.
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/tsconfig.json"
-     */
-    // "tsconfigFilePath": "<projectFolder>/tsconfig.json",
-    /**
-     * Provides a compiler configuration that will be used instead of reading the tsconfig.json file from disk.
-     * The object must conform to the TypeScript tsconfig schema:
-     *
-     * http://json.schemastore.org/tsconfig
-     *
-     * If omitted, then the tsconfig.json file will be read from the "projectFolder".
-     *
-     * DEFAULT VALUE: no overrideTsconfig section
-     */
-    // "overrideTsconfig": {
-    //   . . .
-    // }
-    /**
-     * This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended
-     * and may cause API Extractor to produce incomplete or incorrect declarations, but it may be required when
-     * dependencies contain declarations that are incompatible with the TypeScript engine that API Extractor uses
-     * for its analysis.  Where possible, the underlying issue should be fixed rather than relying on skipLibCheck.
-     *
-     * DEFAULT VALUE: false
-     */
-    // "skipLibCheck": true,
-  },
-
-  /**
-   * Configures how the API report file (*.api.md) will be generated.
-   */
-  "apiReport": {
-    /**
-     * (REQUIRED) Whether to generate an API report.
-     */
-    "enabled": true
-
-    /**
-     * The filename for the API report files.  It will be combined with "reportFolder" or "reportTempFolder" to produce
-     * a full file path.
-     *
-     * The file extension should be ".api.md", and the string should not contain a path separator such as "\" or "/".
-     *
-     * SUPPORTED TOKENS: <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<unscopedPackageName>.api.md"
-     */
-    // "reportFileName": "<unscopedPackageName>.api.md",
-
-    /**
-     * Specifies the folder where the API report file is written.  The file name portion is determined by
-     * the "reportFileName" setting.
-     *
-     * The API report file is normally tracked by Git.  Changes to it can be used to trigger a branch policy,
-     * e.g. for an API review.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/etc/"
-     */
-    // "reportFolder": "<projectFolder>/etc/",
-
-    /**
-     * Specifies the folder where the temporary report file is written.  The file name portion is determined by
-     * the "reportFileName" setting.
-     *
-     * After the temporary file is written to disk, it is compared with the file in the "reportFolder".
-     * If they are different, a production build will fail.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/temp/"
-     */
-    // "reportTempFolder": "<projectFolder>/temp/"
-  },
-
-  /**
-   * Configures how the doc model file (*.api.json) will be generated.
-   */
-  "docModel": {
-    /**
-     * (REQUIRED) Whether to generate a doc model file.
-     */
-    "enabled": true
-
-    /**
-     * The output path for the doc model file.  The file extension should be ".api.json".
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/temp/<unscopedPackageName>.api.json"
-     */
-    // "apiJsonFilePath": "<projectFolder>/temp/<unscopedPackageName>.api.json"
-  },
-
-  /**
-   * Configures how the .d.ts rollup file will be generated.
-   */
-  "dtsRollup": {
-    /**
-     * (REQUIRED) Whether to generate the .d.ts rollup file.
-     */
-    "enabled": false
-
-    /**
-     * Specifies the output path for a .d.ts rollup file to be generated without any trimming.
-     * This file will include all declarations that are exported by the main entry point.
-     *
-     * If the path is an empty string, then this file will not be written.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/dist/<unscopedPackageName>.d.ts"
-     */
-    // "untrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>.d.ts",
-
-    /**
-     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "beta" release.
-     * This file will include only declarations that are marked as "@public" or "@beta".
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: ""
-     */
-    // "betaTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-beta.d.ts",
-
-    /**
-     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "public" release.
-     * This file will include only declarations that are marked as "@public".
-     *
-     * If the path is an empty string, then this file will not be written.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: ""
-     */
-    // "publicTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-public.d.ts",
-
-    /**
-     * When a declaration is trimmed, by default it will be replaced by a code comment such as
-     * "Excluded from this release type: exampleMember".  Set "omitTrimmingComments" to true to remove the
-     * declaration completely.
-     *
-     * DEFAULT VALUE: false
-     */
-    // "omitTrimmingComments": true
-  },
-
-  /**
-   * Configures how the tsdoc-metadata.json file will be generated.
-   */
-  "tsdocMetadata": {
-    /**
-     * Whether to generate the tsdoc-metadata.json file.
-     *
-     * DEFAULT VALUE: true
-     */
-    // "enabled": true,
-    /**
-     * Specifies where the TSDoc metadata file should be written.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * The default value is "<lookup>", which causes the path to be automatically inferred from the "tsdocMetadata",
-     * "typings" or "main" fields of the project's package.json.  If none of these fields are set, the lookup
-     * falls back to "tsdoc-metadata.json" in the package folder.
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<lookup>"
-     */
-    // "tsdocMetadataFilePath": "<projectFolder>/dist/tsdoc-metadata.json"
-  },
-
-  /**
-   * Specifies what type of newlines API Extractor should use when writing output files.  By default, the output files
-   * will be written with Windows-style newlines.  To use POSIX-style newlines, specify "lf" instead.
-   * To use the OS's default newline kind, specify "os".
-   *
-   * DEFAULT VALUE: "crlf"
-   */
-  // "newlineKind": "crlf",
-
-  /**
-   * Configures how API Extractor reports error and warning messages produced during analysis.
-   *
-   * There are three sources of messages:  compiler messages, API Extractor messages, and TSDoc messages.
-   */
-  "messages": {
-    /**
-     * Configures handling of diagnostic messages reported by the TypeScript compiler engine while analyzing
-     * the input .d.ts files.
-     *
-     * TypeScript message identifiers start with "TS" followed by an integer.  For example: "TS2551"
-     *
-     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
-     */
-    "compilerMessageReporting": {
-      /**
-       * Configures the default routing for messages that don't match an explicit rule in this table.
-       */
-      "default": {
-        /**
-         * Specifies whether the message should be written to the the tool's output log.  Note that
-         * the "addToApiReportFile" property may supersede this option.
-         *
-         * Possible values: "error", "warning", "none"
-         *
-         * Errors cause the build to fail and return a nonzero exit code.  Warnings cause a production build fail
-         * and return a nonzero exit code.  For a non-production build (e.g. when "api-extractor run" includes
-         * the "--local" option), the warning is displayed but the build will not fail.
-         *
-         * DEFAULT VALUE: "warning"
-         */
-        "logLevel": "warning"
-
-        /**
-         * When addToApiReportFile is true:  If API Extractor is configured to write an API report file (.api.md),
-         * then the message will be written inside that file; otherwise, the message is instead logged according to
-         * the "logLevel" option.
-         *
-         * DEFAULT VALUE: false
-         */
-        // "addToApiReportFile": false
-      }
-
-      // "TS2551": {
-      //   "logLevel": "warning",
-      //   "addToApiReportFile": true
-      // },
-      //
-      // . . .
-    },
-
-    /**
-     * Configures handling of messages reported by API Extractor during its analysis.
-     *
-     * API Extractor message identifiers start with "ae-".  For example: "ae-extra-release-tag"
-     *
-     * DEFAULT VALUE: See api-extractor-defaults.json for the complete table of extractorMessageReporting mappings
-     */
-    "extractorMessageReporting": {
-      "default": {
-        "logLevel": "none"
-        // "addToApiReportFile": false
-      }
-
-      // "ae-extra-release-tag": {
-      //   "logLevel": "warning",
-      //   "addToApiReportFile": true
-      // },
-      //
-      // . . .
-    },
-
-    /**
-     * Configures handling of messages reported by the TSDoc parser when analyzing code comments.
-     *
-     * TSDoc message identifiers start with "tsdoc-".  For example: "tsdoc-link-tag-unescaped-text"
-     *
-     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
-     */
-    "tsdocMessageReporting": {
-      "default": {
-        "logLevel": "warning"
-        // "addToApiReportFile": false
-      }
-
-      // "tsdoc-link-tag-unescaped-text": {
-      //   "logLevel": "warning",
-      //   "addToApiReportFile": true
-      // },
-      //
-      // . . .
-    }
-  }
-}
diff --git a/packages/calckey-js/codecov.yml b/packages/calckey-js/codecov.yml
deleted file mode 100644
index 524298721..000000000
--- a/packages/calckey-js/codecov.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-codecov:
-  token: d55e1270-f20a-4727-aa05-2bd57793315a
diff --git a/packages/calckey-js/etc/calckey-js.api.md b/packages/calckey-js/etc/calckey-js.api.md
deleted file mode 100644
index 9e19852d4..000000000
--- a/packages/calckey-js/etc/calckey-js.api.md
+++ /dev/null
@@ -1,2696 +0,0 @@
-## API Report File for "calckey-js"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-
-import { EventEmitter } from 'eventemitter3';
-
-// @public (undocumented)
-export type Acct = {
-    username: string;
-    host: string | null;
-};
-
-// Warning: (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
-//
-// @public (undocumented)
-type Ad = TODO_2;
-
-// @public (undocumented)
-type Announcement = {
-    id: ID;
-    createdAt: DateString;
-    updatedAt: DateString | null;
-    text: string;
-    title: string;
-    imageUrl: string | null;
-    isRead?: boolean;
-};
-
-// @public (undocumented)
-type Antenna = {
-    id: ID;
-    createdAt: DateString;
-    name: string;
-    keywords: string[][];
-    excludeKeywords: string[][];
-    src: 'home' | 'all' | 'users' | 'list' | 'group';
-    userListId: ID | null;
-    userGroupId: ID | null;
-    users: string[];
-    caseSensitive: boolean;
-    notify: boolean;
-    withReplies: boolean;
-    withFile: boolean;
-    hasUnreadNote: boolean;
-};
-
-declare namespace api {
-    export {
-        isAPIError,
-        APIError,
-        FetchLike,
-        APIClient
-    }
-}
-export { api }
-
-// @public (undocumented)
-class APIClient {
-    constructor(opts: {
-        origin: APIClient['origin'];
-        credential?: APIClient['credential'];
-        fetch?: APIClient['fetch'] | null | undefined;
-    });
-    // (undocumented)
-    credential: string | null | undefined;
-    // (undocumented)
-    fetch: FetchLike;
-    // (undocumented)
-    origin: string;
-    // Warning: (ae-forgotten-export) The symbol "IsCaseMatched" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-forgotten-export) The symbol "GetCaseResult" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(endpoint: E, params?: P, credential?: string | null | undefined): Promise<Endpoints[E]['res'] extends {
-        $switch: {
-            $cases: [any, any][];
-            $default: any;
-        };
-    } ? IsCaseMatched<E, P, 0> extends true ? GetCaseResult<E, P, 0> : IsCaseMatched<E, P, 1> extends true ? GetCaseResult<E, P, 1> : IsCaseMatched<E, P, 2> extends true ? GetCaseResult<E, P, 2> : IsCaseMatched<E, P, 3> extends true ? GetCaseResult<E, P, 3> : IsCaseMatched<E, P, 4> extends true ? GetCaseResult<E, P, 4> : IsCaseMatched<E, P, 5> extends true ? GetCaseResult<E, P, 5> : IsCaseMatched<E, P, 6> extends true ? GetCaseResult<E, P, 6> : IsCaseMatched<E, P, 7> extends true ? GetCaseResult<E, P, 7> : IsCaseMatched<E, P, 8> extends true ? GetCaseResult<E, P, 8> : IsCaseMatched<E, P, 9> extends true ? GetCaseResult<E, P, 9> : Endpoints[E]['res']['$switch']['$default'] : Endpoints[E]['res']>;
-}
-
-// @public (undocumented)
-type APIError = {
-    id: string;
-    code: string;
-    message: string;
-    kind: 'client' | 'server';
-    info: Record<string, any>;
-};
-
-// @public (undocumented)
-type App = TODO_2;
-
-// @public (undocumented)
-type AuthSession = {
-    id: ID;
-    app: App;
-    token: string;
-};
-
-// @public (undocumented)
-type Blocking = {
-    id: ID;
-    createdAt: DateString;
-    blockeeId: User['id'];
-    blockee: UserDetailed;
-};
-
-// @public (undocumented)
-type Channel = {
-    id: ID;
-};
-
-// 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']> {
-    constructor(stream: Stream, channel: string, name?: string);
-    // (undocumented)
-    channel: string;
-    // (undocumented)
-    abstract dispose(): void;
-    // (undocumented)
-    abstract id: string;
-    // (undocumented)
-    inCount: number;
-    // (undocumented)
-    name?: string;
-    // (undocumented)
-    outCount: number;
-    // (undocumented)
-    send<T extends keyof Channel['receives']>(type: T, body: Channel['receives'][T]): void;
-    // (undocumented)
-    protected stream: Stream;
-}
-
-// @public (undocumented)
-export type Channels = {
-    main: {
-        params: null;
-        events: {
-            notification: (payload: Notification_2) => void;
-            mention: (payload: Note) => void;
-            reply: (payload: Note) => void;
-            renote: (payload: Note) => void;
-            follow: (payload: User) => void;
-            followed: (payload: User) => void;
-            unfollow: (payload: User) => void;
-            meUpdated: (payload: MeDetailed) => void;
-            pageEvent: (payload: PageEvent) => void;
-            urlUploadFinished: (payload: {
-                marker: string;
-                file: DriveFile;
-            }) => void;
-            readAllNotifications: () => void;
-            unreadNotification: (payload: Notification_2) => void;
-            unreadMention: (payload: Note['id']) => void;
-            readAllUnreadMentions: () => void;
-            unreadSpecifiedNote: (payload: Note['id']) => void;
-            readAllUnreadSpecifiedNotes: () => void;
-            readAllMessagingMessages: () => void;
-            messagingMessage: (payload: MessagingMessage) => void;
-            unreadMessagingMessage: (payload: MessagingMessage) => void;
-            readAllAntennas: () => void;
-            unreadAntenna: (payload: Antenna) => void;
-            readAllAnnouncements: () => void;
-            readAllChannels: () => void;
-            unreadChannel: (payload: Note['id']) => void;
-            myTokenRegenerated: () => void;
-            reversiNoInvites: () => void;
-            reversiInvited: (payload: FIXME) => void;
-            signin: (payload: FIXME) => void;
-            registryUpdated: (payload: {
-                scope?: string[];
-                key: string;
-                value: any | null;
-            }) => void;
-            driveFileCreated: (payload: DriveFile) => void;
-            readAntenna: (payload: Antenna) => void;
-        };
-        receives: null;
-    };
-    homeTimeline: {
-        params: null;
-        events: {
-            note: (payload: Note) => void;
-        };
-        receives: null;
-    };
-    localTimeline: {
-        params: null;
-        events: {
-            note: (payload: Note) => void;
-        };
-        receives: null;
-    };
-    hybridTimeline: {
-        params: null;
-        events: {
-            note: (payload: Note) => void;
-        };
-        receives: null;
-    };
-    recommendedTimeline: {
-        params: null;
-        events: {
-            note: (payload: Note) => void;
-        };
-        receives: null;
-    };
-    globalTimeline: {
-        params: null;
-        events: {
-            note: (payload: Note) => void;
-        };
-        receives: null;
-    };
-    messaging: {
-        params: {
-            otherparty?: User['id'] | null;
-            group?: UserGroup['id'] | null;
-        };
-        events: {
-            message: (payload: MessagingMessage) => void;
-            deleted: (payload: MessagingMessage['id']) => void;
-            read: (payload: MessagingMessage['id'][]) => void;
-            typers: (payload: User[]) => void;
-        };
-        receives: {
-            read: {
-                id: MessagingMessage['id'];
-            };
-        };
-    };
-    serverStats: {
-        params: null;
-        events: {
-            stats: (payload: FIXME) => void;
-        };
-        receives: {
-            requestLog: {
-                id: string | number;
-                length: number;
-            };
-        };
-    };
-    queueStats: {
-        params: null;
-        events: {
-            stats: (payload: FIXME) => void;
-        };
-        receives: {
-            requestLog: {
-                id: string | number;
-                length: number;
-            };
-        };
-    };
-};
-
-// @public (undocumented)
-type Clip = TODO_2;
-
-// @public (undocumented)
-type CustomEmoji = {
-    id: string;
-    name: string;
-    url: string;
-    category: string;
-    aliases: string[];
-};
-
-// @public (undocumented)
-type DateString = string;
-
-// @public (undocumented)
-type DetailedInstanceMetadata = LiteInstanceMetadata & {
-    features: Record<string, any>;
-};
-
-// @public (undocumented)
-type DriveFile = {
-    id: ID;
-    createdAt: DateString;
-    isSensitive: boolean;
-    name: string;
-    thumbnailUrl: string;
-    url: string;
-    type: string;
-    size: number;
-    md5: string;
-    blurhash: string;
-    comment: string | null;
-    properties: Record<string, any>;
-};
-
-// @public (undocumented)
-type DriveFolder = TODO_2;
-
-// @public (undocumented)
-export type Endpoints = {
-    'admin/abuse-user-reports': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/delete-all-files-of-a-user': {
-        req: {
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'admin/delete-logs': {
-        req: NoParams;
-        res: null;
-    };
-    'admin/get-index-stats': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/get-table-stats': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/invite': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/logs': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/reset-password': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/resolve-abuse-user-report': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/resync-chart': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/send-email': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/server-info': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/show-moderation-logs': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/show-user': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/show-users': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/silence-user': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/suspend-user': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/unsilence-user': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/unsuspend-user': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/update-meta': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/vacuum': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/accounts/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/ad/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/ad/delete': {
-        req: {
-            id: Ad['id'];
-        };
-        res: null;
-    };
-    'admin/ad/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/ad/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/announcements/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/announcements/delete': {
-        req: {
-            id: Announcement['id'];
-        };
-        res: null;
-    };
-    'admin/announcements/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/announcements/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/drive/clean-remote-files': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/drive/cleanup': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/drive/files': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/drive/show-file': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/add': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/copy': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/list-remote': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/remove': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/federation/delete-all-files': {
-        req: {
-            host: string;
-        };
-        res: null;
-    };
-    'admin/federation/refresh-remote-instance-metadata': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/federation/remove-all-following': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/federation/update-instance': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/moderators/add': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/moderators/remove': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/promo/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/queue/clear': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/queue/deliver-delayed': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/queue/inbox-delayed': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/queue/jobs': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/queue/stats': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/relays/add': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/relays/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/relays/remove': {
-        req: TODO;
-        res: TODO;
-    };
-    'announcements': {
-        req: {
-            limit?: number;
-            withUnreads?: boolean;
-            sinceId?: Announcement['id'];
-            untilId?: Announcement['id'];
-        };
-        res: Announcement[];
-    };
-    'antennas/create': {
-        req: TODO;
-        res: Antenna;
-    };
-    'antennas/delete': {
-        req: {
-            antennaId: Antenna['id'];
-        };
-        res: null;
-    };
-    'antennas/list': {
-        req: NoParams;
-        res: Antenna[];
-    };
-    'antennas/notes': {
-        req: {
-            antennaId: Antenna['id'];
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-        };
-        res: Note[];
-    };
-    'antennas/show': {
-        req: {
-            antennaId: Antenna['id'];
-        };
-        res: Antenna;
-    };
-    'antennas/update': {
-        req: TODO;
-        res: Antenna;
-    };
-    'ap/get': {
-        req: {
-            uri: string;
-        };
-        res: Record<string, any>;
-    };
-    'ap/show': {
-        req: {
-            uri: string;
-        };
-        res: {
-            type: 'Note';
-            object: Note;
-        } | {
-            type: 'User';
-            object: UserDetailed;
-        };
-    };
-    'app/create': {
-        req: TODO;
-        res: App;
-    };
-    'app/show': {
-        req: {
-            appId: App['id'];
-        };
-        res: App;
-    };
-    'auth/accept': {
-        req: {
-            token: string;
-        };
-        res: null;
-    };
-    'auth/session/generate': {
-        req: {
-            appSecret: string;
-        };
-        res: {
-            token: string;
-            url: string;
-        };
-    };
-    'auth/session/show': {
-        req: {
-            token: string;
-        };
-        res: AuthSession;
-    };
-    'auth/session/userkey': {
-        req: {
-            appSecret: string;
-            token: string;
-        };
-        res: {
-            accessToken: string;
-            user: User;
-        };
-    };
-    'blocking/create': {
-        req: {
-            userId: User['id'];
-        };
-        res: UserDetailed;
-    };
-    'blocking/delete': {
-        req: {
-            userId: User['id'];
-        };
-        res: UserDetailed;
-    };
-    'blocking/list': {
-        req: {
-            limit?: number;
-            sinceId?: Blocking['id'];
-            untilId?: Blocking['id'];
-        };
-        res: Blocking[];
-    };
-    'channels/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/featured': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/follow': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/followed': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/owned': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/pin-note': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/timeline': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/unfollow': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'charts/active-users': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: {
-            local: {
-                users: number[];
-            };
-            remote: {
-                users: number[];
-            };
-        };
-    };
-    'charts/drive': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: {
-            local: {
-                decCount: number[];
-                decSize: number[];
-                incCount: number[];
-                incSize: number[];
-                totalCount: number[];
-                totalSize: number[];
-            };
-            remote: {
-                decCount: number[];
-                decSize: number[];
-                incCount: number[];
-                incSize: number[];
-                totalCount: number[];
-                totalSize: number[];
-            };
-        };
-    };
-    'charts/federation': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: {
-            instance: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-        };
-    };
-    'charts/hashtag': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: TODO;
-    };
-    'charts/instance': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-            host: string;
-        };
-        res: {
-            drive: {
-                decFiles: number[];
-                decUsage: number[];
-                incFiles: number[];
-                incUsage: number[];
-                totalFiles: number[];
-                totalUsage: number[];
-            };
-            followers: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-            following: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-            notes: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-                diffs: {
-                    normal: number[];
-                    renote: number[];
-                    reply: number[];
-                };
-            };
-            requests: {
-                failed: number[];
-                received: number[];
-                succeeded: number[];
-            };
-            users: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-        };
-    };
-    'charts/network': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: TODO;
-    };
-    'charts/notes': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: {
-            local: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-                diffs: {
-                    normal: number[];
-                    renote: number[];
-                    reply: number[];
-                };
-            };
-            remote: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-                diffs: {
-                    normal: number[];
-                    renote: number[];
-                    reply: number[];
-                };
-            };
-        };
-    };
-    'charts/user/drive': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-            userId: User['id'];
-        };
-        res: {
-            decCount: number[];
-            decSize: number[];
-            incCount: number[];
-            incSize: number[];
-            totalCount: number[];
-            totalSize: number[];
-        };
-    };
-    'charts/user/following': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-            userId: User['id'];
-        };
-        res: TODO;
-    };
-    'charts/user/notes': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-            userId: User['id'];
-        };
-        res: {
-            dec: number[];
-            inc: number[];
-            total: number[];
-            diffs: {
-                normal: number[];
-                renote: number[];
-                reply: number[];
-            };
-        };
-    };
-    'charts/user/reactions': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-            userId: User['id'];
-        };
-        res: TODO;
-    };
-    'charts/users': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: {
-            local: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-            remote: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-        };
-    };
-    'clips/add-note': {
-        req: TODO;
-        res: TODO;
-    };
-    'clips/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'clips/delete': {
-        req: {
-            clipId: Clip['id'];
-        };
-        res: null;
-    };
-    'clips/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'clips/notes': {
-        req: TODO;
-        res: TODO;
-    };
-    'clips/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'clips/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'drive': {
-        req: NoParams;
-        res: {
-            capacity: number;
-            usage: number;
-        };
-    };
-    'drive/files': {
-        req: {
-            folderId?: DriveFolder['id'] | null;
-            type?: DriveFile['type'] | null;
-            limit?: number;
-            sinceId?: DriveFile['id'];
-            untilId?: DriveFile['id'];
-        };
-        res: DriveFile[];
-    };
-    'drive/files/attached-notes': {
-        req: TODO;
-        res: TODO;
-    };
-    'drive/files/check-existence': {
-        req: TODO;
-        res: TODO;
-    };
-    'drive/files/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'drive/files/delete': {
-        req: {
-            fileId: DriveFile['id'];
-        };
-        res: null;
-    };
-    'drive/files/find-by-hash': {
-        req: TODO;
-        res: TODO;
-    };
-    'drive/files/find': {
-        req: {
-            name: string;
-            folderId?: DriveFolder['id'] | null;
-        };
-        res: DriveFile[];
-    };
-    'drive/files/show': {
-        req: {
-            fileId?: DriveFile['id'];
-            url?: string;
-        };
-        res: DriveFile;
-    };
-    'drive/files/update': {
-        req: {
-            fileId: DriveFile['id'];
-            folderId?: DriveFolder['id'] | null;
-            name?: string;
-            isSensitive?: boolean;
-            comment?: string | null;
-        };
-        res: DriveFile;
-    };
-    'drive/files/upload-from-url': {
-        req: {
-            url: string;
-            folderId?: DriveFolder['id'] | null;
-            isSensitive?: boolean;
-            comment?: string | null;
-            marker?: string | null;
-            force?: boolean;
-        };
-        res: null;
-    };
-    'drive/folders': {
-        req: {
-            folderId?: DriveFolder['id'] | null;
-            limit?: number;
-            sinceId?: DriveFile['id'];
-            untilId?: DriveFile['id'];
-        };
-        res: DriveFolder[];
-    };
-    'drive/folders/create': {
-        req: {
-            name?: string;
-            parentId?: DriveFolder['id'] | null;
-        };
-        res: DriveFolder;
-    };
-    'drive/folders/delete': {
-        req: {
-            folderId: DriveFolder['id'];
-        };
-        res: null;
-    };
-    'drive/folders/find': {
-        req: {
-            name: string;
-            parentId?: DriveFolder['id'] | null;
-        };
-        res: DriveFolder[];
-    };
-    'drive/folders/show': {
-        req: {
-            folderId: DriveFolder['id'];
-        };
-        res: DriveFolder;
-    };
-    'drive/folders/update': {
-        req: {
-            folderId: DriveFolder['id'];
-            name?: string;
-            parentId?: DriveFolder['id'] | null;
-        };
-        res: DriveFolder;
-    };
-    'drive/stream': {
-        req: {
-            type?: DriveFile['type'] | null;
-            limit?: number;
-            sinceId?: DriveFile['id'];
-            untilId?: DriveFile['id'];
-        };
-        res: DriveFile[];
-    };
-    'endpoint': {
-        req: {
-            endpoint: string;
-        };
-        res: {
-            params: {
-                name: string;
-                type: string;
-            }[];
-        };
-    };
-    'endpoints': {
-        req: NoParams;
-        res: string[];
-    };
-    'federation/dns': {
-        req: {
-            host: string;
-        };
-        res: {
-            a: string[];
-            aaaa: string[];
-            cname: string[];
-            txt: string[];
-        };
-    };
-    'federation/followers': {
-        req: {
-            host: string;
-            limit?: number;
-            sinceId?: Following['id'];
-            untilId?: Following['id'];
-        };
-        res: FollowingFolloweePopulated[];
-    };
-    'federation/following': {
-        req: {
-            host: string;
-            limit?: number;
-            sinceId?: Following['id'];
-            untilId?: Following['id'];
-        };
-        res: FollowingFolloweePopulated[];
-    };
-    'federation/instances': {
-        req: {
-            host?: string | null;
-            blocked?: boolean | null;
-            notResponding?: boolean | null;
-            suspended?: boolean | null;
-            federating?: boolean | null;
-            subscribing?: boolean | null;
-            publishing?: boolean | null;
-            limit?: number;
-            offset?: number;
-            sort?: '+pubSub' | '-pubSub' | '+notes' | '-notes' | '+users' | '-users' | '+following' | '-following' | '+followers' | '-followers' | '+caughtAt' | '-caughtAt' | '+lastCommunicatedAt' | '-lastCommunicatedAt' | '+driveUsage' | '-driveUsage' | '+driveFiles' | '-driveFiles';
-        };
-        res: Instance[];
-    };
-    'federation/show-instance': {
-        req: {
-            host: string;
-        };
-        res: Instance;
-    };
-    'federation/update-remote-user': {
-        req: {
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'federation/users': {
-        req: {
-            host: string;
-            limit?: number;
-            sinceId?: User['id'];
-            untilId?: User['id'];
-        };
-        res: UserDetailed[];
-    };
-    'following/create': {
-        req: {
-            userId: User['id'];
-        };
-        res: User;
-    };
-    'following/delete': {
-        req: {
-            userId: User['id'];
-        };
-        res: User;
-    };
-    'following/requests/accept': {
-        req: {
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'following/requests/cancel': {
-        req: {
-            userId: User['id'];
-        };
-        res: User;
-    };
-    'following/requests/list': {
-        req: NoParams;
-        res: FollowRequest[];
-    };
-    'following/requests/reject': {
-        req: {
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'gallery/featured': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/popular': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts/delete': {
-        req: {
-            postId: GalleryPost['id'];
-        };
-        res: null;
-    };
-    'gallery/posts/like': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts/unlike': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/games': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/games/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/games/surrender': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/invitations': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/match': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/match/cancel': {
-        req: TODO;
-        res: TODO;
-    };
-    'get-online-users-count': {
-        req: NoParams;
-        res: {
-            count: number;
-        };
-    };
-    'hashtags/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'hashtags/search': {
-        req: TODO;
-        res: TODO;
-    };
-    'hashtags/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'hashtags/trend': {
-        req: TODO;
-        res: TODO;
-    };
-    'hashtags/users': {
-        req: TODO;
-        res: TODO;
-    };
-    'i': {
-        req: NoParams;
-        res: User;
-    };
-    'i/apps': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/authorized-apps': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/change-password': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/delete-account': {
-        req: {
-            password: string;
-        };
-        res: null;
-    };
-    'i/export-blocking': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/export-following': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/export-mute': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/export-notes': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/export-user-lists': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/favorites': {
-        req: {
-            limit?: number;
-            sinceId?: NoteFavorite['id'];
-            untilId?: NoteFavorite['id'];
-        };
-        res: NoteFavorite[];
-    };
-    'i/gallery/likes': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/gallery/posts': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/get-word-muted-notes-count': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/import-following': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/import-user-lists': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/move': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/known-as': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/notifications': {
-        req: {
-            limit?: number;
-            sinceId?: Notification_2['id'];
-            untilId?: Notification_2['id'];
-            following?: boolean;
-            markAsRead?: boolean;
-            includeTypes?: Notification_2['type'][];
-            excludeTypes?: Notification_2['type'][];
-        };
-        res: Notification_2[];
-    };
-    'i/page-likes': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/pages': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/pin': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: MeDetailed;
-    };
-    'i/read-all-messaging-messages': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/read-all-unread-notes': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/read-announcement': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/regenerate-token': {
-        req: {
-            password: string;
-        };
-        res: null;
-    };
-    'i/registry/get-all': {
-        req: {
-            scope?: string[];
-        };
-        res: Record<string, any>;
-    };
-    'i/registry/get-detail': {
-        req: {
-            key: string;
-            scope?: string[];
-        };
-        res: {
-            updatedAt: DateString;
-            value: any;
-        };
-    };
-    'i/registry/get': {
-        req: {
-            key: string;
-            scope?: string[];
-        };
-        res: any;
-    };
-    'i/registry/keys-with-type': {
-        req: {
-            scope?: string[];
-        };
-        res: Record<string, 'null' | 'array' | 'number' | 'string' | 'boolean' | 'object'>;
-    };
-    'i/registry/keys': {
-        req: {
-            scope?: string[];
-        };
-        res: string[];
-    };
-    'i/registry/remove': {
-        req: {
-            key: string;
-            scope?: string[];
-        };
-        res: null;
-    };
-    'i/registry/scopes': {
-        req: NoParams;
-        res: string[][];
-    };
-    'i/registry/set': {
-        req: {
-            key: string;
-            value: any;
-            scope?: string[];
-        };
-        res: null;
-    };
-    'i/revoke-token': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/signin-history': {
-        req: {
-            limit?: number;
-            sinceId?: Signin['id'];
-            untilId?: Signin['id'];
-        };
-        res: Signin[];
-    };
-    'i/unpin': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: MeDetailed;
-    };
-    'i/update-email': {
-        req: {
-            password: string;
-            email?: string | null;
-        };
-        res: MeDetailed;
-    };
-    'i/update': {
-        req: {
-            name?: string | null;
-            description?: string | null;
-            lang?: string | null;
-            location?: string | null;
-            birthday?: string | null;
-            avatarId?: DriveFile['id'] | null;
-            bannerId?: DriveFile['id'] | null;
-            fields?: {
-                name: string;
-                value: string;
-            }[];
-            isLocked?: boolean;
-            isExplorable?: boolean;
-            hideOnlineStatus?: boolean;
-            carefulBot?: boolean;
-            autoAcceptFollowed?: boolean;
-            noCrawle?: boolean;
-            isBot?: boolean;
-            isCat?: boolean;
-            injectFeaturedNote?: boolean;
-            receiveAnnouncementEmail?: boolean;
-            alwaysMarkNsfw?: boolean;
-            mutedWords?: string[][];
-            mutingNotificationTypes?: Notification_2['type'][];
-            emailNotificationTypes?: string[];
-        };
-        res: MeDetailed;
-    };
-    'i/user-group-invites': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/done': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/key-done': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/password-less': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/register-key': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/register': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/remove-key': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/unregister': {
-        req: TODO;
-        res: TODO;
-    };
-    'messaging/history': {
-        req: {
-            limit?: number;
-            group?: boolean;
-        };
-        res: MessagingMessage[];
-    };
-    'messaging/messages': {
-        req: {
-            userId?: User['id'];
-            groupId?: UserGroup['id'];
-            limit?: number;
-            sinceId?: MessagingMessage['id'];
-            untilId?: MessagingMessage['id'];
-            markAsRead?: boolean;
-        };
-        res: MessagingMessage[];
-    };
-    'messaging/messages/create': {
-        req: {
-            userId?: User['id'];
-            groupId?: UserGroup['id'];
-            text?: string;
-            fileId?: DriveFile['id'];
-        };
-        res: MessagingMessage;
-    };
-    'messaging/messages/delete': {
-        req: {
-            messageId: MessagingMessage['id'];
-        };
-        res: null;
-    };
-    'messaging/messages/read': {
-        req: {
-            messageId: MessagingMessage['id'];
-        };
-        res: null;
-    };
-    'meta': {
-        req: {
-            detail?: boolean;
-        };
-        res: {
-            $switch: {
-                $cases: [
-                [
-                    {
-                    detail: true;
-                },
-                DetailedInstanceMetadata
-                ],
-                [
-                    {
-                    detail: false;
-                },
-                LiteInstanceMetadata
-                ],
-                [
-                    {
-                    detail: boolean;
-                },
-                LiteInstanceMetadata | DetailedInstanceMetadata
-                ]
-                ];
-                $default: LiteInstanceMetadata;
-            };
-        };
-    };
-    'miauth/gen-token': {
-        req: TODO;
-        res: TODO;
-    };
-    'mute/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'mute/delete': {
-        req: {
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'mute/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'my/apps': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-        };
-        res: Note[];
-    };
-    'notes/children': {
-        req: {
-            noteId: Note['id'];
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-        };
-        res: Note[];
-    };
-    'notes/clips': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/conversation': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/create': {
-        req: {
-            visibility?: 'public' | 'home' | 'followers' | 'specified';
-            visibleUserIds?: User['id'][];
-            text?: null | string;
-            cw?: null | string;
-            viaMobile?: boolean;
-            localOnly?: boolean;
-            fileIds?: DriveFile['id'][];
-            replyId?: null | Note['id'];
-            renoteId?: null | Note['id'];
-            channelId?: null | Channel['id'];
-            poll?: null | {
-                choices: string[];
-                multiple?: boolean;
-                expiresAt?: null | number;
-                expiredAfter?: null | number;
-            };
-        };
-        res: {
-            createdNote: Note;
-        };
-    };
-    'notes/delete': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notes/favorites/create': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notes/favorites/delete': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notes/featured': {
-        req: TODO;
-        res: Note[];
-    };
-    'notes/global-timeline': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/recommended-timeline': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/hybrid-timeline': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/local-timeline': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/mentions': {
-        req: {
-            following?: boolean;
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-        };
-        res: Note[];
-    };
-    'notes/polls/recommendation': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/polls/vote': {
-        req: {
-            noteId: Note['id'];
-            choice: number;
-        };
-        res: null;
-    };
-    'notes/reactions': {
-        req: {
-            noteId: Note['id'];
-            type?: string | null;
-            limit?: number;
-        };
-        res: NoteReaction[];
-    };
-    'notes/reactions/create': {
-        req: {
-            noteId: Note['id'];
-            reaction: string;
-        };
-        res: null;
-    };
-    'notes/reactions/delete': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notes/renotes': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            noteId: Note['id'];
-        };
-        res: Note[];
-    };
-    'notes/replies': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            noteId: Note['id'];
-        };
-        res: Note[];
-    };
-    'notes/search-by-tag': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/search': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/show': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: Note;
-    };
-    'notes/state': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/timeline': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/unrenote': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notes/user-list-timeline': {
-        req: {
-            listId: UserList['id'];
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/watching/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/watching/delete': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notifications/create': {
-        req: {
-            body: string;
-            header?: string | null;
-            icon?: string | null;
-        };
-        res: null;
-    };
-    'notifications/mark-all-as-read': {
-        req: NoParams;
-        res: null;
-    };
-    'notifications/read': {
-        req: {
-            notificationId: Notification_2['id'];
-        };
-        res: null;
-    };
-    'page-push': {
-        req: {
-            pageId: Page['id'];
-            event: string;
-            var?: any;
-        };
-        res: null;
-    };
-    'pages/create': {
-        req: TODO;
-        res: Page;
-    };
-    'pages/delete': {
-        req: {
-            pageId: Page['id'];
-        };
-        res: null;
-    };
-    'pages/featured': {
-        req: NoParams;
-        res: Page[];
-    };
-    'pages/like': {
-        req: {
-            pageId: Page['id'];
-        };
-        res: null;
-    };
-    'pages/show': {
-        req: {
-            pageId?: Page['id'];
-            name?: string;
-            username?: string;
-        };
-        res: Page;
-    };
-    'pages/unlike': {
-        req: {
-            pageId: Page['id'];
-        };
-        res: null;
-    };
-    'pages/update': {
-        req: TODO;
-        res: null;
-    };
-    'ping': {
-        req: NoParams;
-        res: {
-            pong: number;
-        };
-    };
-    'pinned-users': {
-        req: TODO;
-        res: TODO;
-    };
-    'promo/read': {
-        req: TODO;
-        res: TODO;
-    };
-    'request-reset-password': {
-        req: {
-            username: string;
-            email: string;
-        };
-        res: null;
-    };
-    'reset-password': {
-        req: {
-            token: string;
-            password: string;
-        };
-        res: null;
-    };
-    'room/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'room/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'stats': {
-        req: NoParams;
-        res: Stats;
-    };
-    'server-info': {
-        req: NoParams;
-        res: ServerInfo;
-    };
-    'latest-version': {
-        req: NoParams;
-        res: TODO;
-    };
-    'sw/register': {
-        req: TODO;
-        res: TODO;
-    };
-    'username/available': {
-        req: {
-            username: string;
-        };
-        res: {
-            available: boolean;
-        };
-    };
-    'users': {
-        req: {
-            limit?: number;
-            offset?: number;
-            sort?: UserSorting;
-            origin?: OriginType;
-        };
-        res: User[];
-    };
-    'users/clips': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/followers': {
-        req: {
-            userId?: User['id'];
-            username?: User['username'];
-            host?: User['host'] | null;
-            limit?: number;
-            sinceId?: Following['id'];
-            untilId?: Following['id'];
-        };
-        res: FollowingFollowerPopulated[];
-    };
-    'users/following': {
-        req: {
-            userId?: User['id'];
-            username?: User['username'];
-            host?: User['host'] | null;
-            limit?: number;
-            sinceId?: Following['id'];
-            untilId?: Following['id'];
-        };
-        res: FollowingFolloweePopulated[];
-    };
-    'users/gallery/posts': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/get-frequently-replied-users': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/delete': {
-        req: {
-            groupId: UserGroup['id'];
-        };
-        res: null;
-    };
-    'users/groups/invitations/accept': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/invitations/reject': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/invite': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/joined': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/owned': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/pull': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/transfer': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/lists/create': {
-        req: {
-            name: string;
-        };
-        res: UserList;
-    };
-    'users/lists/delete': {
-        req: {
-            listId: UserList['id'];
-        };
-        res: null;
-    };
-    'users/lists/list': {
-        req: NoParams;
-        res: UserList[];
-    };
-    'users/lists/pull': {
-        req: {
-            listId: UserList['id'];
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'users/lists/push': {
-        req: {
-            listId: UserList['id'];
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'users/lists/show': {
-        req: {
-            listId: UserList['id'];
-        };
-        res: UserList;
-    };
-    'users/lists/update': {
-        req: {
-            listId: UserList['id'];
-            name: string;
-        };
-        res: UserList;
-    };
-    'users/notes': {
-        req: {
-            userId: User['id'];
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'users/pages': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/recommendation': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/relation': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/report-abuse': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/search-by-username-and-host': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/search': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/show': {
-        req: ShowUserReq | {
-            userIds: User['id'][];
-        };
-        res: {
-            $switch: {
-                $cases: [
-                [
-                    {
-                    userIds: User['id'][];
-                },
-                UserDetailed[]
-                ]
-                ];
-                $default: UserDetailed;
-            };
-        };
-    };
-    'users/stats': {
-        req: TODO;
-        res: TODO;
-    };
-};
-
-declare namespace entities {
-    export {
-        ID,
-        DateString,
-        User,
-        UserLite,
-        UserDetailed,
-        UserGroup,
-        UserList,
-        MeDetailed,
-        DriveFile,
-        DriveFolder,
-        GalleryPost,
-        Note,
-        NoteReaction,
-        Notification_2 as Notification,
-        MessagingMessage,
-        CustomEmoji,
-        LiteInstanceMetadata,
-        DetailedInstanceMetadata,
-        InstanceMetadata,
-        ServerInfo,
-        Stats,
-        Page,
-        PageEvent,
-        Announcement,
-        Antenna,
-        App,
-        AuthSession,
-        Ad,
-        Clip,
-        NoteFavorite,
-        FollowRequest,
-        Channel,
-        Following,
-        FollowingFolloweePopulated,
-        FollowingFollowerPopulated,
-        Blocking,
-        Instance,
-        Signin,
-        UserSorting,
-        OriginType
-    }
-}
-export { entities }
-
-// @public (undocumented)
-type FetchLike = (input: string, init?: {
-    method?: string;
-    body?: string;
-    credentials?: RequestCredentials;
-    cache?: RequestCache;
-}) => Promise<{
-    status: number;
-    json(): Promise<any>;
-}>;
-
-// @public (undocumented)
-export const ffVisibility: readonly ["public", "followers", "private"];
-
-// @public (undocumented)
-type Following = {
-    id: ID;
-    createdAt: DateString;
-    followerId: User['id'];
-    followeeId: User['id'];
-};
-
-// @public (undocumented)
-type FollowingFolloweePopulated = Following & {
-    followee: UserDetailed;
-};
-
-// @public (undocumented)
-type FollowingFollowerPopulated = Following & {
-    follower: UserDetailed;
-};
-
-// @public (undocumented)
-type FollowRequest = {
-    id: ID;
-    follower: User;
-    followee: User;
-};
-
-// @public (undocumented)
-type GalleryPost = TODO_2;
-
-// @public (undocumented)
-type ID = string;
-
-// @public (undocumented)
-type Instance = {
-    id: ID;
-    caughtAt: DateString;
-    host: string;
-    usersCount: number;
-    notesCount: number;
-    followingCount: number;
-    followersCount: number;
-    driveUsage: number;
-    driveFiles: number;
-    latestRequestSentAt: DateString | null;
-    latestStatus: number | null;
-    latestRequestReceivedAt: DateString | null;
-    lastCommunicatedAt: DateString;
-    isNotResponding: boolean;
-    isSuspended: boolean;
-    softwareName: string | null;
-    softwareVersion: string | null;
-    openRegistrations: boolean | null;
-    name: string | null;
-    description: string | null;
-    maintainerName: string | null;
-    maintainerEmail: string | null;
-    iconUrl: string | null;
-    faviconUrl: string | null;
-    themeColor: string | null;
-    infoUpdatedAt: DateString | null;
-};
-
-// @public (undocumented)
-type InstanceMetadata = LiteInstanceMetadata | DetailedInstanceMetadata;
-
-// @public (undocumented)
-function isAPIError(reason: any): reason is APIError;
-
-// @public (undocumented)
-type LiteInstanceMetadata = {
-    maintainerName: string | null;
-    maintainerEmail: string | null;
-    version: string;
-    name: string | null;
-    uri: string;
-    description: string | null;
-    tosUrl: string | null;
-    disableRegistration: boolean;
-    disableLocalTimeline: boolean;
-    disableRecommendedTimeline: boolean;
-    disableGlobalTimeline: boolean;
-    driveCapacityPerLocalUserMb: number;
-    driveCapacityPerRemoteUserMb: number;
-    enableHcaptcha: boolean;
-    hcaptchaSiteKey: string | null;
-    enableRecaptcha: boolean;
-    recaptchaSiteKey: string | null;
-    swPublickey: string | null;
-    maxNoteTextLength: number;
-    enableEmail: boolean;
-    enableTwitterIntegration: boolean;
-    enableGithubIntegration: boolean;
-    enableDiscordIntegration: boolean;
-    enableServiceWorker: boolean;
-    emojis: CustomEmoji[];
-    ads: {
-        id: ID;
-        ratio: number;
-        place: string;
-        url: string;
-        imageUrl: string;
-    }[];
-};
-
-// @public (undocumented)
-type MeDetailed = UserDetailed & {
-    avatarId: DriveFile['id'];
-    bannerId: DriveFile['id'];
-    autoAcceptFollowed: boolean;
-    alwaysMarkNsfw: boolean;
-    carefulBot: boolean;
-    emailNotificationTypes: string[];
-    hasPendingReceivedFollowRequest: boolean;
-    hasUnreadAnnouncement: boolean;
-    hasUnreadAntenna: boolean;
-    hasUnreadChannel: boolean;
-    hasUnreadMentions: boolean;
-    hasUnreadMessagingMessage: boolean;
-    hasUnreadNotification: boolean;
-    hasUnreadSpecifiedNotes: boolean;
-    hideOnlineStatus: boolean;
-    injectFeaturedNote: boolean;
-    integrations: Record<string, any>;
-    isDeleted: boolean;
-    isExplorable: boolean;
-    mutedWords: string[][];
-    mutingNotificationTypes: string[];
-    noCrawle: boolean;
-    receiveAnnouncementEmail: boolean;
-    usePasswordLessLogin: boolean;
-    [other: string]: any;
-};
-
-// @public (undocumented)
-type MessagingMessage = {
-    id: ID;
-    createdAt: DateString;
-    file: DriveFile | null;
-    fileId: DriveFile['id'] | null;
-    isRead: boolean;
-    reads: User['id'][];
-    text: string | null;
-    user: User;
-    userId: User['id'];
-    recipient?: User | null;
-    recipientId: User['id'] | null;
-    group?: UserGroup | null;
-    groupId: UserGroup['id'] | null;
-};
-
-// @public (undocumented)
-export const mutedNoteReasons: readonly ["word", "manual", "spam", "other"];
-
-// @public (undocumented)
-type Note = {
-    id: ID;
-    createdAt: DateString;
-    text: string | null;
-    cw: string | null;
-    user: User;
-    userId: User['id'];
-    reply?: Note;
-    replyId: Note['id'];
-    renote?: Note;
-    renoteId: Note['id'];
-    files: DriveFile[];
-    fileIds: DriveFile['id'][];
-    visibility: 'public' | 'home' | 'followers' | 'specified';
-    visibleUserIds?: User['id'][];
-    localOnly?: boolean;
-    myReaction?: string;
-    reactions: Record<string, number>;
-    renoteCount: number;
-    repliesCount: number;
-    poll?: {
-        expiresAt: DateString | null;
-        multiple: boolean;
-        choices: {
-            isVoted: boolean;
-            text: string;
-            votes: number;
-        }[];
-    };
-    emojis: {
-        name: string;
-        url: string;
-    }[];
-    uri?: string;
-    url?: string;
-    isHidden?: boolean;
-};
-
-// @public (undocumented)
-type NoteFavorite = {
-    id: ID;
-    createdAt: DateString;
-    noteId: Note['id'];
-    note: Note;
-};
-
-// @public (undocumented)
-type NoteReaction = {
-    id: ID;
-    createdAt: DateString;
-    user: UserLite;
-    type: string;
-};
-
-// @public (undocumented)
-export const noteVisibilities: readonly ["public", "home", "followers", "specified"];
-
-// @public (undocumented)
-type Notification_2 = {
-    id: ID;
-    createdAt: DateString;
-    isRead: boolean;
-} & ({
-    type: 'reaction';
-    reaction: string;
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'reply';
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'renote';
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'quote';
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'mention';
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'pollVote';
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'follow';
-    user: User;
-    userId: User['id'];
-} | {
-    type: 'followRequestAccepted';
-    user: User;
-    userId: User['id'];
-} | {
-    type: 'receiveFollowRequest';
-    user: User;
-    userId: User['id'];
-} | {
-    type: 'groupInvited';
-    invitation: UserGroup;
-    user: User;
-    userId: User['id'];
-} | {
-    type: 'app';
-    header?: string | null;
-    body: string;
-    icon?: string | null;
-});
-
-// @public (undocumented)
-export const notificationTypes: readonly ["follow", "mention", "reply", "renote", "quote", "reaction", "pollVote", "pollEnded", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app"];
-
-// @public (undocumented)
-type OriginType = 'combined' | 'local' | 'remote';
-
-// @public (undocumented)
-type Page = {
-    id: ID;
-    createdAt: DateString;
-    updatedAt: DateString;
-    userId: User['id'];
-    user: User;
-    content: Record<string, any>[];
-    variables: Record<string, any>[];
-    title: string;
-    name: string;
-    summary: string | null;
-    hideTitleWhenPinned: boolean;
-    alignCenter: boolean;
-    font: string;
-    script: string;
-    eyeCatchingImageId: DriveFile['id'] | null;
-    eyeCatchingImage: DriveFile | null;
-    attachedFiles: any;
-    likedCount: number;
-    isLiked?: boolean;
-};
-
-// @public (undocumented)
-type PageEvent = {
-    pageId: Page['id'];
-    event: string;
-    var: any;
-    userId: User['id'];
-    user: User;
-};
-
-// @public (undocumented)
-export const permissions: string[];
-
-// @public (undocumented)
-type ServerInfo = {
-    machine: string;
-    cpu: {
-        model: string;
-        cores: number;
-    };
-    mem: {
-        total: number;
-    };
-    fs: {
-        total: number;
-        used: number;
-    };
-};
-
-// @public (undocumented)
-type Signin = {
-    id: ID;
-    createdAt: DateString;
-    ip: string;
-    headers: Record<string, any>;
-    success: boolean;
-};
-
-// @public (undocumented)
-type Stats = {
-    notesCount: number;
-    originalNotesCount: number;
-    usersCount: number;
-    originalUsersCount: number;
-    instances: number;
-    driveUsageLocal: number;
-    driveUsageRemote: number;
-};
-
-// Warning: (ae-forgotten-export) The symbol "StreamEvents" needs to be exported by the entry point index.d.ts
-//
-// @public (undocumented)
-export class Stream extends EventEmitter<StreamEvents> {
-    constructor(origin: string, user: {
-        token: string;
-    } | null, options?: {
-        WebSocket?: any;
-    });
-    // (undocumented)
-    close(): void;
-    // Warning: (ae-forgotten-export) The symbol "NonSharedConnection" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    disconnectToChannel(connection: NonSharedConnection): void;
-    // Warning: (ae-forgotten-export) The symbol "SharedConnection" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    removeSharedConnection(connection: SharedConnection): void;
-    // Warning: (ae-forgotten-export) The symbol "Pool" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    removeSharedConnectionPool(pool: Pool): void;
-    // (undocumented)
-    send(typeOrPayload: any, payload?: any): void;
-    // (undocumented)
-    state: 'initializing' | 'reconnecting' | 'connected';
-    // (undocumented)
-    useChannel<C extends keyof Channels>(channel: C, params?: Channels[C]['params'], name?: string): ChannelConnection<Channels[C]>;
-}
-
-// @public (undocumented)
-type User = UserLite | UserDetailed;
-
-// @public (undocumented)
-type UserDetailed = UserLite & {
-    bannerBlurhash: string | null;
-    bannerColor: string | null;
-    bannerUrl: string | null;
-    birthday: string | null;
-    createdAt: DateString;
-    description: string | null;
-    ffVisibility: 'public' | 'followers' | 'private';
-    fields: {
-        name: string;
-        value: string;
-    }[];
-    followersCount: number;
-    followingCount: number;
-    hasPendingFollowRequestFromYou: boolean;
-    hasPendingFollowRequestToYou: boolean;
-    isAdmin: boolean;
-    isBlocked: boolean;
-    isBlocking: boolean;
-    isBot: boolean;
-    isCat: boolean;
-    isFollowed: boolean;
-    isFollowing: boolean;
-    isLocked: boolean;
-    isModerator: boolean;
-    isMuted: boolean;
-    isSilenced: boolean;
-    isSuspended: boolean;
-    lang: string | null;
-    lastFetchedAt?: DateString;
-    location: string | null;
-    notesCount: number;
-    pinnedNoteIds: ID[];
-    pinnedNotes: Note[];
-    pinnedPage: Page | null;
-    pinnedPageId: string | null;
-    publicReactions: boolean;
-    securityKeys: boolean;
-    twoFactorEnabled: boolean;
-    updatedAt: DateString | null;
-    uri: string | null;
-    url: string | null;
-};
-
-// @public (undocumented)
-type UserGroup = TODO_2;
-
-// @public (undocumented)
-type UserList = {
-    id: ID;
-    createdAt: DateString;
-    name: string;
-    userIds: User['id'][];
-};
-
-// @public (undocumented)
-type UserLite = {
-    id: ID;
-    username: string;
-    host: string | null;
-    name: string;
-    onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
-    avatarUrl: string;
-    avatarBlurhash: string;
-    alsoKnownAs: string[];
-    movedToUri: any;
-    emojis: {
-        name: string;
-        url: string;
-    }[];
-    instance?: {
-        name: Instance['name'];
-        softwareName: Instance['softwareName'];
-        softwareVersion: Instance['softwareVersion'];
-        iconUrl: Instance['iconUrl'];
-        faviconUrl: Instance['faviconUrl'];
-        themeColor: Instance['themeColor'];
-    };
-};
-
-// @public (undocumented)
-type UserSorting = '+follower' | '-follower' | '+createdAt' | '-createdAt' | '+updatedAt' | '-updatedAt';
-
-// Warnings were encountered during analysis:
-//
-// src/api.types.ts:16:32 - (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
-// src/api.types.ts:18:25 - (ae-forgotten-export) The symbol "NoParams" needs to be exported by the entry point index.d.ts
-// src/api.types.ts:601:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts
-// src/streaming.types.ts:35:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts
-
-// (No @packageDocumentation comment for this package)
-
-```
diff --git a/packages/calckey-js/etc/misskey-js.api.md b/packages/calckey-js/etc/misskey-js.api.md
deleted file mode 100644
index 269d5cf10..000000000
--- a/packages/calckey-js/etc/misskey-js.api.md
+++ /dev/null
@@ -1,2681 +0,0 @@
-## API Report File for "misskey-js"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-
-import { EventEmitter } from 'eventemitter3';
-
-// @public (undocumented)
-export type Acct = {
-    username: string;
-    host: string | null;
-};
-
-// Warning: (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
-//
-// @public (undocumented)
-type Ad = TODO_2;
-
-// @public (undocumented)
-type Announcement = {
-    id: ID;
-    createdAt: DateString;
-    updatedAt: DateString | null;
-    text: string;
-    title: string;
-    imageUrl: string | null;
-    isRead?: boolean;
-};
-
-// @public (undocumented)
-type Antenna = {
-    id: ID;
-    createdAt: DateString;
-    name: string;
-    keywords: string[][];
-    excludeKeywords: string[][];
-    src: 'home' | 'all' | 'users' | 'list' | 'group';
-    userListId: ID | null;
-    userGroupId: ID | null;
-    users: string[];
-    caseSensitive: boolean;
-    notify: boolean;
-    withReplies: boolean;
-    withFile: boolean;
-    hasUnreadNote: boolean;
-};
-
-declare namespace api {
-    export {
-        isAPIError,
-        APIError,
-        FetchLike,
-        APIClient
-    }
-}
-export { api }
-
-// @public (undocumented)
-class APIClient {
-    constructor(opts: {
-        origin: APIClient['origin'];
-        credential?: APIClient['credential'];
-        fetch?: APIClient['fetch'] | null | undefined;
-    });
-    // (undocumented)
-    credential: string | null | undefined;
-    // (undocumented)
-    fetch: FetchLike;
-    // (undocumented)
-    origin: string;
-    // Warning: (ae-forgotten-export) The symbol "IsCaseMatched" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-forgotten-export) The symbol "GetCaseResult" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(endpoint: E, params?: P, credential?: string | null | undefined): Promise<Endpoints[E]['res'] extends {
-        $switch: {
-            $cases: [any, any][];
-            $default: any;
-        };
-    } ? IsCaseMatched<E, P, 0> extends true ? GetCaseResult<E, P, 0> : IsCaseMatched<E, P, 1> extends true ? GetCaseResult<E, P, 1> : IsCaseMatched<E, P, 2> extends true ? GetCaseResult<E, P, 2> : IsCaseMatched<E, P, 3> extends true ? GetCaseResult<E, P, 3> : IsCaseMatched<E, P, 4> extends true ? GetCaseResult<E, P, 4> : IsCaseMatched<E, P, 5> extends true ? GetCaseResult<E, P, 5> : IsCaseMatched<E, P, 6> extends true ? GetCaseResult<E, P, 6> : IsCaseMatched<E, P, 7> extends true ? GetCaseResult<E, P, 7> : IsCaseMatched<E, P, 8> extends true ? GetCaseResult<E, P, 8> : IsCaseMatched<E, P, 9> extends true ? GetCaseResult<E, P, 9> : Endpoints[E]['res']['$switch']['$default'] : Endpoints[E]['res']>;
-}
-
-// @public (undocumented)
-type APIError = {
-    id: string;
-    code: string;
-    message: string;
-    kind: 'client' | 'server';
-    info: Record<string, any>;
-};
-
-// @public (undocumented)
-type App = TODO_2;
-
-// @public (undocumented)
-type AuthSession = {
-    id: ID;
-    app: App;
-    token: string;
-};
-
-// @public (undocumented)
-type Blocking = {
-    id: ID;
-    createdAt: DateString;
-    blockeeId: User['id'];
-    blockee: UserDetailed;
-};
-
-// @public (undocumented)
-type Channel = {
-    id: ID;
-};
-
-// 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']> {
-    constructor(stream: Stream, channel: string, name?: string);
-    // (undocumented)
-    channel: string;
-    // (undocumented)
-    abstract dispose(): void;
-    // (undocumented)
-    abstract id: string;
-    // (undocumented)
-    inCount: number;
-    // (undocumented)
-    name?: string;
-    // (undocumented)
-    outCount: number;
-    // (undocumented)
-    send<T extends keyof Channel['receives']>(type: T, body: Channel['receives'][T]): void;
-    // (undocumented)
-    protected stream: Stream;
-}
-
-// @public (undocumented)
-export type Channels = {
-    main: {
-        params: null;
-        events: {
-            notification: (payload: Notification_2) => void;
-            mention: (payload: Note) => void;
-            reply: (payload: Note) => void;
-            renote: (payload: Note) => void;
-            follow: (payload: User) => void;
-            followed: (payload: User) => void;
-            unfollow: (payload: User) => void;
-            meUpdated: (payload: MeDetailed) => void;
-            pageEvent: (payload: PageEvent) => void;
-            urlUploadFinished: (payload: {
-                marker: string;
-                file: DriveFile;
-            }) => void;
-            readAllNotifications: () => void;
-            unreadNotification: (payload: Notification_2) => void;
-            unreadMention: (payload: Note['id']) => void;
-            readAllUnreadMentions: () => void;
-            unreadSpecifiedNote: (payload: Note['id']) => void;
-            readAllUnreadSpecifiedNotes: () => void;
-            readAllMessagingMessages: () => void;
-            messagingMessage: (payload: MessagingMessage) => void;
-            unreadMessagingMessage: (payload: MessagingMessage) => void;
-            readAllAntennas: () => void;
-            unreadAntenna: (payload: Antenna) => void;
-            readAllAnnouncements: () => void;
-            readAllChannels: () => void;
-            unreadChannel: (payload: Note['id']) => void;
-            myTokenRegenerated: () => void;
-            reversiNoInvites: () => void;
-            reversiInvited: (payload: FIXME) => void;
-            signin: (payload: FIXME) => void;
-            registryUpdated: (payload: {
-                scope?: string[];
-                key: string;
-                value: any | null;
-            }) => void;
-            driveFileCreated: (payload: DriveFile) => void;
-            readAntenna: (payload: Antenna) => void;
-        };
-        receives: null;
-    };
-    homeTimeline: {
-        params: null;
-        events: {
-            note: (payload: Note) => void;
-        };
-        receives: null;
-    };
-    localTimeline: {
-        params: null;
-        events: {
-            note: (payload: Note) => void;
-        };
-        receives: null;
-    };
-    hybridTimeline: {
-        params: null;
-        events: {
-            note: (payload: Note) => void;
-        };
-        receives: null;
-    };
-    recommendedTimeline: {
-        params: null;
-        events: {
-            note: (payload: Note) => void;
-        };
-        receives: null;
-    };
-    globalTimeline: {
-        params: null;
-        events: {
-            note: (payload: Note) => void;
-        };
-        receives: null;
-    };
-    messaging: {
-        params: {
-            otherparty?: User['id'] | null;
-            group?: UserGroup['id'] | null;
-        };
-        events: {
-            message: (payload: MessagingMessage) => void;
-            deleted: (payload: MessagingMessage['id']) => void;
-            read: (payload: MessagingMessage['id'][]) => void;
-            typers: (payload: User[]) => void;
-        };
-        receives: {
-            read: {
-                id: MessagingMessage['id'];
-            };
-        };
-    };
-    serverStats: {
-        params: null;
-        events: {
-            stats: (payload: FIXME) => void;
-        };
-        receives: {
-            requestLog: {
-                id: string | number;
-                length: number;
-            };
-        };
-    };
-    queueStats: {
-        params: null;
-        events: {
-            stats: (payload: FIXME) => void;
-        };
-        receives: {
-            requestLog: {
-                id: string | number;
-                length: number;
-            };
-        };
-    };
-};
-
-// @public (undocumented)
-type Clip = TODO_2;
-
-// @public (undocumented)
-type CustomEmoji = {
-    id: string;
-    name: string;
-    url: string;
-    category: string;
-    aliases: string[];
-};
-
-// @public (undocumented)
-type DateString = string;
-
-// @public (undocumented)
-type DetailedInstanceMetadata = LiteInstanceMetadata & {
-    features: Record<string, any>;
-};
-
-// @public (undocumented)
-type DriveFile = {
-    id: ID;
-    createdAt: DateString;
-    isSensitive: boolean;
-    name: string;
-    thumbnailUrl: string;
-    url: string;
-    type: string;
-    size: number;
-    md5: string;
-    blurhash: string;
-    properties: Record<string, any>;
-};
-
-// @public (undocumented)
-type DriveFolder = TODO_2;
-
-// @public (undocumented)
-export type Endpoints = {
-    'admin/abuse-user-reports': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/delete-all-files-of-a-user': {
-        req: {
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'admin/delete-logs': {
-        req: NoParams;
-        res: null;
-    };
-    'admin/get-index-stats': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/get-table-stats': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/invite': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/logs': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/reset-password': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/resolve-abuse-user-report': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/resync-chart': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/send-email': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/server-info': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/show-moderation-logs': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/show-user': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/show-users': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/silence-user': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/suspend-user': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/unsilence-user': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/unsuspend-user': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/update-meta': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/vacuum': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/accounts/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/ad/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/ad/delete': {
-        req: {
-            id: Ad['id'];
-        };
-        res: null;
-    };
-    'admin/ad/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/ad/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/announcements/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/announcements/delete': {
-        req: {
-            id: Announcement['id'];
-        };
-        res: null;
-    };
-    'admin/announcements/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/announcements/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/drive/clean-remote-files': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/drive/cleanup': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/drive/files': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/drive/show-file': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/add': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/copy': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/list-remote': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/remove': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/emoji/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/federation/delete-all-files': {
-        req: {
-            host: string;
-        };
-        res: null;
-    };
-    'admin/federation/refresh-remote-instance-metadata': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/federation/remove-all-following': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/federation/update-instance': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/moderators/add': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/moderators/remove': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/promo/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/queue/clear': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/queue/deliver-delayed': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/queue/inbox-delayed': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/queue/jobs': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/queue/stats': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/relays/add': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/relays/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'admin/relays/remove': {
-        req: TODO;
-        res: TODO;
-    };
-    'announcements': {
-        req: {
-            limit?: number;
-            withUnreads?: boolean;
-            sinceId?: Announcement['id'];
-            untilId?: Announcement['id'];
-        };
-        res: Announcement[];
-    };
-    'antennas/create': {
-        req: TODO;
-        res: Antenna;
-    };
-    'antennas/delete': {
-        req: {
-            antennaId: Antenna['id'];
-        };
-        res: null;
-    };
-    'antennas/list': {
-        req: NoParams;
-        res: Antenna[];
-    };
-    'antennas/notes': {
-        req: {
-            antennaId: Antenna['id'];
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-        };
-        res: Note[];
-    };
-    'antennas/show': {
-        req: {
-            antennaId: Antenna['id'];
-        };
-        res: Antenna;
-    };
-    'antennas/update': {
-        req: TODO;
-        res: Antenna;
-    };
-    'ap/get': {
-        req: {
-            uri: string;
-        };
-        res: Record<string, any>;
-    };
-    'ap/show': {
-        req: {
-            uri: string;
-        };
-        res: {
-            type: 'Note';
-            object: Note;
-        } | {
-            type: 'User';
-            object: UserDetailed;
-        };
-    };
-    'app/create': {
-        req: TODO;
-        res: App;
-    };
-    'app/show': {
-        req: {
-            appId: App['id'];
-        };
-        res: App;
-    };
-    'auth/accept': {
-        req: {
-            token: string;
-        };
-        res: null;
-    };
-    'auth/session/generate': {
-        req: {
-            appSecret: string;
-        };
-        res: {
-            token: string;
-            url: string;
-        };
-    };
-    'auth/session/show': {
-        req: {
-            token: string;
-        };
-        res: AuthSession;
-    };
-    'auth/session/userkey': {
-        req: {
-            appSecret: string;
-            token: string;
-        };
-        res: {
-            accessToken: string;
-            user: User;
-        };
-    };
-    'blocking/create': {
-        req: {
-            userId: User['id'];
-        };
-        res: UserDetailed;
-    };
-    'blocking/delete': {
-        req: {
-            userId: User['id'];
-        };
-        res: UserDetailed;
-    };
-    'blocking/list': {
-        req: {
-            limit?: number;
-            sinceId?: Blocking['id'];
-            untilId?: Blocking['id'];
-        };
-        res: Blocking[];
-    };
-    'channels/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/featured': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/follow': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/followed': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/owned': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/pin-note': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/timeline': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/unfollow': {
-        req: TODO;
-        res: TODO;
-    };
-    'channels/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'charts/active-users': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: {
-            local: {
-                users: number[];
-            };
-            remote: {
-                users: number[];
-            };
-        };
-    };
-    'charts/drive': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: {
-            local: {
-                decCount: number[];
-                decSize: number[];
-                incCount: number[];
-                incSize: number[];
-                totalCount: number[];
-                totalSize: number[];
-            };
-            remote: {
-                decCount: number[];
-                decSize: number[];
-                incCount: number[];
-                incSize: number[];
-                totalCount: number[];
-                totalSize: number[];
-            };
-        };
-    };
-    'charts/federation': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: {
-            instance: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-        };
-    };
-    'charts/hashtag': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: TODO;
-    };
-    'charts/instance': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-            host: string;
-        };
-        res: {
-            drive: {
-                decFiles: number[];
-                decUsage: number[];
-                incFiles: number[];
-                incUsage: number[];
-                totalFiles: number[];
-                totalUsage: number[];
-            };
-            followers: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-            following: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-            notes: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-                diffs: {
-                    normal: number[];
-                    renote: number[];
-                    reply: number[];
-                };
-            };
-            requests: {
-                failed: number[];
-                received: number[];
-                succeeded: number[];
-            };
-            users: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-        };
-    };
-    'charts/network': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: TODO;
-    };
-    'charts/notes': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: {
-            local: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-                diffs: {
-                    normal: number[];
-                    renote: number[];
-                    reply: number[];
-                };
-            };
-            remote: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-                diffs: {
-                    normal: number[];
-                    renote: number[];
-                    reply: number[];
-                };
-            };
-        };
-    };
-    'charts/user/drive': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-            userId: User['id'];
-        };
-        res: {
-            decCount: number[];
-            decSize: number[];
-            incCount: number[];
-            incSize: number[];
-            totalCount: number[];
-            totalSize: number[];
-        };
-    };
-    'charts/user/following': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-            userId: User['id'];
-        };
-        res: TODO;
-    };
-    'charts/user/notes': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-            userId: User['id'];
-        };
-        res: {
-            dec: number[];
-            inc: number[];
-            total: number[];
-            diffs: {
-                normal: number[];
-                renote: number[];
-                reply: number[];
-            };
-        };
-    };
-    'charts/user/reactions': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-            userId: User['id'];
-        };
-        res: TODO;
-    };
-    'charts/users': {
-        req: {
-            span: 'day' | 'hour';
-            limit?: number;
-            offset?: number | null;
-        };
-        res: {
-            local: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-            remote: {
-                dec: number[];
-                inc: number[];
-                total: number[];
-            };
-        };
-    };
-    'clips/add-note': {
-        req: TODO;
-        res: TODO;
-    };
-    'clips/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'clips/delete': {
-        req: {
-            clipId: Clip['id'];
-        };
-        res: null;
-    };
-    'clips/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'clips/notes': {
-        req: TODO;
-        res: TODO;
-    };
-    'clips/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'clips/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'drive': {
-        req: NoParams;
-        res: {
-            capacity: number;
-            usage: number;
-        };
-    };
-    'drive/files': {
-        req: {
-            folderId?: DriveFolder['id'] | null;
-            type?: DriveFile['type'] | null;
-            limit?: number;
-            sinceId?: DriveFile['id'];
-            untilId?: DriveFile['id'];
-        };
-        res: DriveFile[];
-    };
-    'drive/files/attached-notes': {
-        req: TODO;
-        res: TODO;
-    };
-    'drive/files/check-existence': {
-        req: TODO;
-        res: TODO;
-    };
-    'drive/files/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'drive/files/delete': {
-        req: {
-            fileId: DriveFile['id'];
-        };
-        res: null;
-    };
-    'drive/files/find-by-hash': {
-        req: TODO;
-        res: TODO;
-    };
-    'drive/files/find': {
-        req: {
-            name: string;
-            folderId?: DriveFolder['id'] | null;
-        };
-        res: DriveFile[];
-    };
-    'drive/files/show': {
-        req: {
-            fileId?: DriveFile['id'];
-            url?: string;
-        };
-        res: DriveFile;
-    };
-    'drive/files/update': {
-        req: {
-            fileId: DriveFile['id'];
-            folderId?: DriveFolder['id'] | null;
-            name?: string;
-            isSensitive?: boolean;
-            comment?: string | null;
-        };
-        res: DriveFile;
-    };
-    'drive/files/upload-from-url': {
-        req: {
-            url: string;
-            folderId?: DriveFolder['id'] | null;
-            isSensitive?: boolean;
-            comment?: string | null;
-            marker?: string | null;
-            force?: boolean;
-        };
-        res: null;
-    };
-    'drive/folders': {
-        req: {
-            folderId?: DriveFolder['id'] | null;
-            limit?: number;
-            sinceId?: DriveFile['id'];
-            untilId?: DriveFile['id'];
-        };
-        res: DriveFolder[];
-    };
-    'drive/folders/create': {
-        req: {
-            name?: string;
-            parentId?: DriveFolder['id'] | null;
-        };
-        res: DriveFolder;
-    };
-    'drive/folders/delete': {
-        req: {
-            folderId: DriveFolder['id'];
-        };
-        res: null;
-    };
-    'drive/folders/find': {
-        req: {
-            name: string;
-            parentId?: DriveFolder['id'] | null;
-        };
-        res: DriveFolder[];
-    };
-    'drive/folders/show': {
-        req: {
-            folderId: DriveFolder['id'];
-        };
-        res: DriveFolder;
-    };
-    'drive/folders/update': {
-        req: {
-            folderId: DriveFolder['id'];
-            name?: string;
-            parentId?: DriveFolder['id'] | null;
-        };
-        res: DriveFolder;
-    };
-    'drive/stream': {
-        req: {
-            type?: DriveFile['type'] | null;
-            limit?: number;
-            sinceId?: DriveFile['id'];
-            untilId?: DriveFile['id'];
-        };
-        res: DriveFile[];
-    };
-    'endpoint': {
-        req: {
-            endpoint: string;
-        };
-        res: {
-            params: {
-                name: string;
-                type: string;
-            }[];
-        };
-    };
-    'endpoints': {
-        req: NoParams;
-        res: string[];
-    };
-    'federation/dns': {
-        req: {
-            host: string;
-        };
-        res: {
-            a: string[];
-            aaaa: string[];
-            cname: string[];
-            txt: string[];
-        };
-    };
-    'federation/followers': {
-        req: {
-            host: string;
-            limit?: number;
-            sinceId?: Following['id'];
-            untilId?: Following['id'];
-        };
-        res: FollowingFolloweePopulated[];
-    };
-    'federation/following': {
-        req: {
-            host: string;
-            limit?: number;
-            sinceId?: Following['id'];
-            untilId?: Following['id'];
-        };
-        res: FollowingFolloweePopulated[];
-    };
-    'federation/instances': {
-        req: {
-            host?: string | null;
-            blocked?: boolean | null;
-            notResponding?: boolean | null;
-            suspended?: boolean | null;
-            federating?: boolean | null;
-            subscribing?: boolean | null;
-            publishing?: boolean | null;
-            limit?: number;
-            offset?: number;
-            sort?: '+pubSub' | '-pubSub' | '+notes' | '-notes' | '+users' | '-users' | '+following' | '-following' | '+followers' | '-followers' | '+caughtAt' | '-caughtAt' | '+lastCommunicatedAt' | '-lastCommunicatedAt' | '+driveUsage' | '-driveUsage' | '+driveFiles' | '-driveFiles';
-        };
-        res: Instance[];
-    };
-    'federation/show-instance': {
-        req: {
-            host: string;
-        };
-        res: Instance;
-    };
-    'federation/update-remote-user': {
-        req: {
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'federation/users': {
-        req: {
-            host: string;
-            limit?: number;
-            sinceId?: User['id'];
-            untilId?: User['id'];
-        };
-        res: UserDetailed[];
-    };
-    'following/create': {
-        req: {
-            userId: User['id'];
-        };
-        res: User;
-    };
-    'following/delete': {
-        req: {
-            userId: User['id'];
-        };
-        res: User;
-    };
-    'following/requests/accept': {
-        req: {
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'following/requests/cancel': {
-        req: {
-            userId: User['id'];
-        };
-        res: User;
-    };
-    'following/requests/list': {
-        req: NoParams;
-        res: FollowRequest[];
-    };
-    'following/requests/reject': {
-        req: {
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'gallery/featured': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/popular': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts/delete': {
-        req: {
-            postId: GalleryPost['id'];
-        };
-        res: null;
-    };
-    'gallery/posts/like': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts/unlike': {
-        req: TODO;
-        res: TODO;
-    };
-    'gallery/posts/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/games': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/games/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/games/surrender': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/invitations': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/match': {
-        req: TODO;
-        res: TODO;
-    };
-    'games/reversi/match/cancel': {
-        req: TODO;
-        res: TODO;
-    };
-    'get-online-users-count': {
-        req: NoParams;
-        res: {
-            count: number;
-        };
-    };
-    'hashtags/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'hashtags/search': {
-        req: TODO;
-        res: TODO;
-    };
-    'hashtags/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'hashtags/trend': {
-        req: TODO;
-        res: TODO;
-    };
-    'hashtags/users': {
-        req: TODO;
-        res: TODO;
-    };
-    'i': {
-        req: NoParams;
-        res: User;
-    };
-    'i/apps': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/authorized-apps': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/change-password': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/delete-account': {
-        req: {
-            password: string;
-        };
-        res: null;
-    };
-    'i/export-blocking': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/export-following': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/export-mute': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/export-notes': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/export-user-lists': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/favorites': {
-        req: {
-            limit?: number;
-            sinceId?: NoteFavorite['id'];
-            untilId?: NoteFavorite['id'];
-        };
-        res: NoteFavorite[];
-    };
-    'i/gallery/likes': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/gallery/posts': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/get-word-muted-notes-count': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/import-following': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/import-user-lists': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/notifications': {
-        req: {
-            limit?: number;
-            sinceId?: Notification_2['id'];
-            untilId?: Notification_2['id'];
-            following?: boolean;
-            markAsRead?: boolean;
-            includeTypes?: Notification_2['type'][];
-            excludeTypes?: Notification_2['type'][];
-        };
-        res: Notification_2[];
-    };
-    'i/page-likes': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/pages': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/pin': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: MeDetailed;
-    };
-    'i/read-all-messaging-messages': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/read-all-unread-notes': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/read-announcement': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/regenerate-token': {
-        req: {
-            password: string;
-        };
-        res: null;
-    };
-    'i/registry/get-all': {
-        req: {
-            scope?: string[];
-        };
-        res: Record<string, any>;
-    };
-    'i/registry/get-detail': {
-        req: {
-            key: string;
-            scope?: string[];
-        };
-        res: {
-            updatedAt: DateString;
-            value: any;
-        };
-    };
-    'i/registry/get': {
-        req: {
-            key: string;
-            scope?: string[];
-        };
-        res: any;
-    };
-    'i/registry/keys-with-type': {
-        req: {
-            scope?: string[];
-        };
-        res: Record<string, 'null' | 'array' | 'number' | 'string' | 'boolean' | 'object'>;
-    };
-    'i/registry/keys': {
-        req: {
-            scope?: string[];
-        };
-        res: string[];
-    };
-    'i/registry/remove': {
-        req: {
-            key: string;
-            scope?: string[];
-        };
-        res: null;
-    };
-    'i/registry/scopes': {
-        req: NoParams;
-        res: string[][];
-    };
-    'i/registry/set': {
-        req: {
-            key: string;
-            value: any;
-            scope?: string[];
-        };
-        res: null;
-    };
-    'i/revoke-token': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/signin-history': {
-        req: {
-            limit?: number;
-            sinceId?: Signin['id'];
-            untilId?: Signin['id'];
-        };
-        res: Signin[];
-    };
-    'i/unpin': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: MeDetailed;
-    };
-    'i/update-email': {
-        req: {
-            password: string;
-            email?: string | null;
-        };
-        res: MeDetailed;
-    };
-    'i/update': {
-        req: {
-            name?: string | null;
-            description?: string | null;
-            lang?: string | null;
-            location?: string | null;
-            birthday?: string | null;
-            avatarId?: DriveFile['id'] | null;
-            bannerId?: DriveFile['id'] | null;
-            fields?: {
-                name: string;
-                value: string;
-            }[];
-            isLocked?: boolean;
-            isExplorable?: boolean;
-            hideOnlineStatus?: boolean;
-            carefulBot?: boolean;
-            autoAcceptFollowed?: boolean;
-            noCrawle?: boolean;
-            isBot?: boolean;
-            isCat?: boolean;
-            injectFeaturedNote?: boolean;
-            receiveAnnouncementEmail?: boolean;
-            alwaysMarkNsfw?: boolean;
-            mutedWords?: string[][];
-            mutingNotificationTypes?: Notification_2['type'][];
-            emailNotificationTypes?: string[];
-        };
-        res: MeDetailed;
-    };
-    'i/user-group-invites': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/done': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/key-done': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/password-less': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/register-key': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/register': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/remove-key': {
-        req: TODO;
-        res: TODO;
-    };
-    'i/2fa/unregister': {
-        req: TODO;
-        res: TODO;
-    };
-    'messaging/history': {
-        req: {
-            limit?: number;
-            group?: boolean;
-        };
-        res: MessagingMessage[];
-    };
-    'messaging/messages': {
-        req: {
-            userId?: User['id'];
-            groupId?: UserGroup['id'];
-            limit?: number;
-            sinceId?: MessagingMessage['id'];
-            untilId?: MessagingMessage['id'];
-            markAsRead?: boolean;
-        };
-        res: MessagingMessage[];
-    };
-    'messaging/messages/create': {
-        req: {
-            userId?: User['id'];
-            groupId?: UserGroup['id'];
-            text?: string;
-            fileId?: DriveFile['id'];
-        };
-        res: MessagingMessage;
-    };
-    'messaging/messages/delete': {
-        req: {
-            messageId: MessagingMessage['id'];
-        };
-        res: null;
-    };
-    'messaging/messages/read': {
-        req: {
-            messageId: MessagingMessage['id'];
-        };
-        res: null;
-    };
-    'meta': {
-        req: {
-            detail?: boolean;
-        };
-        res: {
-            $switch: {
-                $cases: [
-                [
-                    {
-                    detail: true;
-                },
-                DetailedInstanceMetadata
-                ],
-                [
-                    {
-                    detail: false;
-                },
-                LiteInstanceMetadata
-                ],
-                [
-                    {
-                    detail: boolean;
-                },
-                LiteInstanceMetadata | DetailedInstanceMetadata
-                ]
-                ];
-                $default: LiteInstanceMetadata;
-            };
-        };
-    };
-    'miauth/gen-token': {
-        req: TODO;
-        res: TODO;
-    };
-    'mute/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'mute/delete': {
-        req: {
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'mute/list': {
-        req: TODO;
-        res: TODO;
-    };
-    'my/apps': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-        };
-        res: Note[];
-    };
-    'notes/children': {
-        req: {
-            noteId: Note['id'];
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-        };
-        res: Note[];
-    };
-    'notes/clips': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/conversation': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/create': {
-        req: {
-            visibility?: 'public' | 'home' | 'followers' | 'specified';
-            visibleUserIds?: User['id'][];
-            text?: null | string;
-            cw?: null | string;
-            viaMobile?: boolean;
-            localOnly?: boolean;
-            fileIds?: DriveFile['id'][];
-            replyId?: null | Note['id'];
-            renoteId?: null | Note['id'];
-            channelId?: null | Channel['id'];
-            poll?: null | {
-                choices: string[];
-                multiple?: boolean;
-                expiresAt?: null | number;
-                expiredAfter?: null | number;
-            };
-        };
-        res: {
-            createdNote: Note;
-        };
-    };
-    'notes/delete': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notes/favorites/create': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notes/favorites/delete': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notes/featured': {
-        req: TODO;
-        res: Note[];
-    };
-    'notes/global-timeline': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/recommended-timeline': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/hybrid-timeline': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/local-timeline': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/mentions': {
-        req: {
-            following?: boolean;
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-        };
-        res: Note[];
-    };
-    'notes/polls/recommendation': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/polls/vote': {
-        req: {
-            noteId: Note['id'];
-            choice: number;
-        };
-        res: null;
-    };
-    'notes/reactions': {
-        req: {
-            noteId: Note['id'];
-            type?: string | null;
-            limit?: number;
-        };
-        res: NoteReaction[];
-    };
-    'notes/reactions/create': {
-        req: {
-            noteId: Note['id'];
-            reaction: string;
-        };
-        res: null;
-    };
-    'notes/reactions/delete': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notes/renotes': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            noteId: Note['id'];
-        };
-        res: Note[];
-    };
-    'notes/replies': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            noteId: Note['id'];
-        };
-        res: Note[];
-    };
-    'notes/search-by-tag': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/search': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/show': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: Note;
-    };
-    'notes/state': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/timeline': {
-        req: {
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/unrenote': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notes/user-list-timeline': {
-        req: {
-            listId: UserList['id'];
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'notes/watching/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'notes/watching/delete': {
-        req: {
-            noteId: Note['id'];
-        };
-        res: null;
-    };
-    'notifications/create': {
-        req: {
-            body: string;
-            header?: string | null;
-            icon?: string | null;
-        };
-        res: null;
-    };
-    'notifications/mark-all-as-read': {
-        req: NoParams;
-        res: null;
-    };
-    'notifications/read': {
-        req: {
-            notificationId: Notification_2['id'];
-        };
-        res: null;
-    };
-    'page-push': {
-        req: {
-            pageId: Page['id'];
-            event: string;
-            var?: any;
-        };
-        res: null;
-    };
-    'pages/create': {
-        req: TODO;
-        res: Page;
-    };
-    'pages/delete': {
-        req: {
-            pageId: Page['id'];
-        };
-        res: null;
-    };
-    'pages/featured': {
-        req: NoParams;
-        res: Page[];
-    };
-    'pages/like': {
-        req: {
-            pageId: Page['id'];
-        };
-        res: null;
-    };
-    'pages/show': {
-        req: {
-            pageId?: Page['id'];
-            name?: string;
-            username?: string;
-        };
-        res: Page;
-    };
-    'pages/unlike': {
-        req: {
-            pageId: Page['id'];
-        };
-        res: null;
-    };
-    'pages/update': {
-        req: TODO;
-        res: null;
-    };
-    'ping': {
-        req: NoParams;
-        res: {
-            pong: number;
-        };
-    };
-    'pinned-users': {
-        req: TODO;
-        res: TODO;
-    };
-    'promo/read': {
-        req: TODO;
-        res: TODO;
-    };
-    'request-reset-password': {
-        req: {
-            username: string;
-            email: string;
-        };
-        res: null;
-    };
-    'reset-password': {
-        req: {
-            token: string;
-            password: string;
-        };
-        res: null;
-    };
-    'room/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'room/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'stats': {
-        req: NoParams;
-        res: Stats;
-    };
-    'server-info': {
-        req: NoParams;
-        res: ServerInfo;
-    };
-    'sw/register': {
-        req: TODO;
-        res: TODO;
-    };
-    'username/available': {
-        req: {
-            username: string;
-        };
-        res: {
-            available: boolean;
-        };
-    };
-    'users': {
-        req: {
-            limit?: number;
-            offset?: number;
-            sort?: UserSorting;
-            origin?: OriginType;
-        };
-        res: User[];
-    };
-    'users/clips': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/followers': {
-        req: {
-            userId?: User['id'];
-            username?: User['username'];
-            host?: User['host'] | null;
-            limit?: number;
-            sinceId?: Following['id'];
-            untilId?: Following['id'];
-        };
-        res: FollowingFollowerPopulated[];
-    };
-    'users/following': {
-        req: {
-            userId?: User['id'];
-            username?: User['username'];
-            host?: User['host'] | null;
-            limit?: number;
-            sinceId?: Following['id'];
-            untilId?: Following['id'];
-        };
-        res: FollowingFolloweePopulated[];
-    };
-    'users/gallery/posts': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/get-frequently-replied-users': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/create': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/delete': {
-        req: {
-            groupId: UserGroup['id'];
-        };
-        res: null;
-    };
-    'users/groups/invitations/accept': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/invitations/reject': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/invite': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/joined': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/owned': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/pull': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/show': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/transfer': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/groups/update': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/lists/create': {
-        req: {
-            name: string;
-        };
-        res: UserList;
-    };
-    'users/lists/delete': {
-        req: {
-            listId: UserList['id'];
-        };
-        res: null;
-    };
-    'users/lists/list': {
-        req: NoParams;
-        res: UserList[];
-    };
-    'users/lists/pull': {
-        req: {
-            listId: UserList['id'];
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'users/lists/push': {
-        req: {
-            listId: UserList['id'];
-            userId: User['id'];
-        };
-        res: null;
-    };
-    'users/lists/show': {
-        req: {
-            listId: UserList['id'];
-        };
-        res: UserList;
-    };
-    'users/lists/update': {
-        req: {
-            listId: UserList['id'];
-            name: string;
-        };
-        res: UserList;
-    };
-    'users/notes': {
-        req: {
-            userId: User['id'];
-            limit?: number;
-            sinceId?: Note['id'];
-            untilId?: Note['id'];
-            sinceDate?: number;
-            untilDate?: number;
-        };
-        res: Note[];
-    };
-    'users/pages': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/recommendation': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/relation': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/report-abuse': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/search-by-username-and-host': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/search': {
-        req: TODO;
-        res: TODO;
-    };
-    'users/show': {
-        req: ShowUserReq | {
-            userIds: User['id'][];
-        };
-        res: {
-            $switch: {
-                $cases: [
-                [
-                    {
-                    userIds: User['id'][];
-                },
-                UserDetailed[]
-                ]
-                ];
-                $default: UserDetailed;
-            };
-        };
-    };
-    'users/stats': {
-        req: TODO;
-        res: TODO;
-    };
-};
-
-declare namespace entities {
-    export {
-        ID,
-        DateString,
-        User,
-        UserLite,
-        UserDetailed,
-        UserGroup,
-        UserList,
-        MeDetailed,
-        DriveFile,
-        DriveFolder,
-        GalleryPost,
-        Note,
-        NoteReaction,
-        Notification_2 as Notification,
-        MessagingMessage,
-        CustomEmoji,
-        LiteInstanceMetadata,
-        DetailedInstanceMetadata,
-        InstanceMetadata,
-        ServerInfo,
-        Stats,
-        Page,
-        PageEvent,
-        Announcement,
-        Antenna,
-        App,
-        AuthSession,
-        Ad,
-        Clip,
-        NoteFavorite,
-        FollowRequest,
-        Channel,
-        Following,
-        FollowingFolloweePopulated,
-        FollowingFollowerPopulated,
-        Blocking,
-        Instance,
-        Signin,
-        UserSorting,
-        OriginType
-    }
-}
-export { entities }
-
-// @public (undocumented)
-type FetchLike = (input: string, init?: {
-    method?: string;
-    body?: string;
-    credentials?: RequestCredentials;
-    cache?: RequestCache;
-}) => Promise<{
-    status: number;
-    json(): Promise<any>;
-}>;
-
-// @public (undocumented)
-export const ffVisibility: readonly ["public", "followers", "private"];
-
-// @public (undocumented)
-type Following = {
-    id: ID;
-    createdAt: DateString;
-    followerId: User['id'];
-    followeeId: User['id'];
-};
-
-// @public (undocumented)
-type FollowingFolloweePopulated = Following & {
-    followee: UserDetailed;
-};
-
-// @public (undocumented)
-type FollowingFollowerPopulated = Following & {
-    follower: UserDetailed;
-};
-
-// @public (undocumented)
-type FollowRequest = {
-    id: ID;
-    follower: User;
-    followee: User;
-};
-
-// @public (undocumented)
-type GalleryPost = TODO_2;
-
-// @public (undocumented)
-type ID = string;
-
-// @public (undocumented)
-type Instance = {
-    id: ID;
-    caughtAt: DateString;
-    host: string;
-    usersCount: number;
-    notesCount: number;
-    followingCount: number;
-    followersCount: number;
-    driveUsage: number;
-    driveFiles: number;
-    latestRequestSentAt: DateString | null;
-    latestStatus: number | null;
-    latestRequestReceivedAt: DateString | null;
-    lastCommunicatedAt: DateString;
-    isNotResponding: boolean;
-    isSuspended: boolean;
-    softwareName: string | null;
-    softwareVersion: string | null;
-    openRegistrations: boolean | null;
-    name: string | null;
-    description: string | null;
-    maintainerName: string | null;
-    maintainerEmail: string | null;
-    iconUrl: string | null;
-    faviconUrl: string | null;
-    themeColor: string | null;
-    infoUpdatedAt: DateString | null;
-};
-
-// @public (undocumented)
-type InstanceMetadata = LiteInstanceMetadata | DetailedInstanceMetadata;
-
-// @public (undocumented)
-function isAPIError(reason: any): reason is APIError;
-
-// @public (undocumented)
-type LiteInstanceMetadata = {
-    maintainerName: string | null;
-    maintainerEmail: string | null;
-    version: string;
-    name: string | null;
-    uri: string;
-    description: string | null;
-    tosUrl: string | null;
-    disableRegistration: boolean;
-    disableLocalTimeline: boolean;
-    disableRecommendedTimeline: boolean;
-    disableGlobalTimeline: boolean;
-    driveCapacityPerLocalUserMb: number;
-    driveCapacityPerRemoteUserMb: number;
-    enableHcaptcha: boolean;
-    hcaptchaSiteKey: string | null;
-    enableRecaptcha: boolean;
-    recaptchaSiteKey: string | null;
-    swPublickey: string | null;
-    maxNoteTextLength: number;
-    enableEmail: boolean;
-    enableTwitterIntegration: boolean;
-    enableGithubIntegration: boolean;
-    enableDiscordIntegration: boolean;
-    enableServiceWorker: boolean;
-    emojis: CustomEmoji[];
-    ads: {
-        id: ID;
-        ratio: number;
-        place: string;
-        url: string;
-        imageUrl: string;
-    }[];
-};
-
-// @public (undocumented)
-type MeDetailed = UserDetailed & {
-    avatarId: DriveFile['id'];
-    bannerId: DriveFile['id'];
-    autoAcceptFollowed: boolean;
-    alwaysMarkNsfw: boolean;
-    carefulBot: boolean;
-    emailNotificationTypes: string[];
-    hasPendingReceivedFollowRequest: boolean;
-    hasUnreadAnnouncement: boolean;
-    hasUnreadAntenna: boolean;
-    hasUnreadChannel: boolean;
-    hasUnreadMentions: boolean;
-    hasUnreadMessagingMessage: boolean;
-    hasUnreadNotification: boolean;
-    hasUnreadSpecifiedNotes: boolean;
-    hideOnlineStatus: boolean;
-    injectFeaturedNote: boolean;
-    integrations: Record<string, any>;
-    isDeleted: boolean;
-    isExplorable: boolean;
-    mutedWords: string[][];
-    mutingNotificationTypes: string[];
-    noCrawle: boolean;
-    receiveAnnouncementEmail: boolean;
-    usePasswordLessLogin: boolean;
-    [other: string]: any;
-};
-
-// @public (undocumented)
-type MessagingMessage = {
-    id: ID;
-    createdAt: DateString;
-    file: DriveFile | null;
-    fileId: DriveFile['id'] | null;
-    isRead: boolean;
-    reads: User['id'][];
-    text: string | null;
-    user: User;
-    userId: User['id'];
-    recipient?: User | null;
-    recipientId: User['id'] | null;
-    group?: UserGroup | null;
-    groupId: UserGroup['id'] | null;
-};
-
-// @public (undocumented)
-export const mutedNoteReasons: readonly ["word", "manual", "spam", "other"];
-
-// @public (undocumented)
-type Note = {
-    id: ID;
-    createdAt: DateString;
-    text: string | null;
-    cw: string | null;
-    user: User;
-    userId: User['id'];
-    reply?: Note;
-    replyId: Note['id'];
-    renote?: Note;
-    renoteId: Note['id'];
-    files: DriveFile[];
-    fileIds: DriveFile['id'][];
-    visibility: 'public' | 'home' | 'followers' | 'specified';
-    visibleUserIds?: User['id'][];
-    localOnly?: boolean;
-    myReaction?: string;
-    reactions: Record<string, number>;
-    renoteCount: number;
-    repliesCount: number;
-    poll?: {
-        expiresAt: DateString | null;
-        multiple: boolean;
-        choices: {
-            isVoted: boolean;
-            text: string;
-            votes: number;
-        }[];
-    };
-    emojis: {
-        name: string;
-        url: string;
-    }[];
-    uri?: string;
-    url?: string;
-    isHidden?: boolean;
-};
-
-// @public (undocumented)
-type NoteFavorite = {
-    id: ID;
-    createdAt: DateString;
-    noteId: Note['id'];
-    note: Note;
-};
-
-// @public (undocumented)
-type NoteReaction = {
-    id: ID;
-    createdAt: DateString;
-    user: UserLite;
-    type: string;
-};
-
-// @public (undocumented)
-export const noteVisibilities: readonly ["public", "home", "followers", "specified"];
-
-// @public (undocumented)
-type Notification_2 = {
-    id: ID;
-    createdAt: DateString;
-    isRead: boolean;
-} & ({
-    type: 'reaction';
-    reaction: string;
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'reply';
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'renote';
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'quote';
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'mention';
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'pollVote';
-    user: User;
-    userId: User['id'];
-    note: Note;
-} | {
-    type: 'follow';
-    user: User;
-    userId: User['id'];
-} | {
-    type: 'followRequestAccepted';
-    user: User;
-    userId: User['id'];
-} | {
-    type: 'receiveFollowRequest';
-    user: User;
-    userId: User['id'];
-} | {
-    type: 'groupInvited';
-    invitation: UserGroup;
-    user: User;
-    userId: User['id'];
-} | {
-    type: 'app';
-    header?: string | null;
-    body: string;
-    icon?: string | null;
-});
-
-// @public (undocumented)
-export const notificationTypes: readonly ["follow", "mention", "reply", "renote", "quote", "reaction", "pollVote", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app"];
-
-// @public (undocumented)
-type OriginType = 'combined' | 'local' | 'remote';
-
-// @public (undocumented)
-type Page = {
-    id: ID;
-    createdAt: DateString;
-    updatedAt: DateString;
-    userId: User['id'];
-    user: User;
-    content: Record<string, any>[];
-    variables: Record<string, any>[];
-    title: string;
-    name: string;
-    summary: string | null;
-    hideTitleWhenPinned: boolean;
-    alignCenter: boolean;
-    font: string;
-    script: string;
-    eyeCatchingImageId: DriveFile['id'] | null;
-    eyeCatchingImage: DriveFile | null;
-    attachedFiles: any;
-    likedCount: number;
-    isLiked?: boolean;
-};
-
-// @public (undocumented)
-type PageEvent = {
-    pageId: Page['id'];
-    event: string;
-    var: any;
-    userId: User['id'];
-    user: User;
-};
-
-// @public (undocumented)
-export const permissions: string[];
-
-// @public (undocumented)
-type ServerInfo = {
-    machine: string;
-    cpu: {
-        model: string;
-        cores: number;
-    };
-    mem: {
-        total: number;
-    };
-    fs: {
-        total: number;
-        used: number;
-    };
-};
-
-// @public (undocumented)
-type Signin = {
-    id: ID;
-    createdAt: DateString;
-    ip: string;
-    headers: Record<string, any>;
-    success: boolean;
-};
-
-// @public (undocumented)
-type Stats = {
-    notesCount: number;
-    originalNotesCount: number;
-    usersCount: number;
-    originalUsersCount: number;
-    instances: number;
-    driveUsageLocal: number;
-    driveUsageRemote: number;
-};
-
-// Warning: (ae-forgotten-export) The symbol "StreamEvents" needs to be exported by the entry point index.d.ts
-//
-// @public (undocumented)
-export class Stream extends EventEmitter<StreamEvents> {
-    constructor(origin: string, user: {
-        token: string;
-    } | null, options?: {
-        WebSocket?: any;
-    });
-    // (undocumented)
-    close(): void;
-    // Warning: (ae-forgotten-export) The symbol "NonSharedConnection" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    disconnectToChannel(connection: NonSharedConnection): void;
-    // Warning: (ae-forgotten-export) The symbol "SharedConnection" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    removeSharedConnection(connection: SharedConnection): void;
-    // Warning: (ae-forgotten-export) The symbol "Pool" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    removeSharedConnectionPool(pool: Pool): void;
-    // (undocumented)
-    send(typeOrPayload: any, payload?: any): void;
-    // (undocumented)
-    state: 'initializing' | 'reconnecting' | 'connected';
-    // (undocumented)
-    useChannel<C extends keyof Channels>(channel: C, params?: Channels[C]['params'], name?: string): ChannelConnection<Channels[C]>;
-}
-
-// @public (undocumented)
-type User = UserLite | UserDetailed;
-
-// @public (undocumented)
-type UserDetailed = UserLite & {
-    bannerBlurhash: string | null;
-    bannerColor: string | null;
-    bannerUrl: string | null;
-    birthday: string | null;
-    createdAt: DateString;
-    description: string | null;
-    ffVisibility: 'public' | 'followers' | 'private';
-    fields: {
-        name: string;
-        value: string;
-    }[];
-    followersCount: number;
-    followingCount: number;
-    hasPendingFollowRequestFromYou: boolean;
-    hasPendingFollowRequestToYou: boolean;
-    isAdmin: boolean;
-    isBlocked: boolean;
-    isBlocking: boolean;
-    isBot: boolean;
-    isCat: boolean;
-    isFollowed: boolean;
-    isFollowing: boolean;
-    isLocked: boolean;
-    isModerator: boolean;
-    isMuted: boolean;
-    isSilenced: boolean;
-    isSuspended: boolean;
-    lang: string | null;
-    lastFetchedAt?: DateString;
-    location: string | null;
-    notesCount: number;
-    pinnedNoteIds: ID[];
-    pinnedNotes: Note[];
-    pinnedPage: Page | null;
-    pinnedPageId: string | null;
-    publicReactions: boolean;
-    securityKeys: boolean;
-    twoFactorEnabled: boolean;
-    updatedAt: DateString | null;
-    uri: string | null;
-    url: string | null;
-};
-
-// @public (undocumented)
-type UserGroup = TODO_2;
-
-// @public (undocumented)
-type UserList = {
-    id: ID;
-    createdAt: DateString;
-    name: string;
-    userIds: User['id'][];
-};
-
-// @public (undocumented)
-type UserLite = {
-    id: ID;
-    username: string;
-    host: string | null;
-    name: string;
-    onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
-    avatarUrl: string;
-    avatarBlurhash: string;
-    emojis: {
-        name: string;
-        url: string;
-    }[];
-    instance?: {
-        name: Instance['name'];
-        softwareName: Instance['softwareName'];
-        softwareVersion: Instance['softwareVersion'];
-        iconUrl: Instance['iconUrl'];
-        faviconUrl: Instance['faviconUrl'];
-        themeColor: Instance['themeColor'];
-    };
-};
-
-// @public (undocumented)
-type UserSorting = '+follower' | '-follower' | '+createdAt' | '-createdAt' | '+updatedAt' | '-updatedAt';
-
-// Warnings were encountered during analysis:
-//
-// src/api.types.ts:16:32 - (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
-// src/api.types.ts:18:25 - (ae-forgotten-export) The symbol "NoParams" needs to be exported by the entry point index.d.ts
-// src/api.types.ts:595:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts
-// src/streaming.types.ts:35:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts
-
-// (No @packageDocumentation comment for this package)
-
-```
diff --git a/packages/calckey-js/jest.config.ts b/packages/calckey-js/jest.config.ts
deleted file mode 100644
index f26a77c27..000000000
--- a/packages/calckey-js/jest.config.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * For a detailed explanation regarding each configuration property and type check, visit:
- * https://jestjs.io/docs/en/configuration.html
- */
-
-export default {
-	// All imported modules in your tests should be mocked automatically
-	// automock: false,
-
-	// Stop running tests after `n` failures
-	// bail: 0,
-
-	// The directory where Jest should store its cached dependency information
-	// cacheDirectory: "C:\\Users\\ai\\AppData\\Local\\Temp\\jest",
-
-	// Automatically clear mock calls and instances between every test
-	// clearMocks: false,
-
-	// Indicates whether the coverage information should be collected while executing the test
-	// collectCoverage: false,
-
-	// An array of glob patterns indicating a set of files for which coverage information should be collected
-	// collectCoverageFrom: undefined,
-
-	// The directory where Jest should output its coverage files
-	coverageDirectory: "coverage",
-
-	// An array of regexp pattern strings used to skip coverage collection
-	// coveragePathIgnorePatterns: [
-	//   "\\\\node_modules\\\\"
-	// ],
-
-	// Indicates which provider should be used to instrument code for coverage
-	coverageProvider: "v8",
-
-	// A list of reporter names that Jest uses when writing coverage reports
-	// coverageReporters: [
-	//   "json",
-	//   "text",
-	//   "lcov",
-	//   "clover"
-	// ],
-
-	// An object that configures minimum threshold enforcement for coverage results
-	// coverageThreshold: undefined,
-
-	// A path to a custom dependency extractor
-	// dependencyExtractor: undefined,
-
-	// Make calling deprecated APIs throw helpful error messages
-	// errorOnDeprecated: false,
-
-	// Force coverage collection from ignored files using an array of glob patterns
-	// forceCoverageMatch: [],
-
-	// A path to a module which exports an async function that is triggered once before all test suites
-	// globalSetup: undefined,
-
-	// A path to a module which exports an async function that is triggered once after all test suites
-	// globalTeardown: undefined,
-
-	// A set of global variables that need to be available in all test environments
-	// globals: {},
-
-	// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
-	// maxWorkers: "50%",
-
-	// An array of directory names to be searched recursively up from the requiring module's location
-	// moduleDirectories: [
-	//   "node_modules"
-	// ],
-
-	// An array of file extensions your modules use
-	// moduleFileExtensions: [
-	//   "js",
-	//   "json",
-	//   "jsx",
-	//   "ts",
-	//   "tsx",
-	//   "node"
-	// ],
-
-	// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
-	// moduleNameMapper: {},
-
-	// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
-	// modulePathIgnorePatterns: [],
-
-	// Activates notifications for test results
-	// notify: false,
-
-	// An enum that specifies notification mode. Requires { notify: true }
-	// notifyMode: "failure-change",
-
-	// A preset that is used as a base for Jest's configuration
-	// preset: undefined,
-
-	// Run tests from one or more projects
-	// projects: undefined,
-
-	// Use this configuration option to add custom reporters to Jest
-	// reporters: undefined,
-
-	// Automatically reset mock state between every test
-	// resetMocks: false,
-
-	// Reset the module registry before running each individual test
-	// resetModules: false,
-
-	// A path to a custom resolver
-	// resolver: undefined,
-
-	// Automatically restore mock state between every test
-	// restoreMocks: false,
-
-	// The root directory that Jest should scan for tests and modules within
-	// rootDir: undefined,
-
-	// A list of paths to directories that Jest should use to search for files in
-	roots: ["<rootDir>"],
-
-	// Allows you to use a custom runner instead of Jest's default test runner
-	// runner: "jest-runner",
-
-	// The paths to modules that run some code to configure or set up the testing environment before each test
-	// setupFiles: [],
-
-	// A list of paths to modules that run some code to configure or set up the testing framework before each test
-	// setupFilesAfterEnv: [],
-
-	// The number of seconds after which a test is considered as slow and reported as such in the results.
-	// slowTestThreshold: 5,
-
-	// A list of paths to snapshot serializer modules Jest should use for snapshot testing
-	// snapshotSerializers: [],
-
-	// The test environment that will be used for testing
-	testEnvironment: "node",
-
-	// Options that will be passed to the testEnvironment
-	// testEnvironmentOptions: {},
-
-	// Adds a location field to test results
-	// testLocationInResults: false,
-
-	// The glob patterns Jest uses to detect test files
-	testMatch: [
-		"**/__tests__/**/*.[jt]s?(x)",
-		"**/?(*.)+(spec|test).[tj]s?(x)",
-		"<rootDir>/test/**/*",
-	],
-
-	// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
-	// testPathIgnorePatterns: [
-	//   "\\\\node_modules\\\\"
-	// ],
-
-	// The regexp pattern or array of patterns that Jest uses to detect test files
-	// testRegex: [],
-
-	// This option allows the use of a custom results processor
-	// testResultsProcessor: undefined,
-
-	// This option allows use of a custom test runner
-	// testRunner: "jasmine2",
-
-	// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
-	// testURL: "http://localhost",
-
-	// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
-	// timers: "real",
-
-	// A map from regular expressions to paths to transformers
-	transform: {
-		"^.+\\.(ts|tsx)$": "ts-jest",
-	},
-
-	// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-	// transformIgnorePatterns: [
-	//   "\\\\node_modules\\\\",
-	//   "\\.pnp\\.[^\\\\]+$"
-	// ],
-
-	// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
-	// unmockedModulePathPatterns: undefined,
-
-	// Indicates whether each individual test should be reported during the run
-	// verbose: undefined,
-
-	// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
-	// watchPathIgnorePatterns: [],
-
-	// Whether to use watchman for file crawling
-	// watchman: true,
-};
diff --git a/packages/calckey-js/package-lock.json b/packages/calckey-js/package-lock.json
deleted file mode 100644
index 774fcd5fa..000000000
--- a/packages/calckey-js/package-lock.json
+++ /dev/null
@@ -1,10662 +0,0 @@
-{
-	"name": "calckey-js",
-	"version": "0.0.16",
-	"lockfileVersion": 2,
-	"requires": true,
-	"packages": {
-		"": {
-			"name": "calckey-js",
-			"version": "0.0.16",
-			"dependencies": {
-				"autobind-decorator": "^2.4.0",
-				"eventemitter3": "^4.0.7",
-				"reconnecting-websocket": "^4.4.0",
-				"semver": "^7.3.8"
-			},
-			"devDependencies": {
-				"@microsoft/api-extractor": "^7.19.3",
-				"@types/jest": "^27.4.0",
-				"@types/node": "17.0.5",
-				"@typescript-eslint/eslint-plugin": "5.8.1",
-				"@typescript-eslint/parser": "5.8.1",
-				"eslint": "8.6.0",
-				"jest": "^27.4.5",
-				"jest-fetch-mock": "^3.0.3",
-				"jest-websocket-mock": "^2.2.1",
-				"mock-socket": "^9.0.8",
-				"ts-jest": "^27.1.2",
-				"ts-node": "10.4.0",
-				"tsd": "^0.19.1",
-				"typescript": "4.5.4"
-			}
-		},
-		"node_modules/@babel/code-frame": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/highlight": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/compat-data": {
-			"version": "7.16.4",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
-			"integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/core": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz",
-			"integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.16.7",
-				"@babel/generator": "^7.16.7",
-				"@babel/helper-compilation-targets": "^7.16.7",
-				"@babel/helper-module-transforms": "^7.16.7",
-				"@babel/helpers": "^7.16.7",
-				"@babel/parser": "^7.16.7",
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.16.7",
-				"@babel/types": "^7.16.7",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.1.2",
-				"semver": "^6.3.0",
-				"source-map": "^0.5.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@babel/core/node_modules/semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@babel/core/node_modules/source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/@babel/generator": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.7.tgz",
-			"integrity": "sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7",
-				"jsesc": "^2.5.1",
-				"source-map": "^0.5.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/generator/node_modules/source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
-			"integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/compat-data": "^7.16.4",
-				"@babel/helper-validator-option": "^7.16.7",
-				"browserslist": "^4.17.5",
-				"semver": "^6.3.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@babel/helper-environment-visitor": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-			"integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-function-name": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
-			"integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-get-function-arity": "^7.16.7",
-				"@babel/template": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-get-function-arity": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
-			"integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-hoist-variables": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-			"integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-module-imports": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-			"integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-module-transforms": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
-			"integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.16.7",
-				"@babel/helper-module-imports": "^7.16.7",
-				"@babel/helper-simple-access": "^7.16.7",
-				"@babel/helper-split-export-declaration": "^7.16.7",
-				"@babel/helper-validator-identifier": "^7.16.7",
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-plugin-utils": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
-			"integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-simple-access": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
-			"integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-split-export-declaration": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-			"integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-validator-option": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-			"integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helpers": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
-			"integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/highlight": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz",
-			"integrity": "sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.16.7",
-				"chalk": "^2.0.0",
-				"js-tokens": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^1.9.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "1.1.3"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-			"dev": true
-		},
-		"node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/parser": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.7.tgz",
-			"integrity": "sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==",
-			"dev": true,
-			"bin": {
-				"parser": "bin/babel-parser.js"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-async-generators": {
-			"version": "7.8.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-bigint": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-class-properties": {
-			"version": "7.12.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.12.13"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-import-meta": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-json-strings": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-numeric-separator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-object-rest-spread": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-optional-chaining": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-top-level-await": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-typescript": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz",
-			"integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/template": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-			"integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.16.7",
-				"@babel/parser": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.7.tgz",
-			"integrity": "sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.16.7",
-				"@babel/generator": "^7.16.7",
-				"@babel/helper-environment-visitor": "^7.16.7",
-				"@babel/helper-function-name": "^7.16.7",
-				"@babel/helper-hoist-variables": "^7.16.7",
-				"@babel/helper-split-export-declaration": "^7.16.7",
-				"@babel/parser": "^7.16.7",
-				"@babel/types": "^7.16.7",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/types": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.7.tgz",
-			"integrity": "sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.16.7",
-				"to-fast-properties": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@bcoe/v8-coverage": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-			"dev": true
-		},
-		"node_modules/@cspotcode/source-map-consumer": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
-			"integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 12"
-			}
-		},
-		"node_modules/@cspotcode/source-map-support": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
-			"integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
-			"dev": true,
-			"dependencies": {
-				"@cspotcode/source-map-consumer": "0.8.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@eslint/eslintrc": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
-			"integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==",
-			"dev": true,
-			"dependencies": {
-				"ajv": "^6.12.4",
-				"debug": "^4.3.2",
-				"espree": "^9.2.0",
-				"globals": "^13.9.0",
-				"ignore": "^4.0.6",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.0.4",
-				"strip-json-comments": "^3.1.1"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/@eslint/eslintrc/node_modules/ignore": {
-			"version": "4.0.6",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/@humanwhocodes/config-array": {
-			"version": "0.9.2",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz",
-			"integrity": "sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==",
-			"dev": true,
-			"dependencies": {
-				"@humanwhocodes/object-schema": "^1.2.1",
-				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
-			},
-			"engines": {
-				"node": ">=10.10.0"
-			}
-		},
-		"node_modules/@humanwhocodes/object-schema": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-			"dev": true
-		},
-		"node_modules/@istanbuljs/load-nyc-config": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-			"dev": true,
-			"dependencies": {
-				"camelcase": "^5.3.1",
-				"find-up": "^4.1.0",
-				"get-package-type": "^0.1.0",
-				"js-yaml": "^3.13.1",
-				"resolve-from": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-			"version": "3.14.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-			"dev": true,
-			"dependencies": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/schema": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@jest/console": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz",
-			"integrity": "sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"jest-message-util": "^27.4.2",
-				"jest-util": "^27.4.2",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/@jest/core": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.5.tgz",
-			"integrity": "sha512-3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ==",
-			"dev": true,
-			"dependencies": {
-				"@jest/console": "^27.4.2",
-				"@jest/reporters": "^27.4.5",
-				"@jest/test-result": "^27.4.2",
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"emittery": "^0.8.1",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.4",
-				"jest-changed-files": "^27.4.2",
-				"jest-config": "^27.4.5",
-				"jest-haste-map": "^27.4.5",
-				"jest-message-util": "^27.4.2",
-				"jest-regex-util": "^27.4.0",
-				"jest-resolve": "^27.4.5",
-				"jest-resolve-dependencies": "^27.4.5",
-				"jest-runner": "^27.4.5",
-				"jest-runtime": "^27.4.5",
-				"jest-snapshot": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-validate": "^27.4.2",
-				"jest-watcher": "^27.4.2",
-				"micromatch": "^4.0.4",
-				"rimraf": "^3.0.0",
-				"slash": "^3.0.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@jest/environment": {
-			"version": "27.4.4",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.4.tgz",
-			"integrity": "sha512-q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ==",
-			"dev": true,
-			"dependencies": {
-				"@jest/fake-timers": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"jest-mock": "^27.4.2"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/@jest/fake-timers": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz",
-			"integrity": "sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"@sinonjs/fake-timers": "^8.0.1",
-				"@types/node": "*",
-				"jest-message-util": "^27.4.2",
-				"jest-mock": "^27.4.2",
-				"jest-util": "^27.4.2"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/@jest/globals": {
-			"version": "27.4.4",
-			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.4.tgz",
-			"integrity": "sha512-bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ==",
-			"dev": true,
-			"dependencies": {
-				"@jest/environment": "^27.4.4",
-				"@jest/types": "^27.4.2",
-				"expect": "^27.4.2"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/@jest/reporters": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.5.tgz",
-			"integrity": "sha512-3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA==",
-			"dev": true,
-			"dependencies": {
-				"@bcoe/v8-coverage": "^0.2.3",
-				"@jest/console": "^27.4.2",
-				"@jest/test-result": "^27.4.2",
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.2",
-				"graceful-fs": "^4.2.4",
-				"istanbul-lib-coverage": "^3.0.0",
-				"istanbul-lib-instrument": "^4.0.3",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-lib-source-maps": "^4.0.0",
-				"istanbul-reports": "^3.0.2",
-				"jest-haste-map": "^27.4.5",
-				"jest-resolve": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-worker": "^27.4.5",
-				"slash": "^3.0.0",
-				"source-map": "^0.6.0",
-				"string-length": "^4.0.1",
-				"terminal-link": "^2.0.0",
-				"v8-to-istanbul": "^8.1.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@jest/source-map": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz",
-			"integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==",
-			"dev": true,
-			"dependencies": {
-				"callsites": "^3.0.0",
-				"graceful-fs": "^4.2.4",
-				"source-map": "^0.6.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/@jest/test-result": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz",
-			"integrity": "sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==",
-			"dev": true,
-			"dependencies": {
-				"@jest/console": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"collect-v8-coverage": "^1.0.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/@jest/test-sequencer": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.5.tgz",
-			"integrity": "sha512-n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ==",
-			"dev": true,
-			"dependencies": {
-				"@jest/test-result": "^27.4.2",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^27.4.5",
-				"jest-runtime": "^27.4.5"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/@jest/transform": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.5.tgz",
-			"integrity": "sha512-PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.1.0",
-				"@jest/types": "^27.4.2",
-				"babel-plugin-istanbul": "^6.0.0",
-				"chalk": "^4.0.0",
-				"convert-source-map": "^1.4.0",
-				"fast-json-stable-stringify": "^2.0.0",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^27.4.5",
-				"jest-regex-util": "^27.4.0",
-				"jest-util": "^27.4.2",
-				"micromatch": "^4.0.4",
-				"pirates": "^4.0.1",
-				"slash": "^3.0.0",
-				"source-map": "^0.6.1",
-				"write-file-atomic": "^3.0.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/@jest/types": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
-			"integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
-			"dev": true,
-			"dependencies": {
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^16.0.0",
-				"chalk": "^4.0.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/@microsoft/api-extractor": {
-			"version": "7.19.3",
-			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.19.3.tgz",
-			"integrity": "sha512-GZe+R3K4kh2X425iOHkPbByysB7FN0592mPPA6vNj5IhyhlPHgdZS6m6AmOZOIxMS4euM+SBKzEJEp3oC+WsOQ==",
-			"dev": true,
-			"dependencies": {
-				"@microsoft/api-extractor-model": "7.15.2",
-				"@microsoft/tsdoc": "0.13.2",
-				"@microsoft/tsdoc-config": "~0.15.2",
-				"@rushstack/node-core-library": "3.44.3",
-				"@rushstack/rig-package": "0.3.7",
-				"@rushstack/ts-command-line": "4.10.6",
-				"colors": "~1.2.1",
-				"lodash": "~4.17.15",
-				"resolve": "~1.17.0",
-				"semver": "~7.3.0",
-				"source-map": "~0.6.1",
-				"typescript": "~4.5.2"
-			},
-			"bin": {
-				"api-extractor": "bin/api-extractor"
-			}
-		},
-		"node_modules/@microsoft/api-extractor-model": {
-			"version": "7.15.2",
-			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.15.2.tgz",
-			"integrity": "sha512-qgxKX/s6vo3nCVLhP0Ds7555QrErhcYHEok5/KyEZ7iR8J5M5oldD1eJJQmtEdVF5IzmnPPbxx1nRvfgA674LQ==",
-			"dev": true,
-			"dependencies": {
-				"@microsoft/tsdoc": "0.13.2",
-				"@microsoft/tsdoc-config": "~0.15.2",
-				"@rushstack/node-core-library": "3.44.3"
-			}
-		},
-		"node_modules/@microsoft/api-extractor/node_modules/resolve": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-			"dev": true,
-			"dependencies": {
-				"path-parse": "^1.0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/@microsoft/tsdoc": {
-			"version": "0.13.2",
-			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
-			"integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
-			"dev": true
-		},
-		"node_modules/@microsoft/tsdoc-config": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
-			"integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
-			"dev": true,
-			"dependencies": {
-				"@microsoft/tsdoc": "0.13.2",
-				"ajv": "~6.12.6",
-				"jju": "~1.4.0",
-				"resolve": "~1.19.0"
-			}
-		},
-		"node_modules/@microsoft/tsdoc-config/node_modules/resolve": {
-			"version": "1.19.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
-			"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
-			"dev": true,
-			"dependencies": {
-				"is-core-module": "^2.1.0",
-				"path-parse": "^1.0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/@nodelib/fs.scandir": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
-			"integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
-			"dev": true,
-			"dependencies": {
-				"@nodelib/fs.stat": "2.0.4",
-				"run-parallel": "^1.1.9"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@nodelib/fs.stat": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
-			"integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
-			"dev": true,
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@nodelib/fs.walk": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
-			"integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
-			"dev": true,
-			"dependencies": {
-				"@nodelib/fs.scandir": "2.1.4",
-				"fastq": "^1.6.0"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@rushstack/node-core-library": {
-			"version": "3.44.3",
-			"resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.44.3.tgz",
-			"integrity": "sha512-Bt+R5LAnVr2BImTJqPpton5rvhJ2Wq8x4BaTqaCHQMmfxqtz5lb4nLYT9kneMJTCDuRMBvvLpSuz4MBj50PV3w==",
-			"dev": true,
-			"dependencies": {
-				"@types/node": "12.20.24",
-				"colors": "~1.2.1",
-				"fs-extra": "~7.0.1",
-				"import-lazy": "~4.0.0",
-				"jju": "~1.4.0",
-				"resolve": "~1.17.0",
-				"semver": "~7.3.0",
-				"timsort": "~0.3.0",
-				"z-schema": "~5.0.2"
-			}
-		},
-		"node_modules/@rushstack/node-core-library/node_modules/@types/node": {
-			"version": "12.20.24",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz",
-			"integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==",
-			"dev": true
-		},
-		"node_modules/@rushstack/node-core-library/node_modules/resolve": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-			"dev": true,
-			"dependencies": {
-				"path-parse": "^1.0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/@rushstack/rig-package": {
-			"version": "0.3.7",
-			"resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.7.tgz",
-			"integrity": "sha512-pzMsTSeTC8IiZ6EJLr53gGMvhT4oLWH+hxD7907cHyWuIUlEXFtu/2pK25vUQT13nKp5DJCWxXyYoGRk/h6rtA==",
-			"dev": true,
-			"dependencies": {
-				"resolve": "~1.17.0",
-				"strip-json-comments": "~3.1.1"
-			}
-		},
-		"node_modules/@rushstack/rig-package/node_modules/resolve": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-			"dev": true,
-			"dependencies": {
-				"path-parse": "^1.0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/@rushstack/ts-command-line": {
-			"version": "4.10.6",
-			"resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.10.6.tgz",
-			"integrity": "sha512-Y3GkUag39sTIlukDg9mUp8MCHrrlJ27POrBNRQGc/uF+VVgX8M7zMzHch5zP6O1QVquWgD7Engdpn2piPYaS/g==",
-			"dev": true,
-			"dependencies": {
-				"@types/argparse": "1.0.38",
-				"argparse": "~1.0.9",
-				"colors": "~1.2.1",
-				"string-argv": "~0.3.1"
-			}
-		},
-		"node_modules/@sinonjs/commons": {
-			"version": "1.8.3",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-			"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-			"dev": true,
-			"dependencies": {
-				"type-detect": "4.0.8"
-			}
-		},
-		"node_modules/@sinonjs/fake-timers": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-			"integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-			"dev": true,
-			"dependencies": {
-				"@sinonjs/commons": "^1.7.0"
-			}
-		},
-		"node_modules/@tootallnate/once": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/@tsconfig/node10": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
-			"integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
-			"dev": true
-		},
-		"node_modules/@tsconfig/node12": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
-			"integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
-			"dev": true
-		},
-		"node_modules/@tsconfig/node14": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
-			"integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
-			"dev": true
-		},
-		"node_modules/@tsconfig/node16": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
-			"integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
-			"dev": true
-		},
-		"node_modules/@tsd/typescript": {
-			"version": "4.5.4",
-			"resolved": "https://registry.npmjs.org/@tsd/typescript/-/typescript-4.5.4.tgz",
-			"integrity": "sha512-iDlLkdg3sCjUSNdoUCsYM/SXheHrdxHsR6msIkbFDW4pV6gHTMwg/8te/paLtywDjGL4S4ByDdUKA3RbfdBX0g==",
-			"dev": true,
-			"bin": {
-				"tsc": "typescript/bin/tsc",
-				"tsserver": "typescript/bin/tsserver"
-			}
-		},
-		"node_modules/@types/argparse": {
-			"version": "1.0.38",
-			"resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz",
-			"integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==",
-			"dev": true
-		},
-		"node_modules/@types/babel__core": {
-			"version": "7.1.18",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz",
-			"integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0",
-				"@types/babel__generator": "*",
-				"@types/babel__template": "*",
-				"@types/babel__traverse": "*"
-			}
-		},
-		"node_modules/@types/babel__generator": {
-			"version": "7.6.4",
-			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-			"integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"node_modules/@types/babel__template": {
-			"version": "7.4.1",
-			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-			"integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-			"dev": true,
-			"dependencies": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"node_modules/@types/babel__traverse": {
-			"version": "7.14.2",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
-			"integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.3.0"
-			}
-		},
-		"node_modules/@types/eslint": {
-			"version": "7.29.0",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
-			"integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
-			"dev": true,
-			"dependencies": {
-				"@types/estree": "*",
-				"@types/json-schema": "*"
-			}
-		},
-		"node_modules/@types/estree": {
-			"version": "0.0.50",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-			"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
-			"dev": true
-		},
-		"node_modules/@types/graceful-fs": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-			"integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-			"dev": true,
-			"dependencies": {
-				"@types/node": "*"
-			}
-		},
-		"node_modules/@types/istanbul-lib-coverage": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-			"integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
-			"dev": true
-		},
-		"node_modules/@types/istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-			"dev": true,
-			"dependencies": {
-				"@types/istanbul-lib-coverage": "*"
-			}
-		},
-		"node_modules/@types/istanbul-reports": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-			"integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-			"dev": true,
-			"dependencies": {
-				"@types/istanbul-lib-report": "*"
-			}
-		},
-		"node_modules/@types/jest": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz",
-			"integrity": "sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==",
-			"dev": true,
-			"dependencies": {
-				"jest-diff": "^27.0.0",
-				"pretty-format": "^27.0.0"
-			}
-		},
-		"node_modules/@types/json-schema": {
-			"version": "7.0.9",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-			"dev": true
-		},
-		"node_modules/@types/minimist": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
-			"integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
-			"dev": true
-		},
-		"node_modules/@types/node": {
-			"version": "17.0.5",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.5.tgz",
-			"integrity": "sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw==",
-			"dev": true
-		},
-		"node_modules/@types/normalize-package-data": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-			"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-			"dev": true
-		},
-		"node_modules/@types/prettier": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
-			"integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
-			"dev": true
-		},
-		"node_modules/@types/stack-utils": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-			"integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
-			"dev": true
-		},
-		"node_modules/@types/yargs": {
-			"version": "16.0.4",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-			"integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-			"dev": true,
-			"dependencies": {
-				"@types/yargs-parser": "*"
-			}
-		},
-		"node_modules/@types/yargs-parser": {
-			"version": "20.2.1",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
-			"integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
-			"dev": true
-		},
-		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.1.tgz",
-			"integrity": "sha512-wTZ5oEKrKj/8/366qTM366zqhIKAp6NCMweoRONtfuC07OAU9nVI2GZZdqQ1qD30WAAtcPdkH+npDwtRFdp4Rw==",
-			"dev": true,
-			"dependencies": {
-				"@typescript-eslint/experimental-utils": "5.8.1",
-				"@typescript-eslint/scope-manager": "5.8.1",
-				"debug": "^4.3.2",
-				"functional-red-black-tree": "^1.0.1",
-				"ignore": "^5.1.8",
-				"regexpp": "^3.2.0",
-				"semver": "^7.3.5",
-				"tsutils": "^3.21.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"@typescript-eslint/parser": "^5.0.0",
-				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@typescript-eslint/experimental-utils": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.1.tgz",
-			"integrity": "sha512-fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww==",
-			"dev": true,
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"@typescript-eslint/scope-manager": "5.8.1",
-				"@typescript-eslint/types": "5.8.1",
-				"@typescript-eslint/typescript-estree": "5.8.1",
-				"eslint-scope": "^5.1.1",
-				"eslint-utils": "^3.0.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/parser": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.8.1.tgz",
-			"integrity": "sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==",
-			"dev": true,
-			"dependencies": {
-				"@typescript-eslint/scope-manager": "5.8.1",
-				"@typescript-eslint/types": "5.8.1",
-				"@typescript-eslint/typescript-estree": "5.8.1",
-				"debug": "^4.3.2"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@typescript-eslint/scope-manager": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.8.1.tgz",
-			"integrity": "sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==",
-			"dev": true,
-			"dependencies": {
-				"@typescript-eslint/types": "5.8.1",
-				"@typescript-eslint/visitor-keys": "5.8.1"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/types": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.1.tgz",
-			"integrity": "sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==",
-			"dev": true,
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/typescript-estree": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz",
-			"integrity": "sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==",
-			"dev": true,
-			"dependencies": {
-				"@typescript-eslint/types": "5.8.1",
-				"@typescript-eslint/visitor-keys": "5.8.1",
-				"debug": "^4.3.2",
-				"globby": "^11.0.4",
-				"is-glob": "^4.0.3",
-				"semver": "^7.3.5",
-				"tsutils": "^3.21.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@typescript-eslint/visitor-keys": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.1.tgz",
-			"integrity": "sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg==",
-			"dev": true,
-			"dependencies": {
-				"@typescript-eslint/types": "5.8.1",
-				"eslint-visitor-keys": "^3.0.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/abab": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-			"integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
-			"dev": true
-		},
-		"node_modules/acorn": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-			"dev": true,
-			"bin": {
-				"acorn": "bin/acorn"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/acorn-globals": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-			"integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-			"dev": true,
-			"dependencies": {
-				"acorn": "^7.1.1",
-				"acorn-walk": "^7.1.1"
-			}
-		},
-		"node_modules/acorn-globals/node_modules/acorn": {
-			"version": "7.4.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-			"dev": true,
-			"bin": {
-				"acorn": "bin/acorn"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/acorn-jsx": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true,
-			"peerDependencies": {
-				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-			}
-		},
-		"node_modules/acorn-walk": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/agent-base": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-			"dev": true,
-			"dependencies": {
-				"debug": "4"
-			},
-			"engines": {
-				"node": ">= 6.0.0"
-			}
-		},
-		"node_modules/ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/ansi-colors": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/ansi-escapes": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-			"dev": true,
-			"dependencies": {
-				"type-fest": "^0.21.3"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/ansi-escapes/node_modules/type-fest": {
-			"version": "0.21.3",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/anymatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-			"dev": true,
-			"dependencies": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/arg": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-			"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-			"dev": true
-		},
-		"node_modules/argparse": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-			"dev": true,
-			"dependencies": {
-				"sprintf-js": "~1.0.2"
-			}
-		},
-		"node_modules/array-union": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/arrify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true
-		},
-		"node_modules/autobind-decorator": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/autobind-decorator/-/autobind-decorator-2.4.0.tgz",
-			"integrity": "sha512-OGYhWUO72V6DafbF8PM8rm3EPbfuyMZcJhtm5/n26IDwO18pohE4eNazLoCGhPiXOCD0gEGmrbU3849QvM8bbw==",
-			"engines": {
-				"node": ">=8.10",
-				"npm": ">=6.4.1"
-			}
-		},
-		"node_modules/babel-jest": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.5.tgz",
-			"integrity": "sha512-3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA==",
-			"dev": true,
-			"dependencies": {
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/babel__core": "^7.1.14",
-				"babel-plugin-istanbul": "^6.0.0",
-				"babel-preset-jest": "^27.4.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.8.0"
-			}
-		},
-		"node_modules/babel-plugin-istanbul": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-instrument": "^5.0.4",
-				"test-exclude": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
-			"integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.12.3",
-				"@babel/parser": "^7.14.7",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-coverage": "^3.2.0",
-				"semver": "^6.3.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/babel-plugin-istanbul/node_modules/semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/babel-plugin-jest-hoist": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz",
-			"integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/template": "^7.3.3",
-				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.0.0",
-				"@types/babel__traverse": "^7.0.6"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/babel-preset-current-node-syntax": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-bigint": "^7.8.3",
-				"@babel/plugin-syntax-class-properties": "^7.8.3",
-				"@babel/plugin-syntax-import-meta": "^7.8.3",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-top-level-await": "^7.8.3"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/babel-preset-jest": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz",
-			"integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==",
-			"dev": true,
-			"dependencies": {
-				"babel-plugin-jest-hoist": "^27.4.0",
-				"babel-preset-current-node-syntax": "^1.0.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/balanced-match": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-			"dev": true
-		},
-		"node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"node_modules/braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-			"dev": true,
-			"dependencies": {
-				"fill-range": "^7.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/browser-process-hrtime": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-			"dev": true
-		},
-		"node_modules/browserslist": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
-			"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
-			"dev": true,
-			"dependencies": {
-				"caniuse-lite": "^1.0.30001286",
-				"electron-to-chromium": "^1.4.17",
-				"escalade": "^3.1.1",
-				"node-releases": "^2.0.1",
-				"picocolors": "^1.0.0"
-			},
-			"bin": {
-				"browserslist": "cli.js"
-			},
-			"engines": {
-				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/browserslist"
-			}
-		},
-		"node_modules/bs-logger": {
-			"version": "0.2.6",
-			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-			"dev": true,
-			"dependencies": {
-				"fast-json-stable-stringify": "2.x"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/bser": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-			"dev": true,
-			"dependencies": {
-				"node-int64": "^0.4.0"
-			}
-		},
-		"node_modules/buffer-from": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-			"dev": true
-		},
-		"node_modules/callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/camelcase-keys": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-			"dev": true,
-			"dependencies": {
-				"camelcase": "^5.3.1",
-				"map-obj": "^4.0.0",
-				"quick-lru": "^4.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/caniuse-lite": {
-			"version": "1.0.30001294",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz",
-			"integrity": "sha512-LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g==",
-			"dev": true,
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/browserslist"
-			}
-		},
-		"node_modules/chalk": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-			"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/char-regex": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/ci-info": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-			"integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-			"dev": true
-		},
-		"node_modules/cjs-module-lexer": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-			"integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
-			"dev": true
-		},
-		"node_modules/cliui": {
-			"version": "7.0.4",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-			"dev": true,
-			"dependencies": {
-				"string-width": "^4.2.0",
-				"strip-ansi": "^6.0.0",
-				"wrap-ansi": "^7.0.0"
-			}
-		},
-		"node_modules/co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-			"dev": true,
-			"engines": {
-				"iojs": ">= 1.0.0",
-				"node": ">= 0.12.0"
-			}
-		},
-		"node_modules/collect-v8-coverage": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-			"dev": true
-		},
-		"node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
-		"node_modules/colors": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
-			"integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.1.90"
-			}
-		},
-		"node_modules/combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"dev": true,
-			"dependencies": {
-				"delayed-stream": "~1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"dev": true,
-			"optional": true
-		},
-		"node_modules/concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-			"dev": true
-		},
-		"node_modules/convert-source-map": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-			"dev": true,
-			"dependencies": {
-				"safe-buffer": "~5.1.1"
-			}
-		},
-		"node_modules/create-require": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-			"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-			"dev": true
-		},
-		"node_modules/cross-fetch": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
-			"integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
-			"dev": true,
-			"dependencies": {
-				"node-fetch": "2.6.1"
-			}
-		},
-		"node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
-			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/cssom": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-			"integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-			"dev": true
-		},
-		"node_modules/cssstyle": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-			"integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-			"dev": true,
-			"dependencies": {
-				"cssom": "~0.3.6"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/cssstyle/node_modules/cssom": {
-			"version": "0.3.8",
-			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-			"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-			"dev": true
-		},
-		"node_modules/data-urls": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-			"integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-			"dev": true,
-			"dependencies": {
-				"abab": "^2.0.3",
-				"whatwg-mimetype": "^2.3.0",
-				"whatwg-url": "^8.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/debug": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-			"dev": true,
-			"dependencies": {
-				"ms": "2.1.2"
-			},
-			"engines": {
-				"node": ">=6.0"
-			},
-			"peerDependenciesMeta": {
-				"supports-color": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/decamelize-keys": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-			"integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-			"dev": true,
-			"dependencies": {
-				"decamelize": "^1.1.0",
-				"map-obj": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/decamelize-keys/node_modules/map-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/decimal.js": {
-			"version": "10.3.1",
-			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-			"integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
-			"dev": true
-		},
-		"node_modules/dedent": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
-			"dev": true
-		},
-		"node_modules/deep-is": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-			"dev": true
-		},
-		"node_modules/deepmerge": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/detect-newline": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/diff": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.3.1"
-			}
-		},
-		"node_modules/diff-sequences": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz",
-			"integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==",
-			"dev": true,
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/dir-glob": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-			"dev": true,
-			"dependencies": {
-				"path-type": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/doctrine": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-			"dev": true,
-			"dependencies": {
-				"esutils": "^2.0.2"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/domexception": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-			"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-			"dev": true,
-			"dependencies": {
-				"webidl-conversions": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/domexception/node_modules/webidl-conversions": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-			"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/electron-to-chromium": {
-			"version": "1.4.31",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.31.tgz",
-			"integrity": "sha512-t3XVQtk+Frkv6aTD4RRk0OqosU+VLe1dQFW83MDer78ZD6a52frgXuYOIsLYTQiH2Lm+JB2OKYcn7zrX+YGAiQ==",
-			"dev": true
-		},
-		"node_modules/emittery": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-			"integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sindresorhus/emittery?sponsor=1"
-			}
-		},
-		"node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
-		},
-		"node_modules/enquirer": {
-			"version": "2.3.6",
-			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-			"dev": true,
-			"dependencies": {
-				"ansi-colors": "^4.1.1"
-			},
-			"engines": {
-				"node": ">=8.6"
-			}
-		},
-		"node_modules/error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"dev": true,
-			"dependencies": {
-				"is-arrayish": "^0.2.1"
-			}
-		},
-		"node_modules/escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/escodegen": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-			"integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-			"dev": true,
-			"dependencies": {
-				"esprima": "^4.0.1",
-				"estraverse": "^5.2.0",
-				"esutils": "^2.0.2",
-				"optionator": "^0.8.1"
-			},
-			"bin": {
-				"escodegen": "bin/escodegen.js",
-				"esgenerate": "bin/esgenerate.js"
-			},
-			"engines": {
-				"node": ">=6.0"
-			},
-			"optionalDependencies": {
-				"source-map": "~0.6.1"
-			}
-		},
-		"node_modules/escodegen/node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/escodegen/node_modules/levn": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-			"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-			"dev": true,
-			"dependencies": {
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/escodegen/node_modules/optionator": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-			"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-			"dev": true,
-			"dependencies": {
-				"deep-is": "~0.1.3",
-				"fast-levenshtein": "~2.0.6",
-				"levn": "~0.3.0",
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2",
-				"word-wrap": "~1.2.3"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/escodegen/node_modules/prelude-ls": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-			"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/escodegen/node_modules/type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-			"dev": true,
-			"dependencies": {
-				"prelude-ls": "~1.1.2"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/eslint": {
-			"version": "8.6.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.6.0.tgz",
-			"integrity": "sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==",
-			"dev": true,
-			"dependencies": {
-				"@eslint/eslintrc": "^1.0.5",
-				"@humanwhocodes/config-array": "^0.9.2",
-				"ajv": "^6.10.0",
-				"chalk": "^4.0.0",
-				"cross-spawn": "^7.0.2",
-				"debug": "^4.3.2",
-				"doctrine": "^3.0.0",
-				"enquirer": "^2.3.5",
-				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^7.1.0",
-				"eslint-utils": "^3.0.0",
-				"eslint-visitor-keys": "^3.1.0",
-				"espree": "^9.3.0",
-				"esquery": "^1.4.0",
-				"esutils": "^2.0.2",
-				"fast-deep-equal": "^3.1.3",
-				"file-entry-cache": "^6.0.1",
-				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.6.0",
-				"ignore": "^4.0.6",
-				"import-fresh": "^3.0.0",
-				"imurmurhash": "^0.1.4",
-				"is-glob": "^4.0.0",
-				"js-yaml": "^4.1.0",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"levn": "^0.4.1",
-				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.0.4",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.1",
-				"progress": "^2.0.0",
-				"regexpp": "^3.2.0",
-				"semver": "^7.2.1",
-				"strip-ansi": "^6.0.1",
-				"strip-json-comments": "^3.1.0",
-				"text-table": "^0.2.0",
-				"v8-compile-cache": "^2.0.3"
-			},
-			"bin": {
-				"eslint": "bin/eslint.js"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint-formatter-pretty": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz",
-			"integrity": "sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==",
-			"dev": true,
-			"dependencies": {
-				"@types/eslint": "^7.2.13",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.1.0",
-				"eslint-rule-docs": "^1.1.5",
-				"log-symbols": "^4.0.0",
-				"plur": "^4.0.0",
-				"string-width": "^4.2.0",
-				"supports-hyperlinks": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/eslint-rule-docs": {
-			"version": "1.1.231",
-			"resolved": "https://registry.npmjs.org/eslint-rule-docs/-/eslint-rule-docs-1.1.231.tgz",
-			"integrity": "sha512-egHz9A1WG7b8CS0x1P6P/Rj5FqZOjray/VjpJa14tMZalfRKvpE2ONJ3plCM7+PcinmU4tcmbPLv0VtwzSdLVA==",
-			"dev": true
-		},
-		"node_modules/eslint-scope": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-			"dev": true,
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^4.1.1"
-			},
-			"engines": {
-				"node": ">=8.0.0"
-			}
-		},
-		"node_modules/eslint-utils": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-			"dev": true,
-			"dependencies": {
-				"eslint-visitor-keys": "^2.0.0"
-			},
-			"engines": {
-				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
-			},
-			"peerDependencies": {
-				"eslint": ">=5"
-			}
-		},
-		"node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/eslint-visitor-keys": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-			"integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
-			"dev": true,
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/eslint/node_modules/eslint-scope": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
-			"integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
-			"dev": true,
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/eslint/node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/eslint/node_modules/glob-parent": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-			"dev": true,
-			"dependencies": {
-				"is-glob": "^4.0.3"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/eslint/node_modules/ignore": {
-			"version": "4.0.6",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/espree": {
-			"version": "9.3.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
-			"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
-			"dev": true,
-			"dependencies": {
-				"acorn": "^8.7.0",
-				"acorn-jsx": "^5.3.1",
-				"eslint-visitor-keys": "^3.1.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-			"dev": true,
-			"bin": {
-				"esparse": "bin/esparse.js",
-				"esvalidate": "bin/esvalidate.js"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/esquery": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-			"dev": true,
-			"dependencies": {
-				"estraverse": "^5.1.0"
-			},
-			"engines": {
-				"node": ">=0.10"
-			}
-		},
-		"node_modules/esquery/node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/esrecurse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-			"dev": true,
-			"dependencies": {
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/esrecurse/node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/estraverse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-			"dev": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/eventemitter3": {
-			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-		},
-		"node_modules/execa": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-			"dev": true,
-			"dependencies": {
-				"cross-spawn": "^7.0.3",
-				"get-stream": "^6.0.0",
-				"human-signals": "^2.1.0",
-				"is-stream": "^2.0.0",
-				"merge-stream": "^2.0.0",
-				"npm-run-path": "^4.0.1",
-				"onetime": "^5.1.2",
-				"signal-exit": "^3.0.3",
-				"strip-final-newline": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sindresorhus/execa?sponsor=1"
-			}
-		},
-		"node_modules/exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/expect": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz",
-			"integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"ansi-styles": "^5.0.0",
-				"jest-get-type": "^27.4.0",
-				"jest-matcher-utils": "^27.4.2",
-				"jest-message-util": "^27.4.2",
-				"jest-regex-util": "^27.4.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/expect/node_modules/ansi-styles": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/fast-deep-equal": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-			"dev": true
-		},
-		"node_modules/fast-glob": {
-			"version": "3.2.5",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-			"integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
-			"dev": true,
-			"dependencies": {
-				"@nodelib/fs.stat": "^2.0.2",
-				"@nodelib/fs.walk": "^1.2.3",
-				"glob-parent": "^5.1.0",
-				"merge2": "^1.3.0",
-				"micromatch": "^4.0.2",
-				"picomatch": "^2.2.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true
-		},
-		"node_modules/fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-			"dev": true
-		},
-		"node_modules/fastq": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-			"integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
-			"dev": true,
-			"dependencies": {
-				"reusify": "^1.0.4"
-			}
-		},
-		"node_modules/fb-watchman": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-			"integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-			"dev": true,
-			"dependencies": {
-				"bser": "2.1.1"
-			}
-		},
-		"node_modules/file-entry-cache": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-			"dev": true,
-			"dependencies": {
-				"flat-cache": "^3.0.4"
-			},
-			"engines": {
-				"node": "^10.12.0 || >=12.0.0"
-			}
-		},
-		"node_modules/fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-			"dev": true,
-			"dependencies": {
-				"to-regex-range": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
-			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/flat-cache": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-			"dev": true,
-			"dependencies": {
-				"flatted": "^3.1.0",
-				"rimraf": "^3.0.2"
-			},
-			"engines": {
-				"node": "^10.12.0 || >=12.0.0"
-			}
-		},
-		"node_modules/flatted": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
-			"integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==",
-			"dev": true
-		},
-		"node_modules/form-data": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-			"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-			"dev": true,
-			"dependencies": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.8",
-				"mime-types": "^2.1.12"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/fs-extra": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-			"dev": true,
-			"dependencies": {
-				"graceful-fs": "^4.1.2",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=6 <7 || >=8"
-			}
-		},
-		"node_modules/fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-			"dev": true
-		},
-		"node_modules/fsevents": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-			"dev": true,
-			"hasInstallScript": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-			}
-		},
-		"node_modules/function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-			"dev": true
-		},
-		"node_modules/functional-red-black-tree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-			"dev": true
-		},
-		"node_modules/gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/get-caller-file": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-			"dev": true,
-			"engines": {
-				"node": "6.* || 8.* || >= 10.*"
-			}
-		},
-		"node_modules/get-package-type": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8.0.0"
-			}
-		},
-		"node_modules/get-stream": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/glob": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-			"dev": true,
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"dev": true,
-			"dependencies": {
-				"is-glob": "^4.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/globals": {
-			"version": "13.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-			"integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
-			"dev": true,
-			"dependencies": {
-				"type-fest": "^0.20.2"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/globby": {
-			"version": "11.0.4",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-			"integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-			"dev": true,
-			"dependencies": {
-				"array-union": "^2.1.0",
-				"dir-glob": "^3.0.1",
-				"fast-glob": "^3.1.1",
-				"ignore": "^5.1.4",
-				"merge2": "^1.3.0",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/graceful-fs": {
-			"version": "4.2.6",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-			"integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
-			"dev": true
-		},
-		"node_modules/hard-rejection": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"dev": true,
-			"dependencies": {
-				"function-bind": "^1.1.1"
-			},
-			"engines": {
-				"node": ">= 0.4.0"
-			}
-		},
-		"node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/hosted-git-info": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-			"dev": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/html-encoding-sniffer": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-			"integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-			"dev": true,
-			"dependencies": {
-				"whatwg-encoding": "^1.0.5"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/html-escaper": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-			"dev": true
-		},
-		"node_modules/http-proxy-agent": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-			"dev": true,
-			"dependencies": {
-				"@tootallnate/once": "1",
-				"agent-base": "6",
-				"debug": "4"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/https-proxy-agent": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-			"dev": true,
-			"dependencies": {
-				"agent-base": "6",
-				"debug": "4"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/human-signals": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10.17.0"
-			}
-		},
-		"node_modules/iconv-lite": {
-			"version": "0.4.24",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"dev": true,
-			"dependencies": {
-				"safer-buffer": ">= 2.1.2 < 3"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/ignore": {
-			"version": "5.1.8",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/import-fresh": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-			"dev": true,
-			"dependencies": {
-				"parent-module": "^1.0.0",
-				"resolve-from": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/import-lazy": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/import-local": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
-			"integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
-			"dev": true,
-			"dependencies": {
-				"pkg-dir": "^4.2.0",
-				"resolve-cwd": "^3.0.0"
-			},
-			"bin": {
-				"import-local-fixture": "fixtures/cli.js"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.8.19"
-			}
-		},
-		"node_modules/indent-string": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-			"dev": true,
-			"dependencies": {
-				"once": "^1.3.0",
-				"wrappy": "1"
-			}
-		},
-		"node_modules/inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-			"dev": true
-		},
-		"node_modules/irregular-plurals": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz",
-			"integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-			"dev": true
-		},
-		"node_modules/is-core-module": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-			"integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
-			"dev": true,
-			"dependencies": {
-				"has": "^1.0.3"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/is-generator-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/is-glob": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-			"dev": true,
-			"dependencies": {
-				"is-extglob": "^2.1.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-number": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.12.0"
-			}
-		},
-		"node_modules/is-plain-obj": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-potential-custom-element-name": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-			"dev": true
-		},
-		"node_modules/is-stream": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
-		},
-		"node_modules/is-unicode-supported": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-			"dev": true
-		},
-		"node_modules/istanbul-lib-coverage": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/istanbul-lib-instrument": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-			"integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.7.5",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-coverage": "^3.0.0",
-				"semver": "^6.3.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/istanbul-lib-instrument/node_modules/semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-			"dev": true,
-			"dependencies": {
-				"istanbul-lib-coverage": "^3.0.0",
-				"make-dir": "^3.0.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/istanbul-lib-source-maps": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-			"dev": true,
-			"dependencies": {
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0",
-				"source-map": "^0.6.1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-reports": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz",
-			"integrity": "sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==",
-			"dev": true,
-			"dependencies": {
-				"html-escaper": "^2.0.0",
-				"istanbul-lib-report": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest/-/jest-27.4.5.tgz",
-			"integrity": "sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/core": "^27.4.5",
-				"import-local": "^3.0.2",
-				"jest-cli": "^27.4.5"
-			},
-			"bin": {
-				"jest": "bin/jest.js"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-changed-files": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz",
-			"integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"execa": "^5.0.0",
-				"throat": "^6.0.1"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-circus": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.5.tgz",
-			"integrity": "sha512-eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/environment": "^27.4.4",
-				"@jest/test-result": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"dedent": "^0.7.0",
-				"expect": "^27.4.2",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^27.4.2",
-				"jest-matcher-utils": "^27.4.2",
-				"jest-message-util": "^27.4.2",
-				"jest-runtime": "^27.4.5",
-				"jest-snapshot": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"pretty-format": "^27.4.2",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3",
-				"throat": "^6.0.1"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-cli": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.5.tgz",
-			"integrity": "sha512-hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/core": "^27.4.5",
-				"@jest/test-result": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"chalk": "^4.0.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.4",
-				"import-local": "^3.0.2",
-				"jest-config": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-validate": "^27.4.2",
-				"prompts": "^2.0.1",
-				"yargs": "^16.2.0"
-			},
-			"bin": {
-				"jest": "bin/jest.js"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-config": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.5.tgz",
-			"integrity": "sha512-t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.1.0",
-				"@jest/test-sequencer": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"babel-jest": "^27.4.5",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"deepmerge": "^4.2.2",
-				"glob": "^7.1.1",
-				"graceful-fs": "^4.2.4",
-				"jest-circus": "^27.4.5",
-				"jest-environment-jsdom": "^27.4.4",
-				"jest-environment-node": "^27.4.4",
-				"jest-get-type": "^27.4.0",
-				"jest-jasmine2": "^27.4.5",
-				"jest-regex-util": "^27.4.0",
-				"jest-resolve": "^27.4.5",
-				"jest-runner": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-validate": "^27.4.2",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^27.4.2",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			},
-			"peerDependencies": {
-				"ts-node": ">=9.0.0"
-			},
-			"peerDependenciesMeta": {
-				"ts-node": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-diff": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz",
-			"integrity": "sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==",
-			"dev": true,
-			"dependencies": {
-				"chalk": "^4.0.0",
-				"diff-sequences": "^27.4.0",
-				"jest-get-type": "^27.4.0",
-				"pretty-format": "^27.4.2"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-docblock": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz",
-			"integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==",
-			"dev": true,
-			"dependencies": {
-				"detect-newline": "^3.0.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-each": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz",
-			"integrity": "sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^27.4.0",
-				"jest-util": "^27.4.2",
-				"pretty-format": "^27.4.2"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-environment-jsdom": {
-			"version": "27.4.4",
-			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz",
-			"integrity": "sha512-cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA==",
-			"dev": true,
-			"dependencies": {
-				"@jest/environment": "^27.4.4",
-				"@jest/fake-timers": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"jest-mock": "^27.4.2",
-				"jest-util": "^27.4.2",
-				"jsdom": "^16.6.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-environment-node": {
-			"version": "27.4.4",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.4.tgz",
-			"integrity": "sha512-D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA==",
-			"dev": true,
-			"dependencies": {
-				"@jest/environment": "^27.4.4",
-				"@jest/fake-timers": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"jest-mock": "^27.4.2",
-				"jest-util": "^27.4.2"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-fetch-mock": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz",
-			"integrity": "sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==",
-			"dev": true,
-			"dependencies": {
-				"cross-fetch": "^3.0.4",
-				"promise-polyfill": "^8.1.3"
-			}
-		},
-		"node_modules/jest-get-type": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
-			"integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==",
-			"dev": true,
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-haste-map": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.5.tgz",
-			"integrity": "sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"@types/graceful-fs": "^4.1.2",
-				"@types/node": "*",
-				"anymatch": "^3.0.3",
-				"fb-watchman": "^2.0.0",
-				"graceful-fs": "^4.2.4",
-				"jest-regex-util": "^27.4.0",
-				"jest-serializer": "^27.4.0",
-				"jest-util": "^27.4.2",
-				"jest-worker": "^27.4.5",
-				"micromatch": "^4.0.4",
-				"walker": "^1.0.7"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.2"
-			}
-		},
-		"node_modules/jest-jasmine2": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.5.tgz",
-			"integrity": "sha512-oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/traverse": "^7.1.0",
-				"@jest/environment": "^27.4.4",
-				"@jest/source-map": "^27.4.0",
-				"@jest/test-result": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"expect": "^27.4.2",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^27.4.2",
-				"jest-matcher-utils": "^27.4.2",
-				"jest-message-util": "^27.4.2",
-				"jest-runtime": "^27.4.5",
-				"jest-snapshot": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"pretty-format": "^27.4.2",
-				"throat": "^6.0.1"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-leak-detector": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz",
-			"integrity": "sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==",
-			"dev": true,
-			"dependencies": {
-				"jest-get-type": "^27.4.0",
-				"pretty-format": "^27.4.2"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-matcher-utils": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz",
-			"integrity": "sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==",
-			"dev": true,
-			"dependencies": {
-				"chalk": "^4.0.0",
-				"jest-diff": "^27.4.2",
-				"jest-get-type": "^27.4.0",
-				"pretty-format": "^27.4.2"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-message-util": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz",
-			"integrity": "sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.12.13",
-				"@jest/types": "^27.4.2",
-				"@types/stack-utils": "^2.0.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^27.4.2",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-mock": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz",
-			"integrity": "sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"@types/node": "*"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-pnp-resolver": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			},
-			"peerDependencies": {
-				"jest-resolve": "*"
-			},
-			"peerDependenciesMeta": {
-				"jest-resolve": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-regex-util": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
-			"integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==",
-			"dev": true,
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-resolve": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.5.tgz",
-			"integrity": "sha512-xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^27.4.5",
-				"jest-pnp-resolver": "^1.2.2",
-				"jest-util": "^27.4.2",
-				"jest-validate": "^27.4.2",
-				"resolve": "^1.20.0",
-				"resolve.exports": "^1.1.0",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-resolve-dependencies": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.5.tgz",
-			"integrity": "sha512-elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"jest-regex-util": "^27.4.0",
-				"jest-snapshot": "^27.4.5"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-runner": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.5.tgz",
-			"integrity": "sha512-/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/console": "^27.4.2",
-				"@jest/environment": "^27.4.4",
-				"@jest/test-result": "^27.4.2",
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"emittery": "^0.8.1",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.4",
-				"jest-docblock": "^27.4.0",
-				"jest-environment-jsdom": "^27.4.4",
-				"jest-environment-node": "^27.4.4",
-				"jest-haste-map": "^27.4.5",
-				"jest-leak-detector": "^27.4.2",
-				"jest-message-util": "^27.4.2",
-				"jest-resolve": "^27.4.5",
-				"jest-runtime": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-worker": "^27.4.5",
-				"source-map-support": "^0.5.6",
-				"throat": "^6.0.1"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-runtime": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.5.tgz",
-			"integrity": "sha512-CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ==",
-			"dev": true,
-			"dependencies": {
-				"@jest/console": "^27.4.2",
-				"@jest/environment": "^27.4.4",
-				"@jest/globals": "^27.4.4",
-				"@jest/source-map": "^27.4.0",
-				"@jest/test-result": "^27.4.2",
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/yargs": "^16.0.0",
-				"chalk": "^4.0.0",
-				"cjs-module-lexer": "^1.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"execa": "^5.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^27.4.5",
-				"jest-message-util": "^27.4.2",
-				"jest-mock": "^27.4.2",
-				"jest-regex-util": "^27.4.0",
-				"jest-resolve": "^27.4.5",
-				"jest-snapshot": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-validate": "^27.4.2",
-				"slash": "^3.0.0",
-				"strip-bom": "^4.0.0",
-				"yargs": "^16.2.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-serializer": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
-			"integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
-			"dev": true,
-			"dependencies": {
-				"@types/node": "*",
-				"graceful-fs": "^4.2.4"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-snapshot": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.5.tgz",
-			"integrity": "sha512-eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.7.2",
-				"@babel/generator": "^7.7.2",
-				"@babel/parser": "^7.7.2",
-				"@babel/plugin-syntax-typescript": "^7.7.2",
-				"@babel/traverse": "^7.7.2",
-				"@babel/types": "^7.0.0",
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/babel__traverse": "^7.0.4",
-				"@types/prettier": "^2.1.5",
-				"babel-preset-current-node-syntax": "^1.0.0",
-				"chalk": "^4.0.0",
-				"expect": "^27.4.2",
-				"graceful-fs": "^4.2.4",
-				"jest-diff": "^27.4.2",
-				"jest-get-type": "^27.4.0",
-				"jest-haste-map": "^27.4.5",
-				"jest-matcher-utils": "^27.4.2",
-				"jest-message-util": "^27.4.2",
-				"jest-resolve": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"natural-compare": "^1.4.0",
-				"pretty-format": "^27.4.2",
-				"semver": "^7.3.2"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-util": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
-			"integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"graceful-fs": "^4.2.4",
-				"picomatch": "^2.2.3"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-validate": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz",
-			"integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"camelcase": "^6.2.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^27.4.0",
-				"leven": "^3.1.0",
-				"pretty-format": "^27.4.2"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-validate/node_modules/camelcase": {
-			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
-			"integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/jest-watcher": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz",
-			"integrity": "sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/test-result": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"jest-util": "^27.4.2",
-				"string-length": "^4.0.1"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/jest-websocket-mock": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/jest-websocket-mock/-/jest-websocket-mock-2.2.1.tgz",
-			"integrity": "sha512-fhsGLXrPfs06PhHoxqOSA9yZ6Rb4qYrf4Wcm7/nfRzjlrf1gIeuhYUkzMRjjE0TMQ37SwkmeLanwrZY4ZaNp8g==",
-			"dev": true,
-			"dependencies": {
-				"jest-diff": "^27.0.2"
-			},
-			"peerDependencies": {
-				"mock-socket": "^8||^9"
-			}
-		},
-		"node_modules/jest-worker": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz",
-			"integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==",
-			"dev": true,
-			"dependencies": {
-				"@types/node": "*",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			}
-		},
-		"node_modules/jest-worker/node_modules/supports-color": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
-		"node_modules/jju": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
-			"integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
-			"dev": true
-		},
-		"node_modules/js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"dev": true
-		},
-		"node_modules/js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
-			"dependencies": {
-				"argparse": "^2.0.1"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/js-yaml/node_modules/argparse": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
-		},
-		"node_modules/jsdom": {
-			"version": "16.7.0",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-			"integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
-			"dev": true,
-			"dependencies": {
-				"abab": "^2.0.5",
-				"acorn": "^8.2.4",
-				"acorn-globals": "^6.0.0",
-				"cssom": "^0.4.4",
-				"cssstyle": "^2.3.0",
-				"data-urls": "^2.0.0",
-				"decimal.js": "^10.2.1",
-				"domexception": "^2.0.1",
-				"escodegen": "^2.0.0",
-				"form-data": "^3.0.0",
-				"html-encoding-sniffer": "^2.0.1",
-				"http-proxy-agent": "^4.0.1",
-				"https-proxy-agent": "^5.0.0",
-				"is-potential-custom-element-name": "^1.0.1",
-				"nwsapi": "^2.2.0",
-				"parse5": "6.0.1",
-				"saxes": "^5.0.1",
-				"symbol-tree": "^3.2.4",
-				"tough-cookie": "^4.0.0",
-				"w3c-hr-time": "^1.0.2",
-				"w3c-xmlserializer": "^2.0.0",
-				"webidl-conversions": "^6.1.0",
-				"whatwg-encoding": "^1.0.5",
-				"whatwg-mimetype": "^2.3.0",
-				"whatwg-url": "^8.5.0",
-				"ws": "^7.4.6",
-				"xml-name-validator": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"peerDependencies": {
-				"canvas": "^2.5.0"
-			},
-			"peerDependenciesMeta": {
-				"canvas": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-			"dev": true,
-			"bin": {
-				"jsesc": "bin/jsesc"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/json-parse-even-better-errors": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-			"dev": true
-		},
-		"node_modules/json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true
-		},
-		"node_modules/json-stable-stringify-without-jsonify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-			"dev": true
-		},
-		"node_modules/json5": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-			"dev": true,
-			"dependencies": {
-				"minimist": "^1.2.5"
-			},
-			"bin": {
-				"json5": "lib/cli.js"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/jsonfile": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-			"dev": true,
-			"optionalDependencies": {
-				"graceful-fs": "^4.1.6"
-			}
-		},
-		"node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/kleur": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/leven": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/levn": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-			"dev": true,
-			"dependencies": {
-				"prelude-ls": "^1.2.1",
-				"type-check": "~0.4.0"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/lines-and-columns": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-			"dev": true
-		},
-		"node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
-			"dependencies": {
-				"p-locate": "^4.1.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/lodash": {
-			"version": "4.17.21",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-			"dev": true
-		},
-		"node_modules/lodash.get": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-			"dev": true
-		},
-		"node_modules/lodash.isequal": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-			"dev": true
-		},
-		"node_modules/lodash.memoize": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-			"dev": true
-		},
-		"node_modules/lodash.merge": {
-			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-			"dev": true
-		},
-		"node_modules/log-symbols": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-			"dev": true,
-			"dependencies": {
-				"chalk": "^4.1.0",
-				"is-unicode-supported": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/make-dir": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/make-dir/node_modules/semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/make-error": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-			"dev": true
-		},
-		"node_modules/makeerror": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-			"dev": true,
-			"dependencies": {
-				"tmpl": "1.0.5"
-			}
-		},
-		"node_modules/map-obj": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-			"integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/meow": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-			"dev": true,
-			"dependencies": {
-				"@types/minimist": "^1.2.0",
-				"camelcase-keys": "^6.2.2",
-				"decamelize": "^1.2.0",
-				"decamelize-keys": "^1.1.0",
-				"hard-rejection": "^2.1.0",
-				"minimist-options": "4.1.0",
-				"normalize-package-data": "^3.0.0",
-				"read-pkg-up": "^7.0.1",
-				"redent": "^3.0.0",
-				"trim-newlines": "^3.0.0",
-				"type-fest": "^0.18.0",
-				"yargs-parser": "^20.2.3"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/meow/node_modules/type-fest": {
-			"version": "0.18.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-			"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/merge-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-			"dev": true
-		},
-		"node_modules/merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/micromatch": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-			"dev": true,
-			"dependencies": {
-				"braces": "^3.0.1",
-				"picomatch": "^2.2.3"
-			},
-			"engines": {
-				"node": ">=8.6"
-			}
-		},
-		"node_modules/mime-db": {
-			"version": "1.51.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-			"integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/mime-types": {
-			"version": "2.1.34",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-			"integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
-			"dev": true,
-			"dependencies": {
-				"mime-db": "1.51.0"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/mimic-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/min-indent": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/minimatch": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-			"dev": true,
-			"dependencies": {
-				"brace-expansion": "^1.1.7"
-			},
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/minimist": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-			"dev": true
-		},
-		"node_modules/minimist-options": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-			"dev": true,
-			"dependencies": {
-				"arrify": "^1.0.1",
-				"is-plain-obj": "^1.1.0",
-				"kind-of": "^6.0.3"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/mock-socket": {
-			"version": "9.0.8",
-			"resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.0.8.tgz",
-			"integrity": "sha512-8Syqkaaa2SzRqW68DEsnZkKQicHP7hVzfj3uCvigB5TL79H1ljKbwmOcRIENkx0ZTyu/5W6u+Pk9Qy6JCp38Ww==",
-			"dev": true,
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-			"dev": true
-		},
-		"node_modules/natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-			"dev": true
-		},
-		"node_modules/node-fetch": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
-			"dev": true,
-			"engines": {
-				"node": "4.x || >=6.0.0"
-			}
-		},
-		"node_modules/node-int64": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-			"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-			"dev": true
-		},
-		"node_modules/node-releases": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
-			"dev": true
-		},
-		"node_modules/normalize-package-data": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-			"integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
-			"dev": true,
-			"dependencies": {
-				"hosted-git-info": "^4.0.1",
-				"resolve": "^1.20.0",
-				"semver": "^7.3.4",
-				"validate-npm-package-license": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/npm-run-path": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-			"dev": true,
-			"dependencies": {
-				"path-key": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/nwsapi": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-			"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-			"dev": true
-		},
-		"node_modules/once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-			"dev": true,
-			"dependencies": {
-				"wrappy": "1"
-			}
-		},
-		"node_modules/onetime": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
-			"dependencies": {
-				"mimic-fn": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/optionator": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-			"dev": true,
-			"dependencies": {
-				"deep-is": "^0.1.3",
-				"fast-levenshtein": "^2.0.6",
-				"levn": "^0.4.1",
-				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0",
-				"word-wrap": "^1.2.3"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
-			"dependencies": {
-				"p-try": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/parent-module": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-			"dev": true,
-			"dependencies": {
-				"callsites": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/parse-json": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-even-better-errors": "^2.3.0",
-				"lines-and-columns": "^1.1.6"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/parse5": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-			"dev": true
-		},
-		"node_modules/path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-is-absolute": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-parse": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-			"dev": true
-		},
-		"node_modules/path-type": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-			"dev": true
-		},
-		"node_modules/picomatch": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
-			"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/pirates": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
-			"integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"dev": true,
-			"dependencies": {
-				"find-up": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/plur": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
-			"integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
-			"dev": true,
-			"dependencies": {
-				"irregular-plurals": "^3.2.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/prelude-ls": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/pretty-format": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz",
-			"integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^27.4.2",
-				"ansi-regex": "^5.0.1",
-				"ansi-styles": "^5.0.0",
-				"react-is": "^17.0.1"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/pretty-format/node_modules/ansi-styles": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/progress": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/promise-polyfill": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.2.0.tgz",
-			"integrity": "sha512-k/TC0mIcPVF6yHhUvwAp7cvL6I2fFV7TzF1DuGPI8mBh4QQazf36xCKEHKTZKRysEoTQoQdKyP25J8MPJp7j5g==",
-			"dev": true
-		},
-		"node_modules/prompts": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-			"dev": true,
-			"dependencies": {
-				"kleur": "^3.0.3",
-				"sisteransi": "^1.0.5"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/psl": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-			"dev": true
-		},
-		"node_modules/punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/queue-microtask": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			]
-		},
-		"node_modules/quick-lru": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/react-is": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-			"dev": true
-		},
-		"node_modules/read-pkg": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-			"dev": true,
-			"dependencies": {
-				"@types/normalize-package-data": "^2.4.0",
-				"normalize-package-data": "^2.5.0",
-				"parse-json": "^5.0.0",
-				"type-fest": "^0.6.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-pkg-up": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-			"dev": true,
-			"dependencies": {
-				"find-up": "^4.1.0",
-				"read-pkg": "^5.2.0",
-				"type-fest": "^0.8.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/read-pkg-up/node_modules/type-fest": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-pkg/node_modules/hosted-git-info": {
-			"version": "2.8.9",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-			"dev": true
-		},
-		"node_modules/read-pkg/node_modules/normalize-package-data": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-			"dev": true,
-			"dependencies": {
-				"hosted-git-info": "^2.1.4",
-				"resolve": "^1.10.0",
-				"semver": "2 || 3 || 4 || 5",
-				"validate-npm-package-license": "^3.0.1"
-			}
-		},
-		"node_modules/read-pkg/node_modules/semver": {
-			"version": "5.7.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver"
-			}
-		},
-		"node_modules/read-pkg/node_modules/type-fest": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/reconnecting-websocket": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz",
-			"integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng=="
-		},
-		"node_modules/redent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-			"dev": true,
-			"dependencies": {
-				"indent-string": "^4.0.0",
-				"strip-indent": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/regexpp": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
-			}
-		},
-		"node_modules/require-directory": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/resolve": {
-			"version": "1.20.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-			"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-			"dev": true,
-			"dependencies": {
-				"is-core-module": "^2.2.0",
-				"path-parse": "^1.0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/resolve-cwd": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-			"dev": true,
-			"dependencies": {
-				"resolve-from": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/resolve-cwd/node_modules/resolve-from": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/resolve-from": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/resolve.exports": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-			"integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/reusify": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-			"dev": true,
-			"engines": {
-				"iojs": ">=1.0.0",
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/rimraf": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-			"dev": true,
-			"dependencies": {
-				"glob": "^7.1.3"
-			},
-			"bin": {
-				"rimraf": "bin.js"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/run-parallel": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"dependencies": {
-				"queue-microtask": "^1.2.2"
-			}
-		},
-		"node_modules/safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-			"dev": true
-		},
-		"node_modules/safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"dev": true
-		},
-		"node_modules/saxes": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-			"integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-			"dev": true,
-			"dependencies": {
-				"xmlchars": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/semver": {
-			"version": "7.3.8",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-			"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/signal-exit": {
-			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
-			"integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
-			"dev": true
-		},
-		"node_modules/sisteransi": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-			"dev": true
-		},
-		"node_modules/slash": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map-support": {
-			"version": "0.5.21",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-			"dev": true,
-			"dependencies": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"node_modules/spdx-correct": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-			"dev": true,
-			"dependencies": {
-				"spdx-expression-parse": "^3.0.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"node_modules/spdx-exceptions": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-			"dev": true
-		},
-		"node_modules/spdx-expression-parse": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-			"dev": true,
-			"dependencies": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"node_modules/spdx-license-ids": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-			"integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
-			"dev": true
-		},
-		"node_modules/sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-			"dev": true
-		},
-		"node_modules/stack-utils": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-			"integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
-			"dev": true,
-			"dependencies": {
-				"escape-string-regexp": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/stack-utils/node_modules/escape-string-regexp": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/string-argv": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
-			"integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.6.19"
-			}
-		},
-		"node_modules/string-length": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-			"dev": true,
-			"dependencies": {
-				"char-regex": "^1.0.2",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-ansi": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"dependencies": {
-				"ansi-regex": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-bom": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-final-newline": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/strip-indent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-			"dev": true,
-			"dependencies": {
-				"min-indent": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-json-comments": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/supports-hyperlinks": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-			"integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0",
-				"supports-color": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/symbol-tree": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-			"dev": true
-		},
-		"node_modules/terminal-link": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-			"integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-			"dev": true,
-			"dependencies": {
-				"ansi-escapes": "^4.2.1",
-				"supports-hyperlinks": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/test-exclude": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-			"dev": true,
-			"dependencies": {
-				"@istanbuljs/schema": "^0.1.2",
-				"glob": "^7.1.4",
-				"minimatch": "^3.0.4"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/text-table": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-			"dev": true
-		},
-		"node_modules/throat": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-			"integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
-			"dev": true
-		},
-		"node_modules/timsort": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-			"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
-			"dev": true
-		},
-		"node_modules/tmpl": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-			"dev": true
-		},
-		"node_modules/to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/to-regex-range": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"dev": true,
-			"dependencies": {
-				"is-number": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8.0"
-			}
-		},
-		"node_modules/tough-cookie": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-			"integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-			"dev": true,
-			"dependencies": {
-				"psl": "^1.1.33",
-				"punycode": "^2.1.1",
-				"universalify": "^0.1.2"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/tr46": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-			"integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-			"dev": true,
-			"dependencies": {
-				"punycode": "^2.1.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/trim-newlines": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/ts-jest": {
-			"version": "27.1.2",
-			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.2.tgz",
-			"integrity": "sha512-eSOiJOWq6Hhs6Khzk5wKC5sgWIXgXqOCiIl1+3lfnearu58Hj4QpE5tUhQcA3xtZrELbcvAGCsd6HB8OsaVaTA==",
-			"dev": true,
-			"dependencies": {
-				"bs-logger": "0.x",
-				"fast-json-stable-stringify": "2.x",
-				"jest-util": "^27.0.0",
-				"json5": "2.x",
-				"lodash.memoize": "4.x",
-				"make-error": "1.x",
-				"semver": "7.x",
-				"yargs-parser": "20.x"
-			},
-			"bin": {
-				"ts-jest": "cli.js"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": ">=7.0.0-beta.0 <8",
-				"@types/jest": "^27.0.0",
-				"babel-jest": ">=27.0.0 <28",
-				"esbuild": "~0.14.0",
-				"jest": "^27.0.0",
-				"typescript": ">=3.8 <5.0"
-			},
-			"peerDependenciesMeta": {
-				"@babel/core": {
-					"optional": true
-				},
-				"@types/jest": {
-					"optional": true
-				},
-				"babel-jest": {
-					"optional": true
-				},
-				"esbuild": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/ts-node": {
-			"version": "10.4.0",
-			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz",
-			"integrity": "sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==",
-			"dev": true,
-			"dependencies": {
-				"@cspotcode/source-map-support": "0.7.0",
-				"@tsconfig/node10": "^1.0.7",
-				"@tsconfig/node12": "^1.0.7",
-				"@tsconfig/node14": "^1.0.0",
-				"@tsconfig/node16": "^1.0.2",
-				"acorn": "^8.4.1",
-				"acorn-walk": "^8.1.1",
-				"arg": "^4.1.0",
-				"create-require": "^1.1.0",
-				"diff": "^4.0.1",
-				"make-error": "^1.1.1",
-				"yn": "3.1.1"
-			},
-			"bin": {
-				"ts-node": "dist/bin.js",
-				"ts-node-cwd": "dist/bin-cwd.js",
-				"ts-node-script": "dist/bin-script.js",
-				"ts-node-transpile-only": "dist/bin-transpile.js",
-				"ts-script": "dist/bin-script-deprecated.js"
-			},
-			"peerDependencies": {
-				"@swc/core": ">=1.2.50",
-				"@swc/wasm": ">=1.2.50",
-				"@types/node": "*",
-				"typescript": ">=2.7"
-			},
-			"peerDependenciesMeta": {
-				"@swc/core": {
-					"optional": true
-				},
-				"@swc/wasm": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/ts-node/node_modules/acorn-walk": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-			"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/tsd": {
-			"version": "0.19.1",
-			"resolved": "https://registry.npmjs.org/tsd/-/tsd-0.19.1.tgz",
-			"integrity": "sha512-pSwchclr+ADdxlahRUQXUrdAIOjXx1T1PQV+fLfVLuo/S4z+T00YU84fH8iPlZxyA2pWgJjo42BG1p9SDb4NOw==",
-			"dev": true,
-			"dependencies": {
-				"@tsd/typescript": "~4.5.2",
-				"eslint-formatter-pretty": "^4.1.0",
-				"globby": "^11.0.1",
-				"meow": "^9.0.0",
-				"path-exists": "^4.0.0",
-				"read-pkg-up": "^7.0.0"
-			},
-			"bin": {
-				"tsd": "dist/cli.js"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/tslib": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-			"dev": true
-		},
-		"node_modules/tsutils": {
-			"version": "3.21.0",
-			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-			"dev": true,
-			"dependencies": {
-				"tslib": "^1.8.1"
-			},
-			"engines": {
-				"node": ">= 6"
-			},
-			"peerDependencies": {
-				"typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-			}
-		},
-		"node_modules/type-check": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-			"dev": true,
-			"dependencies": {
-				"prelude-ls": "^1.2.1"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/type-detect": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/type-fest": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/typedarray-to-buffer": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-			"dev": true,
-			"dependencies": {
-				"is-typedarray": "^1.0.0"
-			}
-		},
-		"node_modules/typescript": {
-			"version": "4.5.4",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
-			"integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
-			"dev": true,
-			"bin": {
-				"tsc": "bin/tsc",
-				"tsserver": "bin/tsserver"
-			},
-			"engines": {
-				"node": ">=4.2.0"
-			}
-		},
-		"node_modules/universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 4.0.0"
-			}
-		},
-		"node_modules/uri-js": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"dev": true,
-			"dependencies": {
-				"punycode": "^2.1.0"
-			}
-		},
-		"node_modules/v8-compile-cache": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-			"dev": true
-		},
-		"node_modules/v8-to-istanbul": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz",
-			"integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==",
-			"dev": true,
-			"dependencies": {
-				"@types/istanbul-lib-coverage": "^2.0.1",
-				"convert-source-map": "^1.6.0",
-				"source-map": "^0.7.3"
-			},
-			"engines": {
-				"node": ">=10.12.0"
-			}
-		},
-		"node_modules/v8-to-istanbul/node_modules/source-map": {
-			"version": "0.7.3",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-			"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-			"dev": true,
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-			"dev": true,
-			"dependencies": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
-			}
-		},
-		"node_modules/validator": {
-			"version": "13.7.0",
-			"resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
-			"integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/w3c-hr-time": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-			"dev": true,
-			"dependencies": {
-				"browser-process-hrtime": "^1.0.0"
-			}
-		},
-		"node_modules/w3c-xmlserializer": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-			"integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-			"dev": true,
-			"dependencies": {
-				"xml-name-validator": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/walker": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-			"dev": true,
-			"dependencies": {
-				"makeerror": "1.0.12"
-			}
-		},
-		"node_modules/webidl-conversions": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-			"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-			"dev": true,
-			"engines": {
-				"node": ">=10.4"
-			}
-		},
-		"node_modules/whatwg-encoding": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-			"integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-			"dev": true,
-			"dependencies": {
-				"iconv-lite": "0.4.24"
-			}
-		},
-		"node_modules/whatwg-mimetype": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-			"dev": true
-		},
-		"node_modules/whatwg-url": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-			"integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-			"dev": true,
-			"dependencies": {
-				"lodash": "^4.7.0",
-				"tr46": "^2.1.0",
-				"webidl-conversions": "^6.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/word-wrap": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/wrap-ansi": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-			"dev": true
-		},
-		"node_modules/write-file-atomic": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-			"dev": true,
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"is-typedarray": "^1.0.0",
-				"signal-exit": "^3.0.2",
-				"typedarray-to-buffer": "^3.1.5"
-			}
-		},
-		"node_modules/ws": {
-			"version": "7.5.6",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
-			"integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
-			"dev": true,
-			"engines": {
-				"node": ">=8.3.0"
-			},
-			"peerDependencies": {
-				"bufferutil": "^4.0.1",
-				"utf-8-validate": "^5.0.2"
-			},
-			"peerDependenciesMeta": {
-				"bufferutil": {
-					"optional": true
-				},
-				"utf-8-validate": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/xml-name-validator": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-			"dev": true
-		},
-		"node_modules/xmlchars": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-			"dev": true
-		},
-		"node_modules/y18n": {
-			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-		},
-		"node_modules/yargs": {
-			"version": "16.2.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-			"dev": true,
-			"dependencies": {
-				"cliui": "^7.0.2",
-				"escalade": "^3.1.1",
-				"get-caller-file": "^2.0.5",
-				"require-directory": "^2.1.1",
-				"string-width": "^4.2.0",
-				"y18n": "^5.0.5",
-				"yargs-parser": "^20.2.2"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/yargs-parser": {
-			"version": "20.2.7",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-			"integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/yn": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/z-schema": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.2.tgz",
-			"integrity": "sha512-40TH47ukMHq5HrzkeVE40Ad7eIDKaRV2b+Qpi2prLc9X9eFJFzV7tMe5aH12e6avaSS/u5l653EQOv+J9PirPw==",
-			"dev": true,
-			"dependencies": {
-				"lodash.get": "^4.4.2",
-				"lodash.isequal": "^4.5.0",
-				"validator": "^13.7.0"
-			},
-			"bin": {
-				"z-schema": "bin/z-schema"
-			},
-			"engines": {
-				"node": ">=8.0.0"
-			},
-			"optionalDependencies": {
-				"commander": "^2.7.1"
-			}
-		}
-	},
-	"dependencies": {
-		"@babel/code-frame": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-			"dev": true,
-			"requires": {
-				"@babel/highlight": "^7.16.7"
-			}
-		},
-		"@babel/compat-data": {
-			"version": "7.16.4",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
-			"integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==",
-			"dev": true
-		},
-		"@babel/core": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz",
-			"integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.16.7",
-				"@babel/generator": "^7.16.7",
-				"@babel/helper-compilation-targets": "^7.16.7",
-				"@babel/helper-module-transforms": "^7.16.7",
-				"@babel/helpers": "^7.16.7",
-				"@babel/parser": "^7.16.7",
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.16.7",
-				"@babel/types": "^7.16.7",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.1.2",
-				"semver": "^6.3.0",
-				"source-map": "^0.5.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				}
-			}
-		},
-		"@babel/generator": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.7.tgz",
-			"integrity": "sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7",
-				"jsesc": "^2.5.1",
-				"source-map": "^0.5.0"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				}
-			}
-		},
-		"@babel/helper-compilation-targets": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
-			"integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
-			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.16.4",
-				"@babel/helper-validator-option": "^7.16.7",
-				"browserslist": "^4.17.5",
-				"semver": "^6.3.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/helper-environment-visitor": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-			"integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-function-name": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
-			"integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-get-function-arity": "^7.16.7",
-				"@babel/template": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-get-function-arity": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
-			"integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-hoist-variables": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-			"integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-module-imports": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-			"integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-module-transforms": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
-			"integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.16.7",
-				"@babel/helper-module-imports": "^7.16.7",
-				"@babel/helper-simple-access": "^7.16.7",
-				"@babel/helper-split-export-declaration": "^7.16.7",
-				"@babel/helper-validator-identifier": "^7.16.7",
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-plugin-utils": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
-			"integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
-			"dev": true
-		},
-		"@babel/helper-simple-access": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
-			"integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-			"integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-validator-identifier": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-			"dev": true
-		},
-		"@babel/helper-validator-option": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-			"integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-			"dev": true
-		},
-		"@babel/helpers": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
-			"integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
-			"dev": true,
-			"requires": {
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/highlight": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz",
-			"integrity": "sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-validator-identifier": "^7.16.7",
-				"chalk": "^2.0.0",
-				"js-tokens": "^4.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"color-convert": {
-					"version": "1.9.3",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-					"dev": true,
-					"requires": {
-						"color-name": "1.1.3"
-					}
-				},
-				"color-name": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-					"dev": true
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
-			}
-		},
-		"@babel/parser": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.7.tgz",
-			"integrity": "sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==",
-			"dev": true
-		},
-		"@babel/plugin-syntax-async-generators": {
-			"version": "7.8.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-bigint": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-class-properties": {
-			"version": "7.12.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.12.13"
-			}
-		},
-		"@babel/plugin-syntax-import-meta": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			}
-		},
-		"@babel/plugin-syntax-json-strings": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-logical-assignment-operators": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			}
-		},
-		"@babel/plugin-syntax-nullish-coalescing-operator": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-numeric-separator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			}
-		},
-		"@babel/plugin-syntax-object-rest-spread": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-optional-catch-binding": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-optional-chaining": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-top-level-await": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			}
-		},
-		"@babel/plugin-syntax-typescript": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz",
-			"integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.16.7"
-			}
-		},
-		"@babel/template": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-			"integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.16.7",
-				"@babel/parser": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/traverse": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.7.tgz",
-			"integrity": "sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.16.7",
-				"@babel/generator": "^7.16.7",
-				"@babel/helper-environment-visitor": "^7.16.7",
-				"@babel/helper-function-name": "^7.16.7",
-				"@babel/helper-hoist-variables": "^7.16.7",
-				"@babel/helper-split-export-declaration": "^7.16.7",
-				"@babel/parser": "^7.16.7",
-				"@babel/types": "^7.16.7",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"dependencies": {
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/types": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.7.tgz",
-			"integrity": "sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-validator-identifier": "^7.16.7",
-				"to-fast-properties": "^2.0.0"
-			}
-		},
-		"@bcoe/v8-coverage": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-			"dev": true
-		},
-		"@cspotcode/source-map-consumer": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
-			"integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
-			"dev": true
-		},
-		"@cspotcode/source-map-support": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
-			"integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
-			"dev": true,
-			"requires": {
-				"@cspotcode/source-map-consumer": "0.8.0"
-			}
-		},
-		"@eslint/eslintrc": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
-			"integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==",
-			"dev": true,
-			"requires": {
-				"ajv": "^6.12.4",
-				"debug": "^4.3.2",
-				"espree": "^9.2.0",
-				"globals": "^13.9.0",
-				"ignore": "^4.0.6",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.0.4",
-				"strip-json-comments": "^3.1.1"
-			},
-			"dependencies": {
-				"ignore": {
-					"version": "4.0.6",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-					"dev": true
-				}
-			}
-		},
-		"@humanwhocodes/config-array": {
-			"version": "0.9.2",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz",
-			"integrity": "sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==",
-			"dev": true,
-			"requires": {
-				"@humanwhocodes/object-schema": "^1.2.1",
-				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
-			}
-		},
-		"@humanwhocodes/object-schema": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-			"dev": true
-		},
-		"@istanbuljs/load-nyc-config": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-			"dev": true,
-			"requires": {
-				"camelcase": "^5.3.1",
-				"find-up": "^4.1.0",
-				"get-package-type": "^0.1.0",
-				"js-yaml": "^3.13.1",
-				"resolve-from": "^5.0.0"
-			},
-			"dependencies": {
-				"js-yaml": {
-					"version": "3.14.1",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-					"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-					"dev": true,
-					"requires": {
-						"argparse": "^1.0.7",
-						"esprima": "^4.0.0"
-					}
-				},
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				}
-			}
-		},
-		"@istanbuljs/schema": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-			"dev": true
-		},
-		"@jest/console": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz",
-			"integrity": "sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"jest-message-util": "^27.4.2",
-				"jest-util": "^27.4.2",
-				"slash": "^3.0.0"
-			}
-		},
-		"@jest/core": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.5.tgz",
-			"integrity": "sha512-3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^27.4.2",
-				"@jest/reporters": "^27.4.5",
-				"@jest/test-result": "^27.4.2",
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"emittery": "^0.8.1",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.4",
-				"jest-changed-files": "^27.4.2",
-				"jest-config": "^27.4.5",
-				"jest-haste-map": "^27.4.5",
-				"jest-message-util": "^27.4.2",
-				"jest-regex-util": "^27.4.0",
-				"jest-resolve": "^27.4.5",
-				"jest-resolve-dependencies": "^27.4.5",
-				"jest-runner": "^27.4.5",
-				"jest-runtime": "^27.4.5",
-				"jest-snapshot": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-validate": "^27.4.2",
-				"jest-watcher": "^27.4.2",
-				"micromatch": "^4.0.4",
-				"rimraf": "^3.0.0",
-				"slash": "^3.0.0",
-				"strip-ansi": "^6.0.0"
-			}
-		},
-		"@jest/environment": {
-			"version": "27.4.4",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.4.tgz",
-			"integrity": "sha512-q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ==",
-			"dev": true,
-			"requires": {
-				"@jest/fake-timers": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"jest-mock": "^27.4.2"
-			}
-		},
-		"@jest/fake-timers": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz",
-			"integrity": "sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"@sinonjs/fake-timers": "^8.0.1",
-				"@types/node": "*",
-				"jest-message-util": "^27.4.2",
-				"jest-mock": "^27.4.2",
-				"jest-util": "^27.4.2"
-			}
-		},
-		"@jest/globals": {
-			"version": "27.4.4",
-			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.4.tgz",
-			"integrity": "sha512-bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^27.4.4",
-				"@jest/types": "^27.4.2",
-				"expect": "^27.4.2"
-			}
-		},
-		"@jest/reporters": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.5.tgz",
-			"integrity": "sha512-3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA==",
-			"dev": true,
-			"requires": {
-				"@bcoe/v8-coverage": "^0.2.3",
-				"@jest/console": "^27.4.2",
-				"@jest/test-result": "^27.4.2",
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.2",
-				"graceful-fs": "^4.2.4",
-				"istanbul-lib-coverage": "^3.0.0",
-				"istanbul-lib-instrument": "^4.0.3",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-lib-source-maps": "^4.0.0",
-				"istanbul-reports": "^3.0.2",
-				"jest-haste-map": "^27.4.5",
-				"jest-resolve": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-worker": "^27.4.5",
-				"slash": "^3.0.0",
-				"source-map": "^0.6.0",
-				"string-length": "^4.0.1",
-				"terminal-link": "^2.0.0",
-				"v8-to-istanbul": "^8.1.0"
-			}
-		},
-		"@jest/source-map": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz",
-			"integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==",
-			"dev": true,
-			"requires": {
-				"callsites": "^3.0.0",
-				"graceful-fs": "^4.2.4",
-				"source-map": "^0.6.0"
-			}
-		},
-		"@jest/test-result": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz",
-			"integrity": "sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"collect-v8-coverage": "^1.0.0"
-			}
-		},
-		"@jest/test-sequencer": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.5.tgz",
-			"integrity": "sha512-n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ==",
-			"dev": true,
-			"requires": {
-				"@jest/test-result": "^27.4.2",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^27.4.5",
-				"jest-runtime": "^27.4.5"
-			}
-		},
-		"@jest/transform": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.5.tgz",
-			"integrity": "sha512-PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.1.0",
-				"@jest/types": "^27.4.2",
-				"babel-plugin-istanbul": "^6.0.0",
-				"chalk": "^4.0.0",
-				"convert-source-map": "^1.4.0",
-				"fast-json-stable-stringify": "^2.0.0",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^27.4.5",
-				"jest-regex-util": "^27.4.0",
-				"jest-util": "^27.4.2",
-				"micromatch": "^4.0.4",
-				"pirates": "^4.0.1",
-				"slash": "^3.0.0",
-				"source-map": "^0.6.1",
-				"write-file-atomic": "^3.0.0"
-			}
-		},
-		"@jest/types": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
-			"integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^16.0.0",
-				"chalk": "^4.0.0"
-			}
-		},
-		"@microsoft/api-extractor": {
-			"version": "7.19.3",
-			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.19.3.tgz",
-			"integrity": "sha512-GZe+R3K4kh2X425iOHkPbByysB7FN0592mPPA6vNj5IhyhlPHgdZS6m6AmOZOIxMS4euM+SBKzEJEp3oC+WsOQ==",
-			"dev": true,
-			"requires": {
-				"@microsoft/api-extractor-model": "7.15.2",
-				"@microsoft/tsdoc": "0.13.2",
-				"@microsoft/tsdoc-config": "~0.15.2",
-				"@rushstack/node-core-library": "3.44.3",
-				"@rushstack/rig-package": "0.3.7",
-				"@rushstack/ts-command-line": "4.10.6",
-				"colors": "~1.2.1",
-				"lodash": "~4.17.15",
-				"resolve": "~1.17.0",
-				"semver": "~7.3.0",
-				"source-map": "~0.6.1",
-				"typescript": "~4.5.2"
-			},
-			"dependencies": {
-				"resolve": {
-					"version": "1.17.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-					"dev": true,
-					"requires": {
-						"path-parse": "^1.0.6"
-					}
-				}
-			}
-		},
-		"@microsoft/api-extractor-model": {
-			"version": "7.15.2",
-			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.15.2.tgz",
-			"integrity": "sha512-qgxKX/s6vo3nCVLhP0Ds7555QrErhcYHEok5/KyEZ7iR8J5M5oldD1eJJQmtEdVF5IzmnPPbxx1nRvfgA674LQ==",
-			"dev": true,
-			"requires": {
-				"@microsoft/tsdoc": "0.13.2",
-				"@microsoft/tsdoc-config": "~0.15.2",
-				"@rushstack/node-core-library": "3.44.3"
-			}
-		},
-		"@microsoft/tsdoc": {
-			"version": "0.13.2",
-			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
-			"integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
-			"dev": true
-		},
-		"@microsoft/tsdoc-config": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
-			"integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
-			"dev": true,
-			"requires": {
-				"@microsoft/tsdoc": "0.13.2",
-				"ajv": "~6.12.6",
-				"jju": "~1.4.0",
-				"resolve": "~1.19.0"
-			},
-			"dependencies": {
-				"resolve": {
-					"version": "1.19.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
-					"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
-					"dev": true,
-					"requires": {
-						"is-core-module": "^2.1.0",
-						"path-parse": "^1.0.6"
-					}
-				}
-			}
-		},
-		"@nodelib/fs.scandir": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
-			"integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
-			"dev": true,
-			"requires": {
-				"@nodelib/fs.stat": "2.0.4",
-				"run-parallel": "^1.1.9"
-			}
-		},
-		"@nodelib/fs.stat": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
-			"integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
-			"dev": true
-		},
-		"@nodelib/fs.walk": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
-			"integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
-			"dev": true,
-			"requires": {
-				"@nodelib/fs.scandir": "2.1.4",
-				"fastq": "^1.6.0"
-			}
-		},
-		"@rushstack/node-core-library": {
-			"version": "3.44.3",
-			"resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.44.3.tgz",
-			"integrity": "sha512-Bt+R5LAnVr2BImTJqPpton5rvhJ2Wq8x4BaTqaCHQMmfxqtz5lb4nLYT9kneMJTCDuRMBvvLpSuz4MBj50PV3w==",
-			"dev": true,
-			"requires": {
-				"@types/node": "12.20.24",
-				"colors": "~1.2.1",
-				"fs-extra": "~7.0.1",
-				"import-lazy": "~4.0.0",
-				"jju": "~1.4.0",
-				"resolve": "~1.17.0",
-				"semver": "~7.3.0",
-				"timsort": "~0.3.0",
-				"z-schema": "~5.0.2"
-			},
-			"dependencies": {
-				"@types/node": {
-					"version": "12.20.24",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz",
-					"integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==",
-					"dev": true
-				},
-				"resolve": {
-					"version": "1.17.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-					"dev": true,
-					"requires": {
-						"path-parse": "^1.0.6"
-					}
-				}
-			}
-		},
-		"@rushstack/rig-package": {
-			"version": "0.3.7",
-			"resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.7.tgz",
-			"integrity": "sha512-pzMsTSeTC8IiZ6EJLr53gGMvhT4oLWH+hxD7907cHyWuIUlEXFtu/2pK25vUQT13nKp5DJCWxXyYoGRk/h6rtA==",
-			"dev": true,
-			"requires": {
-				"resolve": "~1.17.0",
-				"strip-json-comments": "~3.1.1"
-			},
-			"dependencies": {
-				"resolve": {
-					"version": "1.17.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-					"dev": true,
-					"requires": {
-						"path-parse": "^1.0.6"
-					}
-				}
-			}
-		},
-		"@rushstack/ts-command-line": {
-			"version": "4.10.6",
-			"resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.10.6.tgz",
-			"integrity": "sha512-Y3GkUag39sTIlukDg9mUp8MCHrrlJ27POrBNRQGc/uF+VVgX8M7zMzHch5zP6O1QVquWgD7Engdpn2piPYaS/g==",
-			"dev": true,
-			"requires": {
-				"@types/argparse": "1.0.38",
-				"argparse": "~1.0.9",
-				"colors": "~1.2.1",
-				"string-argv": "~0.3.1"
-			}
-		},
-		"@sinonjs/commons": {
-			"version": "1.8.3",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-			"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-			"dev": true,
-			"requires": {
-				"type-detect": "4.0.8"
-			}
-		},
-		"@sinonjs/fake-timers": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-			"integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-			"dev": true,
-			"requires": {
-				"@sinonjs/commons": "^1.7.0"
-			}
-		},
-		"@tootallnate/once": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-			"dev": true
-		},
-		"@tsconfig/node10": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
-			"integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
-			"dev": true
-		},
-		"@tsconfig/node12": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
-			"integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
-			"dev": true
-		},
-		"@tsconfig/node14": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
-			"integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
-			"dev": true
-		},
-		"@tsconfig/node16": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
-			"integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
-			"dev": true
-		},
-		"@tsd/typescript": {
-			"version": "4.5.4",
-			"resolved": "https://registry.npmjs.org/@tsd/typescript/-/typescript-4.5.4.tgz",
-			"integrity": "sha512-iDlLkdg3sCjUSNdoUCsYM/SXheHrdxHsR6msIkbFDW4pV6gHTMwg/8te/paLtywDjGL4S4ByDdUKA3RbfdBX0g==",
-			"dev": true
-		},
-		"@types/argparse": {
-			"version": "1.0.38",
-			"resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz",
-			"integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==",
-			"dev": true
-		},
-		"@types/babel__core": {
-			"version": "7.1.18",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz",
-			"integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
-			"dev": true,
-			"requires": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0",
-				"@types/babel__generator": "*",
-				"@types/babel__template": "*",
-				"@types/babel__traverse": "*"
-			}
-		},
-		"@types/babel__generator": {
-			"version": "7.6.4",
-			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-			"integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@types/babel__template": {
-			"version": "7.4.1",
-			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-			"integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-			"dev": true,
-			"requires": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@types/babel__traverse": {
-			"version": "7.14.2",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
-			"integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.3.0"
-			}
-		},
-		"@types/eslint": {
-			"version": "7.29.0",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
-			"integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
-			"dev": true,
-			"requires": {
-				"@types/estree": "*",
-				"@types/json-schema": "*"
-			}
-		},
-		"@types/estree": {
-			"version": "0.0.50",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-			"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
-			"dev": true
-		},
-		"@types/graceful-fs": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-			"integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/istanbul-lib-coverage": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-			"integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
-			"dev": true
-		},
-		"@types/istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "*"
-			}
-		},
-		"@types/istanbul-reports": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-			"integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-report": "*"
-			}
-		},
-		"@types/jest": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz",
-			"integrity": "sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==",
-			"dev": true,
-			"requires": {
-				"jest-diff": "^27.0.0",
-				"pretty-format": "^27.0.0"
-			}
-		},
-		"@types/json-schema": {
-			"version": "7.0.9",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-			"dev": true
-		},
-		"@types/minimist": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
-			"integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
-			"dev": true
-		},
-		"@types/node": {
-			"version": "17.0.5",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.5.tgz",
-			"integrity": "sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw==",
-			"dev": true
-		},
-		"@types/normalize-package-data": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-			"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-			"dev": true
-		},
-		"@types/prettier": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
-			"integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
-			"dev": true
-		},
-		"@types/stack-utils": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-			"integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
-			"dev": true
-		},
-		"@types/yargs": {
-			"version": "16.0.4",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-			"integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-			"dev": true,
-			"requires": {
-				"@types/yargs-parser": "*"
-			}
-		},
-		"@types/yargs-parser": {
-			"version": "20.2.1",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
-			"integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
-			"dev": true
-		},
-		"@typescript-eslint/eslint-plugin": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.1.tgz",
-			"integrity": "sha512-wTZ5oEKrKj/8/366qTM366zqhIKAp6NCMweoRONtfuC07OAU9nVI2GZZdqQ1qD30WAAtcPdkH+npDwtRFdp4Rw==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/experimental-utils": "5.8.1",
-				"@typescript-eslint/scope-manager": "5.8.1",
-				"debug": "^4.3.2",
-				"functional-red-black-tree": "^1.0.1",
-				"ignore": "^5.1.8",
-				"regexpp": "^3.2.0",
-				"semver": "^7.3.5",
-				"tsutils": "^3.21.0"
-			}
-		},
-		"@typescript-eslint/experimental-utils": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.1.tgz",
-			"integrity": "sha512-fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww==",
-			"dev": true,
-			"requires": {
-				"@types/json-schema": "^7.0.9",
-				"@typescript-eslint/scope-manager": "5.8.1",
-				"@typescript-eslint/types": "5.8.1",
-				"@typescript-eslint/typescript-estree": "5.8.1",
-				"eslint-scope": "^5.1.1",
-				"eslint-utils": "^3.0.0"
-			}
-		},
-		"@typescript-eslint/parser": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.8.1.tgz",
-			"integrity": "sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/scope-manager": "5.8.1",
-				"@typescript-eslint/types": "5.8.1",
-				"@typescript-eslint/typescript-estree": "5.8.1",
-				"debug": "^4.3.2"
-			}
-		},
-		"@typescript-eslint/scope-manager": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.8.1.tgz",
-			"integrity": "sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/types": "5.8.1",
-				"@typescript-eslint/visitor-keys": "5.8.1"
-			}
-		},
-		"@typescript-eslint/types": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.1.tgz",
-			"integrity": "sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==",
-			"dev": true
-		},
-		"@typescript-eslint/typescript-estree": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz",
-			"integrity": "sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/types": "5.8.1",
-				"@typescript-eslint/visitor-keys": "5.8.1",
-				"debug": "^4.3.2",
-				"globby": "^11.0.4",
-				"is-glob": "^4.0.3",
-				"semver": "^7.3.5",
-				"tsutils": "^3.21.0"
-			}
-		},
-		"@typescript-eslint/visitor-keys": {
-			"version": "5.8.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.1.tgz",
-			"integrity": "sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/types": "5.8.1",
-				"eslint-visitor-keys": "^3.0.0"
-			}
-		},
-		"abab": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-			"integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
-			"dev": true
-		},
-		"acorn": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-			"dev": true
-		},
-		"acorn-globals": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-			"integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-			"dev": true,
-			"requires": {
-				"acorn": "^7.1.1",
-				"acorn-walk": "^7.1.1"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "7.4.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-					"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-					"dev": true
-				}
-			}
-		},
-		"acorn-jsx": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true,
-			"requires": {}
-		},
-		"acorn-walk": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-			"dev": true
-		},
-		"agent-base": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-			"dev": true,
-			"requires": {
-				"debug": "4"
-			}
-		},
-		"ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
-			"requires": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
-			}
-		},
-		"ansi-colors": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-			"dev": true
-		},
-		"ansi-escapes": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-			"dev": true,
-			"requires": {
-				"type-fest": "^0.21.3"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.21.3",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-					"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-					"dev": true
-				}
-			}
-		},
-		"ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-			"dev": true
-		},
-		"ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"requires": {
-				"color-convert": "^2.0.1"
-			}
-		},
-		"anymatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-			"dev": true,
-			"requires": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
-			}
-		},
-		"arg": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-			"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-			"dev": true
-		},
-		"argparse": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-			"dev": true,
-			"requires": {
-				"sprintf-js": "~1.0.2"
-			}
-		},
-		"array-union": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-			"dev": true
-		},
-		"arrify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-			"dev": true
-		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true
-		},
-		"autobind-decorator": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/autobind-decorator/-/autobind-decorator-2.4.0.tgz",
-			"integrity": "sha512-OGYhWUO72V6DafbF8PM8rm3EPbfuyMZcJhtm5/n26IDwO18pohE4eNazLoCGhPiXOCD0gEGmrbU3849QvM8bbw=="
-		},
-		"babel-jest": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.5.tgz",
-			"integrity": "sha512-3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA==",
-			"dev": true,
-			"requires": {
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/babel__core": "^7.1.14",
-				"babel-plugin-istanbul": "^6.0.0",
-				"babel-preset-jest": "^27.4.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"slash": "^3.0.0"
-			}
-		},
-		"babel-plugin-istanbul": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-instrument": "^5.0.4",
-				"test-exclude": "^6.0.0"
-			},
-			"dependencies": {
-				"istanbul-lib-instrument": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
-					"integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
-					"dev": true,
-					"requires": {
-						"@babel/core": "^7.12.3",
-						"@babel/parser": "^7.14.7",
-						"@istanbuljs/schema": "^0.1.2",
-						"istanbul-lib-coverage": "^3.2.0",
-						"semver": "^6.3.0"
-					}
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
-		"babel-plugin-jest-hoist": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz",
-			"integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==",
-			"dev": true,
-			"requires": {
-				"@babel/template": "^7.3.3",
-				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.0.0",
-				"@types/babel__traverse": "^7.0.6"
-			}
-		},
-		"babel-preset-current-node-syntax": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-			"dev": true,
-			"requires": {
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-bigint": "^7.8.3",
-				"@babel/plugin-syntax-class-properties": "^7.8.3",
-				"@babel/plugin-syntax-import-meta": "^7.8.3",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-top-level-await": "^7.8.3"
-			}
-		},
-		"babel-preset-jest": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz",
-			"integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==",
-			"dev": true,
-			"requires": {
-				"babel-plugin-jest-hoist": "^27.4.0",
-				"babel-preset-current-node-syntax": "^1.0.0"
-			}
-		},
-		"balanced-match": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-			"dev": true
-		},
-		"brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"requires": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-			"dev": true,
-			"requires": {
-				"fill-range": "^7.0.1"
-			}
-		},
-		"browser-process-hrtime": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-			"dev": true
-		},
-		"browserslist": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
-			"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
-			"dev": true,
-			"requires": {
-				"caniuse-lite": "^1.0.30001286",
-				"electron-to-chromium": "^1.4.17",
-				"escalade": "^3.1.1",
-				"node-releases": "^2.0.1",
-				"picocolors": "^1.0.0"
-			}
-		},
-		"bs-logger": {
-			"version": "0.2.6",
-			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-			"dev": true,
-			"requires": {
-				"fast-json-stable-stringify": "2.x"
-			}
-		},
-		"bser": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-			"dev": true,
-			"requires": {
-				"node-int64": "^0.4.0"
-			}
-		},
-		"buffer-from": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-			"dev": true
-		},
-		"callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-			"dev": true
-		},
-		"camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-			"dev": true
-		},
-		"camelcase-keys": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-			"dev": true,
-			"requires": {
-				"camelcase": "^5.3.1",
-				"map-obj": "^4.0.0",
-				"quick-lru": "^4.0.1"
-			}
-		},
-		"caniuse-lite": {
-			"version": "1.0.30001294",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz",
-			"integrity": "sha512-LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g==",
-			"dev": true
-		},
-		"chalk": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-			"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-			"dev": true,
-			"requires": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			}
-		},
-		"char-regex": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-			"dev": true
-		},
-		"ci-info": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-			"integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-			"dev": true
-		},
-		"cjs-module-lexer": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-			"integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
-			"dev": true
-		},
-		"cliui": {
-			"version": "7.0.4",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-			"dev": true,
-			"requires": {
-				"string-width": "^4.2.0",
-				"strip-ansi": "^6.0.0",
-				"wrap-ansi": "^7.0.0"
-			}
-		},
-		"co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-			"dev": true
-		},
-		"collect-v8-coverage": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-			"dev": true
-		},
-		"color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"requires": {
-				"color-name": "~1.1.4"
-			}
-		},
-		"color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
-		"colors": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
-			"integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
-			"dev": true
-		},
-		"combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"dev": true,
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
-		"commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"dev": true,
-			"optional": true
-		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-			"dev": true
-		},
-		"convert-source-map": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "~5.1.1"
-			}
-		},
-		"create-require": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-			"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-			"dev": true
-		},
-		"cross-fetch": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
-			"integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
-			"dev": true,
-			"requires": {
-				"node-fetch": "2.6.1"
-			}
-		},
-		"cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
-			"requires": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			}
-		},
-		"cssom": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-			"integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-			"dev": true
-		},
-		"cssstyle": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-			"integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-			"dev": true,
-			"requires": {
-				"cssom": "~0.3.6"
-			},
-			"dependencies": {
-				"cssom": {
-					"version": "0.3.8",
-					"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-					"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-					"dev": true
-				}
-			}
-		},
-		"data-urls": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-			"integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-			"dev": true,
-			"requires": {
-				"abab": "^2.0.3",
-				"whatwg-mimetype": "^2.3.0",
-				"whatwg-url": "^8.0.0"
-			}
-		},
-		"debug": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-			"dev": true,
-			"requires": {
-				"ms": "2.1.2"
-			}
-		},
-		"decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-			"dev": true
-		},
-		"decamelize-keys": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-			"integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-			"dev": true,
-			"requires": {
-				"decamelize": "^1.1.0",
-				"map-obj": "^1.0.0"
-			},
-			"dependencies": {
-				"map-obj": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-					"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-					"dev": true
-				}
-			}
-		},
-		"decimal.js": {
-			"version": "10.3.1",
-			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-			"integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
-			"dev": true
-		},
-		"dedent": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
-			"dev": true
-		},
-		"deep-is": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-			"dev": true
-		},
-		"deepmerge": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-			"dev": true
-		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true
-		},
-		"detect-newline": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-			"dev": true
-		},
-		"diff": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-			"dev": true
-		},
-		"diff-sequences": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz",
-			"integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==",
-			"dev": true
-		},
-		"dir-glob": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-			"dev": true,
-			"requires": {
-				"path-type": "^4.0.0"
-			}
-		},
-		"doctrine": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-			"dev": true,
-			"requires": {
-				"esutils": "^2.0.2"
-			}
-		},
-		"domexception": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-			"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-			"dev": true,
-			"requires": {
-				"webidl-conversions": "^5.0.0"
-			},
-			"dependencies": {
-				"webidl-conversions": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-					"dev": true
-				}
-			}
-		},
-		"electron-to-chromium": {
-			"version": "1.4.31",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.31.tgz",
-			"integrity": "sha512-t3XVQtk+Frkv6aTD4RRk0OqosU+VLe1dQFW83MDer78ZD6a52frgXuYOIsLYTQiH2Lm+JB2OKYcn7zrX+YGAiQ==",
-			"dev": true
-		},
-		"emittery": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-			"integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
-			"dev": true
-		},
-		"emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
-		},
-		"enquirer": {
-			"version": "2.3.6",
-			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-			"dev": true,
-			"requires": {
-				"ansi-colors": "^4.1.1"
-			}
-		},
-		"error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"dev": true,
-			"requires": {
-				"is-arrayish": "^0.2.1"
-			}
-		},
-		"escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-			"dev": true
-		},
-		"escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true
-		},
-		"escodegen": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-			"integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-			"dev": true,
-			"requires": {
-				"esprima": "^4.0.1",
-				"estraverse": "^5.2.0",
-				"esutils": "^2.0.2",
-				"optionator": "^0.8.1",
-				"source-map": "~0.6.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				},
-				"levn": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-					"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-					"dev": true,
-					"requires": {
-						"prelude-ls": "~1.1.2",
-						"type-check": "~0.3.2"
-					}
-				},
-				"optionator": {
-					"version": "0.8.3",
-					"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-					"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-					"dev": true,
-					"requires": {
-						"deep-is": "~0.1.3",
-						"fast-levenshtein": "~2.0.6",
-						"levn": "~0.3.0",
-						"prelude-ls": "~1.1.2",
-						"type-check": "~0.3.2",
-						"word-wrap": "~1.2.3"
-					}
-				},
-				"prelude-ls": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-					"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-					"dev": true
-				},
-				"type-check": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-					"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-					"dev": true,
-					"requires": {
-						"prelude-ls": "~1.1.2"
-					}
-				}
-			}
-		},
-		"eslint": {
-			"version": "8.6.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.6.0.tgz",
-			"integrity": "sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==",
-			"dev": true,
-			"requires": {
-				"@eslint/eslintrc": "^1.0.5",
-				"@humanwhocodes/config-array": "^0.9.2",
-				"ajv": "^6.10.0",
-				"chalk": "^4.0.0",
-				"cross-spawn": "^7.0.2",
-				"debug": "^4.3.2",
-				"doctrine": "^3.0.0",
-				"enquirer": "^2.3.5",
-				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^7.1.0",
-				"eslint-utils": "^3.0.0",
-				"eslint-visitor-keys": "^3.1.0",
-				"espree": "^9.3.0",
-				"esquery": "^1.4.0",
-				"esutils": "^2.0.2",
-				"fast-deep-equal": "^3.1.3",
-				"file-entry-cache": "^6.0.1",
-				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.6.0",
-				"ignore": "^4.0.6",
-				"import-fresh": "^3.0.0",
-				"imurmurhash": "^0.1.4",
-				"is-glob": "^4.0.0",
-				"js-yaml": "^4.1.0",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"levn": "^0.4.1",
-				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.0.4",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.1",
-				"progress": "^2.0.0",
-				"regexpp": "^3.2.0",
-				"semver": "^7.2.1",
-				"strip-ansi": "^6.0.1",
-				"strip-json-comments": "^3.1.0",
-				"text-table": "^0.2.0",
-				"v8-compile-cache": "^2.0.3"
-			},
-			"dependencies": {
-				"eslint-scope": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
-					"integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
-					"dev": true,
-					"requires": {
-						"esrecurse": "^4.3.0",
-						"estraverse": "^5.2.0"
-					}
-				},
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				},
-				"glob-parent": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-					"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.3"
-					}
-				},
-				"ignore": {
-					"version": "4.0.6",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-					"dev": true
-				}
-			}
-		},
-		"eslint-formatter-pretty": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz",
-			"integrity": "sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==",
-			"dev": true,
-			"requires": {
-				"@types/eslint": "^7.2.13",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.1.0",
-				"eslint-rule-docs": "^1.1.5",
-				"log-symbols": "^4.0.0",
-				"plur": "^4.0.0",
-				"string-width": "^4.2.0",
-				"supports-hyperlinks": "^2.0.0"
-			}
-		},
-		"eslint-rule-docs": {
-			"version": "1.1.231",
-			"resolved": "https://registry.npmjs.org/eslint-rule-docs/-/eslint-rule-docs-1.1.231.tgz",
-			"integrity": "sha512-egHz9A1WG7b8CS0x1P6P/Rj5FqZOjray/VjpJa14tMZalfRKvpE2ONJ3plCM7+PcinmU4tcmbPLv0VtwzSdLVA==",
-			"dev": true
-		},
-		"eslint-scope": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-			"dev": true,
-			"requires": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^4.1.1"
-			}
-		},
-		"eslint-utils": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-			"dev": true,
-			"requires": {
-				"eslint-visitor-keys": "^2.0.0"
-			},
-			"dependencies": {
-				"eslint-visitor-keys": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-					"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-					"dev": true
-				}
-			}
-		},
-		"eslint-visitor-keys": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-			"integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
-			"dev": true
-		},
-		"espree": {
-			"version": "9.3.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
-			"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
-			"dev": true,
-			"requires": {
-				"acorn": "^8.7.0",
-				"acorn-jsx": "^5.3.1",
-				"eslint-visitor-keys": "^3.1.0"
-			}
-		},
-		"esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-			"dev": true
-		},
-		"esquery": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-			"dev": true,
-			"requires": {
-				"estraverse": "^5.1.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				}
-			}
-		},
-		"esrecurse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-			"dev": true,
-			"requires": {
-				"estraverse": "^5.2.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				}
-			}
-		},
-		"estraverse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-			"dev": true
-		},
-		"esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-			"dev": true
-		},
-		"eventemitter3": {
-			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-		},
-		"execa": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-			"dev": true,
-			"requires": {
-				"cross-spawn": "^7.0.3",
-				"get-stream": "^6.0.0",
-				"human-signals": "^2.1.0",
-				"is-stream": "^2.0.0",
-				"merge-stream": "^2.0.0",
-				"npm-run-path": "^4.0.1",
-				"onetime": "^5.1.2",
-				"signal-exit": "^3.0.3",
-				"strip-final-newline": "^2.0.0"
-			}
-		},
-		"exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
-		},
-		"expect": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz",
-			"integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"ansi-styles": "^5.0.0",
-				"jest-get-type": "^27.4.0",
-				"jest-matcher-utils": "^27.4.2",
-				"jest-message-util": "^27.4.2",
-				"jest-regex-util": "^27.4.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-					"dev": true
-				}
-			}
-		},
-		"fast-deep-equal": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-			"dev": true
-		},
-		"fast-glob": {
-			"version": "3.2.5",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-			"integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
-			"dev": true,
-			"requires": {
-				"@nodelib/fs.stat": "^2.0.2",
-				"@nodelib/fs.walk": "^1.2.3",
-				"glob-parent": "^5.1.0",
-				"merge2": "^1.3.0",
-				"micromatch": "^4.0.2",
-				"picomatch": "^2.2.1"
-			}
-		},
-		"fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true
-		},
-		"fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-			"dev": true
-		},
-		"fastq": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-			"integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
-			"dev": true,
-			"requires": {
-				"reusify": "^1.0.4"
-			}
-		},
-		"fb-watchman": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-			"integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-			"dev": true,
-			"requires": {
-				"bser": "2.1.1"
-			}
-		},
-		"file-entry-cache": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-			"dev": true,
-			"requires": {
-				"flat-cache": "^3.0.4"
-			}
-		},
-		"fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-			"dev": true,
-			"requires": {
-				"to-regex-range": "^5.0.1"
-			}
-		},
-		"find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
-			"requires": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			}
-		},
-		"flat-cache": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-			"dev": true,
-			"requires": {
-				"flatted": "^3.1.0",
-				"rimraf": "^3.0.2"
-			}
-		},
-		"flatted": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
-			"integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==",
-			"dev": true
-		},
-		"form-data": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-			"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-			"dev": true,
-			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.8",
-				"mime-types": "^2.1.12"
-			}
-		},
-		"fs-extra": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
-			}
-		},
-		"fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-			"dev": true
-		},
-		"fsevents": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-			"dev": true,
-			"optional": true
-		},
-		"function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-			"dev": true
-		},
-		"functional-red-black-tree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-			"dev": true
-		},
-		"gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-			"dev": true
-		},
-		"get-caller-file": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-			"dev": true
-		},
-		"get-package-type": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-			"dev": true
-		},
-		"get-stream": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"dev": true
-		},
-		"glob": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-			"dev": true,
-			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			}
-		},
-		"glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"dev": true,
-			"requires": {
-				"is-glob": "^4.0.1"
-			}
-		},
-		"globals": {
-			"version": "13.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-			"integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
-			"dev": true,
-			"requires": {
-				"type-fest": "^0.20.2"
-			}
-		},
-		"globby": {
-			"version": "11.0.4",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-			"integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-			"dev": true,
-			"requires": {
-				"array-union": "^2.1.0",
-				"dir-glob": "^3.0.1",
-				"fast-glob": "^3.1.1",
-				"ignore": "^5.1.4",
-				"merge2": "^1.3.0",
-				"slash": "^3.0.0"
-			}
-		},
-		"graceful-fs": {
-			"version": "4.2.6",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-			"integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
-			"dev": true
-		},
-		"hard-rejection": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-			"dev": true
-		},
-		"has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"dev": true,
-			"requires": {
-				"function-bind": "^1.1.1"
-			}
-		},
-		"has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true
-		},
-		"hosted-git-info": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-			"dev": true,
-			"requires": {
-				"lru-cache": "^6.0.0"
-			}
-		},
-		"html-encoding-sniffer": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-			"integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-			"dev": true,
-			"requires": {
-				"whatwg-encoding": "^1.0.5"
-			}
-		},
-		"html-escaper": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-			"dev": true
-		},
-		"http-proxy-agent": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-			"dev": true,
-			"requires": {
-				"@tootallnate/once": "1",
-				"agent-base": "6",
-				"debug": "4"
-			}
-		},
-		"https-proxy-agent": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-			"dev": true,
-			"requires": {
-				"agent-base": "6",
-				"debug": "4"
-			}
-		},
-		"human-signals": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-			"dev": true
-		},
-		"iconv-lite": {
-			"version": "0.4.24",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"dev": true,
-			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3"
-			}
-		},
-		"ignore": {
-			"version": "5.1.8",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-			"dev": true
-		},
-		"import-fresh": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-			"dev": true,
-			"requires": {
-				"parent-module": "^1.0.0",
-				"resolve-from": "^4.0.0"
-			}
-		},
-		"import-lazy": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-			"dev": true
-		},
-		"import-local": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
-			"integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
-			"dev": true,
-			"requires": {
-				"pkg-dir": "^4.2.0",
-				"resolve-cwd": "^3.0.0"
-			}
-		},
-		"imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-			"dev": true
-		},
-		"indent-string": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-			"dev": true
-		},
-		"inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-			"dev": true,
-			"requires": {
-				"once": "^1.3.0",
-				"wrappy": "1"
-			}
-		},
-		"inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-			"dev": true
-		},
-		"irregular-plurals": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz",
-			"integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==",
-			"dev": true
-		},
-		"is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-			"dev": true
-		},
-		"is-core-module": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-			"integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
-			"dev": true,
-			"requires": {
-				"has": "^1.0.3"
-			}
-		},
-		"is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-			"dev": true
-		},
-		"is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true
-		},
-		"is-generator-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-			"dev": true
-		},
-		"is-glob": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-			"dev": true,
-			"requires": {
-				"is-extglob": "^2.1.1"
-			}
-		},
-		"is-number": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-			"dev": true
-		},
-		"is-plain-obj": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-			"dev": true
-		},
-		"is-potential-custom-element-name": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-			"dev": true
-		},
-		"is-stream": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-			"dev": true
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
-		},
-		"is-unicode-supported": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-			"dev": true
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-			"dev": true
-		},
-		"istanbul-lib-coverage": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-			"dev": true
-		},
-		"istanbul-lib-instrument": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-			"integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.7.5",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-coverage": "^3.0.0",
-				"semver": "^6.3.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
-		"istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-			"dev": true,
-			"requires": {
-				"istanbul-lib-coverage": "^3.0.0",
-				"make-dir": "^3.0.0",
-				"supports-color": "^7.1.0"
-			}
-		},
-		"istanbul-lib-source-maps": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0",
-				"source-map": "^0.6.1"
-			}
-		},
-		"istanbul-reports": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz",
-			"integrity": "sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==",
-			"dev": true,
-			"requires": {
-				"html-escaper": "^2.0.0",
-				"istanbul-lib-report": "^3.0.0"
-			}
-		},
-		"jest": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest/-/jest-27.4.5.tgz",
-			"integrity": "sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==",
-			"dev": true,
-			"requires": {
-				"@jest/core": "^27.4.5",
-				"import-local": "^3.0.2",
-				"jest-cli": "^27.4.5"
-			}
-		},
-		"jest-changed-files": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz",
-			"integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"execa": "^5.0.0",
-				"throat": "^6.0.1"
-			}
-		},
-		"jest-circus": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.5.tgz",
-			"integrity": "sha512-eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^27.4.4",
-				"@jest/test-result": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"dedent": "^0.7.0",
-				"expect": "^27.4.2",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^27.4.2",
-				"jest-matcher-utils": "^27.4.2",
-				"jest-message-util": "^27.4.2",
-				"jest-runtime": "^27.4.5",
-				"jest-snapshot": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"pretty-format": "^27.4.2",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3",
-				"throat": "^6.0.1"
-			}
-		},
-		"jest-cli": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.5.tgz",
-			"integrity": "sha512-hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg==",
-			"dev": true,
-			"requires": {
-				"@jest/core": "^27.4.5",
-				"@jest/test-result": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"chalk": "^4.0.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.4",
-				"import-local": "^3.0.2",
-				"jest-config": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-validate": "^27.4.2",
-				"prompts": "^2.0.1",
-				"yargs": "^16.2.0"
-			}
-		},
-		"jest-config": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.5.tgz",
-			"integrity": "sha512-t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.1.0",
-				"@jest/test-sequencer": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"babel-jest": "^27.4.5",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"deepmerge": "^4.2.2",
-				"glob": "^7.1.1",
-				"graceful-fs": "^4.2.4",
-				"jest-circus": "^27.4.5",
-				"jest-environment-jsdom": "^27.4.4",
-				"jest-environment-node": "^27.4.4",
-				"jest-get-type": "^27.4.0",
-				"jest-jasmine2": "^27.4.5",
-				"jest-regex-util": "^27.4.0",
-				"jest-resolve": "^27.4.5",
-				"jest-runner": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-validate": "^27.4.2",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^27.4.2",
-				"slash": "^3.0.0"
-			}
-		},
-		"jest-diff": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz",
-			"integrity": "sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"diff-sequences": "^27.4.0",
-				"jest-get-type": "^27.4.0",
-				"pretty-format": "^27.4.2"
-			}
-		},
-		"jest-docblock": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz",
-			"integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==",
-			"dev": true,
-			"requires": {
-				"detect-newline": "^3.0.0"
-			}
-		},
-		"jest-each": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz",
-			"integrity": "sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^27.4.0",
-				"jest-util": "^27.4.2",
-				"pretty-format": "^27.4.2"
-			}
-		},
-		"jest-environment-jsdom": {
-			"version": "27.4.4",
-			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz",
-			"integrity": "sha512-cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^27.4.4",
-				"@jest/fake-timers": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"jest-mock": "^27.4.2",
-				"jest-util": "^27.4.2",
-				"jsdom": "^16.6.0"
-			}
-		},
-		"jest-environment-node": {
-			"version": "27.4.4",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.4.tgz",
-			"integrity": "sha512-D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^27.4.4",
-				"@jest/fake-timers": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"jest-mock": "^27.4.2",
-				"jest-util": "^27.4.2"
-			}
-		},
-		"jest-fetch-mock": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz",
-			"integrity": "sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==",
-			"dev": true,
-			"requires": {
-				"cross-fetch": "^3.0.4",
-				"promise-polyfill": "^8.1.3"
-			}
-		},
-		"jest-get-type": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
-			"integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==",
-			"dev": true
-		},
-		"jest-haste-map": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.5.tgz",
-			"integrity": "sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"@types/graceful-fs": "^4.1.2",
-				"@types/node": "*",
-				"anymatch": "^3.0.3",
-				"fb-watchman": "^2.0.0",
-				"fsevents": "^2.3.2",
-				"graceful-fs": "^4.2.4",
-				"jest-regex-util": "^27.4.0",
-				"jest-serializer": "^27.4.0",
-				"jest-util": "^27.4.2",
-				"jest-worker": "^27.4.5",
-				"micromatch": "^4.0.4",
-				"walker": "^1.0.7"
-			}
-		},
-		"jest-jasmine2": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.5.tgz",
-			"integrity": "sha512-oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw==",
-			"dev": true,
-			"requires": {
-				"@babel/traverse": "^7.1.0",
-				"@jest/environment": "^27.4.4",
-				"@jest/source-map": "^27.4.0",
-				"@jest/test-result": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"expect": "^27.4.2",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^27.4.2",
-				"jest-matcher-utils": "^27.4.2",
-				"jest-message-util": "^27.4.2",
-				"jest-runtime": "^27.4.5",
-				"jest-snapshot": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"pretty-format": "^27.4.2",
-				"throat": "^6.0.1"
-			}
-		},
-		"jest-leak-detector": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz",
-			"integrity": "sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==",
-			"dev": true,
-			"requires": {
-				"jest-get-type": "^27.4.0",
-				"pretty-format": "^27.4.2"
-			}
-		},
-		"jest-matcher-utils": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz",
-			"integrity": "sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"jest-diff": "^27.4.2",
-				"jest-get-type": "^27.4.0",
-				"pretty-format": "^27.4.2"
-			}
-		},
-		"jest-message-util": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz",
-			"integrity": "sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.12.13",
-				"@jest/types": "^27.4.2",
-				"@types/stack-utils": "^2.0.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^27.4.2",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
-			}
-		},
-		"jest-mock": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz",
-			"integrity": "sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"@types/node": "*"
-			}
-		},
-		"jest-pnp-resolver": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-			"dev": true,
-			"requires": {}
-		},
-		"jest-regex-util": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
-			"integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==",
-			"dev": true
-		},
-		"jest-resolve": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.5.tgz",
-			"integrity": "sha512-xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^27.4.5",
-				"jest-pnp-resolver": "^1.2.2",
-				"jest-util": "^27.4.2",
-				"jest-validate": "^27.4.2",
-				"resolve": "^1.20.0",
-				"resolve.exports": "^1.1.0",
-				"slash": "^3.0.0"
-			}
-		},
-		"jest-resolve-dependencies": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.5.tgz",
-			"integrity": "sha512-elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"jest-regex-util": "^27.4.0",
-				"jest-snapshot": "^27.4.5"
-			}
-		},
-		"jest-runner": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.5.tgz",
-			"integrity": "sha512-/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^27.4.2",
-				"@jest/environment": "^27.4.4",
-				"@jest/test-result": "^27.4.2",
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"emittery": "^0.8.1",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.4",
-				"jest-docblock": "^27.4.0",
-				"jest-environment-jsdom": "^27.4.4",
-				"jest-environment-node": "^27.4.4",
-				"jest-haste-map": "^27.4.5",
-				"jest-leak-detector": "^27.4.2",
-				"jest-message-util": "^27.4.2",
-				"jest-resolve": "^27.4.5",
-				"jest-runtime": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-worker": "^27.4.5",
-				"source-map-support": "^0.5.6",
-				"throat": "^6.0.1"
-			}
-		},
-		"jest-runtime": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.5.tgz",
-			"integrity": "sha512-CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^27.4.2",
-				"@jest/environment": "^27.4.4",
-				"@jest/globals": "^27.4.4",
-				"@jest/source-map": "^27.4.0",
-				"@jest/test-result": "^27.4.2",
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/yargs": "^16.0.0",
-				"chalk": "^4.0.0",
-				"cjs-module-lexer": "^1.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"execa": "^5.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^27.4.5",
-				"jest-message-util": "^27.4.2",
-				"jest-mock": "^27.4.2",
-				"jest-regex-util": "^27.4.0",
-				"jest-resolve": "^27.4.5",
-				"jest-snapshot": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"jest-validate": "^27.4.2",
-				"slash": "^3.0.0",
-				"strip-bom": "^4.0.0",
-				"yargs": "^16.2.0"
-			}
-		},
-		"jest-serializer": {
-			"version": "27.4.0",
-			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
-			"integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"graceful-fs": "^4.2.4"
-			}
-		},
-		"jest-snapshot": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.5.tgz",
-			"integrity": "sha512-eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.7.2",
-				"@babel/generator": "^7.7.2",
-				"@babel/parser": "^7.7.2",
-				"@babel/plugin-syntax-typescript": "^7.7.2",
-				"@babel/traverse": "^7.7.2",
-				"@babel/types": "^7.0.0",
-				"@jest/transform": "^27.4.5",
-				"@jest/types": "^27.4.2",
-				"@types/babel__traverse": "^7.0.4",
-				"@types/prettier": "^2.1.5",
-				"babel-preset-current-node-syntax": "^1.0.0",
-				"chalk": "^4.0.0",
-				"expect": "^27.4.2",
-				"graceful-fs": "^4.2.4",
-				"jest-diff": "^27.4.2",
-				"jest-get-type": "^27.4.0",
-				"jest-haste-map": "^27.4.5",
-				"jest-matcher-utils": "^27.4.2",
-				"jest-message-util": "^27.4.2",
-				"jest-resolve": "^27.4.5",
-				"jest-util": "^27.4.2",
-				"natural-compare": "^1.4.0",
-				"pretty-format": "^27.4.2",
-				"semver": "^7.3.2"
-			}
-		},
-		"jest-util": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
-			"integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"graceful-fs": "^4.2.4",
-				"picomatch": "^2.2.3"
-			}
-		},
-		"jest-validate": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz",
-			"integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"camelcase": "^6.2.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^27.4.0",
-				"leven": "^3.1.0",
-				"pretty-format": "^27.4.2"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "6.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
-					"integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-watcher": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz",
-			"integrity": "sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==",
-			"dev": true,
-			"requires": {
-				"@jest/test-result": "^27.4.2",
-				"@jest/types": "^27.4.2",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"jest-util": "^27.4.2",
-				"string-length": "^4.0.1"
-			}
-		},
-		"jest-websocket-mock": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/jest-websocket-mock/-/jest-websocket-mock-2.2.1.tgz",
-			"integrity": "sha512-fhsGLXrPfs06PhHoxqOSA9yZ6Rb4qYrf4Wcm7/nfRzjlrf1gIeuhYUkzMRjjE0TMQ37SwkmeLanwrZY4ZaNp8g==",
-			"dev": true,
-			"requires": {
-				"jest-diff": "^27.0.2"
-			}
-		},
-		"jest-worker": {
-			"version": "27.4.5",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz",
-			"integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"dependencies": {
-				"supports-color": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"jju": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
-			"integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
-			"dev": true
-		},
-		"js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"dev": true
-		},
-		"js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
-			"requires": {
-				"argparse": "^2.0.1"
-			},
-			"dependencies": {
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				}
-			}
-		},
-		"jsdom": {
-			"version": "16.7.0",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-			"integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
-			"dev": true,
-			"requires": {
-				"abab": "^2.0.5",
-				"acorn": "^8.2.4",
-				"acorn-globals": "^6.0.0",
-				"cssom": "^0.4.4",
-				"cssstyle": "^2.3.0",
-				"data-urls": "^2.0.0",
-				"decimal.js": "^10.2.1",
-				"domexception": "^2.0.1",
-				"escodegen": "^2.0.0",
-				"form-data": "^3.0.0",
-				"html-encoding-sniffer": "^2.0.1",
-				"http-proxy-agent": "^4.0.1",
-				"https-proxy-agent": "^5.0.0",
-				"is-potential-custom-element-name": "^1.0.1",
-				"nwsapi": "^2.2.0",
-				"parse5": "6.0.1",
-				"saxes": "^5.0.1",
-				"symbol-tree": "^3.2.4",
-				"tough-cookie": "^4.0.0",
-				"w3c-hr-time": "^1.0.2",
-				"w3c-xmlserializer": "^2.0.0",
-				"webidl-conversions": "^6.1.0",
-				"whatwg-encoding": "^1.0.5",
-				"whatwg-mimetype": "^2.3.0",
-				"whatwg-url": "^8.5.0",
-				"ws": "^7.4.6",
-				"xml-name-validator": "^3.0.0"
-			}
-		},
-		"jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-			"dev": true
-		},
-		"json-parse-even-better-errors": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-			"dev": true
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true
-		},
-		"json-stable-stringify-without-jsonify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-			"dev": true
-		},
-		"json5": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-			"dev": true,
-			"requires": {
-				"minimist": "^1.2.5"
-			}
-		},
-		"jsonfile": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.6"
-			}
-		},
-		"kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true
-		},
-		"kleur": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-			"dev": true
-		},
-		"leven": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-			"dev": true
-		},
-		"levn": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "^1.2.1",
-				"type-check": "~0.4.0"
-			}
-		},
-		"lines-and-columns": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-			"dev": true
-		},
-		"locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
-			"requires": {
-				"p-locate": "^4.1.0"
-			}
-		},
-		"lodash": {
-			"version": "4.17.21",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-			"dev": true
-		},
-		"lodash.get": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-			"dev": true
-		},
-		"lodash.isequal": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-			"dev": true
-		},
-		"lodash.memoize": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-			"dev": true
-		},
-		"lodash.merge": {
-			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-			"dev": true
-		},
-		"log-symbols": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.1.0",
-				"is-unicode-supported": "^0.1.0"
-			}
-		},
-		"lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"requires": {
-				"yallist": "^4.0.0"
-			}
-		},
-		"make-dir": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-			"dev": true,
-			"requires": {
-				"semver": "^6.0.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
-		"make-error": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-			"dev": true
-		},
-		"makeerror": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-			"dev": true,
-			"requires": {
-				"tmpl": "1.0.5"
-			}
-		},
-		"map-obj": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-			"integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
-			"dev": true
-		},
-		"meow": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-			"dev": true,
-			"requires": {
-				"@types/minimist": "^1.2.0",
-				"camelcase-keys": "^6.2.2",
-				"decamelize": "^1.2.0",
-				"decamelize-keys": "^1.1.0",
-				"hard-rejection": "^2.1.0",
-				"minimist-options": "4.1.0",
-				"normalize-package-data": "^3.0.0",
-				"read-pkg-up": "^7.0.1",
-				"redent": "^3.0.0",
-				"trim-newlines": "^3.0.0",
-				"type-fest": "^0.18.0",
-				"yargs-parser": "^20.2.3"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.18.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-					"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-					"dev": true
-				}
-			}
-		},
-		"merge-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-			"dev": true
-		},
-		"merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true
-		},
-		"micromatch": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-			"dev": true,
-			"requires": {
-				"braces": "^3.0.1",
-				"picomatch": "^2.2.3"
-			}
-		},
-		"mime-db": {
-			"version": "1.51.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-			"integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
-			"dev": true
-		},
-		"mime-types": {
-			"version": "2.1.34",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-			"integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
-			"dev": true,
-			"requires": {
-				"mime-db": "1.51.0"
-			}
-		},
-		"mimic-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true
-		},
-		"min-indent": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-			"dev": true
-		},
-		"minimatch": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-			"dev": true,
-			"requires": {
-				"brace-expansion": "^1.1.7"
-			}
-		},
-		"minimist": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-			"dev": true
-		},
-		"minimist-options": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-			"dev": true,
-			"requires": {
-				"arrify": "^1.0.1",
-				"is-plain-obj": "^1.1.0",
-				"kind-of": "^6.0.3"
-			}
-		},
-		"mock-socket": {
-			"version": "9.0.8",
-			"resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.0.8.tgz",
-			"integrity": "sha512-8Syqkaaa2SzRqW68DEsnZkKQicHP7hVzfj3uCvigB5TL79H1ljKbwmOcRIENkx0ZTyu/5W6u+Pk9Qy6JCp38Ww==",
-			"dev": true
-		},
-		"ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-			"dev": true
-		},
-		"natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-			"dev": true
-		},
-		"node-fetch": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
-			"dev": true
-		},
-		"node-int64": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-			"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-			"dev": true
-		},
-		"node-releases": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
-			"dev": true
-		},
-		"normalize-package-data": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-			"integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
-			"dev": true,
-			"requires": {
-				"hosted-git-info": "^4.0.1",
-				"resolve": "^1.20.0",
-				"semver": "^7.3.4",
-				"validate-npm-package-license": "^3.0.1"
-			}
-		},
-		"normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"dev": true
-		},
-		"npm-run-path": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-			"dev": true,
-			"requires": {
-				"path-key": "^3.0.0"
-			}
-		},
-		"nwsapi": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-			"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-			"dev": true
-		},
-		"once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-			"dev": true,
-			"requires": {
-				"wrappy": "1"
-			}
-		},
-		"onetime": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
-			"requires": {
-				"mimic-fn": "^2.1.0"
-			}
-		},
-		"optionator": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-			"dev": true,
-			"requires": {
-				"deep-is": "^0.1.3",
-				"fast-levenshtein": "^2.0.6",
-				"levn": "^0.4.1",
-				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0",
-				"word-wrap": "^1.2.3"
-			}
-		},
-		"p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
-			"requires": {
-				"p-try": "^2.0.0"
-			}
-		},
-		"p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
-			"requires": {
-				"p-limit": "^2.2.0"
-			}
-		},
-		"p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true
-		},
-		"parent-module": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-			"dev": true,
-			"requires": {
-				"callsites": "^3.0.0"
-			}
-		},
-		"parse-json": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-even-better-errors": "^2.3.0",
-				"lines-and-columns": "^1.1.6"
-			}
-		},
-		"parse5": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-			"dev": true
-		},
-		"path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true
-		},
-		"path-is-absolute": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-			"dev": true
-		},
-		"path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true
-		},
-		"path-parse": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-			"dev": true
-		},
-		"path-type": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"dev": true
-		},
-		"picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-			"dev": true
-		},
-		"picomatch": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
-			"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
-			"dev": true
-		},
-		"pirates": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
-			"integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==",
-			"dev": true
-		},
-		"pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"dev": true,
-			"requires": {
-				"find-up": "^4.0.0"
-			}
-		},
-		"plur": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
-			"integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
-			"dev": true,
-			"requires": {
-				"irregular-plurals": "^3.2.0"
-			}
-		},
-		"prelude-ls": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-			"dev": true
-		},
-		"pretty-format": {
-			"version": "27.4.2",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz",
-			"integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^27.4.2",
-				"ansi-regex": "^5.0.1",
-				"ansi-styles": "^5.0.0",
-				"react-is": "^17.0.1"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-					"dev": true
-				}
-			}
-		},
-		"progress": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-			"dev": true
-		},
-		"promise-polyfill": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.2.0.tgz",
-			"integrity": "sha512-k/TC0mIcPVF6yHhUvwAp7cvL6I2fFV7TzF1DuGPI8mBh4QQazf36xCKEHKTZKRysEoTQoQdKyP25J8MPJp7j5g==",
-			"dev": true
-		},
-		"prompts": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-			"dev": true,
-			"requires": {
-				"kleur": "^3.0.3",
-				"sisteransi": "^1.0.5"
-			}
-		},
-		"psl": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-			"dev": true
-		},
-		"punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-			"dev": true
-		},
-		"queue-microtask": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-			"dev": true
-		},
-		"quick-lru": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-			"dev": true
-		},
-		"react-is": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-			"dev": true
-		},
-		"read-pkg": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-			"dev": true,
-			"requires": {
-				"@types/normalize-package-data": "^2.4.0",
-				"normalize-package-data": "^2.5.0",
-				"parse-json": "^5.0.0",
-				"type-fest": "^0.6.0"
-			},
-			"dependencies": {
-				"hosted-git-info": {
-					"version": "2.8.9",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-					"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-					"dev": true
-				},
-				"normalize-package-data": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-					"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"resolve": "^1.10.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				},
-				"type-fest": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-					"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-					"dev": true
-				}
-			}
-		},
-		"read-pkg-up": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-			"dev": true,
-			"requires": {
-				"find-up": "^4.1.0",
-				"read-pkg": "^5.2.0",
-				"type-fest": "^0.8.1"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.8.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-					"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-					"dev": true
-				}
-			}
-		},
-		"reconnecting-websocket": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz",
-			"integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng=="
-		},
-		"redent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-			"dev": true,
-			"requires": {
-				"indent-string": "^4.0.0",
-				"strip-indent": "^3.0.0"
-			}
-		},
-		"regexpp": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-			"dev": true
-		},
-		"require-directory": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-			"dev": true
-		},
-		"resolve": {
-			"version": "1.20.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-			"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-			"dev": true,
-			"requires": {
-				"is-core-module": "^2.2.0",
-				"path-parse": "^1.0.6"
-			}
-		},
-		"resolve-cwd": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-			"dev": true,
-			"requires": {
-				"resolve-from": "^5.0.0"
-			},
-			"dependencies": {
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				}
-			}
-		},
-		"resolve-from": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-			"dev": true
-		},
-		"resolve.exports": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-			"integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
-			"dev": true
-		},
-		"reusify": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-			"dev": true
-		},
-		"rimraf": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-			"dev": true,
-			"requires": {
-				"glob": "^7.1.3"
-			}
-		},
-		"run-parallel": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-			"dev": true,
-			"requires": {
-				"queue-microtask": "^1.2.2"
-			}
-		},
-		"safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-			"dev": true
-		},
-		"safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"dev": true
-		},
-		"saxes": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-			"integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-			"dev": true,
-			"requires": {
-				"xmlchars": "^2.2.0"
-			}
-		},
-		"semver": {
-			"version": "7.3.8",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-			"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-			"requires": {
-				"lru-cache": "^6.0.0"
-			}
-		},
-		"shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"requires": {
-				"shebang-regex": "^3.0.0"
-			}
-		},
-		"shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true
-		},
-		"signal-exit": {
-			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
-			"integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
-			"dev": true
-		},
-		"sisteransi": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-			"dev": true
-		},
-		"slash": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"dev": true
-		},
-		"source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"dev": true
-		},
-		"source-map-support": {
-			"version": "0.5.21",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"spdx-correct": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-			"dev": true,
-			"requires": {
-				"spdx-expression-parse": "^3.0.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"spdx-exceptions": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-			"dev": true
-		},
-		"spdx-expression-parse": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-			"dev": true,
-			"requires": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"spdx-license-ids": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-			"integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
-			"dev": true
-		},
-		"sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-			"dev": true
-		},
-		"stack-utils": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-			"integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
-			"dev": true,
-			"requires": {
-				"escape-string-regexp": "^2.0.0"
-			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-					"dev": true
-				}
-			}
-		},
-		"string-argv": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
-			"integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
-			"dev": true
-		},
-		"string-length": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-			"dev": true,
-			"requires": {
-				"char-regex": "^1.0.2",
-				"strip-ansi": "^6.0.0"
-			}
-		},
-		"string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"requires": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			}
-		},
-		"strip-ansi": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"requires": {
-				"ansi-regex": "^5.0.1"
-			}
-		},
-		"strip-bom": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-			"dev": true
-		},
-		"strip-final-newline": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true
-		},
-		"strip-indent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-			"dev": true,
-			"requires": {
-				"min-indent": "^1.0.0"
-			}
-		},
-		"strip-json-comments": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true
-		},
-		"supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"requires": {
-				"has-flag": "^4.0.0"
-			}
-		},
-		"supports-hyperlinks": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-			"integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-			"dev": true,
-			"requires": {
-				"has-flag": "^4.0.0",
-				"supports-color": "^7.0.0"
-			}
-		},
-		"symbol-tree": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-			"dev": true
-		},
-		"terminal-link": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-			"integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-			"dev": true,
-			"requires": {
-				"ansi-escapes": "^4.2.1",
-				"supports-hyperlinks": "^2.0.0"
-			}
-		},
-		"test-exclude": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-			"dev": true,
-			"requires": {
-				"@istanbuljs/schema": "^0.1.2",
-				"glob": "^7.1.4",
-				"minimatch": "^3.0.4"
-			}
-		},
-		"text-table": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-			"dev": true
-		},
-		"throat": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-			"integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
-			"dev": true
-		},
-		"timsort": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-			"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
-			"dev": true
-		},
-		"tmpl": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-			"dev": true
-		},
-		"to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-			"dev": true
-		},
-		"to-regex-range": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"dev": true,
-			"requires": {
-				"is-number": "^7.0.0"
-			}
-		},
-		"tough-cookie": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-			"integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-			"dev": true,
-			"requires": {
-				"psl": "^1.1.33",
-				"punycode": "^2.1.1",
-				"universalify": "^0.1.2"
-			}
-		},
-		"tr46": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-			"integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-			"dev": true,
-			"requires": {
-				"punycode": "^2.1.1"
-			}
-		},
-		"trim-newlines": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-			"dev": true
-		},
-		"ts-jest": {
-			"version": "27.1.2",
-			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.2.tgz",
-			"integrity": "sha512-eSOiJOWq6Hhs6Khzk5wKC5sgWIXgXqOCiIl1+3lfnearu58Hj4QpE5tUhQcA3xtZrELbcvAGCsd6HB8OsaVaTA==",
-			"dev": true,
-			"requires": {
-				"bs-logger": "0.x",
-				"fast-json-stable-stringify": "2.x",
-				"jest-util": "^27.0.0",
-				"json5": "2.x",
-				"lodash.memoize": "4.x",
-				"make-error": "1.x",
-				"semver": "7.x",
-				"yargs-parser": "20.x"
-			}
-		},
-		"ts-node": {
-			"version": "10.4.0",
-			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz",
-			"integrity": "sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==",
-			"dev": true,
-			"requires": {
-				"@cspotcode/source-map-support": "0.7.0",
-				"@tsconfig/node10": "^1.0.7",
-				"@tsconfig/node12": "^1.0.7",
-				"@tsconfig/node14": "^1.0.0",
-				"@tsconfig/node16": "^1.0.2",
-				"acorn": "^8.4.1",
-				"acorn-walk": "^8.1.1",
-				"arg": "^4.1.0",
-				"create-require": "^1.1.0",
-				"diff": "^4.0.1",
-				"make-error": "^1.1.1",
-				"yn": "3.1.1"
-			},
-			"dependencies": {
-				"acorn-walk": {
-					"version": "8.2.0",
-					"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-					"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-					"dev": true
-				}
-			}
-		},
-		"tsd": {
-			"version": "0.19.1",
-			"resolved": "https://registry.npmjs.org/tsd/-/tsd-0.19.1.tgz",
-			"integrity": "sha512-pSwchclr+ADdxlahRUQXUrdAIOjXx1T1PQV+fLfVLuo/S4z+T00YU84fH8iPlZxyA2pWgJjo42BG1p9SDb4NOw==",
-			"dev": true,
-			"requires": {
-				"@tsd/typescript": "~4.5.2",
-				"eslint-formatter-pretty": "^4.1.0",
-				"globby": "^11.0.1",
-				"meow": "^9.0.0",
-				"path-exists": "^4.0.0",
-				"read-pkg-up": "^7.0.0"
-			}
-		},
-		"tslib": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-			"dev": true
-		},
-		"tsutils": {
-			"version": "3.21.0",
-			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-			"dev": true,
-			"requires": {
-				"tslib": "^1.8.1"
-			}
-		},
-		"type-check": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "^1.2.1"
-			}
-		},
-		"type-detect": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-			"dev": true
-		},
-		"type-fest": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-			"dev": true
-		},
-		"typedarray-to-buffer": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-			"dev": true,
-			"requires": {
-				"is-typedarray": "^1.0.0"
-			}
-		},
-		"typescript": {
-			"version": "4.5.4",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
-			"integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
-			"dev": true
-		},
-		"universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-			"dev": true
-		},
-		"uri-js": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"dev": true,
-			"requires": {
-				"punycode": "^2.1.0"
-			}
-		},
-		"v8-compile-cache": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-			"dev": true
-		},
-		"v8-to-istanbul": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz",
-			"integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "^2.0.1",
-				"convert-source-map": "^1.6.0",
-				"source-map": "^0.7.3"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				}
-			}
-		},
-		"validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-			"dev": true,
-			"requires": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
-			}
-		},
-		"validator": {
-			"version": "13.7.0",
-			"resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
-			"integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
-			"dev": true
-		},
-		"w3c-hr-time": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-			"dev": true,
-			"requires": {
-				"browser-process-hrtime": "^1.0.0"
-			}
-		},
-		"w3c-xmlserializer": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-			"integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-			"dev": true,
-			"requires": {
-				"xml-name-validator": "^3.0.0"
-			}
-		},
-		"walker": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-			"dev": true,
-			"requires": {
-				"makeerror": "1.0.12"
-			}
-		},
-		"webidl-conversions": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-			"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-			"dev": true
-		},
-		"whatwg-encoding": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-			"integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-			"dev": true,
-			"requires": {
-				"iconv-lite": "0.4.24"
-			}
-		},
-		"whatwg-mimetype": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-			"dev": true
-		},
-		"whatwg-url": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-			"integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.7.0",
-				"tr46": "^2.1.0",
-				"webidl-conversions": "^6.1.0"
-			}
-		},
-		"which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"requires": {
-				"isexe": "^2.0.0"
-			}
-		},
-		"word-wrap": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-			"dev": true
-		},
-		"wrap-ansi": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
-			"requires": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			}
-		},
-		"wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-			"dev": true
-		},
-		"write-file-atomic": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-			"dev": true,
-			"requires": {
-				"imurmurhash": "^0.1.4",
-				"is-typedarray": "^1.0.0",
-				"signal-exit": "^3.0.2",
-				"typedarray-to-buffer": "^3.1.5"
-			}
-		},
-		"ws": {
-			"version": "7.5.6",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
-			"integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
-			"dev": true,
-			"requires": {}
-		},
-		"xml-name-validator": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-			"dev": true
-		},
-		"xmlchars": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-			"dev": true
-		},
-		"y18n": {
-			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-			"dev": true
-		},
-		"yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-		},
-		"yargs": {
-			"version": "16.2.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-			"dev": true,
-			"requires": {
-				"cliui": "^7.0.2",
-				"escalade": "^3.1.1",
-				"get-caller-file": "^2.0.5",
-				"require-directory": "^2.1.1",
-				"string-width": "^4.2.0",
-				"y18n": "^5.0.5",
-				"yargs-parser": "^20.2.2"
-			}
-		},
-		"yargs-parser": {
-			"version": "20.2.7",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-			"integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-			"dev": true
-		},
-		"yn": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-			"dev": true
-		},
-		"z-schema": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.2.tgz",
-			"integrity": "sha512-40TH47ukMHq5HrzkeVE40Ad7eIDKaRV2b+Qpi2prLc9X9eFJFzV7tMe5aH12e6avaSS/u5l653EQOv+J9PirPw==",
-			"dev": true,
-			"requires": {
-				"commander": "^2.7.1",
-				"lodash.get": "^4.4.2",
-				"lodash.isequal": "^4.5.0",
-				"validator": "^13.7.0"
-			}
-		}
-	}
-}
diff --git a/packages/calckey-js/package.json b/packages/calckey-js/package.json
deleted file mode 100644
index d68f24175..000000000
--- a/packages/calckey-js/package.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"name": "calckey-js",
-	"version": "0.0.22",
-	"description": "Calckey SDK for JavaScript",
-	"main": "./built/index.js",
-	"types": "./built/index.d.ts",
-	"scripts": {
-		"build": "tsc",
-		"tsd": "tsd",
-		"api": "pnpm api-extractor run --local --verbose",
-		"api-prod": "pnpm api-extractor run --verbose",
-		"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
-		"typecheck": "tsc --noEmit",
-		"lint": "pnpm typecheck && pnpm eslint",
-		"jest": "jest --coverage --detectOpenHandles",
-		"test": "pnpm jest && pnpm tsd"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://codeberg.org/calckey/calckey.js"
-	},
-	"devDependencies": {
-		"@microsoft/api-extractor": "^7.19.3",
-		"@types/jest": "^27.4.0",
-		"@types/node": "17.0.5",
-		"@typescript-eslint/eslint-plugin": "5.8.1",
-		"@typescript-eslint/parser": "5.8.1",
-		"eslint": "8.6.0",
-		"jest": "^27.4.5",
-		"jest-fetch-mock": "^3.0.3",
-		"jest-websocket-mock": "^2.2.1",
-		"mock-socket": "^9.0.8",
-		"ts-jest": "^27.1.2",
-		"ts-node": "10.4.0",
-		"tsd": "^0.19.1",
-		"typescript": "4.5.4"
-	},
-	"files": [
-		"built"
-	],
-	"dependencies": {
-		"autobind-decorator": "^2.4.0",
-		"eventemitter3": "^4.0.7",
-		"reconnecting-websocket": "^4.4.0",
-		"semver": "^7.3.8"
-	}
-}
diff --git a/packages/calckey-js/src/acct.ts b/packages/calckey-js/src/acct.ts
deleted file mode 100644
index 5b7767a10..000000000
--- a/packages/calckey-js/src/acct.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export type Acct = {
-	username: string;
-	host: string | null;
-};
-
-export function parse(acct: string): Acct {
-	if (acct.startsWith("@")) acct = acct.substr(1);
-	const split = acct.split("@", 2);
-	return { username: split[0], host: split[1] || null };
-}
-
-export function toString(acct: Acct): string {
-	return acct.host == null ? acct.username : `${acct.username}@${acct.host}`;
-}
diff --git a/packages/calckey-js/src/api.ts b/packages/calckey-js/src/api.ts
deleted file mode 100644
index 141aa4b85..000000000
--- a/packages/calckey-js/src/api.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { Endpoints } from "./api.types";
-
-const MK_API_ERROR = Symbol();
-
-export type APIError = {
-	id: string;
-	code: string;
-	message: string;
-	kind: "client" | "server";
-	info: Record<string, any>;
-};
-
-export function isAPIError(reason: any): reason is APIError {
-	return reason[MK_API_ERROR] === true;
-}
-
-export type FetchLike = (
-	input: string,
-	init?: {
-		method?: string;
-		body?: string;
-		credentials?: RequestCredentials;
-		cache?: RequestCache;
-	},
-) => Promise<{
-	status: number;
-	json(): Promise<any>;
-}>;
-
-type IsNeverType<T> = [T] extends [never] ? true : false;
-
-type StrictExtract<Union, Cond> = Cond extends Union ? Union : never;
-
-type IsCaseMatched<
-	E extends keyof Endpoints,
-	P extends Endpoints[E]["req"],
-	C extends number,
-> = IsNeverType<
-	StrictExtract<Endpoints[E]["res"]["$switch"]["$cases"][C], [P, any]>
-> extends false
-	? true
-	: false;
-
-type GetCaseResult<
-	E extends keyof Endpoints,
-	P extends Endpoints[E]["req"],
-	C extends number,
-> = StrictExtract<Endpoints[E]["res"]["$switch"]["$cases"][C], [P, any]>[1];
-
-export class APIClient {
-	public origin: string;
-	public credential: string | null | undefined;
-	public fetch: FetchLike;
-
-	constructor(opts: {
-		origin: APIClient["origin"];
-		credential?: APIClient["credential"];
-		fetch?: APIClient["fetch"] | null | undefined;
-	}) {
-		this.origin = opts.origin;
-		this.credential = opts.credential;
-		// ネイティブ関数をそのまま変数に代入して使おうとするとChromiumではIllegal invocationエラーが発生するため、
-		// 環境で実装されているfetchを使う場合は無名関数でラップして使用する
-		this.fetch = opts.fetch || ((...args) => fetch(...args));
-	}
-
-	public request<E extends keyof Endpoints, P extends Endpoints[E]["req"]>(
-		endpoint: E,
-		params: P = {} as P,
-		credential?: string | null | undefined,
-	): Promise<
-		Endpoints[E]["res"] extends {
-			$switch: { $cases: [any, any][]; $default: any };
-		}
-			? IsCaseMatched<E, P, 0> extends true
-				? GetCaseResult<E, P, 0>
-				: IsCaseMatched<E, P, 1> extends true
-				? GetCaseResult<E, P, 1>
-				: IsCaseMatched<E, P, 2> extends true
-				? GetCaseResult<E, P, 2>
-				: IsCaseMatched<E, P, 3> extends true
-				? GetCaseResult<E, P, 3>
-				: IsCaseMatched<E, P, 4> extends true
-				? GetCaseResult<E, P, 4>
-				: IsCaseMatched<E, P, 5> extends true
-				? GetCaseResult<E, P, 5>
-				: IsCaseMatched<E, P, 6> extends true
-				? GetCaseResult<E, P, 6>
-				: IsCaseMatched<E, P, 7> extends true
-				? GetCaseResult<E, P, 7>
-				: IsCaseMatched<E, P, 8> extends true
-				? GetCaseResult<E, P, 8>
-				: IsCaseMatched<E, P, 9> extends true
-				? GetCaseResult<E, P, 9>
-				: Endpoints[E]["res"]["$switch"]["$default"]
-			: Endpoints[E]["res"]
-	> {
-		const promise = new Promise((resolve, reject) => {
-			this.fetch(`${this.origin}/api/${endpoint}`, {
-				method: "POST",
-				body: JSON.stringify({
-					...params,
-					i: credential !== undefined ? credential : this.credential,
-				}),
-				credentials: "omit",
-				cache: "no-cache",
-			})
-				.then(async (res) => {
-					const body = res.status === 204 ? null : await res.json();
-
-					if (res.status === 200) {
-						resolve(body);
-					} else if (res.status === 204) {
-						resolve(null);
-					} else {
-						reject({
-							[MK_API_ERROR]: true,
-							...body.error,
-						});
-					}
-				})
-				.catch(reject);
-		});
-
-		return promise as any;
-	}
-}
diff --git a/packages/calckey-js/src/api.types.ts b/packages/calckey-js/src/api.types.ts
deleted file mode 100644
index bbe781e92..000000000
--- a/packages/calckey-js/src/api.types.ts
+++ /dev/null
@@ -1,1081 +0,0 @@
-import {
-	Ad,
-	Announcement,
-	Antenna,
-	App,
-	AuthSession,
-	Blocking,
-	Channel,
-	Clip,
-	DateString,
-	DetailedInstanceMetadata,
-	DriveFile,
-	DriveFolder,
-	Following,
-	FollowingFolloweePopulated,
-	FollowingFollowerPopulated,
-	FollowRequest,
-	GalleryPost,
-	Instance,
-	InstanceMetadata,
-	LiteInstanceMetadata,
-	MeDetailed,
-	Note,
-	NoteFavorite,
-	OriginType,
-	Page,
-	ServerInfo,
-	Stats,
-	User,
-	UserDetailed,
-	UserGroup,
-	UserList,
-	UserSorting,
-	Notification,
-	NoteReaction,
-	Signin,
-	MessagingMessage,
-} from "./entities";
-
-type TODO = Record<string, any> | null;
-
-type NoParams = Record<string, never>;
-
-type ShowUserReq = { username: string; host?: string } | { userId: User["id"] };
-
-export type Endpoints = {
-	// admin
-	"admin/abuse-user-reports": { req: TODO; res: TODO };
-	"admin/delete-all-files-of-a-user": {
-		req: { userId: User["id"] };
-		res: null;
-	};
-	"admin/delete-logs": { req: NoParams; res: null };
-	"admin/get-index-stats": { req: TODO; res: TODO };
-	"admin/get-table-stats": { req: TODO; res: TODO };
-	"admin/invite": { req: TODO; res: TODO };
-	"admin/logs": { req: TODO; res: TODO };
-	"admin/reset-password": { req: TODO; res: TODO };
-	"admin/resolve-abuse-user-report": { req: TODO; res: TODO };
-	"admin/resync-chart": { req: TODO; res: TODO };
-	"admin/send-email": { req: TODO; res: TODO };
-	"admin/server-info": { req: TODO; res: TODO };
-	"admin/show-moderation-logs": { req: TODO; res: TODO };
-	"admin/show-user": { req: TODO; res: TODO };
-	"admin/show-users": { req: TODO; res: TODO };
-	"admin/silence-user": { req: TODO; res: TODO };
-	"admin/suspend-user": { req: TODO; res: TODO };
-	"admin/unsilence-user": { req: TODO; res: TODO };
-	"admin/unsuspend-user": { req: TODO; res: TODO };
-	"admin/update-meta": { req: TODO; res: TODO };
-	"admin/vacuum": { req: TODO; res: TODO };
-	"admin/accounts/create": { req: TODO; res: TODO };
-	"admin/ad/create": { req: TODO; res: TODO };
-	"admin/ad/delete": { req: { id: Ad["id"] }; res: null };
-	"admin/ad/list": { req: TODO; res: TODO };
-	"admin/ad/update": { req: TODO; res: TODO };
-	"admin/announcements/create": { req: TODO; res: TODO };
-	"admin/announcements/delete": { req: { id: Announcement["id"] }; res: null };
-	"admin/announcements/list": { req: TODO; res: TODO };
-	"admin/announcements/update": { req: TODO; res: TODO };
-	"admin/drive/clean-remote-files": { req: TODO; res: TODO };
-	"admin/drive/cleanup": { req: TODO; res: TODO };
-	"admin/drive/files": { req: TODO; res: TODO };
-	"admin/drive/show-file": { req: TODO; res: TODO };
-	"admin/emoji/add": { req: TODO; res: TODO };
-	"admin/emoji/copy": { req: TODO; res: TODO };
-	"admin/emoji/list-remote": { req: TODO; res: TODO };
-	"admin/emoji/list": { req: TODO; res: TODO };
-	"admin/emoji/remove": { req: TODO; res: TODO };
-	"admin/emoji/update": { req: TODO; res: TODO };
-	"admin/federation/delete-all-files": { req: { host: string }; res: null };
-	"admin/federation/refresh-remote-instance-metadata": { req: TODO; res: TODO };
-	"admin/federation/remove-all-following": { req: TODO; res: TODO };
-	"admin/federation/update-instance": { req: TODO; res: TODO };
-	"admin/moderators/add": { req: TODO; res: TODO };
-	"admin/moderators/remove": { req: TODO; res: TODO };
-	"admin/promo/create": { req: TODO; res: TODO };
-	"admin/queue/clear": { req: TODO; res: TODO };
-	"admin/queue/deliver-delayed": { req: TODO; res: TODO };
-	"admin/queue/inbox-delayed": { req: TODO; res: TODO };
-	"admin/queue/jobs": { req: TODO; res: TODO };
-	"admin/queue/stats": { req: TODO; res: TODO };
-	"admin/relays/add": { req: TODO; res: TODO };
-	"admin/relays/list": { req: TODO; res: TODO };
-	"admin/relays/remove": { req: TODO; res: TODO };
-
-	// announcements
-	announcements: {
-		req: {
-			limit?: number;
-			withUnreads?: boolean;
-			sinceId?: Announcement["id"];
-			untilId?: Announcement["id"];
-		};
-		res: Announcement[];
-	};
-
-	// antennas
-	"antennas/create": { req: TODO; res: Antenna };
-	"antennas/delete": { req: { antennaId: Antenna["id"] }; res: null };
-	"antennas/list": { req: NoParams; res: Antenna[] };
-	"antennas/notes": {
-		req: {
-			antennaId: Antenna["id"];
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-		};
-		res: Note[];
-	};
-	"antennas/show": { req: { antennaId: Antenna["id"] }; res: Antenna };
-	"antennas/update": { req: TODO; res: Antenna };
-	"antennas/mark-read": { req: TODO; res: Antenna };
-
-	// ap
-	"ap/get": { req: { uri: string }; res: Record<string, any> };
-	"ap/show": {
-		req: { uri: string };
-		res:
-			| {
-					type: "Note";
-					object: Note;
-			  }
-			| {
-					type: "User";
-					object: UserDetailed;
-			  };
-	};
-
-	// app
-	"app/create": { req: TODO; res: App };
-	"app/show": { req: { appId: App["id"] }; res: App };
-
-	// auth
-	"auth/accept": { req: { token: string }; res: null };
-	"auth/session/generate": {
-		req: { appSecret: string };
-		res: { token: string; url: string };
-	};
-	"auth/session/show": { req: { token: string }; res: AuthSession };
-	"auth/session/userkey": {
-		req: { appSecret: string; token: string };
-		res: { accessToken: string; user: User };
-	};
-
-	// blocking
-	"blocking/create": { req: { userId: User["id"] }; res: UserDetailed };
-	"blocking/delete": { req: { userId: User["id"] }; res: UserDetailed };
-	"blocking/list": {
-		req: { limit?: number; sinceId?: Blocking["id"]; untilId?: Blocking["id"] };
-		res: Blocking[];
-	};
-
-	// channels
-	"channels/create": { req: TODO; res: TODO };
-	"channels/featured": { req: TODO; res: TODO };
-	"channels/follow": { req: TODO; res: TODO };
-	"channels/followed": { req: TODO; res: TODO };
-	"channels/owned": { req: TODO; res: TODO };
-	"channels/pin-note": { req: TODO; res: TODO };
-	"channels/show": { req: TODO; res: TODO };
-	"channels/timeline": { req: TODO; res: TODO };
-	"channels/unfollow": { req: TODO; res: TODO };
-	"channels/update": { req: TODO; res: TODO };
-
-	// charts
-	"charts/active-users": {
-		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
-		res: {
-			local: {
-				users: number[];
-			};
-			remote: {
-				users: number[];
-			};
-		};
-	};
-	"charts/drive": {
-		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
-		res: {
-			local: {
-				decCount: number[];
-				decSize: number[];
-				incCount: number[];
-				incSize: number[];
-				totalCount: number[];
-				totalSize: number[];
-			};
-			remote: {
-				decCount: number[];
-				decSize: number[];
-				incCount: number[];
-				incSize: number[];
-				totalCount: number[];
-				totalSize: number[];
-			};
-		};
-	};
-	"charts/federation": {
-		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
-		res: {
-			instance: {
-				dec: number[];
-				inc: number[];
-				total: number[];
-			};
-		};
-	};
-	"charts/hashtag": {
-		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
-		res: TODO;
-	};
-	"charts/instance": {
-		req: {
-			span: "day" | "hour";
-			limit?: number;
-			offset?: number | null;
-			host: string;
-		};
-		res: {
-			drive: {
-				decFiles: number[];
-				decUsage: number[];
-				incFiles: number[];
-				incUsage: number[];
-				totalFiles: number[];
-				totalUsage: number[];
-			};
-			followers: {
-				dec: number[];
-				inc: number[];
-				total: number[];
-			};
-			following: {
-				dec: number[];
-				inc: number[];
-				total: number[];
-			};
-			notes: {
-				dec: number[];
-				inc: number[];
-				total: number[];
-				diffs: {
-					normal: number[];
-					renote: number[];
-					reply: number[];
-				};
-			};
-			requests: {
-				failed: number[];
-				received: number[];
-				succeeded: number[];
-			};
-			users: {
-				dec: number[];
-				inc: number[];
-				total: number[];
-			};
-		};
-	};
-	"charts/network": {
-		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
-		res: TODO;
-	};
-	"charts/notes": {
-		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
-		res: {
-			local: {
-				dec: number[];
-				inc: number[];
-				total: number[];
-				diffs: {
-					normal: number[];
-					renote: number[];
-					reply: number[];
-				};
-			};
-			remote: {
-				dec: number[];
-				inc: number[];
-				total: number[];
-				diffs: {
-					normal: number[];
-					renote: number[];
-					reply: number[];
-				};
-			};
-		};
-	};
-	"charts/user/drive": {
-		req: {
-			span: "day" | "hour";
-			limit?: number;
-			offset?: number | null;
-			userId: User["id"];
-		};
-		res: {
-			decCount: number[];
-			decSize: number[];
-			incCount: number[];
-			incSize: number[];
-			totalCount: number[];
-			totalSize: number[];
-		};
-	};
-	"charts/user/following": {
-		req: {
-			span: "day" | "hour";
-			limit?: number;
-			offset?: number | null;
-			userId: User["id"];
-		};
-		res: TODO;
-	};
-	"charts/user/notes": {
-		req: {
-			span: "day" | "hour";
-			limit?: number;
-			offset?: number | null;
-			userId: User["id"];
-		};
-		res: {
-			dec: number[];
-			inc: number[];
-			total: number[];
-			diffs: {
-				normal: number[];
-				renote: number[];
-				reply: number[];
-			};
-		};
-	};
-	"charts/user/reactions": {
-		req: {
-			span: "day" | "hour";
-			limit?: number;
-			offset?: number | null;
-			userId: User["id"];
-		};
-		res: TODO;
-	};
-	"charts/users": {
-		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
-		res: {
-			local: {
-				dec: number[];
-				inc: number[];
-				total: number[];
-			};
-			remote: {
-				dec: number[];
-				inc: number[];
-				total: number[];
-			};
-		};
-	};
-
-	// clips
-	"clips/add-note": { req: TODO; res: TODO };
-	"clips/create": { req: TODO; res: TODO };
-	"clips/delete": { req: { clipId: Clip["id"] }; res: null };
-	"clips/list": { req: TODO; res: TODO };
-	"clips/notes": { req: TODO; res: TODO };
-	"clips/show": { req: TODO; res: TODO };
-	"clips/update": { req: TODO; res: TODO };
-
-	// drive
-	drive: { req: NoParams; res: { capacity: number; usage: number } };
-	"drive/files": {
-		req: {
-			folderId?: DriveFolder["id"] | null;
-			type?: DriveFile["type"] | null;
-			limit?: number;
-			sinceId?: DriveFile["id"];
-			untilId?: DriveFile["id"];
-		};
-		res: DriveFile[];
-	};
-	"drive/files/attached-notes": { req: TODO; res: TODO };
-	"drive/files/check-existence": { req: TODO; res: TODO };
-	"drive/files/create": { req: TODO; res: TODO };
-	"drive/files/delete": { req: { fileId: DriveFile["id"] }; res: null };
-	"drive/files/find-by-hash": { req: TODO; res: TODO };
-	"drive/files/find": {
-		req: { name: string; folderId?: DriveFolder["id"] | null };
-		res: DriveFile[];
-	};
-	"drive/files/show": {
-		req: { fileId?: DriveFile["id"]; url?: string };
-		res: DriveFile;
-	};
-	"drive/files/update": {
-		req: {
-			fileId: DriveFile["id"];
-			folderId?: DriveFolder["id"] | null;
-			name?: string;
-			isSensitive?: boolean;
-			comment?: string | null;
-		};
-		res: DriveFile;
-	};
-	"drive/files/upload-from-url": {
-		req: {
-			url: string;
-			folderId?: DriveFolder["id"] | null;
-			isSensitive?: boolean;
-			comment?: string | null;
-			marker?: string | null;
-			force?: boolean;
-		};
-		res: null;
-	};
-	"drive/folders": {
-		req: {
-			folderId?: DriveFolder["id"] | null;
-			limit?: number;
-			sinceId?: DriveFile["id"];
-			untilId?: DriveFile["id"];
-		};
-		res: DriveFolder[];
-	};
-	"drive/folders/create": {
-		req: { name?: string; parentId?: DriveFolder["id"] | null };
-		res: DriveFolder;
-	};
-	"drive/folders/delete": { req: { folderId: DriveFolder["id"] }; res: null };
-	"drive/folders/find": {
-		req: { name: string; parentId?: DriveFolder["id"] | null };
-		res: DriveFolder[];
-	};
-	"drive/folders/show": {
-		req: { folderId: DriveFolder["id"] };
-		res: DriveFolder;
-	};
-	"drive/folders/update": {
-		req: {
-			folderId: DriveFolder["id"];
-			name?: string;
-			parentId?: DriveFolder["id"] | null;
-		};
-		res: DriveFolder;
-	};
-	"drive/stream": {
-		req: {
-			type?: DriveFile["type"] | null;
-			limit?: number;
-			sinceId?: DriveFile["id"];
-			untilId?: DriveFile["id"];
-		};
-		res: DriveFile[];
-	};
-
-	// endpoint
-	endpoint: {
-		req: { endpoint: string };
-		res: { params: { name: string; type: string }[] };
-	};
-
-	// endpoints
-	endpoints: { req: NoParams; res: string[] };
-
-	// federation
-	"federation/dns": {
-		req: { host: string };
-		res: {
-			a: string[];
-			aaaa: string[];
-			cname: string[];
-			txt: string[];
-		};
-	};
-	"federation/followers": {
-		req: {
-			host: string;
-			limit?: number;
-			sinceId?: Following["id"];
-			untilId?: Following["id"];
-		};
-		res: FollowingFolloweePopulated[];
-	};
-	"federation/following": {
-		req: {
-			host: string;
-			limit?: number;
-			sinceId?: Following["id"];
-			untilId?: Following["id"];
-		};
-		res: FollowingFolloweePopulated[];
-	};
-	"federation/instances": {
-		req: {
-			host?: string | null;
-			blocked?: boolean | null;
-			notResponding?: boolean | null;
-			suspended?: boolean | null;
-			federating?: boolean | null;
-			subscribing?: boolean | null;
-			publishing?: boolean | null;
-			limit?: number;
-			offset?: number;
-			sort?:
-				| "+pubSub"
-				| "-pubSub"
-				| "+notes"
-				| "-notes"
-				| "+users"
-				| "-users"
-				| "+following"
-				| "-following"
-				| "+followers"
-				| "-followers"
-				| "+caughtAt"
-				| "-caughtAt"
-				| "+lastCommunicatedAt"
-				| "-lastCommunicatedAt"
-				| "+driveUsage"
-				| "-driveUsage"
-				| "+driveFiles"
-				| "-driveFiles";
-		};
-		res: Instance[];
-	};
-	"federation/show-instance": { req: { host: string }; res: Instance };
-	"federation/update-remote-user": { req: { userId: User["id"] }; res: null };
-	"federation/users": {
-		req: {
-			host: string;
-			limit?: number;
-			sinceId?: User["id"];
-			untilId?: User["id"];
-		};
-		res: UserDetailed[];
-	};
-
-	// following
-	"following/create": { req: { userId: User["id"] }; res: User };
-	"following/delete": { req: { userId: User["id"] }; res: User };
-	"following/requests/accept": { req: { userId: User["id"] }; res: null };
-	"following/requests/cancel": { req: { userId: User["id"] }; res: User };
-	"following/requests/list": { req: NoParams; res: FollowRequest[] };
-	"following/requests/reject": { req: { userId: User["id"] }; res: null };
-
-	// gallery
-	"gallery/featured": { req: TODO; res: TODO };
-	"gallery/popular": { req: TODO; res: TODO };
-	"gallery/posts": { req: TODO; res: TODO };
-	"gallery/posts/create": { req: TODO; res: TODO };
-	"gallery/posts/delete": { req: { postId: GalleryPost["id"] }; res: null };
-	"gallery/posts/like": { req: TODO; res: TODO };
-	"gallery/posts/show": { req: TODO; res: TODO };
-	"gallery/posts/unlike": { req: TODO; res: TODO };
-	"gallery/posts/update": { req: TODO; res: TODO };
-
-	// games
-	"games/reversi/games": { req: TODO; res: TODO };
-	"games/reversi/games/show": { req: TODO; res: TODO };
-	"games/reversi/games/surrender": { req: TODO; res: TODO };
-	"games/reversi/invitations": { req: TODO; res: TODO };
-	"games/reversi/match": { req: TODO; res: TODO };
-	"games/reversi/match/cancel": { req: TODO; res: TODO };
-
-	// get-online-users-count
-	"get-online-users-count": { req: NoParams; res: { count: number } };
-
-	// hashtags
-	"hashtags/list": { req: TODO; res: TODO };
-	"hashtags/search": { req: TODO; res: TODO };
-	"hashtags/show": { req: TODO; res: TODO };
-	"hashtags/trend": { req: TODO; res: TODO };
-	"hashtags/users": { req: TODO; res: TODO };
-
-	// i
-	i: { req: NoParams; res: User };
-	"i/apps": { req: TODO; res: TODO };
-	"i/authorized-apps": { req: TODO; res: TODO };
-	"i/change-password": { req: TODO; res: TODO };
-	"i/delete-account": { req: { password: string }; res: null };
-	"i/export-blocking": { req: TODO; res: TODO };
-	"i/export-following": { req: TODO; res: TODO };
-	"i/export-mute": { req: TODO; res: TODO };
-	"i/export-notes": { req: TODO; res: TODO };
-	"i/export-user-lists": { req: TODO; res: TODO };
-	"i/favorites": {
-		req: {
-			limit?: number;
-			sinceId?: NoteFavorite["id"];
-			untilId?: NoteFavorite["id"];
-		};
-		res: NoteFavorite[];
-	};
-	"i/gallery/likes": { req: TODO; res: TODO };
-	"i/gallery/posts": { req: TODO; res: TODO };
-	"i/get-word-muted-notes-count": { req: TODO; res: TODO };
-	"i/import-following": { req: TODO; res: TODO };
-	"i/import-user-lists": { req: TODO; res: TODO };
-	"i/move": { req: TODO; res: TODO };
-	"i/known-as": { req: TODO; res: TODO };
-	"i/notifications": {
-		req: {
-			limit?: number;
-			sinceId?: Notification["id"];
-			untilId?: Notification["id"];
-			following?: boolean;
-			markAsRead?: boolean;
-			includeTypes?: Notification["type"][];
-			excludeTypes?: Notification["type"][];
-		};
-		res: Notification[];
-	};
-	"i/page-likes": { req: TODO; res: TODO };
-	"i/pages": { req: TODO; res: TODO };
-	"i/pin": { req: { noteId: Note["id"] }; res: MeDetailed };
-	"i/read-all-messaging-messages": { req: TODO; res: TODO };
-	"i/read-all-unread-notes": { req: TODO; res: TODO };
-	"i/read-announcement": { req: TODO; res: TODO };
-	"i/regenerate-token": { req: { password: string }; res: null };
-	"i/registry/get-all": { req: { scope?: string[] }; res: Record<string, any> };
-	"i/registry/get-detail": {
-		req: { key: string; scope?: string[] };
-		res: { updatedAt: DateString; value: any };
-	};
-	"i/registry/get": { req: { key: string; scope?: string[] }; res: any };
-	"i/registry/keys-with-type": {
-		req: { scope?: string[] };
-		res: Record<
-			string,
-			"null" | "array" | "number" | "string" | "boolean" | "object"
-		>;
-	};
-	"i/registry/keys": { req: { scope?: string[] }; res: string[] };
-	"i/registry/remove": { req: { key: string; scope?: string[] }; res: null };
-	"i/registry/scopes": { req: NoParams; res: string[][] };
-	"i/registry/set": {
-		req: { key: string; value: any; scope?: string[] };
-		res: null;
-	};
-	"i/revoke-token": { req: TODO; res: TODO };
-	"i/signin-history": {
-		req: { limit?: number; sinceId?: Signin["id"]; untilId?: Signin["id"] };
-		res: Signin[];
-	};
-	"i/unpin": { req: { noteId: Note["id"] }; res: MeDetailed };
-	"i/update-email": {
-		req: {
-			password: string;
-			email?: string | null;
-		};
-		res: MeDetailed;
-	};
-	"i/update": {
-		req: {
-			name?: string | null;
-			description?: string | null;
-			lang?: string | null;
-			location?: string | null;
-			birthday?: string | null;
-			avatarId?: DriveFile["id"] | null;
-			bannerId?: DriveFile["id"] | null;
-			fields?: {
-				name: string;
-				value: string;
-			}[];
-			isLocked?: boolean;
-			isExplorable?: boolean;
-			hideOnlineStatus?: boolean;
-			carefulBot?: boolean;
-			autoAcceptFollowed?: boolean;
-			noCrawle?: boolean;
-			isBot?: boolean;
-			isCat?: boolean;
-			injectFeaturedNote?: boolean;
-			receiveAnnouncementEmail?: boolean;
-			alwaysMarkNsfw?: boolean;
-			mutedWords?: string[][];
-			mutingNotificationTypes?: Notification["type"][];
-			emailNotificationTypes?: string[];
-		};
-		res: MeDetailed;
-	};
-	"i/user-group-invites": { req: TODO; res: TODO };
-	"i/2fa/done": { req: TODO; res: TODO };
-	"i/2fa/key-done": { req: TODO; res: TODO };
-	"i/2fa/password-less": { req: TODO; res: TODO };
-	"i/2fa/register-key": { req: TODO; res: TODO };
-	"i/2fa/register": { req: TODO; res: TODO };
-	"i/2fa/remove-key": { req: TODO; res: TODO };
-	"i/2fa/unregister": { req: TODO; res: TODO };
-
-	// messaging
-	"messaging/history": {
-		req: { limit?: number; group?: boolean };
-		res: MessagingMessage[];
-	};
-	"messaging/messages": {
-		req: {
-			userId?: User["id"];
-			groupId?: UserGroup["id"];
-			limit?: number;
-			sinceId?: MessagingMessage["id"];
-			untilId?: MessagingMessage["id"];
-			markAsRead?: boolean;
-		};
-		res: MessagingMessage[];
-	};
-	"messaging/messages/create": {
-		req: {
-			userId?: User["id"];
-			groupId?: UserGroup["id"];
-			text?: string;
-			fileId?: DriveFile["id"];
-		};
-		res: MessagingMessage;
-	};
-	"messaging/messages/delete": {
-		req: { messageId: MessagingMessage["id"] };
-		res: null;
-	};
-	"messaging/messages/read": {
-		req: { messageId: MessagingMessage["id"] };
-		res: null;
-	};
-
-	// meta
-	meta: {
-		req: { detail?: boolean };
-		res: {
-			$switch: {
-				$cases: [
-					[{ detail: true }, DetailedInstanceMetadata],
-					[{ detail: false }, LiteInstanceMetadata],
-					[
-						{ detail: boolean },
-						LiteInstanceMetadata | DetailedInstanceMetadata,
-					],
-				];
-				$default: LiteInstanceMetadata;
-			};
-		};
-	};
-
-	// miauth
-	"miauth/gen-token": { req: TODO; res: TODO };
-
-	// mute
-	"mute/create": { req: TODO; res: TODO };
-	"mute/delete": { req: { userId: User["id"] }; res: null };
-	"mute/list": { req: TODO; res: TODO };
-
-	// my
-	"my/apps": { req: TODO; res: TODO };
-
-	// notes
-	notes: {
-		req: { limit?: number; sinceId?: Note["id"]; untilId?: Note["id"] };
-		res: Note[];
-	};
-	"notes/children": {
-		req: {
-			noteId: Note["id"];
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-		};
-		res: Note[];
-	};
-	"notes/clips": { req: TODO; res: TODO };
-	"notes/conversation": { req: TODO; res: TODO };
-	"notes/create": {
-		req: {
-			visibility?: "public" | "home" | "followers" | "specified";
-			visibleUserIds?: User["id"][];
-			text?: null | string;
-			cw?: null | string;
-			viaMobile?: boolean;
-			localOnly?: boolean;
-			fileIds?: DriveFile["id"][];
-			replyId?: null | Note["id"];
-			renoteId?: null | Note["id"];
-			channelId?: null | Channel["id"];
-			poll?: null | {
-				choices: string[];
-				multiple?: boolean;
-				expiresAt?: null | number;
-				expiredAfter?: null | number;
-			};
-		};
-		res: { createdNote: Note };
-	};
-	"notes/delete": { req: { noteId: Note["id"] }; res: null };
-	"notes/favorites/create": { req: { noteId: Note["id"] }; res: null };
-	"notes/favorites/delete": { req: { noteId: Note["id"] }; res: null };
-	"notes/featured": { req: TODO; res: Note[] };
-	"notes/global-timeline": {
-		req: {
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-			sinceDate?: number;
-			untilDate?: number;
-		};
-		res: Note[];
-	};
-	"notes/recommended-timeline": {
-		req: {
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-			sinceDate?: number;
-			untilDate?: number;
-		};
-		res: Note[];
-	};
-	"notes/hybrid-timeline": {
-		req: {
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-			sinceDate?: number;
-			untilDate?: number;
-		};
-		res: Note[];
-	};
-	"notes/local-timeline": {
-		req: {
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-			sinceDate?: number;
-			untilDate?: number;
-		};
-		res: Note[];
-	};
-	"notes/mentions": {
-		req: {
-			following?: boolean;
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-		};
-		res: Note[];
-	};
-	"notes/polls/recommendation": { req: TODO; res: TODO };
-	"notes/polls/vote": {
-		req: { noteId: Note["id"]; choice: number };
-		res: null;
-	};
-	"notes/reactions": {
-		req: { noteId: Note["id"]; type?: string | null; limit?: number };
-		res: NoteReaction[];
-	};
-	"notes/reactions/create": {
-		req: { noteId: Note["id"]; reaction: string };
-		res: null;
-	};
-	"notes/reactions/delete": { req: { noteId: Note["id"] }; res: null };
-	"notes/renotes": {
-		req: {
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-			noteId: Note["id"];
-		};
-		res: Note[];
-	};
-	"notes/replies": {
-		req: {
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-			noteId: Note["id"];
-		};
-		res: Note[];
-	};
-	"notes/search-by-tag": { req: TODO; res: TODO };
-	"notes/search": { req: TODO; res: TODO };
-	"notes/show": { req: { noteId: Note["id"] }; res: Note };
-	"notes/state": { req: TODO; res: TODO };
-	"notes/timeline": {
-		req: {
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-			sinceDate?: number;
-			untilDate?: number;
-		};
-		res: Note[];
-	};
-	"notes/unrenote": { req: { noteId: Note["id"] }; res: null };
-	"notes/user-list-timeline": {
-		req: {
-			listId: UserList["id"];
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-			sinceDate?: number;
-			untilDate?: number;
-		};
-		res: Note[];
-	};
-	"notes/watching/create": { req: TODO; res: TODO };
-	"notes/watching/delete": { req: { noteId: Note["id"] }; res: null };
-
-	// notifications
-	"notifications/create": {
-		req: { body: string; header?: string | null; icon?: string | null };
-		res: null;
-	};
-	"notifications/mark-all-as-read": { req: NoParams; res: null };
-	"notifications/read": {
-		req: { notificationId: Notification["id"] };
-		res: null;
-	};
-
-	// page-push
-	"page-push": {
-		req: { pageId: Page["id"]; event: string; var?: any };
-		res: null;
-	};
-
-	// pages
-	"pages/create": { req: TODO; res: Page };
-	"pages/delete": { req: { pageId: Page["id"] }; res: null };
-	"pages/featured": { req: NoParams; res: Page[] };
-	"pages/like": { req: { pageId: Page["id"] }; res: null };
-	"pages/show": {
-		req: { pageId?: Page["id"]; name?: string; username?: string };
-		res: Page;
-	};
-	"pages/unlike": { req: { pageId: Page["id"] }; res: null };
-	"pages/update": { req: TODO; res: null };
-
-	// ping
-	ping: { req: NoParams; res: { pong: number } };
-
-	// pinned-users
-	"pinned-users": { req: TODO; res: TODO };
-
-	// promo
-	"promo/read": { req: TODO; res: TODO };
-
-	// request-reset-password
-	"request-reset-password": {
-		req: { username: string; email: string };
-		res: null;
-	};
-
-	// reset-password
-	"reset-password": { req: { token: string; password: string }; res: null };
-
-	// room
-	"room/show": { req: TODO; res: TODO };
-	"room/update": { req: TODO; res: TODO };
-
-	// stats
-	stats: { req: NoParams; res: Stats };
-
-	// server-info
-	"server-info": { req: NoParams; res: ServerInfo };
-
-	// ck specific
-	"latest-version": { req: NoParams; res: TODO };
-
-	// sw
-	"sw/register": { req: TODO; res: TODO };
-
-	// username
-	"username/available": {
-		req: { username: string };
-		res: { available: boolean };
-	};
-
-	// users
-	users: {
-		req: {
-			limit?: number;
-			offset?: number;
-			sort?: UserSorting;
-			origin?: OriginType;
-		};
-		res: User[];
-	};
-	"users/clips": { req: TODO; res: TODO };
-	"users/followers": {
-		req: {
-			userId?: User["id"];
-			username?: User["username"];
-			host?: User["host"] | null;
-			limit?: number;
-			sinceId?: Following["id"];
-			untilId?: Following["id"];
-		};
-		res: FollowingFollowerPopulated[];
-	};
-	"users/following": {
-		req: {
-			userId?: User["id"];
-			username?: User["username"];
-			host?: User["host"] | null;
-			limit?: number;
-			sinceId?: Following["id"];
-			untilId?: Following["id"];
-		};
-		res: FollowingFolloweePopulated[];
-	};
-	"users/gallery/posts": { req: TODO; res: TODO };
-	"users/get-frequently-replied-users": { req: TODO; res: TODO };
-	"users/groups/create": { req: TODO; res: TODO };
-	"users/groups/delete": { req: { groupId: UserGroup["id"] }; res: null };
-	"users/groups/invitations/accept": { req: TODO; res: TODO };
-	"users/groups/invitations/reject": { req: TODO; res: TODO };
-	"users/groups/invite": { req: TODO; res: TODO };
-	"users/groups/joined": { req: TODO; res: TODO };
-	"users/groups/owned": { req: TODO; res: TODO };
-	"users/groups/pull": { req: TODO; res: TODO };
-	"users/groups/show": { req: TODO; res: TODO };
-	"users/groups/transfer": { req: TODO; res: TODO };
-	"users/groups/update": { req: TODO; res: TODO };
-	"users/lists/create": { req: { name: string }; res: UserList };
-	"users/lists/delete": { req: { listId: UserList["id"] }; res: null };
-	"users/lists/list": { req: NoParams; res: UserList[] };
-	"users/lists/pull": {
-		req: { listId: UserList["id"]; userId: User["id"] };
-		res: null;
-	};
-	"users/lists/push": {
-		req: { listId: UserList["id"]; userId: User["id"] };
-		res: null;
-	};
-	"users/lists/show": { req: { listId: UserList["id"] }; res: UserList };
-	"users/lists/update": {
-		req: { listId: UserList["id"]; name: string };
-		res: UserList;
-	};
-	"users/notes": {
-		req: {
-			userId: User["id"];
-			limit?: number;
-			sinceId?: Note["id"];
-			untilId?: Note["id"];
-			sinceDate?: number;
-			untilDate?: number;
-		};
-		res: Note[];
-	};
-	"users/pages": { req: TODO; res: TODO };
-	"users/recommendation": { req: TODO; res: TODO };
-	"users/relation": { req: TODO; res: TODO };
-	"users/report-abuse": { req: TODO; res: TODO };
-	"users/search-by-username-and-host": { req: TODO; res: TODO };
-	"users/search": { req: TODO; res: TODO };
-	"users/show": {
-		req: ShowUserReq | { userIds: User["id"][] };
-		res: {
-			$switch: {
-				$cases: [[{ userIds: User["id"][] }, UserDetailed[]]];
-				$default: UserDetailed;
-			};
-		};
-	};
-	"users/stats": { req: TODO; res: TODO };
-};
diff --git a/packages/calckey-js/src/consts.ts b/packages/calckey-js/src/consts.ts
deleted file mode 100644
index be33c0d3e..000000000
--- a/packages/calckey-js/src/consts.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-export const notificationTypes = [
-	"follow",
-	"mention",
-	"reply",
-	"renote",
-	"quote",
-	"reaction",
-	"pollVote",
-	"pollEnded",
-	"receiveFollowRequest",
-	"followRequestAccepted",
-	"groupInvited",
-	"app",
-] as const;
-
-export const noteVisibilities = [
-	"public",
-	"home",
-	"followers",
-	"specified",
-] as const;
-
-export const mutedNoteReasons = ["word", "manual", "spam", "other"] as const;
-
-export const ffVisibility = ["public", "followers", "private"] as const;
-
-export const permissions = [
-	"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",
-];
diff --git a/packages/calckey-js/src/entities.ts b/packages/calckey-js/src/entities.ts
deleted file mode 100644
index b15dd8fca..000000000
--- a/packages/calckey-js/src/entities.ts
+++ /dev/null
@@ -1,490 +0,0 @@
-export type ID = string;
-export type DateString = string;
-
-type TODO = Record<string, any>;
-
-// NOTE: 極力この型を使うのは避け、UserLite か UserDetailed か明示するように
-export type User = UserLite | UserDetailed;
-
-export type UserLite = {
-	id: ID;
-	username: string;
-	host: string | null;
-	name: string;
-	onlineStatus: "online" | "active" | "offline" | "unknown";
-	avatarUrl: string;
-	avatarBlurhash: string;
-	alsoKnownAs: string[];
-	movedToUri: any;
-	emojis: {
-		name: string;
-		url: string;
-	}[];
-	instance?: {
-		name: Instance["name"];
-		softwareName: Instance["softwareName"];
-		softwareVersion: Instance["softwareVersion"];
-		iconUrl: Instance["iconUrl"];
-		faviconUrl: Instance["faviconUrl"];
-		themeColor: Instance["themeColor"];
-	};
-};
-
-export type UserDetailed = UserLite & {
-	bannerBlurhash: string | null;
-	bannerColor: string | null;
-	bannerUrl: string | null;
-	birthday: string | null;
-	createdAt: DateString;
-	description: string | null;
-	ffVisibility: "public" | "followers" | "private";
-	fields: { name: string; value: string }[];
-	followersCount: number;
-	followingCount: number;
-	hasPendingFollowRequestFromYou: boolean;
-	hasPendingFollowRequestToYou: boolean;
-	isAdmin: boolean;
-	isBlocked: boolean;
-	isBlocking: boolean;
-	isBot: boolean;
-	isCat: boolean;
-	isFollowed: boolean;
-	isFollowing: boolean;
-	isLocked: boolean;
-	isModerator: boolean;
-	isMuted: boolean;
-	isSilenced: boolean;
-	isSuspended: boolean;
-	lang: string | null;
-	lastFetchedAt?: DateString;
-	location: string | null;
-	notesCount: number;
-	pinnedNoteIds: ID[];
-	pinnedNotes: Note[];
-	pinnedPage: Page | null;
-	pinnedPageId: string | null;
-	publicReactions: boolean;
-	securityKeys: boolean;
-	twoFactorEnabled: boolean;
-	updatedAt: DateString | null;
-	uri: string | null;
-	url: string | null;
-};
-
-export type UserGroup = TODO;
-
-export type UserList = {
-	id: ID;
-	createdAt: DateString;
-	name: string;
-	userIds: User["id"][];
-};
-
-export type MeDetailed = UserDetailed & {
-	avatarId: DriveFile["id"];
-	bannerId: DriveFile["id"];
-	autoAcceptFollowed: boolean;
-	alwaysMarkNsfw: boolean;
-	carefulBot: boolean;
-	emailNotificationTypes: string[];
-	hasPendingReceivedFollowRequest: boolean;
-	hasUnreadAnnouncement: boolean;
-	hasUnreadAntenna: boolean;
-	hasUnreadChannel: boolean;
-	hasUnreadMentions: boolean;
-	hasUnreadMessagingMessage: boolean;
-	hasUnreadNotification: boolean;
-	hasUnreadSpecifiedNotes: boolean;
-	hideOnlineStatus: boolean;
-	injectFeaturedNote: boolean;
-	integrations: Record<string, any>;
-	isDeleted: boolean;
-	isExplorable: boolean;
-	mutedWords: string[][];
-	mutingNotificationTypes: string[];
-	noCrawle: boolean;
-	receiveAnnouncementEmail: boolean;
-	usePasswordLessLogin: boolean;
-	[other: string]: any;
-};
-
-export type DriveFile = {
-	id: ID;
-	createdAt: DateString;
-	isSensitive: boolean;
-	name: string;
-	thumbnailUrl: string;
-	url: string;
-	type: string;
-	size: number;
-	md5: string;
-	blurhash: string;
-	comment: string | null;
-	properties: Record<string, any>;
-};
-
-export type DriveFolder = TODO;
-
-export type GalleryPost = TODO;
-
-export type Note = {
-	id: ID;
-	createdAt: DateString;
-	text: string | null;
-	cw: string | null;
-	user: User;
-	userId: User["id"];
-	reply?: Note;
-	replyId: Note["id"];
-	renote?: Note;
-	renoteId: Note["id"];
-	files: DriveFile[];
-	fileIds: DriveFile["id"][];
-	visibility: "public" | "home" | "followers" | "specified";
-	visibleUserIds?: User["id"][];
-	localOnly?: boolean;
-	myReaction?: string;
-	reactions: Record<string, number>;
-	renoteCount: number;
-	repliesCount: number;
-	poll?: {
-		expiresAt: DateString | null;
-		multiple: boolean;
-		choices: {
-			isVoted: boolean;
-			text: string;
-			votes: number;
-		}[];
-	};
-	emojis: {
-		name: string;
-		url: string;
-	}[];
-	uri?: string;
-	url?: string;
-	isHidden?: boolean;
-};
-
-export type NoteReaction = {
-	id: ID;
-	createdAt: DateString;
-	user: UserLite;
-	type: string;
-};
-
-export type Notification = {
-	id: ID;
-	createdAt: DateString;
-	isRead: boolean;
-} & (
-	| {
-			type: "reaction";
-			reaction: string;
-			user: User;
-			userId: User["id"];
-			note: Note;
-	  }
-	| {
-			type: "reply";
-			user: User;
-			userId: User["id"];
-			note: Note;
-	  }
-	| {
-			type: "renote";
-			user: User;
-			userId: User["id"];
-			note: Note;
-	  }
-	| {
-			type: "quote";
-			user: User;
-			userId: User["id"];
-			note: Note;
-	  }
-	| {
-			type: "mention";
-			user: User;
-			userId: User["id"];
-			note: Note;
-	  }
-	| {
-			type: "pollVote";
-			user: User;
-			userId: User["id"];
-			note: Note;
-	  }
-	| {
-			type: "follow";
-			user: User;
-			userId: User["id"];
-	  }
-	| {
-			type: "followRequestAccepted";
-			user: User;
-			userId: User["id"];
-	  }
-	| {
-			type: "receiveFollowRequest";
-			user: User;
-			userId: User["id"];
-	  }
-	| {
-			type: "groupInvited";
-			invitation: UserGroup;
-			user: User;
-			userId: User["id"];
-	  }
-	| {
-			type: "app";
-			header?: string | null;
-			body: string;
-			icon?: string | null;
-	  }
-);
-
-export type MessagingMessage = {
-	id: ID;
-	createdAt: DateString;
-	file: DriveFile | null;
-	fileId: DriveFile["id"] | null;
-	isRead: boolean;
-	reads: User["id"][];
-	text: string | null;
-	user: User;
-	userId: User["id"];
-	recipient?: User | null;
-	recipientId: User["id"] | null;
-	group?: UserGroup | null;
-	groupId: UserGroup["id"] | null;
-};
-
-export type CustomEmoji = {
-	id: string;
-	name: string;
-	url: string;
-	category: string;
-	aliases: string[];
-};
-
-export type LiteInstanceMetadata = {
-	maintainerName: string | null;
-	maintainerEmail: string | null;
-	version: string;
-	name: string | null;
-	uri: string;
-	description: string | null;
-	tosUrl: string | null;
-	disableRegistration: boolean;
-	disableLocalTimeline: boolean;
-	disableRecommendedTimeline: boolean;
-	disableGlobalTimeline: boolean;
-	driveCapacityPerLocalUserMb: number;
-	driveCapacityPerRemoteUserMb: number;
-	enableHcaptcha: boolean;
-	hcaptchaSiteKey: string | null;
-	enableRecaptcha: boolean;
-	recaptchaSiteKey: string | null;
-	swPublickey: string | null;
-	maxNoteTextLength: number;
-	enableEmail: boolean;
-	enableTwitterIntegration: boolean;
-	enableGithubIntegration: boolean;
-	enableDiscordIntegration: boolean;
-	enableServiceWorker: boolean;
-	emojis: CustomEmoji[];
-	ads: {
-		id: ID;
-		ratio: number;
-		place: string;
-		url: string;
-		imageUrl: string;
-	}[];
-};
-
-export type DetailedInstanceMetadata = LiteInstanceMetadata & {
-	features: Record<string, any>;
-};
-
-export type InstanceMetadata = LiteInstanceMetadata | DetailedInstanceMetadata;
-
-export type ServerInfo = {
-	machine: string;
-	cpu: {
-		model: string;
-		cores: number;
-	};
-	mem: {
-		total: number;
-	};
-	fs: {
-		total: number;
-		used: number;
-	};
-};
-
-export type Stats = {
-	notesCount: number;
-	originalNotesCount: number;
-	usersCount: number;
-	originalUsersCount: number;
-	instances: number;
-	driveUsageLocal: number;
-	driveUsageRemote: number;
-};
-
-export type Page = {
-	id: ID;
-	createdAt: DateString;
-	updatedAt: DateString;
-	userId: User["id"];
-	user: User;
-	content: Record<string, any>[];
-	variables: Record<string, any>[];
-	title: string;
-	name: string;
-	summary: string | null;
-	hideTitleWhenPinned: boolean;
-	alignCenter: boolean;
-	font: string;
-	script: string;
-	eyeCatchingImageId: DriveFile["id"] | null;
-	eyeCatchingImage: DriveFile | null;
-	attachedFiles: any;
-	likedCount: number;
-	isLiked?: boolean;
-};
-
-export type PageEvent = {
-	pageId: Page["id"];
-	event: string;
-	var: any;
-	userId: User["id"];
-	user: User;
-};
-
-export type Announcement = {
-	id: ID;
-	createdAt: DateString;
-	updatedAt: DateString | null;
-	text: string;
-	title: string;
-	imageUrl: string | null;
-	isRead?: boolean;
-};
-
-export type Antenna = {
-	id: ID;
-	createdAt: DateString;
-	name: string;
-	keywords: string[][]; // TODO
-	excludeKeywords: string[][]; // TODO
-	src: "home" | "all" | "users" | "list" | "group" | "instances";
-	userListId: ID | null; // TODO
-	userGroupId: ID | null; // TODO
-	users: string[]; // TODO
-	instances: string[];
-	caseSensitive: boolean;
-	notify: boolean;
-	withReplies: boolean;
-	withFile: boolean;
-	hasUnreadNote: boolean;
-};
-
-export type App = TODO;
-
-export type AuthSession = {
-	id: ID;
-	app: App;
-	token: string;
-};
-
-export type Ad = TODO;
-
-export type Clip = TODO;
-
-export type NoteFavorite = {
-	id: ID;
-	createdAt: DateString;
-	noteId: Note["id"];
-	note: Note;
-};
-
-export type FollowRequest = {
-	id: ID;
-	follower: User;
-	followee: User;
-};
-
-export type Channel = {
-	id: ID;
-	// TODO
-};
-
-export type Following = {
-	id: ID;
-	createdAt: DateString;
-	followerId: User["id"];
-	followeeId: User["id"];
-};
-
-export type FollowingFolloweePopulated = Following & {
-	followee: UserDetailed;
-};
-
-export type FollowingFollowerPopulated = Following & {
-	follower: UserDetailed;
-};
-
-export type Blocking = {
-	id: ID;
-	createdAt: DateString;
-	blockeeId: User["id"];
-	blockee: UserDetailed;
-};
-
-export type Instance = {
-	id: ID;
-	caughtAt: DateString;
-	host: string;
-	usersCount: number;
-	notesCount: number;
-	followingCount: number;
-	followersCount: number;
-	driveUsage: number;
-	driveFiles: number;
-	latestRequestSentAt: DateString | null;
-	latestStatus: number | null;
-	latestRequestReceivedAt: DateString | null;
-	lastCommunicatedAt: DateString;
-	isNotResponding: boolean;
-	isSuspended: boolean;
-	softwareName: string | null;
-	softwareVersion: string | null;
-	openRegistrations: boolean | null;
-	name: string | null;
-	description: string | null;
-	maintainerName: string | null;
-	maintainerEmail: string | null;
-	iconUrl: string | null;
-	faviconUrl: string | null;
-	themeColor: string | null;
-	infoUpdatedAt: DateString | null;
-};
-
-export type Signin = {
-	id: ID;
-	createdAt: DateString;
-	ip: string;
-	headers: Record<string, any>;
-	success: boolean;
-};
-
-export type UserSorting =
-	| "+follower"
-	| "-follower"
-	| "+createdAt"
-	| "-createdAt"
-	| "+updatedAt"
-	| "-updatedAt";
-export type OriginType = "combined" | "local" | "remote";
diff --git a/packages/calckey-js/src/index.ts b/packages/calckey-js/src/index.ts
deleted file mode 100644
index 128ed8c53..000000000
--- a/packages/calckey-js/src/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Endpoints } from "./api.types";
-import Stream, { Connection } from "./streaming";
-import { Channels } from "./streaming.types";
-import { Acct } from "./acct";
-import * as consts from "./consts";
-
-export { Endpoints, Stream, Connection as ChannelConnection, Channels, Acct };
-
-export const permissions = consts.permissions;
-export const notificationTypes = consts.notificationTypes;
-export const noteVisibilities = consts.noteVisibilities;
-export const mutedNoteReasons = consts.mutedNoteReasons;
-export const ffVisibility = consts.ffVisibility;
-
-// api extractor not supported yet
-//export * as api from './api';
-//export * as entities from './entities';
-import * as api from "./api";
-import * as entities from "./entities";
-export { api, entities };
diff --git a/packages/calckey-js/src/streaming.ts b/packages/calckey-js/src/streaming.ts
deleted file mode 100644
index 80a3d6e8c..000000000
--- a/packages/calckey-js/src/streaming.ts
+++ /dev/null
@@ -1,393 +0,0 @@
-import autobind from "autobind-decorator";
-import { EventEmitter } from "eventemitter3";
-import ReconnectingWebsocket from "reconnecting-websocket";
-import { BroadcastEvents, Channels } from "./streaming.types";
-
-export function urlQuery(
-	obj: Record<string, string | number | boolean | undefined>,
-): string {
-	const params = Object.entries(obj)
-		.filter(([, v]) => (Array.isArray(v) ? v.length : v !== undefined))
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		.reduce(
-			(a, [k, v]) => ((a[k] = v!), a),
-			{} as Record<string, string | number | boolean>,
-		);
-
-	return Object.entries(params)
-		.map((e) => `${e[0]}=${encodeURIComponent(e[1])}`)
-		.join("&");
-}
-
-type AnyOf<T extends Record<any, any>> = T[keyof T];
-
-type StreamEvents = {
-	_connected_: void;
-	_disconnected_: void;
-} & BroadcastEvents;
-
-/**
- * Misskey stream connection
- */
-export default class Stream extends EventEmitter<StreamEvents> {
-	private stream: ReconnectingWebsocket;
-	public state: "initializing" | "reconnecting" | "connected" = "initializing";
-	private sharedConnectionPools: Pool[] = [];
-	private sharedConnections: SharedConnection[] = [];
-	private nonSharedConnections: NonSharedConnection[] = [];
-	private idCounter = 0;
-
-	constructor(
-		origin: string,
-		user: { token: string } | null,
-		options?: {
-			WebSocket?: any;
-		},
-	) {
-		super();
-		options = options || {};
-
-		const query = urlQuery({
-			i: user?.token,
-
-			// To prevent cache of an HTML such as error screen
-			_t: Date.now(),
-		});
-
-		const wsOrigin = origin
-			.replace("http://", "ws://")
-			.replace("https://", "wss://");
-
-		this.stream = new ReconnectingWebsocket(
-			`${wsOrigin}/streaming?${query}`,
-			"",
-			{
-				minReconnectionDelay: 1, // https://github.com/pladaria/reconnecting-websocket/issues/91
-				WebSocket: options.WebSocket,
-			},
-		);
-		this.stream.addEventListener("open", this.onOpen);
-		this.stream.addEventListener("close", this.onClose);
-		this.stream.addEventListener("message", this.onMessage);
-	}
-
-	@autobind
-	private genId(): string {
-		return (++this.idCounter).toString();
-	}
-
-	@autobind
-	public useChannel<C extends keyof Channels>(
-		channel: C,
-		params?: Channels[C]["params"],
-		name?: string,
-	): Connection<Channels[C]> {
-		if (params) {
-			return this.connectToChannel(channel, params);
-		} else {
-			return this.useSharedConnection(channel, name);
-		}
-	}
-
-	@autobind
-	private useSharedConnection<C extends keyof Channels>(
-		channel: C,
-		name?: string,
-	): SharedConnection<Channels[C]> {
-		let pool = this.sharedConnectionPools.find((p) => p.channel === channel);
-
-		if (pool == null) {
-			pool = new Pool(this, channel, this.genId());
-			this.sharedConnectionPools.push(pool);
-		}
-
-		const connection = new SharedConnection(this, channel, pool, name);
-		this.sharedConnections.push(connection);
-		return connection;
-	}
-
-	@autobind
-	public removeSharedConnection(connection: SharedConnection): void {
-		this.sharedConnections = this.sharedConnections.filter(
-			(c) => c !== connection,
-		);
-	}
-
-	@autobind
-	public removeSharedConnectionPool(pool: Pool): void {
-		this.sharedConnectionPools = this.sharedConnectionPools.filter(
-			(p) => p !== pool,
-		);
-	}
-
-	@autobind
-	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);
-		return connection;
-	}
-
-	@autobind
-	public disconnectToChannel(connection: NonSharedConnection): void {
-		this.nonSharedConnections = this.nonSharedConnections.filter(
-			(c) => c !== connection,
-		);
-	}
-
-	/**
-	 * Callback of when open connection
-	 */
-	@autobind
-	private onOpen(): void {
-		const isReconnect = this.state === "reconnecting";
-
-		this.state = "connected";
-		this.emit("_connected_");
-
-		// チャンネル再接続
-		if (isReconnect) {
-			for (const p of this.sharedConnectionPools) p.connect();
-			for (const c of this.nonSharedConnections) c.connect();
-		}
-	}
-
-	/**
-	 * Callback of when close connection
-	 */
-	@autobind
-	private onClose(): void {
-		if (this.state === "connected") {
-			this.state = "reconnecting";
-			this.emit("_disconnected_");
-		}
-	}
-
-	/**
-	 * Callback of when received a message from connection
-	 */
-	@autobind
-	private onMessage(message: { data: string }): void {
-		const { type, body } = JSON.parse(message.data);
-
-		if (type === "channel") {
-			const id = body.id;
-
-			let connections: Connection[];
-
-			connections = this.sharedConnections.filter((c) => c.id === id);
-
-			if (connections.length === 0) {
-				const found = this.nonSharedConnections.find((c) => c.id === id);
-				if (found) {
-					connections = [found];
-				}
-			}
-
-			for (const c of connections) {
-				c.emit(body.type, body.body);
-				c.inCount++;
-			}
-		} else {
-			this.emit(type, body);
-		}
-	}
-
-	/**
-	 * Send a message to connection
-	 */
-	@autobind
-	public send(typeOrPayload: any, payload?: any): void {
-		const data =
-			payload === undefined
-				? typeOrPayload
-				: {
-						type: typeOrPayload,
-						body: payload,
-				  };
-
-		this.stream.send(JSON.stringify(data));
-	}
-
-	/**
-	 * Close this connection
-	 */
-	@autobind
-	public close(): void {
-		this.stream.close();
-	}
-}
-
-// TODO: これらのクラスを Stream クラスの内部クラスにすれば余計なメンバをpublicにしないで済むかも？
-// もしくは @internal を使う？ https://www.typescriptlang.org/tsconfig#stripInternal
-class Pool {
-	public channel: string;
-	public id: string;
-	protected stream: Stream;
-	public users = 0;
-	private disposeTimerId: any;
-	private isConnected = false;
-
-	constructor(stream: Stream, channel: string, id: string) {
-		this.channel = channel;
-		this.stream = stream;
-		this.id = id;
-
-		this.stream.on("_disconnected_", this.onStreamDisconnected);
-	}
-
-	@autobind
-	private onStreamDisconnected(): void {
-		this.isConnected = false;
-	}
-
-	@autobind
-	public inc(): void {
-		if (this.users === 0 && !this.isConnected) {
-			this.connect();
-		}
-
-		this.users++;
-
-		// タイマー解除
-		if (this.disposeTimerId) {
-			clearTimeout(this.disposeTimerId);
-			this.disposeTimerId = null;
-		}
-	}
-
-	@autobind
-	public dec(): void {
-		this.users--;
-
-		// そのコネクションの利用者が誰もいなくなったら
-		if (this.users === 0) {
-			// また直ぐに再利用される可能性があるので、一定時間待ち、
-			// 新たな利用者が現れなければコネクションを切断する
-			this.disposeTimerId = setTimeout(() => {
-				this.disconnect();
-			}, 3000);
-		}
-	}
-
-	@autobind
-	public connect(): void {
-		if (this.isConnected) return;
-		this.isConnected = true;
-		this.stream.send("connect", {
-			channel: this.channel,
-			id: this.id,
-		});
-	}
-
-	@autobind
-	private disconnect(): void {
-		this.stream.off("_disconnected_", this.onStreamDisconnected);
-		this.stream.send("disconnect", { id: this.id });
-		this.stream.removeSharedConnectionPool(this);
-	}
-}
-
-export abstract class Connection<
-	Channel extends AnyOf<Channels> = any,
-> extends EventEmitter<Channel["events"]> {
-	public channel: string;
-	protected stream: Stream;
-	public abstract id: string;
-
-	public name?: string; // for debug
-	public inCount = 0; // for debug
-	public outCount = 0; // for debug
-
-	constructor(stream: Stream, channel: string, name?: string) {
-		super();
-
-		this.stream = stream;
-		this.channel = channel;
-		this.name = name;
-	}
-
-	@autobind
-	public send<T extends keyof Channel["receives"]>(
-		type: T,
-		body: Channel["receives"][T],
-	): void {
-		this.stream.send("ch", {
-			id: this.id,
-			type: type,
-			body: body,
-		});
-
-		this.outCount++;
-	}
-
-	public abstract dispose(): void;
-}
-
-class SharedConnection<
-	Channel extends AnyOf<Channels> = any,
-> extends Connection<Channel> {
-	private pool: Pool;
-
-	public get id(): string {
-		return this.pool.id;
-	}
-
-	constructor(stream: Stream, channel: string, pool: Pool, name?: string) {
-		super(stream, channel, name);
-
-		this.pool = pool;
-		this.pool.inc();
-	}
-
-	@autobind
-	public dispose(): void {
-		this.pool.dec();
-		this.removeAllListeners();
-		this.stream.removeSharedConnection(this);
-	}
-}
-
-class NonSharedConnection<
-	Channel extends AnyOf<Channels> = any,
-> extends Connection<Channel> {
-	public id: string;
-	protected params: Channel["params"];
-
-	constructor(
-		stream: Stream,
-		channel: string,
-		id: string,
-		params: Channel["params"],
-	) {
-		super(stream, channel);
-
-		this.params = params;
-		this.id = id;
-
-		this.connect();
-	}
-
-	@autobind
-	public connect(): void {
-		this.stream.send("connect", {
-			channel: this.channel,
-			id: this.id,
-			params: this.params,
-		});
-	}
-
-	@autobind
-	public dispose(): void {
-		this.removeAllListeners();
-		this.stream.send("disconnect", { id: this.id });
-		this.stream.disconnectToChannel(this);
-	}
-}
diff --git a/packages/calckey-js/src/streaming.types.ts b/packages/calckey-js/src/streaming.types.ts
deleted file mode 100644
index 44ef647bc..000000000
--- a/packages/calckey-js/src/streaming.types.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-import {
-	Antenna,
-	CustomEmoji,
-	DriveFile,
-	MeDetailed,
-	MessagingMessage,
-	Note,
-	Notification,
-	PageEvent,
-	User,
-	UserGroup,
-} from "./entities";
-
-type FIXME = any;
-
-export type Channels = {
-	main: {
-		params: null;
-		events: {
-			notification: (payload: Notification) => void;
-			mention: (payload: Note) => void;
-			reply: (payload: Note) => void;
-			renote: (payload: Note) => void;
-			follow: (payload: User) => void; // 自分が他人をフォローしたとき
-			followed: (payload: User) => void; // 他人が自分をフォローしたとき
-			unfollow: (payload: User) => void; // 自分が他人をフォロー解除したとき
-			meUpdated: (payload: MeDetailed) => void;
-			pageEvent: (payload: PageEvent) => void;
-			urlUploadFinished: (payload: { marker: string; file: DriveFile }) => void;
-			readAllNotifications: () => void;
-			unreadNotification: (payload: Notification) => void;
-			unreadMention: (payload: Note["id"]) => void;
-			readAllUnreadMentions: () => void;
-			unreadSpecifiedNote: (payload: Note["id"]) => void;
-			readAllUnreadSpecifiedNotes: () => void;
-			readAllMessagingMessages: () => void;
-			messagingMessage: (payload: MessagingMessage) => void;
-			unreadMessagingMessage: (payload: MessagingMessage) => void;
-			readAllAntennas: () => void;
-			unreadAntenna: (payload: Antenna) => void;
-			readAllAnnouncements: () => void;
-			readAllChannels: () => void;
-			unreadChannel: (payload: Note["id"]) => void;
-			myTokenRegenerated: () => void;
-			reversiNoInvites: () => void;
-			reversiInvited: (payload: FIXME) => void;
-			signin: (payload: FIXME) => void;
-			registryUpdated: (payload: {
-				scope?: string[];
-				key: string;
-				value: any | null;
-			}) => void;
-			driveFileCreated: (payload: DriveFile) => void;
-			readAntenna: (payload: Antenna) => void;
-		};
-		receives: null;
-	};
-	homeTimeline: {
-		params: null;
-		events: {
-			note: (payload: Note) => void;
-		};
-		receives: null;
-	};
-	localTimeline: {
-		params: null;
-		events: {
-			note: (payload: Note) => void;
-		};
-		receives: null;
-	};
-	hybridTimeline: {
-		params: null;
-		events: {
-			note: (payload: Note) => void;
-		};
-		receives: null;
-	};
-	recommendedTimeline: {
-		params: null;
-		events: {
-			note: (payload: Note) => void;
-		};
-		receives: null;
-	};
-	globalTimeline: {
-		params: null;
-		events: {
-			note: (payload: Note) => void;
-		};
-		receives: null;
-	};
-	messaging: {
-		params: {
-			otherparty?: User["id"] | null;
-			group?: UserGroup["id"] | null;
-		};
-		events: {
-			message: (payload: MessagingMessage) => void;
-			deleted: (payload: MessagingMessage["id"]) => void;
-			read: (payload: MessagingMessage["id"][]) => void;
-			typers: (payload: User[]) => void;
-		};
-		receives: {
-			read: {
-				id: MessagingMessage["id"];
-			};
-		};
-	};
-	serverStats: {
-		params: null;
-		events: {
-			stats: (payload: FIXME) => void;
-		};
-		receives: {
-			requestLog: {
-				id: string | number;
-				length: number;
-			};
-		};
-	};
-	queueStats: {
-		params: null;
-		events: {
-			stats: (payload: FIXME) => void;
-		};
-		receives: {
-			requestLog: {
-				id: string | number;
-				length: number;
-			};
-		};
-	};
-};
-
-export type NoteUpdatedEvent =
-	| {
-			id: Note["id"];
-			type: "reacted";
-			body: {
-				reaction: string;
-				userId: User["id"];
-			};
-	  }
-	| {
-			id: Note["id"];
-			type: "unreacted";
-			body: {
-				reaction: string;
-				userId: User["id"];
-			};
-	  }
-	| {
-			id: Note["id"];
-			type: "deleted";
-			body: {
-				deletedAt: string;
-			};
-	  }
-	| {
-			id: Note["id"];
-			type: "pollVoted";
-			body: {
-				choice: number;
-				userId: User["id"];
-			};
-	  }
-	| {
-			id: Note["id"];
-			type: "replied";
-			body: {
-				id: Note["id"];
-			};
-	  };
-
-export type BroadcastEvents = {
-	noteUpdated: (payload: NoteUpdatedEvent) => void;
-	emojiAdded: (payload: {
-		emoji: CustomEmoji;
-	}) => void;
-};
diff --git a/packages/calckey-js/test-d/api.ts b/packages/calckey-js/test-d/api.ts
deleted file mode 100644
index c5018177c..000000000
--- a/packages/calckey-js/test-d/api.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { expectType } from "tsd";
-import * as Misskey from "../src";
-
-describe("API", () => {
-	test("success", async () => {
-		const cli = new Misskey.api.APIClient({
-			origin: "https://misskey.test",
-			credential: "TOKEN",
-		});
-		const res = await cli.request("meta", { detail: true });
-		expectType<Misskey.entities.DetailedInstanceMetadata>(res);
-	});
-
-	test("conditional respose type (meta)", async () => {
-		const cli = new Misskey.api.APIClient({
-			origin: "https://misskey.test",
-			credential: "TOKEN",
-		});
-
-		const res = await cli.request("meta", { detail: true });
-		expectType<Misskey.entities.DetailedInstanceMetadata>(res);
-
-		const res2 = await cli.request("meta", { detail: false });
-		expectType<Misskey.entities.LiteInstanceMetadata>(res2);
-
-		const res3 = await cli.request("meta", {});
-		expectType<Misskey.entities.LiteInstanceMetadata>(res3);
-
-		const res4 = await cli.request("meta", { detail: true as boolean });
-		expectType<
-			| Misskey.entities.LiteInstanceMetadata
-			| Misskey.entities.DetailedInstanceMetadata
-		>(res4);
-	});
-
-	test("conditional respose type (users/show)", async () => {
-		const cli = new Misskey.api.APIClient({
-			origin: "https://misskey.test",
-			credential: "TOKEN",
-		});
-
-		const res = await cli.request("users/show", { userId: "xxxxxxxx" });
-		expectType<Misskey.entities.UserDetailed>(res);
-
-		const res2 = await cli.request("users/show", { userIds: ["xxxxxxxx"] });
-		expectType<Misskey.entities.UserDetailed[]>(res2);
-	});
-});
diff --git a/packages/calckey-js/test-d/streaming.ts b/packages/calckey-js/test-d/streaming.ts
deleted file mode 100644
index c49795dcc..000000000
--- a/packages/calckey-js/test-d/streaming.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { expectType } from "tsd";
-import * as Misskey from "../src";
-
-describe("Streaming", () => {
-	test("emit type", async () => {
-		const stream = new Misskey.Stream("https://misskey.test", {
-			token: "TOKEN",
-		});
-		const mainChannel = stream.useChannel("main");
-		mainChannel.on("notification", (notification) => {
-			expectType<Misskey.entities.Notification>(notification);
-		});
-	});
-
-	test("params type", async () => {
-		const stream = new Misskey.Stream("https://misskey.test", {
-			token: "TOKEN",
-		});
-		// TODO: 「stream.useChannel の第二引数として受け入れる型が
-		// {
-		//   otherparty?: User['id'] | null;
-		//   group?: UserGroup['id'] | null;
-		// }
-		// になっている」というテストを行いたいけどtsdでの書き方がわからない
-		const messagingChannel = stream.useChannel("messaging", {
-			otherparty: "aaa",
-		});
-		messagingChannel.on("message", (message) => {
-			expectType<Misskey.entities.MessagingMessage>(message);
-		});
-	});
-});
diff --git a/packages/calckey-js/test/api.ts b/packages/calckey-js/test/api.ts
deleted file mode 100644
index a8a1fc0e6..000000000
--- a/packages/calckey-js/test/api.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-import { APIClient, isAPIError } from "../src/api";
-import { enableFetchMocks } from "jest-fetch-mock";
-
-enableFetchMocks();
-
-function getFetchCall(call: any[]) {
-	const { body, method } = call[1];
-	if (body != null && typeof body != "string") {
-		throw new Error("invalid body");
-	}
-	return {
-		url: call[0],
-		method: method,
-		body: JSON.parse(body as any),
-	};
-}
-
-describe("API", () => {
-	test("success", async () => {
-		fetchMock.resetMocks();
-		fetchMock.mockResponse(async (req) => {
-			const body = await req.json();
-			if (req.method == "POST" && req.url == "https://misskey.test/api/i") {
-				if (body.i === "TOKEN") {
-					return JSON.stringify({ id: "foo" });
-				} else {
-					return { status: 400 };
-				}
-			} else {
-				return { status: 404 };
-			}
-		});
-
-		const cli = new APIClient({
-			origin: "https://misskey.test",
-			credential: "TOKEN",
-		});
-
-		const res = await cli.request("i");
-
-		expect(res).toEqual({
-			id: "foo",
-		});
-
-		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
-			url: "https://misskey.test/api/i",
-			method: "POST",
-			body: { i: "TOKEN" },
-		});
-	});
-
-	test("with params", async () => {
-		fetchMock.resetMocks();
-		fetchMock.mockResponse(async (req) => {
-			const body = await req.json();
-			if (
-				req.method == "POST" &&
-				req.url == "https://misskey.test/api/notes/show"
-			) {
-				if (body.i === "TOKEN" && body.noteId === "aaaaa") {
-					return JSON.stringify({ id: "foo" });
-				} else {
-					return { status: 400 };
-				}
-			} else {
-				return { status: 404 };
-			}
-		});
-
-		const cli = new APIClient({
-			origin: "https://misskey.test",
-			credential: "TOKEN",
-		});
-
-		const res = await cli.request("notes/show", { noteId: "aaaaa" });
-
-		expect(res).toEqual({
-			id: "foo",
-		});
-
-		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
-			url: "https://misskey.test/api/notes/show",
-			method: "POST",
-			body: { i: "TOKEN", noteId: "aaaaa" },
-		});
-	});
-
-	test("204 No Content で null が返る", async () => {
-		fetchMock.resetMocks();
-		fetchMock.mockResponse(async (req) => {
-			if (
-				req.method == "POST" &&
-				req.url == "https://misskey.test/api/reset-password"
-			) {
-				return { status: 204 };
-			} else {
-				return { status: 404 };
-			}
-		});
-
-		const cli = new APIClient({
-			origin: "https://misskey.test",
-			credential: "TOKEN",
-		});
-
-		const res = await cli.request("reset-password", {
-			token: "aaa",
-			password: "aaa",
-		});
-
-		expect(res).toEqual(null);
-
-		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
-			url: "https://misskey.test/api/reset-password",
-			method: "POST",
-			body: { i: "TOKEN", token: "aaa", password: "aaa" },
-		});
-	});
-
-	test("インスタンスの credential が指定されていても引数で credential が null ならば null としてリクエストされる", async () => {
-		fetchMock.resetMocks();
-		fetchMock.mockResponse(async (req) => {
-			const body = await req.json();
-			if (req.method == "POST" && req.url == "https://misskey.test/api/i") {
-				if (typeof body.i === "string") {
-					return JSON.stringify({ id: "foo" });
-				} else {
-					return {
-						status: 401,
-						body: JSON.stringify({
-							error: {
-								message: "Credential required.",
-								code: "CREDENTIAL_REQUIRED",
-								id: "1384574d-a912-4b81-8601-c7b1c4085df1",
-							},
-						}),
-					};
-				}
-			} else {
-				return { status: 404 };
-			}
-		});
-
-		try {
-			const cli = new APIClient({
-				origin: "https://misskey.test",
-				credential: "TOKEN",
-			});
-
-			await cli.request("i", {}, null);
-		} catch (e) {
-			expect(isAPIError(e)).toEqual(true);
-		}
-	});
-
-	test("api error", async () => {
-		fetchMock.resetMocks();
-		fetchMock.mockResponse(async (req) => {
-			return {
-				status: 500,
-				body: JSON.stringify({
-					error: {
-						message:
-							"Internal error occurred. Please contact us if the error persists.",
-						code: "INTERNAL_ERROR",
-						id: "5d37dbcb-891e-41ca-a3d6-e690c97775ac",
-						kind: "server",
-					},
-				}),
-			};
-		});
-
-		try {
-			const cli = new APIClient({
-				origin: "https://misskey.test",
-				credential: "TOKEN",
-			});
-
-			await cli.request("i");
-		} catch (e: any) {
-			expect(isAPIError(e)).toEqual(true);
-			expect(e.id).toEqual("5d37dbcb-891e-41ca-a3d6-e690c97775ac");
-		}
-	});
-
-	test("network error", async () => {
-		fetchMock.resetMocks();
-		fetchMock.mockAbort();
-
-		try {
-			const cli = new APIClient({
-				origin: "https://misskey.test",
-				credential: "TOKEN",
-			});
-
-			await cli.request("i");
-		} catch (e) {
-			expect(isAPIError(e)).toEqual(false);
-		}
-	});
-
-	test("json parse error", async () => {
-		fetchMock.resetMocks();
-		fetchMock.mockResponse(async (req) => {
-			return {
-				status: 500,
-				body: "<html>I AM NOT JSON</html>",
-			};
-		});
-
-		try {
-			const cli = new APIClient({
-				origin: "https://misskey.test",
-				credential: "TOKEN",
-			});
-
-			await cli.request("i");
-		} catch (e) {
-			expect(isAPIError(e)).toEqual(false);
-		}
-	});
-});
diff --git a/packages/calckey-js/test/streaming.ts b/packages/calckey-js/test/streaming.ts
deleted file mode 100644
index 920a9102b..000000000
--- a/packages/calckey-js/test/streaming.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-import WS from "jest-websocket-mock";
-import Stream from "../src/streaming";
-
-describe("Streaming", () => {
-	test("useChannel", async () => {
-		const server = new WS("wss://misskey.test/streaming");
-		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
-		const mainChannelReceived: any[] = [];
-		const main = stream.useChannel("main");
-		main.on("meUpdated", (payload) => {
-			mainChannelReceived.push(payload);
-		});
-
-		const ws = await server.connected;
-		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
-			"TOKEN",
-		);
-
-		const msg = JSON.parse((await server.nextMessage) as string);
-		const mainChannelId = msg.body.id;
-		expect(msg.type).toEqual("connect");
-		expect(msg.body.channel).toEqual("main");
-		expect(mainChannelId != null).toEqual(true);
-
-		server.send(
-			JSON.stringify({
-				type: "channel",
-				body: {
-					id: mainChannelId,
-					type: "meUpdated",
-					body: {
-						id: "foo",
-					},
-				},
-			}),
-		);
-
-		expect(mainChannelReceived[0]).toEqual({
-			id: "foo",
-		});
-
-		stream.close();
-		server.close();
-	});
-
-	test("useChannel with parameters", async () => {
-		const server = new WS("wss://misskey.test/streaming");
-		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
-		const messagingChannelReceived: any[] = [];
-		const messaging = stream.useChannel("messaging", { otherparty: "aaa" });
-		messaging.on("message", (payload) => {
-			messagingChannelReceived.push(payload);
-		});
-
-		const ws = await server.connected;
-		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
-			"TOKEN",
-		);
-
-		const msg = JSON.parse((await server.nextMessage) as string);
-		const messagingChannelId = msg.body.id;
-		expect(msg.type).toEqual("connect");
-		expect(msg.body.channel).toEqual("messaging");
-		expect(msg.body.params).toEqual({ otherparty: "aaa" });
-		expect(messagingChannelId != null).toEqual(true);
-
-		server.send(
-			JSON.stringify({
-				type: "channel",
-				body: {
-					id: messagingChannelId,
-					type: "message",
-					body: {
-						id: "foo",
-					},
-				},
-			}),
-		);
-
-		expect(messagingChannelReceived[0]).toEqual({
-			id: "foo",
-		});
-
-		stream.close();
-		server.close();
-	});
-
-	test("ちゃんとチャンネルごとにidが異なる", async () => {
-		const server = new WS("wss://misskey.test/streaming");
-		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
-
-		stream.useChannel("messaging", { otherparty: "aaa" });
-		stream.useChannel("messaging", { otherparty: "bbb" });
-
-		const ws = await server.connected;
-		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
-			"TOKEN",
-		);
-
-		const msg = JSON.parse((await server.nextMessage) as string);
-		const messagingChannelId = msg.body.id;
-		const msg2 = JSON.parse((await server.nextMessage) as string);
-		const messagingChannelId2 = msg2.body.id;
-
-		expect(messagingChannelId != null).toEqual(true);
-		expect(messagingChannelId2 != null).toEqual(true);
-		expect(messagingChannelId).not.toEqual(messagingChannelId2);
-
-		stream.close();
-		server.close();
-	});
-
-	test("Connection#send", async () => {
-		const server = new WS("wss://misskey.test/streaming");
-		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
-
-		const messaging = stream.useChannel("messaging", { otherparty: "aaa" });
-		messaging.send("read", { id: "aaa" });
-
-		const ws = await server.connected;
-		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
-			"TOKEN",
-		);
-
-		const connectMsg = JSON.parse((await server.nextMessage) as string);
-		const channelId = connectMsg.body.id;
-		const msg = JSON.parse((await server.nextMessage) as string);
-
-		expect(msg.type).toEqual("ch");
-		expect(msg.body.id).toEqual(channelId);
-		expect(msg.body.type).toEqual("read");
-		expect(msg.body.body).toEqual({ id: "aaa" });
-
-		stream.close();
-		server.close();
-	});
-
-	test("Connection#dispose", async () => {
-		const server = new WS("wss://misskey.test/streaming");
-		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
-		const mainChannelReceived: any[] = [];
-		const main = stream.useChannel("main");
-		main.on("meUpdated", (payload) => {
-			mainChannelReceived.push(payload);
-		});
-
-		const ws = await server.connected;
-		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
-			"TOKEN",
-		);
-
-		const msg = JSON.parse((await server.nextMessage) as string);
-		const mainChannelId = msg.body.id;
-		expect(msg.type).toEqual("connect");
-		expect(msg.body.channel).toEqual("main");
-		expect(mainChannelId != null).toEqual(true);
-		main.dispose();
-
-		server.send(
-			JSON.stringify({
-				type: "channel",
-				body: {
-					id: mainChannelId,
-					type: "meUpdated",
-					body: {
-						id: "foo",
-					},
-				},
-			}),
-		);
-
-		expect(mainChannelReceived.length).toEqual(0);
-
-		stream.close();
-		server.close();
-	});
-
-	// TODO: SharedConnection#dispose して一定時間経ったら disconnect メッセージがサーバーに送られてくるかのテスト
-
-	// TODO: チャンネル接続が使いまわされるかのテスト
-});
diff --git a/packages/calckey-js/tsconfig.json b/packages/calckey-js/tsconfig.json
deleted file mode 100644
index a03a24262..000000000
--- a/packages/calckey-js/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"$schema": "http://json.schemastore.org/tsconfig",
-	"compilerOptions": {
-		"target": "es2020",
-		"module": "commonjs",
-		"declaration": true,
-		"declarationMap": true,
-		"sourceMap": true,
-		"outDir": "./built/",
-		"removeComments": true,
-		"strict": true,
-		"strictFunctionTypes": true,
-		"strictNullChecks": true,
-		"experimentalDecorators": true,
-		"noImplicitReturns": true,
-		"esModuleInterop": true
-	},
-	"include": [
-		"src/**/*"
-	],
-	"exclude": [
-		"node_modules",
-		"test/**/*"
-	]
-}
diff --git a/packages/client/package.json b/packages/client/package.json
index 24af5b143..1267a3084 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -33,7 +33,7 @@
 		"blurhash": "1.1.5",
 		"broadcast-channel": "4.19.1",
 		"browser-image-resizer": "https://github.com/misskey-dev/browser-image-resizer.git",
-		"calckey-js": "workspace:*",
+		"calckey-js": "^0.0.22",
 		"chart.js": "4.1.1",
 		"chartjs-adapter-date-fns": "2.0.1",
 		"chartjs-chart-matrix": "^2.0.1",
diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index 6c644660e..f2d3209d6 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -87,9 +87,6 @@ export default defineConfig(({ command, mode }) => {
 			emptyOutDir: false,
 			sourcemap: process.env.NODE_ENV === "development",
 			reportCompressedSize: false,
-			commonjsOptions: {
-				include: [/calckey-js/, /node_modules/],
-			},
 		},
 		optimizeDeps: {
 			auto: true,
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 2c41a95b5..32a7fcb7b 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -13,7 +13,7 @@
 		"@swc/cli": "^0.1.59",
 		"@swc/core": "^1.3.26",
 		"@swc/core-android-arm64": "1.3.11",
-		"calckey-js": "workspace:*",
+		"calckey-js": "^0.0.22",
 		"idb-keyval": "^6.2.0",
 		"swc-loader": "^0.2.3",
 		"webpack": "^5.75.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dad391189..48a6c5fc9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -19,6 +19,9 @@ importers:
       '@tensorflow/tfjs':
         specifier: ^3.21.0
         version: 3.21.0(seedrandom@3.0.5)
+      calckey-js:
+        specifier: ^0.0.22
+        version: 0.0.22
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
@@ -150,8 +153,8 @@ importers:
         specifier: 7.0.0
         version: 7.0.0
       calckey-js:
-        specifier: workspace:*
-        version: link:../calckey-js
+        specifier: ^0.0.22
+        version: 0.0.22
       cbor:
         specifier: 8.1.0
         version: 8.1.0
@@ -587,64 +590,6 @@ importers:
         specifier: 8.11.0
         version: 8.11.0
 
-  packages/calckey-js:
-    dependencies:
-      autobind-decorator:
-        specifier: ^2.4.0
-        version: 2.4.0
-      eventemitter3:
-        specifier: ^4.0.7
-        version: 4.0.7
-      reconnecting-websocket:
-        specifier: ^4.4.0
-        version: 4.4.0
-      semver:
-        specifier: ^7.3.8
-        version: 7.3.8
-    devDependencies:
-      '@microsoft/api-extractor':
-        specifier: ^7.19.3
-        version: 7.19.3
-      '@types/jest':
-        specifier: ^27.4.0
-        version: 27.4.0
-      '@types/node':
-        specifier: 17.0.5
-        version: 17.0.5
-      '@typescript-eslint/eslint-plugin':
-        specifier: 5.8.1
-        version: 5.8.1(@typescript-eslint/parser@5.8.1)(eslint@8.6.0)(typescript@4.5.4)
-      '@typescript-eslint/parser':
-        specifier: 5.8.1
-        version: 5.8.1(eslint@8.6.0)(typescript@4.5.4)
-      eslint:
-        specifier: 8.6.0
-        version: 8.6.0
-      jest:
-        specifier: ^27.4.5
-        version: 27.4.5(ts-node@10.4.0)
-      jest-fetch-mock:
-        specifier: ^3.0.3
-        version: 3.0.3
-      jest-websocket-mock:
-        specifier: ^2.2.1
-        version: 2.2.1(mock-socket@9.0.8)
-      mock-socket:
-        specifier: ^9.0.8
-        version: 9.0.8
-      ts-jest:
-        specifier: ^27.1.2
-        version: 27.1.2(@babel/core@7.21.4)(@types/jest@27.4.0)(jest@27.4.5)(typescript@4.5.4)
-      ts-node:
-        specifier: 10.4.0
-        version: 10.4.0(@types/node@17.0.5)(typescript@4.5.4)
-      tsd:
-        specifier: ^0.19.1
-        version: 0.19.1
-      typescript:
-        specifier: 4.5.4
-        version: 4.5.4
-
   packages/client:
     devDependencies:
       '@discordapp/twemoji':
@@ -723,8 +668,8 @@ importers:
         specifier: https://github.com/misskey-dev/browser-image-resizer.git
         version: github.com/misskey-dev/browser-image-resizer/0380d12c8e736788ea7f4e6e985175521ea7b23c
       calckey-js:
-        specifier: workspace:*
-        version: link:../calckey-js
+        specifier: ^0.0.22
+        version: 0.0.22
       chart.js:
         specifier: 4.1.1
         version: 4.1.1
@@ -897,8 +842,8 @@ importers:
         specifier: 1.3.11
         version: 1.3.11
       calckey-js:
-        specifier: workspace:*
-        version: link:../calckey-js
+        specifier: ^0.0.22
+        version: 0.0.22
       idb-keyval:
         specifier: ^6.2.0
         version: 6.2.0
@@ -914,54 +859,12 @@ importers:
 
 packages:
 
-  /@ampproject/remapping@2.2.1:
-    resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.17
-    dev: true
-
   /@babel/code-frame@7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.18.6
-
-  /@babel/code-frame@7.21.4:
-    resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/highlight': 7.18.6
-    dev: true
-
-  /@babel/compat-data@7.21.4:
-    resolution: {integrity: sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/core@7.21.4:
-    resolution: {integrity: sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@ampproject/remapping': 2.2.1
-      '@babel/code-frame': 7.21.4
-      '@babel/generator': 7.21.4
-      '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.21.4)
-      '@babel/helper-module-transforms': 7.21.2
-      '@babel/helpers': 7.21.0
-      '@babel/parser': 7.21.4
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.4
-      '@babel/types': 7.21.4
-      convert-source-map: 1.9.0
-      debug: 4.3.4(supports-color@8.1.1)
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    dev: false
 
   /@babel/generator@7.20.7:
     resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==}
@@ -970,34 +873,12 @@ packages:
       '@babel/types': 7.20.7
       '@jridgewell/gen-mapping': 0.3.2
       jsesc: 2.5.2
-
-  /@babel/generator@7.21.4:
-    resolution: {integrity: sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.4
-      '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.17
-      jsesc: 2.5.2
-    dev: true
-
-  /@babel/helper-compilation-targets@7.21.4(@babel/core@7.21.4):
-    resolution: {integrity: sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/compat-data': 7.21.4
-      '@babel/core': 7.21.4
-      '@babel/helper-validator-option': 7.21.0
-      browserslist: 4.21.4
-      lru-cache: 5.1.1
-      semver: 6.3.0
-    dev: true
+    dev: false
 
   /@babel/helper-environment-visitor@7.18.9:
     resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
     engines: {node: '>=6.9.0'}
+    dev: false
 
   /@babel/helper-function-name@7.19.0:
     resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==}
@@ -1005,61 +886,21 @@ packages:
     dependencies:
       '@babel/template': 7.20.7
       '@babel/types': 7.20.7
-
-  /@babel/helper-function-name@7.21.0:
-    resolution: {integrity: sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.20.7
-      '@babel/types': 7.21.4
-    dev: true
+    dev: false
 
   /@babel/helper-hoist-variables@7.18.6:
     resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.7
-
-  /@babel/helper-module-imports@7.21.4:
-    resolution: {integrity: sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.4
-    dev: true
-
-  /@babel/helper-module-transforms@7.21.2:
-    resolution: {integrity: sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-module-imports': 7.21.4
-      '@babel/helper-simple-access': 7.20.2
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/helper-validator-identifier': 7.19.1
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.4
-      '@babel/types': 7.21.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helper-plugin-utils@7.20.2:
-    resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/helper-simple-access@7.20.2:
-    resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.4
-    dev: true
+    dev: false
 
   /@babel/helper-split-export-declaration@7.18.6:
     resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.7
+    dev: false
 
   /@babel/helper-string-parser@7.19.4:
     resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
@@ -1069,22 +910,6 @@ packages:
     resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-validator-option@7.21.0:
-    resolution: {integrity: sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/helpers@7.21.0:
-    resolution: {integrity: sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.4
-      '@babel/types': 7.21.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/highlight@7.18.6:
     resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
     engines: {node: '>=6.9.0'}
@@ -1092,6 +917,7 @@ packages:
       '@babel/helper-validator-identifier': 7.19.1
       chalk: 2.4.2
       js-tokens: 4.0.0
+    dev: false
 
   /@babel/parser@7.20.7:
     resolution: {integrity: sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==}
@@ -1100,133 +926,6 @@ packages:
     dependencies:
       '@babel/types': 7.20.7
 
-  /@babel/parser@7.21.4:
-    resolution: {integrity: sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.21.4
-    dev: true
-
-  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.4):
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.21.4):
-    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.21.4):
-    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.21.4):
-    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.21.4):
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.21.4):
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.21.4):
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.21.4):
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.21.4):
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.21.4):
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.21.4):
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.21.4):
-    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-typescript@7.21.4(@babel/core@7.21.4):
-    resolution: {integrity: sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/runtime@7.20.7:
     resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==}
     engines: {node: '>=6.9.0'}
@@ -1241,6 +940,7 @@ packages:
       '@babel/code-frame': 7.18.6
       '@babel/parser': 7.20.7
       '@babel/types': 7.20.7
+    dev: false
 
   /@babel/traverse@7.20.12:
     resolution: {integrity: sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==}
@@ -1258,24 +958,7 @@ packages:
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
-
-  /@babel/traverse@7.21.4:
-    resolution: {integrity: sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.21.4
-      '@babel/generator': 7.21.4
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.21.0
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.21.4
-      '@babel/types': 7.21.4
-      debug: 4.3.4(supports-color@8.1.1)
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    dev: false
 
   /@babel/types@7.20.7:
     resolution: {integrity: sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==}
@@ -1285,19 +968,6 @@ packages:
       '@babel/helper-validator-identifier': 7.19.1
       to-fast-properties: 2.0.0
 
-  /@babel/types@7.21.4:
-    resolution: {integrity: sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-string-parser': 7.19.4
-      '@babel/helper-validator-identifier': 7.19.1
-      to-fast-properties: 2.0.0
-    dev: true
-
-  /@bcoe/v8-coverage@0.2.3:
-    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
-    dev: true
-
   /@bull-board/api@4.10.2:
     resolution: {integrity: sha512-lRHo0A7hsz71aOx1ZN0SmLLWfSuvKdL6EZ4imlgo5SuXGozybvlRc5KPIJU2/E1w5meoUGi+nFezBwp1gT/SMw==}
     dependencies:
@@ -1497,18 +1167,6 @@ packages:
     resolution: {integrity: sha512-RJu5IWzH6vcygwLsx9KEqzwjnEqApPkSFViMzxCRbe0IuAXt2ZlSUmYKgLFZY+YJIdaZ+/P7PwiUcZ7GYH3Msw==}
     dev: true
 
-  /@cspotcode/source-map-consumer@0.8.0:
-    resolution: {integrity: sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==}
-    engines: {node: '>= 12'}
-    dev: true
-
-  /@cspotcode/source-map-support@0.7.0:
-    resolution: {integrity: sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@cspotcode/source-map-consumer': 0.8.0
-    dev: true
-
   /@cspotcode/source-map-support@0.8.1:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
@@ -1822,17 +1480,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@humanwhocodes/config-array@0.9.5:
-    resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==}
-    engines: {node: '>=10.10.0'}
-    dependencies:
-      '@humanwhocodes/object-schema': 1.2.1
-      debug: 4.3.4(supports-color@8.1.1)
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@humanwhocodes/module-importer@1.0.1:
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
@@ -1843,213 +1490,6 @@ packages:
   /@ioredis/commands@1.2.0:
     resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==}
 
-  /@istanbuljs/load-nyc-config@1.1.0:
-    resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      camelcase: 5.3.1
-      find-up: 4.1.0
-      get-package-type: 0.1.0
-      js-yaml: 3.14.1
-      resolve-from: 5.0.0
-    dev: true
-
-  /@istanbuljs/schema@0.1.3:
-    resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /@jest/console@27.5.1:
-    resolution: {integrity: sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-      chalk: 4.1.2
-      jest-message-util: 27.5.1
-      jest-util: 27.5.1
-      slash: 3.0.0
-    dev: true
-
-  /@jest/core@27.5.1(ts-node@10.4.0):
-    resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      '@jest/console': 27.5.1
-      '@jest/reporters': 27.5.1
-      '@jest/test-result': 27.5.1
-      '@jest/transform': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      emittery: 0.8.1
-      exit: 0.1.2
-      graceful-fs: 4.2.10
-      jest-changed-files: 27.5.1
-      jest-config: 27.5.1(ts-node@10.4.0)
-      jest-haste-map: 27.5.1
-      jest-message-util: 27.5.1
-      jest-regex-util: 27.5.1
-      jest-resolve: 27.5.1
-      jest-resolve-dependencies: 27.5.1
-      jest-runner: 27.5.1
-      jest-runtime: 27.5.1
-      jest-snapshot: 27.5.1
-      jest-util: 27.5.1
-      jest-validate: 27.5.1
-      jest-watcher: 27.5.1
-      micromatch: 4.0.5
-      rimraf: 3.0.2
-      slash: 3.0.0
-      strip-ansi: 6.0.1
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - ts-node
-      - utf-8-validate
-    dev: true
-
-  /@jest/environment@27.5.1:
-    resolution: {integrity: sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/fake-timers': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-      jest-mock: 27.5.1
-    dev: true
-
-  /@jest/fake-timers@27.5.1:
-    resolution: {integrity: sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/types': 27.5.1
-      '@sinonjs/fake-timers': 8.1.0
-      '@types/node': 18.11.18
-      jest-message-util: 27.5.1
-      jest-mock: 27.5.1
-      jest-util: 27.5.1
-    dev: true
-
-  /@jest/globals@27.5.1:
-    resolution: {integrity: sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/environment': 27.5.1
-      '@jest/types': 27.5.1
-      expect: 27.5.1
-    dev: true
-
-  /@jest/reporters@27.5.1:
-    resolution: {integrity: sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      '@bcoe/v8-coverage': 0.2.3
-      '@jest/console': 27.5.1
-      '@jest/test-result': 27.5.1
-      '@jest/transform': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-      chalk: 4.1.2
-      collect-v8-coverage: 1.0.1
-      exit: 0.1.2
-      glob: 7.2.3
-      graceful-fs: 4.2.10
-      istanbul-lib-coverage: 3.2.0
-      istanbul-lib-instrument: 5.2.1
-      istanbul-lib-report: 3.0.0
-      istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.5
-      jest-haste-map: 27.5.1
-      jest-resolve: 27.5.1
-      jest-util: 27.5.1
-      jest-worker: 27.5.1
-      slash: 3.0.0
-      source-map: 0.6.1
-      string-length: 4.0.2
-      terminal-link: 2.1.1
-      v8-to-istanbul: 8.1.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/source-map@27.5.1:
-    resolution: {integrity: sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      callsites: 3.1.0
-      graceful-fs: 4.2.10
-      source-map: 0.6.1
-    dev: true
-
-  /@jest/test-result@27.5.1:
-    resolution: {integrity: sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/console': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/istanbul-lib-coverage': 2.0.4
-      collect-v8-coverage: 1.0.1
-    dev: true
-
-  /@jest/test-sequencer@27.5.1:
-    resolution: {integrity: sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/test-result': 27.5.1
-      graceful-fs: 4.2.10
-      jest-haste-map: 27.5.1
-      jest-runtime: 27.5.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/transform@27.5.1:
-    resolution: {integrity: sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@babel/core': 7.21.4
-      '@jest/types': 27.5.1
-      babel-plugin-istanbul: 6.1.1
-      chalk: 4.1.2
-      convert-source-map: 1.9.0
-      fast-json-stable-stringify: 2.1.0
-      graceful-fs: 4.2.10
-      jest-haste-map: 27.5.1
-      jest-regex-util: 27.5.1
-      jest-util: 27.5.1
-      micromatch: 4.0.5
-      pirates: 4.0.5
-      slash: 3.0.0
-      source-map: 0.6.1
-      write-file-atomic: 3.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/types@27.5.1:
-    resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@types/istanbul-lib-coverage': 2.0.4
-      '@types/istanbul-reports': 3.0.1
-      '@types/node': 18.11.18
-      '@types/yargs': 16.0.5
-      chalk: 4.1.2
-    dev: true
-
   /@jridgewell/gen-mapping@0.3.2:
     resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
     engines: {node: '>=6.0.0'}
@@ -2182,45 +1622,6 @@ packages:
     dev: false
     optional: true
 
-  /@microsoft/api-extractor-model@7.15.2:
-    resolution: {integrity: sha512-qgxKX/s6vo3nCVLhP0Ds7555QrErhcYHEok5/KyEZ7iR8J5M5oldD1eJJQmtEdVF5IzmnPPbxx1nRvfgA674LQ==}
-    dependencies:
-      '@microsoft/tsdoc': 0.13.2
-      '@microsoft/tsdoc-config': 0.15.2
-      '@rushstack/node-core-library': 3.44.3
-    dev: true
-
-  /@microsoft/api-extractor@7.19.3:
-    resolution: {integrity: sha512-GZe+R3K4kh2X425iOHkPbByysB7FN0592mPPA6vNj5IhyhlPHgdZS6m6AmOZOIxMS4euM+SBKzEJEp3oC+WsOQ==}
-    hasBin: true
-    dependencies:
-      '@microsoft/api-extractor-model': 7.15.2
-      '@microsoft/tsdoc': 0.13.2
-      '@microsoft/tsdoc-config': 0.15.2
-      '@rushstack/node-core-library': 3.44.3
-      '@rushstack/rig-package': 0.3.7
-      '@rushstack/ts-command-line': 4.10.6
-      colors: 1.2.5
-      lodash: 4.17.21
-      resolve: 1.17.0
-      semver: 7.3.8
-      source-map: 0.6.1
-      typescript: 4.5.4
-    dev: true
-
-  /@microsoft/tsdoc-config@0.15.2:
-    resolution: {integrity: sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==}
-    dependencies:
-      '@microsoft/tsdoc': 0.13.2
-      ajv: 6.12.6
-      jju: 1.4.0
-      resolve: 1.19.0
-    dev: true
-
-  /@microsoft/tsdoc@0.13.2:
-    resolution: {integrity: sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==}
-    dev: true
-
   /@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0:
     resolution: {integrity: sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==}
     cpu: [arm64]
@@ -2509,36 +1910,6 @@ packages:
     dev: true
     optional: true
 
-  /@rushstack/node-core-library@3.44.3:
-    resolution: {integrity: sha512-Bt+R5LAnVr2BImTJqPpton5rvhJ2Wq8x4BaTqaCHQMmfxqtz5lb4nLYT9kneMJTCDuRMBvvLpSuz4MBj50PV3w==}
-    dependencies:
-      '@types/node': 12.20.24
-      colors: 1.2.5
-      fs-extra: 7.0.1
-      import-lazy: 4.0.0
-      jju: 1.4.0
-      resolve: 1.17.0
-      semver: 7.3.8
-      timsort: 0.3.0
-      z-schema: 5.0.5
-    dev: true
-
-  /@rushstack/rig-package@0.3.7:
-    resolution: {integrity: sha512-pzMsTSeTC8IiZ6EJLr53gGMvhT4oLWH+hxD7907cHyWuIUlEXFtu/2pK25vUQT13nKp5DJCWxXyYoGRk/h6rtA==}
-    dependencies:
-      resolve: 1.17.0
-      strip-json-comments: 3.1.1
-    dev: true
-
-  /@rushstack/ts-command-line@4.10.6:
-    resolution: {integrity: sha512-Y3GkUag39sTIlukDg9mUp8MCHrrlJ27POrBNRQGc/uF+VVgX8M7zMzHch5zP6O1QVquWgD7Engdpn2piPYaS/g==}
-    dependencies:
-      '@types/argparse': 1.0.38
-      argparse: 1.0.10
-      colors: 1.2.5
-      string-argv: 0.3.1
-    dev: true
-
   /@sideway/address@4.1.4:
     resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
     dependencies:
@@ -2572,12 +1943,7 @@ packages:
     resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==}
     dependencies:
       type-detect: 4.0.8
-
-  /@sinonjs/fake-timers@8.1.0:
-    resolution: {integrity: sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==}
-    dependencies:
-      '@sinonjs/commons': 1.8.6
-    dev: true
+    dev: false
 
   /@sinonjs/fake-timers@9.1.2:
     resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==}
@@ -2951,11 +2317,6 @@ packages:
     resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
     dev: false
 
-  /@tootallnate/once@1.1.2:
-    resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
-    engines: {node: '>= 6'}
-    dev: true
-
   /@tootallnate/once@2.0.0:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
@@ -2973,49 +2334,11 @@ packages:
   /@tsconfig/node16@1.0.3:
     resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==}
 
-  /@tsd/typescript@4.5.5:
-    resolution: {integrity: sha512-TxQ9QiUT94ZjKu++ta/iwTMVHsix4ApohnaHPTSd58WQuTjPIELP0tUYcW7lT6psz7yZiU4eRw+X4v/XV830Sw==}
-    hasBin: true
-    dev: true
-
   /@types/accepts@1.3.5:
     resolution: {integrity: sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==}
     dependencies:
       '@types/node': 18.11.18
 
-  /@types/argparse@1.0.38:
-    resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==}
-    dev: true
-
-  /@types/babel__core@7.20.0:
-    resolution: {integrity: sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==}
-    dependencies:
-      '@babel/parser': 7.20.7
-      '@babel/types': 7.20.7
-      '@types/babel__generator': 7.6.4
-      '@types/babel__template': 7.4.1
-      '@types/babel__traverse': 7.18.3
-    dev: true
-
-  /@types/babel__generator@7.6.4:
-    resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
-    dependencies:
-      '@babel/types': 7.21.4
-    dev: true
-
-  /@types/babel__template@7.4.1:
-    resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
-    dependencies:
-      '@babel/parser': 7.21.4
-      '@babel/types': 7.21.4
-    dev: true
-
-  /@types/babel__traverse@7.18.3:
-    resolution: {integrity: sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==}
-    dependencies:
-      '@babel/types': 7.20.7
-    dev: true
-
   /@types/bcryptjs@2.4.2:
     resolution: {integrity: sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==}
     dev: true
@@ -3089,13 +2412,6 @@ packages:
       '@types/estree': 0.0.51
     dev: true
 
-  /@types/eslint@7.29.0:
-    resolution: {integrity: sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==}
-    dependencies:
-      '@types/estree': 0.0.51
-      '@types/json-schema': 7.0.11
-    dev: true
-
   /@types/eslint@8.4.10:
     resolution: {integrity: sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==}
     dependencies:
@@ -3156,12 +2472,6 @@ packages:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/graceful-fs@4.1.6:
-    resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
-    dependencies:
-      '@types/node': 18.11.18
-    dev: true
-
   /@types/gulp-rename@2.0.1:
     resolution: {integrity: sha512-9ZjeS2RHEnmBmTcyi2+oeye3BgCsWhvi4uv3qCnAg8i6plOuRdaeNxjOves0ELysEXYLBl7bCl5fbVs7AZtgTA==}
     dependencies:
@@ -3196,29 +2506,6 @@ packages:
       - supports-color
     dev: true
 
-  /@types/istanbul-lib-coverage@2.0.4:
-    resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
-    dev: true
-
-  /@types/istanbul-lib-report@3.0.0:
-    resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==}
-    dependencies:
-      '@types/istanbul-lib-coverage': 2.0.4
-    dev: true
-
-  /@types/istanbul-reports@3.0.1:
-    resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==}
-    dependencies:
-      '@types/istanbul-lib-report': 3.0.0
-    dev: true
-
-  /@types/jest@27.4.0:
-    resolution: {integrity: sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==}
-    dependencies:
-      jest-diff: 27.5.1
-      pretty-format: 27.5.1
-    dev: true
-
   /@types/js-yaml@4.0.5:
     resolution: {integrity: sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==}
     dev: true
@@ -3404,10 +2691,6 @@ packages:
     resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
     dev: true
 
-  /@types/minimist@1.2.2:
-    resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
-    dev: true
-
   /@types/mocha@9.1.1:
     resolution: {integrity: sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==}
     dev: true
@@ -3426,17 +2709,9 @@ packages:
       node-fetch: 3.3.0
     dev: true
 
-  /@types/node@12.20.24:
-    resolution: {integrity: sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==}
-    dev: true
-
   /@types/node@14.18.36:
     resolution: {integrity: sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==}
 
-  /@types/node@17.0.5:
-    resolution: {integrity: sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw==}
-    dev: true
-
   /@types/node@18.11.18:
     resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
 
@@ -3446,10 +2721,6 @@ packages:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/normalize-package-data@2.4.1:
-    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
-    dev: true
-
   /@types/oauth@0.9.1:
     resolution: {integrity: sha512-a1iY62/a3yhZ7qH7cNUsxoI3U/0Fe9+RnuFrpTKr+0WVOzbKlSLojShCKe20aOD1Sppv+i8Zlq0pLDuTJnwS4A==}
     dependencies:
@@ -3463,10 +2734,6 @@ packages:
     resolution: {integrity: sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg==}
     dev: false
 
-  /@types/prettier@2.7.2:
-    resolution: {integrity: sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==}
-    dev: true
-
   /@types/pug@2.0.6:
     resolution: {integrity: sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==}
     dev: true
@@ -3565,10 +2832,6 @@ packages:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/stack-utils@2.0.1:
-    resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
-    dev: true
-
   /@types/throttle-debounce@5.0.0:
     resolution: {integrity: sha512-Pb7k35iCGFcGPECoNE4DYp3Oyf2xcTd3FbFQxXUI9hEYKUl6YX+KLf7HrBmgVcD05nl50LIH6i+80js4iYmWbw==}
     dev: true
@@ -3652,16 +2915,6 @@ packages:
       '@types/node': 18.11.18
     dev: false
 
-  /@types/yargs-parser@21.0.0:
-    resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
-    dev: true
-
-  /@types/yargs@16.0.5:
-    resolution: {integrity: sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==}
-    dependencies:
-      '@types/yargs-parser': 21.0.0
-    dev: true
-
   /@types/yauzl@2.10.0:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     requiresBuild: true
@@ -3670,112 +2923,6 @@ packages:
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin@5.8.1(@typescript-eslint/parser@5.8.1)(eslint@8.6.0)(typescript@4.5.4):
-    resolution: {integrity: sha512-wTZ5oEKrKj/8/366qTM366zqhIKAp6NCMweoRONtfuC07OAU9nVI2GZZdqQ1qD30WAAtcPdkH+npDwtRFdp4Rw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      '@typescript-eslint/parser': ^5.0.0
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/experimental-utils': 5.8.1(eslint@8.6.0)(typescript@4.5.4)
-      '@typescript-eslint/parser': 5.8.1(eslint@8.6.0)(typescript@4.5.4)
-      '@typescript-eslint/scope-manager': 5.8.1
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.6.0
-      functional-red-black-tree: 1.0.1
-      ignore: 5.2.4
-      regexpp: 3.2.0
-      semver: 7.3.8
-      tsutils: 3.21.0(typescript@4.5.4)
-      typescript: 4.5.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/experimental-utils@5.8.1(eslint@8.6.0)(typescript@4.5.4):
-    resolution: {integrity: sha512-fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-    dependencies:
-      '@types/json-schema': 7.0.11
-      '@typescript-eslint/scope-manager': 5.8.1
-      '@typescript-eslint/types': 5.8.1
-      '@typescript-eslint/typescript-estree': 5.8.1(typescript@4.5.4)
-      eslint: 8.6.0
-      eslint-scope: 5.1.1
-      eslint-utils: 3.0.0(eslint@8.6.0)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-    dev: true
-
-  /@typescript-eslint/parser@5.8.1(eslint@8.6.0)(typescript@4.5.4):
-    resolution: {integrity: sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/scope-manager': 5.8.1
-      '@typescript-eslint/types': 5.8.1
-      '@typescript-eslint/typescript-estree': 5.8.1(typescript@4.5.4)
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.6.0
-      typescript: 4.5.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/scope-manager@5.8.1:
-    resolution: {integrity: sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.8.1
-      '@typescript-eslint/visitor-keys': 5.8.1
-    dev: true
-
-  /@typescript-eslint/types@5.8.1:
-    resolution: {integrity: sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
-  /@typescript-eslint/typescript-estree@5.8.1(typescript@4.5.4):
-    resolution: {integrity: sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/types': 5.8.1
-      '@typescript-eslint/visitor-keys': 5.8.1
-      debug: 4.3.4(supports-color@8.1.1)
-      globby: 11.1.0
-      is-glob: 4.0.3
-      semver: 7.3.8
-      tsutils: 3.21.0(typescript@4.5.4)
-      typescript: 4.5.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/visitor-keys@5.8.1:
-    resolution: {integrity: sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.8.1
-      eslint-visitor-keys: 3.3.0
-    dev: true
-
   /@vitejs/plugin-vue@4.0.0(vite@4.1.1)(vue@3.2.45):
     resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -4039,6 +3186,7 @@ packages:
 
   /abab@2.0.6:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
+    dev: false
 
   /abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
@@ -4058,13 +3206,6 @@ packages:
       negotiator: 0.6.3
     dev: false
 
-  /acorn-globals@6.0.0:
-    resolution: {integrity: sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==}
-    dependencies:
-      acorn: 7.4.1
-      acorn-walk: 7.2.0
-    dev: true
-
   /acorn-globals@7.0.1:
     resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
     dependencies:
@@ -4087,11 +3228,6 @@ packages:
     dependencies:
       acorn: 8.8.1
 
-  /acorn-walk@7.2.0:
-    resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
-    engines: {node: '>=0.4.0'}
-    dev: true
-
   /acorn-walk@8.2.0:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
@@ -4127,6 +3263,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /agentkeepalive@4.2.1:
     resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==}
@@ -4225,6 +3362,7 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       color-convert: 1.9.3
+    dev: false
 
   /ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
@@ -4232,11 +3370,6 @@ packages:
     dependencies:
       color-convert: 2.0.1
 
-  /ansi-styles@5.2.0:
-    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
-    engines: {node: '>=10'}
-    dev: true
-
   /ansi-wrap@0.1.0:
     resolution: {integrity: sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==}
     engines: {node: '>=0.10.0'}
@@ -4442,11 +3575,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /arrify@1.0.1:
-    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /asap@2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
 
@@ -4627,79 +3755,6 @@ packages:
       - supports-color
     dev: false
 
-  /babel-jest@27.5.1(@babel/core@7.21.4):
-    resolution: {integrity: sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    peerDependencies:
-      '@babel/core': ^7.8.0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@jest/transform': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/babel__core': 7.20.0
-      babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 27.5.1(@babel/core@7.21.4)
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      slash: 3.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /babel-plugin-istanbul@6.1.1:
-    resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@babel/helper-plugin-utils': 7.20.2
-      '@istanbuljs/load-nyc-config': 1.1.0
-      '@istanbuljs/schema': 0.1.3
-      istanbul-lib-instrument: 5.2.1
-      test-exclude: 6.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /babel-plugin-jest-hoist@27.5.1:
-    resolution: {integrity: sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@babel/template': 7.20.7
-      '@babel/types': 7.21.4
-      '@types/babel__core': 7.20.0
-      '@types/babel__traverse': 7.18.3
-    dev: true
-
-  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.21.4):
-    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.4)
-      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.21.4)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.21.4)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.21.4)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.4)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.4)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.4)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.4)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.4)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.4)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.4)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.21.4)
-    dev: true
-
-  /babel-preset-jest@27.5.1(@babel/core@7.21.4):
-    resolution: {integrity: sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.21.4
-      babel-plugin-jest-hoist: 27.5.1
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.4)
-    dev: true
-
   /babel-walk@3.0.0-canary-5:
     resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==}
     engines: {node: '>= 10.0.0'}
@@ -4905,10 +3960,6 @@ packages:
       unload: 2.4.1
     dev: true
 
-  /browser-process-hrtime@1.0.0:
-    resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==}
-    dev: true
-
   /browser-stdout@1.3.1:
     resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==}
     dev: true
@@ -4933,19 +3984,6 @@ packages:
       update-browserslist-db: 1.0.10(browserslist@4.21.4)
     dev: true
 
-  /bs-logger@0.2.6:
-    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
-    engines: {node: '>= 6'}
-    dependencies:
-      fast-json-stable-stringify: 2.1.0
-    dev: true
-
-  /bser@2.1.1:
-    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
-    dependencies:
-      node-int64: 0.4.0
-    dev: true
-
   /buffer-alloc-unsafe@1.1.0:
     resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==}
     dev: true
@@ -5151,6 +4189,14 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /calckey-js@0.0.22:
+    resolution: {integrity: sha512-So4Jc3w5QiwNO+8yLomjgNvHR9luKZ5bGLqjIEzAMsD/bIvUqWvriQAyWHN4EweyQUJ8UZCXBG9iyVX8VjtiXw==}
+    dependencies:
+      autobind-decorator: 2.4.0
+      eventemitter3: 4.0.7
+      reconnecting-websocket: 4.4.0
+      semver: 7.3.8
+
   /call-bind@1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
@@ -5161,15 +4207,6 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
-  /camelcase-keys@6.2.2:
-    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
-    engines: {node: '>=8'}
-    dependencies:
-      camelcase: 5.3.1
-      map-obj: 4.3.0
-      quick-lru: 4.0.1
-    dev: true
-
   /camelcase@3.0.0:
     resolution: {integrity: sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==}
     engines: {node: '>=0.10.0'}
@@ -5178,6 +4215,7 @@ packages:
   /camelcase@5.3.1:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
     engines: {node: '>=6'}
+    dev: false
 
   /camelcase@6.3.0:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
@@ -5255,6 +4293,7 @@ packages:
       ansi-styles: 3.2.1
       escape-string-regexp: 1.0.5
       supports-color: 5.5.0
+    dev: false
 
   /chalk@4.0.0:
     resolution: {integrity: sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==}
@@ -5394,10 +4433,6 @@ packages:
       lodash: 4.17.21
     dev: true
 
-  /cjs-module-lexer@1.2.2:
-    resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
-    dev: true
-
   /clap@1.2.3:
     resolution: {integrity: sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==}
     engines: {node: '>=0.10.0'}
@@ -5566,6 +4601,7 @@ packages:
   /co@4.6.0:
     resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
+    dev: false
 
   /coa@1.0.4:
     resolution: {integrity: sha512-KAGck/eNAmCL0dcT3BiuYwLbExK6lduR8DxM3C1TyDzaXhZHyZ8ooX5I5+na2e3dPFuibfxrGdorr0/Lr7RYCQ==}
@@ -5579,10 +4615,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /collect-v8-coverage@1.0.1:
-    resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
-    dev: true
-
   /collection-map@1.0.0:
     resolution: {integrity: sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==}
     engines: {node: '>=0.10.0'}
@@ -5671,11 +4703,6 @@ packages:
     engines: {node: '>=0.1.90'}
     dev: true
 
-  /colors@1.2.5:
-    resolution: {integrity: sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==}
-    engines: {node: '>=0.1.90'}
-    dev: true
-
   /combined-stream@1.0.8:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
@@ -6027,14 +5054,6 @@ packages:
       cross-spawn: 7.0.3
     dev: true
 
-  /cross-fetch@3.1.5:
-    resolution: {integrity: sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==}
-    dependencies:
-      node-fetch: 2.6.7
-    transitivePeerDependencies:
-      - encoding
-    dev: true
-
   /cross-spawn@5.1.0:
     resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
     dependencies:
@@ -6131,10 +5150,7 @@ packages:
 
   /cssom@0.3.8:
     resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
-
-  /cssom@0.4.4:
-    resolution: {integrity: sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==}
-    dev: true
+    dev: false
 
   /cssom@0.5.0:
     resolution: {integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==}
@@ -6145,6 +5161,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       cssom: 0.3.8
+    dev: false
 
   /csstype@2.6.21:
     resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
@@ -6234,15 +5251,6 @@ packages:
     resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
     engines: {node: '>= 12'}
 
-  /data-urls@2.0.0:
-    resolution: {integrity: sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      abab: 2.0.6
-      whatwg-mimetype: 2.3.0
-      whatwg-url: 8.7.0
-    dev: true
-
   /data-urls@3.0.2:
     resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==}
     engines: {node: '>=12'}
@@ -6308,14 +5316,6 @@ packages:
     resolution: {integrity: sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==}
     dev: false
 
-  /decamelize-keys@1.1.1:
-    resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      decamelize: 1.2.0
-      map-obj: 1.0.1
-    dev: true
-
   /decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
@@ -6327,6 +5327,7 @@ packages:
 
   /decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
+    dev: false
 
   /decode-uri-component@0.2.2:
     resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
@@ -6400,10 +5401,6 @@ packages:
       strip-dirs: 2.1.0
     dev: true
 
-  /dedent@0.7.0:
-    resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
-    dev: true
-
   /deep-email-validator@0.1.21:
     resolution: {integrity: sha512-DBAmMzbr+MAubXQ+TS9tZuPwLcdKscb8YzKZiwoLqF3NmaeEgXvSSHhZ0EXOFeKFE2FNWC4mNXCyiQ/JdFXUwg==}
     dependencies:
@@ -6430,6 +5427,7 @@ packages:
   /deepmerge@4.2.2:
     resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
     engines: {node: '>=0.10.0'}
+    dev: false
 
   /default-compare@1.0.0:
     resolution: {integrity: sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==}
@@ -6518,11 +5516,6 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
-  /detect-newline@3.1.0:
-    resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
-    engines: {node: '>=8'}
-    dev: true
-
   /dezalgo@1.0.4:
     resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
     dependencies:
@@ -6530,11 +5523,6 @@ packages:
       wrappy: 1.0.2
     dev: false
 
-  /diff-sequences@27.5.1:
-    resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dev: true
-
   /diff@4.0.2:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
@@ -6595,13 +5583,6 @@ packages:
   /domelementtype@2.3.0:
     resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
 
-  /domexception@2.0.1:
-    resolution: {integrity: sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==}
-    engines: {node: '>=8'}
-    dependencies:
-      webidl-conversions: 5.0.0
-    dev: true
-
   /domexception@4.0.0:
     resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==}
     engines: {node: '>=12'}
@@ -6731,11 +5712,6 @@ packages:
     resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
     dev: true
 
-  /emittery@0.8.1:
-    resolution: {integrity: sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==}
-    engines: {node: '>=10'}
-    dev: true
-
   /emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
@@ -6906,11 +5882,6 @@ packages:
     resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
     engines: {node: '>=0.8.0'}
 
-  /escape-string-regexp@2.0.0:
-    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
-    engines: {node: '>=8'}
-    dev: true
-
   /escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
@@ -6926,24 +5897,7 @@ packages:
       optionator: 0.8.3
     optionalDependencies:
       source-map: 0.6.1
-
-  /eslint-formatter-pretty@4.1.0:
-    resolution: {integrity: sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      '@types/eslint': 7.29.0
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      eslint-rule-docs: 1.1.235
-      log-symbols: 4.1.0
-      plur: 4.0.0
-      string-width: 4.2.3
-      supports-hyperlinks: 2.3.0
-    dev: true
-
-  /eslint-rule-docs@1.1.235:
-    resolution: {integrity: sha512-+TQ+x4JdTnDoFEXXb3fDvfGOwnyNV7duH8fXWTPD1ieaBmB8omj7Gw/pMBBu4uI2uJCCU8APDaQJzWuXnTsH4A==}
-    dev: true
+    dev: false
 
   /eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
@@ -6969,16 +5923,6 @@ packages:
       eslint: 8.31.0
       eslint-visitor-keys: 2.1.0
 
-  /eslint-utils@3.0.0(eslint@8.6.0):
-    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
-    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
-    peerDependencies:
-      eslint: '>=5'
-    dependencies:
-      eslint: 8.6.0
-      eslint-visitor-keys: 2.1.0
-    dev: true
-
   /eslint-visitor-keys@1.3.0:
     resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==}
     engines: {node: '>=4'}
@@ -7039,53 +5983,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /eslint@8.6.0:
-    resolution: {integrity: sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    hasBin: true
-    dependencies:
-      '@eslint/eslintrc': 1.4.1
-      '@humanwhocodes/config-array': 0.9.5
-      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
-      enquirer: 2.3.6
-      escape-string-regexp: 4.0.0
-      eslint-scope: 7.1.1
-      eslint-utils: 3.0.0(eslint@8.6.0)
-      eslint-visitor-keys: 3.3.0
-      espree: 9.4.1
-      esquery: 1.4.0
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 6.0.1
-      functional-red-black-tree: 1.0.1
-      glob-parent: 6.0.2
-      globals: 13.19.0
-      ignore: 4.0.6
-      import-fresh: 3.3.0
-      imurmurhash: 0.1.4
-      is-glob: 4.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.1
-      progress: 2.0.3
-      regexpp: 3.2.0
-      semver: 7.3.8
-      strip-ansi: 6.0.1
-      strip-json-comments: 3.1.1
-      text-table: 0.2.0
-      v8-compile-cache: 2.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /espree@9.4.1:
     resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -7104,6 +6001,7 @@ packages:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
     hasBin: true
+    dev: false
 
   /esquery@1.4.0:
     resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
@@ -7256,11 +6154,6 @@ packages:
       mixly: 1.0.0
     dev: true
 
-  /exit@0.1.2:
-    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
-    engines: {node: '>= 0.8.0'}
-    dev: true
-
   /expand-brackets@2.1.4:
     resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==}
     engines: {node: '>=0.10.0'}
@@ -7288,16 +6181,6 @@ packages:
       homedir-polyfill: 1.0.3
     dev: true
 
-  /expect@27.5.1:
-    resolution: {integrity: sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/types': 27.5.1
-      jest-get-type: 27.5.1
-      jest-matcher-utils: 27.5.1
-      jest-message-util: 27.5.1
-    dev: true
-
   /ext-list@2.2.2:
     resolution: {integrity: sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==}
     engines: {node: '>=0.10.0'}
@@ -7420,12 +6303,6 @@ packages:
     dependencies:
       reusify: 1.0.4
 
-  /fb-watchman@2.0.2:
-    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
-    dependencies:
-      bser: 2.1.1
-    dev: true
-
   /fd-slicer@1.1.0:
     resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
     dependencies:
@@ -7689,6 +6566,7 @@ packages:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       mime-types: 2.1.35
+    dev: false
 
   /form-data@4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
@@ -7749,15 +6627,6 @@ packages:
       universalify: 2.0.0
     dev: true
 
-  /fs-extra@7.0.1:
-    resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
-    engines: {node: '>=6 <7 || >=8'}
-    dependencies:
-      graceful-fs: 4.2.10
-      jsonfile: 4.0.0
-      universalify: 0.1.2
-    dev: true
-
   /fs-extra@8.1.0:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
     engines: {node: '>=6 <7 || >=8'}
@@ -7826,10 +6695,6 @@ packages:
   /function-bind@1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
 
-  /functional-red-black-tree@1.0.1:
-    resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==}
-    dev: true
-
   /gauge@3.0.2:
     resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==}
     engines: {node: '>=10'}
@@ -7864,11 +6729,6 @@ packages:
     engines: {node: '>= 4'}
     dev: true
 
-  /gensync@1.0.0-beta.2:
-    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /get-caller-file@1.0.3:
     resolution: {integrity: sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==}
     dev: true
@@ -7884,11 +6744,6 @@ packages:
       has: 1.0.3
       has-symbols: 1.0.3
 
-  /get-package-type@0.1.0:
-    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
-    engines: {node: '>=8.0.0'}
-    dev: true
-
   /get-paths@0.0.7:
     resolution: {integrity: sha512-0wdJt7C1XKQxuCgouqd+ZvLJ56FQixKoki9MrFaO4EriqzXOiH9gbukaDE1ou08S8Ns3/yDzoBAISNPqj6e6tA==}
     engines: {node: '>=6.4'}
@@ -8095,6 +6950,7 @@ packages:
   /globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
+    dev: false
 
   /globals@13.19.0:
     resolution: {integrity: sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==}
@@ -8303,11 +7159,6 @@ packages:
       har-schema: 2.0.0
     dev: false
 
-  /hard-rejection@2.1.0:
-    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
-    engines: {node: '>=6'}
-    dev: true
-
   /has-ansi@2.0.0:
     resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
     engines: {node: '>=0.10.0'}
@@ -8323,6 +7174,7 @@ packages:
   /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
+    dev: false
 
   /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
@@ -8420,13 +7272,6 @@ packages:
     resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
     dev: true
 
-  /hosted-git-info@4.1.0:
-    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
-    engines: {node: '>=10'}
-    dependencies:
-      lru-cache: 6.0.0
-    dev: true
-
   /hpagent@0.1.2:
     resolution: {integrity: sha512-ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ==}
     dev: false
@@ -8435,13 +7280,6 @@ packages:
     resolution: {integrity: sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==}
     dev: true
 
-  /html-encoding-sniffer@2.0.1:
-    resolution: {integrity: sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      whatwg-encoding: 1.0.5
-    dev: true
-
   /html-encoding-sniffer@3.0.0:
     resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
     engines: {node: '>=12'}
@@ -8453,10 +7291,6 @@ packages:
     resolution: {integrity: sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==}
     dev: false
 
-  /html-escaper@2.0.2:
-    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
-    dev: true
-
   /htmlparser2@3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -8522,17 +7356,6 @@ packages:
       toidentifier: 1.0.1
     dev: false
 
-  /http-proxy-agent@4.0.1:
-    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
-    engines: {node: '>= 6'}
-    dependencies:
-      '@tootallnate/once': 1.1.2
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /http-proxy-agent@5.0.0:
     resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
     engines: {node: '>= 6'}
@@ -8604,6 +7427,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /human-signals@1.1.1:
     resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
@@ -8635,6 +7459,7 @@ packages:
     engines: {node: '>=0.10.0'}
     dependencies:
       safer-buffer: 2.1.2
+    dev: false
 
   /iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
@@ -8660,11 +7485,6 @@ packages:
   /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
-  /ignore@4.0.6:
-    resolution: {integrity: sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==}
-    engines: {node: '>= 4'}
-    dev: true
-
   /ignore@5.2.4:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
@@ -8685,11 +7505,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /import-lazy@4.0.0:
-    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
-    engines: {node: '>=8'}
-    dev: true
-
   /import-local@3.1.0:
     resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
     engines: {node: '>=8'}
@@ -8829,11 +7644,6 @@ packages:
     engines: {node: '>= 10'}
     dev: false
 
-  /irregular-plurals@3.5.0:
-    resolution: {integrity: sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==}
-    engines: {node: '>=8'}
-    dev: true
-
   /is-absolute-url@2.1.0:
     resolution: {integrity: sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==}
     engines: {node: '>=0.10.0'}
@@ -8971,11 +7781,6 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
-  /is-generator-fn@2.1.0:
-    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
-    engines: {node: '>=6'}
-    dev: true
-
   /is-generator-function@1.0.10:
     resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
     engines: {node: '>= 0.4'}
@@ -9071,6 +7876,7 @@ packages:
 
   /is-potential-custom-element-name@1.0.1:
     resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+    dev: false
 
   /is-promise@2.2.2:
     resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==}
@@ -9196,52 +8002,6 @@ packages:
   /isstream@0.1.2:
     resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
 
-  /istanbul-lib-coverage@3.2.0:
-    resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /istanbul-lib-instrument@5.2.1:
-    resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/parser': 7.20.7
-      '@istanbuljs/schema': 0.1.3
-      istanbul-lib-coverage: 3.2.0
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /istanbul-lib-report@3.0.0:
-    resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
-    engines: {node: '>=8'}
-    dependencies:
-      istanbul-lib-coverage: 3.2.0
-      make-dir: 3.1.0
-      supports-color: 7.2.0
-    dev: true
-
-  /istanbul-lib-source-maps@4.0.1:
-    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
-    engines: {node: '>=10'}
-    dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-      istanbul-lib-coverage: 3.2.0
-      source-map: 0.6.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /istanbul-reports@3.1.5:
-    resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==}
-    engines: {node: '>=8'}
-    dependencies:
-      html-escaper: 2.0.2
-      istanbul-lib-report: 3.0.0
-    dev: true
-
   /istextorbinary@3.3.0:
     resolution: {integrity: sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==}
     engines: {node: '>=8'}
@@ -9268,461 +8028,6 @@ packages:
       filelist: 1.0.4
       minimatch: 3.1.2
 
-  /jest-changed-files@27.5.1:
-    resolution: {integrity: sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/types': 27.5.1
-      execa: 5.1.1
-      throat: 6.0.2
-    dev: true
-
-  /jest-circus@27.5.1:
-    resolution: {integrity: sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/environment': 27.5.1
-      '@jest/test-result': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-      chalk: 4.1.2
-      co: 4.6.0
-      dedent: 0.7.0
-      expect: 27.5.1
-      is-generator-fn: 2.1.0
-      jest-each: 27.5.1
-      jest-matcher-utils: 27.5.1
-      jest-message-util: 27.5.1
-      jest-runtime: 27.5.1
-      jest-snapshot: 27.5.1
-      jest-util: 27.5.1
-      pretty-format: 27.5.1
-      slash: 3.0.0
-      stack-utils: 2.0.6
-      throat: 6.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-cli@27.5.1(ts-node@10.4.0):
-    resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      '@jest/core': 27.5.1(ts-node@10.4.0)
-      '@jest/test-result': 27.5.1
-      '@jest/types': 27.5.1
-      chalk: 4.1.2
-      exit: 0.1.2
-      graceful-fs: 4.2.10
-      import-local: 3.1.0
-      jest-config: 27.5.1(ts-node@10.4.0)
-      jest-util: 27.5.1
-      jest-validate: 27.5.1
-      prompts: 2.4.2
-      yargs: 16.2.0
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - ts-node
-      - utf-8-validate
-    dev: true
-
-  /jest-config@27.5.1(ts-node@10.4.0):
-    resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    peerDependencies:
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      ts-node:
-        optional: true
-    dependencies:
-      '@babel/core': 7.21.4
-      '@jest/test-sequencer': 27.5.1
-      '@jest/types': 27.5.1
-      babel-jest: 27.5.1(@babel/core@7.21.4)
-      chalk: 4.1.2
-      ci-info: 3.7.1
-      deepmerge: 4.2.2
-      glob: 7.2.3
-      graceful-fs: 4.2.10
-      jest-circus: 27.5.1
-      jest-environment-jsdom: 27.5.1
-      jest-environment-node: 27.5.1
-      jest-get-type: 27.5.1
-      jest-jasmine2: 27.5.1
-      jest-regex-util: 27.5.1
-      jest-resolve: 27.5.1
-      jest-runner: 27.5.1
-      jest-util: 27.5.1
-      jest-validate: 27.5.1
-      micromatch: 4.0.5
-      parse-json: 5.2.0
-      pretty-format: 27.5.1
-      slash: 3.0.0
-      strip-json-comments: 3.1.1
-      ts-node: 10.4.0(@types/node@17.0.5)(typescript@4.5.4)
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - utf-8-validate
-    dev: true
-
-  /jest-diff@27.5.1:
-    resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      chalk: 4.1.2
-      diff-sequences: 27.5.1
-      jest-get-type: 27.5.1
-      pretty-format: 27.5.1
-    dev: true
-
-  /jest-docblock@27.5.1:
-    resolution: {integrity: sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      detect-newline: 3.1.0
-    dev: true
-
-  /jest-each@27.5.1:
-    resolution: {integrity: sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/types': 27.5.1
-      chalk: 4.1.2
-      jest-get-type: 27.5.1
-      jest-util: 27.5.1
-      pretty-format: 27.5.1
-    dev: true
-
-  /jest-environment-jsdom@27.5.1:
-    resolution: {integrity: sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/environment': 27.5.1
-      '@jest/fake-timers': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-      jest-mock: 27.5.1
-      jest-util: 27.5.1
-      jsdom: 16.7.0
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - utf-8-validate
-    dev: true
-
-  /jest-environment-node@27.5.1:
-    resolution: {integrity: sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/environment': 27.5.1
-      '@jest/fake-timers': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-      jest-mock: 27.5.1
-      jest-util: 27.5.1
-    dev: true
-
-  /jest-fetch-mock@3.0.3:
-    resolution: {integrity: sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==}
-    dependencies:
-      cross-fetch: 3.1.5
-      promise-polyfill: 8.3.0
-    transitivePeerDependencies:
-      - encoding
-    dev: true
-
-  /jest-get-type@27.5.1:
-    resolution: {integrity: sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dev: true
-
-  /jest-haste-map@27.5.1:
-    resolution: {integrity: sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/types': 27.5.1
-      '@types/graceful-fs': 4.1.6
-      '@types/node': 18.11.18
-      anymatch: 3.1.3
-      fb-watchman: 2.0.2
-      graceful-fs: 4.2.10
-      jest-regex-util: 27.5.1
-      jest-serializer: 27.5.1
-      jest-util: 27.5.1
-      jest-worker: 27.5.1
-      micromatch: 4.0.5
-      walker: 1.0.8
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
-  /jest-jasmine2@27.5.1:
-    resolution: {integrity: sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/environment': 27.5.1
-      '@jest/source-map': 27.5.1
-      '@jest/test-result': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-      chalk: 4.1.2
-      co: 4.6.0
-      expect: 27.5.1
-      is-generator-fn: 2.1.0
-      jest-each: 27.5.1
-      jest-matcher-utils: 27.5.1
-      jest-message-util: 27.5.1
-      jest-runtime: 27.5.1
-      jest-snapshot: 27.5.1
-      jest-util: 27.5.1
-      pretty-format: 27.5.1
-      throat: 6.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-leak-detector@27.5.1:
-    resolution: {integrity: sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      jest-get-type: 27.5.1
-      pretty-format: 27.5.1
-    dev: true
-
-  /jest-matcher-utils@27.5.1:
-    resolution: {integrity: sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      chalk: 4.1.2
-      jest-diff: 27.5.1
-      jest-get-type: 27.5.1
-      pretty-format: 27.5.1
-    dev: true
-
-  /jest-message-util@27.5.1:
-    resolution: {integrity: sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@jest/types': 27.5.1
-      '@types/stack-utils': 2.0.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      micromatch: 4.0.5
-      pretty-format: 27.5.1
-      slash: 3.0.0
-      stack-utils: 2.0.6
-    dev: true
-
-  /jest-mock@27.5.1:
-    resolution: {integrity: sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-    dev: true
-
-  /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1):
-    resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
-    engines: {node: '>=6'}
-    peerDependencies:
-      jest-resolve: '*'
-    peerDependenciesMeta:
-      jest-resolve:
-        optional: true
-    dependencies:
-      jest-resolve: 27.5.1
-    dev: true
-
-  /jest-regex-util@27.5.1:
-    resolution: {integrity: sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dev: true
-
-  /jest-resolve-dependencies@27.5.1:
-    resolution: {integrity: sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/types': 27.5.1
-      jest-regex-util: 27.5.1
-      jest-snapshot: 27.5.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-resolve@27.5.1:
-    resolution: {integrity: sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/types': 27.5.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      jest-haste-map: 27.5.1
-      jest-pnp-resolver: 1.2.3(jest-resolve@27.5.1)
-      jest-util: 27.5.1
-      jest-validate: 27.5.1
-      resolve: 1.22.1
-      resolve.exports: 1.1.1
-      slash: 3.0.0
-    dev: true
-
-  /jest-runner@27.5.1:
-    resolution: {integrity: sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/console': 27.5.1
-      '@jest/environment': 27.5.1
-      '@jest/test-result': 27.5.1
-      '@jest/transform': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-      chalk: 4.1.2
-      emittery: 0.8.1
-      graceful-fs: 4.2.10
-      jest-docblock: 27.5.1
-      jest-environment-jsdom: 27.5.1
-      jest-environment-node: 27.5.1
-      jest-haste-map: 27.5.1
-      jest-leak-detector: 27.5.1
-      jest-message-util: 27.5.1
-      jest-resolve: 27.5.1
-      jest-runtime: 27.5.1
-      jest-util: 27.5.1
-      jest-worker: 27.5.1
-      source-map-support: 0.5.21
-      throat: 6.0.2
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - utf-8-validate
-    dev: true
-
-  /jest-runtime@27.5.1:
-    resolution: {integrity: sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/environment': 27.5.1
-      '@jest/fake-timers': 27.5.1
-      '@jest/globals': 27.5.1
-      '@jest/source-map': 27.5.1
-      '@jest/test-result': 27.5.1
-      '@jest/transform': 27.5.1
-      '@jest/types': 27.5.1
-      chalk: 4.1.2
-      cjs-module-lexer: 1.2.2
-      collect-v8-coverage: 1.0.1
-      execa: 5.1.1
-      glob: 7.2.3
-      graceful-fs: 4.2.10
-      jest-haste-map: 27.5.1
-      jest-message-util: 27.5.1
-      jest-mock: 27.5.1
-      jest-regex-util: 27.5.1
-      jest-resolve: 27.5.1
-      jest-snapshot: 27.5.1
-      jest-util: 27.5.1
-      slash: 3.0.0
-      strip-bom: 4.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-serializer@27.5.1:
-    resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@types/node': 18.11.18
-      graceful-fs: 4.2.10
-    dev: true
-
-  /jest-snapshot@27.5.1:
-    resolution: {integrity: sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@babel/core': 7.21.4
-      '@babel/generator': 7.20.7
-      '@babel/plugin-syntax-typescript': 7.21.4(@babel/core@7.21.4)
-      '@babel/traverse': 7.20.12
-      '@babel/types': 7.20.7
-      '@jest/transform': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/babel__traverse': 7.18.3
-      '@types/prettier': 2.7.2
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.4)
-      chalk: 4.1.2
-      expect: 27.5.1
-      graceful-fs: 4.2.10
-      jest-diff: 27.5.1
-      jest-get-type: 27.5.1
-      jest-haste-map: 27.5.1
-      jest-matcher-utils: 27.5.1
-      jest-message-util: 27.5.1
-      jest-util: 27.5.1
-      natural-compare: 1.4.0
-      pretty-format: 27.5.1
-      semver: 7.3.8
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-util@27.5.1:
-    resolution: {integrity: sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-      chalk: 4.1.2
-      ci-info: 3.7.1
-      graceful-fs: 4.2.10
-      picomatch: 2.3.1
-    dev: true
-
-  /jest-validate@27.5.1:
-    resolution: {integrity: sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/types': 27.5.1
-      camelcase: 6.3.0
-      chalk: 4.1.2
-      jest-get-type: 27.5.1
-      leven: 3.1.0
-      pretty-format: 27.5.1
-    dev: true
-
-  /jest-watcher@27.5.1:
-    resolution: {integrity: sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      '@jest/test-result': 27.5.1
-      '@jest/types': 27.5.1
-      '@types/node': 18.11.18
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      jest-util: 27.5.1
-      string-length: 4.0.2
-    dev: true
-
-  /jest-websocket-mock@2.2.1(mock-socket@9.0.8):
-    resolution: {integrity: sha512-fhsGLXrPfs06PhHoxqOSA9yZ6Rb4qYrf4Wcm7/nfRzjlrf1gIeuhYUkzMRjjE0TMQ37SwkmeLanwrZY4ZaNp8g==}
-    peerDependencies:
-      mock-socket: ^8||^9
-    dependencies:
-      jest-diff: 27.5.1
-      mock-socket: 9.0.8
-    dev: true
-
   /jest-worker@27.5.1:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
@@ -9732,31 +8037,6 @@ packages:
       supports-color: 8.1.1
     dev: true
 
-  /jest@27.4.5(ts-node@10.4.0):
-    resolution: {integrity: sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      '@jest/core': 27.5.1(ts-node@10.4.0)
-      import-local: 3.1.0
-      jest-cli: 27.5.1(ts-node@10.4.0)
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - ts-node
-      - utf-8-validate
-    dev: true
-
-  /jju@1.4.0:
-    resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
-    dev: true
-
   /jmespath@0.16.0:
     resolution: {integrity: sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==}
     engines: {node: '>= 0.6.0'}
@@ -9807,14 +8087,7 @@ packages:
 
   /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
-
-  /js-yaml@3.14.1:
-    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
-    hasBin: true
-    dependencies:
-      argparse: 1.0.10
-      esprima: 4.0.1
-    dev: true
+    dev: false
 
   /js-yaml@3.7.0:
     resolution: {integrity: sha512-eIlkGty7HGmntbV6P/ZlAsoncFLGsNoM27lkTzS+oneY/EiNhj+geqD9ezg/ip+SW6Var0BJU2JtV0vEUZpWVQ==}
@@ -9842,48 +8115,6 @@ packages:
     engines: {node: '>=0.1.90'}
     dev: false
 
-  /jsdom@16.7.0:
-    resolution: {integrity: sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      canvas: ^2.5.0
-    peerDependenciesMeta:
-      canvas:
-        optional: true
-    dependencies:
-      abab: 2.0.6
-      acorn: 8.8.1
-      acorn-globals: 6.0.0
-      cssom: 0.4.4
-      cssstyle: 2.3.0
-      data-urls: 2.0.0
-      decimal.js: 10.4.3
-      domexception: 2.0.1
-      escodegen: 2.0.0
-      form-data: 3.0.1
-      html-encoding-sniffer: 2.0.1
-      http-proxy-agent: 4.0.1
-      https-proxy-agent: 5.0.1
-      is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.2
-      parse5: 6.0.1
-      saxes: 5.0.1
-      symbol-tree: 3.2.4
-      tough-cookie: 4.1.2
-      w3c-hr-time: 1.0.2
-      w3c-xmlserializer: 2.0.0
-      webidl-conversions: 6.1.0
-      whatwg-encoding: 1.0.5
-      whatwg-mimetype: 2.3.0
-      whatwg-url: 8.7.0
-      ws: 7.5.9
-      xml-name-validator: 3.0.0
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-    dev: true
-
   /jsdom@20.0.3:
     resolution: {integrity: sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==}
     engines: {node: '>=14'}
@@ -9929,6 +8160,7 @@ packages:
     resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
     engines: {node: '>=4'}
     hasBin: true
+    dev: false
 
   /json-buffer@3.0.0:
     resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==}
@@ -10106,11 +8338,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /kleur@3.0.3:
-    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
-    engines: {node: '>=6'}
-    dev: true
-
   /koa-body@6.0.1:
     resolution: {integrity: sha512-M8ZvMD8r+kPHy28aWP9VxL7kY8oPWA+C7ZgCljrCMeaU7uX6wsIQgDHskyrAr9sw+jqnIXyv4Mlxri5R4InIJg==}
     dependencies:
@@ -10376,17 +8603,13 @@ packages:
       flush-write-stream: 1.1.1
     dev: true
 
-  /leven@3.1.0:
-    resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
-    engines: {node: '>=6'}
-    dev: true
-
   /levn@0.3.0:
     resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.1.2
       type-check: 0.3.2
+    dev: false
 
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
@@ -10411,10 +8634,6 @@ packages:
       - supports-color
     dev: true
 
-  /lines-and-columns@1.2.4:
-    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
-    dev: true
-
   /listenercount@1.0.1:
     resolution: {integrity: sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==}
     dev: false
@@ -10528,15 +8747,12 @@ packages:
     resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
     dev: false
 
-  /lodash.get@4.4.2:
-    resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
-    dev: true
-
   /lodash.isarguments@3.1.0:
     resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
 
   /lodash.isequal@4.5.0:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
 
   /lodash.isplainobject@4.0.6:
     resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
@@ -10636,12 +8852,6 @@ packages:
       pseudomap: 1.0.2
       yallist: 2.1.2
 
-  /lru-cache@5.1.1:
-    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
-    dependencies:
-      yallist: 3.1.1
-    dev: true
-
   /lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
@@ -10680,6 +8890,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       semver: 6.3.0
+    dev: false
 
   /make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
@@ -10716,27 +8927,11 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /makeerror@1.0.12:
-    resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
-    dependencies:
-      tmpl: 1.0.5
-    dev: true
-
   /map-cache@0.2.2:
     resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /map-obj@1.0.1:
-    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /map-obj@4.3.0:
-    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
-    engines: {node: '>=8'}
-    dev: true
-
   /map-stream@0.1.0:
     resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==}
     dev: true
@@ -10773,24 +8968,6 @@ packages:
     engines: {node: '>= 0.6'}
     dev: false
 
-  /meow@9.0.0:
-    resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      '@types/minimist': 1.2.2
-      camelcase-keys: 6.2.2
-      decamelize: 1.2.0
-      decamelize-keys: 1.1.1
-      hard-rejection: 2.1.0
-      minimist-options: 4.1.0
-      normalize-package-data: 3.0.3
-      read-pkg-up: 7.0.1
-      redent: 3.0.0
-      trim-newlines: 3.0.1
-      type-fest: 0.18.1
-      yargs-parser: 20.2.9
-    dev: true
-
   /merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
     dev: true
@@ -10873,11 +9050,6 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: false
 
-  /min-indent@1.0.1:
-    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
-    engines: {node: '>=4'}
-    dev: true
-
   /minimalistic-assert@1.0.1:
     resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
     dev: false
@@ -10900,15 +9072,6 @@ packages:
     dependencies:
       brace-expansion: 2.0.1
 
-  /minimist-options@4.1.0:
-    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
-    engines: {node: '>= 6'}
-    dependencies:
-      arrify: 1.0.1
-      is-plain-obj: 1.1.0
-      kind-of: 6.0.3
-    dev: true
-
   /minimist@1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
 
@@ -11047,11 +9210,6 @@ packages:
       yargs-unparser: 2.0.0
     dev: true
 
-  /mock-socket@9.0.8:
-    resolution: {integrity: sha512-8Syqkaaa2SzRqW68DEsnZkKQicHP7hVzfj3uCvigB5TL79H1ljKbwmOcRIENkx0ZTyu/5W6u+Pk9Qy6JCp38Ww==}
-    engines: {node: '>= 8'}
-    dev: true
-
   /moment@2.29.4:
     resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
     dev: false
@@ -11246,18 +9404,6 @@ packages:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
     engines: {node: '>=10.5.0'}
 
-  /node-fetch@2.6.7:
-    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
-    dependencies:
-      whatwg-url: 5.0.0
-    dev: true
-
   /node-fetch@2.6.8:
     resolution: {integrity: sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==}
     engines: {node: 4.x || >=6.0.0}
@@ -11309,10 +9455,6 @@ packages:
       - supports-color
     dev: false
 
-  /node-int64@0.4.0:
-    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
-    dev: true
-
   /node-releases@2.0.8:
     resolution: {integrity: sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==}
     dev: true
@@ -11350,16 +9492,6 @@ packages:
       validate-npm-package-license: 3.0.4
     dev: true
 
-  /normalize-package-data@3.0.3:
-    resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
-    engines: {node: '>=10'}
-    dependencies:
-      hosted-git-info: 4.1.0
-      is-core-module: 2.11.0
-      semver: 7.3.8
-      validate-npm-package-license: 3.0.4
-    dev: true
-
   /normalize-path@2.1.1:
     resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==}
     engines: {node: '>=0.10.0'}
@@ -11486,6 +9618,7 @@ packages:
 
   /nwsapi@2.2.2:
     resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==}
+    dev: false
 
   /oauth-sign@0.9.0:
     resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
@@ -11633,6 +9766,7 @@ packages:
       prelude-ls: 1.1.2
       type-check: 0.3.2
       word-wrap: 1.2.3
+    dev: false
 
   /optionator@0.9.1:
     resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
@@ -11791,16 +9925,6 @@ packages:
       error-ex: 1.3.2
     dev: true
 
-  /parse-json@5.2.0:
-    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      error-ex: 1.3.2
-      json-parse-even-better-errors: 2.3.1
-      lines-and-columns: 1.2.4
-    dev: true
-
   /parse-link-header@2.0.0:
     resolution: {integrity: sha512-xjU87V0VyHZybn2RrCX5TIFGxTVZE6zqqZWMPlIKiSKuWh/X5WZdt+w1Ki1nXB+8L/KtL+nZ4iq+sfI6MrhhMw==}
     dependencies:
@@ -11833,6 +9957,7 @@ packages:
 
   /parse5@6.0.1:
     resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
+    dev: false
 
   /parse5@7.1.2:
     resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
@@ -12031,11 +10156,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /pirates@4.0.5:
-    resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
-    engines: {node: '>= 6'}
-    dev: true
-
   /pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
@@ -12059,13 +10179,6 @@ packages:
       extend-shallow: 3.0.2
     dev: true
 
-  /plur@4.0.0:
-    resolution: {integrity: sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==}
-    engines: {node: '>=10'}
-    dependencies:
-      irregular-plurals: 3.5.0
-    dev: true
-
   /pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
@@ -12354,6 +10467,7 @@ packages:
   /prelude-ls@1.1.2:
     resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
     engines: {node: '>= 0.8.0'}
+    dev: false
 
   /prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
@@ -12386,15 +10500,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /pretty-format@27.5.1:
-    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    dependencies:
-      ansi-regex: 5.0.1
-      ansi-styles: 5.2.0
-      react-is: 17.0.2
-    dev: true
-
   /pretty-hrtime@1.0.3:
     resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
     engines: {node: '>= 0.8'}
@@ -12447,6 +10552,8 @@ packages:
   /progress@2.0.3:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
     engines: {node: '>=0.4.0'}
+    dev: false
+    optional: true
 
   /promise-inflight@1.0.1:
     resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
@@ -12461,10 +10568,6 @@ packages:
     resolution: {integrity: sha512-7nJ6v5lnJsXwGprnGXga4wx6d1POjvi5Qmf1ivTRxTjH4Z/9Czja/UCMLVmB9N93GeWOU93XaFaEt6jbuoagNw==}
     dev: false
 
-  /promise-polyfill@8.3.0:
-    resolution: {integrity: sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==}
-    dev: true
-
   /promise-retry@2.0.1:
     resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
     engines: {node: '>=10'}
@@ -12478,14 +10581,6 @@ packages:
     dependencies:
       asap: 2.0.6
 
-  /prompts@2.4.2:
-    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
-    engines: {node: '>= 6'}
-    dependencies:
-      kleur: 3.0.3
-      sisteransi: 1.0.5
-    dev: true
-
   /proto-list@1.2.4:
     resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
 
@@ -12708,6 +10803,7 @@ packages:
 
   /querystringify@2.2.0:
     resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
+    dev: false
 
   /queue-lit@1.5.0:
     resolution: {integrity: sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA==}
@@ -12716,11 +10812,6 @@ packages:
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
-  /quick-lru@4.0.1:
-    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
-    engines: {node: '>=8'}
-    dev: true
-
   /quick-lru@5.1.1:
     resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
     engines: {node: '>=10'}
@@ -12789,10 +10880,6 @@ packages:
       - supports-color
     dev: false
 
-  /react-is@17.0.2:
-    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
-    dev: true
-
   /read-pkg-up@1.0.1:
     resolution: {integrity: sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==}
     engines: {node: '>=0.10.0'}
@@ -12801,15 +10888,6 @@ packages:
       read-pkg: 1.1.0
     dev: true
 
-  /read-pkg-up@7.0.1:
-    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
-    engines: {node: '>=8'}
-    dependencies:
-      find-up: 4.1.0
-      read-pkg: 5.2.0
-      type-fest: 0.8.1
-    dev: true
-
   /read-pkg@1.1.0:
     resolution: {integrity: sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==}
     engines: {node: '>=0.10.0'}
@@ -12819,16 +10897,6 @@ packages:
       path-type: 1.1.0
     dev: true
 
-  /read-pkg@5.2.0:
-    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@types/normalize-package-data': 2.4.1
-      normalize-package-data: 2.5.0
-      parse-json: 5.2.0
-      type-fest: 0.6.0
-    dev: true
-
   /readable-stream@1.1.14:
     resolution: {integrity: sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==}
     dependencies:
@@ -12892,15 +10960,6 @@ packages:
 
   /reconnecting-websocket@4.4.0:
     resolution: {integrity: sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==}
-    dev: false
-
-  /redent@3.0.0:
-    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
-    engines: {node: '>=8'}
-    dependencies:
-      indent-string: 4.0.0
-      strip-indent: 3.0.0
-    dev: true
 
   /redis-errors@1.2.0:
     resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
@@ -13085,6 +11144,7 @@ packages:
 
   /requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+    dev: false
 
   /resolve-alpn@1.2.1:
     resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
@@ -13132,24 +11192,6 @@ packages:
     resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
     deprecated: https://github.com/lydell/resolve-url#deprecated
 
-  /resolve.exports@1.1.1:
-    resolution: {integrity: sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /resolve@1.17.0:
-    resolution: {integrity: sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==}
-    dependencies:
-      path-parse: 1.0.7
-    dev: true
-
-  /resolve@1.19.0:
-    resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==}
-    dependencies:
-      is-core-module: 2.11.0
-      path-parse: 1.0.7
-    dev: true
-
   /resolve@1.22.1:
     resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
     hasBin: true
@@ -13321,13 +11363,6 @@ packages:
   /sax@1.2.4:
     resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
 
-  /saxes@5.0.1:
-    resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==}
-    engines: {node: '>=10'}
-    dependencies:
-      xmlchars: 2.2.0
-    dev: true
-
   /saxes@6.0.0:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
     engines: {node: '>=v12.22.7'}
@@ -13387,6 +11422,7 @@ packages:
   /semver@6.3.0:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
+    dev: false
 
   /semver@7.3.8:
     resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
@@ -13514,10 +11550,6 @@ packages:
       is-arrayish: 0.3.2
     dev: false
 
-  /sisteransi@1.0.5:
-    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
-    dev: true
-
   /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
@@ -13762,13 +11794,6 @@ packages:
     resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}
     dev: true
 
-  /stack-utils@2.0.6:
-    resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      escape-string-regexp: 2.0.0
-    dev: true
-
   /standard-as-callback@2.1.0:
     resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
 
@@ -13842,19 +11867,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /string-argv@0.3.1:
-    resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
-    engines: {node: '>=0.6.19'}
-    dev: true
-
-  /string-length@4.0.2:
-    resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      char-regex: 1.0.2
-      strip-ansi: 6.0.1
-    dev: true
-
   /string-width@1.0.2:
     resolution: {integrity: sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==}
     engines: {node: '>=0.10.0'}
@@ -13916,11 +11928,6 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /strip-bom@4.0.0:
-    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
-    engines: {node: '>=8'}
-    dev: true
-
   /strip-dirs@2.1.0:
     resolution: {integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==}
     dependencies:
@@ -13942,13 +11949,6 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /strip-indent@3.0.0:
-    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      min-indent: 1.0.1
-    dev: true
-
   /strip-json-comments@2.0.1:
     resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
     engines: {node: '>=0.10.0'}
@@ -14012,6 +12012,7 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
+    dev: false
 
   /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
@@ -14025,14 +12026,6 @@ packages:
     dependencies:
       has-flag: 4.0.0
 
-  /supports-hyperlinks@2.3.0:
-    resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
-    engines: {node: '>=8'}
-    dependencies:
-      has-flag: 4.0.0
-      supports-color: 7.2.0
-    dev: true
-
   /supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
@@ -14080,6 +12073,7 @@ packages:
 
   /symbol-tree@3.2.4:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
+    dev: false
 
   /syslog-pro@1.0.0:
     resolution: {integrity: sha512-7SNMJKtQBJlwBUp1jxFT7bXya71cnINXPCYJ2AVhlQE4MKL7o2QiPdAXbMdWRiLeykQ2rx+7TNrnoGzvzhO+eA==}
@@ -14163,14 +12157,6 @@ packages:
       yallist: 4.0.0
     dev: false
 
-  /terminal-link@2.1.1:
-    resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-escapes: 4.3.2
-      supports-hyperlinks: 2.3.0
-    dev: true
-
   /terser-webpack-plugin@5.3.6(@swc/core@1.3.26)(webpack@5.75.0):
     resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
     engines: {node: '>= 10.13.0'}
@@ -14234,15 +12220,6 @@ packages:
       - supports-color
     dev: false
 
-  /test-exclude@6.0.0:
-    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@istanbuljs/schema': 0.1.3
-      glob: 7.2.3
-      minimatch: 3.1.2
-    dev: true
-
   /text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
 
@@ -14270,10 +12247,6 @@ packages:
     resolution: {integrity: sha512-1lvNfLezN6OJ9NaFAhfX4sm5e9YCzHtaRgZ1+B4C+Hv6TibRMsuBAM5/wVKzxjpYIlMymvgsHEFrrigEfXnb2A==}
     dev: true
 
-  /throat@6.0.2:
-    resolution: {integrity: sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==}
-    dev: true
-
   /throttle-debounce@5.0.0:
     resolution: {integrity: sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==}
     engines: {node: '>=12.22'}
@@ -14320,10 +12293,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /timsort@0.3.0:
-    resolution: {integrity: sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==}
-    dev: true
-
   /tinycolor2@1.5.2:
     resolution: {integrity: sha512-h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg==}
 
@@ -14333,10 +12302,6 @@ packages:
     dependencies:
       rimraf: 3.0.2
 
-  /tmpl@1.0.5:
-    resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
-    dev: true
-
   /to-absolute-glob@2.0.2:
     resolution: {integrity: sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==}
     engines: {node: '>=0.10.0'}
@@ -14411,7 +12376,7 @@ packages:
     engines: {node: '>=0.8'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.1.1
+      punycode: 2.2.0
 
   /tough-cookie@4.1.2:
     resolution: {integrity: sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==}
@@ -14421,22 +12386,17 @@ packages:
       punycode: 2.2.0
       universalify: 0.2.0
       url-parse: 1.5.10
+    dev: false
 
   /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
-
-  /tr46@2.1.0:
-    resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==}
-    engines: {node: '>=8'}
-    dependencies:
-      punycode: 2.1.1
-    dev: true
+    dev: false
 
   /tr46@3.0.0:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
     dependencies:
-      punycode: 2.1.1
+      punycode: 2.2.0
     dev: false
 
   /trace-redirect@1.0.6:
@@ -14447,11 +12407,6 @@ packages:
     resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==}
     dev: false
 
-  /trim-newlines@3.0.1:
-    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
-    engines: {node: '>=8'}
-    dev: true
-
   /trim-repeated@1.0.0:
     resolution: {integrity: sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==}
     engines: {node: '>=0.10.0'}
@@ -14459,41 +12414,6 @@ packages:
       escape-string-regexp: 1.0.5
     dev: true
 
-  /ts-jest@27.1.2(@babel/core@7.21.4)(@types/jest@27.4.0)(jest@27.4.5)(typescript@4.5.4):
-    resolution: {integrity: sha512-eSOiJOWq6Hhs6Khzk5wKC5sgWIXgXqOCiIl1+3lfnearu58Hj4QpE5tUhQcA3xtZrELbcvAGCsd6HB8OsaVaTA==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    hasBin: true
-    peerDependencies:
-      '@babel/core': '>=7.0.0-beta.0 <8'
-      '@types/jest': ^27.0.0
-      babel-jest: '>=27.0.0 <28'
-      esbuild: ~0.14.0
-      jest: ^27.0.0
-      typescript: '>=3.8 <5.0'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      '@types/jest':
-        optional: true
-      babel-jest:
-        optional: true
-      esbuild:
-        optional: true
-    dependencies:
-      '@babel/core': 7.21.4
-      '@types/jest': 27.4.0
-      bs-logger: 0.2.6
-      fast-json-stable-stringify: 2.1.0
-      jest: 27.4.5(ts-node@10.4.0)
-      jest-util: 27.5.1
-      json5: 2.2.3
-      lodash.memoize: 4.1.2
-      make-error: 1.3.6
-      semver: 7.3.8
-      typescript: 4.5.4
-      yargs-parser: 20.2.9
-    dev: true
-
   /ts-loader@9.4.2(typescript@4.9.4)(webpack@5.75.0):
     resolution: {integrity: sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==}
     engines: {node: '>=12.0.0'}
@@ -14509,36 +12429,6 @@ packages:
       webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
     dev: true
 
-  /ts-node@10.4.0(@types/node@17.0.5)(typescript@4.5.4):
-    resolution: {integrity: sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==}
-    hasBin: true
-    peerDependencies:
-      '@swc/core': '>=1.2.50'
-      '@swc/wasm': '>=1.2.50'
-      '@types/node': '*'
-      typescript: '>=2.7'
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      '@swc/wasm':
-        optional: true
-    dependencies:
-      '@cspotcode/source-map-support': 0.7.0
-      '@tsconfig/node10': 1.0.9
-      '@tsconfig/node12': 1.0.11
-      '@tsconfig/node14': 1.0.3
-      '@tsconfig/node16': 1.0.3
-      '@types/node': 17.0.5
-      acorn: 8.8.1
-      acorn-walk: 8.2.0
-      arg: 4.1.3
-      create-require: 1.1.1
-      diff: 4.0.2
-      make-error: 1.3.6
-      typescript: 4.5.4
-      yn: 3.1.1
-    dev: true
-
   /ts-node@10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
@@ -14591,23 +12481,6 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
-  /tsd@0.19.1:
-    resolution: {integrity: sha512-pSwchclr+ADdxlahRUQXUrdAIOjXx1T1PQV+fLfVLuo/S4z+T00YU84fH8iPlZxyA2pWgJjo42BG1p9SDb4NOw==}
-    engines: {node: '>=12'}
-    hasBin: true
-    dependencies:
-      '@tsd/typescript': 4.5.5
-      eslint-formatter-pretty: 4.1.0
-      globby: 11.1.0
-      meow: 9.0.0
-      path-exists: 4.0.0
-      read-pkg-up: 7.0.1
-    dev: true
-
-  /tslib@1.14.1:
-    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
-    dev: true
-
   /tslib@2.4.1:
     resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
 
@@ -14616,16 +12489,6 @@ packages:
     engines: {node: '>=0.6.x'}
     dev: false
 
-  /tsutils@3.21.0(typescript@4.5.4):
-    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
-    engines: {node: '>= 6'}
-    peerDependencies:
-      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
-    dependencies:
-      tslib: 1.14.1
-      typescript: 4.5.4
-    dev: true
-
   /tunnel-agent@0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
     dependencies:
@@ -14642,6 +12505,7 @@ packages:
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.1.2
+    dev: false
 
   /type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
@@ -14652,11 +12516,7 @@ packages:
   /type-detect@4.0.8:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
     engines: {node: '>=4'}
-
-  /type-fest@0.18.1:
-    resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==}
-    engines: {node: '>=10'}
-    dev: true
+    dev: false
 
   /type-fest@0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
@@ -14667,16 +12527,6 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /type-fest@0.6.0:
-    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /type-fest@0.8.1:
-    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
-    engines: {node: '>=8'}
-    dev: true
-
   /type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}
@@ -14695,6 +12545,7 @@ packages:
     resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
     dependencies:
       is-typedarray: 1.0.0
+    dev: false
 
   /typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
@@ -14781,12 +12632,6 @@ packages:
       - supports-color
     dev: false
 
-  /typescript@4.5.4:
-    resolution: {integrity: sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==}
-    engines: {node: '>=4.2.0'}
-    hasBin: true
-    dev: true
-
   /typescript@4.9.4:
     resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==}
     engines: {node: '>=4.2.0'}
@@ -14882,6 +12727,7 @@ packages:
   /universalify@0.2.0:
     resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
     engines: {node: '>= 4.0.0'}
+    dev: false
 
   /universalify@2.0.0:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
@@ -14958,6 +12804,7 @@ packages:
     dependencies:
       querystringify: 2.2.0
       requires-port: 1.0.0
+    dev: false
 
   /url-polyfill@1.1.12:
     resolution: {integrity: sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==}
@@ -15031,19 +12878,6 @@ packages:
   /v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
-  /v8-compile-cache@2.3.0:
-    resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
-    dev: true
-
-  /v8-to-istanbul@8.1.1:
-    resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==}
-    engines: {node: '>=10.12.0'}
-    dependencies:
-      '@types/istanbul-lib-coverage': 2.0.4
-      convert-source-map: 1.9.0
-      source-map: 0.7.4
-    dev: true
-
   /v8flags@3.2.0:
     resolution: {integrity: sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==}
     engines: {node: '>= 0.10'}
@@ -15058,11 +12892,6 @@ packages:
       spdx-expression-parse: 3.0.1
     dev: true
 
-  /validator@13.9.0:
-    resolution: {integrity: sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==}
-    engines: {node: '>= 0.10'}
-    dev: true
-
   /value-or-function@3.0.0:
     resolution: {integrity: sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==}
     engines: {node: '>= 0.10'}
@@ -15242,20 +13071,6 @@ packages:
       vue: 3.2.45
     dev: true
 
-  /w3c-hr-time@1.0.2:
-    resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
-    deprecated: Use your platform's native performance.now() and performance.timeOrigin.
-    dependencies:
-      browser-process-hrtime: 1.0.0
-    dev: true
-
-  /w3c-xmlserializer@2.0.0:
-    resolution: {integrity: sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==}
-    engines: {node: '>=10'}
-    dependencies:
-      xml-name-validator: 3.0.0
-    dev: true
-
   /w3c-xmlserializer@4.0.0:
     resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==}
     engines: {node: '>=14'}
@@ -15277,12 +13092,6 @@ packages:
       - debug
     dev: true
 
-  /walker@1.0.8:
-    resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
-    dependencies:
-      makeerror: 1.0.12
-    dev: true
-
   /wasm-feature-detect@1.4.0:
     resolution: {integrity: sha512-9z4Yk3SeHQdb7E4g6ywQYcUt1CHr9HFiCIA5h29rv0gmW4lCE5dnDhheiJI5qzVPSDnXHyXQPLGPyucsuIzacw==}
     dev: false
@@ -15316,16 +13125,7 @@ packages:
 
   /webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
-
-  /webidl-conversions@5.0.0:
-    resolution: {integrity: sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /webidl-conversions@6.1.0:
-    resolution: {integrity: sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==}
-    engines: {node: '>=10.4'}
-    dev: true
+    dev: false
 
   /webidl-conversions@7.0.0:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
@@ -15433,12 +13233,6 @@ packages:
       - supports-color
     dev: false
 
-  /whatwg-encoding@1.0.5:
-    resolution: {integrity: sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==}
-    dependencies:
-      iconv-lite: 0.4.24
-    dev: true
-
   /whatwg-encoding@2.0.0:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
     engines: {node: '>=12'}
@@ -15446,10 +13240,6 @@ packages:
       iconv-lite: 0.6.3
     dev: false
 
-  /whatwg-mimetype@2.3.0:
-    resolution: {integrity: sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==}
-    dev: true
-
   /whatwg-mimetype@3.0.0:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
     engines: {node: '>=12'}
@@ -15468,15 +13258,7 @@ packages:
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
-
-  /whatwg-url@8.7.0:
-    resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==}
-    engines: {node: '>=10'}
-    dependencies:
-      lodash: 4.17.21
-      tr46: 2.1.0
-      webidl-conversions: 6.1.0
-    dev: true
+    dev: false
 
   /whet.extend@0.9.9:
     resolution: {integrity: sha512-mmIPAft2vTgEILgPeZFqE/wWh24SEsR/k+N9fJ3Jxrz44iDFy9aemCxdksfURSHYFCLmvs/d/7Iso5XjPpNfrA==}
@@ -15570,28 +13352,6 @@ packages:
   /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  /write-file-atomic@3.0.3:
-    resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}
-    dependencies:
-      imurmurhash: 0.1.4
-      is-typedarray: 1.0.0
-      signal-exit: 3.0.7
-      typedarray-to-buffer: 3.1.5
-    dev: true
-
-  /ws@7.5.9:
-    resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==}
-    engines: {node: '>=8.3.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: ^5.0.2
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-    dev: true
-
   /ws@8.11.0:
     resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==}
     engines: {node: '>=10.0.0'}
@@ -15628,10 +13388,6 @@ packages:
       sax: 1.2.4
     dev: false
 
-  /xml-name-validator@3.0.0:
-    resolution: {integrity: sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==}
-    dev: true
-
   /xml-name-validator@4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
     engines: {node: '>=12'}
@@ -15664,6 +13420,7 @@ packages:
 
   /xmlchars@2.2.0:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+    dev: false
 
   /xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
@@ -15691,6 +13448,8 @@ packages:
 
   /yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
+    dev: false
+    optional: true
 
   /yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
@@ -15817,18 +13576,6 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
-  /z-schema@5.0.5:
-    resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}
-    engines: {node: '>=8.0.0'}
-    hasBin: true
-    dependencies:
-      lodash.get: 4.4.2
-      lodash.isequal: 4.5.0
-      validator: 13.9.0
-    optionalDependencies:
-      commander: 9.5.0
-    dev: true
-
   /zip-stream@4.1.0:
     resolution: {integrity: sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==}
     engines: {node: '>= 10'}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index a2ebb0465..87d240173 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,4 +2,3 @@ packages:
  - 'packages/backend'
  - 'packages/client'
  - 'packages/sw'
- - 'packages/calckey-js'

From 799ac84ee35b4a22c7ff8d57d6eefaee7e67c50a Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 17:44:27 -0700
Subject: [PATCH 424/582] Revert "Revert "Incorporate calckey-js into calckey
 repository (#9820)""

This reverts commit 8033492c7c4827fbff05782d08ae65bc3440c080.
---
 Dockerfile                                 |     2 +
 package.json                               |     1 -
 packages/backend/package.json              |     2 +-
 packages/calckey-js/.editorconfig          |     7 +
 packages/calckey-js/.eslintignore          |     7 +
 packages/calckey-js/.eslintrc.js           |    65 +
 packages/calckey-js/.gitignore             |   113 +
 packages/calckey-js/CHANGELOG.md           |    29 +
 packages/calckey-js/LICENSE                |    21 +
 packages/calckey-js/README.md              |     7 +
 packages/calckey-js/api-extractor.json     |   364 +
 packages/calckey-js/codecov.yml            |     2 +
 packages/calckey-js/etc/calckey-js.api.md  |  2696 +++++
 packages/calckey-js/etc/misskey-js.api.md  |  2681 +++++
 packages/calckey-js/jest.config.ts         |   195 +
 packages/calckey-js/package-lock.json      | 10662 +++++++++++++++++++
 packages/calckey-js/package.json           |    47 +
 packages/calckey-js/src/acct.ts            |    14 +
 packages/calckey-js/src/api.ts             |   127 +
 packages/calckey-js/src/api.types.ts       |  1081 ++
 packages/calckey-js/src/consts.ts          |    60 +
 packages/calckey-js/src/entities.ts        |   490 +
 packages/calckey-js/src/index.ts           |    20 +
 packages/calckey-js/src/streaming.ts       |   393 +
 packages/calckey-js/src/streaming.types.ts |   181 +
 packages/calckey-js/test-d/api.ts          |    48 +
 packages/calckey-js/test-d/streaming.ts    |    32 +
 packages/calckey-js/test/api.ts            |   222 +
 packages/calckey-js/test/streaming.ts      |   181 +
 packages/calckey-js/tsconfig.json          |    25 +
 packages/client/package.json               |     2 +-
 packages/client/vite.config.ts             |     3 +
 packages/sw/package.json                   |     2 +-
 pnpm-lock.yaml                             |  2403 ++++-
 pnpm-workspace.yaml                        |     1 +
 35 files changed, 22107 insertions(+), 79 deletions(-)
 create mode 100644 packages/calckey-js/.editorconfig
 create mode 100644 packages/calckey-js/.eslintignore
 create mode 100644 packages/calckey-js/.eslintrc.js
 create mode 100644 packages/calckey-js/.gitignore
 create mode 100644 packages/calckey-js/CHANGELOG.md
 create mode 100644 packages/calckey-js/LICENSE
 create mode 100644 packages/calckey-js/README.md
 create mode 100644 packages/calckey-js/api-extractor.json
 create mode 100644 packages/calckey-js/codecov.yml
 create mode 100644 packages/calckey-js/etc/calckey-js.api.md
 create mode 100644 packages/calckey-js/etc/misskey-js.api.md
 create mode 100644 packages/calckey-js/jest.config.ts
 create mode 100644 packages/calckey-js/package-lock.json
 create mode 100644 packages/calckey-js/package.json
 create mode 100644 packages/calckey-js/src/acct.ts
 create mode 100644 packages/calckey-js/src/api.ts
 create mode 100644 packages/calckey-js/src/api.types.ts
 create mode 100644 packages/calckey-js/src/consts.ts
 create mode 100644 packages/calckey-js/src/entities.ts
 create mode 100644 packages/calckey-js/src/index.ts
 create mode 100644 packages/calckey-js/src/streaming.ts
 create mode 100644 packages/calckey-js/src/streaming.types.ts
 create mode 100644 packages/calckey-js/test-d/api.ts
 create mode 100644 packages/calckey-js/test-d/streaming.ts
 create mode 100644 packages/calckey-js/test/api.ts
 create mode 100644 packages/calckey-js/test/streaming.ts
 create mode 100644 packages/calckey-js/tsconfig.json

diff --git a/Dockerfile b/Dockerfile
index 1a1a0aac6..bdf11a9df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ COPY package.json pnpm*.yaml ./
 COPY packages/backend/package.json packages/backend/package.json
 COPY packages/client/package.json packages/client/package.json
 COPY packages/sw/package.json packages/sw/package.json
+COPY packages/calckey-js/package.json packages/calckey-js/package.json
 COPY packages/backend/native-utils/package.json packages/backend/native-utils/package.json
 COPY packages/backend/native-utils/npm/linux-x64-musl/package.json packages/backend/native-utils/npm/linux-x64-musl/package.json
 COPY packages/backend/native-utils/npm/linux-arm64-musl/package.json packages/backend/native-utils/npm/linux-arm64-musl/package.json
@@ -43,6 +44,7 @@ COPY --from=build /calckey/node_modules /calckey/node_modules
 COPY --from=build /calckey/packages/backend/node_modules /calckey/packages/backend/node_modules
 COPY --from=build /calckey/packages/sw/node_modules /calckey/packages/sw/node_modules
 COPY --from=build /calckey/packages/client/node_modules /calckey/packages/client/node_modules
+COPY --from=build /calckey/packages/calckey-js/node_modules /calckey/packages/calckey-js/node_modules
 
 # Copy the finished compiled files
 COPY --from=build /calckey/built /calckey/built
diff --git a/package.json b/package.json
index d2030de0f..3a324fa0b 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,6 @@
 		"@bull-board/ui": "^4.10.2",
 		"@napi-rs/cli": "^2.15.0",
 		"@tensorflow/tfjs": "^3.21.0",
-		"calckey-js": "^0.0.22",
 		"js-yaml": "4.1.0",
 		"seedrandom": "^3.0.5"
 	},
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 61ba601cd..9139d24ee 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -49,7 +49,7 @@
 		"blurhash": "1.1.5",
 		"bull": "4.10.2",
 		"cacheable-lookup": "7.0.0",
-		"calckey-js": "^0.0.22",
+		"calckey-js": "workspace:*",
 		"cbor": "8.1.0",
 		"chalk": "5.2.0",
 		"chalk-template": "0.4.0",
diff --git a/packages/calckey-js/.editorconfig b/packages/calckey-js/.editorconfig
new file mode 100644
index 000000000..da178f070
--- /dev/null
+++ b/packages/calckey-js/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 2
+charset = utf-8
+insert_final_newline = true
diff --git a/packages/calckey-js/.eslintignore b/packages/calckey-js/.eslintignore
new file mode 100644
index 000000000..f22128f04
--- /dev/null
+++ b/packages/calckey-js/.eslintignore
@@ -0,0 +1,7 @@
+node_modules
+/built
+/coverage
+/.eslintrc.js
+/jest.config.ts
+/test
+/test-d
diff --git a/packages/calckey-js/.eslintrc.js b/packages/calckey-js/.eslintrc.js
new file mode 100644
index 000000000..164cf1fbe
--- /dev/null
+++ b/packages/calckey-js/.eslintrc.js
@@ -0,0 +1,65 @@
+module.exports = {
+	root: true,
+	parser: "@typescript-eslint/parser",
+	parserOptions: {
+		tsconfigRootDir: __dirname,
+		project: ["./tsconfig.json"],
+	},
+	plugins: ["@typescript-eslint"],
+	extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
+	rules: {
+		indent: [
+			"error",
+			"tab",
+			{
+				SwitchCase: 1,
+				MemberExpression: "off",
+				flatTernaryExpressions: true,
+				ArrayExpression: "first",
+				ObjectExpression: "first",
+			},
+		],
+		"eol-last": ["error", "always"],
+		semi: ["error", "always"],
+		quotes: ["error", "single"],
+		"comma-dangle": ["error", "always-multiline"],
+		"keyword-spacing": [
+			"error",
+			{
+				before: true,
+				after: true,
+			},
+		],
+		"key-spacing": [
+			"error",
+			{
+				beforeColon: false,
+				afterColon: true,
+			},
+		],
+		"space-infix-ops": ["error"],
+		"space-before-blocks": ["error", "always"],
+		"object-curly-spacing": ["error", "always"],
+		"nonblock-statement-body-position": ["error", "beside"],
+		eqeqeq: ["error", "always", { null: "ignore" }],
+		"no-multiple-empty-lines": ["error", { max: 1 }],
+		"no-multi-spaces": ["error"],
+		"no-var": ["error"],
+		"prefer-arrow-callback": ["error"],
+		"no-throw-literal": ["error"],
+		"no-param-reassign": ["warn"],
+		"no-constant-condition": ["warn"],
+		"no-empty-pattern": ["warn"],
+		"@typescript-eslint/no-unnecessary-condition": ["error"],
+		"@typescript-eslint/no-inferrable-types": ["warn"],
+		"@typescript-eslint/no-non-null-assertion": ["warn"],
+		"@typescript-eslint/explicit-function-return-type": ["warn"],
+		"@typescript-eslint/no-misused-promises": [
+			"error",
+			{
+				checksVoidReturn: false,
+			},
+		],
+		"@typescript-eslint/consistent-type-imports": "error",
+	},
+};
diff --git a/packages/calckey-js/.gitignore b/packages/calckey-js/.gitignore
new file mode 100644
index 000000000..8a97abf3a
--- /dev/null
+++ b/packages/calckey-js/.gitignore
@@ -0,0 +1,113 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# Next.js build output
+.next
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and *not* Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# App
+temp
+# built
+
+# Yarn
+.yarn/*
+.pnp.cjs
+.pnp.loader.mjs
diff --git a/packages/calckey-js/CHANGELOG.md b/packages/calckey-js/CHANGELOG.md
new file mode 100644
index 000000000..88a5c2461
--- /dev/null
+++ b/packages/calckey-js/CHANGELOG.md
@@ -0,0 +1,29 @@
+# 0.0.14
+- remove needless Object.freeze()
+
+# 0.0.13
+- expose ChannelConnection and Channels types
+
+# 0.0.12
+- fix a bug that cannot connect to streaming
+
+# 0.0.11
+- update user type
+- add missing main stream types
+
+# 0.0.10
+- add consts
+
+# 0.0.9
+- add list of api permission
+- Update Note type
+
+# 0.0.8
+- add type definition for `messagingMessage` event to main stream channel
+- Update Note type
+
+# 0.0.7
+- Notificationsの型を修正
+- MessagingMessageの型を修正
+- UserLiteの型を修正
+- apiでネイティブfetchを格納する際に無名関数でラップするように
diff --git a/packages/calckey-js/LICENSE b/packages/calckey-js/LICENSE
new file mode 100644
index 000000000..11c1f9ce2
--- /dev/null
+++ b/packages/calckey-js/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021-2022 syuilo and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/calckey-js/README.md b/packages/calckey-js/README.md
new file mode 100644
index 000000000..b7a699285
--- /dev/null
+++ b/packages/calckey-js/README.md
@@ -0,0 +1,7 @@
+# Calckey.js
+
+Fork of Misskey.js for Calckey
+
+https://www.npmjs.com/package/calckey-js
+
+![Parody of the Javascript logo with "CK" instead of "JS"](https://codeberg.org/repo-avatars/80771-4d86135f67b9a460cdd1be9e91648e5f)
\ No newline at end of file
diff --git a/packages/calckey-js/api-extractor.json b/packages/calckey-js/api-extractor.json
new file mode 100644
index 000000000..a95281a6d
--- /dev/null
+++ b/packages/calckey-js/api-extractor.json
@@ -0,0 +1,364 @@
+/**
+ * Config file for API Extractor.  For more info, please visit: https://api-extractor.com
+ */
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+
+  /**
+   * Optionally specifies another JSON config file that this file extends from.  This provides a way for
+   * standard settings to be shared across multiple projects.
+   *
+   * If the path starts with "./" or "../", the path is resolved relative to the folder of the file that contains
+   * the "extends" field.  Otherwise, the first path segment is interpreted as an NPM package name, and will be
+   * resolved using NodeJS require().
+   *
+   * SUPPORTED TOKENS: none
+   * DEFAULT VALUE: ""
+   */
+  // "extends": "./shared/api-extractor-base.json"
+  // "extends": "my-package/include/api-extractor-base.json"
+
+  /**
+   * Determines the "<projectFolder>" token that can be used with other config file settings.  The project folder
+   * typically contains the tsconfig.json and package.json config files, but the path is user-defined.
+   *
+   * The path is resolved relative to the folder of the config file that contains the setting.
+   *
+   * The default value for "projectFolder" is the token "<lookup>", which means the folder is determined by traversing
+   * parent folders, starting from the folder containing api-extractor.json, and stopping at the first folder
+   * that contains a tsconfig.json file.  If a tsconfig.json file cannot be found in this way, then an error
+   * will be reported.
+   *
+   * SUPPORTED TOKENS: <lookup>
+   * DEFAULT VALUE: "<lookup>"
+   */
+  // "projectFolder": "..",
+
+  /**
+   * (REQUIRED) Specifies the .d.ts file to be used as the starting point for analysis.  API Extractor
+   * analyzes the symbols exported by this module.
+   *
+   * The file extension must be ".d.ts" and not ".ts".
+   *
+   * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+   * prepend a folder token such as "<projectFolder>".
+   *
+   * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+   */
+  "mainEntryPointFilePath": "<projectFolder>/built/index.d.ts",
+
+  /**
+   * A list of NPM package names whose exports should be treated as part of this package.
+   *
+   * For example, suppose that Webpack is used to generate a distributed bundle for the project "library1",
+   * and another NPM package "library2" is embedded in this bundle.  Some types from library2 may become part
+   * of the exported API for library1, but by default API Extractor would generate a .d.ts rollup that explicitly
+   * imports library2.  To avoid this, we can specify:
+   *
+   *   "bundledPackages": [ "library2" ],
+   *
+   * This would direct API Extractor to embed those types directly in the .d.ts rollup, as if they had been
+   * local files for library1.
+   */
+  "bundledPackages": [],
+
+  /**
+   * Determines how the TypeScript compiler engine will be invoked by API Extractor.
+   */
+  "compiler": {
+    /**
+     * Specifies the path to the tsconfig.json file to be used by API Extractor when analyzing the project.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * Note: This setting will be ignored if "overrideTsconfig" is used.
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/tsconfig.json"
+     */
+    // "tsconfigFilePath": "<projectFolder>/tsconfig.json",
+    /**
+     * Provides a compiler configuration that will be used instead of reading the tsconfig.json file from disk.
+     * The object must conform to the TypeScript tsconfig schema:
+     *
+     * http://json.schemastore.org/tsconfig
+     *
+     * If omitted, then the tsconfig.json file will be read from the "projectFolder".
+     *
+     * DEFAULT VALUE: no overrideTsconfig section
+     */
+    // "overrideTsconfig": {
+    //   . . .
+    // }
+    /**
+     * This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended
+     * and may cause API Extractor to produce incomplete or incorrect declarations, but it may be required when
+     * dependencies contain declarations that are incompatible with the TypeScript engine that API Extractor uses
+     * for its analysis.  Where possible, the underlying issue should be fixed rather than relying on skipLibCheck.
+     *
+     * DEFAULT VALUE: false
+     */
+    // "skipLibCheck": true,
+  },
+
+  /**
+   * Configures how the API report file (*.api.md) will be generated.
+   */
+  "apiReport": {
+    /**
+     * (REQUIRED) Whether to generate an API report.
+     */
+    "enabled": true
+
+    /**
+     * The filename for the API report files.  It will be combined with "reportFolder" or "reportTempFolder" to produce
+     * a full file path.
+     *
+     * The file extension should be ".api.md", and the string should not contain a path separator such as "\" or "/".
+     *
+     * SUPPORTED TOKENS: <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<unscopedPackageName>.api.md"
+     */
+    // "reportFileName": "<unscopedPackageName>.api.md",
+
+    /**
+     * Specifies the folder where the API report file is written.  The file name portion is determined by
+     * the "reportFileName" setting.
+     *
+     * The API report file is normally tracked by Git.  Changes to it can be used to trigger a branch policy,
+     * e.g. for an API review.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/etc/"
+     */
+    // "reportFolder": "<projectFolder>/etc/",
+
+    /**
+     * Specifies the folder where the temporary report file is written.  The file name portion is determined by
+     * the "reportFileName" setting.
+     *
+     * After the temporary file is written to disk, it is compared with the file in the "reportFolder".
+     * If they are different, a production build will fail.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/temp/"
+     */
+    // "reportTempFolder": "<projectFolder>/temp/"
+  },
+
+  /**
+   * Configures how the doc model file (*.api.json) will be generated.
+   */
+  "docModel": {
+    /**
+     * (REQUIRED) Whether to generate a doc model file.
+     */
+    "enabled": true
+
+    /**
+     * The output path for the doc model file.  The file extension should be ".api.json".
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/temp/<unscopedPackageName>.api.json"
+     */
+    // "apiJsonFilePath": "<projectFolder>/temp/<unscopedPackageName>.api.json"
+  },
+
+  /**
+   * Configures how the .d.ts rollup file will be generated.
+   */
+  "dtsRollup": {
+    /**
+     * (REQUIRED) Whether to generate the .d.ts rollup file.
+     */
+    "enabled": false
+
+    /**
+     * Specifies the output path for a .d.ts rollup file to be generated without any trimming.
+     * This file will include all declarations that are exported by the main entry point.
+     *
+     * If the path is an empty string, then this file will not be written.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/dist/<unscopedPackageName>.d.ts"
+     */
+    // "untrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>.d.ts",
+
+    /**
+     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "beta" release.
+     * This file will include only declarations that are marked as "@public" or "@beta".
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: ""
+     */
+    // "betaTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-beta.d.ts",
+
+    /**
+     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "public" release.
+     * This file will include only declarations that are marked as "@public".
+     *
+     * If the path is an empty string, then this file will not be written.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: ""
+     */
+    // "publicTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-public.d.ts",
+
+    /**
+     * When a declaration is trimmed, by default it will be replaced by a code comment such as
+     * "Excluded from this release type: exampleMember".  Set "omitTrimmingComments" to true to remove the
+     * declaration completely.
+     *
+     * DEFAULT VALUE: false
+     */
+    // "omitTrimmingComments": true
+  },
+
+  /**
+   * Configures how the tsdoc-metadata.json file will be generated.
+   */
+  "tsdocMetadata": {
+    /**
+     * Whether to generate the tsdoc-metadata.json file.
+     *
+     * DEFAULT VALUE: true
+     */
+    // "enabled": true,
+    /**
+     * Specifies where the TSDoc metadata file should be written.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * The default value is "<lookup>", which causes the path to be automatically inferred from the "tsdocMetadata",
+     * "typings" or "main" fields of the project's package.json.  If none of these fields are set, the lookup
+     * falls back to "tsdoc-metadata.json" in the package folder.
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<lookup>"
+     */
+    // "tsdocMetadataFilePath": "<projectFolder>/dist/tsdoc-metadata.json"
+  },
+
+  /**
+   * Specifies what type of newlines API Extractor should use when writing output files.  By default, the output files
+   * will be written with Windows-style newlines.  To use POSIX-style newlines, specify "lf" instead.
+   * To use the OS's default newline kind, specify "os".
+   *
+   * DEFAULT VALUE: "crlf"
+   */
+  // "newlineKind": "crlf",
+
+  /**
+   * Configures how API Extractor reports error and warning messages produced during analysis.
+   *
+   * There are three sources of messages:  compiler messages, API Extractor messages, and TSDoc messages.
+   */
+  "messages": {
+    /**
+     * Configures handling of diagnostic messages reported by the TypeScript compiler engine while analyzing
+     * the input .d.ts files.
+     *
+     * TypeScript message identifiers start with "TS" followed by an integer.  For example: "TS2551"
+     *
+     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
+     */
+    "compilerMessageReporting": {
+      /**
+       * Configures the default routing for messages that don't match an explicit rule in this table.
+       */
+      "default": {
+        /**
+         * Specifies whether the message should be written to the the tool's output log.  Note that
+         * the "addToApiReportFile" property may supersede this option.
+         *
+         * Possible values: "error", "warning", "none"
+         *
+         * Errors cause the build to fail and return a nonzero exit code.  Warnings cause a production build fail
+         * and return a nonzero exit code.  For a non-production build (e.g. when "api-extractor run" includes
+         * the "--local" option), the warning is displayed but the build will not fail.
+         *
+         * DEFAULT VALUE: "warning"
+         */
+        "logLevel": "warning"
+
+        /**
+         * When addToApiReportFile is true:  If API Extractor is configured to write an API report file (.api.md),
+         * then the message will be written inside that file; otherwise, the message is instead logged according to
+         * the "logLevel" option.
+         *
+         * DEFAULT VALUE: false
+         */
+        // "addToApiReportFile": false
+      }
+
+      // "TS2551": {
+      //   "logLevel": "warning",
+      //   "addToApiReportFile": true
+      // },
+      //
+      // . . .
+    },
+
+    /**
+     * Configures handling of messages reported by API Extractor during its analysis.
+     *
+     * API Extractor message identifiers start with "ae-".  For example: "ae-extra-release-tag"
+     *
+     * DEFAULT VALUE: See api-extractor-defaults.json for the complete table of extractorMessageReporting mappings
+     */
+    "extractorMessageReporting": {
+      "default": {
+        "logLevel": "none"
+        // "addToApiReportFile": false
+      }
+
+      // "ae-extra-release-tag": {
+      //   "logLevel": "warning",
+      //   "addToApiReportFile": true
+      // },
+      //
+      // . . .
+    },
+
+    /**
+     * Configures handling of messages reported by the TSDoc parser when analyzing code comments.
+     *
+     * TSDoc message identifiers start with "tsdoc-".  For example: "tsdoc-link-tag-unescaped-text"
+     *
+     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
+     */
+    "tsdocMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+        // "addToApiReportFile": false
+      }
+
+      // "tsdoc-link-tag-unescaped-text": {
+      //   "logLevel": "warning",
+      //   "addToApiReportFile": true
+      // },
+      //
+      // . . .
+    }
+  }
+}
diff --git a/packages/calckey-js/codecov.yml b/packages/calckey-js/codecov.yml
new file mode 100644
index 000000000..524298721
--- /dev/null
+++ b/packages/calckey-js/codecov.yml
@@ -0,0 +1,2 @@
+codecov:
+  token: d55e1270-f20a-4727-aa05-2bd57793315a
diff --git a/packages/calckey-js/etc/calckey-js.api.md b/packages/calckey-js/etc/calckey-js.api.md
new file mode 100644
index 000000000..9e19852d4
--- /dev/null
+++ b/packages/calckey-js/etc/calckey-js.api.md
@@ -0,0 +1,2696 @@
+## API Report File for "calckey-js"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { EventEmitter } from 'eventemitter3';
+
+// @public (undocumented)
+export type Acct = {
+    username: string;
+    host: string | null;
+};
+
+// Warning: (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+type Ad = TODO_2;
+
+// @public (undocumented)
+type Announcement = {
+    id: ID;
+    createdAt: DateString;
+    updatedAt: DateString | null;
+    text: string;
+    title: string;
+    imageUrl: string | null;
+    isRead?: boolean;
+};
+
+// @public (undocumented)
+type Antenna = {
+    id: ID;
+    createdAt: DateString;
+    name: string;
+    keywords: string[][];
+    excludeKeywords: string[][];
+    src: 'home' | 'all' | 'users' | 'list' | 'group';
+    userListId: ID | null;
+    userGroupId: ID | null;
+    users: string[];
+    caseSensitive: boolean;
+    notify: boolean;
+    withReplies: boolean;
+    withFile: boolean;
+    hasUnreadNote: boolean;
+};
+
+declare namespace api {
+    export {
+        isAPIError,
+        APIError,
+        FetchLike,
+        APIClient
+    }
+}
+export { api }
+
+// @public (undocumented)
+class APIClient {
+    constructor(opts: {
+        origin: APIClient['origin'];
+        credential?: APIClient['credential'];
+        fetch?: APIClient['fetch'] | null | undefined;
+    });
+    // (undocumented)
+    credential: string | null | undefined;
+    // (undocumented)
+    fetch: FetchLike;
+    // (undocumented)
+    origin: string;
+    // Warning: (ae-forgotten-export) The symbol "IsCaseMatched" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "GetCaseResult" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(endpoint: E, params?: P, credential?: string | null | undefined): Promise<Endpoints[E]['res'] extends {
+        $switch: {
+            $cases: [any, any][];
+            $default: any;
+        };
+    } ? IsCaseMatched<E, P, 0> extends true ? GetCaseResult<E, P, 0> : IsCaseMatched<E, P, 1> extends true ? GetCaseResult<E, P, 1> : IsCaseMatched<E, P, 2> extends true ? GetCaseResult<E, P, 2> : IsCaseMatched<E, P, 3> extends true ? GetCaseResult<E, P, 3> : IsCaseMatched<E, P, 4> extends true ? GetCaseResult<E, P, 4> : IsCaseMatched<E, P, 5> extends true ? GetCaseResult<E, P, 5> : IsCaseMatched<E, P, 6> extends true ? GetCaseResult<E, P, 6> : IsCaseMatched<E, P, 7> extends true ? GetCaseResult<E, P, 7> : IsCaseMatched<E, P, 8> extends true ? GetCaseResult<E, P, 8> : IsCaseMatched<E, P, 9> extends true ? GetCaseResult<E, P, 9> : Endpoints[E]['res']['$switch']['$default'] : Endpoints[E]['res']>;
+}
+
+// @public (undocumented)
+type APIError = {
+    id: string;
+    code: string;
+    message: string;
+    kind: 'client' | 'server';
+    info: Record<string, any>;
+};
+
+// @public (undocumented)
+type App = TODO_2;
+
+// @public (undocumented)
+type AuthSession = {
+    id: ID;
+    app: App;
+    token: string;
+};
+
+// @public (undocumented)
+type Blocking = {
+    id: ID;
+    createdAt: DateString;
+    blockeeId: User['id'];
+    blockee: UserDetailed;
+};
+
+// @public (undocumented)
+type Channel = {
+    id: ID;
+};
+
+// 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']> {
+    constructor(stream: Stream, channel: string, name?: string);
+    // (undocumented)
+    channel: string;
+    // (undocumented)
+    abstract dispose(): void;
+    // (undocumented)
+    abstract id: string;
+    // (undocumented)
+    inCount: number;
+    // (undocumented)
+    name?: string;
+    // (undocumented)
+    outCount: number;
+    // (undocumented)
+    send<T extends keyof Channel['receives']>(type: T, body: Channel['receives'][T]): void;
+    // (undocumented)
+    protected stream: Stream;
+}
+
+// @public (undocumented)
+export type Channels = {
+    main: {
+        params: null;
+        events: {
+            notification: (payload: Notification_2) => void;
+            mention: (payload: Note) => void;
+            reply: (payload: Note) => void;
+            renote: (payload: Note) => void;
+            follow: (payload: User) => void;
+            followed: (payload: User) => void;
+            unfollow: (payload: User) => void;
+            meUpdated: (payload: MeDetailed) => void;
+            pageEvent: (payload: PageEvent) => void;
+            urlUploadFinished: (payload: {
+                marker: string;
+                file: DriveFile;
+            }) => void;
+            readAllNotifications: () => void;
+            unreadNotification: (payload: Notification_2) => void;
+            unreadMention: (payload: Note['id']) => void;
+            readAllUnreadMentions: () => void;
+            unreadSpecifiedNote: (payload: Note['id']) => void;
+            readAllUnreadSpecifiedNotes: () => void;
+            readAllMessagingMessages: () => void;
+            messagingMessage: (payload: MessagingMessage) => void;
+            unreadMessagingMessage: (payload: MessagingMessage) => void;
+            readAllAntennas: () => void;
+            unreadAntenna: (payload: Antenna) => void;
+            readAllAnnouncements: () => void;
+            readAllChannels: () => void;
+            unreadChannel: (payload: Note['id']) => void;
+            myTokenRegenerated: () => void;
+            reversiNoInvites: () => void;
+            reversiInvited: (payload: FIXME) => void;
+            signin: (payload: FIXME) => void;
+            registryUpdated: (payload: {
+                scope?: string[];
+                key: string;
+                value: any | null;
+            }) => void;
+            driveFileCreated: (payload: DriveFile) => void;
+            readAntenna: (payload: Antenna) => void;
+        };
+        receives: null;
+    };
+    homeTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    localTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    hybridTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    recommendedTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    globalTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    messaging: {
+        params: {
+            otherparty?: User['id'] | null;
+            group?: UserGroup['id'] | null;
+        };
+        events: {
+            message: (payload: MessagingMessage) => void;
+            deleted: (payload: MessagingMessage['id']) => void;
+            read: (payload: MessagingMessage['id'][]) => void;
+            typers: (payload: User[]) => void;
+        };
+        receives: {
+            read: {
+                id: MessagingMessage['id'];
+            };
+        };
+    };
+    serverStats: {
+        params: null;
+        events: {
+            stats: (payload: FIXME) => void;
+        };
+        receives: {
+            requestLog: {
+                id: string | number;
+                length: number;
+            };
+        };
+    };
+    queueStats: {
+        params: null;
+        events: {
+            stats: (payload: FIXME) => void;
+        };
+        receives: {
+            requestLog: {
+                id: string | number;
+                length: number;
+            };
+        };
+    };
+};
+
+// @public (undocumented)
+type Clip = TODO_2;
+
+// @public (undocumented)
+type CustomEmoji = {
+    id: string;
+    name: string;
+    url: string;
+    category: string;
+    aliases: string[];
+};
+
+// @public (undocumented)
+type DateString = string;
+
+// @public (undocumented)
+type DetailedInstanceMetadata = LiteInstanceMetadata & {
+    features: Record<string, any>;
+};
+
+// @public (undocumented)
+type DriveFile = {
+    id: ID;
+    createdAt: DateString;
+    isSensitive: boolean;
+    name: string;
+    thumbnailUrl: string;
+    url: string;
+    type: string;
+    size: number;
+    md5: string;
+    blurhash: string;
+    comment: string | null;
+    properties: Record<string, any>;
+};
+
+// @public (undocumented)
+type DriveFolder = TODO_2;
+
+// @public (undocumented)
+export type Endpoints = {
+    'admin/abuse-user-reports': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/delete-all-files-of-a-user': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'admin/delete-logs': {
+        req: NoParams;
+        res: null;
+    };
+    'admin/get-index-stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/get-table-stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/invite': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/logs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/reset-password': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/resolve-abuse-user-report': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/resync-chart': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/send-email': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/server-info': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-moderation-logs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/silence-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/suspend-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/unsilence-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/unsuspend-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/update-meta': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/vacuum': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/accounts/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/delete': {
+        req: {
+            id: Ad['id'];
+        };
+        res: null;
+    };
+    'admin/ad/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/delete': {
+        req: {
+            id: Announcement['id'];
+        };
+        res: null;
+    };
+    'admin/announcements/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/clean-remote-files': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/cleanup': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/files': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/show-file': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/copy': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/list-remote': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/delete-all-files': {
+        req: {
+            host: string;
+        };
+        res: null;
+    };
+    'admin/federation/refresh-remote-instance-metadata': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/remove-all-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/update-instance': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/moderators/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/moderators/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/promo/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/clear': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/deliver-delayed': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/inbox-delayed': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/jobs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'announcements': {
+        req: {
+            limit?: number;
+            withUnreads?: boolean;
+            sinceId?: Announcement['id'];
+            untilId?: Announcement['id'];
+        };
+        res: Announcement[];
+    };
+    'antennas/create': {
+        req: TODO;
+        res: Antenna;
+    };
+    'antennas/delete': {
+        req: {
+            antennaId: Antenna['id'];
+        };
+        res: null;
+    };
+    'antennas/list': {
+        req: NoParams;
+        res: Antenna[];
+    };
+    'antennas/notes': {
+        req: {
+            antennaId: Antenna['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'antennas/show': {
+        req: {
+            antennaId: Antenna['id'];
+        };
+        res: Antenna;
+    };
+    'antennas/update': {
+        req: TODO;
+        res: Antenna;
+    };
+    'ap/get': {
+        req: {
+            uri: string;
+        };
+        res: Record<string, any>;
+    };
+    'ap/show': {
+        req: {
+            uri: string;
+        };
+        res: {
+            type: 'Note';
+            object: Note;
+        } | {
+            type: 'User';
+            object: UserDetailed;
+        };
+    };
+    'app/create': {
+        req: TODO;
+        res: App;
+    };
+    'app/show': {
+        req: {
+            appId: App['id'];
+        };
+        res: App;
+    };
+    'auth/accept': {
+        req: {
+            token: string;
+        };
+        res: null;
+    };
+    'auth/session/generate': {
+        req: {
+            appSecret: string;
+        };
+        res: {
+            token: string;
+            url: string;
+        };
+    };
+    'auth/session/show': {
+        req: {
+            token: string;
+        };
+        res: AuthSession;
+    };
+    'auth/session/userkey': {
+        req: {
+            appSecret: string;
+            token: string;
+        };
+        res: {
+            accessToken: string;
+            user: User;
+        };
+    };
+    'blocking/create': {
+        req: {
+            userId: User['id'];
+        };
+        res: UserDetailed;
+    };
+    'blocking/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: UserDetailed;
+    };
+    'blocking/list': {
+        req: {
+            limit?: number;
+            sinceId?: Blocking['id'];
+            untilId?: Blocking['id'];
+        };
+        res: Blocking[];
+    };
+    'channels/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/featured': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/follow': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/followed': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/owned': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/pin-note': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/timeline': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/unfollow': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'charts/active-users': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                users: number[];
+            };
+            remote: {
+                users: number[];
+            };
+        };
+    };
+    'charts/drive': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                decCount: number[];
+                decSize: number[];
+                incCount: number[];
+                incSize: number[];
+                totalCount: number[];
+                totalSize: number[];
+            };
+            remote: {
+                decCount: number[];
+                decSize: number[];
+                incCount: number[];
+                incSize: number[];
+                totalCount: number[];
+                totalSize: number[];
+            };
+        };
+    };
+    'charts/federation': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            instance: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'charts/hashtag': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: TODO;
+    };
+    'charts/instance': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            host: string;
+        };
+        res: {
+            drive: {
+                decFiles: number[];
+                decUsage: number[];
+                incFiles: number[];
+                incUsage: number[];
+                totalFiles: number[];
+                totalUsage: number[];
+            };
+            followers: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            following: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            notes: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+            requests: {
+                failed: number[];
+                received: number[];
+                succeeded: number[];
+            };
+            users: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'charts/network': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: TODO;
+    };
+    'charts/notes': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+            remote: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+        };
+    };
+    'charts/user/drive': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: {
+            decCount: number[];
+            decSize: number[];
+            incCount: number[];
+            incSize: number[];
+            totalCount: number[];
+            totalSize: number[];
+        };
+    };
+    'charts/user/following': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: TODO;
+    };
+    'charts/user/notes': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: {
+            dec: number[];
+            inc: number[];
+            total: number[];
+            diffs: {
+                normal: number[];
+                renote: number[];
+                reply: number[];
+            };
+        };
+    };
+    'charts/user/reactions': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: TODO;
+    };
+    'charts/users': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            remote: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'clips/add-note': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/delete': {
+        req: {
+            clipId: Clip['id'];
+        };
+        res: null;
+    };
+    'clips/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive': {
+        req: NoParams;
+        res: {
+            capacity: number;
+            usage: number;
+        };
+    };
+    'drive/files': {
+        req: {
+            folderId?: DriveFolder['id'] | null;
+            type?: DriveFile['type'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFile[];
+    };
+    'drive/files/attached-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/check-existence': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/delete': {
+        req: {
+            fileId: DriveFile['id'];
+        };
+        res: null;
+    };
+    'drive/files/find-by-hash': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/find': {
+        req: {
+            name: string;
+            folderId?: DriveFolder['id'] | null;
+        };
+        res: DriveFile[];
+    };
+    'drive/files/show': {
+        req: {
+            fileId?: DriveFile['id'];
+            url?: string;
+        };
+        res: DriveFile;
+    };
+    'drive/files/update': {
+        req: {
+            fileId: DriveFile['id'];
+            folderId?: DriveFolder['id'] | null;
+            name?: string;
+            isSensitive?: boolean;
+            comment?: string | null;
+        };
+        res: DriveFile;
+    };
+    'drive/files/upload-from-url': {
+        req: {
+            url: string;
+            folderId?: DriveFolder['id'] | null;
+            isSensitive?: boolean;
+            comment?: string | null;
+            marker?: string | null;
+            force?: boolean;
+        };
+        res: null;
+    };
+    'drive/folders': {
+        req: {
+            folderId?: DriveFolder['id'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFolder[];
+    };
+    'drive/folders/create': {
+        req: {
+            name?: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder;
+    };
+    'drive/folders/delete': {
+        req: {
+            folderId: DriveFolder['id'];
+        };
+        res: null;
+    };
+    'drive/folders/find': {
+        req: {
+            name: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder[];
+    };
+    'drive/folders/show': {
+        req: {
+            folderId: DriveFolder['id'];
+        };
+        res: DriveFolder;
+    };
+    'drive/folders/update': {
+        req: {
+            folderId: DriveFolder['id'];
+            name?: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder;
+    };
+    'drive/stream': {
+        req: {
+            type?: DriveFile['type'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFile[];
+    };
+    'endpoint': {
+        req: {
+            endpoint: string;
+        };
+        res: {
+            params: {
+                name: string;
+                type: string;
+            }[];
+        };
+    };
+    'endpoints': {
+        req: NoParams;
+        res: string[];
+    };
+    'federation/dns': {
+        req: {
+            host: string;
+        };
+        res: {
+            a: string[];
+            aaaa: string[];
+            cname: string[];
+            txt: string[];
+        };
+    };
+    'federation/followers': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'federation/following': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'federation/instances': {
+        req: {
+            host?: string | null;
+            blocked?: boolean | null;
+            notResponding?: boolean | null;
+            suspended?: boolean | null;
+            federating?: boolean | null;
+            subscribing?: boolean | null;
+            publishing?: boolean | null;
+            limit?: number;
+            offset?: number;
+            sort?: '+pubSub' | '-pubSub' | '+notes' | '-notes' | '+users' | '-users' | '+following' | '-following' | '+followers' | '-followers' | '+caughtAt' | '-caughtAt' | '+lastCommunicatedAt' | '-lastCommunicatedAt' | '+driveUsage' | '-driveUsage' | '+driveFiles' | '-driveFiles';
+        };
+        res: Instance[];
+    };
+    'federation/show-instance': {
+        req: {
+            host: string;
+        };
+        res: Instance;
+    };
+    'federation/update-remote-user': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'federation/users': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: User['id'];
+            untilId?: User['id'];
+        };
+        res: UserDetailed[];
+    };
+    'following/create': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/requests/accept': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'following/requests/cancel': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/requests/list': {
+        req: NoParams;
+        res: FollowRequest[];
+    };
+    'following/requests/reject': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'gallery/featured': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/popular': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/delete': {
+        req: {
+            postId: GalleryPost['id'];
+        };
+        res: null;
+    };
+    'gallery/posts/like': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/unlike': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games/surrender': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/invitations': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/match': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/match/cancel': {
+        req: TODO;
+        res: TODO;
+    };
+    'get-online-users-count': {
+        req: NoParams;
+        res: {
+            count: number;
+        };
+    };
+    'hashtags/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/trend': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/users': {
+        req: TODO;
+        res: TODO;
+    };
+    'i': {
+        req: NoParams;
+        res: User;
+    };
+    'i/apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/authorized-apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/change-password': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/delete-account': {
+        req: {
+            password: string;
+        };
+        res: null;
+    };
+    'i/export-blocking': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-mute': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-user-lists': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/favorites': {
+        req: {
+            limit?: number;
+            sinceId?: NoteFavorite['id'];
+            untilId?: NoteFavorite['id'];
+        };
+        res: NoteFavorite[];
+    };
+    'i/gallery/likes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/get-word-muted-notes-count': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/import-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/import-user-lists': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/move': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/known-as': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/notifications': {
+        req: {
+            limit?: number;
+            sinceId?: Notification_2['id'];
+            untilId?: Notification_2['id'];
+            following?: boolean;
+            markAsRead?: boolean;
+            includeTypes?: Notification_2['type'][];
+            excludeTypes?: Notification_2['type'][];
+        };
+        res: Notification_2[];
+    };
+    'i/page-likes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/pages': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/pin': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: MeDetailed;
+    };
+    'i/read-all-messaging-messages': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/read-all-unread-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/read-announcement': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/regenerate-token': {
+        req: {
+            password: string;
+        };
+        res: null;
+    };
+    'i/registry/get-all': {
+        req: {
+            scope?: string[];
+        };
+        res: Record<string, any>;
+    };
+    'i/registry/get-detail': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: {
+            updatedAt: DateString;
+            value: any;
+        };
+    };
+    'i/registry/get': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: any;
+    };
+    'i/registry/keys-with-type': {
+        req: {
+            scope?: string[];
+        };
+        res: Record<string, 'null' | 'array' | 'number' | 'string' | 'boolean' | 'object'>;
+    };
+    'i/registry/keys': {
+        req: {
+            scope?: string[];
+        };
+        res: string[];
+    };
+    'i/registry/remove': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: null;
+    };
+    'i/registry/scopes': {
+        req: NoParams;
+        res: string[][];
+    };
+    'i/registry/set': {
+        req: {
+            key: string;
+            value: any;
+            scope?: string[];
+        };
+        res: null;
+    };
+    'i/revoke-token': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/signin-history': {
+        req: {
+            limit?: number;
+            sinceId?: Signin['id'];
+            untilId?: Signin['id'];
+        };
+        res: Signin[];
+    };
+    'i/unpin': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: MeDetailed;
+    };
+    'i/update-email': {
+        req: {
+            password: string;
+            email?: string | null;
+        };
+        res: MeDetailed;
+    };
+    'i/update': {
+        req: {
+            name?: string | null;
+            description?: string | null;
+            lang?: string | null;
+            location?: string | null;
+            birthday?: string | null;
+            avatarId?: DriveFile['id'] | null;
+            bannerId?: DriveFile['id'] | null;
+            fields?: {
+                name: string;
+                value: string;
+            }[];
+            isLocked?: boolean;
+            isExplorable?: boolean;
+            hideOnlineStatus?: boolean;
+            carefulBot?: boolean;
+            autoAcceptFollowed?: boolean;
+            noCrawle?: boolean;
+            isBot?: boolean;
+            isCat?: boolean;
+            injectFeaturedNote?: boolean;
+            receiveAnnouncementEmail?: boolean;
+            alwaysMarkNsfw?: boolean;
+            mutedWords?: string[][];
+            mutingNotificationTypes?: Notification_2['type'][];
+            emailNotificationTypes?: string[];
+        };
+        res: MeDetailed;
+    };
+    'i/user-group-invites': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/done': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/key-done': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/password-less': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/register-key': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/register': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/remove-key': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/unregister': {
+        req: TODO;
+        res: TODO;
+    };
+    'messaging/history': {
+        req: {
+            limit?: number;
+            group?: boolean;
+        };
+        res: MessagingMessage[];
+    };
+    'messaging/messages': {
+        req: {
+            userId?: User['id'];
+            groupId?: UserGroup['id'];
+            limit?: number;
+            sinceId?: MessagingMessage['id'];
+            untilId?: MessagingMessage['id'];
+            markAsRead?: boolean;
+        };
+        res: MessagingMessage[];
+    };
+    'messaging/messages/create': {
+        req: {
+            userId?: User['id'];
+            groupId?: UserGroup['id'];
+            text?: string;
+            fileId?: DriveFile['id'];
+        };
+        res: MessagingMessage;
+    };
+    'messaging/messages/delete': {
+        req: {
+            messageId: MessagingMessage['id'];
+        };
+        res: null;
+    };
+    'messaging/messages/read': {
+        req: {
+            messageId: MessagingMessage['id'];
+        };
+        res: null;
+    };
+    'meta': {
+        req: {
+            detail?: boolean;
+        };
+        res: {
+            $switch: {
+                $cases: [
+                [
+                    {
+                    detail: true;
+                },
+                DetailedInstanceMetadata
+                ],
+                [
+                    {
+                    detail: false;
+                },
+                LiteInstanceMetadata
+                ],
+                [
+                    {
+                    detail: boolean;
+                },
+                LiteInstanceMetadata | DetailedInstanceMetadata
+                ]
+                ];
+                $default: LiteInstanceMetadata;
+            };
+        };
+    };
+    'miauth/gen-token': {
+        req: TODO;
+        res: TODO;
+    };
+    'mute/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'mute/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'mute/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'my/apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/children': {
+        req: {
+            noteId: Note['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/clips': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/conversation': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/create': {
+        req: {
+            visibility?: 'public' | 'home' | 'followers' | 'specified';
+            visibleUserIds?: User['id'][];
+            text?: null | string;
+            cw?: null | string;
+            viaMobile?: boolean;
+            localOnly?: boolean;
+            fileIds?: DriveFile['id'][];
+            replyId?: null | Note['id'];
+            renoteId?: null | Note['id'];
+            channelId?: null | Channel['id'];
+            poll?: null | {
+                choices: string[];
+                multiple?: boolean;
+                expiresAt?: null | number;
+                expiredAfter?: null | number;
+            };
+        };
+        res: {
+            createdNote: Note;
+        };
+    };
+    'notes/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/favorites/create': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/favorites/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/featured': {
+        req: TODO;
+        res: Note[];
+    };
+    'notes/global-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/recommended-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/hybrid-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/local-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/mentions': {
+        req: {
+            following?: boolean;
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/polls/recommendation': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/polls/vote': {
+        req: {
+            noteId: Note['id'];
+            choice: number;
+        };
+        res: null;
+    };
+    'notes/reactions': {
+        req: {
+            noteId: Note['id'];
+            type?: string | null;
+            limit?: number;
+        };
+        res: NoteReaction[];
+    };
+    'notes/reactions/create': {
+        req: {
+            noteId: Note['id'];
+            reaction: string;
+        };
+        res: null;
+    };
+    'notes/reactions/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/renotes': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            noteId: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/replies': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            noteId: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/search-by-tag': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/show': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: Note;
+    };
+    'notes/state': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/unrenote': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/user-list-timeline': {
+        req: {
+            listId: UserList['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/watching/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/watching/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notifications/create': {
+        req: {
+            body: string;
+            header?: string | null;
+            icon?: string | null;
+        };
+        res: null;
+    };
+    'notifications/mark-all-as-read': {
+        req: NoParams;
+        res: null;
+    };
+    'notifications/read': {
+        req: {
+            notificationId: Notification_2['id'];
+        };
+        res: null;
+    };
+    'page-push': {
+        req: {
+            pageId: Page['id'];
+            event: string;
+            var?: any;
+        };
+        res: null;
+    };
+    'pages/create': {
+        req: TODO;
+        res: Page;
+    };
+    'pages/delete': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/featured': {
+        req: NoParams;
+        res: Page[];
+    };
+    'pages/like': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/show': {
+        req: {
+            pageId?: Page['id'];
+            name?: string;
+            username?: string;
+        };
+        res: Page;
+    };
+    'pages/unlike': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/update': {
+        req: TODO;
+        res: null;
+    };
+    'ping': {
+        req: NoParams;
+        res: {
+            pong: number;
+        };
+    };
+    'pinned-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'promo/read': {
+        req: TODO;
+        res: TODO;
+    };
+    'request-reset-password': {
+        req: {
+            username: string;
+            email: string;
+        };
+        res: null;
+    };
+    'reset-password': {
+        req: {
+            token: string;
+            password: string;
+        };
+        res: null;
+    };
+    'room/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'room/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'stats': {
+        req: NoParams;
+        res: Stats;
+    };
+    'server-info': {
+        req: NoParams;
+        res: ServerInfo;
+    };
+    'latest-version': {
+        req: NoParams;
+        res: TODO;
+    };
+    'sw/register': {
+        req: TODO;
+        res: TODO;
+    };
+    'username/available': {
+        req: {
+            username: string;
+        };
+        res: {
+            available: boolean;
+        };
+    };
+    'users': {
+        req: {
+            limit?: number;
+            offset?: number;
+            sort?: UserSorting;
+            origin?: OriginType;
+        };
+        res: User[];
+    };
+    'users/clips': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/followers': {
+        req: {
+            userId?: User['id'];
+            username?: User['username'];
+            host?: User['host'] | null;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFollowerPopulated[];
+    };
+    'users/following': {
+        req: {
+            userId?: User['id'];
+            username?: User['username'];
+            host?: User['host'] | null;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'users/gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/get-frequently-replied-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/delete': {
+        req: {
+            groupId: UserGroup['id'];
+        };
+        res: null;
+    };
+    'users/groups/invitations/accept': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/invitations/reject': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/invite': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/joined': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/owned': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/pull': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/transfer': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/lists/create': {
+        req: {
+            name: string;
+        };
+        res: UserList;
+    };
+    'users/lists/delete': {
+        req: {
+            listId: UserList['id'];
+        };
+        res: null;
+    };
+    'users/lists/list': {
+        req: NoParams;
+        res: UserList[];
+    };
+    'users/lists/pull': {
+        req: {
+            listId: UserList['id'];
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'users/lists/push': {
+        req: {
+            listId: UserList['id'];
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'users/lists/show': {
+        req: {
+            listId: UserList['id'];
+        };
+        res: UserList;
+    };
+    'users/lists/update': {
+        req: {
+            listId: UserList['id'];
+            name: string;
+        };
+        res: UserList;
+    };
+    'users/notes': {
+        req: {
+            userId: User['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'users/pages': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/recommendation': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/relation': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/report-abuse': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/search-by-username-and-host': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/show': {
+        req: ShowUserReq | {
+            userIds: User['id'][];
+        };
+        res: {
+            $switch: {
+                $cases: [
+                [
+                    {
+                    userIds: User['id'][];
+                },
+                UserDetailed[]
+                ]
+                ];
+                $default: UserDetailed;
+            };
+        };
+    };
+    'users/stats': {
+        req: TODO;
+        res: TODO;
+    };
+};
+
+declare namespace entities {
+    export {
+        ID,
+        DateString,
+        User,
+        UserLite,
+        UserDetailed,
+        UserGroup,
+        UserList,
+        MeDetailed,
+        DriveFile,
+        DriveFolder,
+        GalleryPost,
+        Note,
+        NoteReaction,
+        Notification_2 as Notification,
+        MessagingMessage,
+        CustomEmoji,
+        LiteInstanceMetadata,
+        DetailedInstanceMetadata,
+        InstanceMetadata,
+        ServerInfo,
+        Stats,
+        Page,
+        PageEvent,
+        Announcement,
+        Antenna,
+        App,
+        AuthSession,
+        Ad,
+        Clip,
+        NoteFavorite,
+        FollowRequest,
+        Channel,
+        Following,
+        FollowingFolloweePopulated,
+        FollowingFollowerPopulated,
+        Blocking,
+        Instance,
+        Signin,
+        UserSorting,
+        OriginType
+    }
+}
+export { entities }
+
+// @public (undocumented)
+type FetchLike = (input: string, init?: {
+    method?: string;
+    body?: string;
+    credentials?: RequestCredentials;
+    cache?: RequestCache;
+}) => Promise<{
+    status: number;
+    json(): Promise<any>;
+}>;
+
+// @public (undocumented)
+export const ffVisibility: readonly ["public", "followers", "private"];
+
+// @public (undocumented)
+type Following = {
+    id: ID;
+    createdAt: DateString;
+    followerId: User['id'];
+    followeeId: User['id'];
+};
+
+// @public (undocumented)
+type FollowingFolloweePopulated = Following & {
+    followee: UserDetailed;
+};
+
+// @public (undocumented)
+type FollowingFollowerPopulated = Following & {
+    follower: UserDetailed;
+};
+
+// @public (undocumented)
+type FollowRequest = {
+    id: ID;
+    follower: User;
+    followee: User;
+};
+
+// @public (undocumented)
+type GalleryPost = TODO_2;
+
+// @public (undocumented)
+type ID = string;
+
+// @public (undocumented)
+type Instance = {
+    id: ID;
+    caughtAt: DateString;
+    host: string;
+    usersCount: number;
+    notesCount: number;
+    followingCount: number;
+    followersCount: number;
+    driveUsage: number;
+    driveFiles: number;
+    latestRequestSentAt: DateString | null;
+    latestStatus: number | null;
+    latestRequestReceivedAt: DateString | null;
+    lastCommunicatedAt: DateString;
+    isNotResponding: boolean;
+    isSuspended: boolean;
+    softwareName: string | null;
+    softwareVersion: string | null;
+    openRegistrations: boolean | null;
+    name: string | null;
+    description: string | null;
+    maintainerName: string | null;
+    maintainerEmail: string | null;
+    iconUrl: string | null;
+    faviconUrl: string | null;
+    themeColor: string | null;
+    infoUpdatedAt: DateString | null;
+};
+
+// @public (undocumented)
+type InstanceMetadata = LiteInstanceMetadata | DetailedInstanceMetadata;
+
+// @public (undocumented)
+function isAPIError(reason: any): reason is APIError;
+
+// @public (undocumented)
+type LiteInstanceMetadata = {
+    maintainerName: string | null;
+    maintainerEmail: string | null;
+    version: string;
+    name: string | null;
+    uri: string;
+    description: string | null;
+    tosUrl: string | null;
+    disableRegistration: boolean;
+    disableLocalTimeline: boolean;
+    disableRecommendedTimeline: boolean;
+    disableGlobalTimeline: boolean;
+    driveCapacityPerLocalUserMb: number;
+    driveCapacityPerRemoteUserMb: number;
+    enableHcaptcha: boolean;
+    hcaptchaSiteKey: string | null;
+    enableRecaptcha: boolean;
+    recaptchaSiteKey: string | null;
+    swPublickey: string | null;
+    maxNoteTextLength: number;
+    enableEmail: boolean;
+    enableTwitterIntegration: boolean;
+    enableGithubIntegration: boolean;
+    enableDiscordIntegration: boolean;
+    enableServiceWorker: boolean;
+    emojis: CustomEmoji[];
+    ads: {
+        id: ID;
+        ratio: number;
+        place: string;
+        url: string;
+        imageUrl: string;
+    }[];
+};
+
+// @public (undocumented)
+type MeDetailed = UserDetailed & {
+    avatarId: DriveFile['id'];
+    bannerId: DriveFile['id'];
+    autoAcceptFollowed: boolean;
+    alwaysMarkNsfw: boolean;
+    carefulBot: boolean;
+    emailNotificationTypes: string[];
+    hasPendingReceivedFollowRequest: boolean;
+    hasUnreadAnnouncement: boolean;
+    hasUnreadAntenna: boolean;
+    hasUnreadChannel: boolean;
+    hasUnreadMentions: boolean;
+    hasUnreadMessagingMessage: boolean;
+    hasUnreadNotification: boolean;
+    hasUnreadSpecifiedNotes: boolean;
+    hideOnlineStatus: boolean;
+    injectFeaturedNote: boolean;
+    integrations: Record<string, any>;
+    isDeleted: boolean;
+    isExplorable: boolean;
+    mutedWords: string[][];
+    mutingNotificationTypes: string[];
+    noCrawle: boolean;
+    receiveAnnouncementEmail: boolean;
+    usePasswordLessLogin: boolean;
+    [other: string]: any;
+};
+
+// @public (undocumented)
+type MessagingMessage = {
+    id: ID;
+    createdAt: DateString;
+    file: DriveFile | null;
+    fileId: DriveFile['id'] | null;
+    isRead: boolean;
+    reads: User['id'][];
+    text: string | null;
+    user: User;
+    userId: User['id'];
+    recipient?: User | null;
+    recipientId: User['id'] | null;
+    group?: UserGroup | null;
+    groupId: UserGroup['id'] | null;
+};
+
+// @public (undocumented)
+export const mutedNoteReasons: readonly ["word", "manual", "spam", "other"];
+
+// @public (undocumented)
+type Note = {
+    id: ID;
+    createdAt: DateString;
+    text: string | null;
+    cw: string | null;
+    user: User;
+    userId: User['id'];
+    reply?: Note;
+    replyId: Note['id'];
+    renote?: Note;
+    renoteId: Note['id'];
+    files: DriveFile[];
+    fileIds: DriveFile['id'][];
+    visibility: 'public' | 'home' | 'followers' | 'specified';
+    visibleUserIds?: User['id'][];
+    localOnly?: boolean;
+    myReaction?: string;
+    reactions: Record<string, number>;
+    renoteCount: number;
+    repliesCount: number;
+    poll?: {
+        expiresAt: DateString | null;
+        multiple: boolean;
+        choices: {
+            isVoted: boolean;
+            text: string;
+            votes: number;
+        }[];
+    };
+    emojis: {
+        name: string;
+        url: string;
+    }[];
+    uri?: string;
+    url?: string;
+    isHidden?: boolean;
+};
+
+// @public (undocumented)
+type NoteFavorite = {
+    id: ID;
+    createdAt: DateString;
+    noteId: Note['id'];
+    note: Note;
+};
+
+// @public (undocumented)
+type NoteReaction = {
+    id: ID;
+    createdAt: DateString;
+    user: UserLite;
+    type: string;
+};
+
+// @public (undocumented)
+export const noteVisibilities: readonly ["public", "home", "followers", "specified"];
+
+// @public (undocumented)
+type Notification_2 = {
+    id: ID;
+    createdAt: DateString;
+    isRead: boolean;
+} & ({
+    type: 'reaction';
+    reaction: string;
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'reply';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'renote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'quote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'mention';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'pollVote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'follow';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'followRequestAccepted';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'receiveFollowRequest';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'groupInvited';
+    invitation: UserGroup;
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'app';
+    header?: string | null;
+    body: string;
+    icon?: string | null;
+});
+
+// @public (undocumented)
+export const notificationTypes: readonly ["follow", "mention", "reply", "renote", "quote", "reaction", "pollVote", "pollEnded", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app"];
+
+// @public (undocumented)
+type OriginType = 'combined' | 'local' | 'remote';
+
+// @public (undocumented)
+type Page = {
+    id: ID;
+    createdAt: DateString;
+    updatedAt: DateString;
+    userId: User['id'];
+    user: User;
+    content: Record<string, any>[];
+    variables: Record<string, any>[];
+    title: string;
+    name: string;
+    summary: string | null;
+    hideTitleWhenPinned: boolean;
+    alignCenter: boolean;
+    font: string;
+    script: string;
+    eyeCatchingImageId: DriveFile['id'] | null;
+    eyeCatchingImage: DriveFile | null;
+    attachedFiles: any;
+    likedCount: number;
+    isLiked?: boolean;
+};
+
+// @public (undocumented)
+type PageEvent = {
+    pageId: Page['id'];
+    event: string;
+    var: any;
+    userId: User['id'];
+    user: User;
+};
+
+// @public (undocumented)
+export const permissions: string[];
+
+// @public (undocumented)
+type ServerInfo = {
+    machine: string;
+    cpu: {
+        model: string;
+        cores: number;
+    };
+    mem: {
+        total: number;
+    };
+    fs: {
+        total: number;
+        used: number;
+    };
+};
+
+// @public (undocumented)
+type Signin = {
+    id: ID;
+    createdAt: DateString;
+    ip: string;
+    headers: Record<string, any>;
+    success: boolean;
+};
+
+// @public (undocumented)
+type Stats = {
+    notesCount: number;
+    originalNotesCount: number;
+    usersCount: number;
+    originalUsersCount: number;
+    instances: number;
+    driveUsageLocal: number;
+    driveUsageRemote: number;
+};
+
+// Warning: (ae-forgotten-export) The symbol "StreamEvents" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export class Stream extends EventEmitter<StreamEvents> {
+    constructor(origin: string, user: {
+        token: string;
+    } | null, options?: {
+        WebSocket?: any;
+    });
+    // (undocumented)
+    close(): void;
+    // Warning: (ae-forgotten-export) The symbol "NonSharedConnection" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    disconnectToChannel(connection: NonSharedConnection): void;
+    // Warning: (ae-forgotten-export) The symbol "SharedConnection" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    removeSharedConnection(connection: SharedConnection): void;
+    // Warning: (ae-forgotten-export) The symbol "Pool" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    removeSharedConnectionPool(pool: Pool): void;
+    // (undocumented)
+    send(typeOrPayload: any, payload?: any): void;
+    // (undocumented)
+    state: 'initializing' | 'reconnecting' | 'connected';
+    // (undocumented)
+    useChannel<C extends keyof Channels>(channel: C, params?: Channels[C]['params'], name?: string): ChannelConnection<Channels[C]>;
+}
+
+// @public (undocumented)
+type User = UserLite | UserDetailed;
+
+// @public (undocumented)
+type UserDetailed = UserLite & {
+    bannerBlurhash: string | null;
+    bannerColor: string | null;
+    bannerUrl: string | null;
+    birthday: string | null;
+    createdAt: DateString;
+    description: string | null;
+    ffVisibility: 'public' | 'followers' | 'private';
+    fields: {
+        name: string;
+        value: string;
+    }[];
+    followersCount: number;
+    followingCount: number;
+    hasPendingFollowRequestFromYou: boolean;
+    hasPendingFollowRequestToYou: boolean;
+    isAdmin: boolean;
+    isBlocked: boolean;
+    isBlocking: boolean;
+    isBot: boolean;
+    isCat: boolean;
+    isFollowed: boolean;
+    isFollowing: boolean;
+    isLocked: boolean;
+    isModerator: boolean;
+    isMuted: boolean;
+    isSilenced: boolean;
+    isSuspended: boolean;
+    lang: string | null;
+    lastFetchedAt?: DateString;
+    location: string | null;
+    notesCount: number;
+    pinnedNoteIds: ID[];
+    pinnedNotes: Note[];
+    pinnedPage: Page | null;
+    pinnedPageId: string | null;
+    publicReactions: boolean;
+    securityKeys: boolean;
+    twoFactorEnabled: boolean;
+    updatedAt: DateString | null;
+    uri: string | null;
+    url: string | null;
+};
+
+// @public (undocumented)
+type UserGroup = TODO_2;
+
+// @public (undocumented)
+type UserList = {
+    id: ID;
+    createdAt: DateString;
+    name: string;
+    userIds: User['id'][];
+};
+
+// @public (undocumented)
+type UserLite = {
+    id: ID;
+    username: string;
+    host: string | null;
+    name: string;
+    onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
+    avatarUrl: string;
+    avatarBlurhash: string;
+    alsoKnownAs: string[];
+    movedToUri: any;
+    emojis: {
+        name: string;
+        url: string;
+    }[];
+    instance?: {
+        name: Instance['name'];
+        softwareName: Instance['softwareName'];
+        softwareVersion: Instance['softwareVersion'];
+        iconUrl: Instance['iconUrl'];
+        faviconUrl: Instance['faviconUrl'];
+        themeColor: Instance['themeColor'];
+    };
+};
+
+// @public (undocumented)
+type UserSorting = '+follower' | '-follower' | '+createdAt' | '-createdAt' | '+updatedAt' | '-updatedAt';
+
+// Warnings were encountered during analysis:
+//
+// src/api.types.ts:16:32 - (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
+// src/api.types.ts:18:25 - (ae-forgotten-export) The symbol "NoParams" needs to be exported by the entry point index.d.ts
+// src/api.types.ts:601:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts
+// src/streaming.types.ts:35:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/calckey-js/etc/misskey-js.api.md b/packages/calckey-js/etc/misskey-js.api.md
new file mode 100644
index 000000000..269d5cf10
--- /dev/null
+++ b/packages/calckey-js/etc/misskey-js.api.md
@@ -0,0 +1,2681 @@
+## API Report File for "misskey-js"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { EventEmitter } from 'eventemitter3';
+
+// @public (undocumented)
+export type Acct = {
+    username: string;
+    host: string | null;
+};
+
+// Warning: (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+type Ad = TODO_2;
+
+// @public (undocumented)
+type Announcement = {
+    id: ID;
+    createdAt: DateString;
+    updatedAt: DateString | null;
+    text: string;
+    title: string;
+    imageUrl: string | null;
+    isRead?: boolean;
+};
+
+// @public (undocumented)
+type Antenna = {
+    id: ID;
+    createdAt: DateString;
+    name: string;
+    keywords: string[][];
+    excludeKeywords: string[][];
+    src: 'home' | 'all' | 'users' | 'list' | 'group';
+    userListId: ID | null;
+    userGroupId: ID | null;
+    users: string[];
+    caseSensitive: boolean;
+    notify: boolean;
+    withReplies: boolean;
+    withFile: boolean;
+    hasUnreadNote: boolean;
+};
+
+declare namespace api {
+    export {
+        isAPIError,
+        APIError,
+        FetchLike,
+        APIClient
+    }
+}
+export { api }
+
+// @public (undocumented)
+class APIClient {
+    constructor(opts: {
+        origin: APIClient['origin'];
+        credential?: APIClient['credential'];
+        fetch?: APIClient['fetch'] | null | undefined;
+    });
+    // (undocumented)
+    credential: string | null | undefined;
+    // (undocumented)
+    fetch: FetchLike;
+    // (undocumented)
+    origin: string;
+    // Warning: (ae-forgotten-export) The symbol "IsCaseMatched" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "GetCaseResult" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(endpoint: E, params?: P, credential?: string | null | undefined): Promise<Endpoints[E]['res'] extends {
+        $switch: {
+            $cases: [any, any][];
+            $default: any;
+        };
+    } ? IsCaseMatched<E, P, 0> extends true ? GetCaseResult<E, P, 0> : IsCaseMatched<E, P, 1> extends true ? GetCaseResult<E, P, 1> : IsCaseMatched<E, P, 2> extends true ? GetCaseResult<E, P, 2> : IsCaseMatched<E, P, 3> extends true ? GetCaseResult<E, P, 3> : IsCaseMatched<E, P, 4> extends true ? GetCaseResult<E, P, 4> : IsCaseMatched<E, P, 5> extends true ? GetCaseResult<E, P, 5> : IsCaseMatched<E, P, 6> extends true ? GetCaseResult<E, P, 6> : IsCaseMatched<E, P, 7> extends true ? GetCaseResult<E, P, 7> : IsCaseMatched<E, P, 8> extends true ? GetCaseResult<E, P, 8> : IsCaseMatched<E, P, 9> extends true ? GetCaseResult<E, P, 9> : Endpoints[E]['res']['$switch']['$default'] : Endpoints[E]['res']>;
+}
+
+// @public (undocumented)
+type APIError = {
+    id: string;
+    code: string;
+    message: string;
+    kind: 'client' | 'server';
+    info: Record<string, any>;
+};
+
+// @public (undocumented)
+type App = TODO_2;
+
+// @public (undocumented)
+type AuthSession = {
+    id: ID;
+    app: App;
+    token: string;
+};
+
+// @public (undocumented)
+type Blocking = {
+    id: ID;
+    createdAt: DateString;
+    blockeeId: User['id'];
+    blockee: UserDetailed;
+};
+
+// @public (undocumented)
+type Channel = {
+    id: ID;
+};
+
+// 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']> {
+    constructor(stream: Stream, channel: string, name?: string);
+    // (undocumented)
+    channel: string;
+    // (undocumented)
+    abstract dispose(): void;
+    // (undocumented)
+    abstract id: string;
+    // (undocumented)
+    inCount: number;
+    // (undocumented)
+    name?: string;
+    // (undocumented)
+    outCount: number;
+    // (undocumented)
+    send<T extends keyof Channel['receives']>(type: T, body: Channel['receives'][T]): void;
+    // (undocumented)
+    protected stream: Stream;
+}
+
+// @public (undocumented)
+export type Channels = {
+    main: {
+        params: null;
+        events: {
+            notification: (payload: Notification_2) => void;
+            mention: (payload: Note) => void;
+            reply: (payload: Note) => void;
+            renote: (payload: Note) => void;
+            follow: (payload: User) => void;
+            followed: (payload: User) => void;
+            unfollow: (payload: User) => void;
+            meUpdated: (payload: MeDetailed) => void;
+            pageEvent: (payload: PageEvent) => void;
+            urlUploadFinished: (payload: {
+                marker: string;
+                file: DriveFile;
+            }) => void;
+            readAllNotifications: () => void;
+            unreadNotification: (payload: Notification_2) => void;
+            unreadMention: (payload: Note['id']) => void;
+            readAllUnreadMentions: () => void;
+            unreadSpecifiedNote: (payload: Note['id']) => void;
+            readAllUnreadSpecifiedNotes: () => void;
+            readAllMessagingMessages: () => void;
+            messagingMessage: (payload: MessagingMessage) => void;
+            unreadMessagingMessage: (payload: MessagingMessage) => void;
+            readAllAntennas: () => void;
+            unreadAntenna: (payload: Antenna) => void;
+            readAllAnnouncements: () => void;
+            readAllChannels: () => void;
+            unreadChannel: (payload: Note['id']) => void;
+            myTokenRegenerated: () => void;
+            reversiNoInvites: () => void;
+            reversiInvited: (payload: FIXME) => void;
+            signin: (payload: FIXME) => void;
+            registryUpdated: (payload: {
+                scope?: string[];
+                key: string;
+                value: any | null;
+            }) => void;
+            driveFileCreated: (payload: DriveFile) => void;
+            readAntenna: (payload: Antenna) => void;
+        };
+        receives: null;
+    };
+    homeTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    localTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    hybridTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    recommendedTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    globalTimeline: {
+        params: null;
+        events: {
+            note: (payload: Note) => void;
+        };
+        receives: null;
+    };
+    messaging: {
+        params: {
+            otherparty?: User['id'] | null;
+            group?: UserGroup['id'] | null;
+        };
+        events: {
+            message: (payload: MessagingMessage) => void;
+            deleted: (payload: MessagingMessage['id']) => void;
+            read: (payload: MessagingMessage['id'][]) => void;
+            typers: (payload: User[]) => void;
+        };
+        receives: {
+            read: {
+                id: MessagingMessage['id'];
+            };
+        };
+    };
+    serverStats: {
+        params: null;
+        events: {
+            stats: (payload: FIXME) => void;
+        };
+        receives: {
+            requestLog: {
+                id: string | number;
+                length: number;
+            };
+        };
+    };
+    queueStats: {
+        params: null;
+        events: {
+            stats: (payload: FIXME) => void;
+        };
+        receives: {
+            requestLog: {
+                id: string | number;
+                length: number;
+            };
+        };
+    };
+};
+
+// @public (undocumented)
+type Clip = TODO_2;
+
+// @public (undocumented)
+type CustomEmoji = {
+    id: string;
+    name: string;
+    url: string;
+    category: string;
+    aliases: string[];
+};
+
+// @public (undocumented)
+type DateString = string;
+
+// @public (undocumented)
+type DetailedInstanceMetadata = LiteInstanceMetadata & {
+    features: Record<string, any>;
+};
+
+// @public (undocumented)
+type DriveFile = {
+    id: ID;
+    createdAt: DateString;
+    isSensitive: boolean;
+    name: string;
+    thumbnailUrl: string;
+    url: string;
+    type: string;
+    size: number;
+    md5: string;
+    blurhash: string;
+    properties: Record<string, any>;
+};
+
+// @public (undocumented)
+type DriveFolder = TODO_2;
+
+// @public (undocumented)
+export type Endpoints = {
+    'admin/abuse-user-reports': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/delete-all-files-of-a-user': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'admin/delete-logs': {
+        req: NoParams;
+        res: null;
+    };
+    'admin/get-index-stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/get-table-stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/invite': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/logs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/reset-password': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/resolve-abuse-user-report': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/resync-chart': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/send-email': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/server-info': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-moderation-logs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/show-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/silence-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/suspend-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/unsilence-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/unsuspend-user': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/update-meta': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/vacuum': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/accounts/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/delete': {
+        req: {
+            id: Ad['id'];
+        };
+        res: null;
+    };
+    'admin/ad/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/ad/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/delete': {
+        req: {
+            id: Announcement['id'];
+        };
+        res: null;
+    };
+    'admin/announcements/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/announcements/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/clean-remote-files': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/cleanup': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/files': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/drive/show-file': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/copy': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/list-remote': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/emoji/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/delete-all-files': {
+        req: {
+            host: string;
+        };
+        res: null;
+    };
+    'admin/federation/refresh-remote-instance-metadata': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/remove-all-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/federation/update-instance': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/moderators/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/moderators/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/promo/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/clear': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/deliver-delayed': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/inbox-delayed': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/jobs': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/queue/stats': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/add': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'admin/relays/remove': {
+        req: TODO;
+        res: TODO;
+    };
+    'announcements': {
+        req: {
+            limit?: number;
+            withUnreads?: boolean;
+            sinceId?: Announcement['id'];
+            untilId?: Announcement['id'];
+        };
+        res: Announcement[];
+    };
+    'antennas/create': {
+        req: TODO;
+        res: Antenna;
+    };
+    'antennas/delete': {
+        req: {
+            antennaId: Antenna['id'];
+        };
+        res: null;
+    };
+    'antennas/list': {
+        req: NoParams;
+        res: Antenna[];
+    };
+    'antennas/notes': {
+        req: {
+            antennaId: Antenna['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'antennas/show': {
+        req: {
+            antennaId: Antenna['id'];
+        };
+        res: Antenna;
+    };
+    'antennas/update': {
+        req: TODO;
+        res: Antenna;
+    };
+    'ap/get': {
+        req: {
+            uri: string;
+        };
+        res: Record<string, any>;
+    };
+    'ap/show': {
+        req: {
+            uri: string;
+        };
+        res: {
+            type: 'Note';
+            object: Note;
+        } | {
+            type: 'User';
+            object: UserDetailed;
+        };
+    };
+    'app/create': {
+        req: TODO;
+        res: App;
+    };
+    'app/show': {
+        req: {
+            appId: App['id'];
+        };
+        res: App;
+    };
+    'auth/accept': {
+        req: {
+            token: string;
+        };
+        res: null;
+    };
+    'auth/session/generate': {
+        req: {
+            appSecret: string;
+        };
+        res: {
+            token: string;
+            url: string;
+        };
+    };
+    'auth/session/show': {
+        req: {
+            token: string;
+        };
+        res: AuthSession;
+    };
+    'auth/session/userkey': {
+        req: {
+            appSecret: string;
+            token: string;
+        };
+        res: {
+            accessToken: string;
+            user: User;
+        };
+    };
+    'blocking/create': {
+        req: {
+            userId: User['id'];
+        };
+        res: UserDetailed;
+    };
+    'blocking/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: UserDetailed;
+    };
+    'blocking/list': {
+        req: {
+            limit?: number;
+            sinceId?: Blocking['id'];
+            untilId?: Blocking['id'];
+        };
+        res: Blocking[];
+    };
+    'channels/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/featured': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/follow': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/followed': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/owned': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/pin-note': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/timeline': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/unfollow': {
+        req: TODO;
+        res: TODO;
+    };
+    'channels/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'charts/active-users': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                users: number[];
+            };
+            remote: {
+                users: number[];
+            };
+        };
+    };
+    'charts/drive': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                decCount: number[];
+                decSize: number[];
+                incCount: number[];
+                incSize: number[];
+                totalCount: number[];
+                totalSize: number[];
+            };
+            remote: {
+                decCount: number[];
+                decSize: number[];
+                incCount: number[];
+                incSize: number[];
+                totalCount: number[];
+                totalSize: number[];
+            };
+        };
+    };
+    'charts/federation': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            instance: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'charts/hashtag': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: TODO;
+    };
+    'charts/instance': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            host: string;
+        };
+        res: {
+            drive: {
+                decFiles: number[];
+                decUsage: number[];
+                incFiles: number[];
+                incUsage: number[];
+                totalFiles: number[];
+                totalUsage: number[];
+            };
+            followers: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            following: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            notes: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+            requests: {
+                failed: number[];
+                received: number[];
+                succeeded: number[];
+            };
+            users: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'charts/network': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: TODO;
+    };
+    'charts/notes': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+            remote: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+                diffs: {
+                    normal: number[];
+                    renote: number[];
+                    reply: number[];
+                };
+            };
+        };
+    };
+    'charts/user/drive': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: {
+            decCount: number[];
+            decSize: number[];
+            incCount: number[];
+            incSize: number[];
+            totalCount: number[];
+            totalSize: number[];
+        };
+    };
+    'charts/user/following': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: TODO;
+    };
+    'charts/user/notes': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: {
+            dec: number[];
+            inc: number[];
+            total: number[];
+            diffs: {
+                normal: number[];
+                renote: number[];
+                reply: number[];
+            };
+        };
+    };
+    'charts/user/reactions': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+            userId: User['id'];
+        };
+        res: TODO;
+    };
+    'charts/users': {
+        req: {
+            span: 'day' | 'hour';
+            limit?: number;
+            offset?: number | null;
+        };
+        res: {
+            local: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+            remote: {
+                dec: number[];
+                inc: number[];
+                total: number[];
+            };
+        };
+    };
+    'clips/add-note': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/delete': {
+        req: {
+            clipId: Clip['id'];
+        };
+        res: null;
+    };
+    'clips/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'clips/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive': {
+        req: NoParams;
+        res: {
+            capacity: number;
+            usage: number;
+        };
+    };
+    'drive/files': {
+        req: {
+            folderId?: DriveFolder['id'] | null;
+            type?: DriveFile['type'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFile[];
+    };
+    'drive/files/attached-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/check-existence': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/delete': {
+        req: {
+            fileId: DriveFile['id'];
+        };
+        res: null;
+    };
+    'drive/files/find-by-hash': {
+        req: TODO;
+        res: TODO;
+    };
+    'drive/files/find': {
+        req: {
+            name: string;
+            folderId?: DriveFolder['id'] | null;
+        };
+        res: DriveFile[];
+    };
+    'drive/files/show': {
+        req: {
+            fileId?: DriveFile['id'];
+            url?: string;
+        };
+        res: DriveFile;
+    };
+    'drive/files/update': {
+        req: {
+            fileId: DriveFile['id'];
+            folderId?: DriveFolder['id'] | null;
+            name?: string;
+            isSensitive?: boolean;
+            comment?: string | null;
+        };
+        res: DriveFile;
+    };
+    'drive/files/upload-from-url': {
+        req: {
+            url: string;
+            folderId?: DriveFolder['id'] | null;
+            isSensitive?: boolean;
+            comment?: string | null;
+            marker?: string | null;
+            force?: boolean;
+        };
+        res: null;
+    };
+    'drive/folders': {
+        req: {
+            folderId?: DriveFolder['id'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFolder[];
+    };
+    'drive/folders/create': {
+        req: {
+            name?: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder;
+    };
+    'drive/folders/delete': {
+        req: {
+            folderId: DriveFolder['id'];
+        };
+        res: null;
+    };
+    'drive/folders/find': {
+        req: {
+            name: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder[];
+    };
+    'drive/folders/show': {
+        req: {
+            folderId: DriveFolder['id'];
+        };
+        res: DriveFolder;
+    };
+    'drive/folders/update': {
+        req: {
+            folderId: DriveFolder['id'];
+            name?: string;
+            parentId?: DriveFolder['id'] | null;
+        };
+        res: DriveFolder;
+    };
+    'drive/stream': {
+        req: {
+            type?: DriveFile['type'] | null;
+            limit?: number;
+            sinceId?: DriveFile['id'];
+            untilId?: DriveFile['id'];
+        };
+        res: DriveFile[];
+    };
+    'endpoint': {
+        req: {
+            endpoint: string;
+        };
+        res: {
+            params: {
+                name: string;
+                type: string;
+            }[];
+        };
+    };
+    'endpoints': {
+        req: NoParams;
+        res: string[];
+    };
+    'federation/dns': {
+        req: {
+            host: string;
+        };
+        res: {
+            a: string[];
+            aaaa: string[];
+            cname: string[];
+            txt: string[];
+        };
+    };
+    'federation/followers': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'federation/following': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'federation/instances': {
+        req: {
+            host?: string | null;
+            blocked?: boolean | null;
+            notResponding?: boolean | null;
+            suspended?: boolean | null;
+            federating?: boolean | null;
+            subscribing?: boolean | null;
+            publishing?: boolean | null;
+            limit?: number;
+            offset?: number;
+            sort?: '+pubSub' | '-pubSub' | '+notes' | '-notes' | '+users' | '-users' | '+following' | '-following' | '+followers' | '-followers' | '+caughtAt' | '-caughtAt' | '+lastCommunicatedAt' | '-lastCommunicatedAt' | '+driveUsage' | '-driveUsage' | '+driveFiles' | '-driveFiles';
+        };
+        res: Instance[];
+    };
+    'federation/show-instance': {
+        req: {
+            host: string;
+        };
+        res: Instance;
+    };
+    'federation/update-remote-user': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'federation/users': {
+        req: {
+            host: string;
+            limit?: number;
+            sinceId?: User['id'];
+            untilId?: User['id'];
+        };
+        res: UserDetailed[];
+    };
+    'following/create': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/requests/accept': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'following/requests/cancel': {
+        req: {
+            userId: User['id'];
+        };
+        res: User;
+    };
+    'following/requests/list': {
+        req: NoParams;
+        res: FollowRequest[];
+    };
+    'following/requests/reject': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'gallery/featured': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/popular': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/delete': {
+        req: {
+            postId: GalleryPost['id'];
+        };
+        res: null;
+    };
+    'gallery/posts/like': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/unlike': {
+        req: TODO;
+        res: TODO;
+    };
+    'gallery/posts/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/games/surrender': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/invitations': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/match': {
+        req: TODO;
+        res: TODO;
+    };
+    'games/reversi/match/cancel': {
+        req: TODO;
+        res: TODO;
+    };
+    'get-online-users-count': {
+        req: NoParams;
+        res: {
+            count: number;
+        };
+    };
+    'hashtags/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/trend': {
+        req: TODO;
+        res: TODO;
+    };
+    'hashtags/users': {
+        req: TODO;
+        res: TODO;
+    };
+    'i': {
+        req: NoParams;
+        res: User;
+    };
+    'i/apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/authorized-apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/change-password': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/delete-account': {
+        req: {
+            password: string;
+        };
+        res: null;
+    };
+    'i/export-blocking': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-mute': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/export-user-lists': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/favorites': {
+        req: {
+            limit?: number;
+            sinceId?: NoteFavorite['id'];
+            untilId?: NoteFavorite['id'];
+        };
+        res: NoteFavorite[];
+    };
+    'i/gallery/likes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/get-word-muted-notes-count': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/import-following': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/import-user-lists': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/notifications': {
+        req: {
+            limit?: number;
+            sinceId?: Notification_2['id'];
+            untilId?: Notification_2['id'];
+            following?: boolean;
+            markAsRead?: boolean;
+            includeTypes?: Notification_2['type'][];
+            excludeTypes?: Notification_2['type'][];
+        };
+        res: Notification_2[];
+    };
+    'i/page-likes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/pages': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/pin': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: MeDetailed;
+    };
+    'i/read-all-messaging-messages': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/read-all-unread-notes': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/read-announcement': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/regenerate-token': {
+        req: {
+            password: string;
+        };
+        res: null;
+    };
+    'i/registry/get-all': {
+        req: {
+            scope?: string[];
+        };
+        res: Record<string, any>;
+    };
+    'i/registry/get-detail': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: {
+            updatedAt: DateString;
+            value: any;
+        };
+    };
+    'i/registry/get': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: any;
+    };
+    'i/registry/keys-with-type': {
+        req: {
+            scope?: string[];
+        };
+        res: Record<string, 'null' | 'array' | 'number' | 'string' | 'boolean' | 'object'>;
+    };
+    'i/registry/keys': {
+        req: {
+            scope?: string[];
+        };
+        res: string[];
+    };
+    'i/registry/remove': {
+        req: {
+            key: string;
+            scope?: string[];
+        };
+        res: null;
+    };
+    'i/registry/scopes': {
+        req: NoParams;
+        res: string[][];
+    };
+    'i/registry/set': {
+        req: {
+            key: string;
+            value: any;
+            scope?: string[];
+        };
+        res: null;
+    };
+    'i/revoke-token': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/signin-history': {
+        req: {
+            limit?: number;
+            sinceId?: Signin['id'];
+            untilId?: Signin['id'];
+        };
+        res: Signin[];
+    };
+    'i/unpin': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: MeDetailed;
+    };
+    'i/update-email': {
+        req: {
+            password: string;
+            email?: string | null;
+        };
+        res: MeDetailed;
+    };
+    'i/update': {
+        req: {
+            name?: string | null;
+            description?: string | null;
+            lang?: string | null;
+            location?: string | null;
+            birthday?: string | null;
+            avatarId?: DriveFile['id'] | null;
+            bannerId?: DriveFile['id'] | null;
+            fields?: {
+                name: string;
+                value: string;
+            }[];
+            isLocked?: boolean;
+            isExplorable?: boolean;
+            hideOnlineStatus?: boolean;
+            carefulBot?: boolean;
+            autoAcceptFollowed?: boolean;
+            noCrawle?: boolean;
+            isBot?: boolean;
+            isCat?: boolean;
+            injectFeaturedNote?: boolean;
+            receiveAnnouncementEmail?: boolean;
+            alwaysMarkNsfw?: boolean;
+            mutedWords?: string[][];
+            mutingNotificationTypes?: Notification_2['type'][];
+            emailNotificationTypes?: string[];
+        };
+        res: MeDetailed;
+    };
+    'i/user-group-invites': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/done': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/key-done': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/password-less': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/register-key': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/register': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/remove-key': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/2fa/unregister': {
+        req: TODO;
+        res: TODO;
+    };
+    'messaging/history': {
+        req: {
+            limit?: number;
+            group?: boolean;
+        };
+        res: MessagingMessage[];
+    };
+    'messaging/messages': {
+        req: {
+            userId?: User['id'];
+            groupId?: UserGroup['id'];
+            limit?: number;
+            sinceId?: MessagingMessage['id'];
+            untilId?: MessagingMessage['id'];
+            markAsRead?: boolean;
+        };
+        res: MessagingMessage[];
+    };
+    'messaging/messages/create': {
+        req: {
+            userId?: User['id'];
+            groupId?: UserGroup['id'];
+            text?: string;
+            fileId?: DriveFile['id'];
+        };
+        res: MessagingMessage;
+    };
+    'messaging/messages/delete': {
+        req: {
+            messageId: MessagingMessage['id'];
+        };
+        res: null;
+    };
+    'messaging/messages/read': {
+        req: {
+            messageId: MessagingMessage['id'];
+        };
+        res: null;
+    };
+    'meta': {
+        req: {
+            detail?: boolean;
+        };
+        res: {
+            $switch: {
+                $cases: [
+                [
+                    {
+                    detail: true;
+                },
+                DetailedInstanceMetadata
+                ],
+                [
+                    {
+                    detail: false;
+                },
+                LiteInstanceMetadata
+                ],
+                [
+                    {
+                    detail: boolean;
+                },
+                LiteInstanceMetadata | DetailedInstanceMetadata
+                ]
+                ];
+                $default: LiteInstanceMetadata;
+            };
+        };
+    };
+    'miauth/gen-token': {
+        req: TODO;
+        res: TODO;
+    };
+    'mute/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'mute/delete': {
+        req: {
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'mute/list': {
+        req: TODO;
+        res: TODO;
+    };
+    'my/apps': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/children': {
+        req: {
+            noteId: Note['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/clips': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/conversation': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/create': {
+        req: {
+            visibility?: 'public' | 'home' | 'followers' | 'specified';
+            visibleUserIds?: User['id'][];
+            text?: null | string;
+            cw?: null | string;
+            viaMobile?: boolean;
+            localOnly?: boolean;
+            fileIds?: DriveFile['id'][];
+            replyId?: null | Note['id'];
+            renoteId?: null | Note['id'];
+            channelId?: null | Channel['id'];
+            poll?: null | {
+                choices: string[];
+                multiple?: boolean;
+                expiresAt?: null | number;
+                expiredAfter?: null | number;
+            };
+        };
+        res: {
+            createdNote: Note;
+        };
+    };
+    'notes/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/favorites/create': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/favorites/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/featured': {
+        req: TODO;
+        res: Note[];
+    };
+    'notes/global-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/recommended-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/hybrid-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/local-timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/mentions': {
+        req: {
+            following?: boolean;
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/polls/recommendation': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/polls/vote': {
+        req: {
+            noteId: Note['id'];
+            choice: number;
+        };
+        res: null;
+    };
+    'notes/reactions': {
+        req: {
+            noteId: Note['id'];
+            type?: string | null;
+            limit?: number;
+        };
+        res: NoteReaction[];
+    };
+    'notes/reactions/create': {
+        req: {
+            noteId: Note['id'];
+            reaction: string;
+        };
+        res: null;
+    };
+    'notes/reactions/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/renotes': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            noteId: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/replies': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            noteId: Note['id'];
+        };
+        res: Note[];
+    };
+    'notes/search-by-tag': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/show': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: Note;
+    };
+    'notes/state': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/timeline': {
+        req: {
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/unrenote': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notes/user-list-timeline': {
+        req: {
+            listId: UserList['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'notes/watching/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'notes/watching/delete': {
+        req: {
+            noteId: Note['id'];
+        };
+        res: null;
+    };
+    'notifications/create': {
+        req: {
+            body: string;
+            header?: string | null;
+            icon?: string | null;
+        };
+        res: null;
+    };
+    'notifications/mark-all-as-read': {
+        req: NoParams;
+        res: null;
+    };
+    'notifications/read': {
+        req: {
+            notificationId: Notification_2['id'];
+        };
+        res: null;
+    };
+    'page-push': {
+        req: {
+            pageId: Page['id'];
+            event: string;
+            var?: any;
+        };
+        res: null;
+    };
+    'pages/create': {
+        req: TODO;
+        res: Page;
+    };
+    'pages/delete': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/featured': {
+        req: NoParams;
+        res: Page[];
+    };
+    'pages/like': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/show': {
+        req: {
+            pageId?: Page['id'];
+            name?: string;
+            username?: string;
+        };
+        res: Page;
+    };
+    'pages/unlike': {
+        req: {
+            pageId: Page['id'];
+        };
+        res: null;
+    };
+    'pages/update': {
+        req: TODO;
+        res: null;
+    };
+    'ping': {
+        req: NoParams;
+        res: {
+            pong: number;
+        };
+    };
+    'pinned-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'promo/read': {
+        req: TODO;
+        res: TODO;
+    };
+    'request-reset-password': {
+        req: {
+            username: string;
+            email: string;
+        };
+        res: null;
+    };
+    'reset-password': {
+        req: {
+            token: string;
+            password: string;
+        };
+        res: null;
+    };
+    'room/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'room/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'stats': {
+        req: NoParams;
+        res: Stats;
+    };
+    'server-info': {
+        req: NoParams;
+        res: ServerInfo;
+    };
+    'sw/register': {
+        req: TODO;
+        res: TODO;
+    };
+    'username/available': {
+        req: {
+            username: string;
+        };
+        res: {
+            available: boolean;
+        };
+    };
+    'users': {
+        req: {
+            limit?: number;
+            offset?: number;
+            sort?: UserSorting;
+            origin?: OriginType;
+        };
+        res: User[];
+    };
+    'users/clips': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/followers': {
+        req: {
+            userId?: User['id'];
+            username?: User['username'];
+            host?: User['host'] | null;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFollowerPopulated[];
+    };
+    'users/following': {
+        req: {
+            userId?: User['id'];
+            username?: User['username'];
+            host?: User['host'] | null;
+            limit?: number;
+            sinceId?: Following['id'];
+            untilId?: Following['id'];
+        };
+        res: FollowingFolloweePopulated[];
+    };
+    'users/gallery/posts': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/get-frequently-replied-users': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/create': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/delete': {
+        req: {
+            groupId: UserGroup['id'];
+        };
+        res: null;
+    };
+    'users/groups/invitations/accept': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/invitations/reject': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/invite': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/joined': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/owned': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/pull': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/show': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/transfer': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/groups/update': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/lists/create': {
+        req: {
+            name: string;
+        };
+        res: UserList;
+    };
+    'users/lists/delete': {
+        req: {
+            listId: UserList['id'];
+        };
+        res: null;
+    };
+    'users/lists/list': {
+        req: NoParams;
+        res: UserList[];
+    };
+    'users/lists/pull': {
+        req: {
+            listId: UserList['id'];
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'users/lists/push': {
+        req: {
+            listId: UserList['id'];
+            userId: User['id'];
+        };
+        res: null;
+    };
+    'users/lists/show': {
+        req: {
+            listId: UserList['id'];
+        };
+        res: UserList;
+    };
+    'users/lists/update': {
+        req: {
+            listId: UserList['id'];
+            name: string;
+        };
+        res: UserList;
+    };
+    'users/notes': {
+        req: {
+            userId: User['id'];
+            limit?: number;
+            sinceId?: Note['id'];
+            untilId?: Note['id'];
+            sinceDate?: number;
+            untilDate?: number;
+        };
+        res: Note[];
+    };
+    'users/pages': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/recommendation': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/relation': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/report-abuse': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/search-by-username-and-host': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/search': {
+        req: TODO;
+        res: TODO;
+    };
+    'users/show': {
+        req: ShowUserReq | {
+            userIds: User['id'][];
+        };
+        res: {
+            $switch: {
+                $cases: [
+                [
+                    {
+                    userIds: User['id'][];
+                },
+                UserDetailed[]
+                ]
+                ];
+                $default: UserDetailed;
+            };
+        };
+    };
+    'users/stats': {
+        req: TODO;
+        res: TODO;
+    };
+};
+
+declare namespace entities {
+    export {
+        ID,
+        DateString,
+        User,
+        UserLite,
+        UserDetailed,
+        UserGroup,
+        UserList,
+        MeDetailed,
+        DriveFile,
+        DriveFolder,
+        GalleryPost,
+        Note,
+        NoteReaction,
+        Notification_2 as Notification,
+        MessagingMessage,
+        CustomEmoji,
+        LiteInstanceMetadata,
+        DetailedInstanceMetadata,
+        InstanceMetadata,
+        ServerInfo,
+        Stats,
+        Page,
+        PageEvent,
+        Announcement,
+        Antenna,
+        App,
+        AuthSession,
+        Ad,
+        Clip,
+        NoteFavorite,
+        FollowRequest,
+        Channel,
+        Following,
+        FollowingFolloweePopulated,
+        FollowingFollowerPopulated,
+        Blocking,
+        Instance,
+        Signin,
+        UserSorting,
+        OriginType
+    }
+}
+export { entities }
+
+// @public (undocumented)
+type FetchLike = (input: string, init?: {
+    method?: string;
+    body?: string;
+    credentials?: RequestCredentials;
+    cache?: RequestCache;
+}) => Promise<{
+    status: number;
+    json(): Promise<any>;
+}>;
+
+// @public (undocumented)
+export const ffVisibility: readonly ["public", "followers", "private"];
+
+// @public (undocumented)
+type Following = {
+    id: ID;
+    createdAt: DateString;
+    followerId: User['id'];
+    followeeId: User['id'];
+};
+
+// @public (undocumented)
+type FollowingFolloweePopulated = Following & {
+    followee: UserDetailed;
+};
+
+// @public (undocumented)
+type FollowingFollowerPopulated = Following & {
+    follower: UserDetailed;
+};
+
+// @public (undocumented)
+type FollowRequest = {
+    id: ID;
+    follower: User;
+    followee: User;
+};
+
+// @public (undocumented)
+type GalleryPost = TODO_2;
+
+// @public (undocumented)
+type ID = string;
+
+// @public (undocumented)
+type Instance = {
+    id: ID;
+    caughtAt: DateString;
+    host: string;
+    usersCount: number;
+    notesCount: number;
+    followingCount: number;
+    followersCount: number;
+    driveUsage: number;
+    driveFiles: number;
+    latestRequestSentAt: DateString | null;
+    latestStatus: number | null;
+    latestRequestReceivedAt: DateString | null;
+    lastCommunicatedAt: DateString;
+    isNotResponding: boolean;
+    isSuspended: boolean;
+    softwareName: string | null;
+    softwareVersion: string | null;
+    openRegistrations: boolean | null;
+    name: string | null;
+    description: string | null;
+    maintainerName: string | null;
+    maintainerEmail: string | null;
+    iconUrl: string | null;
+    faviconUrl: string | null;
+    themeColor: string | null;
+    infoUpdatedAt: DateString | null;
+};
+
+// @public (undocumented)
+type InstanceMetadata = LiteInstanceMetadata | DetailedInstanceMetadata;
+
+// @public (undocumented)
+function isAPIError(reason: any): reason is APIError;
+
+// @public (undocumented)
+type LiteInstanceMetadata = {
+    maintainerName: string | null;
+    maintainerEmail: string | null;
+    version: string;
+    name: string | null;
+    uri: string;
+    description: string | null;
+    tosUrl: string | null;
+    disableRegistration: boolean;
+    disableLocalTimeline: boolean;
+    disableRecommendedTimeline: boolean;
+    disableGlobalTimeline: boolean;
+    driveCapacityPerLocalUserMb: number;
+    driveCapacityPerRemoteUserMb: number;
+    enableHcaptcha: boolean;
+    hcaptchaSiteKey: string | null;
+    enableRecaptcha: boolean;
+    recaptchaSiteKey: string | null;
+    swPublickey: string | null;
+    maxNoteTextLength: number;
+    enableEmail: boolean;
+    enableTwitterIntegration: boolean;
+    enableGithubIntegration: boolean;
+    enableDiscordIntegration: boolean;
+    enableServiceWorker: boolean;
+    emojis: CustomEmoji[];
+    ads: {
+        id: ID;
+        ratio: number;
+        place: string;
+        url: string;
+        imageUrl: string;
+    }[];
+};
+
+// @public (undocumented)
+type MeDetailed = UserDetailed & {
+    avatarId: DriveFile['id'];
+    bannerId: DriveFile['id'];
+    autoAcceptFollowed: boolean;
+    alwaysMarkNsfw: boolean;
+    carefulBot: boolean;
+    emailNotificationTypes: string[];
+    hasPendingReceivedFollowRequest: boolean;
+    hasUnreadAnnouncement: boolean;
+    hasUnreadAntenna: boolean;
+    hasUnreadChannel: boolean;
+    hasUnreadMentions: boolean;
+    hasUnreadMessagingMessage: boolean;
+    hasUnreadNotification: boolean;
+    hasUnreadSpecifiedNotes: boolean;
+    hideOnlineStatus: boolean;
+    injectFeaturedNote: boolean;
+    integrations: Record<string, any>;
+    isDeleted: boolean;
+    isExplorable: boolean;
+    mutedWords: string[][];
+    mutingNotificationTypes: string[];
+    noCrawle: boolean;
+    receiveAnnouncementEmail: boolean;
+    usePasswordLessLogin: boolean;
+    [other: string]: any;
+};
+
+// @public (undocumented)
+type MessagingMessage = {
+    id: ID;
+    createdAt: DateString;
+    file: DriveFile | null;
+    fileId: DriveFile['id'] | null;
+    isRead: boolean;
+    reads: User['id'][];
+    text: string | null;
+    user: User;
+    userId: User['id'];
+    recipient?: User | null;
+    recipientId: User['id'] | null;
+    group?: UserGroup | null;
+    groupId: UserGroup['id'] | null;
+};
+
+// @public (undocumented)
+export const mutedNoteReasons: readonly ["word", "manual", "spam", "other"];
+
+// @public (undocumented)
+type Note = {
+    id: ID;
+    createdAt: DateString;
+    text: string | null;
+    cw: string | null;
+    user: User;
+    userId: User['id'];
+    reply?: Note;
+    replyId: Note['id'];
+    renote?: Note;
+    renoteId: Note['id'];
+    files: DriveFile[];
+    fileIds: DriveFile['id'][];
+    visibility: 'public' | 'home' | 'followers' | 'specified';
+    visibleUserIds?: User['id'][];
+    localOnly?: boolean;
+    myReaction?: string;
+    reactions: Record<string, number>;
+    renoteCount: number;
+    repliesCount: number;
+    poll?: {
+        expiresAt: DateString | null;
+        multiple: boolean;
+        choices: {
+            isVoted: boolean;
+            text: string;
+            votes: number;
+        }[];
+    };
+    emojis: {
+        name: string;
+        url: string;
+    }[];
+    uri?: string;
+    url?: string;
+    isHidden?: boolean;
+};
+
+// @public (undocumented)
+type NoteFavorite = {
+    id: ID;
+    createdAt: DateString;
+    noteId: Note['id'];
+    note: Note;
+};
+
+// @public (undocumented)
+type NoteReaction = {
+    id: ID;
+    createdAt: DateString;
+    user: UserLite;
+    type: string;
+};
+
+// @public (undocumented)
+export const noteVisibilities: readonly ["public", "home", "followers", "specified"];
+
+// @public (undocumented)
+type Notification_2 = {
+    id: ID;
+    createdAt: DateString;
+    isRead: boolean;
+} & ({
+    type: 'reaction';
+    reaction: string;
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'reply';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'renote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'quote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'mention';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'pollVote';
+    user: User;
+    userId: User['id'];
+    note: Note;
+} | {
+    type: 'follow';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'followRequestAccepted';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'receiveFollowRequest';
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'groupInvited';
+    invitation: UserGroup;
+    user: User;
+    userId: User['id'];
+} | {
+    type: 'app';
+    header?: string | null;
+    body: string;
+    icon?: string | null;
+});
+
+// @public (undocumented)
+export const notificationTypes: readonly ["follow", "mention", "reply", "renote", "quote", "reaction", "pollVote", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app"];
+
+// @public (undocumented)
+type OriginType = 'combined' | 'local' | 'remote';
+
+// @public (undocumented)
+type Page = {
+    id: ID;
+    createdAt: DateString;
+    updatedAt: DateString;
+    userId: User['id'];
+    user: User;
+    content: Record<string, any>[];
+    variables: Record<string, any>[];
+    title: string;
+    name: string;
+    summary: string | null;
+    hideTitleWhenPinned: boolean;
+    alignCenter: boolean;
+    font: string;
+    script: string;
+    eyeCatchingImageId: DriveFile['id'] | null;
+    eyeCatchingImage: DriveFile | null;
+    attachedFiles: any;
+    likedCount: number;
+    isLiked?: boolean;
+};
+
+// @public (undocumented)
+type PageEvent = {
+    pageId: Page['id'];
+    event: string;
+    var: any;
+    userId: User['id'];
+    user: User;
+};
+
+// @public (undocumented)
+export const permissions: string[];
+
+// @public (undocumented)
+type ServerInfo = {
+    machine: string;
+    cpu: {
+        model: string;
+        cores: number;
+    };
+    mem: {
+        total: number;
+    };
+    fs: {
+        total: number;
+        used: number;
+    };
+};
+
+// @public (undocumented)
+type Signin = {
+    id: ID;
+    createdAt: DateString;
+    ip: string;
+    headers: Record<string, any>;
+    success: boolean;
+};
+
+// @public (undocumented)
+type Stats = {
+    notesCount: number;
+    originalNotesCount: number;
+    usersCount: number;
+    originalUsersCount: number;
+    instances: number;
+    driveUsageLocal: number;
+    driveUsageRemote: number;
+};
+
+// Warning: (ae-forgotten-export) The symbol "StreamEvents" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export class Stream extends EventEmitter<StreamEvents> {
+    constructor(origin: string, user: {
+        token: string;
+    } | null, options?: {
+        WebSocket?: any;
+    });
+    // (undocumented)
+    close(): void;
+    // Warning: (ae-forgotten-export) The symbol "NonSharedConnection" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    disconnectToChannel(connection: NonSharedConnection): void;
+    // Warning: (ae-forgotten-export) The symbol "SharedConnection" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    removeSharedConnection(connection: SharedConnection): void;
+    // Warning: (ae-forgotten-export) The symbol "Pool" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    removeSharedConnectionPool(pool: Pool): void;
+    // (undocumented)
+    send(typeOrPayload: any, payload?: any): void;
+    // (undocumented)
+    state: 'initializing' | 'reconnecting' | 'connected';
+    // (undocumented)
+    useChannel<C extends keyof Channels>(channel: C, params?: Channels[C]['params'], name?: string): ChannelConnection<Channels[C]>;
+}
+
+// @public (undocumented)
+type User = UserLite | UserDetailed;
+
+// @public (undocumented)
+type UserDetailed = UserLite & {
+    bannerBlurhash: string | null;
+    bannerColor: string | null;
+    bannerUrl: string | null;
+    birthday: string | null;
+    createdAt: DateString;
+    description: string | null;
+    ffVisibility: 'public' | 'followers' | 'private';
+    fields: {
+        name: string;
+        value: string;
+    }[];
+    followersCount: number;
+    followingCount: number;
+    hasPendingFollowRequestFromYou: boolean;
+    hasPendingFollowRequestToYou: boolean;
+    isAdmin: boolean;
+    isBlocked: boolean;
+    isBlocking: boolean;
+    isBot: boolean;
+    isCat: boolean;
+    isFollowed: boolean;
+    isFollowing: boolean;
+    isLocked: boolean;
+    isModerator: boolean;
+    isMuted: boolean;
+    isSilenced: boolean;
+    isSuspended: boolean;
+    lang: string | null;
+    lastFetchedAt?: DateString;
+    location: string | null;
+    notesCount: number;
+    pinnedNoteIds: ID[];
+    pinnedNotes: Note[];
+    pinnedPage: Page | null;
+    pinnedPageId: string | null;
+    publicReactions: boolean;
+    securityKeys: boolean;
+    twoFactorEnabled: boolean;
+    updatedAt: DateString | null;
+    uri: string | null;
+    url: string | null;
+};
+
+// @public (undocumented)
+type UserGroup = TODO_2;
+
+// @public (undocumented)
+type UserList = {
+    id: ID;
+    createdAt: DateString;
+    name: string;
+    userIds: User['id'][];
+};
+
+// @public (undocumented)
+type UserLite = {
+    id: ID;
+    username: string;
+    host: string | null;
+    name: string;
+    onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
+    avatarUrl: string;
+    avatarBlurhash: string;
+    emojis: {
+        name: string;
+        url: string;
+    }[];
+    instance?: {
+        name: Instance['name'];
+        softwareName: Instance['softwareName'];
+        softwareVersion: Instance['softwareVersion'];
+        iconUrl: Instance['iconUrl'];
+        faviconUrl: Instance['faviconUrl'];
+        themeColor: Instance['themeColor'];
+    };
+};
+
+// @public (undocumented)
+type UserSorting = '+follower' | '-follower' | '+createdAt' | '-createdAt' | '+updatedAt' | '-updatedAt';
+
+// Warnings were encountered during analysis:
+//
+// src/api.types.ts:16:32 - (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
+// src/api.types.ts:18:25 - (ae-forgotten-export) The symbol "NoParams" needs to be exported by the entry point index.d.ts
+// src/api.types.ts:595:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts
+// src/streaming.types.ts:35:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/calckey-js/jest.config.ts b/packages/calckey-js/jest.config.ts
new file mode 100644
index 000000000..f26a77c27
--- /dev/null
+++ b/packages/calckey-js/jest.config.ts
@@ -0,0 +1,195 @@
+/*
+ * For a detailed explanation regarding each configuration property and type check, visit:
+ * https://jestjs.io/docs/en/configuration.html
+ */
+
+export default {
+	// All imported modules in your tests should be mocked automatically
+	// automock: false,
+
+	// Stop running tests after `n` failures
+	// bail: 0,
+
+	// The directory where Jest should store its cached dependency information
+	// cacheDirectory: "C:\\Users\\ai\\AppData\\Local\\Temp\\jest",
+
+	// Automatically clear mock calls and instances between every test
+	// clearMocks: false,
+
+	// Indicates whether the coverage information should be collected while executing the test
+	// collectCoverage: false,
+
+	// An array of glob patterns indicating a set of files for which coverage information should be collected
+	// collectCoverageFrom: undefined,
+
+	// The directory where Jest should output its coverage files
+	coverageDirectory: "coverage",
+
+	// An array of regexp pattern strings used to skip coverage collection
+	// coveragePathIgnorePatterns: [
+	//   "\\\\node_modules\\\\"
+	// ],
+
+	// Indicates which provider should be used to instrument code for coverage
+	coverageProvider: "v8",
+
+	// A list of reporter names that Jest uses when writing coverage reports
+	// coverageReporters: [
+	//   "json",
+	//   "text",
+	//   "lcov",
+	//   "clover"
+	// ],
+
+	// An object that configures minimum threshold enforcement for coverage results
+	// coverageThreshold: undefined,
+
+	// A path to a custom dependency extractor
+	// dependencyExtractor: undefined,
+
+	// Make calling deprecated APIs throw helpful error messages
+	// errorOnDeprecated: false,
+
+	// Force coverage collection from ignored files using an array of glob patterns
+	// forceCoverageMatch: [],
+
+	// A path to a module which exports an async function that is triggered once before all test suites
+	// globalSetup: undefined,
+
+	// A path to a module which exports an async function that is triggered once after all test suites
+	// globalTeardown: undefined,
+
+	// A set of global variables that need to be available in all test environments
+	// globals: {},
+
+	// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+	// maxWorkers: "50%",
+
+	// An array of directory names to be searched recursively up from the requiring module's location
+	// moduleDirectories: [
+	//   "node_modules"
+	// ],
+
+	// An array of file extensions your modules use
+	// moduleFileExtensions: [
+	//   "js",
+	//   "json",
+	//   "jsx",
+	//   "ts",
+	//   "tsx",
+	//   "node"
+	// ],
+
+	// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+	// moduleNameMapper: {},
+
+	// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+	// modulePathIgnorePatterns: [],
+
+	// Activates notifications for test results
+	// notify: false,
+
+	// An enum that specifies notification mode. Requires { notify: true }
+	// notifyMode: "failure-change",
+
+	// A preset that is used as a base for Jest's configuration
+	// preset: undefined,
+
+	// Run tests from one or more projects
+	// projects: undefined,
+
+	// Use this configuration option to add custom reporters to Jest
+	// reporters: undefined,
+
+	// Automatically reset mock state between every test
+	// resetMocks: false,
+
+	// Reset the module registry before running each individual test
+	// resetModules: false,
+
+	// A path to a custom resolver
+	// resolver: undefined,
+
+	// Automatically restore mock state between every test
+	// restoreMocks: false,
+
+	// The root directory that Jest should scan for tests and modules within
+	// rootDir: undefined,
+
+	// A list of paths to directories that Jest should use to search for files in
+	roots: ["<rootDir>"],
+
+	// Allows you to use a custom runner instead of Jest's default test runner
+	// runner: "jest-runner",
+
+	// The paths to modules that run some code to configure or set up the testing environment before each test
+	// setupFiles: [],
+
+	// A list of paths to modules that run some code to configure or set up the testing framework before each test
+	// setupFilesAfterEnv: [],
+
+	// The number of seconds after which a test is considered as slow and reported as such in the results.
+	// slowTestThreshold: 5,
+
+	// A list of paths to snapshot serializer modules Jest should use for snapshot testing
+	// snapshotSerializers: [],
+
+	// The test environment that will be used for testing
+	testEnvironment: "node",
+
+	// Options that will be passed to the testEnvironment
+	// testEnvironmentOptions: {},
+
+	// Adds a location field to test results
+	// testLocationInResults: false,
+
+	// The glob patterns Jest uses to detect test files
+	testMatch: [
+		"**/__tests__/**/*.[jt]s?(x)",
+		"**/?(*.)+(spec|test).[tj]s?(x)",
+		"<rootDir>/test/**/*",
+	],
+
+	// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+	// testPathIgnorePatterns: [
+	//   "\\\\node_modules\\\\"
+	// ],
+
+	// The regexp pattern or array of patterns that Jest uses to detect test files
+	// testRegex: [],
+
+	// This option allows the use of a custom results processor
+	// testResultsProcessor: undefined,
+
+	// This option allows use of a custom test runner
+	// testRunner: "jasmine2",
+
+	// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
+	// testURL: "http://localhost",
+
+	// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
+	// timers: "real",
+
+	// A map from regular expressions to paths to transformers
+	transform: {
+		"^.+\\.(ts|tsx)$": "ts-jest",
+	},
+
+	// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+	// transformIgnorePatterns: [
+	//   "\\\\node_modules\\\\",
+	//   "\\.pnp\\.[^\\\\]+$"
+	// ],
+
+	// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+	// unmockedModulePathPatterns: undefined,
+
+	// Indicates whether each individual test should be reported during the run
+	// verbose: undefined,
+
+	// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+	// watchPathIgnorePatterns: [],
+
+	// Whether to use watchman for file crawling
+	// watchman: true,
+};
diff --git a/packages/calckey-js/package-lock.json b/packages/calckey-js/package-lock.json
new file mode 100644
index 000000000..774fcd5fa
--- /dev/null
+++ b/packages/calckey-js/package-lock.json
@@ -0,0 +1,10662 @@
+{
+	"name": "calckey-js",
+	"version": "0.0.16",
+	"lockfileVersion": 2,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "calckey-js",
+			"version": "0.0.16",
+			"dependencies": {
+				"autobind-decorator": "^2.4.0",
+				"eventemitter3": "^4.0.7",
+				"reconnecting-websocket": "^4.4.0",
+				"semver": "^7.3.8"
+			},
+			"devDependencies": {
+				"@microsoft/api-extractor": "^7.19.3",
+				"@types/jest": "^27.4.0",
+				"@types/node": "17.0.5",
+				"@typescript-eslint/eslint-plugin": "5.8.1",
+				"@typescript-eslint/parser": "5.8.1",
+				"eslint": "8.6.0",
+				"jest": "^27.4.5",
+				"jest-fetch-mock": "^3.0.3",
+				"jest-websocket-mock": "^2.2.1",
+				"mock-socket": "^9.0.8",
+				"ts-jest": "^27.1.2",
+				"ts-node": "10.4.0",
+				"tsd": "^0.19.1",
+				"typescript": "4.5.4"
+			}
+		},
+		"node_modules/@babel/code-frame": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/highlight": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/compat-data": {
+			"version": "7.16.4",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
+			"integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/core": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz",
+			"integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.16.7",
+				"@babel/helper-compilation-targets": "^7.16.7",
+				"@babel/helper-module-transforms": "^7.16.7",
+				"@babel/helpers": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7",
+				"convert-source-map": "^1.7.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.1.2",
+				"semver": "^6.3.0",
+				"source-map": "^0.5.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/babel"
+			}
+		},
+		"node_modules/@babel/core/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/core/node_modules/source-map": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@babel/generator": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.7.tgz",
+			"integrity": "sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7",
+				"jsesc": "^2.5.1",
+				"source-map": "^0.5.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/generator/node_modules/source-map": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
+			"integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/compat-data": "^7.16.4",
+				"@babel/helper-validator-option": "^7.16.7",
+				"browserslist": "^4.17.5",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/helper-environment-visitor": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+			"integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-function-name": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
+			"integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-get-function-arity": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-get-function-arity": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
+			"integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-hoist-variables": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+			"integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-imports": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+			"integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-transforms": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
+			"integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-module-imports": "^7.16.7",
+				"@babel/helper-simple-access": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-plugin-utils": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+			"integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-simple-access": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
+			"integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-split-export-declaration": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+			"integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-identifier": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-option": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+			"integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helpers": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
+			"integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz",
+			"integrity": "sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"chalk": "^2.0.0",
+				"js-tokens": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^1.9.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "1.1.3"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"dev": true
+		},
+		"node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/parser": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.7.tgz",
+			"integrity": "sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==",
+			"dev": true,
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-async-generators": {
+			"version": "7.8.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-bigint": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-class-properties": {
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.12.13"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-import-meta": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-json-strings": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-numeric-separator": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-object-rest-spread": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-chaining": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-top-level-await": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-typescript": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz",
+			"integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/template": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+			"integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.7.tgz",
+			"integrity": "sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.16.7",
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-function-name": "^7.16.7",
+				"@babel/helper-hoist-variables": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/types": "^7.16.7",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/types": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.7.tgz",
+			"integrity": "sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"to-fast-properties": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@bcoe/v8-coverage": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+			"dev": true
+		},
+		"node_modules/@cspotcode/source-map-consumer": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
+			"integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 12"
+			}
+		},
+		"node_modules/@cspotcode/source-map-support": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
+			"integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
+			"dev": true,
+			"dependencies": {
+				"@cspotcode/source-map-consumer": "0.8.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@eslint/eslintrc": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
+			"integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^6.12.4",
+				"debug": "^4.3.2",
+				"espree": "^9.2.0",
+				"globals": "^13.9.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/@humanwhocodes/config-array": {
+			"version": "0.9.2",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz",
+			"integrity": "sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==",
+			"dev": true,
+			"dependencies": {
+				"@humanwhocodes/object-schema": "^1.2.1",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=10.10.0"
+			}
+		},
+		"node_modules/@humanwhocodes/object-schema": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+			"dev": true
+		},
+		"node_modules/@istanbuljs/load-nyc-config": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+			"dev": true,
+			"dependencies": {
+				"camelcase": "^5.3.1",
+				"find-up": "^4.1.0",
+				"get-package-type": "^0.1.0",
+				"js-yaml": "^3.13.1",
+				"resolve-from": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/schema": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/console": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz",
+			"integrity": "sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"jest-message-util": "^27.4.2",
+				"jest-util": "^27.4.2",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/core": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.5.tgz",
+			"integrity": "sha512-3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^27.4.2",
+				"@jest/reporters": "^27.4.5",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"emittery": "^0.8.1",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"jest-changed-files": "^27.4.2",
+				"jest-config": "^27.4.5",
+				"jest-haste-map": "^27.4.5",
+				"jest-message-util": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-resolve-dependencies": "^27.4.5",
+				"jest-runner": "^27.4.5",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"jest-watcher": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"rimraf": "^3.0.0",
+				"slash": "^3.0.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@jest/environment": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.4.tgz",
+			"integrity": "sha512-q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz",
+			"integrity": "sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"@sinonjs/fake-timers": "^8.0.1",
+				"@types/node": "*",
+				"jest-message-util": "^27.4.2",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/globals": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.4.tgz",
+			"integrity": "sha512-bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^27.4.4",
+				"@jest/types": "^27.4.2",
+				"expect": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/reporters": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.5.tgz",
+			"integrity": "sha512-3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA==",
+			"dev": true,
+			"dependencies": {
+				"@bcoe/v8-coverage": "^0.2.3",
+				"@jest/console": "^27.4.2",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.2",
+				"graceful-fs": "^4.2.4",
+				"istanbul-lib-coverage": "^3.0.0",
+				"istanbul-lib-instrument": "^4.0.3",
+				"istanbul-lib-report": "^3.0.0",
+				"istanbul-lib-source-maps": "^4.0.0",
+				"istanbul-reports": "^3.0.2",
+				"jest-haste-map": "^27.4.5",
+				"jest-resolve": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"slash": "^3.0.0",
+				"source-map": "^0.6.0",
+				"string-length": "^4.0.1",
+				"terminal-link": "^2.0.0",
+				"v8-to-istanbul": "^8.1.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@jest/source-map": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz",
+			"integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==",
+			"dev": true,
+			"dependencies": {
+				"callsites": "^3.0.0",
+				"graceful-fs": "^4.2.4",
+				"source-map": "^0.6.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/test-result": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz",
+			"integrity": "sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"collect-v8-coverage": "^1.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/test-sequencer": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.5.tgz",
+			"integrity": "sha512-n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/test-result": "^27.4.2",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-runtime": "^27.4.5"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/transform": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.5.tgz",
+			"integrity": "sha512-PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.1.0",
+				"@jest/types": "^27.4.2",
+				"babel-plugin-istanbul": "^6.0.0",
+				"chalk": "^4.0.0",
+				"convert-source-map": "^1.4.0",
+				"fast-json-stable-stringify": "^2.0.0",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-regex-util": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"pirates": "^4.0.1",
+				"slash": "^3.0.0",
+				"source-map": "^0.6.1",
+				"write-file-atomic": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/types": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
+			"integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^16.0.0",
+				"chalk": "^4.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@microsoft/api-extractor": {
+			"version": "7.19.3",
+			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.19.3.tgz",
+			"integrity": "sha512-GZe+R3K4kh2X425iOHkPbByysB7FN0592mPPA6vNj5IhyhlPHgdZS6m6AmOZOIxMS4euM+SBKzEJEp3oC+WsOQ==",
+			"dev": true,
+			"dependencies": {
+				"@microsoft/api-extractor-model": "7.15.2",
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "~0.15.2",
+				"@rushstack/node-core-library": "3.44.3",
+				"@rushstack/rig-package": "0.3.7",
+				"@rushstack/ts-command-line": "4.10.6",
+				"colors": "~1.2.1",
+				"lodash": "~4.17.15",
+				"resolve": "~1.17.0",
+				"semver": "~7.3.0",
+				"source-map": "~0.6.1",
+				"typescript": "~4.5.2"
+			},
+			"bin": {
+				"api-extractor": "bin/api-extractor"
+			}
+		},
+		"node_modules/@microsoft/api-extractor-model": {
+			"version": "7.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.15.2.tgz",
+			"integrity": "sha512-qgxKX/s6vo3nCVLhP0Ds7555QrErhcYHEok5/KyEZ7iR8J5M5oldD1eJJQmtEdVF5IzmnPPbxx1nRvfgA674LQ==",
+			"dev": true,
+			"dependencies": {
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "~0.15.2",
+				"@rushstack/node-core-library": "3.44.3"
+			}
+		},
+		"node_modules/@microsoft/api-extractor/node_modules/resolve": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+			"dev": true,
+			"dependencies": {
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/@microsoft/tsdoc": {
+			"version": "0.13.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
+			"integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
+			"dev": true
+		},
+		"node_modules/@microsoft/tsdoc-config": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
+			"integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
+			"dev": true,
+			"dependencies": {
+				"@microsoft/tsdoc": "0.13.2",
+				"ajv": "~6.12.6",
+				"jju": "~1.4.0",
+				"resolve": "~1.19.0"
+			}
+		},
+		"node_modules/@microsoft/tsdoc-config/node_modules/resolve": {
+			"version": "1.19.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+			"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+			"dev": true,
+			"dependencies": {
+				"is-core-module": "^2.1.0",
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/@nodelib/fs.scandir": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
+			"integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "2.0.4",
+				"run-parallel": "^1.1.9"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.stat": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
+			"integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.walk": {
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
+			"integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.scandir": "2.1.4",
+				"fastq": "^1.6.0"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@rushstack/node-core-library": {
+			"version": "3.44.3",
+			"resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.44.3.tgz",
+			"integrity": "sha512-Bt+R5LAnVr2BImTJqPpton5rvhJ2Wq8x4BaTqaCHQMmfxqtz5lb4nLYT9kneMJTCDuRMBvvLpSuz4MBj50PV3w==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "12.20.24",
+				"colors": "~1.2.1",
+				"fs-extra": "~7.0.1",
+				"import-lazy": "~4.0.0",
+				"jju": "~1.4.0",
+				"resolve": "~1.17.0",
+				"semver": "~7.3.0",
+				"timsort": "~0.3.0",
+				"z-schema": "~5.0.2"
+			}
+		},
+		"node_modules/@rushstack/node-core-library/node_modules/@types/node": {
+			"version": "12.20.24",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz",
+			"integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==",
+			"dev": true
+		},
+		"node_modules/@rushstack/node-core-library/node_modules/resolve": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+			"dev": true,
+			"dependencies": {
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/@rushstack/rig-package": {
+			"version": "0.3.7",
+			"resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.7.tgz",
+			"integrity": "sha512-pzMsTSeTC8IiZ6EJLr53gGMvhT4oLWH+hxD7907cHyWuIUlEXFtu/2pK25vUQT13nKp5DJCWxXyYoGRk/h6rtA==",
+			"dev": true,
+			"dependencies": {
+				"resolve": "~1.17.0",
+				"strip-json-comments": "~3.1.1"
+			}
+		},
+		"node_modules/@rushstack/rig-package/node_modules/resolve": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+			"dev": true,
+			"dependencies": {
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/@rushstack/ts-command-line": {
+			"version": "4.10.6",
+			"resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.10.6.tgz",
+			"integrity": "sha512-Y3GkUag39sTIlukDg9mUp8MCHrrlJ27POrBNRQGc/uF+VVgX8M7zMzHch5zP6O1QVquWgD7Engdpn2piPYaS/g==",
+			"dev": true,
+			"dependencies": {
+				"@types/argparse": "1.0.38",
+				"argparse": "~1.0.9",
+				"colors": "~1.2.1",
+				"string-argv": "~0.3.1"
+			}
+		},
+		"node_modules/@sinonjs/commons": {
+			"version": "1.8.3",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+			"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+			"dev": true,
+			"dependencies": {
+				"type-detect": "4.0.8"
+			}
+		},
+		"node_modules/@sinonjs/fake-timers": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+			"integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+			"dev": true,
+			"dependencies": {
+				"@sinonjs/commons": "^1.7.0"
+			}
+		},
+		"node_modules/@tootallnate/once": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/@tsconfig/node10": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
+			"integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
+			"dev": true
+		},
+		"node_modules/@tsconfig/node12": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
+			"integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
+			"dev": true
+		},
+		"node_modules/@tsconfig/node14": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
+			"integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
+			"dev": true
+		},
+		"node_modules/@tsconfig/node16": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
+			"integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
+			"dev": true
+		},
+		"node_modules/@tsd/typescript": {
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/@tsd/typescript/-/typescript-4.5.4.tgz",
+			"integrity": "sha512-iDlLkdg3sCjUSNdoUCsYM/SXheHrdxHsR6msIkbFDW4pV6gHTMwg/8te/paLtywDjGL4S4ByDdUKA3RbfdBX0g==",
+			"dev": true,
+			"bin": {
+				"tsc": "typescript/bin/tsc",
+				"tsserver": "typescript/bin/tsserver"
+			}
+		},
+		"node_modules/@types/argparse": {
+			"version": "1.0.38",
+			"resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz",
+			"integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==",
+			"dev": true
+		},
+		"node_modules/@types/babel__core": {
+			"version": "7.1.18",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz",
+			"integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0",
+				"@types/babel__generator": "*",
+				"@types/babel__template": "*",
+				"@types/babel__traverse": "*"
+			}
+		},
+		"node_modules/@types/babel__generator": {
+			"version": "7.6.4",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+			"integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"node_modules/@types/babel__template": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+			"integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+			"dev": true,
+			"dependencies": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"node_modules/@types/babel__traverse": {
+			"version": "7.14.2",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
+			"integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.3.0"
+			}
+		},
+		"node_modules/@types/eslint": {
+			"version": "7.29.0",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
+			"integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
+			"dev": true,
+			"dependencies": {
+				"@types/estree": "*",
+				"@types/json-schema": "*"
+			}
+		},
+		"node_modules/@types/estree": {
+			"version": "0.0.50",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
+			"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+			"dev": true
+		},
+		"node_modules/@types/graceful-fs": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+			"integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/istanbul-lib-coverage": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+			"integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+			"dev": true
+		},
+		"node_modules/@types/istanbul-lib-report": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-coverage": "*"
+			}
+		},
+		"node_modules/@types/istanbul-reports": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+			"integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-report": "*"
+			}
+		},
+		"node_modules/@types/jest": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz",
+			"integrity": "sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==",
+			"dev": true,
+			"dependencies": {
+				"jest-diff": "^27.0.0",
+				"pretty-format": "^27.0.0"
+			}
+		},
+		"node_modules/@types/json-schema": {
+			"version": "7.0.9",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+			"dev": true
+		},
+		"node_modules/@types/minimist": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
+			"integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+			"dev": true
+		},
+		"node_modules/@types/node": {
+			"version": "17.0.5",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.5.tgz",
+			"integrity": "sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw==",
+			"dev": true
+		},
+		"node_modules/@types/normalize-package-data": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+			"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+			"dev": true
+		},
+		"node_modules/@types/prettier": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
+			"integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
+			"dev": true
+		},
+		"node_modules/@types/stack-utils": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+			"integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+			"dev": true
+		},
+		"node_modules/@types/yargs": {
+			"version": "16.0.4",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+			"integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+			"dev": true,
+			"dependencies": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"node_modules/@types/yargs-parser": {
+			"version": "20.2.1",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
+			"integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
+			"dev": true
+		},
+		"node_modules/@typescript-eslint/eslint-plugin": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.1.tgz",
+			"integrity": "sha512-wTZ5oEKrKj/8/366qTM366zqhIKAp6NCMweoRONtfuC07OAU9nVI2GZZdqQ1qD30WAAtcPdkH+npDwtRFdp4Rw==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/experimental-utils": "5.8.1",
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"debug": "^4.3.2",
+				"functional-red-black-tree": "^1.0.1",
+				"ignore": "^5.1.8",
+				"regexpp": "^3.2.0",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"@typescript-eslint/parser": "^5.0.0",
+				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/experimental-utils": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.1.tgz",
+			"integrity": "sha512-fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/typescript-estree": "5.8.1",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^3.0.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/@typescript-eslint/parser": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.8.1.tgz",
+			"integrity": "sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/typescript-estree": "5.8.1",
+				"debug": "^4.3.2"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/scope-manager": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.8.1.tgz",
+			"integrity": "sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/visitor-keys": "5.8.1"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/types": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.1.tgz",
+			"integrity": "sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz",
+			"integrity": "sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/visitor-keys": "5.8.1",
+				"debug": "^4.3.2",
+				"globby": "^11.0.4",
+				"is-glob": "^4.0.3",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/visitor-keys": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.1.tgz",
+			"integrity": "sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.8.1",
+				"eslint-visitor-keys": "^3.0.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/abab": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+			"integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+			"dev": true
+		},
+		"node_modules/acorn": {
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-globals": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+			"integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^7.1.1",
+				"acorn-walk": "^7.1.1"
+			}
+		},
+		"node_modules/acorn-globals/node_modules/acorn": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"peerDependencies": {
+				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/acorn-walk": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/agent-base": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+			"dev": true,
+			"dependencies": {
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6.0.0"
+			}
+		},
+		"node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/ansi-escapes": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.21.3"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ansi-escapes/node_modules/type-fest": {
+			"version": "0.21.3",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/anymatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+			"dev": true,
+			"dependencies": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/arg": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+			"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+			"dev": true
+		},
+		"node_modules/argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"dependencies": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"node_modules/array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/arrify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+			"dev": true
+		},
+		"node_modules/autobind-decorator": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/autobind-decorator/-/autobind-decorator-2.4.0.tgz",
+			"integrity": "sha512-OGYhWUO72V6DafbF8PM8rm3EPbfuyMZcJhtm5/n26IDwO18pohE4eNazLoCGhPiXOCD0gEGmrbU3849QvM8bbw==",
+			"engines": {
+				"node": ">=8.10",
+				"npm": ">=6.4.1"
+			}
+		},
+		"node_modules/babel-jest": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.5.tgz",
+			"integrity": "sha512-3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.0.0",
+				"babel-preset-jest": "^27.4.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.8.0"
+			}
+		},
+		"node_modules/babel-plugin-istanbul": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-instrument": "^5.0.4",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
+			"integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.12.3",
+				"@babel/parser": "^7.14.7",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-coverage": "^3.2.0",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-plugin-istanbul/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/babel-plugin-jest-hoist": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz",
+			"integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.0.0",
+				"@types/babel__traverse": "^7.0.6"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/babel-preset-current-node-syntax": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-bigint": "^7.8.3",
+				"@babel/plugin-syntax-class-properties": "^7.8.3",
+				"@babel/plugin-syntax-import-meta": "^7.8.3",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-top-level-await": "^7.8.3"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/babel-preset-jest": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz",
+			"integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==",
+			"dev": true,
+			"dependencies": {
+				"babel-plugin-jest-hoist": "^27.4.0",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true
+		},
+		"node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/browser-process-hrtime": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+			"dev": true
+		},
+		"node_modules/browserslist": {
+			"version": "4.19.1",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+			"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+			"dev": true,
+			"dependencies": {
+				"caniuse-lite": "^1.0.30001286",
+				"electron-to-chromium": "^1.4.17",
+				"escalade": "^3.1.1",
+				"node-releases": "^2.0.1",
+				"picocolors": "^1.0.0"
+			},
+			"bin": {
+				"browserslist": "cli.js"
+			},
+			"engines": {
+				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/browserslist"
+			}
+		},
+		"node_modules/bs-logger": {
+			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+			"dev": true,
+			"dependencies": {
+				"fast-json-stable-stringify": "2.x"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/bser": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+			"dev": true,
+			"dependencies": {
+				"node-int64": "^0.4.0"
+			}
+		},
+		"node_modules/buffer-from": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+			"dev": true
+		},
+		"node_modules/callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/camelcase": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/camelcase-keys": {
+			"version": "6.2.2",
+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+			"dev": true,
+			"dependencies": {
+				"camelcase": "^5.3.1",
+				"map-obj": "^4.0.0",
+				"quick-lru": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/caniuse-lite": {
+			"version": "1.0.30001294",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz",
+			"integrity": "sha512-LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g==",
+			"dev": true,
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/browserslist"
+			}
+		},
+		"node_modules/chalk": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+			"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/char-regex": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/ci-info": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
+			"integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+			"dev": true
+		},
+		"node_modules/cjs-module-lexer": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
+			"integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+			"dev": true
+		},
+		"node_modules/cliui": {
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+			"dev": true,
+			"dependencies": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^7.0.0"
+			}
+		},
+		"node_modules/co": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+			"dev": true,
+			"engines": {
+				"iojs": ">= 1.0.0",
+				"node": ">= 0.12.0"
+			}
+		},
+		"node_modules/collect-v8-coverage": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+			"dev": true
+		},
+		"node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/colors": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
+			"integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.1.90"
+			}
+		},
+		"node_modules/combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dev": true,
+			"dependencies": {
+				"delayed-stream": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"node_modules/convert-source-map": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+			"dev": true,
+			"dependencies": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
+		"node_modules/create-require": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+			"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+			"dev": true
+		},
+		"node_modules/cross-fetch": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
+			"integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
+			"dev": true,
+			"dependencies": {
+				"node-fetch": "2.6.1"
+			}
+		},
+		"node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/cssom": {
+			"version": "0.4.4",
+			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+			"integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+			"dev": true
+		},
+		"node_modules/cssstyle": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+			"integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+			"dev": true,
+			"dependencies": {
+				"cssom": "~0.3.6"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cssstyle/node_modules/cssom": {
+			"version": "0.3.8",
+			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+			"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+			"dev": true
+		},
+		"node_modules/data-urls": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+			"integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+			"dev": true,
+			"dependencies": {
+				"abab": "^2.0.3",
+				"whatwg-mimetype": "^2.3.0",
+				"whatwg-url": "^8.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/debug": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.1.2"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/decamelize": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decamelize-keys": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+			"integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+			"dev": true,
+			"dependencies": {
+				"decamelize": "^1.1.0",
+				"map-obj": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decamelize-keys/node_modules/map-obj": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decimal.js": {
+			"version": "10.3.1",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+			"integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+			"dev": true
+		},
+		"node_modules/dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+			"dev": true
+		},
+		"node_modules/deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
+		"node_modules/deepmerge": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/detect-newline": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/diff": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.3.1"
+			}
+		},
+		"node_modules/diff-sequences": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz",
+			"integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==",
+			"dev": true,
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"dev": true,
+			"dependencies": {
+				"path-type": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"dependencies": {
+				"esutils": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/domexception": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+			"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+			"dev": true,
+			"dependencies": {
+				"webidl-conversions": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/domexception/node_modules/webidl-conversions": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+			"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/electron-to-chromium": {
+			"version": "1.4.31",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.31.tgz",
+			"integrity": "sha512-t3XVQtk+Frkv6aTD4RRk0OqosU+VLe1dQFW83MDer78ZD6a52frgXuYOIsLYTQiH2Lm+JB2OKYcn7zrX+YGAiQ==",
+			"dev": true
+		},
+		"node_modules/emittery": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+			"integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/emittery?sponsor=1"
+			}
+		},
+		"node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"node_modules/enquirer": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+			"dev": true,
+			"dependencies": {
+				"ansi-colors": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/error-ex": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"dev": true,
+			"dependencies": {
+				"is-arrayish": "^0.2.1"
+			}
+		},
+		"node_modules/escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/escodegen": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+			"integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+			"dev": true,
+			"dependencies": {
+				"esprima": "^4.0.1",
+				"estraverse": "^5.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1"
+			},
+			"bin": {
+				"escodegen": "bin/escodegen.js",
+				"esgenerate": "bin/esgenerate.js"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"optionalDependencies": {
+				"source-map": "~0.6.1"
+			}
+		},
+		"node_modules/escodegen/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/levn": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+			"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/optionator": {
+			"version": "0.8.3",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+			"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+			"dev": true,
+			"dependencies": {
+				"deep-is": "~0.1.3",
+				"fast-levenshtein": "~2.0.6",
+				"levn": "~0.3.0",
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2",
+				"word-wrap": "~1.2.3"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/prelude-ls": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+			"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/type-check": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "~1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/eslint": {
+			"version": "8.6.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.6.0.tgz",
+			"integrity": "sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==",
+			"dev": true,
+			"dependencies": {
+				"@eslint/eslintrc": "^1.0.5",
+				"@humanwhocodes/config-array": "^0.9.2",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.3.2",
+				"doctrine": "^3.0.0",
+				"enquirer": "^2.3.5",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^7.1.0",
+				"eslint-utils": "^3.0.0",
+				"eslint-visitor-keys": "^3.1.0",
+				"espree": "^9.3.0",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^6.0.1",
+				"globals": "^13.6.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^4.1.0",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"progress": "^2.0.0",
+				"regexpp": "^3.2.0",
+				"semver": "^7.2.1",
+				"strip-ansi": "^6.0.1",
+				"strip-json-comments": "^3.1.0",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"bin": {
+				"eslint": "bin/eslint.js"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint-formatter-pretty": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz",
+			"integrity": "sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/eslint": "^7.2.13",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.1.0",
+				"eslint-rule-docs": "^1.1.5",
+				"log-symbols": "^4.0.0",
+				"plur": "^4.0.0",
+				"string-width": "^4.2.0",
+				"supports-hyperlinks": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint-rule-docs": {
+			"version": "1.1.231",
+			"resolved": "https://registry.npmjs.org/eslint-rule-docs/-/eslint-rule-docs-1.1.231.tgz",
+			"integrity": "sha512-egHz9A1WG7b8CS0x1P6P/Rj5FqZOjray/VjpJa14tMZalfRKvpE2ONJ3plCM7+PcinmU4tcmbPLv0VtwzSdLVA==",
+			"dev": true
+		},
+		"node_modules/eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=5"
+			}
+		},
+		"node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/eslint-visitor-keys": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
+			"integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint/node_modules/eslint-scope": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
+			"integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/eslint/node_modules/glob-parent": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.3"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/eslint/node_modules/ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/espree": {
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
+			"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.7.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^3.1.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true,
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/esquery": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/esquery/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/eventemitter3": {
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+		},
+		"node_modules/execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+			"dev": true,
+			"dependencies": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
+			}
+		},
+		"node_modules/exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/expect": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz",
+			"integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"ansi-styles": "^5.0.0",
+				"jest-get-type": "^27.4.0",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-regex-util": "^27.4.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/expect/node_modules/ansi-styles": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
+		},
+		"node_modules/fast-glob": {
+			"version": "3.2.5",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
+			"integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.0",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.2",
+				"picomatch": "^2.2.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"node_modules/fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"node_modules/fastq": {
+			"version": "1.11.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
+			"integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+			"dev": true,
+			"dependencies": {
+				"reusify": "^1.0.4"
+			}
+		},
+		"node_modules/fb-watchman": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+			"integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+			"dev": true,
+			"dependencies": {
+				"bser": "2.1.1"
+			}
+		},
+		"node_modules/file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"dependencies": {
+				"flat-cache": "^3.0.4"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"dev": true,
+			"dependencies": {
+				"flatted": "^3.1.0",
+				"rimraf": "^3.0.2"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/flatted": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
+			"integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==",
+			"dev": true
+		},
+		"node_modules/form-data": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+			"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+			"dev": true,
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/fs-extra": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.1.2",
+				"jsonfile": "^4.0.0",
+				"universalify": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=6 <7 || >=8"
+			}
+		},
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"dev": true
+		},
+		"node_modules/fsevents": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+			"dev": true,
+			"hasInstallScript": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
+		"node_modules/function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+			"dev": true
+		},
+		"node_modules/functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
+		"node_modules/gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true,
+			"engines": {
+				"node": "6.* || 8.* || >= 10.*"
+			}
+		},
+		"node_modules/get-package-type": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/glob": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+			"dev": true,
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/globals": {
+			"version": "13.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+			"integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/globby": {
+			"version": "11.0.4",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+			"integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+			"dev": true,
+			"dependencies": {
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.1.1",
+				"ignore": "^5.1.4",
+				"merge2": "^1.3.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/graceful-fs": {
+			"version": "4.2.6",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+			"integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+			"dev": true
+		},
+		"node_modules/hard-rejection": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4.0"
+			}
+		},
+		"node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/hosted-git-info": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/html-encoding-sniffer": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+			"integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+			"dev": true,
+			"dependencies": {
+				"whatwg-encoding": "^1.0.5"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/html-escaper": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+			"dev": true
+		},
+		"node_modules/http-proxy-agent": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+			"dev": true,
+			"dependencies": {
+				"@tootallnate/once": "1",
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/https-proxy-agent": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+			"dev": true,
+			"dependencies": {
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.17.0"
+			}
+		},
+		"node_modules/iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"dev": true,
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ignore": {
+			"version": "5.1.8",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
+			"dependencies": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/import-lazy": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/import-local": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
+			"integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
+			"dev": true,
+			"dependencies": {
+				"pkg-dir": "^4.2.0",
+				"resolve-cwd": "^3.0.0"
+			},
+			"bin": {
+				"import-local-fixture": "fixtures/cli.js"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.19"
+			}
+		},
+		"node_modules/indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"dev": true,
+			"dependencies": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"node_modules/irregular-plurals": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz",
+			"integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+			"dev": true
+		},
+		"node_modules/is-core-module": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
+			"integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+			"dev": true,
+			"dependencies": {
+				"has": "^1.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-generator-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+			"dev": true,
+			"dependencies": {
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/is-plain-obj": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-potential-custom-element-name": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+			"dev": true
+		},
+		"node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+			"dev": true
+		},
+		"node_modules/is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"node_modules/istanbul-lib-coverage": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/istanbul-lib-instrument": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+			"integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.7.5",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-coverage": "^3.0.0",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/istanbul-lib-instrument/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/istanbul-lib-report": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+			"dev": true,
+			"dependencies": {
+				"istanbul-lib-coverage": "^3.0.0",
+				"make-dir": "^3.0.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/istanbul-lib-source-maps": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+			"dev": true,
+			"dependencies": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^3.0.0",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-reports": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz",
+			"integrity": "sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==",
+			"dev": true,
+			"dependencies": {
+				"html-escaper": "^2.0.0",
+				"istanbul-lib-report": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest/-/jest-27.4.5.tgz",
+			"integrity": "sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/core": "^27.4.5",
+				"import-local": "^3.0.2",
+				"jest-cli": "^27.4.5"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-changed-files": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz",
+			"integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"execa": "^5.0.0",
+				"throat": "^6.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-circus": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.5.tgz",
+			"integrity": "sha512-eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^27.4.4",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"dedent": "^0.7.0",
+				"expect": "^27.4.2",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^27.4.2",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3",
+				"throat": "^6.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-cli": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.5.tgz",
+			"integrity": "sha512-hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/core": "^27.4.5",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"import-local": "^3.0.2",
+				"jest-config": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"prompts": "^2.0.1",
+				"yargs": "^16.2.0"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-config": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.5.tgz",
+			"integrity": "sha512-t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.1.0",
+				"@jest/test-sequencer": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"babel-jest": "^27.4.5",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"deepmerge": "^4.2.2",
+				"glob": "^7.1.1",
+				"graceful-fs": "^4.2.4",
+				"jest-circus": "^27.4.5",
+				"jest-environment-jsdom": "^27.4.4",
+				"jest-environment-node": "^27.4.4",
+				"jest-get-type": "^27.4.0",
+				"jest-jasmine2": "^27.4.5",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-runner": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"ts-node": ">=9.0.0"
+			},
+			"peerDependenciesMeta": {
+				"ts-node": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-diff": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz",
+			"integrity": "sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^27.4.0",
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-docblock": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz",
+			"integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==",
+			"dev": true,
+			"dependencies": {
+				"detect-newline": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-each": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz",
+			"integrity": "sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-environment-jsdom": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz",
+			"integrity": "sha512-cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^27.4.4",
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2",
+				"jsdom": "^16.6.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-environment-node": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.4.tgz",
+			"integrity": "sha512-D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^27.4.4",
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-fetch-mock": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz",
+			"integrity": "sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==",
+			"dev": true,
+			"dependencies": {
+				"cross-fetch": "^3.0.4",
+				"promise-polyfill": "^8.1.3"
+			}
+		},
+		"node_modules/jest-get-type": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
+			"integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==",
+			"dev": true,
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-haste-map": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.5.tgz",
+			"integrity": "sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"@types/graceful-fs": "^4.1.2",
+				"@types/node": "*",
+				"anymatch": "^3.0.3",
+				"fb-watchman": "^2.0.0",
+				"graceful-fs": "^4.2.4",
+				"jest-regex-util": "^27.4.0",
+				"jest-serializer": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"micromatch": "^4.0.4",
+				"walker": "^1.0.7"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.2"
+			}
+		},
+		"node_modules/jest-jasmine2": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.5.tgz",
+			"integrity": "sha512-oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/traverse": "^7.1.0",
+				"@jest/environment": "^27.4.4",
+				"@jest/source-map": "^27.4.0",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"expect": "^27.4.2",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^27.4.2",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2",
+				"throat": "^6.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-leak-detector": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz",
+			"integrity": "sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==",
+			"dev": true,
+			"dependencies": {
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-matcher-utils": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz",
+			"integrity": "sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^27.4.2",
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-message-util": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz",
+			"integrity": "sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.4.2",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-mock": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz",
+			"integrity": "sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-pnp-resolver": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			},
+			"peerDependencies": {
+				"jest-resolve": "*"
+			},
+			"peerDependenciesMeta": {
+				"jest-resolve": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-regex-util": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
+			"integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==",
+			"dev": true,
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-resolve": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.5.tgz",
+			"integrity": "sha512-xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-pnp-resolver": "^1.2.2",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"resolve": "^1.20.0",
+				"resolve.exports": "^1.1.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-resolve-dependencies": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.5.tgz",
+			"integrity": "sha512-elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-snapshot": "^27.4.5"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-runner": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.5.tgz",
+			"integrity": "sha512-/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^27.4.2",
+				"@jest/environment": "^27.4.4",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"emittery": "^0.8.1",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"jest-docblock": "^27.4.0",
+				"jest-environment-jsdom": "^27.4.4",
+				"jest-environment-node": "^27.4.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-leak-detector": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-resolve": "^27.4.5",
+				"jest-runtime": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"source-map-support": "^0.5.6",
+				"throat": "^6.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-runtime": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.5.tgz",
+			"integrity": "sha512-CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^27.4.2",
+				"@jest/environment": "^27.4.4",
+				"@jest/globals": "^27.4.4",
+				"@jest/source-map": "^27.4.0",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/yargs": "^16.0.0",
+				"chalk": "^4.0.0",
+				"cjs-module-lexer": "^1.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"execa": "^5.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-message-util": "^27.4.2",
+				"jest-mock": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"slash": "^3.0.0",
+				"strip-bom": "^4.0.0",
+				"yargs": "^16.2.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-serializer": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
+			"integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"graceful-fs": "^4.2.4"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-snapshot": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.5.tgz",
+			"integrity": "sha512-eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.7.2",
+				"@babel/generator": "^7.7.2",
+				"@babel/parser": "^7.7.2",
+				"@babel/plugin-syntax-typescript": "^7.7.2",
+				"@babel/traverse": "^7.7.2",
+				"@babel/types": "^7.0.0",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/babel__traverse": "^7.0.4",
+				"@types/prettier": "^2.1.5",
+				"babel-preset-current-node-syntax": "^1.0.0",
+				"chalk": "^4.0.0",
+				"expect": "^27.4.2",
+				"graceful-fs": "^4.2.4",
+				"jest-diff": "^27.4.2",
+				"jest-get-type": "^27.4.0",
+				"jest-haste-map": "^27.4.5",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-resolve": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"natural-compare": "^1.4.0",
+				"pretty-format": "^27.4.2",
+				"semver": "^7.3.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-util": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
+			"integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"graceful-fs": "^4.2.4",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-validate": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz",
+			"integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"camelcase": "^6.2.0",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^27.4.0",
+				"leven": "^3.1.0",
+				"pretty-format": "^27.4.2"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-validate/node_modules/camelcase": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
+			"integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/jest-watcher": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz",
+			"integrity": "sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"jest-util": "^27.4.2",
+				"string-length": "^4.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-websocket-mock": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/jest-websocket-mock/-/jest-websocket-mock-2.2.1.tgz",
+			"integrity": "sha512-fhsGLXrPfs06PhHoxqOSA9yZ6Rb4qYrf4Wcm7/nfRzjlrf1gIeuhYUkzMRjjE0TMQ37SwkmeLanwrZY4ZaNp8g==",
+			"dev": true,
+			"dependencies": {
+				"jest-diff": "^27.0.2"
+			},
+			"peerDependencies": {
+				"mock-socket": "^8||^9"
+			}
+		},
+		"node_modules/jest-worker": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz",
+			"integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			}
+		},
+		"node_modules/jest-worker/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/jju": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+			"integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
+			"dev": true
+		},
+		"node_modules/js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
+		"node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/js-yaml/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/jsdom": {
+			"version": "16.7.0",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+			"integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+			"dev": true,
+			"dependencies": {
+				"abab": "^2.0.5",
+				"acorn": "^8.2.4",
+				"acorn-globals": "^6.0.0",
+				"cssom": "^0.4.4",
+				"cssstyle": "^2.3.0",
+				"data-urls": "^2.0.0",
+				"decimal.js": "^10.2.1",
+				"domexception": "^2.0.1",
+				"escodegen": "^2.0.0",
+				"form-data": "^3.0.0",
+				"html-encoding-sniffer": "^2.0.1",
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"is-potential-custom-element-name": "^1.0.1",
+				"nwsapi": "^2.2.0",
+				"parse5": "6.0.1",
+				"saxes": "^5.0.1",
+				"symbol-tree": "^3.2.4",
+				"tough-cookie": "^4.0.0",
+				"w3c-hr-time": "^1.0.2",
+				"w3c-xmlserializer": "^2.0.0",
+				"webidl-conversions": "^6.1.0",
+				"whatwg-encoding": "^1.0.5",
+				"whatwg-mimetype": "^2.3.0",
+				"whatwg-url": "^8.5.0",
+				"ws": "^7.4.6",
+				"xml-name-validator": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"peerDependencies": {
+				"canvas": "^2.5.0"
+			},
+			"peerDependenciesMeta": {
+				"canvas": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jsesc": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"dev": true,
+			"bin": {
+				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+			"dev": true
+		},
+		"node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"node_modules/json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+			"dev": true
+		},
+		"node_modules/json5": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+			"dev": true,
+			"dependencies": {
+				"minimist": "^1.2.5"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/jsonfile": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+			"dev": true,
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/kleur": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/lines-and-columns": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+			"dev": true
+		},
+		"node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/lodash": {
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+			"dev": true
+		},
+		"node_modules/lodash.get": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+			"dev": true
+		},
+		"node_modules/lodash.isequal": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+			"dev": true
+		},
+		"node_modules/lodash.memoize": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+			"dev": true
+		},
+		"node_modules/lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true
+		},
+		"node_modules/log-symbols": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.1.0",
+				"is-unicode-supported": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/make-dir": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+			"dev": true,
+			"dependencies": {
+				"semver": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/make-dir/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/make-error": {
+			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+			"dev": true
+		},
+		"node_modules/makeerror": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+			"dev": true,
+			"dependencies": {
+				"tmpl": "1.0.5"
+			}
+		},
+		"node_modules/map-obj": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
+			"integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/meow": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/minimist": "^1.2.0",
+				"camelcase-keys": "^6.2.2",
+				"decamelize": "^1.2.0",
+				"decamelize-keys": "^1.1.0",
+				"hard-rejection": "^2.1.0",
+				"minimist-options": "4.1.0",
+				"normalize-package-data": "^3.0.0",
+				"read-pkg-up": "^7.0.1",
+				"redent": "^3.0.0",
+				"trim-newlines": "^3.0.0",
+				"type-fest": "^0.18.0",
+				"yargs-parser": "^20.2.3"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/meow/node_modules/type-fest": {
+			"version": "0.18.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+			"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/merge-stream": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+			"dev": true
+		},
+		"node_modules/merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/micromatch": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"dev": true,
+			"dependencies": {
+				"braces": "^3.0.1",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/mime-db": {
+			"version": "1.51.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+			"integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mime-types": {
+			"version": "2.1.34",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+			"integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+			"dev": true,
+			"dependencies": {
+				"mime-db": "1.51.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/min-indent": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"dev": true
+		},
+		"node_modules/minimist-options": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+			"dev": true,
+			"dependencies": {
+				"arrify": "^1.0.1",
+				"is-plain-obj": "^1.1.0",
+				"kind-of": "^6.0.3"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/mock-socket": {
+			"version": "9.0.8",
+			"resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.0.8.tgz",
+			"integrity": "sha512-8Syqkaaa2SzRqW68DEsnZkKQicHP7hVzfj3uCvigB5TL79H1ljKbwmOcRIENkx0ZTyu/5W6u+Pk9Qy6JCp38Ww==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"node_modules/natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"node_modules/node-fetch": {
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+			"dev": true,
+			"engines": {
+				"node": "4.x || >=6.0.0"
+			}
+		},
+		"node_modules/node-int64": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+			"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+			"dev": true
+		},
+		"node_modules/node-releases": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+			"dev": true
+		},
+		"node_modules/normalize-package-data": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
+			"integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
+			"dev": true,
+			"dependencies": {
+				"hosted-git-info": "^4.0.1",
+				"resolve": "^1.20.0",
+				"semver": "^7.3.4",
+				"validate-npm-package-license": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/nwsapi": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+			"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+			"dev": true
+		},
+		"node_modules/once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"dependencies": {
+				"wrappy": "1"
+			}
+		},
+		"node_modules/onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+			"dev": true,
+			"dependencies": {
+				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/optionator": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+			"dev": true,
+			"dependencies": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.3"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"dependencies": {
+				"callsites": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parse-json": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/parse5": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+			"dev": true
+		},
+		"node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true
+		},
+		"node_modules/path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/picocolors": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+			"dev": true
+		},
+		"node_modules/picomatch": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+			"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/pirates": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
+			"integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/plur": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
+			"integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
+			"dev": true,
+			"dependencies": {
+				"irregular-plurals": "^3.2.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/pretty-format": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz",
+			"integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^27.4.2",
+				"ansi-regex": "^5.0.1",
+				"ansi-styles": "^5.0.0",
+				"react-is": "^17.0.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/pretty-format/node_modules/ansi-styles": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/promise-polyfill": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.2.0.tgz",
+			"integrity": "sha512-k/TC0mIcPVF6yHhUvwAp7cvL6I2fFV7TzF1DuGPI8mBh4QQazf36xCKEHKTZKRysEoTQoQdKyP25J8MPJp7j5g==",
+			"dev": true
+		},
+		"node_modules/prompts": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+			"dev": true,
+			"dependencies": {
+				"kleur": "^3.0.3",
+				"sisteransi": "^1.0.5"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/psl": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+			"dev": true
+		},
+		"node_modules/punycode": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/quick-lru": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/react-is": {
+			"version": "17.0.2",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+			"dev": true
+		},
+		"node_modules/read-pkg": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+			"dev": true,
+			"dependencies": {
+				"@types/normalize-package-data": "^2.4.0",
+				"normalize-package-data": "^2.5.0",
+				"parse-json": "^5.0.0",
+				"type-fest": "^0.6.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg-up": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.1.0",
+				"read-pkg": "^5.2.0",
+				"type-fest": "^0.8.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg/node_modules/hosted-git-info": {
+			"version": "2.8.9",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+			"dev": true
+		},
+		"node_modules/read-pkg/node_modules/normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"dependencies": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
+		"node_modules/read-pkg/node_modules/semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/read-pkg/node_modules/type-fest": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/reconnecting-websocket": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz",
+			"integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng=="
+		},
+		"node_modules/redent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+			"dev": true,
+			"dependencies": {
+				"indent-string": "^4.0.0",
+				"strip-indent": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/regexpp": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			}
+		},
+		"node_modules/require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/resolve": {
+			"version": "1.20.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+			"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+			"dev": true,
+			"dependencies": {
+				"is-core-module": "^2.2.0",
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/resolve-cwd": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+			"dev": true,
+			"dependencies": {
+				"resolve-from": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/resolve-cwd/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/resolve.exports": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
+			"integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"dev": true,
+			"engines": {
+				"iojs": ">=1.0.0",
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
+		"node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"node_modules/safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"dev": true
+		},
+		"node_modules/saxes": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+			"integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+			"dev": true,
+			"dependencies": {
+				"xmlchars": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/semver": {
+			"version": "7.3.8",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+			"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/signal-exit": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
+			"integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
+			"dev": true
+		},
+		"node_modules/sisteransi": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+			"dev": true
+		},
+		"node_modules/slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/source-map-support": {
+			"version": "0.5.21",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+			"dev": true,
+			"dependencies": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
+		"node_modules/spdx-correct": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+			"dev": true,
+			"dependencies": {
+				"spdx-expression-parse": "^3.0.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/spdx-exceptions": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+			"dev": true
+		},
+		"node_modules/spdx-expression-parse": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+			"dev": true,
+			"dependencies": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/spdx-license-ids": {
+			"version": "3.0.9",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
+			"integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
+			"dev": true
+		},
+		"node_modules/sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
+		"node_modules/stack-utils": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
+			"integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+			"dev": true,
+			"dependencies": {
+				"escape-string-regexp": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/stack-utils/node_modules/escape-string-regexp": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/string-argv": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+			"integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.6.19"
+			}
+		},
+		"node_modules/string-length": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+			"dev": true,
+			"dependencies": {
+				"char-regex": "^1.0.2",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-bom": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-final-newline": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/strip-indent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+			"dev": true,
+			"dependencies": {
+				"min-indent": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/supports-hyperlinks": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+			"integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0",
+				"supports-color": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/symbol-tree": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+			"dev": true
+		},
+		"node_modules/terminal-link": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+			"integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-escapes": "^4.2.1",
+				"supports-hyperlinks": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/test-exclude": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+			"dev": true,
+			"dependencies": {
+				"@istanbuljs/schema": "^0.1.2",
+				"glob": "^7.1.4",
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+			"dev": true
+		},
+		"node_modules/throat": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
+			"integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+			"dev": true
+		},
+		"node_modules/timsort": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+			"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+			"dev": true
+		},
+		"node_modules/tmpl": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+			"dev": true
+		},
+		"node_modules/to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/tough-cookie": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+			"integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+			"dev": true,
+			"dependencies": {
+				"psl": "^1.1.33",
+				"punycode": "^2.1.1",
+				"universalify": "^0.1.2"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tr46": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+			"integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+			"dev": true,
+			"dependencies": {
+				"punycode": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/trim-newlines": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ts-jest": {
+			"version": "27.1.2",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.2.tgz",
+			"integrity": "sha512-eSOiJOWq6Hhs6Khzk5wKC5sgWIXgXqOCiIl1+3lfnearu58Hj4QpE5tUhQcA3xtZrELbcvAGCsd6HB8OsaVaTA==",
+			"dev": true,
+			"dependencies": {
+				"bs-logger": "0.x",
+				"fast-json-stable-stringify": "2.x",
+				"jest-util": "^27.0.0",
+				"json5": "2.x",
+				"lodash.memoize": "4.x",
+				"make-error": "1.x",
+				"semver": "7.x",
+				"yargs-parser": "20.x"
+			},
+			"bin": {
+				"ts-jest": "cli.js"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7.0.0-beta.0 <8",
+				"@types/jest": "^27.0.0",
+				"babel-jest": ">=27.0.0 <28",
+				"esbuild": "~0.14.0",
+				"jest": "^27.0.0",
+				"typescript": ">=3.8 <5.0"
+			},
+			"peerDependenciesMeta": {
+				"@babel/core": {
+					"optional": true
+				},
+				"@types/jest": {
+					"optional": true
+				},
+				"babel-jest": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ts-node": {
+			"version": "10.4.0",
+			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz",
+			"integrity": "sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==",
+			"dev": true,
+			"dependencies": {
+				"@cspotcode/source-map-support": "0.7.0",
+				"@tsconfig/node10": "^1.0.7",
+				"@tsconfig/node12": "^1.0.7",
+				"@tsconfig/node14": "^1.0.0",
+				"@tsconfig/node16": "^1.0.2",
+				"acorn": "^8.4.1",
+				"acorn-walk": "^8.1.1",
+				"arg": "^4.1.0",
+				"create-require": "^1.1.0",
+				"diff": "^4.0.1",
+				"make-error": "^1.1.1",
+				"yn": "3.1.1"
+			},
+			"bin": {
+				"ts-node": "dist/bin.js",
+				"ts-node-cwd": "dist/bin-cwd.js",
+				"ts-node-script": "dist/bin-script.js",
+				"ts-node-transpile-only": "dist/bin-transpile.js",
+				"ts-script": "dist/bin-script-deprecated.js"
+			},
+			"peerDependencies": {
+				"@swc/core": ">=1.2.50",
+				"@swc/wasm": ">=1.2.50",
+				"@types/node": "*",
+				"typescript": ">=2.7"
+			},
+			"peerDependenciesMeta": {
+				"@swc/core": {
+					"optional": true
+				},
+				"@swc/wasm": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ts-node/node_modules/acorn-walk": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+			"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/tsd": {
+			"version": "0.19.1",
+			"resolved": "https://registry.npmjs.org/tsd/-/tsd-0.19.1.tgz",
+			"integrity": "sha512-pSwchclr+ADdxlahRUQXUrdAIOjXx1T1PQV+fLfVLuo/S4z+T00YU84fH8iPlZxyA2pWgJjo42BG1p9SDb4NOw==",
+			"dev": true,
+			"dependencies": {
+				"@tsd/typescript": "~4.5.2",
+				"eslint-formatter-pretty": "^4.1.0",
+				"globby": "^11.0.1",
+				"meow": "^9.0.0",
+				"path-exists": "^4.0.0",
+				"read-pkg-up": "^7.0.0"
+			},
+			"bin": {
+				"tsd": "dist/cli.js"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+			"dev": true
+		},
+		"node_modules/tsutils": {
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+			"dev": true,
+			"dependencies": {
+				"tslib": "^1.8.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			},
+			"peerDependencies": {
+				"typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+			}
+		},
+		"node_modules/type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/type-detect": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/typedarray-to-buffer": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+			"dev": true,
+			"dependencies": {
+				"is-typedarray": "^1.0.0"
+			}
+		},
+		"node_modules/typescript": {
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
+			"integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
+			"dev": true,
+			"bin": {
+				"tsc": "bin/tsc",
+				"tsserver": "bin/tsserver"
+			},
+			"engines": {
+				"node": ">=4.2.0"
+			}
+		},
+		"node_modules/universalify": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4.0.0"
+			}
+		},
+		"node_modules/uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
+			"dependencies": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"node_modules/v8-compile-cache": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+			"dev": true
+		},
+		"node_modules/v8-to-istanbul": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz",
+			"integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-coverage": "^2.0.1",
+				"convert-source-map": "^1.6.0",
+				"source-map": "^0.7.3"
+			},
+			"engines": {
+				"node": ">=10.12.0"
+			}
+		},
+		"node_modules/v8-to-istanbul/node_modules/source-map": {
+			"version": "0.7.3",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+			"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"dev": true,
+			"dependencies": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"node_modules/validator": {
+			"version": "13.7.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
+			"integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/w3c-hr-time": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+			"dev": true,
+			"dependencies": {
+				"browser-process-hrtime": "^1.0.0"
+			}
+		},
+		"node_modules/w3c-xmlserializer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+			"integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+			"dev": true,
+			"dependencies": {
+				"xml-name-validator": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/walker": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+			"dev": true,
+			"dependencies": {
+				"makeerror": "1.0.12"
+			}
+		},
+		"node_modules/webidl-conversions": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+			"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.4"
+			}
+		},
+		"node_modules/whatwg-encoding": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+			"integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+			"dev": true,
+			"dependencies": {
+				"iconv-lite": "0.4.24"
+			}
+		},
+		"node_modules/whatwg-mimetype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+			"dev": true
+		},
+		"node_modules/whatwg-url": {
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+			"integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+			"dev": true,
+			"dependencies": {
+				"lodash": "^4.7.0",
+				"tr46": "^2.1.0",
+				"webidl-conversions": "^6.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/word-wrap": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		},
+		"node_modules/write-file-atomic": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+			"dev": true,
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"is-typedarray": "^1.0.0",
+				"signal-exit": "^3.0.2",
+				"typedarray-to-buffer": "^3.1.5"
+			}
+		},
+		"node_modules/ws": {
+			"version": "7.5.6",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
+			"integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.3.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": "^5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
+				},
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/xml-name-validator": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+			"dev": true
+		},
+		"node_modules/xmlchars": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+			"dev": true
+		},
+		"node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+		},
+		"node_modules/yargs": {
+			"version": "16.2.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+			"dev": true,
+			"dependencies": {
+				"cliui": "^7.0.2",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.0",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^20.2.2"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yargs-parser": {
+			"version": "20.2.7",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+			"integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yn": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/z-schema": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.2.tgz",
+			"integrity": "sha512-40TH47ukMHq5HrzkeVE40Ad7eIDKaRV2b+Qpi2prLc9X9eFJFzV7tMe5aH12e6avaSS/u5l653EQOv+J9PirPw==",
+			"dev": true,
+			"dependencies": {
+				"lodash.get": "^4.4.2",
+				"lodash.isequal": "^4.5.0",
+				"validator": "^13.7.0"
+			},
+			"bin": {
+				"z-schema": "bin/z-schema"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			},
+			"optionalDependencies": {
+				"commander": "^2.7.1"
+			}
+		}
+	},
+	"dependencies": {
+		"@babel/code-frame": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+			"dev": true,
+			"requires": {
+				"@babel/highlight": "^7.16.7"
+			}
+		},
+		"@babel/compat-data": {
+			"version": "7.16.4",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
+			"integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==",
+			"dev": true
+		},
+		"@babel/core": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz",
+			"integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.16.7",
+				"@babel/helper-compilation-targets": "^7.16.7",
+				"@babel/helper-module-transforms": "^7.16.7",
+				"@babel/helpers": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7",
+				"convert-source-map": "^1.7.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.1.2",
+				"semver": "^6.3.0",
+				"source-map": "^0.5.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true
+				}
+			}
+		},
+		"@babel/generator": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.7.tgz",
+			"integrity": "sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7",
+				"jsesc": "^2.5.1",
+				"source-map": "^0.5.0"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-compilation-targets": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
+			"integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+			"dev": true,
+			"requires": {
+				"@babel/compat-data": "^7.16.4",
+				"@babel/helper-validator-option": "^7.16.7",
+				"browserslist": "^4.17.5",
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-environment-visitor": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+			"integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
+			"integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
+			"integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-hoist-variables": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+			"integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-module-imports": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+			"integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-module-transforms": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
+			"integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-module-imports": "^7.16.7",
+				"@babel/helper-simple-access": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-plugin-utils": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+			"integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+			"dev": true
+		},
+		"@babel/helper-simple-access": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
+			"integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+			"integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-validator-identifier": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+			"dev": true
+		},
+		"@babel/helper-validator-option": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+			"integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+			"dev": true
+		},
+		"@babel/helpers": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
+			"integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+			"dev": true,
+			"requires": {
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/highlight": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz",
+			"integrity": "sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"chalk": "^2.0.0",
+				"js-tokens": "^4.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.1",
+						"escape-string-regexp": "^1.0.5",
+						"supports-color": "^5.3.0"
+					}
+				},
+				"color-convert": {
+					"version": "1.9.3",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+					"dev": true,
+					"requires": {
+						"color-name": "1.1.3"
+					}
+				},
+				"color-name": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+					"dev": true
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
+					}
+				}
+			}
+		},
+		"@babel/parser": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.7.tgz",
+			"integrity": "sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==",
+			"dev": true
+		},
+		"@babel/plugin-syntax-async-generators": {
+			"version": "7.8.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-bigint": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-class-properties": {
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.12.13"
+			}
+		},
+		"@babel/plugin-syntax-import-meta": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			}
+		},
+		"@babel/plugin-syntax-json-strings": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-logical-assignment-operators": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			}
+		},
+		"@babel/plugin-syntax-nullish-coalescing-operator": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-numeric-separator": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			}
+		},
+		"@babel/plugin-syntax-object-rest-spread": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-optional-catch-binding": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-optional-chaining": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-top-level-await": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			}
+		},
+		"@babel/plugin-syntax-typescript": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz",
+			"integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.16.7"
+			}
+		},
+		"@babel/template": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+			"integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/traverse": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.7.tgz",
+			"integrity": "sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.16.7",
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-function-name": "^7.16.7",
+				"@babel/helper-hoist-variables": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/types": "^7.16.7",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0"
+			},
+			"dependencies": {
+				"globals": {
+					"version": "11.12.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/types": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.7.tgz",
+			"integrity": "sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"to-fast-properties": "^2.0.0"
+			}
+		},
+		"@bcoe/v8-coverage": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+			"dev": true
+		},
+		"@cspotcode/source-map-consumer": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
+			"integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
+			"dev": true
+		},
+		"@cspotcode/source-map-support": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
+			"integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
+			"dev": true,
+			"requires": {
+				"@cspotcode/source-map-consumer": "0.8.0"
+			}
+		},
+		"@eslint/eslintrc": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
+			"integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==",
+			"dev": true,
+			"requires": {
+				"ajv": "^6.12.4",
+				"debug": "^4.3.2",
+				"espree": "^9.2.0",
+				"globals": "^13.9.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"dependencies": {
+				"ignore": {
+					"version": "4.0.6",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+					"dev": true
+				}
+			}
+		},
+		"@humanwhocodes/config-array": {
+			"version": "0.9.2",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz",
+			"integrity": "sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==",
+			"dev": true,
+			"requires": {
+				"@humanwhocodes/object-schema": "^1.2.1",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			}
+		},
+		"@humanwhocodes/object-schema": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+			"dev": true
+		},
+		"@istanbuljs/load-nyc-config": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+			"dev": true,
+			"requires": {
+				"camelcase": "^5.3.1",
+				"find-up": "^4.1.0",
+				"get-package-type": "^0.1.0",
+				"js-yaml": "^3.13.1",
+				"resolve-from": "^5.0.0"
+			},
+			"dependencies": {
+				"js-yaml": {
+					"version": "3.14.1",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+					"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+					"dev": true,
+					"requires": {
+						"argparse": "^1.0.7",
+						"esprima": "^4.0.0"
+					}
+				},
+				"resolve-from": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+					"dev": true
+				}
+			}
+		},
+		"@istanbuljs/schema": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+			"dev": true
+		},
+		"@jest/console": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz",
+			"integrity": "sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"jest-message-util": "^27.4.2",
+				"jest-util": "^27.4.2",
+				"slash": "^3.0.0"
+			}
+		},
+		"@jest/core": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.5.tgz",
+			"integrity": "sha512-3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.4.2",
+				"@jest/reporters": "^27.4.5",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"emittery": "^0.8.1",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"jest-changed-files": "^27.4.2",
+				"jest-config": "^27.4.5",
+				"jest-haste-map": "^27.4.5",
+				"jest-message-util": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-resolve-dependencies": "^27.4.5",
+				"jest-runner": "^27.4.5",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"jest-watcher": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"rimraf": "^3.0.0",
+				"slash": "^3.0.0",
+				"strip-ansi": "^6.0.0"
+			}
+		},
+		"@jest/environment": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.4.tgz",
+			"integrity": "sha512-q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ==",
+			"dev": true,
+			"requires": {
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2"
+			}
+		},
+		"@jest/fake-timers": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz",
+			"integrity": "sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"@sinonjs/fake-timers": "^8.0.1",
+				"@types/node": "*",
+				"jest-message-util": "^27.4.2",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2"
+			}
+		},
+		"@jest/globals": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.4.tgz",
+			"integrity": "sha512-bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.4.4",
+				"@jest/types": "^27.4.2",
+				"expect": "^27.4.2"
+			}
+		},
+		"@jest/reporters": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.5.tgz",
+			"integrity": "sha512-3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA==",
+			"dev": true,
+			"requires": {
+				"@bcoe/v8-coverage": "^0.2.3",
+				"@jest/console": "^27.4.2",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.2",
+				"graceful-fs": "^4.2.4",
+				"istanbul-lib-coverage": "^3.0.0",
+				"istanbul-lib-instrument": "^4.0.3",
+				"istanbul-lib-report": "^3.0.0",
+				"istanbul-lib-source-maps": "^4.0.0",
+				"istanbul-reports": "^3.0.2",
+				"jest-haste-map": "^27.4.5",
+				"jest-resolve": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"slash": "^3.0.0",
+				"source-map": "^0.6.0",
+				"string-length": "^4.0.1",
+				"terminal-link": "^2.0.0",
+				"v8-to-istanbul": "^8.1.0"
+			}
+		},
+		"@jest/source-map": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz",
+			"integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==",
+			"dev": true,
+			"requires": {
+				"callsites": "^3.0.0",
+				"graceful-fs": "^4.2.4",
+				"source-map": "^0.6.0"
+			}
+		},
+		"@jest/test-result": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz",
+			"integrity": "sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"collect-v8-coverage": "^1.0.0"
+			}
+		},
+		"@jest/test-sequencer": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.5.tgz",
+			"integrity": "sha512-n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ==",
+			"dev": true,
+			"requires": {
+				"@jest/test-result": "^27.4.2",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-runtime": "^27.4.5"
+			}
+		},
+		"@jest/transform": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.5.tgz",
+			"integrity": "sha512-PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.1.0",
+				"@jest/types": "^27.4.2",
+				"babel-plugin-istanbul": "^6.0.0",
+				"chalk": "^4.0.0",
+				"convert-source-map": "^1.4.0",
+				"fast-json-stable-stringify": "^2.0.0",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-regex-util": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"pirates": "^4.0.1",
+				"slash": "^3.0.0",
+				"source-map": "^0.6.1",
+				"write-file-atomic": "^3.0.0"
+			}
+		},
+		"@jest/types": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
+			"integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^16.0.0",
+				"chalk": "^4.0.0"
+			}
+		},
+		"@microsoft/api-extractor": {
+			"version": "7.19.3",
+			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.19.3.tgz",
+			"integrity": "sha512-GZe+R3K4kh2X425iOHkPbByysB7FN0592mPPA6vNj5IhyhlPHgdZS6m6AmOZOIxMS4euM+SBKzEJEp3oC+WsOQ==",
+			"dev": true,
+			"requires": {
+				"@microsoft/api-extractor-model": "7.15.2",
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "~0.15.2",
+				"@rushstack/node-core-library": "3.44.3",
+				"@rushstack/rig-package": "0.3.7",
+				"@rushstack/ts-command-line": "4.10.6",
+				"colors": "~1.2.1",
+				"lodash": "~4.17.15",
+				"resolve": "~1.17.0",
+				"semver": "~7.3.0",
+				"source-map": "~0.6.1",
+				"typescript": "~4.5.2"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.17.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+					"dev": true,
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"@microsoft/api-extractor-model": {
+			"version": "7.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.15.2.tgz",
+			"integrity": "sha512-qgxKX/s6vo3nCVLhP0Ds7555QrErhcYHEok5/KyEZ7iR8J5M5oldD1eJJQmtEdVF5IzmnPPbxx1nRvfgA674LQ==",
+			"dev": true,
+			"requires": {
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "~0.15.2",
+				"@rushstack/node-core-library": "3.44.3"
+			}
+		},
+		"@microsoft/tsdoc": {
+			"version": "0.13.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
+			"integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
+			"dev": true
+		},
+		"@microsoft/tsdoc-config": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
+			"integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
+			"dev": true,
+			"requires": {
+				"@microsoft/tsdoc": "0.13.2",
+				"ajv": "~6.12.6",
+				"jju": "~1.4.0",
+				"resolve": "~1.19.0"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.19.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+					"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+					"dev": true,
+					"requires": {
+						"is-core-module": "^2.1.0",
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"@nodelib/fs.scandir": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
+			"integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.stat": "2.0.4",
+				"run-parallel": "^1.1.9"
+			}
+		},
+		"@nodelib/fs.stat": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
+			"integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
+			"dev": true
+		},
+		"@nodelib/fs.walk": {
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
+			"integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.scandir": "2.1.4",
+				"fastq": "^1.6.0"
+			}
+		},
+		"@rushstack/node-core-library": {
+			"version": "3.44.3",
+			"resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.44.3.tgz",
+			"integrity": "sha512-Bt+R5LAnVr2BImTJqPpton5rvhJ2Wq8x4BaTqaCHQMmfxqtz5lb4nLYT9kneMJTCDuRMBvvLpSuz4MBj50PV3w==",
+			"dev": true,
+			"requires": {
+				"@types/node": "12.20.24",
+				"colors": "~1.2.1",
+				"fs-extra": "~7.0.1",
+				"import-lazy": "~4.0.0",
+				"jju": "~1.4.0",
+				"resolve": "~1.17.0",
+				"semver": "~7.3.0",
+				"timsort": "~0.3.0",
+				"z-schema": "~5.0.2"
+			},
+			"dependencies": {
+				"@types/node": {
+					"version": "12.20.24",
+					"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz",
+					"integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==",
+					"dev": true
+				},
+				"resolve": {
+					"version": "1.17.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+					"dev": true,
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"@rushstack/rig-package": {
+			"version": "0.3.7",
+			"resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.7.tgz",
+			"integrity": "sha512-pzMsTSeTC8IiZ6EJLr53gGMvhT4oLWH+hxD7907cHyWuIUlEXFtu/2pK25vUQT13nKp5DJCWxXyYoGRk/h6rtA==",
+			"dev": true,
+			"requires": {
+				"resolve": "~1.17.0",
+				"strip-json-comments": "~3.1.1"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.17.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+					"dev": true,
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"@rushstack/ts-command-line": {
+			"version": "4.10.6",
+			"resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.10.6.tgz",
+			"integrity": "sha512-Y3GkUag39sTIlukDg9mUp8MCHrrlJ27POrBNRQGc/uF+VVgX8M7zMzHch5zP6O1QVquWgD7Engdpn2piPYaS/g==",
+			"dev": true,
+			"requires": {
+				"@types/argparse": "1.0.38",
+				"argparse": "~1.0.9",
+				"colors": "~1.2.1",
+				"string-argv": "~0.3.1"
+			}
+		},
+		"@sinonjs/commons": {
+			"version": "1.8.3",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+			"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+			"dev": true,
+			"requires": {
+				"type-detect": "4.0.8"
+			}
+		},
+		"@sinonjs/fake-timers": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+			"integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+			"dev": true,
+			"requires": {
+				"@sinonjs/commons": "^1.7.0"
+			}
+		},
+		"@tootallnate/once": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+			"dev": true
+		},
+		"@tsconfig/node10": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
+			"integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
+			"dev": true
+		},
+		"@tsconfig/node12": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
+			"integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
+			"dev": true
+		},
+		"@tsconfig/node14": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
+			"integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
+			"dev": true
+		},
+		"@tsconfig/node16": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
+			"integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
+			"dev": true
+		},
+		"@tsd/typescript": {
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/@tsd/typescript/-/typescript-4.5.4.tgz",
+			"integrity": "sha512-iDlLkdg3sCjUSNdoUCsYM/SXheHrdxHsR6msIkbFDW4pV6gHTMwg/8te/paLtywDjGL4S4ByDdUKA3RbfdBX0g==",
+			"dev": true
+		},
+		"@types/argparse": {
+			"version": "1.0.38",
+			"resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz",
+			"integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==",
+			"dev": true
+		},
+		"@types/babel__core": {
+			"version": "7.1.18",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz",
+			"integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
+			"dev": true,
+			"requires": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0",
+				"@types/babel__generator": "*",
+				"@types/babel__template": "*",
+				"@types/babel__traverse": "*"
+			}
+		},
+		"@types/babel__generator": {
+			"version": "7.6.4",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+			"integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@types/babel__template": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+			"integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+			"dev": true,
+			"requires": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@types/babel__traverse": {
+			"version": "7.14.2",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
+			"integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.3.0"
+			}
+		},
+		"@types/eslint": {
+			"version": "7.29.0",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
+			"integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
+			"dev": true,
+			"requires": {
+				"@types/estree": "*",
+				"@types/json-schema": "*"
+			}
+		},
+		"@types/estree": {
+			"version": "0.0.50",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
+			"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+			"dev": true
+		},
+		"@types/graceful-fs": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+			"integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
+		"@types/istanbul-lib-coverage": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+			"integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+			"dev": true
+		},
+		"@types/istanbul-lib-report": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-coverage": "*"
+			}
+		},
+		"@types/istanbul-reports": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+			"integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-report": "*"
+			}
+		},
+		"@types/jest": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz",
+			"integrity": "sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==",
+			"dev": true,
+			"requires": {
+				"jest-diff": "^27.0.0",
+				"pretty-format": "^27.0.0"
+			}
+		},
+		"@types/json-schema": {
+			"version": "7.0.9",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+			"dev": true
+		},
+		"@types/minimist": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
+			"integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+			"dev": true
+		},
+		"@types/node": {
+			"version": "17.0.5",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.5.tgz",
+			"integrity": "sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw==",
+			"dev": true
+		},
+		"@types/normalize-package-data": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+			"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+			"dev": true
+		},
+		"@types/prettier": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
+			"integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
+			"dev": true
+		},
+		"@types/stack-utils": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+			"integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+			"dev": true
+		},
+		"@types/yargs": {
+			"version": "16.0.4",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+			"integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+			"dev": true,
+			"requires": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"@types/yargs-parser": {
+			"version": "20.2.1",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
+			"integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
+			"dev": true
+		},
+		"@typescript-eslint/eslint-plugin": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.1.tgz",
+			"integrity": "sha512-wTZ5oEKrKj/8/366qTM366zqhIKAp6NCMweoRONtfuC07OAU9nVI2GZZdqQ1qD30WAAtcPdkH+npDwtRFdp4Rw==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/experimental-utils": "5.8.1",
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"debug": "^4.3.2",
+				"functional-red-black-tree": "^1.0.1",
+				"ignore": "^5.1.8",
+				"regexpp": "^3.2.0",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			}
+		},
+		"@typescript-eslint/experimental-utils": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.1.tgz",
+			"integrity": "sha512-fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww==",
+			"dev": true,
+			"requires": {
+				"@types/json-schema": "^7.0.9",
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/typescript-estree": "5.8.1",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^3.0.0"
+			}
+		},
+		"@typescript-eslint/parser": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.8.1.tgz",
+			"integrity": "sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/scope-manager": "5.8.1",
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/typescript-estree": "5.8.1",
+				"debug": "^4.3.2"
+			}
+		},
+		"@typescript-eslint/scope-manager": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.8.1.tgz",
+			"integrity": "sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/visitor-keys": "5.8.1"
+			}
+		},
+		"@typescript-eslint/types": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.1.tgz",
+			"integrity": "sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==",
+			"dev": true
+		},
+		"@typescript-eslint/typescript-estree": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz",
+			"integrity": "sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "5.8.1",
+				"@typescript-eslint/visitor-keys": "5.8.1",
+				"debug": "^4.3.2",
+				"globby": "^11.0.4",
+				"is-glob": "^4.0.3",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			}
+		},
+		"@typescript-eslint/visitor-keys": {
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.1.tgz",
+			"integrity": "sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "5.8.1",
+				"eslint-visitor-keys": "^3.0.0"
+			}
+		},
+		"abab": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+			"integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+			"dev": true
+		},
+		"acorn": {
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+			"dev": true
+		},
+		"acorn-globals": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+			"integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+			"dev": true,
+			"requires": {
+				"acorn": "^7.1.1",
+				"acorn-walk": "^7.1.1"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "7.4.1",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+					"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+					"dev": true
+				}
+			}
+		},
+		"acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"requires": {}
+		},
+		"acorn-walk": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+			"dev": true
+		},
+		"agent-base": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+			"dev": true,
+			"requires": {
+				"debug": "4"
+			}
+		},
+		"ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"requires": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			}
+		},
+		"ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true
+		},
+		"ansi-escapes": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+			"dev": true,
+			"requires": {
+				"type-fest": "^0.21.3"
+			},
+			"dependencies": {
+				"type-fest": {
+					"version": "0.21.3",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+					"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+					"dev": true
+				}
+			}
+		},
+		"ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true
+		},
+		"ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"requires": {
+				"color-convert": "^2.0.1"
+			}
+		},
+		"anymatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+			"dev": true,
+			"requires": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			}
+		},
+		"arg": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+			"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+			"dev": true
+		},
+		"argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"requires": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+			"dev": true
+		},
+		"arrify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+			"dev": true
+		},
+		"asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+			"dev": true
+		},
+		"autobind-decorator": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/autobind-decorator/-/autobind-decorator-2.4.0.tgz",
+			"integrity": "sha512-OGYhWUO72V6DafbF8PM8rm3EPbfuyMZcJhtm5/n26IDwO18pohE4eNazLoCGhPiXOCD0gEGmrbU3849QvM8bbw=="
+		},
+		"babel-jest": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.5.tgz",
+			"integrity": "sha512-3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA==",
+			"dev": true,
+			"requires": {
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.0.0",
+				"babel-preset-jest": "^27.4.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"slash": "^3.0.0"
+			}
+		},
+		"babel-plugin-istanbul": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-instrument": "^5.0.4",
+				"test-exclude": "^6.0.0"
+			},
+			"dependencies": {
+				"istanbul-lib-instrument": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
+					"integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
+					"dev": true,
+					"requires": {
+						"@babel/core": "^7.12.3",
+						"@babel/parser": "^7.14.7",
+						"@istanbuljs/schema": "^0.1.2",
+						"istanbul-lib-coverage": "^3.2.0",
+						"semver": "^6.3.0"
+					}
+				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"babel-plugin-jest-hoist": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz",
+			"integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==",
+			"dev": true,
+			"requires": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.0.0",
+				"@types/babel__traverse": "^7.0.6"
+			}
+		},
+		"babel-preset-current-node-syntax": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+			"dev": true,
+			"requires": {
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-bigint": "^7.8.3",
+				"@babel/plugin-syntax-class-properties": "^7.8.3",
+				"@babel/plugin-syntax-import-meta": "^7.8.3",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-top-level-await": "^7.8.3"
+			}
+		},
+		"babel-preset-jest": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz",
+			"integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==",
+			"dev": true,
+			"requires": {
+				"babel-plugin-jest-hoist": "^27.4.0",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			}
+		},
+		"balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true
+		},
+		"brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"requires": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"requires": {
+				"fill-range": "^7.0.1"
+			}
+		},
+		"browser-process-hrtime": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+			"dev": true
+		},
+		"browserslist": {
+			"version": "4.19.1",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+			"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+			"dev": true,
+			"requires": {
+				"caniuse-lite": "^1.0.30001286",
+				"electron-to-chromium": "^1.4.17",
+				"escalade": "^3.1.1",
+				"node-releases": "^2.0.1",
+				"picocolors": "^1.0.0"
+			}
+		},
+		"bs-logger": {
+			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+			"dev": true,
+			"requires": {
+				"fast-json-stable-stringify": "2.x"
+			}
+		},
+		"bser": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+			"dev": true,
+			"requires": {
+				"node-int64": "^0.4.0"
+			}
+		},
+		"buffer-from": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+			"dev": true
+		},
+		"callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true
+		},
+		"camelcase": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"dev": true
+		},
+		"camelcase-keys": {
+			"version": "6.2.2",
+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+			"dev": true,
+			"requires": {
+				"camelcase": "^5.3.1",
+				"map-obj": "^4.0.0",
+				"quick-lru": "^4.0.1"
+			}
+		},
+		"caniuse-lite": {
+			"version": "1.0.30001294",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz",
+			"integrity": "sha512-LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g==",
+			"dev": true
+		},
+		"chalk": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+			"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			}
+		},
+		"char-regex": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+			"dev": true
+		},
+		"ci-info": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
+			"integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+			"dev": true
+		},
+		"cjs-module-lexer": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
+			"integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+			"dev": true
+		},
+		"cliui": {
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+			"dev": true,
+			"requires": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^7.0.0"
+			}
+		},
+		"co": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+			"dev": true
+		},
+		"collect-v8-coverage": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+			"dev": true
+		},
+		"color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"requires": {
+				"color-name": "~1.1.4"
+			}
+		},
+		"color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"colors": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
+			"integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
+			"dev": true
+		},
+		"combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dev": true,
+			"requires": {
+				"delayed-stream": "~1.0.0"
+			}
+		},
+		"commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true,
+			"optional": true
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"convert-source-map": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
+		"create-require": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+			"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+			"dev": true
+		},
+		"cross-fetch": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
+			"integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
+			"dev": true,
+			"requires": {
+				"node-fetch": "2.6.1"
+			}
+		},
+		"cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"requires": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			}
+		},
+		"cssom": {
+			"version": "0.4.4",
+			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+			"integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+			"dev": true
+		},
+		"cssstyle": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+			"integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+			"dev": true,
+			"requires": {
+				"cssom": "~0.3.6"
+			},
+			"dependencies": {
+				"cssom": {
+					"version": "0.3.8",
+					"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+					"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+					"dev": true
+				}
+			}
+		},
+		"data-urls": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+			"integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+			"dev": true,
+			"requires": {
+				"abab": "^2.0.3",
+				"whatwg-mimetype": "^2.3.0",
+				"whatwg-url": "^8.0.0"
+			}
+		},
+		"debug": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+			"dev": true,
+			"requires": {
+				"ms": "2.1.2"
+			}
+		},
+		"decamelize": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+			"dev": true
+		},
+		"decamelize-keys": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+			"integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+			"dev": true,
+			"requires": {
+				"decamelize": "^1.1.0",
+				"map-obj": "^1.0.0"
+			},
+			"dependencies": {
+				"map-obj": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+					"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+					"dev": true
+				}
+			}
+		},
+		"decimal.js": {
+			"version": "10.3.1",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+			"integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+			"dev": true
+		},
+		"dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+			"dev": true
+		},
+		"deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
+		"deepmerge": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+			"dev": true
+		},
+		"delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+			"dev": true
+		},
+		"detect-newline": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+			"dev": true
+		},
+		"diff": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+			"dev": true
+		},
+		"diff-sequences": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz",
+			"integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==",
+			"dev": true
+		},
+		"dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"dev": true,
+			"requires": {
+				"path-type": "^4.0.0"
+			}
+		},
+		"doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"requires": {
+				"esutils": "^2.0.2"
+			}
+		},
+		"domexception": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+			"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+			"dev": true,
+			"requires": {
+				"webidl-conversions": "^5.0.0"
+			},
+			"dependencies": {
+				"webidl-conversions": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+					"dev": true
+				}
+			}
+		},
+		"electron-to-chromium": {
+			"version": "1.4.31",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.31.tgz",
+			"integrity": "sha512-t3XVQtk+Frkv6aTD4RRk0OqosU+VLe1dQFW83MDer78ZD6a52frgXuYOIsLYTQiH2Lm+JB2OKYcn7zrX+YGAiQ==",
+			"dev": true
+		},
+		"emittery": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+			"integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+			"dev": true
+		},
+		"emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"enquirer": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+			"dev": true,
+			"requires": {
+				"ansi-colors": "^4.1.1"
+			}
+		},
+		"error-ex": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"dev": true,
+			"requires": {
+				"is-arrayish": "^0.2.1"
+			}
+		},
+		"escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true
+		},
+		"escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true
+		},
+		"escodegen": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+			"integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+			"dev": true,
+			"requires": {
+				"esprima": "^4.0.1",
+				"estraverse": "^5.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"dev": true
+				},
+				"levn": {
+					"version": "0.3.0",
+					"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+					"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+					"dev": true,
+					"requires": {
+						"prelude-ls": "~1.1.2",
+						"type-check": "~0.3.2"
+					}
+				},
+				"optionator": {
+					"version": "0.8.3",
+					"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+					"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+					"dev": true,
+					"requires": {
+						"deep-is": "~0.1.3",
+						"fast-levenshtein": "~2.0.6",
+						"levn": "~0.3.0",
+						"prelude-ls": "~1.1.2",
+						"type-check": "~0.3.2",
+						"word-wrap": "~1.2.3"
+					}
+				},
+				"prelude-ls": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+					"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+					"dev": true
+				},
+				"type-check": {
+					"version": "0.3.2",
+					"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+					"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+					"dev": true,
+					"requires": {
+						"prelude-ls": "~1.1.2"
+					}
+				}
+			}
+		},
+		"eslint": {
+			"version": "8.6.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.6.0.tgz",
+			"integrity": "sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==",
+			"dev": true,
+			"requires": {
+				"@eslint/eslintrc": "^1.0.5",
+				"@humanwhocodes/config-array": "^0.9.2",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.3.2",
+				"doctrine": "^3.0.0",
+				"enquirer": "^2.3.5",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^7.1.0",
+				"eslint-utils": "^3.0.0",
+				"eslint-visitor-keys": "^3.1.0",
+				"espree": "^9.3.0",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^6.0.1",
+				"globals": "^13.6.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^4.1.0",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"progress": "^2.0.0",
+				"regexpp": "^3.2.0",
+				"semver": "^7.2.1",
+				"strip-ansi": "^6.0.1",
+				"strip-json-comments": "^3.1.0",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"dependencies": {
+				"eslint-scope": {
+					"version": "7.1.0",
+					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
+					"integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
+					"dev": true,
+					"requires": {
+						"esrecurse": "^4.3.0",
+						"estraverse": "^5.2.0"
+					}
+				},
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"dev": true
+				},
+				"glob-parent": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+					"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+					"dev": true,
+					"requires": {
+						"is-glob": "^4.0.3"
+					}
+				},
+				"ignore": {
+					"version": "4.0.6",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-formatter-pretty": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz",
+			"integrity": "sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==",
+			"dev": true,
+			"requires": {
+				"@types/eslint": "^7.2.13",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.1.0",
+				"eslint-rule-docs": "^1.1.5",
+				"log-symbols": "^4.0.0",
+				"plur": "^4.0.0",
+				"string-width": "^4.2.0",
+				"supports-hyperlinks": "^2.0.0"
+			}
+		},
+		"eslint-rule-docs": {
+			"version": "1.1.231",
+			"resolved": "https://registry.npmjs.org/eslint-rule-docs/-/eslint-rule-docs-1.1.231.tgz",
+			"integrity": "sha512-egHz9A1WG7b8CS0x1P6P/Rj5FqZOjray/VjpJa14tMZalfRKvpE2ONJ3plCM7+PcinmU4tcmbPLv0VtwzSdLVA==",
+			"dev": true
+		},
+		"eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"requires": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			}
+		},
+		"eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"requires": {
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"dependencies": {
+				"eslint-visitor-keys": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+					"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-visitor-keys": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
+			"integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
+			"dev": true
+		},
+		"espree": {
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
+			"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
+			"dev": true,
+			"requires": {
+				"acorn": "^8.7.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^3.1.0"
+			}
+		},
+		"esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true
+		},
+		"esquery": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.1.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"dev": true
+				}
+			}
+		},
+		"esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.2.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"dev": true
+				}
+			}
+		},
+		"estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true
+		},
+		"esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true
+		},
+		"eventemitter3": {
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+		},
+		"execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			}
+		},
+		"exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true
+		},
+		"expect": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz",
+			"integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"ansi-styles": "^5.0.0",
+				"jest-get-type": "^27.4.0",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-regex-util": "^27.4.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+					"dev": true
+				}
+			}
+		},
+		"fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
+		},
+		"fast-glob": {
+			"version": "3.2.5",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
+			"integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.0",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.2",
+				"picomatch": "^2.2.1"
+			}
+		},
+		"fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"fastq": {
+			"version": "1.11.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
+			"integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+			"dev": true,
+			"requires": {
+				"reusify": "^1.0.4"
+			}
+		},
+		"fb-watchman": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+			"integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+			"dev": true,
+			"requires": {
+				"bser": "2.1.1"
+			}
+		},
+		"file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"requires": {
+				"flat-cache": "^3.0.4"
+			}
+		},
+		"fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"requires": {
+				"to-regex-range": "^5.0.1"
+			}
+		},
+		"find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"requires": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			}
+		},
+		"flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"dev": true,
+			"requires": {
+				"flatted": "^3.1.0",
+				"rimraf": "^3.0.2"
+			}
+		},
+		"flatted": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
+			"integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==",
+			"dev": true
+		},
+		"form-data": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+			"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+			"dev": true,
+			"requires": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			}
+		},
+		"fs-extra": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.2",
+				"jsonfile": "^4.0.0",
+				"universalify": "^0.1.0"
+			}
+		},
+		"fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"dev": true
+		},
+		"fsevents": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+			"dev": true,
+			"optional": true
+		},
+		"function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+			"dev": true
+		},
+		"functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
+		"gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true
+		},
+		"get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true
+		},
+		"get-package-type": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+			"dev": true
+		},
+		"get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"dev": true
+		},
+		"glob": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+			"dev": true,
+			"requires": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			}
+		},
+		"glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"requires": {
+				"is-glob": "^4.0.1"
+			}
+		},
+		"globals": {
+			"version": "13.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+			"integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+			"dev": true,
+			"requires": {
+				"type-fest": "^0.20.2"
+			}
+		},
+		"globby": {
+			"version": "11.0.4",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+			"integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+			"dev": true,
+			"requires": {
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.1.1",
+				"ignore": "^5.1.4",
+				"merge2": "^1.3.0",
+				"slash": "^3.0.0"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.2.6",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+			"integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+			"dev": true
+		},
+		"hard-rejection": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+			"dev": true
+		},
+		"has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1"
+			}
+		},
+		"has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true
+		},
+		"hosted-git-info": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "^6.0.0"
+			}
+		},
+		"html-encoding-sniffer": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+			"integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+			"dev": true,
+			"requires": {
+				"whatwg-encoding": "^1.0.5"
+			}
+		},
+		"html-escaper": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+			"dev": true
+		},
+		"http-proxy-agent": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+			"dev": true,
+			"requires": {
+				"@tootallnate/once": "1",
+				"agent-base": "6",
+				"debug": "4"
+			}
+		},
+		"https-proxy-agent": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+			"dev": true,
+			"requires": {
+				"agent-base": "6",
+				"debug": "4"
+			}
+		},
+		"human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"dev": true
+		},
+		"iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"dev": true,
+			"requires": {
+				"safer-buffer": ">= 2.1.2 < 3"
+			}
+		},
+		"ignore": {
+			"version": "5.1.8",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+			"dev": true
+		},
+		"import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
+			"requires": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			}
+		},
+		"import-lazy": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+			"dev": true
+		},
+		"import-local": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
+			"integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
+			"dev": true,
+			"requires": {
+				"pkg-dir": "^4.2.0",
+				"resolve-cwd": "^3.0.0"
+			}
+		},
+		"imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true
+		},
+		"indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"dev": true
+		},
+		"inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"dev": true,
+			"requires": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"irregular-plurals": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz",
+			"integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==",
+			"dev": true
+		},
+		"is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+			"dev": true
+		},
+		"is-core-module": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
+			"integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+			"dev": true,
+			"requires": {
+				"has": "^1.0.3"
+			}
+		},
+		"is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true
+		},
+		"is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true
+		},
+		"is-generator-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+			"dev": true
+		},
+		"is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+			"dev": true,
+			"requires": {
+				"is-extglob": "^2.1.1"
+			}
+		},
+		"is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true
+		},
+		"is-plain-obj": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+			"dev": true
+		},
+		"is-potential-custom-element-name": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+			"dev": true
+		},
+		"is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true
+		},
+		"is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+			"dev": true
+		},
+		"is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+			"dev": true
+		},
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"istanbul-lib-coverage": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+			"dev": true
+		},
+		"istanbul-lib-instrument": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+			"integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.7.5",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-coverage": "^3.0.0",
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-lib-report": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+			"dev": true,
+			"requires": {
+				"istanbul-lib-coverage": "^3.0.0",
+				"make-dir": "^3.0.0",
+				"supports-color": "^7.1.0"
+			}
+		},
+		"istanbul-lib-source-maps": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^3.0.0",
+				"source-map": "^0.6.1"
+			}
+		},
+		"istanbul-reports": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz",
+			"integrity": "sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==",
+			"dev": true,
+			"requires": {
+				"html-escaper": "^2.0.0",
+				"istanbul-lib-report": "^3.0.0"
+			}
+		},
+		"jest": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest/-/jest-27.4.5.tgz",
+			"integrity": "sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==",
+			"dev": true,
+			"requires": {
+				"@jest/core": "^27.4.5",
+				"import-local": "^3.0.2",
+				"jest-cli": "^27.4.5"
+			}
+		},
+		"jest-changed-files": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz",
+			"integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"execa": "^5.0.0",
+				"throat": "^6.0.1"
+			}
+		},
+		"jest-circus": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.5.tgz",
+			"integrity": "sha512-eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.4.4",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"dedent": "^0.7.0",
+				"expect": "^27.4.2",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^27.4.2",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3",
+				"throat": "^6.0.1"
+			}
+		},
+		"jest-cli": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.5.tgz",
+			"integrity": "sha512-hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg==",
+			"dev": true,
+			"requires": {
+				"@jest/core": "^27.4.5",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"import-local": "^3.0.2",
+				"jest-config": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"prompts": "^2.0.1",
+				"yargs": "^16.2.0"
+			}
+		},
+		"jest-config": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.5.tgz",
+			"integrity": "sha512-t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.1.0",
+				"@jest/test-sequencer": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"babel-jest": "^27.4.5",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"deepmerge": "^4.2.2",
+				"glob": "^7.1.1",
+				"graceful-fs": "^4.2.4",
+				"jest-circus": "^27.4.5",
+				"jest-environment-jsdom": "^27.4.4",
+				"jest-environment-node": "^27.4.4",
+				"jest-get-type": "^27.4.0",
+				"jest-jasmine2": "^27.4.5",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-runner": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0"
+			}
+		},
+		"jest-diff": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz",
+			"integrity": "sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^27.4.0",
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			}
+		},
+		"jest-docblock": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz",
+			"integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==",
+			"dev": true,
+			"requires": {
+				"detect-newline": "^3.0.0"
+			}
+		},
+		"jest-each": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz",
+			"integrity": "sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2"
+			}
+		},
+		"jest-environment-jsdom": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz",
+			"integrity": "sha512-cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.4.4",
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2",
+				"jsdom": "^16.6.0"
+			}
+		},
+		"jest-environment-node": {
+			"version": "27.4.4",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.4.tgz",
+			"integrity": "sha512-D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.4.4",
+				"@jest/fake-timers": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"jest-mock": "^27.4.2",
+				"jest-util": "^27.4.2"
+			}
+		},
+		"jest-fetch-mock": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz",
+			"integrity": "sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==",
+			"dev": true,
+			"requires": {
+				"cross-fetch": "^3.0.4",
+				"promise-polyfill": "^8.1.3"
+			}
+		},
+		"jest-get-type": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
+			"integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==",
+			"dev": true
+		},
+		"jest-haste-map": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.5.tgz",
+			"integrity": "sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"@types/graceful-fs": "^4.1.2",
+				"@types/node": "*",
+				"anymatch": "^3.0.3",
+				"fb-watchman": "^2.0.0",
+				"fsevents": "^2.3.2",
+				"graceful-fs": "^4.2.4",
+				"jest-regex-util": "^27.4.0",
+				"jest-serializer": "^27.4.0",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"micromatch": "^4.0.4",
+				"walker": "^1.0.7"
+			}
+		},
+		"jest-jasmine2": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.5.tgz",
+			"integrity": "sha512-oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw==",
+			"dev": true,
+			"requires": {
+				"@babel/traverse": "^7.1.0",
+				"@jest/environment": "^27.4.4",
+				"@jest/source-map": "^27.4.0",
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"expect": "^27.4.2",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^27.4.2",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-runtime": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"pretty-format": "^27.4.2",
+				"throat": "^6.0.1"
+			}
+		},
+		"jest-leak-detector": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz",
+			"integrity": "sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==",
+			"dev": true,
+			"requires": {
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			}
+		},
+		"jest-matcher-utils": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz",
+			"integrity": "sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^27.4.2",
+				"jest-get-type": "^27.4.0",
+				"pretty-format": "^27.4.2"
+			}
+		},
+		"jest-message-util": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz",
+			"integrity": "sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.4.2",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.4.2",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			}
+		},
+		"jest-mock": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz",
+			"integrity": "sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*"
+			}
+		},
+		"jest-pnp-resolver": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+			"dev": true,
+			"requires": {}
+		},
+		"jest-regex-util": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
+			"integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==",
+			"dev": true
+		},
+		"jest-resolve": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.5.tgz",
+			"integrity": "sha512-xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-pnp-resolver": "^1.2.2",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"resolve": "^1.20.0",
+				"resolve.exports": "^1.1.0",
+				"slash": "^3.0.0"
+			}
+		},
+		"jest-resolve-dependencies": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.5.tgz",
+			"integrity": "sha512-elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-snapshot": "^27.4.5"
+			}
+		},
+		"jest-runner": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.5.tgz",
+			"integrity": "sha512-/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.4.2",
+				"@jest/environment": "^27.4.4",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"emittery": "^0.8.1",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"jest-docblock": "^27.4.0",
+				"jest-environment-jsdom": "^27.4.4",
+				"jest-environment-node": "^27.4.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-leak-detector": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-resolve": "^27.4.5",
+				"jest-runtime": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-worker": "^27.4.5",
+				"source-map-support": "^0.5.6",
+				"throat": "^6.0.1"
+			}
+		},
+		"jest-runtime": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.5.tgz",
+			"integrity": "sha512-CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.4.2",
+				"@jest/environment": "^27.4.4",
+				"@jest/globals": "^27.4.4",
+				"@jest/source-map": "^27.4.0",
+				"@jest/test-result": "^27.4.2",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/yargs": "^16.0.0",
+				"chalk": "^4.0.0",
+				"cjs-module-lexer": "^1.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"execa": "^5.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.4.5",
+				"jest-message-util": "^27.4.2",
+				"jest-mock": "^27.4.2",
+				"jest-regex-util": "^27.4.0",
+				"jest-resolve": "^27.4.5",
+				"jest-snapshot": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"jest-validate": "^27.4.2",
+				"slash": "^3.0.0",
+				"strip-bom": "^4.0.0",
+				"yargs": "^16.2.0"
+			}
+		},
+		"jest-serializer": {
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
+			"integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"graceful-fs": "^4.2.4"
+			}
+		},
+		"jest-snapshot": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.5.tgz",
+			"integrity": "sha512-eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.7.2",
+				"@babel/generator": "^7.7.2",
+				"@babel/parser": "^7.7.2",
+				"@babel/plugin-syntax-typescript": "^7.7.2",
+				"@babel/traverse": "^7.7.2",
+				"@babel/types": "^7.0.0",
+				"@jest/transform": "^27.4.5",
+				"@jest/types": "^27.4.2",
+				"@types/babel__traverse": "^7.0.4",
+				"@types/prettier": "^2.1.5",
+				"babel-preset-current-node-syntax": "^1.0.0",
+				"chalk": "^4.0.0",
+				"expect": "^27.4.2",
+				"graceful-fs": "^4.2.4",
+				"jest-diff": "^27.4.2",
+				"jest-get-type": "^27.4.0",
+				"jest-haste-map": "^27.4.5",
+				"jest-matcher-utils": "^27.4.2",
+				"jest-message-util": "^27.4.2",
+				"jest-resolve": "^27.4.5",
+				"jest-util": "^27.4.2",
+				"natural-compare": "^1.4.0",
+				"pretty-format": "^27.4.2",
+				"semver": "^7.3.2"
+			}
+		},
+		"jest-util": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
+			"integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"graceful-fs": "^4.2.4",
+				"picomatch": "^2.2.3"
+			}
+		},
+		"jest-validate": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz",
+			"integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"camelcase": "^6.2.0",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^27.4.0",
+				"leven": "^3.1.0",
+				"pretty-format": "^27.4.2"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
+					"integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
+					"dev": true
+				}
+			}
+		},
+		"jest-watcher": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz",
+			"integrity": "sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==",
+			"dev": true,
+			"requires": {
+				"@jest/test-result": "^27.4.2",
+				"@jest/types": "^27.4.2",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"jest-util": "^27.4.2",
+				"string-length": "^4.0.1"
+			}
+		},
+		"jest-websocket-mock": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/jest-websocket-mock/-/jest-websocket-mock-2.2.1.tgz",
+			"integrity": "sha512-fhsGLXrPfs06PhHoxqOSA9yZ6Rb4qYrf4Wcm7/nfRzjlrf1gIeuhYUkzMRjjE0TMQ37SwkmeLanwrZY4ZaNp8g==",
+			"dev": true,
+			"requires": {
+				"jest-diff": "^27.0.2"
+			}
+		},
+		"jest-worker": {
+			"version": "27.4.5",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz",
+			"integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"dependencies": {
+				"supports-color": {
+					"version": "8.1.1",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
+		"jju": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+			"integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
+			"dev": true
+		},
+		"js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"requires": {
+				"argparse": "^2.0.1"
+			},
+			"dependencies": {
+				"argparse": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+					"dev": true
+				}
+			}
+		},
+		"jsdom": {
+			"version": "16.7.0",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+			"integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+			"dev": true,
+			"requires": {
+				"abab": "^2.0.5",
+				"acorn": "^8.2.4",
+				"acorn-globals": "^6.0.0",
+				"cssom": "^0.4.4",
+				"cssstyle": "^2.3.0",
+				"data-urls": "^2.0.0",
+				"decimal.js": "^10.2.1",
+				"domexception": "^2.0.1",
+				"escodegen": "^2.0.0",
+				"form-data": "^3.0.0",
+				"html-encoding-sniffer": "^2.0.1",
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"is-potential-custom-element-name": "^1.0.1",
+				"nwsapi": "^2.2.0",
+				"parse5": "6.0.1",
+				"saxes": "^5.0.1",
+				"symbol-tree": "^3.2.4",
+				"tough-cookie": "^4.0.0",
+				"w3c-hr-time": "^1.0.2",
+				"w3c-xmlserializer": "^2.0.0",
+				"webidl-conversions": "^6.1.0",
+				"whatwg-encoding": "^1.0.5",
+				"whatwg-mimetype": "^2.3.0",
+				"whatwg-url": "^8.5.0",
+				"ws": "^7.4.6",
+				"xml-name-validator": "^3.0.0"
+			}
+		},
+		"jsesc": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"dev": true
+		},
+		"json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+			"dev": true
+		},
+		"json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+			"dev": true
+		},
+		"json5": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.5"
+			}
+		},
+		"jsonfile": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true
+		},
+		"kleur": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+			"dev": true
+		},
+		"leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"dev": true
+		},
+		"levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
+			"requires": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			}
+		},
+		"lines-and-columns": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+			"dev": true
+		},
+		"locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"requires": {
+				"p-locate": "^4.1.0"
+			}
+		},
+		"lodash": {
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+			"dev": true
+		},
+		"lodash.get": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+			"dev": true
+		},
+		"lodash.isequal": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+			"dev": true
+		},
+		"lodash.memoize": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+			"dev": true
+		},
+		"lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true
+		},
+		"log-symbols": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.1.0",
+				"is-unicode-supported": "^0.1.0"
+			}
+		},
+		"lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"requires": {
+				"yallist": "^4.0.0"
+			}
+		},
+		"make-dir": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+			"dev": true,
+			"requires": {
+				"semver": "^6.0.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"make-error": {
+			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+			"dev": true
+		},
+		"makeerror": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+			"dev": true,
+			"requires": {
+				"tmpl": "1.0.5"
+			}
+		},
+		"map-obj": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
+			"integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
+			"dev": true
+		},
+		"meow": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+			"dev": true,
+			"requires": {
+				"@types/minimist": "^1.2.0",
+				"camelcase-keys": "^6.2.2",
+				"decamelize": "^1.2.0",
+				"decamelize-keys": "^1.1.0",
+				"hard-rejection": "^2.1.0",
+				"minimist-options": "4.1.0",
+				"normalize-package-data": "^3.0.0",
+				"read-pkg-up": "^7.0.1",
+				"redent": "^3.0.0",
+				"trim-newlines": "^3.0.0",
+				"type-fest": "^0.18.0",
+				"yargs-parser": "^20.2.3"
+			},
+			"dependencies": {
+				"type-fest": {
+					"version": "0.18.1",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+					"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+					"dev": true
+				}
+			}
+		},
+		"merge-stream": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+			"dev": true
+		},
+		"merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"dev": true
+		},
+		"micromatch": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"dev": true,
+			"requires": {
+				"braces": "^3.0.1",
+				"picomatch": "^2.2.3"
+			}
+		},
+		"mime-db": {
+			"version": "1.51.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+			"integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+			"dev": true
+		},
+		"mime-types": {
+			"version": "2.1.34",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+			"integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+			"dev": true,
+			"requires": {
+				"mime-db": "1.51.0"
+			}
+		},
+		"mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"dev": true
+		},
+		"min-indent": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+			"dev": true
+		},
+		"minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"requires": {
+				"brace-expansion": "^1.1.7"
+			}
+		},
+		"minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"dev": true
+		},
+		"minimist-options": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+			"dev": true,
+			"requires": {
+				"arrify": "^1.0.1",
+				"is-plain-obj": "^1.1.0",
+				"kind-of": "^6.0.3"
+			}
+		},
+		"mock-socket": {
+			"version": "9.0.8",
+			"resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.0.8.tgz",
+			"integrity": "sha512-8Syqkaaa2SzRqW68DEsnZkKQicHP7hVzfj3uCvigB5TL79H1ljKbwmOcRIENkx0ZTyu/5W6u+Pk9Qy6JCp38Ww==",
+			"dev": true
+		},
+		"ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"node-fetch": {
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+			"dev": true
+		},
+		"node-int64": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+			"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+			"dev": true
+		},
+		"node-releases": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+			"dev": true
+		},
+		"normalize-package-data": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
+			"integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^4.0.1",
+				"resolve": "^1.20.0",
+				"semver": "^7.3.4",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
+		"normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true
+		},
+		"npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dev": true,
+			"requires": {
+				"path-key": "^3.0.0"
+			}
+		},
+		"nwsapi": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+			"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+			"dev": true
+		},
+		"once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"requires": {
+				"wrappy": "1"
+			}
+		},
+		"onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+			"dev": true,
+			"requires": {
+				"mimic-fn": "^2.1.0"
+			}
+		},
+		"optionator": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+			"dev": true,
+			"requires": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.3"
+			}
+		},
+		"p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"requires": {
+				"p-try": "^2.0.0"
+			}
+		},
+		"p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"requires": {
+				"p-limit": "^2.2.0"
+			}
+		},
+		"p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true
+		},
+		"parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"requires": {
+				"callsites": "^3.0.0"
+			}
+		},
+		"parse-json": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
+			}
+		},
+		"parse5": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+			"dev": true
+		},
+		"path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true
+		},
+		"path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+			"dev": true
+		},
+		"path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true
+		},
+		"path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true
+		},
+		"path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"dev": true
+		},
+		"picocolors": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+			"dev": true
+		},
+		"picomatch": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+			"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+			"dev": true
+		},
+		"pirates": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
+			"integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==",
+			"dev": true
+		},
+		"pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"requires": {
+				"find-up": "^4.0.0"
+			}
+		},
+		"plur": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
+			"integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
+			"dev": true,
+			"requires": {
+				"irregular-plurals": "^3.2.0"
+			}
+		},
+		"prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true
+		},
+		"pretty-format": {
+			"version": "27.4.2",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz",
+			"integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.4.2",
+				"ansi-regex": "^5.0.1",
+				"ansi-styles": "^5.0.0",
+				"react-is": "^17.0.1"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+					"dev": true
+				}
+			}
+		},
+		"progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"dev": true
+		},
+		"promise-polyfill": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.2.0.tgz",
+			"integrity": "sha512-k/TC0mIcPVF6yHhUvwAp7cvL6I2fFV7TzF1DuGPI8mBh4QQazf36xCKEHKTZKRysEoTQoQdKyP25J8MPJp7j5g==",
+			"dev": true
+		},
+		"prompts": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+			"dev": true,
+			"requires": {
+				"kleur": "^3.0.3",
+				"sisteransi": "^1.0.5"
+			}
+		},
+		"psl": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+			"dev": true
+		},
+		"punycode": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true
+		},
+		"queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"dev": true
+		},
+		"quick-lru": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+			"dev": true
+		},
+		"react-is": {
+			"version": "17.0.2",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+			"dev": true
+		},
+		"read-pkg": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+			"dev": true,
+			"requires": {
+				"@types/normalize-package-data": "^2.4.0",
+				"normalize-package-data": "^2.5.0",
+				"parse-json": "^5.0.0",
+				"type-fest": "^0.6.0"
+			},
+			"dependencies": {
+				"hosted-git-info": {
+					"version": "2.8.9",
+					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+					"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+					"dev": true
+				},
+				"normalize-package-data": {
+					"version": "2.5.0",
+					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+					"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+					"dev": true,
+					"requires": {
+						"hosted-git-info": "^2.1.4",
+						"resolve": "^1.10.0",
+						"semver": "2 || 3 || 4 || 5",
+						"validate-npm-package-license": "^3.0.1"
+					}
+				},
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				},
+				"type-fest": {
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+					"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+					"dev": true
+				}
+			}
+		},
+		"read-pkg-up": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+			"dev": true,
+			"requires": {
+				"find-up": "^4.1.0",
+				"read-pkg": "^5.2.0",
+				"type-fest": "^0.8.1"
+			},
+			"dependencies": {
+				"type-fest": {
+					"version": "0.8.1",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+					"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+					"dev": true
+				}
+			}
+		},
+		"reconnecting-websocket": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz",
+			"integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng=="
+		},
+		"redent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+			"dev": true,
+			"requires": {
+				"indent-string": "^4.0.0",
+				"strip-indent": "^3.0.0"
+			}
+		},
+		"regexpp": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+			"dev": true
+		},
+		"require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+			"dev": true
+		},
+		"resolve": {
+			"version": "1.20.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+			"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+			"dev": true,
+			"requires": {
+				"is-core-module": "^2.2.0",
+				"path-parse": "^1.0.6"
+			}
+		},
+		"resolve-cwd": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+			"dev": true,
+			"requires": {
+				"resolve-from": "^5.0.0"
+			},
+			"dependencies": {
+				"resolve-from": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+					"dev": true
+				}
+			}
+		},
+		"resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true
+		},
+		"resolve.exports": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
+			"integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+			"dev": true
+		},
+		"reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"dev": true
+		},
+		"rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
+			"requires": {
+				"glob": "^7.1.3"
+			}
+		},
+		"run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"dev": true,
+			"requires": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
+		"safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"dev": true
+		},
+		"saxes": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+			"integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+			"dev": true,
+			"requires": {
+				"xmlchars": "^2.2.0"
+			}
+		},
+		"semver": {
+			"version": "7.3.8",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+			"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+			"requires": {
+				"lru-cache": "^6.0.0"
+			}
+		},
+		"shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"requires": {
+				"shebang-regex": "^3.0.0"
+			}
+		},
+		"shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true
+		},
+		"signal-exit": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
+			"integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
+			"dev": true
+		},
+		"sisteransi": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+			"dev": true
+		},
+		"slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true
+		},
+		"source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true
+		},
+		"source-map-support": {
+			"version": "0.5.21",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+			"dev": true,
+			"requires": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
+		"spdx-correct": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+			"dev": true,
+			"requires": {
+				"spdx-expression-parse": "^3.0.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"spdx-exceptions": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+			"dev": true
+		},
+		"spdx-expression-parse": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+			"dev": true,
+			"requires": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"spdx-license-ids": {
+			"version": "3.0.9",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
+			"integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
+			"dev": true
+		},
+		"sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
+		"stack-utils": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
+			"integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+			"dev": true,
+			"requires": {
+				"escape-string-regexp": "^2.0.0"
+			},
+			"dependencies": {
+				"escape-string-regexp": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+					"dev": true
+				}
+			}
+		},
+		"string-argv": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+			"integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+			"dev": true
+		},
+		"string-length": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+			"dev": true,
+			"requires": {
+				"char-regex": "^1.0.2",
+				"strip-ansi": "^6.0.0"
+			}
+		},
+		"string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"requires": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			}
+		},
+		"strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"requires": {
+				"ansi-regex": "^5.0.1"
+			}
+		},
+		"strip-bom": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+			"dev": true
+		},
+		"strip-final-newline": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+			"dev": true
+		},
+		"strip-indent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+			"dev": true,
+			"requires": {
+				"min-indent": "^1.0.0"
+			}
+		},
+		"strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true
+		},
+		"supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"requires": {
+				"has-flag": "^4.0.0"
+			}
+		},
+		"supports-hyperlinks": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+			"integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+			"dev": true,
+			"requires": {
+				"has-flag": "^4.0.0",
+				"supports-color": "^7.0.0"
+			}
+		},
+		"symbol-tree": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+			"dev": true
+		},
+		"terminal-link": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+			"integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+			"dev": true,
+			"requires": {
+				"ansi-escapes": "^4.2.1",
+				"supports-hyperlinks": "^2.0.0"
+			}
+		},
+		"test-exclude": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+			"dev": true,
+			"requires": {
+				"@istanbuljs/schema": "^0.1.2",
+				"glob": "^7.1.4",
+				"minimatch": "^3.0.4"
+			}
+		},
+		"text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+			"dev": true
+		},
+		"throat": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
+			"integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+			"dev": true
+		},
+		"timsort": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+			"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+			"dev": true
+		},
+		"tmpl": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+			"dev": true
+		},
+		"to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+			"dev": true
+		},
+		"to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"requires": {
+				"is-number": "^7.0.0"
+			}
+		},
+		"tough-cookie": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+			"integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+			"dev": true,
+			"requires": {
+				"psl": "^1.1.33",
+				"punycode": "^2.1.1",
+				"universalify": "^0.1.2"
+			}
+		},
+		"tr46": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+			"integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+			"dev": true,
+			"requires": {
+				"punycode": "^2.1.1"
+			}
+		},
+		"trim-newlines": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+			"dev": true
+		},
+		"ts-jest": {
+			"version": "27.1.2",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.2.tgz",
+			"integrity": "sha512-eSOiJOWq6Hhs6Khzk5wKC5sgWIXgXqOCiIl1+3lfnearu58Hj4QpE5tUhQcA3xtZrELbcvAGCsd6HB8OsaVaTA==",
+			"dev": true,
+			"requires": {
+				"bs-logger": "0.x",
+				"fast-json-stable-stringify": "2.x",
+				"jest-util": "^27.0.0",
+				"json5": "2.x",
+				"lodash.memoize": "4.x",
+				"make-error": "1.x",
+				"semver": "7.x",
+				"yargs-parser": "20.x"
+			}
+		},
+		"ts-node": {
+			"version": "10.4.0",
+			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz",
+			"integrity": "sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==",
+			"dev": true,
+			"requires": {
+				"@cspotcode/source-map-support": "0.7.0",
+				"@tsconfig/node10": "^1.0.7",
+				"@tsconfig/node12": "^1.0.7",
+				"@tsconfig/node14": "^1.0.0",
+				"@tsconfig/node16": "^1.0.2",
+				"acorn": "^8.4.1",
+				"acorn-walk": "^8.1.1",
+				"arg": "^4.1.0",
+				"create-require": "^1.1.0",
+				"diff": "^4.0.1",
+				"make-error": "^1.1.1",
+				"yn": "3.1.1"
+			},
+			"dependencies": {
+				"acorn-walk": {
+					"version": "8.2.0",
+					"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+					"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+					"dev": true
+				}
+			}
+		},
+		"tsd": {
+			"version": "0.19.1",
+			"resolved": "https://registry.npmjs.org/tsd/-/tsd-0.19.1.tgz",
+			"integrity": "sha512-pSwchclr+ADdxlahRUQXUrdAIOjXx1T1PQV+fLfVLuo/S4z+T00YU84fH8iPlZxyA2pWgJjo42BG1p9SDb4NOw==",
+			"dev": true,
+			"requires": {
+				"@tsd/typescript": "~4.5.2",
+				"eslint-formatter-pretty": "^4.1.0",
+				"globby": "^11.0.1",
+				"meow": "^9.0.0",
+				"path-exists": "^4.0.0",
+				"read-pkg-up": "^7.0.0"
+			}
+		},
+		"tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+			"dev": true
+		},
+		"tsutils": {
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+			"dev": true,
+			"requires": {
+				"tslib": "^1.8.1"
+			}
+		},
+		"type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
+			"requires": {
+				"prelude-ls": "^1.2.1"
+			}
+		},
+		"type-detect": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+			"dev": true
+		},
+		"type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true
+		},
+		"typedarray-to-buffer": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+			"dev": true,
+			"requires": {
+				"is-typedarray": "^1.0.0"
+			}
+		},
+		"typescript": {
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
+			"integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
+			"dev": true
+		},
+		"universalify": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+			"dev": true
+		},
+		"uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
+			"requires": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"v8-compile-cache": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+			"dev": true
+		},
+		"v8-to-istanbul": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz",
+			"integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-coverage": "^2.0.1",
+				"convert-source-map": "^1.6.0",
+				"source-map": "^0.7.3"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				}
+			}
+		},
+		"validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"dev": true,
+			"requires": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"validator": {
+			"version": "13.7.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
+			"integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
+			"dev": true
+		},
+		"w3c-hr-time": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+			"dev": true,
+			"requires": {
+				"browser-process-hrtime": "^1.0.0"
+			}
+		},
+		"w3c-xmlserializer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+			"integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+			"dev": true,
+			"requires": {
+				"xml-name-validator": "^3.0.0"
+			}
+		},
+		"walker": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+			"dev": true,
+			"requires": {
+				"makeerror": "1.0.12"
+			}
+		},
+		"webidl-conversions": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+			"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+			"dev": true
+		},
+		"whatwg-encoding": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+			"integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+			"dev": true,
+			"requires": {
+				"iconv-lite": "0.4.24"
+			}
+		},
+		"whatwg-mimetype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+			"dev": true
+		},
+		"whatwg-url": {
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+			"integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+			"dev": true,
+			"requires": {
+				"lodash": "^4.7.0",
+				"tr46": "^2.1.0",
+				"webidl-conversions": "^6.1.0"
+			}
+		},
+		"which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"requires": {
+				"isexe": "^2.0.0"
+			}
+		},
+		"word-wrap": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"dev": true
+		},
+		"wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			}
+		},
+		"wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		},
+		"write-file-atomic": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+			"dev": true,
+			"requires": {
+				"imurmurhash": "^0.1.4",
+				"is-typedarray": "^1.0.0",
+				"signal-exit": "^3.0.2",
+				"typedarray-to-buffer": "^3.1.5"
+			}
+		},
+		"ws": {
+			"version": "7.5.6",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
+			"integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
+			"dev": true,
+			"requires": {}
+		},
+		"xml-name-validator": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+			"dev": true
+		},
+		"xmlchars": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+			"dev": true
+		},
+		"y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"dev": true
+		},
+		"yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+		},
+		"yargs": {
+			"version": "16.2.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+			"dev": true,
+			"requires": {
+				"cliui": "^7.0.2",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.0",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^20.2.2"
+			}
+		},
+		"yargs-parser": {
+			"version": "20.2.7",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+			"integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+			"dev": true
+		},
+		"yn": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+			"dev": true
+		},
+		"z-schema": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.2.tgz",
+			"integrity": "sha512-40TH47ukMHq5HrzkeVE40Ad7eIDKaRV2b+Qpi2prLc9X9eFJFzV7tMe5aH12e6avaSS/u5l653EQOv+J9PirPw==",
+			"dev": true,
+			"requires": {
+				"commander": "^2.7.1",
+				"lodash.get": "^4.4.2",
+				"lodash.isequal": "^4.5.0",
+				"validator": "^13.7.0"
+			}
+		}
+	}
+}
diff --git a/packages/calckey-js/package.json b/packages/calckey-js/package.json
new file mode 100644
index 000000000..d68f24175
--- /dev/null
+++ b/packages/calckey-js/package.json
@@ -0,0 +1,47 @@
+{
+	"name": "calckey-js",
+	"version": "0.0.22",
+	"description": "Calckey SDK for JavaScript",
+	"main": "./built/index.js",
+	"types": "./built/index.d.ts",
+	"scripts": {
+		"build": "tsc",
+		"tsd": "tsd",
+		"api": "pnpm api-extractor run --local --verbose",
+		"api-prod": "pnpm api-extractor run --verbose",
+		"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
+		"typecheck": "tsc --noEmit",
+		"lint": "pnpm typecheck && pnpm eslint",
+		"jest": "jest --coverage --detectOpenHandles",
+		"test": "pnpm jest && pnpm tsd"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://codeberg.org/calckey/calckey.js"
+	},
+	"devDependencies": {
+		"@microsoft/api-extractor": "^7.19.3",
+		"@types/jest": "^27.4.0",
+		"@types/node": "17.0.5",
+		"@typescript-eslint/eslint-plugin": "5.8.1",
+		"@typescript-eslint/parser": "5.8.1",
+		"eslint": "8.6.0",
+		"jest": "^27.4.5",
+		"jest-fetch-mock": "^3.0.3",
+		"jest-websocket-mock": "^2.2.1",
+		"mock-socket": "^9.0.8",
+		"ts-jest": "^27.1.2",
+		"ts-node": "10.4.0",
+		"tsd": "^0.19.1",
+		"typescript": "4.5.4"
+	},
+	"files": [
+		"built"
+	],
+	"dependencies": {
+		"autobind-decorator": "^2.4.0",
+		"eventemitter3": "^4.0.7",
+		"reconnecting-websocket": "^4.4.0",
+		"semver": "^7.3.8"
+	}
+}
diff --git a/packages/calckey-js/src/acct.ts b/packages/calckey-js/src/acct.ts
new file mode 100644
index 000000000..5b7767a10
--- /dev/null
+++ b/packages/calckey-js/src/acct.ts
@@ -0,0 +1,14 @@
+export type Acct = {
+	username: string;
+	host: string | null;
+};
+
+export function parse(acct: string): Acct {
+	if (acct.startsWith("@")) acct = acct.substr(1);
+	const split = acct.split("@", 2);
+	return { username: split[0], host: split[1] || null };
+}
+
+export function toString(acct: Acct): string {
+	return acct.host == null ? acct.username : `${acct.username}@${acct.host}`;
+}
diff --git a/packages/calckey-js/src/api.ts b/packages/calckey-js/src/api.ts
new file mode 100644
index 000000000..141aa4b85
--- /dev/null
+++ b/packages/calckey-js/src/api.ts
@@ -0,0 +1,127 @@
+import { Endpoints } from "./api.types";
+
+const MK_API_ERROR = Symbol();
+
+export type APIError = {
+	id: string;
+	code: string;
+	message: string;
+	kind: "client" | "server";
+	info: Record<string, any>;
+};
+
+export function isAPIError(reason: any): reason is APIError {
+	return reason[MK_API_ERROR] === true;
+}
+
+export type FetchLike = (
+	input: string,
+	init?: {
+		method?: string;
+		body?: string;
+		credentials?: RequestCredentials;
+		cache?: RequestCache;
+	},
+) => Promise<{
+	status: number;
+	json(): Promise<any>;
+}>;
+
+type IsNeverType<T> = [T] extends [never] ? true : false;
+
+type StrictExtract<Union, Cond> = Cond extends Union ? Union : never;
+
+type IsCaseMatched<
+	E extends keyof Endpoints,
+	P extends Endpoints[E]["req"],
+	C extends number,
+> = IsNeverType<
+	StrictExtract<Endpoints[E]["res"]["$switch"]["$cases"][C], [P, any]>
+> extends false
+	? true
+	: false;
+
+type GetCaseResult<
+	E extends keyof Endpoints,
+	P extends Endpoints[E]["req"],
+	C extends number,
+> = StrictExtract<Endpoints[E]["res"]["$switch"]["$cases"][C], [P, any]>[1];
+
+export class APIClient {
+	public origin: string;
+	public credential: string | null | undefined;
+	public fetch: FetchLike;
+
+	constructor(opts: {
+		origin: APIClient["origin"];
+		credential?: APIClient["credential"];
+		fetch?: APIClient["fetch"] | null | undefined;
+	}) {
+		this.origin = opts.origin;
+		this.credential = opts.credential;
+		// ネイティブ関数をそのまま変数に代入して使おうとするとChromiumではIllegal invocationエラーが発生するため、
+		// 環境で実装されているfetchを使う場合は無名関数でラップして使用する
+		this.fetch = opts.fetch || ((...args) => fetch(...args));
+	}
+
+	public request<E extends keyof Endpoints, P extends Endpoints[E]["req"]>(
+		endpoint: E,
+		params: P = {} as P,
+		credential?: string | null | undefined,
+	): Promise<
+		Endpoints[E]["res"] extends {
+			$switch: { $cases: [any, any][]; $default: any };
+		}
+			? IsCaseMatched<E, P, 0> extends true
+				? GetCaseResult<E, P, 0>
+				: IsCaseMatched<E, P, 1> extends true
+				? GetCaseResult<E, P, 1>
+				: IsCaseMatched<E, P, 2> extends true
+				? GetCaseResult<E, P, 2>
+				: IsCaseMatched<E, P, 3> extends true
+				? GetCaseResult<E, P, 3>
+				: IsCaseMatched<E, P, 4> extends true
+				? GetCaseResult<E, P, 4>
+				: IsCaseMatched<E, P, 5> extends true
+				? GetCaseResult<E, P, 5>
+				: IsCaseMatched<E, P, 6> extends true
+				? GetCaseResult<E, P, 6>
+				: IsCaseMatched<E, P, 7> extends true
+				? GetCaseResult<E, P, 7>
+				: IsCaseMatched<E, P, 8> extends true
+				? GetCaseResult<E, P, 8>
+				: IsCaseMatched<E, P, 9> extends true
+				? GetCaseResult<E, P, 9>
+				: Endpoints[E]["res"]["$switch"]["$default"]
+			: Endpoints[E]["res"]
+	> {
+		const promise = new Promise((resolve, reject) => {
+			this.fetch(`${this.origin}/api/${endpoint}`, {
+				method: "POST",
+				body: JSON.stringify({
+					...params,
+					i: credential !== undefined ? credential : this.credential,
+				}),
+				credentials: "omit",
+				cache: "no-cache",
+			})
+				.then(async (res) => {
+					const body = res.status === 204 ? null : await res.json();
+
+					if (res.status === 200) {
+						resolve(body);
+					} else if (res.status === 204) {
+						resolve(null);
+					} else {
+						reject({
+							[MK_API_ERROR]: true,
+							...body.error,
+						});
+					}
+				})
+				.catch(reject);
+		});
+
+		return promise as any;
+	}
+}
diff --git a/packages/calckey-js/src/api.types.ts b/packages/calckey-js/src/api.types.ts
new file mode 100644
index 000000000..bbe781e92
--- /dev/null
+++ b/packages/calckey-js/src/api.types.ts
@@ -0,0 +1,1081 @@
+import {
+	Ad,
+	Announcement,
+	Antenna,
+	App,
+	AuthSession,
+	Blocking,
+	Channel,
+	Clip,
+	DateString,
+	DetailedInstanceMetadata,
+	DriveFile,
+	DriveFolder,
+	Following,
+	FollowingFolloweePopulated,
+	FollowingFollowerPopulated,
+	FollowRequest,
+	GalleryPost,
+	Instance,
+	InstanceMetadata,
+	LiteInstanceMetadata,
+	MeDetailed,
+	Note,
+	NoteFavorite,
+	OriginType,
+	Page,
+	ServerInfo,
+	Stats,
+	User,
+	UserDetailed,
+	UserGroup,
+	UserList,
+	UserSorting,
+	Notification,
+	NoteReaction,
+	Signin,
+	MessagingMessage,
+} from "./entities";
+
+type TODO = Record<string, any> | null;
+
+type NoParams = Record<string, never>;
+
+type ShowUserReq = { username: string; host?: string } | { userId: User["id"] };
+
+export type Endpoints = {
+	// admin
+	"admin/abuse-user-reports": { req: TODO; res: TODO };
+	"admin/delete-all-files-of-a-user": {
+		req: { userId: User["id"] };
+		res: null;
+	};
+	"admin/delete-logs": { req: NoParams; res: null };
+	"admin/get-index-stats": { req: TODO; res: TODO };
+	"admin/get-table-stats": { req: TODO; res: TODO };
+	"admin/invite": { req: TODO; res: TODO };
+	"admin/logs": { req: TODO; res: TODO };
+	"admin/reset-password": { req: TODO; res: TODO };
+	"admin/resolve-abuse-user-report": { req: TODO; res: TODO };
+	"admin/resync-chart": { req: TODO; res: TODO };
+	"admin/send-email": { req: TODO; res: TODO };
+	"admin/server-info": { req: TODO; res: TODO };
+	"admin/show-moderation-logs": { req: TODO; res: TODO };
+	"admin/show-user": { req: TODO; res: TODO };
+	"admin/show-users": { req: TODO; res: TODO };
+	"admin/silence-user": { req: TODO; res: TODO };
+	"admin/suspend-user": { req: TODO; res: TODO };
+	"admin/unsilence-user": { req: TODO; res: TODO };
+	"admin/unsuspend-user": { req: TODO; res: TODO };
+	"admin/update-meta": { req: TODO; res: TODO };
+	"admin/vacuum": { req: TODO; res: TODO };
+	"admin/accounts/create": { req: TODO; res: TODO };
+	"admin/ad/create": { req: TODO; res: TODO };
+	"admin/ad/delete": { req: { id: Ad["id"] }; res: null };
+	"admin/ad/list": { req: TODO; res: TODO };
+	"admin/ad/update": { req: TODO; res: TODO };
+	"admin/announcements/create": { req: TODO; res: TODO };
+	"admin/announcements/delete": { req: { id: Announcement["id"] }; res: null };
+	"admin/announcements/list": { req: TODO; res: TODO };
+	"admin/announcements/update": { req: TODO; res: TODO };
+	"admin/drive/clean-remote-files": { req: TODO; res: TODO };
+	"admin/drive/cleanup": { req: TODO; res: TODO };
+	"admin/drive/files": { req: TODO; res: TODO };
+	"admin/drive/show-file": { req: TODO; res: TODO };
+	"admin/emoji/add": { req: TODO; res: TODO };
+	"admin/emoji/copy": { req: TODO; res: TODO };
+	"admin/emoji/list-remote": { req: TODO; res: TODO };
+	"admin/emoji/list": { req: TODO; res: TODO };
+	"admin/emoji/remove": { req: TODO; res: TODO };
+	"admin/emoji/update": { req: TODO; res: TODO };
+	"admin/federation/delete-all-files": { req: { host: string }; res: null };
+	"admin/federation/refresh-remote-instance-metadata": { req: TODO; res: TODO };
+	"admin/federation/remove-all-following": { req: TODO; res: TODO };
+	"admin/federation/update-instance": { req: TODO; res: TODO };
+	"admin/moderators/add": { req: TODO; res: TODO };
+	"admin/moderators/remove": { req: TODO; res: TODO };
+	"admin/promo/create": { req: TODO; res: TODO };
+	"admin/queue/clear": { req: TODO; res: TODO };
+	"admin/queue/deliver-delayed": { req: TODO; res: TODO };
+	"admin/queue/inbox-delayed": { req: TODO; res: TODO };
+	"admin/queue/jobs": { req: TODO; res: TODO };
+	"admin/queue/stats": { req: TODO; res: TODO };
+	"admin/relays/add": { req: TODO; res: TODO };
+	"admin/relays/list": { req: TODO; res: TODO };
+	"admin/relays/remove": { req: TODO; res: TODO };
+
+	// announcements
+	announcements: {
+		req: {
+			limit?: number;
+			withUnreads?: boolean;
+			sinceId?: Announcement["id"];
+			untilId?: Announcement["id"];
+		};
+		res: Announcement[];
+	};
+
+	// antennas
+	"antennas/create": { req: TODO; res: Antenna };
+	"antennas/delete": { req: { antennaId: Antenna["id"] }; res: null };
+	"antennas/list": { req: NoParams; res: Antenna[] };
+	"antennas/notes": {
+		req: {
+			antennaId: Antenna["id"];
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+		};
+		res: Note[];
+	};
+	"antennas/show": { req: { antennaId: Antenna["id"] }; res: Antenna };
+	"antennas/update": { req: TODO; res: Antenna };
+	"antennas/mark-read": { req: TODO; res: Antenna };
+
+	// ap
+	"ap/get": { req: { uri: string }; res: Record<string, any> };
+	"ap/show": {
+		req: { uri: string };
+		res:
+			| {
+					type: "Note";
+					object: Note;
+			  }
+			| {
+					type: "User";
+					object: UserDetailed;
+			  };
+	};
+
+	// app
+	"app/create": { req: TODO; res: App };
+	"app/show": { req: { appId: App["id"] }; res: App };
+
+	// auth
+	"auth/accept": { req: { token: string }; res: null };
+	"auth/session/generate": {
+		req: { appSecret: string };
+		res: { token: string; url: string };
+	};
+	"auth/session/show": { req: { token: string }; res: AuthSession };
+	"auth/session/userkey": {
+		req: { appSecret: string; token: string };
+		res: { accessToken: string; user: User };
+	};
+
+	// blocking
+	"blocking/create": { req: { userId: User["id"] }; res: UserDetailed };
+	"blocking/delete": { req: { userId: User["id"] }; res: UserDetailed };
+	"blocking/list": {
+		req: { limit?: number; sinceId?: Blocking["id"]; untilId?: Blocking["id"] };
+		res: Blocking[];
+	};
+
+	// channels
+	"channels/create": { req: TODO; res: TODO };
+	"channels/featured": { req: TODO; res: TODO };
+	"channels/follow": { req: TODO; res: TODO };
+	"channels/followed": { req: TODO; res: TODO };
+	"channels/owned": { req: TODO; res: TODO };
+	"channels/pin-note": { req: TODO; res: TODO };
+	"channels/show": { req: TODO; res: TODO };
+	"channels/timeline": { req: TODO; res: TODO };
+	"channels/unfollow": { req: TODO; res: TODO };
+	"channels/update": { req: TODO; res: TODO };
+
+	// charts
+	"charts/active-users": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: {
+			local: {
+				users: number[];
+			};
+			remote: {
+				users: number[];
+			};
+		};
+	};
+	"charts/drive": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: {
+			local: {
+				decCount: number[];
+				decSize: number[];
+				incCount: number[];
+				incSize: number[];
+				totalCount: number[];
+				totalSize: number[];
+			};
+			remote: {
+				decCount: number[];
+				decSize: number[];
+				incCount: number[];
+				incSize: number[];
+				totalCount: number[];
+				totalSize: number[];
+			};
+		};
+	};
+	"charts/federation": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: {
+			instance: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+			};
+		};
+	};
+	"charts/hashtag": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: TODO;
+	};
+	"charts/instance": {
+		req: {
+			span: "day" | "hour";
+			limit?: number;
+			offset?: number | null;
+			host: string;
+		};
+		res: {
+			drive: {
+				decFiles: number[];
+				decUsage: number[];
+				incFiles: number[];
+				incUsage: number[];
+				totalFiles: number[];
+				totalUsage: number[];
+			};
+			followers: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+			};
+			following: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+			};
+			notes: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+				diffs: {
+					normal: number[];
+					renote: number[];
+					reply: number[];
+				};
+			};
+			requests: {
+				failed: number[];
+				received: number[];
+				succeeded: number[];
+			};
+			users: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+			};
+		};
+	};
+	"charts/network": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: TODO;
+	};
+	"charts/notes": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: {
+			local: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+				diffs: {
+					normal: number[];
+					renote: number[];
+					reply: number[];
+				};
+			};
+			remote: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+				diffs: {
+					normal: number[];
+					renote: number[];
+					reply: number[];
+				};
+			};
+		};
+	};
+	"charts/user/drive": {
+		req: {
+			span: "day" | "hour";
+			limit?: number;
+			offset?: number | null;
+			userId: User["id"];
+		};
+		res: {
+			decCount: number[];
+			decSize: number[];
+			incCount: number[];
+			incSize: number[];
+			totalCount: number[];
+			totalSize: number[];
+		};
+	};
+	"charts/user/following": {
+		req: {
+			span: "day" | "hour";
+			limit?: number;
+			offset?: number | null;
+			userId: User["id"];
+		};
+		res: TODO;
+	};
+	"charts/user/notes": {
+		req: {
+			span: "day" | "hour";
+			limit?: number;
+			offset?: number | null;
+			userId: User["id"];
+		};
+		res: {
+			dec: number[];
+			inc: number[];
+			total: number[];
+			diffs: {
+				normal: number[];
+				renote: number[];
+				reply: number[];
+			};
+		};
+	};
+	"charts/user/reactions": {
+		req: {
+			span: "day" | "hour";
+			limit?: number;
+			offset?: number | null;
+			userId: User["id"];
+		};
+		res: TODO;
+	};
+	"charts/users": {
+		req: { span: "day" | "hour"; limit?: number; offset?: number | null };
+		res: {
+			local: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+			};
+			remote: {
+				dec: number[];
+				inc: number[];
+				total: number[];
+			};
+		};
+	};
+
+	// clips
+	"clips/add-note": { req: TODO; res: TODO };
+	"clips/create": { req: TODO; res: TODO };
+	"clips/delete": { req: { clipId: Clip["id"] }; res: null };
+	"clips/list": { req: TODO; res: TODO };
+	"clips/notes": { req: TODO; res: TODO };
+	"clips/show": { req: TODO; res: TODO };
+	"clips/update": { req: TODO; res: TODO };
+
+	// drive
+	drive: { req: NoParams; res: { capacity: number; usage: number } };
+	"drive/files": {
+		req: {
+			folderId?: DriveFolder["id"] | null;
+			type?: DriveFile["type"] | null;
+			limit?: number;
+			sinceId?: DriveFile["id"];
+			untilId?: DriveFile["id"];
+		};
+		res: DriveFile[];
+	};
+	"drive/files/attached-notes": { req: TODO; res: TODO };
+	"drive/files/check-existence": { req: TODO; res: TODO };
+	"drive/files/create": { req: TODO; res: TODO };
+	"drive/files/delete": { req: { fileId: DriveFile["id"] }; res: null };
+	"drive/files/find-by-hash": { req: TODO; res: TODO };
+	"drive/files/find": {
+		req: { name: string; folderId?: DriveFolder["id"] | null };
+		res: DriveFile[];
+	};
+	"drive/files/show": {
+		req: { fileId?: DriveFile["id"]; url?: string };
+		res: DriveFile;
+	};
+	"drive/files/update": {
+		req: {
+			fileId: DriveFile["id"];
+			folderId?: DriveFolder["id"] | null;
+			name?: string;
+			isSensitive?: boolean;
+			comment?: string | null;
+		};
+		res: DriveFile;
+	};
+	"drive/files/upload-from-url": {
+		req: {
+			url: string;
+			folderId?: DriveFolder["id"] | null;
+			isSensitive?: boolean;
+			comment?: string | null;
+			marker?: string | null;
+			force?: boolean;
+		};
+		res: null;
+	};
+	"drive/folders": {
+		req: {
+			folderId?: DriveFolder["id"] | null;
+			limit?: number;
+			sinceId?: DriveFile["id"];
+			untilId?: DriveFile["id"];
+		};
+		res: DriveFolder[];
+	};
+	"drive/folders/create": {
+		req: { name?: string; parentId?: DriveFolder["id"] | null };
+		res: DriveFolder;
+	};
+	"drive/folders/delete": { req: { folderId: DriveFolder["id"] }; res: null };
+	"drive/folders/find": {
+		req: { name: string; parentId?: DriveFolder["id"] | null };
+		res: DriveFolder[];
+	};
+	"drive/folders/show": {
+		req: { folderId: DriveFolder["id"] };
+		res: DriveFolder;
+	};
+	"drive/folders/update": {
+		req: {
+			folderId: DriveFolder["id"];
+			name?: string;
+			parentId?: DriveFolder["id"] | null;
+		};
+		res: DriveFolder;
+	};
+	"drive/stream": {
+		req: {
+			type?: DriveFile["type"] | null;
+			limit?: number;
+			sinceId?: DriveFile["id"];
+			untilId?: DriveFile["id"];
+		};
+		res: DriveFile[];
+	};
+
+	// endpoint
+	endpoint: {
+		req: { endpoint: string };
+		res: { params: { name: string; type: string }[] };
+	};
+
+	// endpoints
+	endpoints: { req: NoParams; res: string[] };
+
+	// federation
+	"federation/dns": {
+		req: { host: string };
+		res: {
+			a: string[];
+			aaaa: string[];
+			cname: string[];
+			txt: string[];
+		};
+	};
+	"federation/followers": {
+		req: {
+			host: string;
+			limit?: number;
+			sinceId?: Following["id"];
+			untilId?: Following["id"];
+		};
+		res: FollowingFolloweePopulated[];
+	};
+	"federation/following": {
+		req: {
+			host: string;
+			limit?: number;
+			sinceId?: Following["id"];
+			untilId?: Following["id"];
+		};
+		res: FollowingFolloweePopulated[];
+	};
+	"federation/instances": {
+		req: {
+			host?: string | null;
+			blocked?: boolean | null;
+			notResponding?: boolean | null;
+			suspended?: boolean | null;
+			federating?: boolean | null;
+			subscribing?: boolean | null;
+			publishing?: boolean | null;
+			limit?: number;
+			offset?: number;
+			sort?:
+				| "+pubSub"
+				| "-pubSub"
+				| "+notes"
+				| "-notes"
+				| "+users"
+				| "-users"
+				| "+following"
+				| "-following"
+				| "+followers"
+				| "-followers"
+				| "+caughtAt"
+				| "-caughtAt"
+				| "+lastCommunicatedAt"
+				| "-lastCommunicatedAt"
+				| "+driveUsage"
+				| "-driveUsage"
+				| "+driveFiles"
+				| "-driveFiles";
+		};
+		res: Instance[];
+	};
+	"federation/show-instance": { req: { host: string }; res: Instance };
+	"federation/update-remote-user": { req: { userId: User["id"] }; res: null };
+	"federation/users": {
+		req: {
+			host: string;
+			limit?: number;
+			sinceId?: User["id"];
+			untilId?: User["id"];
+		};
+		res: UserDetailed[];
+	};
+
+	// following
+	"following/create": { req: { userId: User["id"] }; res: User };
+	"following/delete": { req: { userId: User["id"] }; res: User };
+	"following/requests/accept": { req: { userId: User["id"] }; res: null };
+	"following/requests/cancel": { req: { userId: User["id"] }; res: User };
+	"following/requests/list": { req: NoParams; res: FollowRequest[] };
+	"following/requests/reject": { req: { userId: User["id"] }; res: null };
+
+	// gallery
+	"gallery/featured": { req: TODO; res: TODO };
+	"gallery/popular": { req: TODO; res: TODO };
+	"gallery/posts": { req: TODO; res: TODO };
+	"gallery/posts/create": { req: TODO; res: TODO };
+	"gallery/posts/delete": { req: { postId: GalleryPost["id"] }; res: null };
+	"gallery/posts/like": { req: TODO; res: TODO };
+	"gallery/posts/show": { req: TODO; res: TODO };
+	"gallery/posts/unlike": { req: TODO; res: TODO };
+	"gallery/posts/update": { req: TODO; res: TODO };
+
+	// games
+	"games/reversi/games": { req: TODO; res: TODO };
+	"games/reversi/games/show": { req: TODO; res: TODO };
+	"games/reversi/games/surrender": { req: TODO; res: TODO };
+	"games/reversi/invitations": { req: TODO; res: TODO };
+	"games/reversi/match": { req: TODO; res: TODO };
+	"games/reversi/match/cancel": { req: TODO; res: TODO };
+
+	// get-online-users-count
+	"get-online-users-count": { req: NoParams; res: { count: number } };
+
+	// hashtags
+	"hashtags/list": { req: TODO; res: TODO };
+	"hashtags/search": { req: TODO; res: TODO };
+	"hashtags/show": { req: TODO; res: TODO };
+	"hashtags/trend": { req: TODO; res: TODO };
+	"hashtags/users": { req: TODO; res: TODO };
+
+	// i
+	i: { req: NoParams; res: User };
+	"i/apps": { req: TODO; res: TODO };
+	"i/authorized-apps": { req: TODO; res: TODO };
+	"i/change-password": { req: TODO; res: TODO };
+	"i/delete-account": { req: { password: string }; res: null };
+	"i/export-blocking": { req: TODO; res: TODO };
+	"i/export-following": { req: TODO; res: TODO };
+	"i/export-mute": { req: TODO; res: TODO };
+	"i/export-notes": { req: TODO; res: TODO };
+	"i/export-user-lists": { req: TODO; res: TODO };
+	"i/favorites": {
+		req: {
+			limit?: number;
+			sinceId?: NoteFavorite["id"];
+			untilId?: NoteFavorite["id"];
+		};
+		res: NoteFavorite[];
+	};
+	"i/gallery/likes": { req: TODO; res: TODO };
+	"i/gallery/posts": { req: TODO; res: TODO };
+	"i/get-word-muted-notes-count": { req: TODO; res: TODO };
+	"i/import-following": { req: TODO; res: TODO };
+	"i/import-user-lists": { req: TODO; res: TODO };
+	"i/move": { req: TODO; res: TODO };
+	"i/known-as": { req: TODO; res: TODO };
+	"i/notifications": {
+		req: {
+			limit?: number;
+			sinceId?: Notification["id"];
+			untilId?: Notification["id"];
+			following?: boolean;
+			markAsRead?: boolean;
+			includeTypes?: Notification["type"][];
+			excludeTypes?: Notification["type"][];
+		};
+		res: Notification[];
+	};
+	"i/page-likes": { req: TODO; res: TODO };
+	"i/pages": { req: TODO; res: TODO };
+	"i/pin": { req: { noteId: Note["id"] }; res: MeDetailed };
+	"i/read-all-messaging-messages": { req: TODO; res: TODO };
+	"i/read-all-unread-notes": { req: TODO; res: TODO };
+	"i/read-announcement": { req: TODO; res: TODO };
+	"i/regenerate-token": { req: { password: string }; res: null };
+	"i/registry/get-all": { req: { scope?: string[] }; res: Record<string, any> };
+	"i/registry/get-detail": {
+		req: { key: string; scope?: string[] };
+		res: { updatedAt: DateString; value: any };
+	};
+	"i/registry/get": { req: { key: string; scope?: string[] }; res: any };
+	"i/registry/keys-with-type": {
+		req: { scope?: string[] };
+		res: Record<
+			string,
+			"null" | "array" | "number" | "string" | "boolean" | "object"
+		>;
+	};
+	"i/registry/keys": { req: { scope?: string[] }; res: string[] };
+	"i/registry/remove": { req: { key: string; scope?: string[] }; res: null };
+	"i/registry/scopes": { req: NoParams; res: string[][] };
+	"i/registry/set": {
+		req: { key: string; value: any; scope?: string[] };
+		res: null;
+	};
+	"i/revoke-token": { req: TODO; res: TODO };
+	"i/signin-history": {
+		req: { limit?: number; sinceId?: Signin["id"]; untilId?: Signin["id"] };
+		res: Signin[];
+	};
+	"i/unpin": { req: { noteId: Note["id"] }; res: MeDetailed };
+	"i/update-email": {
+		req: {
+			password: string;
+			email?: string | null;
+		};
+		res: MeDetailed;
+	};
+	"i/update": {
+		req: {
+			name?: string | null;
+			description?: string | null;
+			lang?: string | null;
+			location?: string | null;
+			birthday?: string | null;
+			avatarId?: DriveFile["id"] | null;
+			bannerId?: DriveFile["id"] | null;
+			fields?: {
+				name: string;
+				value: string;
+			}[];
+			isLocked?: boolean;
+			isExplorable?: boolean;
+			hideOnlineStatus?: boolean;
+			carefulBot?: boolean;
+			autoAcceptFollowed?: boolean;
+			noCrawle?: boolean;
+			isBot?: boolean;
+			isCat?: boolean;
+			injectFeaturedNote?: boolean;
+			receiveAnnouncementEmail?: boolean;
+			alwaysMarkNsfw?: boolean;
+			mutedWords?: string[][];
+			mutingNotificationTypes?: Notification["type"][];
+			emailNotificationTypes?: string[];
+		};
+		res: MeDetailed;
+	};
+	"i/user-group-invites": { req: TODO; res: TODO };
+	"i/2fa/done": { req: TODO; res: TODO };
+	"i/2fa/key-done": { req: TODO; res: TODO };
+	"i/2fa/password-less": { req: TODO; res: TODO };
+	"i/2fa/register-key": { req: TODO; res: TODO };
+	"i/2fa/register": { req: TODO; res: TODO };
+	"i/2fa/remove-key": { req: TODO; res: TODO };
+	"i/2fa/unregister": { req: TODO; res: TODO };
+
+	// messaging
+	"messaging/history": {
+		req: { limit?: number; group?: boolean };
+		res: MessagingMessage[];
+	};
+	"messaging/messages": {
+		req: {
+			userId?: User["id"];
+			groupId?: UserGroup["id"];
+			limit?: number;
+			sinceId?: MessagingMessage["id"];
+			untilId?: MessagingMessage["id"];
+			markAsRead?: boolean;
+		};
+		res: MessagingMessage[];
+	};
+	"messaging/messages/create": {
+		req: {
+			userId?: User["id"];
+			groupId?: UserGroup["id"];
+			text?: string;
+			fileId?: DriveFile["id"];
+		};
+		res: MessagingMessage;
+	};
+	"messaging/messages/delete": {
+		req: { messageId: MessagingMessage["id"] };
+		res: null;
+	};
+	"messaging/messages/read": {
+		req: { messageId: MessagingMessage["id"] };
+		res: null;
+	};
+
+	// meta
+	meta: {
+		req: { detail?: boolean };
+		res: {
+			$switch: {
+				$cases: [
+					[{ detail: true }, DetailedInstanceMetadata],
+					[{ detail: false }, LiteInstanceMetadata],
+					[
+						{ detail: boolean },
+						LiteInstanceMetadata | DetailedInstanceMetadata,
+					],
+				];
+				$default: LiteInstanceMetadata;
+			};
+		};
+	};
+
+	// miauth
+	"miauth/gen-token": { req: TODO; res: TODO };
+
+	// mute
+	"mute/create": { req: TODO; res: TODO };
+	"mute/delete": { req: { userId: User["id"] }; res: null };
+	"mute/list": { req: TODO; res: TODO };
+
+	// my
+	"my/apps": { req: TODO; res: TODO };
+
+	// notes
+	notes: {
+		req: { limit?: number; sinceId?: Note["id"]; untilId?: Note["id"] };
+		res: Note[];
+	};
+	"notes/children": {
+		req: {
+			noteId: Note["id"];
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+		};
+		res: Note[];
+	};
+	"notes/clips": { req: TODO; res: TODO };
+	"notes/conversation": { req: TODO; res: TODO };
+	"notes/create": {
+		req: {
+			visibility?: "public" | "home" | "followers" | "specified";
+			visibleUserIds?: User["id"][];
+			text?: null | string;
+			cw?: null | string;
+			viaMobile?: boolean;
+			localOnly?: boolean;
+			fileIds?: DriveFile["id"][];
+			replyId?: null | Note["id"];
+			renoteId?: null | Note["id"];
+			channelId?: null | Channel["id"];
+			poll?: null | {
+				choices: string[];
+				multiple?: boolean;
+				expiresAt?: null | number;
+				expiredAfter?: null | number;
+			};
+		};
+		res: { createdNote: Note };
+	};
+	"notes/delete": { req: { noteId: Note["id"] }; res: null };
+	"notes/favorites/create": { req: { noteId: Note["id"] }; res: null };
+	"notes/favorites/delete": { req: { noteId: Note["id"] }; res: null };
+	"notes/featured": { req: TODO; res: Note[] };
+	"notes/global-timeline": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/recommended-timeline": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/hybrid-timeline": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/local-timeline": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/mentions": {
+		req: {
+			following?: boolean;
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+		};
+		res: Note[];
+	};
+	"notes/polls/recommendation": { req: TODO; res: TODO };
+	"notes/polls/vote": {
+		req: { noteId: Note["id"]; choice: number };
+		res: null;
+	};
+	"notes/reactions": {
+		req: { noteId: Note["id"]; type?: string | null; limit?: number };
+		res: NoteReaction[];
+	};
+	"notes/reactions/create": {
+		req: { noteId: Note["id"]; reaction: string };
+		res: null;
+	};
+	"notes/reactions/delete": { req: { noteId: Note["id"] }; res: null };
+	"notes/renotes": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			noteId: Note["id"];
+		};
+		res: Note[];
+	};
+	"notes/replies": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			noteId: Note["id"];
+		};
+		res: Note[];
+	};
+	"notes/search-by-tag": { req: TODO; res: TODO };
+	"notes/search": { req: TODO; res: TODO };
+	"notes/show": { req: { noteId: Note["id"] }; res: Note };
+	"notes/state": { req: TODO; res: TODO };
+	"notes/timeline": {
+		req: {
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/unrenote": { req: { noteId: Note["id"] }; res: null };
+	"notes/user-list-timeline": {
+		req: {
+			listId: UserList["id"];
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"notes/watching/create": { req: TODO; res: TODO };
+	"notes/watching/delete": { req: { noteId: Note["id"] }; res: null };
+
+	// notifications
+	"notifications/create": {
+		req: { body: string; header?: string | null; icon?: string | null };
+		res: null;
+	};
+	"notifications/mark-all-as-read": { req: NoParams; res: null };
+	"notifications/read": {
+		req: { notificationId: Notification["id"] };
+		res: null;
+	};
+
+	// page-push
+	"page-push": {
+		req: { pageId: Page["id"]; event: string; var?: any };
+		res: null;
+	};
+
+	// pages
+	"pages/create": { req: TODO; res: Page };
+	"pages/delete": { req: { pageId: Page["id"] }; res: null };
+	"pages/featured": { req: NoParams; res: Page[] };
+	"pages/like": { req: { pageId: Page["id"] }; res: null };
+	"pages/show": {
+		req: { pageId?: Page["id"]; name?: string; username?: string };
+		res: Page;
+	};
+	"pages/unlike": { req: { pageId: Page["id"] }; res: null };
+	"pages/update": { req: TODO; res: null };
+
+	// ping
+	ping: { req: NoParams; res: { pong: number } };
+
+	// pinned-users
+	"pinned-users": { req: TODO; res: TODO };
+
+	// promo
+	"promo/read": { req: TODO; res: TODO };
+
+	// request-reset-password
+	"request-reset-password": {
+		req: { username: string; email: string };
+		res: null;
+	};
+
+	// reset-password
+	"reset-password": { req: { token: string; password: string }; res: null };
+
+	// room
+	"room/show": { req: TODO; res: TODO };
+	"room/update": { req: TODO; res: TODO };
+
+	// stats
+	stats: { req: NoParams; res: Stats };
+
+	// server-info
+	"server-info": { req: NoParams; res: ServerInfo };
+
+	// ck specific
+	"latest-version": { req: NoParams; res: TODO };
+
+	// sw
+	"sw/register": { req: TODO; res: TODO };
+
+	// username
+	"username/available": {
+		req: { username: string };
+		res: { available: boolean };
+	};
+
+	// users
+	users: {
+		req: {
+			limit?: number;
+			offset?: number;
+			sort?: UserSorting;
+			origin?: OriginType;
+		};
+		res: User[];
+	};
+	"users/clips": { req: TODO; res: TODO };
+	"users/followers": {
+		req: {
+			userId?: User["id"];
+			username?: User["username"];
+			host?: User["host"] | null;
+			limit?: number;
+			sinceId?: Following["id"];
+			untilId?: Following["id"];
+		};
+		res: FollowingFollowerPopulated[];
+	};
+	"users/following": {
+		req: {
+			userId?: User["id"];
+			username?: User["username"];
+			host?: User["host"] | null;
+			limit?: number;
+			sinceId?: Following["id"];
+			untilId?: Following["id"];
+		};
+		res: FollowingFolloweePopulated[];
+	};
+	"users/gallery/posts": { req: TODO; res: TODO };
+	"users/get-frequently-replied-users": { req: TODO; res: TODO };
+	"users/groups/create": { req: TODO; res: TODO };
+	"users/groups/delete": { req: { groupId: UserGroup["id"] }; res: null };
+	"users/groups/invitations/accept": { req: TODO; res: TODO };
+	"users/groups/invitations/reject": { req: TODO; res: TODO };
+	"users/groups/invite": { req: TODO; res: TODO };
+	"users/groups/joined": { req: TODO; res: TODO };
+	"users/groups/owned": { req: TODO; res: TODO };
+	"users/groups/pull": { req: TODO; res: TODO };
+	"users/groups/show": { req: TODO; res: TODO };
+	"users/groups/transfer": { req: TODO; res: TODO };
+	"users/groups/update": { req: TODO; res: TODO };
+	"users/lists/create": { req: { name: string }; res: UserList };
+	"users/lists/delete": { req: { listId: UserList["id"] }; res: null };
+	"users/lists/list": { req: NoParams; res: UserList[] };
+	"users/lists/pull": {
+		req: { listId: UserList["id"]; userId: User["id"] };
+		res: null;
+	};
+	"users/lists/push": {
+		req: { listId: UserList["id"]; userId: User["id"] };
+		res: null;
+	};
+	"users/lists/show": { req: { listId: UserList["id"] }; res: UserList };
+	"users/lists/update": {
+		req: { listId: UserList["id"]; name: string };
+		res: UserList;
+	};
+	"users/notes": {
+		req: {
+			userId: User["id"];
+			limit?: number;
+			sinceId?: Note["id"];
+			untilId?: Note["id"];
+			sinceDate?: number;
+			untilDate?: number;
+		};
+		res: Note[];
+	};
+	"users/pages": { req: TODO; res: TODO };
+	"users/recommendation": { req: TODO; res: TODO };
+	"users/relation": { req: TODO; res: TODO };
+	"users/report-abuse": { req: TODO; res: TODO };
+	"users/search-by-username-and-host": { req: TODO; res: TODO };
+	"users/search": { req: TODO; res: TODO };
+	"users/show": {
+		req: ShowUserReq | { userIds: User["id"][] };
+		res: {
+			$switch: {
+				$cases: [[{ userIds: User["id"][] }, UserDetailed[]]];
+				$default: UserDetailed;
+			};
+		};
+	};
+	"users/stats": { req: TODO; res: TODO };
+};
diff --git a/packages/calckey-js/src/consts.ts b/packages/calckey-js/src/consts.ts
new file mode 100644
index 000000000..be33c0d3e
--- /dev/null
+++ b/packages/calckey-js/src/consts.ts
@@ -0,0 +1,60 @@
+export const notificationTypes = [
+	"follow",
+	"mention",
+	"reply",
+	"renote",
+	"quote",
+	"reaction",
+	"pollVote",
+	"pollEnded",
+	"receiveFollowRequest",
+	"followRequestAccepted",
+	"groupInvited",
+	"app",
+] as const;
+
+export const noteVisibilities = [
+	"public",
+	"home",
+	"followers",
+	"specified",
+] as const;
+
+export const mutedNoteReasons = ["word", "manual", "spam", "other"] as const;
+
+export const ffVisibility = ["public", "followers", "private"] as const;
+
+export const permissions = [
+	"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",
+];
diff --git a/packages/calckey-js/src/entities.ts b/packages/calckey-js/src/entities.ts
new file mode 100644
index 000000000..b15dd8fca
--- /dev/null
+++ b/packages/calckey-js/src/entities.ts
@@ -0,0 +1,490 @@
+export type ID = string;
+export type DateString = string;
+
+type TODO = Record<string, any>;
+
+// NOTE: 極力この型を使うのは避け、UserLite か UserDetailed か明示するように
+export type User = UserLite | UserDetailed;
+
+export type UserLite = {
+	id: ID;
+	username: string;
+	host: string | null;
+	name: string;
+	onlineStatus: "online" | "active" | "offline" | "unknown";
+	avatarUrl: string;
+	avatarBlurhash: string;
+	alsoKnownAs: string[];
+	movedToUri: any;
+	emojis: {
+		name: string;
+		url: string;
+	}[];
+	instance?: {
+		name: Instance["name"];
+		softwareName: Instance["softwareName"];
+		softwareVersion: Instance["softwareVersion"];
+		iconUrl: Instance["iconUrl"];
+		faviconUrl: Instance["faviconUrl"];
+		themeColor: Instance["themeColor"];
+	};
+};
+
+export type UserDetailed = UserLite & {
+	bannerBlurhash: string | null;
+	bannerColor: string | null;
+	bannerUrl: string | null;
+	birthday: string | null;
+	createdAt: DateString;
+	description: string | null;
+	ffVisibility: "public" | "followers" | "private";
+	fields: { name: string; value: string }[];
+	followersCount: number;
+	followingCount: number;
+	hasPendingFollowRequestFromYou: boolean;
+	hasPendingFollowRequestToYou: boolean;
+	isAdmin: boolean;
+	isBlocked: boolean;
+	isBlocking: boolean;
+	isBot: boolean;
+	isCat: boolean;
+	isFollowed: boolean;
+	isFollowing: boolean;
+	isLocked: boolean;
+	isModerator: boolean;
+	isMuted: boolean;
+	isSilenced: boolean;
+	isSuspended: boolean;
+	lang: string | null;
+	lastFetchedAt?: DateString;
+	location: string | null;
+	notesCount: number;
+	pinnedNoteIds: ID[];
+	pinnedNotes: Note[];
+	pinnedPage: Page | null;
+	pinnedPageId: string | null;
+	publicReactions: boolean;
+	securityKeys: boolean;
+	twoFactorEnabled: boolean;
+	updatedAt: DateString | null;
+	uri: string | null;
+	url: string | null;
+};
+
+export type UserGroup = TODO;
+
+export type UserList = {
+	id: ID;
+	createdAt: DateString;
+	name: string;
+	userIds: User["id"][];
+};
+
+export type MeDetailed = UserDetailed & {
+	avatarId: DriveFile["id"];
+	bannerId: DriveFile["id"];
+	autoAcceptFollowed: boolean;
+	alwaysMarkNsfw: boolean;
+	carefulBot: boolean;
+	emailNotificationTypes: string[];
+	hasPendingReceivedFollowRequest: boolean;
+	hasUnreadAnnouncement: boolean;
+	hasUnreadAntenna: boolean;
+	hasUnreadChannel: boolean;
+	hasUnreadMentions: boolean;
+	hasUnreadMessagingMessage: boolean;
+	hasUnreadNotification: boolean;
+	hasUnreadSpecifiedNotes: boolean;
+	hideOnlineStatus: boolean;
+	injectFeaturedNote: boolean;
+	integrations: Record<string, any>;
+	isDeleted: boolean;
+	isExplorable: boolean;
+	mutedWords: string[][];
+	mutingNotificationTypes: string[];
+	noCrawle: boolean;
+	receiveAnnouncementEmail: boolean;
+	usePasswordLessLogin: boolean;
+	[other: string]: any;
+};
+
+export type DriveFile = {
+	id: ID;
+	createdAt: DateString;
+	isSensitive: boolean;
+	name: string;
+	thumbnailUrl: string;
+	url: string;
+	type: string;
+	size: number;
+	md5: string;
+	blurhash: string;
+	comment: string | null;
+	properties: Record<string, any>;
+};
+
+export type DriveFolder = TODO;
+
+export type GalleryPost = TODO;
+
+export type Note = {
+	id: ID;
+	createdAt: DateString;
+	text: string | null;
+	cw: string | null;
+	user: User;
+	userId: User["id"];
+	reply?: Note;
+	replyId: Note["id"];
+	renote?: Note;
+	renoteId: Note["id"];
+	files: DriveFile[];
+	fileIds: DriveFile["id"][];
+	visibility: "public" | "home" | "followers" | "specified";
+	visibleUserIds?: User["id"][];
+	localOnly?: boolean;
+	myReaction?: string;
+	reactions: Record<string, number>;
+	renoteCount: number;
+	repliesCount: number;
+	poll?: {
+		expiresAt: DateString | null;
+		multiple: boolean;
+		choices: {
+			isVoted: boolean;
+			text: string;
+			votes: number;
+		}[];
+	};
+	emojis: {
+		name: string;
+		url: string;
+	}[];
+	uri?: string;
+	url?: string;
+	isHidden?: boolean;
+};
+
+export type NoteReaction = {
+	id: ID;
+	createdAt: DateString;
+	user: UserLite;
+	type: string;
+};
+
+export type Notification = {
+	id: ID;
+	createdAt: DateString;
+	isRead: boolean;
+} & (
+	| {
+			type: "reaction";
+			reaction: string;
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "reply";
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "renote";
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "quote";
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "mention";
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "pollVote";
+			user: User;
+			userId: User["id"];
+			note: Note;
+	  }
+	| {
+			type: "follow";
+			user: User;
+			userId: User["id"];
+	  }
+	| {
+			type: "followRequestAccepted";
+			user: User;
+			userId: User["id"];
+	  }
+	| {
+			type: "receiveFollowRequest";
+			user: User;
+			userId: User["id"];
+	  }
+	| {
+			type: "groupInvited";
+			invitation: UserGroup;
+			user: User;
+			userId: User["id"];
+	  }
+	| {
+			type: "app";
+			header?: string | null;
+			body: string;
+			icon?: string | null;
+	  }
+);
+
+export type MessagingMessage = {
+	id: ID;
+	createdAt: DateString;
+	file: DriveFile | null;
+	fileId: DriveFile["id"] | null;
+	isRead: boolean;
+	reads: User["id"][];
+	text: string | null;
+	user: User;
+	userId: User["id"];
+	recipient?: User | null;
+	recipientId: User["id"] | null;
+	group?: UserGroup | null;
+	groupId: UserGroup["id"] | null;
+};
+
+export type CustomEmoji = {
+	id: string;
+	name: string;
+	url: string;
+	category: string;
+	aliases: string[];
+};
+
+export type LiteInstanceMetadata = {
+	maintainerName: string | null;
+	maintainerEmail: string | null;
+	version: string;
+	name: string | null;
+	uri: string;
+	description: string | null;
+	tosUrl: string | null;
+	disableRegistration: boolean;
+	disableLocalTimeline: boolean;
+	disableRecommendedTimeline: boolean;
+	disableGlobalTimeline: boolean;
+	driveCapacityPerLocalUserMb: number;
+	driveCapacityPerRemoteUserMb: number;
+	enableHcaptcha: boolean;
+	hcaptchaSiteKey: string | null;
+	enableRecaptcha: boolean;
+	recaptchaSiteKey: string | null;
+	swPublickey: string | null;
+	maxNoteTextLength: number;
+	enableEmail: boolean;
+	enableTwitterIntegration: boolean;
+	enableGithubIntegration: boolean;
+	enableDiscordIntegration: boolean;
+	enableServiceWorker: boolean;
+	emojis: CustomEmoji[];
+	ads: {
+		id: ID;
+		ratio: number;
+		place: string;
+		url: string;
+		imageUrl: string;
+	}[];
+};
+
+export type DetailedInstanceMetadata = LiteInstanceMetadata & {
+	features: Record<string, any>;
+};
+
+export type InstanceMetadata = LiteInstanceMetadata | DetailedInstanceMetadata;
+
+export type ServerInfo = {
+	machine: string;
+	cpu: {
+		model: string;
+		cores: number;
+	};
+	mem: {
+		total: number;
+	};
+	fs: {
+		total: number;
+		used: number;
+	};
+};
+
+export type Stats = {
+	notesCount: number;
+	originalNotesCount: number;
+	usersCount: number;
+	originalUsersCount: number;
+	instances: number;
+	driveUsageLocal: number;
+	driveUsageRemote: number;
+};
+
+export type Page = {
+	id: ID;
+	createdAt: DateString;
+	updatedAt: DateString;
+	userId: User["id"];
+	user: User;
+	content: Record<string, any>[];
+	variables: Record<string, any>[];
+	title: string;
+	name: string;
+	summary: string | null;
+	hideTitleWhenPinned: boolean;
+	alignCenter: boolean;
+	font: string;
+	script: string;
+	eyeCatchingImageId: DriveFile["id"] | null;
+	eyeCatchingImage: DriveFile | null;
+	attachedFiles: any;
+	likedCount: number;
+	isLiked?: boolean;
+};
+
+export type PageEvent = {
+	pageId: Page["id"];
+	event: string;
+	var: any;
+	userId: User["id"];
+	user: User;
+};
+
+export type Announcement = {
+	id: ID;
+	createdAt: DateString;
+	updatedAt: DateString | null;
+	text: string;
+	title: string;
+	imageUrl: string | null;
+	isRead?: boolean;
+};
+
+export type Antenna = {
+	id: ID;
+	createdAt: DateString;
+	name: string;
+	keywords: string[][]; // TODO
+	excludeKeywords: string[][]; // TODO
+	src: "home" | "all" | "users" | "list" | "group" | "instances";
+	userListId: ID | null; // TODO
+	userGroupId: ID | null; // TODO
+	users: string[]; // TODO
+	instances: string[];
+	caseSensitive: boolean;
+	notify: boolean;
+	withReplies: boolean;
+	withFile: boolean;
+	hasUnreadNote: boolean;
+};
+
+export type App = TODO;
+
+export type AuthSession = {
+	id: ID;
+	app: App;
+	token: string;
+};
+
+export type Ad = TODO;
+
+export type Clip = TODO;
+
+export type NoteFavorite = {
+	id: ID;
+	createdAt: DateString;
+	noteId: Note["id"];
+	note: Note;
+};
+
+export type FollowRequest = {
+	id: ID;
+	follower: User;
+	followee: User;
+};
+
+export type Channel = {
+	id: ID;
+	// TODO
+};
+
+export type Following = {
+	id: ID;
+	createdAt: DateString;
+	followerId: User["id"];
+	followeeId: User["id"];
+};
+
+export type FollowingFolloweePopulated = Following & {
+	followee: UserDetailed;
+};
+
+export type FollowingFollowerPopulated = Following & {
+	follower: UserDetailed;
+};
+
+export type Blocking = {
+	id: ID;
+	createdAt: DateString;
+	blockeeId: User["id"];
+	blockee: UserDetailed;
+};
+
+export type Instance = {
+	id: ID;
+	caughtAt: DateString;
+	host: string;
+	usersCount: number;
+	notesCount: number;
+	followingCount: number;
+	followersCount: number;
+	driveUsage: number;
+	driveFiles: number;
+	latestRequestSentAt: DateString | null;
+	latestStatus: number | null;
+	latestRequestReceivedAt: DateString | null;
+	lastCommunicatedAt: DateString;
+	isNotResponding: boolean;
+	isSuspended: boolean;
+	softwareName: string | null;
+	softwareVersion: string | null;
+	openRegistrations: boolean | null;
+	name: string | null;
+	description: string | null;
+	maintainerName: string | null;
+	maintainerEmail: string | null;
+	iconUrl: string | null;
+	faviconUrl: string | null;
+	themeColor: string | null;
+	infoUpdatedAt: DateString | null;
+};
+
+export type Signin = {
+	id: ID;
+	createdAt: DateString;
+	ip: string;
+	headers: Record<string, any>;
+	success: boolean;
+};
+
+export type UserSorting =
+	| "+follower"
+	| "-follower"
+	| "+createdAt"
+	| "-createdAt"
+	| "+updatedAt"
+	| "-updatedAt";
+export type OriginType = "combined" | "local" | "remote";
diff --git a/packages/calckey-js/src/index.ts b/packages/calckey-js/src/index.ts
new file mode 100644
index 000000000..128ed8c53
--- /dev/null
+++ b/packages/calckey-js/src/index.ts
@@ -0,0 +1,20 @@
+import { Endpoints } from "./api.types";
+import Stream, { Connection } from "./streaming";
+import { Channels } from "./streaming.types";
+import { Acct } from "./acct";
+import * as consts from "./consts";
+
+export { Endpoints, Stream, Connection as ChannelConnection, Channels, Acct };
+
+export const permissions = consts.permissions;
+export const notificationTypes = consts.notificationTypes;
+export const noteVisibilities = consts.noteVisibilities;
+export const mutedNoteReasons = consts.mutedNoteReasons;
+export const ffVisibility = consts.ffVisibility;
+
+// api extractor not supported yet
+//export * as api from './api';
+//export * as entities from './entities';
+import * as api from "./api";
+import * as entities from "./entities";
+export { api, entities };
diff --git a/packages/calckey-js/src/streaming.ts b/packages/calckey-js/src/streaming.ts
new file mode 100644
index 000000000..80a3d6e8c
--- /dev/null
+++ b/packages/calckey-js/src/streaming.ts
@@ -0,0 +1,393 @@
+import autobind from "autobind-decorator";
+import { EventEmitter } from "eventemitter3";
+import ReconnectingWebsocket from "reconnecting-websocket";
+import { BroadcastEvents, Channels } from "./streaming.types";
+
+export function urlQuery(
+	obj: Record<string, string | number | boolean | undefined>,
+): string {
+	const params = Object.entries(obj)
+		.filter(([, v]) => (Array.isArray(v) ? v.length : v !== undefined))
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		.reduce(
+			(a, [k, v]) => ((a[k] = v!), a),
+			{} as Record<string, string | number | boolean>,
+		);
+
+	return Object.entries(params)
+		.map((e) => `${e[0]}=${encodeURIComponent(e[1])}`)
+		.join("&");
+}
+
+type AnyOf<T extends Record<any, any>> = T[keyof T];
+
+type StreamEvents = {
+	_connected_: void;
+	_disconnected_: void;
+} & BroadcastEvents;
+
+/**
+ * Misskey stream connection
+ */
+export default class Stream extends EventEmitter<StreamEvents> {
+	private stream: ReconnectingWebsocket;
+	public state: "initializing" | "reconnecting" | "connected" = "initializing";
+	private sharedConnectionPools: Pool[] = [];
+	private sharedConnections: SharedConnection[] = [];
+	private nonSharedConnections: NonSharedConnection[] = [];
+	private idCounter = 0;
+
+	constructor(
+		origin: string,
+		user: { token: string } | null,
+		options?: {
+			WebSocket?: any;
+		},
+	) {
+		super();
+		options = options || {};
+
+		const query = urlQuery({
+			i: user?.token,
+
+			// To prevent cache of an HTML such as error screen
+			_t: Date.now(),
+		});
+
+		const wsOrigin = origin
+			.replace("http://", "ws://")
+			.replace("https://", "wss://");
+
+		this.stream = new ReconnectingWebsocket(
+			`${wsOrigin}/streaming?${query}`,
+			"",
+			{
+				minReconnectionDelay: 1, // https://github.com/pladaria/reconnecting-websocket/issues/91
+				WebSocket: options.WebSocket,
+			},
+		);
+		this.stream.addEventListener("open", this.onOpen);
+		this.stream.addEventListener("close", this.onClose);
+		this.stream.addEventListener("message", this.onMessage);
+	}
+
+	@autobind
+	private genId(): string {
+		return (++this.idCounter).toString();
+	}
+
+	@autobind
+	public useChannel<C extends keyof Channels>(
+		channel: C,
+		params?: Channels[C]["params"],
+		name?: string,
+	): Connection<Channels[C]> {
+		if (params) {
+			return this.connectToChannel(channel, params);
+		} else {
+			return this.useSharedConnection(channel, name);
+		}
+	}
+
+	@autobind
+	private useSharedConnection<C extends keyof Channels>(
+		channel: C,
+		name?: string,
+	): SharedConnection<Channels[C]> {
+		let pool = this.sharedConnectionPools.find((p) => p.channel === channel);
+
+		if (pool == null) {
+			pool = new Pool(this, channel, this.genId());
+			this.sharedConnectionPools.push(pool);
+		}
+
+		const connection = new SharedConnection(this, channel, pool, name);
+		this.sharedConnections.push(connection);
+		return connection;
+	}
+
+	@autobind
+	public removeSharedConnection(connection: SharedConnection): void {
+		this.sharedConnections = this.sharedConnections.filter(
+			(c) => c !== connection,
+		);
+	}
+
+	@autobind
+	public removeSharedConnectionPool(pool: Pool): void {
+		this.sharedConnectionPools = this.sharedConnectionPools.filter(
+			(p) => p !== pool,
+		);
+	}
+
+	@autobind
+	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);
+		return connection;
+	}
+
+	@autobind
+	public disconnectToChannel(connection: NonSharedConnection): void {
+		this.nonSharedConnections = this.nonSharedConnections.filter(
+			(c) => c !== connection,
+		);
+	}
+
+	/**
+	 * Callback of when open connection
+	 */
+	@autobind
+	private onOpen(): void {
+		const isReconnect = this.state === "reconnecting";
+
+		this.state = "connected";
+		this.emit("_connected_");
+
+		// チャンネル再接続
+		if (isReconnect) {
+			for (const p of this.sharedConnectionPools) p.connect();
+			for (const c of this.nonSharedConnections) c.connect();
+		}
+	}
+
+	/**
+	 * Callback of when close connection
+	 */
+	@autobind
+	private onClose(): void {
+		if (this.state === "connected") {
+			this.state = "reconnecting";
+			this.emit("_disconnected_");
+		}
+	}
+
+	/**
+	 * Callback of when received a message from connection
+	 */
+	@autobind
+	private onMessage(message: { data: string }): void {
+		const { type, body } = JSON.parse(message.data);
+
+		if (type === "channel") {
+			const id = body.id;
+
+			let connections: Connection[];
+
+			connections = this.sharedConnections.filter((c) => c.id === id);
+
+			if (connections.length === 0) {
+				const found = this.nonSharedConnections.find((c) => c.id === id);
+				if (found) {
+					connections = [found];
+				}
+			}
+
+			for (const c of connections) {
+				c.emit(body.type, body.body);
+				c.inCount++;
+			}
+		} else {
+			this.emit(type, body);
+		}
+	}
+
+	/**
+	 * Send a message to connection
+	 */
+	@autobind
+	public send(typeOrPayload: any, payload?: any): void {
+		const data =
+			payload === undefined
+				? typeOrPayload
+				: {
+						type: typeOrPayload,
+						body: payload,
+				  };
+
+		this.stream.send(JSON.stringify(data));
+	}
+
+	/**
+	 * Close this connection
+	 */
+	@autobind
+	public close(): void {
+		this.stream.close();
+	}
+}
+
+// TODO: これらのクラスを Stream クラスの内部クラスにすれば余計なメンバをpublicにしないで済むかも？
+// もしくは @internal を使う？ https://www.typescriptlang.org/tsconfig#stripInternal
+class Pool {
+	public channel: string;
+	public id: string;
+	protected stream: Stream;
+	public users = 0;
+	private disposeTimerId: any;
+	private isConnected = false;
+
+	constructor(stream: Stream, channel: string, id: string) {
+		this.channel = channel;
+		this.stream = stream;
+		this.id = id;
+
+		this.stream.on("_disconnected_", this.onStreamDisconnected);
+	}
+
+	@autobind
+	private onStreamDisconnected(): void {
+		this.isConnected = false;
+	}
+
+	@autobind
+	public inc(): void {
+		if (this.users === 0 && !this.isConnected) {
+			this.connect();
+		}
+
+		this.users++;
+
+		// タイマー解除
+		if (this.disposeTimerId) {
+			clearTimeout(this.disposeTimerId);
+			this.disposeTimerId = null;
+		}
+	}
+
+	@autobind
+	public dec(): void {
+		this.users--;
+
+		// そのコネクションの利用者が誰もいなくなったら
+		if (this.users === 0) {
+			// また直ぐに再利用される可能性があるので、一定時間待ち、
+			// 新たな利用者が現れなければコネクションを切断する
+			this.disposeTimerId = setTimeout(() => {
+				this.disconnect();
+			}, 3000);
+		}
+	}
+
+	@autobind
+	public connect(): void {
+		if (this.isConnected) return;
+		this.isConnected = true;
+		this.stream.send("connect", {
+			channel: this.channel,
+			id: this.id,
+		});
+	}
+
+	@autobind
+	private disconnect(): void {
+		this.stream.off("_disconnected_", this.onStreamDisconnected);
+		this.stream.send("disconnect", { id: this.id });
+		this.stream.removeSharedConnectionPool(this);
+	}
+}
+
+export abstract class Connection<
+	Channel extends AnyOf<Channels> = any,
+> extends EventEmitter<Channel["events"]> {
+	public channel: string;
+	protected stream: Stream;
+	public abstract id: string;
+
+	public name?: string; // for debug
+	public inCount = 0; // for debug
+	public outCount = 0; // for debug
+
+	constructor(stream: Stream, channel: string, name?: string) {
+		super();
+
+		this.stream = stream;
+		this.channel = channel;
+		this.name = name;
+	}
+
+	@autobind
+	public send<T extends keyof Channel["receives"]>(
+		type: T,
+		body: Channel["receives"][T],
+	): void {
+		this.stream.send("ch", {
+			id: this.id,
+			type: type,
+			body: body,
+		});
+
+		this.outCount++;
+	}
+
+	public abstract dispose(): void;
+}
+
+class SharedConnection<
+	Channel extends AnyOf<Channels> = any,
+> extends Connection<Channel> {
+	private pool: Pool;
+
+	public get id(): string {
+		return this.pool.id;
+	}
+
+	constructor(stream: Stream, channel: string, pool: Pool, name?: string) {
+		super(stream, channel, name);
+
+		this.pool = pool;
+		this.pool.inc();
+	}
+
+	@autobind
+	public dispose(): void {
+		this.pool.dec();
+		this.removeAllListeners();
+		this.stream.removeSharedConnection(this);
+	}
+}
+
+class NonSharedConnection<
+	Channel extends AnyOf<Channels> = any,
+> extends Connection<Channel> {
+	public id: string;
+	protected params: Channel["params"];
+
+	constructor(
+		stream: Stream,
+		channel: string,
+		id: string,
+		params: Channel["params"],
+	) {
+		super(stream, channel);
+
+		this.params = params;
+		this.id = id;
+
+		this.connect();
+	}
+
+	@autobind
+	public connect(): void {
+		this.stream.send("connect", {
+			channel: this.channel,
+			id: this.id,
+			params: this.params,
+		});
+	}
+
+	@autobind
+	public dispose(): void {
+		this.removeAllListeners();
+		this.stream.send("disconnect", { id: this.id });
+		this.stream.disconnectToChannel(this);
+	}
+}
diff --git a/packages/calckey-js/src/streaming.types.ts b/packages/calckey-js/src/streaming.types.ts
new file mode 100644
index 000000000..44ef647bc
--- /dev/null
+++ b/packages/calckey-js/src/streaming.types.ts
@@ -0,0 +1,181 @@
+import {
+	Antenna,
+	CustomEmoji,
+	DriveFile,
+	MeDetailed,
+	MessagingMessage,
+	Note,
+	Notification,
+	PageEvent,
+	User,
+	UserGroup,
+} from "./entities";
+
+type FIXME = any;
+
+export type Channels = {
+	main: {
+		params: null;
+		events: {
+			notification: (payload: Notification) => void;
+			mention: (payload: Note) => void;
+			reply: (payload: Note) => void;
+			renote: (payload: Note) => void;
+			follow: (payload: User) => void; // 自分が他人をフォローしたとき
+			followed: (payload: User) => void; // 他人が自分をフォローしたとき
+			unfollow: (payload: User) => void; // 自分が他人をフォロー解除したとき
+			meUpdated: (payload: MeDetailed) => void;
+			pageEvent: (payload: PageEvent) => void;
+			urlUploadFinished: (payload: { marker: string; file: DriveFile }) => void;
+			readAllNotifications: () => void;
+			unreadNotification: (payload: Notification) => void;
+			unreadMention: (payload: Note["id"]) => void;
+			readAllUnreadMentions: () => void;
+			unreadSpecifiedNote: (payload: Note["id"]) => void;
+			readAllUnreadSpecifiedNotes: () => void;
+			readAllMessagingMessages: () => void;
+			messagingMessage: (payload: MessagingMessage) => void;
+			unreadMessagingMessage: (payload: MessagingMessage) => void;
+			readAllAntennas: () => void;
+			unreadAntenna: (payload: Antenna) => void;
+			readAllAnnouncements: () => void;
+			readAllChannels: () => void;
+			unreadChannel: (payload: Note["id"]) => void;
+			myTokenRegenerated: () => void;
+			reversiNoInvites: () => void;
+			reversiInvited: (payload: FIXME) => void;
+			signin: (payload: FIXME) => void;
+			registryUpdated: (payload: {
+				scope?: string[];
+				key: string;
+				value: any | null;
+			}) => void;
+			driveFileCreated: (payload: DriveFile) => void;
+			readAntenna: (payload: Antenna) => void;
+		};
+		receives: null;
+	};
+	homeTimeline: {
+		params: null;
+		events: {
+			note: (payload: Note) => void;
+		};
+		receives: null;
+	};
+	localTimeline: {
+		params: null;
+		events: {
+			note: (payload: Note) => void;
+		};
+		receives: null;
+	};
+	hybridTimeline: {
+		params: null;
+		events: {
+			note: (payload: Note) => void;
+		};
+		receives: null;
+	};
+	recommendedTimeline: {
+		params: null;
+		events: {
+			note: (payload: Note) => void;
+		};
+		receives: null;
+	};
+	globalTimeline: {
+		params: null;
+		events: {
+			note: (payload: Note) => void;
+		};
+		receives: null;
+	};
+	messaging: {
+		params: {
+			otherparty?: User["id"] | null;
+			group?: UserGroup["id"] | null;
+		};
+		events: {
+			message: (payload: MessagingMessage) => void;
+			deleted: (payload: MessagingMessage["id"]) => void;
+			read: (payload: MessagingMessage["id"][]) => void;
+			typers: (payload: User[]) => void;
+		};
+		receives: {
+			read: {
+				id: MessagingMessage["id"];
+			};
+		};
+	};
+	serverStats: {
+		params: null;
+		events: {
+			stats: (payload: FIXME) => void;
+		};
+		receives: {
+			requestLog: {
+				id: string | number;
+				length: number;
+			};
+		};
+	};
+	queueStats: {
+		params: null;
+		events: {
+			stats: (payload: FIXME) => void;
+		};
+		receives: {
+			requestLog: {
+				id: string | number;
+				length: number;
+			};
+		};
+	};
+};
+
+export type NoteUpdatedEvent =
+	| {
+			id: Note["id"];
+			type: "reacted";
+			body: {
+				reaction: string;
+				userId: User["id"];
+			};
+	  }
+	| {
+			id: Note["id"];
+			type: "unreacted";
+			body: {
+				reaction: string;
+				userId: User["id"];
+			};
+	  }
+	| {
+			id: Note["id"];
+			type: "deleted";
+			body: {
+				deletedAt: string;
+			};
+	  }
+	| {
+			id: Note["id"];
+			type: "pollVoted";
+			body: {
+				choice: number;
+				userId: User["id"];
+			};
+	  }
+	| {
+			id: Note["id"];
+			type: "replied";
+			body: {
+				id: Note["id"];
+			};
+	  };
+
+export type BroadcastEvents = {
+	noteUpdated: (payload: NoteUpdatedEvent) => void;
+	emojiAdded: (payload: {
+		emoji: CustomEmoji;
+	}) => void;
+};
diff --git a/packages/calckey-js/test-d/api.ts b/packages/calckey-js/test-d/api.ts
new file mode 100644
index 000000000..c5018177c
--- /dev/null
+++ b/packages/calckey-js/test-d/api.ts
@@ -0,0 +1,48 @@
+import { expectType } from "tsd";
+import * as Misskey from "../src";
+
+describe("API", () => {
+	test("success", async () => {
+		const cli = new Misskey.api.APIClient({
+			origin: "https://misskey.test",
+			credential: "TOKEN",
+		});
+		const res = await cli.request("meta", { detail: true });
+		expectType<Misskey.entities.DetailedInstanceMetadata>(res);
+	});
+
+	test("conditional respose type (meta)", async () => {
+		const cli = new Misskey.api.APIClient({
+			origin: "https://misskey.test",
+			credential: "TOKEN",
+		});
+
+		const res = await cli.request("meta", { detail: true });
+		expectType<Misskey.entities.DetailedInstanceMetadata>(res);
+
+		const res2 = await cli.request("meta", { detail: false });
+		expectType<Misskey.entities.LiteInstanceMetadata>(res2);
+
+		const res3 = await cli.request("meta", {});
+		expectType<Misskey.entities.LiteInstanceMetadata>(res3);
+
+		const res4 = await cli.request("meta", { detail: true as boolean });
+		expectType<
+			| Misskey.entities.LiteInstanceMetadata
+			| Misskey.entities.DetailedInstanceMetadata
+		>(res4);
+	});
+
+	test("conditional respose type (users/show)", async () => {
+		const cli = new Misskey.api.APIClient({
+			origin: "https://misskey.test",
+			credential: "TOKEN",
+		});
+
+		const res = await cli.request("users/show", { userId: "xxxxxxxx" });
+		expectType<Misskey.entities.UserDetailed>(res);
+
+		const res2 = await cli.request("users/show", { userIds: ["xxxxxxxx"] });
+		expectType<Misskey.entities.UserDetailed[]>(res2);
+	});
+});
diff --git a/packages/calckey-js/test-d/streaming.ts b/packages/calckey-js/test-d/streaming.ts
new file mode 100644
index 000000000..c49795dcc
--- /dev/null
+++ b/packages/calckey-js/test-d/streaming.ts
@@ -0,0 +1,32 @@
+import { expectType } from "tsd";
+import * as Misskey from "../src";
+
+describe("Streaming", () => {
+	test("emit type", async () => {
+		const stream = new Misskey.Stream("https://misskey.test", {
+			token: "TOKEN",
+		});
+		const mainChannel = stream.useChannel("main");
+		mainChannel.on("notification", (notification) => {
+			expectType<Misskey.entities.Notification>(notification);
+		});
+	});
+
+	test("params type", async () => {
+		const stream = new Misskey.Stream("https://misskey.test", {
+			token: "TOKEN",
+		});
+		// TODO: 「stream.useChannel の第二引数として受け入れる型が
+		// {
+		//   otherparty?: User['id'] | null;
+		//   group?: UserGroup['id'] | null;
+		// }
+		// になっている」というテストを行いたいけどtsdでの書き方がわからない
+		const messagingChannel = stream.useChannel("messaging", {
+			otherparty: "aaa",
+		});
+		messagingChannel.on("message", (message) => {
+			expectType<Misskey.entities.MessagingMessage>(message);
+		});
+	});
+});
diff --git a/packages/calckey-js/test/api.ts b/packages/calckey-js/test/api.ts
new file mode 100644
index 000000000..a8a1fc0e6
--- /dev/null
+++ b/packages/calckey-js/test/api.ts
@@ -0,0 +1,222 @@
+import { APIClient, isAPIError } from "../src/api";
+import { enableFetchMocks } from "jest-fetch-mock";
+
+enableFetchMocks();
+
+function getFetchCall(call: any[]) {
+	const { body, method } = call[1];
+	if (body != null && typeof body != "string") {
+		throw new Error("invalid body");
+	}
+	return {
+		url: call[0],
+		method: method,
+		body: JSON.parse(body as any),
+	};
+}
+
+describe("API", () => {
+	test("success", async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			const body = await req.json();
+			if (req.method == "POST" && req.url == "https://misskey.test/api/i") {
+				if (body.i === "TOKEN") {
+					return JSON.stringify({ id: "foo" });
+				} else {
+					return { status: 400 };
+				}
+			} else {
+				return { status: 404 };
+			}
+		});
+
+		const cli = new APIClient({
+			origin: "https://misskey.test",
+			credential: "TOKEN",
+		});
+
+		const res = await cli.request("i");
+
+		expect(res).toEqual({
+			id: "foo",
+		});
+
+		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
+			url: "https://misskey.test/api/i",
+			method: "POST",
+			body: { i: "TOKEN" },
+		});
+	});
+
+	test("with params", async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			const body = await req.json();
+			if (
+				req.method == "POST" &&
+				req.url == "https://misskey.test/api/notes/show"
+			) {
+				if (body.i === "TOKEN" && body.noteId === "aaaaa") {
+					return JSON.stringify({ id: "foo" });
+				} else {
+					return { status: 400 };
+				}
+			} else {
+				return { status: 404 };
+			}
+		});
+
+		const cli = new APIClient({
+			origin: "https://misskey.test",
+			credential: "TOKEN",
+		});
+
+		const res = await cli.request("notes/show", { noteId: "aaaaa" });
+
+		expect(res).toEqual({
+			id: "foo",
+		});
+
+		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
+			url: "https://misskey.test/api/notes/show",
+			method: "POST",
+			body: { i: "TOKEN", noteId: "aaaaa" },
+		});
+	});
+
+	test("204 No Content で null が返る", async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			if (
+				req.method == "POST" &&
+				req.url == "https://misskey.test/api/reset-password"
+			) {
+				return { status: 204 };
+			} else {
+				return { status: 404 };
+			}
+		});
+
+		const cli = new APIClient({
+			origin: "https://misskey.test",
+			credential: "TOKEN",
+		});
+
+		const res = await cli.request("reset-password", {
+			token: "aaa",
+			password: "aaa",
+		});
+
+		expect(res).toEqual(null);
+
+		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
+			url: "https://misskey.test/api/reset-password",
+			method: "POST",
+			body: { i: "TOKEN", token: "aaa", password: "aaa" },
+		});
+	});
+
+	test("インスタンスの credential が指定されていても引数で credential が null ならば null としてリクエストされる", async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			const body = await req.json();
+			if (req.method == "POST" && req.url == "https://misskey.test/api/i") {
+				if (typeof body.i === "string") {
+					return JSON.stringify({ id: "foo" });
+				} else {
+					return {
+						status: 401,
+						body: JSON.stringify({
+							error: {
+								message: "Credential required.",
+								code: "CREDENTIAL_REQUIRED",
+								id: "1384574d-a912-4b81-8601-c7b1c4085df1",
+							},
+						}),
+					};
+				}
+			} else {
+				return { status: 404 };
+			}
+		});
+
+		try {
+			const cli = new APIClient({
+				origin: "https://misskey.test",
+				credential: "TOKEN",
+			});
+
+			await cli.request("i", {}, null);
+		} catch (e) {
+			expect(isAPIError(e)).toEqual(true);
+		}
+	});
+
+	test("api error", async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			return {
+				status: 500,
+				body: JSON.stringify({
+					error: {
+						message:
+							"Internal error occurred. Please contact us if the error persists.",
+						code: "INTERNAL_ERROR",
+						id: "5d37dbcb-891e-41ca-a3d6-e690c97775ac",
+						kind: "server",
+					},
+				}),
+			};
+		});
+
+		try {
+			const cli = new APIClient({
+				origin: "https://misskey.test",
+				credential: "TOKEN",
+			});
+
+			await cli.request("i");
+		} catch (e: any) {
+			expect(isAPIError(e)).toEqual(true);
+			expect(e.id).toEqual("5d37dbcb-891e-41ca-a3d6-e690c97775ac");
+		}
+	});
+
+	test("network error", async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockAbort();
+
+		try {
+			const cli = new APIClient({
+				origin: "https://misskey.test",
+				credential: "TOKEN",
+			});
+
+			await cli.request("i");
+		} catch (e) {
+			expect(isAPIError(e)).toEqual(false);
+		}
+	});
+
+	test("json parse error", async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			return {
+				status: 500,
+				body: "<html>I AM NOT JSON</html>",
+			};
+		});
+
+		try {
+			const cli = new APIClient({
+				origin: "https://misskey.test",
+				credential: "TOKEN",
+			});
+
+			await cli.request("i");
+		} catch (e) {
+			expect(isAPIError(e)).toEqual(false);
+		}
+	});
+});
diff --git a/packages/calckey-js/test/streaming.ts b/packages/calckey-js/test/streaming.ts
new file mode 100644
index 000000000..920a9102b
--- /dev/null
+++ b/packages/calckey-js/test/streaming.ts
@@ -0,0 +1,181 @@
+import WS from "jest-websocket-mock";
+import Stream from "../src/streaming";
+
+describe("Streaming", () => {
+	test("useChannel", async () => {
+		const server = new WS("wss://misskey.test/streaming");
+		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
+		const mainChannelReceived: any[] = [];
+		const main = stream.useChannel("main");
+		main.on("meUpdated", (payload) => {
+			mainChannelReceived.push(payload);
+		});
+
+		const ws = await server.connected;
+		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
+			"TOKEN",
+		);
+
+		const msg = JSON.parse((await server.nextMessage) as string);
+		const mainChannelId = msg.body.id;
+		expect(msg.type).toEqual("connect");
+		expect(msg.body.channel).toEqual("main");
+		expect(mainChannelId != null).toEqual(true);
+
+		server.send(
+			JSON.stringify({
+				type: "channel",
+				body: {
+					id: mainChannelId,
+					type: "meUpdated",
+					body: {
+						id: "foo",
+					},
+				},
+			}),
+		);
+
+		expect(mainChannelReceived[0]).toEqual({
+			id: "foo",
+		});
+
+		stream.close();
+		server.close();
+	});
+
+	test("useChannel with parameters", async () => {
+		const server = new WS("wss://misskey.test/streaming");
+		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
+		const messagingChannelReceived: any[] = [];
+		const messaging = stream.useChannel("messaging", { otherparty: "aaa" });
+		messaging.on("message", (payload) => {
+			messagingChannelReceived.push(payload);
+		});
+
+		const ws = await server.connected;
+		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
+			"TOKEN",
+		);
+
+		const msg = JSON.parse((await server.nextMessage) as string);
+		const messagingChannelId = msg.body.id;
+		expect(msg.type).toEqual("connect");
+		expect(msg.body.channel).toEqual("messaging");
+		expect(msg.body.params).toEqual({ otherparty: "aaa" });
+		expect(messagingChannelId != null).toEqual(true);
+
+		server.send(
+			JSON.stringify({
+				type: "channel",
+				body: {
+					id: messagingChannelId,
+					type: "message",
+					body: {
+						id: "foo",
+					},
+				},
+			}),
+		);
+
+		expect(messagingChannelReceived[0]).toEqual({
+			id: "foo",
+		});
+
+		stream.close();
+		server.close();
+	});
+
+	test("ちゃんとチャンネルごとにidが異なる", async () => {
+		const server = new WS("wss://misskey.test/streaming");
+		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
+
+		stream.useChannel("messaging", { otherparty: "aaa" });
+		stream.useChannel("messaging", { otherparty: "bbb" });
+
+		const ws = await server.connected;
+		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
+			"TOKEN",
+		);
+
+		const msg = JSON.parse((await server.nextMessage) as string);
+		const messagingChannelId = msg.body.id;
+		const msg2 = JSON.parse((await server.nextMessage) as string);
+		const messagingChannelId2 = msg2.body.id;
+
+		expect(messagingChannelId != null).toEqual(true);
+		expect(messagingChannelId2 != null).toEqual(true);
+		expect(messagingChannelId).not.toEqual(messagingChannelId2);
+
+		stream.close();
+		server.close();
+	});
+
+	test("Connection#send", async () => {
+		const server = new WS("wss://misskey.test/streaming");
+		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
+
+		const messaging = stream.useChannel("messaging", { otherparty: "aaa" });
+		messaging.send("read", { id: "aaa" });
+
+		const ws = await server.connected;
+		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
+			"TOKEN",
+		);
+
+		const connectMsg = JSON.parse((await server.nextMessage) as string);
+		const channelId = connectMsg.body.id;
+		const msg = JSON.parse((await server.nextMessage) as string);
+
+		expect(msg.type).toEqual("ch");
+		expect(msg.body.id).toEqual(channelId);
+		expect(msg.body.type).toEqual("read");
+		expect(msg.body.body).toEqual({ id: "aaa" });
+
+		stream.close();
+		server.close();
+	});
+
+	test("Connection#dispose", async () => {
+		const server = new WS("wss://misskey.test/streaming");
+		const stream = new Stream("https://misskey.test", { token: "TOKEN" });
+		const mainChannelReceived: any[] = [];
+		const main = stream.useChannel("main");
+		main.on("meUpdated", (payload) => {
+			mainChannelReceived.push(payload);
+		});
+
+		const ws = await server.connected;
+		expect(new URLSearchParams(new URL(ws.url).search).get("i")).toEqual(
+			"TOKEN",
+		);
+
+		const msg = JSON.parse((await server.nextMessage) as string);
+		const mainChannelId = msg.body.id;
+		expect(msg.type).toEqual("connect");
+		expect(msg.body.channel).toEqual("main");
+		expect(mainChannelId != null).toEqual(true);
+		main.dispose();
+
+		server.send(
+			JSON.stringify({
+				type: "channel",
+				body: {
+					id: mainChannelId,
+					type: "meUpdated",
+					body: {
+						id: "foo",
+					},
+				},
+			}),
+		);
+
+		expect(mainChannelReceived.length).toEqual(0);
+
+		stream.close();
+		server.close();
+	});
+
+	// TODO: SharedConnection#dispose して一定時間経ったら disconnect メッセージがサーバーに送られてくるかのテスト
+
+	// TODO: チャンネル接続が使いまわされるかのテスト
+});
diff --git a/packages/calckey-js/tsconfig.json b/packages/calckey-js/tsconfig.json
new file mode 100644
index 000000000..a03a24262
--- /dev/null
+++ b/packages/calckey-js/tsconfig.json
@@ -0,0 +1,25 @@
+{
+	"$schema": "http://json.schemastore.org/tsconfig",
+	"compilerOptions": {
+		"target": "es2020",
+		"module": "commonjs",
+		"declaration": true,
+		"declarationMap": true,
+		"sourceMap": true,
+		"outDir": "./built/",
+		"removeComments": true,
+		"strict": true,
+		"strictFunctionTypes": true,
+		"strictNullChecks": true,
+		"experimentalDecorators": true,
+		"noImplicitReturns": true,
+		"esModuleInterop": true
+	},
+	"include": [
+		"src/**/*"
+	],
+	"exclude": [
+		"node_modules",
+		"test/**/*"
+	]
+}
diff --git a/packages/client/package.json b/packages/client/package.json
index 1267a3084..24af5b143 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -33,7 +33,7 @@
 		"blurhash": "1.1.5",
 		"broadcast-channel": "4.19.1",
 		"browser-image-resizer": "https://github.com/misskey-dev/browser-image-resizer.git",
-		"calckey-js": "^0.0.22",
+		"calckey-js": "workspace:*",
 		"chart.js": "4.1.1",
 		"chartjs-adapter-date-fns": "2.0.1",
 		"chartjs-chart-matrix": "^2.0.1",
diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index f2d3209d6..6c644660e 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -87,6 +87,9 @@ export default defineConfig(({ command, mode }) => {
 			emptyOutDir: false,
 			sourcemap: process.env.NODE_ENV === "development",
 			reportCompressedSize: false,
+			commonjsOptions: {
+				include: [/calckey-js/, /node_modules/],
+			},
 		},
 		optimizeDeps: {
 			auto: true,
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 32a7fcb7b..2c41a95b5 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -13,7 +13,7 @@
 		"@swc/cli": "^0.1.59",
 		"@swc/core": "^1.3.26",
 		"@swc/core-android-arm64": "1.3.11",
-		"calckey-js": "^0.0.22",
+		"calckey-js": "workspace:*",
 		"idb-keyval": "^6.2.0",
 		"swc-loader": "^0.2.3",
 		"webpack": "^5.75.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 48a6c5fc9..dad391189 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -19,9 +19,6 @@ importers:
       '@tensorflow/tfjs':
         specifier: ^3.21.0
         version: 3.21.0(seedrandom@3.0.5)
-      calckey-js:
-        specifier: ^0.0.22
-        version: 0.0.22
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
@@ -153,8 +150,8 @@ importers:
         specifier: 7.0.0
         version: 7.0.0
       calckey-js:
-        specifier: ^0.0.22
-        version: 0.0.22
+        specifier: workspace:*
+        version: link:../calckey-js
       cbor:
         specifier: 8.1.0
         version: 8.1.0
@@ -590,6 +587,64 @@ importers:
         specifier: 8.11.0
         version: 8.11.0
 
+  packages/calckey-js:
+    dependencies:
+      autobind-decorator:
+        specifier: ^2.4.0
+        version: 2.4.0
+      eventemitter3:
+        specifier: ^4.0.7
+        version: 4.0.7
+      reconnecting-websocket:
+        specifier: ^4.4.0
+        version: 4.4.0
+      semver:
+        specifier: ^7.3.8
+        version: 7.3.8
+    devDependencies:
+      '@microsoft/api-extractor':
+        specifier: ^7.19.3
+        version: 7.19.3
+      '@types/jest':
+        specifier: ^27.4.0
+        version: 27.4.0
+      '@types/node':
+        specifier: 17.0.5
+        version: 17.0.5
+      '@typescript-eslint/eslint-plugin':
+        specifier: 5.8.1
+        version: 5.8.1(@typescript-eslint/parser@5.8.1)(eslint@8.6.0)(typescript@4.5.4)
+      '@typescript-eslint/parser':
+        specifier: 5.8.1
+        version: 5.8.1(eslint@8.6.0)(typescript@4.5.4)
+      eslint:
+        specifier: 8.6.0
+        version: 8.6.0
+      jest:
+        specifier: ^27.4.5
+        version: 27.4.5(ts-node@10.4.0)
+      jest-fetch-mock:
+        specifier: ^3.0.3
+        version: 3.0.3
+      jest-websocket-mock:
+        specifier: ^2.2.1
+        version: 2.2.1(mock-socket@9.0.8)
+      mock-socket:
+        specifier: ^9.0.8
+        version: 9.0.8
+      ts-jest:
+        specifier: ^27.1.2
+        version: 27.1.2(@babel/core@7.21.4)(@types/jest@27.4.0)(jest@27.4.5)(typescript@4.5.4)
+      ts-node:
+        specifier: 10.4.0
+        version: 10.4.0(@types/node@17.0.5)(typescript@4.5.4)
+      tsd:
+        specifier: ^0.19.1
+        version: 0.19.1
+      typescript:
+        specifier: 4.5.4
+        version: 4.5.4
+
   packages/client:
     devDependencies:
       '@discordapp/twemoji':
@@ -668,8 +723,8 @@ importers:
         specifier: https://github.com/misskey-dev/browser-image-resizer.git
         version: github.com/misskey-dev/browser-image-resizer/0380d12c8e736788ea7f4e6e985175521ea7b23c
       calckey-js:
-        specifier: ^0.0.22
-        version: 0.0.22
+        specifier: workspace:*
+        version: link:../calckey-js
       chart.js:
         specifier: 4.1.1
         version: 4.1.1
@@ -842,8 +897,8 @@ importers:
         specifier: 1.3.11
         version: 1.3.11
       calckey-js:
-        specifier: ^0.0.22
-        version: 0.0.22
+        specifier: workspace:*
+        version: link:../calckey-js
       idb-keyval:
         specifier: ^6.2.0
         version: 6.2.0
@@ -859,12 +914,54 @@ importers:
 
 packages:
 
+  /@ampproject/remapping@2.2.1:
+    resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.2
+      '@jridgewell/trace-mapping': 0.3.17
+    dev: true
+
   /@babel/code-frame@7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.18.6
-    dev: false
+
+  /@babel/code-frame@7.21.4:
+    resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/highlight': 7.18.6
+    dev: true
+
+  /@babel/compat-data@7.21.4:
+    resolution: {integrity: sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/core@7.21.4:
+    resolution: {integrity: sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@ampproject/remapping': 2.2.1
+      '@babel/code-frame': 7.21.4
+      '@babel/generator': 7.21.4
+      '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.21.4)
+      '@babel/helper-module-transforms': 7.21.2
+      '@babel/helpers': 7.21.0
+      '@babel/parser': 7.21.4
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.21.4
+      '@babel/types': 7.21.4
+      convert-source-map: 1.9.0
+      debug: 4.3.4(supports-color@8.1.1)
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
   /@babel/generator@7.20.7:
     resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==}
@@ -873,12 +970,34 @@ packages:
       '@babel/types': 7.20.7
       '@jridgewell/gen-mapping': 0.3.2
       jsesc: 2.5.2
-    dev: false
+
+  /@babel/generator@7.21.4:
+    resolution: {integrity: sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.21.4
+      '@jridgewell/gen-mapping': 0.3.2
+      '@jridgewell/trace-mapping': 0.3.17
+      jsesc: 2.5.2
+    dev: true
+
+  /@babel/helper-compilation-targets@7.21.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/compat-data': 7.21.4
+      '@babel/core': 7.21.4
+      '@babel/helper-validator-option': 7.21.0
+      browserslist: 4.21.4
+      lru-cache: 5.1.1
+      semver: 6.3.0
+    dev: true
 
   /@babel/helper-environment-visitor@7.18.9:
     resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
     engines: {node: '>=6.9.0'}
-    dev: false
 
   /@babel/helper-function-name@7.19.0:
     resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==}
@@ -886,21 +1005,61 @@ packages:
     dependencies:
       '@babel/template': 7.20.7
       '@babel/types': 7.20.7
-    dev: false
+
+  /@babel/helper-function-name@7.21.0:
+    resolution: {integrity: sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.20.7
+      '@babel/types': 7.21.4
+    dev: true
 
   /@babel/helper-hoist-variables@7.18.6:
     resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.7
-    dev: false
+
+  /@babel/helper-module-imports@7.21.4:
+    resolution: {integrity: sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.21.4
+    dev: true
+
+  /@babel/helper-module-transforms@7.21.2:
+    resolution: {integrity: sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-module-imports': 7.21.4
+      '@babel/helper-simple-access': 7.20.2
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/helper-validator-identifier': 7.19.1
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.21.4
+      '@babel/types': 7.21.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-plugin-utils@7.20.2:
+    resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-simple-access@7.20.2:
+    resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.21.4
+    dev: true
 
   /@babel/helper-split-export-declaration@7.18.6:
     resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.20.7
-    dev: false
 
   /@babel/helper-string-parser@7.19.4:
     resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
@@ -910,6 +1069,22 @@ packages:
     resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/helper-validator-option@7.21.0:
+    resolution: {integrity: sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helpers@7.21.0:
+    resolution: {integrity: sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.21.4
+      '@babel/types': 7.21.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/highlight@7.18.6:
     resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
     engines: {node: '>=6.9.0'}
@@ -917,7 +1092,6 @@ packages:
       '@babel/helper-validator-identifier': 7.19.1
       chalk: 2.4.2
       js-tokens: 4.0.0
-    dev: false
 
   /@babel/parser@7.20.7:
     resolution: {integrity: sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==}
@@ -926,6 +1100,133 @@ packages:
     dependencies:
       '@babel/types': 7.20.7
 
+  /@babel/parser@7.21.4:
+    resolution: {integrity: sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.21.4
+    dev: true
+
+  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.21.4):
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.21.4):
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.21.4):
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
+  /@babel/plugin-syntax-typescript@7.21.4(@babel/core@7.21.4):
+    resolution: {integrity: sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/helper-plugin-utils': 7.20.2
+    dev: true
+
   /@babel/runtime@7.20.7:
     resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==}
     engines: {node: '>=6.9.0'}
@@ -940,7 +1241,6 @@ packages:
       '@babel/code-frame': 7.18.6
       '@babel/parser': 7.20.7
       '@babel/types': 7.20.7
-    dev: false
 
   /@babel/traverse@7.20.12:
     resolution: {integrity: sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==}
@@ -958,7 +1258,24 @@ packages:
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
-    dev: false
+
+  /@babel/traverse@7.21.4:
+    resolution: {integrity: sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.21.4
+      '@babel/generator': 7.21.4
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-function-name': 7.21.0
+      '@babel/helper-hoist-variables': 7.18.6
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/parser': 7.21.4
+      '@babel/types': 7.21.4
+      debug: 4.3.4(supports-color@8.1.1)
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
   /@babel/types@7.20.7:
     resolution: {integrity: sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==}
@@ -968,6 +1285,19 @@ packages:
       '@babel/helper-validator-identifier': 7.19.1
       to-fast-properties: 2.0.0
 
+  /@babel/types@7.21.4:
+    resolution: {integrity: sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.19.4
+      '@babel/helper-validator-identifier': 7.19.1
+      to-fast-properties: 2.0.0
+    dev: true
+
+  /@bcoe/v8-coverage@0.2.3:
+    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
+    dev: true
+
   /@bull-board/api@4.10.2:
     resolution: {integrity: sha512-lRHo0A7hsz71aOx1ZN0SmLLWfSuvKdL6EZ4imlgo5SuXGozybvlRc5KPIJU2/E1w5meoUGi+nFezBwp1gT/SMw==}
     dependencies:
@@ -1167,6 +1497,18 @@ packages:
     resolution: {integrity: sha512-RJu5IWzH6vcygwLsx9KEqzwjnEqApPkSFViMzxCRbe0IuAXt2ZlSUmYKgLFZY+YJIdaZ+/P7PwiUcZ7GYH3Msw==}
     dev: true
 
+  /@cspotcode/source-map-consumer@0.8.0:
+    resolution: {integrity: sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==}
+    engines: {node: '>= 12'}
+    dev: true
+
+  /@cspotcode/source-map-support@0.7.0:
+    resolution: {integrity: sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@cspotcode/source-map-consumer': 0.8.0
+    dev: true
+
   /@cspotcode/source-map-support@0.8.1:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
@@ -1480,6 +1822,17 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@humanwhocodes/config-array@0.9.5:
+    resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==}
+    engines: {node: '>=10.10.0'}
+    dependencies:
+      '@humanwhocodes/object-schema': 1.2.1
+      debug: 4.3.4(supports-color@8.1.1)
+      minimatch: 3.1.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@humanwhocodes/module-importer@1.0.1:
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
@@ -1490,6 +1843,213 @@ packages:
   /@ioredis/commands@1.2.0:
     resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==}
 
+  /@istanbuljs/load-nyc-config@1.1.0:
+    resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      camelcase: 5.3.1
+      find-up: 4.1.0
+      get-package-type: 0.1.0
+      js-yaml: 3.14.1
+      resolve-from: 5.0.0
+    dev: true
+
+  /@istanbuljs/schema@0.1.3:
+    resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /@jest/console@27.5.1:
+    resolution: {integrity: sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      jest-message-util: 27.5.1
+      jest-util: 27.5.1
+      slash: 3.0.0
+    dev: true
+
+  /@jest/core@27.5.1(ts-node@10.4.0):
+    resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@jest/console': 27.5.1
+      '@jest/reporters': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      emittery: 0.8.1
+      exit: 0.1.2
+      graceful-fs: 4.2.10
+      jest-changed-files: 27.5.1
+      jest-config: 27.5.1(ts-node@10.4.0)
+      jest-haste-map: 27.5.1
+      jest-message-util: 27.5.1
+      jest-regex-util: 27.5.1
+      jest-resolve: 27.5.1
+      jest-resolve-dependencies: 27.5.1
+      jest-runner: 27.5.1
+      jest-runtime: 27.5.1
+      jest-snapshot: 27.5.1
+      jest-util: 27.5.1
+      jest-validate: 27.5.1
+      jest-watcher: 27.5.1
+      micromatch: 4.0.5
+      rimraf: 3.0.2
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+    dev: true
+
+  /@jest/environment@27.5.1:
+    resolution: {integrity: sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/fake-timers': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      jest-mock: 27.5.1
+    dev: true
+
+  /@jest/fake-timers@27.5.1:
+    resolution: {integrity: sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      '@sinonjs/fake-timers': 8.1.0
+      '@types/node': 18.11.18
+      jest-message-util: 27.5.1
+      jest-mock: 27.5.1
+      jest-util: 27.5.1
+    dev: true
+
+  /@jest/globals@27.5.1:
+    resolution: {integrity: sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/types': 27.5.1
+      expect: 27.5.1
+    dev: true
+
+  /@jest/reporters@27.5.1:
+    resolution: {integrity: sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@bcoe/v8-coverage': 0.2.3
+      '@jest/console': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      collect-v8-coverage: 1.0.1
+      exit: 0.1.2
+      glob: 7.2.3
+      graceful-fs: 4.2.10
+      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-instrument: 5.2.1
+      istanbul-lib-report: 3.0.0
+      istanbul-lib-source-maps: 4.0.1
+      istanbul-reports: 3.1.5
+      jest-haste-map: 27.5.1
+      jest-resolve: 27.5.1
+      jest-util: 27.5.1
+      jest-worker: 27.5.1
+      slash: 3.0.0
+      source-map: 0.6.1
+      string-length: 4.0.2
+      terminal-link: 2.1.1
+      v8-to-istanbul: 8.1.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@jest/source-map@27.5.1:
+    resolution: {integrity: sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      callsites: 3.1.0
+      graceful-fs: 4.2.10
+      source-map: 0.6.1
+    dev: true
+
+  /@jest/test-result@27.5.1:
+    resolution: {integrity: sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/console': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/istanbul-lib-coverage': 2.0.4
+      collect-v8-coverage: 1.0.1
+    dev: true
+
+  /@jest/test-sequencer@27.5.1:
+    resolution: {integrity: sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/test-result': 27.5.1
+      graceful-fs: 4.2.10
+      jest-haste-map: 27.5.1
+      jest-runtime: 27.5.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@jest/transform@27.5.1:
+    resolution: {integrity: sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@babel/core': 7.21.4
+      '@jest/types': 27.5.1
+      babel-plugin-istanbul: 6.1.1
+      chalk: 4.1.2
+      convert-source-map: 1.9.0
+      fast-json-stable-stringify: 2.1.0
+      graceful-fs: 4.2.10
+      jest-haste-map: 27.5.1
+      jest-regex-util: 27.5.1
+      jest-util: 27.5.1
+      micromatch: 4.0.5
+      pirates: 4.0.5
+      slash: 3.0.0
+      source-map: 0.6.1
+      write-file-atomic: 3.0.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@jest/types@27.5.1:
+    resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.4
+      '@types/istanbul-reports': 3.0.1
+      '@types/node': 18.11.18
+      '@types/yargs': 16.0.5
+      chalk: 4.1.2
+    dev: true
+
   /@jridgewell/gen-mapping@0.3.2:
     resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
     engines: {node: '>=6.0.0'}
@@ -1622,6 +2182,45 @@ packages:
     dev: false
     optional: true
 
+  /@microsoft/api-extractor-model@7.15.2:
+    resolution: {integrity: sha512-qgxKX/s6vo3nCVLhP0Ds7555QrErhcYHEok5/KyEZ7iR8J5M5oldD1eJJQmtEdVF5IzmnPPbxx1nRvfgA674LQ==}
+    dependencies:
+      '@microsoft/tsdoc': 0.13.2
+      '@microsoft/tsdoc-config': 0.15.2
+      '@rushstack/node-core-library': 3.44.3
+    dev: true
+
+  /@microsoft/api-extractor@7.19.3:
+    resolution: {integrity: sha512-GZe+R3K4kh2X425iOHkPbByysB7FN0592mPPA6vNj5IhyhlPHgdZS6m6AmOZOIxMS4euM+SBKzEJEp3oC+WsOQ==}
+    hasBin: true
+    dependencies:
+      '@microsoft/api-extractor-model': 7.15.2
+      '@microsoft/tsdoc': 0.13.2
+      '@microsoft/tsdoc-config': 0.15.2
+      '@rushstack/node-core-library': 3.44.3
+      '@rushstack/rig-package': 0.3.7
+      '@rushstack/ts-command-line': 4.10.6
+      colors: 1.2.5
+      lodash: 4.17.21
+      resolve: 1.17.0
+      semver: 7.3.8
+      source-map: 0.6.1
+      typescript: 4.5.4
+    dev: true
+
+  /@microsoft/tsdoc-config@0.15.2:
+    resolution: {integrity: sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==}
+    dependencies:
+      '@microsoft/tsdoc': 0.13.2
+      ajv: 6.12.6
+      jju: 1.4.0
+      resolve: 1.19.0
+    dev: true
+
+  /@microsoft/tsdoc@0.13.2:
+    resolution: {integrity: sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==}
+    dev: true
+
   /@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0:
     resolution: {integrity: sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==}
     cpu: [arm64]
@@ -1910,6 +2509,36 @@ packages:
     dev: true
     optional: true
 
+  /@rushstack/node-core-library@3.44.3:
+    resolution: {integrity: sha512-Bt+R5LAnVr2BImTJqPpton5rvhJ2Wq8x4BaTqaCHQMmfxqtz5lb4nLYT9kneMJTCDuRMBvvLpSuz4MBj50PV3w==}
+    dependencies:
+      '@types/node': 12.20.24
+      colors: 1.2.5
+      fs-extra: 7.0.1
+      import-lazy: 4.0.0
+      jju: 1.4.0
+      resolve: 1.17.0
+      semver: 7.3.8
+      timsort: 0.3.0
+      z-schema: 5.0.5
+    dev: true
+
+  /@rushstack/rig-package@0.3.7:
+    resolution: {integrity: sha512-pzMsTSeTC8IiZ6EJLr53gGMvhT4oLWH+hxD7907cHyWuIUlEXFtu/2pK25vUQT13nKp5DJCWxXyYoGRk/h6rtA==}
+    dependencies:
+      resolve: 1.17.0
+      strip-json-comments: 3.1.1
+    dev: true
+
+  /@rushstack/ts-command-line@4.10.6:
+    resolution: {integrity: sha512-Y3GkUag39sTIlukDg9mUp8MCHrrlJ27POrBNRQGc/uF+VVgX8M7zMzHch5zP6O1QVquWgD7Engdpn2piPYaS/g==}
+    dependencies:
+      '@types/argparse': 1.0.38
+      argparse: 1.0.10
+      colors: 1.2.5
+      string-argv: 0.3.1
+    dev: true
+
   /@sideway/address@4.1.4:
     resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
     dependencies:
@@ -1943,7 +2572,12 @@ packages:
     resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==}
     dependencies:
       type-detect: 4.0.8
-    dev: false
+
+  /@sinonjs/fake-timers@8.1.0:
+    resolution: {integrity: sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==}
+    dependencies:
+      '@sinonjs/commons': 1.8.6
+    dev: true
 
   /@sinonjs/fake-timers@9.1.2:
     resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==}
@@ -2317,6 +2951,11 @@ packages:
     resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
     dev: false
 
+  /@tootallnate/once@1.1.2:
+    resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
+    engines: {node: '>= 6'}
+    dev: true
+
   /@tootallnate/once@2.0.0:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
@@ -2334,11 +2973,49 @@ packages:
   /@tsconfig/node16@1.0.3:
     resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==}
 
+  /@tsd/typescript@4.5.5:
+    resolution: {integrity: sha512-TxQ9QiUT94ZjKu++ta/iwTMVHsix4ApohnaHPTSd58WQuTjPIELP0tUYcW7lT6psz7yZiU4eRw+X4v/XV830Sw==}
+    hasBin: true
+    dev: true
+
   /@types/accepts@1.3.5:
     resolution: {integrity: sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==}
     dependencies:
       '@types/node': 18.11.18
 
+  /@types/argparse@1.0.38:
+    resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==}
+    dev: true
+
+  /@types/babel__core@7.20.0:
+    resolution: {integrity: sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==}
+    dependencies:
+      '@babel/parser': 7.20.7
+      '@babel/types': 7.20.7
+      '@types/babel__generator': 7.6.4
+      '@types/babel__template': 7.4.1
+      '@types/babel__traverse': 7.18.3
+    dev: true
+
+  /@types/babel__generator@7.6.4:
+    resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
+    dependencies:
+      '@babel/types': 7.21.4
+    dev: true
+
+  /@types/babel__template@7.4.1:
+    resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
+    dependencies:
+      '@babel/parser': 7.21.4
+      '@babel/types': 7.21.4
+    dev: true
+
+  /@types/babel__traverse@7.18.3:
+    resolution: {integrity: sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==}
+    dependencies:
+      '@babel/types': 7.20.7
+    dev: true
+
   /@types/bcryptjs@2.4.2:
     resolution: {integrity: sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==}
     dev: true
@@ -2412,6 +3089,13 @@ packages:
       '@types/estree': 0.0.51
     dev: true
 
+  /@types/eslint@7.29.0:
+    resolution: {integrity: sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==}
+    dependencies:
+      '@types/estree': 0.0.51
+      '@types/json-schema': 7.0.11
+    dev: true
+
   /@types/eslint@8.4.10:
     resolution: {integrity: sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==}
     dependencies:
@@ -2472,6 +3156,12 @@ packages:
       '@types/node': 18.11.18
     dev: true
 
+  /@types/graceful-fs@4.1.6:
+    resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
+    dependencies:
+      '@types/node': 18.11.18
+    dev: true
+
   /@types/gulp-rename@2.0.1:
     resolution: {integrity: sha512-9ZjeS2RHEnmBmTcyi2+oeye3BgCsWhvi4uv3qCnAg8i6plOuRdaeNxjOves0ELysEXYLBl7bCl5fbVs7AZtgTA==}
     dependencies:
@@ -2506,6 +3196,29 @@ packages:
       - supports-color
     dev: true
 
+  /@types/istanbul-lib-coverage@2.0.4:
+    resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
+    dev: true
+
+  /@types/istanbul-lib-report@3.0.0:
+    resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==}
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.4
+    dev: true
+
+  /@types/istanbul-reports@3.0.1:
+    resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==}
+    dependencies:
+      '@types/istanbul-lib-report': 3.0.0
+    dev: true
+
+  /@types/jest@27.4.0:
+    resolution: {integrity: sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==}
+    dependencies:
+      jest-diff: 27.5.1
+      pretty-format: 27.5.1
+    dev: true
+
   /@types/js-yaml@4.0.5:
     resolution: {integrity: sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==}
     dev: true
@@ -2691,6 +3404,10 @@ packages:
     resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
     dev: true
 
+  /@types/minimist@1.2.2:
+    resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
+    dev: true
+
   /@types/mocha@9.1.1:
     resolution: {integrity: sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==}
     dev: true
@@ -2709,9 +3426,17 @@ packages:
       node-fetch: 3.3.0
     dev: true
 
+  /@types/node@12.20.24:
+    resolution: {integrity: sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==}
+    dev: true
+
   /@types/node@14.18.36:
     resolution: {integrity: sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==}
 
+  /@types/node@17.0.5:
+    resolution: {integrity: sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw==}
+    dev: true
+
   /@types/node@18.11.18:
     resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
 
@@ -2721,6 +3446,10 @@ packages:
       '@types/node': 18.11.18
     dev: true
 
+  /@types/normalize-package-data@2.4.1:
+    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
+    dev: true
+
   /@types/oauth@0.9.1:
     resolution: {integrity: sha512-a1iY62/a3yhZ7qH7cNUsxoI3U/0Fe9+RnuFrpTKr+0WVOzbKlSLojShCKe20aOD1Sppv+i8Zlq0pLDuTJnwS4A==}
     dependencies:
@@ -2734,6 +3463,10 @@ packages:
     resolution: {integrity: sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg==}
     dev: false
 
+  /@types/prettier@2.7.2:
+    resolution: {integrity: sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==}
+    dev: true
+
   /@types/pug@2.0.6:
     resolution: {integrity: sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==}
     dev: true
@@ -2832,6 +3565,10 @@ packages:
       '@types/node': 18.11.18
     dev: true
 
+  /@types/stack-utils@2.0.1:
+    resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
+    dev: true
+
   /@types/throttle-debounce@5.0.0:
     resolution: {integrity: sha512-Pb7k35iCGFcGPECoNE4DYp3Oyf2xcTd3FbFQxXUI9hEYKUl6YX+KLf7HrBmgVcD05nl50LIH6i+80js4iYmWbw==}
     dev: true
@@ -2915,6 +3652,16 @@ packages:
       '@types/node': 18.11.18
     dev: false
 
+  /@types/yargs-parser@21.0.0:
+    resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
+    dev: true
+
+  /@types/yargs@16.0.5:
+    resolution: {integrity: sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==}
+    dependencies:
+      '@types/yargs-parser': 21.0.0
+    dev: true
+
   /@types/yauzl@2.10.0:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     requiresBuild: true
@@ -2923,6 +3670,112 @@ packages:
     dev: true
     optional: true
 
+  /@typescript-eslint/eslint-plugin@5.8.1(@typescript-eslint/parser@5.8.1)(eslint@8.6.0)(typescript@4.5.4):
+    resolution: {integrity: sha512-wTZ5oEKrKj/8/366qTM366zqhIKAp6NCMweoRONtfuC07OAU9nVI2GZZdqQ1qD30WAAtcPdkH+npDwtRFdp4Rw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/experimental-utils': 5.8.1(eslint@8.6.0)(typescript@4.5.4)
+      '@typescript-eslint/parser': 5.8.1(eslint@8.6.0)(typescript@4.5.4)
+      '@typescript-eslint/scope-manager': 5.8.1
+      debug: 4.3.4(supports-color@8.1.1)
+      eslint: 8.6.0
+      functional-red-black-tree: 1.0.1
+      ignore: 5.2.4
+      regexpp: 3.2.0
+      semver: 7.3.8
+      tsutils: 3.21.0(typescript@4.5.4)
+      typescript: 4.5.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/experimental-utils@5.8.1(eslint@8.6.0)(typescript@4.5.4):
+    resolution: {integrity: sha512-fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      '@types/json-schema': 7.0.11
+      '@typescript-eslint/scope-manager': 5.8.1
+      '@typescript-eslint/types': 5.8.1
+      '@typescript-eslint/typescript-estree': 5.8.1(typescript@4.5.4)
+      eslint: 8.6.0
+      eslint-scope: 5.1.1
+      eslint-utils: 3.0.0(eslint@8.6.0)
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/parser@5.8.1(eslint@8.6.0)(typescript@4.5.4):
+    resolution: {integrity: sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/scope-manager': 5.8.1
+      '@typescript-eslint/types': 5.8.1
+      '@typescript-eslint/typescript-estree': 5.8.1(typescript@4.5.4)
+      debug: 4.3.4(supports-color@8.1.1)
+      eslint: 8.6.0
+      typescript: 4.5.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/scope-manager@5.8.1:
+    resolution: {integrity: sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.8.1
+      '@typescript-eslint/visitor-keys': 5.8.1
+    dev: true
+
+  /@typescript-eslint/types@5.8.1:
+    resolution: {integrity: sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /@typescript-eslint/typescript-estree@5.8.1(typescript@4.5.4):
+    resolution: {integrity: sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': 5.8.1
+      '@typescript-eslint/visitor-keys': 5.8.1
+      debug: 4.3.4(supports-color@8.1.1)
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.3.8
+      tsutils: 3.21.0(typescript@4.5.4)
+      typescript: 4.5.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/visitor-keys@5.8.1:
+    resolution: {integrity: sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.8.1
+      eslint-visitor-keys: 3.3.0
+    dev: true
+
   /@vitejs/plugin-vue@4.0.0(vite@4.1.1)(vue@3.2.45):
     resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -3186,7 +4039,6 @@ packages:
 
   /abab@2.0.6:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
-    dev: false
 
   /abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
@@ -3206,6 +4058,13 @@ packages:
       negotiator: 0.6.3
     dev: false
 
+  /acorn-globals@6.0.0:
+    resolution: {integrity: sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==}
+    dependencies:
+      acorn: 7.4.1
+      acorn-walk: 7.2.0
+    dev: true
+
   /acorn-globals@7.0.1:
     resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
     dependencies:
@@ -3228,6 +4087,11 @@ packages:
     dependencies:
       acorn: 8.8.1
 
+  /acorn-walk@7.2.0:
+    resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
+    engines: {node: '>=0.4.0'}
+    dev: true
+
   /acorn-walk@8.2.0:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
@@ -3263,7 +4127,6 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
   /agentkeepalive@4.2.1:
     resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==}
@@ -3362,7 +4225,6 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       color-convert: 1.9.3
-    dev: false
 
   /ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
@@ -3370,6 +4232,11 @@ packages:
     dependencies:
       color-convert: 2.0.1
 
+  /ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+    dev: true
+
   /ansi-wrap@0.1.0:
     resolution: {integrity: sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==}
     engines: {node: '>=0.10.0'}
@@ -3575,6 +4442,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /arrify@1.0.1:
+    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /asap@2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
 
@@ -3755,6 +4627,79 @@ packages:
       - supports-color
     dev: false
 
+  /babel-jest@27.5.1(@babel/core@7.21.4):
+    resolution: {integrity: sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    peerDependencies:
+      '@babel/core': ^7.8.0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/babel__core': 7.20.0
+      babel-plugin-istanbul: 6.1.1
+      babel-preset-jest: 27.5.1(@babel/core@7.21.4)
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      slash: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-istanbul@6.1.1:
+    resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@babel/helper-plugin-utils': 7.20.2
+      '@istanbuljs/load-nyc-config': 1.1.0
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-instrument: 5.2.1
+      test-exclude: 6.0.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-jest-hoist@27.5.1:
+    resolution: {integrity: sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@babel/template': 7.20.7
+      '@babel/types': 7.21.4
+      '@types/babel__core': 7.20.0
+      '@types/babel__traverse': 7.18.3
+    dev: true
+
+  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.21.4):
+    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.4)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.21.4)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.21.4)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.4)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.4)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.4)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.21.4)
+    dev: true
+
+  /babel-preset-jest@27.5.1(@babel/core@7.21.4):
+    resolution: {integrity: sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.21.4
+      babel-plugin-jest-hoist: 27.5.1
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.4)
+    dev: true
+
   /babel-walk@3.0.0-canary-5:
     resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==}
     engines: {node: '>= 10.0.0'}
@@ -3960,6 +4905,10 @@ packages:
       unload: 2.4.1
     dev: true
 
+  /browser-process-hrtime@1.0.0:
+    resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==}
+    dev: true
+
   /browser-stdout@1.3.1:
     resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==}
     dev: true
@@ -3984,6 +4933,19 @@ packages:
       update-browserslist-db: 1.0.10(browserslist@4.21.4)
     dev: true
 
+  /bs-logger@0.2.6:
+    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
+    engines: {node: '>= 6'}
+    dependencies:
+      fast-json-stable-stringify: 2.1.0
+    dev: true
+
+  /bser@2.1.1:
+    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
+    dependencies:
+      node-int64: 0.4.0
+    dev: true
+
   /buffer-alloc-unsafe@1.1.0:
     resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==}
     dev: true
@@ -4189,14 +5151,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /calckey-js@0.0.22:
-    resolution: {integrity: sha512-So4Jc3w5QiwNO+8yLomjgNvHR9luKZ5bGLqjIEzAMsD/bIvUqWvriQAyWHN4EweyQUJ8UZCXBG9iyVX8VjtiXw==}
-    dependencies:
-      autobind-decorator: 2.4.0
-      eventemitter3: 4.0.7
-      reconnecting-websocket: 4.4.0
-      semver: 7.3.8
-
   /call-bind@1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
@@ -4207,6 +5161,15 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
+  /camelcase-keys@6.2.2:
+    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
+    engines: {node: '>=8'}
+    dependencies:
+      camelcase: 5.3.1
+      map-obj: 4.3.0
+      quick-lru: 4.0.1
+    dev: true
+
   /camelcase@3.0.0:
     resolution: {integrity: sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==}
     engines: {node: '>=0.10.0'}
@@ -4215,7 +5178,6 @@ packages:
   /camelcase@5.3.1:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
     engines: {node: '>=6'}
-    dev: false
 
   /camelcase@6.3.0:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
@@ -4293,7 +5255,6 @@ packages:
       ansi-styles: 3.2.1
       escape-string-regexp: 1.0.5
       supports-color: 5.5.0
-    dev: false
 
   /chalk@4.0.0:
     resolution: {integrity: sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==}
@@ -4433,6 +5394,10 @@ packages:
       lodash: 4.17.21
     dev: true
 
+  /cjs-module-lexer@1.2.2:
+    resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
+    dev: true
+
   /clap@1.2.3:
     resolution: {integrity: sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==}
     engines: {node: '>=0.10.0'}
@@ -4601,7 +5566,6 @@ packages:
   /co@4.6.0:
     resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
-    dev: false
 
   /coa@1.0.4:
     resolution: {integrity: sha512-KAGck/eNAmCL0dcT3BiuYwLbExK6lduR8DxM3C1TyDzaXhZHyZ8ooX5I5+na2e3dPFuibfxrGdorr0/Lr7RYCQ==}
@@ -4615,6 +5579,10 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /collect-v8-coverage@1.0.1:
+    resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
+    dev: true
+
   /collection-map@1.0.0:
     resolution: {integrity: sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==}
     engines: {node: '>=0.10.0'}
@@ -4703,6 +5671,11 @@ packages:
     engines: {node: '>=0.1.90'}
     dev: true
 
+  /colors@1.2.5:
+    resolution: {integrity: sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==}
+    engines: {node: '>=0.1.90'}
+    dev: true
+
   /combined-stream@1.0.8:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
@@ -5054,6 +6027,14 @@ packages:
       cross-spawn: 7.0.3
     dev: true
 
+  /cross-fetch@3.1.5:
+    resolution: {integrity: sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==}
+    dependencies:
+      node-fetch: 2.6.7
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
   /cross-spawn@5.1.0:
     resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
     dependencies:
@@ -5150,7 +6131,10 @@ packages:
 
   /cssom@0.3.8:
     resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
-    dev: false
+
+  /cssom@0.4.4:
+    resolution: {integrity: sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==}
+    dev: true
 
   /cssom@0.5.0:
     resolution: {integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==}
@@ -5161,7 +6145,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       cssom: 0.3.8
-    dev: false
 
   /csstype@2.6.21:
     resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
@@ -5251,6 +6234,15 @@ packages:
     resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
     engines: {node: '>= 12'}
 
+  /data-urls@2.0.0:
+    resolution: {integrity: sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      abab: 2.0.6
+      whatwg-mimetype: 2.3.0
+      whatwg-url: 8.7.0
+    dev: true
+
   /data-urls@3.0.2:
     resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==}
     engines: {node: '>=12'}
@@ -5316,6 +6308,14 @@ packages:
     resolution: {integrity: sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==}
     dev: false
 
+  /decamelize-keys@1.1.1:
+    resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      decamelize: 1.2.0
+      map-obj: 1.0.1
+    dev: true
+
   /decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
@@ -5327,7 +6327,6 @@ packages:
 
   /decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
-    dev: false
 
   /decode-uri-component@0.2.2:
     resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
@@ -5401,6 +6400,10 @@ packages:
       strip-dirs: 2.1.0
     dev: true
 
+  /dedent@0.7.0:
+    resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
+    dev: true
+
   /deep-email-validator@0.1.21:
     resolution: {integrity: sha512-DBAmMzbr+MAubXQ+TS9tZuPwLcdKscb8YzKZiwoLqF3NmaeEgXvSSHhZ0EXOFeKFE2FNWC4mNXCyiQ/JdFXUwg==}
     dependencies:
@@ -5427,7 +6430,6 @@ packages:
   /deepmerge@4.2.2:
     resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
     engines: {node: '>=0.10.0'}
-    dev: false
 
   /default-compare@1.0.0:
     resolution: {integrity: sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==}
@@ -5516,6 +6518,11 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
+  /detect-newline@3.1.0:
+    resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
+    engines: {node: '>=8'}
+    dev: true
+
   /dezalgo@1.0.4:
     resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
     dependencies:
@@ -5523,6 +6530,11 @@ packages:
       wrappy: 1.0.2
     dev: false
 
+  /diff-sequences@27.5.1:
+    resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dev: true
+
   /diff@4.0.2:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
@@ -5583,6 +6595,13 @@ packages:
   /domelementtype@2.3.0:
     resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
 
+  /domexception@2.0.1:
+    resolution: {integrity: sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==}
+    engines: {node: '>=8'}
+    dependencies:
+      webidl-conversions: 5.0.0
+    dev: true
+
   /domexception@4.0.0:
     resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==}
     engines: {node: '>=12'}
@@ -5712,6 +6731,11 @@ packages:
     resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
     dev: true
 
+  /emittery@0.8.1:
+    resolution: {integrity: sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==}
+    engines: {node: '>=10'}
+    dev: true
+
   /emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
@@ -5882,6 +6906,11 @@ packages:
     resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
     engines: {node: '>=0.8.0'}
 
+  /escape-string-regexp@2.0.0:
+    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
+    engines: {node: '>=8'}
+    dev: true
+
   /escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
@@ -5897,7 +6926,24 @@ packages:
       optionator: 0.8.3
     optionalDependencies:
       source-map: 0.6.1
-    dev: false
+
+  /eslint-formatter-pretty@4.1.0:
+    resolution: {integrity: sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      '@types/eslint': 7.29.0
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      eslint-rule-docs: 1.1.235
+      log-symbols: 4.1.0
+      plur: 4.0.0
+      string-width: 4.2.3
+      supports-hyperlinks: 2.3.0
+    dev: true
+
+  /eslint-rule-docs@1.1.235:
+    resolution: {integrity: sha512-+TQ+x4JdTnDoFEXXb3fDvfGOwnyNV7duH8fXWTPD1ieaBmB8omj7Gw/pMBBu4uI2uJCCU8APDaQJzWuXnTsH4A==}
+    dev: true
 
   /eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
@@ -5923,6 +6969,16 @@ packages:
       eslint: 8.31.0
       eslint-visitor-keys: 2.1.0
 
+  /eslint-utils@3.0.0(eslint@8.6.0):
+    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
+    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
+    peerDependencies:
+      eslint: '>=5'
+    dependencies:
+      eslint: 8.6.0
+      eslint-visitor-keys: 2.1.0
+    dev: true
+
   /eslint-visitor-keys@1.3.0:
     resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==}
     engines: {node: '>=4'}
@@ -5983,6 +7039,53 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /eslint@8.6.0:
+    resolution: {integrity: sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    hasBin: true
+    dependencies:
+      '@eslint/eslintrc': 1.4.1
+      '@humanwhocodes/config-array': 0.9.5
+      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
+      enquirer: 2.3.6
+      escape-string-regexp: 4.0.0
+      eslint-scope: 7.1.1
+      eslint-utils: 3.0.0(eslint@8.6.0)
+      eslint-visitor-keys: 3.3.0
+      espree: 9.4.1
+      esquery: 1.4.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 6.0.1
+      functional-red-black-tree: 1.0.1
+      glob-parent: 6.0.2
+      globals: 13.19.0
+      ignore: 4.0.6
+      import-fresh: 3.3.0
+      imurmurhash: 0.1.4
+      is-glob: 4.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.1
+      progress: 2.0.3
+      regexpp: 3.2.0
+      semver: 7.3.8
+      strip-ansi: 6.0.1
+      strip-json-comments: 3.1.1
+      text-table: 0.2.0
+      v8-compile-cache: 2.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /espree@9.4.1:
     resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -6001,7 +7104,6 @@ packages:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
     hasBin: true
-    dev: false
 
   /esquery@1.4.0:
     resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
@@ -6154,6 +7256,11 @@ packages:
       mixly: 1.0.0
     dev: true
 
+  /exit@0.1.2:
+    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
+    engines: {node: '>= 0.8.0'}
+    dev: true
+
   /expand-brackets@2.1.4:
     resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==}
     engines: {node: '>=0.10.0'}
@@ -6181,6 +7288,16 @@ packages:
       homedir-polyfill: 1.0.3
     dev: true
 
+  /expect@27.5.1:
+    resolution: {integrity: sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      jest-get-type: 27.5.1
+      jest-matcher-utils: 27.5.1
+      jest-message-util: 27.5.1
+    dev: true
+
   /ext-list@2.2.2:
     resolution: {integrity: sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==}
     engines: {node: '>=0.10.0'}
@@ -6303,6 +7420,12 @@ packages:
     dependencies:
       reusify: 1.0.4
 
+  /fb-watchman@2.0.2:
+    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
+    dependencies:
+      bser: 2.1.1
+    dev: true
+
   /fd-slicer@1.1.0:
     resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
     dependencies:
@@ -6566,7 +7689,6 @@ packages:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       mime-types: 2.1.35
-    dev: false
 
   /form-data@4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
@@ -6627,6 +7749,15 @@ packages:
       universalify: 2.0.0
     dev: true
 
+  /fs-extra@7.0.1:
+    resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
+    engines: {node: '>=6 <7 || >=8'}
+    dependencies:
+      graceful-fs: 4.2.10
+      jsonfile: 4.0.0
+      universalify: 0.1.2
+    dev: true
+
   /fs-extra@8.1.0:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
     engines: {node: '>=6 <7 || >=8'}
@@ -6695,6 +7826,10 @@ packages:
   /function-bind@1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
 
+  /functional-red-black-tree@1.0.1:
+    resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==}
+    dev: true
+
   /gauge@3.0.2:
     resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==}
     engines: {node: '>=10'}
@@ -6729,6 +7864,11 @@ packages:
     engines: {node: '>= 4'}
     dev: true
 
+  /gensync@1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
   /get-caller-file@1.0.3:
     resolution: {integrity: sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==}
     dev: true
@@ -6744,6 +7884,11 @@ packages:
       has: 1.0.3
       has-symbols: 1.0.3
 
+  /get-package-type@0.1.0:
+    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
+    engines: {node: '>=8.0.0'}
+    dev: true
+
   /get-paths@0.0.7:
     resolution: {integrity: sha512-0wdJt7C1XKQxuCgouqd+ZvLJ56FQixKoki9MrFaO4EriqzXOiH9gbukaDE1ou08S8Ns3/yDzoBAISNPqj6e6tA==}
     engines: {node: '>=6.4'}
@@ -6950,7 +8095,6 @@ packages:
   /globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
-    dev: false
 
   /globals@13.19.0:
     resolution: {integrity: sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==}
@@ -7159,6 +8303,11 @@ packages:
       har-schema: 2.0.0
     dev: false
 
+  /hard-rejection@2.1.0:
+    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
+    engines: {node: '>=6'}
+    dev: true
+
   /has-ansi@2.0.0:
     resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
     engines: {node: '>=0.10.0'}
@@ -7174,7 +8323,6 @@ packages:
   /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
-    dev: false
 
   /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
@@ -7272,6 +8420,13 @@ packages:
     resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
     dev: true
 
+  /hosted-git-info@4.1.0:
+    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
+    engines: {node: '>=10'}
+    dependencies:
+      lru-cache: 6.0.0
+    dev: true
+
   /hpagent@0.1.2:
     resolution: {integrity: sha512-ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ==}
     dev: false
@@ -7280,6 +8435,13 @@ packages:
     resolution: {integrity: sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==}
     dev: true
 
+  /html-encoding-sniffer@2.0.1:
+    resolution: {integrity: sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      whatwg-encoding: 1.0.5
+    dev: true
+
   /html-encoding-sniffer@3.0.0:
     resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
     engines: {node: '>=12'}
@@ -7291,6 +8453,10 @@ packages:
     resolution: {integrity: sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==}
     dev: false
 
+  /html-escaper@2.0.2:
+    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
+    dev: true
+
   /htmlparser2@3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -7356,6 +8522,17 @@ packages:
       toidentifier: 1.0.1
     dev: false
 
+  /http-proxy-agent@4.0.1:
+    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
+    engines: {node: '>= 6'}
+    dependencies:
+      '@tootallnate/once': 1.1.2
+      agent-base: 6.0.2
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /http-proxy-agent@5.0.0:
     resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
     engines: {node: '>= 6'}
@@ -7427,7 +8604,6 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
   /human-signals@1.1.1:
     resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
@@ -7459,7 +8635,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dependencies:
       safer-buffer: 2.1.2
-    dev: false
 
   /iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
@@ -7485,6 +8660,11 @@ packages:
   /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
+  /ignore@4.0.6:
+    resolution: {integrity: sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==}
+    engines: {node: '>= 4'}
+    dev: true
+
   /ignore@5.2.4:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
@@ -7505,6 +8685,11 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /import-lazy@4.0.0:
+    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
+    engines: {node: '>=8'}
+    dev: true
+
   /import-local@3.1.0:
     resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
     engines: {node: '>=8'}
@@ -7644,6 +8829,11 @@ packages:
     engines: {node: '>= 10'}
     dev: false
 
+  /irregular-plurals@3.5.0:
+    resolution: {integrity: sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==}
+    engines: {node: '>=8'}
+    dev: true
+
   /is-absolute-url@2.1.0:
     resolution: {integrity: sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==}
     engines: {node: '>=0.10.0'}
@@ -7781,6 +8971,11 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
+  /is-generator-fn@2.1.0:
+    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
+    engines: {node: '>=6'}
+    dev: true
+
   /is-generator-function@1.0.10:
     resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
     engines: {node: '>= 0.4'}
@@ -7876,7 +9071,6 @@ packages:
 
   /is-potential-custom-element-name@1.0.1:
     resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
-    dev: false
 
   /is-promise@2.2.2:
     resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==}
@@ -8002,6 +9196,52 @@ packages:
   /isstream@0.1.2:
     resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
 
+  /istanbul-lib-coverage@3.2.0:
+    resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /istanbul-lib-instrument@5.2.1:
+    resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/parser': 7.20.7
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-coverage: 3.2.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /istanbul-lib-report@3.0.0:
+    resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
+    engines: {node: '>=8'}
+    dependencies:
+      istanbul-lib-coverage: 3.2.0
+      make-dir: 3.1.0
+      supports-color: 7.2.0
+    dev: true
+
+  /istanbul-lib-source-maps@4.0.1:
+    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
+    engines: {node: '>=10'}
+    dependencies:
+      debug: 4.3.4(supports-color@8.1.1)
+      istanbul-lib-coverage: 3.2.0
+      source-map: 0.6.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /istanbul-reports@3.1.5:
+    resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==}
+    engines: {node: '>=8'}
+    dependencies:
+      html-escaper: 2.0.2
+      istanbul-lib-report: 3.0.0
+    dev: true
+
   /istextorbinary@3.3.0:
     resolution: {integrity: sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==}
     engines: {node: '>=8'}
@@ -8028,6 +9268,461 @@ packages:
       filelist: 1.0.4
       minimatch: 3.1.2
 
+  /jest-changed-files@27.5.1:
+    resolution: {integrity: sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      execa: 5.1.1
+      throat: 6.0.2
+    dev: true
+
+  /jest-circus@27.5.1:
+    resolution: {integrity: sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      co: 4.6.0
+      dedent: 0.7.0
+      expect: 27.5.1
+      is-generator-fn: 2.1.0
+      jest-each: 27.5.1
+      jest-matcher-utils: 27.5.1
+      jest-message-util: 27.5.1
+      jest-runtime: 27.5.1
+      jest-snapshot: 27.5.1
+      jest-util: 27.5.1
+      pretty-format: 27.5.1
+      slash: 3.0.0
+      stack-utils: 2.0.6
+      throat: 6.0.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jest-cli@27.5.1(ts-node@10.4.0):
+    resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@jest/core': 27.5.1(ts-node@10.4.0)
+      '@jest/test-result': 27.5.1
+      '@jest/types': 27.5.1
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.10
+      import-local: 3.1.0
+      jest-config: 27.5.1(ts-node@10.4.0)
+      jest-util: 27.5.1
+      jest-validate: 27.5.1
+      prompts: 2.4.2
+      yargs: 16.2.0
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+    dev: true
+
+  /jest-config@27.5.1(ts-node@10.4.0):
+    resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    peerDependencies:
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      ts-node:
+        optional: true
+    dependencies:
+      '@babel/core': 7.21.4
+      '@jest/test-sequencer': 27.5.1
+      '@jest/types': 27.5.1
+      babel-jest: 27.5.1(@babel/core@7.21.4)
+      chalk: 4.1.2
+      ci-info: 3.7.1
+      deepmerge: 4.2.2
+      glob: 7.2.3
+      graceful-fs: 4.2.10
+      jest-circus: 27.5.1
+      jest-environment-jsdom: 27.5.1
+      jest-environment-node: 27.5.1
+      jest-get-type: 27.5.1
+      jest-jasmine2: 27.5.1
+      jest-regex-util: 27.5.1
+      jest-resolve: 27.5.1
+      jest-runner: 27.5.1
+      jest-util: 27.5.1
+      jest-validate: 27.5.1
+      micromatch: 4.0.5
+      parse-json: 5.2.0
+      pretty-format: 27.5.1
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+      ts-node: 10.4.0(@types/node@17.0.5)(typescript@4.5.4)
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - utf-8-validate
+    dev: true
+
+  /jest-diff@27.5.1:
+    resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      chalk: 4.1.2
+      diff-sequences: 27.5.1
+      jest-get-type: 27.5.1
+      pretty-format: 27.5.1
+    dev: true
+
+  /jest-docblock@27.5.1:
+    resolution: {integrity: sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      detect-newline: 3.1.0
+    dev: true
+
+  /jest-each@27.5.1:
+    resolution: {integrity: sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      chalk: 4.1.2
+      jest-get-type: 27.5.1
+      jest-util: 27.5.1
+      pretty-format: 27.5.1
+    dev: true
+
+  /jest-environment-jsdom@27.5.1:
+    resolution: {integrity: sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/fake-timers': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      jest-mock: 27.5.1
+      jest-util: 27.5.1
+      jsdom: 16.7.0
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - utf-8-validate
+    dev: true
+
+  /jest-environment-node@27.5.1:
+    resolution: {integrity: sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/fake-timers': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      jest-mock: 27.5.1
+      jest-util: 27.5.1
+    dev: true
+
+  /jest-fetch-mock@3.0.3:
+    resolution: {integrity: sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==}
+    dependencies:
+      cross-fetch: 3.1.5
+      promise-polyfill: 8.3.0
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
+  /jest-get-type@27.5.1:
+    resolution: {integrity: sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dev: true
+
+  /jest-haste-map@27.5.1:
+    resolution: {integrity: sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      '@types/graceful-fs': 4.1.6
+      '@types/node': 18.11.18
+      anymatch: 3.1.3
+      fb-watchman: 2.0.2
+      graceful-fs: 4.2.10
+      jest-regex-util: 27.5.1
+      jest-serializer: 27.5.1
+      jest-util: 27.5.1
+      jest-worker: 27.5.1
+      micromatch: 4.0.5
+      walker: 1.0.8
+    optionalDependencies:
+      fsevents: 2.3.2
+    dev: true
+
+  /jest-jasmine2@27.5.1:
+    resolution: {integrity: sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/source-map': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      co: 4.6.0
+      expect: 27.5.1
+      is-generator-fn: 2.1.0
+      jest-each: 27.5.1
+      jest-matcher-utils: 27.5.1
+      jest-message-util: 27.5.1
+      jest-runtime: 27.5.1
+      jest-snapshot: 27.5.1
+      jest-util: 27.5.1
+      pretty-format: 27.5.1
+      throat: 6.0.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jest-leak-detector@27.5.1:
+    resolution: {integrity: sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      jest-get-type: 27.5.1
+      pretty-format: 27.5.1
+    dev: true
+
+  /jest-matcher-utils@27.5.1:
+    resolution: {integrity: sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      chalk: 4.1.2
+      jest-diff: 27.5.1
+      jest-get-type: 27.5.1
+      pretty-format: 27.5.1
+    dev: true
+
+  /jest-message-util@27.5.1:
+    resolution: {integrity: sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@babel/code-frame': 7.18.6
+      '@jest/types': 27.5.1
+      '@types/stack-utils': 2.0.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      micromatch: 4.0.5
+      pretty-format: 27.5.1
+      slash: 3.0.0
+      stack-utils: 2.0.6
+    dev: true
+
+  /jest-mock@27.5.1:
+    resolution: {integrity: sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+    dev: true
+
+  /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1):
+    resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
+    engines: {node: '>=6'}
+    peerDependencies:
+      jest-resolve: '*'
+    peerDependenciesMeta:
+      jest-resolve:
+        optional: true
+    dependencies:
+      jest-resolve: 27.5.1
+    dev: true
+
+  /jest-regex-util@27.5.1:
+    resolution: {integrity: sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dev: true
+
+  /jest-resolve-dependencies@27.5.1:
+    resolution: {integrity: sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      jest-regex-util: 27.5.1
+      jest-snapshot: 27.5.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jest-resolve@27.5.1:
+    resolution: {integrity: sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      jest-haste-map: 27.5.1
+      jest-pnp-resolver: 1.2.3(jest-resolve@27.5.1)
+      jest-util: 27.5.1
+      jest-validate: 27.5.1
+      resolve: 1.22.1
+      resolve.exports: 1.1.1
+      slash: 3.0.0
+    dev: true
+
+  /jest-runner@27.5.1:
+    resolution: {integrity: sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/console': 27.5.1
+      '@jest/environment': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      emittery: 0.8.1
+      graceful-fs: 4.2.10
+      jest-docblock: 27.5.1
+      jest-environment-jsdom: 27.5.1
+      jest-environment-node: 27.5.1
+      jest-haste-map: 27.5.1
+      jest-leak-detector: 27.5.1
+      jest-message-util: 27.5.1
+      jest-resolve: 27.5.1
+      jest-runtime: 27.5.1
+      jest-util: 27.5.1
+      jest-worker: 27.5.1
+      source-map-support: 0.5.21
+      throat: 6.0.2
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - utf-8-validate
+    dev: true
+
+  /jest-runtime@27.5.1:
+    resolution: {integrity: sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/environment': 27.5.1
+      '@jest/fake-timers': 27.5.1
+      '@jest/globals': 27.5.1
+      '@jest/source-map': 27.5.1
+      '@jest/test-result': 27.5.1
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      chalk: 4.1.2
+      cjs-module-lexer: 1.2.2
+      collect-v8-coverage: 1.0.1
+      execa: 5.1.1
+      glob: 7.2.3
+      graceful-fs: 4.2.10
+      jest-haste-map: 27.5.1
+      jest-message-util: 27.5.1
+      jest-mock: 27.5.1
+      jest-regex-util: 27.5.1
+      jest-resolve: 27.5.1
+      jest-snapshot: 27.5.1
+      jest-util: 27.5.1
+      slash: 3.0.0
+      strip-bom: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jest-serializer@27.5.1:
+    resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@types/node': 18.11.18
+      graceful-fs: 4.2.10
+    dev: true
+
+  /jest-snapshot@27.5.1:
+    resolution: {integrity: sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@babel/core': 7.21.4
+      '@babel/generator': 7.20.7
+      '@babel/plugin-syntax-typescript': 7.21.4(@babel/core@7.21.4)
+      '@babel/traverse': 7.20.12
+      '@babel/types': 7.20.7
+      '@jest/transform': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/babel__traverse': 7.18.3
+      '@types/prettier': 2.7.2
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.4)
+      chalk: 4.1.2
+      expect: 27.5.1
+      graceful-fs: 4.2.10
+      jest-diff: 27.5.1
+      jest-get-type: 27.5.1
+      jest-haste-map: 27.5.1
+      jest-matcher-utils: 27.5.1
+      jest-message-util: 27.5.1
+      jest-util: 27.5.1
+      natural-compare: 1.4.0
+      pretty-format: 27.5.1
+      semver: 7.3.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jest-util@27.5.1:
+    resolution: {integrity: sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      chalk: 4.1.2
+      ci-info: 3.7.1
+      graceful-fs: 4.2.10
+      picomatch: 2.3.1
+    dev: true
+
+  /jest-validate@27.5.1:
+    resolution: {integrity: sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+      camelcase: 6.3.0
+      chalk: 4.1.2
+      jest-get-type: 27.5.1
+      leven: 3.1.0
+      pretty-format: 27.5.1
+    dev: true
+
+  /jest-watcher@27.5.1:
+    resolution: {integrity: sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/test-result': 27.5.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.11.18
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      jest-util: 27.5.1
+      string-length: 4.0.2
+    dev: true
+
+  /jest-websocket-mock@2.2.1(mock-socket@9.0.8):
+    resolution: {integrity: sha512-fhsGLXrPfs06PhHoxqOSA9yZ6Rb4qYrf4Wcm7/nfRzjlrf1gIeuhYUkzMRjjE0TMQ37SwkmeLanwrZY4ZaNp8g==}
+    peerDependencies:
+      mock-socket: ^8||^9
+    dependencies:
+      jest-diff: 27.5.1
+      mock-socket: 9.0.8
+    dev: true
+
   /jest-worker@27.5.1:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
@@ -8037,6 +9732,31 @@ packages:
       supports-color: 8.1.1
     dev: true
 
+  /jest@27.4.5(ts-node@10.4.0):
+    resolution: {integrity: sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@jest/core': 27.5.1(ts-node@10.4.0)
+      import-local: 3.1.0
+      jest-cli: 27.5.1(ts-node@10.4.0)
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+    dev: true
+
+  /jju@1.4.0:
+    resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
+    dev: true
+
   /jmespath@0.16.0:
     resolution: {integrity: sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==}
     engines: {node: '>= 0.6.0'}
@@ -8087,7 +9807,14 @@ packages:
 
   /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
-    dev: false
+
+  /js-yaml@3.14.1:
+    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+    hasBin: true
+    dependencies:
+      argparse: 1.0.10
+      esprima: 4.0.1
+    dev: true
 
   /js-yaml@3.7.0:
     resolution: {integrity: sha512-eIlkGty7HGmntbV6P/ZlAsoncFLGsNoM27lkTzS+oneY/EiNhj+geqD9ezg/ip+SW6Var0BJU2JtV0vEUZpWVQ==}
@@ -8115,6 +9842,48 @@ packages:
     engines: {node: '>=0.1.90'}
     dev: false
 
+  /jsdom@16.7.0:
+    resolution: {integrity: sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      canvas: ^2.5.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+    dependencies:
+      abab: 2.0.6
+      acorn: 8.8.1
+      acorn-globals: 6.0.0
+      cssom: 0.4.4
+      cssstyle: 2.3.0
+      data-urls: 2.0.0
+      decimal.js: 10.4.3
+      domexception: 2.0.1
+      escodegen: 2.0.0
+      form-data: 3.0.1
+      html-encoding-sniffer: 2.0.1
+      http-proxy-agent: 4.0.1
+      https-proxy-agent: 5.0.1
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.2
+      parse5: 6.0.1
+      saxes: 5.0.1
+      symbol-tree: 3.2.4
+      tough-cookie: 4.1.2
+      w3c-hr-time: 1.0.2
+      w3c-xmlserializer: 2.0.0
+      webidl-conversions: 6.1.0
+      whatwg-encoding: 1.0.5
+      whatwg-mimetype: 2.3.0
+      whatwg-url: 8.7.0
+      ws: 7.5.9
+      xml-name-validator: 3.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+    dev: true
+
   /jsdom@20.0.3:
     resolution: {integrity: sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==}
     engines: {node: '>=14'}
@@ -8160,7 +9929,6 @@ packages:
     resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
     engines: {node: '>=4'}
     hasBin: true
-    dev: false
 
   /json-buffer@3.0.0:
     resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==}
@@ -8338,6 +10106,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /kleur@3.0.3:
+    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
+    engines: {node: '>=6'}
+    dev: true
+
   /koa-body@6.0.1:
     resolution: {integrity: sha512-M8ZvMD8r+kPHy28aWP9VxL7kY8oPWA+C7ZgCljrCMeaU7uX6wsIQgDHskyrAr9sw+jqnIXyv4Mlxri5R4InIJg==}
     dependencies:
@@ -8603,13 +10376,17 @@ packages:
       flush-write-stream: 1.1.1
     dev: true
 
+  /leven@3.1.0:
+    resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
+    engines: {node: '>=6'}
+    dev: true
+
   /levn@0.3.0:
     resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.1.2
       type-check: 0.3.2
-    dev: false
 
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
@@ -8634,6 +10411,10 @@ packages:
       - supports-color
     dev: true
 
+  /lines-and-columns@1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+    dev: true
+
   /listenercount@1.0.1:
     resolution: {integrity: sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==}
     dev: false
@@ -8747,12 +10528,15 @@ packages:
     resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
     dev: false
 
+  /lodash.get@4.4.2:
+    resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
+    dev: true
+
   /lodash.isarguments@3.1.0:
     resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
 
   /lodash.isequal@4.5.0:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
-    dev: false
 
   /lodash.isplainobject@4.0.6:
     resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
@@ -8852,6 +10636,12 @@ packages:
       pseudomap: 1.0.2
       yallist: 2.1.2
 
+  /lru-cache@5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
+    dependencies:
+      yallist: 3.1.1
+    dev: true
+
   /lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
@@ -8890,7 +10680,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       semver: 6.3.0
-    dev: false
 
   /make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
@@ -8927,11 +10716,27 @@ packages:
       kind-of: 6.0.3
     dev: true
 
+  /makeerror@1.0.12:
+    resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
+    dependencies:
+      tmpl: 1.0.5
+    dev: true
+
   /map-cache@0.2.2:
     resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /map-obj@1.0.1:
+    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /map-obj@4.3.0:
+    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
+    engines: {node: '>=8'}
+    dev: true
+
   /map-stream@0.1.0:
     resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==}
     dev: true
@@ -8968,6 +10773,24 @@ packages:
     engines: {node: '>= 0.6'}
     dev: false
 
+  /meow@9.0.0:
+    resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      '@types/minimist': 1.2.2
+      camelcase-keys: 6.2.2
+      decamelize: 1.2.0
+      decamelize-keys: 1.1.1
+      hard-rejection: 2.1.0
+      minimist-options: 4.1.0
+      normalize-package-data: 3.0.3
+      read-pkg-up: 7.0.1
+      redent: 3.0.0
+      trim-newlines: 3.0.1
+      type-fest: 0.18.1
+      yargs-parser: 20.2.9
+    dev: true
+
   /merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
     dev: true
@@ -9050,6 +10873,11 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: false
 
+  /min-indent@1.0.1:
+    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
+    engines: {node: '>=4'}
+    dev: true
+
   /minimalistic-assert@1.0.1:
     resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
     dev: false
@@ -9072,6 +10900,15 @@ packages:
     dependencies:
       brace-expansion: 2.0.1
 
+  /minimist-options@4.1.0:
+    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
+    engines: {node: '>= 6'}
+    dependencies:
+      arrify: 1.0.1
+      is-plain-obj: 1.1.0
+      kind-of: 6.0.3
+    dev: true
+
   /minimist@1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
 
@@ -9210,6 +11047,11 @@ packages:
       yargs-unparser: 2.0.0
     dev: true
 
+  /mock-socket@9.0.8:
+    resolution: {integrity: sha512-8Syqkaaa2SzRqW68DEsnZkKQicHP7hVzfj3uCvigB5TL79H1ljKbwmOcRIENkx0ZTyu/5W6u+Pk9Qy6JCp38Ww==}
+    engines: {node: '>= 8'}
+    dev: true
+
   /moment@2.29.4:
     resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
     dev: false
@@ -9404,6 +11246,18 @@ packages:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
     engines: {node: '>=10.5.0'}
 
+  /node-fetch@2.6.7:
+    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+    dependencies:
+      whatwg-url: 5.0.0
+    dev: true
+
   /node-fetch@2.6.8:
     resolution: {integrity: sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==}
     engines: {node: 4.x || >=6.0.0}
@@ -9455,6 +11309,10 @@ packages:
       - supports-color
     dev: false
 
+  /node-int64@0.4.0:
+    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
+    dev: true
+
   /node-releases@2.0.8:
     resolution: {integrity: sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==}
     dev: true
@@ -9492,6 +11350,16 @@ packages:
       validate-npm-package-license: 3.0.4
     dev: true
 
+  /normalize-package-data@3.0.3:
+    resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
+    engines: {node: '>=10'}
+    dependencies:
+      hosted-git-info: 4.1.0
+      is-core-module: 2.11.0
+      semver: 7.3.8
+      validate-npm-package-license: 3.0.4
+    dev: true
+
   /normalize-path@2.1.1:
     resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==}
     engines: {node: '>=0.10.0'}
@@ -9618,7 +11486,6 @@ packages:
 
   /nwsapi@2.2.2:
     resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==}
-    dev: false
 
   /oauth-sign@0.9.0:
     resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
@@ -9766,7 +11633,6 @@ packages:
       prelude-ls: 1.1.2
       type-check: 0.3.2
       word-wrap: 1.2.3
-    dev: false
 
   /optionator@0.9.1:
     resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
@@ -9925,6 +11791,16 @@ packages:
       error-ex: 1.3.2
     dev: true
 
+  /parse-json@5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@babel/code-frame': 7.18.6
+      error-ex: 1.3.2
+      json-parse-even-better-errors: 2.3.1
+      lines-and-columns: 1.2.4
+    dev: true
+
   /parse-link-header@2.0.0:
     resolution: {integrity: sha512-xjU87V0VyHZybn2RrCX5TIFGxTVZE6zqqZWMPlIKiSKuWh/X5WZdt+w1Ki1nXB+8L/KtL+nZ4iq+sfI6MrhhMw==}
     dependencies:
@@ -9957,7 +11833,6 @@ packages:
 
   /parse5@6.0.1:
     resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
-    dev: false
 
   /parse5@7.1.2:
     resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
@@ -10156,6 +12031,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /pirates@4.0.5:
+    resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
+    engines: {node: '>= 6'}
+    dev: true
+
   /pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
@@ -10179,6 +12059,13 @@ packages:
       extend-shallow: 3.0.2
     dev: true
 
+  /plur@4.0.0:
+    resolution: {integrity: sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==}
+    engines: {node: '>=10'}
+    dependencies:
+      irregular-plurals: 3.5.0
+    dev: true
+
   /pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
@@ -10467,7 +12354,6 @@ packages:
   /prelude-ls@1.1.2:
     resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
     engines: {node: '>= 0.8.0'}
-    dev: false
 
   /prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
@@ -10500,6 +12386,15 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /pretty-format@27.5.1:
+    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      ansi-regex: 5.0.1
+      ansi-styles: 5.2.0
+      react-is: 17.0.2
+    dev: true
+
   /pretty-hrtime@1.0.3:
     resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
     engines: {node: '>= 0.8'}
@@ -10552,8 +12447,6 @@ packages:
   /progress@2.0.3:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
     engines: {node: '>=0.4.0'}
-    dev: false
-    optional: true
 
   /promise-inflight@1.0.1:
     resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
@@ -10568,6 +12461,10 @@ packages:
     resolution: {integrity: sha512-7nJ6v5lnJsXwGprnGXga4wx6d1POjvi5Qmf1ivTRxTjH4Z/9Czja/UCMLVmB9N93GeWOU93XaFaEt6jbuoagNw==}
     dev: false
 
+  /promise-polyfill@8.3.0:
+    resolution: {integrity: sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==}
+    dev: true
+
   /promise-retry@2.0.1:
     resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
     engines: {node: '>=10'}
@@ -10581,6 +12478,14 @@ packages:
     dependencies:
       asap: 2.0.6
 
+  /prompts@2.4.2:
+    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
+    engines: {node: '>= 6'}
+    dependencies:
+      kleur: 3.0.3
+      sisteransi: 1.0.5
+    dev: true
+
   /proto-list@1.2.4:
     resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
 
@@ -10803,7 +12708,6 @@ packages:
 
   /querystringify@2.2.0:
     resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
-    dev: false
 
   /queue-lit@1.5.0:
     resolution: {integrity: sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA==}
@@ -10812,6 +12716,11 @@ packages:
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
+  /quick-lru@4.0.1:
+    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
+    engines: {node: '>=8'}
+    dev: true
+
   /quick-lru@5.1.1:
     resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
     engines: {node: '>=10'}
@@ -10880,6 +12789,10 @@ packages:
       - supports-color
     dev: false
 
+  /react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+    dev: true
+
   /read-pkg-up@1.0.1:
     resolution: {integrity: sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==}
     engines: {node: '>=0.10.0'}
@@ -10888,6 +12801,15 @@ packages:
       read-pkg: 1.1.0
     dev: true
 
+  /read-pkg-up@7.0.1:
+    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
+    engines: {node: '>=8'}
+    dependencies:
+      find-up: 4.1.0
+      read-pkg: 5.2.0
+      type-fest: 0.8.1
+    dev: true
+
   /read-pkg@1.1.0:
     resolution: {integrity: sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==}
     engines: {node: '>=0.10.0'}
@@ -10897,6 +12819,16 @@ packages:
       path-type: 1.1.0
     dev: true
 
+  /read-pkg@5.2.0:
+    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@types/normalize-package-data': 2.4.1
+      normalize-package-data: 2.5.0
+      parse-json: 5.2.0
+      type-fest: 0.6.0
+    dev: true
+
   /readable-stream@1.1.14:
     resolution: {integrity: sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==}
     dependencies:
@@ -10960,6 +12892,15 @@ packages:
 
   /reconnecting-websocket@4.4.0:
     resolution: {integrity: sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==}
+    dev: false
+
+  /redent@3.0.0:
+    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
+    engines: {node: '>=8'}
+    dependencies:
+      indent-string: 4.0.0
+      strip-indent: 3.0.0
+    dev: true
 
   /redis-errors@1.2.0:
     resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
@@ -11144,7 +13085,6 @@ packages:
 
   /requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
-    dev: false
 
   /resolve-alpn@1.2.1:
     resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
@@ -11192,6 +13132,24 @@ packages:
     resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
     deprecated: https://github.com/lydell/resolve-url#deprecated
 
+  /resolve.exports@1.1.1:
+    resolution: {integrity: sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /resolve@1.17.0:
+    resolution: {integrity: sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==}
+    dependencies:
+      path-parse: 1.0.7
+    dev: true
+
+  /resolve@1.19.0:
+    resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==}
+    dependencies:
+      is-core-module: 2.11.0
+      path-parse: 1.0.7
+    dev: true
+
   /resolve@1.22.1:
     resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
     hasBin: true
@@ -11363,6 +13321,13 @@ packages:
   /sax@1.2.4:
     resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
 
+  /saxes@5.0.1:
+    resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==}
+    engines: {node: '>=10'}
+    dependencies:
+      xmlchars: 2.2.0
+    dev: true
+
   /saxes@6.0.0:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
     engines: {node: '>=v12.22.7'}
@@ -11422,7 +13387,6 @@ packages:
   /semver@6.3.0:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
-    dev: false
 
   /semver@7.3.8:
     resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
@@ -11550,6 +13514,10 @@ packages:
       is-arrayish: 0.3.2
     dev: false
 
+  /sisteransi@1.0.5:
+    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+    dev: true
+
   /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
@@ -11794,6 +13762,13 @@ packages:
     resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}
     dev: true
 
+  /stack-utils@2.0.6:
+    resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      escape-string-regexp: 2.0.0
+    dev: true
+
   /standard-as-callback@2.1.0:
     resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
 
@@ -11867,6 +13842,19 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /string-argv@0.3.1:
+    resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
+    engines: {node: '>=0.6.19'}
+    dev: true
+
+  /string-length@4.0.2:
+    resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      char-regex: 1.0.2
+      strip-ansi: 6.0.1
+    dev: true
+
   /string-width@1.0.2:
     resolution: {integrity: sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==}
     engines: {node: '>=0.10.0'}
@@ -11928,6 +13916,11 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  /strip-bom@4.0.0:
+    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
+    engines: {node: '>=8'}
+    dev: true
+
   /strip-dirs@2.1.0:
     resolution: {integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==}
     dependencies:
@@ -11949,6 +13942,13 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
+  /strip-indent@3.0.0:
+    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      min-indent: 1.0.1
+    dev: true
+
   /strip-json-comments@2.0.1:
     resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
     engines: {node: '>=0.10.0'}
@@ -12012,7 +14012,6 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
-    dev: false
 
   /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
@@ -12026,6 +14025,14 @@ packages:
     dependencies:
       has-flag: 4.0.0
 
+  /supports-hyperlinks@2.3.0:
+    resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
+    engines: {node: '>=8'}
+    dependencies:
+      has-flag: 4.0.0
+      supports-color: 7.2.0
+    dev: true
+
   /supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
@@ -12073,7 +14080,6 @@ packages:
 
   /symbol-tree@3.2.4:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
-    dev: false
 
   /syslog-pro@1.0.0:
     resolution: {integrity: sha512-7SNMJKtQBJlwBUp1jxFT7bXya71cnINXPCYJ2AVhlQE4MKL7o2QiPdAXbMdWRiLeykQ2rx+7TNrnoGzvzhO+eA==}
@@ -12157,6 +14163,14 @@ packages:
       yallist: 4.0.0
     dev: false
 
+  /terminal-link@2.1.1:
+    resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-escapes: 4.3.2
+      supports-hyperlinks: 2.3.0
+    dev: true
+
   /terser-webpack-plugin@5.3.6(@swc/core@1.3.26)(webpack@5.75.0):
     resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
     engines: {node: '>= 10.13.0'}
@@ -12220,6 +14234,15 @@ packages:
       - supports-color
     dev: false
 
+  /test-exclude@6.0.0:
+    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@istanbuljs/schema': 0.1.3
+      glob: 7.2.3
+      minimatch: 3.1.2
+    dev: true
+
   /text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
 
@@ -12247,6 +14270,10 @@ packages:
     resolution: {integrity: sha512-1lvNfLezN6OJ9NaFAhfX4sm5e9YCzHtaRgZ1+B4C+Hv6TibRMsuBAM5/wVKzxjpYIlMymvgsHEFrrigEfXnb2A==}
     dev: true
 
+  /throat@6.0.2:
+    resolution: {integrity: sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==}
+    dev: true
+
   /throttle-debounce@5.0.0:
     resolution: {integrity: sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==}
     engines: {node: '>=12.22'}
@@ -12293,6 +14320,10 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /timsort@0.3.0:
+    resolution: {integrity: sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==}
+    dev: true
+
   /tinycolor2@1.5.2:
     resolution: {integrity: sha512-h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg==}
 
@@ -12302,6 +14333,10 @@ packages:
     dependencies:
       rimraf: 3.0.2
 
+  /tmpl@1.0.5:
+    resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
+    dev: true
+
   /to-absolute-glob@2.0.2:
     resolution: {integrity: sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==}
     engines: {node: '>=0.10.0'}
@@ -12376,7 +14411,7 @@ packages:
     engines: {node: '>=0.8'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.2.0
+      punycode: 2.1.1
 
   /tough-cookie@4.1.2:
     resolution: {integrity: sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==}
@@ -12386,17 +14421,22 @@ packages:
       punycode: 2.2.0
       universalify: 0.2.0
       url-parse: 1.5.10
-    dev: false
 
   /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
-    dev: false
+
+  /tr46@2.1.0:
+    resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==}
+    engines: {node: '>=8'}
+    dependencies:
+      punycode: 2.1.1
+    dev: true
 
   /tr46@3.0.0:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
     dependencies:
-      punycode: 2.2.0
+      punycode: 2.1.1
     dev: false
 
   /trace-redirect@1.0.6:
@@ -12407,6 +14447,11 @@ packages:
     resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==}
     dev: false
 
+  /trim-newlines@3.0.1:
+    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
+    engines: {node: '>=8'}
+    dev: true
+
   /trim-repeated@1.0.0:
     resolution: {integrity: sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==}
     engines: {node: '>=0.10.0'}
@@ -12414,6 +14459,41 @@ packages:
       escape-string-regexp: 1.0.5
     dev: true
 
+  /ts-jest@27.1.2(@babel/core@7.21.4)(@types/jest@27.4.0)(jest@27.4.5)(typescript@4.5.4):
+    resolution: {integrity: sha512-eSOiJOWq6Hhs6Khzk5wKC5sgWIXgXqOCiIl1+3lfnearu58Hj4QpE5tUhQcA3xtZrELbcvAGCsd6HB8OsaVaTA==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    hasBin: true
+    peerDependencies:
+      '@babel/core': '>=7.0.0-beta.0 <8'
+      '@types/jest': ^27.0.0
+      babel-jest: '>=27.0.0 <28'
+      esbuild: ~0.14.0
+      jest: ^27.0.0
+      typescript: '>=3.8 <5.0'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      '@types/jest':
+        optional: true
+      babel-jest:
+        optional: true
+      esbuild:
+        optional: true
+    dependencies:
+      '@babel/core': 7.21.4
+      '@types/jest': 27.4.0
+      bs-logger: 0.2.6
+      fast-json-stable-stringify: 2.1.0
+      jest: 27.4.5(ts-node@10.4.0)
+      jest-util: 27.5.1
+      json5: 2.2.3
+      lodash.memoize: 4.1.2
+      make-error: 1.3.6
+      semver: 7.3.8
+      typescript: 4.5.4
+      yargs-parser: 20.2.9
+    dev: true
+
   /ts-loader@9.4.2(typescript@4.9.4)(webpack@5.75.0):
     resolution: {integrity: sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==}
     engines: {node: '>=12.0.0'}
@@ -12429,6 +14509,36 @@ packages:
       webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
     dev: true
 
+  /ts-node@10.4.0(@types/node@17.0.5)(typescript@4.5.4):
+    resolution: {integrity: sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==}
+    hasBin: true
+    peerDependencies:
+      '@swc/core': '>=1.2.50'
+      '@swc/wasm': '>=1.2.50'
+      '@types/node': '*'
+      typescript: '>=2.7'
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      '@swc/wasm':
+        optional: true
+    dependencies:
+      '@cspotcode/source-map-support': 0.7.0
+      '@tsconfig/node10': 1.0.9
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.3
+      '@types/node': 17.0.5
+      acorn: 8.8.1
+      acorn-walk: 8.2.0
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 4.5.4
+      yn: 3.1.1
+    dev: true
+
   /ts-node@10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
@@ -12481,6 +14591,23 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
+  /tsd@0.19.1:
+    resolution: {integrity: sha512-pSwchclr+ADdxlahRUQXUrdAIOjXx1T1PQV+fLfVLuo/S4z+T00YU84fH8iPlZxyA2pWgJjo42BG1p9SDb4NOw==}
+    engines: {node: '>=12'}
+    hasBin: true
+    dependencies:
+      '@tsd/typescript': 4.5.5
+      eslint-formatter-pretty: 4.1.0
+      globby: 11.1.0
+      meow: 9.0.0
+      path-exists: 4.0.0
+      read-pkg-up: 7.0.1
+    dev: true
+
+  /tslib@1.14.1:
+    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
+    dev: true
+
   /tslib@2.4.1:
     resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
 
@@ -12489,6 +14616,16 @@ packages:
     engines: {node: '>=0.6.x'}
     dev: false
 
+  /tsutils@3.21.0(typescript@4.5.4):
+    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
+    engines: {node: '>= 6'}
+    peerDependencies:
+      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+    dependencies:
+      tslib: 1.14.1
+      typescript: 4.5.4
+    dev: true
+
   /tunnel-agent@0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
     dependencies:
@@ -12505,7 +14642,6 @@ packages:
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.1.2
-    dev: false
 
   /type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
@@ -12516,7 +14652,11 @@ packages:
   /type-detect@4.0.8:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
     engines: {node: '>=4'}
-    dev: false
+
+  /type-fest@0.18.1:
+    resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==}
+    engines: {node: '>=10'}
+    dev: true
 
   /type-fest@0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
@@ -12527,6 +14667,16 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /type-fest@0.6.0:
+    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /type-fest@0.8.1:
+    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
+    engines: {node: '>=8'}
+    dev: true
+
   /type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}
@@ -12545,7 +14695,6 @@ packages:
     resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
     dependencies:
       is-typedarray: 1.0.0
-    dev: false
 
   /typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
@@ -12632,6 +14781,12 @@ packages:
       - supports-color
     dev: false
 
+  /typescript@4.5.4:
+    resolution: {integrity: sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==}
+    engines: {node: '>=4.2.0'}
+    hasBin: true
+    dev: true
+
   /typescript@4.9.4:
     resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==}
     engines: {node: '>=4.2.0'}
@@ -12727,7 +14882,6 @@ packages:
   /universalify@0.2.0:
     resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
     engines: {node: '>= 4.0.0'}
-    dev: false
 
   /universalify@2.0.0:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
@@ -12804,7 +14958,6 @@ packages:
     dependencies:
       querystringify: 2.2.0
       requires-port: 1.0.0
-    dev: false
 
   /url-polyfill@1.1.12:
     resolution: {integrity: sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==}
@@ -12878,6 +15031,19 @@ packages:
   /v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
+  /v8-compile-cache@2.3.0:
+    resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
+    dev: true
+
+  /v8-to-istanbul@8.1.1:
+    resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==}
+    engines: {node: '>=10.12.0'}
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.4
+      convert-source-map: 1.9.0
+      source-map: 0.7.4
+    dev: true
+
   /v8flags@3.2.0:
     resolution: {integrity: sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==}
     engines: {node: '>= 0.10'}
@@ -12892,6 +15058,11 @@ packages:
       spdx-expression-parse: 3.0.1
     dev: true
 
+  /validator@13.9.0:
+    resolution: {integrity: sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==}
+    engines: {node: '>= 0.10'}
+    dev: true
+
   /value-or-function@3.0.0:
     resolution: {integrity: sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==}
     engines: {node: '>= 0.10'}
@@ -13071,6 +15242,20 @@ packages:
       vue: 3.2.45
     dev: true
 
+  /w3c-hr-time@1.0.2:
+    resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
+    deprecated: Use your platform's native performance.now() and performance.timeOrigin.
+    dependencies:
+      browser-process-hrtime: 1.0.0
+    dev: true
+
+  /w3c-xmlserializer@2.0.0:
+    resolution: {integrity: sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==}
+    engines: {node: '>=10'}
+    dependencies:
+      xml-name-validator: 3.0.0
+    dev: true
+
   /w3c-xmlserializer@4.0.0:
     resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==}
     engines: {node: '>=14'}
@@ -13092,6 +15277,12 @@ packages:
       - debug
     dev: true
 
+  /walker@1.0.8:
+    resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
+    dependencies:
+      makeerror: 1.0.12
+    dev: true
+
   /wasm-feature-detect@1.4.0:
     resolution: {integrity: sha512-9z4Yk3SeHQdb7E4g6ywQYcUt1CHr9HFiCIA5h29rv0gmW4lCE5dnDhheiJI5qzVPSDnXHyXQPLGPyucsuIzacw==}
     dev: false
@@ -13125,7 +15316,16 @@ packages:
 
   /webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
-    dev: false
+
+  /webidl-conversions@5.0.0:
+    resolution: {integrity: sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /webidl-conversions@6.1.0:
+    resolution: {integrity: sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==}
+    engines: {node: '>=10.4'}
+    dev: true
 
   /webidl-conversions@7.0.0:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
@@ -13233,6 +15433,12 @@ packages:
       - supports-color
     dev: false
 
+  /whatwg-encoding@1.0.5:
+    resolution: {integrity: sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==}
+    dependencies:
+      iconv-lite: 0.4.24
+    dev: true
+
   /whatwg-encoding@2.0.0:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
     engines: {node: '>=12'}
@@ -13240,6 +15446,10 @@ packages:
       iconv-lite: 0.6.3
     dev: false
 
+  /whatwg-mimetype@2.3.0:
+    resolution: {integrity: sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==}
+    dev: true
+
   /whatwg-mimetype@3.0.0:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
     engines: {node: '>=12'}
@@ -13258,7 +15468,15 @@ packages:
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
-    dev: false
+
+  /whatwg-url@8.7.0:
+    resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==}
+    engines: {node: '>=10'}
+    dependencies:
+      lodash: 4.17.21
+      tr46: 2.1.0
+      webidl-conversions: 6.1.0
+    dev: true
 
   /whet.extend@0.9.9:
     resolution: {integrity: sha512-mmIPAft2vTgEILgPeZFqE/wWh24SEsR/k+N9fJ3Jxrz44iDFy9aemCxdksfURSHYFCLmvs/d/7Iso5XjPpNfrA==}
@@ -13352,6 +15570,28 @@ packages:
   /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
+  /write-file-atomic@3.0.3:
+    resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}
+    dependencies:
+      imurmurhash: 0.1.4
+      is-typedarray: 1.0.0
+      signal-exit: 3.0.7
+      typedarray-to-buffer: 3.1.5
+    dev: true
+
+  /ws@7.5.9:
+    resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==}
+    engines: {node: '>=8.3.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: ^5.0.2
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+    dev: true
+
   /ws@8.11.0:
     resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==}
     engines: {node: '>=10.0.0'}
@@ -13388,6 +15628,10 @@ packages:
       sax: 1.2.4
     dev: false
 
+  /xml-name-validator@3.0.0:
+    resolution: {integrity: sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==}
+    dev: true
+
   /xml-name-validator@4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
     engines: {node: '>=12'}
@@ -13420,7 +15664,6 @@ packages:
 
   /xmlchars@2.2.0:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
-    dev: false
 
   /xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
@@ -13448,8 +15691,6 @@ packages:
 
   /yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
-    dev: false
-    optional: true
 
   /yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
@@ -13576,6 +15817,18 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
+  /z-schema@5.0.5:
+    resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}
+    engines: {node: '>=8.0.0'}
+    hasBin: true
+    dependencies:
+      lodash.get: 4.4.2
+      lodash.isequal: 4.5.0
+      validator: 13.9.0
+    optionalDependencies:
+      commander: 9.5.0
+    dev: true
+
   /zip-stream@4.1.0:
     resolution: {integrity: sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==}
     engines: {node: '>= 10'}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 87d240173..a2ebb0465 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,3 +2,4 @@ packages:
  - 'packages/backend'
  - 'packages/client'
  - 'packages/sw'
+ - 'packages/calckey-js'

From 8cb98945e4f0c8361b29834f1e608b2863c26b82 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 17:58:29 -0700
Subject: [PATCH 425/582] hotfix: fix crash

---
 packages/client/src/store.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 2aa204d18..44c442a4a 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -1,7 +1,6 @@
 import { markRaw, ref } from "vue";
 import { Storage } from "./pizzax";
 import { Theme } from "./scripts/theme";
-import { deviceKind } from "@/scripts/device-kind";
 
 export const postFormActions = [];
 export const userActions = [];
@@ -19,8 +18,6 @@ const menuOptions = [
 	"search",
 ];
 
-if (deviceKind === "desktop") menuOptions.push("ui");
-
 // TODO: それぞれいちいちwhereとかdefaultというキーを付けなきゃいけないの冗長なのでなんとかする(ただ型定義が面倒になりそう)
 //       あと、現行の定義の仕方なら「whereが何であるかに関わらずキー名の重複不可」という制約を付けられるメリットもあるからそのメリットを引き継ぐ方法も考えないといけない
 export const defaultStore = markRaw(

From d562f0c3c8b8946b9e23564c1358c17578d78191 Mon Sep 17 00:00:00 2001
From: amy bones <amy@spookygirl.boo>
Date: Thu, 30 Mar 2023 01:05:11 -0700
Subject: [PATCH 426/582] feat: add hidden hashtags management page

This simply adds a basic admin UI to blocklist some hashtags from displaying in
the trending widget. The facility existed already in the backend, but there was
no UI to manipulate the list save for executing raw SQL or API calls.
---
 locales/en-US.yml                            |  2 +
 packages/client/src/pages/admin/hashtags.vue | 54 ++++++++++++++++++++
 packages/client/src/pages/admin/index.vue    |  6 +++
 packages/client/src/router.ts                |  5 ++
 4 files changed, 67 insertions(+)
 create mode 100644 packages/client/src/pages/admin/hashtags.vue

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 16e7aa7cb..9a5d35d81 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -201,6 +201,8 @@ clearCachedFiles: "Clear cache"
 clearCachedFilesConfirm: "Are you sure that you want to delete all cached remote files?"
 blockedInstances: "Blocked Instances"
 blockedInstancesDescription: "List the hostnames of the instances that you want to block. Listed instances will no longer be able to communicate with this instance."
+hiddenTags: "Hidden Hashtags"
+hiddenTagsDescription: "List the hashtags (without the #) of the hashtags you wish to hide from trending and explore. Hidden hashtags are still discoverable via other means."
 muteAndBlock: "Mutes and Blocks"
 mutedUsers: "Muted users"
 blockedUsers: "Blocked users"
diff --git a/packages/client/src/pages/admin/hashtags.vue b/packages/client/src/pages/admin/hashtags.vue
new file mode 100644
index 000000000..c2ecbcf3a
--- /dev/null
+++ b/packages/client/src/pages/admin/hashtags.vue
@@ -0,0 +1,54 @@
+<template>
+	<MkStickyContainer>
+		<template #header>
+			<MkPageHeader :actions="headerActions" :tabs="headerTabs" />
+		</template>
+		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+			<FormSuspense :p="init">
+				<FormTextarea v-model="hiddenTags" class="_formBlock">
+					<span>{{ i18n.ts.hiddenTags }}</span>
+					<template #caption>{{ i18n.ts.hiddenTagsDescription }}</template>
+				</FormTextarea>
+
+				<FormButton primary class="_formBlock" @click="save"><i
+						class="ph-floppy-disk-back ph-bold ph-lg"></i>
+					{{ i18n.ts.save }}</FormButton>
+			</FormSuspense>
+		</MkSpacer>
+	</MkStickyContainer>
+</template>
+
+<script lang="ts" setup>
+import { } from 'vue';
+import FormButton from '@/components/MkButton.vue';
+import FormTextarea from '@/components/form/textarea.vue';
+import FormSuspense from '@/components/form/suspense.vue';
+import * as os from '@/os';
+import { fetchInstance } from '@/instance';
+import { i18n } from '@/i18n';
+import { definePageMetadata } from '@/scripts/page-metadata';
+
+let hiddenTags: string = $ref('');
+
+async function init() {
+	const meta = await os.api('admin/meta');
+	hiddenTags = meta.hiddenTags.join("\n");
+}
+
+function save() {
+	os.apiWithDialog('admin/update-meta', {
+		hiddenTags: hiddenTags.split("\n").map((h: string) => h.trim()) || [],
+	}).then(() => {
+		fetchInstance();
+	});
+}
+
+const headerActions = $computed(() => []);
+
+const headerTabs = $computed(() => []);
+
+definePageMetadata({
+	title: i18n.ts.hiddenTags,
+	icon: 'ph-hash ph-bold ph-lg',
+});
+</script>
diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 1e4438a66..881105a23 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -181,6 +181,12 @@ const menuDef = $computed(() => [
 				to: "/admin/emojis",
 				active: currentPage?.route.name === "emojis",
 			},
+			{
+				icon: "ph-hash ph-bold ph-lg",
+				text: i18n.ts.hashtags,
+				to: "/admin/hashtags",
+				active: currentPage?.route.name === "hashtags",
+			},
 			{
 				icon: "ph-planet ph-bold ph-lg",
 				text: i18n.ts.federation,
diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts
index 8276e891c..a76c322bf 100644
--- a/packages/client/src/router.ts
+++ b/packages/client/src/router.ts
@@ -450,6 +450,11 @@ export const routes = [
 				name: "users",
 				component: page(() => import("./pages/admin/users.vue")),
 			},
+			{
+				path: "/hashtags",
+				name: "hashtags",
+				component: page(() => import("./pages/admin/hashtags.vue")),
+			},
 			{
 				path: "/emojis",
 				name: "emojis",

From 0ef179e35f137d70f7fb97ec99dd99fdd0d21095 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Sat, 8 Apr 2023 05:44:36 +0000
Subject: [PATCH 427/582] feat: per-user boost muting (#9825)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cherry-picked from FoundKey/c414f24a2c ([commit](https://akkoma.dev/FoundKeyGang/FoundKey/commit/c414f24a2c123774246c7eca65edda4d3afaf8b3))

This allows us to hide specified users' boosts from the timelines (the boosts will still be visible on their user page).

Co-authored-by: Hélène <pleroma-dev@helene.moe>
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9825
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 locales/en-US.yml                             |  2 +
 locales/ja-JP.yml                             |  2 +
 locales/zh-CN.yml                             |  2 +
 locales/zh-TW.yml                             |  2 +
 .../1665091090561-add-renote-muting.js        | 16 ++++
 packages/backend/src/db/postgre.ts            |  2 +
 packages/backend/src/misc/schema.ts           |  2 +
 .../src/models/entities/renote-muting.ts      | 42 ++++++++++
 packages/backend/src/models/index.ts          |  2 +
 .../src/models/repositories/renote-muting.ts  | 31 ++++++++
 .../backend/src/models/repositories/user.ts   |  9 +++
 .../src/models/schema/renote-muting.ts        | 26 +++++++
 packages/backend/src/models/schema/user.ts    |  4 +
 .../common/generated-muted-renote-query.ts    | 22 ++++++
 packages/backend/src/server/api/endpoints.ts  |  6 ++
 .../api/endpoints/notes/global-timeline.ts    |  2 +
 .../api/endpoints/notes/hybrid-timeline.ts    |  2 +
 .../api/endpoints/notes/local-timeline.ts     |  2 +
 .../server/api/endpoints/notes/timeline.ts    |  2 +
 .../api/endpoints/renote-mute/create.ts       | 78 +++++++++++++++++++
 .../api/endpoints/renote-mute/delete.ts       | 73 +++++++++++++++++
 .../server/api/endpoints/renote-mute/list.ts  | 43 ++++++++++
 .../server/api/endpoints/users/relation.ts    |  8 ++
 .../backend/src/server/api/stream/channel.ts  |  4 +
 .../src/server/api/stream/channels/antenna.ts |  2 +
 .../src/server/api/stream/channels/channel.ts |  2 +
 .../api/stream/channels/global-timeline.ts    |  2 +
 .../src/server/api/stream/channels/hashtag.ts |  2 +
 .../api/stream/channels/home-timeline.ts      |  2 +
 .../api/stream/channels/hybrid-timeline.ts    |  2 +
 .../api/stream/channels/local-timeline.ts     |  2 +
 .../server/api/stream/channels/user-list.ts   |  2 +
 .../backend/src/server/api/stream/index.ts    | 15 ++++
 packages/calckey-js/src/api.types.ts          |  3 +
 packages/calckey-js/src/entities.ts           |  1 +
 packages/client/src/scripts/get-user-menu.ts  | 17 +++-
 36 files changed, 435 insertions(+), 1 deletion(-)
 create mode 100644 packages/backend/migration/1665091090561-add-renote-muting.js
 create mode 100644 packages/backend/src/models/entities/renote-muting.ts
 create mode 100644 packages/backend/src/models/repositories/renote-muting.ts
 create mode 100644 packages/backend/src/models/schema/renote-muting.ts
 create mode 100644 packages/backend/src/server/api/common/generated-muted-renote-query.ts
 create mode 100644 packages/backend/src/server/api/endpoints/renote-mute/create.ts
 create mode 100644 packages/backend/src/server/api/endpoints/renote-mute/delete.ts
 create mode 100644 packages/backend/src/server/api/endpoints/renote-mute/list.ts

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 9a5d35d81..a1b998d8a 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -121,6 +121,8 @@ unmarkAsSensitive: "Unmark as NSFW"
 enterFileName: "Enter filename"
 mute: "Mute"
 unmute: "Unmute"
+renoteMute: "Mute boosts"
+renoteUnmute: "Unmute boosts"
 block: "Block"
 unblock: "Unblock"
 suspend: "Suspend"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index d553f9eab..0f1c700fd 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -121,6 +121,8 @@ unmarkAsSensitive: "閲覧注意を解除する"
 enterFileName: "ファイル名を入力"
 mute: "ミュート"
 unmute: "ミュート解除"
+renoteMute: "ブーストをミュート"
+renoteUnmute: "ブーストのミュートを解除"
 block: "ブロック"
 unblock: "ブロック解除"
 suspend: "凍結"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index aa2700c57..ea9d6371f 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -116,6 +116,8 @@ unmarkAsSensitive: "取消标记为敏感内容"
 enterFileName: "请输入文件名"
 mute: "屏蔽"
 unmute: "解除屏蔽"
+renoteMute: "屏蔽转帖"
+renoteUnmute: "解除屏蔽转帖"
 block: "拉黑"
 unblock: "取消拉黑"
 suspend: "冻结"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 46be6f8e1..4471444e9 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -116,6 +116,8 @@ unmarkAsSensitive: "取消標記為敏感內容"
 enterFileName: "請輸入檔案名稱"
 mute: "靜音"
 unmute: "解除靜音"
+renoteMute: "靜音轉發貼文"
+renoteUnmute: "解除靜音轉發貼文"
 block: "封鎖"
 unblock: "解除封鎖"
 suspend: "凍結"
diff --git a/packages/backend/migration/1665091090561-add-renote-muting.js b/packages/backend/migration/1665091090561-add-renote-muting.js
new file mode 100644
index 000000000..d2ed2bd2e
--- /dev/null
+++ b/packages/backend/migration/1665091090561-add-renote-muting.js
@@ -0,0 +1,16 @@
+
+export class addRenoteMuting1665091090561 {
+	constructor() {
+		this.name = 'addRenoteMuting1665091090561';
+	}
+
+	async up(queryRunner) {
+		await queryRunner.query(`CREATE TABLE "renote_muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "muteeId" character varying(32) NOT NULL, "muterId" character varying(32) NOT NULL, CONSTRAINT "PK_renoteMuting_id" PRIMARY KEY ("id"))`);
+		await queryRunner.query(`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `);
+		await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `);
+		await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `);
+	}
+
+	async down(queryRunner) {
+	}
+}
diff --git a/packages/backend/src/db/postgre.ts b/packages/backend/src/db/postgre.ts
index f95bd2594..bdeb910e8 100644
--- a/packages/backend/src/db/postgre.ts
+++ b/packages/backend/src/db/postgre.ts
@@ -23,6 +23,7 @@ import { Meta } from "@/models/entities/meta.js";
 import { Following } from "@/models/entities/following.js";
 import { Instance } from "@/models/entities/instance.js";
 import { Muting } from "@/models/entities/muting.js";
+import { RenoteMuting } from "@/models/entities/renote-muting.js";
 import { SwSubscription } from "@/models/entities/sw-subscription.js";
 import { Blocking } from "@/models/entities/blocking.js";
 import { UserList } from "@/models/entities/user-list.js";
@@ -136,6 +137,7 @@ export const entities = [
 	Following,
 	FollowRequest,
 	Muting,
+	RenoteMuting,
 	Blocking,
 	Note,
 	NoteFavorite,
diff --git a/packages/backend/src/misc/schema.ts b/packages/backend/src/misc/schema.ts
index 35637e6ed..7eaeb92e0 100644
--- a/packages/backend/src/misc/schema.ts
+++ b/packages/backend/src/misc/schema.ts
@@ -16,6 +16,7 @@ import { packedDriveFileSchema } from "@/models/schema/drive-file.js";
 import { packedDriveFolderSchema } from "@/models/schema/drive-folder.js";
 import { packedFollowingSchema } from "@/models/schema/following.js";
 import { packedMutingSchema } from "@/models/schema/muting.js";
+import { packedRenoteMutingSchema } from "@/models/schema/renote-muting.js";
 import { packedBlockingSchema } from "@/models/schema/blocking.js";
 import { packedNoteReactionSchema } from "@/models/schema/note-reaction.js";
 import { packedHashtagSchema } from "@/models/schema/hashtag.js";
@@ -51,6 +52,7 @@ export const refs = {
 	DriveFolder: packedDriveFolderSchema,
 	Following: packedFollowingSchema,
 	Muting: packedMutingSchema,
+	RenoteMuting: packedRenoteMutingSchema,
 	Blocking: packedBlockingSchema,
 	Hashtag: packedHashtagSchema,
 	Page: packedPageSchema,
diff --git a/packages/backend/src/models/entities/renote-muting.ts b/packages/backend/src/models/entities/renote-muting.ts
new file mode 100644
index 000000000..423a94c55
--- /dev/null
+++ b/packages/backend/src/models/entities/renote-muting.ts
@@ -0,0 +1,42 @@
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from "typeorm";
+import { id } from "../id.js";
+import { User } from "./user.js";
+
+@Entity()
+@Index(["muterId", "muteeId"], { unique: true })
+export class RenoteMuting {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Index()
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Muting.",
+	})
+	public createdAt: Date;
+
+	@Index()
+	@Column({
+		...id(),
+		comment: "The mutee user ID.",
+	})
+	public muteeId: User["id"];
+
+	@ManyToOne(type => User, {
+		onDelete: "CASCADE",
+	})
+	@JoinColumn()
+	public mutee: User | null;
+
+	@Index()
+	@Column({
+		...id(),
+		comment: "The muter user ID.",
+	})
+	public muterId: User["id"];
+
+	@ManyToOne(type => User, {
+		onDelete: "CASCADE",
+	})
+	@JoinColumn()
+	public muter: User | null;
+}
diff --git a/packages/backend/src/models/index.ts b/packages/backend/src/models/index.ts
index 98f6705f4..f68166c17 100644
--- a/packages/backend/src/models/index.ts
+++ b/packages/backend/src/models/index.ts
@@ -27,6 +27,7 @@ import { UserGroupJoining } from "./entities/user-group-joining.js";
 import { UserGroupInvitationRepository } from "./repositories/user-group-invitation.js";
 import { FollowRequestRepository } from "./repositories/follow-request.js";
 import { MutingRepository } from "./repositories/muting.js";
+import { RenoteMutingRepository } from "./repositories/renote-muting.js";
 import { BlockingRepository } from "./repositories/blocking.js";
 import { NoteReactionRepository } from "./repositories/note-reaction.js";
 import { NotificationRepository } from "./repositories/notification.js";
@@ -102,6 +103,7 @@ export const DriveFolders = DriveFolderRepository;
 export const Notifications = NotificationRepository;
 export const Metas = db.getRepository(Meta);
 export const Mutings = MutingRepository;
+export const RenoteMutings = RenoteMutingRepository;
 export const Blockings = BlockingRepository;
 export const SwSubscriptions = db.getRepository(SwSubscription);
 export const Hashtags = HashtagRepository;
diff --git a/packages/backend/src/models/repositories/renote-muting.ts b/packages/backend/src/models/repositories/renote-muting.ts
new file mode 100644
index 000000000..a39c69738
--- /dev/null
+++ b/packages/backend/src/models/repositories/renote-muting.ts
@@ -0,0 +1,31 @@
+import { db } from "@/db/postgre.js";
+import { Packed } from "@/misc/schema.js";
+import { RenoteMuting } from "@/models/entities/renote-muting.js";
+import { User } from "@/models/entities/user.js";
+import { awaitAll } from "@/prelude/await-all.js";
+import { Users } from "../index.js";
+
+export const RenoteMutingRepository = db.getRepository(RenoteMuting).extend({
+	async pack(
+		src: RenoteMuting["id"] | RenoteMuting,
+		me?: { id: User["id"] } | null | undefined,
+	): Promise<Packed<"RenoteMuting">> {
+		const muting = typeof src === "object" ? src : await this.findOneByOrFail({ id: src });
+
+		return await awaitAll({
+			id: muting.id,
+			createdAt: muting.createdAt.toISOString(),
+			muteeId: muting.muteeId,
+			mutee: Users.pack(muting.muteeId, me, {
+				detail: true,
+			}),
+		});
+	},
+
+	packMany(
+		mutings: any[],
+		me: { id: User["id"] },
+	) {
+		return Promise.all(mutings.map(x => this.pack(x, me)));
+	},
+});
diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 27b0c78d6..f6fcdae29 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -28,6 +28,7 @@ import {
 	Instances,
 	MessagingMessages,
 	Mutings,
+	RenoteMutings,
 	Notes,
 	NoteUnreads,
 	Notifications,
@@ -171,6 +172,13 @@ export const UserRepository = db.getRepository(User).extend({
 				},
 				take: 1,
 			}).then((n) => n > 0),
+			isRenoteMuted: RenoteMutings.count({
+				where: {
+					muterId: me,
+					muteeId: target,
+				},
+				take: 1,
+			}).then((n) => n > 0),
 		});
 	},
 
@@ -585,6 +593,7 @@ export const UserRepository = db.getRepository(User).extend({
 						isBlocking: relation.isBlocking,
 						isBlocked: relation.isBlocked,
 						isMuted: relation.isMuted,
+						isRenoteMuted: relation.isRenoteMuted,
 				  }
 				: {}),
 		} as Promiseable<Packed<"User">> as Promiseable<
diff --git a/packages/backend/src/models/schema/renote-muting.ts b/packages/backend/src/models/schema/renote-muting.ts
new file mode 100644
index 000000000..f60b10567
--- /dev/null
+++ b/packages/backend/src/models/schema/renote-muting.ts
@@ -0,0 +1,26 @@
+export const packedRenoteMutingSchema = {
+	type: "object",
+	properties: {
+		id: {
+			type: "string",
+			optional: false, nullable: false,
+			format: "id",
+			example: "xxxxxxxxxx",
+		},
+		createdAt: {
+			type: "string",
+			optional: false, nullable: false,
+			format: "date-time",
+		},
+		muteeId: {
+			type: "string",
+			optional: false, nullable: false,
+			format: "id",
+		},
+		mutee: {
+			type: "object",
+			optional: false, nullable: false,
+			ref: "UserDetailed",
+		},
+	},
+} as const;
diff --git a/packages/backend/src/models/schema/user.ts b/packages/backend/src/models/schema/user.ts
index 7f7689165..952999583 100644
--- a/packages/backend/src/models/schema/user.ts
+++ b/packages/backend/src/models/schema/user.ts
@@ -335,6 +335,10 @@ export const packedUserDetailedNotMeOnlySchema = {
 			nullable: false,
 			optional: true,
 		},
+		isRenoteMuted: {
+			type: "boolean",
+			nullable: false, optional: true,
+		},
 		//#endregion
 	},
 } as const;
diff --git a/packages/backend/src/server/api/common/generated-muted-renote-query.ts b/packages/backend/src/server/api/common/generated-muted-renote-query.ts
new file mode 100644
index 000000000..e11f3edaf
--- /dev/null
+++ b/packages/backend/src/server/api/common/generated-muted-renote-query.ts
@@ -0,0 +1,22 @@
+import { Brackets, SelectQueryBuilder } from "typeorm";
+import { User } from "@/models/entities/user.js";
+import { RenoteMutings } from "@/models/index.js";
+
+export function generateMutedUserRenotesQueryForNotes(q: SelectQueryBuilder<any>, me: { id: User["id"] }): void {
+	const mutingQuery = RenoteMutings.createQueryBuilder("renote_muting")
+		.select("renote_muting.muteeId")
+		.where("renote_muting.muterId = :muterId", { muterId: me.id });
+
+	q.andWhere(new Brackets(qb => {
+		qb
+			.where(new Brackets(qb => { 
+				qb.where("note.renoteId IS NOT NULL");
+				qb.andWhere("note.text IS NULL");
+				qb.andWhere(`note.userId NOT IN (${ mutingQuery.getQuery() })`);
+			}))
+			.orWhere("note.renoteId IS NULL")
+			.orWhere("note.text IS NOT NULL");
+	}));
+	
+	q.setParameters(mutingQuery.getParameters());
+}
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 3bedd1af3..3f82eb7a7 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -231,6 +231,9 @@ import * as ep___miauth_genToken from "./endpoints/miauth/gen-token.js";
 import * as ep___mute_create from "./endpoints/mute/create.js";
 import * as ep___mute_delete from "./endpoints/mute/delete.js";
 import * as ep___mute_list from "./endpoints/mute/list.js";
+import * as ep___renote_mute_create from "./endpoints/renote-mute/create.js";
+import * as ep___renote_mute_delete from "./endpoints/renote-mute/delete.js";
+import * as ep___renote_mute_list from "./endpoints/renote-mute/list.js";
 import * as ep___my_apps from "./endpoints/my/apps.js";
 import * as ep___notes from "./endpoints/notes.js";
 import * as ep___notes_children from "./endpoints/notes/children.js";
@@ -626,6 +629,9 @@ const eps = [
 	["ping", ep___ping],
 	["pinned-users", ep___pinnedUsers],
 	["recommended-instances", ep___recommendedInstances],
+	["renote-mute/create", ep___renote_mute_create],
+	["renote-mute/delete", ep___renote_mute_delete],
+	["renote-mute/list", ep___renote_mute_list],
 	["custom-motd", ep___customMOTD],
 	["custom-splash-icons", ep___customSplashIcons],
 	["latest-version", ep___latestVersion],
diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
index a7aaf9b8f..077a1ad5e 100644
--- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -8,6 +8,7 @@ import { generateMutedUserQuery } from "../../common/generate-muted-user-query.j
 import { generateRepliesQuery } from "../../common/generate-replies-query.js";
 import { generateMutedNoteQuery } from "../../common/generate-muted-note-query.js";
 import { generateBlockedUserQuery } from "../../common/generate-block-query.js";
+import { generateMutedUserRenotesQueryForNotes } from "../../common/generated-muted-renote-query.js";
 
 export const meta = {
 	tags: ["notes"],
@@ -86,6 +87,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		generateMutedUserQuery(query, user);
 		generateMutedNoteQuery(query, user);
 		generateBlockedUserQuery(query, user);
+		generateMutedUserRenotesQueryForNotes(query, user);
 	}
 
 	if (ps.withFiles) {
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 af9f670d9..3c171278b 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -11,6 +11,7 @@ import { generateRepliesQuery } from "../../common/generate-replies-query.js";
 import { generateMutedNoteQuery } from "../../common/generate-muted-note-query.js";
 import { generateChannelQuery } from "../../common/generate-channel-query.js";
 import { generateBlockedUserQuery } from "../../common/generate-block-query.js";
+import { generateMutedUserRenotesQueryForNotes } from "../../common/generated-muted-renote-query.js";
 
 export const meta = {
 	tags: ["notes"],
@@ -103,6 +104,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	generateMutedUserQuery(query, user);
 	generateMutedNoteQuery(query, user);
 	generateBlockedUserQuery(query, user);
+	generateMutedUserRenotesQueryForNotes(query, user);
 
 	if (ps.includeMyRenotes === false) {
 		query.andWhere(
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index e1e8a9ae2..cec371c8d 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -11,6 +11,7 @@ import { generateRepliesQuery } from "../../common/generate-replies-query.js";
 import { generateMutedNoteQuery } from "../../common/generate-muted-note-query.js";
 import { generateChannelQuery } from "../../common/generate-channel-query.js";
 import { generateBlockedUserQuery } from "../../common/generate-block-query.js";
+import { generateMutedUserRenotesQueryForNotes } from "../../common/generated-muted-renote-query.js";
 
 export const meta = {
 	tags: ["notes"],
@@ -96,6 +97,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (user) generateMutedUserQuery(query, user);
 	if (user) generateMutedNoteQuery(query, user);
 	if (user) generateBlockedUserQuery(query, user);
+	if (user) generateMutedUserRenotesQueryForNotes(query, user);
 
 	if (ps.withFiles) {
 		query.andWhere("note.fileIds != '{}'");
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index 0d6ec2f46..f85c0cfd3 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -9,6 +9,7 @@ import { generateRepliesQuery } from "../../common/generate-replies-query.js";
 import { generateMutedNoteQuery } from "../../common/generate-muted-note-query.js";
 import { generateChannelQuery } from "../../common/generate-channel-query.js";
 import { generateBlockedUserQuery } from "../../common/generate-block-query.js";
+import { generateMutedUserRenotesQueryForNotes } from "../../common/generated-muted-renote-query.js";
 
 export const meta = {
 	tags: ["notes"],
@@ -95,6 +96,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	generateMutedUserQuery(query, user);
 	generateMutedNoteQuery(query, user);
 	generateBlockedUserQuery(query, user);
+	generateMutedUserRenotesQueryForNotes(query, user);
 
 	if (ps.includeMyRenotes === false) {
 		query.andWhere(
diff --git a/packages/backend/src/server/api/endpoints/renote-mute/create.ts b/packages/backend/src/server/api/endpoints/renote-mute/create.ts
new file mode 100644
index 000000000..8f76e618b
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/renote-mute/create.ts
@@ -0,0 +1,78 @@
+import { genId } from "@/misc/gen-id.js";
+import { RenoteMutings } from "@/models/index.js";
+import { RenoteMuting } from "@/models/entities/renote-muting.js";
+import define from "../../define.js";
+import { ApiError } from "../../error.js";
+import { getUser } from "../../common/getters.js";
+
+export const meta = {
+	tags: ["account"],
+
+	requireCredential: true,
+
+	kind: "write:mutes",
+
+	errors: {
+		noSuchUser: {
+			message: "No such user.",
+			code: "NO_SUCH_USER",
+			id: "6fef56f3-e765-4957-88e5-c6f65329b8a5",
+		},
+
+		muteeIsYourself: {
+			message: "Mutee is yourself.",
+			code: "MUTEE_IS_YOURSELF",
+			id: "a4619cb2-5f23-484b-9301-94c903074e10",
+		},
+
+		alreadyMuting: {
+			message: "You are already muting that user.",
+			code: "ALREADY_MUTING",
+			id: "7e7359cb-160c-4956-b08f-4d1c653cd007",
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: "object",
+	properties: {
+		userId: { type: "string", format: "misskey:id" },
+	},
+	required: ["userId"],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+export default define(meta, paramDef, async (ps, user) => {
+	const muter = user;
+
+	// 自分自身
+	if (user.id === ps.userId) {
+		throw new ApiError(meta.errors.muteeIsYourself);
+	}
+
+	// Get mutee
+	const mutee = await getUser(ps.userId).catch(e => {
+		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff") throw new ApiError(meta.errors.noSuchUser);
+		throw e;
+	});
+
+	// Check if already muting
+	const exist = await RenoteMutings.findOneBy({
+		muterId: muter.id,
+		muteeId: mutee.id,
+	});
+
+	if (exist != null) {
+		throw new ApiError(meta.errors.alreadyMuting);
+	}
+
+	// Create mute
+	await RenoteMutings.insert({
+		id: genId(),
+		createdAt: new Date(),
+		muterId: muter.id,
+		muteeId: mutee.id,
+	} as RenoteMuting);
+
+	// publishUserEvent(user.id, "mute", 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
new file mode 100644
index 000000000..f5caad345
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts
@@ -0,0 +1,73 @@
+import { RenoteMutings } from "@/models/index.js";
+import define from "../../define.js";
+import { ApiError } from "../../error.js";
+import { getUser } from "../../common/getters.js";
+
+export const meta = {
+	tags: ["account"],
+
+	requireCredential: true,
+
+	kind: "write:mutes",
+
+	errors: {
+		noSuchUser: {
+			message: "No such user.",
+			code: "NO_SUCH_USER",
+			id: "b851d00b-8ab1-4a56-8b1b-e24187cb48ef",
+		},
+
+		muteeIsYourself: {
+			message: "Mutee is yourself.",
+			code: "MUTEE_IS_YOURSELF",
+			id: "f428b029-6b39-4d48-a1d2-cc1ae6dd5cf9",
+		},
+
+		notMuting: {
+			message: "You are not muting that user.",
+			code: "NOT_MUTING",
+			id: "5467d020-daa9-4553-81e1-135c0c35a96d",
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: "object",
+	properties: {
+		userId: { type: "string", format: "misskey:id" },
+	},
+	required: ["userId"],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+export default define(meta, paramDef, async (ps, user) => {
+	const muter = user;
+
+	// Check if the mutee is yourself
+	if (user.id === ps.userId) {
+		throw new ApiError(meta.errors.muteeIsYourself);
+	}
+
+	// Get mutee
+	const mutee = await getUser(ps.userId).catch(e => {
+		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff") throw new ApiError(meta.errors.noSuchUser);
+		throw e;
+	});
+
+	// Check not muting
+	const exist = await RenoteMutings.findOneBy({
+		muterId: muter.id,
+		muteeId: mutee.id,
+	});
+
+	if (exist == null) {
+		throw new ApiError(meta.errors.notMuting);
+	}
+
+	// Delete mute
+	await RenoteMutings.delete({
+		id: exist.id,
+	});
+
+	// publishUserEvent(user.id, "unmute", mutee);
+});
diff --git a/packages/backend/src/server/api/endpoints/renote-mute/list.ts b/packages/backend/src/server/api/endpoints/renote-mute/list.ts
new file mode 100644
index 000000000..fd6964bba
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/renote-mute/list.ts
@@ -0,0 +1,43 @@
+import { RenoteMutings } from "@/models/index.js";
+import define from "../../define.js";
+import { makePaginationQuery } from "../../common/make-pagination-query.js";
+
+export const meta = {
+	tags: ["account"],
+
+	requireCredential: true,
+
+	kind: "read:mutes",
+
+	res: {
+		type: "array",
+		optional: false, nullable: false,
+		items: {
+			type: "object",
+			optional: false, nullable: false,
+			ref: "RenoteMuting",
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: "object",
+	properties: {
+		limit: { type: "integer", minimum: 1, maximum: 100, default: 30 },
+		sinceId: { type: "string", format: "misskey:id" },
+		untilId: { type: "string", format: "misskey:id" },
+	},
+	required: [],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+export default define(meta, paramDef, async (ps, me) => {
+	const query = makePaginationQuery(RenoteMutings.createQueryBuilder("muting"), ps.sinceId, ps.untilId)
+		.andWhere("muting.muterId = :meId", { meId: me.id });
+
+	const mutings = await query
+		.take(ps.limit)
+		.getMany();
+
+	return await RenoteMutings.packMany(mutings, me);
+});
diff --git a/packages/backend/src/server/api/endpoints/users/relation.ts b/packages/backend/src/server/api/endpoints/users/relation.ts
index 01f39396d..b1803b01e 100644
--- a/packages/backend/src/server/api/endpoints/users/relation.ts
+++ b/packages/backend/src/server/api/endpoints/users/relation.ts
@@ -57,6 +57,10 @@ export const meta = {
 						optional: false,
 						nullable: false,
 					},
+					isRenoteMuted: {
+						type: "boolean",
+						optional: false, nullable: false,
+					},
 				},
 			},
 			{
@@ -107,6 +111,10 @@ export const meta = {
 							optional: false,
 							nullable: false,
 						},
+						isRenoteMuted: {
+							type: "boolean",
+							optional: false, nullable: false,
+						},
 					},
 				},
 			},
diff --git a/packages/backend/src/server/api/stream/channel.ts b/packages/backend/src/server/api/stream/channel.ts
index 93dbdc426..fc8e0ce35 100644
--- a/packages/backend/src/server/api/stream/channel.ts
+++ b/packages/backend/src/server/api/stream/channel.ts
@@ -30,6 +30,10 @@ export default abstract class Channel {
 		return this.connection.muting;
 	}
 
+	protected get renoteMuting() {
+		return this.connection.renoteMuting;
+	}
+
 	protected get blocking() {
 		return this.connection.blocking;
 	}
diff --git a/packages/backend/src/server/api/stream/channels/antenna.ts b/packages/backend/src/server/api/stream/channels/antenna.ts
index 8e0d08110..7ad7353a6 100644
--- a/packages/backend/src/server/api/stream/channels/antenna.ts
+++ b/packages/backend/src/server/api/stream/channels/antenna.ts
@@ -34,6 +34,8 @@ export default class extends Channel {
 				// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 				if (isUserRelated(note, this.blocking)) return;
 
+				if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+
 				this.connection.cacheNote(note);
 
 				this.send("note", note);
diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index d2a2269a4..ad20adeaf 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -36,6 +36,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+
 		this.connection.cacheNote(note);
 
 		this.send("note", note);
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 a99b3cbc1..39dc599c1 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -56,6 +56,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
diff --git a/packages/backend/src/server/api/stream/channels/hashtag.ts b/packages/backend/src/server/api/stream/channels/hashtag.ts
index 9d7b518d9..66265fe4e 100644
--- a/packages/backend/src/server/api/stream/channels/hashtag.ts
+++ b/packages/backend/src/server/api/stream/channels/hashtag.ts
@@ -36,6 +36,8 @@ export default class extends Channel {
 		if (isUserRelated(note, this.muting)) return;
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
+		
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
 
 		this.connection.cacheNote(note);
 
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 c51a0fc2b..1e6f91ee4 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -54,6 +54,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
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 3e4a8a4e1..3038374ec 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -71,6 +71,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
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 56689aae9..9cea11b22 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -48,6 +48,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
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 f63776c9e..234505fa0 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -56,6 +56,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+
 		this.send("note", note);
 	}
 
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index 03cecf542..055fe200b 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -7,6 +7,7 @@ import {
 	Users,
 	Followings,
 	Mutings,
+	RenoteMutings,
 	UserProfiles,
 	ChannelFollowings,
 	Blockings,
@@ -36,6 +37,7 @@ export default class Connection {
 	public userProfile?: UserProfile | null;
 	public following: Set<User["id"]> = new Set();
 	public muting: Set<User["id"]> = new Set();
+	public renoteMuting: Set<User["id"]> = new Set();
 	public blocking: Set<User["id"]> = new Set(); // "被"blocking
 	public followingChannels: Set<ChannelModel["id"]> = new Set();
 	public token?: AccessToken;
@@ -80,6 +82,7 @@ export default class Connection {
 		if (this.user) {
 			this.updateFollowing();
 			this.updateMuting();
+			this.updateRenoteMuting();
 			this.updateBlocking();
 			this.updateFollowingChannels();
 			this.updateUserProfile();
@@ -114,6 +117,7 @@ export default class Connection {
 				this.muting.delete(data.body.id);
 				break;
 
+			// TODO: renote mute events
 			// TODO: block events
 
 			case "followChannel":
@@ -564,6 +568,17 @@ export default class Connection {
 		this.muting = new Set<string>(mutings.map((x) => x.muteeId));
 	}
 
+	private async updateRenoteMuting() {
+		const renoteMutings = await RenoteMutings.find({
+			where: {
+				muterId: this.user!.id,
+			},
+			select: ["muteeId"],
+		});
+
+		this.renoteMuting = new Set<string>(renoteMutings.map((x) => x.muteeId));
+	}
+
 	private async updateBlocking() {
 		// ここでいうBlockingは被Blockingの意
 		const blockings = await Blockings.find({
diff --git a/packages/calckey-js/src/api.types.ts b/packages/calckey-js/src/api.types.ts
index bbe781e92..e406b865a 100644
--- a/packages/calckey-js/src/api.types.ts
+++ b/packages/calckey-js/src/api.types.ts
@@ -765,6 +765,9 @@ export type Endpoints = {
 	"mute/create": { req: TODO; res: TODO };
 	"mute/delete": { req: { userId: User["id"] }; res: null };
 	"mute/list": { req: TODO; res: TODO };
+	"renote-mute/create": { req: TODO; res: TODO; };
+	"renote-mute/delete": { req: { userId: User['id'] }; res: null; };
+	"renote-mute/list": { req: TODO; res: TODO; };
 
 	// my
 	"my/apps": { req: TODO; res: TODO };
diff --git a/packages/calckey-js/src/entities.ts b/packages/calckey-js/src/entities.ts
index b15dd8fca..bf881df2f 100644
--- a/packages/calckey-js/src/entities.ts
+++ b/packages/calckey-js/src/entities.ts
@@ -53,6 +53,7 @@ export type UserDetailed = UserLite & {
 	isLocked: boolean;
 	isModerator: boolean;
 	isMuted: boolean;
+	isRenoteMuted: boolean;
 	isSilenced: boolean;
 	isSuspended: boolean;
 	lang: string | null;
diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts
index 44dbac961..b128419f1 100644
--- a/packages/client/src/scripts/get-user-menu.ts
+++ b/packages/client/src/scripts/get-user-menu.ts
@@ -117,7 +117,15 @@ export function getUserMenu(user, router: Router = mainRouter) {
 		}
 	}
 
-	async function toggleBlock() {
+	async function toggleRenoteMute(): Promise<void> {
+		os.apiWithDialog(user.isRenoteMuted ? "renote-mute/delete" : "renote-mute/create", {
+			userId: user.id,
+		}).then(() => {
+			user.isRenoteMuted = !user.isRenoteMuted;
+		});
+	}
+
+	async function toggleBlock(): Promise<void> {
 		if (
 			!(await getConfirmed(
 				user.isBlocking ? i18n.ts.unblockConfirm : i18n.ts.blockConfirm,
@@ -261,6 +269,13 @@ export function getUserMenu(user, router: Router = mainRouter) {
 	if ($i && meId !== user.id) {
 		menu = menu.concat([
 			null,
+			{
+				icon: user.isRenoteMuted
+					? "ph-eye ph-bold ph-lg"
+					: "ph-eye-slash ph-bold ph-lg",
+				text: user.isRenoteMuted ? i18n.ts.renoteUnmute : i18n.ts.renoteMute,
+				action: toggleRenoteMute,
+			},
 			{
 				icon: user.isMuted
 					? "ph-eye ph-bold ph-lg"

From f2cf92aea1b185de74e997de5a4cfb76f755bab9 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@mx.a-ef.org>
Date: Sat, 8 Apr 2023 01:44:50 -0400
Subject: [PATCH 428/582] fetch person again

---
 .../backend/src/remote/activitypub/kernel/move/index.ts   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/kernel/move/index.ts b/packages/backend/src/remote/activitypub/kernel/move/index.ts
index 690b84b0e..800fd7bfe 100644
--- a/packages/backend/src/remote/activitypub/kernel/move/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/move/index.ts
@@ -19,14 +19,18 @@ export default async (
 	// fetch the new and old accounts
 	const targetUri = getApHrefNullable(activity.target);
 	if (!targetUri) return "move: target uri is null";
-	const new_acc = await resolvePerson(targetUri);
+	let new_acc = await resolvePerson(targetUri);
 	if (!actor.uri) return "move: actor uri is null";
-	const old_acc = await resolvePerson(actor.uri);
+	let old_acc = await resolvePerson(actor.uri);
 
 	// update them if they're remote
 	if (new_acc.uri) await updatePerson(new_acc.uri);
 	if (old_acc.uri) await updatePerson(old_acc.uri);
 
+	// retrieve updated users
+	new_acc = await resolvePerson(targetUri);
+	old_acc = await resolvePerson(actor.uri);
+
 	// check if alsoKnownAs of the new account is valid
 	let isValidMove = true;
 	if (old_acc.uri) {

From 1affde0a8c33335458faf98245cb71208bab4f4d Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 22:46:10 -0700
Subject: [PATCH 429/582] chore: formatting

---
 .../1665091090561-add-renote-muting.js        | 22 +++++++-----
 .../src/models/entities/renote-muting.ts      |  9 ++++-
 .../src/models/repositories/renote-muting.ts  | 10 +++---
 .../src/models/schema/renote-muting.ts        | 12 ++++---
 packages/backend/src/models/schema/user.ts    |  3 +-
 .../common/generated-muted-renote-query.ts    | 30 +++++++++-------
 .../api/endpoints/renote-mute/create.ts       |  5 +--
 .../api/endpoints/renote-mute/delete.ts       |  5 +--
 .../server/api/endpoints/renote-mute/list.ts  | 17 +++++----
 .../server/api/endpoints/users/relation.ts    |  6 ++--
 .../src/server/api/stream/channels/antenna.ts |  3 +-
 .../src/server/api/stream/channels/channel.ts |  3 +-
 .../api/stream/channels/global-timeline.ts    |  3 +-
 .../src/server/api/stream/channels/hashtag.ts |  5 +--
 .../api/stream/channels/home-timeline.ts      |  3 +-
 .../api/stream/channels/hybrid-timeline.ts    |  3 +-
 .../api/stream/channels/local-timeline.ts     |  3 +-
 .../server/api/stream/channels/user-list.ts   |  3 +-
 packages/calckey-js/src/api.types.ts          |  6 ++--
 packages/client/src/pages/admin/hashtags.vue  | 35 ++++++++++---------
 packages/client/src/scripts/get-user-menu.ts  |  9 +++--
 21 files changed, 119 insertions(+), 76 deletions(-)

diff --git a/packages/backend/migration/1665091090561-add-renote-muting.js b/packages/backend/migration/1665091090561-add-renote-muting.js
index d2ed2bd2e..2c76aaff5 100644
--- a/packages/backend/migration/1665091090561-add-renote-muting.js
+++ b/packages/backend/migration/1665091090561-add-renote-muting.js
@@ -1,16 +1,22 @@
-
 export class addRenoteMuting1665091090561 {
 	constructor() {
-		this.name = 'addRenoteMuting1665091090561';
+		this.name = "addRenoteMuting1665091090561";
 	}
 
 	async up(queryRunner) {
-		await queryRunner.query(`CREATE TABLE "renote_muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "muteeId" character varying(32) NOT NULL, "muterId" character varying(32) NOT NULL, CONSTRAINT "PK_renoteMuting_id" PRIMARY KEY ("id"))`);
-		await queryRunner.query(`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `);
-		await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `);
-		await queryRunner.query(`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `);
+		await queryRunner.query(
+			`CREATE TABLE "renote_muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "muteeId" character varying(32) NOT NULL, "muterId" character varying(32) NOT NULL, CONSTRAINT "PK_renoteMuting_id" PRIMARY KEY ("id"))`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `,
+		);
 	}
 
-	async down(queryRunner) {
-	}
+	async down(queryRunner) {}
 }
diff --git a/packages/backend/src/models/entities/renote-muting.ts b/packages/backend/src/models/entities/renote-muting.ts
index 423a94c55..64ec7f583 100644
--- a/packages/backend/src/models/entities/renote-muting.ts
+++ b/packages/backend/src/models/entities/renote-muting.ts
@@ -1,4 +1,11 @@
-import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from "typeorm";
+import {
+	PrimaryColumn,
+	Entity,
+	Index,
+	JoinColumn,
+	Column,
+	ManyToOne,
+} from "typeorm";
 import { id } from "../id.js";
 import { User } from "./user.js";
 
diff --git a/packages/backend/src/models/repositories/renote-muting.ts b/packages/backend/src/models/repositories/renote-muting.ts
index a39c69738..18fd343a0 100644
--- a/packages/backend/src/models/repositories/renote-muting.ts
+++ b/packages/backend/src/models/repositories/renote-muting.ts
@@ -10,7 +10,8 @@ export const RenoteMutingRepository = db.getRepository(RenoteMuting).extend({
 		src: RenoteMuting["id"] | RenoteMuting,
 		me?: { id: User["id"] } | null | undefined,
 	): Promise<Packed<"RenoteMuting">> {
-		const muting = typeof src === "object" ? src : await this.findOneByOrFail({ id: src });
+		const muting =
+			typeof src === "object" ? src : await this.findOneByOrFail({ id: src });
 
 		return await awaitAll({
 			id: muting.id,
@@ -22,10 +23,7 @@ export const RenoteMutingRepository = db.getRepository(RenoteMuting).extend({
 		});
 	},
 
-	packMany(
-		mutings: any[],
-		me: { id: User["id"] },
-	) {
-		return Promise.all(mutings.map(x => this.pack(x, me)));
+	packMany(mutings: any[], me: { id: User["id"] }) {
+		return Promise.all(mutings.map((x) => this.pack(x, me)));
 	},
 });
diff --git a/packages/backend/src/models/schema/renote-muting.ts b/packages/backend/src/models/schema/renote-muting.ts
index f60b10567..2a5824e32 100644
--- a/packages/backend/src/models/schema/renote-muting.ts
+++ b/packages/backend/src/models/schema/renote-muting.ts
@@ -3,23 +3,27 @@ export const packedRenoteMutingSchema = {
 	properties: {
 		id: {
 			type: "string",
-			optional: false, nullable: false,
+			optional: false,
+			nullable: false,
 			format: "id",
 			example: "xxxxxxxxxx",
 		},
 		createdAt: {
 			type: "string",
-			optional: false, nullable: false,
+			optional: false,
+			nullable: false,
 			format: "date-time",
 		},
 		muteeId: {
 			type: "string",
-			optional: false, nullable: false,
+			optional: false,
+			nullable: false,
 			format: "id",
 		},
 		mutee: {
 			type: "object",
-			optional: false, nullable: false,
+			optional: false,
+			nullable: false,
 			ref: "UserDetailed",
 		},
 	},
diff --git a/packages/backend/src/models/schema/user.ts b/packages/backend/src/models/schema/user.ts
index 952999583..80e94fe50 100644
--- a/packages/backend/src/models/schema/user.ts
+++ b/packages/backend/src/models/schema/user.ts
@@ -337,7 +337,8 @@ export const packedUserDetailedNotMeOnlySchema = {
 		},
 		isRenoteMuted: {
 			type: "boolean",
-			nullable: false, optional: true,
+			nullable: false,
+			optional: true,
 		},
 		//#endregion
 	},
diff --git a/packages/backend/src/server/api/common/generated-muted-renote-query.ts b/packages/backend/src/server/api/common/generated-muted-renote-query.ts
index e11f3edaf..3fcd9b28e 100644
--- a/packages/backend/src/server/api/common/generated-muted-renote-query.ts
+++ b/packages/backend/src/server/api/common/generated-muted-renote-query.ts
@@ -2,21 +2,27 @@ import { Brackets, SelectQueryBuilder } from "typeorm";
 import { User } from "@/models/entities/user.js";
 import { RenoteMutings } from "@/models/index.js";
 
-export function generateMutedUserRenotesQueryForNotes(q: SelectQueryBuilder<any>, me: { id: User["id"] }): void {
+export function generateMutedUserRenotesQueryForNotes(
+	q: SelectQueryBuilder<any>,
+	me: { id: User["id"] },
+): void {
 	const mutingQuery = RenoteMutings.createQueryBuilder("renote_muting")
 		.select("renote_muting.muteeId")
 		.where("renote_muting.muterId = :muterId", { muterId: me.id });
 
-	q.andWhere(new Brackets(qb => {
-		qb
-			.where(new Brackets(qb => { 
-				qb.where("note.renoteId IS NOT NULL");
-				qb.andWhere("note.text IS NULL");
-				qb.andWhere(`note.userId NOT IN (${ mutingQuery.getQuery() })`);
-			}))
-			.orWhere("note.renoteId IS NULL")
-			.orWhere("note.text IS NOT NULL");
-	}));
-	
+	q.andWhere(
+		new Brackets((qb) => {
+			qb.where(
+				new Brackets((qb) => {
+					qb.where("note.renoteId IS NOT NULL");
+					qb.andWhere("note.text IS NULL");
+					qb.andWhere(`note.userId NOT IN (${mutingQuery.getQuery()})`);
+				}),
+			)
+				.orWhere("note.renoteId IS NULL")
+				.orWhere("note.text IS NOT NULL");
+		}),
+	);
+
 	q.setParameters(mutingQuery.getParameters());
 }
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 8f76e618b..82db79cc6 100644
--- a/packages/backend/src/server/api/endpoints/renote-mute/create.ts
+++ b/packages/backend/src/server/api/endpoints/renote-mute/create.ts
@@ -51,8 +51,9 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// Get mutee
-	const mutee = await getUser(ps.userId).catch(e => {
-		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff") throw new ApiError(meta.errors.noSuchUser);
+	const mutee = await getUser(ps.userId).catch((e) => {
+		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff")
+			throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 
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 f5caad345..4fd500d7c 100644
--- a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts
+++ b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts
@@ -49,8 +49,9 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// Get mutee
-	const mutee = await getUser(ps.userId).catch(e => {
-		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff") throw new ApiError(meta.errors.noSuchUser);
+	const mutee = await getUser(ps.userId).catch((e) => {
+		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff")
+			throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 
diff --git a/packages/backend/src/server/api/endpoints/renote-mute/list.ts b/packages/backend/src/server/api/endpoints/renote-mute/list.ts
index fd6964bba..9149dd975 100644
--- a/packages/backend/src/server/api/endpoints/renote-mute/list.ts
+++ b/packages/backend/src/server/api/endpoints/renote-mute/list.ts
@@ -11,10 +11,12 @@ export const meta = {
 
 	res: {
 		type: "array",
-		optional: false, nullable: false,
+		optional: false,
+		nullable: false,
 		items: {
 			type: "object",
-			optional: false, nullable: false,
+			optional: false,
+			nullable: false,
 			ref: "RenoteMuting",
 		},
 	},
@@ -32,12 +34,13 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, me) => {
-	const query = makePaginationQuery(RenoteMutings.createQueryBuilder("muting"), ps.sinceId, ps.untilId)
-		.andWhere("muting.muterId = :meId", { meId: me.id });
+	const query = makePaginationQuery(
+		RenoteMutings.createQueryBuilder("muting"),
+		ps.sinceId,
+		ps.untilId,
+	).andWhere("muting.muterId = :meId", { meId: me.id });
 
-	const mutings = await query
-		.take(ps.limit)
-		.getMany();
+	const mutings = await query.take(ps.limit).getMany();
 
 	return await RenoteMutings.packMany(mutings, me);
 });
diff --git a/packages/backend/src/server/api/endpoints/users/relation.ts b/packages/backend/src/server/api/endpoints/users/relation.ts
index b1803b01e..5580eaea0 100644
--- a/packages/backend/src/server/api/endpoints/users/relation.ts
+++ b/packages/backend/src/server/api/endpoints/users/relation.ts
@@ -59,7 +59,8 @@ export const meta = {
 					},
 					isRenoteMuted: {
 						type: "boolean",
-						optional: false, nullable: false,
+						optional: false,
+						nullable: false,
 					},
 				},
 			},
@@ -113,7 +114,8 @@ export const meta = {
 						},
 						isRenoteMuted: {
 							type: "boolean",
-							optional: false, nullable: false,
+							optional: false,
+							nullable: false,
 						},
 					},
 				},
diff --git a/packages/backend/src/server/api/stream/channels/antenna.ts b/packages/backend/src/server/api/stream/channels/antenna.ts
index 7ad7353a6..050a8d101 100644
--- a/packages/backend/src/server/api/stream/channels/antenna.ts
+++ b/packages/backend/src/server/api/stream/channels/antenna.ts
@@ -34,7 +34,8 @@ export default class extends Channel {
 				// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 				if (isUserRelated(note, this.blocking)) return;
 
-				if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+				if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+					return;
 
 				this.connection.cacheNote(note);
 
diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index ad20adeaf..d046579f4 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -36,7 +36,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		this.connection.cacheNote(note);
 
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 39dc599c1..aa3844c7e 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -56,7 +56,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
diff --git a/packages/backend/src/server/api/stream/channels/hashtag.ts b/packages/backend/src/server/api/stream/channels/hashtag.ts
index 66265fe4e..a2e5481ab 100644
--- a/packages/backend/src/server/api/stream/channels/hashtag.ts
+++ b/packages/backend/src/server/api/stream/channels/hashtag.ts
@@ -36,8 +36,9 @@ export default class extends Channel {
 		if (isUserRelated(note, this.muting)) return;
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
-		
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		this.connection.cacheNote(note);
 
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 1e6f91ee4..fa4a8a390 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -54,7 +54,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
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 3038374ec..557bb9682 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -71,7 +71,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
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 9cea11b22..dc3aab8d7 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -48,7 +48,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
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 234505fa0..105c45955 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -56,7 +56,8 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
-		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting)) return;
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
 
 		this.send("note", note);
 	}
diff --git a/packages/calckey-js/src/api.types.ts b/packages/calckey-js/src/api.types.ts
index e406b865a..bef00da4e 100644
--- a/packages/calckey-js/src/api.types.ts
+++ b/packages/calckey-js/src/api.types.ts
@@ -765,9 +765,9 @@ export type Endpoints = {
 	"mute/create": { req: TODO; res: TODO };
 	"mute/delete": { req: { userId: User["id"] }; res: null };
 	"mute/list": { req: TODO; res: TODO };
-	"renote-mute/create": { req: TODO; res: TODO; };
-	"renote-mute/delete": { req: { userId: User['id'] }; res: null; };
-	"renote-mute/list": { req: TODO; res: TODO; };
+	"renote-mute/create": { req: TODO; res: TODO };
+	"renote-mute/delete": { req: { userId: User["id"] }; res: null };
+	"renote-mute/list": { req: TODO; res: TODO };
 
 	// my
 	"my/apps": { req: TODO; res: TODO };
diff --git a/packages/client/src/pages/admin/hashtags.vue b/packages/client/src/pages/admin/hashtags.vue
index c2ecbcf3a..38cd0be5e 100644
--- a/packages/client/src/pages/admin/hashtags.vue
+++ b/packages/client/src/pages/admin/hashtags.vue
@@ -7,36 +7,39 @@
 			<FormSuspense :p="init">
 				<FormTextarea v-model="hiddenTags" class="_formBlock">
 					<span>{{ i18n.ts.hiddenTags }}</span>
-					<template #caption>{{ i18n.ts.hiddenTagsDescription }}</template>
+					<template #caption>{{
+						i18n.ts.hiddenTagsDescription
+					}}</template>
 				</FormTextarea>
 
-				<FormButton primary class="_formBlock" @click="save"><i
-						class="ph-floppy-disk-back ph-bold ph-lg"></i>
-					{{ i18n.ts.save }}</FormButton>
+				<FormButton primary class="_formBlock" @click="save"
+					><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
+					{{ i18n.ts.save }}</FormButton
+				>
 			</FormSuspense>
 		</MkSpacer>
 	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
-import FormButton from '@/components/MkButton.vue';
-import FormTextarea from '@/components/form/textarea.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import * as os from '@/os';
-import { fetchInstance } from '@/instance';
-import { i18n } from '@/i18n';
-import { definePageMetadata } from '@/scripts/page-metadata';
+import {} from "vue";
+import FormButton from "@/components/MkButton.vue";
+import FormTextarea from "@/components/form/textarea.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
 
-let hiddenTags: string = $ref('');
+let hiddenTags: string = $ref("");
 
 async function init() {
-	const meta = await os.api('admin/meta');
+	const meta = await os.api("admin/meta");
 	hiddenTags = meta.hiddenTags.join("\n");
 }
 
 function save() {
-	os.apiWithDialog('admin/update-meta', {
+	os.apiWithDialog("admin/update-meta", {
 		hiddenTags: hiddenTags.split("\n").map((h: string) => h.trim()) || [],
 	}).then(() => {
 		fetchInstance();
@@ -49,6 +52,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.hiddenTags,
-	icon: 'ph-hash ph-bold ph-lg',
+	icon: "ph-hash ph-bold ph-lg",
 });
 </script>
diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts
index b128419f1..fd1ce0820 100644
--- a/packages/client/src/scripts/get-user-menu.ts
+++ b/packages/client/src/scripts/get-user-menu.ts
@@ -118,9 +118,12 @@ export function getUserMenu(user, router: Router = mainRouter) {
 	}
 
 	async function toggleRenoteMute(): Promise<void> {
-		os.apiWithDialog(user.isRenoteMuted ? "renote-mute/delete" : "renote-mute/create", {
-			userId: user.id,
-		}).then(() => {
+		os.apiWithDialog(
+			user.isRenoteMuted ? "renote-mute/delete" : "renote-mute/create",
+			{
+				userId: user.id,
+			},
+		).then(() => {
 			user.isRenoteMuted = !user.isRenoteMuted;
 		});
 	}

From 79ae442ba31a49a65c615ea3c2288830c703a04b Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 22:46:41 -0700
Subject: [PATCH 430/582] back button

---
 packages/client/src/pages/admin/hashtags.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/admin/hashtags.vue b/packages/client/src/pages/admin/hashtags.vue
index 38cd0be5e..d10ee44f3 100644
--- a/packages/client/src/pages/admin/hashtags.vue
+++ b/packages/client/src/pages/admin/hashtags.vue
@@ -1,7 +1,11 @@
 <template>
 	<MkStickyContainer>
 		<template #header>
-			<MkPageHeader :actions="headerActions" :tabs="headerTabs" />
+			<MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+			/>
 		</template>
 		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
 			<FormSuspense :p="init">

From 6d5129c938210a1479faf6593a566c226a37d15c Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 22:54:25 -0700
Subject: [PATCH 431/582] move hidden hashtag menu

---
 packages/client/src/pages/admin/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 881105a23..07dac9c6b 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -181,12 +181,6 @@ const menuDef = $computed(() => [
 				to: "/admin/emojis",
 				active: currentPage?.route.name === "emojis",
 			},
-			{
-				icon: "ph-hash ph-bold ph-lg",
-				text: i18n.ts.hashtags,
-				to: "/admin/hashtags",
-				active: currentPage?.route.name === "hashtags",
-			},
 			{
 				icon: "ph-planet ph-bold ph-lg",
 				text: i18n.ts.federation,
@@ -275,6 +269,12 @@ const menuDef = $computed(() => [
 							active:
 								currentPage?.route.name === "instance-block",
 						},
+						{
+							icon: "ph-hash ph-bold ph-lg",
+							text: i18n.ts.hiddenTags,
+							to: "/admin/hashtags",
+							active: currentPage?.route.name === "hashtags",
+						},
 						{
 							icon: "ph-ghost ph-bold ph-lg",
 							text: i18n.ts.proxyAccount,

From 9be3fca2b8eb0873268a6f2293c4d6f730e9f4b2 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 23:55:03 -0700
Subject: [PATCH 432/582] feat: messaging room banner

---
 .../client/src/pages/messaging/messaging-room.vue     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index ed3b4e227..487d9ab92 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -6,6 +6,12 @@
 		@drop.prevent.stop="onDrop"
 	>
 		<div class="_content mk-messaging-room">
+			<template #header
+				><MkPageHeader
+					:actions="headerActions"
+					:tabs="headerTabs"
+					:display-back-button="true"
+			/></template>
 			<MkSpacer :content-max="800">
 				<div class="body">
 					<MkPagination
@@ -328,12 +334,17 @@ function onVisibilitychange() {
 	}
 }
 
+const headerActions = $computed(() => []);
+
+const headerTabs = $computed(() => []);
+
 onMounted(() => {
 	fetch();
 	definePageMetadata(
 		computed(() => ({
 			title: group != null ? group.name : user?.name,
 			icon: "ph-chats-teardrop ph-bold ph-lg",
+			avatar: group != null ? null : user,
 		}))
 	);
 });

From ca0189f1fd2261134fac35c5e8bff7fed25087dd Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 7 Apr 2023 23:49:36 -0700
Subject: [PATCH 433/582] feat: mark all as read action in chat

---
 packages/client/src/pages/messaging/index.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 768c58cc6..4afe832db 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -121,12 +121,15 @@ window.addEventListener("resize", () => {
 		deviceKind === "smartphone" || window.innerWidth <= MOBILE_THRESHOLD;
 });
 
+async function readAllMessagingMessages() {
+	await os.api("i/read-all-messaging-messages");
+}
+
 const headerActions = $computed(() => [
 	{
-		asFullButton: true,
-		icon: "ph-plus ph-bold ph-lg",
-		text: i18n.ts.addUser,
-		handler: startMenu,
+		icon: "ph-check ph-bold ph-lg",
+		text: i18n.ts.markAllAsRead,
+		handler: readAllMessagingMessages,
 	},
 ]);
 

From ce9c671816b9918339be1b955fe774e5c6ff073e Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sat, 8 Apr 2023 00:10:16 -0700
Subject: [PATCH 434/582] fix

---
 .../src/pages/messaging/messaging-room.vue    | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 487d9ab92..442a90551 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -1,18 +1,12 @@
 <template>
-	<div
-		ref="rootEl"
-		class="_section"
-		@dragover.prevent.stop="onDragover"
-		@drop.prevent.stop="onDrop"
-	>
-		<div class="_content mk-messaging-room">
-			<template #header
-				><MkPageHeader
-					:actions="headerActions"
-					:tabs="headerTabs"
-					:display-back-button="true"
-			/></template>
-			<MkSpacer :content-max="800">
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+			<MkSpacer :content-max="800" class="mk-messaging-room">
 				<div class="body">
 					<MkPagination
 						v-if="pagination"
@@ -93,8 +87,7 @@
 					/>
 				</footer>
 			</MkSpacer>
-		</div>
-	</div>
+	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
@@ -362,9 +355,6 @@ XMessage:last-of-type {
 }
 
 .mk-messaging-room {
-	position: relative;
-	overflow: auto;
-
 	> .body {
 		.more {
 			display: block;

From 5f0103dff16513f58b3659e2bee6474a93e04f2c Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sat, 8 Apr 2023 00:18:37 -0700
Subject: [PATCH 435/582] fix chat metadata

---
 .../src/pages/messaging/messaging-room.vue       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 442a90551..4e96235db 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -333,13 +333,6 @@ const headerTabs = $computed(() => []);
 
 onMounted(() => {
 	fetch();
-	definePageMetadata(
-		computed(() => ({
-			title: group != null ? group.name : user?.name,
-			icon: "ph-chats-teardrop ph-bold ph-lg",
-			avatar: group != null ? null : user,
-		}))
-	);
 });
 
 onBeforeUnmount(() => {
@@ -347,6 +340,15 @@ onBeforeUnmount(() => {
 	document.removeEventListener("visibilitychange", onVisibilitychange);
 	if (scrollRemove) scrollRemove();
 });
+
+await fetch();
+definePageMetadata(
+		computed(() => ({
+			title: group != null ? group.name : user?.name,
+			icon: "ph-chats-teardrop ph-bold ph-lg",
+			avatar: group != null ? null : user,
+		}))
+	);
 </script>
 
 <style lang="scss" scoped>

From c46325afc82b24aa9bce064ac5d9a706d90fedeb Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 8 Apr 2023 21:48:47 +0900
Subject: [PATCH 436/582] Update Chinese locale

---
 locales/zh-CN.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index ea9d6371f..e891e3d88 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1,5 +1,5 @@
 ---
-_lang_: "中文(简体)"
+_lang_: "简体中文"
 headlineMisskey: "通过帖子连接在一起的网络"
 introMisskey: "欢迎！Misskey是一个开源的、去中心化的“微博客”服务。\n通过编写「帖文」来和大家分享你的以及你周围的事情吧！📡\n通过「回应」功能，可以让你快速地对大家的帖文表达反馈👍\n来探索新的世界吧！🚀"
 monthAndDay: "{month}月 {day}日"

From f35a40a537cc84e72231b3d2807707257c75824c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 9 Apr 2023 20:28:29 -0700
Subject: [PATCH 437/582] docs: hyperlink foundkey commits

---
 CALCKEY.md | 57 +++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 937110afb..3ef2ee69e 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -132,32 +132,31 @@
 - [Add additional background for acrylic popups if backdrop-filter is unsupported](https://github.com/misskey-dev/misskey/pull/8671)
 - [Add parameters to MFM rotate](https://github.com/misskey-dev/misskey/pull/8549)
 - Many changes from [Foundkey](https://akkoma.dev/FoundKeyGang/Foundkey)
-	- 0ece67b04c3f0365057624c1068808276ccab981: refactor pages/auth.form.vue to composition API
-	- 0ece67b04c3f0365057624c1068808276ccab981: refactor pages/auth.form.vue to composition API
-	- 4bc9610d8bf5af736b5e89e4782395705de45d7d: remove unnecessary joins
-	- 9ee609d70082f7a6dc119a5d83c0e7c5e1208676: enhance privacy of notes
-	- 0fec6e10477b1c1b95d9469fbaf4e249a3722f12: remove ms dependency
-	- 46fff77accbe8bf0fd3cc88170d67b997bf2bdc3:  client uses new API for child notes depth
-	- c35372a20d22cddb75e93a0b407f2b652cd7faf0:  pack children without detail
-	- aca724e0bfff3e58b4d273f3ee744e3f3aa9c39b: enable to fetch replies recursively
-	- 2fe64c11502fd8d89c126558cd715e095c83754e: Refactor components/page/page.textarea.vue to composition API
-	- 6d3181f9835955e5b79bde5484c74bd70e7f9535: Refactor components/page/page.text.vue to composition API
-	- b630cd7eacd695bb705e6748c87f38425ec4ed45:  refactor: add NoteReactions.packMany
-	- 3fe351df6d4e21f7748c46adfa6ca165abd030c0: fix: catch errors from packing with detail
-	- 63591da33e233b2ed0ab331ae6bb3c9eff5020ae: refactor: colours in queue chart
-	- 0f6d94f1e7e1f58cfbf8d07e5f835f8de626842e: backend: improve mutes and blocks
-	- e2bf2715a6462ed377b033956d65260157f042ea: fix spelling error
-	- 09a7eabda137e77f81ab31f65d69329670693c8d: backend: fix lint "no-throw-literal"
-	- 4fbe2e065e75ed3e5b4dfdfd4be3baa03cc447c3: client: fix lint "quotes"
-	- 585e4f5c42cfafb6cdf7eb601ab435d6a4d85a96: fix textarea not updating properly
-	- 30d8bc9259cb6b72ed76d67b21dbb4cdceca8327: refactor: welcome.setup.vue to composition api
-	- 751921e24f37ed707fe44a40d88eebb1299efa35: make emoji picker case insensitive
-	- 298febeb9c9501e3e3df16982c08657d1da474e0: enhance: add re-collapsing to quoted notes
-	- b0fdedb264db87575063abed45e52ad71ce4a6af: fix lints in folder.vue
-	- 6fed87f85d132304eb84b0a59b84dce299a1822f: fix pagination.vue lints
-	- Tosti's security fixes
-	- 384e8c49b738f576ba8843296de6cebf01c1b247: server: allow to like own gallery posts
-	- 4c5aa9e53887cca5561fcec6ab0754e018f589a5: server: allow to like own pages
-	- 923c93da1228458dd65be47483c198a1a9191bcf: use await for notes.countBy
-	- ca90cedba0a0704b503c2778694230f5a7dfbace: server: reduce dead instance detection to 7 days
-	- e9ab42c10afb4e27516c2d2b5e3e06630efe9edd: Alt text in image viewer
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/0ece67b04c3f0365057624c1068808276ccab981: refactor pages/auth.form.vue to composition API
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/4bc9610d8bf5af736b5e89e4782395705de45d7d: remove unnecessary joins
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/9ee609d70082f7a6dc119a5d83c0e7c5e1208676: enhance privacy of notes
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/0fec6e10477b1c1b95d9469fbaf4e249a3722f12: remove ms dependency
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/46fff77accbe8bf0fd3cc88170d67b997bf2bdc3:  client uses new API for child notes depth
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/c35372a20d22cddb75e93a0b407f2b652cd7faf0:  pack children without detail
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/aca724e0bfff3e58b4d273f3ee744e3f3aa9c39b: enable to fetch replies recursively
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/2fe64c11502fd8d89c126558cd715e095c83754e: Refactor components/page/page.textarea.vue to composition API
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/6d3181f9835955e5b79bde5484c74bd70e7f9535: Refactor components/page/page.text.vue to composition API
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/b630cd7eacd695bb705e6748c87f38425ec4ed45:  refactor: add NoteReactions.packMany
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/3fe351df6d4e21f7748c46adfa6ca165abd030c0: fix: catch errors from packing with detail
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/63591da33e233b2ed0ab331ae6bb3c9eff5020ae: refactor: colours in queue chart
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/0f6d94f1e7e1f58cfbf8d07e5f835f8de626842e: backend: improve mutes and blocks
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/e2bf2715a6462ed377b033956d65260157f042ea: fix spelling error
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/09a7eabda137e77f81ab31f65d69329670693c8d: backend: fix lint "no-throw-literal"
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/4fbe2e065e75ed3e5b4dfdfd4be3baa03cc447c3: client: fix lint "quotes"
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/585e4f5c42cfafb6cdf7eb601ab435d6a4d85a96: fix textarea not updating properly
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/30d8bc9259cb6b72ed76d67b21dbb4cdceca8327: refactor: welcome.setup.vue to composition api
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/751921e24f37ed707fe44a40d88eebb1299efa35: make emoji picker case insensitive
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/298febeb9c9501e3e3df16982c08657d1da474e0: enhance: add re-collapsing to quoted notes
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/b0fdedb264db87575063abed45e52ad71ce4a6af: fix lints in folder.vue
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/6fed87f85d132304eb84b0a59b84dce299a1822f: fix pagination.vue lints
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/384e8c49b738f576ba8843296de6cebf01c1b247: server: allow to like own gallery posts
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/4c5aa9e53887cca5561fcec6ab0754e018f589a5: server: allow to like own pages
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/923c93da1228458dd65be47483c198a1a9191bcf: use await for notes.countBy
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/ca90cedba0a0704b503c2778694230f5a7dfbace: server: reduce dead instance detection to 7 days
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/e9ab42c10afb4e27516c2d2b5e3e06630efe9edd: Alt text in image viewer
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/ed9d4023d41bba7c4ac53a1a3422246feed37de2: add argon2 support

From 9abd49bc88970ee06a589d4b148b7eae80ec7aa7 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Mon, 10 Apr 2023 05:42:17 +0000
Subject: [PATCH 438/582] Partially disable search MFM (#9830)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Honestly, this workaround is pure garbage when this can be achieved by deleting a small piece of code from mfm-js, but this closes #9816 anyway 😅

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9830
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 packages/client/src/components/mfm.ts | 38 +++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index e7f27854f..ff8c7a863 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -50,7 +50,9 @@ export default defineComponent({
 	render() {
 		if (this.text == null || this.text === "") return;
 
-		const ast = (this.plain ? mfm.parseSimple : mfm.parse)(this.text, {
+		const isPlain = this.plain;
+
+		const ast = (isPlain ? mfm.parseSimple : mfm.parse)(this.text, {
 			fnNameList: MFM_TAGS,
 		});
 
@@ -61,7 +63,7 @@ export default defineComponent({
 
 		const genEl = (ast: mfm.MfmNode[]) =>
 			concat(
-				ast.map((token): VNode[] => {
+				ast.map((token, index): VNode[] => {
 					switch (token.type) {
 						case "text": {
 							const text = token.props.text.replace(/(\r\n|\n|\r)/g, "\n");
@@ -459,6 +461,38 @@ export default defineComponent({
 						}
 
 						case "search": {
+							// Disable "search" keyword
+							// (see the issue #9816 on Codeberg)
+							if (token.props.content.endsWith("search")) {
+								const sentinel = "#";
+								let ast2 = (isPlain ? mfm.parseSimple : mfm.parse)(
+									token.props.content.slice(0, -6) + sentinel,
+									{
+										fnNameList: MFM_TAGS,
+									},
+								);
+								if (
+									ast2[ast2.length - 1].type === "text" &&
+									ast2[ast2.length - 1].props.text.endsWith(sentinel)
+								) {
+									ast2[ast2.length - 1].props.text = ast2[
+										ast2.length - 1
+									].props.text.slice(0, -1);
+								}
+
+								let prefix = "\n";
+								if (
+									index === 0 ||
+									["blockCode", "mathBlock", "search", "quote"].includes(
+										ast[index - 1].type,
+									)
+								) {
+									prefix = "";
+								}
+
+								return [prefix, ...genEl(ast2), "search\n"];
+							}
+
 							return [
 								h(MkGoogle, {
 									key: Math.random(),

From 9b657111930cb236a43361c58d47ca2fddc3c961 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Apr 2023 10:03:25 -0700
Subject: [PATCH 439/582] feat: admin lookup files/instance

---
 packages/client/src/pages/admin/files.vue     | 34 ++-----------------
 packages/client/src/pages/admin/index.vue     |  6 ++--
 packages/client/src/scripts/lookup-file.ts    | 27 +++++++++++++++
 .../client/src/scripts/lookup-instance.ts     | 25 ++++++++++++++
 4 files changed, 58 insertions(+), 34 deletions(-)
 create mode 100644 packages/client/src/scripts/lookup-file.ts
 create mode 100644 packages/client/src/scripts/lookup-instance.ts

diff --git a/packages/client/src/pages/admin/files.vue b/packages/client/src/pages/admin/files.vue
index e752eb82c..e808ab65f 100644
--- a/packages/client/src/pages/admin/files.vue
+++ b/packages/client/src/pages/admin/files.vue
@@ -86,7 +86,7 @@ import MkButton from "@/components/MkButton.vue";
 import MkInput from "@/components/form/input.vue";
 import MkSelect from "@/components/form/select.vue";
 import MkFileListForAdmin from "@/components/MkFileListForAdmin.vue";
-import bytes from "@/filters/bytes";
+import { lookupFile } from "@/scripts/lookup-file";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
@@ -118,41 +118,11 @@ function clear() {
 	});
 }
 
-function show(file) {
-	os.pageWindow(`/admin/file/${file.id}`);
-}
-
-async function find() {
-	const { canceled, result: q } = await os.inputText({
-		title: i18n.ts.fileIdOrUrl,
-		allowEmpty: false,
-	});
-	if (canceled) return;
-
-	os.api(
-		"admin/drive/show-file",
-		q.startsWith("http://") || q.startsWith("https://")
-			? { url: q.trim() }
-			: { fileId: q.trim() }
-	)
-		.then((file) => {
-			show(file);
-		})
-		.catch((err) => {
-			if (err.code === "NO_SUCH_FILE") {
-				os.alert({
-					type: "error",
-					text: i18n.ts.notFound,
-				});
-			}
-		});
-}
-
 const headerActions = $computed(() => [
 	{
 		text: i18n.ts.lookup,
 		icon: "ph-magnifying-glass ph-bold ph-lg",
-		handler: find,
+		handler: lookupFile,
 	},
 	{
 		text: i18n.ts.clearCachedFiles,
diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 07dac9c6b..7e88b64ab 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -79,6 +79,8 @@ import { version } from "@/config";
 import { $i } from "@/account";
 import * as os from "@/os";
 import { lookupUser } from "@/scripts/lookup-user";
+import { lookupFile } from "@/scripts/lookup-file";
+import { lookupInstance } from "@/scripts/lookup-instance";
 import { defaultStore } from "@/store";
 import { useRouter } from "@/router";
 import {
@@ -371,14 +373,14 @@ const lookup = (ev) => {
 				text: i18n.ts.file,
 				icon: "ph-cloud ph-bold ph-lg",
 				action: () => {
-					alert("TODO");
+					lookupFile();
 				},
 			},
 			{
 				text: i18n.ts.instance,
 				icon: "ph-planet ph-bold ph-lg",
 				action: () => {
-					alert("TODO");
+					lookupInstance();
 				},
 			},
 		],
diff --git a/packages/client/src/scripts/lookup-file.ts b/packages/client/src/scripts/lookup-file.ts
new file mode 100644
index 000000000..a151e097f
--- /dev/null
+++ b/packages/client/src/scripts/lookup-file.ts
@@ -0,0 +1,27 @@
+import { i18n } from "@/i18n";
+import * as os from "@/os";
+
+export async function lookupFile() {
+	const { canceled, result: q } = await os.inputText({
+		title: i18n.ts.fileIdOrUrl,
+	});
+	if (canceled) return;
+
+	os.api(
+		"admin/drive/show-file",
+		q.startsWith("http://") || q.startsWith("https://")
+			? { url: q.trim() }
+			: { fileId: q.trim() },
+	)
+		.then((file) => {
+			os.pageWindow(`/admin/file/${file.id}`);
+		})
+		.catch((err) => {
+			if (err.code === "NO_SUCH_FILE") {
+				os.alert({
+					type: "error",
+					text: i18n.ts.notFound,
+				});
+			}
+		});
+}
diff --git a/packages/client/src/scripts/lookup-instance.ts b/packages/client/src/scripts/lookup-instance.ts
new file mode 100644
index 000000000..f3e92b02d
--- /dev/null
+++ b/packages/client/src/scripts/lookup-instance.ts
@@ -0,0 +1,25 @@
+import { i18n } from "@/i18n";
+import * as os from "@/os";
+
+export async function lookupInstance() {
+	const { canceled, result: q } = await os.inputText({
+		title: i18n.ts.instance,
+	});
+	if (canceled) return;
+
+	os.api(
+		"federation/show-instance",
+		q.startsWith("http://") || q.startsWith("https://")
+			? { url: q.trim() }
+			: { fileId: q.trim() },
+	)
+		.then((instance) => {
+			os.pageWindow(`/instance-info/${instance.host}`);
+		})
+		.catch(() => {
+			os.alert({
+				type: "error",
+				text: i18n.ts.notFound,
+			});
+		});
+}

From fce8b16144efdc56cc2bd3c48cc76fabfb46d2fb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Apr 2023 10:07:03 -0700
Subject: [PATCH 440/582] feat: index posts action

---
 packages/client/src/pages/admin/database.vue | 24 +------------------
 packages/client/src/pages/admin/index.vue    |  7 ++++++
 packages/client/src/scripts/index-posts.ts   | 25 ++++++++++++++++++++
 3 files changed, 33 insertions(+), 23 deletions(-)
 create mode 100644 packages/client/src/scripts/index-posts.ts

diff --git a/packages/client/src/pages/admin/database.vue b/packages/client/src/pages/admin/database.vue
index f665d3813..4154e9090 100644
--- a/packages/client/src/pages/admin/database.vue
+++ b/packages/client/src/pages/admin/database.vue
@@ -43,29 +43,7 @@ import bytes from "@/filters/bytes";
 import number from "@/filters/number";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
-
-async function indexPosts() {
-	const { canceled, result: index } = await os.inputText({
-		title: i18n.ts.indexFrom,
-	});
-	if (canceled) return;
-
-	if (index == null || index === "") {
-		await os.api("admin/search/index-all");
-		await os.alert({
-			type: "info",
-			text: i18n.ts.indexNotice,
-		});
-	} else {
-		await os.api("admin/search/index-all", {
-			cursor: index,
-		});
-		await os.alert({
-			type: "info",
-			text: i18n.ts.indexNotice,
-		});
-	}
-}
+import { indexPosts } from "@/scripts/index-posts";
 
 const databasePromiseFactory = () =>
 	os
diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 7e88b64ab..63e4e178f 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -81,6 +81,7 @@ import * as os from "@/os";
 import { lookupUser } from "@/scripts/lookup-user";
 import { lookupFile } from "@/scripts/lookup-file";
 import { lookupInstance } from "@/scripts/lookup-instance";
+import { indexPosts } from "@/scripts/index-posts";
 import { defaultStore } from "@/store";
 import { useRouter } from "@/router";
 import {
@@ -160,6 +161,12 @@ const menuDef = $computed(() => [
 						},
 				  ]
 				: []),
+				{
+					type: "button",
+					icon: "ph-list-magnifying-glass ph-bold ph-lg",
+					text: i18n.ts.indexPosts,
+					action: indexPosts,
+				},
 		],
 	},
 	{
diff --git a/packages/client/src/scripts/index-posts.ts b/packages/client/src/scripts/index-posts.ts
new file mode 100644
index 000000000..9817a8328
--- /dev/null
+++ b/packages/client/src/scripts/index-posts.ts
@@ -0,0 +1,25 @@
+import { i18n } from "@/i18n";
+import * as os from "@/os";
+
+export async function indexPosts() {
+	const { canceled, result: index } = await os.inputText({
+		title: i18n.ts.indexFrom,
+	});
+	if (canceled) return;
+
+	if (index == null || index === "") {
+		await os.api("admin/search/index-all");
+		await os.alert({
+			type: "info",
+			text: i18n.ts.indexNotice,
+		});
+	} else {
+		await os.api("admin/search/index-all", {
+			cursor: index,
+		});
+		await os.alert({
+			type: "info",
+			text: i18n.ts.indexNotice,
+		});
+	}
+}

From 53b21cd4558f8a8f9c0100c1da1a41066805ff5e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Apr 2023 10:12:17 -0700
Subject: [PATCH 441/582] feat: lookup post action

---
 locales/en-US.yml                         |  1 +
 packages/client/src/pages/admin/index.vue | 28 ++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index a1b998d8a..213452a51 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -963,6 +963,7 @@ indexNotice: "Now indexing. This will probably take a while, please don't restar
 customKaTeXMacro: "Custom KaTeX macros"
 customKaTeXMacroDescription: "Set up macros to write mathematical expressions easily! The notation conforms to the LaTeX command definitions and is written as \\newcommand{\\name}{content} or \\newcommand{\\name}[number of arguments]{content}. For example, \\newcommand{\\add}[2]{#1 + #2} will expand \\add{3}{foo} to 3 + foo. The curly brackets surrounding the macro name can be changed to round or square brackets. This affects the brackets used for arguments. One (and only one) macro can be defined per line, and you can't break the line in the middle of the definition. Invalid lines are simply ignored. Only simple string substitution functions are supported; advanced syntax, such as conditional branching, cannot be used here."
 enableCustomKaTeXMacro: "Enable custom KaTeX macros"
+noteId: "Post ID"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."
diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 63e4e178f..c0ac742b8 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -359,6 +359,32 @@ const invite = () => {
 		});
 };
 
+async function lookupNote() {
+	const { canceled, result: q } = await os.inputText({
+		title: i18n.ts.noteId,
+	});
+	if (canceled) return;
+
+	os.api(
+		"notes/show",
+		q.startsWith("http://") || q.startsWith("https://")
+			? { url: q.trim() }
+			: { noteId: q.trim() },
+	)
+		.then((note) => {
+			os.pageWindow(`/notes/${note.id}`);
+		})
+		.catch((err) => {
+			if (err.code === "NO_SUCH_NOTE") {
+				os.alert({
+					type: "error",
+					text: i18n.ts.notFound,
+				});
+			}
+		});
+}
+
+
 const lookup = (ev) => {
 	os.popupMenu(
 		[
@@ -373,7 +399,7 @@ const lookup = (ev) => {
 				text: i18n.ts.note,
 				icon: "ph-pencil ph-bold ph-lg",
 				action: () => {
-					alert("TODO");
+					lookupNote();
 				},
 			},
 			{

From c6b797317973451804c474319253374f89a15062 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Apr 2023 10:30:04 -0700
Subject: [PATCH 442/582] consistent locales

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

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 213452a51..fcc8ad081 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -165,7 +165,7 @@ removeWallpaper: "Remove wallpaper"
 searchWith: "Search: {q}"
 youHaveNoLists: "You don't have any lists"
 followConfirm: "Are you sure that you want to follow {name}?"
-proxyAccount: "Proxy account"
+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"
 selectUser: "Select a user"
@@ -957,7 +957,7 @@ moveFromDescription: "This will set an alias of your old account so that you can
 migrationConfirm: "Are you absolutely sure you want to migrate your acccount to {account}? Once you do this, you won't be able to reverse it, and you won't be able to use your account normally again.\nAlso, please ensure that you've set this current account as the account you're moving from."
 defaultReaction: "Default emoji reaction for outgoing and incoming posts"
 license: "License"
-indexPosts: "Index posts"
+indexPosts: "Index Posts"
 indexFrom: "Index from Post ID onwards (leave blank to index every post)"
 indexNotice: "Now indexing. This will probably take a while, please don't restart your server for at least an hour."
 customKaTeXMacro: "Custom KaTeX macros"

From 3b251e3a4615e5c6849346ad5ff002be482f6e53 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 11 Apr 2023 10:32:51 -0700
Subject: [PATCH 443/582] fix lookup instance

---
 packages/client/src/scripts/lookup-instance.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/client/src/scripts/lookup-instance.ts b/packages/client/src/scripts/lookup-instance.ts
index f3e92b02d..96b771c74 100644
--- a/packages/client/src/scripts/lookup-instance.ts
+++ b/packages/client/src/scripts/lookup-instance.ts
@@ -9,9 +9,7 @@ export async function lookupInstance() {
 
 	os.api(
 		"federation/show-instance",
-		q.startsWith("http://") || q.startsWith("https://")
-			? { url: q.trim() }
-			: { fileId: q.trim() },
+		q.startsWith("http://") || q.startsWith("https://") ? { host: q.replace("https://", "") } : { host: q }
 	)
 		.then((instance) => {
 			os.pageWindow(`/instance-info/${instance.host}`);

From e0b2bf846a746ac72a4ebd2178637c3f918586ca Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 12 Apr 2023 03:52:22 +0900
Subject: [PATCH 444/582] Hyperlink more remote commits

---
 CALCKEY.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CALCKEY.md b/CALCKEY.md
index 3ef2ee69e..923cbe680 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -111,6 +111,9 @@
 - New dashboard
 - Backfill follower counts
 - Improved emoji licensing
+  - This feature was ported from Misskey.
+    - https://github.com/misskey-dev/misskey/commit/8ae9d2eaa8b0842671558370f787902e94b7f5a3: enhance: カスタム絵文字にライセンス情報を付与できるように
+    - https://github.com/misskey-dev/misskey/commit/ed51209172441927d24339f0759a5badbee3c9b6: 絵文字のライセンスを表示できるように
 - Compile time compression
 - Sonic search
 - Popular color schemes, including Nord, Gruvbox, and Catppuccin
@@ -160,3 +163,4 @@
 	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/ca90cedba0a0704b503c2778694230f5a7dfbace: server: reduce dead instance detection to 7 days
 	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/e9ab42c10afb4e27516c2d2b5e3e06630efe9edd: Alt text in image viewer
 	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/ed9d4023d41bba7c4ac53a1a3422246feed37de2: add argon2 support
+	- https://akkoma.dev/FoundKeyGang/FoundKey/commit/c414f24a2c123774246c7eca65edda4d3afaf8b3: feat: per-user renote muting

From 58b39506802010dcda898ea1caae653700b781d2 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 12 Apr 2023 15:52:46 +0900
Subject: [PATCH 445/582] Allow to mute my own boosts

---
 .../src/server/api/endpoints/renote-mute/create.ts    | 11 -----------
 .../src/server/api/endpoints/renote-mute/delete.ts    | 11 -----------
 packages/client/src/scripts/get-user-menu.ts          | 10 +++++-----
 3 files changed, 5 insertions(+), 27 deletions(-)

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 82db79cc6..857cbd975 100644
--- a/packages/backend/src/server/api/endpoints/renote-mute/create.ts
+++ b/packages/backend/src/server/api/endpoints/renote-mute/create.ts
@@ -19,12 +19,6 @@ export const meta = {
 			id: "6fef56f3-e765-4957-88e5-c6f65329b8a5",
 		},
 
-		muteeIsYourself: {
-			message: "Mutee is yourself.",
-			code: "MUTEE_IS_YOURSELF",
-			id: "a4619cb2-5f23-484b-9301-94c903074e10",
-		},
-
 		alreadyMuting: {
 			message: "You are already muting that user.",
 			code: "ALREADY_MUTING",
@@ -45,11 +39,6 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, user) => {
 	const muter = user;
 
-	// 自分自身
-	if (user.id === ps.userId) {
-		throw new ApiError(meta.errors.muteeIsYourself);
-	}
-
 	// Get mutee
 	const mutee = await getUser(ps.userId).catch((e) => {
 		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff")
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 4fd500d7c..fb4c972af 100644
--- a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts
+++ b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts
@@ -17,12 +17,6 @@ export const meta = {
 			id: "b851d00b-8ab1-4a56-8b1b-e24187cb48ef",
 		},
 
-		muteeIsYourself: {
-			message: "Mutee is yourself.",
-			code: "MUTEE_IS_YOURSELF",
-			id: "f428b029-6b39-4d48-a1d2-cc1ae6dd5cf9",
-		},
-
 		notMuting: {
 			message: "You are not muting that user.",
 			code: "NOT_MUTING",
@@ -43,11 +37,6 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, user) => {
 	const muter = user;
 
-	// Check if the mutee is yourself
-	if (user.id === ps.userId) {
-		throw new ApiError(meta.errors.muteeIsYourself);
-	}
-
 	// Get mutee
 	const mutee = await getUser(ps.userId).catch((e) => {
 		if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff")
diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts
index fd1ce0820..d55c3374f 100644
--- a/packages/client/src/scripts/get-user-menu.ts
+++ b/packages/client/src/scripts/get-user-menu.ts
@@ -267,11 +267,6 @@ export function getUserMenu(user, router: Router = mainRouter) {
 					action: inviteGroup,
 			  }
 			: undefined,
-	] as any;
-
-	if ($i && meId !== user.id) {
-		menu = menu.concat([
-			null,
 			{
 				icon: user.isRenoteMuted
 					? "ph-eye ph-bold ph-lg"
@@ -279,6 +274,11 @@ export function getUserMenu(user, router: Router = mainRouter) {
 				text: user.isRenoteMuted ? i18n.ts.renoteUnmute : i18n.ts.renoteMute,
 				action: toggleRenoteMute,
 			},
+	] as any;
+
+	if ($i && meId !== user.id) {
+		menu = menu.concat([
+			null,
 			{
 				icon: user.isMuted
 					? "ph-eye ph-bold ph-lg"

From 845285fad6f0d8d6d8a3e73fe46824a42eb72d21 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 12 Apr 2023 20:24:54 +0900
Subject: [PATCH 446/582] correct position

---
 packages/client/src/scripts/get-user-menu.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts
index d55c3374f..2ea72c998 100644
--- a/packages/client/src/scripts/get-user-menu.ts
+++ b/packages/client/src/scripts/get-user-menu.ts
@@ -267,18 +267,18 @@ export function getUserMenu(user, router: Router = mainRouter) {
 					action: inviteGroup,
 			  }
 			: undefined,
-			{
-				icon: user.isRenoteMuted
-					? "ph-eye ph-bold ph-lg"
-					: "ph-eye-slash ph-bold ph-lg",
-				text: user.isRenoteMuted ? i18n.ts.renoteUnmute : i18n.ts.renoteMute,
-				action: toggleRenoteMute,
-			},
+		null,
+		{
+			icon: user.isRenoteMuted
+				? "ph-eye ph-bold ph-lg"
+				: "ph-eye-slash ph-bold ph-lg",
+			text: user.isRenoteMuted ? i18n.ts.renoteUnmute : i18n.ts.renoteMute,
+			action: toggleRenoteMute,
+		},
 	] as any;
 
 	if ($i && meId !== user.id) {
 		menu = menu.concat([
-			null,
 			{
 				icon: user.isMuted
 					? "ph-eye ph-bold ph-lg"

From a52fdea655777361d69f31ec7523a44d3f0bda79 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Apr 2023 14:19:43 -0700
Subject: [PATCH 447/582] chore: up pnpm

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

diff --git a/package.json b/package.json
index 3a324fa0b..d777d2071 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@8.1.1",
+	"packageManager": "pnpm@8.2.0",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",

From b62549cf69b7b92119f4e40bae11744736d1c8f0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Apr 2023 17:19:14 -0700
Subject: [PATCH 448/582] chore: formatting

---
 packages/client/package.json                  |   2 +-
 packages/client/src/pages/admin/index.vue     |  15 +-
 .../src/pages/messaging/messaging-room.vue    | 172 +++++++++---------
 .../client/src/scripts/lookup-instance.ts     |   4 +-
 pnpm-lock.yaml                                |  76 ++++----
 5 files changed, 140 insertions(+), 129 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 24af5b143..49c175b15 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -53,7 +53,7 @@
 		"json5": "2.2.3",
 		"katex": "0.16.4",
 		"matter-js": "0.18.0",
-		"mfm-js": "0.23.2",
+		"mfm-js": "0.23.3",
 		"photoswipe": "5.3.4",
 		"prettier": "2.8.7",
 		"prettier-plugin-vue": "1.1.6",
diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index c0ac742b8..77c90aeee 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -161,12 +161,12 @@ const menuDef = $computed(() => [
 						},
 				  ]
 				: []),
-				{
-					type: "button",
-					icon: "ph-list-magnifying-glass ph-bold ph-lg",
-					text: i18n.ts.indexPosts,
-					action: indexPosts,
-				},
+			{
+				type: "button",
+				icon: "ph-list-magnifying-glass ph-bold ph-lg",
+				text: i18n.ts.indexPosts,
+				action: indexPosts,
+			},
 		],
 	},
 	{
@@ -369,7 +369,7 @@ async function lookupNote() {
 		"notes/show",
 		q.startsWith("http://") || q.startsWith("https://")
 			? { url: q.trim() }
-			: { noteId: q.trim() },
+			: { noteId: q.trim() }
 	)
 		.then((note) => {
 			os.pageWindow(`/notes/${note.id}`);
@@ -384,7 +384,6 @@ async function lookupNote() {
 		});
 }
 
-
 const lookup = (ev) => {
 	os.popupMenu(
 		[
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 4e96235db..34361ba75 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -6,87 +6,87 @@
 				:tabs="headerTabs"
 				:display-back-button="true"
 		/></template>
-			<MkSpacer :content-max="800" class="mk-messaging-room">
-				<div class="body">
-					<MkPagination
-						v-if="pagination"
-						ref="pagingComponent"
-						:key="userAcct || groupId"
-						:pagination="pagination"
-					>
-						<template #empty>
-							<div class="_fullinfo">
-								<img
-									src="/static-assets/badges/info.png"
-									class="_ghost"
-									alt="Info"
-								/>
-								<div>{{ i18n.ts.noMessagesYet }}</div>
-							</div>
-						</template>
-						<template
-							#default="{ items: messages, fetching: pFetching }"
-						>
-							<XList
-								v-if="messages.length > 0"
-								v-slot="{ item: message }"
-								:class="{
-									messages: true,
-									'deny-move-transition': pFetching,
-								}"
-								:items="messages"
-								direction="up"
-								reversed
-							>
-								<XMessage
-									:key="message.id"
-									:message="message"
-									:is-group="group != null"
-								/>
-							</XList>
-						</template>
-					</MkPagination>
-				</div>
-				<footer>
-					<div v-if="typers.length > 0" class="typers">
-						<I18n
-							:src="i18n.ts.typingUsers"
-							text-tag="span"
-							class="users"
-						>
-							<template #users>
-								<b
-									v-for="typer in typers"
-									:key="typer.id"
-									class="user"
-									>{{ typer.username }}</b
-								>
-							</template>
-						</I18n>
-						<MkEllipsis />
-					</div>
-					<transition :name="animation ? 'fade' : ''">
-						<div v-show="showIndicator" class="new-message">
-							<button
-								class="_buttonPrimary"
-								@click="onIndicatorClick"
-							>
-								<i
-									class="fas ph-fw ph-lg ph-arrow-circle-down ph-bold ph-lg"
-								></i
-								>{{ i18n.ts.newMessageExists }}
-							</button>
+		<MkSpacer :content-max="800" class="mk-messaging-room">
+			<div class="body">
+				<MkPagination
+					v-if="pagination"
+					ref="pagingComponent"
+					:key="userAcct || groupId"
+					:pagination="pagination"
+				>
+					<template #empty>
+						<div class="_fullinfo">
+							<img
+								src="/static-assets/badges/info.png"
+								class="_ghost"
+								alt="Info"
+							/>
+							<div>{{ i18n.ts.noMessagesYet }}</div>
 						</div>
-					</transition>
-					<XForm
-						v-if="!fetching"
-						ref="formEl"
-						:user="user"
-						:group="group"
-						class="form"
-					/>
-				</footer>
-			</MkSpacer>
+					</template>
+					<template
+						#default="{ items: messages, fetching: pFetching }"
+					>
+						<XList
+							v-if="messages.length > 0"
+							v-slot="{ item: message }"
+							:class="{
+								messages: true,
+								'deny-move-transition': pFetching,
+							}"
+							:items="messages"
+							direction="up"
+							reversed
+						>
+							<XMessage
+								:key="message.id"
+								:message="message"
+								:is-group="group != null"
+							/>
+						</XList>
+					</template>
+				</MkPagination>
+			</div>
+			<footer>
+				<div v-if="typers.length > 0" class="typers">
+					<I18n
+						:src="i18n.ts.typingUsers"
+						text-tag="span"
+						class="users"
+					>
+						<template #users>
+							<b
+								v-for="typer in typers"
+								:key="typer.id"
+								class="user"
+								>{{ typer.username }}</b
+							>
+						</template>
+					</I18n>
+					<MkEllipsis />
+				</div>
+				<transition :name="animation ? 'fade' : ''">
+					<div v-show="showIndicator" class="new-message">
+						<button
+							class="_buttonPrimary"
+							@click="onIndicatorClick"
+						>
+							<i
+								class="fas ph-fw ph-lg ph-arrow-circle-down ph-bold ph-lg"
+							></i
+							>{{ i18n.ts.newMessageExists }}
+						</button>
+					</div>
+				</transition>
+				<XForm
+					v-if="!fetching"
+					ref="formEl"
+					:user="user"
+					:group="group"
+					class="form"
+				/>
+			</footer>
+		</MkSpacer>
 	</MkStickyContainer>
 </template>
 
@@ -343,12 +343,12 @@ onBeforeUnmount(() => {
 
 await fetch();
 definePageMetadata(
-		computed(() => ({
-			title: group != null ? group.name : user?.name,
-			icon: "ph-chats-teardrop ph-bold ph-lg",
-			avatar: group != null ? null : user,
-		}))
-	);
+	computed(() => ({
+		title: group != null ? group.name : user?.name,
+		icon: "ph-chats-teardrop ph-bold ph-lg",
+		avatar: group != null ? null : user,
+	}))
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/scripts/lookup-instance.ts b/packages/client/src/scripts/lookup-instance.ts
index 96b771c74..18f87b6da 100644
--- a/packages/client/src/scripts/lookup-instance.ts
+++ b/packages/client/src/scripts/lookup-instance.ts
@@ -9,7 +9,9 @@ export async function lookupInstance() {
 
 	os.api(
 		"federation/show-instance",
-		q.startsWith("http://") || q.startsWith("https://") ? { host: q.replace("https://", "") } : { host: q }
+		q.startsWith("http://") || q.startsWith("https://")
+			? { host: q.replace("https://", "") }
+			: { host: q },
 	)
 		.then((instance) => {
 			os.pageWindow(`/instance-info/${instance.host}`);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dad391189..97412f122 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -783,8 +783,8 @@ importers:
         specifier: 0.18.0
         version: 0.18.0
       mfm-js:
-        specifier: 0.23.2
-        version: 0.23.2
+        specifier: 0.23.3
+        version: 0.23.3
       photoswipe:
         specifier: 5.3.4
         version: 5.3.4
@@ -1890,7 +1890,7 @@ packages:
       chalk: 4.1.2
       emittery: 0.8.1
       exit: 0.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-changed-files: 27.5.1
       jest-config: 27.5.1(ts-node@10.4.0)
       jest-haste-map: 27.5.1
@@ -1966,7 +1966,7 @@ packages:
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       istanbul-lib-coverage: 3.2.0
       istanbul-lib-instrument: 5.2.1
       istanbul-lib-report: 3.0.0
@@ -1990,7 +1990,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       callsites: 3.1.0
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       source-map: 0.6.1
     dev: true
 
@@ -2009,7 +2009,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/test-result': 27.5.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-haste-map: 27.5.1
       jest-runtime: 27.5.1
     transitivePeerDependencies:
@@ -2026,7 +2026,7 @@ packages:
       chalk: 4.1.2
       convert-source-map: 1.9.0
       fast-json-stable-stringify: 2.1.0
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-haste-map: 27.5.1
       jest-regex-util: 27.5.1
       jest-util: 27.5.1
@@ -4297,7 +4297,7 @@ packages:
     engines: {node: '>= 6'}
     dependencies:
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       lazystream: 1.0.1
       lodash.defaults: 4.2.0
       lodash.difference: 4.5.0
@@ -4640,7 +4640,7 @@ packages:
       babel-plugin-istanbul: 6.1.1
       babel-preset-jest: 27.5.1(@babel/core@7.21.4)
       chalk: 4.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       slash: 3.0.0
     transitivePeerDependencies:
       - supports-color
@@ -5977,8 +5977,8 @@ packages:
     requiresBuild: true
     dev: false
 
-  /core-js@3.29.0:
-    resolution: {integrity: sha512-VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg==}
+  /core-js@3.30.0:
+    resolution: {integrity: sha512-hQotSSARoNh1mYPi9O2YaWeiq/cEB95kOrFb4NCrO4RIFt1qqNpKsaE+vy/L3oiqvND5cThqXzUU3r9F7Efztg==}
     requiresBuild: true
     dev: true
 
@@ -6394,7 +6394,7 @@ packages:
       decompress-tarbz2: 4.1.1
       decompress-targz: 4.1.1
       decompress-unzip: 4.0.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       make-dir: 1.3.0
       pify: 2.3.0
       strip-dirs: 2.1.0
@@ -7744,7 +7744,7 @@ packages:
     resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
     engines: {node: '>=12'}
     dependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jsonfile: 6.1.0
       universalify: 2.0.0
     dev: true
@@ -7753,7 +7753,7 @@ packages:
     resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
     engines: {node: '>=6 <7 || >=8'}
     dependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jsonfile: 4.0.0
       universalify: 0.1.2
     dev: true
@@ -7794,7 +7794,7 @@ packages:
     resolution: {integrity: sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==}
     engines: {node: '>= 0.10'}
     dependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       through2: 2.0.5
     dev: true
 
@@ -8194,6 +8194,9 @@ packages:
   /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
+  /graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
   /grapheme-splitter@1.0.4:
     resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
 
@@ -9319,7 +9322,7 @@ packages:
       '@jest/types': 27.5.1
       chalk: 4.1.2
       exit: 0.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       import-local: 3.1.0
       jest-config: 27.5.1(ts-node@10.4.0)
       jest-util: 27.5.1
@@ -9351,7 +9354,7 @@ packages:
       ci-info: 3.7.1
       deepmerge: 4.2.2
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-circus: 27.5.1
       jest-environment-jsdom: 27.5.1
       jest-environment-node: 27.5.1
@@ -9456,7 +9459,7 @@ packages:
       '@types/node': 18.11.18
       anymatch: 3.1.3
       fb-watchman: 2.0.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-regex-util: 27.5.1
       jest-serializer: 27.5.1
       jest-util: 27.5.1
@@ -9518,7 +9521,7 @@ packages:
       '@jest/types': 27.5.1
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       micromatch: 4.0.5
       pretty-format: 27.5.1
       slash: 3.0.0
@@ -9567,7 +9570,7 @@ packages:
     dependencies:
       '@jest/types': 27.5.1
       chalk: 4.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-haste-map: 27.5.1
       jest-pnp-resolver: 1.2.3(jest-resolve@27.5.1)
       jest-util: 27.5.1
@@ -9589,7 +9592,7 @@ packages:
       '@types/node': 18.11.18
       chalk: 4.1.2
       emittery: 0.8.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-docblock: 27.5.1
       jest-environment-jsdom: 27.5.1
       jest-environment-node: 27.5.1
@@ -9625,7 +9628,7 @@ packages:
       collect-v8-coverage: 1.0.1
       execa: 5.1.1
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-haste-map: 27.5.1
       jest-message-util: 27.5.1
       jest-mock: 27.5.1
@@ -9644,7 +9647,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@types/node': 18.11.18
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
     dev: true
 
   /jest-snapshot@27.5.1:
@@ -9663,7 +9666,7 @@ packages:
       babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.4)
       chalk: 4.1.2
       expect: 27.5.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-diff: 27.5.1
       jest-get-type: 27.5.1
       jest-haste-map: 27.5.1
@@ -9685,7 +9688,7 @@ packages:
       '@types/node': 18.11.18
       chalk: 4.1.2
       ci-info: 3.7.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       picomatch: 2.3.1
     dev: true
 
@@ -9979,21 +9982,21 @@ packages:
   /jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
     optionalDependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
 
   /jsonfile@5.0.0:
     resolution: {integrity: sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==}
     dependencies:
       universalify: 0.1.2
     optionalDependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
 
   /jsonfile@6.1.0:
     resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
     dependencies:
       universalify: 2.0.0
     optionalDependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
     dev: true
 
   /jsonld@6.0.0:
@@ -10464,7 +10467,7 @@ packages:
     resolution: {integrity: sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       parse-json: 2.2.0
       pify: 2.3.0
       pinkie-promise: 2.0.1
@@ -10809,6 +10812,13 @@ packages:
     resolution: {integrity: sha512-lfYvsMr6FIYbt0ZDL+nY+GWWqmcXpe9jrYLBLy5vvQHwGfPALpx43uNHj8hZsakgM82hPMo/zdx0e9tj+4Z4IA==}
     dependencies:
       twemoji-parser: 14.0.0
+    dev: false
+
+  /mfm-js@0.23.3:
+    resolution: {integrity: sha512-o8scYmbey6rMUmWAlT3k3ntt6khaCLdxlmHhAWV5wTTMj2OK1atQvZfRUq0SIVm1Jig08qlZg/ps71xUqrScNA==}
+    dependencies:
+      twemoji-parser: 14.0.0
+    dev: true
 
   /micromatch@3.1.10:
     resolution: {integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==}
@@ -11296,7 +11306,7 @@ packages:
     dependencies:
       env-paths: 2.2.1
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       make-fetch-happen: 10.2.1
       nopt: 6.0.0
       npmlog: 6.0.2
@@ -11909,7 +11919,7 @@ packages:
     resolution: {integrity: sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       pify: 2.3.0
       pinkie-promise: 2.0.1
     dev: true
@@ -15118,7 +15128,7 @@ packages:
     dependencies:
       append-buffer: 1.0.2
       convert-source-map: 1.9.0
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       normalize-path: 2.1.1
       now-and-later: 2.0.1
       remove-bom-buffer: 3.0.0
@@ -15857,7 +15867,7 @@ packages:
     name: plyr
     version: 3.7.0
     dependencies:
-      core-js: 3.29.0
+      core-js: 3.30.0
       custom-event-polyfill: 1.0.7
       loadjs: 4.2.0
       rangetouch: 2.0.1

From 9751de98209075cdee482257487f5713065a8080 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Thu, 13 Apr 2023 00:33:53 +0000
Subject: [PATCH 449/582] chore: update mfm-js version (#9844)

This resolves #9757.

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9844
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 packages/client/src/components/mfm.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index ff8c7a863..169fc7cfe 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -52,9 +52,7 @@ export default defineComponent({
 
 		const isPlain = this.plain;
 
-		const ast = (isPlain ? mfm.parseSimple : mfm.parse)(this.text, {
-			fnNameList: MFM_TAGS,
-		});
+		const ast = (isPlain ? mfm.parseSimple : mfm.parse)(this.text);
 
 		const validTime = (t: string | null | undefined) => {
 			if (t == null) return null;
@@ -467,9 +465,6 @@ export default defineComponent({
 								const sentinel = "#";
 								let ast2 = (isPlain ? mfm.parseSimple : mfm.parse)(
 									token.props.content.slice(0, -6) + sentinel,
-									{
-										fnNameList: MFM_TAGS,
-									},
 								);
 								if (
 									ast2[ast2.length - 1].type === "text" &&

From c750e059857eb5de6b03906e6c9c4acabc4b56b9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Apr 2023 17:34:51 -0700
Subject: [PATCH 450/582] dev35

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

diff --git a/package.json b/package.json
index d777d2071..433582f08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev33",
+	"version": "13.2.0-dev35",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 53001293573be330784598b7873f201f05c7d1e6 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 13 Apr 2023 11:58:42 +0900
Subject: [PATCH 451/582] Change boost button labels

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

diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index e2968f796..77f597e83 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -104,7 +104,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 
 	if (["public", "home"].includes(props.note.visibility)) {
 		buttonActions.push({
-			text: i18n.ts.renoteAsUnlisted,
+			text: `${i18n.ts.renote} (${i18n.ts._visibility.home})`,
 			icons: ["ph-repeat ph-bold ph-lg", "ph-house ph-bold ph-lg"],
 			danger: false,
 			action: () => {
@@ -130,7 +130,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 
 	if (props.note.visibility === "specified") {
 		buttonActions.push({
-			text: i18n.ts.renoteToRecipients,
+			text: `${i18n.ts.renote} (${i18n.ts.recipient})`,
 			icons: [
 				"ph-repeat ph-bold ph-lg",
 				"ph-envelope-simple-open ph-bold ph-lg",
@@ -158,7 +158,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 		});
 	} else {
 		buttonActions.push({
-			text: i18n.ts.renoteToFollowers,
+			text: `${i18n.ts.renote} (${i18n.ts._visibility.followers})`,
 			icons: [
 				"ph-repeat ph-bold ph-lg",
 				"ph-lock-simple-open ph-bold ph-lg",

From 6523d597b273161025c34fff827d8acff9a69ac5 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 13 Apr 2023 11:58:57 +0900
Subject: [PATCH 452/582] Update locale

---
 locales/en-US.yml | 3 ---
 locales/ja-JP.yml | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index fcc8ad081..d67e3b362 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -97,9 +97,6 @@ unfollow: "Unfollow"
 followRequestPending: "Follow request pending"
 enterEmoji: "Enter an emoji"
 renote: "Boost"
-renoteAsUnlisted: "Boost (Unlisted)"
-renoteToFollowers: "Boost (Followers)"
-renoteToRecipients: "Boost (Recipients)"
 unrenote: "Take back boost"
 renoted: "Boosted."
 cantRenote: "This post can't be boosted."
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 0f1c700fd..2e6795a78 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -97,9 +97,6 @@ unfollow: "フォロー解除"
 followRequestPending: "フォロー許可待ち"
 enterEmoji: "絵文字を入力"
 renote: "ブースト"
-renoteAsUnlisted: "未収載でブースト"
-renoteToFollowers: "フォロワー限定でブースト"
-renoteToRecipients: "宛先のユーザーにブースト"
 unrenote: "ブースト解除"
 renoted: "ブーストしました。"
 cantRenote: "この投稿はブーストできません。"

From 224fdf4dc592e89e6960a5a40e78f185a1857088 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 13 Apr 2023 09:43:13 -0700
Subject: [PATCH 453/582] chore: up swc

---
 packages/backend/package.json |   4 +-
 packages/sw/package.json      |   4 +-
 pnpm-lock.yaml                | 727 ++++++----------------------------
 3 files changed, 133 insertions(+), 602 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 9139d24ee..a03d6d35b 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -133,8 +133,8 @@
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
-		"@swc/cli": "^0.1.59",
-		"@swc/core": "^1.3.26",
+		"@swc/cli": "^0.1.62",
+		"@swc/core": "^1.3.50",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.15.9",
 		"@types/cbor": "6.0.0",
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 2c41a95b5..112005ba7 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -10,8 +10,8 @@
 
 	},
 	"devDependencies": {
-		"@swc/cli": "^0.1.59",
-		"@swc/core": "^1.3.26",
+		"@swc/cli": "^0.1.62",
+		"@swc/core": "^1.3.50",
 		"@swc/core-android-arm64": "1.3.11",
 		"calckey-js": "workspace:*",
 		"idb-keyval": "^6.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 97412f122..410801dde 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -404,11 +404,11 @@ importers:
         version: 3.21.1(seedrandom@3.0.5)
     devDependencies:
       '@swc/cli':
-        specifier: ^0.1.59
-        version: 0.1.59(@swc/core@1.3.26)(chokidar@3.5.3)
+        specifier: ^0.1.62
+        version: 0.1.62(@swc/core@1.3.50)(chokidar@3.5.3)
       '@swc/core':
-        specifier: ^1.3.26
-        version: 1.3.26
+        specifier: ^1.3.50
+        version: 1.3.50
       '@types/bcryptjs':
         specifier: 2.4.2
         version: 2.4.2
@@ -567,13 +567,13 @@ importers:
         version: 2.0.0
       swc-loader:
         specifier: ^0.2.3
-        version: 0.2.3(@swc/core@1.3.26)(webpack@5.75.0)
+        version: 0.2.3(@swc/core@1.3.50)(webpack@5.75.0)
       ts-loader:
         specifier: 9.4.2
         version: 9.4.2(typescript@4.9.4)(webpack@5.75.0)
       ts-node:
         specifier: 10.9.1
-        version: 10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4)
+        version: 10.9.1(@swc/core@1.3.50)(@types/node@18.11.18)(typescript@4.9.4)
       tsconfig-paths:
         specifier: 4.1.2
         version: 4.1.2
@@ -582,7 +582,7 @@ importers:
         version: 4.9.4
       webpack:
         specifier: ^5.75.0
-        version: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+        version: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
       ws:
         specifier: 8.11.0
         version: 8.11.0
@@ -888,11 +888,11 @@ importers:
   packages/sw:
     devDependencies:
       '@swc/cli':
-        specifier: ^0.1.59
-        version: 0.1.59(@swc/core@1.3.26)(chokidar@3.5.3)
+        specifier: ^0.1.62
+        version: 0.1.62(@swc/core@1.3.50)(chokidar@3.5.3)
       '@swc/core':
-        specifier: ^1.3.26
-        version: 1.3.26
+        specifier: ^1.3.50
+        version: 1.3.50
       '@swc/core-android-arm64':
         specifier: 1.3.11
         version: 1.3.11
@@ -904,10 +904,10 @@ importers:
         version: 6.2.0
       swc-loader:
         specifier: ^0.2.3
-        version: 0.2.3(@swc/core@1.3.26)(webpack@5.75.0)
+        version: 0.2.3(@swc/core@1.3.50)(webpack@5.75.0)
       webpack:
         specifier: ^5.75.0
-        version: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+        version: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
       webpack-cli:
         specifier: ^5.0.1
         version: 5.0.1(webpack@5.75.0)
@@ -2221,6 +2221,20 @@ packages:
     resolution: {integrity: sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==}
     dev: true
 
+  /@mole-inc/bin-wrapper@8.0.1:
+    resolution: {integrity: sha512-sTGoeZnjI8N4KS+sW2AN95gDBErhAguvkw/tWdCjeM8bvxpz5lqrnd0vOJABA1A+Ic3zED7PYoLP/RANLgVotA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      bin-check: 4.1.0
+      bin-version-check: 5.0.0
+      content-disposition: 0.5.4
+      ext-name: 5.0.0
+      file-type: 17.1.6
+      filenamify: 5.1.1
+      got: 11.8.5
+      os-filter-obj: 2.0.0
+    dev: true
+
   /@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0:
     resolution: {integrity: sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==}
     cpu: [arm64]
@@ -2553,15 +2567,9 @@ packages:
     resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==}
     dev: true
 
-  /@sindresorhus/is@0.7.0:
-    resolution: {integrity: sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==}
-    engines: {node: '>=4'}
-    dev: true
-
   /@sindresorhus/is@4.6.0:
     resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
     engines: {node: '>=10'}
-    dev: false
 
   /@sindresorhus/is@5.3.0:
     resolution: {integrity: sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==}
@@ -2589,8 +2597,8 @@ packages:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@swc/cli@0.1.59(@swc/core@1.3.26)(chokidar@3.5.3):
-    resolution: {integrity: sha512-BlX3wIxYTwdtR22dIqZ3FEIOJPqnlByAp4JY46OMZi2UXMB3ZbOzefawD2ZlLafRUWyy5NtiZZty5waKzaYRnA==}
+  /@swc/cli@0.1.62(@swc/core@1.3.50)(chokidar@3.5.3):
+    resolution: {integrity: sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==}
     engines: {node: '>= 12.13'}
     hasBin: true
     peerDependencies:
@@ -2600,8 +2608,8 @@ packages:
       chokidar:
         optional: true
     dependencies:
-      '@swc/core': 1.3.26
-      bin-wrapper: 4.1.0
+      '@mole-inc/bin-wrapper': 8.0.1
+      '@swc/core': 1.3.50
       chokidar: 3.5.3
       commander: 7.2.0
       fast-glob: 3.2.12
@@ -2619,101 +2627,106 @@ packages:
     dependencies:
       '@swc/wasm': 1.2.130
 
-  /@swc/core-darwin-arm64@1.3.26:
-    resolution: {integrity: sha512-FWWflBfKRYrUJtko2xiedC5XCa31O75IZZqnTWuLpe9g3C5tnUuF3M8LSXZS/dn6wprome1MhtG9GMPkSYkhkg==}
+  /@swc/core-darwin-arm64@1.3.50:
+    resolution: {integrity: sha512-riJGLORCFOMeUccEV0hzua0iyJFks7kef+5GfcmC93SLno+LHFDnaJ4mKVXcCAmQ7GYhVTPJs9gSHIW2fO5anQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@swc/core-darwin-x64@1.3.26:
-    resolution: {integrity: sha512-0uQeebAtsewqJ2b35aPZstGrylwd6oJjUyAJOfVJNbremFSJ5JzytB3NoDCIw7CT5UQrSRpvD3mU95gfdQjDGA==}
+  /@swc/core-darwin-x64@1.3.50:
+    resolution: {integrity: sha512-XaAhpeUoAK8tOUYSXH/v35yEjIoSP6ClGV/EaqBmDuCzAPue6uJMlIAW+nTmdtqVm5ZNZy2cKtP4ZHhVlfl7xw==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm-gnueabihf@1.3.26:
-    resolution: {integrity: sha512-06T+LbVFlyciQtwrUB5/a16A1ju1jFoYvd/hq9TWhf7GrtL43U7oJIgqMOPHx2j0+Ps2R3S6R/UUN5YXu618zA==}
+  /@swc/core-linux-arm-gnueabihf@1.3.50:
+    resolution: {integrity: sha512-8hDtXs0T5biMtA3I21JQG1uxL+Hb/D2t0NZENuajVK5Vky3GXmf+ICVeQzwGzSXiyftaDgyNAvBidbKPBlNEtw==}
     engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm64-gnu@1.3.26:
-    resolution: {integrity: sha512-2NT/0xALPfK+U01qIlHxjkGdIj6F0txhu1U2v6B0YP2+k0whL2gCgYeg9QUvkYEXSD5r1Yx+vcb2R/vaSCSClg==}
+  /@swc/core-linux-arm64-gnu@1.3.50:
+    resolution: {integrity: sha512-iS908P5cNTHWus4QefSg2jn4lDYcl15sN1Fvx8fQgqYQra2O9CsR8lXBJYkvllykkzoKvWfcOLRCTquz3vsnVQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm64-musl@1.3.26:
-    resolution: {integrity: sha512-64KrTay9hC0mTvZ1AmEFmNEwV5QDjw9U7PJU5riotSc28I+Q/ZoM0qcSFW9JRRa6F2Tr+IfMtyv8+eB2//BQ5g==}
+  /@swc/core-linux-arm64-musl@1.3.50:
+    resolution: {integrity: sha512-ysh8MeaWjGqVwIPCDUhUOr4oczIx5qb8vFBoegI+SOUfcpWik22/+hG25LWzZY6PwAtqUGkhsJt/+5dY4IMhEA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-x64-gnu@1.3.26:
-    resolution: {integrity: sha512-Te8G13l3dcRM1Mf3J4JzGUngzNXLKnMYlUmBOYN/ORsx7e+VNelR3zsTLHC0+0jGqELDgqvMyzDfk+dux/C/bQ==}
+  /@swc/core-linux-x64-gnu@1.3.50:
+    resolution: {integrity: sha512-Ci4LQaGIPweWNVWgR2f47nrYEfq7002Pj6WWKGrnO6g+k5cwR3izxHMOnZhcKyAD3cWOS904i/GbfgXs2wBCDQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-x64-musl@1.3.26:
-    resolution: {integrity: sha512-nqQWuSM6OTKepUiQ9+rXgERq/JiO72RBOpXKO2afYppsL96sngjIRewV74v5f6IAfyzw+k+AhC5pgRA4Xu/Jkg==}
+  /@swc/core-linux-x64-musl@1.3.50:
+    resolution: {integrity: sha512-SEXOhGjmC4rdBeucCvNmtO2vflUEhkmWLfqvkalHYDbPMA/gwLSoYu3D85u5XqB8DatDi4TOCUx80IR1b/vDBQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-arm64-msvc@1.3.26:
-    resolution: {integrity: sha512-xx34mx+9IBV1sun7sxoNFiqNom9wiOuvsQFJUyQptCnZHgYwOr9OI204LBF95dCcBCZsTm2hT1wBnySJOeimYw==}
+  /@swc/core-win32-arm64-msvc@1.3.50:
+    resolution: {integrity: sha512-DPsJ2r9mYU8VzF9vhK323psyE8modj5be9M9diOsqF58Fu9ARtOfuulY+eiS5e41ya2XM/H2N/qOfsA+h2KRcg==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-ia32-msvc@1.3.26:
-    resolution: {integrity: sha512-48LZ/HKNuU9zl8c7qG6IQKb5rBCwmJgysGOmEGzTRBYxAf/x6Scmt0aqxCoV4J02HOs2WduCBDnhUKsSQ2kcXQ==}
+  /@swc/core-win32-ia32-msvc@1.3.50:
+    resolution: {integrity: sha512-2iyzHLat0C93S3XLp7QJ6RTA9Md+EcPl2fq1S/m2EZqofcq7wu5SuywaXoF89xOibOJBnWe6KwOnOFWFaXrPjQ==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-x64-msvc@1.3.26:
-    resolution: {integrity: sha512-UPe7S+MezD/S6cKBIc50TduGzmw6PBz1Ms5p+5wDLOKYNS/LSEM4iRmLwvePzP5X8mOyesXrsbwxLy8KHP65Yw==}
+  /@swc/core-win32-x64-msvc@1.3.50:
+    resolution: {integrity: sha512-iFRU2Y5DVIEdjaWnlLij8QQBM5Q91UJotNNgzuevPSIOhOyhF6V2AQS1QC4mfkPCy3Bw0GrZDChu3GcuBj9Rzw==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@swc/core@1.3.26:
-    resolution: {integrity: sha512-U7vEsaLn3IGg0XCRLJX/GTkK9WIfFHUX5USdrp1L2QD29sWPe25HqNndXmUR9KytzKmpDMNoUuHyiuhpVrnNeQ==}
+  /@swc/core@1.3.50:
+    resolution: {integrity: sha512-soTAHlwkI8zukR9KftWZ0gZ7HKU99B/C3CtBxzSI3N23QG+EfSSOgrYARfuZk5g4yLWpsU0rEkojd78vixqkwg==}
     engines: {node: '>=10'}
     requiresBuild: true
+    peerDependencies:
+      '@swc/helpers': ^0.5.0
+    peerDependenciesMeta:
+      '@swc/helpers':
+        optional: true
     optionalDependencies:
-      '@swc/core-darwin-arm64': 1.3.26
-      '@swc/core-darwin-x64': 1.3.26
-      '@swc/core-linux-arm-gnueabihf': 1.3.26
-      '@swc/core-linux-arm64-gnu': 1.3.26
-      '@swc/core-linux-arm64-musl': 1.3.26
-      '@swc/core-linux-x64-gnu': 1.3.26
-      '@swc/core-linux-x64-musl': 1.3.26
-      '@swc/core-win32-arm64-msvc': 1.3.26
-      '@swc/core-win32-ia32-msvc': 1.3.26
-      '@swc/core-win32-x64-msvc': 1.3.26
+      '@swc/core-darwin-arm64': 1.3.50
+      '@swc/core-darwin-x64': 1.3.50
+      '@swc/core-linux-arm-gnueabihf': 1.3.50
+      '@swc/core-linux-arm64-gnu': 1.3.50
+      '@swc/core-linux-arm64-musl': 1.3.50
+      '@swc/core-linux-x64-gnu': 1.3.50
+      '@swc/core-linux-x64-musl': 1.3.50
+      '@swc/core-win32-arm64-msvc': 1.3.50
+      '@swc/core-win32-ia32-msvc': 1.3.50
+      '@swc/core-win32-x64-msvc': 1.3.50
 
   /@swc/wasm@1.2.130:
     resolution: {integrity: sha512-rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q==}
@@ -2733,7 +2746,6 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       defer-to-connect: 2.0.1
-    dev: false
 
   /@szmarczak/http-timer@5.0.1:
     resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==}
@@ -2949,7 +2961,6 @@ packages:
 
   /@tokenizer/token@0.3.0:
     resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
-    dev: false
 
   /@tootallnate/once@1.1.2:
     resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
@@ -3042,7 +3053,6 @@ packages:
       '@types/keyv': 3.1.4
       '@types/node': 18.11.18
       '@types/responselike': 1.0.0
-    dev: false
 
   /@types/cbor@6.0.0:
     resolution: {integrity: sha512-mGQ1lbYOwVti5Xlarn1bTeBZqgY0kstsdjnkoEovgohYKdBjGejHyNGXHdMBeqyQazIv32Jjp33+5pBEaSRy2w==}
@@ -3182,7 +3192,6 @@ packages:
 
   /@types/http-cache-semantics@4.0.1:
     resolution: {integrity: sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==}
-    dev: false
 
   /@types/http-errors@2.0.1:
     resolution: {integrity: sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==}
@@ -3999,7 +4008,7 @@ packages:
       webpack: 5.x.x
       webpack-cli: 5.x.x
     dependencies:
-      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
       webpack-cli: 5.0.1(webpack@5.75.0)
     dev: true
 
@@ -4010,7 +4019,7 @@ packages:
       webpack: 5.x.x
       webpack-cli: 5.x.x
     dependencies:
-      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
       webpack-cli: 5.0.1(webpack@5.75.0)
     dev: true
 
@@ -4025,7 +4034,7 @@ packages:
       webpack-dev-server:
         optional: true
     dependencies:
-      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
       webpack-cli: 5.0.1(webpack@5.75.0)
     dev: true
 
@@ -4285,13 +4294,6 @@ packages:
     resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
     dev: true
 
-  /archive-type@4.0.0:
-    resolution: {integrity: sha512-zV4Ky0v1F8dBrdYElwTvQhweQ0P7Kwc1aluqJsYtOBP01jXcWCyW2IEfI1YiqsG+Iy7ZR+o5LF1N+PGECBxHWA==}
-    engines: {node: '>=4'}
-    dependencies:
-      file-type: 4.4.0
-    dev: true
-
   /archiver-utils@2.1.0:
     resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
     engines: {node: '>= 6'}
@@ -4774,33 +4776,21 @@ packages:
       executable: 4.1.1
     dev: true
 
-  /bin-version-check@4.0.0:
-    resolution: {integrity: sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==}
-    engines: {node: '>=6'}
+  /bin-version-check@5.0.0:
+    resolution: {integrity: sha512-Q3FMQnS5eZmrBGqmDXLs4dbAn/f+52voP6ykJYmweSA60t6DyH4UTSwZhtbK5UH+LBoWvDljILUQMLRUtsynsA==}
+    engines: {node: '>=12'}
     dependencies:
-      bin-version: 3.1.0
-      semver: 5.7.1
-      semver-truncate: 1.1.2
+      bin-version: 6.0.0
+      semver: 7.3.8
+      semver-truncate: 2.0.0
     dev: true
 
-  /bin-version@3.1.0:
-    resolution: {integrity: sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==}
-    engines: {node: '>=6'}
+  /bin-version@6.0.0:
+    resolution: {integrity: sha512-nk5wEsP4RiKjG+vF+uG8lFsEn4d7Y6FVDamzzftSunXOoOcOOkzcWdKVlGgFFwlUQCj63SgnUkLLGF8v7lufhw==}
+    engines: {node: '>=12'}
     dependencies:
-      execa: 1.0.0
-      find-versions: 3.2.0
-    dev: true
-
-  /bin-wrapper@4.1.0:
-    resolution: {integrity: sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==}
-    engines: {node: '>=6'}
-    dependencies:
-      bin-check: 4.1.0
-      bin-version-check: 4.0.0
-      download: 7.1.0
-      import-lazy: 3.1.0
-      os-filter-obj: 2.0.0
-      pify: 4.0.1
+      execa: 5.1.1
+      find-versions: 5.1.0
     dev: true
 
   /binary-extensions@2.2.0:
@@ -4819,13 +4809,6 @@ packages:
     engines: {node: '>=0.8'}
     dev: true
 
-  /bl@1.2.3:
-    resolution: {integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==}
-    dependencies:
-      readable-stream: 2.3.7
-      safe-buffer: 5.2.1
-    dev: true
-
   /bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
     dependencies:
@@ -4946,17 +4929,6 @@ packages:
       node-int64: 0.4.0
     dev: true
 
-  /buffer-alloc-unsafe@1.1.0:
-    resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==}
-    dev: true
-
-  /buffer-alloc@1.2.0:
-    resolution: {integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==}
-    dependencies:
-      buffer-alloc-unsafe: 1.1.0
-      buffer-fill: 1.0.0
-    dev: true
-
   /buffer-crc32@0.2.13:
     resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
 
@@ -4969,10 +4941,6 @@ packages:
     engines: {node: '>=0.4'}
     dev: true
 
-  /buffer-fill@1.0.0:
-    resolution: {integrity: sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==}
-    dev: true
-
   /buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
@@ -5101,7 +5069,6 @@ packages:
   /cacheable-lookup@5.0.4:
     resolution: {integrity: sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==}
     engines: {node: '>=10.6.0'}
-    dev: false
 
   /cacheable-lookup@7.0.0:
     resolution: {integrity: sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==}
@@ -5121,18 +5088,6 @@ packages:
       responselike: 3.0.0
     dev: false
 
-  /cacheable-request@2.1.4:
-    resolution: {integrity: sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ==}
-    dependencies:
-      clone-response: 1.0.2
-      get-stream: 3.0.0
-      http-cache-semantics: 3.8.1
-      keyv: 3.0.0
-      lowercase-keys: 1.0.0
-      normalize-url: 2.0.1
-      responselike: 1.0.2
-    dev: true
-
   /cacheable-request@7.0.2:
     resolution: {integrity: sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==}
     engines: {node: '>=8'}
@@ -5144,7 +5099,6 @@ packages:
       lowercase-keys: 2.0.0
       normalize-url: 6.1.0
       responselike: 2.0.1
-    dev: false
 
   /cachedir@2.3.0:
     resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==}
@@ -5208,16 +5162,6 @@ packages:
   /caseless@0.12.0:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
 
-  /caw@2.0.1:
-    resolution: {integrity: sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==}
-    engines: {node: '>=4'}
-    dependencies:
-      get-proxy: 2.1.0
-      isurl: 1.0.0
-      tunnel-agent: 0.6.0
-      url-to-options: 1.0.1
-    dev: true
-
   /cbor@8.1.0:
     resolution: {integrity: sha512-DwGjNW9omn6EwP70aXsn7FQJx5kO12tX0bZkaTjzdVFM6/7nhA4t0EENocKGx6D2Bch9PE2KzCUf5SceBdeijg==}
     engines: {node: '>=12.19'}
@@ -5502,17 +5446,10 @@ packages:
       shallow-clone: 3.0.1
     dev: true
 
-  /clone-response@1.0.2:
-    resolution: {integrity: sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==}
-    dependencies:
-      mimic-response: 1.0.1
-    dev: true
-
   /clone-response@1.0.3:
     resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}
     dependencies:
       mimic-response: 1.0.1
-    dev: false
 
   /clone-stats@1.0.0:
     resolution: {integrity: sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==}
@@ -6043,17 +5980,6 @@ packages:
       which: 1.3.1
     dev: true
 
-  /cross-spawn@6.0.5:
-    resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
-    engines: {node: '>=4.8'}
-    dependencies:
-      nice-try: 1.0.5
-      path-key: 2.0.1
-      semver: 5.7.1
-      shebang-command: 1.2.0
-      which: 1.3.1
-    dev: true
-
   /cross-spawn@7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
@@ -6333,72 +6259,11 @@ packages:
     engines: {node: '>=0.10'}
     dev: true
 
-  /decompress-response@3.3.0:
-    resolution: {integrity: sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==}
-    engines: {node: '>=4'}
-    dependencies:
-      mimic-response: 1.0.1
-    dev: true
-
   /decompress-response@6.0.0:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
     dependencies:
       mimic-response: 3.1.0
-    dev: false
-
-  /decompress-tar@4.1.1:
-    resolution: {integrity: sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==}
-    engines: {node: '>=4'}
-    dependencies:
-      file-type: 5.2.0
-      is-stream: 1.1.0
-      tar-stream: 1.6.2
-    dev: true
-
-  /decompress-tarbz2@4.1.1:
-    resolution: {integrity: sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==}
-    engines: {node: '>=4'}
-    dependencies:
-      decompress-tar: 4.1.1
-      file-type: 6.2.0
-      is-stream: 1.1.0
-      seek-bzip: 1.0.6
-      unbzip2-stream: 1.4.3
-    dev: true
-
-  /decompress-targz@4.1.1:
-    resolution: {integrity: sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==}
-    engines: {node: '>=4'}
-    dependencies:
-      decompress-tar: 4.1.1
-      file-type: 5.2.0
-      is-stream: 1.1.0
-    dev: true
-
-  /decompress-unzip@4.0.1:
-    resolution: {integrity: sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==}
-    engines: {node: '>=4'}
-    dependencies:
-      file-type: 3.9.0
-      get-stream: 2.3.1
-      pify: 2.3.0
-      yauzl: 2.10.0
-    dev: true
-
-  /decompress@4.2.1:
-    resolution: {integrity: sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==}
-    engines: {node: '>=4'}
-    dependencies:
-      decompress-tar: 4.1.1
-      decompress-tarbz2: 4.1.1
-      decompress-targz: 4.1.1
-      decompress-unzip: 4.0.1
-      graceful-fs: 4.2.11
-      make-dir: 1.3.0
-      pify: 2.3.0
-      strip-dirs: 2.1.0
-    dev: true
 
   /dedent@0.7.0:
     resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
@@ -6446,7 +6311,6 @@ packages:
   /defer-to-connect@2.0.1:
     resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==}
     engines: {node: '>=10'}
-    dev: false
 
   /define-properties@1.1.4:
     resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
@@ -6647,34 +6511,12 @@ packages:
     engines: {node: '>=12'}
     dev: false
 
-  /download@7.1.0:
-    resolution: {integrity: sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==}
-    engines: {node: '>=6'}
-    dependencies:
-      archive-type: 4.0.0
-      caw: 2.0.1
-      content-disposition: 0.5.4
-      decompress: 4.2.1
-      ext-name: 5.0.0
-      file-type: 8.1.0
-      filenamify: 2.1.0
-      get-stream: 3.0.0
-      got: 8.3.2
-      make-dir: 1.3.0
-      p-event: 2.3.1
-      pify: 3.0.0
-    dev: true
-
   /duplexer2@0.1.4:
     resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==}
     dependencies:
       readable-stream: 2.3.7
     dev: false
 
-  /duplexer3@0.1.5:
-    resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==}
-    dev: true
-
   /duplexer@0.1.2:
     resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
     dev: true
@@ -6915,6 +6757,11 @@ packages:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
 
+  /escape-string-regexp@5.0.0:
+    resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
+    engines: {node: '>=12'}
+    dev: true
+
   /escodegen@2.0.0:
     resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==}
     engines: {node: '>=6.0'}
@@ -7185,19 +7032,6 @@ packages:
       strip-eof: 1.0.0
     dev: true
 
-  /execa@1.0.0:
-    resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==}
-    engines: {node: '>=6'}
-    dependencies:
-      cross-spawn: 6.0.5
-      get-stream: 4.1.0
-      is-stream: 1.1.0
-      npm-run-path: 2.0.2
-      p-finally: 1.0.0
-      signal-exit: 3.0.7
-      strip-eof: 1.0.0
-    dev: true
-
   /execa@4.1.0:
     resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
     engines: {node: '>=10'}
@@ -7471,50 +7305,24 @@ packages:
       readable-web-to-node-stream: 3.0.2
       strtok3: 7.0.0
       token-types: 5.0.1
-    dev: false
-
-  /file-type@3.9.0:
-    resolution: {integrity: sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /file-type@4.4.0:
-    resolution: {integrity: sha512-f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /file-type@5.2.0:
-    resolution: {integrity: sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /file-type@6.2.0:
-    resolution: {integrity: sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /file-type@8.1.0:
-    resolution: {integrity: sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==}
-    engines: {node: '>=6'}
-    dev: true
 
   /filelist@1.0.4:
     resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
     dependencies:
       minimatch: 5.1.2
 
-  /filename-reserved-regex@2.0.0:
-    resolution: {integrity: sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==}
-    engines: {node: '>=4'}
+  /filename-reserved-regex@3.0.0:
+    resolution: {integrity: sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: true
 
-  /filenamify@2.1.0:
-    resolution: {integrity: sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==}
-    engines: {node: '>=4'}
+  /filenamify@5.1.1:
+    resolution: {integrity: sha512-M45CbrJLGACfrPOkrTp3j2EcO9OBkKUYME0eiqOCa7i2poaklU0jhlIaMlr8ijLorT0uLAzrn3qXOp5684CkfA==}
+    engines: {node: '>=12.20'}
     dependencies:
-      filename-reserved-regex: 2.0.0
-      strip-outer: 1.0.1
-      trim-repeated: 1.0.0
+      filename-reserved-regex: 3.0.0
+      strip-outer: 2.0.0
+      trim-repeated: 2.0.0
     dev: true
 
   /fill-range@4.0.0:
@@ -7555,11 +7363,11 @@ packages:
       locate-path: 6.0.0
       path-exists: 4.0.0
 
-  /find-versions@3.2.0:
-    resolution: {integrity: sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==}
-    engines: {node: '>=6'}
+  /find-versions@5.1.0:
+    resolution: {integrity: sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==}
+    engines: {node: '>=12'}
     dependencies:
-      semver-regex: 2.0.0
+      semver-regex: 4.0.5
     dev: true
 
   /findup-sync@2.0.0:
@@ -7726,19 +7534,13 @@ packages:
     engines: {node: '>= 0.6'}
     dev: false
 
-  /from2@2.3.0:
-    resolution: {integrity: sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==}
-    dependencies:
-      inherits: 2.0.4
-      readable-stream: 2.3.7
-    dev: true
-
   /from@0.1.7:
     resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==}
     dev: true
 
   /fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+    dev: false
 
   /fs-extra@10.1.0:
     resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
@@ -7916,33 +7718,11 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
-  /get-proxy@2.1.0:
-    resolution: {integrity: sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==}
-    engines: {node: '>=4'}
-    dependencies:
-      npm-conf: 1.1.3
-    dev: true
-
-  /get-stream@2.3.1:
-    resolution: {integrity: sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      object-assign: 4.1.1
-      pinkie-promise: 2.0.1
-    dev: true
-
   /get-stream@3.0.0:
     resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /get-stream@4.1.0:
-    resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==}
-    engines: {node: '>=6'}
-    dependencies:
-      pump: 3.0.0
-    dev: true
-
   /get-stream@5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
@@ -8147,7 +7927,6 @@ packages:
       lowercase-keys: 2.0.0
       p-cancelable: 2.1.1
       responselike: 2.0.1
-    dev: false
 
   /got@12.5.3:
     resolution: {integrity: sha512-8wKnb9MGU8IPGRIo+/ukTy9XLJBwDiCpIf5TVzQ9Cpol50eMTpBq2GAuDsuDIz7hTYmZgMgC1e9ydr6kSDWs3w==}
@@ -8166,31 +7945,6 @@ packages:
       responselike: 3.0.0
     dev: false
 
-  /got@8.3.2:
-    resolution: {integrity: sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==}
-    engines: {node: '>=4'}
-    dependencies:
-      '@sindresorhus/is': 0.7.0
-      '@types/keyv': 3.1.4
-      '@types/responselike': 1.0.0
-      cacheable-request: 2.1.4
-      decompress-response: 3.3.0
-      duplexer3: 0.1.5
-      get-stream: 3.0.0
-      into-stream: 3.1.0
-      is-retry-allowed: 1.2.0
-      isurl: 1.0.0
-      lowercase-keys: 1.0.1
-      mimic-response: 1.0.1
-      p-cancelable: 0.4.1
-      p-timeout: 2.0.1
-      pify: 3.0.0
-      safe-buffer: 5.2.1
-      timed-out: 4.0.1
-      url-parse-lax: 3.0.0
-      url-to-options: 1.0.1
-    dev: true
-
   /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
@@ -8337,20 +8091,10 @@ packages:
       get-intrinsic: 1.1.3
     dev: true
 
-  /has-symbol-support-x@1.4.2:
-    resolution: {integrity: sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==}
-    dev: true
-
   /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
 
-  /has-to-string-tag-x@1.4.1:
-    resolution: {integrity: sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==}
-    dependencies:
-      has-symbol-support-x: 1.4.2
-    dev: true
-
   /has-tostringtag@1.0.0:
     resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
     engines: {node: '>= 0.4'}
@@ -8487,13 +8231,8 @@ packages:
       http-errors: 1.8.1
     dev: false
 
-  /http-cache-semantics@3.8.1:
-    resolution: {integrity: sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==}
-    dev: true
-
   /http-cache-semantics@4.1.0:
     resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==}
-    dev: false
 
   /http-errors@1.6.3:
     resolution: {integrity: sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==}
@@ -8571,7 +8310,6 @@ packages:
     dependencies:
       quick-lru: 5.1.1
       resolve-alpn: 1.2.1
-    dev: false
 
   /http2-wrapper@2.2.0:
     resolution: {integrity: sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==}
@@ -8683,11 +8421,6 @@ packages:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
-  /import-lazy@3.1.0:
-    resolution: {integrity: sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==}
-    engines: {node: '>=6'}
-    dev: true
-
   /import-lazy@4.0.0:
     resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
     engines: {node: '>=8'}
@@ -8769,14 +8502,6 @@ packages:
     engines: {node: '>=10.13.0'}
     dev: true
 
-  /into-stream@3.1.0:
-    resolution: {integrity: sha512-TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ==}
-    engines: {node: '>=4'}
-    dependencies:
-      from2: 2.3.0
-      p-is-promise: 1.1.0
-    dev: true
-
   /invert-kv@1.0.0:
     resolution: {integrity: sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==}
     engines: {node: '>=0.10.0'}
@@ -9018,10 +8743,6 @@ packages:
     resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
     dev: false
 
-  /is-natural-number@4.0.1:
-    resolution: {integrity: sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==}
-    dev: true
-
   /is-negated-glob@1.0.0:
     resolution: {integrity: sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==}
     engines: {node: '>=0.10.0'}
@@ -9043,10 +8764,6 @@ packages:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
-  /is-object@1.0.2:
-    resolution: {integrity: sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==}
-    dev: true
-
   /is-path-inside@3.0.3:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
@@ -9092,11 +8809,6 @@ packages:
       is-unc-path: 1.0.0
     dev: true
 
-  /is-retry-allowed@1.2.0:
-    resolution: {integrity: sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /is-stream@1.1.0:
     resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
     engines: {node: '>=0.10.0'}
@@ -9253,14 +8965,6 @@ packages:
       textextensions: 3.3.0
     dev: true
 
-  /isurl@1.0.0:
-    resolution: {integrity: sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==}
-    engines: {node: '>= 4'}
-    dependencies:
-      has-to-string-tag-x: 1.4.1
-      is-object: 1.0.2
-    dev: true
-
   /jake@10.8.5:
     resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
     engines: {node: '>=10'}
@@ -9933,13 +9637,8 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
-  /json-buffer@3.0.0:
-    resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==}
-    dev: true
-
   /json-buffer@3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
-    dev: false
 
   /json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
@@ -9970,7 +9669,7 @@ packages:
       json5: 2.2.3
       loader-utils: 2.0.4
       schema-utils: 3.1.1
-      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
     dev: true
 
   /json5@2.2.3:
@@ -10074,17 +9773,10 @@ packages:
       tsscmp: 1.0.6
     dev: false
 
-  /keyv@3.0.0:
-    resolution: {integrity: sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==}
-    dependencies:
-      json-buffer: 3.0.0
-    dev: true
-
   /keyv@4.5.2:
     resolution: {integrity: sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==}
     dependencies:
       json-buffer: 3.0.1
-    dev: false
 
   /kind-of@3.2.2:
     resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
@@ -10613,20 +10305,9 @@ packages:
     resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==}
     dev: false
 
-  /lowercase-keys@1.0.0:
-    resolution: {integrity: sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /lowercase-keys@1.0.1:
-    resolution: {integrity: sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /lowercase-keys@2.0.0:
     resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}
     engines: {node: '>=8'}
-    dev: false
 
   /lowercase-keys@3.0.0:
     resolution: {integrity: sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==}
@@ -10671,13 +10352,6 @@ packages:
     resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==}
     dev: false
 
-  /make-dir@1.3.0:
-    resolution: {integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==}
-    engines: {node: '>=4'}
-    dependencies:
-      pify: 3.0.0
-    dev: true
-
   /make-dir@3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
@@ -10876,7 +10550,6 @@ packages:
   /mimic-response@3.1.0:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
     engines: {node: '>=10'}
-    dev: false
 
   /mimic-response@4.0.0:
     resolution: {integrity: sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==}
@@ -11232,10 +10905,6 @@ packages:
   /next-tick@1.1.0:
     resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
 
-  /nice-try@1.0.5:
-    resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
-    dev: true
-
   /node-abi@3.31.0:
     resolution: {integrity: sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==}
     engines: {node: '>=10'}
@@ -11396,19 +11065,9 @@ packages:
       sort-keys: 1.1.2
     dev: true
 
-  /normalize-url@2.0.1:
-    resolution: {integrity: sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==}
-    engines: {node: '>=4'}
-    dependencies:
-      prepend-http: 2.0.0
-      query-string: 5.1.1
-      sort-keys: 2.0.0
-    dev: true
-
   /normalize-url@6.1.0:
     resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==}
     engines: {node: '>=10'}
-    dev: false
 
   /normalize-url@8.0.0:
     resolution: {integrity: sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==}
@@ -11422,14 +11081,6 @@ packages:
       once: 1.4.0
     dev: true
 
-  /npm-conf@1.1.3:
-    resolution: {integrity: sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==}
-    engines: {node: '>=4'}
-    dependencies:
-      config-chain: 1.1.13
-      pify: 3.0.0
-    dev: true
-
   /npm-run-path@2.0.2:
     resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}
     engines: {node: '>=4'}
@@ -11683,37 +11334,19 @@ packages:
     resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
     dev: true
 
-  /p-cancelable@0.4.1:
-    resolution: {integrity: sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==}
-    engines: {node: '>=4'}
-    dev: true
-
   /p-cancelable@2.1.1:
     resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
     engines: {node: '>=8'}
-    dev: false
 
   /p-cancelable@3.0.0:
     resolution: {integrity: sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==}
     engines: {node: '>=12.20'}
     dev: false
 
-  /p-event@2.3.1:
-    resolution: {integrity: sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==}
-    engines: {node: '>=6'}
-    dependencies:
-      p-timeout: 2.0.1
-    dev: true
-
   /p-finally@1.0.0:
     resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
     engines: {node: '>=4'}
 
-  /p-is-promise@1.1.0:
-    resolution: {integrity: sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg==}
-    engines: {node: '>=4'}
-    dev: true
-
   /p-limit@2.3.0:
     resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
     engines: {node: '>=6'}
@@ -11752,13 +11385,6 @@ packages:
       p-timeout: 3.2.0
     dev: true
 
-  /p-timeout@2.0.1:
-    resolution: {integrity: sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==}
-    engines: {node: '>=4'}
-    dependencies:
-      p-finally: 1.0.0
-    dev: true
-
   /p-timeout@3.2.0:
     resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
     engines: {node: '>=8'}
@@ -11938,7 +11564,6 @@ packages:
   /peek-readable@5.0.0:
     resolution: {integrity: sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==}
     engines: {node: '>=14.16'}
-    dev: false
 
   /pend@1.2.0:
     resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
@@ -12020,11 +11645,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /pify@3.0.0:
-    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
-    engines: {node: '>=4'}
-    dev: true
-
   /pify@4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
@@ -12374,11 +11994,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /prepend-http@2.0.0:
-    resolution: {integrity: sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==}
-    engines: {node: '>=4'}
-    dev: true
-
   /prettier-plugin-vue@1.1.6:
     resolution: {integrity: sha512-trQ/oY+6hSsGe2zPIFThXMIM0TbxMEbk2VOrKjwHWuSz7OEo0rnumbz9a47OxVPCaAnGY9vZG8qDTiTmk9bq0A==}
     dependencies:
@@ -12695,15 +12310,6 @@ packages:
       strict-uri-encode: 1.1.0
     dev: true
 
-  /query-string@5.1.1:
-    resolution: {integrity: sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      decode-uri-component: 0.2.2
-      object-assign: 4.1.1
-      strict-uri-encode: 1.1.0
-    dev: true
-
   /querystring@0.2.0:
     resolution: {integrity: sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==}
     engines: {node: '>=0.4.x'}
@@ -12734,7 +12340,6 @@ packages:
   /quick-lru@5.1.1:
     resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
     engines: {node: '>=10'}
-    dev: false
 
   /random-seed@0.3.0:
     resolution: {integrity: sha512-y13xtn3kcTlLub3HKWXxJNeC2qK4mB59evwZ5EkeRlolx+Bp2ztF7LbcZmyCnOqlHQrLnfuNbi1sVmm9lPDlDA==}
@@ -12872,7 +12477,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       readable-stream: 3.6.0
-    dev: false
 
   /readdir-glob@1.1.2:
     resolution: {integrity: sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==}
@@ -13098,7 +12702,6 @@ packages:
 
   /resolve-alpn@1.2.1:
     resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
-    dev: false
 
   /resolve-cwd@3.0.0:
     resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
@@ -13168,17 +12771,10 @@ packages:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  /responselike@1.0.2:
-    resolution: {integrity: sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==}
-    dependencies:
-      lowercase-keys: 1.0.1
-    dev: true
-
   /responselike@2.0.1:
     resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}
     dependencies:
       lowercase-keys: 2.0.0
-    dev: false
 
   /responselike@3.0.0:
     resolution: {integrity: sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==}
@@ -13364,13 +12960,6 @@ packages:
   /seedrandom@3.0.5:
     resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
 
-  /seek-bzip@1.0.6:
-    resolution: {integrity: sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==}
-    hasBin: true
-    dependencies:
-      commander: 2.20.3
-    dev: true
-
   /semver-greatest-satisfied-range@1.1.0:
     resolution: {integrity: sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==}
     engines: {node: '>= 0.10'}
@@ -13378,16 +12967,16 @@ packages:
       sver-compat: 1.5.0
     dev: true
 
-  /semver-regex@2.0.0:
-    resolution: {integrity: sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==}
-    engines: {node: '>=6'}
+  /semver-regex@4.0.5:
+    resolution: {integrity: sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw==}
+    engines: {node: '>=12'}
     dev: true
 
-  /semver-truncate@1.1.2:
-    resolution: {integrity: sha512-V1fGg9i4CL3qesB6U0L6XAm4xOJiHmt4QAacazumuasc03BvtFGIMCduv01JWQ69Nv+JST9TqhSCiJoxoY031w==}
-    engines: {node: '>=0.10.0'}
+  /semver-truncate@2.0.0:
+    resolution: {integrity: sha512-Rh266MLDYNeML5h90ttdMwfXe1+Nc4LAWd9X1KdJe8pPHP4kFmvLZALtsMNHNdvTyQygbEC0D59sIz47DIaq8w==}
+    engines: {node: '>=8'}
     dependencies:
-      semver: 5.7.1
+      semver: 6.3.0
     dev: true
 
   /semver@5.7.1:
@@ -13626,13 +13215,6 @@ packages:
       is-plain-obj: 1.1.0
     dev: true
 
-  /sort-keys@2.0.0:
-    resolution: {integrity: sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==}
-    engines: {node: '>=4'}
-    dependencies:
-      is-plain-obj: 1.1.0
-    dev: true
-
   /sortablejs@1.14.0:
     resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
     dev: true
@@ -13931,12 +13513,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /strip-dirs@2.1.0:
-    resolution: {integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==}
-    dependencies:
-      is-natural-number: 4.0.1
-    dev: true
-
   /strip-eof@1.0.0:
     resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==}
     engines: {node: '>=0.10.0'}
@@ -13968,11 +13544,9 @@ packages:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
 
-  /strip-outer@1.0.1:
-    resolution: {integrity: sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      escape-string-regexp: 1.0.5
+  /strip-outer@2.0.0:
+    resolution: {integrity: sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: true
 
   /strnum@1.0.5:
@@ -13985,7 +13559,6 @@ packages:
     dependencies:
       '@tokenizer/token': 0.3.0
       peek-readable: 5.0.0
-    dev: false
 
   /summaly@2.7.0:
     resolution: {integrity: sha512-pEz9LL8Gp0oPIQfn6TrnBCcv/HkFE14hxhH3W6LPGdopXlPXjRcMlDMJaO+VupUNMOGaMjCsjq7+0rWnu8sp7w==}
@@ -14069,14 +13642,14 @@ packages:
       whet.extend: 0.9.9
     dev: true
 
-  /swc-loader@0.2.3(@swc/core@1.3.26)(webpack@5.75.0):
+  /swc-loader@0.2.3(@swc/core@1.3.50)(webpack@5.75.0):
     resolution: {integrity: sha512-D1p6XXURfSPleZZA/Lipb3A8pZ17fP4NObZvFCDjK/OKljroqDpPmsBdTraWhVBqUNpcWBQY1imWdoPScRlQ7A==}
     peerDependencies:
       '@swc/core': ^1.2.147
       webpack: '>=2'
     dependencies:
-      '@swc/core': 1.3.26
-      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      '@swc/core': 1.3.50
+      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
     dev: true
 
   /swiper@8.4.5:
@@ -14123,19 +13696,6 @@ packages:
       tar-stream: 2.2.0
     dev: false
 
-  /tar-stream@1.6.2:
-    resolution: {integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      bl: 1.2.3
-      buffer-alloc: 1.2.0
-      end-of-stream: 1.4.4
-      fs-constants: 1.0.0
-      readable-stream: 2.3.7
-      to-buffer: 1.1.1
-      xtend: 4.0.2
-    dev: true
-
   /tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
@@ -14181,7 +13741,7 @@ packages:
       supports-hyperlinks: 2.3.0
     dev: true
 
-  /terser-webpack-plugin@5.3.6(@swc/core@1.3.26)(webpack@5.75.0):
+  /terser-webpack-plugin@5.3.6(@swc/core@1.3.50)(webpack@5.75.0):
     resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -14198,12 +13758,12 @@ packages:
         optional: true
     dependencies:
       '@jridgewell/trace-mapping': 0.3.17
-      '@swc/core': 1.3.26
+      '@swc/core': 1.3.50
       jest-worker: 27.5.1
       schema-utils: 3.1.1
       serialize-javascript: 6.0.0
       terser: 5.16.1
-      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
     dev: true
 
   /terser@5.16.1:
@@ -14325,11 +13885,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /timed-out@4.0.1:
-    resolution: {integrity: sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /timsort@0.3.0:
     resolution: {integrity: sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==}
     dev: true
@@ -14355,10 +13910,6 @@ packages:
       is-negated-glob: 1.0.0
     dev: true
 
-  /to-buffer@1.1.1:
-    resolution: {integrity: sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==}
-    dev: true
-
   /to-fast-properties@2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
     engines: {node: '>=4'}
@@ -14414,7 +13965,6 @@ packages:
     dependencies:
       '@tokenizer/token': 0.3.0
       ieee754: 1.2.1
-    dev: false
 
   /tough-cookie@2.5.0:
     resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
@@ -14462,11 +14012,11 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /trim-repeated@1.0.0:
-    resolution: {integrity: sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==}
-    engines: {node: '>=0.10.0'}
+  /trim-repeated@2.0.0:
+    resolution: {integrity: sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==}
+    engines: {node: '>=12'}
     dependencies:
-      escape-string-regexp: 1.0.5
+      escape-string-regexp: 5.0.0
     dev: true
 
   /ts-jest@27.1.2(@babel/core@7.21.4)(@types/jest@27.4.0)(jest@27.4.5)(typescript@4.5.4):
@@ -14516,7 +14066,7 @@ packages:
       micromatch: 4.0.5
       semver: 7.3.8
       typescript: 4.9.4
-      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
     dev: true
 
   /ts-node@10.4.0(@types/node@17.0.5)(typescript@4.5.4):
@@ -14549,7 +14099,7 @@ packages:
       yn: 3.1.1
     dev: true
 
-  /ts-node@10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4):
+  /ts-node@10.9.1(@swc/core@1.3.50)(@types/node@18.11.18)(typescript@4.9.4):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
@@ -14564,7 +14114,7 @@ packages:
         optional: true
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
-      '@swc/core': 1.3.26
+      '@swc/core': 1.3.50
       '@tsconfig/node10': 1.0.9
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
@@ -14782,7 +14332,7 @@ packages:
       pg: 8.8.0
       reflect-metadata: 0.1.13
       sha.js: 2.4.11
-      ts-node: 10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4)
+      ts-node: 10.9.1(@swc/core@1.3.50)(@types/node@18.11.18)(typescript@4.9.4)
       tslib: 2.4.1
       uuid: 8.3.2
       xml2js: 0.4.23
@@ -14807,13 +14357,6 @@ packages:
     hasBin: true
     dev: false
 
-  /unbzip2-stream@1.4.3:
-    resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
-    dependencies:
-      buffer: 5.7.1
-      through: 2.3.8
-    dev: true
-
   /unc-path-regex@0.1.2:
     resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
     engines: {node: '>=0.10.0'}
@@ -14956,13 +14499,6 @@ packages:
     deprecated: Please see https://github.com/lydell/urix#deprecated
     dev: true
 
-  /url-parse-lax@3.0.0:
-    resolution: {integrity: sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==}
-    engines: {node: '>=4'}
-    dependencies:
-      prepend-http: 2.0.0
-    dev: true
-
   /url-parse@1.5.10:
     resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
     dependencies:
@@ -14973,11 +14509,6 @@ packages:
     resolution: {integrity: sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==}
     dev: true
 
-  /url-to-options@1.0.1:
-    resolution: {integrity: sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==}
-    engines: {node: '>= 4'}
-    dev: true
-
   /url@0.10.3:
     resolution: {integrity: sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==}
     dependencies:
@@ -15371,7 +14902,7 @@ packages:
       import-local: 3.1.0
       interpret: 3.1.1
       rechoir: 0.8.0
-      webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1)
+      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
       webpack-merge: 5.8.0
     dev: true
 
@@ -15388,7 +14919,7 @@ packages:
     engines: {node: '>=10.13.0'}
     dev: true
 
-  /webpack@5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1):
+  /webpack@5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1):
     resolution: {integrity: sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==}
     engines: {node: '>=10.13.0'}
     hasBin: true
@@ -15419,7 +14950,7 @@ packages:
       neo-async: 2.6.2
       schema-utils: 3.1.1
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.6(@swc/core@1.3.26)(webpack@5.75.0)
+      terser-webpack-plugin: 5.3.6(@swc/core@1.3.50)(webpack@5.75.0)
       watchpack: 2.4.0
       webpack-cli: 5.0.1(webpack@5.75.0)
       webpack-sources: 3.2.3

From 3d569217276eeb3475e4bb2911efa6c06930a138 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 13 Apr 2023 19:46:52 -0700
Subject: [PATCH 454/582] fix: :lock: don't show notes with CW on welcome
 screen

Closes #9849
---
 packages/client/src/pages/welcome.entrance.a.vue | 1 +
 packages/client/src/pages/welcome.timeline.vue   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue
index f40e2a82b..286ecdda1 100644
--- a/packages/client/src/pages/welcome.entrance.a.vue
+++ b/packages/client/src/pages/welcome.entrance.a.vue
@@ -38,6 +38,7 @@
 							class="logo"
 							v-if="meta.logoImageUrl"
 							:src="meta.logoImageUrl"
+							alt="logo"
 						/>
 						<span v-else class="text">{{ instanceName }}</span>
 					</h1>
diff --git a/packages/client/src/pages/welcome.timeline.vue b/packages/client/src/pages/welcome.timeline.vue
index f90976bf2..26f5fa4b0 100644
--- a/packages/client/src/pages/welcome.timeline.vue
+++ b/packages/client/src/pages/welcome.timeline.vue
@@ -6,7 +6,7 @@
 			v-bind:class="{ scroll: isScrolling }"
 		>
 			<div v-for="note in notes" class="note">
-				<div class="content _panel">
+				<div class="content _panel" v-if="note.cw == null">
 					<div class="body">
 						<MkA
 							v-if="note.replyId"

From 4de7c5162305c7c18290aee3d78878758e663d30 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 13 Apr 2023 20:11:39 -0700
Subject: [PATCH 455/582] only show index posts action if admin

---
 packages/client/src/pages/admin/index.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 77c90aeee..34d0404fc 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -161,12 +161,16 @@ const menuDef = $computed(() => [
 						},
 				  ]
 				: []),
-			{
-				type: "button",
-				icon: "ph-list-magnifying-glass ph-bold ph-lg",
-				text: i18n.ts.indexPosts,
-				action: indexPosts,
-			},
+			...($i.isAdmin
+				? [
+						{
+							type: "button",
+							icon: "ph-list-magnifying-glass ph-bold ph-lg",
+							text: i18n.ts.indexPosts,
+							action: indexPosts,
+						},
+				  ]
+				: []),
 		],
 	},
 	{

From 818bdcbd18406b9dd7ea68f2ad0a3e589b064d70 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 15 Apr 2023 00:40:13 +0900
Subject: [PATCH 456/582] improve city search

---
 packages/client/src/pages/user/home.vue | 34 ++++++++++++++++---------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 3fa01d9c0..ef5a6544d 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -353,18 +353,28 @@ const age = $computed(() => {
 });
 
 const timeForThem = $computed(() => {
-	const tzInfo = cityTimezones.lookupViaCity(
-		props.user.location!.replace(/\s.*/, "")
-	);
-	if (tzInfo.length == 0) return "";
-	const tz = tzInfo[0].timezone;
-	const theirTime = new Date().toLocaleString("en-US", {
-		timeZone: tz,
-		hour12: false,
-	});
-	return ` (${theirTime.split(",")[1].trim().split(":")[0]}:${theirTime
-		.split(" ")[1]
-		.slice(-5, -3)})`;
+	const maybeCityNames = [
+		props.user.location!,
+		props.user.location!.replace(/[^A-Za-z].*/, ""),
+		props.user.location!.replace(/[^A-Za-z\-\'\.].*/, ""),
+		props.user.location!.replace(/[^A-Za-z0-9\-\'\.\s].*/, ""),
+	];
+
+	for (const city of maybeCityNames) {
+		let tzInfo = cityTimezones.lookupViaCity(city);
+		if (tzInfo.length == 0) continue;
+
+		const tz = tzInfo[0].timezone;
+		const theirTime = new Date().toLocaleString("en-US", {
+			timeZone: tz,
+			hour12: false,
+		});
+		return ` (${theirTime.split(",")[1].trim().split(":")[0]}:${theirTime
+			.split(" ")[1]
+			.slice(-5, -3)})`;
+	}
+
+	return "";
 });
 
 function menu(ev) {

From 4fc833c84cfbb6e3e08c30efc6ad4d1437eefef7 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 15 Apr 2023 01:00:43 +0900
Subject: [PATCH 457/582] allow acute accent

---
 packages/client/src/pages/user/home.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index ef5a6544d..84ee4b0a3 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -355,9 +355,18 @@ const age = $computed(() => {
 const timeForThem = $computed(() => {
 	const maybeCityNames = [
 		props.user.location!,
-		props.user.location!.replace(/[^A-Za-z].*/, ""),
-		props.user.location!.replace(/[^A-Za-z\-\'\.].*/, ""),
-		props.user.location!.replace(/[^A-Za-z0-9\-\'\.\s].*/, ""),
+		props.user.location!.replace(
+			/[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź].*/,
+			""
+		),
+		props.user.location!.replace(
+			/[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.].*/,
+			""
+		),
+		props.user.location!.replace(
+			/[^A-Za-z0-9ÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.\s].*/,
+			""
+		),
 	];
 
 	for (const city of maybeCityNames) {

From d73a87b1b9eae4616077e7e530465c7b7d227e6c Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 15 Apr 2023 01:01:36 +0900
Subject: [PATCH 458/582] prevent crashes due to timezone === null

---
 packages/client/src/pages/user/home.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 84ee4b0a3..8c1c82d06 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -374,6 +374,8 @@ const timeForThem = $computed(() => {
 		if (tzInfo.length == 0) continue;
 
 		const tz = tzInfo[0].timezone;
+		if (!tz) continue;
+
 		const theirTime = new Date().toLocaleString("en-US", {
 			timeZone: tz,
 			hour12: false,

From 81a8550d8fbf5697766cb2036260d9f1d9c8caa3 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 15 Apr 2023 01:10:59 +0900
Subject: [PATCH 459/582] update locale

---
 locales/en-US.yml | 2 +-
 locales/ja-JP.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index d67e3b362..d0a152599 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1426,7 +1426,7 @@ _profile:
   metadataContent: "Content"
   changeAvatar: "Change avatar"
   changeBanner: "Change banner"
-  locationDescription: "If you enter your city, it will display your local time to other users."
+  locationDescription: "If you enter your city first, it will display your local time to other users."
 _exportOrImport:
   allNotes: "All posts"
   followingList: "Followed users"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 2e6795a78..b5c102a65 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1423,7 +1423,7 @@ _profile:
   metadataContent: "内容"
   changeAvatar: "アバター画像を変更"
   changeBanner: "バナー画像を変更"
-  locationDescription: "正しく入力すると、あなたの現地時間が他のユーザーに表示されます。"
+  locationDescription: "英語表記の都市名から始まる内容を入力すると、現地時間がユーザーページに表示されます。"
 _exportOrImport:
   allNotes: "全ての投稿"
   followingList: "フォロー"

From 74a43b7478f6572cbeaa5378386dbd805674948a Mon Sep 17 00:00:00 2001
From: daikei <daikei@noreply.codeberg.org>
Date: Fri, 14 Apr 2023 16:18:50 +0000
Subject: [PATCH 460/582] replace koa-favicon with a small patch of code

This should remove a needless dependency and replace it with a tiny, simple koa router
---
 packages/backend/src/server/web/index.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 642a17d57..52b49c2a4 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -8,13 +8,11 @@ import { readFileSync } from "node:fs";
 import Koa from "koa";
 import Router from "@koa/router";
 import send from "koa-send";
-import favicon from "koa-favicon";
 import views from "koa-views";
 import sharp from "sharp";
 import { createBullBoard } from "@bull-board/api";
 import { BullAdapter } from "@bull-board/api/bullAdapter.js";
 import { KoaAdapter } from "@bull-board/koa";
-
 import { In, IsNull } from "typeorm";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 import config from "@/config/index.js";
@@ -98,8 +96,13 @@ app.use(
 	}),
 );
 
-// Serve favicon
-app.use(favicon(`${_dirname}/../../../assets/favicon.ico`));
+// Favicon Router
+app.use(async (ctx, next) => {
+        if (ctx.path != '/favicon.ico') return next()
+        const meta = await fetchMeta();
+        if (meta.iconUrl === "") ctx.body = readFileSync(`${_dirname}/../../../assets/favicon.ico`);
+        else ctx.redirect(meta.iconUrl)
+})
 
 // Common request handler
 app.use(async (ctx, next) => {

From 2aa0fa37cfdc976e8cca7785404305e75bacf671 Mon Sep 17 00:00:00 2001
From: daikei <daikei@noreply.codeberg.org>
Date: Fri, 14 Apr 2023 16:20:27 +0000
Subject: [PATCH 461/582] remove koa-favicon

---
 packages/backend/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index a03d6d35b..b02af2c03 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -75,7 +75,6 @@
 		"koa": "2.13.4",
 		"koa-body": "^6.0.1",
 		"koa-bodyparser": "4.3.0",
-		"koa-favicon": "2.1.0",
 		"koa-json-body": "5.3.0",
 		"koa-logger": "3.2.1",
 		"koa-mount": "4.0.0",

From 3ecd3cf6a16137f00120c428afab1995021b20f2 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 15 Apr 2023 01:37:53 +0900
Subject: [PATCH 462/582] fix a bug

---
 packages/client/src/pages/user/home.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 8c1c82d06..c3d73b573 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -363,10 +363,12 @@ const timeForThem = $computed(() => {
 			/[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.].*/,
 			""
 		),
-		props.user.location!.replace(
-			/[^A-Za-z0-9ÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.\s].*/,
-			""
-		),
+		props.user
+			.location!.replace(
+				/[^A-Za-z0-9ÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.\s].*/,
+				""
+			)
+			.trim(),
 	];
 
 	for (const city of maybeCityNames) {

From ec96805ddc8b2423466a5f4edd4f8c1556360ab9 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 15 Apr 2023 01:41:49 +0900
Subject: [PATCH 463/582] change regex priority

---
 packages/client/src/pages/user/home.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index c3d73b573..af3a38431 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -355,20 +355,20 @@ const age = $computed(() => {
 const timeForThem = $computed(() => {
 	const maybeCityNames = [
 		props.user.location!,
-		props.user.location!.replace(
-			/[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź].*/,
-			""
-		),
-		props.user.location!.replace(
-			/[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.].*/,
-			""
-		),
 		props.user
 			.location!.replace(
 				/[^A-Za-z0-9ÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.\s].*/,
 				""
 			)
 			.trim(),
+		props.user.location!.replace(
+			/[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.].*/,
+			""
+		),
+		props.user.location!.replace(
+			/[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź].*/,
+			""
+		),
 	];
 
 	for (const city of maybeCityNames) {

From 24c23c647433bcaa85ca3d04050dcc3780d04e98 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 14 Apr 2023 15:35:18 -0700
Subject: [PATCH 464/582] chore: formatting

---
 packages/backend/src/server/web/index.ts | 11 ++++++-----
 pnpm-lock.yaml                           |  9 ---------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 52b49c2a4..028170cd7 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -98,11 +98,12 @@ app.use(
 
 // Favicon Router
 app.use(async (ctx, next) => {
-        if (ctx.path != '/favicon.ico') return next()
-        const meta = await fetchMeta();
-        if (meta.iconUrl === "") ctx.body = readFileSync(`${_dirname}/../../../assets/favicon.ico`);
-        else ctx.redirect(meta.iconUrl)
-})
+	if (ctx.path != "/favicon.ico") return next();
+	const meta = await fetchMeta();
+	if (meta.iconUrl === "")
+		ctx.body = readFileSync(`${_dirname}/../../../assets/favicon.ico`);
+	else ctx.redirect(meta.iconUrl);
+});
 
 // Common request handler
 app.use(async (ctx, next) => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 410801dde..7e62b9ef3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -227,9 +227,6 @@ importers:
       koa-bodyparser:
         specifier: 4.3.0
         version: 4.3.0
-      koa-favicon:
-        specifier: 2.1.0
-        version: 2.1.0
       koa-json-body:
         specifier: 5.3.0
         version: 5.3.0
@@ -9837,12 +9834,6 @@ packages:
       koa-compose: 4.1.0
     dev: false
 
-  /koa-favicon@2.1.0:
-    resolution: {integrity: sha512-LvukcooYjxKtnZq0RXdBup+JDhaHwLgnLlDHB/xvjwQEjbc4rbp/0WkmOzpOvaHujc+fIwPear0dpKX1V+dHVg==}
-    dependencies:
-      mz: 2.7.0
-    dev: false
-
   /koa-json-body@5.3.0:
     resolution: {integrity: sha512-M2P3zLOs2XiYCpJLGSTXOKij4u5vJ8pbAMXXarXQnwsx4DwDav9qn081tYI2RdZ79B159Pdk4bRfvwl/sazL8A==}
     engines: {node: '>= 4.0.0'}

From 569f754d850a12917ae53d0f7eff1825e882e327 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 16 Apr 2023 01:05:18 +0900
Subject: [PATCH 465/582] feat: rename workspaces

---
 locales/en-US.yml                         |  2 ++
 locales/ja-JP.yml                         |  2 ++
 locales/zh-CN.yml                         |  2 ++
 locales/zh-TW.yml                         |  2 ++
 packages/client/src/ui/deck.vue           | 26 +++++++++++++++++++++++
 packages/client/src/ui/deck/deck-store.ts | 14 ++++++++++++
 6 files changed, 48 insertions(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index d0a152599..99b0a7c86 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1806,7 +1806,9 @@ _deck:
   popRight: "Pop column to the right"
   profile: "Workspace"
   newProfile: "New workspace"
+  renameProfile: "Rename workspace"
   deleteProfile: "Delete workspace"
+  nameAlreadyExists: "This workspace name already exists."
   introduction: "Create the perfect interface for you by arranging columns freely!"
   introduction2: "Click on the + on the right of the screen to add new colums whenever you want."
   widgetsIntroduction: "Please select \"Edit widgets\" in the column menu and add a widget."
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b5c102a65..5bd06f23e 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1803,7 +1803,9 @@ _deck:
   popRight: "右に出す"
   profile: "ワークスペース"
   newProfile: "新規ワークスペース"
+  renameProfile: "ワークスペース名を変更"
   deleteProfile: "ワークスペースを削除"
+  nameAlreadyExists: "この名前のワークスペースは既に存在します。"
   introduction: "カラムを組み合わせて自分だけのインターフェイスを作りましょう！"
   introduction2: "画面の右にある + を押して、いつでもカラムを追加できます。"
   widgetsIntroduction: "カラムのメニューから、「ウィジェットの編集」を選択してウィジェットを追加してください"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index e891e3d88..2784da81d 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1731,7 +1731,9 @@ _deck:
   popRight: "向右弹出"
   profile: "配置文件"
   newProfile: "新建配置文件"
+  renameProfile: "重命名配置文件"
   deleteProfile: "删除配置文件"
+  nameAlreadyExists: "该配置文件名已存在。"
   introduction: "将各列进行组合以创建您自己的界面！"
   introduction2: "您可以随时通过屏幕右侧的 + 来添加列"
   widgetsIntroduction: "从列菜单中，选择“小工具编辑”来添加小工具"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 4471444e9..3e8485adb 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1731,7 +1731,9 @@ _deck:
   popRight: "向右彈出"
   profile: "個人檔案"
   newProfile: "新建個人檔案"
+  renameProfile: "重新命名個人檔案"
   deleteProfile: "刪除個人檔案"
+  nameAlreadyExists: "該個人檔案名已經存在。"
   introduction: "組合欄位來製作屬於自己的介面吧！"
   introduction2: "您可以隨時透過按畫面右方的 + 來添加欄位。"
   widgetsIntroduction: "請從欄位的選單中，選擇「編輯小工具」來添加小工具"
diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index debf5d0e4..9de91fe56 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -70,6 +70,14 @@
 						>
 							<i class="ph-caret-down ph-bold ph-lg"></i>
 						</button>
+						<button
+							v-if="deckStore.state.profile !== 'default'"
+							v-tooltip.noDelay.left="i18n.ts._deck.renameProfile"
+							class="_button button"
+							@click="renameProfile"
+						>
+							<i class="ph-pencil ph-bold ph-lg"></i>
+						</button>
 						<button
 							v-if="deckStore.state.profile !== 'default'"
 							v-tooltip.noDelay.left="i18n.ts._deck.deleteProfile"
@@ -161,6 +169,7 @@ import {
 	addColumn as addColumnToStore,
 	loadDeck,
 	getProfiles,
+	renameProfile as renameProfile_,
 	deleteProfile as deleteProfile_,
 } from "./deck/deck-store";
 import DeckColumnCore from "@/ui/deck/column-core.vue";
@@ -319,6 +328,23 @@ function changeProfile(ev: MouseEvent) {
 	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
+async function renameProfile() {
+	const { canceled, result: newProfileName } = await os.inputText({
+		title: i18n.ts._deck.renameProfile,
+		allowEmpty: false,
+	});
+	if (canceled) return;
+
+	const profiles = await getProfiles();
+	if (profiles.includes(newProfileName)) {
+		os.alert({ type: "error", text: i18n.ts._deck.nameAlreadyExists });
+		return;
+	}
+
+	await renameProfile_(deckStore.state.profile, newProfileName);
+	unisonReload();
+}
+
 async function deleteProfile() {
 	const { canceled } = await os.confirm({
 		type: "warning",
diff --git a/packages/client/src/ui/deck/deck-store.ts b/packages/client/src/ui/deck/deck-store.ts
index 4c9df3559..a6db02ac5 100644
--- a/packages/client/src/ui/deck/deck-store.ts
+++ b/packages/client/src/ui/deck/deck-store.ts
@@ -115,6 +115,20 @@ export async function deleteProfile(key: string): Promise<any> {
 	});
 }
 
+export async function renameProfile(oldKey: string, newKey: string) {
+	if (oldKey === newKey) return;
+
+	await api("i/registry/set", {
+		scope: ["client", "deck", "profiles"],
+		key: newKey,
+		value: { columns: deckStore.state.columns, layout: deckStore.state.layout },
+	});
+	deckStore.set("profile", newKey);
+	saveDeck();
+
+	deleteProfile(oldKey);
+}
+
 export function addColumn(column: Column) {
 	if (column.name === undefined) column.name = null;
 	deckStore.push("columns", column);

From f7203b738c827d609cd07d4c9ab36c53c5415e1c Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Sat, 15 Apr 2023 17:53:17 +0000
Subject: [PATCH 466/582] fix: disable "Search" keyword (#9856)

Related: #9816 #9830
I was so careless that I didn't know "Search" was also a keyword. I disabled that and fixed a minor bug.

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9856
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 packages/client/src/components/mfm.ts | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 169fc7cfe..6f1b4256d 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -12,7 +12,6 @@ import MkGoogle from "@/components/MkGoogle.vue";
 import MkSparkle from "@/components/MkSparkle.vue";
 import MkA from "@/components/global/MkA.vue";
 import { host } from "@/config";
-import { MFM_TAGS } from "@/scripts/mfm-tags";
 import { reducedMotion } from "@/scripts/reduced-motion";
 import { defaultStore } from "@/store";
 
@@ -461,7 +460,7 @@ export default defineComponent({
 						case "search": {
 							// Disable "search" keyword
 							// (see the issue #9816 on Codeberg)
-							if (token.props.content.endsWith("search")) {
+							if (token.props.content.slice(-6).toLowerCase() === "search") {
 								const sentinel = "#";
 								let ast2 = (isPlain ? mfm.parseSimple : mfm.parse)(
 									token.props.content.slice(0, -6) + sentinel,
@@ -473,19 +472,32 @@ export default defineComponent({
 									ast2[ast2.length - 1].props.text = ast2[
 										ast2.length - 1
 									].props.text.slice(0, -1);
+								} else {
+									// I don't think this scope is reachable
+									console.warn(
+										"Something went wrong while parsing MFM. Please send a bug report, if possible.",
+									);
 								}
 
 								let prefix = "\n";
 								if (
 									index === 0 ||
-									["blockCode", "mathBlock", "search", "quote"].includes(
-										ast[index - 1].type,
-									)
+									[
+										"blockCode",
+										"center",
+										"mathBlock",
+										"quote",
+										"search",
+									].includes(ast[index - 1].type)
 								) {
 									prefix = "";
 								}
 
-								return [prefix, ...genEl(ast2), "search\n"];
+								return [
+									prefix,
+									...genEl(ast2),
+									`${token.props.content.slice(-6)}\n`,
+								];
 							}
 
 							return [

From e7c17bd8d833c0133ee12ee9c2140eadf148400f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 15 Apr 2023 13:16:13 -0700
Subject: [PATCH 467/582] read messages with dialog

---
 packages/client/src/pages/messaging/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 4afe832db..f18c37cac 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -122,7 +122,7 @@ window.addEventListener("resize", () => {
 });
 
 async function readAllMessagingMessages() {
-	await os.api("i/read-all-messaging-messages");
+	await os.apiWithDialog("i/read-all-messaging-messages");
 }
 
 const headerActions = $computed(() => [

From 6636e19e41df202f1cb2a1f60cdbf61bad241bcd Mon Sep 17 00:00:00 2001
From: Kaity A <supakaity@noreply.codeberg.org>
Date: Sat, 15 Apr 2023 21:56:17 +0000
Subject: [PATCH 468/582] Add continuation for thread reply level (#9821)

I think this will solve the continuation issue in threads where the reply level reaches 12 deep in the conversation thread, without getting to indent depth 5.

Co-authored-by: Kaity A <kaity@theallans.com.au>
Co-authored-by: Kaity A <supakaity@blahaj.zone>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9821
Co-authored-by: Kaity A <supakaity@noreply.codeberg.org>
Co-committed-by: Kaity A <supakaity@noreply.codeberg.org>
---
 packages/client/src/components/MkNoteSub.vue | 49 +++++++++++---------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 9c98ae15d..6a5d154ef 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -142,27 +142,31 @@
 			</div>
 		</div>
 		<template v-if="conversation">
-			<template v-if="replies.length == 1">
-				<MkNoteSub
-					v-for="reply in replies"
-					:key="reply.id"
-					:note="reply"
-					class="reply single"
-					:conversation="conversation"
-					:depth="depth"
-					:parentId="appearNote.replyId"
-				/>
-			</template>
-			<template v-else-if="depth < 5">
-				<MkNoteSub
-					v-for="reply in replies"
-					:key="reply.id"
-					:note="reply"
-					class="reply"
-					:conversation="conversation"
-					:depth="depth + 1"
-					:parentId="appearNote.replyId"
-				/>
+			<template v-if="replyLevel < 11 && depth < 5">
+				<template v-if="replies.length == 1">
+					<MkNoteSub
+						v-for="reply in replies"
+						:key="reply.id"
+						:note="reply"
+						class="reply single"
+						:conversation="conversation"
+						:depth="depth"
+						:replyLevel="replyLevel + 1"
+						:parentId="appearNote.replyId"
+					/>
+				</template>
+				<template v-else>
+					<MkNoteSub
+						v-for="reply in replies"
+						:key="reply.id"
+						:note="reply"
+						class="reply"
+						:conversation="conversation"
+						:depth="depth + 1"
+						:replyLevel="replyLevel + 1"
+						:parentId="appearNote.replyId"
+					/>
+				</template>
 			</template>
 			<div v-else-if="replies.length > 0" class="more">
 				<div class="line"></div>
@@ -206,9 +210,12 @@ const props = withDefaults(
 
 		// how many notes are in between this one and the note being viewed in detail
 		depth?: number;
+		// the actual reply level of this note within the conversation thread
+		replyLevel?: number;
 	}>(),
 	{
 		depth: 1,
+		replyLevel: 1,
 	}
 );
 

From c7c8d7320e4f0c6a2fbb23c88e78751cd0193dfe Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sun, 16 Apr 2023 08:26:04 +0000
Subject: [PATCH 469/582] Update 'patrons.json'

---
 patrons.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/patrons.json b/patrons.json
index 917451983..9e1e5e00b 100644
--- a/patrons.json
+++ b/patrons.json
@@ -22,6 +22,7 @@
 		"@unattributed@calckey.social",
 		"@cody@mk.codingneko.com",
 		"@kate@blahaj.zone",
+		"@emtk@mkkey.net",
 		"Interkosmos Link"
 	]
 }

From 61ce6fd0ea31c5a35781807b54f78b1540c7147f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 16 Apr 2023 17:35:10 -0700
Subject: [PATCH 470/582] feat: :sparkles: software name on hover icon in
 instance ticker

---
 packages/client/src/components/MkInstanceTicker.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue
index 8e2d17b2a..21de324e5 100644
--- a/packages/client/src/components/MkInstanceTicker.vue
+++ b/packages/client/src/components/MkInstanceTicker.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="hpaizdrt" ref="ticker" :style="bg">
-		<img class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" />
+		<img v-tooltip="instance.softwareName" class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" />
 		<span class="name">{{ instance.name }}</span>
 	</div>
 </template>
@@ -15,6 +15,7 @@ const props = defineProps<{
 		faviconUrl?: string;
 		name: string;
 		themeColor?: string;
+		softwareName?: string;
 	};
 }>();
 
@@ -29,6 +30,7 @@ const instance = props.instance ?? {
 			'meta[name="theme-color-orig"]'
 		) as HTMLMetaElement
 	)?.content,
+	software: Instance.softwareName || "Calckey",
 };
 
 const computedStyle = getComputedStyle(document.documentElement);

From 6d47c9d555fb810a1d6c8292030422030ffee13d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 16 Apr 2023 17:50:05 -0700
Subject: [PATCH 471/582] capitalize string

---
 packages/client/src/components/MkInstanceTicker.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue
index 21de324e5..f067f338b 100644
--- a/packages/client/src/components/MkInstanceTicker.vue
+++ b/packages/client/src/components/MkInstanceTicker.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="hpaizdrt" ref="ticker" :style="bg">
-		<img v-tooltip="instance.softwareName" class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" />
+		<img v-tooltip="capitalize(instance.softwareName)" class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" />
 		<span class="name">{{ instance.name }}</span>
 	</div>
 </template>
@@ -33,6 +33,8 @@ const instance = props.instance ?? {
 	software: Instance.softwareName || "Calckey",
 };
 
+const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1)
+
 const computedStyle = getComputedStyle(document.documentElement);
 const themeColor =
 	instance.themeColor ?? computedStyle.getPropertyValue("--bg");

From 772272a47692a3ed6fc3fe847b01730048142d56 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 16 Apr 2023 17:51:34 -0700
Subject: [PATCH 472/582] remove duplicate styles

---
 .../client/src/components/MkInstanceTicker.vue   | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue
index f067f338b..411f63171 100644
--- a/packages/client/src/components/MkInstanceTicker.vue
+++ b/packages/client/src/components/MkInstanceTicker.vue
@@ -54,15 +54,11 @@ function getInstanceIcon(instance): string {
 
 <style lang="scss" scoped>
 .hpaizdrt {
-	display: flex;
-	align-items: center;
-	height: 1.1em;
 	display: flex;
 	align-items: center;
 	height: 1.1em;
 	justify-self: flex-end;
 	padding: 0.2em 0.4em;
-	padding: 0.2em 0.4em;
 	border-radius: 100px;
 	font-size: 0.8em;
 	text-shadow: 0 2px 2px var(--shadow);
@@ -71,10 +67,6 @@ function getInstanceIcon(instance): string {
 		width: max-content;
 		max-width: 100%;
 	}
-	.header > .body & {
-		width: max-content;
-		max-width: 100%;
-	}
 
 	> .icon {
 		height: 100%;
@@ -82,27 +74,19 @@ function getInstanceIcon(instance): string {
 	}
 
 	> .name {
-		display: none;
 		display: none;
 		margin-left: 4px;
 		font-size: 0.85em;
-		font-size: 0.85em;
 		vertical-align: top;
 		font-weight: bold;
 		text-overflow: ellipsis;
 		white-space: nowrap;
-		text-overflow: ellipsis;
-		white-space: nowrap;
 		text-shadow: -1px -1px 0 var(--bg), 1px -1px 0 var(--bg),
 			-1px 1px 0 var(--bg), 1px 1px 0 var(--bg);
 		.article > .main &,
 		.header > .body & {
 			display: unset;
 		}
-		.article > .main &,
-		.header > .body & {
-			display: unset;
-		}
 	}
 }
 </style>

From 098d19cae1dbaec6a7b7d0954df57179cadfadbe Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 16 Apr 2023 17:52:14 -0700
Subject: [PATCH 473/582] move hover to entire ticker

---
 packages/client/src/components/MkInstanceTicker.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue
index 411f63171..31617fb6d 100644
--- a/packages/client/src/components/MkInstanceTicker.vue
+++ b/packages/client/src/components/MkInstanceTicker.vue
@@ -1,6 +1,6 @@
 <template>
-	<div class="hpaizdrt" ref="ticker" :style="bg">
-		<img v-tooltip="capitalize(instance.softwareName)" class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" />
+	<div class="hpaizdrt" v-tooltip="capitalize(instance.softwareName)"  ref="ticker" :style="bg">
+		<img class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" />
 		<span class="name">{{ instance.name }}</span>
 	</div>
 </template>

From 1678add2104e07a27a170f8e46e9bd0462f9565d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 16 Apr 2023 19:04:28 -0700
Subject: [PATCH 474/582] style announcement image

---
 packages/client/src/pages/announcements.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/client/src/pages/announcements.vue b/packages/client/src/pages/announcements.vue
index ba48f3bd0..8e9975020 100644
--- a/packages/client/src/pages/announcements.vue
+++ b/packages/client/src/pages/announcements.vue
@@ -81,6 +81,8 @@ definePageMetadata({
 				display: block;
 				max-height: 300px;
 				max-width: 100%;
+				border-radius: 10px;
+				margin-top: 1rem;
 			}
 		}
 	}

From db315b4f8fa2514d833e5bfcf73a307d8f0297dd Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Mon, 17 Apr 2023 02:21:19 +0000
Subject: [PATCH 475/582] docs: rm yunohost

has been broken for months, I don't maintain it either.
---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index af117ac4a..28c6d6bba 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@
 - 📖 JoinFediverse Wiki: <https://joinfediverse.wiki/What_is_Calckey%3F>
 - 🐋 Docker Hub: <https://hub.docker.com/r/thatonecalculator/calckey>
 - ✍️ Weblate: <https://hosted.weblate.org/engage/calckey/>
-- 📦 Yunohost: <https://github.com/YunoHost-Apps/calckey_ynh>
+<!-- - 📦 Yunohost: <https://github.com/YunoHost-Apps/calckey_ynh> -->
 
 # 🌠 Getting started
 
@@ -65,7 +65,8 @@ This guide will work for both **starting from scratch** and **migrating from Mis
 
 If you have access to a server that supports one of the sources below, I recommend you use it! Note that these methods *won't* allow you to migrate from Misskey without manual intervention.
 
-[![Install on Ubuntu](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png)](https://codeberg.org/calckey/ubuntu-bash-install)　　[![Install on the Arch User Repository](https://pool.jortage.com/voringme/misskey/ba2a5c07-f078-43f1-8483-2e01acca9c40.png)](https://aur.archlinux.org/packages/calckey)　　[![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
+[![Install on Ubuntu](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png)](https://codeberg.org/calckey/ubuntu-bash-install)　　[![Install on the Arch User Repository](https://pool.jortage.com/voringme/misskey/ba2a5c07-f078-43f1-8483-2e01acca9c40.png)](https://aur.archlinux.org/packages/calckey)
+<!-- [![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) -->
 
 ### 🐋 Docker
 

From ca7f24617b9ba004ff442dad119f7b78265ce913 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 16 Apr 2023 19:26:57 -0700
Subject: [PATCH 476/582] MkNumber for data in MkUserInfo

---
 packages/client/src/components/MkUserInfo.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/MkUserInfo.vue b/packages/client/src/components/MkUserInfo.vue
index 5841e6d41..3dd6f90cb 100644
--- a/packages/client/src/components/MkUserInfo.vue
+++ b/packages/client/src/components/MkUserInfo.vue
@@ -34,15 +34,15 @@
 		<div class="status">
 			<div>
 				<p>{{ i18n.ts.notes }}</p>
-				<span>{{ user.notesCount }}</span>
+				<MkNumber :value="user.notesCount"/>
 			</div>
 			<div>
 				<p>{{ i18n.ts.following }}</p>
-				<span>{{ user.followingCount }}</span>
+				<MkNumber :value="user.followingCount"/>
 			</div>
 			<div>
 				<p>{{ i18n.ts.followers }}</p>
-				<span>{{ user.followersCount }}</span>
+				<MkNumber :value="user.followersCount"/>
 			</div>
 		</div>
 		<MkFollowButton
@@ -57,6 +57,7 @@
 <script lang="ts" setup>
 import * as misskey from "calckey-js";
 import MkFollowButton from "@/components/MkFollowButton.vue";
+import MkNumber from "@/components/MkNumber.vue";
 import { userPage } from "@/filters/user";
 import { i18n } from "@/i18n";
 

From c2cc4534d59ee806bce28ef399bb3d3bb6ed08b8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 16 Apr 2023 19:38:29 -0700
Subject: [PATCH 477/582] chore: add weblate config file

---
 .weblate | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .weblate

diff --git a/.weblate b/.weblate
new file mode 100644
index 000000000..18f45edbb
--- /dev/null
+++ b/.weblate
@@ -0,0 +1,3 @@
+[weblate]
+url = https://hosted.weblate.org/api/
+translation = calckey/locales

From 1df7458d4e8c8e41e8179a8130cca8f620a2aab9 Mon Sep 17 00:00:00 2001
From: daikei <daikei@noreply.codeberg.org>
Date: Mon, 17 Apr 2023 08:02:29 +0000
Subject: [PATCH 478/582] [Fix] remove-trailing-slashes with inhouse script
 (#9869)

I'm looking to remove another 5kb package, replacing it with an in-house script. The commit i'm proposing translates the entire job of `koa-remove-trailing-slashes` into a 206 byte script that gets the job done well.

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9869
Co-authored-by: daikei <daikei@noreply.codeberg.org>
Co-committed-by: daikei <daikei@noreply.codeberg.org>
---
 packages/backend/package.json        | 1 -
 packages/backend/src/server/index.ts | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index b02af2c03..97e86cd26 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -78,7 +78,6 @@
 		"koa-json-body": "5.3.0",
 		"koa-logger": "3.2.1",
 		"koa-mount": "4.0.0",
-		"koa-remove-trailing-slashes": "2.0.3",
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index be1f71a7a..16f1a1034 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -10,7 +10,6 @@ import Router from "@koa/router";
 import mount from "koa-mount";
 import koaLogger from "koa-logger";
 import * as slow from "koa-slow";
-
 import { IsNull } from "typeorm";
 import config from "@/config/index.js";
 import Logger from "@/services/logger.js";
@@ -30,7 +29,6 @@ import proxyServer from "./proxy/index.js";
 import webServer from "./web/index.js";
 import { initializeStreamingServer } from "./api/streaming.js";
 import { koaBody } from "koa-body";
-import removeTrailingSlash from "koa-remove-trailing-slashes";
 import { v4 as uuid } from "uuid";
 
 export const serverLogger = new Logger("server", "gray", false);
@@ -39,7 +37,11 @@ export const serverLogger = new Logger("server", "gray", false);
 const app = new Koa();
 app.proxy = true;
 
-app.use(removeTrailingSlash());
+// Replace trailing slashes 
+app.use(async (ctx, next) => {
+	if (ctx.request.path !== "/" && ctx.request.path.endsWith('/')) return ctx.redirect(ctx.request.path.replace(/\/$/, ""))
+	else next()
+});
 
 if (!["production", "test"].includes(process.env.NODE_ENV || "")) {
 	// Logger

From e006d96aac88c30c6924a5c4e8dec258aae9ff55 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 17 Apr 2023 01:03:56 -0700
Subject: [PATCH 479/582] formatting

---
 packages/backend/src/server/index.ts                | 7 ++++---
 packages/client/src/components/MkInstanceTicker.vue | 9 +++++++--
 packages/client/src/components/MkUserInfo.vue       | 6 +++---
 pnpm-lock.yaml                                      | 7 -------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 16f1a1034..a8eccc5fc 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -37,10 +37,11 @@ export const serverLogger = new Logger("server", "gray", false);
 const app = new Koa();
 app.proxy = true;
 
-// Replace trailing slashes 
+// Replace trailing slashes
 app.use(async (ctx, next) => {
-	if (ctx.request.path !== "/" && ctx.request.path.endsWith('/')) return ctx.redirect(ctx.request.path.replace(/\/$/, ""))
-	else next()
+	if (ctx.request.path !== "/" && ctx.request.path.endsWith("/"))
+		return ctx.redirect(ctx.request.path.replace(/\/$/, ""));
+	else next();
 });
 
 if (!["production", "test"].includes(process.env.NODE_ENV || "")) {
diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue
index 31617fb6d..3558b53d8 100644
--- a/packages/client/src/components/MkInstanceTicker.vue
+++ b/packages/client/src/components/MkInstanceTicker.vue
@@ -1,5 +1,10 @@
 <template>
-	<div class="hpaizdrt" v-tooltip="capitalize(instance.softwareName)"  ref="ticker" :style="bg">
+	<div
+		class="hpaizdrt"
+		v-tooltip="capitalize(instance.softwareName)"
+		ref="ticker"
+		:style="bg"
+	>
 		<img class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" />
 		<span class="name">{{ instance.name }}</span>
 	</div>
@@ -33,7 +38,7 @@ const instance = props.instance ?? {
 	software: Instance.softwareName || "Calckey",
 };
 
-const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1)
+const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1);
 
 const computedStyle = getComputedStyle(document.documentElement);
 const themeColor =
diff --git a/packages/client/src/components/MkUserInfo.vue b/packages/client/src/components/MkUserInfo.vue
index 3dd6f90cb..e2b579eaf 100644
--- a/packages/client/src/components/MkUserInfo.vue
+++ b/packages/client/src/components/MkUserInfo.vue
@@ -34,15 +34,15 @@
 		<div class="status">
 			<div>
 				<p>{{ i18n.ts.notes }}</p>
-				<MkNumber :value="user.notesCount"/>
+				<MkNumber :value="user.notesCount" />
 			</div>
 			<div>
 				<p>{{ i18n.ts.following }}</p>
-				<MkNumber :value="user.followingCount"/>
+				<MkNumber :value="user.followingCount" />
 			</div>
 			<div>
 				<p>{{ i18n.ts.followers }}</p>
-				<MkNumber :value="user.followersCount"/>
+				<MkNumber :value="user.followersCount" />
 			</div>
 		</div>
 		<MkFollowButton
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7e62b9ef3..c875c9fed 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -236,9 +236,6 @@ importers:
       koa-mount:
         specifier: 4.0.0
         version: 4.0.0
-      koa-remove-trailing-slashes:
-        specifier: 2.0.3
-        version: 2.0.3
       koa-send:
         specifier: 5.0.1
         version: 5.0.1
@@ -9861,10 +9858,6 @@ packages:
       - supports-color
     dev: false
 
-  /koa-remove-trailing-slashes@2.0.3:
-    resolution: {integrity: sha512-NFFF9Sl1wxFo5h0I3OzrHDINdFPaqG+Hx19590F7PNOcmm7yYeFW71p4XicVuSovbcx75GWGb3fi6N6kI6E/3g==}
-    dev: false
-
   /koa-router@10.1.1:
     resolution: {integrity: sha512-z/OzxVjf5NyuNO3t9nJpx7e1oR3FSBAauiwXtMQu4ppcnuNZzTaQ4p21P8A6r2Es8uJJM339oc4oVW+qX7SqnQ==}
     engines: {node: '>= 8.0.0'}

From d1cff9be8d6ec86922b181e6295c29fd19d26565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Tomaszewski?= <jeder@jeder.pl>
Date: Mon, 17 Apr 2023 06:20:47 +0000
Subject: [PATCH 480/582] chore: Translated using Weblate (Polish)

Currently translated at 99.7% (1720 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/pl/
---
 locales/pl-PL.yml | 825 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 607 insertions(+), 218 deletions(-)

diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index a7cbec5b6..9734663f9 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1,7 +1,8 @@
----
 _lang_: "Polski"
-headlineMisskey: "Sieć połączona wpisami"
-introMisskey: "Misskey jest serwisem mikroblogowym typu open source.\nMisskey to opensource'owy serwis mikroblogowy, w którym możesz tworzyć \"notatki\", aby dzielić się tym, co się dzieje i opowiadać wszystkim o sobie.\nMożesz również użyć funkcji \"Reakcje\", aby szybko dodać własne reakcje do notatek innych użytkowników👍.\nOdkrywaj nowy świat🚀!"
+headlineMisskey: "Otwartoźródłowa, zdecentralizowana sieć społecznościowa, która zawsze\
+  \ będzie darmowa! \U0001F680"
+introMisskey: "Hej! Calckey to otwartoźródłowa oraz zdecentralizowana sieć społecznościowa,\
+  \ która zawsze będzie darmowa! \U0001F680"
 monthAndDay: "{month}-{day}"
 search: "Szukaj"
 notifications: "Powiadomienia"
@@ -13,7 +14,7 @@ ok: "OK"
 gotIt: "Rozumiem!"
 cancel: "Anuluj"
 enterUsername: "Wprowadź nazwę użytkownika"
-renotedBy: "Udostępniono przez {user}"
+renotedBy: "Podbito przez {user}"
 noNotes: "Brak wpisów"
 noNotifications: "Brak powiadomień"
 instance: "Instancja"
@@ -23,50 +24,53 @@ otherSettings: "Pozostałe ustawienia"
 openInWindow: "Otwórz w oknie"
 profile: "Profil"
 timeline: "Oś czasu"
-noAccountDescription: "Ten użytkownik nie napisał jeszcze swojej biografii."
+noAccountDescription: "Ten użytkownik nie napisał jeszcze swojego opisu."
 login: "Zaloguj się"
 loggingIn: "Logowanie"
 logout: "Wyloguj się"
 signup: "Zarejestruj się"
-uploading: "Wysyłanie"
+uploading: "Wysyłanie..."
 save: "Zapisz"
 users: "Użytkownicy"
 addUser: "Dodaj użytkownika"
 favorite: "Dodaj do ulubionych"
-favorites: "Ulubione"
-unfavorite: "Usuń z ulubionych"
-favorited: "Dodano do ulubionych."
-alreadyFavorited: "Już jest w ulubionych."
-cantFavorite: "Nie można dodać do ulubionych."
+favorites: "Zakładki"
+unfavorite: "Usuń zakładkę"
+favorited: "Dodano do zakładek."
+alreadyFavorited: "Już jest w zakładkach."
+cantFavorite: "Nie można dodać do zakładek."
 pin: "Przypnij do profilu"
 unpin: "Odepnij z profilu"
 copyContent: "Skopiuj zawartość"
 copyLink: "Skopiuj odnośnik"
 delete: "Usuń"
 deleteAndEdit: "Usuń i edytuj"
-deleteAndEditConfirm: "Czy na pewno chcesz usunąć ten wpis i zedytować go? Utracisz wszystkie reakcje, udostępnienia i odpowiedzi do tego wpisu."
+deleteAndEditConfirm: "Czy na pewno chcesz usunąć ten wpis i zedytować go? Utracisz\
+  \ wszystkie reakcje, podbicia i odpowiedzi do tego wpisu."
 addToList: "Dodaj do listy"
 sendMessage: "Wyślij wiadomość"
 copyUsername: "Kopiuj nazwę użytkownika"
 searchUser: "Wyszukiwanie użytkowników"
 reply: "Odpowiedz"
 loadMore: "Załaduj więcej"
-showMore: "Załaduj więcej"
+showMore: "Pokaż więcej"
 showLess: "Zamknij"
-youGotNewFollower: "Zaobserwował(a) Cię"
+youGotNewFollower: "Zaobserwował* Cię"
 receiveFollowRequest: "Otrzymano prośbę o możliwość obserwacji"
 followRequestAccepted: "Zaakceptowano prośbę o możliwość obserwacji"
 mention: "Wspomnij"
 mentions: "Wspomnienia"
-directNotes: "Bezpośrednie wpisy"
-importAndExport: "Import i eksport"
+directNotes: "Bezpośrednie wiadomości"
+importAndExport: "Import i eksport danych"
 import: "Importuj"
 export: "Eksportuj"
 files: "Pliki"
 download: "Pobierz"
-driveFileDeleteConfirm: "Czy chcesz usunąć plik \"{name}\"? Zniknie również notatka, do której dołączony jest ten plik."
+driveFileDeleteConfirm: "Czy chcesz usunąć plik \"{name}\"? Zniknie również wpis,\
+  \ do której dołączony jest ten plik."
 unfollowConfirm: "Czy na pewno chcesz przestać obserwować {name}?"
-exportRequested: "Zażądałeś eksportu. Może to zająć trochę czasu. Po zakończeniu eksportu zostanie on dodany do Twoich \"dysków\"."
+exportRequested: "Zażądałeś eksportu. Może to zająć chwilę. Po zakończeniu eksportu\
+  \ zostanie on dodany do Twojego dysku."
 importRequested: "Zażądano importu. Może to zająć chwilę."
 lists: "Listy"
 noLists: "Nie masz żadnych list"
@@ -80,11 +84,12 @@ manageLists: "Zarządzaj listami"
 error: "Błąd"
 somethingHappened: "Coś poszło nie tak"
 retry: "Spróbuj ponownie"
-pageLoadError: "Nie udało się załadować strony"
-pageLoadErrorDescription: "Zwykle jest to spowodowane problemem z siecią lub cache przeglądarki. Spróbuj wyczyścić cache i sprawdź jeszcze raz za chwilę."
+pageLoadError: "Nie udało się załadować strony."
+pageLoadErrorDescription: "Zwykle jest to spowodowane problemem z siecią lub cache\
+  \ przeglądarki. Spróbuj wyczyścić cache i sprawdź jeszcze raz za chwilę."
 serverIsDead: "Serwer nie odpowiada. Zaczekaj chwilę i spróbuj ponownie."
-youShouldUpgradeClient: "Odśwież stronę, by zaaktualizować klienta."
-enterListName: "Nazwa listy"
+youShouldUpgradeClient: "Aby zobaczyć tą stronę, odśwież ją, by zaaktualizować klienta."
+enterListName: "Wpisz nazwę listy"
 privacy: "Prywatność"
 makeFollowManuallyApprove: "Prośby o możliwość obserwacji wymagają zatwierdzenia"
 defaultNoteVisibility: "Domyślna widoczność"
@@ -94,11 +99,11 @@ followRequests: "Prośby o możliwość obserwacji"
 unfollow: "Przestań obserwować"
 followRequestPending: "Oczekująca prośba o możliwość obserwacji"
 enterEmoji: "Wprowadź emoji"
-renote: "Udostępnij"
-unrenote: "Cofnij udostępnienie"
-renoted: "Udostępniono."
-cantRenote: "Ten wpis nie może zostać udostępniony."
-cantReRenote: "Udostępnienie nie może zostać udostępnione."
+renote: "Podbij"
+unrenote: "Cofnij podbicie"
+renoted: "Podbito."
+cantRenote: "Ten wpis nie może zostać podbity."
+cantReRenote: "Podbicie nie może zostać podbite."
 quote: "Cytuj"
 pinnedNote: "Przypięty wpis"
 pinned: "Przypnij do profilu"
@@ -108,7 +113,8 @@ sensitive: "NSFW"
 add: "Dodaj"
 reaction: "Reakcja"
 reactionSetting: "Reakcje do pokazania w wyborniku reakcji"
-reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć, naciśnij „+” aby dodać"
+reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć,\
+  \ naciśnij „+” aby dodać."
 rememberNoteVisibility: "Zapamiętuj ustawienia widoczności wpisu"
 attachCancel: "Usuń załącznik"
 markAsSensitive: "Oznacz jako NSFW"
@@ -125,7 +131,7 @@ unblockConfirm: "Czy na pewno chcesz odblokować to konto?"
 suspendConfirm: "Czy na pewno chcesz zawiesić to konto?"
 unsuspendConfirm: "Czy na pewno chcesz cofnąć zawieszenie tego konta?"
 selectList: "Wybierz listę"
-selectAntenna: "Wybierz Antennę"
+selectAntenna: "Wybierz antenę"
 selectWidget: "Wybierz widżet"
 editWidgets: "Edytuj widżety"
 editWidgetsExit: "Gotowe"
@@ -137,13 +143,19 @@ emojiUrl: "Adres URL emoji"
 addEmoji: "Dodaj emoji"
 settingGuide: "Proponowana konfiguracja"
 cacheRemoteFiles: "Przechowuj zdalne pliki w pamięci podręcznej"
-cacheRemoteFilesDescription: "Gdy ta opcja jest wyłączona, zdalne pliki są ładowane bezpośrednio ze zdalnych instancji. Wyłączenie the opcji zmniejszy użycie powierzchni dyskowej, ale zwiększy transfer, ponieważ miniaturki nie będą generowane."
+cacheRemoteFilesDescription: "Gdy ta opcja jest wyłączona, zdalne pliki są ładowane\
+  \ bezpośrednio ze zdalnych instancji. Wyłączenie the opcji zmniejszy użycie powierzchni\
+  \ dyskowej, ale zwiększy transfer, ponieważ miniaturki nie będą generowane."
 flagAsBot: "To konto jest botem"
-flagAsBotDescription: "Jeżeli ten kanał jest kontrolowany przez jakiś program, ustaw tę opcję. Jeżeli włączona, będzie działać jako flaga informująca innych programistów, aby zapobiegać nieskończonej interakcji z różnymi botami i dostosowywać wewnętrzne systemy Misskey, traktując konto jako bota."
-flagAsCat: "To konto jest kotem"
-flagAsCatDescription: "Przełącz tę opcję, aby konto było oznaczone jako kot."
+flagAsBotDescription: "Jeżeli ten kanał jest kontrolowany przez jakiś program, ustaw\
+  \ tę opcję. Jeżeli włączona, będzie działać jako flaga informująca innych programistów,\
+  \ aby zapobiegać nieskończonej interakcji z różnymi botami i dostosowywać wewnętrzne\
+  \ systemy Calckey, traktując konto jako bota."
+flagAsCat: "Czy jesteś kotem? \U0001F63A"
+flagAsCatDescription: "Dostaniesz kocie uszka, oraz będziesz mówić jak kot!"
 flagShowTimelineReplies: "Pokazuj odpowiedzi na osi czasu"
-autoAcceptFollowed: "Automatycznie przyjmuj prośby o możliwość obserwacji od użytkowników, których obserwujesz"
+autoAcceptFollowed: "Automatycznie przyjmuj prośby o możliwość obserwacji od użytkowników,\
+  \ których obserwujesz"
 addAccount: "Dodaj konto"
 loginFailed: "Nie udało się zalogować"
 showOnRemote: "Zobacz na zdalnej instancji"
@@ -157,7 +169,7 @@ followConfirm: "Czy na pewno chcesz zaobserwować {name}?"
 proxyAccount: "Konto proxy"
 host: "Host"
 selectUser: "Wybierz użytkownika"
-recipient: "Odbiorca"
+recipient: "Odbiorca(-y)"
 annotation: "Komentarze"
 federation: "Federacja"
 instances: "Instancja"
@@ -175,7 +187,7 @@ operations: "Działania"
 software: "Oprogramowanie"
 version: "Wersja"
 metadata: "Metadane"
-withNFiles: "{n} plik(i)"
+withNFiles: "{n} plik(i/ów)"
 monitor: "Monitor"
 jobQueue: "Kolejka zadań"
 cpuAndMemory: "CPU i pamięć"
@@ -185,21 +197,24 @@ instanceInfo: "Informacje o instancji"
 statistics: "Statystyki"
 clearQueue: "Wyczyść kolejkę"
 clearQueueConfirmTitle: "Czy na pewno chcesz wyczyścić kolejkę?"
-clearQueueConfirmText: "Wszystkie niewysłane wpisy z kolejki nie zostaną wysłane. Zwykle to nie jest konieczne."
+clearQueueConfirmText: "Wszystkie niewysłane wpisy z kolejki nie zostaną wysłane.\
+  \ Zwykle to nie jest konieczne."
 clearCachedFiles: "Wyczyść pamięć podręczną"
-clearCachedFilesConfirm: "Czy na pewno chcesz usunąć wszystkie zdalne pliki z pamięci podręcznej?"
+clearCachedFilesConfirm: "Czy na pewno chcesz usunąć wszystkie zdalne pliki z pamięci\
+  \ podręcznej?"
 blockedInstances: "Zablokowane instancje"
-blockedInstancesDescription: "Wypisz nazwy hostów instancji, które powinny zostać zablokowane. Wypisane instancje nie będą mogły dłużej komunikować się z tą instancją."
-muteAndBlock: "Wycisz / Zablokuj"
+blockedInstancesDescription: "Wypisz nazwy hostów instancji, które powinny zostać\
+  \ zablokowane. Wypisane instancje nie będą mogły dłużej komunikować się z tą instancją."
+muteAndBlock: "Wyciszenia i blokady"
 mutedUsers: "Wyciszeni użytkownicy"
 blockedUsers: "Zablokowani użytkownicy"
 noUsers: "Brak użytkowników"
 editProfile: "Edytuj profil"
 noteDeleteConfirm: "Czy na pewno chcesz usunąć ten wpis?"
-pinLimitExceeded: "Nie możesz przypiąć więcej wpisów."
-intro: "Zakończono instalację Misskey! Utwórz konto administratora."
+pinLimitExceeded: "Nie możesz przypiąć więcej wpisów"
+intro: "Zakończono instalację Calckey! Utwórz konto administratora."
 done: "Gotowe"
-processing: "Przetwarzanie"
+processing: "Przetwarzanie..."
 preview: "Podgląd"
 default: "Domyślne"
 defaultValueIs: "Domyślne: {value}"
@@ -253,7 +268,8 @@ agreeTo: "Wyrażam zgodę na {0}"
 tos: "Regulamin"
 start: "Rozpocznij"
 home: "Strona główna"
-remoteUserCaution: "Te informacje mogą nie być aktualne, ponieważ użytkownik pochodzi ze zdalnej instancji."
+remoteUserCaution: "Te informacje mogą nie być aktualne, ponieważ użytkownik pochodzi\
+  \ ze zdalnej instancji."
 activity: "Aktywność"
 images: "Zdjęcia"
 birthday: "Data urodzenia"
@@ -286,7 +302,8 @@ unableToDelete: "Nie można usunąć"
 inputNewFileName: "Wprowadź nową nazwę pliku"
 inputNewDescription: "Proszę wpisać nowy napis"
 inputNewFolderName: "Wprowadź nową nazwę katalogu"
-circularReferenceFolder: "Katalog docelowy jest podkatalogiem katalogu, który chcesz przenieść."
+circularReferenceFolder: "Katalog docelowy jest podkatalogiem katalogu, który chcesz\
+  \ przenieść."
 hasChildFilesOrFolders: "Ponieważ ten katalog nie jest pusty, nie może być usunięty."
 copyUrl: "Skopiuj adres URL"
 rename: "Zmień nazwę"
@@ -294,7 +311,7 @@ avatar: "Awatar"
 banner: "Baner"
 nsfw: "NSFW"
 whenServerDisconnected: "Po utracie połączenia z serwerem"
-disconnectedFromServer: "Utracono połączenie z serwerem."
+disconnectedFromServer: "Utracono połączenie z serwerem"
 reload: "Odśwież"
 doNothing: "Ignoruj"
 reloadConfirm: "Czy chcesz odświeżyć oś czasu?"
@@ -315,12 +332,13 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Strony"
-integration: "Integracja"
+integration: "Integracje"
 connectService: "Połącz"
 disconnectService: "Rozłącz"
 enableLocalTimeline: "Włącz lokalną oś czasu"
 enableGlobalTimeline: "Włącz globalną oś czasu"
-disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dostęp do wszystkich osi czasu, nawet gdy są one wyłączone."
+disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dostęp do\
+  \ wszystkich osi czasu, nawet gdy są one wyłączone."
 registration: "Zarejestruj się"
 enableRegistration: "Włącz rejestrację nowych użytkowników"
 invite: "Zaproś"
@@ -332,9 +350,11 @@ bannerUrl: "Adres URL banera"
 backgroundImageUrl: "Adres URL tła"
 basicInfo: "Podstawowe informacje"
 pinnedUsers: "Przypięty użytkownik"
-pinnedUsersDescription: "Wypisz po jednej nazwie użytkownika w wierszu. Podani użytkownicy zostaną przypięci pod kartą „Eksploruj”."
+pinnedUsersDescription: "Wypisz po jednej nazwie użytkownika w wierszu. Podani użytkownicy\
+  \ zostaną przypięci pod kartą „Eksploruj”."
 pinnedPages: "Przypięte strony"
-pinnedPagesDescription: "Wprowadź ścieżki stron które chcesz przypiąć na głównej stronie instancji, oddzielone znakiem nowego wiersza."
+pinnedPagesDescription: "Wprowadź ścieżki stron które chcesz przypiąć na głównej stronie\
+  \ instancji, oddzielone znakiem nowego wiersza."
 pinnedClipId: "ID przypiętego klipu"
 pinnedNotes: "Przypięty wpis"
 hcaptcha: "hCaptcha"
@@ -345,17 +365,19 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "Włącz reCAPTCHA"
 recaptchaSiteKey: "Klucz strony"
 recaptchaSecretKey: "Tajny klucz"
-avoidMultiCaptchaConfirm: "Używanie wielu Captchy może spowodować zakłócenia. Czy chcesz wyłączyć inną Captchę? Możesz zostawić wiele jednocześnie, klikając Anuluj."
+avoidMultiCaptchaConfirm: "Używanie wielu Captchy może spowodować zakłócenia. Czy\
+  \ chcesz wyłączyć inną Captchę? Możesz zostawić wiele jednocześnie, klikając Anuluj."
 antennas: "Anteny"
-manageAntennas: "Zarządzaj Antenami"
+manageAntennas: "Zarządzaj antenami"
 name: "Nazwa"
-antennaSource: "Źródło Anteny"
+antennaSource: "Źródło anteny"
 antennaKeywords: "Słowa kluczowe do obserwacji"
 antennaExcludeKeywords: "Wykluczone słowa kluczowe"
-antennaKeywordsDescription: "Oddziel spacjami dla warunku AND, albo wymuś koniec linii dla warunku OR"
+antennaKeywordsDescription: "Oddziel spacjami dla warunku AND, albo wymuś koniec linii\
+  \ dla warunku OR."
 notifyAntenna: "Powiadamiaj o nowych wpisach"
 withFileAntenna: "Filtruj tylko wpisy z załączonym plikiem"
-enableServiceworker: "Włącz ServiceWorker"
+enableServiceworker: "Włącz powiadomienia push dla twojej przeglądarki"
 antennaUsersDescription: "Wypisz po jednej nazwie użytkownika w linii"
 caseSensitive: "Wielkość liter ma znaczenie"
 withReplies: "Uwzględnij odpowiedzi"
@@ -375,7 +397,7 @@ exploreFediverse: "Eksploruj Fediwersum"
 popularTags: "Tagi na czasie"
 userList: "Listy"
 about: "Informacje"
-aboutMisskey: "O Misskey"
+aboutMisskey: "O Calckey"
 administrator: "Admin"
 token: "Token"
 twoStepAuthentication: "Uwierzytelnianie dwuskładnikowe"
@@ -402,7 +424,7 @@ markAsReadAllTalkMessages: "Oznacz wszystkie wiadomości jako przeczytane"
 help: "Pomoc"
 inputMessageHere: "Wprowadź wiadomość tutaj"
 close: "Zamknij"
-group: "Grupy"
+group: "Grupa"
 groups: "Grupy"
 createGroup: "Utwórz grupę"
 ownedGroups: "Posiadane grupy"
@@ -428,10 +450,10 @@ onlyOneFileCanBeAttached: "Możesz załączyć tylko jeden plik do wiadomości"
 signinRequired: "Proszę się zalogować"
 invitations: "Zaproś"
 invitationCode: "Kod zaproszenia"
-checking: "Sprawdzam"
+checking: "Sprawdzam..."
 available: "Dostępna"
 unavailable: "Niedostępna"
-usernameInvalidFormat: "może zawierać litery, cyfry i podkreślniki."
+usernameInvalidFormat: "Nazwa użytkownika może zawierać litery, cyfry i podkreślniki."
 tooShort: "Zbyt krótka"
 tooLong: "Zbyt długa"
 weakPassword: "Słabe hasło"
@@ -440,7 +462,8 @@ strongPassword: "Silne hasło"
 passwordMatched: "Pasuje"
 passwordNotMatched: "Hasła nie pasują do siebie"
 signinWith: "Zaloguj się z {x}"
-signinFailed: "Nie udało się zalogować. Wprowadzona nazwa użytkownika lub hasło są nieprawidłowe."
+signinFailed: "Nie udało się zalogować. Wprowadzona nazwa użytkownika lub hasło są\
+  \ nieprawidłowe."
 tapSecurityKey: "Wybierz swój klucz bezpieczeństwa"
 or: "Lub"
 language: "Język"
@@ -486,13 +509,18 @@ objectStorageBucketDesc: "Podaj nazwę „wiadra” używaną przez konfigurowan
 objectStoragePrefix: "Prefiks"
 objectStoragePrefixDesc: "Pliki będą przechowywane w katalogu z tym prefiksem."
 objectStorageEndpoint: "Punkt końcowy"
-objectStorageEndpointDesc: "Pozostaw puste jeżeli używasz AWS S3, w innym wypadku określ punkt końcowy jako '<host>' lub '<host>:<port>' zgodnie z instrukcjami usługi, której używasz."
+objectStorageEndpointDesc: "Pozostaw puste jeżeli używasz AWS S3, w innym wypadku\
+  \ określ punkt końcowy jako '<host>' lub '<host>:<port>' zgodnie z instrukcjami\
+  \ usługi, której używasz."
 objectStorageRegion: "Region"
-objectStorageRegionDesc: "Określ region, np. 'xx-east-1'. Jeżeli usługa której używasz nie zawiera rozróżnienia regionów, pozostaw to pustym lub wprowadź 'us-east-1'."
+objectStorageRegionDesc: "Określ region, np. 'xx-east-1'. Jeżeli usługa której używasz\
+  \ nie zawiera rozróżnienia regionów, pozostaw to pustym lub wprowadź 'us-east-1'."
 objectStorageUseSSL: "Użyj SSL"
-objectStorageUseSSLDesc: "Wyłącz, jeżeli nie zamierzasz używać HTTPS dla połączenia z API"
+objectStorageUseSSLDesc: "Wyłącz, jeżeli nie zamierzasz używać HTTPS dla połączenia\
+  \ z API"
 objectStorageUseProxy: "Połącz przez proxy"
-objectStorageUseProxyDesc: "Wyłącz, jeżeli nie zamierzasz używać proxy dla połączenia z pamięcią blokową"
+objectStorageUseProxyDesc: "Wyłącz, jeżeli nie zamierzasz używać proxy dla połączenia\
+  \ z pamięcią blokową"
 serverLogs: "Dziennik zdarzeń"
 deleteAll: "Usuń wszystkie"
 showFixedPostForm: "Wyświetlaj formularz tworzenia wpisu w górnej części osi czasu"
@@ -506,7 +534,7 @@ volume: "Głośność"
 masterVolume: "Głośność główna"
 details: "Szczegóły"
 chooseEmoji: "Wybierz emoji"
-unableToProcess: "Nie udało się dokończyć działania."
+unableToProcess: "Nie udało się dokończyć działania"
 recentUsed: "Ostatnio używane"
 install: "Zainstaluj"
 uninstall: "Odinstaluj"
@@ -519,18 +547,22 @@ sort: "Sortuj"
 ascendingOrder: "Rosnąco"
 descendingOrder: "Malejąco"
 scratchpad: "Brudnopis"
-scratchpadDescription: "Brudnopis zawiera eksperymentalne środowisko dla AiScript. Możesz pisać, wykonywać i sprawdzać wyniki w interakcji z Misskey."
+scratchpadDescription: "Brudnopis to środowisko dla eksperymentów z AiScript. Możesz\
+  \ pisać, wykonywać i sprawdzać wyniki interakcji skryptu z Calckey."
 output: "Wyjście"
 script: "Skrypt"
 disablePagesScript: "Wyłącz AiScript na Stronach"
 updateRemoteUser: "Aktualizuj zdalne dane o użytkowniku"
 deleteAllFiles: "Usuń wszystkie pliki"
 deleteAllFilesConfirm: "Czy na pewno chcesz usunąć wszystkie pliki?"
-removeAllFollowingDescription: "Przestań obserwować wszystkie konta z {host}. Wykonaj to, jeżeli instancja już nie istnieje."
+removeAllFollowingDescription: "Przestań obserwować wszystkie konta z {host}. Wykonaj\
+  \ to, jeżeli instancja już nie istnieje."
 userSuspended: "To konto zostało zawieszone."
 userSilenced: "Ten użytkownik został wyciszony."
 yourAccountSuspendedTitle: "To konto jest zawieszone"
-yourAccountSuspendedDescription: "To konto zostało zawieszone z powodu złamania regulaminu serwera lub innych podobnych. Skontaktuj się z administratorem, jeśli chciałbyś poznać bardziej szczegółowy powód. Proszę nie zakładać nowego konta."
+yourAccountSuspendedDescription: "To konto zostało zawieszone z powodu złamania regulaminu\
+  \ serwera lub innych podobnych. Skontaktuj się z administratorem, jeśli chciałbyś\
+  \ poznać bardziej szczegółowy powód. Proszę nie zakładać nowego konta."
 menu: "Menu"
 divider: "Rozdzielacz"
 addItem: "Dodaj element"
@@ -569,12 +601,14 @@ permission: "Uprawnienia"
 enableAll: "Włącz wszystko"
 disableAll: "Wyłącz wszystko"
 tokenRequested: "Przydziel dostęp do konta"
-pluginTokenRequestedDescription: "Ta wtyczka będzie mogła korzystać z ustawionych tu uprawnień."
+pluginTokenRequestedDescription: "Ta wtyczka będzie mogła korzystać z ustawionych\
+  \ tu uprawnień."
 notificationType: "Rodzaj powiadomień"
 edit: "Edytuj"
 emailServer: "Serwer poczty e-mail"
 enableEmail: "Włącz dostarczanie wiadomości e-mail"
-emailConfigInfo: "Wykorzystywany do potwierdzenia adresu e-mail w trakcie rejestracji, lub gdy zapomnisz hasła"
+emailConfigInfo: "Wykorzystywany do potwierdzenia adresu e-mail w trakcie rejestracji,\
+  \ lub gdy zapomnisz hasła"
 email: "Adres e-mail"
 emailAddress: "Adres e-mail"
 smtpConfig: "Konfiguracja serwera SMTP"
@@ -582,12 +616,13 @@ smtpHost: "Host"
 smtpPort: "Port"
 smtpUser: "Nazwa użytkownika"
 smtpPass: "Hasło"
-emptyToDisableSmtpAuth: "Pozostaw adres e-mail i hasło puste, aby wyłączyć weryfikację SMTP"
+emptyToDisableSmtpAuth: "Pozostaw adres e-mail i hasło puste, aby wyłączyć weryfikację\
+  \ SMTP"
 smtpSecureInfo: "Wyłącz, jeżeli używasz STARTTLS"
 testEmail: "Przetestuj dostarczanie wiadomości e-mail"
 wordMute: "Wyciszenie słowa"
 instanceMute: "Wyciszone instancje"
-userSaysSomething: "{name} powiedział(-a) coś"
+userSaysSomething: "{name} powiedział* coś"
 makeActive: "Aktywuj"
 display: "Wyświetlanie"
 copy: "Kopiuj"
@@ -599,12 +634,14 @@ database: "Baza danych"
 channel: "Kanały"
 create: "Utwórz"
 notificationSetting: "Ustawienia powiadomień"
-notificationSettingDesc: "Wybierz rodzaj powiadomień do wyświetlania"
+notificationSettingDesc: "Wybierz rodzaj powiadomień do wyświetlania."
 useGlobalSetting: "Użyj globalnych ustawień"
-useGlobalSettingDesc: "Jeżeli włączone, zostaną wykorzystane ustawienia powiadomień Twojego konta. Jeżeli wyłączone, mogą zostać wykonane oddzielne konfiguracje."
+useGlobalSettingDesc: "Jeżeli włączone, zostaną wykorzystane ustawienia powiadomień\
+  \ Twojego konta. Jeżeli wyłączone, mogą zostać wykonane oddzielne konfiguracje."
 other: "Inne"
 regenerateLoginToken: "Generuj token logowania ponownie"
-regenerateLoginTokenDescription: "Regeneruje token używany wewnętrznie podczas logowania. Zazwyczaj nie jest to konieczne. Po regeneracji wszystkie urządzenia zostaną wylogowane."
+regenerateLoginTokenDescription: "Regeneruje token używany wewnętrznie podczas logowania.\
+  \ Zazwyczaj nie jest to konieczne. Po regeneracji wszystkie urządzenia zostaną wylogowane."
 setMultipleBySeparatingWithSpace: "Możesz ustawić wiele, oddzielając je spacjami."
 fileIdOrUrl: "ID pliku albo URL"
 behavior: "Zachowanie"
@@ -612,10 +649,11 @@ sample: "Przykład"
 abuseReports: "Zgłoszenia"
 reportAbuse: "Zgłoś"
 reportAbuseOf: "Zgłoś {name}"
-fillAbuseReportDescription: "Wypełnij szczegóły zgłoszenia. Jeżeli dotyczy ono określonego wpisu, uwzględnij jego adres URL."
+fillAbuseReportDescription: "Wypełnij szczegóły zgłoszenia. Jeżeli dotyczy ono określonego\
+  \ wpisu, uwzględnij jego adres URL."
 abuseReported: "Twoje zgłoszenie zostało wysłane. Dziękujemy."
-reporteeOrigin: "Pochodzenie zgłoszonego"
-reporterOrigin: "Pochodzenie zgłaszającego"
+reporteeOrigin: "Pochodzenie osoby zgłoszonej"
+reporterOrigin: "Pochodzenie osoby zgłaszającej"
 forwardReport: "Przekaż zgłoszenie do innej instancji"
 send: "Wyślij"
 abuseMarkAsResolved: "Oznacz zgłoszenie jako rozwiązane"
@@ -627,23 +665,25 @@ instanceTicker: "Informacje o wpisach instancji"
 waitingFor: "Oczekiwanie na {x}"
 random: "Losowe"
 system: "System"
-switchUi: "Przełącz interfejs użytkownika"
+switchUi: "Layout"
 desktop: "Pulpit"
 clip: "Klip"
 createNew: "Utwórz nowy"
 optional: "Nieobowiązkowe"
 createNewClip: "Utwórz nowy klip"
 unclip: "Odczep"
-confirmToUnclipAlreadyClippedNote: "Ten wpis jest już częścią klipu \"{name}\". Czy chcesz ją usunąć z tego klipu?"
+confirmToUnclipAlreadyClippedNote: "Ten wpis jest już częścią klipu \"{name}\". Czy\
+  \ chcesz ją usunąć z tego klipu?"
 public: "Publiczny"
-i18nInfo: "Calckey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}."
+i18nInfo: "Calckey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc\
+  \ na {link}."
 manageAccessTokens: "Zarządzaj tokenami dostępu"
 accountInfo: "Informacje o koncie"
 notesCount: "Liczba wpisów"
 repliesCount: "Liczba wysłanych odpowiedzi"
-renotesCount: "Liczba wysłanych udostępnień"
+renotesCount: "Liczba wysłanych podbić"
 repliedCount: "Liczba otrzymanych odpowiedzi"
-renotedCount: "Liczba otrzymanych udostępnień"
+renotedCount: "Liczba otrzymanych podbić"
 followingCount: "Liczba obserwowanych kont"
 followersCount: "Liczba obserwujących"
 sentReactionsCount: "Liczba wysłanych reakcji"
@@ -655,15 +695,19 @@ no: "Nie"
 driveFilesCount: "Liczba plików na dysku"
 driveUsage: "Użycie przestrzeni dyskowej"
 noCrawle: "Odrzuć indeksowanie przez crawlery"
-noCrawleDescription: "Proś wyszukiwarki internetowe, aby nie indeksowały Twojego profilu, wpisów, stron itd."
-lockedAccountInfo: "Dopóki nie ustawisz widoczności wpisu na \"Obserwujący\", twoje wpisy będą mogli widzieć wszyscy, nawet jeśli ustawisz manualne zatwierdzanie obserwujących."
+noCrawleDescription: "Proś wyszukiwarki internetowe, aby nie indeksowały Twojego profilu,\
+  \ wpisów, stron itd."
+lockedAccountInfo: "Dopóki nie ustawisz widoczności wpisu na \"Obserwujący\", twoje\
+  \ wpisy będą mogli widzieć wszyscy, nawet jeśli ustawisz manualne zatwierdzanie\
+  \ obserwujących."
 alwaysMarkSensitive: "Oznacz domyślnie jako NSFW"
 loadRawImages: "Wyświetlaj zdjęcia w załącznikach w całości zamiast miniatur"
 disableShowingAnimatedImages: "Nie odtwarzaj animowanych obrazów"
-verificationEmailSent: "Wiadomość weryfikacyjna została wysłana. Odwiedź uwzględniony odnośnik, aby ukończyć weryfikację."
+verificationEmailSent: "Wiadomość weryfikacyjna została wysłana. Odwiedź uwzględniony\
+  \ odnośnik, aby ukończyć weryfikację."
 notSet: "Nie ustawiono"
 emailVerified: "Adres e-mail został potwierdzony"
-noteFavoritesCount: "Liczba polubionych wpisów"
+noteFavoritesCount: "Liczba zakładek"
 pageLikesCount: "Liczba otrzymanych polubień stron"
 pageLikedCount: "Liczba polubionych stron"
 contact: "Kontakt"
@@ -672,15 +716,17 @@ clips: "Klipy"
 experimentalFeatures: "Eksperymentalne funkcje"
 developer: "Programista"
 makeExplorable: "Pokazuj konto na stronie „Eksploruj”"
-makeExplorableDescription: "Jeżeli wyłączysz tę opcję, Twoje konto nie będzie wyświetlać się w sekcji „Eksploruj”."
-showGapBetweenNotesInTimeline: "Pokazuj odstęp między wpisami na osi czasu."
+makeExplorableDescription: "Jeżeli wyłączysz tę opcję, Twoje konto nie będzie wyświetlać\
+  \ się w sekcji „Eksploruj”."
+showGapBetweenNotesInTimeline: "Pokazuj odstęp między wpisami na osi czasu"
 duplicate: "Duplikuj"
 left: "Lewo"
-center: "Wyśsrodkuj"
+center: "Wyśrodkuj"
 wide: "Szerokie"
 narrow: "Wąskie"
-reloadToApplySetting: "To ustawienie zostanie zastosowane po odświeżeniu strony. Chcesz odświeżyć?"
-needReloadToApply: "To ustawienie zostanie zastosowane po odświeżeniu strony"
+reloadToApplySetting: "To ustawienie zostanie zastosowane po odświeżeniu strony. Chcesz\
+  \ odświeżyć?"
+needReloadToApply: "To ustawienie zostanie zastosowane po odświeżeniu strony."
 showTitlebar: "Pokazuj pasek tytułowy"
 clearCache: "Wyczyść pamięć podręczną"
 onlineUsersCount: "{n} osób jest online"
@@ -715,7 +761,7 @@ emailNotification: "Powiadomienia e-mail"
 publish: "Publikuj"
 inChannelSearch: "Szukaj na kanale"
 useReactionPickerForContextMenu: "Otwórz wybornik reakcji prawym kliknięciem"
-typingUsers: "{users} pisze"
+typingUsers: "{users} pisze/ą"
 jumpToSpecifiedDate: "Przejdź do określonej daty"
 showingPastTimeline: "Obecnie wyświetla starą oś czasu"
 clear: "Wróć"
@@ -725,14 +771,17 @@ unlikeConfirm: "Na pewno chcesz usunąć polubienie?"
 fullView: "Pełny widok"
 quitFullView: "Opuść pełny widok"
 addDescription: "Dodaj opis"
-userPagePinTip: "Możesz wyświetlać wpisy w tym miejscu po wybraniu \"Przypnij do profilu\" z menu pojedyńczego wpisu"
-notSpecifiedMentionWarning: "Ten wpis zawiera wzmianki o użytkownikach niezawartych jako odbiorcy"
+userPagePinTip: "Możesz wyświetlać wpisy w tym miejscu po wybraniu \"Przypnij do profilu\"\
+  \ z menu pojedynczego wpisu."
+notSpecifiedMentionWarning: "Ten wpis zawiera wzmianki o użytkownikach niezawartych\
+  \ jako odbiorcy"
 info: "Informacje"
 userInfo: "Informacje o użykowniku"
 unknown: "Nieznane"
 onlineStatus: "Status online"
 hideOnlineStatus: "Ukryj status online"
-hideOnlineStatusDescription: "Ukrywanie statusu online ogranicza wygody niektórych funkcji, tj. wyszukiwanie"
+hideOnlineStatusDescription: "Ukrywanie statusu online ogranicza wygody niektórych\
+  \ funkcji, takich jak wyszukiwanie."
 online: "Online"
 active: "Aktywny"
 offline: "Offline"
@@ -763,27 +812,30 @@ priority: "Priorytet"
 high: "Wysoki"
 middle: "Średnie"
 low: "Niski"
-emailNotConfiguredWarning: "Nie podano adresu e-mail"
+emailNotConfiguredWarning: "Nie podano adresu e-mail."
 ratio: "Stosunek"
 previewNoteText: "Pokaż podgląd"
 customCss: "Własny CSS"
-customCssWarn: "Używaj tego ustawienia tylko wtedy, gdy wiesz co ono robi. Nieprawidłowe wpisy mogą spowodować, że klient przestanie działać poprawnie."
+customCssWarn: "Używaj tego ustawienia tylko wtedy, gdy wiesz co ono robi. Nieprawidłowe\
+  \ wpisy mogą spowodować, że klient przestanie działać poprawnie."
 global: "Globalna"
 squareAvatars: "Wyświetlaj kwadratowe awatary"
-sent: "Wyślij"
+sent: "Wysłane"
 received: "Otrzymane"
 searchResult: "Wyniki wyszukiwania"
 hashtags: "Hashtag"
 troubleshooting: "Rozwiązywanie problemów"
 useBlurEffect: "Użyj efektów rozmycia w UI"
 learnMore: "Dowiedz się więcej"
-misskeyUpdated: "Misskey zostało zaktualizowane!"
+misskeyUpdated: "Calckey zostało zaktualizowane!"
 whatIsNew: "Pokaż zmiany"
 translate: "Przetłumacz"
 translatedFrom: "Przetłumaczone z {x}"
 accountDeletionInProgress: "Trwa usuwanie konta"
-usernameInfo: "Nazwa, która identyfikuje Twoje konto spośród innych na tym serwerze.  Możesz użyć alfabetu (a~z, A~Z), cyfr (0~9) lub podkreślników (_). Nazwy użytkownika nie mogą być później zmieniane."
-aiChanMode: "Tryb Ai"
+usernameInfo: "Nazwa, która identyfikuje Twoje konto spośród innych na tym serwerze.\
+  \  Możesz użyć alfabetu (a~z, A~Z), cyfr (0~9) lub podkreślników (_). Nazwy użytkownika\
+  \ nie mogą być później zmieniane."
+aiChanMode: "Ai-chan w klasycznym interfejsie"
 keepCw: "Zostaw ostrzeżenia o zawartości"
 pubSub: "Konta Pub/Sub"
 resolved: "Rozwiązane"
@@ -795,21 +847,24 @@ unread: "Nieodczytane"
 filter: "Filtr"
 controlPanel: "Panel sterowania"
 manageAccounts: "Zarządzaj kontami"
-makeReactionsPublic: "Ustawić historię reakcji jako publiczną"
-makeReactionsPublicDescription: "To spowoduje, że lista wszystkich Twoich dotychczasowych reakcji będzie publicznie widoczna."
+makeReactionsPublic: "Ustaw historię reakcji jako publiczną"
+makeReactionsPublicDescription: "To spowoduje, że lista wszystkich Twoich dotychczasowych\
+  \ reakcji będzie publicznie widoczna."
 classic: "Klasyczny"
 muteThread: "Wycisz wątek"
 unmuteThread: "Wyłącz wyciszenie wątku"
 ffVisibility: "Widoczność obserwowanych/obserwujących"
-ffVisibilityDescription: "Pozwala skonfigurować, kto może zobaczyć, kogo obserwujesz i kto Cię obserwuje."
-continueThread: "Pokaż kontynuację wątku"
+ffVisibilityDescription: "Pozwala skonfigurować, kto może zobaczyć, kogo obserwujesz\
+  \ i kto Cię obserwuje."
+continueThread: "Kontynuuj wątek"
 deleteAccountConfirm: "Spowoduje to nieodwracalne usunięcie Twojego konta. Kontynuować?"
 incorrectPassword: "Nieprawidłowe hasło."
 voteConfirm: "Potwierdzić swój głos na \"{choice}\"?"
 hide: "Ukryj"
 leaveGroup: "Opuść grupę"
 leaveGroupConfirm: "Czy na pewno chcesz opuścić \"{name}\"?"
-useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach mobilnych"
+useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach\
+  \ mobilnych"
 welcomeBackWithName: "Witaj z powrotem, {name}"
 clickToFinishEmailVerification: "Kliknij [{ok}], aby zakończyć weryfikację e-mail."
 overridedDeviceKind: "Typ urządzenia"
@@ -819,7 +874,7 @@ auto: "Automatycznie"
 size: "Rozmiar"
 numberOfColumn: "Liczba kolumn"
 searchByGoogle: "Szukaj"
-indefinitely: "Nigdy"
+indefinitely: "Dożywotnio"
 file: "Pliki"
 logoutConfirm: "Czy na pewno chcesz się wylogować?"
 lastActiveDate: "Ostatnio użyte w"
@@ -830,19 +885,34 @@ colored: "Kolorowe"
 label: "Etykieta"
 type: "Typ"
 speed: "Prędkość"
-localOnly: "Lokalne tylko"
+localOnly: "Tylko lokalne"
 failedToUpload: "Przesyłanie nie powiodło się"
-cannotUploadBecauseInappropriate: "Nie można przesłać tego pliku, ponieważ jego części zostały wykryte jako potencjalnie nieodpowiednie."
-cannotUploadBecauseNoFreeSpace: "Przesyłanie nie powiodło się z powodu braku miejsca na dysku."
+cannotUploadBecauseInappropriate: "Nie można przesłać tego pliku, ponieważ jego części\
+  \ zostały wykryte jako potencjalnie nieodpowiednie."
+cannotUploadBecauseNoFreeSpace: "Przesyłanie nie powiodło się z powodu braku miejsca\
+  \ na dysku."
 beta: "Beta"
 enableAutoSensitive: "Automatyczne oznaczanie NSFW"
-enableAutoSensitiveDescription: "Umożliwia automatyczne wykrywanie i oznaczanie zawartości NSFW za pomocą uczenia maszynowego. Nawet jeśli ta opcja jest wyłączona, może być włączona w całej instancji."
+enableAutoSensitiveDescription: "Umożliwia automatyczne wykrywanie i oznaczanie zawartości\
+  \ NSFW za pomocą uczenia maszynowego. Nawet jeśli ta opcja jest wyłączona, może\
+  \ być włączona na całej instancji."
 navbar: "Pasek nawigacyjny"
 account: "Konta"
 move: "Przenieś"
 _sensitiveMediaDetection:
-  description: "Zmniejsza wysiłek związany z moderacją serwera dzięki automatycznemu rozpoznawaniu zawartości NSFW za pomocą uczenia maszynowego. To nieznacznie zwiększy obciążenie serwera."
+  description: "Zmniejsza wysiłek związany z moderacją serwera dzięki automatycznemu\
+    \ rozpoznawaniu zawartości NSFW za pomocą uczenia maszynowego. To nieznacznie\
+    \ zwiększy obciążenie serwera."
   setSensitiveFlagAutomatically: "Oznacz jako NSFW"
+  sensitivity: Czułość wykrywania
+  analyzeVideosDescription: Analizuje filmy, w dodatku do zdjęć. Zwiększy to nieznacznie
+    zużycie serwera.
+  sensitivityDescription: Zmniejszenie czułości doprowadzi do mniejszej liczby błędnych
+    wykryć (fałszywie pozytywnych), podczas gdy zwiększenie czułości doprowadzi do
+    mniejszej liczby brakujących wykryć (fałszywie negatywnych).
+  setSensitiveFlagAutomaticallyDescription: Wyniki wykrywania wewnętrznego zostaną
+    zachowane, nawet jeśli ta opcja jest wyłączona.
+  analyzeVideos: Włącz analizę filmów
 _emailUnavailable:
   used: "Ten adres e-mail jest już używany"
   format: "Format tego adresu e-mail jest nieprawidłowy"
@@ -856,11 +926,15 @@ _ffVisibility:
 _signup:
   almostThere: "Prawie na miejscu"
   emailAddressInfo: "Podaj swój adres e-mail. Nie zostanie on upubliczniony."
-  emailSent: "E-mail z potwierdzeniem został wysłany na Twój adres e-mail ({email}). Kliknij dołączony link, aby dokończyć tworzenie konta."
+  emailSent: "E-mail z potwierdzeniem został wysłany na Twój adres e-mail ({email}).\
+    \ Kliknij dołączony link, aby dokończyć tworzenie konta."
 _accountDelete:
   accountDelete: "Usuń konto"
-  mayTakeTime: "Ponieważ usuwanie konta jest procesem wymagającym dużej ilości zasobów, jego ukończenie może zająć trochę czasu, w zależności od ilości utworzonej zawartości i liczby przesłanych plików."
-  sendEmail: "Po zakończeniu usuwania konta na adres e-mail zarejestrowany na tym koncie zostanie wysłana wiadomość e-mail."
+  mayTakeTime: "Ponieważ usuwanie konta jest procesem wymagającym dużej ilości zasobów,\
+    \ jego ukończenie może zająć trochę czasu, w zależności od ilości utworzonej zawartości\
+    \ i liczby przesłanych plików."
+  sendEmail: "Po zakończeniu usuwania konta na adres e-mail zarejestrowany na tym\
+    \ koncie zostanie wysłana wiadomość e-mail."
   requestAccountDelete: "Poproś o usunięcie konta"
   started: "Usuwanie się rozpoczęło."
   inProgress: "Usuwanie jest obecnie w toku"
@@ -868,9 +942,12 @@ _ad:
   back: "Wróć"
   reduceFrequencyOfThisAd: "Pokazuj tę reklamę rzadziej"
 _forgotPassword:
-  enterEmail: "Wpisz adres e-mail użyty do rejestracji. Zostanie do niego wysłany link, za pomocą którego możesz zresetować hasło."
-  ifNoEmail: "Jeżeli nie podano adresu e-mail podczas rejestracji, skontaktuj się z administratorem zamiast tego."
-  contactAdmin: "Jeżeli Twoja instancja nie obsługuje adresów e-mail, skontaktuj się zamiast tego z administratorem, aby zresetować hasło."
+  enterEmail: "Wpisz adres e-mail użyty do rejestracji. Zostanie do niego wysłany\
+    \ link, za pomocą którego możesz zresetować hasło."
+  ifNoEmail: "Jeżeli nie podano adresu e-mail podczas rejestracji, skontaktuj się\
+    \ z administratorem zamiast tego."
+  contactAdmin: "Jeżeli Twoja instancja nie obsługuje adresów e-mail, skontaktuj się\
+    \ zamiast tego z administratorem, aby zresetować hasło."
 _gallery:
   my: "Moja galeria"
   liked: "Polubione wpisy"
@@ -878,7 +955,7 @@ _gallery:
   unlike: "Cofnij polubienie"
 _email:
   _follow:
-    title: "Zaobserwował(a) Cię"
+    title: "Zaobserwował* Cię"
   _receiveFollowRequest:
     title: "Otrzymano prośbę o możliwość obserwacji"
 _plugin:
@@ -893,15 +970,19 @@ _preferencesBackups:
   save: "Zapisz zmiany"
   inputName: "Proszę podać nazwę dla tej kopii zapasowej"
   cannotSave: "Zapisanie nie powiodło się"
-  nameAlreadyExists: "Kopia zapasowa o nazwie \"{name}\" już istnieje. Proszę podać inną nazwę."
-  applyConfirm: "Czy na pewno chcesz zastosować kopię zapasową \"{name}\" na tym urządzeniu? Istniejące ustawienia tego urządzenia zostaną nadpisane."
+  nameAlreadyExists: "Kopia zapasowa o nazwie \"{name}\" już istnieje. Proszę podać\
+    \ inną nazwę."
+  applyConfirm: "Czy na pewno chcesz zastosować kopię zapasową \"{name}\" na tym urządzeniu?\
+    \ Istniejące ustawienia tego urządzenia zostaną nadpisane."
   saveConfirm: "Zapisać kopię zapasową jako {name}?"
   deleteConfirm: "Usunąć kopię zapasową {name}?"
   renameConfirm: "Zmienić nazwę kopii zapasowej z \"{old}\" na \"{new}\"?"
-  createdAt: "Utworzony w: {date} {time}"
+  createdAt: "Utworzono w: {date} {time}"
   updatedAt: "Zaktualizowano w: {date} {time}"
   cannotLoad: "Ładowanie nie powiodło się"
   invalidFile: "Nieprawidłowy format pliku"
+  noBackups: Nie znaleziono kopii zapasowych. Możesz utworzyć kopię zapasową twoich
+    ustawień klienta na tym serwerze poprzez użycie “Utwórz nową kopię zapasową”.
 _registry:
   scope: "Zakres"
   key: "Klucz"
@@ -909,13 +990,15 @@ _registry:
   domain: "Domena"
   createKey: "Utwórz klucz"
 _aboutMisskey:
-  about: "Misskey jest oprogramowanie open source rozwijanym przez syuilo od 2014."
+  about: "Calckey jest forkiem Misskey utworzonym przez ThatOneCalculator, rozwijanym\
+    \ od 2022."
   contributors: "Główni twórcy"
   allContributors: "Wszyscy twórcy"
   source: "Kod źródłowy"
-  translation: "Tłumacz Misskey"
-  donate: "Przekaż darowiznę na Misskey"
-  morePatrons: "Naprawdę doceniam wsparcie ze strony wielu niewymienionych tu osób. Dziękuję! 🥰"
+  translation: "Tłumacz Calckey"
+  donate: "Przekaż darowiznę na Calckey"
+  morePatrons: "Naprawdę doceniam wsparcie ze strony wielu niewymienionych tu osób.\
+    \ Dziękuję! \U0001F970"
   patrons: "Wspierający"
 _nsfw:
   respect: "Ukrywaj media NSFW"
@@ -923,14 +1006,17 @@ _nsfw:
   force: "Ukrywaj wszystkie media"
 _mfm:
   cheatSheet: "Ściąga MFM"
-  intro: "MFM to język składniowy wyjątkowy dla Misskey, który może być użyty w wielu miejscach. Tu znajdziesz listę wszystkich możliwych elementów składni MFM."
-  dummy: "Misskey rozszerza świat Fediwersum"
+  intro: "MFM jest językiem składniowym używanym przez m.in. Misskey, forki *key (w\
+    \ tym Calckey), oraz Akkomę, który może być użyty w wielu miejscach. Tu znajdziesz\
+    \ listę wszystkich możliwych elementów składni MFM."
+  dummy: "Calckey rozszerza świat Fediwersum"
   mention: "Wspomnij"
-  mentionDescription: "Używając znaku @ i nazwy użytkownika, możesz określić danego użytkownika."
+  mentionDescription: "Używając znaku @ i nazwy użytkownika, możesz określić danego\
+    \ użytkownika."
   hashtag: "Hashtag"
   hashtagDescription: "Używając kratki i tekstu, możesz określić hashtag."
   url: "Adres URL"
-  urlDescription: "Adresy URL mogą być wyświetlane"
+  urlDescription: "Adresy URL mogą być wyświetlane."
   link: "Odnośnik"
   linkDescription: "Określone części tekstu mogą być wyświetlane jako adres URL."
   bold: "Pogrubienie"
@@ -941,19 +1027,21 @@ _mfm:
   centerDescription: "Wyśrodkowuje zawartość."
   inlineCode: "Kod (w wierszu)"
   blockCode: "Kod (blok)"
-  blockCodeDescription: "Wyświetla kod z podświetlaną składnią składający się z wielu linii."
+  blockCodeDescription: "Wyświetla kod z podświetlaną składnią składający się z wielu\
+    \ linii."
   blockMath: "Matematyka (Blok)"
   quote: "Cytuj"
   quoteDescription: "Wyświetla treść jako cytat."
   emoji: "Niestandardowe emoji"
-  emojiDescription: "Otaczając nazwę niestandardowego emoji dwukropkami, możesz użyć niestandardowego emoji."
+  emojiDescription: "Otaczając nazwę niestandardowego emoji dwukropkami, możesz użyć\
+    \ niestandardowego emoji."
   search: "Szukaj"
   searchDescription: "Wyświetla pole wyszukiwania z wcześniej wpisanym tekstem."
   flip: "Odwróć"
   flipDescription: "Przerzuca treść poziomo lub pionowo."
   jelly: "Animacja (Galaretka)"
   jellyDescription: "Nadaje treści galaretowatą animację."
-  tada: "Animation (Tada)"
+  tada: "Animacja (Tada)"
   tadaDescription: "Nadaje treści animację podobną do \"Tada!\"."
   jump: "Animacja (Skok)"
   jumpDescription: "Nadaje treści animację skakania."
@@ -970,7 +1058,7 @@ _mfm:
   x3: "Bardzo duże"
   x3Description: "Czyni treść jeszcze większą."
   x4: "Ogromne"
-  x4Description: "Czyni treść jeszcze większą niż jeszcze większa."
+  x4Description: "Czyni treść nawet większą niż jeszcze większa."
   blur: "Rozmycie"
   blurDescription: "Rozmywa treść. Zostanie wyraźnie wyświetlona po najechaniu."
   font: "Czcionka"
@@ -979,10 +1067,14 @@ _mfm:
   rainbowDescription: "Sprawia, że zawartość pojawia się w kolorach tęczy."
   sparkle: "Blask"
   sparkleDescription: "Nadaje zawartości efekt lśniącego brokatu."
-  rotate: "Obróć"
+  rotate: "Obrót"
   rotateDescription: "Obraca zawartość o określony kąt."
   plain: "Zwyczajny"
   plainDescription: "Wyłącza efekty wszystkich MFM zawartych w tym efekcie MFM."
+  inlineCodeDescription: Wyświetla podświetlanie składni dla kodu (programu) w linii.
+  inlineMath: Matematyka (Inline)
+  inlineMathDescription: Pokaż formuły matematyczne (KaTeX) w linii
+  blockMathDescription: Pokaż wieloliniowe formuły matematyczne (KaTeX) w bloku
 _instanceTicker:
   none: "Nigdy nie pokazuj"
   remote: "Pokaż dla zdalnych użytkowników"
@@ -991,6 +1083,7 @@ _serverDisconnectedBehavior:
   reload: "Automatycznie odśwież"
   dialog: "Pokazuj okno ostrzeżenia"
   quiet: "Pokazuj nieirytujące ostrzeżenia"
+  nothing: Nic nie rób
 _channel:
   create: "Utwórz kanał"
   edit: "Edytuj kanał"
@@ -1004,15 +1097,26 @@ _channel:
 _menuDisplay:
   top: "Góra"
   hide: "Ukryj"
+  sideFull: Z boku
+  sideIcon: Z boku (tylko ikony)
 _wordMute:
   muteWords: "Słowo do wyciszenia"
   muteWordsDescription2: "Otocz słowa kluczowe ukośnikami, aby używać wyrażeń regularnych."
   soft: "Łagodny"
   hard: "Twardy"
   mutedNotes: "Wyciszone wpisy"
+  muteWordsDescription: Rozdzielaj spacją dla kondycji AND, lub przerwaniem wiersza
+    dla kondycji OR.
+  softDescription: Ukryj z osi czasu wpisy, które spełniają podane warunki.
+  hardDescription: Zapobiega dodawania do osi czasu wpisów, które spełniają podane
+    warunki. Dodatkowo, te wpisy nie zostaną dodane do osi czasu, jeśli warunki się
+    zmienią.
 _instanceMute:
   title: "Ukrywa wpisy z wymienionych instancji."
   heading: "Lista instancji do wyciszenia"
+  instanceMuteDescription2: Oddzielaj nowymi liniami
+  instanceMuteDescription: Spowoduje to wyciszenie wszystkich wpisów/podbić z podanych
+    instancji, w tym tych od użytkowników odpowiadających na wpisy z wyciszonych instancji.
 _theme:
   explore: "Przeglądaj motywy"
   install: "Zainstaluj motyw"
@@ -1023,7 +1127,7 @@ _theme:
   installedThemes: "Zainstalowane motywy"
   builtinThemes: "Wbudowane motywy"
   alreadyInstalled: "Motyw jest już zainstalowany"
-  invalid: "Format motywu jest nieprawidłowy."
+  invalid: "Format motywu jest nieprawidłowy"
   make: "Utwórz motyw"
   base: "Podstawowy"
   addConstant: "Dodaj stałą"
@@ -1041,8 +1145,9 @@ _theme:
   darken: "Ściemnij"
   lighten: "Rozjaśnij"
   inputConstantName: "Wprowadź nazwę stałej"
-  importInfo: "Jeżeli wprowadzisz tu kod motywu, możesz zaimportować go w edytorze motywu"
-  deleteConstantConfirm: "Czy na pewno chcesz usunąć stała {const}?"
+  importInfo: "Jeżeli wprowadzisz tu kod motywu, możesz zaimportować go w edytorze\
+    \ motywu"
+  deleteConstantConfirm: "Czy na pewno chcesz usunąć stałą {const}?"
   keys:
     accent: "Akcent"
     bg: "Tło"
@@ -1061,7 +1166,7 @@ _theme:
     hashtag: "Hashtag"
     mention: "Wspomnij"
     mentionMe: "Wspomnienia (ja)"
-    renote: "Udostępnij"
+    renote: "Podbij"
     modalBg: "Tło modalu"
     divider: "Rozdzielacz"
     scrollbarHandle: "Uchwyt paska przewijania"
@@ -1113,64 +1218,93 @@ _time:
 _tutorial:
   title: "Jak korzystać z Calckey"
   step1_1: "Witamy!"
-  step1_2: "Pozwól, że cię skonfigurujemy. Będziesz działać w mgnieniu oka!"
-  step2_1: "Po pierwsze, proszę wypełnić swój profil"
-  step2_2: "Podanie kilku informacji o tym, kim jesteś, ułatwi innym stwierdzenie, czy chcą zobaczyć Twoje notatki lub śledzić Cię."
+  step1_2: "Pozwól, że Cię skonfigurujemy. Będziesz działać w mgnieniu oka!"
+  step2_1: "Najpierw, proszę wypełnij swój profil."
+  step2_2: "Podanie kilku informacji o tym, kim jesteś, ułatwi innym stwierdzenie,\
+    \ czy chcą zobaczyć Twoje wpisy lub śledzić Cię."
   step3_1: "Teraz czas na śledzenie niektórych osób!"
-  step3_2: "Twoje domowe i społeczne linie czasu opierają się na tym, kogo śledzisz, więc spróbuj śledzić kilka kont, aby zacząć.\nKliknij kółko z plusem w prawym górnym rogu profilu, aby go śledzić."
-  step4_1: "Pozwól, że się tam dostaniesz."
-  step4_2: "Dla twojego pierwszego postu, niektórzy ludzie lubią zrobić {introduction} post lub prosty \"Hello world!\""
-  step5_1: "Timelines, timelines everywhere!"
-  step5_2: "Twoja instancja ma włączone {timelines} różne timelines"
-  step5_3: "Oś czasu Home {icon} to miejsce, w którym możesz zobaczyć posty od swoich zwolenników"
-  step5_4: "The Local {icon} timeline to miejsce, w którym możesz zobaczyć posty od wszystkich innych osób na tej instancji."
-  step5_5: "Oś czasu Recommended {icon} to miejsce, gdzie możesz zobaczyć posty z instancji, które admini polecają."
-  step5_6: "Oś czasu Social {icon} to miejsce, w którym możesz zobaczyć posty od znajomych swoich followersów."
-  step5_7: "The Global {icon} timeline to miejsce, gdzie możesz zobaczyć posty z każdej innej połączonej instancji."
-  step6_1: "Więc, co to jest to miejsce?"
-  step6_2: "Cóż, nie dołączyłeś po prostu do Calckey. Dołączyłeś do portalu do Fediverse, połączonej sieci tysięcy serwerów, zwanych instancjami."
-  step6_3: "Każdy serwer działa w inny sposób, i nie wszystkie serwery działają z Calckey. Ten jednak działa! Jest to trochę skomplikowane, ale w krótkim czasie załapiesz o co chodzi."
+  step3_2: "Twoje domowe i społeczne linie czasu opierają się na tym, kogo śledzisz,\
+    \ więc spróbuj śledzić kilka kont, aby zacząć.\nKliknij kółko z plusem w prawym\
+    \ górnym rogu profilu, aby go śledzić."
+  step4_1: "Pozwól, że zabierzemy Cię tam."
+  step4_2: "Dla twojego pierwszego postu, niektórzy ludzie lubią zrobić {introduction}\
+    \ post lub prosty \"Hello world!\""
+  step5_1: "Osie czasu, wszędzie widzę osie czasu!"
+  step5_2: "Twoja instancja ma włączone {timelines} różne osie czasu."
+  step5_3: "Główna {icon} oś czasu to miejsce, w którym możesz zobaczyć posty od użytkowników\
+    \ których obserwujesz, oraz innych użytkowników z tej instancji. Jeśli wolisz,\
+    \ by główna oś czasu pokazywała tylko posty od użytkowników których obserwujesz,\
+    \ możesz łatwo to zmienić w ustawieniach!"
+  step5_4: "Lokalna {icon} oś czasu to miejsce, w którym możesz zobaczyć posty od\
+    \ wszystkich innych osób na tej instancji."
+  step5_5: "Społeczna {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z instancji,\
+    \ które admini polecają."
+  step5_6: "Polecana {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z instancji,\
+    \ które admini polecają."
+  step5_7: "Globalna {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z każdej\
+    \ innej połączonej instancji."
+  step6_1: "Więc, czym to jest to miejsce?"
+  step6_2: "Cóż, nie dołączył*ś po prostu do Calckey. Dołączył*ś do portalu do Fediverse,\
+    \ połączonej sieci tysięcy serwerów, zwanych instancjami."
+  step6_3: "Każdy serwer działa w inny sposób, i nie wszystkie serwery używają Calckey.\
+    \ Ten jednak używa! Jest to trochę skomplikowane, ale w krótkim czasie załapiesz\
+    \ o co chodzi."
   step6_4: "A teraz idź, odkrywaj i baw się dobrze!"
 _2fa:
   alreadyRegistered: "Zarejestrowałeś już urządzenie do uwierzytelniania dwuskładnikowego."
   registerDevice: "Zarejestruj nowe urządzenie"
   registerKey: "Zarejestruj klucz bezpieczeństwa"
-  step1: "Najpierw, zainstaluj aplikację uwierzytelniającą (taką jak {a} lub {b}) na swoim urządzeniu."
+  step1: "Najpierw, zainstaluj aplikację uwierzytelniającą (taką jak {a} lub {b})\
+    \ na swoim urządzeniu."
   step2: "Następnie, zeskanuje kod QR z ekranu."
   step3: "Wprowadź token podany w aplikacji, aby ukończyć konfigurację."
   step4: "Od teraz, przy każdej próbie logowania otrzymasz prośbę o token logowania."
+  step2Url: 'Możesz też wpisać ten URL jeśli używasz programu komputerowego:'
+  securityKeyInfo: Oprócz uwierzytelnienia odciskiem palców lub PIN, możesz również
+    skonfigurować uwierzytelnienie za pomocą kluczy sprzętowych obsługujących FIDO2,
+    w celu dalszego zabezpieczenia Twojego konta.
 _permissions:
-  "read:account": "Wyświetl informacje o swoim koncie"
-  "write:account": "Edytuj swoje informacje o koncie"
-  "read:blocks": "Zobacz listę osób, które zablokowałeś(-aś)"
-  "write:blocks": "Edytuj listę osób, które zablokowałeś(-aś)"
-  "read:drive": "Dostęp do plików i katalogów ze Twojego dysku"
-  "write:drive": "Edycja i usuwanie plików i katalogów z Twojego dysku."
-  "read:favorites": "Wyświetlanie Twojej listy ulubionych."
-  "write:favorites": "Edycja Twojej listy ulubionych."
+  "read:account": "Wyświetlanie informacji o twoim koncie"
+  "write:account": "Edycja informacji o twoim koncie"
+  "read:blocks": "Wyświetlanie listy zablokowanych użytkowników"
+  "write:blocks": "Blokowanie i odblokowywanie użytkowników"
+  "read:drive": "Wyświetlanie plików i folderów z twojego Dysku"
+  "write:drive": "Edycja i usuwanie plików i katalogów z Twojego dysku"
+  "read:favorites": "Wyświetlanie Twoich zakładek"
+  "write:favorites": "Edycja Twoich zakładek"
   "read:following": "Wyświetlanie informacji o obserwowanych"
   "write:following": "Obserwowanie lub cofanie obserwacji innych kont"
-  "read:messaging": "Zobacz swoje czaty"
-  "read:mutes": "Wyświetlanie listy osób, które wyciszyłeś(-aś)"
-  "write:mutes": "Edycja listy osób, które wyciszyłeś(-aś)"
+  "read:messaging": "Wyświetlanie twoich czatów"
+  "read:mutes": "Wyświetlanie listy wyciszonych osób"
+  "write:mutes": "Edycja listy wyciszonych osób"
   "read:notifications": "Wyświetlanie powiadomień"
   "write:notifications": "Działanie na powiadomieniach"
   "read:reactions": "Wyświetlanie reakcji"
   "write:reactions": "Edycja reakcji"
   "write:votes": "Głosowanie w ankiecie"
   "read:pages": "Wyświetlanie Twoich stron"
-  "write:pages": "Edycja lub usuwanie Twoich stron"
+  "write:pages": "Edycja i usuwanie Twoich stron"
   "read:page-likes": "Wyświetlanie polubień na stronach"
   "write:page-likes": "Edycja polubień na stronach"
   "read:user-groups": "Wyświetlanie grup użytkownika"
-  "write:user-groups": "Edycja lub usuwanie grup użytkownika"
-  "read:channels": "Zobacz swoje kanały"
-  "write:channels": "Edytuj swoje kanały"
-  "read:gallery": "Zobacz swoją galerię"
-  "write:gallery": "Edytuj swoją galerię"
+  "write:user-groups": "Edycja i usuwanie grup użytkownika"
+  "read:channels": "Wyświetlenie Twoich kanałów"
+  "write:channels": "Edycja Twoich kanałów"
+  "read:gallery": "Wyświetlenie Twojej galerii"
+  "write:gallery": "Edycja Twojej galerii"
+  "write:messaging": Tworzenie i usuwanie wiadomości czatu
+  "write:notes": Tworzenie i usuwanie wpisów
+  "read:gallery-likes": Wyświetlenie Twojej listy z polubionymi postami galerii
+  "write:gallery-likes": Edycja Twojej listy z polubionymi postami galerii
 _auth:
   shareAccess: "Czy chcesz autoryzować „{name}” do dostępu do tego konta?"
   permissionAsk: "Ta aplikacja wymaga następujących uprawnień:"
+  denied: Odmowa dostępu
+  copyAsk: Proszę wpisz następujący kod autoryzacyjny w aplikacji
+  shareAccessAsk: Czy na pewno chcesz upoważnić tą aplikację do dostępu do Twojego
+    konta?
+  pleaseGoBack: Wróć do aplikacji
+  callback: Wracam do aplikacji
 _weekday:
   sunday: "Niedziela"
   monday: "Poniedziałek"
@@ -1201,11 +1335,15 @@ _widgets:
   serverMetric: "Metryka serwera"
   aiscript: "Konsola AiScript"
   aichan: "Ai"
+  rssTicker: Ticker RSS
+  userList: Lista użytkowników
+  _userList:
+    chooseList: Wybierz listę
 _cw:
   hide: "Ukryj"
   show: "Załaduj więcej"
-  chars: "{count} znaków"
-  files: "{count} plików"
+  chars: "{count} znak(-i/-ów)"
+  files: "{count} plik(-i/-ów)"
 _poll:
   noOnlyOneChoice: "Wymagane są przynajmniej dwie opcje"
   choiceN: "Opcja {n}"
@@ -1230,11 +1368,15 @@ _poll:
   remainingSeconds: "Pozostało {s} sekund"
 _visibility:
   public: "Publiczny"
-  publicDescription: "Twój wpis pojawi się w publicznych osiach czasu"
-  home: "Strona główna"
+  publicDescription: "Wpis pojawi się u wszystkich"
+  home: "Niewidoczny"
   followers: "Obserwujący"
   specified: "Bezpośredni"
   specifiedDescription: "Napisz tylko określonym użytkownikom"
+  homeDescription: Wpis będzie publiczny ale nie pojawi się na osi czasu instancji
+  followersDescription: Wpis pojawi się tylko na osiach czasu Twoich obserwujących
+  localOnly: Lokalnie
+  localOnlyDescription: Wpis będzie widoczny tylko dla użytkowników tej instancji
 _postForm:
   _placeholders:
     a: "Co się dzieje?"
@@ -1243,6 +1385,9 @@ _postForm:
     d: "Czy masz coś do powiedzenia?"
     e: "Zacznij coś pisać…"
     f: "Czekamy, aż coś napiszesz."
+  quotePlaceholder: Cytuj ten wpis...
+  channelPlaceholder: Wyślij na kanał...
+  replyPlaceholder: Odpowiedz na ten wpis...
 _profile:
   name: "Nazwa"
   username: "Nazwa użytkownika"
@@ -1250,47 +1395,65 @@ _profile:
   youCanIncludeHashtags: "Możesz umieścić hashtagi w swoim opisie."
   metadata: "Dodatkowe informacje"
   metadataEdit: "Edytuj dodatkowe informacje"
-  metadataDescription: "Możesz wyświetlać do czterech sekcji dodatkowych informacji na swoim profilu."
+  metadataDescription: "Możesz wyświetlać do czterech sekcji dodatkowych informacji\
+    \ na swoim profilu."
   metadataLabel: "Etykieta"
   metadataContent: "Treść"
   changeAvatar: "Zmień awatar"
   changeBanner: "Zmień baner"
+  locationDescription: Jeśli wpiszesz z początku swoje miasto, twój czas lokalny będzie
+    się pokazywać innym użytkownikom.
 _exportOrImport:
   allNotes: "Wszystkie wpisy"
   followingList: "Obserwowani"
   muteList: "Wycisz"
   blockingList: "Zablokuj"
   userLists: "Listy"
+  excludeMutingUsers: Wyklucz wyciszonych użytkowników
+  excludeInactiveUsers: Wyklucz nieaktywnych użytkowników
 _charts:
   federation: "Federacja"
   apRequest: "Żądania"
   usersTotal: "Łącznie # użytkowników"
   activeUsers: "Aktywni użytkownicy"
+  storageUsageTotal: Łączne użycie dysku
+  filesIncDec: Różnica w liczbie plików
+  filesTotal: Łączna liczba plików
+  storageUsageIncDec: Różnica w wykorzystaniu miejsca
+  localNotesIncDec: Różnica w liczbie lokalnych wpisów
+  remoteNotesIncDec: Różnica w liczbie zdalnych wpisów
+  notesTotal: Łączna liczba wpisów
+  usersIncDec: Różnica w liczbie użytkowników
+  notesIncDec: Różnica w liczbie wpisów
 _instanceCharts:
   requests: "Żądania"
   notesTotal: "Łącznie # wpisów"
-  ff: "Różnica w # obserwujących"
+  ff: "Różnica w # obserwujących "
   ffTotal: "Łączna liczba # obserwujących"
   cacheSize: "Różnica w rozmiarze pamięci podręcznej"
   cacheSizeTotal: "Łączny rozmiar pamięci podręcznej"
   files: "Różnica # plików"
   filesTotal: "Łącznie # plików"
+  usersTotal: Łączna liczba użytkowników
+  users: Różnica w liczbie użytkowników
+  notes: Różnica w liczbie wpisów
 _timelines:
   home: "Strona główna"
   local: "Lokalne"
-  social: "Społeczność"
+  social: "Społeczna"
   global: "Globalna"
+  recommended: Polecana
 _pages:
   newPage: "Utwórz stronę"
   editPage: "Edytuj tę stronę"
   readPage: "Aktywowano widok źródła"
-  created: "Pomyślnie utworzono stronę!"
-  updated: "Pomyślnie zaktualizowano stronę!"
-  deleted: "Strona została usunięta"
+  created: "Pomyślnie utworzono stronę"
+  updated: "Pomyślnie zaktualizowano stronę"
+  deleted: "Pomyślnie usunięto stronę"
   pageSetting: "Ustawienia strony"
   nameAlreadyExists: "Określony adres URL strony już istnieje"
   invalidNameTitle: "Podany adres URL strony jest nieprawidłowy"
-  invalidNameText: "Sprawdź, czy nie jest puste"
+  invalidNameText: "Upewnij się, że pole tytułowe strony nie jest puste"
   editThisPage: "Edytuj tę stronę"
   viewSource: "Zobacz źródło"
   viewPage: "Wyświetlanie Twoich stron"
@@ -1298,10 +1461,10 @@ _pages:
   unlike: "Cofnij polubienie"
   my: "Moje strony"
   liked: "Polubione strony"
-  featured: "Wyróżnione"
+  featured: "Popularne"
   inspector: "Inspektor"
   contents: "Zawartość"
-  content: "Blokada strony"
+  content: "Blok strony"
   variables: "Zmienne"
   title: "Tytuł"
   url: "URL strony"
@@ -1311,8 +1474,8 @@ _pages:
   font: "Czcionka"
   fontSerif: "Szeryfowa"
   fontSansSerif: "Bezszeryfowa"
-  eyeCatchingImageSet: "Ustaw przyciągające wzrok zdjęcie"
-  eyeCatchingImageRemove: "Usuń przyciągające wzrok zdjęcie"
+  eyeCatchingImageSet: "Ustaw miniaturę"
+  eyeCatchingImageRemove: "Usuń miniaturę"
   chooseBlock: "Dodaj blok"
   selectType: "Wybierz typ"
   enterVariableName: "Wprowadź nazwę dla swojej zmiennej"
@@ -1332,12 +1495,14 @@ _pages:
     post: "Utwórz wpis"
     _post:
       text: "Treść"
+      attachCanvasImage: Załącz płótno
+      canvasId: ID płótna
     textInput: "Pole tekstowe"
     _textInput:
       name: "Nazwa zmiennej"
       text: "Tytuł"
       default: "Domyślna wartość"
-    textareaInput: "Pole tekstowe na wiele wierszy"
+    textareaInput: "Wielowierszowe pole tekstowe"
     _textareaInput:
       name: "Nazwa zmiennej"
       text: "Tytuł"
@@ -1350,6 +1515,7 @@ _pages:
     _canvas:
       width: "Szerokość"
       height: "Wysokość"
+      id: ID płótna
     note: "Osadzony wpis"
     _note:
       id: "ID wpisu"
@@ -1389,6 +1555,7 @@ _pages:
       title: "Tytuł"
       values: "Lista wyborów (oddzielonych znakiem nowego wiersza)"
       default: "Domyślna wartość"
+    canvas: Płótno
   script:
     categories:
       flow: "Kontrola przepływu"
@@ -1479,7 +1646,8 @@ _pages:
       if: "Warunek"
       _if:
         arg1: "Jeżeli"
-        arg2: "Jeżeli prawda"
+        arg2: "Wtedy"
+        arg3: Inaczej
       not: "NIE"
       _not:
         arg1: "NIE"
@@ -1493,14 +1661,15 @@ _pages:
       randomPick: "Wybierz losowo z listy"
       _randomPick:
         arg1: "Listy"
-      dailyRandom: "Losowo (zostaje na dzień)"
+      dailyRandom: "Losowo (zmienia się raz dziennie dla każdego użytkownika)"
       _dailyRandom:
         arg1: "Prawdopodobieństwo"
-      dailyRannum: "Losowa liczba (zostaje na dzień)"
+      dailyRannum: "Losowa liczba (zmienia się raz dziennie dla każdego użytkownika)"
       _dailyRannum:
         arg1: "Minimalna wartość"
         arg2: "Maksymalna wartość"
-      dailyRandomPick: "Wybierz losowo z listy (zostaje na dzień)"
+      dailyRandomPick: "Wybierz losowo z listy (zmienia się raz dziennie dla każdego\
+        \ użytkownika)"
       _dailyRandomPick:
         arg1: "Listy"
       seedRandom: "Losowo (z ziarnem)"
@@ -1516,7 +1685,8 @@ _pages:
       _seedRandomPick:
         arg1: "Ziarno"
         arg2: "Listy"
-      DRPWPM: "Wybierz losowo z ważonej listy (zostaje na dzień)"
+      DRPWPM: "Wybierz losowo z ważonej listy (zmienia się raz dziennie dla każdego\
+        \ użytkownika)"
       pick: "Wybierz z listy"
       _pick:
         arg1: "Listy"
@@ -1539,53 +1709,69 @@ _pages:
       fn: "Funkcje"
       _fn:
         arg1: "Wyjście"
+        slots-info: Oddziel każde gniazdo nową linią
+        slots: Gniazda
       for: "Powtórzenie"
       _for:
         arg1: "Liczba powtórzeń"
         arg2: "Działanie"
+      textList: Lista tekstowa
+      strPick: Wyciągaczka ciągu znaków
+      strReverse: Odwróć tekst
+      join: Łączenie tekstu
+      round: Zaokrąglanie wartości dziesiętnych
+      _DRPWPM:
+        arg1: Lista tekstowa
     types:
       string: "Tekst"
       number: "Liczba"
       boolean: "Flaguj"
       array: "Listy"
+      stringArray: Lista tekstowa
     enviromentVariables: "Zmienna środowiskowa"
     pageVariables: "Element strony"
+    argVariables: Gniazda wejściowe
+    typeError: Gniazdo {slot} akceptuje wartości typu “{expect}”, lecz wprowadzona
+      wartość jest typu “{actual}”!
+    thereIsEmptySlot: Gniazdo {slot} jest puste!
+    emptySlot: Puste gniazdo
 _relayStatus:
   requesting: "Oczekujące"
   accepted: "Zaakceptowano"
   rejected: "Odrzucono"
 _notification:
   fileUploaded: "Pomyślnie wysłano plik"
-  youGotMention: "{name} wspomniał(a) o Tobie"
-  youGotReply: "{name} odpowiedział(a) Tobie"
-  youGotQuote: "{name} zacytował(a) Ciebie"
-  youRenoted: "{name} udostępnił(a) Twój wpis"
-  youGotPoll: "{name} zagłosował(a) w Twojej ankiecie"
-  youGotMessagingMessageFromUser: "{name} wysłał(a) Ci wiadomość"
+  youGotMention: "{name} wspomniał* o Tobie"
+  youGotReply: "{name} odpowiedział* Tobie"
+  youGotQuote: "{name} zacytował* Ciebie"
+  youRenoted: "{name} podbił* Twój wpis"
+  youGotPoll: "{name} zagłosował* w Twojej ankiecie"
+  youGotMessagingMessageFromUser: "{name} wysłał* Ci wiadomość"
   youGotMessagingMessageFromGroup: "Została wysłana wiadomość do grupy {name}"
-  youWereFollowed: "Zaobserwował(a) Cię"
-  youReceivedFollowRequest: "Otrzymałeś(-aś) prośbę o możliwość obserwacji"
+  youWereFollowed: "Zaobserwował* Cię"
+  youReceivedFollowRequest: "Otrzymał*ś prośbę o możliwość obserwacji"
   yourFollowRequestAccepted: "Twoja prośba o możliwość obserwacji została przyjęta"
-  youWereInvitedToGroup: "Zaproszony(-a) do grupy"
+  youWereInvitedToGroup: "{userName} zaprosił* Ciebie do grupy"
   pollEnded: "Wyniki ankiety stały się dostępne"
   emptyPushNotificationMessage: "Powiadomienia push zostały zaktualizowane"
   _types:
     all: "Wszystkie"
     follow: "Nowi obserwujący"
-    mention: "Wspomnij"
+    mention: "Wspomnienia"
     reply: "Odpowiedzi"
-    renote: "Udostępnij"
-    quote: "Cytuj"
-    reaction: "Reakcja"
+    renote: "Podbicia"
+    quote: "Cytaty"
+    reaction: "Reakcje"
     pollVote: "Głosy w ankietach"
-    receiveFollowRequest: "Otrzymano prośbę o możliwość obserwacji"
-    followRequestAccepted: "Przyjęto prośbę o możliwość obserwacji"
-    groupInvited: "Zaproszono do grup"
-    app: "Powiadomienia z aplikacji"
+    receiveFollowRequest: "Otrzymane prośby o możliwość obserwacji"
+    followRequestAccepted: "Przyjęte prośby o możliwość obserwacji"
+    groupInvited: "Zaproszenia do grup"
+    app: "Powiadomienia z powiązanych aplikacji"
+    pollEnded: Zakończone ankiety
   _actions:
-    followBack: "zaobserwował cię z powrotem"
+    followBack: "zaobserwował* cię z powrotem"
     reply: "Odpowiedz"
-    renote: "Udostępnij"
+    renote: "Podbicia"
 _deck:
   alwaysShowMainColumn: "Zawsze pokazuj główną kolumnę"
   columnAlign: "Wyrównaj kolumny"
@@ -1597,9 +1783,9 @@ _deck:
   swapDown: "Zamień z poniższym"
   stackLeft: "Przypnij do lewej"
   popRight: "Odepnij w prawo"
-  profile: "Profil"
-  newProfile: "Nowy profil"
-  deleteProfile: "Usuń profil"
+  profile: "Przestrzeń"
+  newProfile: "Nowa przestrzeń"
+  deleteProfile: "Usuń przestrzeń"
   widgetsIntroduction: "Wybierz \"Edytuj widżety\" w menu kolumny i dodaj widżet."
   _columns:
     main: "Główna"
@@ -1609,4 +1795,207 @@ _deck:
     antenna: "Anteny"
     list: "Listy"
     mentions: "Wspomnienia"
-    direct: "Bezpośredni"
+    direct: "Bezpośrednie wiadomości"
+  introduction2: Kliknij + z prawej strony ekranu, by dodać nowe kolumny kiedy chcesz.
+  introduction: Utwórz idealny dla siebie interfejs, poprzez dowolne ustawianie kolumn!
+  renameProfile: Zmień nazwę przestrzeni
+  nameAlreadyExists: Ta nazwa przestrzeni już istnieje.
+accountMoved: 'Użytkownik przeniósł się na nowe konto:'
+flagShowTimelineRepliesDescription: Jeśli włączone, pokazuje odpowiedzi użytkowników
+  na wpisy innych użytkowników na osi czasu.
+manageGroups: Zarządzaj grupami
+objectStorageSetPublicRead: Ustaw "public-read" podczas wysyłania
+removeAllFollowing: Przestań obserwować wszystkich obserwowanych użytkowników
+smtpSecure: Użyj implicit SSL/TLS dla połączeń SMTP
+secureMode: Tryb bezpieczny (Authorized Fetch)
+instanceSecurity: Bezpieczeństwo instancji
+privateMode: Tryb prywatny
+allowedInstances: Dopuszczone instancje
+recommended: Polecane
+allowedInstancesDescription: Hosty instancji które mają być dopuszczone do federacji,
+  każda separowana nową linią (dotyczy tylko trybu prywatnego).
+seperateRenoteQuote: Oddziel przyciski podbicia i cytatów
+refreshInterval: 'Częstotliwość aktualizacji '
+slow: Wolna
+_messaging:
+  dms: Prywatne
+  groups: Grupy
+_antennaSources:
+  all: Wszystkie wpisy
+  users: Wpisy od konkretnych użytkowników
+  homeTimeline: Wpisy od obserwowanych użytkowników
+  userList: Wpisy od użytkowników z konkretnej listy
+  userGroup: Wpisy od użytkowników z konkretnej grupy
+  instances: Wpisy od wszystkich użytkowników na instancji
+enableRecommendedTimeline: Włącz polecaną oś czasu
+recentNDays: Ostatnie {n} dni
+driveCapOverrideCaption: Zresetuj pojemność do domyślnej poprzed wpisanie wartości
+  0 lub mniejszej.
+requireAdminForView: Musisz zalogować się jako administrator, by to zobaczyć.
+replayTutorial: Powtórz samouczek
+migration: Migracja
+moveTo: Przenieś obecne konto do nowego
+moveToLabel: 'Konto na które się przenosisz:'
+moveAccount: Przenieś konto!
+moveAccountDescription: Ten proces jest nieodwracalny. Upewnij się, że utworzył*ś
+  alias dla tego konta na nowym koncie, przed rozpoczęciem. Proszę wpisz tag konta
+  w formacie @person@instance.com
+moveFrom: Przejdź ze starego konta na obecne
+moveFromLabel: 'Konto które przenosisz:'
+showUpdates: Pokaż pop-up po aktualizacji Calckey
+swipeOnDesktop: Zezwól na przeciąganie w stylu mobilnym na desktopie
+moveFromDescription: To utworzy alias twojego starego konta, w celu umożliwienia migracji
+  z tamtego konta na to. Zrób to ZANIM rozpoczniesz przenoszenie się z tamtego konta.
+  Proszę wpisz tag konta w formacie @person@instance.com
+migrationConfirm: "Czy jesteś na 200% pewn* tego, że chcesz przenieść swoje konto\
+  \ na {account}? Gdy to zrobisz, odwrócenie tego będzie nie możliwe, i nie będziesz\
+  \ w stanie ponownie używać normalnie z tego konta.\nUpewnij się, że to konto zostało\
+  \ ustawione jako konto z którego się przenosisz."
+noThankYou: Nie, dziękuję
+addInstance: Dodaj instancję
+renoteMute: Wycisz podbicia
+renoteUnmute: Odcisz podbicia
+flagSpeakAsCat: Mów jak kot
+flagSpeakAsCatDescription: Twoje posty zostaną znya-izowane, gdy w trybie kota
+selectInstance: Wybierz instancję
+noInstances: Brak instancji
+keepOriginalUploadingDescription: Zapisuje oryginalne zdjęcie. Jeśli wyłączone, wersja
+  do wyświetlania w sieci zostanie wygenerowana podczas wysłania.
+antennaInstancesDescription: Wypisz jednego hosta instancji na linię
+regexpError: Błąd regularnego wyrażenia
+regexpErrorDescription: 'Wystąpił błąd w regularnym wyrażeniu znajdującym się w linijce
+  {line} Twoich {tab} wyciszeń słownych:'
+forwardReportIsAnonymous: Zamiast Twojego konta, anonimowe konto systemowe zostanie
+  wyświetlone na zdalnej instancji jako zgłaszający.
+breakFollowConfirm: Czy na pewno chcesz usunąć obserwującego?
+instanceDefaultThemeDescription: Wpisz kod motywu w formacie obiektowym.
+mutePeriod: Długość wyciszenia
+tenMinutes: 10 minut
+showLocalPosts: 'Pokaż lokalne wpisy w:'
+socialTimeline: Społeczna oś czasu
+homeTimeline: Główna oś czasu
+reflectMayTakeTime: Może upłynąć trochę czasu, zanim pojawią się zmiany.
+failedToFetchAccountInformation: Nie można uzyskać informacji o koncie
+pushNotification: Powiadomienia push
+subscribePushNotification: Włącz powiadomienia push
+unsubscribePushNotification: Wyłącz powiadomienia push
+pushNotificationAlreadySubscribed: Powiadomienia push są już włączone
+pushNotificationNotSupported: Twoja przeglądarka lub instancja nie obsługuje powiadomień
+  push
+sendPushNotificationReadMessage: Usuń powiadomienia push, gdy odpowiednie powiadomienia
+  lub wiadomości zostaną odczytane
+sendPushNotificationReadMessageCaption: Powiadomienie zawierające tekst "{emptyPushNotificationMessage}"
+  zostanie wyświetlone przez krótką chwilę. Jeśli dotyczy, może to zwiększyć zużycie
+  baterii Twojego urządzenia.
+defaultReaction: Domyślna reakcja emoji dla wychodzących i przychodzących wpisów
+license: Licencja
+indexPosts: Indeksuj wpisy
+indexFrom: Indeksuj wpisy od ID (zostaw puste dla indeksowania wszystkich wpisów)
+indexNotice: Indeksuję. Zapewne zajmie to chwilę, nie restartuj serwera przez co najmniej
+  godzinę.
+customKaTeXMacro: Niestandardowe makra KaTeX
+enableCustomKaTeXMacro: Włącz niestandardowe makra KaTeX
+noteId: ID wpisu
+_apps:
+  apps: Aplikacje
+  crossPlatform: Wieloplatformowe
+  mobile: Mobilne
+  firstParty: Oficjalne
+  firstClass: Pierwszej klasy
+  secondClass: Drugiej klasy
+  thirdClass: Trzeciej klasy
+  free: Darmowe
+  paid: Płatne
+  pwa: Zainstaluj PWA
+  kaiteki: Kaiteki
+  milktea: Milktea
+  missLi: MissLi
+  mona: Mona
+  theDesk: TheDesk
+  lesskey: Lesskey
+hiddenTagsDescription: 'Wypisz tagi (bez #) hashtagów które masz zamiar ukryć z "Na
+  czasie" i "Eksploruj". Na ukryte hashtagi można dalej wejść innymi sposobami.'
+proxyAccountDescription: Konto proxy jest kontem które w określonych sytuacjach zachowuje
+  się jak zdalny obserwujący. Na przykład, kiedy użytkownik dodaje zdalnego użytkownika
+  do listy, oraz żaden lokalny użytkownik nie obserwuje tego konta, aktywność owego
+  użytkownika nie zostanie dostarczona na oś czasu. W takim razie, użytkownika zaobserwuje
+  konto proxy.
+objectStorageBaseUrlDesc: "URL stosowany jako odniesienie. Podaj URL twojego CDN,\
+  \ albo proxy, jeśli używasz któregokolwiek.\nDla S3 użyj 'https://<bucket>.s3.amazonaws.com',\
+  \ a dla GCS i jego odpowiedników użyj 'https://storage.googleapis.com/<bucket>',\
+  \ itd."
+sendErrorReportsDescription: "Gdy ta opcja jest włączona, szczegółowe informacje o\
+  \ błędach będą udostępnianie z Calckey gdy wystąpi problem, pomagając w ulepszaniu\
+  \ Misskey.\nZawrze to informacje takie jak wersja twojego systemu operacyjnego,\
+  \ przeglądarki, Twoja aktywność na Calckey itd."
+privateModeInfo: Jeśli włączone, tylko dopuszczone instancje będą mogły federować
+  z Twoją instancją. Wszystkie posty będą ukryte przed publiką.
+oneHour: Godzina
+oneDay: Dzień
+oneWeek: Tydzień
+recommendedInstances: Polecane instancje
+recommendedInstancesDescription: Polecane instancje, mające pojawić się w odpowiedniej
+  osi czasu, oddzielane nowymi liniami. NIE dodawaj “https://”, TYLKO samą domenę.
+rateLimitExceeded: Przekroczono ratelimit
+cropImage: Kadruj zdjęcie
+cropImageAsk: Czy chcesz skadrować to zdjęcie?
+recentNHours: Ostatnie {n} godzin
+noEmailServerWarning: Serwer email nie jest skonfigurowany.
+thereIsUnresolvedAbuseReportWarning: Istnieją nierozwiązane zgłoszenia.
+check: Sprawdź
+driveCapOverrideLabel: Zmień pojemność dysku dla tego użytkownika
+isSystemAccount: Konto założone i automatycznie zarządzane przez system.
+typeToConfirm: Wpisz {x} by potwierdzić
+deleteAccount: Usuń konto
+document: Dokumentacja
+numberOfPageCache: Liczba zbuforowanych stron
+numberOfPageCacheDescription: Zwiększenie tej liczby poprawi wygodę użytkowników,
+  ale spowoduje większe zużycie serwera, jak i pamięci.
+fast: Szybka
+sensitiveMediaDetection: Wykrywanie nieodpowiednich multimediów
+remoteOnly: Tylko zdalne
+activeEmailValidationDescription: Włącza ściślejszą walidację adresów e-mail, która
+  obejmuje sprawdzanie adresów jednorazowych oraz tego, czy rzeczywiście można się
+  z nim komunikować. Jeśli wyłączone, walidowany jest tylko format wiadomości e-mail.
+shuffle: Losuj
+showAds: Pokazuj reklamy
+enterSendsMessage: Wciśnij Enter w komunikatorze, by wysłać wiadomość (domyślnie –
+  Ctrl + Enter)
+adminCustomCssWarn: To ustawienie powinno być używane tylko pod warunkiem, że wiesz
+  za co ono odpowiada. Wpisanie niepoprawnych wartości może spowodować niepoprawne
+  działanie klientów KAŻDEGO użytkownika. Proszę upewnij się, że twój CSS działa poprawnie
+  poprzez przetestowanie go w ustawieniach twojego użytkownika.
+customMOTD: Niestandardowe MOTD (wiadomości splash screen)
+customMOTDDescription: Niestandardowe wiadomości dla MOTD (splash screen), oddzielane
+  nowymi liniami, mające pokazywać się za każdym razem gdy użytkownik ładuje/odświeża
+  stronę.
+customSplashIcons: Niestandardowe ikony na splash screenie (URL-e)
+customSplashIconsDescription: URL-e dla niestandardowych ikonych na splash screenie,
+  mające pokazywać się za każdym razem, gdy użytkownik ładuje/odświeża stronę, oddzielane
+  nowymi liniami. Upewnij się, że zdjęcia są na statycznych URL-ach, najlepiej o rozmiarze
+  192x192.
+caption: Auto opis
+splash: Splash screen
+updateAvailable: Może być dostępna aktualizacja!
+logoImageUrl: URL grafiki loga
+showAdminUpdates: Wskaż, że jest dostępna nowa wersja Calckey (tylko dla adminów)
+hiddenTags: Ukryte hashtagi
+userSaysSomethingReason: '{name} powiedział* {reason}'
+customKaTeXMacroDescription: 'Skonfiguruj makra, aby łatwo pisać wyrażenia matematyczne!
+  Notacja jest zgodna z definicjami poleceń LaTeXa i zapisywana jest jako \newcommand{\nazwa}[numer
+  argumentów]{treść}. Na przykład, \newcommand{\add}[2]{#1 + #2} rozszerzy \add{3}{foo}
+  do 3 + foo. Nawiasy klamrowe otaczające nazwę makra mogą być zmienione na nawiasy
+  okrągłe lub kwadratowe. Wpłynie to na nawiasy używane dla argumentów. W każdym wierszu
+  można zdefiniować jedno (i tylko jedno) makro i nie można przerwać linii w środku
+  definicji. Nieprawidłowe linie są po prostu ignorowane. Obsługiwane są tylko proste
+  funkcje podstawiania łańcuchów; nie można tu stosować zaawansowanej składni, takiej
+  jak warunkowe rozgałęzienia.'
+secureModeInfo: Nie odsyłaj bez dowodu przy żądaniu z innych instancji.
+preferencesBackups: Kopie zapasowe ustawień
+undeck: Opuść tablicę
+reporter: Osoba zgłaszająca
+instanceDefaultDarkTheme: Domyślny ciemny motyw instancji
+lastCommunication: Ostatnie połączenie
+emailRequiredForSignup: Wymagaj adresu email przy rejestracji
+themeColor: Kolor znacznika instancji
+instanceDefaultLightTheme: Domyślny jasny motyw instancji

From 4a7a79c3d5f0f58c6cbb6b68bc5d5a2cc1f37c82 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 17 Apr 2023 01:22:25 -0700
Subject: [PATCH 481/582] Revert "formatting"

This reverts commit b32e1b56fa0acda38a91f2851aea398204d02417.
---
 packages/backend/src/server/index.ts                | 7 +++----
 packages/client/src/components/MkInstanceTicker.vue | 9 ++-------
 packages/client/src/components/MkUserInfo.vue       | 6 +++---
 pnpm-lock.yaml                                      | 7 +++++++
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index a8eccc5fc..16f1a1034 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -37,11 +37,10 @@ export const serverLogger = new Logger("server", "gray", false);
 const app = new Koa();
 app.proxy = true;
 
-// Replace trailing slashes
+// Replace trailing slashes 
 app.use(async (ctx, next) => {
-	if (ctx.request.path !== "/" && ctx.request.path.endsWith("/"))
-		return ctx.redirect(ctx.request.path.replace(/\/$/, ""));
-	else next();
+	if (ctx.request.path !== "/" && ctx.request.path.endsWith('/')) return ctx.redirect(ctx.request.path.replace(/\/$/, ""))
+	else next()
 });
 
 if (!["production", "test"].includes(process.env.NODE_ENV || "")) {
diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue
index 3558b53d8..31617fb6d 100644
--- a/packages/client/src/components/MkInstanceTicker.vue
+++ b/packages/client/src/components/MkInstanceTicker.vue
@@ -1,10 +1,5 @@
 <template>
-	<div
-		class="hpaizdrt"
-		v-tooltip="capitalize(instance.softwareName)"
-		ref="ticker"
-		:style="bg"
-	>
+	<div class="hpaizdrt" v-tooltip="capitalize(instance.softwareName)"  ref="ticker" :style="bg">
 		<img class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" />
 		<span class="name">{{ instance.name }}</span>
 	</div>
@@ -38,7 +33,7 @@ const instance = props.instance ?? {
 	software: Instance.softwareName || "Calckey",
 };
 
-const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1);
+const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1)
 
 const computedStyle = getComputedStyle(document.documentElement);
 const themeColor =
diff --git a/packages/client/src/components/MkUserInfo.vue b/packages/client/src/components/MkUserInfo.vue
index e2b579eaf..3dd6f90cb 100644
--- a/packages/client/src/components/MkUserInfo.vue
+++ b/packages/client/src/components/MkUserInfo.vue
@@ -34,15 +34,15 @@
 		<div class="status">
 			<div>
 				<p>{{ i18n.ts.notes }}</p>
-				<MkNumber :value="user.notesCount" />
+				<MkNumber :value="user.notesCount"/>
 			</div>
 			<div>
 				<p>{{ i18n.ts.following }}</p>
-				<MkNumber :value="user.followingCount" />
+				<MkNumber :value="user.followingCount"/>
 			</div>
 			<div>
 				<p>{{ i18n.ts.followers }}</p>
-				<MkNumber :value="user.followersCount" />
+				<MkNumber :value="user.followersCount"/>
 			</div>
 		</div>
 		<MkFollowButton
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c875c9fed..7e62b9ef3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -236,6 +236,9 @@ importers:
       koa-mount:
         specifier: 4.0.0
         version: 4.0.0
+      koa-remove-trailing-slashes:
+        specifier: 2.0.3
+        version: 2.0.3
       koa-send:
         specifier: 5.0.1
         version: 5.0.1
@@ -9858,6 +9861,10 @@ packages:
       - supports-color
     dev: false
 
+  /koa-remove-trailing-slashes@2.0.3:
+    resolution: {integrity: sha512-NFFF9Sl1wxFo5h0I3OzrHDINdFPaqG+Hx19590F7PNOcmm7yYeFW71p4XicVuSovbcx75GWGb3fi6N6kI6E/3g==}
+    dev: false
+
   /koa-router@10.1.1:
     resolution: {integrity: sha512-z/OzxVjf5NyuNO3t9nJpx7e1oR3FSBAauiwXtMQu4ppcnuNZzTaQ4p21P8A6r2Es8uJJM339oc4oVW+qX7SqnQ==}
     engines: {node: '>= 8.0.0'}

From 79d9b1bf133f00b5b8d8a46e23a0fb75dfbc2e9b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 17 Apr 2023 01:22:31 -0700
Subject: [PATCH 482/582] Revert "[Fix] remove-trailing-slashes with inhouse
 script (#9869)"

This reverts commit 07db141fc0f1d0c55a930378f3adc81f23dbda44.
---
 packages/backend/package.json        | 1 +
 packages/backend/src/server/index.ts | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 97e86cd26..b02af2c03 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -78,6 +78,7 @@
 		"koa-json-body": "5.3.0",
 		"koa-logger": "3.2.1",
 		"koa-mount": "4.0.0",
+		"koa-remove-trailing-slashes": "2.0.3",
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 16f1a1034..be1f71a7a 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -10,6 +10,7 @@ import Router from "@koa/router";
 import mount from "koa-mount";
 import koaLogger from "koa-logger";
 import * as slow from "koa-slow";
+
 import { IsNull } from "typeorm";
 import config from "@/config/index.js";
 import Logger from "@/services/logger.js";
@@ -29,6 +30,7 @@ import proxyServer from "./proxy/index.js";
 import webServer from "./web/index.js";
 import { initializeStreamingServer } from "./api/streaming.js";
 import { koaBody } from "koa-body";
+import removeTrailingSlash from "koa-remove-trailing-slashes";
 import { v4 as uuid } from "uuid";
 
 export const serverLogger = new Logger("server", "gray", false);
@@ -37,11 +39,7 @@ export const serverLogger = new Logger("server", "gray", false);
 const app = new Koa();
 app.proxy = true;
 
-// Replace trailing slashes 
-app.use(async (ctx, next) => {
-	if (ctx.request.path !== "/" && ctx.request.path.endsWith('/')) return ctx.redirect(ctx.request.path.replace(/\/$/, ""))
-	else next()
-});
+app.use(removeTrailingSlash());
 
 if (!["production", "test"].includes(process.env.NODE_ENV || "")) {
 	// Logger

From 5856a3c3a543ac72816a0f40b995ff740f07a4d1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 17 Apr 2023 01:47:53 -0700
Subject: [PATCH 483/582] chore: formatting

---
 locales/pl-PL.yml                             | 276 ++++++------------
 .../src/components/MkInstanceTicker.vue       |   9 +-
 packages/client/src/components/MkUserInfo.vue |   6 +-
 3 files changed, 95 insertions(+), 196 deletions(-)

diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 9734663f9..cc2dfa443 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1,8 +1,6 @@
 _lang_: "Polski"
-headlineMisskey: "Otwartoźródłowa, zdecentralizowana sieć społecznościowa, która zawsze\
-  \ będzie darmowa! \U0001F680"
-introMisskey: "Hej! Calckey to otwartoźródłowa oraz zdecentralizowana sieć społecznościowa,\
-  \ która zawsze będzie darmowa! \U0001F680"
+headlineMisskey: "Otwartoźródłowa, zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
+introMisskey: "Hej! Calckey to otwartoźródłowa oraz zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
 monthAndDay: "{month}-{day}"
 search: "Szukaj"
 notifications: "Powiadomienia"
@@ -45,8 +43,7 @@ copyContent: "Skopiuj zawartość"
 copyLink: "Skopiuj odnośnik"
 delete: "Usuń"
 deleteAndEdit: "Usuń i edytuj"
-deleteAndEditConfirm: "Czy na pewno chcesz usunąć ten wpis i zedytować go? Utracisz\
-  \ wszystkie reakcje, podbicia i odpowiedzi do tego wpisu."
+deleteAndEditConfirm: "Czy na pewno chcesz usunąć ten wpis i zedytować go? Utracisz wszystkie reakcje, podbicia i odpowiedzi do tego wpisu."
 addToList: "Dodaj do listy"
 sendMessage: "Wyślij wiadomość"
 copyUsername: "Kopiuj nazwę użytkownika"
@@ -66,11 +63,9 @@ import: "Importuj"
 export: "Eksportuj"
 files: "Pliki"
 download: "Pobierz"
-driveFileDeleteConfirm: "Czy chcesz usunąć plik \"{name}\"? Zniknie również wpis,\
-  \ do której dołączony jest ten plik."
+driveFileDeleteConfirm: "Czy chcesz usunąć plik \"{name}\"? Zniknie również wpis, do której dołączony jest ten plik."
 unfollowConfirm: "Czy na pewno chcesz przestać obserwować {name}?"
-exportRequested: "Zażądałeś eksportu. Może to zająć chwilę. Po zakończeniu eksportu\
-  \ zostanie on dodany do Twojego dysku."
+exportRequested: "Zażądałeś eksportu. Może to zająć chwilę. Po zakończeniu eksportu zostanie on dodany do Twojego dysku."
 importRequested: "Zażądano importu. Może to zająć chwilę."
 lists: "Listy"
 noLists: "Nie masz żadnych list"
@@ -85,8 +80,7 @@ error: "Błąd"
 somethingHappened: "Coś poszło nie tak"
 retry: "Spróbuj ponownie"
 pageLoadError: "Nie udało się załadować strony."
-pageLoadErrorDescription: "Zwykle jest to spowodowane problemem z siecią lub cache\
-  \ przeglądarki. Spróbuj wyczyścić cache i sprawdź jeszcze raz za chwilę."
+pageLoadErrorDescription: "Zwykle jest to spowodowane problemem z siecią lub cache przeglądarki. Spróbuj wyczyścić cache i sprawdź jeszcze raz za chwilę."
 serverIsDead: "Serwer nie odpowiada. Zaczekaj chwilę i spróbuj ponownie."
 youShouldUpgradeClient: "Aby zobaczyć tą stronę, odśwież ją, by zaaktualizować klienta."
 enterListName: "Wpisz nazwę listy"
@@ -113,8 +107,7 @@ sensitive: "NSFW"
 add: "Dodaj"
 reaction: "Reakcja"
 reactionSetting: "Reakcje do pokazania w wyborniku reakcji"
-reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć,\
-  \ naciśnij „+” aby dodać."
+reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć, naciśnij „+” aby dodać."
 rememberNoteVisibility: "Zapamiętuj ustawienia widoczności wpisu"
 attachCancel: "Usuń załącznik"
 markAsSensitive: "Oznacz jako NSFW"
@@ -143,19 +136,13 @@ emojiUrl: "Adres URL emoji"
 addEmoji: "Dodaj emoji"
 settingGuide: "Proponowana konfiguracja"
 cacheRemoteFiles: "Przechowuj zdalne pliki w pamięci podręcznej"
-cacheRemoteFilesDescription: "Gdy ta opcja jest wyłączona, zdalne pliki są ładowane\
-  \ bezpośrednio ze zdalnych instancji. Wyłączenie the opcji zmniejszy użycie powierzchni\
-  \ dyskowej, ale zwiększy transfer, ponieważ miniaturki nie będą generowane."
+cacheRemoteFilesDescription: "Gdy ta opcja jest wyłączona, zdalne pliki są ładowane bezpośrednio ze zdalnych instancji. Wyłączenie the opcji zmniejszy użycie powierzchni dyskowej, ale zwiększy transfer, ponieważ miniaturki nie będą generowane."
 flagAsBot: "To konto jest botem"
-flagAsBotDescription: "Jeżeli ten kanał jest kontrolowany przez jakiś program, ustaw\
-  \ tę opcję. Jeżeli włączona, będzie działać jako flaga informująca innych programistów,\
-  \ aby zapobiegać nieskończonej interakcji z różnymi botami i dostosowywać wewnętrzne\
-  \ systemy Calckey, traktując konto jako bota."
+flagAsBotDescription: "Jeżeli ten kanał jest kontrolowany przez jakiś program, ustaw tę opcję. Jeżeli włączona, będzie działać jako flaga informująca innych programistów, aby zapobiegać nieskończonej interakcji z różnymi botami i dostosowywać wewnętrzne systemy Calckey, traktując konto jako bota."
 flagAsCat: "Czy jesteś kotem? \U0001F63A"
 flagAsCatDescription: "Dostaniesz kocie uszka, oraz będziesz mówić jak kot!"
 flagShowTimelineReplies: "Pokazuj odpowiedzi na osi czasu"
-autoAcceptFollowed: "Automatycznie przyjmuj prośby o możliwość obserwacji od użytkowników,\
-  \ których obserwujesz"
+autoAcceptFollowed: "Automatycznie przyjmuj prośby o możliwość obserwacji od użytkowników, których obserwujesz"
 addAccount: "Dodaj konto"
 loginFailed: "Nie udało się zalogować"
 showOnRemote: "Zobacz na zdalnej instancji"
@@ -197,14 +184,11 @@ instanceInfo: "Informacje o instancji"
 statistics: "Statystyki"
 clearQueue: "Wyczyść kolejkę"
 clearQueueConfirmTitle: "Czy na pewno chcesz wyczyścić kolejkę?"
-clearQueueConfirmText: "Wszystkie niewysłane wpisy z kolejki nie zostaną wysłane.\
-  \ Zwykle to nie jest konieczne."
+clearQueueConfirmText: "Wszystkie niewysłane wpisy z kolejki nie zostaną wysłane. Zwykle to nie jest konieczne."
 clearCachedFiles: "Wyczyść pamięć podręczną"
-clearCachedFilesConfirm: "Czy na pewno chcesz usunąć wszystkie zdalne pliki z pamięci\
-  \ podręcznej?"
+clearCachedFilesConfirm: "Czy na pewno chcesz usunąć wszystkie zdalne pliki z pamięci podręcznej?"
 blockedInstances: "Zablokowane instancje"
-blockedInstancesDescription: "Wypisz nazwy hostów instancji, które powinny zostać\
-  \ zablokowane. Wypisane instancje nie będą mogły dłużej komunikować się z tą instancją."
+blockedInstancesDescription: "Wypisz nazwy hostów instancji, które powinny zostać zablokowane. Wypisane instancje nie będą mogły dłużej komunikować się z tą instancją."
 muteAndBlock: "Wyciszenia i blokady"
 mutedUsers: "Wyciszeni użytkownicy"
 blockedUsers: "Zablokowani użytkownicy"
@@ -268,8 +252,7 @@ agreeTo: "Wyrażam zgodę na {0}"
 tos: "Regulamin"
 start: "Rozpocznij"
 home: "Strona główna"
-remoteUserCaution: "Te informacje mogą nie być aktualne, ponieważ użytkownik pochodzi\
-  \ ze zdalnej instancji."
+remoteUserCaution: "Te informacje mogą nie być aktualne, ponieważ użytkownik pochodzi ze zdalnej instancji."
 activity: "Aktywność"
 images: "Zdjęcia"
 birthday: "Data urodzenia"
@@ -302,8 +285,7 @@ unableToDelete: "Nie można usunąć"
 inputNewFileName: "Wprowadź nową nazwę pliku"
 inputNewDescription: "Proszę wpisać nowy napis"
 inputNewFolderName: "Wprowadź nową nazwę katalogu"
-circularReferenceFolder: "Katalog docelowy jest podkatalogiem katalogu, który chcesz\
-  \ przenieść."
+circularReferenceFolder: "Katalog docelowy jest podkatalogiem katalogu, który chcesz przenieść."
 hasChildFilesOrFolders: "Ponieważ ten katalog nie jest pusty, nie może być usunięty."
 copyUrl: "Skopiuj adres URL"
 rename: "Zmień nazwę"
@@ -337,8 +319,7 @@ connectService: "Połącz"
 disconnectService: "Rozłącz"
 enableLocalTimeline: "Włącz lokalną oś czasu"
 enableGlobalTimeline: "Włącz globalną oś czasu"
-disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dostęp do\
-  \ wszystkich osi czasu, nawet gdy są one wyłączone."
+disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dostęp do wszystkich osi czasu, nawet gdy są one wyłączone."
 registration: "Zarejestruj się"
 enableRegistration: "Włącz rejestrację nowych użytkowników"
 invite: "Zaproś"
@@ -350,11 +331,9 @@ bannerUrl: "Adres URL banera"
 backgroundImageUrl: "Adres URL tła"
 basicInfo: "Podstawowe informacje"
 pinnedUsers: "Przypięty użytkownik"
-pinnedUsersDescription: "Wypisz po jednej nazwie użytkownika w wierszu. Podani użytkownicy\
-  \ zostaną przypięci pod kartą „Eksploruj”."
+pinnedUsersDescription: "Wypisz po jednej nazwie użytkownika w wierszu. Podani użytkownicy zostaną przypięci pod kartą „Eksploruj”."
 pinnedPages: "Przypięte strony"
-pinnedPagesDescription: "Wprowadź ścieżki stron które chcesz przypiąć na głównej stronie\
-  \ instancji, oddzielone znakiem nowego wiersza."
+pinnedPagesDescription: "Wprowadź ścieżki stron które chcesz przypiąć na głównej stronie instancji, oddzielone znakiem nowego wiersza."
 pinnedClipId: "ID przypiętego klipu"
 pinnedNotes: "Przypięty wpis"
 hcaptcha: "hCaptcha"
@@ -365,16 +344,14 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "Włącz reCAPTCHA"
 recaptchaSiteKey: "Klucz strony"
 recaptchaSecretKey: "Tajny klucz"
-avoidMultiCaptchaConfirm: "Używanie wielu Captchy może spowodować zakłócenia. Czy\
-  \ chcesz wyłączyć inną Captchę? Możesz zostawić wiele jednocześnie, klikając Anuluj."
+avoidMultiCaptchaConfirm: "Używanie wielu Captchy może spowodować zakłócenia. Czy chcesz wyłączyć inną Captchę? Możesz zostawić wiele jednocześnie, klikając Anuluj."
 antennas: "Anteny"
 manageAntennas: "Zarządzaj antenami"
 name: "Nazwa"
 antennaSource: "Źródło anteny"
 antennaKeywords: "Słowa kluczowe do obserwacji"
 antennaExcludeKeywords: "Wykluczone słowa kluczowe"
-antennaKeywordsDescription: "Oddziel spacjami dla warunku AND, albo wymuś koniec linii\
-  \ dla warunku OR."
+antennaKeywordsDescription: "Oddziel spacjami dla warunku AND, albo wymuś koniec linii dla warunku OR."
 notifyAntenna: "Powiadamiaj o nowych wpisach"
 withFileAntenna: "Filtruj tylko wpisy z załączonym plikiem"
 enableServiceworker: "Włącz powiadomienia push dla twojej przeglądarki"
@@ -462,8 +439,7 @@ strongPassword: "Silne hasło"
 passwordMatched: "Pasuje"
 passwordNotMatched: "Hasła nie pasują do siebie"
 signinWith: "Zaloguj się z {x}"
-signinFailed: "Nie udało się zalogować. Wprowadzona nazwa użytkownika lub hasło są\
-  \ nieprawidłowe."
+signinFailed: "Nie udało się zalogować. Wprowadzona nazwa użytkownika lub hasło są nieprawidłowe."
 tapSecurityKey: "Wybierz swój klucz bezpieczeństwa"
 or: "Lub"
 language: "Język"
@@ -509,18 +485,13 @@ objectStorageBucketDesc: "Podaj nazwę „wiadra” używaną przez konfigurowan
 objectStoragePrefix: "Prefiks"
 objectStoragePrefixDesc: "Pliki będą przechowywane w katalogu z tym prefiksem."
 objectStorageEndpoint: "Punkt końcowy"
-objectStorageEndpointDesc: "Pozostaw puste jeżeli używasz AWS S3, w innym wypadku\
-  \ określ punkt końcowy jako '<host>' lub '<host>:<port>' zgodnie z instrukcjami\
-  \ usługi, której używasz."
+objectStorageEndpointDesc: "Pozostaw puste jeżeli używasz AWS S3, w innym wypadku określ punkt końcowy jako '<host>' lub '<host>:<port>' zgodnie z instrukcjami usługi, której używasz."
 objectStorageRegion: "Region"
-objectStorageRegionDesc: "Określ region, np. 'xx-east-1'. Jeżeli usługa której używasz\
-  \ nie zawiera rozróżnienia regionów, pozostaw to pustym lub wprowadź 'us-east-1'."
+objectStorageRegionDesc: "Określ region, np. 'xx-east-1'. Jeżeli usługa której używasz nie zawiera rozróżnienia regionów, pozostaw to pustym lub wprowadź 'us-east-1'."
 objectStorageUseSSL: "Użyj SSL"
-objectStorageUseSSLDesc: "Wyłącz, jeżeli nie zamierzasz używać HTTPS dla połączenia\
-  \ z API"
+objectStorageUseSSLDesc: "Wyłącz, jeżeli nie zamierzasz używać HTTPS dla połączenia z API"
 objectStorageUseProxy: "Połącz przez proxy"
-objectStorageUseProxyDesc: "Wyłącz, jeżeli nie zamierzasz używać proxy dla połączenia\
-  \ z pamięcią blokową"
+objectStorageUseProxyDesc: "Wyłącz, jeżeli nie zamierzasz używać proxy dla połączenia z pamięcią blokową"
 serverLogs: "Dziennik zdarzeń"
 deleteAll: "Usuń wszystkie"
 showFixedPostForm: "Wyświetlaj formularz tworzenia wpisu w górnej części osi czasu"
@@ -547,22 +518,18 @@ sort: "Sortuj"
 ascendingOrder: "Rosnąco"
 descendingOrder: "Malejąco"
 scratchpad: "Brudnopis"
-scratchpadDescription: "Brudnopis to środowisko dla eksperymentów z AiScript. Możesz\
-  \ pisać, wykonywać i sprawdzać wyniki interakcji skryptu z Calckey."
+scratchpadDescription: "Brudnopis to środowisko dla eksperymentów z AiScript. Możesz pisać, wykonywać i sprawdzać wyniki interakcji skryptu z Calckey."
 output: "Wyjście"
 script: "Skrypt"
 disablePagesScript: "Wyłącz AiScript na Stronach"
 updateRemoteUser: "Aktualizuj zdalne dane o użytkowniku"
 deleteAllFiles: "Usuń wszystkie pliki"
 deleteAllFilesConfirm: "Czy na pewno chcesz usunąć wszystkie pliki?"
-removeAllFollowingDescription: "Przestań obserwować wszystkie konta z {host}. Wykonaj\
-  \ to, jeżeli instancja już nie istnieje."
+removeAllFollowingDescription: "Przestań obserwować wszystkie konta z {host}. Wykonaj to, jeżeli instancja już nie istnieje."
 userSuspended: "To konto zostało zawieszone."
 userSilenced: "Ten użytkownik został wyciszony."
 yourAccountSuspendedTitle: "To konto jest zawieszone"
-yourAccountSuspendedDescription: "To konto zostało zawieszone z powodu złamania regulaminu\
-  \ serwera lub innych podobnych. Skontaktuj się z administratorem, jeśli chciałbyś\
-  \ poznać bardziej szczegółowy powód. Proszę nie zakładać nowego konta."
+yourAccountSuspendedDescription: "To konto zostało zawieszone z powodu złamania regulaminu serwera lub innych podobnych. Skontaktuj się z administratorem, jeśli chciałbyś poznać bardziej szczegółowy powód. Proszę nie zakładać nowego konta."
 menu: "Menu"
 divider: "Rozdzielacz"
 addItem: "Dodaj element"
@@ -601,14 +568,12 @@ permission: "Uprawnienia"
 enableAll: "Włącz wszystko"
 disableAll: "Wyłącz wszystko"
 tokenRequested: "Przydziel dostęp do konta"
-pluginTokenRequestedDescription: "Ta wtyczka będzie mogła korzystać z ustawionych\
-  \ tu uprawnień."
+pluginTokenRequestedDescription: "Ta wtyczka będzie mogła korzystać z ustawionych tu uprawnień."
 notificationType: "Rodzaj powiadomień"
 edit: "Edytuj"
 emailServer: "Serwer poczty e-mail"
 enableEmail: "Włącz dostarczanie wiadomości e-mail"
-emailConfigInfo: "Wykorzystywany do potwierdzenia adresu e-mail w trakcie rejestracji,\
-  \ lub gdy zapomnisz hasła"
+emailConfigInfo: "Wykorzystywany do potwierdzenia adresu e-mail w trakcie rejestracji, lub gdy zapomnisz hasła"
 email: "Adres e-mail"
 emailAddress: "Adres e-mail"
 smtpConfig: "Konfiguracja serwera SMTP"
@@ -616,8 +581,7 @@ smtpHost: "Host"
 smtpPort: "Port"
 smtpUser: "Nazwa użytkownika"
 smtpPass: "Hasło"
-emptyToDisableSmtpAuth: "Pozostaw adres e-mail i hasło puste, aby wyłączyć weryfikację\
-  \ SMTP"
+emptyToDisableSmtpAuth: "Pozostaw adres e-mail i hasło puste, aby wyłączyć weryfikację SMTP"
 smtpSecureInfo: "Wyłącz, jeżeli używasz STARTTLS"
 testEmail: "Przetestuj dostarczanie wiadomości e-mail"
 wordMute: "Wyciszenie słowa"
@@ -636,12 +600,10 @@ create: "Utwórz"
 notificationSetting: "Ustawienia powiadomień"
 notificationSettingDesc: "Wybierz rodzaj powiadomień do wyświetlania."
 useGlobalSetting: "Użyj globalnych ustawień"
-useGlobalSettingDesc: "Jeżeli włączone, zostaną wykorzystane ustawienia powiadomień\
-  \ Twojego konta. Jeżeli wyłączone, mogą zostać wykonane oddzielne konfiguracje."
+useGlobalSettingDesc: "Jeżeli włączone, zostaną wykorzystane ustawienia powiadomień Twojego konta. Jeżeli wyłączone, mogą zostać wykonane oddzielne konfiguracje."
 other: "Inne"
 regenerateLoginToken: "Generuj token logowania ponownie"
-regenerateLoginTokenDescription: "Regeneruje token używany wewnętrznie podczas logowania.\
-  \ Zazwyczaj nie jest to konieczne. Po regeneracji wszystkie urządzenia zostaną wylogowane."
+regenerateLoginTokenDescription: "Regeneruje token używany wewnętrznie podczas logowania. Zazwyczaj nie jest to konieczne. Po regeneracji wszystkie urządzenia zostaną wylogowane."
 setMultipleBySeparatingWithSpace: "Możesz ustawić wiele, oddzielając je spacjami."
 fileIdOrUrl: "ID pliku albo URL"
 behavior: "Zachowanie"
@@ -649,8 +611,7 @@ sample: "Przykład"
 abuseReports: "Zgłoszenia"
 reportAbuse: "Zgłoś"
 reportAbuseOf: "Zgłoś {name}"
-fillAbuseReportDescription: "Wypełnij szczegóły zgłoszenia. Jeżeli dotyczy ono określonego\
-  \ wpisu, uwzględnij jego adres URL."
+fillAbuseReportDescription: "Wypełnij szczegóły zgłoszenia. Jeżeli dotyczy ono określonego wpisu, uwzględnij jego adres URL."
 abuseReported: "Twoje zgłoszenie zostało wysłane. Dziękujemy."
 reporteeOrigin: "Pochodzenie osoby zgłoszonej"
 reporterOrigin: "Pochodzenie osoby zgłaszającej"
@@ -672,11 +633,9 @@ createNew: "Utwórz nowy"
 optional: "Nieobowiązkowe"
 createNewClip: "Utwórz nowy klip"
 unclip: "Odczep"
-confirmToUnclipAlreadyClippedNote: "Ten wpis jest już częścią klipu \"{name}\". Czy\
-  \ chcesz ją usunąć z tego klipu?"
+confirmToUnclipAlreadyClippedNote: "Ten wpis jest już częścią klipu \"{name}\". Czy chcesz ją usunąć z tego klipu?"
 public: "Publiczny"
-i18nInfo: "Calckey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc\
-  \ na {link}."
+i18nInfo: "Calckey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}."
 manageAccessTokens: "Zarządzaj tokenami dostępu"
 accountInfo: "Informacje o koncie"
 notesCount: "Liczba wpisów"
@@ -695,16 +654,12 @@ no: "Nie"
 driveFilesCount: "Liczba plików na dysku"
 driveUsage: "Użycie przestrzeni dyskowej"
 noCrawle: "Odrzuć indeksowanie przez crawlery"
-noCrawleDescription: "Proś wyszukiwarki internetowe, aby nie indeksowały Twojego profilu,\
-  \ wpisów, stron itd."
-lockedAccountInfo: "Dopóki nie ustawisz widoczności wpisu na \"Obserwujący\", twoje\
-  \ wpisy będą mogli widzieć wszyscy, nawet jeśli ustawisz manualne zatwierdzanie\
-  \ obserwujących."
+noCrawleDescription: "Proś wyszukiwarki internetowe, aby nie indeksowały Twojego profilu, wpisów, stron itd."
+lockedAccountInfo: "Dopóki nie ustawisz widoczności wpisu na \"Obserwujący\", twoje wpisy będą mogli widzieć wszyscy, nawet jeśli ustawisz manualne zatwierdzanie obserwujących."
 alwaysMarkSensitive: "Oznacz domyślnie jako NSFW"
 loadRawImages: "Wyświetlaj zdjęcia w załącznikach w całości zamiast miniatur"
 disableShowingAnimatedImages: "Nie odtwarzaj animowanych obrazów"
-verificationEmailSent: "Wiadomość weryfikacyjna została wysłana. Odwiedź uwzględniony\
-  \ odnośnik, aby ukończyć weryfikację."
+verificationEmailSent: "Wiadomość weryfikacyjna została wysłana. Odwiedź uwzględniony odnośnik, aby ukończyć weryfikację."
 notSet: "Nie ustawiono"
 emailVerified: "Adres e-mail został potwierdzony"
 noteFavoritesCount: "Liczba zakładek"
@@ -716,16 +671,14 @@ clips: "Klipy"
 experimentalFeatures: "Eksperymentalne funkcje"
 developer: "Programista"
 makeExplorable: "Pokazuj konto na stronie „Eksploruj”"
-makeExplorableDescription: "Jeżeli wyłączysz tę opcję, Twoje konto nie będzie wyświetlać\
-  \ się w sekcji „Eksploruj”."
+makeExplorableDescription: "Jeżeli wyłączysz tę opcję, Twoje konto nie będzie wyświetlać się w sekcji „Eksploruj”."
 showGapBetweenNotesInTimeline: "Pokazuj odstęp między wpisami na osi czasu"
 duplicate: "Duplikuj"
 left: "Lewo"
 center: "Wyśrodkuj"
 wide: "Szerokie"
 narrow: "Wąskie"
-reloadToApplySetting: "To ustawienie zostanie zastosowane po odświeżeniu strony. Chcesz\
-  \ odświeżyć?"
+reloadToApplySetting: "To ustawienie zostanie zastosowane po odświeżeniu strony. Chcesz odświeżyć?"
 needReloadToApply: "To ustawienie zostanie zastosowane po odświeżeniu strony."
 showTitlebar: "Pokazuj pasek tytułowy"
 clearCache: "Wyczyść pamięć podręczną"
@@ -771,17 +724,14 @@ unlikeConfirm: "Na pewno chcesz usunąć polubienie?"
 fullView: "Pełny widok"
 quitFullView: "Opuść pełny widok"
 addDescription: "Dodaj opis"
-userPagePinTip: "Możesz wyświetlać wpisy w tym miejscu po wybraniu \"Przypnij do profilu\"\
-  \ z menu pojedynczego wpisu."
-notSpecifiedMentionWarning: "Ten wpis zawiera wzmianki o użytkownikach niezawartych\
-  \ jako odbiorcy"
+userPagePinTip: "Możesz wyświetlać wpisy w tym miejscu po wybraniu \"Przypnij do profilu\" z menu pojedynczego wpisu."
+notSpecifiedMentionWarning: "Ten wpis zawiera wzmianki o użytkownikach niezawartych jako odbiorcy"
 info: "Informacje"
 userInfo: "Informacje o użykowniku"
 unknown: "Nieznane"
 onlineStatus: "Status online"
 hideOnlineStatus: "Ukryj status online"
-hideOnlineStatusDescription: "Ukrywanie statusu online ogranicza wygody niektórych\
-  \ funkcji, takich jak wyszukiwanie."
+hideOnlineStatusDescription: "Ukrywanie statusu online ogranicza wygody niektórych funkcji, takich jak wyszukiwanie."
 online: "Online"
 active: "Aktywny"
 offline: "Offline"
@@ -816,8 +766,7 @@ emailNotConfiguredWarning: "Nie podano adresu e-mail."
 ratio: "Stosunek"
 previewNoteText: "Pokaż podgląd"
 customCss: "Własny CSS"
-customCssWarn: "Używaj tego ustawienia tylko wtedy, gdy wiesz co ono robi. Nieprawidłowe\
-  \ wpisy mogą spowodować, że klient przestanie działać poprawnie."
+customCssWarn: "Używaj tego ustawienia tylko wtedy, gdy wiesz co ono robi. Nieprawidłowe wpisy mogą spowodować, że klient przestanie działać poprawnie."
 global: "Globalna"
 squareAvatars: "Wyświetlaj kwadratowe awatary"
 sent: "Wysłane"
@@ -832,9 +781,7 @@ whatIsNew: "Pokaż zmiany"
 translate: "Przetłumacz"
 translatedFrom: "Przetłumaczone z {x}"
 accountDeletionInProgress: "Trwa usuwanie konta"
-usernameInfo: "Nazwa, która identyfikuje Twoje konto spośród innych na tym serwerze.\
-  \  Możesz użyć alfabetu (a~z, A~Z), cyfr (0~9) lub podkreślników (_). Nazwy użytkownika\
-  \ nie mogą być później zmieniane."
+usernameInfo: "Nazwa, która identyfikuje Twoje konto spośród innych na tym serwerze.  Możesz użyć alfabetu (a~z, A~Z), cyfr (0~9) lub podkreślników (_). Nazwy użytkownika nie mogą być później zmieniane."
 aiChanMode: "Ai-chan w klasycznym interfejsie"
 keepCw: "Zostaw ostrzeżenia o zawartości"
 pubSub: "Konta Pub/Sub"
@@ -848,14 +795,12 @@ filter: "Filtr"
 controlPanel: "Panel sterowania"
 manageAccounts: "Zarządzaj kontami"
 makeReactionsPublic: "Ustaw historię reakcji jako publiczną"
-makeReactionsPublicDescription: "To spowoduje, że lista wszystkich Twoich dotychczasowych\
-  \ reakcji będzie publicznie widoczna."
+makeReactionsPublicDescription: "To spowoduje, że lista wszystkich Twoich dotychczasowych reakcji będzie publicznie widoczna."
 classic: "Klasyczny"
 muteThread: "Wycisz wątek"
 unmuteThread: "Wyłącz wyciszenie wątku"
 ffVisibility: "Widoczność obserwowanych/obserwujących"
-ffVisibilityDescription: "Pozwala skonfigurować, kto może zobaczyć, kogo obserwujesz\
-  \ i kto Cię obserwuje."
+ffVisibilityDescription: "Pozwala skonfigurować, kto może zobaczyć, kogo obserwujesz i kto Cię obserwuje."
 continueThread: "Kontynuuj wątek"
 deleteAccountConfirm: "Spowoduje to nieodwracalne usunięcie Twojego konta. Kontynuować?"
 incorrectPassword: "Nieprawidłowe hasło."
@@ -863,8 +808,7 @@ voteConfirm: "Potwierdzić swój głos na \"{choice}\"?"
 hide: "Ukryj"
 leaveGroup: "Opuść grupę"
 leaveGroupConfirm: "Czy na pewno chcesz opuścić \"{name}\"?"
-useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach\
-  \ mobilnych"
+useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach mobilnych"
 welcomeBackWithName: "Witaj z powrotem, {name}"
 clickToFinishEmailVerification: "Kliknij [{ok}], aby zakończyć weryfikację e-mail."
 overridedDeviceKind: "Typ urządzenia"
@@ -887,22 +831,16 @@ type: "Typ"
 speed: "Prędkość"
 localOnly: "Tylko lokalne"
 failedToUpload: "Przesyłanie nie powiodło się"
-cannotUploadBecauseInappropriate: "Nie można przesłać tego pliku, ponieważ jego części\
-  \ zostały wykryte jako potencjalnie nieodpowiednie."
-cannotUploadBecauseNoFreeSpace: "Przesyłanie nie powiodło się z powodu braku miejsca\
-  \ na dysku."
+cannotUploadBecauseInappropriate: "Nie można przesłać tego pliku, ponieważ jego części zostały wykryte jako potencjalnie nieodpowiednie."
+cannotUploadBecauseNoFreeSpace: "Przesyłanie nie powiodło się z powodu braku miejsca na dysku."
 beta: "Beta"
 enableAutoSensitive: "Automatyczne oznaczanie NSFW"
-enableAutoSensitiveDescription: "Umożliwia automatyczne wykrywanie i oznaczanie zawartości\
-  \ NSFW za pomocą uczenia maszynowego. Nawet jeśli ta opcja jest wyłączona, może\
-  \ być włączona na całej instancji."
+enableAutoSensitiveDescription: "Umożliwia automatyczne wykrywanie i oznaczanie zawartości NSFW za pomocą uczenia maszynowego. Nawet jeśli ta opcja jest wyłączona, może być włączona na całej instancji."
 navbar: "Pasek nawigacyjny"
 account: "Konta"
 move: "Przenieś"
 _sensitiveMediaDetection:
-  description: "Zmniejsza wysiłek związany z moderacją serwera dzięki automatycznemu\
-    \ rozpoznawaniu zawartości NSFW za pomocą uczenia maszynowego. To nieznacznie\
-    \ zwiększy obciążenie serwera."
+  description: "Zmniejsza wysiłek związany z moderacją serwera dzięki automatycznemu rozpoznawaniu zawartości NSFW za pomocą uczenia maszynowego. To nieznacznie zwiększy obciążenie serwera."
   setSensitiveFlagAutomatically: "Oznacz jako NSFW"
   sensitivity: Czułość wykrywania
   analyzeVideosDescription: Analizuje filmy, w dodatku do zdjęć. Zwiększy to nieznacznie
@@ -926,15 +864,11 @@ _ffVisibility:
 _signup:
   almostThere: "Prawie na miejscu"
   emailAddressInfo: "Podaj swój adres e-mail. Nie zostanie on upubliczniony."
-  emailSent: "E-mail z potwierdzeniem został wysłany na Twój adres e-mail ({email}).\
-    \ Kliknij dołączony link, aby dokończyć tworzenie konta."
+  emailSent: "E-mail z potwierdzeniem został wysłany na Twój adres e-mail ({email}). Kliknij dołączony link, aby dokończyć tworzenie konta."
 _accountDelete:
   accountDelete: "Usuń konto"
-  mayTakeTime: "Ponieważ usuwanie konta jest procesem wymagającym dużej ilości zasobów,\
-    \ jego ukończenie może zająć trochę czasu, w zależności od ilości utworzonej zawartości\
-    \ i liczby przesłanych plików."
-  sendEmail: "Po zakończeniu usuwania konta na adres e-mail zarejestrowany na tym\
-    \ koncie zostanie wysłana wiadomość e-mail."
+  mayTakeTime: "Ponieważ usuwanie konta jest procesem wymagającym dużej ilości zasobów, jego ukończenie może zająć trochę czasu, w zależności od ilości utworzonej zawartości i liczby przesłanych plików."
+  sendEmail: "Po zakończeniu usuwania konta na adres e-mail zarejestrowany na tym koncie zostanie wysłana wiadomość e-mail."
   requestAccountDelete: "Poproś o usunięcie konta"
   started: "Usuwanie się rozpoczęło."
   inProgress: "Usuwanie jest obecnie w toku"
@@ -942,12 +876,9 @@ _ad:
   back: "Wróć"
   reduceFrequencyOfThisAd: "Pokazuj tę reklamę rzadziej"
 _forgotPassword:
-  enterEmail: "Wpisz adres e-mail użyty do rejestracji. Zostanie do niego wysłany\
-    \ link, za pomocą którego możesz zresetować hasło."
-  ifNoEmail: "Jeżeli nie podano adresu e-mail podczas rejestracji, skontaktuj się\
-    \ z administratorem zamiast tego."
-  contactAdmin: "Jeżeli Twoja instancja nie obsługuje adresów e-mail, skontaktuj się\
-    \ zamiast tego z administratorem, aby zresetować hasło."
+  enterEmail: "Wpisz adres e-mail użyty do rejestracji. Zostanie do niego wysłany link, za pomocą którego możesz zresetować hasło."
+  ifNoEmail: "Jeżeli nie podano adresu e-mail podczas rejestracji, skontaktuj się z administratorem zamiast tego."
+  contactAdmin: "Jeżeli Twoja instancja nie obsługuje adresów e-mail, skontaktuj się zamiast tego z administratorem, aby zresetować hasło."
 _gallery:
   my: "Moja galeria"
   liked: "Polubione wpisy"
@@ -970,10 +901,8 @@ _preferencesBackups:
   save: "Zapisz zmiany"
   inputName: "Proszę podać nazwę dla tej kopii zapasowej"
   cannotSave: "Zapisanie nie powiodło się"
-  nameAlreadyExists: "Kopia zapasowa o nazwie \"{name}\" już istnieje. Proszę podać\
-    \ inną nazwę."
-  applyConfirm: "Czy na pewno chcesz zastosować kopię zapasową \"{name}\" na tym urządzeniu?\
-    \ Istniejące ustawienia tego urządzenia zostaną nadpisane."
+  nameAlreadyExists: "Kopia zapasowa o nazwie \"{name}\" już istnieje. Proszę podać inną nazwę."
+  applyConfirm: "Czy na pewno chcesz zastosować kopię zapasową \"{name}\" na tym urządzeniu? Istniejące ustawienia tego urządzenia zostaną nadpisane."
   saveConfirm: "Zapisać kopię zapasową jako {name}?"
   deleteConfirm: "Usunąć kopię zapasową {name}?"
   renameConfirm: "Zmienić nazwę kopii zapasowej z \"{old}\" na \"{new}\"?"
@@ -990,15 +919,13 @@ _registry:
   domain: "Domena"
   createKey: "Utwórz klucz"
 _aboutMisskey:
-  about: "Calckey jest forkiem Misskey utworzonym przez ThatOneCalculator, rozwijanym\
-    \ od 2022."
+  about: "Calckey jest forkiem Misskey utworzonym przez ThatOneCalculator, rozwijanym od 2022."
   contributors: "Główni twórcy"
   allContributors: "Wszyscy twórcy"
   source: "Kod źródłowy"
   translation: "Tłumacz Calckey"
   donate: "Przekaż darowiznę na Calckey"
-  morePatrons: "Naprawdę doceniam wsparcie ze strony wielu niewymienionych tu osób.\
-    \ Dziękuję! \U0001F970"
+  morePatrons: "Naprawdę doceniam wsparcie ze strony wielu niewymienionych tu osób. Dziękuję! \U0001F970"
   patrons: "Wspierający"
 _nsfw:
   respect: "Ukrywaj media NSFW"
@@ -1006,13 +933,10 @@ _nsfw:
   force: "Ukrywaj wszystkie media"
 _mfm:
   cheatSheet: "Ściąga MFM"
-  intro: "MFM jest językiem składniowym używanym przez m.in. Misskey, forki *key (w\
-    \ tym Calckey), oraz Akkomę, który może być użyty w wielu miejscach. Tu znajdziesz\
-    \ listę wszystkich możliwych elementów składni MFM."
+  intro: "MFM jest językiem składniowym używanym przez m.in. Misskey, forki *key (w tym Calckey), oraz Akkomę, który może być użyty w wielu miejscach. Tu znajdziesz listę wszystkich możliwych elementów składni MFM."
   dummy: "Calckey rozszerza świat Fediwersum"
   mention: "Wspomnij"
-  mentionDescription: "Używając znaku @ i nazwy użytkownika, możesz określić danego\
-    \ użytkownika."
+  mentionDescription: "Używając znaku @ i nazwy użytkownika, możesz określić danego użytkownika."
   hashtag: "Hashtag"
   hashtagDescription: "Używając kratki i tekstu, możesz określić hashtag."
   url: "Adres URL"
@@ -1027,14 +951,12 @@ _mfm:
   centerDescription: "Wyśrodkowuje zawartość."
   inlineCode: "Kod (w wierszu)"
   blockCode: "Kod (blok)"
-  blockCodeDescription: "Wyświetla kod z podświetlaną składnią składający się z wielu\
-    \ linii."
+  blockCodeDescription: "Wyświetla kod z podświetlaną składnią składający się z wielu linii."
   blockMath: "Matematyka (Blok)"
   quote: "Cytuj"
   quoteDescription: "Wyświetla treść jako cytat."
   emoji: "Niestandardowe emoji"
-  emojiDescription: "Otaczając nazwę niestandardowego emoji dwukropkami, możesz użyć\
-    \ niestandardowego emoji."
+  emojiDescription: "Otaczając nazwę niestandardowego emoji dwukropkami, możesz użyć niestandardowego emoji."
   search: "Szukaj"
   searchDescription: "Wyświetla pole wyszukiwania z wcześniej wpisanym tekstem."
   flip: "Odwróć"
@@ -1145,8 +1067,7 @@ _theme:
   darken: "Ściemnij"
   lighten: "Rozjaśnij"
   inputConstantName: "Wprowadź nazwę stałej"
-  importInfo: "Jeżeli wprowadzisz tu kod motywu, możesz zaimportować go w edytorze\
-    \ motywu"
+  importInfo: "Jeżeli wprowadzisz tu kod motywu, możesz zaimportować go w edytorze motywu"
   deleteConstantConfirm: "Czy na pewno chcesz usunąć stałą {const}?"
   keys:
     accent: "Akcent"
@@ -1220,42 +1141,27 @@ _tutorial:
   step1_1: "Witamy!"
   step1_2: "Pozwól, że Cię skonfigurujemy. Będziesz działać w mgnieniu oka!"
   step2_1: "Najpierw, proszę wypełnij swój profil."
-  step2_2: "Podanie kilku informacji o tym, kim jesteś, ułatwi innym stwierdzenie,\
-    \ czy chcą zobaczyć Twoje wpisy lub śledzić Cię."
+  step2_2: "Podanie kilku informacji o tym, kim jesteś, ułatwi innym stwierdzenie, czy chcą zobaczyć Twoje wpisy lub śledzić Cię."
   step3_1: "Teraz czas na śledzenie niektórych osób!"
-  step3_2: "Twoje domowe i społeczne linie czasu opierają się na tym, kogo śledzisz,\
-    \ więc spróbuj śledzić kilka kont, aby zacząć.\nKliknij kółko z plusem w prawym\
-    \ górnym rogu profilu, aby go śledzić."
+  step3_2: "Twoje domowe i społeczne linie czasu opierają się na tym, kogo śledzisz, więc spróbuj śledzić kilka kont, aby zacząć.\nKliknij kółko z plusem w prawym górnym rogu profilu, aby go śledzić."
   step4_1: "Pozwól, że zabierzemy Cię tam."
-  step4_2: "Dla twojego pierwszego postu, niektórzy ludzie lubią zrobić {introduction}\
-    \ post lub prosty \"Hello world!\""
+  step4_2: "Dla twojego pierwszego postu, niektórzy ludzie lubią zrobić {introduction} post lub prosty \"Hello world!\""
   step5_1: "Osie czasu, wszędzie widzę osie czasu!"
   step5_2: "Twoja instancja ma włączone {timelines} różne osie czasu."
-  step5_3: "Główna {icon} oś czasu to miejsce, w którym możesz zobaczyć posty od użytkowników\
-    \ których obserwujesz, oraz innych użytkowników z tej instancji. Jeśli wolisz,\
-    \ by główna oś czasu pokazywała tylko posty od użytkowników których obserwujesz,\
-    \ możesz łatwo to zmienić w ustawieniach!"
-  step5_4: "Lokalna {icon} oś czasu to miejsce, w którym możesz zobaczyć posty od\
-    \ wszystkich innych osób na tej instancji."
-  step5_5: "Społeczna {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z instancji,\
-    \ które admini polecają."
-  step5_6: "Polecana {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z instancji,\
-    \ które admini polecają."
-  step5_7: "Globalna {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z każdej\
-    \ innej połączonej instancji."
+  step5_3: "Główna {icon} oś czasu to miejsce, w którym możesz zobaczyć posty od użytkowników których obserwujesz, oraz innych użytkowników z tej instancji. Jeśli wolisz, by główna oś czasu pokazywała tylko posty od użytkowników których obserwujesz, możesz łatwo to zmienić w ustawieniach!"
+  step5_4: "Lokalna {icon} oś czasu to miejsce, w którym możesz zobaczyć posty od wszystkich innych osób na tej instancji."
+  step5_5: "Społeczna {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z instancji, które admini polecają."
+  step5_6: "Polecana {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z instancji, które admini polecają."
+  step5_7: "Globalna {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z każdej innej połączonej instancji."
   step6_1: "Więc, czym to jest to miejsce?"
-  step6_2: "Cóż, nie dołączył*ś po prostu do Calckey. Dołączył*ś do portalu do Fediverse,\
-    \ połączonej sieci tysięcy serwerów, zwanych instancjami."
-  step6_3: "Każdy serwer działa w inny sposób, i nie wszystkie serwery używają Calckey.\
-    \ Ten jednak używa! Jest to trochę skomplikowane, ale w krótkim czasie załapiesz\
-    \ o co chodzi."
+  step6_2: "Cóż, nie dołączył*ś po prostu do Calckey. Dołączył*ś do portalu do Fediverse, połączonej sieci tysięcy serwerów, zwanych instancjami."
+  step6_3: "Każdy serwer działa w inny sposób, i nie wszystkie serwery używają Calckey. Ten jednak używa! Jest to trochę skomplikowane, ale w krótkim czasie załapiesz o co chodzi."
   step6_4: "A teraz idź, odkrywaj i baw się dobrze!"
 _2fa:
   alreadyRegistered: "Zarejestrowałeś już urządzenie do uwierzytelniania dwuskładnikowego."
   registerDevice: "Zarejestruj nowe urządzenie"
   registerKey: "Zarejestruj klucz bezpieczeństwa"
-  step1: "Najpierw, zainstaluj aplikację uwierzytelniającą (taką jak {a} lub {b})\
-    \ na swoim urządzeniu."
+  step1: "Najpierw, zainstaluj aplikację uwierzytelniającą (taką jak {a} lub {b}) na swoim urządzeniu."
   step2: "Następnie, zeskanuje kod QR z ekranu."
   step3: "Wprowadź token podany w aplikacji, aby ukończyć konfigurację."
   step4: "Od teraz, przy każdej próbie logowania otrzymasz prośbę o token logowania."
@@ -1395,8 +1301,7 @@ _profile:
   youCanIncludeHashtags: "Możesz umieścić hashtagi w swoim opisie."
   metadata: "Dodatkowe informacje"
   metadataEdit: "Edytuj dodatkowe informacje"
-  metadataDescription: "Możesz wyświetlać do czterech sekcji dodatkowych informacji\
-    \ na swoim profilu."
+  metadataDescription: "Możesz wyświetlać do czterech sekcji dodatkowych informacji na swoim profilu."
   metadataLabel: "Etykieta"
   metadataContent: "Treść"
   changeAvatar: "Zmień awatar"
@@ -1668,8 +1573,7 @@ _pages:
       _dailyRannum:
         arg1: "Minimalna wartość"
         arg2: "Maksymalna wartość"
-      dailyRandomPick: "Wybierz losowo z listy (zmienia się raz dziennie dla każdego\
-        \ użytkownika)"
+      dailyRandomPick: "Wybierz losowo z listy (zmienia się raz dziennie dla każdegoużytkownika)"
       _dailyRandomPick:
         arg1: "Listy"
       seedRandom: "Losowo (z ziarnem)"
@@ -1685,8 +1589,7 @@ _pages:
       _seedRandomPick:
         arg1: "Ziarno"
         arg2: "Listy"
-      DRPWPM: "Wybierz losowo z ważonej listy (zmienia się raz dziennie dla każdego\
-        \ użytkownika)"
+      DRPWPM: "Wybierz losowo z ważonej listy (zmienia się raz dziennie dla każdegoużytkownika)"
       pick: "Wybierz z listy"
       _pick:
         arg1: "Listy"
@@ -1847,10 +1750,7 @@ swipeOnDesktop: Zezwól na przeciąganie w stylu mobilnym na desktopie
 moveFromDescription: To utworzy alias twojego starego konta, w celu umożliwienia migracji
   z tamtego konta na to. Zrób to ZANIM rozpoczniesz przenoszenie się z tamtego konta.
   Proszę wpisz tag konta w formacie @person@instance.com
-migrationConfirm: "Czy jesteś na 200% pewn* tego, że chcesz przenieść swoje konto\
-  \ na {account}? Gdy to zrobisz, odwrócenie tego będzie nie możliwe, i nie będziesz\
-  \ w stanie ponownie używać normalnie z tego konta.\nUpewnij się, że to konto zostało\
-  \ ustawione jako konto z którego się przenosisz."
+migrationConfirm: "Czy jesteś na 200% pewn* tego, że chcesz przenieść swoje konto na {account}? Gdy to zrobisz, odwrócenie tego będzie nie możliwe, i nie będziesz w stanie ponownie używać normalnie z tego konta.\nUpewnij się, że to konto zostało ustawione jako konto z którego się przenosisz."
 noThankYou: Nie, dziękuję
 addInstance: Dodaj instancję
 renoteMute: Wycisz podbicia
@@ -1920,14 +1820,8 @@ proxyAccountDescription: Konto proxy jest kontem które w określonych sytuacjac
   do listy, oraz żaden lokalny użytkownik nie obserwuje tego konta, aktywność owego
   użytkownika nie zostanie dostarczona na oś czasu. W takim razie, użytkownika zaobserwuje
   konto proxy.
-objectStorageBaseUrlDesc: "URL stosowany jako odniesienie. Podaj URL twojego CDN,\
-  \ albo proxy, jeśli używasz któregokolwiek.\nDla S3 użyj 'https://<bucket>.s3.amazonaws.com',\
-  \ a dla GCS i jego odpowiedników użyj 'https://storage.googleapis.com/<bucket>',\
-  \ itd."
-sendErrorReportsDescription: "Gdy ta opcja jest włączona, szczegółowe informacje o\
-  \ błędach będą udostępnianie z Calckey gdy wystąpi problem, pomagając w ulepszaniu\
-  \ Misskey.\nZawrze to informacje takie jak wersja twojego systemu operacyjnego,\
-  \ przeglądarki, Twoja aktywność na Calckey itd."
+objectStorageBaseUrlDesc: "URL stosowany jako odniesienie. Podaj URL twojego CDN, albo proxy, jeśli używasz któregokolwiek.\nDla S3 użyj 'https://<bucket>.s3.amazonaws.com', a dla GCS i jego odpowiedników użyj 'https://storage.googleapis.com/<bucket>', itd."
+sendErrorReportsDescription: "Gdy ta opcja jest włączona, szczegółowe informacje o błędach będą udostępnianie z Calckey gdy wystąpi problem, pomagając w ulepszaniu Misskey.\nZawrze to informacje takie jak wersja twojego systemu operacyjnego, przeglądarki, Twoja aktywność na Calckey itd."
 privateModeInfo: Jeśli włączone, tylko dopuszczone instancje będą mogły federować
   z Twoją instancją. Wszystkie posty będą ukryte przed publiką.
 oneHour: Godzina
diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue
index 31617fb6d..3558b53d8 100644
--- a/packages/client/src/components/MkInstanceTicker.vue
+++ b/packages/client/src/components/MkInstanceTicker.vue
@@ -1,5 +1,10 @@
 <template>
-	<div class="hpaizdrt" v-tooltip="capitalize(instance.softwareName)"  ref="ticker" :style="bg">
+	<div
+		class="hpaizdrt"
+		v-tooltip="capitalize(instance.softwareName)"
+		ref="ticker"
+		:style="bg"
+	>
 		<img class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" />
 		<span class="name">{{ instance.name }}</span>
 	</div>
@@ -33,7 +38,7 @@ const instance = props.instance ?? {
 	software: Instance.softwareName || "Calckey",
 };
 
-const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1)
+const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1);
 
 const computedStyle = getComputedStyle(document.documentElement);
 const themeColor =
diff --git a/packages/client/src/components/MkUserInfo.vue b/packages/client/src/components/MkUserInfo.vue
index 3dd6f90cb..e2b579eaf 100644
--- a/packages/client/src/components/MkUserInfo.vue
+++ b/packages/client/src/components/MkUserInfo.vue
@@ -34,15 +34,15 @@
 		<div class="status">
 			<div>
 				<p>{{ i18n.ts.notes }}</p>
-				<MkNumber :value="user.notesCount"/>
+				<MkNumber :value="user.notesCount" />
 			</div>
 			<div>
 				<p>{{ i18n.ts.following }}</p>
-				<MkNumber :value="user.followingCount"/>
+				<MkNumber :value="user.followingCount" />
 			</div>
 			<div>
 				<p>{{ i18n.ts.followers }}</p>
-				<MkNumber :value="user.followersCount"/>
+				<MkNumber :value="user.followersCount" />
 			</div>
 		</div>
 		<MkFollowButton

From 230ca29a1d85836268f6df177c9f573bcb436c9f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 17 Apr 2023 03:07:07 -0700
Subject: [PATCH 484/582] update locales for calckey

---
 locales/ar-SA.yml                             | 12 +++----
 locales/bn-BD.yml                             | 22 ++++++------
 locales/ca-ES.yml                             |  4 +--
 locales/cs-CZ.yml                             | 12 +++----
 locales/de-DE.yml                             | 28 +++++++--------
 locales/en-US.yml                             | 10 +++---
 locales/es-ES.yml                             | 28 +++++++--------
 locales/fr-FR.yml                             | 28 +++++++--------
 locales/id-ID.yml                             | 34 +++++++++----------
 locales/it-IT.yml                             | 28 +++++++--------
 locales/ja-JP.yml                             | 10 +++---
 locales/ja-KS.yml                             | 24 ++++++-------
 locales/kn-IN.yml                             |  2 +-
 locales/ko-KR.yml                             | 26 +++++++-------
 locales/nl-NL.yml                             | 10 +++---
 locales/pl-PL.yml                             | 14 ++++----
 locales/pt-PT.yml                             | 10 +++---
 locales/ro-RO.yml                             | 12 +++----
 locales/ru-RU.yml                             | 28 +++++++--------
 locales/sk-SK.yml                             | 28 +++++++--------
 locales/sv-SE.yml                             |  8 ++---
 locales/th-TH.yml                             | 28 +++++++--------
 locales/tr-TR.yml                             |  2 +-
 locales/uk-UA.yml                             | 26 +++++++-------
 locales/vi-VN.yml                             | 28 +++++++--------
 locales/zh-CN.yml                             | 28 +++++++--------
 locales/zh-TW.yml                             | 26 +++++++-------
 packages/client/src/pages/about-calckey.vue   | 18 +++++-----
 packages/client/src/pages/about.vue           |  2 +-
 .../client/src/pages/welcome.entrance.a.vue   |  4 +--
 .../client/src/pages/welcome.entrance.b.vue   |  4 +--
 .../client/src/pages/welcome.entrance.c.vue   |  4 +--
 packages/client/src/scripts/helpMenu.ts       |  2 +-
 packages/client/src/ui/classic.sidebar.vue    |  2 +-
 packages/client/src/ui/visitor/a.vue          |  2 +-
 packages/client/src/ui/visitor/kanban.vue     |  2 +-
 36 files changed, 278 insertions(+), 278 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index 844cfb5d5..cc9231e9a 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "العربية"
-headlineMisskey: "شبكة مرتبطة بالملاحظات"
-introMisskey: "اهلا بك! ميسكي هو منصة تدوين مصغر لا مركزية ومفتوحة المصدر.\nيمكنك مشاركة \"ملاحظات\" عن ما يجري حولك، وإخبار الجميع عن نفسك 📡\nتسمح لك \"الانفعالات\" بتعبير عن شعورك حول ملاحظات الآخرين 👍\nاكتشف عالمًا جديدًا 🚀"
+headlineCalckey: "شبكة مرتبطة بالملاحظات"
+introCalckey: "اهلا بك! ميسكي هو منصة تدوين مصغر لا مركزية ومفتوحة المصدر.\nيمكنك مشاركة \"ملاحظات\" عن ما يجري حولك، وإخبار الجميع عن نفسك 📡\nتسمح لك \"الانفعالات\" بتعبير عن شعورك حول ملاحظات الآخرين 👍\nاكتشف عالمًا جديدًا 🚀"
 monthAndDay: "{day}/{month}"
 search: "البحث"
 notifications: "الإشعارات"
@@ -197,7 +197,7 @@ noUsers: "ليس هناك مستخدمون"
 editProfile: "تعديل الملف التعريفي"
 noteDeleteConfirm: "هل تريد حذف هذه الملاحظة؟"
 pinLimitExceeded: "لا يمكنك تدبيس الملاحظات بعد الآن."
-intro: "لقد انتهت عملية تنصيب Misskey. الرجاء إنشاء حساب إداري."
+intro: "لقد انتهت عملية تنصيب Calckey. الرجاء إنشاء حساب إداري."
 done: "تمّ"
 processing: "المعالجة جارية"
 preview: "معاينة"
@@ -372,7 +372,7 @@ exploreFediverse: "استكشف الفديفرس"
 popularTags: "الوسوم الرائجة"
 userList: "القوائم"
 about: "عن"
-aboutMisskey: "عن Misskey"
+aboutCalckey: "عن Calckey"
 administrator: "المدير"
 token: "الرمز المميز"
 twoStepAuthentication: "الإستيثاق بعاملَيْن"
@@ -856,8 +856,8 @@ _registry:
   keys: "المفاتيح"
   domain: "النّطاق"
   createKey: "أنشئ مفتاحًا"
-_aboutMisskey:
-  about: "ميسكي هو برمجية مفتوحة المصدر يطورها syuilo منذ 2014."
+_aboutCalckey:
+  about: "ميسكي هو برمجية مفتوحة المصدر يطورها thatonecalculator منذ 2022."
   contributors: "المساهمون الرئيسيون"
   allContributors: "كل المساهمين"
   source: "الشفرة المصدرية"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index 8a9358e2a..f0aa5785b 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "বাংলা"
-headlineMisskey: "নোট ব্যাবহার করে সংযুক্ত নেটওয়ার্ক"
-introMisskey: "স্বাগতম! মিসকি একটি ওপেন সোর্স, ডিসেন্ট্রালাইজড মাইক্রোব্লগিং পরিষেবা। \n\"নোট\" তৈরির মাধ্যমে যা ঘটছে তা সবার সাথে শেয়ার করুন 📡\n\"রিঅ্যাকশন\" গুলির মাধ্যমে যেকোনো নোট সম্পর্কে আপনার অনুভূতি ব্যাক্ত করতে পারেন 👍\nএকটি নতুন দুনিয়া ঘুরে দেখুন 🚀\n"
+headlineCalckey: "নোট ব্যাবহার করে সংযুক্ত নেটওয়ার্ক"
+introCalckey: "স্বাগতম! মিসকি একটি ওপেন সোর্স, ডিসেন্ট্রালাইজড মাইক্রোব্লগিং পরিষেবা। \n\"নোট\" তৈরির মাধ্যমে যা ঘটছে তা সবার সাথে শেয়ার করুন 📡\n\"রিঅ্যাকশন\" গুলির মাধ্যমে যেকোনো নোট সম্পর্কে আপনার অনুভূতি ব্যাক্ত করতে পারেন 👍\nএকটি নতুন দুনিয়া ঘুরে দেখুন 🚀\n"
 monthAndDay: "{day}/{month}"
 search: "খুঁজুন"
 notifications: "বিজ্ঞপ্তি"
@@ -199,7 +199,7 @@ noUsers: "কোন ব্যাবহারকারী নেই"
 editProfile: "প্রোফাইল সম্পাদনা করুন"
 noteDeleteConfirm: "আপনি কি নোট ডিলিট করার ব্যাপারে নিশ্চিত?"
 pinLimitExceeded: "আপনি আর কোন নোট পিন করতে পারবেন না"
-intro: "Misskey এর ইন্সটলেশন সম্পন্ন হয়েছে！দয়া করে অ্যাডমিন ইউজার তৈরি করুন।"
+intro: "Calckey এর ইন্সটলেশন সম্পন্ন হয়েছে！দয়া করে অ্যাডমিন ইউজার তৈরি করুন।"
 done: "সম্পন্ন"
 processing: "প্রক্রিয়াধীন..."
 preview: "পূর্বরূপ দেখুন"
@@ -377,7 +377,7 @@ exploreFediverse: "Fediverse ঘুরে দেখুন"
 popularTags: "জনপ্রিয় ট্যাগগুলি"
 userList: "লিস্ট"
 about: "আপনার সম্পর্কে"
-aboutMisskey: "Misskey সম্পর্কে"
+aboutCalckey: "Calckey সম্পর্কে"
 administrator: "প্রশাসক"
 token: "টোকেন"
 twoStepAuthentication: "২-ধাপ প্রমাণীকরণ"
@@ -695,7 +695,7 @@ onlineUsersCount: "{n} জন ব্যাবহারকারী অনলা
 nUsers: "{n} জন ব্যাবহারকারী"
 nNotes: "{n} টি নোট"
 sendErrorReports: "ক্রুটি প্রতিবেদন পাঠান"
-sendErrorReportsDescription: "চালু থাকলে, বিস্তারিত ত্রুটির তথ্য Misskey-এর সাথে শেয়ার করা হয়। যা সফ্টওয়্যারটির গুণমান উন্নত করতে সাহায্য করে। ত্রুটির তথ্যের মধ্যে রয়েছে OS সংস্করণ, ব্রাউজারের ধরন, কর্মের ইতিহাস ইত্যাদি।"
+sendErrorReportsDescription: "চালু থাকলে, বিস্তারিত ত্রুটির তথ্য Calckey-এর সাথে শেয়ার করা হয়। যা সফ্টওয়্যারটির গুণমান উন্নত করতে সাহায্য করে। ত্রুটির তথ্যের মধ্যে রয়েছে OS সংস্করণ, ব্রাউজারের ধরন, কর্মের ইতিহাস ইত্যাদি।"
 myTheme: "আমার থিম"
 backgroundColor: "পটভূমির রং"
 accentColor: "এক্সেন্টের রং"
@@ -786,7 +786,7 @@ hashtags: "হ্যাশট্যাগ"
 troubleshooting: "ট্রাবলশুটিং"
 useBlurEffect: "UI তে ব্লার ইফেক্ট ব্যাবহার করুন"
 learnMore: "আরও জানুন"
-misskeyUpdated: "Misskey আপডেট করা হয়েছে！"
+misskeyUpdated: "Calckey আপডেট করা হয়েছে！"
 whatIsNew: "পরিবর্তনগুলি দেখান"
 translate: "অনুবাদ"
 translatedFrom: "{x} হতে অনুবাদ করা"
@@ -897,13 +897,13 @@ _registry:
   keys: "কী - সমূহ"
   domain: "ডোমেন"
   createKey: "কী বানান"
-_aboutMisskey:
-  about: "Misskey, একটি ওপেন সোর্স সফ্টওয়্যার যা 2014 সাল থেকে syuilo তৈরি করছেন।"
+_aboutCalckey:
+  about: "Calckey, একটি ওপেন সোর্স সফ্টওয়্যার যা 2022 সাল থেকে thatonecalculator তৈরি করছেন।"
   contributors: "প্রধান কন্ট্রিবিউটারগণ"
   allContributors: "সকল কন্ট্রিবিউটারগণ"
   source: "সোর্স কোড"
-  translation: "Misskey অনুবাদ করুন"
-  donate: "Misskey তে দান করুন"
+  translation: "Calckey অনুবাদ করুন"
+  donate: "Calckey তে দান করুন"
   morePatrons: "আরও অনেকে আমাদের সাহায্য করছেন। তাদের সবাইকে ধন্যবাদ 🥰"
   patrons: "সমর্থনকারী"
 _nsfw:
@@ -912,7 +912,7 @@ _nsfw:
   force: "সকল মিডিয়া লুকান"
 _mfm:
   cheatSheet: "MFM চিটশিট"
-  intro: "MFM একটি মার্কআপ ভাষা যা Misskey-এর মধ্যে বিভিন্ন জায়গায় ব্যবহার করা যেতে পারে। এখানে আপনি MFM-এর সিনট্যাক্সগুলির একটি তালিকা দেখতে পারবেন।"
+  intro: "MFM একটি মার্কআপ ভাষা যা Calckey-এর মধ্যে বিভিন্ন জায়গায় ব্যবহার করা যেতে পারে। এখানে আপনি MFM-এর সিনট্যাক্সগুলির একটি তালিকা দেখতে পারবেন।"
   dummy: "মিসকি ফেডিভার্সের বিশ্বকে প্রসারিত করে"
   mention: "উল্লেখ"
   mentionDescription: "@ চিহ্ন + ব্যবহারকারীর নাম একটি নির্দিষ্ট ব্যবহারকারীকে নির্দেশ করতে ব্যবহার করা যায়।"
diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 360ef4c22..e35b0478f 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Català"
-headlineMisskey: "Una xarxa connectada per notes"
-introMisskey: "Benvingut! Misskey és un servei de microblogging descentralitzat de codi obert.\nCrea \"notes\" per compartir els teus pensaments amb tots els que t'envolten. 📡\nAmb \"reaccions\", també pots expressar ràpidament els teus sentiments sobre les notes de tothom. 👍\nExplorem un món nou! 🚀"
+headlineCalckey: "Una xarxa connectada per notes"
+introCalckey: "Benvingut! Calckey és un servei de microblogging descentralitzat de codi obert.\nCrea \"notes\" per compartir els teus pensaments amb tots els que t'envolten. 📡\nAmb \"reaccions\", també pots expressar ràpidament els teus sentiments sobre les notes de tothom. 👍\nExplorem un món nou! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Cercar"
 notifications: "Notificacions"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index cb2f0a1df..28004a45b 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Čeština"
-headlineMisskey: "Síť propojená poznámkami"
-introMisskey: "Vítejte! Misskey je otevřený a decentralizovaný microblogový servis.\n\"Poznámkami\" můžete sdílet co se zrovna děje se všemi ve Vašem okolí. 📡\nPomocí \"reakcí\" můžete sdílet své názory a pocity na ostatní poznámky. 👍\nPojďte objevovat nový svět! 🚀"
+headlineCalckey: "Síť propojená poznámkami"
+introCalckey: "Vítejte! Calckey je otevřený a decentralizovaný microblogový servis.\n\"Poznámkami\" můžete sdílet co se zrovna děje se všemi ve Vašem okolí. 📡\nPomocí \"reakcí\" můžete sdílet své názory a pocity na ostatní poznámky. 👍\nPojďte objevovat nový svět! 🚀"
 monthAndDay: "{day}. {month}."
 search: "Vyhledávání"
 notifications: "Oznámení"
@@ -136,7 +136,7 @@ settingGuide: "Doporučené nastavení"
 cacheRemoteFiles: "Ukládání vzdálených souborů do mezipaměti"
 cacheRemoteFilesDescription: "Zakázání tohoto nastavení způsobí, že vzdálené soubory budou odkazovány přímo, místo aby byly ukládány do mezipaměti. Tím se ušetří úložiště na serveru, ale zvýší se provoz, protože se negenerují miniatury."
 flagAsBot: "Tento účet je bot"
-flagAsBotDescription: "Pokud je tento účet kontrolován programem zaškrtněte tuto možnost. To označí tento účet jako bot pro ostatní vývojáře a zabrání tak nekonečným interakcím s ostatními boty a upraví Misskey systém aby se choval k tomuhle účtu jako bot."
+flagAsBotDescription: "Pokud je tento účet kontrolován programem zaškrtněte tuto možnost. To označí tento účet jako bot pro ostatní vývojáře a zabrání tak nekonečným interakcím s ostatními boty a upraví Calckey systém aby se choval k tomuhle účtu jako bot."
 flagAsCat: "Tenhle účet je kočka"
 flagAsCatDescription: "Vyberte tuto možnost aby tento účet byl označen jako kočka."
 flagShowTimelineReplies: "Zobrazovat odpovědi na časové ose"
@@ -189,7 +189,7 @@ blockedInstances: "Blokované instance"
 noUsers: "Žádní uživatelé"
 editProfile: "Upravit můj profil"
 pinLimitExceeded: "Nemůžete připnout další poznámky."
-intro: "Instalace Misskey byla dokončena! Prosím vytvořte admina."
+intro: "Instalace Calckey byla dokončena! Prosím vytvořte admina."
 done: "Hotovo"
 processing: "Zpracovávám"
 preview: "Náhled"
@@ -332,7 +332,7 @@ recentlyUpdatedUsers: "Nedávno aktívni uživatelé"
 popularTags: "Populární tagy"
 userList: "Seznamy"
 about: "Informace"
-aboutMisskey: "O Misskey"
+aboutCalckey: "O Calckey"
 administrator: "Administrátor"
 token: "Token"
 twoStepAuthentication: "Dvoufaktorová autentikace"
@@ -630,7 +630,7 @@ _registry:
   keys: "Klíče"
   domain: "Doména"
   createKey: "Vytvořit klíč"
-_aboutMisskey:
+_aboutCalckey:
   allContributors: "Všichni přispěvatelé"
   source: "Zdrojový kód"
 _mfm:
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index a51bc0c48..622ad1138 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Deutsch"
-headlineMisskey: "Ein durch Posts verbundenes Netzwerk"
-introMisskey: "Willkommen! Calckey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse „Posts“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen zu teilen. 📡\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle über Posts anderer Benutzer zum Ausdruck bringen. 👍\nEine neue Welt wartet auf dich! 🚀"
+headlineCalckey: "Ein durch Posts verbundenes Netzwerk"
+introCalckey: "Willkommen! Calckey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse „Posts“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen zu teilen. 📡\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle über Posts anderer Benutzer zum Ausdruck bringen. 👍\nEine neue Welt wartet auf dich! 🚀"
 monthAndDay: "{day}.{month}."
 search: "Suchen"
 notifications: "Benachrichtigungen"
@@ -140,7 +140,7 @@ settingGuide: "Empfohlene Einstellung"
 cacheRemoteFiles: "Dateien von fremden Instanzen im Cache speichern"
 cacheRemoteFilesDescription: "Ist diese Einstellung deaktiviert, so werden Dateien fremder Instanzen direkt von dort geladen. Hierdurch wird Speicherplatz auf diesem Server gespart, aber durch fehlende Generierung von Vorschaubildern mehr Bandbreite verwendet."
 flagAsBot: "Als Bot markieren"
-flagAsBotDescription: "Aktiviere diese Option, falls dieses Benutzerkonto durch ein Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Misskeys interne Systeme dieses Benutzerkonto als Bot behandeln."
+flagAsBotDescription: "Aktiviere diese Option, falls dieses Benutzerkonto durch ein Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Calckeys interne Systeme dieses Benutzerkonto als Bot behandeln."
 flagAsCat: "Als Katze markieren"
 flagAsCatDescription: "Aktiviere diese Option, um dieses Benutzerkonto als Katze zu markieren."
 flagShowTimelineReplies: "Antworten in der Chronik anzeigen"
@@ -200,7 +200,7 @@ noUsers: "Keine Benutzer gefunden"
 editProfile: "Profil bearbeiten"
 noteDeleteConfirm: "Möchtest du diese Notiz wirklich löschen?"
 pinLimitExceeded: "Du kannst nicht noch mehr Notizen anheften."
-intro: "Misskey ist installiert! Lass uns nun ein Administratorkonto einrichten."
+intro: "Calckey ist installiert! Lass uns nun ein Administratorkonto einrichten."
 done: "Fertig"
 processing: "In Bearbeitung …"
 preview: "Vorschau"
@@ -379,7 +379,7 @@ exploreFediverse: "Das Fediverse erkunden"
 popularTags: "Beliebte Schlagwörter"
 userList: "Liste"
 about: "Über"
-aboutMisskey: "Über Misskey"
+aboutCalckey: "Über Calckey"
 administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Zwei-Faktor-Authentifizierung"
@@ -525,7 +525,7 @@ sort: "Sortieren"
 ascendingOrder: "Aufsteigende Reihenfolge"
 descendingOrder: "Absteigende Reihenfolge"
 scratchpad: "Testumgebung"
-scratchpadDescription: "Die Testumgebung bietet einen Bereich für AiScript-Experimente. Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Misskey überprüfen."
+scratchpadDescription: "Die Testumgebung bietet einen Bereich für AiScript-Experimente. Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Calckey überprüfen."
 output: "Ausgabe"
 script: "Skript"
 disablePagesScript: "AiScript auf Seiten deaktivieren"
@@ -701,7 +701,7 @@ onlineUsersCount: "{n} Benutzer sind online"
 nUsers: "{n} Benutzer"
 nNotes: "{n} Notizen"
 sendErrorReports: "Fehlerberichte senden"
-sendErrorReportsDescription: "Ist diese Option aktiviert, so werden beim Auftreten von Fehlern detaillierte Fehlerinformationen an Misskey weitergegeben, was zur Verbesserung der Qualität von Misskey beiträgt.\nEnthalten in diesen Informationen sind u.a. die Version deines Betriebssystems, welchen Browser du verwendest und ein Verlauf deiner Aktivitäten innerhalb Misskey."
+sendErrorReportsDescription: "Ist diese Option aktiviert, so werden beim Auftreten von Fehlern detaillierte Fehlerinformationen an Calckey weitergegeben, was zur Verbesserung der Qualität von Calckey beiträgt.\nEnthalten in diesen Informationen sind u.a. die Version deines Betriebssystems, welchen Browser du verwendest und ein Verlauf deiner Aktivitäten innerhalb Calckey."
 myTheme: "Mein Farbschema"
 backgroundColor: "Hintergrundfarbe"
 accentColor: "Akzentfarbe"
@@ -792,7 +792,7 @@ hashtags: "Hashtags"
 troubleshooting: "Problembehandlung"
 useBlurEffect: "Weichzeichnungseffekt in der Benutzeroberfläche verwenden"
 learnMore: "Mehr erfahren"
-misskeyUpdated: "Misskey wurde aktualisiert!"
+misskeyUpdated: "Calckey wurde aktualisiert!"
 whatIsNew: "Änderungen anzeigen"
 translate: "Übersetzen"
 translatedFrom: "Aus {x} übersetzt"
@@ -967,13 +967,13 @@ _registry:
   keys: "Schlüssel"
   domain: "Domain"
   createKey: "Schlüssel erstellen"
-_aboutMisskey:
-  about: "Misskey ist Open-Source-Software, welche von syuilo seit 2014 entwickelt wird."
+_aboutCalckey:
+  about: "Calckey ist Open-Source-Software, welche von thatonecalculator seit 2022 entwickelt wird."
   contributors: "Hauptmitwirkende"
   allContributors: "Alle Mitwirkenden"
   source: "Quellcode"
-  translation: "Misskey übersetzen"
-  donate: "An Misskey spenden"
+  translation: "Calckey übersetzen"
+  donate: "An Calckey spenden"
   morePatrons: "Wir schätzen ebenso die Unterstützung vieler anderer hier nicht gelisteter Personen sehr. Danke! 🥰"
   patrons: "UnterstützerInnen"
 _nsfw:
@@ -982,8 +982,8 @@ _nsfw:
   force: "Alle Medien verbergen"
 _mfm:
   cheatSheet: "MFM Spickzettel"
-  intro: "MFM ist eine Misskey-exklusive Markup-Sprache, die in Misskey an vielen Stellen verwendet werden kann. Hier kannst du eine Liste von verfügbarer MFM-Syntax einsehen."
-  dummy: "Misskey erweitert die Welt des Fediverse"
+  intro: "MFM ist eine Calckey-exklusive Markup-Sprache, die in Calckey an vielen Stellen verwendet werden kann. Hier kannst du eine Liste von verfügbarer MFM-Syntax einsehen."
+  dummy: "Calckey erweitert die Welt des Fediverse"
   mention: "Erwähnung"
   mentionDescription: "Mit At-Zeichen und Benutzername kann ein individueller Nutzer angegeben werden."
   hashtag: "Hashtag"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 99b0a7c86..a22a591d3 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "English"
-headlineMisskey: "An open source, decentralized social media platform that's free forever! 🚀"
-introMisskey: "Welcome! Calckey is an open source, decentralized social media platform that's free forever! 🚀"
+headlineCalckey: "An open source, decentralized social media platform that's free forever! 🚀"
+introCalckey: "Welcome! Calckey is an open source, decentralized social media platform that's free forever! 🚀"
 monthAndDay: "{month}/{day}"
 search: "Search"
 notifications: "Notifications"
@@ -392,7 +392,7 @@ exploreFediverse: "Explore the Fediverse"
 popularTags: "Popular tags"
 userList: "Lists"
 about: "About"
-aboutMisskey: "About Calckey"
+aboutCalckey: "About Calckey"
 administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Two-factor authentication"
@@ -715,7 +715,7 @@ onlineUsersCount: "{n} users are online"
 nUsers: "{n} Users"
 nNotes: "{n} Posts"
 sendErrorReports: "Send error reports"
-sendErrorReportsDescription: "When turned on, detailed error information will be shared with Calckey when a problem occurs, helping to improve the quality of Misskey.\nThis will include information such the version of your OS, what browser you're using, your activity in Calckey, etc."
+sendErrorReportsDescription: "When turned on, detailed error information will be shared with Calckey when a problem occurs, helping to improve the quality of Calckey.\nThis will include information such the version of your OS, what browser you're using, your activity in Calckey, etc."
 myTheme: "My theme"
 backgroundColor: "Background color"
 accentColor: "Accent color"
@@ -1036,7 +1036,7 @@ _registry:
   keys: "Keys"
   domain: "Domain"
   createKey: "Create key"
-_aboutMisskey:
+_aboutCalckey:
   about: "Calckey is a fork of Misskey made by ThatOneCalculator, which has been in development since 2022."
   contributors: "Main contributors"
   allContributors: "All contributors"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 1d35c878c..a10480415 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Español"
-headlineMisskey: "Red conectada por notas"
-introMisskey: "¡Bienvenido/a! Misskey es un servicio de microblogging descentralizado de código abierto.\nEscribe \"notas\" para compartir lo que te ocurre ahora o para contar sobre ti a todos 📡\nCon la función de \"reacciones\", puedes también añadir una reacción rápida a las notas de todos 👍\n¡Exploremos juntos un nuevo mundo! 🚀"
+headlineCalckey: "Red conectada por notas"
+introCalckey: "¡Bienvenido/a! Calckey es un servicio de microblogging descentralizado de código abierto.\nEscribe \"notas\" para compartir lo que te ocurre ahora o para contar sobre ti a todos 📡\nCon la función de \"reacciones\", puedes también añadir una reacción rápida a las notas de todos 👍\n¡Exploremos juntos un nuevo mundo! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Buscar"
 notifications: "Notificaciones"
@@ -139,7 +139,7 @@ settingGuide: "Configuración sugerida"
 cacheRemoteFiles: "Mantener en cache los archivos remotos"
 cacheRemoteFilesDescription: "Si desactiva esta configuración, Los archivos remotos se cargarán desde el link directo sin usar la caché. Con eso se puede ahorrar almacenamiento del servidor, pero eso aumentará el tráfico al no crear miniaturas."
 flagAsBot: "Esta cuenta es un bot"
-flagAsBotDescription: "En caso de que esta cuenta fuera usada por un programa, active esta opción. Al hacerlo, esta opción servirá para otros desarrolladores para evitar cadenas infinitas de reacciones, y ajustará los sistemas internos de Misskey para que trate a esta cuenta como un bot."
+flagAsBotDescription: "En caso de que esta cuenta fuera usada por un programa, active esta opción. Al hacerlo, esta opción servirá para otros desarrolladores para evitar cadenas infinitas de reacciones, y ajustará los sistemas internos de Calckey para que trate a esta cuenta como un bot."
 flagAsCat: "Esta cuenta es un gato"
 flagAsCatDescription: "En caso de que declare que esta cuenta es de un gato, active esta opción."
 flagShowTimelineReplies: "Mostrar respuestas a las notas en la biografía"
@@ -199,7 +199,7 @@ noUsers: "No hay usuarios"
 editProfile: "Editar perfil"
 noteDeleteConfirm: "¿Desea borrar esta nota?"
 pinLimitExceeded: "Ya no se pueden fijar más posts"
-intro: "¡La instalación de Misskey ha terminado! Crea el usuario administrador."
+intro: "¡La instalación de Calckey ha terminado! Crea el usuario administrador."
 done: "Terminado"
 processing: "Procesando"
 preview: "Vista previa"
@@ -378,7 +378,7 @@ exploreFediverse: "Explorar fediverso"
 popularTags: "Etiquetas populares"
 userList: "Lista"
 about: "Información"
-aboutMisskey: "Sobre Misskey"
+aboutCalckey: "Sobre Calckey"
 administrator: "Administrador"
 token: "Token"
 twoStepAuthentication: "Autenticación de dos factores"
@@ -524,7 +524,7 @@ sort: "Ordenar"
 ascendingOrder: "Ascendente"
 descendingOrder: "Descendente"
 scratchpad: "Scratch pad"
-scratchpadDescription: "Scratchpad proporciona un entorno experimental para AiScript. Puede escribir, ejecutar y verificar los resultados que interactúan con Misskey."
+scratchpadDescription: "Scratchpad proporciona un entorno experimental para AiScript. Puede escribir, ejecutar y verificar los resultados que interactúan con Calckey."
 output: "Salida"
 script: "Script"
 disablePagesScript: "Deshabilitar AiScript en Páginas"
@@ -700,7 +700,7 @@ onlineUsersCount: "{n} usuarios en línea"
 nUsers: "{n} Usuarios"
 nNotes: "{n} Notas"
 sendErrorReports: "Envíar informe de errores"
-sendErrorReportsDescription: "Si habilita esta opción, ayudará a mejorar la calidad de Misskey compartiendo información detallada sobre los errores cuando se produzca un problema.\nEsto incluye información como la versión de su sistema operativo, el tipo de navegador que utiliza, su historial de actividad, etc."
+sendErrorReportsDescription: "Si habilita esta opción, ayudará a mejorar la calidad de Calckey compartiendo información detallada sobre los errores cuando se produzca un problema.\nEsto incluye información como la versión de su sistema operativo, el tipo de navegador que utiliza, su historial de actividad, etc."
 myTheme: "Mi Tema"
 backgroundColor: "Fondo"
 accentColor: "Acento"
@@ -791,7 +791,7 @@ hashtags: "Hashtag"
 troubleshooting: "Solución de problemas"
 useBlurEffect: "Utilizar efecto de desenfoque en la interfaz de usuario"
 learnMore: "Ver más"
-misskeyUpdated: "¡Misskey ha sido actualizado!"
+misskeyUpdated: "¡Calckey ha sido actualizado!"
 whatIsNew: "Mostrar cambios"
 translate: "Traducir"
 translatedFrom: "Traducido de {x}"
@@ -966,13 +966,13 @@ _registry:
   keys: "Clave"
   domain: "Dominio"
   createKey: "Crear una llave"
-_aboutMisskey:
-  about: "Misskey es un software de código abierto, desarrollado por syuilo desde el 2014"
+_aboutCalckey:
+  about: "Calckey es un software de código abierto, desarrollado por thatonecalculator desde el 2022"
   contributors: "Principales colaboradores"
   allContributors: "Todos los colaboradores"
   source: "Código fuente"
-  translation: "Traducir Misskey"
-  donate: "Donar a Misskey"
+  translation: "Traducir Calckey"
+  donate: "Donar a Calckey"
   morePatrons: "Muchas más personas nos apoyan. Muchas gracias🥰"
   patrons: "Patrocinadores"
 _nsfw:
@@ -981,8 +981,8 @@ _nsfw:
   force: "Ocultar todos los medios"
 _mfm:
   cheatSheet: "Hoja de referencia de MFM"
-  intro: "MFM es un lenguaje de marcado dedicado que se puede usar en varios lugares dentro de Misskey. Aquí puede ver una lista de sintaxis disponibles en MFM."
-  dummy: "Misskey expande el mundo de la Fediverso"
+  intro: "MFM es un lenguaje de marcado dedicado que se puede usar en varios lugares dentro de Calckey. Aquí puede ver una lista de sintaxis disponibles en MFM."
+  dummy: "Calckey expande el mundo de la Fediverso"
   mention: "Menciones"
   mentionDescription: "El signo @ seguido de un nombre de usuario se puede utilizar para notificar a un usuario en particular."
   hashtag: "Hashtag"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 2d918b5ad..6ce8f0669 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Français"
-headlineMisskey: "Réseau relié par des notes"
-introMisskey: "Bienvenue ! Misskey est un service de microblogage décentralisé, libre et ouvert.\nÉcrivez des « notes » et partagez ce qui se passe à l’instant présent, autour de vous avec les autres 📡\nLa fonction « réactions », vous permet également d’ajouter une réaction rapide aux notes des autres utilisateur·rice·s 👍\nExplorons un nouveau monde 🚀"
+headlineCalckey: "Réseau relié par des notes"
+introCalckey: "Bienvenue ! Calckey est un service de microblogage décentralisé, libre et ouvert.\nÉcrivez des « notes » et partagez ce qui se passe à l’instant présent, autour de vous avec les autres 📡\nLa fonction « réactions », vous permet également d’ajouter une réaction rapide aux notes des autres utilisateur·rice·s 👍\nExplorons un nouveau monde 🚀"
 monthAndDay: "{day}/{month}"
 search: "Rechercher"
 notifications: "Notifications"
@@ -139,7 +139,7 @@ settingGuide: "Configuration proposée"
 cacheRemoteFiles: "Mise en cache des fichiers distants"
 cacheRemoteFilesDescription: "Lorsque cette option est désactivée, les fichiers distants sont chargés directement depuis l’instance distante. La désactiver diminuera certes l’utilisation de l’espace de stockage local mais augmentera le trafic réseau puisque les miniatures ne seront plus générées."
 flagAsBot: "Ce compte est un robot"
-flagAsBotDescription: "Si ce compte est géré de manière automatisée, choisissez cette option. Si elle est activée, elle agira comme un marqueur pour les autres développeurs afin d'éviter des chaînes d'interaction sans fin avec d'autres robots et d'ajuster les systèmes internes de Misskey pour traiter ce compte comme un robot."
+flagAsBotDescription: "Si ce compte est géré de manière automatisée, choisissez cette option. Si elle est activée, elle agira comme un marqueur pour les autres développeurs afin d'éviter des chaînes d'interaction sans fin avec d'autres robots et d'ajuster les systèmes internes de Calckey pour traiter ce compte comme un robot."
 flagAsCat: "Ce compte est un chat"
 flagAsCatDescription: "Activer l'option \" Je suis un chat \" pour ce compte."
 flagShowTimelineReplies: "Afficher les réponses dans le fil"
@@ -198,7 +198,7 @@ noUsers: "Il n’y a pas d’utilisateur·rice·s"
 editProfile: "Modifier votre profil"
 noteDeleteConfirm: "Êtes-vous sûr·e de vouloir supprimer cette note ?"
 pinLimitExceeded: "Vous ne pouvez plus épingler d’autres notes."
-intro: "L’installation de Misskey est terminée ! Veuillez créer un compte administrateur."
+intro: "L’installation de Calckey est terminée ! Veuillez créer un compte administrateur."
 done: "Terminé"
 processing: "Traitement en cours"
 preview: "Aperçu"
@@ -375,7 +375,7 @@ exploreFediverse: "Explorer le Fediverse"
 popularTags: "Mots-clés populaires"
 userList: "Listes"
 about: "Informations"
-aboutMisskey: "À propos de Misskey"
+aboutCalckey: "À propos de Calckey"
 administrator: "Administrateur"
 token: "Jeton"
 twoStepAuthentication: "Authentification à deux facteurs"
@@ -519,7 +519,7 @@ sort: "Trier"
 ascendingOrder: "Ascendant"
 descendingOrder: "Descendant"
 scratchpad: "ScratchPad"
-scratchpadDescription: "ScratchPad fournit un environnement expérimental pour AiScript. Vous pouvez vérifier la rédaction de votre code, sa bonne exécution et le résultat de son interaction avec Misskey."
+scratchpadDescription: "ScratchPad fournit un environnement expérimental pour AiScript. Vous pouvez vérifier la rédaction de votre code, sa bonne exécution et le résultat de son interaction avec Calckey."
 output: "Sortie"
 script: "Script"
 disablePagesScript: "Désactiver AiScript sur les Pages"
@@ -690,7 +690,7 @@ onlineUsersCount: "{n} utilisateur(s) en ligne"
 nUsers: "{n} utilisateur·rice·s"
 nNotes: "{n} Notes"
 sendErrorReports: "Envoyer les rapports d’erreur"
-sendErrorReportsDescription: "Si vous activez l'envoi des rapports d'erreur, vous contribuerez à améliorer la qualité de Misskey grâce au partage d'informations détaillées sur les erreurs lorsqu'un problème survient.\nCela inclut des informations telles que la version de votre système d'exploitation, le type de navigateur que vous utilisez, votre historique d'activité, etc."
+sendErrorReportsDescription: "Si vous activez l'envoi des rapports d'erreur, vous contribuerez à améliorer la qualité de Calckey grâce au partage d'informations détaillées sur les erreurs lorsqu'un problème survient.\nCela inclut des informations telles que la version de votre système d'exploitation, le type de navigateur que vous utilisez, votre historique d'activité, etc."
 myTheme: "Mes thèmes"
 backgroundColor: "Arrière-plan"
 accentColor: "Accentuation"
@@ -781,7 +781,7 @@ hashtags: "Hashtags"
 troubleshooting: "Résolution de problèmes"
 useBlurEffect: "Utiliser des effets de flou dans l'interface"
 learnMore: "Plus d'informations"
-misskeyUpdated: "Misskey a été mis à jour !"
+misskeyUpdated: "Calckey a été mis à jour !"
 whatIsNew: "Voir les derniers changements"
 translate: "Traduire"
 translatedFrom: "Traduit depuis {x}"
@@ -892,13 +892,13 @@ _registry:
   keys: "Clé "
   domain: "Domaine"
   createKey: "Créer une clé"
-_aboutMisskey:
-  about: "Misskey est un logiciel libre et ouvert, développé par syuilo depuis 2014."
+_aboutCalckey:
+  about: "Calckey est un logiciel libre et ouvert, développé par thatonecalculator depuis 2022."
   contributors: "Principaux contributeurs"
   allContributors: "Tous les contributeurs"
   source: "Code source"
-  translation: "Traduire Misskey"
-  donate: "Soutenir Misskey"
+  translation: "Traduire Calckey"
+  donate: "Soutenir Calckey"
   morePatrons: "Nous apprécions vraiment le soutien de nombreuses autres personnes non mentionnées ici. Merci à toutes et à tous ! 🥰"
   patrons: "Contributeurs"
 _nsfw:
@@ -907,8 +907,8 @@ _nsfw:
   force: "Cacher tous les médias"
 _mfm:
   cheatSheet: "Antisèche MFM"
-  intro: "MFM est un langage Markdown spécifique utilisable ici et là dans Misskey. Vous pouvez vérifier ici les structures utilisables avec MFM."
-  dummy: "La Fédiverse s'agrandit avec Misskey"
+  intro: "MFM est un langage Markdown spécifique utilisable ici et là dans Calckey. Vous pouvez vérifier ici les structures utilisables avec MFM."
+  dummy: "La Fédiverse s'agrandit avec Calckey"
   mention: "Mentionner"
   mentionDescription: "Vous pouvez afficher un utilisateur spécifique en indiquant une arobase suivie d'un nom d'utilisateur"
   hashtag: "Hashtags"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index bb3904e2e..45cabfa1a 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Bahasa Indonesia"
-headlineMisskey: "Jaringan terhubung melalui catatan"
-introMisskey: "Selamat datang! Misskey adalah perangkat mikroblog tercatu bersifat sumber terbuka.\nMulailah menuliskan catatan, bagikan peristiwa terkini, serta ceritakan segala tentangmu.📡\nTunjukkan juga reaksimu pada catatan pengguna lain.👍\nMari jelajahi dunia baru🚀"
+headlineCalckey: "Jaringan terhubung melalui catatan"
+introCalckey: "Selamat datang! Calckey adalah perangkat mikroblog tercatu bersifat sumber terbuka.\nMulailah menuliskan catatan, bagikan peristiwa terkini, serta ceritakan segala tentangmu.📡\nTunjukkan juga reaksimu pada catatan pengguna lain.👍\nMari jelajahi dunia baru🚀"
 monthAndDay: "{day} {month}"
 search: "Penelusuran"
 notifications: "Pemberitahuan"
@@ -139,7 +139,7 @@ settingGuide: "Pengaturan rekomendasi"
 cacheRemoteFiles: "Tembolokkan berkas remote"
 cacheRemoteFilesDescription: "Ketika pengaturan ini dinonaktifkan, berkas luar akan dimuat langsung dari instansi luar. Menonaktifkan ini akan mengurangi penggunaan penyimpanan, namun dapat menyebabkan meningkatkan lalu lintas bandwidth, karena thumbnail tidak dihasilkan."
 flagAsBot: "Atur akun ini sebagai Bot"
-flagAsBotDescription: "Jika akun ini dikendalikan oleh program, tetapkanlah opsi ini. Jika diaktifkan, ini akan berfungsi sebagai tanda bagi pengembang lain untuk mencegah interaksi berantai dengan bot lain dan menyesuaikan sistem internal Misskey untuk memperlakukan akun ini sebagai bot."
+flagAsBotDescription: "Jika akun ini dikendalikan oleh program, tetapkanlah opsi ini. Jika diaktifkan, ini akan berfungsi sebagai tanda bagi pengembang lain untuk mencegah interaksi berantai dengan bot lain dan menyesuaikan sistem internal Calckey untuk memperlakukan akun ini sebagai bot."
 flagAsCat: "Atur akun ini sebagai kucing"
 flagAsCatDescription: "Nyalakan tanda ini untuk menandai akun ini sebagai kucing."
 flagShowTimelineReplies: "Tampilkan balasan di linimasa"
@@ -199,7 +199,7 @@ noUsers: "Tidak ada pengguna"
 editProfile: "Sunting profil"
 noteDeleteConfirm: "Apakah kamu yakin ingin menghapus catatan ini?"
 pinLimitExceeded: "Kamu tidak dapat menyematkan catatan lagi"
-intro: "Instalasi Misskey telah selesai! Mohon untuk membuat pengguna admin."
+intro: "Instalasi Calckey telah selesai! Mohon untuk membuat pengguna admin."
 done: "Selesai"
 processing: "Memproses"
 preview: "Pratinjau"
@@ -377,7 +377,7 @@ exploreFediverse: "Jelajahi Fediverse"
 popularTags: "Tag populer"
 userList: "Daftar"
 about: "Informasi"
-aboutMisskey: "Tentang Misskey"
+aboutCalckey: "Tentang Calckey"
 administrator: "Admin"
 token: "Token"
 twoStepAuthentication: "Otentikasi dua faktor"
@@ -522,7 +522,7 @@ sort: "Urutkan"
 ascendingOrder: "Urutkan naik"
 descendingOrder: "Urutkan menurun"
 scratchpad: "Scratchpad"
-scratchpadDescription: "Scratchpad menyediakan lingkungan eksperimen untuk AiScript. Kamu  bisa menulis, mengeksuksi, serta mengecek hasil yang berinteraksi dengan Misskey."
+scratchpadDescription: "Scratchpad menyediakan lingkungan eksperimen untuk AiScript. Kamu  bisa menulis, mengeksuksi, serta mengecek hasil yang berinteraksi dengan Calckey."
 output: "Keluaran"
 script: "Script"
 disablePagesScript: "Nonaktifkan script pada halaman"
@@ -697,7 +697,7 @@ onlineUsersCount: "{n} orang sedang daring"
 nUsers: "{n} Pengguna"
 nNotes: "{n} Catatan"
 sendErrorReports: "Kirim laporan kesalahan"
-sendErrorReportsDescription: "Ketika dinyalakan, informasi kesalahan rinci akan dibagikan dengan Misskey ketika masalah terjadi, hal ini untuk membantu kualitas Misskey. Fitur ini memungkinkan memuat informasi seperti sistem operasi yang kamu gunakan dan versinya, aplikasi peramban yang kamu gunakan, riwayat aktivitas kamu, dll."
+sendErrorReportsDescription: "Ketika dinyalakan, informasi kesalahan rinci akan dibagikan dengan Calckey ketika masalah terjadi, hal ini untuk membantu kualitas Calckey. Fitur ini memungkinkan memuat informasi seperti sistem operasi yang kamu gunakan dan versinya, aplikasi peramban yang kamu gunakan, riwayat aktivitas kamu, dll."
 myTheme: "Tema saya"
 backgroundColor: "Latar Belakang"
 accentColor: "Aksen"
@@ -788,7 +788,7 @@ hashtags: "Tagar"
 troubleshooting: "Penyelesaian Masalah"
 useBlurEffect: "Gunakan efek blur pada antarmuka"
 learnMore: "Pelajari lebih lanjut"
-misskeyUpdated: "Misskey telah dimutakhirkan!"
+misskeyUpdated: "Calckey telah dimutakhirkan!"
 whatIsNew: "Lihat perubahan pemutakhiran"
 translate: "Terjemahkan"
 translatedFrom: "Terjemahkan dari {x}"
@@ -901,13 +901,13 @@ _registry:
   keys: "Kunci"
   domain: "Domain"
   createKey: "Buat kunci"
-_aboutMisskey:
-  about: "Misskey adalah perangkat lunak sumber terbuka yang sedang dikembangkan oleh syuilo sejak 2014."
+_aboutCalckey:
+  about: "Calckey adalah perangkat lunak sumber terbuka yang sedang dikembangkan oleh thatonecalculator sejak 2022."
   contributors: "Kontributor utama"
   allContributors: "Seluruh kontributor"
   source: "Sumber kode"
-  translation: "Terjemahkan Misskey"
-  donate: "Donasi ke Misskey"
+  translation: "Terjemahkan Calckey"
+  donate: "Donasi ke Calckey"
   morePatrons: "Kami sangat mengapresiasi dukungan dari banyak penolong lain yang tidak tercantum disini. Terima kasih! 🥰"
   patrons: "Pendukung"
 _nsfw:
@@ -916,8 +916,8 @@ _nsfw:
   force: "Sembunyikan semua media"
 _mfm:
   cheatSheet: "Contekan MFM"
-  intro: "MFM adalah Misskey-exclusive Markup Language yang dapat digunakan di banyak tempat. Berikut kamu bisa melihat daftar dari syntax MFM yang ada."
-  dummy: "Misskey membentangkan dunia Fediverse"
+  intro: "MFM adalah Calckey-exclusive Markup Language yang dapat digunakan di banyak tempat. Berikut kamu bisa melihat daftar dari syntax MFM yang ada."
+  dummy: "Calckey membentangkan dunia Fediverse"
   mention: "Sebut"
   mentionDescription: "Kamu dapat menentukan pengguna tertentu dengan menggunakan simbol-At dan nama engguna mereka."
   hashtag: "Tagar"
@@ -1113,7 +1113,7 @@ _time:
   hour: "jam"
   day: "hari"
 _tutorial:
-  title: "Cara menggunakan Misskey"
+  title: "Cara menggunakan Calckey"
   step1_1: "Selamat datang!"
   step1_2: "Halaman ini disebut \"linimasa\". Halaman ini menampilkan \"catatan\" yang diurutkan secara kronologis dari orang-orang yang kamu \"ikuti\"."
   step1_3: "Linimasa kamu kosong, karena kamu belum mencatat catatan apapun atau mengikuti siapapun."
@@ -1132,8 +1132,8 @@ _tutorial:
   step6_1: "Sekarang kamu dapat melihat catatan pengguna lain pada linimasamu."
   step6_2: "Kamu juga bisa memberikan \"reaksi\" ke catatan orang lain untuk merespon dengan cepat."
   step6_3: "Untuk memberikan \"reaksi\", tekan tanda \"+\" pada catatan pengguna lain dan pilih emoji yang kamu suka untuk memberikan reaksimu kepada mereka."
-  step7_1: "Yay, Selamat! Kamu sudah menyelesaikan tutorial dasar Misskey."
-  step7_2: "Jika kamu ingin mempelajari lebih lanjut tentang Misskey, cobalah berkunjung ke bagian {help}."
+  step7_1: "Yay, Selamat! Kamu sudah menyelesaikan tutorial dasar Calckey."
+  step7_2: "Jika kamu ingin mempelajari lebih lanjut tentang Calckey, cobalah berkunjung ke bagian {help}."
   step7_3: "Semoga berhasil dan bersenang-senanglah! 🚀"
 _2fa:
   alreadyRegistered: "Kamu telah mendaftarkan perangkat otentikasi dua faktor."
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 185d12d5a..45fd942c9 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Italiano"
-headlineMisskey: "Rete collegata tramite note"
-introMisskey: "Benvenut@! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \nScrivi \"note\" per condividere ciò che sta succedendo adesso o per dire a tutti qualcosa di te. 📡\nGrazie alla funzione \"reazioni\" puoi anche mandare reazioni rapide alle note delle altre persone del Fediverso. 👍\nEsplora un nuovo mondo! 🚀"
+headlineCalckey: "Rete collegata tramite note"
+introCalckey: "Benvenut@! Calckey è un servizio di microblogging decentralizzato, libero e aperto. \nScrivi \"note\" per condividere ciò che sta succedendo adesso o per dire a tutti qualcosa di te. 📡\nGrazie alla funzione \"reazioni\" puoi anche mandare reazioni rapide alle note delle altre persone del Fediverso. 👍\nEsplora un nuovo mondo! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Cerca"
 notifications: "Notifiche"
@@ -139,7 +139,7 @@ settingGuide: "Configurazione suggerita"
 cacheRemoteFiles: "Memorizzazione nella cache dei file remoti"
 cacheRemoteFilesDescription: "Disabilitando questa opzione, i file remoti verranno linkati direttamente senza essere memorizzati nella cache. Sarà possibile risparmiare spazio di archiviazione sul server, ma il traffico aumenterà in quanto non verranno generate anteprime."
 flagAsBot: "Io sono un robot"
-flagAsBotDescription: "Se l'account esegue principalmente operazioni automatiche, attiva quest'opzione. Quando attivata, opera come un segnalatore per gli altri sviluppatori allo scopo di prevenire catene d’interazione senza fine con altri bot, e di adeguare i sistemi interni di Misskey perché trattino questo account come un bot."
+flagAsBotDescription: "Se l'account esegue principalmente operazioni automatiche, attiva quest'opzione. Quando attivata, opera come un segnalatore per gli altri sviluppatori allo scopo di prevenire catene d’interazione senza fine con altri bot, e di adeguare i sistemi interni di Calckey perché trattino questo account come un bot."
 flagAsCat: "Io sono un gatto"
 flagAsCatDescription: "Abilita l'opzione \"Io sono un gatto\" per l'account."
 autoAcceptFollowed: "Accetta automaticamente le richieste di follow da utenti che già segui"
@@ -197,7 +197,7 @@ noUsers: "Nessun utente trovato"
 editProfile: "Modifica profilo"
 noteDeleteConfirm: "Eliminare questo Nota?"
 pinLimitExceeded: "Non puoi fissare altre note "
-intro: "L'installazione di Misskey è finita! Si prega di creare un account amministratore."
+intro: "L'installazione di Calckey è finita! Si prega di creare un account amministratore."
 done: "Fine"
 processing: "In elaborazione"
 preview: "Anteprima"
@@ -373,7 +373,7 @@ exploreFediverse: "Esplora il Fediverso"
 popularTags: "Tag di tendenza"
 userList: "Liste"
 about: "Informazioni"
-aboutMisskey: "Informazioni di Misskey"
+aboutCalckey: "Informazioni di Calckey"
 administrator: "Amministratore"
 token: "Token"
 twoStepAuthentication: "Autenticazione a due fattori"
@@ -518,7 +518,7 @@ sort: "Ordina per"
 ascendingOrder: "Ascendente"
 descendingOrder: "Discendente"
 scratchpad: "ScratchPad"
-scratchpadDescription: "Lo Scratchpad offre un ambiente per esperimenti di AiScript. È possibile scrivere, eseguire e confermare i risultati dell'interazione del codice con Misskey."
+scratchpadDescription: "Lo Scratchpad offre un ambiente per esperimenti di AiScript. È possibile scrivere, eseguire e confermare i risultati dell'interazione del codice con Calckey."
 output: "Uscita"
 script: "Script"
 disablePagesScript: "Disabilita AiScript nelle pagine"
@@ -686,7 +686,7 @@ onlineUsersCount: "{n} utenti online"
 nUsers: "{n} utenti"
 nNotes: "{n}Note"
 sendErrorReports: "Invia segnalazioni di errori"
-sendErrorReportsDescription: "Quando abilitato, se si verifica un problema, informazioni dettagliate sugli errori verranno condivise con Misskey in modo da aiutare a migliorare la qualità del software.\nCiò include informazioni come la versione del sistema operativo, il tipo di navigatore web che usi, la cronologia delle attività, ecc."
+sendErrorReportsDescription: "Quando abilitato, se si verifica un problema, informazioni dettagliate sugli errori verranno condivise con Calckey in modo da aiutare a migliorare la qualità del software.\nCiò include informazioni come la versione del sistema operativo, il tipo di navigatore web che usi, la cronologia delle attività, ecc."
 myTheme: "I miei temi"
 backgroundColor: "Sfondo"
 textColor: "Testo"
@@ -773,7 +773,7 @@ hashtags: "Hashtag"
 troubleshooting: "Risoluzione problemi"
 useBlurEffect: "Utilizza effetto sfocatura per l'interfaccia utente"
 learnMore: "Più dettagli"
-misskeyUpdated: "Misskey è stato aggiornato!"
+misskeyUpdated: "Calckey è stato aggiornato!"
 whatIsNew: "Visualizza le informazioni sull'aggiornamento"
 translate: "Traduzione"
 translatedFrom: "Tradotto da {x}"
@@ -860,13 +860,13 @@ _registry:
   keys: "Dati"
   domain: "Dominio"
   createKey: "Crea chiave"
-_aboutMisskey:
-  about: "Misskey è un software libero e open source, sviluppato da syuilo dal 2014."
+_aboutCalckey:
+  about: "Calckey è un software libero e open source, sviluppato da thatonecalculator dal 2022."
   contributors: "Principali sostenitori"
   allContributors: "Tutti i sostenitori"
   source: "Codice sorgente"
-  translation: "Tradurre Misskey"
-  donate: "Sostieni Misskey"
+  translation: "Tradurre Calckey"
+  donate: "Sostieni Calckey"
   morePatrons: "Apprezziamo sinceramente il supporto di tante altre persone. Grazie mille! 🥰"
   patrons: "Sostenitori"
 _nsfw:
@@ -875,8 +875,8 @@ _nsfw:
   force: "Nascondere tutti i media"
 _mfm:
   cheatSheet: "Bigliettino MFM"
-  intro: "MFM è un linguaggio Markdown particolare che si può usare in diverse parti di Misskey. Qui puoi visualizzare a colpo d'occhio tutta la sintassi MFM utile."
-  dummy: "Il Fediverso si espande con Misskey"
+  intro: "MFM è un linguaggio Markdown particolare che si può usare in diverse parti di Calckey. Qui puoi visualizzare a colpo d'occhio tutta la sintassi MFM utile."
+  dummy: "Il Fediverso si espande con Calckey"
   mention: "Menzioni"
   mentionDescription: "Si può menzionare un utente specifico digitando il suo nome utente subito dopo il segno @."
   hashtag: "Hashtag"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 5bd06f23e..9a757133d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "日本語"
-headlineMisskey: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム🚀"
-introMisskey: "ようこそ！Calckeyは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しましょう📡\n「リアクション」機能で、皆の投稿に素早く反応を追加できます👍\n新しい世界を探検しよう🚀"
+headlineCalckey: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム🚀"
+introCalckey: "ようこそ！Calckeyは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しましょう📡\n「リアクション」機能で、皆の投稿に素早く反応を追加できます👍\n新しい世界を探検しよう🚀"
 monthAndDay: "{month}月 {day}日"
 search: "検索"
 notifications: "通知"
@@ -390,7 +390,7 @@ exploreFediverse: "Fediverseを探索"
 popularTags: "人気のタグ"
 userList: "リスト"
 about: "情報"
-aboutMisskey: "Calckeyについて"
+aboutCalckey: "Calckeyについて"
 administrator: "管理者"
 token: "トークン"
 twoStepAuthentication: "二段階認証"
@@ -1033,7 +1033,7 @@ _registry:
   keys: "キー"
   domain: "ドメイン"
   createKey: "キーを作成"
-_aboutMisskey:
+_aboutCalckey:
   about: "Calckeyは、2022年に生まれたThatOneCalculatorによるMisskeyのforkです。"
   contributors: "主なコントリビューター"
   allContributors: "全てのコントリビューター"
@@ -1048,7 +1048,7 @@ _nsfw:
   force: "常にメディアを隠す"
 _mfm:
   cheatSheet: "MFMチートシート"
-  intro: "MFMは、MisskeyやCalckey、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
+  intro: "MFMは、CalckeyやCalckey、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
   dummy: "CalckeyでFediverseの世界が広がります"
   mention: "メンション"
   mentionDescription: "アットマーク + ユーザー名で、特定のユーザーを示せます。"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index d5c48276f..fe867e08d 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "日本語 (関西弁)"
-headlineMisskey: "ノートでつながるネットワーク"
-introMisskey: "ようお越し！Misskeyは、オープンソースの分散型マイクロブログサービスやねん。\n「ノート」を作って、いま起こっとることを共有したり、あんたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素早く反応を追加したりもできるで✌\nほな新しい世界を探検しよか🚀"
+headlineCalckey: "ノートでつながるネットワーク"
+introCalckey: "ようお越し！Calckeyは、オープンソースの分散型マイクロブログサービスやねん。\n「ノート」を作って、いま起こっとることを共有したり、あんたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素早く反応を追加したりもできるで✌\nほな新しい世界を探検しよか🚀"
 monthAndDay: "{month}月 {day}日"
 search: "探す"
 notifications: "通知"
@@ -139,7 +139,7 @@ settingGuide: "ええ感じの設定"
 cacheRemoteFiles: "リモートのファイルをキャッシュする"
 cacheRemoteFilesDescription: "この設定を切っとくと、リモートファイルをキャッシュせず直リンクするようになるで。サーバーの容量は節約できるけど、サムネイルが作られんくなるから通信量が増えるで。"
 flagAsBot: "Botやで"
-flagAsBotDescription: "もしこのアカウントがプログラムによって運用されるんやったら、このフラグをオンにしてたのむで。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Misskeyのシステム上での扱いがBotに合ったもんになるんやで。"
+flagAsBotDescription: "もしこのアカウントがプログラムによって運用されるんやったら、このフラグをオンにしてたのむで。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Calckeyのシステム上での扱いがBotに合ったもんになるんやで。"
 flagAsCat: "Catやで"
 flagAsCatDescription: "ワレ、猫ちゃんならこのフラグをつけてみ？"
 flagShowTimelineReplies: "It will display the reply to the note in the timeline. "
@@ -199,7 +199,7 @@ noUsers: "ユーザーはおらへん"
 editProfile: "プロフィールをいじる"
 noteDeleteConfirm: "このノートを削除しまっか？"
 pinLimitExceeded: "これ以上ピン留めできひん"
-intro: "Misskeyのインストールが完了してん！管理者アカウントを作ってや。"
+intro: "Calckeyのインストールが完了してん！管理者アカウントを作ってや。"
 done: "でけた"
 processing: "処理しとる"
 preview: "プレビュー"
@@ -378,7 +378,7 @@ exploreFediverse: "Fediverseを探ってみる"
 popularTags: "人気のタグ"
 userList: "リスト"
 about: "情報"
-aboutMisskey: "Misskeyってなんや？"
+aboutCalckey: "Calckeyってなんや？"
 administrator: "管理者"
 token: "トークン"
 twoStepAuthentication: "二段階認証"
@@ -524,7 +524,7 @@ sort: "仕分ける"
 ascendingOrder: "小さい順"
 descendingOrder: "大きい順"
 scratchpad: "スクラッチパッド"
-scratchpadDescription: "スクラッチパッドではAiScriptを色々試すことができるんや。Misskeyに対して色々できるコードを書いて動かしてみたり、結果を見たりできるで。"
+scratchpadDescription: "スクラッチパッドではAiScriptを色々試すことができるんや。Calckeyに対して色々できるコードを書いて動かしてみたり、結果を見たりできるで。"
 output: "出力"
 script: "スクリプト"
 disablePagesScript: "Pagesのスクリプトを無効にしてや"
@@ -699,7 +699,7 @@ onlineUsersCount: "{n}人が起きとるで"
 nUsers: "{n}ユーザー"
 nNotes: "{n}ノート"
 sendErrorReports: "エラーリポートを送る"
-sendErrorReportsDescription: "オンにしたら、なんか変なことが起きたときにエラーの詳細がMisskeyに共有されて、ソフトウェアの品質向上に役立てられるんや。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれるで。"
+sendErrorReportsDescription: "オンにしたら、なんか変なことが起きたときにエラーの詳細がCalckeyに共有されて、ソフトウェアの品質向上に役立てられるんや。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれるで。"
 myTheme: "マイテーマ"
 backgroundColor: "背景"
 accentColor: "アクセント"
@@ -790,7 +790,7 @@ hashtags: "ハッシュタグ"
 troubleshooting: "トラブルシューティング"
 useBlurEffect: "UIにぼかし効果を使うで"
 learnMore: "詳しく"
-misskeyUpdated: "Misskeyが更新されたで！\nモデレーターの人らに感謝せなあかんで"
+misskeyUpdated: "Calckeyが更新されたで！\nモデレーターの人らに感謝せなあかんで"
 whatIsNew: "更新情報を見るで"
 translate: "翻訳"
 translatedFrom: "{x}から翻訳するで"
@@ -868,13 +868,13 @@ _registry:
   keys: "キー"
   domain: "ドメイン"
   createKey: "キーを作る"
-_aboutMisskey:
-  about: "Misskeyはsyuiloが2014年からずっと作ってはる、オープンソースなソフトウェアや。"
+_aboutCalckey:
+  about: "Calckeyはthatonecalculatorが2022年からずっと作ってはる、オープンソースなソフトウェアや。"
   contributors: "主な貢献者"
   allContributors: "全ての貢献者"
   source: "ソースコード"
-  translation: "Misskeyを翻訳"
-  donate: "Misskeyに寄付"
+  translation: "Calckeyを翻訳"
+  donate: "Calckeyに寄付"
   morePatrons: "他にもぎょうさんの人からサポートしてもろてんねん。ほんまおおきに🥰"
   patrons: "支援者"
 _mfm:
diff --git a/locales/kn-IN.yml b/locales/kn-IN.yml
index 39b3cbe91..8ca9e69e7 100644
--- a/locales/kn-IN.yml
+++ b/locales/kn-IN.yml
@@ -1,6 +1,6 @@
 ---
 _lang_: "ಕನ್ನಡ"
-introMisskey: "ಸ್ವಾಗತ! Misskey ಓಪನ್ ಸೋರ್ಸ್ ಒಕ್ಕೂಟ ಮೈಕ್ರೋಬ್ಲಾಗಿಂಗ್ ಸೇವೆಯಾಗಿದೆ.\n ಏನಾಗುತ್ತಿದೆ ಎಂಬುದನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಥವಾ ನಿಮ್ಮ ಬಗ್ಗೆ ಎಲ್ಲರಿಗೂ ಹೇಳಲು \"ಟಿಪ್ಪಣಿ\"ಗಳನ್ನು ರಚಿಸಿ📡\n \"ಸ್ಪಂದನೆ\" ಕ್ರಿಯೆಯೊಂದಿಗೆ, ನೀವು ಎಲ್ಲರ ಟಿಪ್ಪಣಿಗಳಿಗೆ ತ್ವರಿತವಾಗಿ ಸ್ಪಂದನೆಗಳನ್ನು ಕೂಡ ಸೇರಿಸಬಹುದು.👍\n ಹೊಸ ಜಗತ್ತನ್ನು ಅನ್ವೇಷಿಸಿ🚀"
+introCalckey: "ಸ್ವಾಗತ! Calckey ಓಪನ್ ಸೋರ್ಸ್ ಒಕ್ಕೂಟ ಮೈಕ್ರೋಬ್ಲಾಗಿಂಗ್ ಸೇವೆಯಾಗಿದೆ.\n ಏನಾಗುತ್ತಿದೆ ಎಂಬುದನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಥವಾ ನಿಮ್ಮ ಬಗ್ಗೆ ಎಲ್ಲರಿಗೂ ಹೇಳಲು \"ಟಿಪ್ಪಣಿ\"ಗಳನ್ನು ರಚಿಸಿ📡\n \"ಸ್ಪಂದನೆ\" ಕ್ರಿಯೆಯೊಂದಿಗೆ, ನೀವು ಎಲ್ಲರ ಟಿಪ್ಪಣಿಗಳಿಗೆ ತ್ವರಿತವಾಗಿ ಸ್ಪಂದನೆಗಳನ್ನು ಕೂಡ ಸೇರಿಸಬಹುದು.👍\n ಹೊಸ ಜಗತ್ತನ್ನು ಅನ್ವೇಷಿಸಿ🚀"
 monthAndDay: "{month}ನೇ ತಿಂಗಳ {day}ನೇ ದಿನ"
 search: "ಹುಡುಕು"
 notifications: "ಅಧಿಸೂಚನೆಗಳು"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index b87a4b06c..d9b7e1223 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "한국어"
-headlineMisskey: "노트로 연결되는 네트워크"
-introMisskey: "환영합니다! Misskey 는 오픈 소스 분산형 마이크로 블로그 서비스입니다.\n\"노트\" 를 작성해서, 지금 일어나고 있는 일을 공유하거나, 당신만의 이야기를 모두에게 발신하세요📡\n\"리액션\" 기능으로, 친구의 노트에 총알같이 반응을 추가할 수도 있습니다👍\n새로운 세계를 탐험해 보세요🚀"
+headlineCalckey: "노트로 연결되는 네트워크"
+introCalckey: "환영합니다! Calckey 는 오픈 소스 분산형 마이크로 블로그 서비스입니다.\n\"노트\" 를 작성해서, 지금 일어나고 있는 일을 공유하거나, 당신만의 이야기를 모두에게 발신하세요📡\n\"리액션\" 기능으로, 친구의 노트에 총알같이 반응을 추가할 수도 있습니다👍\n새로운 세계를 탐험해 보세요🚀"
 monthAndDay: "{month}월 {day}일"
 search: "검색"
 notifications: "알림"
@@ -199,7 +199,7 @@ noUsers: "아무도 없습니다"
 editProfile: "프로필 수정"
 noteDeleteConfirm: "이 노트를 삭제하시겠습니까?"
 pinLimitExceeded: "더 이상 고정할 수 없습니다."
-intro: "Misskey의 설치가 완료되었습니다! 관리자 계정을 생성해주세요."
+intro: "Calckey의 설치가 완료되었습니다! 관리자 계정을 생성해주세요."
 done: "완료"
 processing: "처리중"
 preview: "미리보기"
@@ -378,7 +378,7 @@ exploreFediverse: "연합우주를 탐색"
 popularTags: "인기 태그"
 userList: "리스트"
 about: "정보"
-aboutMisskey: "Misskey에 대하여"
+aboutCalckey: "Calckey에 대하여"
 administrator: "관리자"
 token: "토큰"
 twoStepAuthentication: "2단계 인증"
@@ -524,7 +524,7 @@ sort: "정렬"
 ascendingOrder: "오름차순"
 descendingOrder: "내림차순"
 scratchpad: "스크래치 패드"
-scratchpadDescription: "스크래치 패드는 AiScript 의 테스트 환경을 제공합니다. Misskey 와 상호 작용하는 코드를 작성, 실행 및 결과를 확인할 수 있습니다."
+scratchpadDescription: "스크래치 패드는 AiScript 의 테스트 환경을 제공합니다. Calckey 와 상호 작용하는 코드를 작성, 실행 및 결과를 확인할 수 있습니다."
 output: "출력"
 script: "스크립트"
 disablePagesScript: "Pages 에서 AiScript 를 사용하지 않음"
@@ -700,7 +700,7 @@ onlineUsersCount: "{n}명이 접속 중"
 nUsers: "{n} 유저"
 nNotes: "{n} 노트"
 sendErrorReports: "오류 보고서 보내기"
-sendErrorReportsDescription: "이 설정을 활성화하면, 문제가 발생했을 때 오류에 대한 상세 정보를 Misskey에 보내어 더 나은 소프트웨어를 만드는 데에 도움을 줄 수 있습니다."
+sendErrorReportsDescription: "이 설정을 활성화하면, 문제가 발생했을 때 오류에 대한 상세 정보를 Calckey에 보내어 더 나은 소프트웨어를 만드는 데에 도움을 줄 수 있습니다."
 myTheme: "내 테마"
 backgroundColor: "배경 색"
 accentColor: "강조 색상"
@@ -791,7 +791,7 @@ hashtags: "해시태그"
 troubleshooting: "문제 해결"
 useBlurEffect: "UI에 흐림 효과 사용"
 learnMore: "자세히"
-misskeyUpdated: "Misskey가 업데이트 되었습니다!"
+misskeyUpdated: "Calckey가 업데이트 되었습니다!"
 whatIsNew: "패치 정보 보기"
 translate: "번역"
 translatedFrom: "{x}에서 번역"
@@ -965,13 +965,13 @@ _registry:
   keys: "키"
   domain: "도메인"
   createKey: "키 생성"
-_aboutMisskey:
-  about: "Misskey는 syuilo에 의해서 2014년부터 개발되어 온 오픈소스 소프트웨어 입니다."
+_aboutCalckey:
+  about: "Calckey는 thatonecalculator에 의해서 2022년부터 개발되어 온 오픈소스 소프트웨어 입니다."
   contributors: "주요 기여자"
   allContributors: "모든 기여자"
   source: "소스 코드"
-  translation: "Misskey를 번역하기"
-  donate: "Misskey에 기부하기"
+  translation: "Calckey를 번역하기"
+  donate: "Calckey에 기부하기"
   morePatrons: "이 외에도 다른 많은 분들이 도움을 주시고 계십니다. 감사합니다🥰"
   patrons: "후원자"
 _nsfw:
@@ -980,8 +980,8 @@ _nsfw:
   force: "미디어 항상 숨기기"
 _mfm:
   cheatSheet: "MFM 도움말"
-  intro: "MFM는 Misskey의 다양한 곳에서 사용할 수 있는 전용 마크업 언어입니다. 여기에서는 MFM에서 사용할 수 있는 구문을 확인할 수 있습니다."
-  dummy: "Misskey로 연합우주의 세계가 펼쳐집니다"
+  intro: "MFM는 Calckey의 다양한 곳에서 사용할 수 있는 전용 마크업 언어입니다. 여기에서는 MFM에서 사용할 수 있는 구문을 확인할 수 있습니다."
+  dummy: "Calckey로 연합우주의 세계가 펼쳐집니다"
   mention: "멘션"
   mentionDescription: "골뱅이표(@) 뒤에 사용자명을 넣어 특정 유저를 나타낼 수 있습니다."
   hashtag: "해시태그"
diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index 7a0580f2d..963b24caf 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Nederlands"
-headlineMisskey: "Netwerk verbonden door notities"
-introMisskey: "Welkom! Misskey is een open source, gedecentraliseerde microblogdienst.\nMaak \"notities\" om je gedachten te delen met iedereen om je heen. 📡\nMet \"reacties\" kun je ook snel je mening geven over berichten van anderen. 👍\nLaten we een nieuwe wereld verkennen! 🚀"
+headlineCalckey: "Netwerk verbonden door notities"
+introCalckey: "Welkom! Calckey is een open source, gedecentraliseerde microblogdienst.\nMaak \"notities\" om je gedachten te delen met iedereen om je heen. 📡\nMet \"reacties\" kun je ook snel je mening geven over berichten van anderen. 👍\nLaten we een nieuwe wereld verkennen! 🚀"
 monthAndDay: "{day} {month}"
 search: "Zoeken"
 notifications: "Meldingen"
@@ -123,7 +123,7 @@ unblockConfirm: "Ben je zeker dat je deze account wil blokkeren?"
 suspendConfirm: "Ben je zeker dat je deze account wil suspenderen?"
 unsuspendConfirm: "Ben je zeker dat je deze account wil opnieuw aanstellen?"
 flagAsBot: "Markeer dit account als een robot."
-flagAsBotDescription: "Als dit account van een programma wordt beheerd, zet deze vlag aan. Het aanzetten helpt andere ontwikkelaars om bijvoorbeeld onbedoelde feedback loops te doorbreken of om Misskey meer geschikt te maken."
+flagAsBotDescription: "Als dit account van een programma wordt beheerd, zet deze vlag aan. Het aanzetten helpt andere ontwikkelaars om bijvoorbeeld onbedoelde feedback loops te doorbreken of om Calckey meer geschikt te maken."
 flagAsCat: "Markeer dit account als een kat."
 flagAsCatDescription: "Zet deze vlag aan als je wilt aangeven dat dit account een kat is."
 flagShowTimelineReplies: "Toon antwoorden op de tijdlijn."
@@ -183,7 +183,7 @@ noUsers: "Er zijn geen gebruikers."
 editProfile: "Bewerk Profiel"
 noteDeleteConfirm: "Ben je zeker dat je dit bericht wil verwijderen?"
 pinLimitExceeded: "Je kunt geen berichten meer vastprikken"
-intro: "Installatie van Misskey geëindigd! Maak nu een beheerder aan."
+intro: "Installatie van Calckey geëindigd! Maak nu een beheerder aan."
 done: "Klaar"
 processing: "Bezig met verwerken"
 preview: "Voorbeeld"
@@ -280,7 +280,7 @@ disconnectedFromServer: "Verbinding met de server onderbroken."
 inMb: "in megabytes"
 pinnedNotes: "Vastgemaakte notitie"
 userList: "Lijsten"
-aboutMisskey: "Over Misskey"
+aboutCalckey: "Over Calckey"
 administrator: "Beheerder"
 token: "Token"
 securityKeyName: "Sleutelnaam"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index cc2dfa443..952d94050 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1,6 +1,6 @@
 _lang_: "Polski"
-headlineMisskey: "Otwartoźródłowa, zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
-introMisskey: "Hej! Calckey to otwartoźródłowa oraz zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
+headlineCalckey: "Otwartoźródłowa, zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
+introCalckey: "Hej! Calckey to otwartoźródłowa oraz zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
 monthAndDay: "{month}-{day}"
 search: "Szukaj"
 notifications: "Powiadomienia"
@@ -374,7 +374,7 @@ exploreFediverse: "Eksploruj Fediwersum"
 popularTags: "Tagi na czasie"
 userList: "Listy"
 about: "Informacje"
-aboutMisskey: "O Calckey"
+aboutCalckey: "O Calckey"
 administrator: "Admin"
 token: "Token"
 twoStepAuthentication: "Uwierzytelnianie dwuskładnikowe"
@@ -918,8 +918,8 @@ _registry:
   keys: "Klucz"
   domain: "Domena"
   createKey: "Utwórz klucz"
-_aboutMisskey:
-  about: "Calckey jest forkiem Misskey utworzonym przez ThatOneCalculator, rozwijanym od 2022."
+_aboutCalckey:
+  about: "Calckey jest forkiem Calckey utworzonym przez ThatOneCalculator, rozwijanym od 2022."
   contributors: "Główni twórcy"
   allContributors: "Wszyscy twórcy"
   source: "Kod źródłowy"
@@ -933,7 +933,7 @@ _nsfw:
   force: "Ukrywaj wszystkie media"
 _mfm:
   cheatSheet: "Ściąga MFM"
-  intro: "MFM jest językiem składniowym używanym przez m.in. Misskey, forki *key (w tym Calckey), oraz Akkomę, który może być użyty w wielu miejscach. Tu znajdziesz listę wszystkich możliwych elementów składni MFM."
+  intro: "MFM jest językiem składniowym używanym przez m.in. Calckey, forki *key (w tym Calckey), oraz Akkomę, który może być użyty w wielu miejscach. Tu znajdziesz listę wszystkich możliwych elementów składni MFM."
   dummy: "Calckey rozszerza świat Fediwersum"
   mention: "Wspomnij"
   mentionDescription: "Używając znaku @ i nazwy użytkownika, możesz określić danego użytkownika."
@@ -1821,7 +1821,7 @@ proxyAccountDescription: Konto proxy jest kontem które w określonych sytuacjac
   użytkownika nie zostanie dostarczona na oś czasu. W takim razie, użytkownika zaobserwuje
   konto proxy.
 objectStorageBaseUrlDesc: "URL stosowany jako odniesienie. Podaj URL twojego CDN, albo proxy, jeśli używasz któregokolwiek.\nDla S3 użyj 'https://<bucket>.s3.amazonaws.com', a dla GCS i jego odpowiedników użyj 'https://storage.googleapis.com/<bucket>', itd."
-sendErrorReportsDescription: "Gdy ta opcja jest włączona, szczegółowe informacje o błędach będą udostępnianie z Calckey gdy wystąpi problem, pomagając w ulepszaniu Misskey.\nZawrze to informacje takie jak wersja twojego systemu operacyjnego, przeglądarki, Twoja aktywność na Calckey itd."
+sendErrorReportsDescription: "Gdy ta opcja jest włączona, szczegółowe informacje o błędach będą udostępnianie z Calckey gdy wystąpi problem, pomagając w ulepszaniu Calckey.\nZawrze to informacje takie jak wersja twojego systemu operacyjnego, przeglądarki, Twoja aktywność na Calckey itd."
 privateModeInfo: Jeśli włączone, tylko dopuszczone instancje będą mogły federować
   z Twoją instancją. Wszystkie posty będą ukryte przed publiką.
 oneHour: Godzina
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index 054e845b7..fa0a3eab9 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Português"
-headlineMisskey: "Uma rede ligada por notas"
-introMisskey: "Bem-vindo! Misskey é um serviço de microblogue descentralizado de código aberto.\nCria \"notas\" e partilha o que te ocorre com todos à tua volta. 📡\nCom \"reações\" podes também expressar logo o que sentes às notas de todos. 👍\nExploremos um novo mundo! 🚀"
+headlineCalckey: "Uma rede ligada por notas"
+introCalckey: "Bem-vindo! Calckey é um serviço de microblogue descentralizado de código aberto.\nCria \"notas\" e partilha o que te ocorre com todos à tua volta. 📡\nCom \"reações\" podes também expressar logo o que sentes às notas de todos. 👍\nExploremos um novo mundo! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Buscar"
 notifications: "Notificações"
@@ -139,7 +139,7 @@ settingGuide: "Guia de configuração"
 cacheRemoteFiles: "Memória transitória de arquivos remotos"
 cacheRemoteFilesDescription: "Se você desabilitar essa configuração, os arquivos remotos não serão armazenados em memória transitória e serão vinculados diretamente. Economiza o armazenamento do servidor, mas não gera miniaturas, o que aumenta o tráfego."
 flagAsBot: "Marcar conta como robô"
-flagAsBotDescription: "Se esta conta for operada por um programa, ative este sinalizador. Quando ativado, serve como um sinalizador para evitar o encadeamento de reações para outros programadores, e o manuseio do sistema do Misskey é adequado para ‘bots’."
+flagAsBotDescription: "Se esta conta for operada por um programa, ative este sinalizador. Quando ativado, serve como um sinalizador para evitar o encadeamento de reações para outros programadores, e o manuseio do sistema do Calckey é adequado para ‘bots’."
 flagAsCat: "Marcar conta como gato"
 flagAsCatDescription: "Ative essa opção para marcar essa conta como gato."
 flagShowTimelineReplies: "Mostrar respostas na linha de tempo"
@@ -199,7 +199,7 @@ noUsers: "Sem usuários"
 editProfile: "Editar Perfil"
 noteDeleteConfirm: "Deseja excluir esta nota?"
 pinLimitExceeded: "Não consigo mais fixar"
-intro: "A instalação do Misskey está completa! Crie uma conta de administrador."
+intro: "A instalação do Calckey está completa! Crie uma conta de administrador."
 done: "Concluído"
 processing: "Em Progresso"
 preview: "Pré-visualizar"
@@ -377,7 +377,7 @@ exploreFediverse: "Explorar Fediverse"
 popularTags: "Tags populares"
 userList: "Listas"
 about: "Informações"
-aboutMisskey: "Sobre Misskey"
+aboutCalckey: "Sobre Calckey"
 administrator: "Administrador"
 token: "Símbolo"
 twoStepAuthentication: "Verificação em duas etapas"
diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml
index 8408d4c77..6e6f3b12b 100644
--- a/locales/ro-RO.yml
+++ b/locales/ro-RO.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Română"
-headlineMisskey: "O rețea conectată prin note"
-introMisskey: "Bine ai venit! Misskey este un serviciu de microblogging open source și decentralizat.\nCreează \"note\" cu care să îți poți împărți gândurile cu oricine din jurul tău. 📡\nCu \"reacții\" îți poți expirma rapid părerea despre notele oricui. 👍\nHai să explorăm o lume nouă! 🚀"
+headlineCalckey: "O rețea conectată prin note"
+introCalckey: "Bine ai venit! Calckey este un serviciu de microblogging open source și decentralizat.\nCreează \"note\" cu care să îți poți împărți gândurile cu oricine din jurul tău. 📡\nCu \"reacții\" îți poți expirma rapid părerea despre notele oricui. 👍\nHai să explorăm o lume nouă! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Caută"
 notifications: "Notificări"
@@ -139,7 +139,7 @@ settingGuide: "Setări recomandate"
 cacheRemoteFiles: "Ține fișierele externe in cache"
 cacheRemoteFilesDescription: "Când această setare este dezactivată, fișierele externe sunt încărcate direct din instanța externă. Dezactivarea va scădea utilizarea spațiului de stocare, dar va crește traficul, deoarece thumbnail-urile nu vor fi generate."
 flagAsBot: "Marchează acest cont ca bot"
-flagAsBotDescription: "Activează această opțiune dacă acest cont este controlat de un program. Daca e activată, aceasta va juca rolul unui indicator pentru dezvoltatori pentru a preveni interacțiunea în lanțuri infinite cu ceilalți boți și ajustează sistemele interne al Misskey pentru a trata acest cont drept un bot."
+flagAsBotDescription: "Activează această opțiune dacă acest cont este controlat de un program. Daca e activată, aceasta va juca rolul unui indicator pentru dezvoltatori pentru a preveni interacțiunea în lanțuri infinite cu ceilalți boți și ajustează sistemele interne al Calckey pentru a trata acest cont drept un bot."
 flagAsCat: "Marchează acest cont ca pisică"
 flagAsCatDescription: "Activează această opțiune dacă acest cont este o pisică."
 flagShowTimelineReplies: "Arată răspunsurile în cronologie"
@@ -199,7 +199,7 @@ noUsers: "Niciun utilizator"
 editProfile: "Editează profilul"
 noteDeleteConfirm: "Ești sigur că vrei să ștergi această notă?"
 pinLimitExceeded: "Nu poți mai fixa mai multe note"
-intro: "Misskey s-a instalat! Te rog crează un utilizator admin."
+intro: "Calckey s-a instalat! Te rog crează un utilizator admin."
 done: "Gata"
 processing: "Se procesează"
 preview: "Previzualizare"
@@ -377,7 +377,7 @@ exploreFediverse: "Explorează Fediverse-ul"
 popularTags: "Taguri populare"
 userList: "Liste"
 about: "Despre"
-aboutMisskey: "Despre Misskey"
+aboutCalckey: "Despre Calckey"
 administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Autentificare în doi pași"
@@ -522,7 +522,7 @@ sort: "Sortează"
 ascendingOrder: "Crescător"
 descendingOrder: "Descrescător"
 scratchpad: "Scratchpad"
-scratchpadDescription: "Scratchpad-ul oferă un mediu de experimentare în AiScript. Poți scrie, executa și verifica rezultatele acestuia interacționând cu Misskey în el."
+scratchpadDescription: "Scratchpad-ul oferă un mediu de experimentare în AiScript. Poți scrie, executa și verifica rezultatele acestuia interacționând cu Calckey în el."
 output: "Ieșire"
 script: "Script"
 disablePagesScript: "Dezactivează AiScript în Pagini"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 9d76dc623..bb6948827 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Русский"
-headlineMisskey: "Сеть, сплетённая из заметок"
-introMisskey: "Добро пожаловать! Misskey — это децентрализованный сервис микроблогов с открытым исходным кодом.\nПишите «заметки» — делитесь со всеми происходящим вокруг или рассказывайте о себе 📡\nСтавьте «реакции» — выражайте свои чувства и эмоции от заметок других 👍\nОткройте для себя новый мир 🚀"
+headlineCalckey: "Сеть, сплетённая из заметок"
+introCalckey: "Добро пожаловать! Calckey — это децентрализованный сервис микроблогов с открытым исходным кодом.\nПишите «заметки» — делитесь со всеми происходящим вокруг или рассказывайте о себе 📡\nСтавьте «реакции» — выражайте свои чувства и эмоции от заметок других 👍\nОткройте для себя новый мир 🚀"
 monthAndDay: "{day}.{month}"
 search: "Поиск"
 notifications: "Уведомления"
@@ -139,7 +139,7 @@ settingGuide: "Рекомендуемые настройки"
 cacheRemoteFiles: "Кешировать внешние файлы"
 cacheRemoteFilesDescription: "Когда эта настройка отключена, файлы с других сайтов будут загружаться прямо оттуда. Это сэкономит место на сервере, но увеличит трафик, так как не будут создаваться эскизы."
 flagAsBot: "Аккаунт бота"
-flagAsBotDescription: "Включите, если этот аккаунт управляется программой. Это позволит системе Misskey учитывать это, а также поможет разработчикам других ботов предотвратить бесконечные циклы взаимодействия."
+flagAsBotDescription: "Включите, если этот аккаунт управляется программой. Это позволит системе Calckey учитывать это, а также поможет разработчикам других ботов предотвратить бесконечные циклы взаимодействия."
 flagAsCat: "Аккаунт кота"
 flagAsCatDescription: "Включите, и этот аккаунт будет помечен как кошачий."
 flagShowTimelineReplies: "Показывать ответы на заметки в ленте"
@@ -199,7 +199,7 @@ noUsers: "Нет ни одного пользователя"
 editProfile: "Редактировать профиль"
 noteDeleteConfirm: "Вы хотите удалить эту заметку?"
 pinLimitExceeded: "Нельзя закрепить ещё больше заметок"
-intro: "Установка Misskey завершена! А теперь создайте учетную запись администратора."
+intro: "Установка Calckey завершена! А теперь создайте учетную запись администратора."
 done: "Готово"
 processing: "Обработка"
 preview: "Предпросмотр"
@@ -378,7 +378,7 @@ exploreFediverse: "Исследуйте Fediverse"
 popularTags: "Популярные теги"
 userList: "Списки"
 about: "Описание"
-aboutMisskey: "О Misskey"
+aboutCalckey: "О Calckey"
 administrator: "Администратор"
 token: "Токен"
 twoStepAuthentication: "Двухфакторная аутентификация"
@@ -524,7 +524,7 @@ sort: "Сортировать"
 ascendingOrder: "по возрастанию"
 descendingOrder: "По убыванию"
 scratchpad: "Когтеточка"
-scratchpadDescription: "«Когтеточка» — это место для опытов с AiScript. Здесь можно писать программы, взаимодействующие с Misskey, запускать и смотреть что из этого получается."
+scratchpadDescription: "«Когтеточка» — это место для опытов с AiScript. Здесь можно писать программы, взаимодействующие с Calckey, запускать и смотреть что из этого получается."
 output: "Выходы"
 script: "Скрипт"
 disablePagesScript: "Отключить скрипты на «Страницах»"
@@ -696,7 +696,7 @@ onlineUsersCount: "Пользователей сейчас в сети: {n}"
 nUsers: "Пользователей: {n}"
 nNotes: "Заметок: {n}"
 sendErrorReports: "Посылать отчёты о сбоях"
-sendErrorReportsDescription: "Если включено, когда возникнет какая-нибудь техническая проблема, подробные сведения об этом будут отправлены разработчикам Misskey. Это очень помогает делать программу лучше. В отчёты попадают тип и версия ОС, браузера, журнал действий (что привело к сбою) и тому подобное."
+sendErrorReportsDescription: "Если включено, когда возникнет какая-нибудь техническая проблема, подробные сведения об этом будут отправлены разработчикам Calckey. Это очень помогает делать программу лучше. В отчёты попадают тип и версия ОС, браузера, журнал действий (что привело к сбою) и тому подобное."
 myTheme: "Личная тема"
 backgroundColor: "Фон"
 accentColor: "Акцент"
@@ -787,7 +787,7 @@ hashtags: "Хэштег"
 troubleshooting: "Разрешение проблем"
 useBlurEffect: "Размытие в интерфейсе"
 learnMore: "Подробнее"
-misskeyUpdated: "Misskey обновился!"
+misskeyUpdated: "Calckey обновился!"
 whatIsNew: "Что новенького?"
 translate: "Перевод"
 translatedFrom: "Перевод. Язык оригинала — {x}"
@@ -898,13 +898,13 @@ _registry:
   keys: "Ключ"
   domain: "Домен"
   createKey: "Новый ключ"
-_aboutMisskey:
-  about: "Misskey — программа с открытым исходным кодом, которую разрабатывает syuilo с 2014 года."
+_aboutCalckey:
+  about: "Calckey — программа с открытым исходным кодом, которую разрабатывает thatonecalculator с 2022 года."
   contributors: "Основные соавторы"
   allContributors: "Все соавторы"
   source: "Исходный код"
-  translation: "Перевод Misskey"
-  donate: "Пожертвование на Misskey"
+  translation: "Перевод Calckey"
+  donate: "Пожертвование на Calckey"
   morePatrons: "Большое спасибо и многим другим, кто принял участие в этом проекте! 🥰"
   patrons: "Материальная поддержка"
 _nsfw:
@@ -913,8 +913,8 @@ _nsfw:
   force: "Скрывать вообще все файлы"
 _mfm:
   cheatSheet: "Подсказка по разметке MFM"
-  intro: "MFM — язык оформления текста, который придуман специально для Misskey и готов для применения во многих местах. На этой странице собраны и кратко изложены способы его использовать."
-  dummy: "Misskey расширяет границы Федиверса."
+  intro: "MFM — язык оформления текста, который придуман специально для Calckey и готов для применения во многих местах. На этой странице собраны и кратко изложены способы его использовать."
+  dummy: "Calckey расширяет границы Федиверса."
   mention: "Упоминание"
   mentionDescription: "При помощи знака «собака» перед именем можно упомянуть какого-нибудь пользователя."
   hashtag: "Хэштег"
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index 3f8a4b7b9..b799f4a39 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Slovenčina"
-headlineMisskey: "Sieť prepojená poznámkami"
-introMisskey: "Vitajte! Misskey je otvorená a decentralizovaná mikroblogovacia služba.\n\"Poznámkami\" môžete zdieľať svoje myšlienky so všetkými okolo. 📡\nPomocou \"reakcií\" môžete rýchlo vyjadri svoje pocity o každého poznámkach. 👍\nPoďte objavovať svet! 🚀"
+headlineCalckey: "Sieť prepojená poznámkami"
+introCalckey: "Vitajte! Calckey je otvorená a decentralizovaná mikroblogovacia služba.\n\"Poznámkami\" môžete zdieľať svoje myšlienky so všetkými okolo. 📡\nPomocou \"reakcií\" môžete rýchlo vyjadri svoje pocity o každého poznámkach. 👍\nPoďte objavovať svet! 🚀"
 monthAndDay: "{day}. {month}."
 search: "Hľadať"
 notifications: "Oznámenia"
@@ -139,7 +139,7 @@ settingGuide: "Odporúčané nastavenia"
 cacheRemoteFiles: "Cachovanie vzdialených súborov"
 cacheRemoteFilesDescription: "Zakázanie tohoto nastavenia spôsobí, že vzdialené súbory budú odkazované priamo, namiesto ukladania do cache. Ušetrí sa tak miesto na serveri, ale zvýši sa dátový tok, pretože sa negenerujú miniatúry."
 flagAsBot: "Tento účet je bot"
-flagAsBotDescription: "Ak je tento účet ovládaný programom, zaškrtnite túto voľbu. Ostatní uvidia, že je to bot a zabráni nekonečným interakciám s ďalšími botmi a upraví interné systémy Misskey, aby ho považoval za bota."
+flagAsBotDescription: "Ak je tento účet ovládaný programom, zaškrtnite túto voľbu. Ostatní uvidia, že je to bot a zabráni nekonečným interakciám s ďalšími botmi a upraví interné systémy Calckey, aby ho považoval za bota."
 flagAsCat: "Tento účet je mačka"
 flagAsCatDescription: "Zvoľte túto voľbu, aby bol tento účet označený ako mačka."
 flagShowTimelineReplies: "Zobraziť odpovede na poznámky v časovej osi"
@@ -199,7 +199,7 @@ noUsers: "Žiadni používatelia"
 editProfile: "Upraviť profil"
 noteDeleteConfirm: "Naozaj chcete odstrániť túto poznámku?"
 pinLimitExceeded: "Ďalšie poznámky už nemôžete pripnúť."
-intro: "Inštalácia Misskey je dokončená! Prosím vytvorte administrátora."
+intro: "Inštalácia Calckey je dokončená! Prosím vytvorte administrátora."
 done: "Hotovo"
 processing: "Pracujem..."
 preview: "Náhľad"
@@ -378,7 +378,7 @@ exploreFediverse: "Objavovať Fediverzum"
 popularTags: "Populárne značky"
 userList: "Zoznamy"
 about: "Informácie"
-aboutMisskey: "O Misskey"
+aboutCalckey: "O Calckey"
 administrator: "Administrátor"
 token: "Token"
 twoStepAuthentication: "Dvojfaktorová autentifikácia"
@@ -524,7 +524,7 @@ sort: "Zoradiť"
 ascendingOrder: "Vzostupne"
 descendingOrder: "Zostupne"
 scratchpad: "Zápisník"
-scratchpadDescription: "Zápisník poskytuje prostredia pre experimenty s AiScriptom. Môžete písať, spúšťať a skúšať vysledky pri interakcii s Misskey."
+scratchpadDescription: "Zápisník poskytuje prostredia pre experimenty s AiScriptom. Môžete písať, spúšťať a skúšať vysledky pri interakcii s Calckey."
 output: "Výstup"
 script: "Skript"
 disablePagesScript: "Vypnúť AiScript na stránkach"
@@ -699,7 +699,7 @@ onlineUsersCount: "{n} používateľov je online"
 nUsers: "{n} používateľov"
 nNotes: "{n} poznámok"
 sendErrorReports: "Poslať nahlásenie chyby"
-sendErrorReportsDescription: "Keď je zapnuté, v prípade problému sa odošlú podrobné informácie o chybe do Misskey. Pomôžete tak zvýšiť kvalitu Misskey.\nTieto informácie zahŕňajú verziu vášho OS, použitý prehliadač, históriu aktivít, atď."
+sendErrorReportsDescription: "Keď je zapnuté, v prípade problému sa odošlú podrobné informácie o chybe do Calckey. Pomôžete tak zvýšiť kvalitu Calckey.\nTieto informácie zahŕňajú verziu vášho OS, použitý prehliadač, históriu aktivít, atď."
 myTheme: "Moja téma"
 backgroundColor: "Pozadie"
 accentColor: "Akcent"
@@ -790,7 +790,7 @@ hashtags: "Hashtagy"
 troubleshooting: "Riešenie problémov"
 useBlurEffect: "Používať efekty rozmazania v UI"
 learnMore: "Zistiť viac"
-misskeyUpdated: "Misskey sa aktualizoval!"
+misskeyUpdated: "Calckey sa aktualizoval!"
 whatIsNew: "Čo je nové?"
 translate: "Preložiť"
 translatedFrom: "Preložené z {x}"
@@ -961,13 +961,13 @@ _registry:
   keys: "Kľúče"
   domain: "Doména"
   createKey: "Vytvoriť kľúč"
-_aboutMisskey:
-  about: "Misskey je open-source softvér, ktorý vyvíja syuilo od 2014."
+_aboutCalckey:
+  about: "Calckey je open-source softvér, ktorý vyvíja thatonecalculator od 2022."
   contributors: "Hlavní prispievatelia"
   allContributors: "Všetci prispievatelia"
   source: "Zdrojový kód"
-  translation: "Preložiť Misskey"
-  donate: "Podporiť Misskey"
+  translation: "Preložiť Calckey"
+  donate: "Podporiť Calckey"
   morePatrons: "Takisto oceňujeme podporu mnoých ďalších, ktorí tu nie sú uvedení. Ďakujeme! 🥰"
   patrons: "Prispievatelia"
 _nsfw:
@@ -976,8 +976,8 @@ _nsfw:
   force: "Skryť všetky médiá"
 _mfm:
   cheatSheet: "MFM Cheatsheet"
-  intro: "MFM je Misskey exkluzívny značkovací jazyk, ktorý sa dá používať na viacerých miestach. Tu môžete vidieť zoznam všetkej dostupnej MFM syntaxe."
-  dummy: "Misskey rozširuje svet Fediverza"
+  intro: "MFM je Calckey exkluzívny značkovací jazyk, ktorý sa dá používať na viacerých miestach. Tu môžete vidieť zoznam všetkej dostupnej MFM syntaxe."
+  dummy: "Calckey rozširuje svet Fediverza"
   mention: "Zmienka"
   mentionDescription: "Používateľa spomeniete použítím zavináča a mena používateľa"
   hashtag: "Hashtag"
diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml
index bd895135c..6ff228613 100644
--- a/locales/sv-SE.yml
+++ b/locales/sv-SE.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Svenska"
-headlineMisskey: "Ett nätverk kopplat av noter"
-introMisskey: "Välkommen! Misskey är en öppen och decentraliserad mikrobloggningstjänst.\nSkapa en \"not\" och dela dina tankar med alla runtomkring dig. 📡\nMed \"reaktioner\" kan du snabbt uttrycka dina känslor kring andras noter.👍\nLåt oss utforska en nya värld!🚀"
+headlineCalckey: "Ett nätverk kopplat av noter"
+introCalckey: "Välkommen! Calckey är en öppen och decentraliserad mikrobloggningstjänst.\nSkapa en \"not\" och dela dina tankar med alla runtomkring dig. 📡\nMed \"reaktioner\" kan du snabbt uttrycka dina känslor kring andras noter.👍\nLåt oss utforska en nya värld!🚀"
 monthAndDay: "{day}/{month}"
 search: "Sök"
 notifications: "Notifikationer"
@@ -138,7 +138,7 @@ settingGuide: "Rekommenderade inställningar"
 cacheRemoteFiles: "Spara externa filer till cachen"
 cacheRemoteFilesDescription: "När denna inställning är avstängd kommer externa filer laddas direkt från den externa instansen. Genom att stänga av detta kommer lagringsutrymme minska i användning men kommer öka datatrafiken eftersom miniatyrer inte kommer genereras."
 flagAsBot: "Markera konto som bot"
-flagAsBotDescription: "Aktivera det här alternativet om kontot är kontrollerat av ett program. Om aktiverat kommer den fungera som en flagga för andra utvecklare för att hindra ändlösa kedjor med andra bottar. Det kommer också få Misskeys interna system att hantera kontot som en bot."
+flagAsBotDescription: "Aktivera det här alternativet om kontot är kontrollerat av ett program. Om aktiverat kommer den fungera som en flagga för andra utvecklare för att hindra ändlösa kedjor med andra bottar. Det kommer också få Calckeys interna system att hantera kontot som en bot."
 flagAsCat: "Markera konto som katt"
 flagAsCatDescription: "Aktivera denna inställning för att markera kontot som en katt."
 flagShowTimelineReplies: "Visa svar i tidslinje"
@@ -198,7 +198,7 @@ noUsers: "Det finns inga användare"
 editProfile: "Redigera profil"
 noteDeleteConfirm: "Är du säker på att du vill ta bort denna not?"
 pinLimitExceeded: "Du kan inte fästa fler noter"
-intro: "Misskey har installerats! Vänligen skapa en adminanvändare."
+intro: "Calckey har installerats! Vänligen skapa en adminanvändare."
 done: "Klar"
 processing: "Bearbetar..."
 preview: "Förhandsvisning"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 173548e90..ebbb15e4e 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "ภาษาไทย"
-headlineMisskey: "เชื่อมต่อเครือข่ายโดยโน้ต"
-introMisskey: "ยินดีต้อนรับจ้าาา! Misskey เป็นบริการไมโครบล็อกโอเพ่นซอร์ส แบบการกระจายอำนาจ\nสร้าง \"โน้ต\" เพื่อแบ่งปันความคิดของคุณกับทุกคนรอบตัวคุณกันเถอะ 📡\nด้วยการ \"รีแอคชั่นผู้คน\" คุณยังสามารถแสดงความรู้สึกของคุณเกี่ยวกับบันทึกของทุกคนได้อย่างรวดเร็ว 👍\n\nแล้วมาท่องสำรวจโลกใบใหม่กันเถอะ! 🚀"
+headlineCalckey: "เชื่อมต่อเครือข่ายโดยโน้ต"
+introCalckey: "ยินดีต้อนรับจ้าาา! Calckey เป็นบริการไมโครบล็อกโอเพ่นซอร์ส แบบการกระจายอำนาจ\nสร้าง \"โน้ต\" เพื่อแบ่งปันความคิดของคุณกับทุกคนรอบตัวคุณกันเถอะ 📡\nด้วยการ \"รีแอคชั่นผู้คน\" คุณยังสามารถแสดงความรู้สึกของคุณเกี่ยวกับบันทึกของทุกคนได้อย่างรวดเร็ว 👍\n\nแล้วมาท่องสำรวจโลกใบใหม่กันเถอะ! 🚀"
 monthAndDay: "{เดือน}/{วัน}"
 search: "ค้นหา"
 notifications: "การเเจ้งเตือน"
@@ -139,7 +139,7 @@ settingGuide: "การตั้งค่าที่แนะนำ"
 cacheRemoteFiles: "แคชไฟล์ระยะไกล"
 cacheRemoteFilesDescription: "เมื่อปิดใช้งานการตั้งค่านี้ ไฟล์ระยะไกลนั้นจะถูกโหลดโดยตรงจากอินสแตนซ์ระยะไกล แต่กรณีการปิดใช้งานนี้จะช่วยลดปริมาณการใช้พื้นที่จัดเก็บข้อมูล แต่เพิ่มปริมาณการใช้งาน เพราะเนื่องจากจะไม่มีการสร้างภาพขนาดย่อ"
 flagAsBot: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นบอท"
-flagAsBotDescription: "การเปิดใช้งานตัวเลือกนี้หากบัญชีนี้ถูกควบคุมโดยนักเขียนโปรแกรม หรือ ถ้าหากเปิดใช้งาน มันจะทำหน้าที่เป็นแฟล็กสำหรับนักพัฒนารายอื่นๆ และเพื่อป้องกันการโต้ตอบแบบไม่มีที่สิ้นสุดกับบอทตัวอื่นๆ และยังสามารถปรับเปลี่ยนระบบภายในของ Misskey เพื่อปฏิบัติต่อบัญชีนี้เป็นบอท"
+flagAsBotDescription: "การเปิดใช้งานตัวเลือกนี้หากบัญชีนี้ถูกควบคุมโดยนักเขียนโปรแกรม หรือ ถ้าหากเปิดใช้งาน มันจะทำหน้าที่เป็นแฟล็กสำหรับนักพัฒนารายอื่นๆ และเพื่อป้องกันการโต้ตอบแบบไม่มีที่สิ้นสุดกับบอทตัวอื่นๆ และยังสามารถปรับเปลี่ยนระบบภายในของ Calckey เพื่อปฏิบัติต่อบัญชีนี้เป็นบอท"
 flagAsCat: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นแมว"
 flagAsCatDescription: "การเปิดใช้งานตัวเลือกนี้เพื่อทำเครื่องหมายบอกว่าบัญชีนี้เป็นแมว"
 flagShowTimelineReplies: "แสดงตอบกลับ ในไทม์ไลน์"
@@ -199,7 +199,7 @@ noUsers: "ไม่พบผู้ใช้งาน"
 editProfile: "แก้ไขโปรไฟล์"
 noteDeleteConfirm: "นายแน่ใจแล้วหรอว่าต้องการลบโน้ตนี้นะ?"
 pinLimitExceeded: "คุณไม่สามารถปักหมุดโน้ตเพิ่มเติมใดๆได้อีก"
-intro: "การติดตั้ง Misskey เสร็จสิ้นแล้วนะ! โปรดสร้างผู้ใช้งานที่เป็นผู้ดูแลระบบ"
+intro: "การติดตั้ง Calckey เสร็จสิ้นแล้วนะ! โปรดสร้างผู้ใช้งานที่เป็นผู้ดูแลระบบ"
 done: "เสร็จสิ้น"
 processing: "กำลังประมวลผล..."
 preview: "แสดงตัวอย่าง"
@@ -378,7 +378,7 @@ exploreFediverse: "สำรวจเฟดดิเวิร์ส"
 popularTags: "แท็กยอดนิยม"
 userList: "รายการ"
 about: "เกี่ยวกับ"
-aboutMisskey: "เกี่ยวกับ Misskey"
+aboutCalckey: "เกี่ยวกับ Calckey"
 administrator: "ผู้ดูแลระบบ"
 token: "โทเค็น"
 twoStepAuthentication: "ยืนยันตัวตน 2 ชั้น"
@@ -524,7 +524,7 @@ sort: "เรียงลำดับ"
 ascendingOrder: "เรียงจากน้อยไปมาก"
 descendingOrder: "เรียงจากมากไปน้อย"
 scratchpad: "กระดานทดลอง"
-scratchpadDescription: "Scratchpad เป็นการจัดเตรียมสภาพแวดล้อมสำหรับการทดลอง AiScript แต่คุณสามารถเขียน ดำเนินการ และตรวจสอบผลลัพธ์ของการโต้ตอบกับ Misskey มันได้ด้วยนะ"
+scratchpadDescription: "Scratchpad เป็นการจัดเตรียมสภาพแวดล้อมสำหรับการทดลอง AiScript แต่คุณสามารถเขียน ดำเนินการ และตรวจสอบผลลัพธ์ของการโต้ตอบกับ Calckey มันได้ด้วยนะ"
 output: "เอาท์พุต"
 script: "สคริปต์"
 disablePagesScript: "ปิดการใช้งาน AiScript บนเพจ"
@@ -700,7 +700,7 @@ onlineUsersCount: "{n} ผู้ใช้คนนี้กำลังออน
 nUsers: "{n} ผู้ใช้งาน"
 nNotes: "{n} โน้ต"
 sendErrorReports: "ส่งรายงานว่าข้อผิดพลาด"
-sendErrorReportsDescription: "เมื่อเปิดใช้งาน ข้อมูลข้อผิดพลาดโดยรายละเอียดนั้นจะถูกแชร์ให้กับ Misskey เมื่อเกิดปัญหา ซึ่งช่วยปรับปรุงคุณภาพของ Misskey\nซึ่งจะรวมถึงข้อมูล เช่น เวอร์ชั่นของระบบปฏิบัติการ เบราว์เซอร์ที่คุณใช้ กิจกรรมของคุณใน Misskey เป็นต้น"
+sendErrorReportsDescription: "เมื่อเปิดใช้งาน ข้อมูลข้อผิดพลาดโดยรายละเอียดนั้นจะถูกแชร์ให้กับ Calckey เมื่อเกิดปัญหา ซึ่งช่วยปรับปรุงคุณภาพของ Calckey\nซึ่งจะรวมถึงข้อมูล เช่น เวอร์ชั่นของระบบปฏิบัติการ เบราว์เซอร์ที่คุณใช้ กิจกรรมของคุณใน Calckey เป็นต้น"
 myTheme: "ธีมของฉัน"
 backgroundColor: "ภาพพื้นหลัง"
 accentColor: "รูปแบบสี"
@@ -791,7 +791,7 @@ hashtags: "แฮชแท็ก"
 troubleshooting: "แก้ปัญหา"
 useBlurEffect: "ใช้เอฟเฟกต์เบลอใน UI"
 learnMore: "แสดงให้ดูหน่อย"
-misskeyUpdated: "Misskey ได้รับการอัปเดตแล้ว!"
+misskeyUpdated: "Calckey ได้รับการอัปเดตแล้ว!"
 whatIsNew: "แสดงการเปลี่ยนแปลง"
 translate: "แปลภาษา"
 translatedFrom: "แปลมาจาก {x}"
@@ -966,13 +966,13 @@ _registry:
   keys: "คีย์"
   domain: "โดเมน"
   createKey: "สร้างคีย์"
-_aboutMisskey:
-  about: "Misskey เป็นซอฟต์แวร์โอเพ่นซอร์สที่ถูกพัฒนาโดย Syuilo ตั้งแต่ปี 2014"
+_aboutCalckey:
+  about: "Calckey เป็นซอฟต์แวร์โอเพ่นซอร์สที่ถูกพัฒนาโดย thatonecalculator ตั้งแต่ปี 2022"
   contributors: "ผู้สนับสนุนหลัก"
   allContributors: "ผู้มีส่วนร่วมทั้งหมด"
   source: "ซอร์สโค้ด"
-  translation: "รับแปลภาษา Misskey"
-  donate: "บริจาคให้กับ Misskey"
+  translation: "รับแปลภาษา Calckey"
+  donate: "บริจาคให้กับ Calckey"
   morePatrons: "เราขอขอบคุณสำหรับความช่วยเหลือจากผู้ช่วยอื่นๆ ที่ไม่ได้ระบุไว้ที่นี่นะ ขอขอบคุณ! 🥰"
   patrons: "สมาชิกพันธมิตร"
 _nsfw:
@@ -981,8 +981,8 @@ _nsfw:
   force: "ซ่อนสื่อทั้งหมด"
 _mfm:
   cheatSheet: "โค้ด MFM Cheat Sheet"
-  intro: "MFM เป็นภาษามาร์กอัปพิเศษเฉพาะของ Misskey ที่สามารถใช้ได้ในหลายที่ คุณยังสามารถดูรายการไวยากรณ์ MFM ที่มีอยู่ทั้งหมดได้ที่นี่นะ"
-  dummy: "Misskey ขยายโลกของ Fediverse"
+  intro: "MFM เป็นภาษามาร์กอัปพิเศษเฉพาะของ Calckey ที่สามารถใช้ได้ในหลายที่ คุณยังสามารถดูรายการไวยากรณ์ MFM ที่มีอยู่ทั้งหมดได้ที่นี่นะ"
+  dummy: "Calckey ขยายโลกของ Fediverse"
   mention: "กล่าวถึง"
   mentionDescription: "คุณสามารถระบุผู้ใช้โดยใช้ At-Symbol และชื่อผู้ใช้ได้นะ"
   hashtag: "แฮชแท็ก"
diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml
index aecb413de..9237e2a46 100644
--- a/locales/tr-TR.yml
+++ b/locales/tr-TR.yml
@@ -1,6 +1,6 @@
 ---
 _lang_: "Türkçe"
-introMisskey: "Açık kaynaklı bir dağıtılmış mikroblog hizmeti olan Misskey'e hoş geldiniz.\nMisskey, neler olup bittiğini paylaşmak ve herkese sizden bahsetmek için \"notlar\" oluşturmanıza olanak tanıyan, açık kaynaklı, dağıtılmış bir mikroblog hizmetidir.\nHerkesin notlarına kendi tepkilerinizi hızlıca eklemek için \"Tepkiler\" özelliğini de kullanabilirsiniz👍.\nYeni bir dünyayı keşfedin🚀."
+introCalckey: "Açık kaynaklı bir dağıtılmış mikroblog hizmeti olan Calckey'e hoş geldiniz.\nCalckey, neler olup bittiğini paylaşmak ve herkese sizden bahsetmek için \"notlar\" oluşturmanıza olanak tanıyan, açık kaynaklı, dağıtılmış bir mikroblog hizmetidir.\nHerkesin notlarına kendi tepkilerinizi hızlıca eklemek için \"Tepkiler\" özelliğini de kullanabilirsiniz👍.\nYeni bir dünyayı keşfedin🚀."
 monthAndDay: "{month}Ay {day}Gün"
 search: "Arama"
 notifications: "Bildirim"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 63caf22c1..3e5780558 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Українська"
-headlineMisskey: "Мережа об'єднана записами"
-introMisskey: "Ласкаво просимо! Misskey - децентралізована служба мікроблогів з відкритим кодом.\nСтворюйте \"нотатки\", щоб поділитися тим, що відбувається, і розповісти всім про себе 📡\nЗа допомогою \"реакцій\" ви також можете швидко висловити свої почуття щодо нотаток інших 👍\nДосліджуймо новий світ! 🚀"
+headlineCalckey: "Мережа об'єднана записами"
+introCalckey: "Ласкаво просимо! Calckey - децентралізована служба мікроблогів з відкритим кодом.\nСтворюйте \"нотатки\", щоб поділитися тим, що відбувається, і розповісти всім про себе 📡\nЗа допомогою \"реакцій\" ви також можете швидко висловити свої почуття щодо нотаток інших 👍\nДосліджуймо новий світ! 🚀"
 monthAndDay: "{month}/{day}"
 search: "Пошук"
 notifications: "Сповіщення"
@@ -139,7 +139,7 @@ settingGuide: "Рекомендована конфігурація"
 cacheRemoteFiles: "Кешувати дані з інших інстансів"
 cacheRemoteFilesDescription: "Якщо кешування вимкнено, віддалені файли завантажуються безпосередньо з віддаленого інстансу. Це зменшує використання сховища, але збільшує трафік, оскільки не генеруются ескізи."
 flagAsBot: "Акаунт бота"
-flagAsBotDescription: "Ввімкніть якщо цей обліковий запис використовується ботом. Ця опція позначить обліковий запис як бота. Це потрібно щоб виключити безкінечну інтеракцію між ботами а також відповідного підлаштування Misskey."
+flagAsBotDescription: "Ввімкніть якщо цей обліковий запис використовується ботом. Ця опція позначить обліковий запис як бота. Це потрібно щоб виключити безкінечну інтеракцію між ботами а також відповідного підлаштування Calckey."
 flagAsCat: "Акаунт кота"
 flagAsCatDescription: "Ввімкніть, щоб позначити, що обліковий запис є котиком."
 flagShowTimelineReplies: "Показувати відповіді на нотатки на часовій шкалі"
@@ -199,7 +199,7 @@ noUsers: "Немає користувачів"
 editProfile: "Редагувати обліковий запис"
 noteDeleteConfirm: "Ви дійсно хочете видалити цей запис?"
 pinLimitExceeded: "Більше записів не можна закріпити"
-intro: "Встановлення Misskey завершено! Будь ласка, створіть обліковий запис адміністратора."
+intro: "Встановлення Calckey завершено! Будь ласка, створіть обліковий запис адміністратора."
 done: "Готово"
 processing: "Обробка"
 preview: "Попередній перегляд"
@@ -377,7 +377,7 @@ exploreFediverse: "Огляд федіверсу"
 popularTags: "Популярні теги"
 userList: "Списки"
 about: "Інформація"
-aboutMisskey: "Про Misskey"
+aboutCalckey: "Про Calckey"
 administrator: "Адмін"
 token: "Токен"
 twoStepAuthentication: "Двохфакторна аутентифікація"
@@ -522,7 +522,7 @@ sort: "Сортування"
 ascendingOrder: "За зростанням"
 descendingOrder: "За спаданням"
 scratchpad: "Чернетка"
-scratchpadDescription: "Scratchpad надає середовище для експериментів з AiScript. Ви можете писати, виконувати його і тестувати взаємодію з Misskey."
+scratchpadDescription: "Scratchpad надає середовище для експериментів з AiScript. Ви можете писати, виконувати його і тестувати взаємодію з Calckey."
 output: "Вихід"
 script: "Скрипт"
 disablePagesScript: "Вимкнути AiScript на Сторінках"
@@ -695,7 +695,7 @@ onlineUsersCount: "{n} користувачів онлайн"
 nUsers: "{n} Користувачів"
 nNotes: "{n} Записів"
 sendErrorReports: "Надіслати звіт про помилки"
-sendErrorReportsDescription: "При увімкненні детальна інформація про помилки буде надана Misskey у разі виникнення проблем, що дасть можливість покращити Misskey."
+sendErrorReportsDescription: "При увімкненні детальна інформація про помилки буде надана Calckey у разі виникнення проблем, що дасть можливість покращити Calckey."
 myTheme: "Моя тема"
 backgroundColor: "Фон"
 accentColor: "Акцент"
@@ -756,13 +756,13 @@ _registry:
   keys: "Ключі"
   domain: "Домен"
   createKey: "Створити ключ"
-_aboutMisskey:
-  about: "Misskey - це програмне забезпечення з відкритим кодом, яке розробляє syuilo з 2014 року."
+_aboutCalckey:
+  about: "Calckey - це програмне забезпечення з відкритим кодом, яке розробляє thatonecalculator з 2022 року."
   contributors: "Головні помічники"
   allContributors: "Всі помічники"
   source: "Вихідний код"
-  translation: "Перекладати Misskey"
-  donate: "Пожертвувати Misskey"
+  translation: "Перекладати Calckey"
+  donate: "Пожертвувати Calckey"
   morePatrons: "Ми дуже цінуємо підтримку багатьох інших помічників, не перелічених тут. Дякуємо! 🥰"
   patrons: "Підтримали"
 _nsfw:
@@ -771,8 +771,8 @@ _nsfw:
   force: "Приховувати всі медіа файли"
 _mfm:
   cheatSheet: " Довідка MFM"
-  intro: "MFM це ексклюзивна мова розмітки тексту в Misskey, яку можна використовувати в багатьох місцях. Тут ви можете переглянути приклади її синтаксису."
-  dummy: "Misskey розширює світ Федіверсу"
+  intro: "MFM це ексклюзивна мова розмітки тексту в Calckey, яку можна використовувати в багатьох місцях. Тут ви можете переглянути приклади її синтаксису."
+  dummy: "Calckey розширює світ Федіверсу"
   mention: "Згадка"
   mentionDescription: "За допомогою знака \"@\" перед ім'ям можна згадати конкретного користувача."
   hashtag: "Хештеґ"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 48ef4e323..b00d68bc4 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Tiếng Việt"
-headlineMisskey: "Mạng xã hội liên hợp"
-introMisskey: "Xin chào! Misskey là một nền tảng tiểu blog phi tập trung mã nguồn mở.\nViết \"tút\" để chia sẻ những suy nghĩ của bạn 📡\nBằng \"biểu cảm\", bạn có thể bày tỏ nhanh chóng cảm xúc của bạn với các tút 👍\nHãy khám phá một thế giới mới! 🚀"
+headlineCalckey: "Mạng xã hội liên hợp"
+introCalckey: "Xin chào! Calckey là một nền tảng tiểu blog phi tập trung mã nguồn mở.\nViết \"tút\" để chia sẻ những suy nghĩ của bạn 📡\nBằng \"biểu cảm\", bạn có thể bày tỏ nhanh chóng cảm xúc của bạn với các tút 👍\nHãy khám phá một thế giới mới! 🚀"
 monthAndDay: "{day} tháng {month}"
 search: "Tìm kiếm"
 notifications: "Thông báo"
@@ -139,7 +139,7 @@ settingGuide: "Cài đặt đề xuất"
 cacheRemoteFiles: "Tập tin cache từ xa"
 cacheRemoteFilesDescription: "Khi tùy chọn này bị tắt, các tập tin từ xa sẽ được tải trực tiếp từ máy chủ khác. Điều này sẽ giúp giảm dung lượng lưu trữ nhưng lại tăng lưu lượng truy cập, vì hình thu nhỏ sẽ không được tạo."
 flagAsBot: "Đánh dấu đây là tài khoản bot"
-flagAsBotDescription: "Bật tùy chọn này nếu tài khoản này được kiểm soát bởi một chương trình. Nếu được bật, nó sẽ được đánh dấu để các nhà phát triển khác ngăn chặn chuỗi tương tác vô tận với các bot khác và điều chỉnh hệ thống nội bộ của Misskey để coi tài khoản này như một bot."
+flagAsBotDescription: "Bật tùy chọn này nếu tài khoản này được kiểm soát bởi một chương trình. Nếu được bật, nó sẽ được đánh dấu để các nhà phát triển khác ngăn chặn chuỗi tương tác vô tận với các bot khác và điều chỉnh hệ thống nội bộ của Calckey để coi tài khoản này như một bot."
 flagAsCat: "Tài khoản này là mèo"
 flagAsCatDescription: "Bật tùy chọn này để đánh dấu tài khoản là một con mèo."
 flagShowTimelineReplies: "Hiện lượt trả lời trong bảng tin"
@@ -199,7 +199,7 @@ noUsers: "Chưa có ai"
 editProfile: "Sửa hồ sơ"
 noteDeleteConfirm: "Bạn có chắc muốn xóa tút này?"
 pinLimitExceeded: "Bạn đã đạt giới hạn số lượng tút có thể ghim"
-intro: "Đã cài đặt Misskey! Xin hãy tạo tài khoản admin."
+intro: "Đã cài đặt Calckey! Xin hãy tạo tài khoản admin."
 done: "Xong"
 processing: "Đang xử lý"
 preview: "Xem trước"
@@ -378,7 +378,7 @@ exploreFediverse: "Khám phá Fediverse"
 popularTags: "Hashtag thông dụng"
 userList: "Danh sách"
 about: "Giới thiệu"
-aboutMisskey: "Về Misskey"
+aboutCalckey: "Về Calckey"
 administrator: "Quản trị viên"
 token: "Token"
 twoStepAuthentication: "Xác minh 2 bước"
@@ -524,7 +524,7 @@ sort: "Sắp xếp"
 ascendingOrder: "Tăng dần"
 descendingOrder: "Giảm dần"
 scratchpad: "Scratchpad"
-scratchpadDescription: "Scratchpad cung cấp môi trường cho các thử nghiệm AiScript. Bạn có thể viết, thực thi và kiểm tra kết quả tương tác với Misskey trong đó."
+scratchpadDescription: "Scratchpad cung cấp môi trường cho các thử nghiệm AiScript. Bạn có thể viết, thực thi và kiểm tra kết quả tương tác với Calckey trong đó."
 output: "Nguồn ra"
 script: "Kịch bản"
 disablePagesScript: "Tắt AiScript trên Trang"
@@ -700,7 +700,7 @@ onlineUsersCount: "{n} người đang online"
 nUsers: "{n} Người"
 nNotes: "{n} Tút"
 sendErrorReports: "Báo lỗi"
-sendErrorReportsDescription: "Khi được bật, thông tin chi tiết về lỗi sẽ được chia sẻ với Misskey khi xảy ra sự cố, giúp nâng cao chất lượng của Misskey.\nBao gồm thông tin như phiên bản hệ điều hành của bạn, trình duyệt bạn đang sử dụng, hoạt động của bạn trong Misskey, v.v."
+sendErrorReportsDescription: "Khi được bật, thông tin chi tiết về lỗi sẽ được chia sẻ với Calckey khi xảy ra sự cố, giúp nâng cao chất lượng của Calckey.\nBao gồm thông tin như phiên bản hệ điều hành của bạn, trình duyệt bạn đang sử dụng, hoạt động của bạn trong Calckey, v.v."
 myTheme: "Theme của tôi"
 backgroundColor: "Màu nền"
 accentColor: "Màu phụ"
@@ -791,7 +791,7 @@ hashtags: "Hashtag"
 troubleshooting: "Khắc phục sự cố"
 useBlurEffect: "Dùng hiệu ứng làm mờ trong giao diện"
 learnMore: "Tìm hiểu thêm"
-misskeyUpdated: "Misskey vừa được cập nhật!"
+misskeyUpdated: "Calckey vừa được cập nhật!"
 whatIsNew: "Hiện những thay đổi"
 translate: "Dịch"
 translatedFrom: "Dịch từ {x}"
@@ -966,13 +966,13 @@ _registry:
   keys: "Các mã"
   domain: "Tên miền"
   createKey: "Tạo mã"
-_aboutMisskey:
-  about: "Misskey là phần mềm mã nguồn mở được phát triển bởi syuilo từ năm 2014."
+_aboutCalckey:
+  about: "Calckey là phần mềm mã nguồn mở được phát triển bởi thatonecalculator từ năm 2022."
   contributors: "Những người đóng góp nổi bật"
   allContributors: "Toàn bộ người đóng góp"
   source: "Mã nguồn"
-  translation: "Dịch Misskey"
-  donate: "Ủng hộ Misskey"
+  translation: "Dịch Calckey"
+  donate: "Ủng hộ Calckey"
   morePatrons: "Chúng tôi cũng trân trọng sự hỗ trợ của nhiều người đóng góp khác không được liệt kê ở đây. Cảm ơn! 🥰"
   patrons: "Người ủng hộ"
 _nsfw:
@@ -981,8 +981,8 @@ _nsfw:
   force: "Ẩn mọi media"
 _mfm:
   cheatSheet: "MFM Cheatsheet"
-  intro: "MFM là ngôn ngữ phát triển độc quyền của Misskey có thể được sử dụng ở nhiều nơi. Tại đây bạn có thể xem danh sách tất cả các cú pháp MFM có sẵn."
-  dummy: "Misskey mở rộng thế giới Fediverse"
+  intro: "MFM là ngôn ngữ phát triển độc quyền của Calckey có thể được sử dụng ở nhiều nơi. Tại đây bạn có thể xem danh sách tất cả các cú pháp MFM có sẵn."
+  dummy: "Calckey mở rộng thế giới Fediverse"
   mention: "Nhắc đến"
   mentionDescription: "Bạn có thể nhắc đến ai đó bằng cách sử dụng @tên người dùng."
   hashtag: "Hashtag"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 2784da81d..b9e1b40d5 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "简体中文"
-headlineMisskey: "通过帖子连接在一起的网络"
-introMisskey: "欢迎！Misskey是一个开源的、去中心化的“微博客”服务。\n通过编写「帖文」来和大家分享你的以及你周围的事情吧！📡\n通过「回应」功能，可以让你快速地对大家的帖文表达反馈👍\n来探索新的世界吧！🚀"
+headlineCalckey: "通过帖子连接在一起的网络"
+introCalckey: "欢迎！Calckey是一个开源的、去中心化的“微博客”服务。\n通过编写「帖文」来和大家分享你的以及你周围的事情吧！📡\n通过「回应」功能，可以让你快速地对大家的帖文表达反馈👍\n来探索新的世界吧！🚀"
 monthAndDay: "{month}月 {day}日"
 search: "搜索"
 notifications: "通知"
@@ -141,7 +141,7 @@ settingGuide: "推荐配置"
 cacheRemoteFiles: "远程文件缓存"
 cacheRemoteFilesDescription: "当禁用此设定时远程文件将直接从远程实例载入。禁用后会减小储存空间需求，但是会增加流量，因为缩略图不会被生成。"
 flagAsBot: "这是一个机器人账号"
-flagAsBotDescription: "如果此帐户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Misskey的内部系统将此帐户识别为机器人。"
+flagAsBotDescription: "如果此帐户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Calckey的内部系统将此帐户识别为机器人。"
 flagAsCat: "将这个账户设定为一只猫"
 flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。\n开启后，会在您的头像上出现猫耳朵，并将你的帖子中的「na」替换为「nya」，日文同理。"
 flagShowTimelineReplies: "在时间线上显示帖子的回复"
@@ -201,7 +201,7 @@ noUsers: "无用户"
 editProfile: "编辑资料"
 noteDeleteConfirm: "要删除该帖子吗？"
 pinLimitExceeded: "无法置顶更多了"
-intro: "Misskey的部署结束啦！填写管理员账号吧！"
+intro: "Calckey的部署结束啦！填写管理员账号吧！"
 done: "完成"
 processing: "正在处理"
 preview: "预览"
@@ -380,7 +380,7 @@ exploreFediverse: "探索联邦宇宙"
 popularTags: "热门标签"
 userList: "列表"
 about: "关于"
-aboutMisskey: "关于 Misskey"
+aboutCalckey: "关于 Calckey"
 administrator: "管理员"
 token: "Token (令牌)"
 twoStepAuthentication: "两步验证"
@@ -526,7 +526,7 @@ sort: "排序"
 ascendingOrder: "升序"
 descendingOrder: "降序"
 scratchpad: "AiScript控制台"
-scratchpadDescription: "AiScript控制台为AiScript提供了实验环境。您可以编写代码以与Misskey交互，运行它并查看结果。"
+scratchpadDescription: "AiScript控制台为AiScript提供了实验环境。您可以编写代码以与Calckey交互，运行它并查看结果。"
 output: "输出"
 script: "脚本"
 disablePagesScript: "禁用页面脚本"
@@ -702,7 +702,7 @@ onlineUsersCount: "{n}人在线"
 nUsers: "{n}用户"
 nNotes: "{n}帖子"
 sendErrorReports: "发送错误报告"
-sendErrorReportsDescription: "启用后，如果出现问题，可以与Misskey共享详细的错误信息，从而帮助提高软件的质量。"
+sendErrorReportsDescription: "启用后，如果出现问题，可以与Calckey共享详细的错误信息，从而帮助提高软件的质量。"
 myTheme: "我的主题"
 backgroundColor: "背景"
 accentColor: "强调色"
@@ -793,7 +793,7 @@ hashtags: "话题标签"
 troubleshooting: "故障排除"
 useBlurEffect: "在UI上使用模糊效果"
 learnMore: "更多信息"
-misskeyUpdated: "Misskey更新完成！"
+misskeyUpdated: "Calckey更新完成！"
 whatIsNew: "显示更新信息"
 translate: "翻译"
 translatedFrom: "从 {x} 翻译"
@@ -971,13 +971,13 @@ _registry:
   keys: "主要"
   domain: "域"
   createKey: "创建键"
-_aboutMisskey:
-  about: "Misskey是由syuilo于2014年开发的开源软件。"
+_aboutCalckey:
+  about: "Calckey是由thatonecalculator于2022年开发的开源软件。"
   contributors: "主要贡献者"
   allContributors: "全体贡献者"
   source: "源代码"
-  translation: "翻译Misskey"
-  donate: "赞助Misskey"
+  translation: "翻译Calckey"
+  donate: "赞助Calckey"
   morePatrons: "还有很多其他的人也在支持我们，非常感谢🥰"
   patrons: "支持者"
 _nsfw:
@@ -986,8 +986,8 @@ _nsfw:
   force: "总是隐藏内容"
 _mfm:
   cheatSheet: "MFM代码速查表"
-  intro: "MFM是一种在Misskey中的各个位置使用的专用标记语言。在这里您可以看到MFM中可用的语法列表。"
-  dummy: "通过Misskey扩展联邦宇宙的世界"
+  intro: "MFM是一种在Calckey中的各个位置使用的专用标记语言。在这里您可以看到MFM中可用的语法列表。"
+  dummy: "通过Calckey扩展联邦宇宙的世界"
   mention: "提及"
   mentionDescription: "可以使用 @+用户名 来指示特定用户"
   hashtag: "话题标签"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 3e8485adb..3f488faba 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "繁體中文"
-headlineMisskey: "貼文連繫網路"
-introMisskey: "歡迎！ Misskey是一個開放原始碼且去中心化的社群網路。\n透過「貼文」分享周邊新鮮事，並告訴其他人您的想法！📡\n透過「反應」功能，對大家的貼文表達情感！👍\n一起來探索這個新的世界吧！🚀"
+headlineCalckey: "貼文連繫網路"
+introCalckey: "歡迎！ Calckey是一個開放原始碼且去中心化的社群網路。\n透過「貼文」分享周邊新鮮事，並告訴其他人您的想法！📡\n透過「反應」功能，對大家的貼文表達情感！👍\n一起來探索這個新的世界吧！🚀"
 monthAndDay: "{month}月 {day}日"
 search: "搜尋"
 notifications: "通知"
@@ -141,7 +141,7 @@ settingGuide: "推薦設定"
 cacheRemoteFiles: "快取遠端檔案"
 cacheRemoteFilesDescription: "禁用此設定會停止遠端檔案的緩存，從而節省儲存空間，但資料會因直接連線從而產生額外連接數據。"
 flagAsBot: "此使用者是機器人"
-flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Misskey內部系統將本帳戶識別為機器人"
+flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Calckey內部系統將本帳戶識別為機器人"
 flagAsCat: "此使用者是貓"
 flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
 flagShowTimelineReplies: "在時間軸上顯示貼文的回覆"
@@ -201,7 +201,7 @@ noUsers: "沒有任何使用者"
 editProfile: "編輯個人檔案"
 noteDeleteConfirm: "確定刪除此貼文嗎？"
 pinLimitExceeded: "不能置頂更多貼文了"
-intro: "Misskey 部署完成！請建立管理員帳戶。"
+intro: "Calckey 部署完成！請建立管理員帳戶。"
 done: "完成"
 processing: "處理中"
 preview: "預覽"
@@ -380,7 +380,7 @@ exploreFediverse: "探索聯邦世界"
 popularTags: "熱門標籤"
 userList: "清單"
 about: "資訊"
-aboutMisskey: "關於 Misskey"
+aboutCalckey: "關於 Calckey"
 administrator: "管理員"
 token: "權杖"
 twoStepAuthentication: "兩階段驗證"
@@ -526,7 +526,7 @@ sort: "排序"
 ascendingOrder: "昇冪"
 descendingOrder: "降冪"
 scratchpad: "暫存記憶體"
-scratchpadDescription: "AiScript控制台為AiScript提供了實驗環境。您可以在此編寫、執行和確認代碼與Misskey互動的结果。"
+scratchpadDescription: "AiScript控制台為AiScript提供了實驗環境。您可以在此編寫、執行和確認代碼與Calckey互動的结果。"
 output: "輸出"
 script: "腳本"
 disablePagesScript: "停用頁面的AiScript腳本"
@@ -793,7 +793,7 @@ hashtags: "#tag"
 troubleshooting: "故障排除"
 useBlurEffect: "在 UI 上使用模糊效果"
 learnMore: "更多資訊"
-misskeyUpdated: "Misskey 更新完成！"
+misskeyUpdated: "Calckey 更新完成！"
 whatIsNew: "顯示更新資訊"
 translate: "翻譯"
 translatedFrom: "從 {x} 翻譯"
@@ -971,13 +971,13 @@ _registry:
   keys: "機碼"
   domain: "域"
   createKey: "新增機碼"
-_aboutMisskey:
-  about: "Misskey是由syuilo自2014年起開發的開源軟體。"
+_aboutCalckey:
+  about: "Calckey是由thatonecalculator自2022年起開發的開源軟體。"
   contributors: "主要貢獻者"
   allContributors: "全體貢獻人員"
   source: "原始碼"
-  translation: "翻譯Misskey"
-  donate: "贊助Misskey"
+  translation: "翻譯Calckey"
+  donate: "贊助Calckey"
   morePatrons: "還有許許多多幫助我們的其他人，非常感謝你們。 🥰"
   patrons: "贊助者"
 _nsfw:
@@ -986,8 +986,8 @@ _nsfw:
   force: "隱藏所有內容"
 _mfm:
   cheatSheet: "MFM代碼小抄"
-  intro: "MFM是Misskey專用的標記語言，可以在Misskey中的各個位置使用。 您可以這裏看到MFM可用語法列表。"
-  dummy: "Misskey拓展了Fediverse的世界"
+  intro: "MFM是Calckey專用的標記語言，可以在Calckey中的各個位置使用。 您可以這裏看到MFM可用語法列表。"
+  dummy: "Calckey拓展了Fediverse的世界"
   mention: "提及"
   mentionDescription: "透過 @+用戶名 來標示特定使用者。"
   hashtag: "#tag"
diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue
index fa0eeff0b..2f229585e 100644
--- a/packages/client/src/pages/about-calckey.vue
+++ b/packages/client/src/pages/about-calckey.vue
@@ -42,7 +42,7 @@
 						/></span>
 					</div>
 					<div class="_formBlock" style="text-align: center">
-						{{ i18n.ts._aboutMisskey.about }}<br /><a
+						{{ i18n.ts._aboutCalckey.about }}<br /><a
 							href="https://codeberg.org/calckey/calckey"
 							target="_blank"
 							class="_link"
@@ -63,7 +63,7 @@
 								<template #icon
 									><i class="ph-code ph-bold ph-lg"></i
 								></template>
-								{{ i18n.ts._aboutMisskey.source }}
+								{{ i18n.ts._aboutCalckey.source }}
 								<template #suffix>Codeberg</template>
 							</FormLink>
 							<FormLink
@@ -73,7 +73,7 @@
 								<template #icon
 									><i class="ph-money ph-bold ph-lg"></i
 								></template>
-								{{ i18n.ts._aboutMisskey.donate }}
+								{{ i18n.ts._aboutCalckey.donate }}
 								<template #suffix>Donate</template>
 							</FormLink>
 							<FormLink
@@ -83,14 +83,14 @@
 								<template #icon
 									><i class="ph-translate ph-bold ph-lg"></i
 								></template>
-								{{ i18n.ts._aboutMisskey.translation }}
+								{{ i18n.ts._aboutCalckey.translation }}
 								<template #suffix>Translate</template>
 							</FormLink>
 						</div>
 					</FormSection>
 					<FormSection>
 						<template #label>{{
-							i18n.ts._aboutMisskey.contributors
+							i18n.ts._aboutCalckey.contributors
 						}}</template>
 						<div class="_formLinks">
 							<FormLink to="/@kainoa@calckey.social"
@@ -118,7 +118,7 @@
 							><MkLink
 								url="https://codeberg.org/calckey/calckey/activity"
 								>{{
-									i18n.ts._aboutMisskey.allContributors
+									i18n.ts._aboutCalckey.allContributors
 								}}</MkLink
 							></template
 						>
@@ -126,7 +126,7 @@
 					<FormSection>
 						<template #label
 							><Mfm text="$[jelly ❤]" />
-							{{ i18n.ts._aboutMisskey.patrons }}</template
+							{{ i18n.ts._aboutCalckey.patrons }}</template
 						>
 						<MkSparkle>
 							<div
@@ -138,7 +138,7 @@
 							</div>
 						</MkSparkle>
 						<template #caption>{{
-							i18n.ts._aboutMisskey.morePatrons
+							i18n.ts._aboutCalckey.morePatrons
 						}}</template>
 					</FormSection>
 				</div>
@@ -209,7 +209,7 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
-	title: i18n.ts.aboutMisskey,
+	title: i18n.ts.aboutCalckey,
 	icon: null,
 });
 </script>
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index 4b9e62cf8..15214ef03 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -60,7 +60,7 @@
 								<template #value>{{ version }}</template>
 							</MkKeyValue>
 							<FormLink to="/about-calckey">{{
-								i18n.ts.aboutMisskey
+								i18n.ts.aboutCalckey
 							}}</FormLink>
 						</FormSection>
 
diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue
index 286ecdda1..bc5b26f1c 100644
--- a/packages/client/src/pages/welcome.entrance.a.vue
+++ b/packages/client/src/pages/welcome.entrance.a.vue
@@ -45,7 +45,7 @@
 					<div class="about">
 						<div
 							class="desc"
-							v-html="meta.description || i18n.ts.headlineMisskey"
+							v-html="meta.description || i18n.ts.headlineCalckey"
 						></div>
 					</div>
 					<div class="action">
@@ -177,7 +177,7 @@ function showMenu(ev) {
 				},
 			},
 			{
-				text: i18n.ts.aboutMisskey,
+				text: i18n.ts.aboutCalckey,
 				icon: "ph-info ph-bold ph-lg",
 				action: () => {
 					os.pageWindow("/about-calckey");
diff --git a/packages/client/src/pages/welcome.entrance.b.vue b/packages/client/src/pages/welcome.entrance.b.vue
index 82651aeda..25bc9f849 100644
--- a/packages/client/src/pages/welcome.entrance.b.vue
+++ b/packages/client/src/pages/welcome.entrance.b.vue
@@ -15,7 +15,7 @@
 				<div class="about">
 					<div
 						class="desc"
-						v-html="meta.description || i18n.ts.headlineMisskey"
+						v-html="meta.description || i18n.ts.headlineCalckey"
 					></div>
 				</div>
 				<div class="action">
@@ -156,7 +156,7 @@ export default defineComponent({
 						},
 					},
 					{
-						text: i18n.ts.aboutMisskey,
+						text: i18n.ts.aboutCalckey,
 						icon: "ph-info ph-bold ph-lg",
 						action: () => {
 							os.pageWindow("/about-calckey");
diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue
index 69c1d5142..4dc50a177 100644
--- a/packages/client/src/pages/welcome.entrance.c.vue
+++ b/packages/client/src/pages/welcome.entrance.c.vue
@@ -30,7 +30,7 @@
 							<div
 								class="desc"
 								v-html="
-									meta.description || i18n.ts.headlineMisskey
+									meta.description || i18n.ts.headlineCalckey
 								"
 							></div>
 						</div>
@@ -182,7 +182,7 @@ export default defineComponent({
 						},
 					},
 					{
-						text: i18n.ts.aboutMisskey,
+						text: i18n.ts.aboutCalckey,
 						icon: "ph-info ph-bold ph-lg",
 						action: () => {
 							os.pageWindow("/about-calckey");
diff --git a/packages/client/src/scripts/helpMenu.ts b/packages/client/src/scripts/helpMenu.ts
index aca9d6e70..b67079f8f 100644
--- a/packages/client/src/scripts/helpMenu.ts
+++ b/packages/client/src/scripts/helpMenu.ts
@@ -20,7 +20,7 @@ export function openHelpMenu_(ev: MouseEvent) {
 			},
 			{
 				type: "link",
-				text: i18n.ts.aboutMisskey,
+				text: i18n.ts.aboutCalckey,
 				icon: "ph-lightbulb ph-bold ph-lg",
 				to: "/about-calckey",
 			},
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index b70a3c984..b3fb12148 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -262,7 +262,7 @@ function openInstanceMenu(ev: MouseEvent) {
 			},
 			{
 				type: "link",
-				text: i18n.ts.aboutMisskey,
+				text: i18n.ts.aboutCalckey,
 				to: "/about-calckey",
 			},
 		],
diff --git a/packages/client/src/ui/visitor/a.vue b/packages/client/src/ui/visitor/a.vue
index 3894a991d..00e8a8e23 100644
--- a/packages/client/src/ui/visitor/a.vue
+++ b/packages/client/src/ui/visitor/a.vue
@@ -16,7 +16,7 @@
 				<div v-if="meta" class="about">
 					<div
 						class="desc"
-						v-html="meta.description || i18n.ts.introMisskey"
+						v-html="meta.description || i18n.ts.introCalckey"
 					></div>
 				</div>
 				<div class="action">
diff --git a/packages/client/src/ui/visitor/kanban.vue b/packages/client/src/ui/visitor/kanban.vue
index 1391bfb67..5e2fa72cb 100644
--- a/packages/client/src/ui/visitor/kanban.vue
+++ b/packages/client/src/ui/visitor/kanban.vue
@@ -26,7 +26,7 @@
 					<div v-if="meta" class="about">
 						<div
 							class="desc"
-							v-html="meta.description || i18n.ts.introMisskey"
+							v-html="meta.description || i18n.ts.introCalckey"
 						></div>
 					</div>
 					<div class="action">

From b0714908e787500d19b13b99e7088b24102a0738 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 17 Apr 2023 03:07:50 -0700
Subject: [PATCH 485/582] fix

---
 locales/ja-JP.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 9a757133d..b6661c110 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1048,7 +1048,7 @@ _nsfw:
   force: "常にメディアを隠す"
 _mfm:
   cheatSheet: "MFMチートシート"
-  intro: "MFMは、CalckeyやCalckey、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
+  intro: "MFMは、MisskeyやCalckey、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
   dummy: "CalckeyでFediverseの世界が広がります"
   mention: "メンション"
   mentionDescription: "アットマーク + ユーザー名で、特定のユーザーを示せます。"

From ebb93328d58417d4508046cdb1fd00f79b2e96a5 Mon Sep 17 00:00:00 2001
From: daikei <daikei@noreply.codeberg.org>
Date: Mon, 17 Apr 2023 22:36:22 +0000
Subject: [PATCH 486/582] [Fix] Properly replace koa-fix-trailing-slashes with
 inhouse script (#9870)

This follows up #9869, with an awaited ``next()``, fixing the script.

> I'm looking to remove another 5kb package, replacing it with an in-house script. The commit i'm proposing translates the entire job of koa-remove-trailing-slashes into a 206 byte script that gets the job done well.

(just to show the code does work)
![](https://s3.kitsunes.club/storage/41c7854d-d01e-4f4c-94dd-8b651e2d7367.gif)

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9870
Co-authored-by: daikei <daikei@noreply.codeberg.org>
Co-committed-by: daikei <daikei@noreply.codeberg.org>
---
 packages/backend/package.json        | 1 -
 packages/backend/src/server/index.ts | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index b02af2c03..97e86cd26 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -78,7 +78,6 @@
 		"koa-json-body": "5.3.0",
 		"koa-logger": "3.2.1",
 		"koa-mount": "4.0.0",
-		"koa-remove-trailing-slashes": "2.0.3",
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index be1f71a7a..191556c40 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -10,7 +10,6 @@ import Router from "@koa/router";
 import mount from "koa-mount";
 import koaLogger from "koa-logger";
 import * as slow from "koa-slow";
-
 import { IsNull } from "typeorm";
 import config from "@/config/index.js";
 import Logger from "@/services/logger.js";
@@ -30,7 +29,6 @@ import proxyServer from "./proxy/index.js";
 import webServer from "./web/index.js";
 import { initializeStreamingServer } from "./api/streaming.js";
 import { koaBody } from "koa-body";
-import removeTrailingSlash from "koa-remove-trailing-slashes";
 import { v4 as uuid } from "uuid";
 
 export const serverLogger = new Logger("server", "gray", false);
@@ -39,7 +37,11 @@ export const serverLogger = new Logger("server", "gray", false);
 const app = new Koa();
 app.proxy = true;
 
-app.use(removeTrailingSlash());
+// Replace trailing slashes 
+app.use(async (ctx, next) => {
+	if (ctx.request.path !== "/" && ctx.request.path.endsWith('/')) return ctx.redirect(ctx.request.path.replace(/\/$/, ""))
+	else await next()
+});
 
 if (!["production", "test"].includes(process.env.NODE_ENV || "")) {
 	// Logger

From 19c937fc6422df9a4ead99b75e466d3fc5282bdc Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 17 Apr 2023 15:36:54 -0700
Subject: [PATCH 487/582] Revert "fix"

This reverts commit 9b0a3b2187869c0245a857188ec40d4fd7c2b9af.
---
 locales/ja-JP.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b6661c110..9a757133d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1048,7 +1048,7 @@ _nsfw:
   force: "常にメディアを隠す"
 _mfm:
   cheatSheet: "MFMチートシート"
-  intro: "MFMは、MisskeyやCalckey、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
+  intro: "MFMは、CalckeyやCalckey、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
   dummy: "CalckeyでFediverseの世界が広がります"
   mention: "メンション"
   mentionDescription: "アットマーク + ユーザー名で、特定のユーザーを示せます。"

From cc73ec8d6206736761c8596123fcfdbd1dbf9b71 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 17 Apr 2023 15:37:05 -0700
Subject: [PATCH 488/582] Revert "update locales for calckey"

This reverts commit 8ab6a4c442175630e1e32d2a3d2d478878a4600e.
---
 locales/ar-SA.yml                             | 12 +++----
 locales/bn-BD.yml                             | 22 ++++++------
 locales/ca-ES.yml                             |  4 +--
 locales/cs-CZ.yml                             | 12 +++----
 locales/de-DE.yml                             | 28 +++++++--------
 locales/en-US.yml                             | 10 +++---
 locales/es-ES.yml                             | 28 +++++++--------
 locales/fr-FR.yml                             | 28 +++++++--------
 locales/id-ID.yml                             | 34 +++++++++----------
 locales/it-IT.yml                             | 28 +++++++--------
 locales/ja-JP.yml                             | 10 +++---
 locales/ja-KS.yml                             | 24 ++++++-------
 locales/kn-IN.yml                             |  2 +-
 locales/ko-KR.yml                             | 26 +++++++-------
 locales/nl-NL.yml                             | 10 +++---
 locales/pl-PL.yml                             | 14 ++++----
 locales/pt-PT.yml                             | 10 +++---
 locales/ro-RO.yml                             | 12 +++----
 locales/ru-RU.yml                             | 28 +++++++--------
 locales/sk-SK.yml                             | 28 +++++++--------
 locales/sv-SE.yml                             |  8 ++---
 locales/th-TH.yml                             | 28 +++++++--------
 locales/tr-TR.yml                             |  2 +-
 locales/uk-UA.yml                             | 26 +++++++-------
 locales/vi-VN.yml                             | 28 +++++++--------
 locales/zh-CN.yml                             | 28 +++++++--------
 locales/zh-TW.yml                             | 26 +++++++-------
 packages/client/src/pages/about-calckey.vue   | 18 +++++-----
 packages/client/src/pages/about.vue           |  2 +-
 .../client/src/pages/welcome.entrance.a.vue   |  4 +--
 .../client/src/pages/welcome.entrance.b.vue   |  4 +--
 .../client/src/pages/welcome.entrance.c.vue   |  4 +--
 packages/client/src/scripts/helpMenu.ts       |  2 +-
 packages/client/src/ui/classic.sidebar.vue    |  2 +-
 packages/client/src/ui/visitor/a.vue          |  2 +-
 packages/client/src/ui/visitor/kanban.vue     |  2 +-
 36 files changed, 278 insertions(+), 278 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index cc9231e9a..844cfb5d5 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "العربية"
-headlineCalckey: "شبكة مرتبطة بالملاحظات"
-introCalckey: "اهلا بك! ميسكي هو منصة تدوين مصغر لا مركزية ومفتوحة المصدر.\nيمكنك مشاركة \"ملاحظات\" عن ما يجري حولك، وإخبار الجميع عن نفسك 📡\nتسمح لك \"الانفعالات\" بتعبير عن شعورك حول ملاحظات الآخرين 👍\nاكتشف عالمًا جديدًا 🚀"
+headlineMisskey: "شبكة مرتبطة بالملاحظات"
+introMisskey: "اهلا بك! ميسكي هو منصة تدوين مصغر لا مركزية ومفتوحة المصدر.\nيمكنك مشاركة \"ملاحظات\" عن ما يجري حولك، وإخبار الجميع عن نفسك 📡\nتسمح لك \"الانفعالات\" بتعبير عن شعورك حول ملاحظات الآخرين 👍\nاكتشف عالمًا جديدًا 🚀"
 monthAndDay: "{day}/{month}"
 search: "البحث"
 notifications: "الإشعارات"
@@ -197,7 +197,7 @@ noUsers: "ليس هناك مستخدمون"
 editProfile: "تعديل الملف التعريفي"
 noteDeleteConfirm: "هل تريد حذف هذه الملاحظة؟"
 pinLimitExceeded: "لا يمكنك تدبيس الملاحظات بعد الآن."
-intro: "لقد انتهت عملية تنصيب Calckey. الرجاء إنشاء حساب إداري."
+intro: "لقد انتهت عملية تنصيب Misskey. الرجاء إنشاء حساب إداري."
 done: "تمّ"
 processing: "المعالجة جارية"
 preview: "معاينة"
@@ -372,7 +372,7 @@ exploreFediverse: "استكشف الفديفرس"
 popularTags: "الوسوم الرائجة"
 userList: "القوائم"
 about: "عن"
-aboutCalckey: "عن Calckey"
+aboutMisskey: "عن Misskey"
 administrator: "المدير"
 token: "الرمز المميز"
 twoStepAuthentication: "الإستيثاق بعاملَيْن"
@@ -856,8 +856,8 @@ _registry:
   keys: "المفاتيح"
   domain: "النّطاق"
   createKey: "أنشئ مفتاحًا"
-_aboutCalckey:
-  about: "ميسكي هو برمجية مفتوحة المصدر يطورها thatonecalculator منذ 2022."
+_aboutMisskey:
+  about: "ميسكي هو برمجية مفتوحة المصدر يطورها syuilo منذ 2014."
   contributors: "المساهمون الرئيسيون"
   allContributors: "كل المساهمين"
   source: "الشفرة المصدرية"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index f0aa5785b..8a9358e2a 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "বাংলা"
-headlineCalckey: "নোট ব্যাবহার করে সংযুক্ত নেটওয়ার্ক"
-introCalckey: "স্বাগতম! মিসকি একটি ওপেন সোর্স, ডিসেন্ট্রালাইজড মাইক্রোব্লগিং পরিষেবা। \n\"নোট\" তৈরির মাধ্যমে যা ঘটছে তা সবার সাথে শেয়ার করুন 📡\n\"রিঅ্যাকশন\" গুলির মাধ্যমে যেকোনো নোট সম্পর্কে আপনার অনুভূতি ব্যাক্ত করতে পারেন 👍\nএকটি নতুন দুনিয়া ঘুরে দেখুন 🚀\n"
+headlineMisskey: "নোট ব্যাবহার করে সংযুক্ত নেটওয়ার্ক"
+introMisskey: "স্বাগতম! মিসকি একটি ওপেন সোর্স, ডিসেন্ট্রালাইজড মাইক্রোব্লগিং পরিষেবা। \n\"নোট\" তৈরির মাধ্যমে যা ঘটছে তা সবার সাথে শেয়ার করুন 📡\n\"রিঅ্যাকশন\" গুলির মাধ্যমে যেকোনো নোট সম্পর্কে আপনার অনুভূতি ব্যাক্ত করতে পারেন 👍\nএকটি নতুন দুনিয়া ঘুরে দেখুন 🚀\n"
 monthAndDay: "{day}/{month}"
 search: "খুঁজুন"
 notifications: "বিজ্ঞপ্তি"
@@ -199,7 +199,7 @@ noUsers: "কোন ব্যাবহারকারী নেই"
 editProfile: "প্রোফাইল সম্পাদনা করুন"
 noteDeleteConfirm: "আপনি কি নোট ডিলিট করার ব্যাপারে নিশ্চিত?"
 pinLimitExceeded: "আপনি আর কোন নোট পিন করতে পারবেন না"
-intro: "Calckey এর ইন্সটলেশন সম্পন্ন হয়েছে！দয়া করে অ্যাডমিন ইউজার তৈরি করুন।"
+intro: "Misskey এর ইন্সটলেশন সম্পন্ন হয়েছে！দয়া করে অ্যাডমিন ইউজার তৈরি করুন।"
 done: "সম্পন্ন"
 processing: "প্রক্রিয়াধীন..."
 preview: "পূর্বরূপ দেখুন"
@@ -377,7 +377,7 @@ exploreFediverse: "Fediverse ঘুরে দেখুন"
 popularTags: "জনপ্রিয় ট্যাগগুলি"
 userList: "লিস্ট"
 about: "আপনার সম্পর্কে"
-aboutCalckey: "Calckey সম্পর্কে"
+aboutMisskey: "Misskey সম্পর্কে"
 administrator: "প্রশাসক"
 token: "টোকেন"
 twoStepAuthentication: "২-ধাপ প্রমাণীকরণ"
@@ -695,7 +695,7 @@ onlineUsersCount: "{n} জন ব্যাবহারকারী অনলা
 nUsers: "{n} জন ব্যাবহারকারী"
 nNotes: "{n} টি নোট"
 sendErrorReports: "ক্রুটি প্রতিবেদন পাঠান"
-sendErrorReportsDescription: "চালু থাকলে, বিস্তারিত ত্রুটির তথ্য Calckey-এর সাথে শেয়ার করা হয়। যা সফ্টওয়্যারটির গুণমান উন্নত করতে সাহায্য করে। ত্রুটির তথ্যের মধ্যে রয়েছে OS সংস্করণ, ব্রাউজারের ধরন, কর্মের ইতিহাস ইত্যাদি।"
+sendErrorReportsDescription: "চালু থাকলে, বিস্তারিত ত্রুটির তথ্য Misskey-এর সাথে শেয়ার করা হয়। যা সফ্টওয়্যারটির গুণমান উন্নত করতে সাহায্য করে। ত্রুটির তথ্যের মধ্যে রয়েছে OS সংস্করণ, ব্রাউজারের ধরন, কর্মের ইতিহাস ইত্যাদি।"
 myTheme: "আমার থিম"
 backgroundColor: "পটভূমির রং"
 accentColor: "এক্সেন্টের রং"
@@ -786,7 +786,7 @@ hashtags: "হ্যাশট্যাগ"
 troubleshooting: "ট্রাবলশুটিং"
 useBlurEffect: "UI তে ব্লার ইফেক্ট ব্যাবহার করুন"
 learnMore: "আরও জানুন"
-misskeyUpdated: "Calckey আপডেট করা হয়েছে！"
+misskeyUpdated: "Misskey আপডেট করা হয়েছে！"
 whatIsNew: "পরিবর্তনগুলি দেখান"
 translate: "অনুবাদ"
 translatedFrom: "{x} হতে অনুবাদ করা"
@@ -897,13 +897,13 @@ _registry:
   keys: "কী - সমূহ"
   domain: "ডোমেন"
   createKey: "কী বানান"
-_aboutCalckey:
-  about: "Calckey, একটি ওপেন সোর্স সফ্টওয়্যার যা 2022 সাল থেকে thatonecalculator তৈরি করছেন।"
+_aboutMisskey:
+  about: "Misskey, একটি ওপেন সোর্স সফ্টওয়্যার যা 2014 সাল থেকে syuilo তৈরি করছেন।"
   contributors: "প্রধান কন্ট্রিবিউটারগণ"
   allContributors: "সকল কন্ট্রিবিউটারগণ"
   source: "সোর্স কোড"
-  translation: "Calckey অনুবাদ করুন"
-  donate: "Calckey তে দান করুন"
+  translation: "Misskey অনুবাদ করুন"
+  donate: "Misskey তে দান করুন"
   morePatrons: "আরও অনেকে আমাদের সাহায্য করছেন। তাদের সবাইকে ধন্যবাদ 🥰"
   patrons: "সমর্থনকারী"
 _nsfw:
@@ -912,7 +912,7 @@ _nsfw:
   force: "সকল মিডিয়া লুকান"
 _mfm:
   cheatSheet: "MFM চিটশিট"
-  intro: "MFM একটি মার্কআপ ভাষা যা Calckey-এর মধ্যে বিভিন্ন জায়গায় ব্যবহার করা যেতে পারে। এখানে আপনি MFM-এর সিনট্যাক্সগুলির একটি তালিকা দেখতে পারবেন।"
+  intro: "MFM একটি মার্কআপ ভাষা যা Misskey-এর মধ্যে বিভিন্ন জায়গায় ব্যবহার করা যেতে পারে। এখানে আপনি MFM-এর সিনট্যাক্সগুলির একটি তালিকা দেখতে পারবেন।"
   dummy: "মিসকি ফেডিভার্সের বিশ্বকে প্রসারিত করে"
   mention: "উল্লেখ"
   mentionDescription: "@ চিহ্ন + ব্যবহারকারীর নাম একটি নির্দিষ্ট ব্যবহারকারীকে নির্দেশ করতে ব্যবহার করা যায়।"
diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index e35b0478f..360ef4c22 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Català"
-headlineCalckey: "Una xarxa connectada per notes"
-introCalckey: "Benvingut! Calckey és un servei de microblogging descentralitzat de codi obert.\nCrea \"notes\" per compartir els teus pensaments amb tots els que t'envolten. 📡\nAmb \"reaccions\", també pots expressar ràpidament els teus sentiments sobre les notes de tothom. 👍\nExplorem un món nou! 🚀"
+headlineMisskey: "Una xarxa connectada per notes"
+introMisskey: "Benvingut! Misskey és un servei de microblogging descentralitzat de codi obert.\nCrea \"notes\" per compartir els teus pensaments amb tots els que t'envolten. 📡\nAmb \"reaccions\", també pots expressar ràpidament els teus sentiments sobre les notes de tothom. 👍\nExplorem un món nou! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Cercar"
 notifications: "Notificacions"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 28004a45b..cb2f0a1df 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Čeština"
-headlineCalckey: "Síť propojená poznámkami"
-introCalckey: "Vítejte! Calckey je otevřený a decentralizovaný microblogový servis.\n\"Poznámkami\" můžete sdílet co se zrovna děje se všemi ve Vašem okolí. 📡\nPomocí \"reakcí\" můžete sdílet své názory a pocity na ostatní poznámky. 👍\nPojďte objevovat nový svět! 🚀"
+headlineMisskey: "Síť propojená poznámkami"
+introMisskey: "Vítejte! Misskey je otevřený a decentralizovaný microblogový servis.\n\"Poznámkami\" můžete sdílet co se zrovna děje se všemi ve Vašem okolí. 📡\nPomocí \"reakcí\" můžete sdílet své názory a pocity na ostatní poznámky. 👍\nPojďte objevovat nový svět! 🚀"
 monthAndDay: "{day}. {month}."
 search: "Vyhledávání"
 notifications: "Oznámení"
@@ -136,7 +136,7 @@ settingGuide: "Doporučené nastavení"
 cacheRemoteFiles: "Ukládání vzdálených souborů do mezipaměti"
 cacheRemoteFilesDescription: "Zakázání tohoto nastavení způsobí, že vzdálené soubory budou odkazovány přímo, místo aby byly ukládány do mezipaměti. Tím se ušetří úložiště na serveru, ale zvýší se provoz, protože se negenerují miniatury."
 flagAsBot: "Tento účet je bot"
-flagAsBotDescription: "Pokud je tento účet kontrolován programem zaškrtněte tuto možnost. To označí tento účet jako bot pro ostatní vývojáře a zabrání tak nekonečným interakcím s ostatními boty a upraví Calckey systém aby se choval k tomuhle účtu jako bot."
+flagAsBotDescription: "Pokud je tento účet kontrolován programem zaškrtněte tuto možnost. To označí tento účet jako bot pro ostatní vývojáře a zabrání tak nekonečným interakcím s ostatními boty a upraví Misskey systém aby se choval k tomuhle účtu jako bot."
 flagAsCat: "Tenhle účet je kočka"
 flagAsCatDescription: "Vyberte tuto možnost aby tento účet byl označen jako kočka."
 flagShowTimelineReplies: "Zobrazovat odpovědi na časové ose"
@@ -189,7 +189,7 @@ blockedInstances: "Blokované instance"
 noUsers: "Žádní uživatelé"
 editProfile: "Upravit můj profil"
 pinLimitExceeded: "Nemůžete připnout další poznámky."
-intro: "Instalace Calckey byla dokončena! Prosím vytvořte admina."
+intro: "Instalace Misskey byla dokončena! Prosím vytvořte admina."
 done: "Hotovo"
 processing: "Zpracovávám"
 preview: "Náhled"
@@ -332,7 +332,7 @@ recentlyUpdatedUsers: "Nedávno aktívni uživatelé"
 popularTags: "Populární tagy"
 userList: "Seznamy"
 about: "Informace"
-aboutCalckey: "O Calckey"
+aboutMisskey: "O Misskey"
 administrator: "Administrátor"
 token: "Token"
 twoStepAuthentication: "Dvoufaktorová autentikace"
@@ -630,7 +630,7 @@ _registry:
   keys: "Klíče"
   domain: "Doména"
   createKey: "Vytvořit klíč"
-_aboutCalckey:
+_aboutMisskey:
   allContributors: "Všichni přispěvatelé"
   source: "Zdrojový kód"
 _mfm:
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 622ad1138..a51bc0c48 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Deutsch"
-headlineCalckey: "Ein durch Posts verbundenes Netzwerk"
-introCalckey: "Willkommen! Calckey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse „Posts“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen zu teilen. 📡\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle über Posts anderer Benutzer zum Ausdruck bringen. 👍\nEine neue Welt wartet auf dich! 🚀"
+headlineMisskey: "Ein durch Posts verbundenes Netzwerk"
+introMisskey: "Willkommen! Calckey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse „Posts“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen zu teilen. 📡\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle über Posts anderer Benutzer zum Ausdruck bringen. 👍\nEine neue Welt wartet auf dich! 🚀"
 monthAndDay: "{day}.{month}."
 search: "Suchen"
 notifications: "Benachrichtigungen"
@@ -140,7 +140,7 @@ settingGuide: "Empfohlene Einstellung"
 cacheRemoteFiles: "Dateien von fremden Instanzen im Cache speichern"
 cacheRemoteFilesDescription: "Ist diese Einstellung deaktiviert, so werden Dateien fremder Instanzen direkt von dort geladen. Hierdurch wird Speicherplatz auf diesem Server gespart, aber durch fehlende Generierung von Vorschaubildern mehr Bandbreite verwendet."
 flagAsBot: "Als Bot markieren"
-flagAsBotDescription: "Aktiviere diese Option, falls dieses Benutzerkonto durch ein Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Calckeys interne Systeme dieses Benutzerkonto als Bot behandeln."
+flagAsBotDescription: "Aktiviere diese Option, falls dieses Benutzerkonto durch ein Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Misskeys interne Systeme dieses Benutzerkonto als Bot behandeln."
 flagAsCat: "Als Katze markieren"
 flagAsCatDescription: "Aktiviere diese Option, um dieses Benutzerkonto als Katze zu markieren."
 flagShowTimelineReplies: "Antworten in der Chronik anzeigen"
@@ -200,7 +200,7 @@ noUsers: "Keine Benutzer gefunden"
 editProfile: "Profil bearbeiten"
 noteDeleteConfirm: "Möchtest du diese Notiz wirklich löschen?"
 pinLimitExceeded: "Du kannst nicht noch mehr Notizen anheften."
-intro: "Calckey ist installiert! Lass uns nun ein Administratorkonto einrichten."
+intro: "Misskey ist installiert! Lass uns nun ein Administratorkonto einrichten."
 done: "Fertig"
 processing: "In Bearbeitung …"
 preview: "Vorschau"
@@ -379,7 +379,7 @@ exploreFediverse: "Das Fediverse erkunden"
 popularTags: "Beliebte Schlagwörter"
 userList: "Liste"
 about: "Über"
-aboutCalckey: "Über Calckey"
+aboutMisskey: "Über Misskey"
 administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Zwei-Faktor-Authentifizierung"
@@ -525,7 +525,7 @@ sort: "Sortieren"
 ascendingOrder: "Aufsteigende Reihenfolge"
 descendingOrder: "Absteigende Reihenfolge"
 scratchpad: "Testumgebung"
-scratchpadDescription: "Die Testumgebung bietet einen Bereich für AiScript-Experimente. Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Calckey überprüfen."
+scratchpadDescription: "Die Testumgebung bietet einen Bereich für AiScript-Experimente. Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Misskey überprüfen."
 output: "Ausgabe"
 script: "Skript"
 disablePagesScript: "AiScript auf Seiten deaktivieren"
@@ -701,7 +701,7 @@ onlineUsersCount: "{n} Benutzer sind online"
 nUsers: "{n} Benutzer"
 nNotes: "{n} Notizen"
 sendErrorReports: "Fehlerberichte senden"
-sendErrorReportsDescription: "Ist diese Option aktiviert, so werden beim Auftreten von Fehlern detaillierte Fehlerinformationen an Calckey weitergegeben, was zur Verbesserung der Qualität von Calckey beiträgt.\nEnthalten in diesen Informationen sind u.a. die Version deines Betriebssystems, welchen Browser du verwendest und ein Verlauf deiner Aktivitäten innerhalb Calckey."
+sendErrorReportsDescription: "Ist diese Option aktiviert, so werden beim Auftreten von Fehlern detaillierte Fehlerinformationen an Misskey weitergegeben, was zur Verbesserung der Qualität von Misskey beiträgt.\nEnthalten in diesen Informationen sind u.a. die Version deines Betriebssystems, welchen Browser du verwendest und ein Verlauf deiner Aktivitäten innerhalb Misskey."
 myTheme: "Mein Farbschema"
 backgroundColor: "Hintergrundfarbe"
 accentColor: "Akzentfarbe"
@@ -792,7 +792,7 @@ hashtags: "Hashtags"
 troubleshooting: "Problembehandlung"
 useBlurEffect: "Weichzeichnungseffekt in der Benutzeroberfläche verwenden"
 learnMore: "Mehr erfahren"
-misskeyUpdated: "Calckey wurde aktualisiert!"
+misskeyUpdated: "Misskey wurde aktualisiert!"
 whatIsNew: "Änderungen anzeigen"
 translate: "Übersetzen"
 translatedFrom: "Aus {x} übersetzt"
@@ -967,13 +967,13 @@ _registry:
   keys: "Schlüssel"
   domain: "Domain"
   createKey: "Schlüssel erstellen"
-_aboutCalckey:
-  about: "Calckey ist Open-Source-Software, welche von thatonecalculator seit 2022 entwickelt wird."
+_aboutMisskey:
+  about: "Misskey ist Open-Source-Software, welche von syuilo seit 2014 entwickelt wird."
   contributors: "Hauptmitwirkende"
   allContributors: "Alle Mitwirkenden"
   source: "Quellcode"
-  translation: "Calckey übersetzen"
-  donate: "An Calckey spenden"
+  translation: "Misskey übersetzen"
+  donate: "An Misskey spenden"
   morePatrons: "Wir schätzen ebenso die Unterstützung vieler anderer hier nicht gelisteter Personen sehr. Danke! 🥰"
   patrons: "UnterstützerInnen"
 _nsfw:
@@ -982,8 +982,8 @@ _nsfw:
   force: "Alle Medien verbergen"
 _mfm:
   cheatSheet: "MFM Spickzettel"
-  intro: "MFM ist eine Calckey-exklusive Markup-Sprache, die in Calckey an vielen Stellen verwendet werden kann. Hier kannst du eine Liste von verfügbarer MFM-Syntax einsehen."
-  dummy: "Calckey erweitert die Welt des Fediverse"
+  intro: "MFM ist eine Misskey-exklusive Markup-Sprache, die in Misskey an vielen Stellen verwendet werden kann. Hier kannst du eine Liste von verfügbarer MFM-Syntax einsehen."
+  dummy: "Misskey erweitert die Welt des Fediverse"
   mention: "Erwähnung"
   mentionDescription: "Mit At-Zeichen und Benutzername kann ein individueller Nutzer angegeben werden."
   hashtag: "Hashtag"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index a22a591d3..99b0a7c86 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "English"
-headlineCalckey: "An open source, decentralized social media platform that's free forever! 🚀"
-introCalckey: "Welcome! Calckey is an open source, decentralized social media platform that's free forever! 🚀"
+headlineMisskey: "An open source, decentralized social media platform that's free forever! 🚀"
+introMisskey: "Welcome! Calckey is an open source, decentralized social media platform that's free forever! 🚀"
 monthAndDay: "{month}/{day}"
 search: "Search"
 notifications: "Notifications"
@@ -392,7 +392,7 @@ exploreFediverse: "Explore the Fediverse"
 popularTags: "Popular tags"
 userList: "Lists"
 about: "About"
-aboutCalckey: "About Calckey"
+aboutMisskey: "About Calckey"
 administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Two-factor authentication"
@@ -715,7 +715,7 @@ onlineUsersCount: "{n} users are online"
 nUsers: "{n} Users"
 nNotes: "{n} Posts"
 sendErrorReports: "Send error reports"
-sendErrorReportsDescription: "When turned on, detailed error information will be shared with Calckey when a problem occurs, helping to improve the quality of Calckey.\nThis will include information such the version of your OS, what browser you're using, your activity in Calckey, etc."
+sendErrorReportsDescription: "When turned on, detailed error information will be shared with Calckey when a problem occurs, helping to improve the quality of Misskey.\nThis will include information such the version of your OS, what browser you're using, your activity in Calckey, etc."
 myTheme: "My theme"
 backgroundColor: "Background color"
 accentColor: "Accent color"
@@ -1036,7 +1036,7 @@ _registry:
   keys: "Keys"
   domain: "Domain"
   createKey: "Create key"
-_aboutCalckey:
+_aboutMisskey:
   about: "Calckey is a fork of Misskey made by ThatOneCalculator, which has been in development since 2022."
   contributors: "Main contributors"
   allContributors: "All contributors"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index a10480415..1d35c878c 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Español"
-headlineCalckey: "Red conectada por notas"
-introCalckey: "¡Bienvenido/a! Calckey es un servicio de microblogging descentralizado de código abierto.\nEscribe \"notas\" para compartir lo que te ocurre ahora o para contar sobre ti a todos 📡\nCon la función de \"reacciones\", puedes también añadir una reacción rápida a las notas de todos 👍\n¡Exploremos juntos un nuevo mundo! 🚀"
+headlineMisskey: "Red conectada por notas"
+introMisskey: "¡Bienvenido/a! Misskey es un servicio de microblogging descentralizado de código abierto.\nEscribe \"notas\" para compartir lo que te ocurre ahora o para contar sobre ti a todos 📡\nCon la función de \"reacciones\", puedes también añadir una reacción rápida a las notas de todos 👍\n¡Exploremos juntos un nuevo mundo! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Buscar"
 notifications: "Notificaciones"
@@ -139,7 +139,7 @@ settingGuide: "Configuración sugerida"
 cacheRemoteFiles: "Mantener en cache los archivos remotos"
 cacheRemoteFilesDescription: "Si desactiva esta configuración, Los archivos remotos se cargarán desde el link directo sin usar la caché. Con eso se puede ahorrar almacenamiento del servidor, pero eso aumentará el tráfico al no crear miniaturas."
 flagAsBot: "Esta cuenta es un bot"
-flagAsBotDescription: "En caso de que esta cuenta fuera usada por un programa, active esta opción. Al hacerlo, esta opción servirá para otros desarrolladores para evitar cadenas infinitas de reacciones, y ajustará los sistemas internos de Calckey para que trate a esta cuenta como un bot."
+flagAsBotDescription: "En caso de que esta cuenta fuera usada por un programa, active esta opción. Al hacerlo, esta opción servirá para otros desarrolladores para evitar cadenas infinitas de reacciones, y ajustará los sistemas internos de Misskey para que trate a esta cuenta como un bot."
 flagAsCat: "Esta cuenta es un gato"
 flagAsCatDescription: "En caso de que declare que esta cuenta es de un gato, active esta opción."
 flagShowTimelineReplies: "Mostrar respuestas a las notas en la biografía"
@@ -199,7 +199,7 @@ noUsers: "No hay usuarios"
 editProfile: "Editar perfil"
 noteDeleteConfirm: "¿Desea borrar esta nota?"
 pinLimitExceeded: "Ya no se pueden fijar más posts"
-intro: "¡La instalación de Calckey ha terminado! Crea el usuario administrador."
+intro: "¡La instalación de Misskey ha terminado! Crea el usuario administrador."
 done: "Terminado"
 processing: "Procesando"
 preview: "Vista previa"
@@ -378,7 +378,7 @@ exploreFediverse: "Explorar fediverso"
 popularTags: "Etiquetas populares"
 userList: "Lista"
 about: "Información"
-aboutCalckey: "Sobre Calckey"
+aboutMisskey: "Sobre Misskey"
 administrator: "Administrador"
 token: "Token"
 twoStepAuthentication: "Autenticación de dos factores"
@@ -524,7 +524,7 @@ sort: "Ordenar"
 ascendingOrder: "Ascendente"
 descendingOrder: "Descendente"
 scratchpad: "Scratch pad"
-scratchpadDescription: "Scratchpad proporciona un entorno experimental para AiScript. Puede escribir, ejecutar y verificar los resultados que interactúan con Calckey."
+scratchpadDescription: "Scratchpad proporciona un entorno experimental para AiScript. Puede escribir, ejecutar y verificar los resultados que interactúan con Misskey."
 output: "Salida"
 script: "Script"
 disablePagesScript: "Deshabilitar AiScript en Páginas"
@@ -700,7 +700,7 @@ onlineUsersCount: "{n} usuarios en línea"
 nUsers: "{n} Usuarios"
 nNotes: "{n} Notas"
 sendErrorReports: "Envíar informe de errores"
-sendErrorReportsDescription: "Si habilita esta opción, ayudará a mejorar la calidad de Calckey compartiendo información detallada sobre los errores cuando se produzca un problema.\nEsto incluye información como la versión de su sistema operativo, el tipo de navegador que utiliza, su historial de actividad, etc."
+sendErrorReportsDescription: "Si habilita esta opción, ayudará a mejorar la calidad de Misskey compartiendo información detallada sobre los errores cuando se produzca un problema.\nEsto incluye información como la versión de su sistema operativo, el tipo de navegador que utiliza, su historial de actividad, etc."
 myTheme: "Mi Tema"
 backgroundColor: "Fondo"
 accentColor: "Acento"
@@ -791,7 +791,7 @@ hashtags: "Hashtag"
 troubleshooting: "Solución de problemas"
 useBlurEffect: "Utilizar efecto de desenfoque en la interfaz de usuario"
 learnMore: "Ver más"
-misskeyUpdated: "¡Calckey ha sido actualizado!"
+misskeyUpdated: "¡Misskey ha sido actualizado!"
 whatIsNew: "Mostrar cambios"
 translate: "Traducir"
 translatedFrom: "Traducido de {x}"
@@ -966,13 +966,13 @@ _registry:
   keys: "Clave"
   domain: "Dominio"
   createKey: "Crear una llave"
-_aboutCalckey:
-  about: "Calckey es un software de código abierto, desarrollado por thatonecalculator desde el 2022"
+_aboutMisskey:
+  about: "Misskey es un software de código abierto, desarrollado por syuilo desde el 2014"
   contributors: "Principales colaboradores"
   allContributors: "Todos los colaboradores"
   source: "Código fuente"
-  translation: "Traducir Calckey"
-  donate: "Donar a Calckey"
+  translation: "Traducir Misskey"
+  donate: "Donar a Misskey"
   morePatrons: "Muchas más personas nos apoyan. Muchas gracias🥰"
   patrons: "Patrocinadores"
 _nsfw:
@@ -981,8 +981,8 @@ _nsfw:
   force: "Ocultar todos los medios"
 _mfm:
   cheatSheet: "Hoja de referencia de MFM"
-  intro: "MFM es un lenguaje de marcado dedicado que se puede usar en varios lugares dentro de Calckey. Aquí puede ver una lista de sintaxis disponibles en MFM."
-  dummy: "Calckey expande el mundo de la Fediverso"
+  intro: "MFM es un lenguaje de marcado dedicado que se puede usar en varios lugares dentro de Misskey. Aquí puede ver una lista de sintaxis disponibles en MFM."
+  dummy: "Misskey expande el mundo de la Fediverso"
   mention: "Menciones"
   mentionDescription: "El signo @ seguido de un nombre de usuario se puede utilizar para notificar a un usuario en particular."
   hashtag: "Hashtag"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 6ce8f0669..2d918b5ad 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Français"
-headlineCalckey: "Réseau relié par des notes"
-introCalckey: "Bienvenue ! Calckey est un service de microblogage décentralisé, libre et ouvert.\nÉcrivez des « notes » et partagez ce qui se passe à l’instant présent, autour de vous avec les autres 📡\nLa fonction « réactions », vous permet également d’ajouter une réaction rapide aux notes des autres utilisateur·rice·s 👍\nExplorons un nouveau monde 🚀"
+headlineMisskey: "Réseau relié par des notes"
+introMisskey: "Bienvenue ! Misskey est un service de microblogage décentralisé, libre et ouvert.\nÉcrivez des « notes » et partagez ce qui se passe à l’instant présent, autour de vous avec les autres 📡\nLa fonction « réactions », vous permet également d’ajouter une réaction rapide aux notes des autres utilisateur·rice·s 👍\nExplorons un nouveau monde 🚀"
 monthAndDay: "{day}/{month}"
 search: "Rechercher"
 notifications: "Notifications"
@@ -139,7 +139,7 @@ settingGuide: "Configuration proposée"
 cacheRemoteFiles: "Mise en cache des fichiers distants"
 cacheRemoteFilesDescription: "Lorsque cette option est désactivée, les fichiers distants sont chargés directement depuis l’instance distante. La désactiver diminuera certes l’utilisation de l’espace de stockage local mais augmentera le trafic réseau puisque les miniatures ne seront plus générées."
 flagAsBot: "Ce compte est un robot"
-flagAsBotDescription: "Si ce compte est géré de manière automatisée, choisissez cette option. Si elle est activée, elle agira comme un marqueur pour les autres développeurs afin d'éviter des chaînes d'interaction sans fin avec d'autres robots et d'ajuster les systèmes internes de Calckey pour traiter ce compte comme un robot."
+flagAsBotDescription: "Si ce compte est géré de manière automatisée, choisissez cette option. Si elle est activée, elle agira comme un marqueur pour les autres développeurs afin d'éviter des chaînes d'interaction sans fin avec d'autres robots et d'ajuster les systèmes internes de Misskey pour traiter ce compte comme un robot."
 flagAsCat: "Ce compte est un chat"
 flagAsCatDescription: "Activer l'option \" Je suis un chat \" pour ce compte."
 flagShowTimelineReplies: "Afficher les réponses dans le fil"
@@ -198,7 +198,7 @@ noUsers: "Il n’y a pas d’utilisateur·rice·s"
 editProfile: "Modifier votre profil"
 noteDeleteConfirm: "Êtes-vous sûr·e de vouloir supprimer cette note ?"
 pinLimitExceeded: "Vous ne pouvez plus épingler d’autres notes."
-intro: "L’installation de Calckey est terminée ! Veuillez créer un compte administrateur."
+intro: "L’installation de Misskey est terminée ! Veuillez créer un compte administrateur."
 done: "Terminé"
 processing: "Traitement en cours"
 preview: "Aperçu"
@@ -375,7 +375,7 @@ exploreFediverse: "Explorer le Fediverse"
 popularTags: "Mots-clés populaires"
 userList: "Listes"
 about: "Informations"
-aboutCalckey: "À propos de Calckey"
+aboutMisskey: "À propos de Misskey"
 administrator: "Administrateur"
 token: "Jeton"
 twoStepAuthentication: "Authentification à deux facteurs"
@@ -519,7 +519,7 @@ sort: "Trier"
 ascendingOrder: "Ascendant"
 descendingOrder: "Descendant"
 scratchpad: "ScratchPad"
-scratchpadDescription: "ScratchPad fournit un environnement expérimental pour AiScript. Vous pouvez vérifier la rédaction de votre code, sa bonne exécution et le résultat de son interaction avec Calckey."
+scratchpadDescription: "ScratchPad fournit un environnement expérimental pour AiScript. Vous pouvez vérifier la rédaction de votre code, sa bonne exécution et le résultat de son interaction avec Misskey."
 output: "Sortie"
 script: "Script"
 disablePagesScript: "Désactiver AiScript sur les Pages"
@@ -690,7 +690,7 @@ onlineUsersCount: "{n} utilisateur(s) en ligne"
 nUsers: "{n} utilisateur·rice·s"
 nNotes: "{n} Notes"
 sendErrorReports: "Envoyer les rapports d’erreur"
-sendErrorReportsDescription: "Si vous activez l'envoi des rapports d'erreur, vous contribuerez à améliorer la qualité de Calckey grâce au partage d'informations détaillées sur les erreurs lorsqu'un problème survient.\nCela inclut des informations telles que la version de votre système d'exploitation, le type de navigateur que vous utilisez, votre historique d'activité, etc."
+sendErrorReportsDescription: "Si vous activez l'envoi des rapports d'erreur, vous contribuerez à améliorer la qualité de Misskey grâce au partage d'informations détaillées sur les erreurs lorsqu'un problème survient.\nCela inclut des informations telles que la version de votre système d'exploitation, le type de navigateur que vous utilisez, votre historique d'activité, etc."
 myTheme: "Mes thèmes"
 backgroundColor: "Arrière-plan"
 accentColor: "Accentuation"
@@ -781,7 +781,7 @@ hashtags: "Hashtags"
 troubleshooting: "Résolution de problèmes"
 useBlurEffect: "Utiliser des effets de flou dans l'interface"
 learnMore: "Plus d'informations"
-misskeyUpdated: "Calckey a été mis à jour !"
+misskeyUpdated: "Misskey a été mis à jour !"
 whatIsNew: "Voir les derniers changements"
 translate: "Traduire"
 translatedFrom: "Traduit depuis {x}"
@@ -892,13 +892,13 @@ _registry:
   keys: "Clé "
   domain: "Domaine"
   createKey: "Créer une clé"
-_aboutCalckey:
-  about: "Calckey est un logiciel libre et ouvert, développé par thatonecalculator depuis 2022."
+_aboutMisskey:
+  about: "Misskey est un logiciel libre et ouvert, développé par syuilo depuis 2014."
   contributors: "Principaux contributeurs"
   allContributors: "Tous les contributeurs"
   source: "Code source"
-  translation: "Traduire Calckey"
-  donate: "Soutenir Calckey"
+  translation: "Traduire Misskey"
+  donate: "Soutenir Misskey"
   morePatrons: "Nous apprécions vraiment le soutien de nombreuses autres personnes non mentionnées ici. Merci à toutes et à tous ! 🥰"
   patrons: "Contributeurs"
 _nsfw:
@@ -907,8 +907,8 @@ _nsfw:
   force: "Cacher tous les médias"
 _mfm:
   cheatSheet: "Antisèche MFM"
-  intro: "MFM est un langage Markdown spécifique utilisable ici et là dans Calckey. Vous pouvez vérifier ici les structures utilisables avec MFM."
-  dummy: "La Fédiverse s'agrandit avec Calckey"
+  intro: "MFM est un langage Markdown spécifique utilisable ici et là dans Misskey. Vous pouvez vérifier ici les structures utilisables avec MFM."
+  dummy: "La Fédiverse s'agrandit avec Misskey"
   mention: "Mentionner"
   mentionDescription: "Vous pouvez afficher un utilisateur spécifique en indiquant une arobase suivie d'un nom d'utilisateur"
   hashtag: "Hashtags"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 45cabfa1a..bb3904e2e 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Bahasa Indonesia"
-headlineCalckey: "Jaringan terhubung melalui catatan"
-introCalckey: "Selamat datang! Calckey adalah perangkat mikroblog tercatu bersifat sumber terbuka.\nMulailah menuliskan catatan, bagikan peristiwa terkini, serta ceritakan segala tentangmu.📡\nTunjukkan juga reaksimu pada catatan pengguna lain.👍\nMari jelajahi dunia baru🚀"
+headlineMisskey: "Jaringan terhubung melalui catatan"
+introMisskey: "Selamat datang! Misskey adalah perangkat mikroblog tercatu bersifat sumber terbuka.\nMulailah menuliskan catatan, bagikan peristiwa terkini, serta ceritakan segala tentangmu.📡\nTunjukkan juga reaksimu pada catatan pengguna lain.👍\nMari jelajahi dunia baru🚀"
 monthAndDay: "{day} {month}"
 search: "Penelusuran"
 notifications: "Pemberitahuan"
@@ -139,7 +139,7 @@ settingGuide: "Pengaturan rekomendasi"
 cacheRemoteFiles: "Tembolokkan berkas remote"
 cacheRemoteFilesDescription: "Ketika pengaturan ini dinonaktifkan, berkas luar akan dimuat langsung dari instansi luar. Menonaktifkan ini akan mengurangi penggunaan penyimpanan, namun dapat menyebabkan meningkatkan lalu lintas bandwidth, karena thumbnail tidak dihasilkan."
 flagAsBot: "Atur akun ini sebagai Bot"
-flagAsBotDescription: "Jika akun ini dikendalikan oleh program, tetapkanlah opsi ini. Jika diaktifkan, ini akan berfungsi sebagai tanda bagi pengembang lain untuk mencegah interaksi berantai dengan bot lain dan menyesuaikan sistem internal Calckey untuk memperlakukan akun ini sebagai bot."
+flagAsBotDescription: "Jika akun ini dikendalikan oleh program, tetapkanlah opsi ini. Jika diaktifkan, ini akan berfungsi sebagai tanda bagi pengembang lain untuk mencegah interaksi berantai dengan bot lain dan menyesuaikan sistem internal Misskey untuk memperlakukan akun ini sebagai bot."
 flagAsCat: "Atur akun ini sebagai kucing"
 flagAsCatDescription: "Nyalakan tanda ini untuk menandai akun ini sebagai kucing."
 flagShowTimelineReplies: "Tampilkan balasan di linimasa"
@@ -199,7 +199,7 @@ noUsers: "Tidak ada pengguna"
 editProfile: "Sunting profil"
 noteDeleteConfirm: "Apakah kamu yakin ingin menghapus catatan ini?"
 pinLimitExceeded: "Kamu tidak dapat menyematkan catatan lagi"
-intro: "Instalasi Calckey telah selesai! Mohon untuk membuat pengguna admin."
+intro: "Instalasi Misskey telah selesai! Mohon untuk membuat pengguna admin."
 done: "Selesai"
 processing: "Memproses"
 preview: "Pratinjau"
@@ -377,7 +377,7 @@ exploreFediverse: "Jelajahi Fediverse"
 popularTags: "Tag populer"
 userList: "Daftar"
 about: "Informasi"
-aboutCalckey: "Tentang Calckey"
+aboutMisskey: "Tentang Misskey"
 administrator: "Admin"
 token: "Token"
 twoStepAuthentication: "Otentikasi dua faktor"
@@ -522,7 +522,7 @@ sort: "Urutkan"
 ascendingOrder: "Urutkan naik"
 descendingOrder: "Urutkan menurun"
 scratchpad: "Scratchpad"
-scratchpadDescription: "Scratchpad menyediakan lingkungan eksperimen untuk AiScript. Kamu  bisa menulis, mengeksuksi, serta mengecek hasil yang berinteraksi dengan Calckey."
+scratchpadDescription: "Scratchpad menyediakan lingkungan eksperimen untuk AiScript. Kamu  bisa menulis, mengeksuksi, serta mengecek hasil yang berinteraksi dengan Misskey."
 output: "Keluaran"
 script: "Script"
 disablePagesScript: "Nonaktifkan script pada halaman"
@@ -697,7 +697,7 @@ onlineUsersCount: "{n} orang sedang daring"
 nUsers: "{n} Pengguna"
 nNotes: "{n} Catatan"
 sendErrorReports: "Kirim laporan kesalahan"
-sendErrorReportsDescription: "Ketika dinyalakan, informasi kesalahan rinci akan dibagikan dengan Calckey ketika masalah terjadi, hal ini untuk membantu kualitas Calckey. Fitur ini memungkinkan memuat informasi seperti sistem operasi yang kamu gunakan dan versinya, aplikasi peramban yang kamu gunakan, riwayat aktivitas kamu, dll."
+sendErrorReportsDescription: "Ketika dinyalakan, informasi kesalahan rinci akan dibagikan dengan Misskey ketika masalah terjadi, hal ini untuk membantu kualitas Misskey. Fitur ini memungkinkan memuat informasi seperti sistem operasi yang kamu gunakan dan versinya, aplikasi peramban yang kamu gunakan, riwayat aktivitas kamu, dll."
 myTheme: "Tema saya"
 backgroundColor: "Latar Belakang"
 accentColor: "Aksen"
@@ -788,7 +788,7 @@ hashtags: "Tagar"
 troubleshooting: "Penyelesaian Masalah"
 useBlurEffect: "Gunakan efek blur pada antarmuka"
 learnMore: "Pelajari lebih lanjut"
-misskeyUpdated: "Calckey telah dimutakhirkan!"
+misskeyUpdated: "Misskey telah dimutakhirkan!"
 whatIsNew: "Lihat perubahan pemutakhiran"
 translate: "Terjemahkan"
 translatedFrom: "Terjemahkan dari {x}"
@@ -901,13 +901,13 @@ _registry:
   keys: "Kunci"
   domain: "Domain"
   createKey: "Buat kunci"
-_aboutCalckey:
-  about: "Calckey adalah perangkat lunak sumber terbuka yang sedang dikembangkan oleh thatonecalculator sejak 2022."
+_aboutMisskey:
+  about: "Misskey adalah perangkat lunak sumber terbuka yang sedang dikembangkan oleh syuilo sejak 2014."
   contributors: "Kontributor utama"
   allContributors: "Seluruh kontributor"
   source: "Sumber kode"
-  translation: "Terjemahkan Calckey"
-  donate: "Donasi ke Calckey"
+  translation: "Terjemahkan Misskey"
+  donate: "Donasi ke Misskey"
   morePatrons: "Kami sangat mengapresiasi dukungan dari banyak penolong lain yang tidak tercantum disini. Terima kasih! 🥰"
   patrons: "Pendukung"
 _nsfw:
@@ -916,8 +916,8 @@ _nsfw:
   force: "Sembunyikan semua media"
 _mfm:
   cheatSheet: "Contekan MFM"
-  intro: "MFM adalah Calckey-exclusive Markup Language yang dapat digunakan di banyak tempat. Berikut kamu bisa melihat daftar dari syntax MFM yang ada."
-  dummy: "Calckey membentangkan dunia Fediverse"
+  intro: "MFM adalah Misskey-exclusive Markup Language yang dapat digunakan di banyak tempat. Berikut kamu bisa melihat daftar dari syntax MFM yang ada."
+  dummy: "Misskey membentangkan dunia Fediverse"
   mention: "Sebut"
   mentionDescription: "Kamu dapat menentukan pengguna tertentu dengan menggunakan simbol-At dan nama engguna mereka."
   hashtag: "Tagar"
@@ -1113,7 +1113,7 @@ _time:
   hour: "jam"
   day: "hari"
 _tutorial:
-  title: "Cara menggunakan Calckey"
+  title: "Cara menggunakan Misskey"
   step1_1: "Selamat datang!"
   step1_2: "Halaman ini disebut \"linimasa\". Halaman ini menampilkan \"catatan\" yang diurutkan secara kronologis dari orang-orang yang kamu \"ikuti\"."
   step1_3: "Linimasa kamu kosong, karena kamu belum mencatat catatan apapun atau mengikuti siapapun."
@@ -1132,8 +1132,8 @@ _tutorial:
   step6_1: "Sekarang kamu dapat melihat catatan pengguna lain pada linimasamu."
   step6_2: "Kamu juga bisa memberikan \"reaksi\" ke catatan orang lain untuk merespon dengan cepat."
   step6_3: "Untuk memberikan \"reaksi\", tekan tanda \"+\" pada catatan pengguna lain dan pilih emoji yang kamu suka untuk memberikan reaksimu kepada mereka."
-  step7_1: "Yay, Selamat! Kamu sudah menyelesaikan tutorial dasar Calckey."
-  step7_2: "Jika kamu ingin mempelajari lebih lanjut tentang Calckey, cobalah berkunjung ke bagian {help}."
+  step7_1: "Yay, Selamat! Kamu sudah menyelesaikan tutorial dasar Misskey."
+  step7_2: "Jika kamu ingin mempelajari lebih lanjut tentang Misskey, cobalah berkunjung ke bagian {help}."
   step7_3: "Semoga berhasil dan bersenang-senanglah! 🚀"
 _2fa:
   alreadyRegistered: "Kamu telah mendaftarkan perangkat otentikasi dua faktor."
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 45fd942c9..185d12d5a 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Italiano"
-headlineCalckey: "Rete collegata tramite note"
-introCalckey: "Benvenut@! Calckey è un servizio di microblogging decentralizzato, libero e aperto. \nScrivi \"note\" per condividere ciò che sta succedendo adesso o per dire a tutti qualcosa di te. 📡\nGrazie alla funzione \"reazioni\" puoi anche mandare reazioni rapide alle note delle altre persone del Fediverso. 👍\nEsplora un nuovo mondo! 🚀"
+headlineMisskey: "Rete collegata tramite note"
+introMisskey: "Benvenut@! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \nScrivi \"note\" per condividere ciò che sta succedendo adesso o per dire a tutti qualcosa di te. 📡\nGrazie alla funzione \"reazioni\" puoi anche mandare reazioni rapide alle note delle altre persone del Fediverso. 👍\nEsplora un nuovo mondo! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Cerca"
 notifications: "Notifiche"
@@ -139,7 +139,7 @@ settingGuide: "Configurazione suggerita"
 cacheRemoteFiles: "Memorizzazione nella cache dei file remoti"
 cacheRemoteFilesDescription: "Disabilitando questa opzione, i file remoti verranno linkati direttamente senza essere memorizzati nella cache. Sarà possibile risparmiare spazio di archiviazione sul server, ma il traffico aumenterà in quanto non verranno generate anteprime."
 flagAsBot: "Io sono un robot"
-flagAsBotDescription: "Se l'account esegue principalmente operazioni automatiche, attiva quest'opzione. Quando attivata, opera come un segnalatore per gli altri sviluppatori allo scopo di prevenire catene d’interazione senza fine con altri bot, e di adeguare i sistemi interni di Calckey perché trattino questo account come un bot."
+flagAsBotDescription: "Se l'account esegue principalmente operazioni automatiche, attiva quest'opzione. Quando attivata, opera come un segnalatore per gli altri sviluppatori allo scopo di prevenire catene d’interazione senza fine con altri bot, e di adeguare i sistemi interni di Misskey perché trattino questo account come un bot."
 flagAsCat: "Io sono un gatto"
 flagAsCatDescription: "Abilita l'opzione \"Io sono un gatto\" per l'account."
 autoAcceptFollowed: "Accetta automaticamente le richieste di follow da utenti che già segui"
@@ -197,7 +197,7 @@ noUsers: "Nessun utente trovato"
 editProfile: "Modifica profilo"
 noteDeleteConfirm: "Eliminare questo Nota?"
 pinLimitExceeded: "Non puoi fissare altre note "
-intro: "L'installazione di Calckey è finita! Si prega di creare un account amministratore."
+intro: "L'installazione di Misskey è finita! Si prega di creare un account amministratore."
 done: "Fine"
 processing: "In elaborazione"
 preview: "Anteprima"
@@ -373,7 +373,7 @@ exploreFediverse: "Esplora il Fediverso"
 popularTags: "Tag di tendenza"
 userList: "Liste"
 about: "Informazioni"
-aboutCalckey: "Informazioni di Calckey"
+aboutMisskey: "Informazioni di Misskey"
 administrator: "Amministratore"
 token: "Token"
 twoStepAuthentication: "Autenticazione a due fattori"
@@ -518,7 +518,7 @@ sort: "Ordina per"
 ascendingOrder: "Ascendente"
 descendingOrder: "Discendente"
 scratchpad: "ScratchPad"
-scratchpadDescription: "Lo Scratchpad offre un ambiente per esperimenti di AiScript. È possibile scrivere, eseguire e confermare i risultati dell'interazione del codice con Calckey."
+scratchpadDescription: "Lo Scratchpad offre un ambiente per esperimenti di AiScript. È possibile scrivere, eseguire e confermare i risultati dell'interazione del codice con Misskey."
 output: "Uscita"
 script: "Script"
 disablePagesScript: "Disabilita AiScript nelle pagine"
@@ -686,7 +686,7 @@ onlineUsersCount: "{n} utenti online"
 nUsers: "{n} utenti"
 nNotes: "{n}Note"
 sendErrorReports: "Invia segnalazioni di errori"
-sendErrorReportsDescription: "Quando abilitato, se si verifica un problema, informazioni dettagliate sugli errori verranno condivise con Calckey in modo da aiutare a migliorare la qualità del software.\nCiò include informazioni come la versione del sistema operativo, il tipo di navigatore web che usi, la cronologia delle attività, ecc."
+sendErrorReportsDescription: "Quando abilitato, se si verifica un problema, informazioni dettagliate sugli errori verranno condivise con Misskey in modo da aiutare a migliorare la qualità del software.\nCiò include informazioni come la versione del sistema operativo, il tipo di navigatore web che usi, la cronologia delle attività, ecc."
 myTheme: "I miei temi"
 backgroundColor: "Sfondo"
 textColor: "Testo"
@@ -773,7 +773,7 @@ hashtags: "Hashtag"
 troubleshooting: "Risoluzione problemi"
 useBlurEffect: "Utilizza effetto sfocatura per l'interfaccia utente"
 learnMore: "Più dettagli"
-misskeyUpdated: "Calckey è stato aggiornato!"
+misskeyUpdated: "Misskey è stato aggiornato!"
 whatIsNew: "Visualizza le informazioni sull'aggiornamento"
 translate: "Traduzione"
 translatedFrom: "Tradotto da {x}"
@@ -860,13 +860,13 @@ _registry:
   keys: "Dati"
   domain: "Dominio"
   createKey: "Crea chiave"
-_aboutCalckey:
-  about: "Calckey è un software libero e open source, sviluppato da thatonecalculator dal 2022."
+_aboutMisskey:
+  about: "Misskey è un software libero e open source, sviluppato da syuilo dal 2014."
   contributors: "Principali sostenitori"
   allContributors: "Tutti i sostenitori"
   source: "Codice sorgente"
-  translation: "Tradurre Calckey"
-  donate: "Sostieni Calckey"
+  translation: "Tradurre Misskey"
+  donate: "Sostieni Misskey"
   morePatrons: "Apprezziamo sinceramente il supporto di tante altre persone. Grazie mille! 🥰"
   patrons: "Sostenitori"
 _nsfw:
@@ -875,8 +875,8 @@ _nsfw:
   force: "Nascondere tutti i media"
 _mfm:
   cheatSheet: "Bigliettino MFM"
-  intro: "MFM è un linguaggio Markdown particolare che si può usare in diverse parti di Calckey. Qui puoi visualizzare a colpo d'occhio tutta la sintassi MFM utile."
-  dummy: "Il Fediverso si espande con Calckey"
+  intro: "MFM è un linguaggio Markdown particolare che si può usare in diverse parti di Misskey. Qui puoi visualizzare a colpo d'occhio tutta la sintassi MFM utile."
+  dummy: "Il Fediverso si espande con Misskey"
   mention: "Menzioni"
   mentionDescription: "Si può menzionare un utente specifico digitando il suo nome utente subito dopo il segno @."
   hashtag: "Hashtag"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 9a757133d..5bd06f23e 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "日本語"
-headlineCalckey: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム🚀"
-introCalckey: "ようこそ！Calckeyは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しましょう📡\n「リアクション」機能で、皆の投稿に素早く反応を追加できます👍\n新しい世界を探検しよう🚀"
+headlineMisskey: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム🚀"
+introMisskey: "ようこそ！Calckeyは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しましょう📡\n「リアクション」機能で、皆の投稿に素早く反応を追加できます👍\n新しい世界を探検しよう🚀"
 monthAndDay: "{month}月 {day}日"
 search: "検索"
 notifications: "通知"
@@ -390,7 +390,7 @@ exploreFediverse: "Fediverseを探索"
 popularTags: "人気のタグ"
 userList: "リスト"
 about: "情報"
-aboutCalckey: "Calckeyについて"
+aboutMisskey: "Calckeyについて"
 administrator: "管理者"
 token: "トークン"
 twoStepAuthentication: "二段階認証"
@@ -1033,7 +1033,7 @@ _registry:
   keys: "キー"
   domain: "ドメイン"
   createKey: "キーを作成"
-_aboutCalckey:
+_aboutMisskey:
   about: "Calckeyは、2022年に生まれたThatOneCalculatorによるMisskeyのforkです。"
   contributors: "主なコントリビューター"
   allContributors: "全てのコントリビューター"
@@ -1048,7 +1048,7 @@ _nsfw:
   force: "常にメディアを隠す"
 _mfm:
   cheatSheet: "MFMチートシート"
-  intro: "MFMは、CalckeyやCalckey、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
+  intro: "MFMは、MisskeyやCalckey、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
   dummy: "CalckeyでFediverseの世界が広がります"
   mention: "メンション"
   mentionDescription: "アットマーク + ユーザー名で、特定のユーザーを示せます。"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index fe867e08d..d5c48276f 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "日本語 (関西弁)"
-headlineCalckey: "ノートでつながるネットワーク"
-introCalckey: "ようお越し！Calckeyは、オープンソースの分散型マイクロブログサービスやねん。\n「ノート」を作って、いま起こっとることを共有したり、あんたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素早く反応を追加したりもできるで✌\nほな新しい世界を探検しよか🚀"
+headlineMisskey: "ノートでつながるネットワーク"
+introMisskey: "ようお越し！Misskeyは、オープンソースの分散型マイクロブログサービスやねん。\n「ノート」を作って、いま起こっとることを共有したり、あんたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素早く反応を追加したりもできるで✌\nほな新しい世界を探検しよか🚀"
 monthAndDay: "{month}月 {day}日"
 search: "探す"
 notifications: "通知"
@@ -139,7 +139,7 @@ settingGuide: "ええ感じの設定"
 cacheRemoteFiles: "リモートのファイルをキャッシュする"
 cacheRemoteFilesDescription: "この設定を切っとくと、リモートファイルをキャッシュせず直リンクするようになるで。サーバーの容量は節約できるけど、サムネイルが作られんくなるから通信量が増えるで。"
 flagAsBot: "Botやで"
-flagAsBotDescription: "もしこのアカウントがプログラムによって運用されるんやったら、このフラグをオンにしてたのむで。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Calckeyのシステム上での扱いがBotに合ったもんになるんやで。"
+flagAsBotDescription: "もしこのアカウントがプログラムによって運用されるんやったら、このフラグをオンにしてたのむで。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Misskeyのシステム上での扱いがBotに合ったもんになるんやで。"
 flagAsCat: "Catやで"
 flagAsCatDescription: "ワレ、猫ちゃんならこのフラグをつけてみ？"
 flagShowTimelineReplies: "It will display the reply to the note in the timeline. "
@@ -199,7 +199,7 @@ noUsers: "ユーザーはおらへん"
 editProfile: "プロフィールをいじる"
 noteDeleteConfirm: "このノートを削除しまっか？"
 pinLimitExceeded: "これ以上ピン留めできひん"
-intro: "Calckeyのインストールが完了してん！管理者アカウントを作ってや。"
+intro: "Misskeyのインストールが完了してん！管理者アカウントを作ってや。"
 done: "でけた"
 processing: "処理しとる"
 preview: "プレビュー"
@@ -378,7 +378,7 @@ exploreFediverse: "Fediverseを探ってみる"
 popularTags: "人気のタグ"
 userList: "リスト"
 about: "情報"
-aboutCalckey: "Calckeyってなんや？"
+aboutMisskey: "Misskeyってなんや？"
 administrator: "管理者"
 token: "トークン"
 twoStepAuthentication: "二段階認証"
@@ -524,7 +524,7 @@ sort: "仕分ける"
 ascendingOrder: "小さい順"
 descendingOrder: "大きい順"
 scratchpad: "スクラッチパッド"
-scratchpadDescription: "スクラッチパッドではAiScriptを色々試すことができるんや。Calckeyに対して色々できるコードを書いて動かしてみたり、結果を見たりできるで。"
+scratchpadDescription: "スクラッチパッドではAiScriptを色々試すことができるんや。Misskeyに対して色々できるコードを書いて動かしてみたり、結果を見たりできるで。"
 output: "出力"
 script: "スクリプト"
 disablePagesScript: "Pagesのスクリプトを無効にしてや"
@@ -699,7 +699,7 @@ onlineUsersCount: "{n}人が起きとるで"
 nUsers: "{n}ユーザー"
 nNotes: "{n}ノート"
 sendErrorReports: "エラーリポートを送る"
-sendErrorReportsDescription: "オンにしたら、なんか変なことが起きたときにエラーの詳細がCalckeyに共有されて、ソフトウェアの品質向上に役立てられるんや。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれるで。"
+sendErrorReportsDescription: "オンにしたら、なんか変なことが起きたときにエラーの詳細がMisskeyに共有されて、ソフトウェアの品質向上に役立てられるんや。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれるで。"
 myTheme: "マイテーマ"
 backgroundColor: "背景"
 accentColor: "アクセント"
@@ -790,7 +790,7 @@ hashtags: "ハッシュタグ"
 troubleshooting: "トラブルシューティング"
 useBlurEffect: "UIにぼかし効果を使うで"
 learnMore: "詳しく"
-misskeyUpdated: "Calckeyが更新されたで！\nモデレーターの人らに感謝せなあかんで"
+misskeyUpdated: "Misskeyが更新されたで！\nモデレーターの人らに感謝せなあかんで"
 whatIsNew: "更新情報を見るで"
 translate: "翻訳"
 translatedFrom: "{x}から翻訳するで"
@@ -868,13 +868,13 @@ _registry:
   keys: "キー"
   domain: "ドメイン"
   createKey: "キーを作る"
-_aboutCalckey:
-  about: "Calckeyはthatonecalculatorが2022年からずっと作ってはる、オープンソースなソフトウェアや。"
+_aboutMisskey:
+  about: "Misskeyはsyuiloが2014年からずっと作ってはる、オープンソースなソフトウェアや。"
   contributors: "主な貢献者"
   allContributors: "全ての貢献者"
   source: "ソースコード"
-  translation: "Calckeyを翻訳"
-  donate: "Calckeyに寄付"
+  translation: "Misskeyを翻訳"
+  donate: "Misskeyに寄付"
   morePatrons: "他にもぎょうさんの人からサポートしてもろてんねん。ほんまおおきに🥰"
   patrons: "支援者"
 _mfm:
diff --git a/locales/kn-IN.yml b/locales/kn-IN.yml
index 8ca9e69e7..39b3cbe91 100644
--- a/locales/kn-IN.yml
+++ b/locales/kn-IN.yml
@@ -1,6 +1,6 @@
 ---
 _lang_: "ಕನ್ನಡ"
-introCalckey: "ಸ್ವಾಗತ! Calckey ಓಪನ್ ಸೋರ್ಸ್ ಒಕ್ಕೂಟ ಮೈಕ್ರೋಬ್ಲಾಗಿಂಗ್ ಸೇವೆಯಾಗಿದೆ.\n ಏನಾಗುತ್ತಿದೆ ಎಂಬುದನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಥವಾ ನಿಮ್ಮ ಬಗ್ಗೆ ಎಲ್ಲರಿಗೂ ಹೇಳಲು \"ಟಿಪ್ಪಣಿ\"ಗಳನ್ನು ರಚಿಸಿ📡\n \"ಸ್ಪಂದನೆ\" ಕ್ರಿಯೆಯೊಂದಿಗೆ, ನೀವು ಎಲ್ಲರ ಟಿಪ್ಪಣಿಗಳಿಗೆ ತ್ವರಿತವಾಗಿ ಸ್ಪಂದನೆಗಳನ್ನು ಕೂಡ ಸೇರಿಸಬಹುದು.👍\n ಹೊಸ ಜಗತ್ತನ್ನು ಅನ್ವೇಷಿಸಿ🚀"
+introMisskey: "ಸ್ವಾಗತ! Misskey ಓಪನ್ ಸೋರ್ಸ್ ಒಕ್ಕೂಟ ಮೈಕ್ರೋಬ್ಲಾಗಿಂಗ್ ಸೇವೆಯಾಗಿದೆ.\n ಏನಾಗುತ್ತಿದೆ ಎಂಬುದನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಥವಾ ನಿಮ್ಮ ಬಗ್ಗೆ ಎಲ್ಲರಿಗೂ ಹೇಳಲು \"ಟಿಪ್ಪಣಿ\"ಗಳನ್ನು ರಚಿಸಿ📡\n \"ಸ್ಪಂದನೆ\" ಕ್ರಿಯೆಯೊಂದಿಗೆ, ನೀವು ಎಲ್ಲರ ಟಿಪ್ಪಣಿಗಳಿಗೆ ತ್ವರಿತವಾಗಿ ಸ್ಪಂದನೆಗಳನ್ನು ಕೂಡ ಸೇರಿಸಬಹುದು.👍\n ಹೊಸ ಜಗತ್ತನ್ನು ಅನ್ವೇಷಿಸಿ🚀"
 monthAndDay: "{month}ನೇ ತಿಂಗಳ {day}ನೇ ದಿನ"
 search: "ಹುಡುಕು"
 notifications: "ಅಧಿಸೂಚನೆಗಳು"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index d9b7e1223..b87a4b06c 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "한국어"
-headlineCalckey: "노트로 연결되는 네트워크"
-introCalckey: "환영합니다! Calckey 는 오픈 소스 분산형 마이크로 블로그 서비스입니다.\n\"노트\" 를 작성해서, 지금 일어나고 있는 일을 공유하거나, 당신만의 이야기를 모두에게 발신하세요📡\n\"리액션\" 기능으로, 친구의 노트에 총알같이 반응을 추가할 수도 있습니다👍\n새로운 세계를 탐험해 보세요🚀"
+headlineMisskey: "노트로 연결되는 네트워크"
+introMisskey: "환영합니다! Misskey 는 오픈 소스 분산형 마이크로 블로그 서비스입니다.\n\"노트\" 를 작성해서, 지금 일어나고 있는 일을 공유하거나, 당신만의 이야기를 모두에게 발신하세요📡\n\"리액션\" 기능으로, 친구의 노트에 총알같이 반응을 추가할 수도 있습니다👍\n새로운 세계를 탐험해 보세요🚀"
 monthAndDay: "{month}월 {day}일"
 search: "검색"
 notifications: "알림"
@@ -199,7 +199,7 @@ noUsers: "아무도 없습니다"
 editProfile: "프로필 수정"
 noteDeleteConfirm: "이 노트를 삭제하시겠습니까?"
 pinLimitExceeded: "더 이상 고정할 수 없습니다."
-intro: "Calckey의 설치가 완료되었습니다! 관리자 계정을 생성해주세요."
+intro: "Misskey의 설치가 완료되었습니다! 관리자 계정을 생성해주세요."
 done: "완료"
 processing: "처리중"
 preview: "미리보기"
@@ -378,7 +378,7 @@ exploreFediverse: "연합우주를 탐색"
 popularTags: "인기 태그"
 userList: "리스트"
 about: "정보"
-aboutCalckey: "Calckey에 대하여"
+aboutMisskey: "Misskey에 대하여"
 administrator: "관리자"
 token: "토큰"
 twoStepAuthentication: "2단계 인증"
@@ -524,7 +524,7 @@ sort: "정렬"
 ascendingOrder: "오름차순"
 descendingOrder: "내림차순"
 scratchpad: "스크래치 패드"
-scratchpadDescription: "스크래치 패드는 AiScript 의 테스트 환경을 제공합니다. Calckey 와 상호 작용하는 코드를 작성, 실행 및 결과를 확인할 수 있습니다."
+scratchpadDescription: "스크래치 패드는 AiScript 의 테스트 환경을 제공합니다. Misskey 와 상호 작용하는 코드를 작성, 실행 및 결과를 확인할 수 있습니다."
 output: "출력"
 script: "스크립트"
 disablePagesScript: "Pages 에서 AiScript 를 사용하지 않음"
@@ -700,7 +700,7 @@ onlineUsersCount: "{n}명이 접속 중"
 nUsers: "{n} 유저"
 nNotes: "{n} 노트"
 sendErrorReports: "오류 보고서 보내기"
-sendErrorReportsDescription: "이 설정을 활성화하면, 문제가 발생했을 때 오류에 대한 상세 정보를 Calckey에 보내어 더 나은 소프트웨어를 만드는 데에 도움을 줄 수 있습니다."
+sendErrorReportsDescription: "이 설정을 활성화하면, 문제가 발생했을 때 오류에 대한 상세 정보를 Misskey에 보내어 더 나은 소프트웨어를 만드는 데에 도움을 줄 수 있습니다."
 myTheme: "내 테마"
 backgroundColor: "배경 색"
 accentColor: "강조 색상"
@@ -791,7 +791,7 @@ hashtags: "해시태그"
 troubleshooting: "문제 해결"
 useBlurEffect: "UI에 흐림 효과 사용"
 learnMore: "자세히"
-misskeyUpdated: "Calckey가 업데이트 되었습니다!"
+misskeyUpdated: "Misskey가 업데이트 되었습니다!"
 whatIsNew: "패치 정보 보기"
 translate: "번역"
 translatedFrom: "{x}에서 번역"
@@ -965,13 +965,13 @@ _registry:
   keys: "키"
   domain: "도메인"
   createKey: "키 생성"
-_aboutCalckey:
-  about: "Calckey는 thatonecalculator에 의해서 2022년부터 개발되어 온 오픈소스 소프트웨어 입니다."
+_aboutMisskey:
+  about: "Misskey는 syuilo에 의해서 2014년부터 개발되어 온 오픈소스 소프트웨어 입니다."
   contributors: "주요 기여자"
   allContributors: "모든 기여자"
   source: "소스 코드"
-  translation: "Calckey를 번역하기"
-  donate: "Calckey에 기부하기"
+  translation: "Misskey를 번역하기"
+  donate: "Misskey에 기부하기"
   morePatrons: "이 외에도 다른 많은 분들이 도움을 주시고 계십니다. 감사합니다🥰"
   patrons: "후원자"
 _nsfw:
@@ -980,8 +980,8 @@ _nsfw:
   force: "미디어 항상 숨기기"
 _mfm:
   cheatSheet: "MFM 도움말"
-  intro: "MFM는 Calckey의 다양한 곳에서 사용할 수 있는 전용 마크업 언어입니다. 여기에서는 MFM에서 사용할 수 있는 구문을 확인할 수 있습니다."
-  dummy: "Calckey로 연합우주의 세계가 펼쳐집니다"
+  intro: "MFM는 Misskey의 다양한 곳에서 사용할 수 있는 전용 마크업 언어입니다. 여기에서는 MFM에서 사용할 수 있는 구문을 확인할 수 있습니다."
+  dummy: "Misskey로 연합우주의 세계가 펼쳐집니다"
   mention: "멘션"
   mentionDescription: "골뱅이표(@) 뒤에 사용자명을 넣어 특정 유저를 나타낼 수 있습니다."
   hashtag: "해시태그"
diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index 963b24caf..7a0580f2d 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Nederlands"
-headlineCalckey: "Netwerk verbonden door notities"
-introCalckey: "Welkom! Calckey is een open source, gedecentraliseerde microblogdienst.\nMaak \"notities\" om je gedachten te delen met iedereen om je heen. 📡\nMet \"reacties\" kun je ook snel je mening geven over berichten van anderen. 👍\nLaten we een nieuwe wereld verkennen! 🚀"
+headlineMisskey: "Netwerk verbonden door notities"
+introMisskey: "Welkom! Misskey is een open source, gedecentraliseerde microblogdienst.\nMaak \"notities\" om je gedachten te delen met iedereen om je heen. 📡\nMet \"reacties\" kun je ook snel je mening geven over berichten van anderen. 👍\nLaten we een nieuwe wereld verkennen! 🚀"
 monthAndDay: "{day} {month}"
 search: "Zoeken"
 notifications: "Meldingen"
@@ -123,7 +123,7 @@ unblockConfirm: "Ben je zeker dat je deze account wil blokkeren?"
 suspendConfirm: "Ben je zeker dat je deze account wil suspenderen?"
 unsuspendConfirm: "Ben je zeker dat je deze account wil opnieuw aanstellen?"
 flagAsBot: "Markeer dit account als een robot."
-flagAsBotDescription: "Als dit account van een programma wordt beheerd, zet deze vlag aan. Het aanzetten helpt andere ontwikkelaars om bijvoorbeeld onbedoelde feedback loops te doorbreken of om Calckey meer geschikt te maken."
+flagAsBotDescription: "Als dit account van een programma wordt beheerd, zet deze vlag aan. Het aanzetten helpt andere ontwikkelaars om bijvoorbeeld onbedoelde feedback loops te doorbreken of om Misskey meer geschikt te maken."
 flagAsCat: "Markeer dit account als een kat."
 flagAsCatDescription: "Zet deze vlag aan als je wilt aangeven dat dit account een kat is."
 flagShowTimelineReplies: "Toon antwoorden op de tijdlijn."
@@ -183,7 +183,7 @@ noUsers: "Er zijn geen gebruikers."
 editProfile: "Bewerk Profiel"
 noteDeleteConfirm: "Ben je zeker dat je dit bericht wil verwijderen?"
 pinLimitExceeded: "Je kunt geen berichten meer vastprikken"
-intro: "Installatie van Calckey geëindigd! Maak nu een beheerder aan."
+intro: "Installatie van Misskey geëindigd! Maak nu een beheerder aan."
 done: "Klaar"
 processing: "Bezig met verwerken"
 preview: "Voorbeeld"
@@ -280,7 +280,7 @@ disconnectedFromServer: "Verbinding met de server onderbroken."
 inMb: "in megabytes"
 pinnedNotes: "Vastgemaakte notitie"
 userList: "Lijsten"
-aboutCalckey: "Over Calckey"
+aboutMisskey: "Over Misskey"
 administrator: "Beheerder"
 token: "Token"
 securityKeyName: "Sleutelnaam"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 952d94050..cc2dfa443 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1,6 +1,6 @@
 _lang_: "Polski"
-headlineCalckey: "Otwartoźródłowa, zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
-introCalckey: "Hej! Calckey to otwartoźródłowa oraz zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
+headlineMisskey: "Otwartoźródłowa, zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
+introMisskey: "Hej! Calckey to otwartoźródłowa oraz zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
 monthAndDay: "{month}-{day}"
 search: "Szukaj"
 notifications: "Powiadomienia"
@@ -374,7 +374,7 @@ exploreFediverse: "Eksploruj Fediwersum"
 popularTags: "Tagi na czasie"
 userList: "Listy"
 about: "Informacje"
-aboutCalckey: "O Calckey"
+aboutMisskey: "O Calckey"
 administrator: "Admin"
 token: "Token"
 twoStepAuthentication: "Uwierzytelnianie dwuskładnikowe"
@@ -918,8 +918,8 @@ _registry:
   keys: "Klucz"
   domain: "Domena"
   createKey: "Utwórz klucz"
-_aboutCalckey:
-  about: "Calckey jest forkiem Calckey utworzonym przez ThatOneCalculator, rozwijanym od 2022."
+_aboutMisskey:
+  about: "Calckey jest forkiem Misskey utworzonym przez ThatOneCalculator, rozwijanym od 2022."
   contributors: "Główni twórcy"
   allContributors: "Wszyscy twórcy"
   source: "Kod źródłowy"
@@ -933,7 +933,7 @@ _nsfw:
   force: "Ukrywaj wszystkie media"
 _mfm:
   cheatSheet: "Ściąga MFM"
-  intro: "MFM jest językiem składniowym używanym przez m.in. Calckey, forki *key (w tym Calckey), oraz Akkomę, który może być użyty w wielu miejscach. Tu znajdziesz listę wszystkich możliwych elementów składni MFM."
+  intro: "MFM jest językiem składniowym używanym przez m.in. Misskey, forki *key (w tym Calckey), oraz Akkomę, który może być użyty w wielu miejscach. Tu znajdziesz listę wszystkich możliwych elementów składni MFM."
   dummy: "Calckey rozszerza świat Fediwersum"
   mention: "Wspomnij"
   mentionDescription: "Używając znaku @ i nazwy użytkownika, możesz określić danego użytkownika."
@@ -1821,7 +1821,7 @@ proxyAccountDescription: Konto proxy jest kontem które w określonych sytuacjac
   użytkownika nie zostanie dostarczona na oś czasu. W takim razie, użytkownika zaobserwuje
   konto proxy.
 objectStorageBaseUrlDesc: "URL stosowany jako odniesienie. Podaj URL twojego CDN, albo proxy, jeśli używasz któregokolwiek.\nDla S3 użyj 'https://<bucket>.s3.amazonaws.com', a dla GCS i jego odpowiedników użyj 'https://storage.googleapis.com/<bucket>', itd."
-sendErrorReportsDescription: "Gdy ta opcja jest włączona, szczegółowe informacje o błędach będą udostępnianie z Calckey gdy wystąpi problem, pomagając w ulepszaniu Calckey.\nZawrze to informacje takie jak wersja twojego systemu operacyjnego, przeglądarki, Twoja aktywność na Calckey itd."
+sendErrorReportsDescription: "Gdy ta opcja jest włączona, szczegółowe informacje o błędach będą udostępnianie z Calckey gdy wystąpi problem, pomagając w ulepszaniu Misskey.\nZawrze to informacje takie jak wersja twojego systemu operacyjnego, przeglądarki, Twoja aktywność na Calckey itd."
 privateModeInfo: Jeśli włączone, tylko dopuszczone instancje będą mogły federować
   z Twoją instancją. Wszystkie posty będą ukryte przed publiką.
 oneHour: Godzina
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index fa0a3eab9..054e845b7 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Português"
-headlineCalckey: "Uma rede ligada por notas"
-introCalckey: "Bem-vindo! Calckey é um serviço de microblogue descentralizado de código aberto.\nCria \"notas\" e partilha o que te ocorre com todos à tua volta. 📡\nCom \"reações\" podes também expressar logo o que sentes às notas de todos. 👍\nExploremos um novo mundo! 🚀"
+headlineMisskey: "Uma rede ligada por notas"
+introMisskey: "Bem-vindo! Misskey é um serviço de microblogue descentralizado de código aberto.\nCria \"notas\" e partilha o que te ocorre com todos à tua volta. 📡\nCom \"reações\" podes também expressar logo o que sentes às notas de todos. 👍\nExploremos um novo mundo! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Buscar"
 notifications: "Notificações"
@@ -139,7 +139,7 @@ settingGuide: "Guia de configuração"
 cacheRemoteFiles: "Memória transitória de arquivos remotos"
 cacheRemoteFilesDescription: "Se você desabilitar essa configuração, os arquivos remotos não serão armazenados em memória transitória e serão vinculados diretamente. Economiza o armazenamento do servidor, mas não gera miniaturas, o que aumenta o tráfego."
 flagAsBot: "Marcar conta como robô"
-flagAsBotDescription: "Se esta conta for operada por um programa, ative este sinalizador. Quando ativado, serve como um sinalizador para evitar o encadeamento de reações para outros programadores, e o manuseio do sistema do Calckey é adequado para ‘bots’."
+flagAsBotDescription: "Se esta conta for operada por um programa, ative este sinalizador. Quando ativado, serve como um sinalizador para evitar o encadeamento de reações para outros programadores, e o manuseio do sistema do Misskey é adequado para ‘bots’."
 flagAsCat: "Marcar conta como gato"
 flagAsCatDescription: "Ative essa opção para marcar essa conta como gato."
 flagShowTimelineReplies: "Mostrar respostas na linha de tempo"
@@ -199,7 +199,7 @@ noUsers: "Sem usuários"
 editProfile: "Editar Perfil"
 noteDeleteConfirm: "Deseja excluir esta nota?"
 pinLimitExceeded: "Não consigo mais fixar"
-intro: "A instalação do Calckey está completa! Crie uma conta de administrador."
+intro: "A instalação do Misskey está completa! Crie uma conta de administrador."
 done: "Concluído"
 processing: "Em Progresso"
 preview: "Pré-visualizar"
@@ -377,7 +377,7 @@ exploreFediverse: "Explorar Fediverse"
 popularTags: "Tags populares"
 userList: "Listas"
 about: "Informações"
-aboutCalckey: "Sobre Calckey"
+aboutMisskey: "Sobre Misskey"
 administrator: "Administrador"
 token: "Símbolo"
 twoStepAuthentication: "Verificação em duas etapas"
diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml
index 6e6f3b12b..8408d4c77 100644
--- a/locales/ro-RO.yml
+++ b/locales/ro-RO.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Română"
-headlineCalckey: "O rețea conectată prin note"
-introCalckey: "Bine ai venit! Calckey este un serviciu de microblogging open source și decentralizat.\nCreează \"note\" cu care să îți poți împărți gândurile cu oricine din jurul tău. 📡\nCu \"reacții\" îți poți expirma rapid părerea despre notele oricui. 👍\nHai să explorăm o lume nouă! 🚀"
+headlineMisskey: "O rețea conectată prin note"
+introMisskey: "Bine ai venit! Misskey este un serviciu de microblogging open source și decentralizat.\nCreează \"note\" cu care să îți poți împărți gândurile cu oricine din jurul tău. 📡\nCu \"reacții\" îți poți expirma rapid părerea despre notele oricui. 👍\nHai să explorăm o lume nouă! 🚀"
 monthAndDay: "{day}/{month}"
 search: "Caută"
 notifications: "Notificări"
@@ -139,7 +139,7 @@ settingGuide: "Setări recomandate"
 cacheRemoteFiles: "Ține fișierele externe in cache"
 cacheRemoteFilesDescription: "Când această setare este dezactivată, fișierele externe sunt încărcate direct din instanța externă. Dezactivarea va scădea utilizarea spațiului de stocare, dar va crește traficul, deoarece thumbnail-urile nu vor fi generate."
 flagAsBot: "Marchează acest cont ca bot"
-flagAsBotDescription: "Activează această opțiune dacă acest cont este controlat de un program. Daca e activată, aceasta va juca rolul unui indicator pentru dezvoltatori pentru a preveni interacțiunea în lanțuri infinite cu ceilalți boți și ajustează sistemele interne al Calckey pentru a trata acest cont drept un bot."
+flagAsBotDescription: "Activează această opțiune dacă acest cont este controlat de un program. Daca e activată, aceasta va juca rolul unui indicator pentru dezvoltatori pentru a preveni interacțiunea în lanțuri infinite cu ceilalți boți și ajustează sistemele interne al Misskey pentru a trata acest cont drept un bot."
 flagAsCat: "Marchează acest cont ca pisică"
 flagAsCatDescription: "Activează această opțiune dacă acest cont este o pisică."
 flagShowTimelineReplies: "Arată răspunsurile în cronologie"
@@ -199,7 +199,7 @@ noUsers: "Niciun utilizator"
 editProfile: "Editează profilul"
 noteDeleteConfirm: "Ești sigur că vrei să ștergi această notă?"
 pinLimitExceeded: "Nu poți mai fixa mai multe note"
-intro: "Calckey s-a instalat! Te rog crează un utilizator admin."
+intro: "Misskey s-a instalat! Te rog crează un utilizator admin."
 done: "Gata"
 processing: "Se procesează"
 preview: "Previzualizare"
@@ -377,7 +377,7 @@ exploreFediverse: "Explorează Fediverse-ul"
 popularTags: "Taguri populare"
 userList: "Liste"
 about: "Despre"
-aboutCalckey: "Despre Calckey"
+aboutMisskey: "Despre Misskey"
 administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Autentificare în doi pași"
@@ -522,7 +522,7 @@ sort: "Sortează"
 ascendingOrder: "Crescător"
 descendingOrder: "Descrescător"
 scratchpad: "Scratchpad"
-scratchpadDescription: "Scratchpad-ul oferă un mediu de experimentare în AiScript. Poți scrie, executa și verifica rezultatele acestuia interacționând cu Calckey în el."
+scratchpadDescription: "Scratchpad-ul oferă un mediu de experimentare în AiScript. Poți scrie, executa și verifica rezultatele acestuia interacționând cu Misskey în el."
 output: "Ieșire"
 script: "Script"
 disablePagesScript: "Dezactivează AiScript în Pagini"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index bb6948827..9d76dc623 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Русский"
-headlineCalckey: "Сеть, сплетённая из заметок"
-introCalckey: "Добро пожаловать! Calckey — это децентрализованный сервис микроблогов с открытым исходным кодом.\nПишите «заметки» — делитесь со всеми происходящим вокруг или рассказывайте о себе 📡\nСтавьте «реакции» — выражайте свои чувства и эмоции от заметок других 👍\nОткройте для себя новый мир 🚀"
+headlineMisskey: "Сеть, сплетённая из заметок"
+introMisskey: "Добро пожаловать! Misskey — это децентрализованный сервис микроблогов с открытым исходным кодом.\nПишите «заметки» — делитесь со всеми происходящим вокруг или рассказывайте о себе 📡\nСтавьте «реакции» — выражайте свои чувства и эмоции от заметок других 👍\nОткройте для себя новый мир 🚀"
 monthAndDay: "{day}.{month}"
 search: "Поиск"
 notifications: "Уведомления"
@@ -139,7 +139,7 @@ settingGuide: "Рекомендуемые настройки"
 cacheRemoteFiles: "Кешировать внешние файлы"
 cacheRemoteFilesDescription: "Когда эта настройка отключена, файлы с других сайтов будут загружаться прямо оттуда. Это сэкономит место на сервере, но увеличит трафик, так как не будут создаваться эскизы."
 flagAsBot: "Аккаунт бота"
-flagAsBotDescription: "Включите, если этот аккаунт управляется программой. Это позволит системе Calckey учитывать это, а также поможет разработчикам других ботов предотвратить бесконечные циклы взаимодействия."
+flagAsBotDescription: "Включите, если этот аккаунт управляется программой. Это позволит системе Misskey учитывать это, а также поможет разработчикам других ботов предотвратить бесконечные циклы взаимодействия."
 flagAsCat: "Аккаунт кота"
 flagAsCatDescription: "Включите, и этот аккаунт будет помечен как кошачий."
 flagShowTimelineReplies: "Показывать ответы на заметки в ленте"
@@ -199,7 +199,7 @@ noUsers: "Нет ни одного пользователя"
 editProfile: "Редактировать профиль"
 noteDeleteConfirm: "Вы хотите удалить эту заметку?"
 pinLimitExceeded: "Нельзя закрепить ещё больше заметок"
-intro: "Установка Calckey завершена! А теперь создайте учетную запись администратора."
+intro: "Установка Misskey завершена! А теперь создайте учетную запись администратора."
 done: "Готово"
 processing: "Обработка"
 preview: "Предпросмотр"
@@ -378,7 +378,7 @@ exploreFediverse: "Исследуйте Fediverse"
 popularTags: "Популярные теги"
 userList: "Списки"
 about: "Описание"
-aboutCalckey: "О Calckey"
+aboutMisskey: "О Misskey"
 administrator: "Администратор"
 token: "Токен"
 twoStepAuthentication: "Двухфакторная аутентификация"
@@ -524,7 +524,7 @@ sort: "Сортировать"
 ascendingOrder: "по возрастанию"
 descendingOrder: "По убыванию"
 scratchpad: "Когтеточка"
-scratchpadDescription: "«Когтеточка» — это место для опытов с AiScript. Здесь можно писать программы, взаимодействующие с Calckey, запускать и смотреть что из этого получается."
+scratchpadDescription: "«Когтеточка» — это место для опытов с AiScript. Здесь можно писать программы, взаимодействующие с Misskey, запускать и смотреть что из этого получается."
 output: "Выходы"
 script: "Скрипт"
 disablePagesScript: "Отключить скрипты на «Страницах»"
@@ -696,7 +696,7 @@ onlineUsersCount: "Пользователей сейчас в сети: {n}"
 nUsers: "Пользователей: {n}"
 nNotes: "Заметок: {n}"
 sendErrorReports: "Посылать отчёты о сбоях"
-sendErrorReportsDescription: "Если включено, когда возникнет какая-нибудь техническая проблема, подробные сведения об этом будут отправлены разработчикам Calckey. Это очень помогает делать программу лучше. В отчёты попадают тип и версия ОС, браузера, журнал действий (что привело к сбою) и тому подобное."
+sendErrorReportsDescription: "Если включено, когда возникнет какая-нибудь техническая проблема, подробные сведения об этом будут отправлены разработчикам Misskey. Это очень помогает делать программу лучше. В отчёты попадают тип и версия ОС, браузера, журнал действий (что привело к сбою) и тому подобное."
 myTheme: "Личная тема"
 backgroundColor: "Фон"
 accentColor: "Акцент"
@@ -787,7 +787,7 @@ hashtags: "Хэштег"
 troubleshooting: "Разрешение проблем"
 useBlurEffect: "Размытие в интерфейсе"
 learnMore: "Подробнее"
-misskeyUpdated: "Calckey обновился!"
+misskeyUpdated: "Misskey обновился!"
 whatIsNew: "Что новенького?"
 translate: "Перевод"
 translatedFrom: "Перевод. Язык оригинала — {x}"
@@ -898,13 +898,13 @@ _registry:
   keys: "Ключ"
   domain: "Домен"
   createKey: "Новый ключ"
-_aboutCalckey:
-  about: "Calckey — программа с открытым исходным кодом, которую разрабатывает thatonecalculator с 2022 года."
+_aboutMisskey:
+  about: "Misskey — программа с открытым исходным кодом, которую разрабатывает syuilo с 2014 года."
   contributors: "Основные соавторы"
   allContributors: "Все соавторы"
   source: "Исходный код"
-  translation: "Перевод Calckey"
-  donate: "Пожертвование на Calckey"
+  translation: "Перевод Misskey"
+  donate: "Пожертвование на Misskey"
   morePatrons: "Большое спасибо и многим другим, кто принял участие в этом проекте! 🥰"
   patrons: "Материальная поддержка"
 _nsfw:
@@ -913,8 +913,8 @@ _nsfw:
   force: "Скрывать вообще все файлы"
 _mfm:
   cheatSheet: "Подсказка по разметке MFM"
-  intro: "MFM — язык оформления текста, который придуман специально для Calckey и готов для применения во многих местах. На этой странице собраны и кратко изложены способы его использовать."
-  dummy: "Calckey расширяет границы Федиверса."
+  intro: "MFM — язык оформления текста, который придуман специально для Misskey и готов для применения во многих местах. На этой странице собраны и кратко изложены способы его использовать."
+  dummy: "Misskey расширяет границы Федиверса."
   mention: "Упоминание"
   mentionDescription: "При помощи знака «собака» перед именем можно упомянуть какого-нибудь пользователя."
   hashtag: "Хэштег"
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index b799f4a39..3f8a4b7b9 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Slovenčina"
-headlineCalckey: "Sieť prepojená poznámkami"
-introCalckey: "Vitajte! Calckey je otvorená a decentralizovaná mikroblogovacia služba.\n\"Poznámkami\" môžete zdieľať svoje myšlienky so všetkými okolo. 📡\nPomocou \"reakcií\" môžete rýchlo vyjadri svoje pocity o každého poznámkach. 👍\nPoďte objavovať svet! 🚀"
+headlineMisskey: "Sieť prepojená poznámkami"
+introMisskey: "Vitajte! Misskey je otvorená a decentralizovaná mikroblogovacia služba.\n\"Poznámkami\" môžete zdieľať svoje myšlienky so všetkými okolo. 📡\nPomocou \"reakcií\" môžete rýchlo vyjadri svoje pocity o každého poznámkach. 👍\nPoďte objavovať svet! 🚀"
 monthAndDay: "{day}. {month}."
 search: "Hľadať"
 notifications: "Oznámenia"
@@ -139,7 +139,7 @@ settingGuide: "Odporúčané nastavenia"
 cacheRemoteFiles: "Cachovanie vzdialených súborov"
 cacheRemoteFilesDescription: "Zakázanie tohoto nastavenia spôsobí, že vzdialené súbory budú odkazované priamo, namiesto ukladania do cache. Ušetrí sa tak miesto na serveri, ale zvýši sa dátový tok, pretože sa negenerujú miniatúry."
 flagAsBot: "Tento účet je bot"
-flagAsBotDescription: "Ak je tento účet ovládaný programom, zaškrtnite túto voľbu. Ostatní uvidia, že je to bot a zabráni nekonečným interakciám s ďalšími botmi a upraví interné systémy Calckey, aby ho považoval za bota."
+flagAsBotDescription: "Ak je tento účet ovládaný programom, zaškrtnite túto voľbu. Ostatní uvidia, že je to bot a zabráni nekonečným interakciám s ďalšími botmi a upraví interné systémy Misskey, aby ho považoval za bota."
 flagAsCat: "Tento účet je mačka"
 flagAsCatDescription: "Zvoľte túto voľbu, aby bol tento účet označený ako mačka."
 flagShowTimelineReplies: "Zobraziť odpovede na poznámky v časovej osi"
@@ -199,7 +199,7 @@ noUsers: "Žiadni používatelia"
 editProfile: "Upraviť profil"
 noteDeleteConfirm: "Naozaj chcete odstrániť túto poznámku?"
 pinLimitExceeded: "Ďalšie poznámky už nemôžete pripnúť."
-intro: "Inštalácia Calckey je dokončená! Prosím vytvorte administrátora."
+intro: "Inštalácia Misskey je dokončená! Prosím vytvorte administrátora."
 done: "Hotovo"
 processing: "Pracujem..."
 preview: "Náhľad"
@@ -378,7 +378,7 @@ exploreFediverse: "Objavovať Fediverzum"
 popularTags: "Populárne značky"
 userList: "Zoznamy"
 about: "Informácie"
-aboutCalckey: "O Calckey"
+aboutMisskey: "O Misskey"
 administrator: "Administrátor"
 token: "Token"
 twoStepAuthentication: "Dvojfaktorová autentifikácia"
@@ -524,7 +524,7 @@ sort: "Zoradiť"
 ascendingOrder: "Vzostupne"
 descendingOrder: "Zostupne"
 scratchpad: "Zápisník"
-scratchpadDescription: "Zápisník poskytuje prostredia pre experimenty s AiScriptom. Môžete písať, spúšťať a skúšať vysledky pri interakcii s Calckey."
+scratchpadDescription: "Zápisník poskytuje prostredia pre experimenty s AiScriptom. Môžete písať, spúšťať a skúšať vysledky pri interakcii s Misskey."
 output: "Výstup"
 script: "Skript"
 disablePagesScript: "Vypnúť AiScript na stránkach"
@@ -699,7 +699,7 @@ onlineUsersCount: "{n} používateľov je online"
 nUsers: "{n} používateľov"
 nNotes: "{n} poznámok"
 sendErrorReports: "Poslať nahlásenie chyby"
-sendErrorReportsDescription: "Keď je zapnuté, v prípade problému sa odošlú podrobné informácie o chybe do Calckey. Pomôžete tak zvýšiť kvalitu Calckey.\nTieto informácie zahŕňajú verziu vášho OS, použitý prehliadač, históriu aktivít, atď."
+sendErrorReportsDescription: "Keď je zapnuté, v prípade problému sa odošlú podrobné informácie o chybe do Misskey. Pomôžete tak zvýšiť kvalitu Misskey.\nTieto informácie zahŕňajú verziu vášho OS, použitý prehliadač, históriu aktivít, atď."
 myTheme: "Moja téma"
 backgroundColor: "Pozadie"
 accentColor: "Akcent"
@@ -790,7 +790,7 @@ hashtags: "Hashtagy"
 troubleshooting: "Riešenie problémov"
 useBlurEffect: "Používať efekty rozmazania v UI"
 learnMore: "Zistiť viac"
-misskeyUpdated: "Calckey sa aktualizoval!"
+misskeyUpdated: "Misskey sa aktualizoval!"
 whatIsNew: "Čo je nové?"
 translate: "Preložiť"
 translatedFrom: "Preložené z {x}"
@@ -961,13 +961,13 @@ _registry:
   keys: "Kľúče"
   domain: "Doména"
   createKey: "Vytvoriť kľúč"
-_aboutCalckey:
-  about: "Calckey je open-source softvér, ktorý vyvíja thatonecalculator od 2022."
+_aboutMisskey:
+  about: "Misskey je open-source softvér, ktorý vyvíja syuilo od 2014."
   contributors: "Hlavní prispievatelia"
   allContributors: "Všetci prispievatelia"
   source: "Zdrojový kód"
-  translation: "Preložiť Calckey"
-  donate: "Podporiť Calckey"
+  translation: "Preložiť Misskey"
+  donate: "Podporiť Misskey"
   morePatrons: "Takisto oceňujeme podporu mnoých ďalších, ktorí tu nie sú uvedení. Ďakujeme! 🥰"
   patrons: "Prispievatelia"
 _nsfw:
@@ -976,8 +976,8 @@ _nsfw:
   force: "Skryť všetky médiá"
 _mfm:
   cheatSheet: "MFM Cheatsheet"
-  intro: "MFM je Calckey exkluzívny značkovací jazyk, ktorý sa dá používať na viacerých miestach. Tu môžete vidieť zoznam všetkej dostupnej MFM syntaxe."
-  dummy: "Calckey rozširuje svet Fediverza"
+  intro: "MFM je Misskey exkluzívny značkovací jazyk, ktorý sa dá používať na viacerých miestach. Tu môžete vidieť zoznam všetkej dostupnej MFM syntaxe."
+  dummy: "Misskey rozširuje svet Fediverza"
   mention: "Zmienka"
   mentionDescription: "Používateľa spomeniete použítím zavináča a mena používateľa"
   hashtag: "Hashtag"
diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml
index 6ff228613..bd895135c 100644
--- a/locales/sv-SE.yml
+++ b/locales/sv-SE.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Svenska"
-headlineCalckey: "Ett nätverk kopplat av noter"
-introCalckey: "Välkommen! Calckey är en öppen och decentraliserad mikrobloggningstjänst.\nSkapa en \"not\" och dela dina tankar med alla runtomkring dig. 📡\nMed \"reaktioner\" kan du snabbt uttrycka dina känslor kring andras noter.👍\nLåt oss utforska en nya värld!🚀"
+headlineMisskey: "Ett nätverk kopplat av noter"
+introMisskey: "Välkommen! Misskey är en öppen och decentraliserad mikrobloggningstjänst.\nSkapa en \"not\" och dela dina tankar med alla runtomkring dig. 📡\nMed \"reaktioner\" kan du snabbt uttrycka dina känslor kring andras noter.👍\nLåt oss utforska en nya värld!🚀"
 monthAndDay: "{day}/{month}"
 search: "Sök"
 notifications: "Notifikationer"
@@ -138,7 +138,7 @@ settingGuide: "Rekommenderade inställningar"
 cacheRemoteFiles: "Spara externa filer till cachen"
 cacheRemoteFilesDescription: "När denna inställning är avstängd kommer externa filer laddas direkt från den externa instansen. Genom att stänga av detta kommer lagringsutrymme minska i användning men kommer öka datatrafiken eftersom miniatyrer inte kommer genereras."
 flagAsBot: "Markera konto som bot"
-flagAsBotDescription: "Aktivera det här alternativet om kontot är kontrollerat av ett program. Om aktiverat kommer den fungera som en flagga för andra utvecklare för att hindra ändlösa kedjor med andra bottar. Det kommer också få Calckeys interna system att hantera kontot som en bot."
+flagAsBotDescription: "Aktivera det här alternativet om kontot är kontrollerat av ett program. Om aktiverat kommer den fungera som en flagga för andra utvecklare för att hindra ändlösa kedjor med andra bottar. Det kommer också få Misskeys interna system att hantera kontot som en bot."
 flagAsCat: "Markera konto som katt"
 flagAsCatDescription: "Aktivera denna inställning för att markera kontot som en katt."
 flagShowTimelineReplies: "Visa svar i tidslinje"
@@ -198,7 +198,7 @@ noUsers: "Det finns inga användare"
 editProfile: "Redigera profil"
 noteDeleteConfirm: "Är du säker på att du vill ta bort denna not?"
 pinLimitExceeded: "Du kan inte fästa fler noter"
-intro: "Calckey har installerats! Vänligen skapa en adminanvändare."
+intro: "Misskey har installerats! Vänligen skapa en adminanvändare."
 done: "Klar"
 processing: "Bearbetar..."
 preview: "Förhandsvisning"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index ebbb15e4e..173548e90 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "ภาษาไทย"
-headlineCalckey: "เชื่อมต่อเครือข่ายโดยโน้ต"
-introCalckey: "ยินดีต้อนรับจ้าาา! Calckey เป็นบริการไมโครบล็อกโอเพ่นซอร์ส แบบการกระจายอำนาจ\nสร้าง \"โน้ต\" เพื่อแบ่งปันความคิดของคุณกับทุกคนรอบตัวคุณกันเถอะ 📡\nด้วยการ \"รีแอคชั่นผู้คน\" คุณยังสามารถแสดงความรู้สึกของคุณเกี่ยวกับบันทึกของทุกคนได้อย่างรวดเร็ว 👍\n\nแล้วมาท่องสำรวจโลกใบใหม่กันเถอะ! 🚀"
+headlineMisskey: "เชื่อมต่อเครือข่ายโดยโน้ต"
+introMisskey: "ยินดีต้อนรับจ้าาา! Misskey เป็นบริการไมโครบล็อกโอเพ่นซอร์ส แบบการกระจายอำนาจ\nสร้าง \"โน้ต\" เพื่อแบ่งปันความคิดของคุณกับทุกคนรอบตัวคุณกันเถอะ 📡\nด้วยการ \"รีแอคชั่นผู้คน\" คุณยังสามารถแสดงความรู้สึกของคุณเกี่ยวกับบันทึกของทุกคนได้อย่างรวดเร็ว 👍\n\nแล้วมาท่องสำรวจโลกใบใหม่กันเถอะ! 🚀"
 monthAndDay: "{เดือน}/{วัน}"
 search: "ค้นหา"
 notifications: "การเเจ้งเตือน"
@@ -139,7 +139,7 @@ settingGuide: "การตั้งค่าที่แนะนำ"
 cacheRemoteFiles: "แคชไฟล์ระยะไกล"
 cacheRemoteFilesDescription: "เมื่อปิดใช้งานการตั้งค่านี้ ไฟล์ระยะไกลนั้นจะถูกโหลดโดยตรงจากอินสแตนซ์ระยะไกล แต่กรณีการปิดใช้งานนี้จะช่วยลดปริมาณการใช้พื้นที่จัดเก็บข้อมูล แต่เพิ่มปริมาณการใช้งาน เพราะเนื่องจากจะไม่มีการสร้างภาพขนาดย่อ"
 flagAsBot: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นบอท"
-flagAsBotDescription: "การเปิดใช้งานตัวเลือกนี้หากบัญชีนี้ถูกควบคุมโดยนักเขียนโปรแกรม หรือ ถ้าหากเปิดใช้งาน มันจะทำหน้าที่เป็นแฟล็กสำหรับนักพัฒนารายอื่นๆ และเพื่อป้องกันการโต้ตอบแบบไม่มีที่สิ้นสุดกับบอทตัวอื่นๆ และยังสามารถปรับเปลี่ยนระบบภายในของ Calckey เพื่อปฏิบัติต่อบัญชีนี้เป็นบอท"
+flagAsBotDescription: "การเปิดใช้งานตัวเลือกนี้หากบัญชีนี้ถูกควบคุมโดยนักเขียนโปรแกรม หรือ ถ้าหากเปิดใช้งาน มันจะทำหน้าที่เป็นแฟล็กสำหรับนักพัฒนารายอื่นๆ และเพื่อป้องกันการโต้ตอบแบบไม่มีที่สิ้นสุดกับบอทตัวอื่นๆ และยังสามารถปรับเปลี่ยนระบบภายในของ Misskey เพื่อปฏิบัติต่อบัญชีนี้เป็นบอท"
 flagAsCat: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นแมว"
 flagAsCatDescription: "การเปิดใช้งานตัวเลือกนี้เพื่อทำเครื่องหมายบอกว่าบัญชีนี้เป็นแมว"
 flagShowTimelineReplies: "แสดงตอบกลับ ในไทม์ไลน์"
@@ -199,7 +199,7 @@ noUsers: "ไม่พบผู้ใช้งาน"
 editProfile: "แก้ไขโปรไฟล์"
 noteDeleteConfirm: "นายแน่ใจแล้วหรอว่าต้องการลบโน้ตนี้นะ?"
 pinLimitExceeded: "คุณไม่สามารถปักหมุดโน้ตเพิ่มเติมใดๆได้อีก"
-intro: "การติดตั้ง Calckey เสร็จสิ้นแล้วนะ! โปรดสร้างผู้ใช้งานที่เป็นผู้ดูแลระบบ"
+intro: "การติดตั้ง Misskey เสร็จสิ้นแล้วนะ! โปรดสร้างผู้ใช้งานที่เป็นผู้ดูแลระบบ"
 done: "เสร็จสิ้น"
 processing: "กำลังประมวลผล..."
 preview: "แสดงตัวอย่าง"
@@ -378,7 +378,7 @@ exploreFediverse: "สำรวจเฟดดิเวิร์ส"
 popularTags: "แท็กยอดนิยม"
 userList: "รายการ"
 about: "เกี่ยวกับ"
-aboutCalckey: "เกี่ยวกับ Calckey"
+aboutMisskey: "เกี่ยวกับ Misskey"
 administrator: "ผู้ดูแลระบบ"
 token: "โทเค็น"
 twoStepAuthentication: "ยืนยันตัวตน 2 ชั้น"
@@ -524,7 +524,7 @@ sort: "เรียงลำดับ"
 ascendingOrder: "เรียงจากน้อยไปมาก"
 descendingOrder: "เรียงจากมากไปน้อย"
 scratchpad: "กระดานทดลอง"
-scratchpadDescription: "Scratchpad เป็นการจัดเตรียมสภาพแวดล้อมสำหรับการทดลอง AiScript แต่คุณสามารถเขียน ดำเนินการ และตรวจสอบผลลัพธ์ของการโต้ตอบกับ Calckey มันได้ด้วยนะ"
+scratchpadDescription: "Scratchpad เป็นการจัดเตรียมสภาพแวดล้อมสำหรับการทดลอง AiScript แต่คุณสามารถเขียน ดำเนินการ และตรวจสอบผลลัพธ์ของการโต้ตอบกับ Misskey มันได้ด้วยนะ"
 output: "เอาท์พุต"
 script: "สคริปต์"
 disablePagesScript: "ปิดการใช้งาน AiScript บนเพจ"
@@ -700,7 +700,7 @@ onlineUsersCount: "{n} ผู้ใช้คนนี้กำลังออน
 nUsers: "{n} ผู้ใช้งาน"
 nNotes: "{n} โน้ต"
 sendErrorReports: "ส่งรายงานว่าข้อผิดพลาด"
-sendErrorReportsDescription: "เมื่อเปิดใช้งาน ข้อมูลข้อผิดพลาดโดยรายละเอียดนั้นจะถูกแชร์ให้กับ Calckey เมื่อเกิดปัญหา ซึ่งช่วยปรับปรุงคุณภาพของ Calckey\nซึ่งจะรวมถึงข้อมูล เช่น เวอร์ชั่นของระบบปฏิบัติการ เบราว์เซอร์ที่คุณใช้ กิจกรรมของคุณใน Calckey เป็นต้น"
+sendErrorReportsDescription: "เมื่อเปิดใช้งาน ข้อมูลข้อผิดพลาดโดยรายละเอียดนั้นจะถูกแชร์ให้กับ Misskey เมื่อเกิดปัญหา ซึ่งช่วยปรับปรุงคุณภาพของ Misskey\nซึ่งจะรวมถึงข้อมูล เช่น เวอร์ชั่นของระบบปฏิบัติการ เบราว์เซอร์ที่คุณใช้ กิจกรรมของคุณใน Misskey เป็นต้น"
 myTheme: "ธีมของฉัน"
 backgroundColor: "ภาพพื้นหลัง"
 accentColor: "รูปแบบสี"
@@ -791,7 +791,7 @@ hashtags: "แฮชแท็ก"
 troubleshooting: "แก้ปัญหา"
 useBlurEffect: "ใช้เอฟเฟกต์เบลอใน UI"
 learnMore: "แสดงให้ดูหน่อย"
-misskeyUpdated: "Calckey ได้รับการอัปเดตแล้ว!"
+misskeyUpdated: "Misskey ได้รับการอัปเดตแล้ว!"
 whatIsNew: "แสดงการเปลี่ยนแปลง"
 translate: "แปลภาษา"
 translatedFrom: "แปลมาจาก {x}"
@@ -966,13 +966,13 @@ _registry:
   keys: "คีย์"
   domain: "โดเมน"
   createKey: "สร้างคีย์"
-_aboutCalckey:
-  about: "Calckey เป็นซอฟต์แวร์โอเพ่นซอร์สที่ถูกพัฒนาโดย thatonecalculator ตั้งแต่ปี 2022"
+_aboutMisskey:
+  about: "Misskey เป็นซอฟต์แวร์โอเพ่นซอร์สที่ถูกพัฒนาโดย Syuilo ตั้งแต่ปี 2014"
   contributors: "ผู้สนับสนุนหลัก"
   allContributors: "ผู้มีส่วนร่วมทั้งหมด"
   source: "ซอร์สโค้ด"
-  translation: "รับแปลภาษา Calckey"
-  donate: "บริจาคให้กับ Calckey"
+  translation: "รับแปลภาษา Misskey"
+  donate: "บริจาคให้กับ Misskey"
   morePatrons: "เราขอขอบคุณสำหรับความช่วยเหลือจากผู้ช่วยอื่นๆ ที่ไม่ได้ระบุไว้ที่นี่นะ ขอขอบคุณ! 🥰"
   patrons: "สมาชิกพันธมิตร"
 _nsfw:
@@ -981,8 +981,8 @@ _nsfw:
   force: "ซ่อนสื่อทั้งหมด"
 _mfm:
   cheatSheet: "โค้ด MFM Cheat Sheet"
-  intro: "MFM เป็นภาษามาร์กอัปพิเศษเฉพาะของ Calckey ที่สามารถใช้ได้ในหลายที่ คุณยังสามารถดูรายการไวยากรณ์ MFM ที่มีอยู่ทั้งหมดได้ที่นี่นะ"
-  dummy: "Calckey ขยายโลกของ Fediverse"
+  intro: "MFM เป็นภาษามาร์กอัปพิเศษเฉพาะของ Misskey ที่สามารถใช้ได้ในหลายที่ คุณยังสามารถดูรายการไวยากรณ์ MFM ที่มีอยู่ทั้งหมดได้ที่นี่นะ"
+  dummy: "Misskey ขยายโลกของ Fediverse"
   mention: "กล่าวถึง"
   mentionDescription: "คุณสามารถระบุผู้ใช้โดยใช้ At-Symbol และชื่อผู้ใช้ได้นะ"
   hashtag: "แฮชแท็ก"
diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml
index 9237e2a46..aecb413de 100644
--- a/locales/tr-TR.yml
+++ b/locales/tr-TR.yml
@@ -1,6 +1,6 @@
 ---
 _lang_: "Türkçe"
-introCalckey: "Açık kaynaklı bir dağıtılmış mikroblog hizmeti olan Calckey'e hoş geldiniz.\nCalckey, neler olup bittiğini paylaşmak ve herkese sizden bahsetmek için \"notlar\" oluşturmanıza olanak tanıyan, açık kaynaklı, dağıtılmış bir mikroblog hizmetidir.\nHerkesin notlarına kendi tepkilerinizi hızlıca eklemek için \"Tepkiler\" özelliğini de kullanabilirsiniz👍.\nYeni bir dünyayı keşfedin🚀."
+introMisskey: "Açık kaynaklı bir dağıtılmış mikroblog hizmeti olan Misskey'e hoş geldiniz.\nMisskey, neler olup bittiğini paylaşmak ve herkese sizden bahsetmek için \"notlar\" oluşturmanıza olanak tanıyan, açık kaynaklı, dağıtılmış bir mikroblog hizmetidir.\nHerkesin notlarına kendi tepkilerinizi hızlıca eklemek için \"Tepkiler\" özelliğini de kullanabilirsiniz👍.\nYeni bir dünyayı keşfedin🚀."
 monthAndDay: "{month}Ay {day}Gün"
 search: "Arama"
 notifications: "Bildirim"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 3e5780558..63caf22c1 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Українська"
-headlineCalckey: "Мережа об'єднана записами"
-introCalckey: "Ласкаво просимо! Calckey - децентралізована служба мікроблогів з відкритим кодом.\nСтворюйте \"нотатки\", щоб поділитися тим, що відбувається, і розповісти всім про себе 📡\nЗа допомогою \"реакцій\" ви також можете швидко висловити свої почуття щодо нотаток інших 👍\nДосліджуймо новий світ! 🚀"
+headlineMisskey: "Мережа об'єднана записами"
+introMisskey: "Ласкаво просимо! Misskey - децентралізована служба мікроблогів з відкритим кодом.\nСтворюйте \"нотатки\", щоб поділитися тим, що відбувається, і розповісти всім про себе 📡\nЗа допомогою \"реакцій\" ви також можете швидко висловити свої почуття щодо нотаток інших 👍\nДосліджуймо новий світ! 🚀"
 monthAndDay: "{month}/{day}"
 search: "Пошук"
 notifications: "Сповіщення"
@@ -139,7 +139,7 @@ settingGuide: "Рекомендована конфігурація"
 cacheRemoteFiles: "Кешувати дані з інших інстансів"
 cacheRemoteFilesDescription: "Якщо кешування вимкнено, віддалені файли завантажуються безпосередньо з віддаленого інстансу. Це зменшує використання сховища, але збільшує трафік, оскільки не генеруются ескізи."
 flagAsBot: "Акаунт бота"
-flagAsBotDescription: "Ввімкніть якщо цей обліковий запис використовується ботом. Ця опція позначить обліковий запис як бота. Це потрібно щоб виключити безкінечну інтеракцію між ботами а також відповідного підлаштування Calckey."
+flagAsBotDescription: "Ввімкніть якщо цей обліковий запис використовується ботом. Ця опція позначить обліковий запис як бота. Це потрібно щоб виключити безкінечну інтеракцію між ботами а також відповідного підлаштування Misskey."
 flagAsCat: "Акаунт кота"
 flagAsCatDescription: "Ввімкніть, щоб позначити, що обліковий запис є котиком."
 flagShowTimelineReplies: "Показувати відповіді на нотатки на часовій шкалі"
@@ -199,7 +199,7 @@ noUsers: "Немає користувачів"
 editProfile: "Редагувати обліковий запис"
 noteDeleteConfirm: "Ви дійсно хочете видалити цей запис?"
 pinLimitExceeded: "Більше записів не можна закріпити"
-intro: "Встановлення Calckey завершено! Будь ласка, створіть обліковий запис адміністратора."
+intro: "Встановлення Misskey завершено! Будь ласка, створіть обліковий запис адміністратора."
 done: "Готово"
 processing: "Обробка"
 preview: "Попередній перегляд"
@@ -377,7 +377,7 @@ exploreFediverse: "Огляд федіверсу"
 popularTags: "Популярні теги"
 userList: "Списки"
 about: "Інформація"
-aboutCalckey: "Про Calckey"
+aboutMisskey: "Про Misskey"
 administrator: "Адмін"
 token: "Токен"
 twoStepAuthentication: "Двохфакторна аутентифікація"
@@ -522,7 +522,7 @@ sort: "Сортування"
 ascendingOrder: "За зростанням"
 descendingOrder: "За спаданням"
 scratchpad: "Чернетка"
-scratchpadDescription: "Scratchpad надає середовище для експериментів з AiScript. Ви можете писати, виконувати його і тестувати взаємодію з Calckey."
+scratchpadDescription: "Scratchpad надає середовище для експериментів з AiScript. Ви можете писати, виконувати його і тестувати взаємодію з Misskey."
 output: "Вихід"
 script: "Скрипт"
 disablePagesScript: "Вимкнути AiScript на Сторінках"
@@ -695,7 +695,7 @@ onlineUsersCount: "{n} користувачів онлайн"
 nUsers: "{n} Користувачів"
 nNotes: "{n} Записів"
 sendErrorReports: "Надіслати звіт про помилки"
-sendErrorReportsDescription: "При увімкненні детальна інформація про помилки буде надана Calckey у разі виникнення проблем, що дасть можливість покращити Calckey."
+sendErrorReportsDescription: "При увімкненні детальна інформація про помилки буде надана Misskey у разі виникнення проблем, що дасть можливість покращити Misskey."
 myTheme: "Моя тема"
 backgroundColor: "Фон"
 accentColor: "Акцент"
@@ -756,13 +756,13 @@ _registry:
   keys: "Ключі"
   domain: "Домен"
   createKey: "Створити ключ"
-_aboutCalckey:
-  about: "Calckey - це програмне забезпечення з відкритим кодом, яке розробляє thatonecalculator з 2022 року."
+_aboutMisskey:
+  about: "Misskey - це програмне забезпечення з відкритим кодом, яке розробляє syuilo з 2014 року."
   contributors: "Головні помічники"
   allContributors: "Всі помічники"
   source: "Вихідний код"
-  translation: "Перекладати Calckey"
-  donate: "Пожертвувати Calckey"
+  translation: "Перекладати Misskey"
+  donate: "Пожертвувати Misskey"
   morePatrons: "Ми дуже цінуємо підтримку багатьох інших помічників, не перелічених тут. Дякуємо! 🥰"
   patrons: "Підтримали"
 _nsfw:
@@ -771,8 +771,8 @@ _nsfw:
   force: "Приховувати всі медіа файли"
 _mfm:
   cheatSheet: " Довідка MFM"
-  intro: "MFM це ексклюзивна мова розмітки тексту в Calckey, яку можна використовувати в багатьох місцях. Тут ви можете переглянути приклади її синтаксису."
-  dummy: "Calckey розширює світ Федіверсу"
+  intro: "MFM це ексклюзивна мова розмітки тексту в Misskey, яку можна використовувати в багатьох місцях. Тут ви можете переглянути приклади її синтаксису."
+  dummy: "Misskey розширює світ Федіверсу"
   mention: "Згадка"
   mentionDescription: "За допомогою знака \"@\" перед ім'ям можна згадати конкретного користувача."
   hashtag: "Хештеґ"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index b00d68bc4..48ef4e323 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "Tiếng Việt"
-headlineCalckey: "Mạng xã hội liên hợp"
-introCalckey: "Xin chào! Calckey là một nền tảng tiểu blog phi tập trung mã nguồn mở.\nViết \"tút\" để chia sẻ những suy nghĩ của bạn 📡\nBằng \"biểu cảm\", bạn có thể bày tỏ nhanh chóng cảm xúc của bạn với các tút 👍\nHãy khám phá một thế giới mới! 🚀"
+headlineMisskey: "Mạng xã hội liên hợp"
+introMisskey: "Xin chào! Misskey là một nền tảng tiểu blog phi tập trung mã nguồn mở.\nViết \"tút\" để chia sẻ những suy nghĩ của bạn 📡\nBằng \"biểu cảm\", bạn có thể bày tỏ nhanh chóng cảm xúc của bạn với các tút 👍\nHãy khám phá một thế giới mới! 🚀"
 monthAndDay: "{day} tháng {month}"
 search: "Tìm kiếm"
 notifications: "Thông báo"
@@ -139,7 +139,7 @@ settingGuide: "Cài đặt đề xuất"
 cacheRemoteFiles: "Tập tin cache từ xa"
 cacheRemoteFilesDescription: "Khi tùy chọn này bị tắt, các tập tin từ xa sẽ được tải trực tiếp từ máy chủ khác. Điều này sẽ giúp giảm dung lượng lưu trữ nhưng lại tăng lưu lượng truy cập, vì hình thu nhỏ sẽ không được tạo."
 flagAsBot: "Đánh dấu đây là tài khoản bot"
-flagAsBotDescription: "Bật tùy chọn này nếu tài khoản này được kiểm soát bởi một chương trình. Nếu được bật, nó sẽ được đánh dấu để các nhà phát triển khác ngăn chặn chuỗi tương tác vô tận với các bot khác và điều chỉnh hệ thống nội bộ của Calckey để coi tài khoản này như một bot."
+flagAsBotDescription: "Bật tùy chọn này nếu tài khoản này được kiểm soát bởi một chương trình. Nếu được bật, nó sẽ được đánh dấu để các nhà phát triển khác ngăn chặn chuỗi tương tác vô tận với các bot khác và điều chỉnh hệ thống nội bộ của Misskey để coi tài khoản này như một bot."
 flagAsCat: "Tài khoản này là mèo"
 flagAsCatDescription: "Bật tùy chọn này để đánh dấu tài khoản là một con mèo."
 flagShowTimelineReplies: "Hiện lượt trả lời trong bảng tin"
@@ -199,7 +199,7 @@ noUsers: "Chưa có ai"
 editProfile: "Sửa hồ sơ"
 noteDeleteConfirm: "Bạn có chắc muốn xóa tút này?"
 pinLimitExceeded: "Bạn đã đạt giới hạn số lượng tút có thể ghim"
-intro: "Đã cài đặt Calckey! Xin hãy tạo tài khoản admin."
+intro: "Đã cài đặt Misskey! Xin hãy tạo tài khoản admin."
 done: "Xong"
 processing: "Đang xử lý"
 preview: "Xem trước"
@@ -378,7 +378,7 @@ exploreFediverse: "Khám phá Fediverse"
 popularTags: "Hashtag thông dụng"
 userList: "Danh sách"
 about: "Giới thiệu"
-aboutCalckey: "Về Calckey"
+aboutMisskey: "Về Misskey"
 administrator: "Quản trị viên"
 token: "Token"
 twoStepAuthentication: "Xác minh 2 bước"
@@ -524,7 +524,7 @@ sort: "Sắp xếp"
 ascendingOrder: "Tăng dần"
 descendingOrder: "Giảm dần"
 scratchpad: "Scratchpad"
-scratchpadDescription: "Scratchpad cung cấp môi trường cho các thử nghiệm AiScript. Bạn có thể viết, thực thi và kiểm tra kết quả tương tác với Calckey trong đó."
+scratchpadDescription: "Scratchpad cung cấp môi trường cho các thử nghiệm AiScript. Bạn có thể viết, thực thi và kiểm tra kết quả tương tác với Misskey trong đó."
 output: "Nguồn ra"
 script: "Kịch bản"
 disablePagesScript: "Tắt AiScript trên Trang"
@@ -700,7 +700,7 @@ onlineUsersCount: "{n} người đang online"
 nUsers: "{n} Người"
 nNotes: "{n} Tút"
 sendErrorReports: "Báo lỗi"
-sendErrorReportsDescription: "Khi được bật, thông tin chi tiết về lỗi sẽ được chia sẻ với Calckey khi xảy ra sự cố, giúp nâng cao chất lượng của Calckey.\nBao gồm thông tin như phiên bản hệ điều hành của bạn, trình duyệt bạn đang sử dụng, hoạt động của bạn trong Calckey, v.v."
+sendErrorReportsDescription: "Khi được bật, thông tin chi tiết về lỗi sẽ được chia sẻ với Misskey khi xảy ra sự cố, giúp nâng cao chất lượng của Misskey.\nBao gồm thông tin như phiên bản hệ điều hành của bạn, trình duyệt bạn đang sử dụng, hoạt động của bạn trong Misskey, v.v."
 myTheme: "Theme của tôi"
 backgroundColor: "Màu nền"
 accentColor: "Màu phụ"
@@ -791,7 +791,7 @@ hashtags: "Hashtag"
 troubleshooting: "Khắc phục sự cố"
 useBlurEffect: "Dùng hiệu ứng làm mờ trong giao diện"
 learnMore: "Tìm hiểu thêm"
-misskeyUpdated: "Calckey vừa được cập nhật!"
+misskeyUpdated: "Misskey vừa được cập nhật!"
 whatIsNew: "Hiện những thay đổi"
 translate: "Dịch"
 translatedFrom: "Dịch từ {x}"
@@ -966,13 +966,13 @@ _registry:
   keys: "Các mã"
   domain: "Tên miền"
   createKey: "Tạo mã"
-_aboutCalckey:
-  about: "Calckey là phần mềm mã nguồn mở được phát triển bởi thatonecalculator từ năm 2022."
+_aboutMisskey:
+  about: "Misskey là phần mềm mã nguồn mở được phát triển bởi syuilo từ năm 2014."
   contributors: "Những người đóng góp nổi bật"
   allContributors: "Toàn bộ người đóng góp"
   source: "Mã nguồn"
-  translation: "Dịch Calckey"
-  donate: "Ủng hộ Calckey"
+  translation: "Dịch Misskey"
+  donate: "Ủng hộ Misskey"
   morePatrons: "Chúng tôi cũng trân trọng sự hỗ trợ của nhiều người đóng góp khác không được liệt kê ở đây. Cảm ơn! 🥰"
   patrons: "Người ủng hộ"
 _nsfw:
@@ -981,8 +981,8 @@ _nsfw:
   force: "Ẩn mọi media"
 _mfm:
   cheatSheet: "MFM Cheatsheet"
-  intro: "MFM là ngôn ngữ phát triển độc quyền của Calckey có thể được sử dụng ở nhiều nơi. Tại đây bạn có thể xem danh sách tất cả các cú pháp MFM có sẵn."
-  dummy: "Calckey mở rộng thế giới Fediverse"
+  intro: "MFM là ngôn ngữ phát triển độc quyền của Misskey có thể được sử dụng ở nhiều nơi. Tại đây bạn có thể xem danh sách tất cả các cú pháp MFM có sẵn."
+  dummy: "Misskey mở rộng thế giới Fediverse"
   mention: "Nhắc đến"
   mentionDescription: "Bạn có thể nhắc đến ai đó bằng cách sử dụng @tên người dùng."
   hashtag: "Hashtag"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index b9e1b40d5..2784da81d 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "简体中文"
-headlineCalckey: "通过帖子连接在一起的网络"
-introCalckey: "欢迎！Calckey是一个开源的、去中心化的“微博客”服务。\n通过编写「帖文」来和大家分享你的以及你周围的事情吧！📡\n通过「回应」功能，可以让你快速地对大家的帖文表达反馈👍\n来探索新的世界吧！🚀"
+headlineMisskey: "通过帖子连接在一起的网络"
+introMisskey: "欢迎！Misskey是一个开源的、去中心化的“微博客”服务。\n通过编写「帖文」来和大家分享你的以及你周围的事情吧！📡\n通过「回应」功能，可以让你快速地对大家的帖文表达反馈👍\n来探索新的世界吧！🚀"
 monthAndDay: "{month}月 {day}日"
 search: "搜索"
 notifications: "通知"
@@ -141,7 +141,7 @@ settingGuide: "推荐配置"
 cacheRemoteFiles: "远程文件缓存"
 cacheRemoteFilesDescription: "当禁用此设定时远程文件将直接从远程实例载入。禁用后会减小储存空间需求，但是会增加流量，因为缩略图不会被生成。"
 flagAsBot: "这是一个机器人账号"
-flagAsBotDescription: "如果此帐户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Calckey的内部系统将此帐户识别为机器人。"
+flagAsBotDescription: "如果此帐户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Misskey的内部系统将此帐户识别为机器人。"
 flagAsCat: "将这个账户设定为一只猫"
 flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。\n开启后，会在您的头像上出现猫耳朵，并将你的帖子中的「na」替换为「nya」，日文同理。"
 flagShowTimelineReplies: "在时间线上显示帖子的回复"
@@ -201,7 +201,7 @@ noUsers: "无用户"
 editProfile: "编辑资料"
 noteDeleteConfirm: "要删除该帖子吗？"
 pinLimitExceeded: "无法置顶更多了"
-intro: "Calckey的部署结束啦！填写管理员账号吧！"
+intro: "Misskey的部署结束啦！填写管理员账号吧！"
 done: "完成"
 processing: "正在处理"
 preview: "预览"
@@ -380,7 +380,7 @@ exploreFediverse: "探索联邦宇宙"
 popularTags: "热门标签"
 userList: "列表"
 about: "关于"
-aboutCalckey: "关于 Calckey"
+aboutMisskey: "关于 Misskey"
 administrator: "管理员"
 token: "Token (令牌)"
 twoStepAuthentication: "两步验证"
@@ -526,7 +526,7 @@ sort: "排序"
 ascendingOrder: "升序"
 descendingOrder: "降序"
 scratchpad: "AiScript控制台"
-scratchpadDescription: "AiScript控制台为AiScript提供了实验环境。您可以编写代码以与Calckey交互，运行它并查看结果。"
+scratchpadDescription: "AiScript控制台为AiScript提供了实验环境。您可以编写代码以与Misskey交互，运行它并查看结果。"
 output: "输出"
 script: "脚本"
 disablePagesScript: "禁用页面脚本"
@@ -702,7 +702,7 @@ onlineUsersCount: "{n}人在线"
 nUsers: "{n}用户"
 nNotes: "{n}帖子"
 sendErrorReports: "发送错误报告"
-sendErrorReportsDescription: "启用后，如果出现问题，可以与Calckey共享详细的错误信息，从而帮助提高软件的质量。"
+sendErrorReportsDescription: "启用后，如果出现问题，可以与Misskey共享详细的错误信息，从而帮助提高软件的质量。"
 myTheme: "我的主题"
 backgroundColor: "背景"
 accentColor: "强调色"
@@ -793,7 +793,7 @@ hashtags: "话题标签"
 troubleshooting: "故障排除"
 useBlurEffect: "在UI上使用模糊效果"
 learnMore: "更多信息"
-misskeyUpdated: "Calckey更新完成！"
+misskeyUpdated: "Misskey更新完成！"
 whatIsNew: "显示更新信息"
 translate: "翻译"
 translatedFrom: "从 {x} 翻译"
@@ -971,13 +971,13 @@ _registry:
   keys: "主要"
   domain: "域"
   createKey: "创建键"
-_aboutCalckey:
-  about: "Calckey是由thatonecalculator于2022年开发的开源软件。"
+_aboutMisskey:
+  about: "Misskey是由syuilo于2014年开发的开源软件。"
   contributors: "主要贡献者"
   allContributors: "全体贡献者"
   source: "源代码"
-  translation: "翻译Calckey"
-  donate: "赞助Calckey"
+  translation: "翻译Misskey"
+  donate: "赞助Misskey"
   morePatrons: "还有很多其他的人也在支持我们，非常感谢🥰"
   patrons: "支持者"
 _nsfw:
@@ -986,8 +986,8 @@ _nsfw:
   force: "总是隐藏内容"
 _mfm:
   cheatSheet: "MFM代码速查表"
-  intro: "MFM是一种在Calckey中的各个位置使用的专用标记语言。在这里您可以看到MFM中可用的语法列表。"
-  dummy: "通过Calckey扩展联邦宇宙的世界"
+  intro: "MFM是一种在Misskey中的各个位置使用的专用标记语言。在这里您可以看到MFM中可用的语法列表。"
+  dummy: "通过Misskey扩展联邦宇宙的世界"
   mention: "提及"
   mentionDescription: "可以使用 @+用户名 来指示特定用户"
   hashtag: "话题标签"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 3f488faba..3e8485adb 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "繁體中文"
-headlineCalckey: "貼文連繫網路"
-introCalckey: "歡迎！ Calckey是一個開放原始碼且去中心化的社群網路。\n透過「貼文」分享周邊新鮮事，並告訴其他人您的想法！📡\n透過「反應」功能，對大家的貼文表達情感！👍\n一起來探索這個新的世界吧！🚀"
+headlineMisskey: "貼文連繫網路"
+introMisskey: "歡迎！ Misskey是一個開放原始碼且去中心化的社群網路。\n透過「貼文」分享周邊新鮮事，並告訴其他人您的想法！📡\n透過「反應」功能，對大家的貼文表達情感！👍\n一起來探索這個新的世界吧！🚀"
 monthAndDay: "{month}月 {day}日"
 search: "搜尋"
 notifications: "通知"
@@ -141,7 +141,7 @@ settingGuide: "推薦設定"
 cacheRemoteFiles: "快取遠端檔案"
 cacheRemoteFilesDescription: "禁用此設定會停止遠端檔案的緩存，從而節省儲存空間，但資料會因直接連線從而產生額外連接數據。"
 flagAsBot: "此使用者是機器人"
-flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Calckey內部系統將本帳戶識別為機器人"
+flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Misskey內部系統將本帳戶識別為機器人"
 flagAsCat: "此使用者是貓"
 flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
 flagShowTimelineReplies: "在時間軸上顯示貼文的回覆"
@@ -201,7 +201,7 @@ noUsers: "沒有任何使用者"
 editProfile: "編輯個人檔案"
 noteDeleteConfirm: "確定刪除此貼文嗎？"
 pinLimitExceeded: "不能置頂更多貼文了"
-intro: "Calckey 部署完成！請建立管理員帳戶。"
+intro: "Misskey 部署完成！請建立管理員帳戶。"
 done: "完成"
 processing: "處理中"
 preview: "預覽"
@@ -380,7 +380,7 @@ exploreFediverse: "探索聯邦世界"
 popularTags: "熱門標籤"
 userList: "清單"
 about: "資訊"
-aboutCalckey: "關於 Calckey"
+aboutMisskey: "關於 Misskey"
 administrator: "管理員"
 token: "權杖"
 twoStepAuthentication: "兩階段驗證"
@@ -526,7 +526,7 @@ sort: "排序"
 ascendingOrder: "昇冪"
 descendingOrder: "降冪"
 scratchpad: "暫存記憶體"
-scratchpadDescription: "AiScript控制台為AiScript提供了實驗環境。您可以在此編寫、執行和確認代碼與Calckey互動的结果。"
+scratchpadDescription: "AiScript控制台為AiScript提供了實驗環境。您可以在此編寫、執行和確認代碼與Misskey互動的结果。"
 output: "輸出"
 script: "腳本"
 disablePagesScript: "停用頁面的AiScript腳本"
@@ -793,7 +793,7 @@ hashtags: "#tag"
 troubleshooting: "故障排除"
 useBlurEffect: "在 UI 上使用模糊效果"
 learnMore: "更多資訊"
-misskeyUpdated: "Calckey 更新完成！"
+misskeyUpdated: "Misskey 更新完成！"
 whatIsNew: "顯示更新資訊"
 translate: "翻譯"
 translatedFrom: "從 {x} 翻譯"
@@ -971,13 +971,13 @@ _registry:
   keys: "機碼"
   domain: "域"
   createKey: "新增機碼"
-_aboutCalckey:
-  about: "Calckey是由thatonecalculator自2022年起開發的開源軟體。"
+_aboutMisskey:
+  about: "Misskey是由syuilo自2014年起開發的開源軟體。"
   contributors: "主要貢獻者"
   allContributors: "全體貢獻人員"
   source: "原始碼"
-  translation: "翻譯Calckey"
-  donate: "贊助Calckey"
+  translation: "翻譯Misskey"
+  donate: "贊助Misskey"
   morePatrons: "還有許許多多幫助我們的其他人，非常感謝你們。 🥰"
   patrons: "贊助者"
 _nsfw:
@@ -986,8 +986,8 @@ _nsfw:
   force: "隱藏所有內容"
 _mfm:
   cheatSheet: "MFM代碼小抄"
-  intro: "MFM是Calckey專用的標記語言，可以在Calckey中的各個位置使用。 您可以這裏看到MFM可用語法列表。"
-  dummy: "Calckey拓展了Fediverse的世界"
+  intro: "MFM是Misskey專用的標記語言，可以在Misskey中的各個位置使用。 您可以這裏看到MFM可用語法列表。"
+  dummy: "Misskey拓展了Fediverse的世界"
   mention: "提及"
   mentionDescription: "透過 @+用戶名 來標示特定使用者。"
   hashtag: "#tag"
diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue
index 2f229585e..fa0eeff0b 100644
--- a/packages/client/src/pages/about-calckey.vue
+++ b/packages/client/src/pages/about-calckey.vue
@@ -42,7 +42,7 @@
 						/></span>
 					</div>
 					<div class="_formBlock" style="text-align: center">
-						{{ i18n.ts._aboutCalckey.about }}<br /><a
+						{{ i18n.ts._aboutMisskey.about }}<br /><a
 							href="https://codeberg.org/calckey/calckey"
 							target="_blank"
 							class="_link"
@@ -63,7 +63,7 @@
 								<template #icon
 									><i class="ph-code ph-bold ph-lg"></i
 								></template>
-								{{ i18n.ts._aboutCalckey.source }}
+								{{ i18n.ts._aboutMisskey.source }}
 								<template #suffix>Codeberg</template>
 							</FormLink>
 							<FormLink
@@ -73,7 +73,7 @@
 								<template #icon
 									><i class="ph-money ph-bold ph-lg"></i
 								></template>
-								{{ i18n.ts._aboutCalckey.donate }}
+								{{ i18n.ts._aboutMisskey.donate }}
 								<template #suffix>Donate</template>
 							</FormLink>
 							<FormLink
@@ -83,14 +83,14 @@
 								<template #icon
 									><i class="ph-translate ph-bold ph-lg"></i
 								></template>
-								{{ i18n.ts._aboutCalckey.translation }}
+								{{ i18n.ts._aboutMisskey.translation }}
 								<template #suffix>Translate</template>
 							</FormLink>
 						</div>
 					</FormSection>
 					<FormSection>
 						<template #label>{{
-							i18n.ts._aboutCalckey.contributors
+							i18n.ts._aboutMisskey.contributors
 						}}</template>
 						<div class="_formLinks">
 							<FormLink to="/@kainoa@calckey.social"
@@ -118,7 +118,7 @@
 							><MkLink
 								url="https://codeberg.org/calckey/calckey/activity"
 								>{{
-									i18n.ts._aboutCalckey.allContributors
+									i18n.ts._aboutMisskey.allContributors
 								}}</MkLink
 							></template
 						>
@@ -126,7 +126,7 @@
 					<FormSection>
 						<template #label
 							><Mfm text="$[jelly ❤]" />
-							{{ i18n.ts._aboutCalckey.patrons }}</template
+							{{ i18n.ts._aboutMisskey.patrons }}</template
 						>
 						<MkSparkle>
 							<div
@@ -138,7 +138,7 @@
 							</div>
 						</MkSparkle>
 						<template #caption>{{
-							i18n.ts._aboutCalckey.morePatrons
+							i18n.ts._aboutMisskey.morePatrons
 						}}</template>
 					</FormSection>
 				</div>
@@ -209,7 +209,7 @@ const headerActions = $computed(() => []);
 const headerTabs = $computed(() => []);
 
 definePageMetadata({
-	title: i18n.ts.aboutCalckey,
+	title: i18n.ts.aboutMisskey,
 	icon: null,
 });
 </script>
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index 15214ef03..4b9e62cf8 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -60,7 +60,7 @@
 								<template #value>{{ version }}</template>
 							</MkKeyValue>
 							<FormLink to="/about-calckey">{{
-								i18n.ts.aboutCalckey
+								i18n.ts.aboutMisskey
 							}}</FormLink>
 						</FormSection>
 
diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue
index bc5b26f1c..286ecdda1 100644
--- a/packages/client/src/pages/welcome.entrance.a.vue
+++ b/packages/client/src/pages/welcome.entrance.a.vue
@@ -45,7 +45,7 @@
 					<div class="about">
 						<div
 							class="desc"
-							v-html="meta.description || i18n.ts.headlineCalckey"
+							v-html="meta.description || i18n.ts.headlineMisskey"
 						></div>
 					</div>
 					<div class="action">
@@ -177,7 +177,7 @@ function showMenu(ev) {
 				},
 			},
 			{
-				text: i18n.ts.aboutCalckey,
+				text: i18n.ts.aboutMisskey,
 				icon: "ph-info ph-bold ph-lg",
 				action: () => {
 					os.pageWindow("/about-calckey");
diff --git a/packages/client/src/pages/welcome.entrance.b.vue b/packages/client/src/pages/welcome.entrance.b.vue
index 25bc9f849..82651aeda 100644
--- a/packages/client/src/pages/welcome.entrance.b.vue
+++ b/packages/client/src/pages/welcome.entrance.b.vue
@@ -15,7 +15,7 @@
 				<div class="about">
 					<div
 						class="desc"
-						v-html="meta.description || i18n.ts.headlineCalckey"
+						v-html="meta.description || i18n.ts.headlineMisskey"
 					></div>
 				</div>
 				<div class="action">
@@ -156,7 +156,7 @@ export default defineComponent({
 						},
 					},
 					{
-						text: i18n.ts.aboutCalckey,
+						text: i18n.ts.aboutMisskey,
 						icon: "ph-info ph-bold ph-lg",
 						action: () => {
 							os.pageWindow("/about-calckey");
diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue
index 4dc50a177..69c1d5142 100644
--- a/packages/client/src/pages/welcome.entrance.c.vue
+++ b/packages/client/src/pages/welcome.entrance.c.vue
@@ -30,7 +30,7 @@
 							<div
 								class="desc"
 								v-html="
-									meta.description || i18n.ts.headlineCalckey
+									meta.description || i18n.ts.headlineMisskey
 								"
 							></div>
 						</div>
@@ -182,7 +182,7 @@ export default defineComponent({
 						},
 					},
 					{
-						text: i18n.ts.aboutCalckey,
+						text: i18n.ts.aboutMisskey,
 						icon: "ph-info ph-bold ph-lg",
 						action: () => {
 							os.pageWindow("/about-calckey");
diff --git a/packages/client/src/scripts/helpMenu.ts b/packages/client/src/scripts/helpMenu.ts
index b67079f8f..aca9d6e70 100644
--- a/packages/client/src/scripts/helpMenu.ts
+++ b/packages/client/src/scripts/helpMenu.ts
@@ -20,7 +20,7 @@ export function openHelpMenu_(ev: MouseEvent) {
 			},
 			{
 				type: "link",
-				text: i18n.ts.aboutCalckey,
+				text: i18n.ts.aboutMisskey,
 				icon: "ph-lightbulb ph-bold ph-lg",
 				to: "/about-calckey",
 			},
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index b3fb12148..b70a3c984 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -262,7 +262,7 @@ function openInstanceMenu(ev: MouseEvent) {
 			},
 			{
 				type: "link",
-				text: i18n.ts.aboutCalckey,
+				text: i18n.ts.aboutMisskey,
 				to: "/about-calckey",
 			},
 		],
diff --git a/packages/client/src/ui/visitor/a.vue b/packages/client/src/ui/visitor/a.vue
index 00e8a8e23..3894a991d 100644
--- a/packages/client/src/ui/visitor/a.vue
+++ b/packages/client/src/ui/visitor/a.vue
@@ -16,7 +16,7 @@
 				<div v-if="meta" class="about">
 					<div
 						class="desc"
-						v-html="meta.description || i18n.ts.introCalckey"
+						v-html="meta.description || i18n.ts.introMisskey"
 					></div>
 				</div>
 				<div class="action">
diff --git a/packages/client/src/ui/visitor/kanban.vue b/packages/client/src/ui/visitor/kanban.vue
index 5e2fa72cb..1391bfb67 100644
--- a/packages/client/src/ui/visitor/kanban.vue
+++ b/packages/client/src/ui/visitor/kanban.vue
@@ -26,7 +26,7 @@
 					<div v-if="meta" class="about">
 						<div
 							class="desc"
-							v-html="meta.description || i18n.ts.introCalckey"
+							v-html="meta.description || i18n.ts.introMisskey"
 						></div>
 					</div>
 					<div class="action">

From 877d44bc7c1087287e7afcc79fa6c2956f10aecc Mon Sep 17 00:00:00 2001
From: Panagiotis Damelos <dreamsareimmortal@hotmail.com>
Date: Mon, 17 Apr 2023 23:35:24 +0000
Subject: [PATCH 489/582] chore: Translated using Weblate (Greek)

Currently translated at 31.6% (545 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/el/
---
 locales/el-GR.yml | 352 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 267 insertions(+), 85 deletions(-)

diff --git a/locales/el-GR.yml b/locales/el-GR.yml
index d32dd9c72..3595fd3ca 100644
--- a/locales/el-GR.yml
+++ b/locales/el-GR.yml
@@ -1,22 +1,21 @@
----
 _lang_: "Ελληνικά"
-monthAndDay: "{μήνας}/{ημέρα}"
+monthAndDay: "{day}/{month}"
 search: "Αναζήτηση"
 notifications: "Ειδοποιήσεις"
 username: "Όνομα μέλους"
 password: "Κωδικός πρόσβασης"
 forgotPassword: "Ξέχασα τον κωδικό πρόσβασης"
-fetchingAsApObject: "Μαζεύοντας από το Fediverse..."
+fetchingAsApObject: "Άντληση από το Fediverse"
 ok: "Εντάξει"
 gotIt: "Τό'πιασα!"
 cancel: "Ακύρωση"
-enterUsername: "Εισάγετε το όνομα μέλους"
-renotedBy: "Κοινοποιήθηκε από {user}"
-noNotes: "Δεν υπάρχουν σημειώματα"
+enterUsername: "Εισαγωγή ονόματος μέλους"
+renotedBy: "Προωθήθηκε από {user}"
+noNotes: "Δεν υπάρχουν δημοσιεύσεις"
 noNotifications: "Δεν υπάρχουν ειδοποιήσεις"
 settings: "Ρυθμίσεις"
 basicSettings: "Βασικές ρυθμίσεις"
-otherSettings: "Άλλες ρυθμίσεις"
+otherSettings: "Άλλες Ρυθμίσεις"
 openInWindow: "Άνοιγμα σε παράθυρο"
 profile: "Προφίλ"
 timeline: "Χρονολόγιο"
@@ -24,25 +23,26 @@ noAccountDescription: "Αυτό το μέλος δεν έχει γράψει β
 login: "Σύνδεση"
 loggingIn: "Συνδέεστε"
 logout: "Αποσύνδεση"
-signup: "Δημιουργία λογαριασμού"
+signup: "Εγγραφή"
 uploading: "Ανέβασμα..."
 save: "Αποθήκευση"
 users: "Μέλη"
 addUser: "Προσθήκη μέλους"
-favorite: "Προσθήκη στα αγαπημένα"
-favorites: "Αγαπημένα"
-unfavorite: "Αφαίρεση από αγαπημένα"
-favorited: "Προστέθηκε στα αγαπημένα."
-alreadyFavorited: "Έχει ήδη προστεθεί στα αγαπημένα."
-cantFavorite: "Αδυναμία προσθήκης στα αγαπημένα."
+favorite: "Προσθήκη στους σελιδοδείκτες"
+favorites: "Σελιδοδείκτες"
+unfavorite: "Αφαίρεση από σελιδοδείκτες"
+favorited: "Προστέθηκε στους σελιδοδείκτες."
+alreadyFavorited: "Έχει ήδη προστεθεί στους σελιδοδείκτες."
+cantFavorite: "Αδυναμία προσθήκης στους σελιδοδείκτες."
 pin: "Καρφίτσωμα στο προφίλ"
 unpin: "Ξεκαρφίτσωμα από το προφίλ"
 copyContent: "Αντιγραφή περιεχομένων"
 copyLink: "Αντιγραφή συνδέσμου"
 delete: "Διαγραφή"
 deleteAndEdit: "Διαγραφή και επεξεργασία"
-deleteAndEditConfirm: "Σίγουρα θέλετε να διαγράψετε αυτό το σημείωμα και να το επεξεργαστείτε; Θα χάσετε όλες τις αντιδράσεις, κοινοποιήσεις και απαντήσεις σε αυτό."
-addToList: "Προσθήκη στη λίστα"
+deleteAndEditConfirm: "Σίγουρα θέλετε να διαγράψετε αυτή τη δημοσίευση και να την\
+  \ επεξεργαστείτε; Θα χάσετε όλες τις αντιδράσεις, προωθήσεις και απαντήσεις σε αυτήν."
+addToList: "Προσθήκη σε λίστα"
 sendMessage: "Αποστολή μηνύματος"
 copyUsername: "Αντιγραφή ονόματος μέλους"
 searchUser: "Αναζήτηση μέλους"
@@ -55,20 +55,22 @@ receiveFollowRequest: "Λάβατε αίτημα ακολούθησης"
 followRequestAccepted: "Το αίτημα ακολούθησης έγινε δεκτό"
 mention: "Επισήμανση"
 mentions: "Επισημάνσεις"
-directNotes: "Απευθείας σημειώματα"
-importAndExport: "Εισαγωγή / Εξαγωγή"
+directNotes: "Απευθείας μηνύματα"
+importAndExport: "Εισαγωγή/Εξαγωγή Δεδομένων"
 import: "Εισαγωγή"
 export: "Εξαγωγή"
 files: "Αρχεία"
-download: "Λήψη"
-driveFileDeleteConfirm: "Θέλετε σίγουρα να διαγράψετε το αρχείο \"{name}\"; Τα σημειώματα με αυτό το συνημμένο αρχείο επίσης θα διαγραφούν."
+download: "Κατέβασμα"
+driveFileDeleteConfirm: "Θέλετε σίγουρα να διαγράψετε το αρχείο \"{name}\"; Οι δημοσιεύσεις\
+  \ με αυτό το συνημμένο αρχείο επίσης θα διαγραφούν."
 unfollowConfirm: "Θέλετε σίγουρα να σταματήσετε να ακολουθείτε το μέλος {name};"
-exportRequested: "Ζητήσατε μία εξαγωγή. Αυτό μπορεί να πάρει κάποιον χρόνο. Επίσης θα προστεθεί στον Δίσκο σας μόλις ολοκληρωθεί."
-importRequested: "Ζητήσατε μία εισαγωγή. Αυτό μπορεί να πάρει κάποιον χρόνο."
+exportRequested: "Ζητήσατε μία εξαγωγή. Αυτό μπορεί να πάρει κάποιον χρόνο. Θα προστεθεί\
+  \ στον Δίσκο σας μόλις ολοκληρωθεί."
+importRequested: "Ζητήσατε μια εισαγωγή. Αυτό μπορεί να πάρει κάποιον χρόνο."
 lists: "Λίστες"
 noLists: "Δεν έχετε λίστες"
-note: "Σημείωμα"
-notes: "Σημειώματα"
+note: "Δημοσίευση"
+notes: "Δημοσιεύσεις"
 following: "Ακολουθεί"
 followers: "Ακολουθούν"
 followsYou: "Σε ακολουθεί"
@@ -78,35 +80,40 @@ error: "Σφάλμα"
 somethingHappened: "Προέκυψε ένα σφάλμα"
 retry: "Προσπάθεια ξανά"
 pageLoadError: "Ένα σφάλμα προέκυψε φορτώνοντας τη σελίδα."
-pageLoadErrorDescription: "Αυτό κανονικά προκαλείται από σφάλματα δικτύου ή από την προσωρινή μνήμη του προγράμματος περιήγησης. Δοκιμάστε να σβήσετε την προσωρινή μνήμη (cache) και ξαναδοκιμάστε μετά από λίγο."
-serverIsDead: "Αυτός ο server δεν αποκρίνεται. Παρακαλώ περιμέντε λίγο και δοκιμάστε ξανά."
-youShouldUpgradeClient: "Για να δείτε αυτή τη σελίδα, παρακαλώ επαναφορτώστε για να ενημερωθεί το πρόγραμμα."
+pageLoadErrorDescription: "Αυτό κανονικά προκαλείται από σφάλματα δικτύου ή από την\
+  \ προσωρινή μνήμη του προγράμματος περιήγησης. Δοκιμάστε να σβήσετε την προσωρινή\
+  \ μνήμη (cache) και να δοκιμάσετε ξανά μετά από λίγο."
+serverIsDead: "Αυτός ο server δεν αποκρίνεται. Παρακαλώ περιμέντε λίγο και δοκιμάστε\
+  \ ξανά."
+youShouldUpgradeClient: "Για να δείτε αυτή τη σελίδα, παρακαλώ επαναφορτώστε για να\
+  \ γίνει ενημέρωση."
 enterListName: "Πληκτρολογήστε ένα όνομα για τη λίστα"
 privacy: "Ιδιωτικότητα"
 makeFollowManuallyApprove: "Τα αιτήματα ακολούθησης χρειάζονται έγκριση"
 defaultNoteVisibility: "Προεπιλεγμένη ορατότητα"
 follow: "Ακολουθήστε"
-followRequest: "Στείλτε αίτημα ακολούθησης"
+followRequest: "Ακολουθήστε"
 followRequests: "Αιτήματα ακολούθησης"
 unfollow: "Να μην ακολουθώ"
 followRequestPending: "Το αίτημα ακολούθησης εκκρεμεί"
 enterEmoji: "Εισάγετε ένα emoji"
-renote: "Κοινοποίηση σημειώματος"
-unrenote: "Ακύρωση κοινοποίησης"
-renoted: "Κοινοποιήθηκε."
-cantRenote: "Αυτή η δημοσίευση δεν μπορεί να κοινοποιηθεί."
-cantReRenote: "Μία κοινοποίηση δεν μπορεί να κοινοποιηθεί."
+renote: "Προώθηση"
+unrenote: "Αναίρεση προώθησης"
+renoted: "Προωθήθηκε."
+cantRenote: "Αυτή η δημοσίευση δεν μπορεί να προωθηθεί."
+cantReRenote: "Μία προώθηση δεν μπορεί να προωθηθεί."
 quote: "Παράθεση"
-pinnedNote: "Καρφιτσωμένο σημείωμα"
+pinnedNote: "Καρφιτσωμένη δημοσίευση"
 pinned: "Καρφίτσωμα στο προφίλ"
 you: "Εσύ"
 clickToShow: "Κάντε κλικ για εμφάνιση"
-add: "Προσθέστε"
+add: "Προσθήκη"
 reaction: "Αντιδράσεις"
-reactionSetting: "Αντιδράσεις για εμφάνιση στην επιλογή αντίδρασης"
-reactionSettingDescription2: "Σύρετε για να αλλάξετε τη σειρά, κάντε κλικ για να διαγράψετε, πατήστε \"+\" για να προσθέσετε."
-rememberNoteVisibility: "Θυμήσου τις ρυθμίσεις ορατότητας σημειώματος"
-attachCancel: "Διαγραφή αρχείου"
+reactionSetting: "Αντιδράσεις που θα εμφανίζονται στον επιλογέα"
+reactionSettingDescription2: "Σύρετε για να αλλάξετε τη σειρά, κάντε κλικ για να διαγράψετε,\
+  \ πατήστε \"+\" για να προσθέσετε."
+rememberNoteVisibility: "Θυμήσου τις ρυθμίσεις ορατότητας για τις δημοσιεύσεις"
+attachCancel: "Αφαίρεση επισυναπτόμενου"
 enterFileName: "Πληκτρολογήστε όνομα αρχείου"
 mute: "Σίγαση"
 unmute: "Άρση σίγασης"
@@ -116,31 +123,31 @@ suspend: "Αποβολή"
 unsuspend: "Άρση αποβολής"
 blockConfirm: "Θέλετε σίγουρα να μπλοκάρετε αυτόν τον λογαριασμό;"
 unblockConfirm: "Θέλετε σίγουρα να ξεμπλοκάρετε αυτόν τον λογαριασμό;"
-suspendConfirm: "Θέλετε σίγουρα να αποβάλλετε αυτόν τον λογαριασμό;"
+suspendConfirm: "Θέλετε σίγουρα να αποβάλετε αυτόν τον λογαριασμό;"
 unsuspendConfirm: "Θέλετε σίγουρα να άρετε την αποβολή αυτού του λογαριασμού;"
-selectList: "Επιλέξτε μία λίστα"
-selectAntenna: "Επιλέξτε μία αντένα"
-selectWidget: "Επιλέξτε ένα μαραφέτι"
-editWidgets: "Επεξεργασία μαραφετίων"
+selectList: "Επιλέξτε μια λίστα"
+selectAntenna: "Επιλέξτε μια αντένα"
+selectWidget: "Επιλέξτε ένα πρόσθετο"
+editWidgets: "Επεξεργασία πρόσθετων"
 editWidgetsExit: "Ολοκληρώθηκε"
-customEmojis: "Επιπλέον emoji"
+customEmojis: "Προσαρμοσμένα Emoji"
 emojiName: "Όνομα emoji"
-addEmoji: "Προσθήκη emoji"
-settingGuide: "Συνιστώμενες ρυθμίσεις"
-flagAsBot: "Αυτός ο λογαριασμός είναι bot"
-flagAsCat: "Αυτός ο λογαριασμός είναι γάτα"
+addEmoji: "Προσθήκη"
+settingGuide: "Προτεινόμενες ρυθμίσεις"
+flagAsBot: "Δήλωση αυτού του λογαριασμού ως bot"
+flagAsCat: "Είσαι γατί; \U0001F63A"
 flagShowTimelineReplies: "Εμφάνιση απαντήσεων στο χρονολόγιο"
 addAccount: "Προσθήκη λογαριασμού"
 general: "Γενικές"
 wallpaper: "Ταπετσαρία"
 setWallpaper: "Ορισμός ταπετσαρίας"
-removeWallpaper: "Διαγραφή ταπετσαρίας"
+removeWallpaper: "Αφαίρεση ταπετσαρίας"
 searchWith: "Αναζήτηση: {q}"
 youHaveNoLists: "Δεν έχετε λίστες"
 followConfirm: "Θέλετε σίγουρα να ακολουθήσετε τον λογαριασμό {name};"
 host: "Φιλοξενεί"
 selectUser: "Επιλέξτε ένα μέλος"
-recipient: "Αποδέκτης-τρια"
+recipient: "Αποδέκτης-τρια(-ες)"
 annotation: "Σχόλια"
 federation: "Ομοσπονδία"
 storageUsage: "Χρήση χώρου"
@@ -148,11 +155,11 @@ version: "Έκδοση"
 metadata: "Μεταδεδομένα"
 network: "Δίκτυο"
 disk: "Δίσκος"
-instanceInfo: "Πληροφορίες του instance"
+instanceInfo: "Πληροφορίες Instance"
 statistics: "Στατιστικά"
 clearQueue: "Εκκαθάριση ουράς"
 clearQueueConfirmTitle: "Θέλετε να διαγράψετε την ουρά;"
-clearCachedFiles: "Εκκαθάριση προσωρινής μνήμης"
+clearCachedFiles: "Εκκαθάριση προσωρινής μνήμης (cache)"
 done: "Ολοκληρώθηκε"
 attachFile: "Επισύναψη αρχείων"
 more: "Περισσότερα!"
@@ -166,12 +173,12 @@ messaging: "Συνομιλία"
 upload: "Ανεβάστε"
 fromDrive: "Από τον Αποθηκευτικό Χώρο"
 fromUrl: "Από URL"
-uploadFromUrl: "Ανεβάστε από URL"
-explore: "Εξερευνήστε"
+uploadFromUrl: "Ανέβασμα από URL"
+explore: "Εξερεύνηση"
 messageRead: "Διαβάστηκε"
-startMessaging: "Ξεκινήστε μία συνομιλία"
+startMessaging: "Ξεκινήστε μια νέα συνομιλία"
 nUsersRead: "διαβάστηκε από {n}"
-tos: "Όροι χρήσης"
+tos: "Όροι Χρήσης"
 start: "Ας αρχίσουμε"
 home: "Κεντρικό"
 activity: "Δραστηριότητα"
@@ -189,16 +196,16 @@ selectFiles: "Επιλέξτε αρχεία"
 selectFolder: "Επιλέξτε φάκελο"
 selectFolders: "Επιλέξτε φακέλους"
 renameFile: "Μετονομασία αρχείου"
-addFile: "Προσθήκη αρχείου"
+addFile: "Προσθέστε ένα αρχείο"
 emptyDrive: "Ο Αποθηκευτικός Χώρος σας είναι άδειος"
-copyUrl: "Αντιγραφή URL"
-rename: "Αλλαγή ονόματος"
-avatar: "Εικονίδιο"
-banner: "Πανό"
+copyUrl: "Αντιγραφή διεύθυνσης URL"
+rename: "Μετονομασία"
+avatar: "Εικόνα προφίλ"
+banner: "Εξώφυλλο"
 reload: "Ανανέωση"
 doNothing: "Αγνόηση"
 watch: "Παρακολούθηση"
-unwatch: "Τέλος παρακολούθησης"
+unwatch: "Άρση παρακολούθησης"
 accept: "Αποδοχή"
 reject: "Απόρριψη"
 normal: "Κανονικό"
@@ -212,23 +219,23 @@ connectService: "Σύνδεση"
 disconnectService: "Αποσύνδεση"
 registration: "Εγγραφή"
 pinnedPages: "Καρφιτσωμένες Σελίδες"
-pinnedNotes: "Καρφιτσωμένα σημειώματα"
+pinnedNotes: "Καρφιτσωμένες δημοσιεύσεις"
 antennas: "Αντένες"
-manageAntennas: "Διαχείριση αντενών"
+manageAntennas: "Διαχείρισης Αντενών"
 name: "Όνομα"
-antennaSource: "Πηγή αντένας"
+antennaSource: "Πηγή Αντένας"
 antennaKeywords: "Λέξεις-κλειδιά για παρακολούθηση"
-antennaExcludeKeywords: "Λέξεις-κλειδιά για αποκλεισμό"
-notifyAntenna: "Ειδοποίηση για νέα σημειώματα"
+antennaExcludeKeywords: "Λέξεις-κλειδιά για εξαίρεση"
+notifyAntenna: "Ειδοποίηση για νέες δημοσιεύσεις"
 withFileAntenna: "Μόνο σημειώματα με αρχεία"
 caseSensitive: "Διάκριση Πεζών-Κεφαλαίων"
 popularTags: "Δημοφιλείς ετικέτες"
 userList: "Λίστες"
-about: "Πληροφορίες"
+about: "Σχετικά με"
 moderator: "Συντονιστής"
 moderation: "Συντονισμός"
-cacheClear: "Εκκαθάριση προσωρινής μνήμης"
-markAsReadAllNotifications: "Όλες οι ειδοποιήσεις διαβάστηκαν"
+cacheClear: "Εκκαθάριση προσωρινής μνήμης (cache)"
+markAsReadAllNotifications: "Σημειώστε όλες τις ειδοποιήσεις ως διαβασμένες"
 group: "Ομάδα"
 groups: "Ομάδες"
 createGroup: "Δημιουργία ομάδας"
@@ -236,13 +243,13 @@ ownedGroups: "Οι ομάδες σας"
 groupName: "Όνομα ομάδας"
 members: "Μέλη"
 transfer: "Μεταφορά"
-messagingWithUser: "Ιδιωτική συνομιλία"
+messagingWithUser: "Προσωπική συνομιλία"
 messagingWithGroup: "Ομαδική συνομιλία"
 title: "Τίτλος"
 text: "Κείμενο"
 enable: "Ενεργοποίηση"
 next: "Επόμενο"
-noteOf: "Σημείωμα από {user}"
+noteOf: "Δημοσίευση από {user}"
 inviteToGroup: "Πρόσκληση στην ομάδα"
 quoteAttached: "Παράθεση"
 signinRequired: "Παρακαλούμε δημιουργήστε λογαριασμό ή συνδεθείτε πριν συνεχίσετε"
@@ -250,25 +257,25 @@ category: "Κατηγορία"
 tags: "Ετικέτες"
 createAccount: "Δημιουργία λογαριασμού"
 local: "Τοπικό"
-remote: "Απομακρυσμένo"
+remote: "Απομακρυσμένο"
 total: "Σύνολο"
 appearance: "Εμφάνιση"
-accountSettings: "Ρυθμίσεις λογαριασμού"
+accountSettings: "Ρυθμίσεις Λογαριασμού"
 sounds: "Ήχοι"
 sound: "Ήχοι"
 listen: "Ακρόαση"
 showInPage: "Εμφάνιση στη σελίδα"
 volume: "Ένταση"
-masterVolume: "Κύρια ένταση"
+masterVolume: "Κεντρική ένταση"
 details: "Λεπτομέρειες"
-install: "Εγκατάσταση"
-uninstall: "Κατάργηση εγκατάστασης"
+install: "Εγκαταστήστε"
+uninstall: "Απεγκατάσταση"
 manage: "Διαχείριση"
 smtpHost: "Φιλοξενεί"
 smtpUser: "Όνομα μέλους"
-smtpPass: "Κωδικός πρόσβασης"
+smtpPass: "Κωδικός"
 notificationSetting: "Ρυθμίσεις ειδοποιήσεων"
-notificationSettingDesc: "Επιλέξτε τους τύπους ειδοποιήσεων που εμφανίζονται"
+notificationSettingDesc: "Επιλέξτε τους τύπους ειδοποιήσεων για προβολή."
 switchUi: "Αλλαγή UI"
 clip: "Κλιπ"
 driveFilesCount: "Αριθμός αρχείων Αποθηκευτικού Χώρου"
@@ -293,7 +300,8 @@ manageAccounts: "Διαχείριση Λογαριασμών"
 searchByGoogle: "Αναζήτηση"
 file: "Αρχεία"
 recommended: "Προτεινόμενα"
-cannotUploadBecauseNoFreeSpace: "Το ανέβασμα απέτυχε λόγω ανεπαρκούς Αποθηκευτικού Χώρου"
+cannotUploadBecauseNoFreeSpace: "Το ανέβασμα απέτυχε λόγω ανεπαρκούς Αποθηκευτικού\
+  \ Χώρου"
 _email:
   _follow:
     title: "Έχετε ένα νέο ακόλουθο"
@@ -327,15 +335,20 @@ _ago:
   monthsAgo: "{n} μήνα(ες) πριν"
   yearsAgo: "{n} έτος(η) πριν"
 _permissions:
-  "write:drive": "Επεξεργαστείτε ή διαγράψτε τα αρχεία και τους φακέλους του Αποθηκευτικού Χώρου σας"
-  "read:favorites": "Δείτε τη λίστα των αγαπημένων σας"
-  "write:favorites": "Επεξεργαστείτε τη λίστα των αγαπημένων σας"
+  "write:drive": "Επεξεργαστείτε ή διαγράψτε τα αρχεία και τους φακέλους του Αποθηκευτικού\
+    \ Χώρου σας"
+  "read:favorites": "Δείτε τη λίστα με τους σελιδοδείκτες σας"
+  "write:favorites": "Επεξεργαστείτε τη λίστα με τους σελιδοδείκτες σας"
   "read:messaging": "Δείτε τις συνομιλίες σας"
   "write:messaging": "Γράψτε ή διαγράψτε μηνύματα συνομιλίας"
   "read:notifications": "Δείτε τις ειδοποιήσεις σας"
   "write:notifications": "Διαχειριστείτε τις ειδοποιήσεις σας"
   "read:pages": "Δείτε τις Σελίδες σας"
   "write:pages": "Επεξεργαστείτε ή διαγράψτε τις σελίδες σας"
+  "write:gallery-likes": Επεξεργασία της λίστας των αγαπημένων σας δημοσιεύσεων γκαλερί
+  "read:gallery": Δείτε την γκαλερί σας
+  "write:gallery": Επεξεργασία της γκαλερί σας
+  "read:gallery-likes": Δείτε τη λίστα των αγαπημένων σας δημοσιεύσεων γκαλερί
 _antennaSources:
   all: "Όλα τα σημειώματα"
   homeTimeline: "Σημειώματα από μέλη που ακολουθείτε"
@@ -398,7 +411,8 @@ _notification:
     reply: "Απάντηση"
     renote: "Κοινοποίηση σημειώματος"
 _deck:
-  widgetsIntroduction: "Παρακαλούμε επιλέξτε \"Επεξεργασία μαραφετίων\" στο μενού και προσθέστε μαραφέτι."
+  widgetsIntroduction: "Παρακαλούμε επιλέξτε \"Επεξεργασία μαραφετίων\" στο μενού\
+    \ και προσθέστε μαραφέτι."
   _columns:
     widgets: "Μαραφέτια"
     notifications: "Ειδοποιήσεις"
@@ -406,3 +420,171 @@ _deck:
     antenna: "Αντένες"
     list: "Λίστα"
     mentions: "Επισημάνσεις"
+sensitive: Ευαίσθητο περιεχόμενο (NSFW)
+createFolder: Δημιουργία φακέλου
+uploadFromUrlDescription: Το URL του αρχείου που θέλετε να ανεβάσετε
+emptyFolder: Αυτός ο φάκελος είναι άδειος
+unableToDelete: Αδυναμία διαγραφής
+recentlyUpdatedUsers: Πρόσφατα ενεργά μέλη
+recentlyRegisteredUsers: Νέα μέλη
+exploreUsersCount: Υπάρχουν {count} μέλη
+help: Βοήθεια
+inputNewFileName: Πληκτρολογήστε ένα νέο όνομα αρχείου
+nothing: Δεν υπάρχει τίποτα να δείτε εδώ
+newNoteRecived: Δεν υπάρχουν νέες δημοσιεύσεις
+passwordMatched: Ταιριάζει
+unmarkAsSensitive: Αναίρεση επισήμανσης ως Ευαίσθητο Περιεχόμενο (NSFW)
+withNFiles: '{n} αρχείο(-α)'
+blockedUsers: Μπλοκαρισμένα μέλη
+noteDeleteConfirm: Θέλετε σίγουρα να διαγράψετε αυτή τη δημοσίευση;
+preview: Προεπισκόπηση
+noCustomEmojis: Δεν υπάρχουν emoji
+tosUrl: URL Όρων Χρήσης
+monthX: '{month}'
+markAsReadAllTalkMessages: Σημειώστε όλα τα μηνύματα ως διαβασμένα
+inputMessageHere: Γράψτε εδώ το μήνυμά σας
+close: Κλείσιμο
+newMessageExists: Δεν υπάρχουν νέα μηνύματα
+usernameInvalidFormat: Μπορείτε να χρησιμοποιήσετε κεφαλαία και μικρά γράμματα, αριθμούς,
+  και κάτω παύλες.
+tooShort: Πολύ μικρό
+passwordNotMatched: Δεν ταιριάζει
+existingAccount: Υπάρχων λογαριασμός
+deleteAll: Διαγραφή όλων
+chooseEmoji: Επιλέξτε ένα emoji
+sort: Ταξινόμηση
+descendingOrder: Φθίνουσα
+deleteAllFiles: Διαγραφή όλων των αρχείων
+userSuspended: Αυτό το μέλος έχει αποβληθεί.
+menu: Μενού
+divider: Χώρισμα
+deletedNote: Διαγραμμένη δημοσίευση
+useCw: Απόκρυψη περιεχομένου
+description: Περιγραφή
+width: Πλάτος
+disableAll: Απενεργοποίηση όλων
+notificationType: Τύπος ειδοποίησης
+wordMute: Σίγαση λέξεων
+userSaysSomething: '{name} είπε κάτι'
+metrics: Μετρήσεις
+overview: Γενική εικόνα
+database: Βάση δεδομένων
+channel: Κανάλια
+other: Άλλα
+abuseReports: Αναφορές
+reportAbuse: Αναφορά
+unclip: Ακύρωση κλιπ
+public: Δημόσιο
+renotedCount: Αριθμός προωθήσεων που ελήφθησαν
+alwaysMarkSensitive: Επισήμανση ως ευαίσθητο περιεχόμενο (NSFW) ως προεπιλογή
+markAllAsRead: Σημειώστε τα όλα ως διαβασμένα
+_gallery:
+  like: Μου αρέσει
+  liked: Αγαπημένες δημοσιεύσεις
+  my: Η Γκαλερί μου
+  unlike: Δεν μου αρέσει
+showOnRemote: Δείτε στο απομακρυσμένο instance
+perDay: Ανά Ημέρα
+software: Λογισμικό
+cpuAndMemory: CPU και Μνήμη
+noUsers: Δεν υπάρχουν μέλη
+processing: Επεξεργασία...
+changePassword: Αλλαγή κωδικού
+security: Ασφάλεια
+featured: Προτεινόμενα
+keepOriginalUploading: Διατήρηση πρωτότυπης εικόνας
+manageGroups: Διαχείριση ομάδων
+deleteFolder: Διαγραφή φακέλου
+nsfw: Ευαίσθητο περιεχόμενο (NSFW)
+nUsersMentioned: Έχει αναφερθεί από {n} μέλη
+notFound: Δεν βρέθηκε
+markAsReadAllUnreadNotes: Σημειώστε όλες τις δημοσιεύσεις ως διαβασμένες
+invites: Προσκλήσεις
+quoteQuestion: Επισύναψη ως παράθεση;
+noMessagesYet: Δεν υπάρχουν μηνύματα ακόμη
+onlyOneFileCanBeAttached: Μπορείτε να επισυνάψετε μόνο ένα αρχείο σε ένα μήνυμα
+tooLong: Πολύ μεγάλο
+or: Ή
+language: Γλώσσα
+groupInvited: Προσκληθήκατε σε μία ομάδα
+ascendingOrder: Αύξουσα
+visibility: Ορατότητα
+invisibleNote: Αόρατη δημοσίευση
+enableInfiniteScroll: Αυτόματη φόρτωση περισσοτέρων
+poll: Ψηφοφορία
+enablePlayer: Άνοιγμα προβολής βίντεο
+large: Μεγάλο
+medium: Μεσαίο
+small: Μικρό
+postToGallery: Δημιουργία νέας δημοσίευσης γκαλερί
+reloadConfirm: Θα θέλατε να ανανεώσετε το χρονολόγιο;
+enableAll: Ενεργοποίηση όλων
+permission: Εξουσιοδοτήσεις
+sample: Δείγμα
+copy: Αντιγραφή
+display: Προβολή
+send: Αποστολή
+behavior: Συμπεριφορά
+useGlobalSetting: Χρήση παγκόσμιων ρυθμίσεων
+abuseMarkAsResolved: Επισήμανση της αναφοράς ως επιλυμένη
+openInNewTab: Άνοιγμα σε νέα καρτέλα
+_sensitiveMediaDetection:
+  setSensitiveFlagAutomatically: Επισήμανση ως ευαίσθητο περιεχόμενο (NSFW)
+defaultNavigationBehaviour: Προεπιλεγμένη συμπεριφορά περιήγησης
+system: Σύστημα
+createNew: Δημιουργία νέου
+createNewClip: Δημιουργία νέου κλιπ
+repliesCount: Αριθμός απεσταλμένων απαντήσεων
+optional: Προαιρετικό
+renotesCount: Αριθμός προωθήσεων σε δημοσιεύσεις άλλων
+addItem: Προσθήκη αντικειμένου
+disablePlayer: Κλείσιμο προβολής βίντεο
+describeFile: Προσθήκη λεζάντας
+enterFileDescription: Πληκτρολογήστε λεζάντα
+author: Συντάκτης
+setMultipleBySeparatingWithSpace: Διαχωρίστε πολλαπλές καταχωρήσεις με κενά.
+random: Τυχαίο
+accountInfo: Πληροφορίες Λογαριασμού
+notesCount: Αριθμός δημοσιεύσεων
+repliedCount: Αριθμός απαντήσεων που ελήφθησαν
+flagAsCatDescription: Θα έχεις γατοαυτιά και θα μιλάς σαν γατί!
+muteAndBlock: Σιγάσεις και Μπλοκαρίσματα
+mutedUsers: Σιγασμένα μέλη
+editProfile: Επεξεργασία προφίλ
+pinLimitExceeded: Δεν μπορείτε να καρφιτσώσετε άλλες δημοσιεύσεις
+currentPassword: Τρέχων κωδικός
+newPassword: Νέος κωδικός
+newPasswordRetype: Ξαναγράψτε τον νέο κωδικό
+notesAndReplies: Δημοσιεύσεις και απαντήσεις
+popularUsers: Δημοφιλή μέλη
+share: Κοινοποίηση
+retype: Πληκτρολογήστε ξανά
+invitations: Προσκλήσεις
+available: Διαθέσιμο
+unavailable: Μη διαθέσιμο
+youHaveNoGroups: Δεν έχετε ομάδες
+doing: Επεξεργασία...
+yourAccountSuspendedTitle: Αυτός ο λογαριασμός έχει αποβληθεί
+leaveConfirm: Υπάρχουν αλλαγές που δεν έχουν σωθεί. Θέλετε να τις απορρίψετε;
+height: Ύψος
+edit: Επεξεργασία
+headlineMisskey: Μία ανοιχτού λογισμικού, αποκεντρωμένη πλατφόρμα κοινωνικής δικτύωσης
+  που θα είναι για πάντα ελεύθερη! 🚀
+introMisskey: Καλώς ήρθατε! Το Calckey είναι μία ανοιχτού λογισμικού, αποκεντρωμένη
+  πλατφόρμα κοινωνικής δικτύωσης που θα είναι για πάντα ελεύθερη! 🚀
+markAsSensitive: Επισήμανση ως Ευαίσθητο Περιεχόμενο (NSFW)
+autoAcceptFollowed: Αυτόματη έγκριση αιτημάτων ακολούθησης από λογαριασμούς που ακολουθείτε
+loginFailed: Αποτυχία σύνδεσης
+accountMoved: 'Έχει μεταφερθεί σε νέο λογαριασμό:'
+perHour: Ανά Ώρα
+remoteUserCaution: Οι πληροφορίες από απομακρυσμένους λογαριασμούς μπορεί να είναι
+  ατελείς.
+folderName: Όνομα φακέλου
+renameFolder: Μετονομασία φακέλου
+recentUsed: Χρησιμοποιήθηκαν πρόσφατα
+deleteAllFilesConfirm: Σίγουρα θέλετε να διαγράψετε όλα τα αρχεία;
+removeAllFollowing: Άρση ακολούθησης όλων των ακολουθούμενων μελών
+userSilenced: Αυτό το μέλος είναι υπό σίγαση.
+makeActive: Ενεργοποίηση
+create: Δημιουργία
+reportAbuseOf: Αναφορά {name}

From f80ac680353edf442a5d056c52ec1d8402612c0c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 18 Apr 2023 11:58:04 -0700
Subject: [PATCH 490/582] gallery styling

---
 packages/client/src/pages/gallery/post.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue
index 0c104b4c7..8eb104624 100644
--- a/packages/client/src/pages/gallery/post.vue
+++ b/packages/client/src/pages/gallery/post.vue
@@ -203,7 +203,7 @@ function shareWithNote() {
 }
 
 function like() {
-	os.apiWithDialog("gallery/posts/like", {
+	os.api("gallery/posts/like", {
 		postId: props.postId,
 	}).then(() => {
 		post.isLiked = true;
@@ -266,6 +266,7 @@ definePageMetadata(
 				max-width: 100%;
 				max-height: 500px;
 				margin: 0 auto;
+				border-radius: 10px;
 			}
 
 			& + .file {

From 0cbc9330f2c0df45787c904878ed8e8763293d20 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Tue, 18 Apr 2023 18:59:21 +0000
Subject: [PATCH 491/582] chore: Translated using Weblate (English)

Currently translated at 100.0% (1724 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/en/
---
 locales/en-US.yml | 363 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 255 insertions(+), 108 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 99b0a7c86..648f7f1fd 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1,7 +1,8 @@
----
 _lang_: "English"
-headlineMisskey: "An open source, decentralized social media platform that's free forever! 🚀"
-introMisskey: "Welcome! Calckey is an open source, decentralized social media platform that's free forever! 🚀"
+headlineMisskey: "An open source, decentralized social media platform that's free\
+  \ forever! \U0001F680"
+introMisskey: "Welcome! Calckey is an open source, decentralized social media platform\
+  \ that's free forever! \U0001F680"
 monthAndDay: "{month}/{day}"
 search: "Search"
 notifications: "Notifications"
@@ -46,7 +47,8 @@ copyContent: "Copy contents"
 copyLink: "Copy link"
 delete: "Delete"
 deleteAndEdit: "Delete and edit"
-deleteAndEditConfirm: "Are you sure you want to delete this post and edit it? You will lose all reactions, boosts and replies to it."
+deleteAndEditConfirm: "Are you sure you want to delete this post and edit it? You\
+  \ will lose all reactions, boosts and replies to it."
 addToList: "Add to list"
 sendMessage: "Send a message"
 copyUsername: "Copy username"
@@ -66,9 +68,11 @@ import: "Import"
 export: "Export"
 files: "Files"
 download: "Download"
-driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? Posts with this file attached will also be deleted."
+driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? Posts\
+  \ with this file attached will also be deleted."
 unfollowConfirm: "Are you sure that you want to unfollow {name}?"
-exportRequested: "You've requested an export. This may take a while. It will be added to your Drive once completed."
+exportRequested: "You've requested an export. This may take a while. It will be added\
+  \ to your Drive once completed."
 importRequested: "You've requested an import. This may take a while."
 lists: "Lists"
 noLists: "You don't have any lists"
@@ -83,7 +87,8 @@ error: "Error"
 somethingHappened: "An error has occurred"
 retry: "Retry"
 pageLoadError: "An error occurred loading the page."
-pageLoadErrorDescription: "This is normally caused by network errors or the browser's cache. Try clearing the cache and then try again after waiting a little while."
+pageLoadErrorDescription: "This is normally caused by network errors or the browser's\
+  \ cache. Try clearing the cache and then try again after waiting a little while."
 serverIsDead: "This server is not responding. Please wait for a while and try again."
 youShouldUpgradeClient: "To view this page, please refresh to update your client."
 enterListName: "Enter a name for the list"
@@ -141,15 +146,21 @@ emojiUrl: "Emoji URL"
 addEmoji: "Add"
 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 instance. Disabling this will decrease storage usage,\
+  \ but increase traffic, as thumbnails will not be generated."
 flagAsBot: "Mark this account as a bot"
-flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Calckey's internal systems to treat this account as a bot."
-flagAsCat: "Are you a cat? 😺"
+flagAsBotDescription: "Enable this option if this account is controlled by a program.\
+  \ If enabled, it will act as a flag for other developers to prevent endless interaction\
+  \ chains with other bots and adjust Calckey's internal systems to treat this account\
+  \ as a bot."
+flagAsCat: "Are you a cat? \U0001F63A"
 flagAsCatDescription: "You'll get cat ears and speak like a cat!"
 flagSpeakAsCat: "Speak as a cat"
 flagSpeakAsCatDescription: "Your posts will get nyanified when in cat mode"
 flagShowTimelineReplies: "Show replies in timeline"
-flagShowTimelineRepliesDescription: "Shows replies of users to posts of other users in the timeline if turned on."
+flagShowTimelineRepliesDescription: "Shows replies of users to posts of other users\
+  \ in the timeline if turned on."
 autoAcceptFollowed: "Automatically approve follow requests from users you're following"
 addAccount: "Add account"
 loginFailed: "Failed to sign in"
@@ -163,7 +174,10 @@ searchWith: "Search: {q}"
 youHaveNoLists: "You don't have any lists"
 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."
+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"
 selectUser: "Select a user"
 selectInstance: "Select an instance"
@@ -195,13 +209,17 @@ instanceInfo: "Instance Information"
 statistics: "Statistics"
 clearQueue: "Clear queue"
 clearQueueConfirmTitle: "Are you sure that you want to clear the queue?"
-clearQueueConfirmText: "Any undelivered posts remaining in the queue will not be federated. Usually this operation is not needed."
+clearQueueConfirmText: "Any undelivered posts remaining in the queue will not be federated.\
+  \ Usually this operation is not needed."
 clearCachedFiles: "Clear cache"
 clearCachedFilesConfirm: "Are you sure that you want to delete all cached remote files?"
 blockedInstances: "Blocked Instances"
-blockedInstancesDescription: "List the hostnames of the instances that you want to block. Listed instances will no longer be able to communicate with this instance."
+blockedInstancesDescription: "List the hostnames of the instances that you want to\
+  \ block. Listed instances will no longer be able to communicate with this instance."
 hiddenTags: "Hidden Hashtags"
-hiddenTagsDescription: "List the hashtags (without the #) of the hashtags you wish to hide from trending and explore. Hidden hashtags are still discoverable via other means."
+hiddenTagsDescription: "List the hashtags (without the #) of the hashtags you wish\
+  \ to hide from trending and explore. Hidden hashtags are still discoverable via\
+  \ other means."
 muteAndBlock: "Mutes and Blocks"
 mutedUsers: "Muted users"
 blockedUsers: "Blocked users"
@@ -251,7 +269,8 @@ saved: "Saved"
 messaging: "Chat"
 upload: "Upload"
 keepOriginalUploading: "Keep original image"
-keepOriginalUploadingDescription: "Saves the originally uploaded image as-is. If turned off, a version to display on the web will be generated on upload."
+keepOriginalUploadingDescription: "Saves the originally uploaded image as-is. If turned\
+  \ off, a version to display on the web will be generated on upload."
 fromDrive: "From Drive"
 fromUrl: "From URL"
 uploadFromUrl: "Upload from a URL"
@@ -301,7 +320,8 @@ unableToDelete: "Unable to delete"
 inputNewFileName: "Enter a new filename"
 inputNewDescription: "Enter new caption"
 inputNewFolderName: "Enter a new folder name"
-circularReferenceFolder: "The destination folder is a subfolder of the folder you wish to move."
+circularReferenceFolder: "The destination folder is a subfolder of the folder you\
+  \ wish to move."
 hasChildFilesOrFolders: "Since this folder is not empty, it can not be deleted."
 copyUrl: "Copy URL"
 rename: "Rename"
@@ -336,7 +356,8 @@ disconnectService: "Disconnect"
 enableLocalTimeline: "Enable local timeline"
 enableGlobalTimeline: "Enable global timeline"
 enableRecommendedTimeline: "Enable recommended timeline"
-disablingTimelinesInfo: "Adminstrators and Moderators will always have access to all timelines, even if they are not enabled."
+disablingTimelinesInfo: "Adminstrators and Moderators will always have access to all\
+  \ timelines, even if they are not enabled."
 registration: "Register"
 enableRegistration: "Enable new user registration"
 invite: "Invite"
@@ -348,9 +369,11 @@ bannerUrl: "Banner image URL"
 backgroundImageUrl: "Background image URL"
 basicInfo: "Basic info"
 pinnedUsers: "Pinned users"
-pinnedUsersDescription: "List usernames separated by line breaks to be pinned in the \"Explore\" tab."
+pinnedUsersDescription: "List usernames separated by line breaks to be pinned in the\
+  \ \"Explore\" tab."
 pinnedPages: "Pinned Pages"
-pinnedPagesDescription: "Enter the paths of the Pages you want to pin to the top page of this instance, separated by line breaks."
+pinnedPagesDescription: "Enter the paths of the Pages you want to pin to the top page\
+  \ of this instance, separated by line breaks."
 pinnedClipId: "ID of the clip to pin"
 pinnedNotes: "Pinned posts"
 hcaptcha: "hCaptcha"
@@ -361,14 +384,17 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "Enable reCAPTCHA"
 recaptchaSiteKey: "Site key"
 recaptchaSecretKey: "Secret key"
-avoidMultiCaptchaConfirm: "Using multiple Captcha systems may cause interference between them. Would you like to disable the other Captcha systems currently active? If you would like them to stay enabled, press cancel."
+avoidMultiCaptchaConfirm: "Using multiple Captcha systems may cause interference between\
+  \ them. Would you like to disable the other Captcha systems currently active? If\
+  \ you would like them to stay enabled, press cancel."
 antennas: "Antennas"
 manageAntennas: "Manage Antennas"
 name: "Name"
 antennaSource: "Antenna source"
 antennaKeywords: "Keywords to listen to"
 antennaExcludeKeywords: "Keywords to exclude"
-antennaKeywordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
+antennaKeywordsDescription: "Separate with spaces for an AND condition or with line\
+  \ breaks for an OR condition."
 notifyAntenna: "Notify about new posts"
 withFileAntenna: "Only posts with files"
 enableServiceworker: "Enable Push-Notifications for your Browser"
@@ -498,19 +524,27 @@ showFeaturedNotesInTimeline: "Show featured posts in timelines"
 objectStorage: "Object Storage"
 useObjectStorage: "Use object storage"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "The URL used as reference. Specify the URL of your CDN or Proxy if you are using either.\nFor S3 use 'https://<bucket>.s3.amazonaws.com' and for GCS or equivalent services use 'https://storage.googleapis.com/<bucket>', etc."
+objectStorageBaseUrlDesc: "The URL used as reference. Specify the URL of your CDN\
+  \ or Proxy if you are using either.\nFor S3 use 'https://<bucket>.s3.amazonaws.com'\
+  \ and for GCS or equivalent services use 'https://storage.googleapis.com/<bucket>',\
+  \ etc."
 objectStorageBucket: "Bucket"
 objectStorageBucketDesc: "Please specify the bucket name used at your provider."
 objectStoragePrefix: "Prefix"
 objectStoragePrefixDesc: "Files will be stored under directories with this prefix."
 objectStorageEndpoint: "Endpoint"
-objectStorageEndpointDesc: "Leave this empty if you are using AWS S3, otherwise specify the endpoint as '<host>' or '<host>:<port>', depending on the service you are using."
+objectStorageEndpointDesc: "Leave this empty if you are using AWS S3, otherwise specify\
+  \ the endpoint as '<host>' or '<host>:<port>', depending on the service you are\
+  \ using."
 objectStorageRegion: "Region"
-objectStorageRegionDesc: "Specify a region like 'xx-east-1'. If your service does not distinguish between regions, leave this blank or enter 'us-east-1'."
+objectStorageRegionDesc: "Specify a region like 'xx-east-1'. If your service does\
+  \ not distinguish between regions, leave this blank or enter 'us-east-1'."
 objectStorageUseSSL: "Use SSL"
-objectStorageUseSSLDesc: "Turn this off if you are not going to use HTTPS for API connections"
+objectStorageUseSSLDesc: "Turn this off if you are not going to use HTTPS for API\
+  \ connections"
 objectStorageUseProxy: "Connect over Proxy"
-objectStorageUseProxyDesc: "Turn this off if you are not going to use a Proxy for API connections"
+objectStorageUseProxyDesc: "Turn this off if you are not going to use a Proxy for\
+  \ API connections"
 objectStorageSetPublicRead: "Set \"public-read\" on upload"
 serverLogs: "Server logs"
 deleteAll: "Delete all"
@@ -538,7 +572,9 @@ sort: "Sort"
 ascendingOrder: "Ascending"
 descendingOrder: "Descending"
 scratchpad: "Scratchpad"
-scratchpadDescription: "The scratchpad provides an environment for AiScript experiments. You can write, execute, and check the results of it interacting with Calckey in it."
+scratchpadDescription: "The scratchpad provides an environment for AiScript experiments.\
+  \ You can write, execute, and check the results of it interacting with Calckey in\
+  \ it."
 output: "Output"
 script: "Script"
 disablePagesScript: "Disable AiScript on Pages"
@@ -546,11 +582,14 @@ updateRemoteUser: "Update remote user information"
 deleteAllFiles: "Delete all files"
 deleteAllFilesConfirm: "Are you sure that you want to delete all files?"
 removeAllFollowing: "Unfollow all followed users"
-removeAllFollowingDescription: "Executing this unfollows all accounts from {host}. Please run this if the instance e.g. no longer exists."
+removeAllFollowingDescription: "Executing this unfollows all accounts from {host}.\
+  \ Please run this if the instance e.g. no longer exists."
 userSuspended: "This user has been suspended."
 userSilenced: "This user is being silenced."
 yourAccountSuspendedTitle: "This account is suspended"
-yourAccountSuspendedDescription: "This account has been suspended due to breaking the server's terms of services or similar. Contact the administrator if you would like to know a more detailed reason. Please do not create a new account."
+yourAccountSuspendedDescription: "This account has been suspended due to breaking\
+  \ the server's terms of services or similar. Contact the administrator if you would\
+  \ like to know a more detailed reason. Please do not create a new account."
 menu: "Menu"
 divider: "Divider"
 addItem: "Add Item"
@@ -591,12 +630,14 @@ permission: "Permissions"
 enableAll: "Enable all"
 disableAll: "Disable all"
 tokenRequested: "Grant access to account"
-pluginTokenRequestedDescription: "This plugin will be able to use the permissions set here."
+pluginTokenRequestedDescription: "This plugin will be able to use the permissions\
+  \ set here."
 notificationType: "Notification type"
 edit: "Edit"
 emailServer: "Email server"
 enableEmail: "Enable email distribution"
-emailConfigInfo: "Used to confirm your email during sign-up or if you forget your password"
+emailConfigInfo: "Used to confirm your email during sign-up or if you forget your\
+  \ password"
 email: "Email"
 emailAddress: "Email address"
 smtpConfig: "SMTP Server Configuration"
@@ -610,7 +651,8 @@ smtpSecureInfo: "Turn this off when using STARTTLS"
 testEmail: "Test email delivery"
 wordMute: "Word mute"
 regexpError: "Regular Expression error"
-regexpErrorDescription: "An error occurred in the regular expression on line {line} of your {tab} word mutes:"
+regexpErrorDescription: "An error occurred in the regular expression on line {line}\
+  \ of your {tab} word mutes:"
 instanceMute: "Instance Mutes"
 userSaysSomething: "{name} said something"
 userSaysSomethingReason: "{name} said {reason}"
@@ -627,10 +669,13 @@ create: "Create"
 notificationSetting: "Notification settings"
 notificationSettingDesc: "Select the types of notification to display."
 useGlobalSetting: "Use global settings"
-useGlobalSettingDesc: "If turned on, your account's notification settings will be used. If turned off, individual configurations can be made."
+useGlobalSettingDesc: "If turned on, your account's notification settings will be\
+  \ used. If turned off, individual configurations can be made."
 other: "Other"
 regenerateLoginToken: "Regenerate login token"
-regenerateLoginTokenDescription: "Regenerates the token used internally during login. Normally this action is not necessary. If regenerated, all devices will be logged out."
+regenerateLoginTokenDescription: "Regenerates the token used internally during login.\
+  \ Normally this action is not necessary. If regenerated, all devices will be logged\
+  \ out."
 setMultipleBySeparatingWithSpace: "Separate multiple entries with spaces."
 fileIdOrUrl: "File ID or URL"
 behavior: "Behavior"
@@ -638,13 +683,15 @@ sample: "Sample"
 abuseReports: "Reports"
 reportAbuse: "Report"
 reportAbuseOf: "Report {name}"
-fillAbuseReportDescription: "Please fill in details regarding this report. If it is about a specific post, please include its URL."
+fillAbuseReportDescription: "Please fill in details regarding this report. If it is\
+  \ about a specific post, please include its URL."
 abuseReported: "Your report has been sent. Thank you very much."
 reporter: "Reporter"
 reporteeOrigin: "Reportee Origin"
 reporterOrigin: "Reporter Origin"
 forwardReport: "Forward report to remote instance"
-forwardReportIsAnonymous: "Instead of your account, an anonymous system account will be displayed as reporter at the remote instance."
+forwardReportIsAnonymous: "Instead of your account, an anonymous system account will\
+  \ be displayed as reporter at the remote instance."
 send: "Send"
 abuseMarkAsResolved: "Mark report as resolved"
 openInNewTab: "Open in new tab"
@@ -662,9 +709,11 @@ createNew: "Create new"
 optional: "Optional"
 createNewClip: "Create new clip"
 unclip: "Unclip"
-confirmToUnclipAlreadyClippedNote: "This post is already part of the \"{name}\" clip. Do you want to remove it from this clip instead?"
+confirmToUnclipAlreadyClippedNote: "This post is already part of the \"{name}\" clip.\
+  \ Do you want to remove it from this clip instead?"
 public: "Public"
-i18nInfo: "Calckey is being translated into various languages by volunteers. You can help at {link}."
+i18nInfo: "Calckey is being translated into various languages by volunteers. You can\
+  \ help at {link}."
 manageAccessTokens: "Manage access tokens"
 accountInfo: "Account Info"
 notesCount: "Number of posts"
@@ -683,12 +732,16 @@ no: "No"
 driveFilesCount: "Number of Drive files"
 driveUsage: "Drive space usage"
 noCrawle: "Reject crawler indexing"
-noCrawleDescription: "Ask search engines to not index your profile page, posts, Pages, etc."
-lockedAccountInfo: "Unless you set your post visiblity to \"Followers only\", your posts will be visible to anyone, even if you require followers to be manually approved."
+noCrawleDescription: "Ask search engines to not index your profile page, posts, Pages,\
+  \ etc."
+lockedAccountInfo: "Unless you set your post visiblity to \"Followers only\", your\
+  \ posts will be visible to anyone, even if you require followers to be manually\
+  \ approved."
 alwaysMarkSensitive: "Mark as NSFW by default"
 loadRawImages: "Load original images instead of showing thumbnails"
 disableShowingAnimatedImages: "Don't play animated images"
-verificationEmailSent: "A verification email has been sent. Please follow the included link to complete verification."
+verificationEmailSent: "A verification email has been sent. Please follow the included\
+  \ link to complete verification."
 notSet: "Not set"
 emailVerified: "Email has been verified"
 noteFavoritesCount: "Number of bookmarked posts"
@@ -700,7 +753,8 @@ clips: "Clips"
 experimentalFeatures: "Experimental features"
 developer: "Developer"
 makeExplorable: "Make account visible in \"Explore\""
-makeExplorableDescription: "If you turn this off, your account will not show up in the \"Explore\" section."
+makeExplorableDescription: "If you turn this off, your account will not show up in\
+  \ the \"Explore\" section."
 showGapBetweenNotesInTimeline: "Show a gap between posts on the timeline"
 duplicate: "Duplicate"
 left: "Left"
@@ -715,7 +769,10 @@ onlineUsersCount: "{n} users are online"
 nUsers: "{n} Users"
 nNotes: "{n} Posts"
 sendErrorReports: "Send error reports"
-sendErrorReportsDescription: "When turned on, detailed error information will be shared with Calckey when a problem occurs, helping to improve the quality of Misskey.\nThis will include information such the version of your OS, what browser you're using, your activity in Calckey, etc."
+sendErrorReportsDescription: "When turned on, detailed error information will be shared\
+  \ with Calckey when a problem occurs, helping to improve the quality of Calckey.\n\
+  This will include information such the version of your OS, what browser you're using,\
+  \ your activity in Calckey, etc."
 myTheme: "My theme"
 backgroundColor: "Background color"
 accentColor: "Accent color"
@@ -754,14 +811,17 @@ unlikeConfirm: "Really remove your like?"
 fullView: "Full view"
 quitFullView: "Exit full view"
 addDescription: "Add description"
-userPagePinTip: "You can display posts here by selecting \"Pin to profile\" from the menu of individual posts."
-notSpecifiedMentionWarning: "This post contains mentions of users not included as recipients"
+userPagePinTip: "You can display posts here by selecting \"Pin to profile\" from the\
+  \ menu of individual posts."
+notSpecifiedMentionWarning: "This post contains mentions of users not included as\
+  \ recipients"
 info: "About"
 userInfo: "User information"
 unknown: "Unknown"
 onlineStatus: "Online status"
 hideOnlineStatus: "Hide online status"
-hideOnlineStatusDescription: "Hiding your online status reduces the convenience of some features such as the search."
+hideOnlineStatusDescription: "Hiding your online status reduces the convenience of\
+  \ some features such as the search."
 online: "Online"
 active: "Active"
 offline: "Offline"
@@ -798,12 +858,15 @@ secureMode: "Secure Mode (Authorized Fetch)"
 instanceSecurity: "Instance Security"
 secureModeInfo: "When requesting from other instances, do not send back without proof."
 privateMode: "Private Mode"
-privateModeInfo: "When enabled, only whitelisted instances can federate with your instances. All posts will be hidden from the public."
+privateModeInfo: "When enabled, only whitelisted instances can federate with your\
+  \ instances. All posts will be hidden from the public."
 allowedInstances: "Whitelisted Instances"
-allowedInstancesDescription: "Hosts of instances to be whitelisted for federation, each seperated by a new line (only applies in private mode)."
+allowedInstancesDescription: "Hosts of instances to be whitelisted for federation,\
+  \ each seperated by a new line (only applies in private mode)."
 previewNoteText: "Show preview"
 customCss: "Custom CSS"
-customCssWarn: "This setting should only be used if you know what it does. Entering improper values may cause the client to stop functioning normally."
+customCssWarn: "This setting should only be used if you know what it does. Entering\
+  \ improper values may cause the client to stop functioning normally."
 global: "Global"
 recommended: "Recommended"
 squareAvatars: "Display squared avatars"
@@ -820,7 +883,9 @@ whatIsNew: "Show changes"
 translate: "Translate"
 translatedFrom: "Translated from {x}"
 accountDeletionInProgress: "Account deletion is currently in progress"
-usernameInfo: "A name that identifies your account from others on this server.  You can use the alphabet (a~z, A~Z), digits (0~9) or underscores (_). Usernames cannot be changed later."
+usernameInfo: "A name that identifies your account from others on this server.  You\
+  \ can use the alphabet (a~z, A~Z), digits (0~9) or underscores (_). Usernames cannot\
+  \ be changed later."
 aiChanMode: "Ai-chan in Classic UI"
 keepCw: "Keep content warnings"
 pubSub: "Pub/Sub Accounts"
@@ -837,12 +902,14 @@ filter: "Filter"
 controlPanel: "Control Panel"
 manageAccounts: "Manage Accounts"
 makeReactionsPublic: "Set reaction history to public"
-makeReactionsPublicDescription: "This will make the list of all your past reactions publicly visible."
+makeReactionsPublicDescription: "This will make the list of all your past reactions\
+  \ publicly visible."
 classic: "Classic"
 muteThread: "Mute thread"
 unmuteThread: "Unmute thread"
 ffVisibility: "Follows/Followers Visibility"
-ffVisibilityDescription: "Allows you to configure who can see who you follow and who follows you."
+ffVisibilityDescription: "Allows you to configure who can see who you follow and who\
+  \ follows you."
 continueThread: "Continue thread"
 deleteAccountConfirm: "This will irreversibly delete your account. Proceed?"
 incorrectPassword: "Incorrect password."
@@ -885,14 +952,16 @@ noEmailServerWarning: "Email server not configured."
 thereIsUnresolvedAbuseReportWarning: "There are unsolved reports."
 check: "Check"
 driveCapOverrideLabel: "Change the drive capacity for this user"
-driveCapOverrideCaption: "Reset the capacity to default by inputting a value of 0 or lower."
+driveCapOverrideCaption: "Reset the capacity to default by inputting a value of 0\
+  \ or lower."
 requireAdminForView: "You must log in with an administrator account to view this."
 isSystemAccount: "An account created and automatically operated by the system."
 typeToConfirm: "Please enter {x} to confirm"
 deleteAccount: "Delete account"
 document: "Documentation"
 numberOfPageCache: "Number of cached pages"
-numberOfPageCacheDescription: "Increasing this number will improve convenience for users but cause more server load as well as more memory to be used."
+numberOfPageCacheDescription: "Increasing this number will improve convenience for\
+  \ users but cause more server load as well as more memory to be used."
 logoutConfirm: "Really log out?"
 lastActiveDate: "Last used at"
 statusbar: "Status bar"
@@ -909,12 +978,17 @@ sensitiveMediaDetection: "Detection of NSFW media"
 localOnly: "Local only"
 remoteOnly: "Remote only"
 failedToUpload: "Upload failed"
-cannotUploadBecauseInappropriate: "This file could not be uploaded because parts of it have been detected as potentially NSFW."
+cannotUploadBecauseInappropriate: "This file could not be uploaded because parts of\
+  \ it have been detected as potentially NSFW."
 cannotUploadBecauseNoFreeSpace: "Upload failed due to lack of Drive capacity."
 beta: "Beta"
 enableAutoSensitive: "Automatic NSFW-Marking"
-enableAutoSensitiveDescription: "Allows automatic detection and marking of NSFW media through Machine Learning where possible. Even if this option is disabled, it may be enabled instance-wide."
-activeEmailValidationDescription: "Enables stricter validation of email addresses, which includes checking for disposable addresses and by whether it can actually be communicated with. When unchecked, only the format of the email is validated."
+enableAutoSensitiveDescription: "Allows automatic detection and marking of NSFW media\
+  \ through Machine Learning where possible. Even if this option is disabled, it may\
+  \ be enabled instance-wide."
+activeEmailValidationDescription: "Enables stricter validation of email addresses,\
+  \ which includes checking for disposable addresses and by whether it can actually\
+  \ be communicated with. When unchecked, only the format of the email is validated."
 navbar: "Navigation bar"
 shuffle: "Shuffle"
 account: "Account"
@@ -924,18 +998,27 @@ subscribePushNotification: "Enable push notifications"
 unsubscribePushNotification: "Disable push notifications"
 pushNotificationAlreadySubscribed: "Push notifications are already enabled"
 pushNotificationNotSupported: "Your browser or instance does not support push notifications"
-sendPushNotificationReadMessage: "Delete push notifications once the relevant notifications or messages have been read"
-sendPushNotificationReadMessageCaption: "A notification containing the text \"{emptyPushNotificationMessage}\" will be displayed for a short time. This may increase the battery usage of your device, if applicable."
+sendPushNotificationReadMessage: "Delete push notifications once the relevant notifications\
+  \ or messages have been read"
+sendPushNotificationReadMessageCaption: "A notification containing the text \"{emptyPushNotificationMessage}\"\
+  \ will be displayed for a short time. This may increase the battery usage of your\
+  \ device, if applicable."
 showAds: "Show ads"
 enterSendsMessage: "Press Return in Messaging to send message (off is Ctrl + Return)"
-adminCustomCssWarn: "This setting should only be used if you know what it does. Entering improper values may cause EVERYONE'S clients to stop functioning normally. Please ensure your CSS works properly by testing it in your user settings."
+adminCustomCssWarn: "This setting should only be used if you know what it does. Entering\
+  \ improper values may cause EVERYONE'S clients to stop functioning normally. Please\
+  \ ensure your CSS works properly by testing it in your user settings."
 customMOTD: "Custom MOTD (splash screen messages)"
-customMOTDDescription: "Custom messages for the MOTD (splash screen) separated by line breaks to be shown randomly every time a user loads/reloads the page."
+customMOTDDescription: "Custom messages for the MOTD (splash screen) separated by\
+  \ line breaks to be shown randomly every time a user loads/reloads the page."
 customSplashIcons: "Custom splash screen icons (urls)"
-customSplashIconsDescription: "URLs for custom splash screen icons separated by line breaks to be shown randomly every time a user loads/reloads the page. Please make sure the images are on a static URL, preferably all resized to 192x192."
+customSplashIconsDescription: "URLs for custom splash screen icons separated by line\
+  \ breaks to be shown randomly every time a user loads/reloads the page. Please make\
+  \ sure the images are on a static URL, preferably all resized to 192x192."
 showUpdates: "Show a popup when Calckey updates"
 recommendedInstances: "Recommended instances"
-recommendedInstancesDescription: "Recommended instances seperated by line breaks to appear in the recommended timeline. Do NOT add `https://`, ONLY the domain."
+recommendedInstancesDescription: "Recommended instances seperated by line breaks to\
+  \ appear in the recommended timeline. Do NOT add `https://`, ONLY the domain."
 caption: "Auto Caption"
 splash: "Splash Screen"
 updateAvailable: "There might be an update available!"
@@ -947,29 +1030,51 @@ migration: "Migration"
 moveTo: "Move current account to new account"
 moveToLabel: "Account you're moving to:"
 moveAccount: "Move account!"
-moveAccountDescription: "This process is irreversible. Make sure you've set up an alias for this account on your new account before moving. Please enter the tag of the account formatted like @person@instance.com"
+moveAccountDescription: "This process is irreversible. Make sure you've set up an\
+  \ alias for this account on your new account before moving. Please enter the tag\
+  \ of the account formatted like @person@instance.com"
 moveFrom: "Move to this account from an older account"
 moveFromLabel: "Account you're moving from:"
-moveFromDescription: "This will set an alias of your old account so that you can move from that account to this current one. Do this BEFORE moving from your older account. Please enter the tag of the account formatted like @person@instance.com"
-migrationConfirm: "Are you absolutely sure you want to migrate your acccount to {account}? Once you do this, you won't be able to reverse it, and you won't be able to use your account normally again.\nAlso, please ensure that you've set this current account as the account you're moving from."
+moveFromDescription: "This will set an alias of your old account so that you can move\
+  \ from that account to this current one. Do this BEFORE moving from your older account.\
+  \ Please enter the tag of the account formatted like @person@instance.com"
+migrationConfirm: "Are you absolutely sure you want to migrate your acccount to {account}?\
+  \ Once you do this, you won't be able to reverse it, and you won't be able to use\
+  \ your account normally again.\nAlso, please ensure that you've set this current\
+  \ account as the account you're moving from."
 defaultReaction: "Default emoji reaction for outgoing and incoming posts"
 license: "License"
 indexPosts: "Index Posts"
 indexFrom: "Index from Post ID onwards (leave blank to index every post)"
-indexNotice: "Now indexing. This will probably take a while, please don't restart your server for at least an hour."
+indexNotice: "Now indexing. This will probably take a while, please don't restart\
+  \ your server for at least an hour."
 customKaTeXMacro: "Custom KaTeX macros"
-customKaTeXMacroDescription: "Set up macros to write mathematical expressions easily! The notation conforms to the LaTeX command definitions and is written as \\newcommand{\\name}{content} or \\newcommand{\\name}[number of arguments]{content}. For example, \\newcommand{\\add}[2]{#1 + #2} will expand \\add{3}{foo} to 3 + foo. The curly brackets surrounding the macro name can be changed to round or square brackets. This affects the brackets used for arguments. One (and only one) macro can be defined per line, and you can't break the line in the middle of the definition. Invalid lines are simply ignored. Only simple string substitution functions are supported; advanced syntax, such as conditional branching, cannot be used here."
+customKaTeXMacroDescription: "Set up macros to write mathematical expressions easily!\
+  \ The notation conforms to the LaTeX command definitions and is written as \\newcommand{\\\
+  name}{content} or \\newcommand{\\name}[number of arguments]{content}. For example,\
+  \ \\newcommand{\\add}[2]{#1 + #2} will expand \\add{3}{foo} to 3 + foo. The curly\
+  \ brackets surrounding the macro name can be changed to round or square brackets.\
+  \ This affects the brackets used for arguments. One (and only one) macro can be\
+  \ defined per line, and you can't break the line in the middle of the definition.\
+  \ Invalid lines are simply ignored. Only simple string substitution functions are\
+  \ supported; advanced syntax, such as conditional branching, cannot be used here."
 enableCustomKaTeXMacro: "Enable custom KaTeX macros"
 noteId: "Post ID"
 
 _sensitiveMediaDetection:
-  description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."
+  description: "Reduces the effort of server moderation through automatically recognizing\
+    \ NSFW media via Machine Learning. This will slightly increase the load on the\
+    \ server."
   sensitivity: "Detection sensitivity"
-  sensitivityDescription: "Reducing the sensitivity will lead to fewer misdetections (false positives) whereas increasing it will lead to fewer missed detections (false negatives)."
+  sensitivityDescription: "Reducing the sensitivity will lead to fewer misdetections\
+    \ (false positives) whereas increasing it will lead to fewer missed detections\
+    \ (false negatives)."
   setSensitiveFlagAutomatically: "Mark as NSFW"
-  setSensitiveFlagAutomaticallyDescription: "The results of the internal detection will be retained even if this option is turned off."
+  setSensitiveFlagAutomaticallyDescription: "The results of the internal detection\
+    \ will be retained even if this option is turned off."
   analyzeVideos: "Enable analysis of videos"
-  analyzeVideosDescription: "Analyzes videos in addition to images. This will slightly increase the load on the server."
+  analyzeVideosDescription: "Analyzes videos in addition to images. This will slightly\
+    \ increase the load on the server."
 _emailUnavailable:
   used: "This email address is already being used"
   format: "The format of this email address is invalid"
@@ -983,11 +1088,15 @@ _ffVisibility:
 _signup:
   almostThere: "Almost there"
   emailAddressInfo: "Please enter your email address. It will not be made public."
-  emailSent: "A confirmation email has been sent to your email address ({email}). Please click the included link to complete account creation."
+  emailSent: "A confirmation email has been sent to your email address ({email}).\
+    \ Please click the included link to complete account creation."
 _accountDelete:
   accountDelete: "Delete account"
-  mayTakeTime: "As account deletion is a resource-heavy process, it may take some time to complete depending on how much content you have created and how many files you have uploaded."
-  sendEmail: "Once account deletion has been completed, an email will be sent to the email address registered to this account."
+  mayTakeTime: "As account deletion is a resource-heavy process, it may take some\
+    \ time to complete depending on how much content you have created and how many\
+    \ files you have uploaded."
+  sendEmail: "Once account deletion has been completed, an email will be sent to the\
+    \ email address registered to this account."
   requestAccountDelete: "Request account deletion"
   started: "Deletion has been started."
   inProgress: "Deletion is currently in progress"
@@ -995,9 +1104,12 @@ _ad:
   back: "Back"
   reduceFrequencyOfThisAd: "Show this ad less"
 _forgotPassword:
-  enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it."
-  ifNoEmail: "If you did not use an email during registration, please contact the instance administrator instead."
-  contactAdmin: "This instance does not support using email addresses, please contact the instance administrator to reset your password instead."
+  enterEmail: "Enter the email address you used to register. A link with which you\
+    \ can reset your password will then be sent to it."
+  ifNoEmail: "If you did not use an email during registration, please contact the\
+    \ instance administrator instead."
+  contactAdmin: "This instance does not support using email addresses, please contact\
+    \ the instance administrator to reset your password instead."
 _gallery:
   my: "My Gallery"
   liked: "Liked Posts"
@@ -1020,12 +1132,15 @@ _preferencesBackups:
   save: "Save changes"
   inputName: "Please enter a name for this backup"
   cannotSave: "Saving failed"
-  nameAlreadyExists: "A backup called \"{name}\" already exists. Please enter a different name."
-  applyConfirm: "Do you really want to apply the \"{name}\" backup to this device? Existing settings of this device will be overwritten."
+  nameAlreadyExists: "A backup called \"{name}\" already exists. Please enter a different\
+    \ name."
+  applyConfirm: "Do you really want to apply the \"{name}\" backup to this device?\
+    \ Existing settings of this device will be overwritten."
   saveConfirm: "Save backup as {name}?"
   deleteConfirm: "Delete the {name} backup?"
   renameConfirm: "Rename this backup from \"{old}\" to \"{new}\"?"
-  noBackups: "No backups exist. You may backup your client settings on this server by using \"Create new backup\"."
+  noBackups: "No backups exist. You may backup your client settings on this server\
+    \ by using \"Create new backup\"."
   createdAt: "Created at: {date} {time}"
   updatedAt: "Updated at: {date} {time}"
   cannotLoad: "Loading failed"
@@ -1037,13 +1152,15 @@ _registry:
   domain: "Domain"
   createKey: "Create key"
 _aboutMisskey:
-  about: "Calckey is a fork of Misskey made by ThatOneCalculator, which has been in development since 2022."
+  about: "Calckey is a fork of Misskey made by ThatOneCalculator, which has been in\
+    \ development since 2022."
   contributors: "Main contributors"
   allContributors: "All contributors"
   source: "Source code"
   translation: "Translate Calckey"
   donate: "Donate to Calckey"
-  morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰"
+  morePatrons: "We also appreciate the support of many other helpers not listed here.\
+    \ Thank you! \U0001F970"
   patrons: "Calckey patrons"
 _nsfw:
   respect: "Hide NSFW media"
@@ -1051,7 +1168,8 @@ _nsfw:
   force: "Hide all media"
 _mfm:
   cheatSheet: "MFM Cheatsheet"
-  intro: "MFM is a markup language used on Misskey, Calckey, Akkoma, and more that can be used in many places. Here you can view a list of all available MFM syntax."
+  intro: "MFM is a markup language used on Misskey, Calckey, Akkoma, and more that\
+    \ can be used in many places. Here you can view a list of all available MFM syntax."
   dummy: "Calckey expands the world of the Fediverse"
   mention: "Mention"
   mentionDescription: "You can specify a user by using an At-Symbol and a username."
@@ -1070,7 +1188,8 @@ _mfm:
   inlineCode: "Code (Inline)"
   inlineCodeDescription: "Displays inline syntax highlighting for (program) code."
   blockCode: "Code (Block)"
-  blockCodeDescription: "Displays syntax highlighting for multi-line (program) code in a block."
+  blockCodeDescription: "Displays syntax highlighting for multi-line (program) code\
+    \ in a block."
   inlineMath: "Math (Inline)"
   inlineMathDescription: "Display math formulas (KaTeX) in-line"
   blockMath: "Math (Block)"
@@ -1078,7 +1197,8 @@ _mfm:
   quote: "Quote"
   quoteDescription: "Displays content as a quote."
   emoji: "Custom Emoji"
-  emojiDescription: "By surrounding a custom emoji name with colons, custom emoji can be displayed."
+  emojiDescription: "By surrounding a custom emoji name with colons, custom emoji\
+    \ can be displayed."
   search: "Search"
   searchDescription: "Displays a search box with pre-entered text."
   flip: "Flip"
@@ -1114,7 +1234,8 @@ _mfm:
   rotate: "Rotate"
   rotateDescription: "Turns content by a specified angle."
   plain: "Plain"
-  plainDescription: "Deactivates the effects of all MFM contained within this MFM effect."
+  plainDescription: "Deactivates the effects of all MFM contained within this MFM\
+    \ effect."
 _instanceTicker:
   none: "Never show"
   remote: "Show for remote users"
@@ -1144,15 +1265,19 @@ _menuDisplay:
   hide: "Hide"
 _wordMute:
   muteWords: "Muted words"
-  muteWordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
+  muteWordsDescription: "Separate with spaces for an AND condition or with line breaks\
+    \ for an OR condition."
   muteWordsDescription2: "Surround keywords with slashes to use regular expressions."
   softDescription: "Hide posts that fulfil the set conditions from the timeline."
-  hardDescription: "Prevents posts fulfilling the set conditions from being added to the timeline. In addition, these posts will not be added to the timeline even if the conditions are changed."
+  hardDescription: "Prevents posts fulfilling the set conditions from being added\
+    \ to the timeline. In addition, these posts will not be added to the timeline\
+    \ even if the conditions are changed."
   soft: "Soft"
   hard: "Hard"
   mutedNotes: "Muted posts"
 _instanceMute:
-  instanceMuteDescription: "This will mute any posts/boosts from the listed instances, including those of users replying to a user from a muted instance."
+  instanceMuteDescription: "This will mute any posts/boosts from the listed instances,\
+    \ including those of users replying to a user from a muted instance."
   instanceMuteDescription2: "Separate with newlines"
   title: "Hides posts from listed instances."
   heading: "List of instances to be muted"
@@ -1258,21 +1383,35 @@ _tutorial:
   step1_1: "Welcome!"
   step1_2: "Let's get you set up. You'll be up and running in no time!"
   step2_1: "First, please fill out your profile."
-  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your posts or follow you."
+  step2_2: "Providing some information about who you are will make it easier for others\
+    \ to tell if they want to see your posts or follow you."
   step3_1: "Now time to follow some people!"
-  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
+  step3_2: "Your home and social timelines are based off of who you follow, so try\
+    \ following a couple accounts to get started.\nClick the plus circle on the top\
+    \ right of a profile to follow them."
   step4_1: "Let's get you out there."
-  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
+  step4_2: "For your first post, some people like to made a {introduction} post or\
+    \ a simple \"Hello world!\""
   step5_1: "Timelines, timelines everywhere!"
   step5_2: "Your instance has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from the accounts you follow and from everyone else on this instance. If you prefer your Home timeline to only display posts from accounts you follow, you can easily change this in Settings!"
-  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_5: "The Social {icon} timeline is where you can see posts only from the accounts you follow."
-  step5_6: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
+  step5_3: "The Home {icon} timeline is where you can see posts from the accounts\
+    \ you follow and from everyone else on this instance. If you prefer your Home\
+    \ timeline to only display posts from accounts you follow, you can easily change\
+    \ this in Settings!"
+  step5_4: "The Local {icon} timeline is where you can see posts from everyone else\
+    \ on this instance."
+  step5_5: "The Social {icon} timeline is where you can see posts only from the accounts\
+    \ you follow."
+  step5_6: "The Recommended {icon} timeline is where you can see posts from instances\
+    \ the admins recommend."
+  step5_7: "The Global {icon} timeline is where you can see posts from every other\
+    \ connected instance."
   step6_1: "So, what is this place?"
-  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
+  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse,\
+    \ an interconnected network of thousands of servers, called \"instances\"."
+  step6_3: "Each server works in different ways, and not all servers run Calckey.\
+    \ This one does though! It's a bit complicated, but you'll get the hang of it\
+    \ in no time."
   step6_4: "Now go, explore, and have fun!"
 _2fa:
   alreadyRegistered: "You have already registered a 2-factor authentication device."
@@ -1283,7 +1422,9 @@ _2fa:
   step2Url: "You can also enter this URL if you're using a desktop program:"
   step3: "Enter the token provided by your app to finish setup."
   step4: "From now on, any future login attempts will ask for such a login token."
-  securityKeyInfo: "Besides fingerprint or PIN authentication, you can also setup authentication via hardware security keys that support FIDO2 to further secure your account."
+  securityKeyInfo: "Besides fingerprint or PIN authentication, you can also setup\
+    \ authentication via hardware security keys that support FIDO2 to further secure\
+    \ your account."
 _permissions:
   "read:account": "View your account information"
   "write:account": "Edit your account information"
@@ -1319,7 +1460,8 @@ _permissions:
   "write:gallery-likes": "Edit your list of liked gallery posts"
 _auth:
   shareAccess: "Would you like to authorize \"{name}\" to access this account?"
-  shareAccessAsk: "Are you sure you want to authorize this application to access your account?"
+  shareAccessAsk: "Are you sure you want to authorize this application to access your\
+    \ account?"
   permissionAsk: "This application requests the following permissions"
   pleaseGoBack: "Please go back to the application"
   callback: "Returning to the application"
@@ -1421,12 +1563,14 @@ _profile:
   youCanIncludeHashtags: "You can also include hashtags in your bio."
   metadata: "Additional Information"
   metadataEdit: "Edit additional Information"
-  metadataDescription: "Using these, you can display additional information fields in your profile."
+  metadataDescription: "Using these, you can display additional information fields\
+    \ in your profile."
   metadataLabel: "Label"
   metadataContent: "Content"
   changeAvatar: "Change avatar"
   changeBanner: "Change banner"
-  locationDescription: "If you enter your city first, it will display your local time to other users."
+  locationDescription: "If you enter your city first, it will display your local time\
+    \ to other users."
 _exportOrImport:
   allNotes: "All posts"
   followingList: "Followed users"
@@ -1744,7 +1888,8 @@ _pages:
       _for:
         arg1: "Number of times to repeat"
         arg2: "Action"
-    typeError: "Slot {slot} accepts values of type \"{expect}\", but the provided value is of type \"{actual}\"!"
+    typeError: "Slot {slot} accepts values of type \"{expect}\", but the provided\
+      \ value is of type \"{actual}\"!"
     thereIsEmptySlot: "Slot {slot} is empty!"
     types:
       string: "Text"
@@ -1810,8 +1955,10 @@ _deck:
   deleteProfile: "Delete workspace"
   nameAlreadyExists: "This workspace name already exists."
   introduction: "Create the perfect interface for you by arranging columns freely!"
-  introduction2: "Click on the + on the right of the screen to add new colums whenever you want."
-  widgetsIntroduction: "Please select \"Edit widgets\" in the column menu and add a widget."
+  introduction2: "Click on the + on the right of the screen to add new colums whenever\
+    \ you want."
+  widgetsIntroduction: "Please select \"Edit widgets\" in the column menu and add\
+    \ a widget."
   _columns:
     main: "Main"
     widgets: "Widgets"

From 7ff889735a425536a92482c08248e02913e2fcb7 Mon Sep 17 00:00:00 2001
From: D David <postureatsevenpm@gmail.com>
Date: Tue, 18 Apr 2023 17:44:34 +0000
Subject: [PATCH 492/582] chore: Translated using Weblate (Spanish)

Currently translated at 92.0% (1587 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/es/
---
 locales/es-ES.yml | 446 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 312 insertions(+), 134 deletions(-)

diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 1d35c878c..feab851db 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1,7 +1,8 @@
----
 _lang_: "Español"
-headlineMisskey: "Red conectada por notas"
-introMisskey: "¡Bienvenido/a! Misskey es un servicio de microblogging descentralizado de código abierto.\nEscribe \"notas\" para compartir lo que te ocurre ahora o para contar sobre ti a todos 📡\nCon la función de \"reacciones\", puedes también añadir una reacción rápida a las notas de todos 👍\n¡Exploremos juntos un nuevo mundo! 🚀"
+headlineMisskey: "¡Un proyecto de código abierto y una plataforma de medios de comunicación\
+  \ descentralizada que es gratis para siempre! \U0001F680"
+introMisskey: "¡Bienvenido! ¡Calckey es un proyecto de código abierto, plataforma\
+  \ descentralizado medios de comunicación social que es gratis para siempre! \U0001F680"
 monthAndDay: "{day}/{month}"
 search: "Buscar"
 notifications: "Notificaciones"
@@ -14,7 +15,7 @@ gotIt: "¡Lo tengo!"
 cancel: "Cancelar"
 enterUsername: "Introduce el nombre de usuario"
 renotedBy: "Renotado por {user}"
-noNotes: "No hay notas"
+noNotes: "No hay publicaciones"
 noNotifications: "No hay notificaciones"
 instance: "Instancia"
 settings: "Configuración"
@@ -23,7 +24,7 @@ otherSettings: "Configuración avanzada"
 openInWindow: "Abrir en una ventana"
 profile: "Perfil"
 timeline: "Línea de tiempo"
-noAccountDescription: "Este usuario no ha escrito su biografía aún"
+noAccountDescription: "Este usuario no ha escrito su biografía aún."
 login: "Iniciar sesión"
 loggingIn: "Iniciando sesión"
 logout: "Cerrar sesión"
@@ -36,7 +37,7 @@ favorite: "Añadir a favoritos"
 favorites: "Favoritos"
 unfavorite: "Quitar de favoritos"
 favorited: "Añadido a favoritos."
-alreadyFavorited: "Ya había sido añadido a favoritos"
+alreadyFavorited: "Ya había sido añadido a favoritos."
 cantFavorite: "No se puede añadir a favoritos."
 pin: "Fijar al perfil"
 unpin: "Desfijar"
@@ -44,7 +45,8 @@ copyContent: "Copiar contenido"
 copyLink: "Copiar enlace"
 delete: "Borrar"
 deleteAndEdit: "Borrar y editar"
-deleteAndEditConfirm: "¿Estás seguro de que quieres borrar esta nota y editarla? Perderás todas las reacciones, renotas y respuestas."
+deleteAndEditConfirm: "¿Estás seguro de que quieres borrar esta publicación y editarla?\
+  \ Perderás todas las reacciones, impulsados y respuestas."
 addToList: "Agregar a lista"
 sendMessage: "Enviar un mensaje"
 copyUsername: "Copiar nombre de usuario"
@@ -58,20 +60,22 @@ receiveFollowRequest: "Recibiste una solicitud de seguimiento"
 followRequestAccepted: "La solicitud de seguimiento fue aceptada"
 mention: "Menciones"
 mentions: "Menciones"
-directNotes: "Notas directas"
+directNotes: "Mensajes Directos"
 importAndExport: "Importar y Exportar"
 import: "Importar"
 export: "Exportar"
 files: "Archivos"
 download: "Descargar"
-driveFileDeleteConfirm: "¿Desea borrar el archivo \"{name}\"? Las notas que tengan este archivo como adjunto serán eliminadas"
+driveFileDeleteConfirm: "¿Desea borrar el archivo \"{name}\"? Las publicaciones que\
+  \ tengan este archivo como adjunto serán eliminadas."
 unfollowConfirm: "¿Desea dejar de seguir a {name}?"
-exportRequested: "Se ha solicitado la exportación. Puede tomar un tiempo. Cuando termine la exportación, se añadirá en el drive"
+exportRequested: "Se ha solicitado la exportación. Puede tomar un tiempo. Cuando termine\
+  \ la exportación, se añadirá en el drive."
 importRequested: "Se ha solicitado la importación. Puede tomar un tiempo."
 lists: "Listas"
 noLists: "No tiene listas"
-note: "Notas"
-notes: "Notas"
+note: "Publicación"
+notes: "Publicaciones"
 following: "Siguiendo"
 followers: "Seguidores"
 followsYou: "Te sigue"
@@ -80,10 +84,12 @@ manageLists: "Administrar listas"
 error: "Error"
 somethingHappened: "Ocurrió un error"
 retry: "Reintentar"
-pageLoadError: "Error al leer la página"
-pageLoadErrorDescription: "Normalmente es debido a la red o al caché del navegador. Por favor limpie el caché o intente más tarde."
+pageLoadError: "Error al cargar la página."
+pageLoadErrorDescription: "Normalmente es debido a la red o al caché del navegador.\
+  \ Por favor limpie el caché o intente más tarde."
 serverIsDead: "No hay respuesta del servidor. Espere un momento y vuelva a intentarlo."
-youShouldUpgradeClient: "Para ver esta página, por favor refrezca el navegador y utiliza una versión más reciente del cliente."
+youShouldUpgradeClient: "Para ver esta página, por favor refrezca el navegador y utiliza\
+  \ una versión más reciente del cliente."
 enterListName: "Ingrese nombre de lista"
 privacy: "Privacidad"
 makeFollowManuallyApprove: "Aprobar manualmente las solicitudes de seguimiento"
@@ -94,13 +100,13 @@ followRequests: "Solicitudes de seguimiento"
 unfollow: "Dejar de seguir"
 followRequestPending: "Solicitudes de seguimiento pendiente"
 enterEmoji: "Ingresar emojis"
-renote: "Renotar"
-unrenote: "Quitar renota"
-renoted: "Renotado"
-cantRenote: "No se puede renotar este post"
-cantReRenote: "No se puede renotar una renota"
+renote: "Impulsar"
+unrenote: "Quitar impulso"
+renoted: "Impulsado."
+cantRenote: "No se puede impulsar esta publicación."
+cantReRenote: "No se puede impulsar un impulso."
 quote: "Citar"
-pinnedNote: "Nota fijada"
+pinnedNote: "Publicación fijada"
 pinned: "Fijar al perfil"
 you: "Tú"
 clickToShow: "Click para ver"
@@ -108,8 +114,9 @@ sensitive: "Marcado como sensible"
 add: "Agregar"
 reaction: "Reacción"
 reactionSetting: "Reacciones para mostrar en el menú de reacciones"
-reactionSettingDescription2: "Arrastre para reordenar, click para borrar, apriete la tecla + para añadir."
-rememberNoteVisibility: "Recordar visibilidad"
+reactionSettingDescription2: "Arrastre para reordenar, click para borrar, apriete\
+  \ la tecla + para añadir."
+rememberNoteVisibility: "Recordar la configuración de visibilidad de la publicación"
 attachCancel: "Quitar adjunto"
 markAsSensitive: "Marcar como sensible"
 unmarkAsSensitive: "Desmarcar como sensible"
@@ -137,16 +144,23 @@ emojiUrl: "URL de la imágen del emoji"
 addEmoji: "Agregar emoji"
 settingGuide: "Configuración sugerida"
 cacheRemoteFiles: "Mantener en cache los archivos remotos"
-cacheRemoteFilesDescription: "Si desactiva esta configuración, Los archivos remotos se cargarán desde el link directo sin usar la caché. Con eso se puede ahorrar almacenamiento del servidor, pero eso aumentará el tráfico al no crear miniaturas."
+cacheRemoteFilesDescription: "Si desactiva esta configuración, Los archivos remotos\
+  \ se cargarán desde el link directo sin usar la caché. Con eso se puede ahorrar\
+  \ almacenamiento del servidor, pero eso aumentará el tráfico al no crear miniaturas."
 flagAsBot: "Esta cuenta es un bot"
-flagAsBotDescription: "En caso de que esta cuenta fuera usada por un programa, active esta opción. Al hacerlo, esta opción servirá para otros desarrolladores para evitar cadenas infinitas de reacciones, y ajustará los sistemas internos de Misskey para que trate a esta cuenta como un bot."
+flagAsBotDescription: "En caso de que esta cuenta fuera usada por un programa, active\
+  \ esta opción. Al hacerlo, esta opción servirá para otros desarrolladores para evitar\
+  \ cadenas infinitas de reacciones, y ajustará los sistemas internos de Calckey para\
+  \ que trate a esta cuenta como un bot."
 flagAsCat: "Esta cuenta es un gato"
-flagAsCatDescription: "En caso de que declare que esta cuenta es de un gato, active esta opción."
+flagAsCatDescription: "Vas a tener orejas de gato y hablar como un gato!"
 flagShowTimelineReplies: "Mostrar respuestas a las notas en la biografía"
-flagShowTimelineRepliesDescription: "Cuando se marca, la línea de tiempo muestra respuestas a otras notas además de las notas del usuario"
-autoAcceptFollowed: "Aceptar automáticamente las solicitudes de seguimiento de los usuarios que sigues"
+flagShowTimelineRepliesDescription: "Cuando se marca, la línea de tiempo muestra respuestas\
+  \ a otras publicaciones además de las publicaciones del usuario."
+autoAcceptFollowed: "Aceptar automáticamente las solicitudes de seguimiento de los\
+  \ usuarios que sigues"
 addAccount: "Agregar Cuenta"
-loginFailed: "Error al iniciar sesión."
+loginFailed: "Error al iniciar sesión"
 showOnRemote: "Ver en una instancia remota"
 general: "General"
 wallpaper: "Fondo de pantalla"
@@ -156,7 +170,11 @@ searchWith: "Buscar: {q}"
 youHaveNoLists: "No tienes listas"
 followConfirm: "¿Desea seguir a {name}?"
 proxyAccount: "Cuenta proxy"
-proxyAccountDescription: "Una cuenta proxy es una cuenta que actúa como un seguidor remoto de un usuario bajo ciertas condiciones. Por ejemplo, cuando un usuario añade un usuario remoto a una lista, si ningún usuario local sigue al usuario agregado a la lista, la instancia no puede obtener su actividad. Así que la cuenta proxy sigue al usuario añadido a la lista"
+proxyAccountDescription: "Una cuenta proxy es una cuenta que actúa como un seguidor\
+  \ remoto de un usuario bajo ciertas condiciones. Por ejemplo, cuando un usuario\
+  \ añade un usuario remoto a una lista, si ningún usuario local sigue al usuario\
+  \ agregado a la lista, la instancia no puede obtener su actividad. Así que la cuenta\
+  \ proxy sigue al usuario añadido a la lista."
 host: "Host"
 selectUser: "Elegir usuario"
 recipient: "Recipiente"
@@ -187,21 +205,24 @@ instanceInfo: "información de la instancia"
 statistics: "Estadísticas"
 clearQueue: "Limpiar cola"
 clearQueueConfirmTitle: "¿Desea limpiar la cola?"
-clearQueueConfirmText: "Las notas aún no entregadas no se federarán. Normalmente no se necesita ejecutar esta operación"
+clearQueueConfirmText: "Las publicaciones aún no entregadas no se federarán. Normalmente\
+  \ no se necesita ejecutar esta operación."
 clearCachedFiles: "Limpiar caché"
 clearCachedFilesConfirm: "¿Desea borrar todos los archivos remotos cacheados?"
 blockedInstances: "Instancias bloqueadas"
-blockedInstancesDescription: "Seleccione los hosts de las instancias que desea bloquear, separadas por una linea nueva. Las instancias bloqueadas no podrán comunicarse con esta instancia."
+blockedInstancesDescription: "Seleccione los hosts de las instancias que desea bloquear,\
+  \ separadas por una linea nueva. Las instancias bloqueadas no podrán comunicarse\
+  \ con esta instancia."
 muteAndBlock: "Silenciar y bloquear"
 mutedUsers: "Usuarios silenciados"
 blockedUsers: "Usuarios bloqueados"
 noUsers: "No hay usuarios"
 editProfile: "Editar perfil"
-noteDeleteConfirm: "¿Desea borrar esta nota?"
-pinLimitExceeded: "Ya no se pueden fijar más posts"
-intro: "¡La instalación de Misskey ha terminado! Crea el usuario administrador."
+noteDeleteConfirm: "¿Desea borrar esta publicación?"
+pinLimitExceeded: "Ya no se pueden fijar más publicaciones"
+intro: "¡La instalación de Calckey ha terminado! Crea el usuario administrador."
 done: "Terminado"
-processing: "Procesando"
+processing: "Procesando..."
 preview: "Vista previa"
 default: "Predeterminado"
 defaultValueIs: "Predeterminado"
@@ -219,7 +240,7 @@ instanceFollowers: "Seguidores de la instancia"
 instanceUsers: "Usuarios de la instancia"
 changePassword: "Cambiar contraseña"
 security: "Seguridad"
-retypedNotMatch: "No hay coincidencia"
+retypedNotMatch: "No hay coincidencia."
 currentPassword: "Contraseña actual"
 newPassword: "Contraseña nueva"
 newPasswordRetype: "Contraseña nueva (repetir)"
@@ -240,7 +261,9 @@ saved: "Guardado"
 messaging: "Chat"
 upload: "Subir"
 keepOriginalUploading: "Mantener la imagen original"
-keepOriginalUploadingDescription: "Mantener la versión original al cargar imágenes. Si está desactivado, el navegador generará imágenes para la publicación web en el momento de recargar la página"
+keepOriginalUploadingDescription: "Mantener la versión original al cargar imágenes.\
+  \ Si está desactivado, el navegador generará imágenes para la publicación web en\
+  \ el momento de recargar la página."
 fromDrive: "Desde el drive"
 fromUrl: "Desde la URL"
 uploadFromUrl: "Subir desde una URL"
@@ -256,7 +279,7 @@ agreeTo: "De acuerdo con {0}"
 tos: "Términos de uso"
 start: "Comenzar"
 home: "Inicio"
-remoteUserCaution: "Para el usuario remoto, la información está incompleta"
+remoteUserCaution: "La información del usuario remoto tal vez esta incompleta."
 activity: "Actividad"
 images: "Imágenes"
 birthday: "Fecha de nacimiento"
@@ -289,7 +312,8 @@ unableToDelete: "No se puede borrar"
 inputNewFileName: "Ingrese un nuevo nombre de archivo"
 inputNewDescription: "Ingrese nueva descripción"
 inputNewFolderName: "Ingrese un nuevo nombre de la carpeta"
-circularReferenceFolder: "La carpeta de destino es una sub-carpeta de la carpeta que quieres mover."
+circularReferenceFolder: "La carpeta de destino es una sub-carpeta de la carpeta que\
+  \ quieres mover."
 hasChildFilesOrFolders: "No se puede borrar esta carpeta. No está vacía."
 copyUrl: "Copiar URL"
 rename: "Renombrar"
@@ -323,7 +347,8 @@ connectService: "Conectar"
 disconnectService: "Desconectar"
 enableLocalTimeline: "Habilitar linea de tiempo local"
 enableGlobalTimeline: "Habilitar linea de tiempo global"
-disablingTimelinesInfo: "Aunque se desactiven estas lineas de tiempo, por conveniencia el administrador y los moderadores pueden seguir usándolos"
+disablingTimelinesInfo: "Aunque se desactiven estas lineas de tiempo, por conveniencia\
+  \ el administrador y los moderadores pueden seguir usándolos"
 registration: "Registro"
 enableRegistration: "Permitir nuevos registros"
 invite: "Invitar"
@@ -335,9 +360,11 @@ bannerUrl: "URL de la imagen del banner"
 backgroundImageUrl: "URL de la imagen de fondo"
 basicInfo: "Información básica"
 pinnedUsers: "Usuarios fijados"
-pinnedUsersDescription: "Describir los usuarios que quiere fijar en la página \"Descubrir\" separados por una linea nueva"
+pinnedUsersDescription: "Describir los usuarios que quiere fijar en la página \"Descubrir\"\
+  \ separados por una linea nueva"
 pinnedPages: "Páginas fijadas"
-pinnedPagesDescription: "Describa las rutas de las páginas que desea fijar a la página principal de la instancia, separadas por lineas nuevas"
+pinnedPagesDescription: "Describa las rutas de las páginas que desea fijar a la página\
+  \ principal de la instancia, separadas por lineas nuevas"
 pinnedClipId: "Id del clip fijado"
 pinnedNotes: "Nota fijada"
 hcaptcha: "hCaptcha"
@@ -348,14 +375,17 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "activar reCAPTCHA"
 recaptchaSiteKey: "Clave del sitio"
 recaptchaSecretKey: "Clave secreta"
-avoidMultiCaptchaConfirm: "El uso de múltiples Captchas puede causar interferencia. ¿Desea desactivar el otro Captcha? Puede dejar múltiples Captchas habilitadas presionando cancelar."
+avoidMultiCaptchaConfirm: "El uso de múltiples Captchas puede causar interferencia.\
+  \ ¿Desea desactivar el otro Captcha? Puede dejar múltiples Captchas habilitadas\
+  \ presionando cancelar."
 antennas: "Antenas"
 manageAntennas: "Administrar antenas"
 name: "Nombre"
 antennaSource: "Origen de la antena"
 antennaKeywords: "Palabras clave para recibir"
 antennaExcludeKeywords: "Palabras clave para excluir"
-antennaKeywordsDescription: "Separar con espacios es una declaración AND, separar con una linea nueva es una declaración OR"
+antennaKeywordsDescription: "Separar con espacios es una declaración AND, separar\
+  \ con una linea nueva es una declaración OR"
 notifyAntenna: "Notificar nueva nota"
 withFileAntenna: "Sólo notas con archivos adjuntados"
 enableServiceworker: "Activar ServiceWorker"
@@ -378,7 +408,7 @@ exploreFediverse: "Explorar fediverso"
 popularTags: "Etiquetas populares"
 userList: "Lista"
 about: "Información"
-aboutMisskey: "Sobre Misskey"
+aboutMisskey: "Sobre Calckey"
 administrator: "Administrador"
 token: "Token"
 twoStepAuthentication: "Autenticación de dos factores"
@@ -443,7 +473,8 @@ strongPassword: "Muy buena contraseña"
 passwordMatched: "Correcto"
 passwordNotMatched: "Las contraseñas no son las mismas"
 signinWith: "Inicie sesión con {x}"
-signinFailed: "Autenticación fallida. Asegúrate de haber usado el nombre de usuario y contraseña correctos."
+signinFailed: "Autenticación fallida. Asegúrate de haber usado el nombre de usuario\
+  \ y contraseña correctos."
 tapSecurityKey: "Toque la clave de seguridad"
 or: "O"
 language: "Idioma"
@@ -453,7 +484,8 @@ aboutX: "Acerca de {x}"
 useOsNativeEmojis: "Usa los emojis nativos de la plataforma"
 disableDrawer: "No mostrar los menús en cajones"
 youHaveNoGroups: "Sin grupos"
-joinOrCreateGroup: "Obtenga una invitación para unirse al grupos o puede crear su propio grupo."
+joinOrCreateGroup: "Obtenga una invitación para unirse al grupos o puede crear su\
+  \ propio grupo."
 noHistory: "No hay datos en el historial"
 signinHistory: "Historial de ingresos"
 disableAnimatedMfm: "Deshabilitar MFM que tiene animaciones"
@@ -484,19 +516,28 @@ showFeaturedNotesInTimeline: "Mostrar notas destacadas en la línea de tiempo"
 objectStorage: "Almacenamiento de objetos"
 useObjectStorage: "Usar almacenamiento de objetos"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "Prefijo de URL utilizado para construir URL para hacer referencia a objetos (medios). Especifique su URL si está utilizando un CDN o Proxy; de lo contrario, especifique la dirección a la que se puede acceder públicamente de acuerdo con la guía de servicio que va a utilizar. i.g 'https://<bucket>.s3.amazonaws.com' para AWS S3 y 'https://storage.googleapis.com/<bucket>' para GCS."
+objectStorageBaseUrlDesc: "Prefijo de URL utilizado para construir URL para hacer\
+  \ referencia a objetos (medios). Especifique su URL si está utilizando un CDN o\
+  \ Proxy; de lo contrario, especifique la dirección a la que se puede acceder públicamente\
+  \ de acuerdo con la guía de servicio que va a utilizar. i.g 'https://<bucket>.s3.amazonaws.com'\
+  \ para AWS S3 y 'https://storage.googleapis.com/<bucket>' para GCS."
 objectStorageBucket: "Bucket"
-objectStorageBucketDesc: "Especifique el nombre del depósito utilizado en el servicio configurado."
+objectStorageBucketDesc: "Especifique el nombre del depósito utilizado en el servicio\
+  \ configurado."
 objectStoragePrefix: "Prefix"
 objectStoragePrefixDesc: "Los archivos se almacenarán en el directorio de este prefijo."
 objectStorageEndpoint: "Endpoint"
-objectStorageEndpointDesc: "Deje esto en blanco si está utilizando AWS S3; de lo contrario, especifique el punto final como '<host>' o '<host>: <port>' de acuerdo con la guía de servicio que va a utilizar."
+objectStorageEndpointDesc: "Deje esto en blanco si está utilizando AWS S3; de lo contrario,\
+  \ especifique el punto final como '<host>' o '<host>: <port>' de acuerdo con la\
+  \ guía de servicio que va a utilizar."
 objectStorageRegion: "Region"
-objectStorageRegionDesc: "Especifique una región como 'xx-east-1'. Si su servicio no tiene distinción sobre regiones, déjelo en blanco o complete con 'us-east-1'."
+objectStorageRegionDesc: "Especifique una región como 'xx-east-1'. Si su servicio\
+  \ no tiene distinción sobre regiones, déjelo en blanco o complete con 'us-east-1'."
 objectStorageUseSSL: "Usar SSL"
 objectStorageUseSSLDesc: "Desactive esto si no va a usar HTTPS para la conexión API"
 objectStorageUseProxy: "Conectarse a través de Proxy"
-objectStorageUseProxyDesc: "Desactive esto si no va a usar Proxy para la conexión de Almacenamiento de objetos"
+objectStorageUseProxyDesc: "Desactive esto si no va a usar Proxy para la conexión\
+  \ de Almacenamiento de objetos"
 objectStorageSetPublicRead: "Seleccionar \"public-read\" al subir "
 serverLogs: "Registros del servidor"
 deleteAll: "Eliminar todos"
@@ -524,7 +565,8 @@ sort: "Ordenar"
 ascendingOrder: "Ascendente"
 descendingOrder: "Descendente"
 scratchpad: "Scratch pad"
-scratchpadDescription: "Scratchpad proporciona un entorno experimental para AiScript. Puede escribir, ejecutar y verificar los resultados que interactúan con Misskey."
+scratchpadDescription: "Scratchpad proporciona un entorno experimental para AiScript.\
+  \ Puede escribir, ejecutar y verificar los resultados que interactúan con Calckey."
 output: "Salida"
 script: "Script"
 disablePagesScript: "Deshabilitar AiScript en Páginas"
@@ -532,11 +574,14 @@ updateRemoteUser: "Actualizar información de usuario remoto"
 deleteAllFiles: "Borrar todos los archivos"
 deleteAllFilesConfirm: "¿Desea borrar todos los archivos?"
 removeAllFollowing: "Retener todos los siguientes"
-removeAllFollowingDescription: "Cancelar todos los siguientes del servidor {host}. Ejecutar en caso de que esta instancia haya dejado de existir"
+removeAllFollowingDescription: "Cancelar todos los siguientes del servidor {host}.\
+  \ Ejecutar en caso de que esta instancia haya dejado de existir"
 userSuspended: "Este usuario ha sido suspendido."
 userSilenced: "Este usuario ha sido silenciado."
 yourAccountSuspendedTitle: "Esta cuenta ha sido suspendida"
-yourAccountSuspendedDescription: "Esta cuenta ha sido suspendida debido a violaciones de los términos de servicio del servidor y otras razones. Para más información, póngase en contacto con el administrador. Por favor, no cree una nueva cuenta."
+yourAccountSuspendedDescription: "Esta cuenta ha sido suspendida debido a violaciones\
+  \ de los términos de servicio del servidor y otras razones. Para más información,\
+  \ póngase en contacto con el administrador. Por favor, no cree una nueva cuenta."
 menu: "Menú"
 divider: "Divisor"
 addItem: "Agregar elemento"
@@ -590,13 +635,15 @@ smtpHost: "Host"
 smtpPort: "Puerto"
 smtpUser: "Nombre de usuario"
 smtpPass: "Contraseña"
-emptyToDisableSmtpAuth: "Deje el nombre del usuario y la contraseña en blanco para deshabilitar la autenticación SMTP"
+emptyToDisableSmtpAuth: "Deje el nombre del usuario y la contraseña en blanco para\
+  \ deshabilitar la autenticación SMTP"
 smtpSecure: "Usar SSL/TLS implícito en la conexión SMTP"
 smtpSecureInfo: "Apagar cuando se use STARTTLS"
 testEmail: "Prueba de envío"
 wordMute: "Silenciar palabras"
 regexpError: "Error de la expresión regular"
-regexpErrorDescription: "Ocurrió un error en la expresión regular en la linea {line} de las palabras muteadas {tab}"
+regexpErrorDescription: "Ocurrió un error en la expresión regular en la linea {line}\
+  \ de las palabras muteadas {tab}"
 instanceMute: "Instancias silenciadas"
 userSaysSomething: "{name} dijo algo"
 makeActive: "Activar"
@@ -612,10 +659,13 @@ create: "Crear"
 notificationSetting: "Ajustes de Notificaciones"
 notificationSettingDesc: "Por favor elija el tipo de notificación a mostrar"
 useGlobalSetting: "Usar ajustes globales"
-useGlobalSettingDesc: "Al activarse, se usará la configuración de notificaciones de la cuenta, al desactivarse se pueden hacer configuraciones particulares."
+useGlobalSettingDesc: "Al activarse, se usará la configuración de notificaciones de\
+  \ la cuenta, al desactivarse se pueden hacer configuraciones particulares."
 other: "Otro"
 regenerateLoginToken: "Regenerar token de login"
-regenerateLoginTokenDescription: "Regenerar el token usado internamente durante el login. No siempre es necesario hacerlo. Al hacerlo de nuevo, se deslogueará en todos los dispositivos."
+regenerateLoginTokenDescription: "Regenerar el token usado internamente durante el\
+  \ login. No siempre es necesario hacerlo. Al hacerlo de nuevo, se deslogueará en\
+  \ todos los dispositivos."
 setMultipleBySeparatingWithSpace: "Puedes añadir mas de uno, separado por espacios."
 fileIdOrUrl: "Id del archivo o URL"
 behavior: "Comportamiento"
@@ -623,13 +673,15 @@ sample: "Muestra"
 abuseReports: "Reportes"
 reportAbuse: "Reportar"
 reportAbuseOf: "Reportar a {name}"
-fillAbuseReportDescription: "Ingrese los detalles del reporte. Si hay una nota en particular, ingrese la URL de esta."
+fillAbuseReportDescription: "Ingrese los detalles del reporte. Si hay una nota en\
+  \ particular, ingrese la URL de esta."
 abuseReported: "Se ha enviado el reporte. Muchas gracias."
 reporter: "Reportador"
 reporteeOrigin: "Reportar a"
 reporterOrigin: "Origen del reporte"
 forwardReport: "Transferir un informe a una instancia remota"
-forwardReportIsAnonymous: "No puede ver su información de la instancia remota y aparecerá como una cuenta anónima del sistema"
+forwardReportIsAnonymous: "No puede ver su información de la instancia remota y aparecerá\
+  \ como una cuenta anónima del sistema"
 send: "Enviar"
 abuseMarkAsResolved: "Marcar reporte como resuelto"
 openInNewTab: "Abrir en una Nueva Pestaña"
@@ -647,9 +699,11 @@ createNew: "Crear"
 optional: "Opcional"
 createNewClip: "Crear clip nuevo"
 unclip: "Quitar clip"
-confirmToUnclipAlreadyClippedNote: "Esta nota ya está incluida en el clip \"{name}\". ¿Quiere quitar la nota del clip?"
+confirmToUnclipAlreadyClippedNote: "Esta nota ya está incluida en el clip \"{name}\"\
+  . ¿Quiere quitar la nota del clip?"
 public: "Público"
-i18nInfo: "Calckey está siendo traducido a varios idiomas gracias a voluntarios. Se puede colaborar traduciendo en {link}"
+i18nInfo: "Calckey está siendo traducido a varios idiomas gracias a voluntarios. Se\
+  \ puede colaborar traduciendo en {link}"
 manageAccessTokens: "Administrar tokens de acceso"
 accountInfo: "Información de la Cuenta"
 notesCount: "Cantidad de notas"
@@ -668,12 +722,18 @@ no: "No"
 driveFilesCount: "Cantidad de archivos en el drive"
 driveUsage: "Uso del drive"
 noCrawle: "Rechazar indexación del crawler"
-noCrawleDescription: "Pedir a los motores de búsqueda que no indexen tu perfil, notas, páginas, etc."
-lockedAccountInfo: "A menos que configures la visibilidad de tus notas como \"Sólo seguidores\", tus notas serán visibles para cualquiera, incluso si requieres que los seguidores sean aprobados manualmente."
-alwaysMarkSensitive: "Marcar los medios de comunicación como contenido sensible por defecto"
+noCrawleDescription: "Pedir a los motores de búsqueda que no indexen tu perfil, notas,\
+  \ páginas, etc."
+lockedAccountInfo: "A menos que configures la visibilidad de tus notas como \"Sólo\
+  \ seguidores\", tus notas serán visibles para cualquiera, incluso si requieres que\
+  \ los seguidores sean aprobados manualmente."
+alwaysMarkSensitive: "Marcar los medios de comunicación como contenido sensible por\
+  \ defecto"
 loadRawImages: "Cargar las imágenes originales en lugar de mostrar las miniaturas"
 disableShowingAnimatedImages: "No reproducir imágenes animadas"
-verificationEmailSent: "Se le ha enviado un correo electrónico de confirmación. Por favor, acceda al enlace proporcionado en el correo electrónico para completar la configuración."
+verificationEmailSent: "Se le ha enviado un correo electrónico de confirmación. Por\
+  \ favor, acceda al enlace proporcionado en el correo electrónico para completar\
+  \ la configuración."
 notSet: "Sin especificar"
 emailVerified: "Su dirección de correo electrónico ha sido verificada."
 noteFavoritesCount: "Número de notas favoritas"
@@ -685,14 +745,16 @@ clips: "Clip"
 experimentalFeatures: "Características experimentales"
 developer: "Desarrolladores"
 makeExplorable: "Hacer visible la cuenta en \"Explorar\""
-makeExplorableDescription: "Si desactiva esta opción, su cuenta no aparecerá en la sección \"Explorar\"."
+makeExplorableDescription: "Si desactiva esta opción, su cuenta no aparecerá en la\
+  \ sección \"Explorar\"."
 showGapBetweenNotesInTimeline: "Mostrar un intervalo entre notas en la línea de tiempo"
 duplicate: "Duplicar"
 left: "Izquierda"
 center: "Centrar"
 wide: "Ancho"
 narrow: "Estrecho"
-reloadToApplySetting: "Esta configuración sólo se aplicará después de recargar la página. ¿Recargar ahora?"
+reloadToApplySetting: "Esta configuración sólo se aplicará después de recargar la\
+  \ página. ¿Recargar ahora?"
 needReloadToApply: "Se requiere un reinicio para la aplicar los cambios"
 showTitlebar: "Mostrar la barra de título"
 clearCache: "Limpiar caché"
@@ -700,7 +762,11 @@ onlineUsersCount: "{n} usuarios en línea"
 nUsers: "{n} Usuarios"
 nNotes: "{n} Notas"
 sendErrorReports: "Envíar informe de errores"
-sendErrorReportsDescription: "Si habilita esta opción, ayudará a mejorar la calidad de Misskey compartiendo información detallada sobre los errores cuando se produzca un problema.\nEsto incluye información como la versión de su sistema operativo, el tipo de navegador que utiliza, su historial de actividad, etc."
+sendErrorReportsDescription: "Si habilita esta opción, los detalles de los errores\
+  \ serán compartidos con Calckey cuando ocurra un problema, lo que ayudará a mejorar\
+  \ la calidad de Calckey. \nEsto incluye información como la versión del sistema\
+  \ operativo, el tipo de navegador que está utilizando y su historial en Calckey,\
+  \ entre otros datos."
 myTheme: "Mi Tema"
 backgroundColor: "Fondo"
 accentColor: "Acento"
@@ -728,7 +794,8 @@ receiveAnnouncementFromInstance: "Recibir notificaciones de la instancia"
 emailNotification: "Notificaciones por correo electrónico"
 publish: "Publicar"
 inChannelSearch: "Buscar en el canal"
-useReactionPickerForContextMenu: "Haga clic con el botón derecho para abrir el menu de reacciones"
+useReactionPickerForContextMenu: "Haga clic con el botón derecho para abrir el menu\
+  \ de reacciones"
 typingUsers: "{users} está escribiendo"
 jumpToSpecifiedDate: "Saltar a una fecha específica"
 showingPastTimeline: "Mostrar líneas de tiempo antiguas"
@@ -739,14 +806,16 @@ unlikeConfirm: "¿Quitar como favorito?"
 fullView: "Vista completa"
 quitFullView: "quitar vista completa"
 addDescription: "Agregar descripción"
-userPagePinTip: "Puede mantener sus notas visibles aquí seleccionando Pin en el menú de notas individuales"
+userPagePinTip: "Puede mantener sus notas visibles aquí seleccionando Pin en el menú\
+  \ de notas individuales"
 notSpecifiedMentionWarning: "Algunas menciones no están incluidas en el destino"
 info: "Información"
 userInfo: "Información del usuario"
 unknown: "Desconocido"
 onlineStatus: "En línea"
 hideOnlineStatus: "mostrarse como desconectado"
-hideOnlineStatusDescription: "Ocultar su estado en línea puede reducir la eficacia de algunas funciones, como la búsqueda"
+hideOnlineStatusDescription: "Ocultar su estado en línea puede reducir la eficacia\
+  \ de algunas funciones, como la búsqueda"
 online: "En línea"
 active: "Activo"
 offline: "Sin conexión"
@@ -781,7 +850,8 @@ emailNotConfiguredWarning: "No se ha configurado una dirección de correo electr
 ratio: "Proporción"
 previewNoteText: "Mostrar vista preliminar"
 customCss: "CSS personalizado"
-customCssWarn: "Este ajuste sólo debe utilizarse si se sabe lo que hace. Introducir valores inadecuados puede hacer que el cliente deje de funcionar con normalidad."
+customCssWarn: "Este ajuste sólo debe utilizarse si se sabe lo que hace. Introducir\
+  \ valores inadecuados puede hacer que el cliente deje de funcionar con normalidad."
 global: "Global"
 squareAvatars: "Mostrar iconos cuadrados"
 sent: "Enviar"
@@ -791,12 +861,14 @@ hashtags: "Hashtag"
 troubleshooting: "Solución de problemas"
 useBlurEffect: "Utilizar efecto de desenfoque en la interfaz de usuario"
 learnMore: "Ver más"
-misskeyUpdated: "¡Misskey ha sido actualizado!"
+misskeyUpdated: "¡Calckey ha sido actualizado!"
 whatIsNew: "Mostrar cambios"
 translate: "Traducir"
 translatedFrom: "Traducido de {x}"
 accountDeletionInProgress: "La eliminación de la cuenta está en curso"
-usernameInfo: "Un nombre que identifique su cuenta de otras en este servidor.  Puede utilizar el alfabeto (a~z, A~Z), dígitos (0~9) o guiones bajos (_). Los nombres de usuario no se pueden cambiar posteriormente."
+usernameInfo: "Un nombre que identifique su cuenta de otras en este servidor.  Puede\
+  \ utilizar el alfabeto (a~z, A~Z), dígitos (0~9) o guiones bajos (_). Los nombres\
+  \ de usuario no se pueden cambiar posteriormente."
 aiChanMode: "Modo Ai"
 keepCw: "Mantener la advertencia de contenido"
 pubSub: "Cuentas Pub/Sub"
@@ -806,18 +878,21 @@ unresolved: "Sin resolver"
 breakFollow: "Dejar de seguir"
 itsOn: "¡Está encendido!"
 itsOff: "¡Está apagado!"
-emailRequiredForSignup: "Se requere una dirección de correo electrónico para el registro de la cuenta"
+emailRequiredForSignup: "Se requere una dirección de correo electrónico para el registro\
+  \ de la cuenta"
 unread: "No leído"
 filter: "Filtro"
 controlPanel: "Panel de control"
 manageAccounts: "Administrar cuenta"
 makeReactionsPublic: "Hacer el historial de reacciones público"
-makeReactionsPublicDescription: "Todas las reacciones que hayas hecho serán públicamente visibles."
+makeReactionsPublicDescription: "Todas las reacciones que hayas hecho serán públicamente\
+  \ visibles."
 classic: "Clásico"
 muteThread: "Ocultar hilo"
 unmuteThread: "Mostrar hilo"
 ffVisibility: "Visibilidad de seguidores y seguidos"
-ffVisibilityDescription: "Puedes configurar quien puede ver a quienes sigues y quienes te siguen"
+ffVisibilityDescription: "Puedes configurar quien puede ver a quienes sigues y quienes\
+  \ te siguen"
 continueThread: "Ver la continuación del hilo"
 deleteAccountConfirm: "La cuenta será borrada. ¿Está seguro?"
 incorrectPassword: "La contraseña es incorrecta"
@@ -858,14 +933,16 @@ thereIsUnresolvedAbuseReportWarning: "Hay reportes sin resolver"
 recommended: "Recomendado"
 check: "Verificar"
 driveCapOverrideLabel: "Cambiar la capacidad de la unidad para este usuario"
-driveCapOverrideCaption: "Restablecer la capacidad a su predeterminado ingresando un valor de 0 o menos"
+driveCapOverrideCaption: "Restablecer la capacidad a su predeterminado ingresando\
+  \ un valor de 0 o menos"
 requireAdminForView: "Necesitas iniciar sesión como administrador para ver esto."
 isSystemAccount: "Cuenta creada y operada automáticamente por el sistema"
 typeToConfirm: "Ingrese {x} para confirmar"
 deleteAccount: "Borrar cuenta"
 document: "Documento"
 numberOfPageCache: "Cantidad de páginas cacheadas"
-numberOfPageCacheDescription: "Al aumentar el número mejora la conveniencia pero tambien puede aumentar la carga y la memoria a usarse"
+numberOfPageCacheDescription: "Al aumentar el número mejora la conveniencia pero tambien\
+  \ puede aumentar la carga y la memoria a usarse"
 logoutConfirm: "¿Cerrar sesión?"
 lastActiveDate: "Utilizado por última vez el"
 statusbar: "Barra de estado"
@@ -882,42 +959,59 @@ sensitiveMediaDetection: "Detección de contenido NSFW"
 localOnly: "Solo local"
 remoteOnly: "Sólo remoto"
 failedToUpload: "La subida falló"
-cannotUploadBecauseInappropriate: "Este archivo no se puede subir debido a que algunas partes han sido detectadas comoNSFW."
-cannotUploadBecauseNoFreeSpace: "La subida falló debido a falta de espacio libre en la unidad del usuario."
+cannotUploadBecauseInappropriate: "Este archivo no se puede subir debido a que algunas\
+  \ partes han sido detectadas comoNSFW."
+cannotUploadBecauseNoFreeSpace: "La subida falló debido a falta de espacio libre en\
+  \ la unidad del usuario."
 beta: "Beta"
 enableAutoSensitive: "Marcar automáticamente contenido NSFW"
-enableAutoSensitiveDescription: "Permite la detección y marcado automático de contenido NSFW usando 'Machine Learning' cuando sea posible. Incluso si esta opción está desactivada, puede ser activado para toda la instancia."
-activeEmailValidationDescription: "Habilita la validación estricta de direcciones de correo electrónico, lo cual incluye la revisión de direcciones desechables y si se puede comunicar con éstas. Cuando está deshabilitado, sólo el formato de la dirección es validado."
+enableAutoSensitiveDescription: "Permite la detección y marcado automático de contenido\
+  \ NSFW usando 'Machine Learning' cuando sea posible. Incluso si esta opción está\
+  \ desactivada, puede ser activado para toda la instancia."
+activeEmailValidationDescription: "Habilita la validación estricta de direcciones\
+  \ de correo electrónico, lo cual incluye la revisión de direcciones desechables\
+  \ y si se puede comunicar con éstas. Cuando está deshabilitado, sólo el formato\
+  \ de la dirección es validado."
 navbar: "Barra de navegación"
 shuffle: "Aleatorio"
 account: "Cuentas"
 move: "Mover"
 _sensitiveMediaDetection:
-  description: "Reduce el esfuerzo de la moderación el el servidor a través del reconocimiento automático de contenido NSFW usando 'Machine Learning'. Esto puede incrementar ligeramente la carga en el servidor."
+  description: "Reduce el esfuerzo de la moderación el el servidor a través del reconocimiento\
+    \ automático de contenido NSFW usando 'Machine Learning'. Esto puede incrementar\
+    \ ligeramente la carga en el servidor."
   sensitivity: "Sensibilidad de detección"
-  sensitivityDescription: "Reducir la sensibilidad puede acarrear a varios falsos positivos, mientras que incrementarla puede reducir las detecciones (falsos negativos)."
+  sensitivityDescription: "Reducir la sensibilidad puede acarrear a varios falsos\
+    \ positivos, mientras que incrementarla puede reducir las detecciones (falsos\
+    \ negativos)."
   setSensitiveFlagAutomatically: "Marcar como NSFW"
-  setSensitiveFlagAutomaticallyDescription: "Los resultados de la detección interna pueden ser retenidos incluso si la opción está desactivada."
+  setSensitiveFlagAutomaticallyDescription: "Los resultados de la detección interna\
+    \ pueden ser retenidos incluso si la opción está desactivada."
   analyzeVideos: "Habilitar el análisis de videos"
-  analyzeVideosDescription: "Analizar videos en adición a las imágenes. Esto puede incrementar ligeramente la carga del servidor."
+  analyzeVideosDescription: "Analizar videos en adición a las imágenes. Esto puede\
+    \ incrementar ligeramente la carga del servidor."
 _emailUnavailable:
   used: "Ya fue usado"
-  format: "Formato no válido."
-  disposable: "No es un correo reutilizable"
+  format: "El formato de este correo electrónico no es válido"
+  disposable: "No se pueden utilizar direcciones de correo electrónico desechables"
   mx: "Servidor de correo inválido"
   smtp: "Servidor de correo no disponible"
 _ffVisibility:
-  public: "Publicar"
+  public: "Público"
   followers: "Visible solo para seguidores"
   private: "Privado"
 _signup:
   almostThere: "Ya falta poco"
   emailAddressInfo: "Ingrese el correo electrónico que usa. Este no se hará público."
-  emailSent: "Se envió un correo de verificación a la dirección {email}. Acceda al link enviado en el correo para completar el ingreso."
+  emailSent: "Se envió un correo de verificación a la dirección {email}. Acceda al\
+    \ link enviado en el correo para completar el ingreso."
 _accountDelete:
   accountDelete: "Eliminar Cuenta"
-  mayTakeTime: "La eliminación de la cuenta es un proceso que precisa de carga. Puede pasar un tiempo hasta que se complete si es mucho el contenido creado y los archivos subidos."
-  sendEmail: "Cuando se termine de borrar la cuenta, se enviará un correo a la dirección usada para el registro."
+  mayTakeTime: "La eliminación de la cuenta es un proceso que precisa de carga. Puede\
+    \ pasar un tiempo hasta que se complete si es mucho el contenido creado y los\
+    \ archivos subidos."
+  sendEmail: "Cuando se termine de borrar la cuenta, se enviará un correo a la dirección\
+    \ usada para el registro."
   requestAccountDelete: "Pedir la eliminación de la cuenta."
   started: "El proceso de eliminación ha comenzado."
   inProgress: "La eliminación está en proceso."
@@ -925,9 +1019,12 @@ _ad:
   back: "Deseleccionar"
   reduceFrequencyOfThisAd: "Mostrar menos este anuncio."
 _forgotPassword:
-  enterEmail: "Ingrese el correo usado para registrar la cuenta. Se enviará un link para resetear la contraseña."
+  enterEmail: "Ingrese el correo usado para registrar la cuenta. Se enviará un link\
+    \ para resetear la contraseña."
   ifNoEmail: "Si no utilizó un correo para crear la cuenta, contáctese con el administrador."
-  contactAdmin: "Esta instancia no admite el uso de direcciones de correo electrónico, póngase en contacto con el administrador de la instancia para restablecer su contraseña"
+  contactAdmin: "Esta instancia no admite el uso de direcciones de correo electrónico,\
+    \ póngase en contacto con el administrador de la instancia para restablecer su\
+    \ contraseña"
 _gallery:
   my: "Mi galería"
   liked: "Publicaciones que me gustan"
@@ -950,12 +1047,15 @@ _preferencesBackups:
   save: "Guardar cambios"
   inputName: "Por favor, ingresa un nombre para este respaldo"
   cannotSave: "Fallo al guardar"
-  nameAlreadyExists: "Un respaldo llamado \"{name}\" ya existe. Por favor ingresa un nombre diferente"
-  applyConfirm: "¿Realmente quieres aplicar los cambios desde el archivo \"{name}\" a este dispositivo? Las configuraciones existentes serán sobreescritas. "
+  nameAlreadyExists: "Un respaldo llamado \"{name}\" ya existe. Por favor ingresa\
+    \ un nombre diferente"
+  applyConfirm: "¿Realmente quieres aplicar los cambios desde el archivo \"{name}\"\
+    \ a este dispositivo? Las configuraciones existentes serán sobreescritas. "
   saveConfirm: "¿Guardar respaldo como \"{name}\"?"
   deleteConfirm: "¿Borrar el respaldo \"{name}\"?"
   renameConfirm: "¿Renombrar este respaldo de \"{old}\" a \"{new}\"?"
-  noBackups: "No existen respaldos. Deberás respaldar las configuraciones del cliente en este servidor usando \"Crear nuevo respaldo\""
+  noBackups: "No existen respaldos. Deberás respaldar las configuraciones del cliente\
+    \ en este servidor usando \"Crear nuevo respaldo\""
   createdAt: "Creado: {date} {time}"
   updatedAt: "Actualizado: {date} {time}"
   cannotLoad: "La carga falló"
@@ -967,24 +1067,29 @@ _registry:
   domain: "Dominio"
   createKey: "Crear una llave"
 _aboutMisskey:
-  about: "Misskey es un software de código abierto, desarrollado por syuilo desde el 2014"
+  about: "Calckey es una bifurcación de Misskey creada por ThatOneCalculator, que\
+    \ ha estado en desarrollo desde el 2022."
   contributors: "Principales colaboradores"
   allContributors: "Todos los colaboradores"
   source: "Código fuente"
-  translation: "Traducir Misskey"
-  donate: "Donar a Misskey"
-  morePatrons: "Muchas más personas nos apoyan. Muchas gracias🥰"
-  patrons: "Patrocinadores"
+  translation: "Traducir Calckey"
+  donate: "Donar a Calckey"
+  morePatrons: "También apreciamos el apoyo de muchos más que no están enlistados\
+    \ aquí. ¡Gracias! \U0001F970"
+  patrons: "Mecenas de Calckey"
 _nsfw:
   respect: "Ocultar medios NSFW"
   ignore: "No esconder medios NSFW "
   force: "Ocultar todos los medios"
 _mfm:
   cheatSheet: "Hoja de referencia de MFM"
-  intro: "MFM es un lenguaje de marcado dedicado que se puede usar en varios lugares dentro de Misskey. Aquí puede ver una lista de sintaxis disponibles en MFM."
-  dummy: "Misskey expande el mundo de la Fediverso"
+  intro: "MFM es un lenguaje de marcado dedicado que se puede usar en varios lugares\
+    \ dentro de Misskey, Calckey, Akkoma, y mucho más. Aquí puede ver una lista de\
+    \ sintaxis disponibles en MFM."
+  dummy: "Calckey expande el mundo de la Fediverso"
   mention: "Menciones"
-  mentionDescription: "El signo @ seguido de un nombre de usuario se puede utilizar para notificar a un usuario en particular."
+  mentionDescription: "El signo @ seguido de un nombre de usuario se puede utilizar\
+    \ para notificar a un usuario en particular."
   hashtag: "Hashtag"
   hashtagDescription: "Puede especificar un hashtag con un numeral y el texto."
   url: "URL"
@@ -1000,7 +1105,8 @@ _mfm:
   inlineCode: "Código (insertado)"
   inlineCodeDescription: "Muestra el código de un programa resaltando su sintaxis"
   blockCode: "Código (bloque)"
-  blockCodeDescription: "Código de resaltado de sintaxis, como programas de varias líneas con bloques."
+  blockCodeDescription: "Código de resaltado de sintaxis, como programas de varias\
+    \ líneas con bloques."
   inlineMath: "Fórmula (insertado)"
   inlineMathDescription: "Muestra fórmulas (KaTeX) insertadas"
   blockMath: "Fórmula (bloque)"
@@ -1012,7 +1118,8 @@ _mfm:
   search: "Buscar"
   searchDescription: "Muestra una caja de búsqueda con texto pre-escrito"
   flip: "Echar de un capirotazo"
-  flipDescription: "Voltea el contenido hacia arriba / abajo o hacia la izquierda / derecha."
+  flipDescription: "Voltea el contenido hacia arriba / abajo o hacia la izquierda\
+    \ / derecha."
   jelly: "Animación (gelatina)"
   jellyDescription: "Aplica un efecto de animación tipo gelatina"
   tada: "Animación (tadá)"
@@ -1034,7 +1141,8 @@ _mfm:
   x4: "Totalmente grande"
   x4Description: "Muestra el contenido totalmente grande"
   blur: "Desenfoque"
-  blurDescription: "Para desenfocar el contenido. Se muestra claramente al colocar el puntero encima."
+  blurDescription: "Para desenfocar el contenido. Se muestra claramente al colocar\
+    \ el puntero encima."
   font: "Fuente"
   fontDescription: "Elegir la fuente del contenido"
   rainbow: "Arcoíris"
@@ -1044,7 +1152,8 @@ _mfm:
   rotate: "Rotar"
   rotateDescription: "Rota el contenido a un ángulo especificado."
   plain: "Plano"
-  plainDescription: "Desactiva los efectos de todo el contenido MFM con este efecto MFM."
+  plainDescription: "Desactiva los efectos de todo el contenido MFM con este efecto\
+    \ MFM."
 _instanceTicker:
   none: "No mostrar"
   remote: "Mostrar a usuarios remotos"
@@ -1070,15 +1179,20 @@ _menuDisplay:
   hide: "Ocultar"
 _wordMute:
   muteWords: "Palabras que silenciar"
-  muteWordsDescription: "Separar con espacios indica una declaracion And, separar con lineas nuevas indica una declaracion Or。"
-  muteWordsDescription2: "Encerrar las palabras clave entre numerales para usar expresiones regulares"
+  muteWordsDescription: "Separar con espacios indica una declaracion And, separar\
+    \ con lineas nuevas indica una declaracion Or。"
+  muteWordsDescription2: "Encerrar las palabras clave entre numerales para usar expresiones\
+    \ regulares"
   softDescription: "Ocultar en la linea de tiempo las notas que cumplen las condiciones"
-  hardDescription: "Evitar que se agreguen a la linea de tiempo las notas que cumplen las condiciones. Las notas no agregadas seguirán quitadas aunque cambien las condiciones."
+  hardDescription: "Evitar que se agreguen a la linea de tiempo las notas que cumplen\
+    \ las condiciones. Las notas no agregadas seguirán quitadas aunque cambien las\
+    \ condiciones."
   soft: "Suave"
   hard: "Duro"
   mutedNotes: "Notas silenciadas"
 _instanceMute:
-  instanceMuteDescription: "Silencia todas las notas y reposts de la instancias seleccionadas, incluyendo respuestas a los usuarios de las mismas"
+  instanceMuteDescription: "Silencia todas las notas y reposts de la instancias seleccionadas,\
+    \ incluyendo respuestas a los usuarios de las mismas"
   instanceMuteDescription2: "Separar por líneas"
   title: "Oculta las notas de las instancias listadas."
   heading: "Instancias a silenciar"
@@ -1184,32 +1298,47 @@ _tutorial:
   step1_1: "¡Bienvenido!"
   step1_2: "Vamos a configurarte. Estarás listo y funcionando en poco tiempo"
   step2_1: "En primer lugar, rellena tu perfil"
-  step2_2: "Proporcionar algo de información sobre quién eres hará que sea más fácil para los demás saber si quieren ver tus notas o seguirte."
+  step2_2: "Proporcionar algo de información sobre quién eres hará que sea más fácil\
+    \ para los demás saber si quieren ver tus notas o seguirte."
   step3_1: "¡Ahora es el momento de seguir a algunas personas!"
-  step3_2: "Tu página de inicio y tus líneas de tiempo sociales se basan en quién sigues, así que intenta seguir un par de cuentas para empezar.\nHaz clic en el círculo más en la parte superior derecha de un perfil para seguirlos."
+  step3_2: "Tu página de inicio y tus líneas de tiempo sociales se basan en quién\
+    \ sigues, así que intenta seguir un par de cuentas para empezar.\nHaz clic en\
+    \ el círculo más en la parte superior derecha de un perfil para seguirlos."
   step4_1: "Vamos a salir a la calle"
-  step4_2: "Para tu primer post, a algunas personas les gusta hacer un post de {introduction} o un simple \"¡Hola mundo!\""
+  step4_2: "Para tu primer post, a algunas personas les gusta hacer un post de {introduction}\
+    \ o un simple \"¡Hola mundo!\""
   step5_1: "¡Líneas de tiempo, líneas de tiempo por todas partes!"
   step5_2: "Su instancia tiene {timelines} diferentes líneas de tiempo habilitadas"
-  step5_3: "La línea de tiempo Inicio {icon} es donde puedes ver las publicaciones de tus seguidores."
-  step5_4: "La línea de tiempo Local {icon} es donde puedes ver las publicaciones de todos los demás en esta instancia."
-  step5_5: "La línea de tiempo {icon} recomendada es donde puedes ver las publicaciones de las instancias que los administradores recomiendan."
-  step5_6: "La línea de tiempo Social {icon} es donde puedes ver las publicaciones de los amigos de tus seguidores."
-  step5_7: "La línea de tiempo Global {icon} es donde puedes ver las publicaciones de todas las demás instancias conectadas."
+  step5_3: "La línea de tiempo Inicio {icon} es donde puedes ver las publicaciones\
+    \ de tus seguidores."
+  step5_4: "La línea de tiempo Local {icon} es donde puedes ver las publicaciones\
+    \ de todos los demás en esta instancia."
+  step5_5: "La línea de tiempo {icon} recomendada es donde puedes ver las publicaciones\
+    \ de las instancias que los administradores recomiendan."
+  step5_6: "La línea de tiempo Social {icon} es donde puedes ver las publicaciones\
+    \ de los amigos de tus seguidores."
+  step5_7: "La línea de tiempo Global {icon} es donde puedes ver las publicaciones\
+    \ de todas las demás instancias conectadas."
   step6_1: "Entonces, ¿qué es este lugar?"
-  step6_2: "Bueno, no sólo te has unido a Calckey. Te has unido a un portal del Fediverso, una red interconectada de miles de servidores, llamada \"instancias\""
-  step6_3: "Cada servidor funciona de forma diferente, y no todos los servidores ejecutan Calckey. Sin embargo, ¡éste lo hace! Es un poco complicado, pero le cogerás el tranquillo enseguida"
+  step6_2: "Bueno, no sólo te has unido a Calckey. Te has unido a un portal del Fediverso,\
+    \ una red interconectada de miles de servidores, llamada \"instancias\""
+  step6_3: "Cada servidor funciona de forma diferente, y no todos los servidores ejecutan\
+    \ Calckey. Sin embargo, ¡éste lo hace! Es un poco complicado, pero le cogerás\
+    \ el tranquillo enseguida"
   step6_4: "¡Ahora ve, explora y diviértete!"
 _2fa:
   alreadyRegistered: "Ya has completado la configuración."
   registerDevice: "Registrar dispositivo"
   registerKey: "Registrar clave"
-  step1: "Primero, instale en su dispositivo la aplicación de autenticación {a} o {b} u otra."
+  step1: "Primero, instale en su dispositivo la aplicación de autenticación {a} o\
+    \ {b} u otra."
   step2: "Luego, escanee con la aplicación el código QR mostrado en pantalla."
   step2Url: "En una aplicación de escritorio se puede ingresar la siguiente URL:"
   step3: "Para terminar, ingrese el token mostrado en la aplicación."
   step4: "Ahora cuando inicie sesión, ingrese el mismo token"
-  securityKeyInfo: "Se puede configurar el inicio de sesión usando una clave de seguridad de hardware que soporte FIDO2 o con un certificado de huella digital o con un PIN"
+  securityKeyInfo: "Se puede configurar el inicio de sesión usando una clave de seguridad\
+    \ de hardware que soporte FIDO2 o con un certificado de huella digital o con un\
+    \ PIN"
 _permissions:
   "read:account": "Ver información de la cuenta"
   "write:account": "Editar información de la cuenta"
@@ -1245,7 +1374,8 @@ _permissions:
   "write:gallery-likes": "Editar favoritos de la galería"
 _auth:
   shareAccess: "¿Desea permitir el acceso a la cuenta \"{name}\"?"
-  shareAccessAsk: "¿Está seguro de que desea autorizar esta aplicación para acceder a su cuenta?"
+  shareAccessAsk: "¿Está seguro de que desea autorizar esta aplicación para acceder\
+    \ a su cuenta?"
   permissionAsk: "Esta aplicación requiere los siguientes permisos"
   pleaseGoBack: "Por favor, vuelve a la aplicación"
   callback: "Volviendo a la aplicación"
@@ -1287,6 +1417,7 @@ _widgets:
   serverMetric: "Estadísticas del servidor"
   aiscript: "Consola de AiScript"
   aichan: "indigo"
+  userList: Lista Usuarios
 _cw:
   hide: "Ocultar"
   show: "Ver más"
@@ -1387,6 +1518,7 @@ _timelines:
   local: "Local"
   social: "Social"
   global: "Global"
+  recommended: Recomendado
 _pages:
   newPage: "Crear página"
   editPage: "Editar página"
@@ -1633,7 +1765,8 @@ _pages:
       _seedRandomPick:
         arg1: "Semilla"
         arg2: "Listas"
-      DRPWPM: "Elegir aleatoriamente de la lista ponderada (Diariamente para cada usuario)"
+      DRPWPM: "Elegir aleatoriamente de la lista ponderada (Diariamente para cada\
+        \ usuario)"
       _DRPWPM:
         arg1: "Lista de texto"
       pick: "Elegir de la lista"
@@ -1664,7 +1797,8 @@ _pages:
       _for:
         arg1: "Cantidad de repeticiones"
         arg2: "Acción"
-    typeError: "El slot {slot} acepta el tipo {expect} pero fue ingresado el tipo {actual}"
+    typeError: "El slot {slot} acepta el tipo {expect} pero fue ingresado el tipo\
+      \ {actual}"
     thereIsEmptySlot: "El slot {slot} está vacío"
     types:
       string: "Texto"
@@ -1728,8 +1862,10 @@ _deck:
   newProfile: "Nuevo perfil"
   deleteProfile: "Eliminar perfil"
   introduction: "¡Crea la interfaz perfecta para tí organizando las columnas libremente!"
-  introduction2: "Presiona en la  + de la derecha de la pantalla para añadir nuevas columnas donde quieras."
-  widgetsIntroduction: "Por favor selecciona \"Editar Widgets\" en el menú columna y agrega un widget."
+  introduction2: "Presiona en la  + de la derecha de la pantalla para añadir nuevas\
+    \ columnas donde quieras."
+  widgetsIntroduction: "Por favor selecciona \"Editar Widgets\" en el menú columna\
+    \ y agrega un widget."
   _columns:
     main: "Principal"
     widgets: "Widgets"
@@ -1739,3 +1875,45 @@ _deck:
     list: "Listas"
     mentions: "Menciones"
     direct: "Mensaje directo"
+manageGroups: Administrar grupos
+replayTutorial: Repetir Tutorial
+privateMode: Modo privado
+addInstance: Añadir una instancia
+renoteMute: Silenciar impulsos
+renoteUnmute: Dejar de silenciar impulsos
+flagSpeakAsCat: Habla como un gato
+selectInstance: Selectiona una instancia
+flagSpeakAsCatDescription: Tu publicación se "nyanified" cuando esté en modo gato
+allowedInstances: Instancias en la lista blanca
+breakFollowConfirm: ¿Estás seguro de que quieres eliminar el seguidor?
+subscribePushNotification: Habilitar notificaciones
+unsubscribePushNotification: Desactivar notificaciones
+pushNotificationAlreadySubscribed: Las notificaciones ya están activados
+pushNotificationNotSupported: Su navegador o instancia no admite notificaciones
+moveAccount: ¡Mover cuenta!
+moveFrom: Mueve a esta cuenta de una cuenta antigua
+moveFromLabel: 'La cuenta que estás moviendo de:'
+moveAccountDescription: ''
+license: Licencia
+_apps:
+  apps: Aplicaciones
+  crossPlatform: Plataforma Cruzada
+  mobile: Teléfono móvil
+  secondClass: Segunda clase
+  lesskey: ''
+  firstClass: Primera clase
+  thirdClass: Tercera clase
+  theDesk: ''
+  pwa: Instalar PWA
+  free: Gratis
+  paid: Pagado
+noThankYou: No gracias
+userSaysSomethingReason: '{name} dijo {reason}'
+hiddenTags: Etiquetas Ocultas
+noInstances: No hay instancias
+accountMoved: 'Usuario ha movido a una cuenta nueva:'
+caption: Auto Subtítulos
+showAds: Mostrar Anuncios
+enterSendsMessage: Presione "RETORNO" en los mensajes para enviar el mensaje (para
+  apagarlo es Ctrl + RETORNO)
+recommendedInstances: Instancias Recomendadas

From 263de894a552b27c9f51cd683757618b536db633 Mon Sep 17 00:00:00 2001
From: Eryk Michalak <gnu.ewm@protonmail.com>
Date: Tue, 18 Apr 2023 15:06:30 +0000
Subject: [PATCH 493/582] chore: Translated using Weblate (Polish)

Currently translated at 100.0% (1724 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/pl/
---
 locales/pl-PL.yml | 272 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 188 insertions(+), 84 deletions(-)

diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index cc2dfa443..f8583fcc0 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1,6 +1,8 @@
 _lang_: "Polski"
-headlineMisskey: "Otwartoźródłowa, zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
-introMisskey: "Hej! Calckey to otwartoźródłowa oraz zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀"
+headlineMisskey: "Otwartoźródłowa, zdecentralizowana sieć społecznościowa, która zawsze\
+  \ będzie darmowa! \U0001F680"
+introMisskey: "Hej! Calckey to otwartoźródłowa oraz zdecentralizowana sieć społecznościowa,\
+  \ która zawsze będzie darmowa! \U0001F680"
 monthAndDay: "{month}-{day}"
 search: "Szukaj"
 notifications: "Powiadomienia"
@@ -43,7 +45,8 @@ copyContent: "Skopiuj zawartość"
 copyLink: "Skopiuj odnośnik"
 delete: "Usuń"
 deleteAndEdit: "Usuń i edytuj"
-deleteAndEditConfirm: "Czy na pewno chcesz usunąć ten wpis i zedytować go? Utracisz wszystkie reakcje, podbicia i odpowiedzi do tego wpisu."
+deleteAndEditConfirm: "Czy na pewno chcesz usunąć ten wpis i zedytować go? Utracisz\
+  \ wszystkie reakcje, podbicia i odpowiedzi do tego wpisu."
 addToList: "Dodaj do listy"
 sendMessage: "Wyślij wiadomość"
 copyUsername: "Kopiuj nazwę użytkownika"
@@ -63,9 +66,11 @@ import: "Importuj"
 export: "Eksportuj"
 files: "Pliki"
 download: "Pobierz"
-driveFileDeleteConfirm: "Czy chcesz usunąć plik \"{name}\"? Zniknie również wpis, do której dołączony jest ten plik."
+driveFileDeleteConfirm: "Czy chcesz usunąć plik \"{name}\"? Zniknie również wpis,\
+  \ do której dołączony jest ten plik."
 unfollowConfirm: "Czy na pewno chcesz przestać obserwować {name}?"
-exportRequested: "Zażądałeś eksportu. Może to zająć chwilę. Po zakończeniu eksportu zostanie on dodany do Twojego dysku."
+exportRequested: "Zażądałeś eksportu. Może to zająć chwilę. Po zakończeniu eksportu\
+  \ zostanie on dodany do Twojego dysku."
 importRequested: "Zażądano importu. Może to zająć chwilę."
 lists: "Listy"
 noLists: "Nie masz żadnych list"
@@ -80,7 +85,8 @@ error: "Błąd"
 somethingHappened: "Coś poszło nie tak"
 retry: "Spróbuj ponownie"
 pageLoadError: "Nie udało się załadować strony."
-pageLoadErrorDescription: "Zwykle jest to spowodowane problemem z siecią lub cache przeglądarki. Spróbuj wyczyścić cache i sprawdź jeszcze raz za chwilę."
+pageLoadErrorDescription: "Zwykle jest to spowodowane problemem z siecią lub cache\
+  \ przeglądarki. Spróbuj wyczyścić cache i sprawdź jeszcze raz za chwilę."
 serverIsDead: "Serwer nie odpowiada. Zaczekaj chwilę i spróbuj ponownie."
 youShouldUpgradeClient: "Aby zobaczyć tą stronę, odśwież ją, by zaaktualizować klienta."
 enterListName: "Wpisz nazwę listy"
@@ -107,7 +113,8 @@ sensitive: "NSFW"
 add: "Dodaj"
 reaction: "Reakcja"
 reactionSetting: "Reakcje do pokazania w wyborniku reakcji"
-reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć, naciśnij „+” aby dodać."
+reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć,\
+  \ naciśnij „+” aby dodać."
 rememberNoteVisibility: "Zapamiętuj ustawienia widoczności wpisu"
 attachCancel: "Usuń załącznik"
 markAsSensitive: "Oznacz jako NSFW"
@@ -136,13 +143,19 @@ emojiUrl: "Adres URL emoji"
 addEmoji: "Dodaj emoji"
 settingGuide: "Proponowana konfiguracja"
 cacheRemoteFiles: "Przechowuj zdalne pliki w pamięci podręcznej"
-cacheRemoteFilesDescription: "Gdy ta opcja jest wyłączona, zdalne pliki są ładowane bezpośrednio ze zdalnych instancji. Wyłączenie the opcji zmniejszy użycie powierzchni dyskowej, ale zwiększy transfer, ponieważ miniaturki nie będą generowane."
+cacheRemoteFilesDescription: "Gdy ta opcja jest wyłączona, zdalne pliki są ładowane\
+  \ bezpośrednio ze zdalnych instancji. Wyłączenie the opcji zmniejszy użycie powierzchni\
+  \ dyskowej, ale zwiększy transfer, ponieważ miniaturki nie będą generowane."
 flagAsBot: "To konto jest botem"
-flagAsBotDescription: "Jeżeli ten kanał jest kontrolowany przez jakiś program, ustaw tę opcję. Jeżeli włączona, będzie działać jako flaga informująca innych programistów, aby zapobiegać nieskończonej interakcji z różnymi botami i dostosowywać wewnętrzne systemy Calckey, traktując konto jako bota."
+flagAsBotDescription: "Jeżeli ten kanał jest kontrolowany przez jakiś program, ustaw\
+  \ tę opcję. Jeżeli włączona, będzie działać jako flaga informująca innych programistów,\
+  \ aby zapobiegać nieskończonej interakcji z różnymi botami i dostosowywać wewnętrzne\
+  \ systemy Calckey, traktując konto jako bota."
 flagAsCat: "Czy jesteś kotem? \U0001F63A"
 flagAsCatDescription: "Dostaniesz kocie uszka, oraz będziesz mówić jak kot!"
 flagShowTimelineReplies: "Pokazuj odpowiedzi na osi czasu"
-autoAcceptFollowed: "Automatycznie przyjmuj prośby o możliwość obserwacji od użytkowników, których obserwujesz"
+autoAcceptFollowed: "Automatycznie przyjmuj prośby o możliwość obserwacji od użytkowników,\
+  \ których obserwujesz"
 addAccount: "Dodaj konto"
 loginFailed: "Nie udało się zalogować"
 showOnRemote: "Zobacz na zdalnej instancji"
@@ -184,11 +197,14 @@ instanceInfo: "Informacje o instancji"
 statistics: "Statystyki"
 clearQueue: "Wyczyść kolejkę"
 clearQueueConfirmTitle: "Czy na pewno chcesz wyczyścić kolejkę?"
-clearQueueConfirmText: "Wszystkie niewysłane wpisy z kolejki nie zostaną wysłane. Zwykle to nie jest konieczne."
+clearQueueConfirmText: "Wszystkie niewysłane wpisy z kolejki nie zostaną wysłane.\
+  \ Zwykle to nie jest konieczne."
 clearCachedFiles: "Wyczyść pamięć podręczną"
-clearCachedFilesConfirm: "Czy na pewno chcesz usunąć wszystkie zdalne pliki z pamięci podręcznej?"
+clearCachedFilesConfirm: "Czy na pewno chcesz usunąć wszystkie zdalne pliki z pamięci\
+  \ podręcznej?"
 blockedInstances: "Zablokowane instancje"
-blockedInstancesDescription: "Wypisz nazwy hostów instancji, które powinny zostać zablokowane. Wypisane instancje nie będą mogły dłużej komunikować się z tą instancją."
+blockedInstancesDescription: "Wypisz nazwy hostów instancji, które powinny zostać\
+  \ zablokowane. Wypisane instancje nie będą mogły dłużej komunikować się z tą instancją."
 muteAndBlock: "Wyciszenia i blokady"
 mutedUsers: "Wyciszeni użytkownicy"
 blockedUsers: "Zablokowani użytkownicy"
@@ -252,7 +268,8 @@ agreeTo: "Wyrażam zgodę na {0}"
 tos: "Regulamin"
 start: "Rozpocznij"
 home: "Strona główna"
-remoteUserCaution: "Te informacje mogą nie być aktualne, ponieważ użytkownik pochodzi ze zdalnej instancji."
+remoteUserCaution: "Te informacje mogą nie być aktualne, ponieważ użytkownik pochodzi\
+  \ ze zdalnej instancji."
 activity: "Aktywność"
 images: "Zdjęcia"
 birthday: "Data urodzenia"
@@ -285,7 +302,8 @@ unableToDelete: "Nie można usunąć"
 inputNewFileName: "Wprowadź nową nazwę pliku"
 inputNewDescription: "Proszę wpisać nowy napis"
 inputNewFolderName: "Wprowadź nową nazwę katalogu"
-circularReferenceFolder: "Katalog docelowy jest podkatalogiem katalogu, który chcesz przenieść."
+circularReferenceFolder: "Katalog docelowy jest podkatalogiem katalogu, który chcesz\
+  \ przenieść."
 hasChildFilesOrFolders: "Ponieważ ten katalog nie jest pusty, nie może być usunięty."
 copyUrl: "Skopiuj adres URL"
 rename: "Zmień nazwę"
@@ -319,7 +337,8 @@ connectService: "Połącz"
 disconnectService: "Rozłącz"
 enableLocalTimeline: "Włącz lokalną oś czasu"
 enableGlobalTimeline: "Włącz globalną oś czasu"
-disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dostęp do wszystkich osi czasu, nawet gdy są one wyłączone."
+disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dostęp do\
+  \ wszystkich osi czasu, nawet gdy są one wyłączone."
 registration: "Zarejestruj się"
 enableRegistration: "Włącz rejestrację nowych użytkowników"
 invite: "Zaproś"
@@ -331,9 +350,11 @@ bannerUrl: "Adres URL banera"
 backgroundImageUrl: "Adres URL tła"
 basicInfo: "Podstawowe informacje"
 pinnedUsers: "Przypięty użytkownik"
-pinnedUsersDescription: "Wypisz po jednej nazwie użytkownika w wierszu. Podani użytkownicy zostaną przypięci pod kartą „Eksploruj”."
+pinnedUsersDescription: "Wypisz po jednej nazwie użytkownika w wierszu. Podani użytkownicy\
+  \ zostaną przypięci pod kartą „Eksploruj”."
 pinnedPages: "Przypięte strony"
-pinnedPagesDescription: "Wprowadź ścieżki stron które chcesz przypiąć na głównej stronie instancji, oddzielone znakiem nowego wiersza."
+pinnedPagesDescription: "Wprowadź ścieżki stron które chcesz przypiąć na głównej stronie\
+  \ instancji, oddzielone znakiem nowego wiersza."
 pinnedClipId: "ID przypiętego klipu"
 pinnedNotes: "Przypięty wpis"
 hcaptcha: "hCaptcha"
@@ -344,14 +365,16 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "Włącz reCAPTCHA"
 recaptchaSiteKey: "Klucz strony"
 recaptchaSecretKey: "Tajny klucz"
-avoidMultiCaptchaConfirm: "Używanie wielu Captchy może spowodować zakłócenia. Czy chcesz wyłączyć inną Captchę? Możesz zostawić wiele jednocześnie, klikając Anuluj."
+avoidMultiCaptchaConfirm: "Używanie wielu Captchy może spowodować zakłócenia. Czy\
+  \ chcesz wyłączyć inną Captchę? Możesz zostawić wiele jednocześnie, klikając Anuluj."
 antennas: "Anteny"
 manageAntennas: "Zarządzaj antenami"
 name: "Nazwa"
 antennaSource: "Źródło anteny"
 antennaKeywords: "Słowa kluczowe do obserwacji"
 antennaExcludeKeywords: "Wykluczone słowa kluczowe"
-antennaKeywordsDescription: "Oddziel spacjami dla warunku AND, albo wymuś koniec linii dla warunku OR."
+antennaKeywordsDescription: "Oddziel spacjami dla warunku AND, albo wymuś koniec linii\
+  \ dla warunku OR."
 notifyAntenna: "Powiadamiaj o nowych wpisach"
 withFileAntenna: "Filtruj tylko wpisy z załączonym plikiem"
 enableServiceworker: "Włącz powiadomienia push dla twojej przeglądarki"
@@ -439,7 +462,8 @@ strongPassword: "Silne hasło"
 passwordMatched: "Pasuje"
 passwordNotMatched: "Hasła nie pasują do siebie"
 signinWith: "Zaloguj się z {x}"
-signinFailed: "Nie udało się zalogować. Wprowadzona nazwa użytkownika lub hasło są nieprawidłowe."
+signinFailed: "Nie udało się zalogować. Wprowadzona nazwa użytkownika lub hasło są\
+  \ nieprawidłowe."
 tapSecurityKey: "Wybierz swój klucz bezpieczeństwa"
 or: "Lub"
 language: "Język"
@@ -485,13 +509,18 @@ objectStorageBucketDesc: "Podaj nazwę „wiadra” używaną przez konfigurowan
 objectStoragePrefix: "Prefiks"
 objectStoragePrefixDesc: "Pliki będą przechowywane w katalogu z tym prefiksem."
 objectStorageEndpoint: "Punkt końcowy"
-objectStorageEndpointDesc: "Pozostaw puste jeżeli używasz AWS S3, w innym wypadku określ punkt końcowy jako '<host>' lub '<host>:<port>' zgodnie z instrukcjami usługi, której używasz."
+objectStorageEndpointDesc: "Pozostaw puste jeżeli używasz AWS S3, w innym wypadku\
+  \ określ punkt końcowy jako '<host>' lub '<host>:<port>' zgodnie z instrukcjami\
+  \ usługi, której używasz."
 objectStorageRegion: "Region"
-objectStorageRegionDesc: "Określ region, np. 'xx-east-1'. Jeżeli usługa której używasz nie zawiera rozróżnienia regionów, pozostaw to pustym lub wprowadź 'us-east-1'."
+objectStorageRegionDesc: "Określ region, np. 'xx-east-1'. Jeżeli usługa której używasz\
+  \ nie zawiera rozróżnienia regionów, pozostaw to pustym lub wprowadź 'us-east-1'."
 objectStorageUseSSL: "Użyj SSL"
-objectStorageUseSSLDesc: "Wyłącz, jeżeli nie zamierzasz używać HTTPS dla połączenia z API"
+objectStorageUseSSLDesc: "Wyłącz, jeżeli nie zamierzasz używać HTTPS dla połączenia\
+  \ z API"
 objectStorageUseProxy: "Połącz przez proxy"
-objectStorageUseProxyDesc: "Wyłącz, jeżeli nie zamierzasz używać proxy dla połączenia z pamięcią blokową"
+objectStorageUseProxyDesc: "Wyłącz, jeżeli nie zamierzasz używać proxy dla połączenia\
+  \ z pamięcią blokową"
 serverLogs: "Dziennik zdarzeń"
 deleteAll: "Usuń wszystkie"
 showFixedPostForm: "Wyświetlaj formularz tworzenia wpisu w górnej części osi czasu"
@@ -518,18 +547,22 @@ sort: "Sortuj"
 ascendingOrder: "Rosnąco"
 descendingOrder: "Malejąco"
 scratchpad: "Brudnopis"
-scratchpadDescription: "Brudnopis to środowisko dla eksperymentów z AiScript. Możesz pisać, wykonywać i sprawdzać wyniki interakcji skryptu z Calckey."
+scratchpadDescription: "Brudnopis to środowisko dla eksperymentów z AiScript. Możesz\
+  \ pisać, wykonywać i sprawdzać wyniki interakcji skryptu z Calckey."
 output: "Wyjście"
 script: "Skrypt"
 disablePagesScript: "Wyłącz AiScript na Stronach"
 updateRemoteUser: "Aktualizuj zdalne dane o użytkowniku"
 deleteAllFiles: "Usuń wszystkie pliki"
 deleteAllFilesConfirm: "Czy na pewno chcesz usunąć wszystkie pliki?"
-removeAllFollowingDescription: "Przestań obserwować wszystkie konta z {host}. Wykonaj to, jeżeli instancja już nie istnieje."
+removeAllFollowingDescription: "Przestań obserwować wszystkie konta z {host}. Wykonaj\
+  \ to, jeżeli instancja już nie istnieje."
 userSuspended: "To konto zostało zawieszone."
 userSilenced: "Ten użytkownik został wyciszony."
 yourAccountSuspendedTitle: "To konto jest zawieszone"
-yourAccountSuspendedDescription: "To konto zostało zawieszone z powodu złamania regulaminu serwera lub innych podobnych. Skontaktuj się z administratorem, jeśli chciałbyś poznać bardziej szczegółowy powód. Proszę nie zakładać nowego konta."
+yourAccountSuspendedDescription: "To konto zostało zawieszone z powodu złamania regulaminu\
+  \ serwera lub innych podobnych. Skontaktuj się z administratorem, jeśli chciałbyś\
+  \ poznać bardziej szczegółowy powód. Proszę nie zakładać nowego konta."
 menu: "Menu"
 divider: "Rozdzielacz"
 addItem: "Dodaj element"
@@ -568,12 +601,14 @@ permission: "Uprawnienia"
 enableAll: "Włącz wszystko"
 disableAll: "Wyłącz wszystko"
 tokenRequested: "Przydziel dostęp do konta"
-pluginTokenRequestedDescription: "Ta wtyczka będzie mogła korzystać z ustawionych tu uprawnień."
+pluginTokenRequestedDescription: "Ta wtyczka będzie mogła korzystać z ustawionych\
+  \ tu uprawnień."
 notificationType: "Rodzaj powiadomień"
 edit: "Edytuj"
 emailServer: "Serwer poczty e-mail"
 enableEmail: "Włącz dostarczanie wiadomości e-mail"
-emailConfigInfo: "Wykorzystywany do potwierdzenia adresu e-mail w trakcie rejestracji, lub gdy zapomnisz hasła"
+emailConfigInfo: "Wykorzystywany do potwierdzenia adresu e-mail w trakcie rejestracji,\
+  \ lub gdy zapomnisz hasła"
 email: "Adres e-mail"
 emailAddress: "Adres e-mail"
 smtpConfig: "Konfiguracja serwera SMTP"
@@ -581,7 +616,8 @@ smtpHost: "Host"
 smtpPort: "Port"
 smtpUser: "Nazwa użytkownika"
 smtpPass: "Hasło"
-emptyToDisableSmtpAuth: "Pozostaw adres e-mail i hasło puste, aby wyłączyć weryfikację SMTP"
+emptyToDisableSmtpAuth: "Pozostaw adres e-mail i hasło puste, aby wyłączyć weryfikację\
+  \ SMTP"
 smtpSecureInfo: "Wyłącz, jeżeli używasz STARTTLS"
 testEmail: "Przetestuj dostarczanie wiadomości e-mail"
 wordMute: "Wyciszenie słowa"
@@ -600,10 +636,12 @@ create: "Utwórz"
 notificationSetting: "Ustawienia powiadomień"
 notificationSettingDesc: "Wybierz rodzaj powiadomień do wyświetlania."
 useGlobalSetting: "Użyj globalnych ustawień"
-useGlobalSettingDesc: "Jeżeli włączone, zostaną wykorzystane ustawienia powiadomień Twojego konta. Jeżeli wyłączone, mogą zostać wykonane oddzielne konfiguracje."
+useGlobalSettingDesc: "Jeżeli włączone, zostaną wykorzystane ustawienia powiadomień\
+  \ Twojego konta. Jeżeli wyłączone, mogą zostać wykonane oddzielne konfiguracje."
 other: "Inne"
 regenerateLoginToken: "Generuj token logowania ponownie"
-regenerateLoginTokenDescription: "Regeneruje token używany wewnętrznie podczas logowania. Zazwyczaj nie jest to konieczne. Po regeneracji wszystkie urządzenia zostaną wylogowane."
+regenerateLoginTokenDescription: "Regeneruje token używany wewnętrznie podczas logowania.\
+  \ Zazwyczaj nie jest to konieczne. Po regeneracji wszystkie urządzenia zostaną wylogowane."
 setMultipleBySeparatingWithSpace: "Możesz ustawić wiele, oddzielając je spacjami."
 fileIdOrUrl: "ID pliku albo URL"
 behavior: "Zachowanie"
@@ -611,7 +649,8 @@ sample: "Przykład"
 abuseReports: "Zgłoszenia"
 reportAbuse: "Zgłoś"
 reportAbuseOf: "Zgłoś {name}"
-fillAbuseReportDescription: "Wypełnij szczegóły zgłoszenia. Jeżeli dotyczy ono określonego wpisu, uwzględnij jego adres URL."
+fillAbuseReportDescription: "Wypełnij szczegóły zgłoszenia. Jeżeli dotyczy ono określonego\
+  \ wpisu, uwzględnij jego adres URL."
 abuseReported: "Twoje zgłoszenie zostało wysłane. Dziękujemy."
 reporteeOrigin: "Pochodzenie osoby zgłoszonej"
 reporterOrigin: "Pochodzenie osoby zgłaszającej"
@@ -633,9 +672,11 @@ createNew: "Utwórz nowy"
 optional: "Nieobowiązkowe"
 createNewClip: "Utwórz nowy klip"
 unclip: "Odczep"
-confirmToUnclipAlreadyClippedNote: "Ten wpis jest już częścią klipu \"{name}\". Czy chcesz ją usunąć z tego klipu?"
+confirmToUnclipAlreadyClippedNote: "Ten wpis jest już częścią klipu \"{name}\". Czy\
+  \ chcesz ją usunąć z tego klipu?"
 public: "Publiczny"
-i18nInfo: "Calckey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}."
+i18nInfo: "Calckey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc\
+  \ na {link}."
 manageAccessTokens: "Zarządzaj tokenami dostępu"
 accountInfo: "Informacje o koncie"
 notesCount: "Liczba wpisów"
@@ -654,12 +695,16 @@ no: "Nie"
 driveFilesCount: "Liczba plików na dysku"
 driveUsage: "Użycie przestrzeni dyskowej"
 noCrawle: "Odrzuć indeksowanie przez crawlery"
-noCrawleDescription: "Proś wyszukiwarki internetowe, aby nie indeksowały Twojego profilu, wpisów, stron itd."
-lockedAccountInfo: "Dopóki nie ustawisz widoczności wpisu na \"Obserwujący\", twoje wpisy będą mogli widzieć wszyscy, nawet jeśli ustawisz manualne zatwierdzanie obserwujących."
+noCrawleDescription: "Proś wyszukiwarki internetowe, aby nie indeksowały Twojego profilu,\
+  \ wpisów, stron itd."
+lockedAccountInfo: "Dopóki nie ustawisz widoczności wpisu na \"Obserwujący\", twoje\
+  \ wpisy będą mogli widzieć wszyscy, nawet jeśli ustawisz manualne zatwierdzanie\
+  \ obserwujących."
 alwaysMarkSensitive: "Oznacz domyślnie jako NSFW"
 loadRawImages: "Wyświetlaj zdjęcia w załącznikach w całości zamiast miniatur"
 disableShowingAnimatedImages: "Nie odtwarzaj animowanych obrazów"
-verificationEmailSent: "Wiadomość weryfikacyjna została wysłana. Odwiedź uwzględniony odnośnik, aby ukończyć weryfikację."
+verificationEmailSent: "Wiadomość weryfikacyjna została wysłana. Odwiedź uwzględniony\
+  \ odnośnik, aby ukończyć weryfikację."
 notSet: "Nie ustawiono"
 emailVerified: "Adres e-mail został potwierdzony"
 noteFavoritesCount: "Liczba zakładek"
@@ -671,14 +716,16 @@ clips: "Klipy"
 experimentalFeatures: "Eksperymentalne funkcje"
 developer: "Programista"
 makeExplorable: "Pokazuj konto na stronie „Eksploruj”"
-makeExplorableDescription: "Jeżeli wyłączysz tę opcję, Twoje konto nie będzie wyświetlać się w sekcji „Eksploruj”."
+makeExplorableDescription: "Jeżeli wyłączysz tę opcję, Twoje konto nie będzie wyświetlać\
+  \ się w sekcji „Eksploruj”."
 showGapBetweenNotesInTimeline: "Pokazuj odstęp między wpisami na osi czasu"
 duplicate: "Duplikuj"
 left: "Lewo"
 center: "Wyśrodkuj"
 wide: "Szerokie"
 narrow: "Wąskie"
-reloadToApplySetting: "To ustawienie zostanie zastosowane po odświeżeniu strony. Chcesz odświeżyć?"
+reloadToApplySetting: "To ustawienie zostanie zastosowane po odświeżeniu strony. Chcesz\
+  \ odświeżyć?"
 needReloadToApply: "To ustawienie zostanie zastosowane po odświeżeniu strony."
 showTitlebar: "Pokazuj pasek tytułowy"
 clearCache: "Wyczyść pamięć podręczną"
@@ -724,14 +771,17 @@ unlikeConfirm: "Na pewno chcesz usunąć polubienie?"
 fullView: "Pełny widok"
 quitFullView: "Opuść pełny widok"
 addDescription: "Dodaj opis"
-userPagePinTip: "Możesz wyświetlać wpisy w tym miejscu po wybraniu \"Przypnij do profilu\" z menu pojedynczego wpisu."
-notSpecifiedMentionWarning: "Ten wpis zawiera wzmianki o użytkownikach niezawartych jako odbiorcy"
+userPagePinTip: "Możesz wyświetlać wpisy w tym miejscu po wybraniu \"Przypnij do profilu\"\
+  \ z menu pojedynczego wpisu."
+notSpecifiedMentionWarning: "Ten wpis zawiera wzmianki o użytkownikach niezawartych\
+  \ jako odbiorcy"
 info: "Informacje"
 userInfo: "Informacje o użykowniku"
 unknown: "Nieznane"
 onlineStatus: "Status online"
 hideOnlineStatus: "Ukryj status online"
-hideOnlineStatusDescription: "Ukrywanie statusu online ogranicza wygody niektórych funkcji, takich jak wyszukiwanie."
+hideOnlineStatusDescription: "Ukrywanie statusu online ogranicza wygody niektórych\
+  \ funkcji, takich jak wyszukiwanie."
 online: "Online"
 active: "Aktywny"
 offline: "Offline"
@@ -766,7 +816,8 @@ emailNotConfiguredWarning: "Nie podano adresu e-mail."
 ratio: "Stosunek"
 previewNoteText: "Pokaż podgląd"
 customCss: "Własny CSS"
-customCssWarn: "Używaj tego ustawienia tylko wtedy, gdy wiesz co ono robi. Nieprawidłowe wpisy mogą spowodować, że klient przestanie działać poprawnie."
+customCssWarn: "Używaj tego ustawienia tylko wtedy, gdy wiesz co ono robi. Nieprawidłowe\
+  \ wpisy mogą spowodować, że klient przestanie działać poprawnie."
 global: "Globalna"
 squareAvatars: "Wyświetlaj kwadratowe awatary"
 sent: "Wysłane"
@@ -781,7 +832,9 @@ whatIsNew: "Pokaż zmiany"
 translate: "Przetłumacz"
 translatedFrom: "Przetłumaczone z {x}"
 accountDeletionInProgress: "Trwa usuwanie konta"
-usernameInfo: "Nazwa, która identyfikuje Twoje konto spośród innych na tym serwerze.  Możesz użyć alfabetu (a~z, A~Z), cyfr (0~9) lub podkreślników (_). Nazwy użytkownika nie mogą być później zmieniane."
+usernameInfo: "Nazwa, która identyfikuje Twoje konto spośród innych na tym serwerze.\
+  \  Możesz użyć alfabetu (a~z, A~Z), cyfr (0~9) lub podkreślników (_). Nazwy użytkownika\
+  \ nie mogą być później zmieniane."
 aiChanMode: "Ai-chan w klasycznym interfejsie"
 keepCw: "Zostaw ostrzeżenia o zawartości"
 pubSub: "Konta Pub/Sub"
@@ -795,12 +848,14 @@ filter: "Filtr"
 controlPanel: "Panel sterowania"
 manageAccounts: "Zarządzaj kontami"
 makeReactionsPublic: "Ustaw historię reakcji jako publiczną"
-makeReactionsPublicDescription: "To spowoduje, że lista wszystkich Twoich dotychczasowych reakcji będzie publicznie widoczna."
+makeReactionsPublicDescription: "To spowoduje, że lista wszystkich Twoich dotychczasowych\
+  \ reakcji będzie publicznie widoczna."
 classic: "Klasyczny"
 muteThread: "Wycisz wątek"
 unmuteThread: "Wyłącz wyciszenie wątku"
 ffVisibility: "Widoczność obserwowanych/obserwujących"
-ffVisibilityDescription: "Pozwala skonfigurować, kto może zobaczyć, kogo obserwujesz i kto Cię obserwuje."
+ffVisibilityDescription: "Pozwala skonfigurować, kto może zobaczyć, kogo obserwujesz\
+  \ i kto Cię obserwuje."
 continueThread: "Kontynuuj wątek"
 deleteAccountConfirm: "Spowoduje to nieodwracalne usunięcie Twojego konta. Kontynuować?"
 incorrectPassword: "Nieprawidłowe hasło."
@@ -808,7 +863,8 @@ voteConfirm: "Potwierdzić swój głos na \"{choice}\"?"
 hide: "Ukryj"
 leaveGroup: "Opuść grupę"
 leaveGroupConfirm: "Czy na pewno chcesz opuścić \"{name}\"?"
-useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach mobilnych"
+useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach\
+  \ mobilnych"
 welcomeBackWithName: "Witaj z powrotem, {name}"
 clickToFinishEmailVerification: "Kliknij [{ok}], aby zakończyć weryfikację e-mail."
 overridedDeviceKind: "Typ urządzenia"
@@ -831,16 +887,22 @@ type: "Typ"
 speed: "Prędkość"
 localOnly: "Tylko lokalne"
 failedToUpload: "Przesyłanie nie powiodło się"
-cannotUploadBecauseInappropriate: "Nie można przesłać tego pliku, ponieważ jego części zostały wykryte jako potencjalnie nieodpowiednie."
-cannotUploadBecauseNoFreeSpace: "Przesyłanie nie powiodło się z powodu braku miejsca na dysku."
+cannotUploadBecauseInappropriate: "Nie można przesłać tego pliku, ponieważ jego części\
+  \ zostały wykryte jako potencjalnie nieodpowiednie."
+cannotUploadBecauseNoFreeSpace: "Przesyłanie nie powiodło się z powodu braku miejsca\
+  \ na dysku."
 beta: "Beta"
 enableAutoSensitive: "Automatyczne oznaczanie NSFW"
-enableAutoSensitiveDescription: "Umożliwia automatyczne wykrywanie i oznaczanie zawartości NSFW za pomocą uczenia maszynowego. Nawet jeśli ta opcja jest wyłączona, może być włączona na całej instancji."
+enableAutoSensitiveDescription: "Umożliwia automatyczne wykrywanie i oznaczanie zawartości\
+  \ NSFW za pomocą uczenia maszynowego. Nawet jeśli ta opcja jest wyłączona, może\
+  \ być włączona na całej instancji."
 navbar: "Pasek nawigacyjny"
 account: "Konta"
 move: "Przenieś"
 _sensitiveMediaDetection:
-  description: "Zmniejsza wysiłek związany z moderacją serwera dzięki automatycznemu rozpoznawaniu zawartości NSFW za pomocą uczenia maszynowego. To nieznacznie zwiększy obciążenie serwera."
+  description: "Zmniejsza wysiłek związany z moderacją serwera dzięki automatycznemu\
+    \ rozpoznawaniu zawartości NSFW za pomocą uczenia maszynowego. To nieznacznie\
+    \ zwiększy obciążenie serwera."
   setSensitiveFlagAutomatically: "Oznacz jako NSFW"
   sensitivity: Czułość wykrywania
   analyzeVideosDescription: Analizuje filmy, w dodatku do zdjęć. Zwiększy to nieznacznie
@@ -864,11 +926,15 @@ _ffVisibility:
 _signup:
   almostThere: "Prawie na miejscu"
   emailAddressInfo: "Podaj swój adres e-mail. Nie zostanie on upubliczniony."
-  emailSent: "E-mail z potwierdzeniem został wysłany na Twój adres e-mail ({email}). Kliknij dołączony link, aby dokończyć tworzenie konta."
+  emailSent: "E-mail z potwierdzeniem został wysłany na Twój adres e-mail ({email}).\
+    \ Kliknij dołączony link, aby dokończyć tworzenie konta."
 _accountDelete:
   accountDelete: "Usuń konto"
-  mayTakeTime: "Ponieważ usuwanie konta jest procesem wymagającym dużej ilości zasobów, jego ukończenie może zająć trochę czasu, w zależności od ilości utworzonej zawartości i liczby przesłanych plików."
-  sendEmail: "Po zakończeniu usuwania konta na adres e-mail zarejestrowany na tym koncie zostanie wysłana wiadomość e-mail."
+  mayTakeTime: "Ponieważ usuwanie konta jest procesem wymagającym dużej ilości zasobów,\
+    \ jego ukończenie może zająć trochę czasu, w zależności od ilości utworzonej zawartości\
+    \ i liczby przesłanych plików."
+  sendEmail: "Po zakończeniu usuwania konta na adres e-mail zarejestrowany na tym\
+    \ koncie zostanie wysłana wiadomość e-mail."
   requestAccountDelete: "Poproś o usunięcie konta"
   started: "Usuwanie się rozpoczęło."
   inProgress: "Usuwanie jest obecnie w toku"
@@ -876,9 +942,12 @@ _ad:
   back: "Wróć"
   reduceFrequencyOfThisAd: "Pokazuj tę reklamę rzadziej"
 _forgotPassword:
-  enterEmail: "Wpisz adres e-mail użyty do rejestracji. Zostanie do niego wysłany link, za pomocą którego możesz zresetować hasło."
-  ifNoEmail: "Jeżeli nie podano adresu e-mail podczas rejestracji, skontaktuj się z administratorem zamiast tego."
-  contactAdmin: "Jeżeli Twoja instancja nie obsługuje adresów e-mail, skontaktuj się zamiast tego z administratorem, aby zresetować hasło."
+  enterEmail: "Wpisz adres e-mail użyty do rejestracji. Zostanie do niego wysłany\
+    \ link, za pomocą którego możesz zresetować hasło."
+  ifNoEmail: "Jeżeli nie podano adresu e-mail podczas rejestracji, skontaktuj się\
+    \ z administratorem zamiast tego."
+  contactAdmin: "Jeżeli Twoja instancja nie obsługuje adresów e-mail, skontaktuj się\
+    \ zamiast tego z administratorem, aby zresetować hasło."
 _gallery:
   my: "Moja galeria"
   liked: "Polubione wpisy"
@@ -901,8 +970,10 @@ _preferencesBackups:
   save: "Zapisz zmiany"
   inputName: "Proszę podać nazwę dla tej kopii zapasowej"
   cannotSave: "Zapisanie nie powiodło się"
-  nameAlreadyExists: "Kopia zapasowa o nazwie \"{name}\" już istnieje. Proszę podać inną nazwę."
-  applyConfirm: "Czy na pewno chcesz zastosować kopię zapasową \"{name}\" na tym urządzeniu? Istniejące ustawienia tego urządzenia zostaną nadpisane."
+  nameAlreadyExists: "Kopia zapasowa o nazwie \"{name}\" już istnieje. Proszę podać\
+    \ inną nazwę."
+  applyConfirm: "Czy na pewno chcesz zastosować kopię zapasową \"{name}\" na tym urządzeniu?\
+    \ Istniejące ustawienia tego urządzenia zostaną nadpisane."
   saveConfirm: "Zapisać kopię zapasową jako {name}?"
   deleteConfirm: "Usunąć kopię zapasową {name}?"
   renameConfirm: "Zmienić nazwę kopii zapasowej z \"{old}\" na \"{new}\"?"
@@ -919,13 +990,15 @@ _registry:
   domain: "Domena"
   createKey: "Utwórz klucz"
 _aboutMisskey:
-  about: "Calckey jest forkiem Misskey utworzonym przez ThatOneCalculator, rozwijanym od 2022."
+  about: "Calckey jest forkiem Misskey utworzonym przez ThatOneCalculator, rozwijanym\
+    \ od 2022."
   contributors: "Główni twórcy"
   allContributors: "Wszyscy twórcy"
   source: "Kod źródłowy"
   translation: "Tłumacz Calckey"
   donate: "Przekaż darowiznę na Calckey"
-  morePatrons: "Naprawdę doceniam wsparcie ze strony wielu niewymienionych tu osób. Dziękuję! \U0001F970"
+  morePatrons: "Naprawdę doceniam wsparcie ze strony wielu niewymienionych tu osób.\
+    \ Dziękuję! \U0001F970"
   patrons: "Wspierający"
 _nsfw:
   respect: "Ukrywaj media NSFW"
@@ -933,10 +1006,13 @@ _nsfw:
   force: "Ukrywaj wszystkie media"
 _mfm:
   cheatSheet: "Ściąga MFM"
-  intro: "MFM jest językiem składniowym używanym przez m.in. Misskey, forki *key (w tym Calckey), oraz Akkomę, który może być użyty w wielu miejscach. Tu znajdziesz listę wszystkich możliwych elementów składni MFM."
+  intro: "MFM jest językiem składniowym używanym przez m.in. Misskey, forki *key (w\
+    \ tym Calckey), oraz Akkomę, który może być użyty w wielu miejscach. Tu znajdziesz\
+    \ listę wszystkich możliwych elementów składni MFM."
   dummy: "Calckey rozszerza świat Fediwersum"
   mention: "Wspomnij"
-  mentionDescription: "Używając znaku @ i nazwy użytkownika, możesz określić danego użytkownika."
+  mentionDescription: "Używając znaku @ i nazwy użytkownika, możesz określić danego\
+    \ użytkownika."
   hashtag: "Hashtag"
   hashtagDescription: "Używając kratki i tekstu, możesz określić hashtag."
   url: "Adres URL"
@@ -951,12 +1027,14 @@ _mfm:
   centerDescription: "Wyśrodkowuje zawartość."
   inlineCode: "Kod (w wierszu)"
   blockCode: "Kod (blok)"
-  blockCodeDescription: "Wyświetla kod z podświetlaną składnią składający się z wielu linii."
+  blockCodeDescription: "Wyświetla kod z podświetlaną składnią składający się z wielu\
+    \ linii."
   blockMath: "Matematyka (Blok)"
   quote: "Cytuj"
   quoteDescription: "Wyświetla treść jako cytat."
   emoji: "Niestandardowe emoji"
-  emojiDescription: "Otaczając nazwę niestandardowego emoji dwukropkami, możesz użyć niestandardowego emoji."
+  emojiDescription: "Otaczając nazwę niestandardowego emoji dwukropkami, możesz użyć\
+    \ niestandardowego emoji."
   search: "Szukaj"
   searchDescription: "Wyświetla pole wyszukiwania z wcześniej wpisanym tekstem."
   flip: "Odwróć"
@@ -1067,7 +1145,8 @@ _theme:
   darken: "Ściemnij"
   lighten: "Rozjaśnij"
   inputConstantName: "Wprowadź nazwę stałej"
-  importInfo: "Jeżeli wprowadzisz tu kod motywu, możesz zaimportować go w edytorze motywu"
+  importInfo: "Jeżeli wprowadzisz tu kod motywu, możesz zaimportować go w edytorze\
+    \ motywu"
   deleteConstantConfirm: "Czy na pewno chcesz usunąć stałą {const}?"
   keys:
     accent: "Akcent"
@@ -1141,27 +1220,42 @@ _tutorial:
   step1_1: "Witamy!"
   step1_2: "Pozwól, że Cię skonfigurujemy. Będziesz działać w mgnieniu oka!"
   step2_1: "Najpierw, proszę wypełnij swój profil."
-  step2_2: "Podanie kilku informacji o tym, kim jesteś, ułatwi innym stwierdzenie, czy chcą zobaczyć Twoje wpisy lub śledzić Cię."
+  step2_2: "Podanie kilku informacji o tym, kim jesteś, ułatwi innym stwierdzenie,\
+    \ czy chcą zobaczyć Twoje wpisy lub śledzić Cię."
   step3_1: "Teraz czas na śledzenie niektórych osób!"
-  step3_2: "Twoje domowe i społeczne linie czasu opierają się na tym, kogo śledzisz, więc spróbuj śledzić kilka kont, aby zacząć.\nKliknij kółko z plusem w prawym górnym rogu profilu, aby go śledzić."
+  step3_2: "Twoje domowe i społeczne linie czasu opierają się na tym, kogo śledzisz,\
+    \ więc spróbuj śledzić kilka kont, aby zacząć.\nKliknij kółko z plusem w prawym\
+    \ górnym rogu profilu, aby go śledzić."
   step4_1: "Pozwól, że zabierzemy Cię tam."
-  step4_2: "Dla twojego pierwszego postu, niektórzy ludzie lubią zrobić {introduction} post lub prosty \"Hello world!\""
+  step4_2: "Dla twojego pierwszego postu, niektórzy ludzie lubią zrobić {introduction}\
+    \ post lub prosty \"Hello world!\""
   step5_1: "Osie czasu, wszędzie widzę osie czasu!"
   step5_2: "Twoja instancja ma włączone {timelines} różne osie czasu."
-  step5_3: "Główna {icon} oś czasu to miejsce, w którym możesz zobaczyć posty od użytkowników których obserwujesz, oraz innych użytkowników z tej instancji. Jeśli wolisz, by główna oś czasu pokazywała tylko posty od użytkowników których obserwujesz, możesz łatwo to zmienić w ustawieniach!"
-  step5_4: "Lokalna {icon} oś czasu to miejsce, w którym możesz zobaczyć posty od wszystkich innych osób na tej instancji."
-  step5_5: "Społeczna {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z instancji, które admini polecają."
-  step5_6: "Polecana {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z instancji, które admini polecają."
-  step5_7: "Globalna {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z każdej innej połączonej instancji."
+  step5_3: "Główna {icon} oś czasu to miejsce, w którym możesz zobaczyć posty od użytkowników\
+    \ których obserwujesz, oraz innych użytkowników z tej instancji. Jeśli wolisz,\
+    \ by główna oś czasu pokazywała tylko posty od użytkowników których obserwujesz,\
+    \ możesz łatwo to zmienić w ustawieniach!"
+  step5_4: "Lokalna {icon} oś czasu to miejsce, w którym możesz zobaczyć posty od\
+    \ wszystkich innych osób na tej instancji."
+  step5_5: "Społeczna {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z instancji,\
+    \ które admini polecają."
+  step5_6: "Polecana {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z instancji,\
+    \ które admini polecają."
+  step5_7: "Globalna {icon} oś czasu to miejsce, gdzie możesz zobaczyć posty z każdej\
+    \ innej połączonej instancji."
   step6_1: "Więc, czym to jest to miejsce?"
-  step6_2: "Cóż, nie dołączył*ś po prostu do Calckey. Dołączył*ś do portalu do Fediverse, połączonej sieci tysięcy serwerów, zwanych instancjami."
-  step6_3: "Każdy serwer działa w inny sposób, i nie wszystkie serwery używają Calckey. Ten jednak używa! Jest to trochę skomplikowane, ale w krótkim czasie załapiesz o co chodzi."
+  step6_2: "Cóż, nie dołączył*ś po prostu do Calckey. Dołączył*ś do portalu do Fediverse,\
+    \ połączonej sieci tysięcy serwerów, zwanych instancjami."
+  step6_3: "Każdy serwer działa w inny sposób, i nie wszystkie serwery używają Calckey.\
+    \ Ten jednak używa! Jest to trochę skomplikowane, ale w krótkim czasie załapiesz\
+    \ o co chodzi."
   step6_4: "A teraz idź, odkrywaj i baw się dobrze!"
 _2fa:
   alreadyRegistered: "Zarejestrowałeś już urządzenie do uwierzytelniania dwuskładnikowego."
   registerDevice: "Zarejestruj nowe urządzenie"
   registerKey: "Zarejestruj klucz bezpieczeństwa"
-  step1: "Najpierw, zainstaluj aplikację uwierzytelniającą (taką jak {a} lub {b}) na swoim urządzeniu."
+  step1: "Najpierw, zainstaluj aplikację uwierzytelniającą (taką jak {a} lub {b})\
+    \ na swoim urządzeniu."
   step2: "Następnie, zeskanuje kod QR z ekranu."
   step3: "Wprowadź token podany w aplikacji, aby ukończyć konfigurację."
   step4: "Od teraz, przy każdej próbie logowania otrzymasz prośbę o token logowania."
@@ -1301,7 +1395,8 @@ _profile:
   youCanIncludeHashtags: "Możesz umieścić hashtagi w swoim opisie."
   metadata: "Dodatkowe informacje"
   metadataEdit: "Edytuj dodatkowe informacje"
-  metadataDescription: "Możesz wyświetlać do czterech sekcji dodatkowych informacji na swoim profilu."
+  metadataDescription: "Możesz wyświetlać do czterech sekcji dodatkowych informacji\
+    \ na swoim profilu."
   metadataLabel: "Etykieta"
   metadataContent: "Treść"
   changeAvatar: "Zmień awatar"
@@ -1400,7 +1495,7 @@ _pages:
     post: "Utwórz wpis"
     _post:
       text: "Treść"
-      attachCanvasImage: Załącz płótno
+      attachCanvasImage: Załącz obraz płótna
       canvasId: ID płótna
     textInput: "Pole tekstowe"
     _textInput:
@@ -1750,7 +1845,10 @@ swipeOnDesktop: Zezwól na przeciąganie w stylu mobilnym na desktopie
 moveFromDescription: To utworzy alias twojego starego konta, w celu umożliwienia migracji
   z tamtego konta na to. Zrób to ZANIM rozpoczniesz przenoszenie się z tamtego konta.
   Proszę wpisz tag konta w formacie @person@instance.com
-migrationConfirm: "Czy jesteś na 200% pewn* tego, że chcesz przenieść swoje konto na {account}? Gdy to zrobisz, odwrócenie tego będzie nie możliwe, i nie będziesz w stanie ponownie używać normalnie z tego konta.\nUpewnij się, że to konto zostało ustawione jako konto z którego się przenosisz."
+migrationConfirm: "Czy jesteś na 200% pewn* tego, że chcesz przenieść swoje konto\
+  \ na {account}? Gdy to zrobisz, odwrócenie tego będzie nie możliwe, i nie będziesz\
+  \ w stanie ponownie używać normalnie z tego konta.\nUpewnij się, że to konto zostało\
+  \ ustawione jako konto z którego się przenosisz."
 noThankYou: Nie, dziękuję
 addInstance: Dodaj instancję
 renoteMute: Wycisz podbicia
@@ -1820,8 +1918,14 @@ proxyAccountDescription: Konto proxy jest kontem które w określonych sytuacjac
   do listy, oraz żaden lokalny użytkownik nie obserwuje tego konta, aktywność owego
   użytkownika nie zostanie dostarczona na oś czasu. W takim razie, użytkownika zaobserwuje
   konto proxy.
-objectStorageBaseUrlDesc: "URL stosowany jako odniesienie. Podaj URL twojego CDN, albo proxy, jeśli używasz któregokolwiek.\nDla S3 użyj 'https://<bucket>.s3.amazonaws.com', a dla GCS i jego odpowiedników użyj 'https://storage.googleapis.com/<bucket>', itd."
-sendErrorReportsDescription: "Gdy ta opcja jest włączona, szczegółowe informacje o błędach będą udostępnianie z Calckey gdy wystąpi problem, pomagając w ulepszaniu Misskey.\nZawrze to informacje takie jak wersja twojego systemu operacyjnego, przeglądarki, Twoja aktywność na Calckey itd."
+objectStorageBaseUrlDesc: "URL stosowany jako odniesienie. Podaj URL twojego CDN,\
+  \ albo proxy, jeśli używasz któregokolwiek.\nDla S3 użyj 'https://<bucket>.s3.amazonaws.com',\
+  \ a dla GCS i jego odpowiedników użyj 'https://storage.googleapis.com/<bucket>',\
+  \ itd."
+sendErrorReportsDescription: "Gdy ta opcja jest włączona, szczegółowe informacje o\
+  \ błędach będą udostępnianie z Calckey gdy wystąpi problem, pomagając w ulepszaniu\
+  \ Misskey.\nZawrze to informacje takie jak wersja twojego systemu operacyjnego,\
+  \ przeglądarki, Twoja aktywność na Calckey itd."
 privateModeInfo: Jeśli włączone, tylko dopuszczone instancje będą mogły federować
   z Twoją instancją. Wszystkie posty będą ukryte przed publiką.
 oneHour: Godzina

From e81b08eb6147b32c3222fc56083c322032c95f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D0=B1=D0=B5=D1=80=20=D0=BE=D0=B3=D1=83=D1=80?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BA?= <abrew1330@gmail.com>
Date: Tue, 18 Apr 2023 04:56:02 +0000
Subject: [PATCH 494/582] chore: Translated using Weblate (Russian)

Currently translated at 90.1% (1554 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ru/
---
 locales/ru-RU.yml | 312 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 224 insertions(+), 88 deletions(-)

diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 9d76dc623..40b7c54e0 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -1,7 +1,9 @@
----
 _lang_: "Русский"
 headlineMisskey: "Сеть, сплетённая из заметок"
-introMisskey: "Добро пожаловать! Misskey — это децентрализованный сервис микроблогов с открытым исходным кодом.\nПишите «заметки» — делитесь со всеми происходящим вокруг или рассказывайте о себе 📡\nСтавьте «реакции» — выражайте свои чувства и эмоции от заметок других 👍\nОткройте для себя новый мир 🚀"
+introMisskey: "Добро пожаловать! Misskey — это децентрализованный сервис микроблогов\
+  \ с открытым исходным кодом.\nПишите «заметки» — делитесь со всеми происходящим\
+  \ вокруг или рассказывайте о себе \U0001F4E1\nСтавьте «реакции» — выражайте свои\
+  \ чувства и эмоции от заметок других \U0001F44D\nОткройте для себя новый мир \U0001F680"
 monthAndDay: "{day}.{month}"
 search: "Поиск"
 notifications: "Уведомления"
@@ -44,7 +46,8 @@ copyContent: "Скопировать содержимое"
 copyLink: "Скопировать ссылку"
 delete: "Удалить"
 deleteAndEdit: "Удалить и отредактировать"
-deleteAndEditConfirm: "Удалить эту заметку и создать отредактированную? Все реакции, ссылки и ответы на существующую будут будут потеряны."
+deleteAndEditConfirm: "Удалить эту заметку и создать отредактированную? Все реакции,\
+  \ ссылки и ответы на существующую будут будут потеряны."
 addToList: "Добавить в список"
 sendMessage: "Отправить сообщение"
 copyUsername: "Скопировать имя пользователя"
@@ -66,7 +69,8 @@ files: "Файлы"
 download: "Скачать"
 driveFileDeleteConfirm: "Удалить файл «{name}»? Заметки с ним также будут удалены."
 unfollowConfirm: "Удалить из подписок пользователя {name}?"
-exportRequested: "Вы запросили экспорт. Это может занять некоторое время. Результат будет добавлен на «Диск»."
+exportRequested: "Вы запросили экспорт. Это может занять некоторое время. Результат\
+  \ будет добавлен на «Диск»."
 importRequested: "Вы запросили импорт. Это может занять некоторое время."
 lists: "Списки"
 noLists: "Нет ни одного списка"
@@ -81,7 +85,9 @@ error: "Ошибка"
 somethingHappened: "Что-то пошло не так"
 retry: "Повторить попытку"
 pageLoadError: "Не удалось загрузить страницу"
-pageLoadErrorDescription: "Обычно это случается из-за сбоев в сети или кэша браузера. Попробуйте очистить кэш, или подождать пару минут, а потом попытаться загрузить страницу снова."
+pageLoadErrorDescription: "Обычно это случается из-за сбоев в сети или кэша браузера.\
+  \ Попробуйте очистить кэш, или подождать пару минут, а потом попытаться загрузить\
+  \ страницу снова."
 serverIsDead: "Ответа от сервера нет. Пожалуйста, подождите немного и повторите попытку."
 youShouldUpgradeClient: "Чтобы просмотреть эту страницу, пожалуйста, обновите ее."
 enterListName: "Название списка"
@@ -108,7 +114,8 @@ sensitive: "Содержимое не для всех"
 add: "Добавить"
 reaction: "Реакции"
 reactionSetting: "Реакции, отображаемые в палитре"
-reactionSettingDescription2: "Расставляйте перетаскиванием, удаляйте нажатием, добавляйте кнопкой «+»."
+reactionSettingDescription2: "Расставляйте перетаскиванием, удаляйте нажатием, добавляйте\
+  \ кнопкой «+»."
 rememberNoteVisibility: "Запоминать видимость заметок"
 attachCancel: "Удалить вложение"
 markAsSensitive: "Отметить как «не для всех»"
@@ -137,13 +144,18 @@ emojiUrl: "URL эмодзи"
 addEmoji: "Добавить эмодзи"
 settingGuide: "Рекомендуемые настройки"
 cacheRemoteFiles: "Кешировать внешние файлы"
-cacheRemoteFilesDescription: "Когда эта настройка отключена, файлы с других сайтов будут загружаться прямо оттуда. Это сэкономит место на сервере, но увеличит трафик, так как не будут создаваться эскизы."
+cacheRemoteFilesDescription: "Когда эта настройка отключена, файлы с других сайтов\
+  \ будут загружаться прямо оттуда. Это сэкономит место на сервере, но увеличит трафик,\
+  \ так как не будут создаваться эскизы."
 flagAsBot: "Аккаунт бота"
-flagAsBotDescription: "Включите, если этот аккаунт управляется программой. Это позволит системе Misskey учитывать это, а также поможет разработчикам других ботов предотвратить бесконечные циклы взаимодействия."
+flagAsBotDescription: "Включите, если этот аккаунт управляется программой. Это позволит\
+  \ системе Misskey учитывать это, а также поможет разработчикам других ботов предотвратить\
+  \ бесконечные циклы взаимодействия."
 flagAsCat: "Аккаунт кота"
 flagAsCatDescription: "Включите, и этот аккаунт будет помечен как кошачий."
 flagShowTimelineReplies: "Показывать ответы на заметки в ленте"
-flagShowTimelineRepliesDescription: "Если этот параметр включен, то в ленте, в дополнение к заметкам пользователя, отображаются ответы на другие заметки пользователя."
+flagShowTimelineRepliesDescription: "Если этот параметр включен, то в ленте, в дополнение\
+  \ к заметкам пользователя, отображаются ответы на другие заметки пользователя."
 autoAcceptFollowed: "Принимать подписчиков автоматически"
 addAccount: "Добавить учётную запись"
 loginFailed: "Неудачная попытка входа"
@@ -156,7 +168,11 @@ searchWith: "Найденное «{q}»"
 youHaveNoLists: "У вас нет ни одного списка"
 followConfirm: "Подписаться на {name}?"
 proxyAccount: "Учётная запись прокси"
-proxyAccountDescription: "Учетная запись прокси предназначена служить подписчиком на пользователей с других сайтов. Например, если пользователь добавит кого-то с другого сайта а список, деятельность того не отобразится, пока никто с этого же сайта не подписан на него. Чтобы это стало возможным, на него подписывается прокси."
+proxyAccountDescription: "Учетная запись прокси предназначена служить подписчиком\
+  \ на пользователей с других сайтов. Например, если пользователь добавит кого-то\
+  \ с другого сайта а список, деятельность того не отобразится, пока никто с этого\
+  \ же сайта не подписан на него. Чтобы это стало возможным, на него подписывается\
+  \ прокси."
 host: "Хост"
 selectUser: "Выберите пользователя"
 recipient: "Кому"
@@ -187,11 +203,13 @@ instanceInfo: "Информация об инстансе"
 statistics: "Статистика"
 clearQueue: "Очистить очередь"
 clearQueueConfirmTitle: "Очистить очередь?"
-clearQueueConfirmText: "Всё, что осталось в очереди, не будет доставлено. Обычно эта операция НЕ нужна."
+clearQueueConfirmText: "Всё, что осталось в очереди, не будет доставлено. Обычно эта\
+  \ операция НЕ нужна."
 clearCachedFiles: "Очистить кэш"
 clearCachedFilesConfirm: "Удалить все закэшированные файлы с других сайтов?"
 blockedInstances: "Заблокированные инстансы"
-blockedInstancesDescription: "Введите список инстансов, которые хотите заблокировать. Они больше не смогут обмениваться с вашим инстансом."
+blockedInstancesDescription: "Введите список инстансов, которые хотите заблокировать.\
+  \ Они больше не смогут обмениваться с вашим инстансом."
 muteAndBlock: "Скрытие и блокировка"
 mutedUsers: "Скрытые пользователи"
 blockedUsers: "Заблокированные пользователи"
@@ -232,7 +250,7 @@ lookup: "Запрос"
 announcements: "Оповещения"
 imageUrl: "Ссылка на изображение"
 remove: "Удалить"
-removed: "Удалено"
+removed: "\uFEFFУдалено"
 removeAreYouSure: "Хотите удалить «{x}»?"
 deleteAreYouSure: "Хотите удалить «{x}»?"
 resetAreYouSure: "На самом деле сбросить?"
@@ -240,7 +258,8 @@ saved: "Сохранено"
 messaging: "Сообщения"
 upload: "Загрузить"
 keepOriginalUploading: "Сохранить исходное изображение"
-keepOriginalUploadingDescription: "Сохраняет исходную версию при загрузке изображений. Если выключить, то при загрузке браузер генерирует изображение для публикации."
+keepOriginalUploadingDescription: "Сохраняет исходную версию при загрузке изображений.\
+  \ Если выключить, то при загрузке браузер генерирует изображение для публикации."
 fromDrive: "С «диска»"
 fromUrl: "По ссылке"
 uploadFromUrl: "Загрузить по ссылке"
@@ -256,7 +275,8 @@ agreeTo: "Я соглашаюсь с {0}"
 tos: "Пользовательское соглашение"
 start: "Начать"
 home: "Главная"
-remoteUserCaution: "Это пользователь с другого сайта, поэтому информация может быть неточной."
+remoteUserCaution: "Это пользователь с другого сайта, поэтому информация может быть\
+  \ неточной."
 activity: "Активность"
 images: "Изображения"
 birthday: "День рождения"
@@ -318,12 +338,13 @@ dayX: "{day} день"
 monthX: "{month} месяц"
 yearX: "{year} год"
 pages: "Страницы"
-integration: "Интеграция"
+integration: "Интеграции"
 connectService: "Подключиться"
 disconnectService: "Отключиться"
 enableLocalTimeline: "Включить локальную ленту"
 enableGlobalTimeline: "Включить глобальную ленту"
-disablingTimelinesInfo: "У администраторов и модераторов есть доступ ко всем лентам, даже если они отключены."
+disablingTimelinesInfo: "У администраторов и модераторов есть доступ ко всем лентам,\
+  \ даже если они отключены."
 registration: "Регистрация"
 enableRegistration: "Разрешить регистрацию"
 invite: "Пригласить"
@@ -335,9 +356,11 @@ bannerUrl: "Ссылка на изображение в шапке"
 backgroundImageUrl: "Ссылка на фоновое изображение"
 basicInfo: "Общая информация"
 pinnedUsers: "Прикреплённый пользователь"
-pinnedUsersDescription: "Перечислите по одному имени пользователя в строке. Пользователи, перечисленные здесь, будут привязаны к закладке \"Изучение\"."
+pinnedUsersDescription: "Перечислите по одному имени пользователя в строке. Пользователи,\
+  \ перечисленные здесь, будут привязаны к закладке \"Изучение\"."
 pinnedPages: "Закрепленные страницы"
-pinnedPagesDescription: "Если хотите закрепить страницы на главной сайта, сюда можно добавить пути к ним, каждый в отдельной строке."
+pinnedPagesDescription: "Если хотите закрепить страницы на главной сайта, сюда можно\
+  \ добавить пути к ним, каждый в отдельной строке."
 pinnedClipId: "Идентификатор закреплённой подборки"
 pinnedNotes: "Закреплённая заметка"
 hcaptcha: "hCaptcha"
@@ -348,14 +371,18 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "Включить reCAPTCHA"
 recaptchaSiteKey: "Ключ сайта"
 recaptchaSecretKey: "Секретный ключ"
-avoidMultiCaptchaConfirm: "Несколько способов проверки могут мешать друг другу. Подтвердите, если хотите отключить другие способы. Или нажмите «Отмена», чтобы оставить их включёнными."
+avoidMultiCaptchaConfirm: "Несколько способов проверки могут мешать друг другу. Подтвердите,\
+  \ если хотите отключить другие способы. Или нажмите «Отмена», чтобы оставить их\
+  \ включёнными."
 antennas: "Антенны"
 manageAntennas: "Настройки антенн"
 name: "Название"
 antennaSource: "Источник антенны"
 antennaKeywords: "Ключевые слова"
 antennaExcludeKeywords: "Исключения"
-antennaKeywordsDescription: "Пишите слова через пробел в одной строке, чтобы ловить их появление вместе; на отдельных строках располагайте слова, или группы слов, чтобы ловить любые из них."
+antennaKeywordsDescription: "Пишите слова через пробел в одной строке, чтобы ловить\
+  \ их появление вместе; на отдельных строках располагайте слова, или группы слов,\
+  \ чтобы ловить любые из них."
 notifyAntenna: "Уведомлять о новых заметках"
 withFileAntenna: "Только заметки с вложениями"
 enableServiceworker: "Включить ServiceWorker"
@@ -434,7 +461,8 @@ invitationCode: "Код приглашения"
 checking: "Проверка"
 available: "Доступно"
 unavailable: "Не доступно"
-usernameInvalidFormat: "Можно использовать только латинские буквы (A—Z, a—z), цифры (0—9) и знак подчёркивания (_)"
+usernameInvalidFormat: "Можно использовать только латинские буквы (A—Z, a—z), цифры\
+  \ (0—9) и знак подчёркивания (_)"
 tooShort: "Слишком короткий"
 tooLong: "Слишком длинный"
 weakPassword: "Слабый пароль"
@@ -443,7 +471,8 @@ strongPassword: "Надёжный пароль"
 passwordMatched: "Совпали"
 passwordNotMatched: "Не совпадают"
 signinWith: "Использовать {x} для входа"
-signinFailed: "Невозможно войти в систему. Введенное вами имя пользователя или пароль неверны."
+signinFailed: "Невозможно войти в систему. Введенное вами имя пользователя или пароль\
+  \ неверны."
 tapSecurityKey: "Нажмите на свой электронный ключ"
 or: "или"
 language: "Язык"
@@ -484,19 +513,27 @@ showFeaturedNotesInTimeline: "Показывать в ленте заметки
 objectStorage: "Хранилище"
 useObjectStorage: "Занято в хранилище"
 objectStorageBaseUrl: "Базовый адрес"
-objectStorageBaseUrlDesc: "Это начальная часть адреса, используемого CDN или прокси, например для S3: https://<bucket>.s3.amazonaws.com, или дя GCS: 'https://storage.googleapis.com/<bucket>'"
+objectStorageBaseUrlDesc: "Это начальная часть адреса, используемого CDN или прокси,\
+  \ например для S3: https://<bucket>.s3.amazonaws.com, или дя GCS: 'https://storage.googleapis.com/<bucket>'"
 objectStorageBucket: "Bucket"
-objectStorageBucketDesc: "Укажите название контейнера (Bucket) который используется на выбранном сервисе."
+objectStorageBucketDesc: "Укажите название контейнера (Bucket) который используется\
+  \ на выбранном сервисе."
 objectStoragePrefix: "Префикс"
-objectStoragePrefixDesc: "Файлы будут храниться в директории, соответствующей указанному здесь префиксу пути"
+objectStoragePrefixDesc: "Файлы будут храниться в директории, соответствующей указанному\
+  \ здесь префиксу пути"
 objectStorageEndpoint: "Конечная точка"
-objectStorageEndpointDesc: "Если используете AWS S3, оставьте пустым. В остальных случаях укажите конечную точку (endpoint) в форме «<host>» или «<host>:<port>», так, как это описано в руководстве той службы, которую собираетесь использовать."
+objectStorageEndpointDesc: "Если используете AWS S3, оставьте пустым. В остальных\
+  \ случаях укажите конечную точку (endpoint) в форме «<host>» или «<host>:<port>»,\
+  \ так, как это описано в руководстве той службы, которую собираетесь использовать."
 objectStorageRegion: "Регион"
-objectStorageRegionDesc: "Укажите регион, например xx-east-1. Если ваша служба не различает регионы, оставьте поле пустым, или впишите us-east-1."
+objectStorageRegionDesc: "Укажите регион, например xx-east-1. Если ваша служба не\
+  \ различает регионы, оставьте поле пустым, или впишите us-east-1."
 objectStorageUseSSL: "Использовать SSL"
-objectStorageUseSSLDesc: "Отключите, если не собираетесь использовать протокол HTTPS для обмена по API."
+objectStorageUseSSLDesc: "Отключите, если не собираетесь использовать протокол HTTPS\
+  \ для обмена по API."
 objectStorageUseProxy: "Использовать прокси"
-objectStorageUseProxyDesc: "Отключите, если не будете испоьзовать прокси для соединений по протоколу ObjectStorage."
+objectStorageUseProxyDesc: "Отключите, если не будете испоьзовать прокси для соединений\
+  \ по протоколу ObjectStorage."
 objectStorageSetPublicRead: "Устанавливать public-read при загрузке на сервер"
 serverLogs: "Журнал сервера"
 deleteAll: "Удалить всё"
@@ -524,7 +561,9 @@ sort: "Сортировать"
 ascendingOrder: "по возрастанию"
 descendingOrder: "По убыванию"
 scratchpad: "Когтеточка"
-scratchpadDescription: "«Когтеточка» — это место для опытов с AiScript. Здесь можно писать программы, взаимодействующие с Misskey, запускать и смотреть что из этого получается."
+scratchpadDescription: "«Когтеточка» — это место для опытов с AiScript. Здесь можно\
+  \ писать программы, взаимодействующие с Misskey, запускать и смотреть что из этого\
+  \ получается."
 output: "Выходы"
 script: "Скрипт"
 disablePagesScript: "Отключить скрипты на «Страницах»"
@@ -532,11 +571,14 @@ updateRemoteUser: "Обновить данные пользователя с е
 deleteAllFiles: "Удалить все файлы"
 deleteAllFilesConfirm: "Вы хотите удалить все файлы?"
 removeAllFollowing: "Удалить всех подписчиков"
-removeAllFollowingDescription: "Отменить все подписки с домена {host}? Пожалуйста, применяйте это действие, если инстанс больше не существует."
+removeAllFollowingDescription: "Отменить все подписки с домена {host}? Пожалуйста,\
+  \ применяйте это действие, если инстанс больше не существует."
 userSuspended: "Эта учётная запись заморожена"
 userSilenced: "Этот пользователь был заглушен"
 yourAccountSuspendedTitle: "Эта учетная запись заблокирована"
-yourAccountSuspendedDescription: "Эта учетная запись была заблокирована из-за нарушения условий предоставления услуг сервера. Свяжитесь с администратором, если вы хотите узнать более подробную причину. Пожалуйста, не создавайте новую учетную запись."
+yourAccountSuspendedDescription: "Эта учетная запись была заблокирована из-за нарушения\
+  \ условий предоставления услуг сервера. Свяжитесь с администратором, если вы хотите\
+  \ узнать более подробную причину. Пожалуйста, не создавайте новую учетную запись."
 menu: "Меню"
 divider: "Линия-разделитель"
 addItem: "Добавить элемент"
@@ -577,12 +619,14 @@ permission: "Разрешения"
 enableAll: "Включить все"
 disableAll: "Выключить всё"
 tokenRequested: "Открыть доступ к учётной записи"
-pluginTokenRequestedDescription: "Это расширение сможет пользоваться разрешениями, установленными здесь."
+pluginTokenRequestedDescription: "Это расширение сможет пользоваться разрешениями,\
+  \ установленными здесь."
 notificationType: "Тип уведомления"
 edit: "Изменить"
 emailServer: "Сервер электронной почты"
 enableEmail: "Включить обмен электронной почтой"
-emailConfigInfo: "Используется для подтверждения адреса электронной почты и сброса пароля."
+emailConfigInfo: "Используется для подтверждения адреса электронной почты и сброса\
+  \ пароля."
 email: "Электронная почта"
 emailAddress: "Адрес электронной почты"
 smtpConfig: "Конфигурация SMTP-сервера"
@@ -590,7 +634,8 @@ smtpHost: "Хост"
 smtpPort: "Порт"
 smtpUser: "Имя пользователя"
 smtpPass: "Пароль"
-emptyToDisableSmtpAuth: "Не заполняйте имя пользователя и пароль, чтобы отключить аутентификацию в SMTP."
+emptyToDisableSmtpAuth: "Не заполняйте имя пользователя и пароль, чтобы отключить\
+  \ аутентификацию в SMTP."
 smtpSecure: "Использовать SSL/TLS для SMTP-соединений"
 smtpSecureInfo: "Выключите при использовании STARTTLS."
 testEmail: "Проверка доставки электронной почты"
@@ -611,10 +656,13 @@ create: "Создать"
 notificationSetting: "Настройки уведомлений"
 notificationSettingDesc: "Выберите тип уведомлений для отображения"
 useGlobalSetting: "Использовать глобальные настройки"
-useGlobalSettingDesc: "Если включено, будут использоваться настройки учётной записи. Если включить, этот виджет можно будет настроить индивидуально."
+useGlobalSettingDesc: "Если включено, будут использоваться настройки учётной записи.\
+  \ Если включить, этот виджет можно будет настроить индивидуально."
 other: "Другие"
 regenerateLoginToken: "Создать новый токен для входа"
-regenerateLoginTokenDescription: "Создаёт новый токен, используемый внутри программы во время входа. Обычно в этом нет необходимости. При создании все устройства будут отключены."
+regenerateLoginTokenDescription: "Создаёт новый токен, используемый внутри программы\
+  \ во время входа. Обычно в этом нет необходимости. При создании все устройства будут\
+  \ отключены."
 setMultipleBySeparatingWithSpace: "Можно написать несколько через пробел"
 fileIdOrUrl: "Идентификатор файла или ссылка"
 behavior: "Поведение"
@@ -622,18 +670,21 @@ sample: "Пример"
 abuseReports: "Жалобы"
 reportAbuse: "Жалоба"
 reportAbuseOf: "Пожаловаться на пользователя {name}"
-fillAbuseReportDescription: "Опишите, пожалуйста, причину жалобы подробнее. Если речь о конкретной заметке, будьте добры приложить ссылку на неё."
+fillAbuseReportDescription: "Опишите, пожалуйста, причину жалобы подробнее. Если речь\
+  \ о конкретной заметке, будьте добры приложить ссылку на неё."
 abuseReported: "Жалоба отправлена. Большое спасибо за информацию."
 reporteeOrigin: "О ком сообщено"
 reporterOrigin: "Кто сообщил"
 forwardReport: "Перенаправление отчета на инстант."
-forwardReportIsAnonymous: "Удаленный инстант не сможет увидеть вашу информацию и будет отображаться как анонимная системная учетная запись."
+forwardReportIsAnonymous: "Удаленный инстант не сможет увидеть вашу информацию и будет\
+  \ отображаться как анонимная системная учетная запись."
 send: "Отправить"
 abuseMarkAsResolved: "Отметить жалобу как решённую"
 openInNewTab: "Открыть в новой вкладке"
 openInSideView: "Открывать в боковой колонке"
 defaultNavigationBehaviour: "Поведение навигации по умолчанию"
-editTheseSettingsMayBreakAccount: "От изменений в этих настройках ваша учётная запись может поломаться."
+editTheseSettingsMayBreakAccount: "От изменений в этих настройках ваша учётная запись\
+  \ может поломаться."
 instanceTicker: "Строка с названием инстанса в заметках"
 waitingFor: "Ждём, когда {x} ответит"
 random: "Случайные"
@@ -645,7 +696,8 @@ createNew: "Новый документ"
 optional: "Необязательно"
 createNewClip: "Новая подборка"
 public: "Общедоступно"
-i18nInfo: "Calckey переводят на разные языки добровольцы со всего света. Ваша помощь тоже пригодится здесь: {link}."
+i18nInfo: "Calckey переводят на разные языки добровольцы со всего света. Ваша помощь\
+  \ тоже пригодится здесь: {link}."
 manageAccessTokens: "Управление токенами доступа"
 accountInfo: "Сведения об учётной записи"
 notesCount: "Количество заметок"
@@ -664,12 +716,15 @@ no: "Нет"
 driveFilesCount: "Количество файлов на диске"
 driveUsage: "Занято места на диске"
 noCrawle: "Запретить паукам индексировать сайт"
-noCrawleDescription: "Просьба поисковым системам не ходить по вашему профилю, по заметкам, страницам и не индексировать их."
-lockedAccountInfo: "Даже если вы вручную подтверждаете подписки, кто угодно может читать ваши заметки, если вы не отмечаете их «для подписчиков»."
+noCrawleDescription: "Просьба поисковым системам не ходить по вашему профилю, по заметкам,\
+  \ страницам и не индексировать их."
+lockedAccountInfo: "Даже если вы вручную подтверждаете подписки, кто угодно может\
+  \ читать ваши заметки, если вы не отмечаете их «для подписчиков»."
 alwaysMarkSensitive: "Отмечать файлы как «содержимое не для всех» по умолчанию"
 loadRawImages: "Сразу показывать изображения в полном размере"
 disableShowingAnimatedImages: "Не проигрывать анимацию"
-verificationEmailSent: "Вам отправлено письмо для подтверждения. Пройдите, пожалуйста, по ссылке из письма, чтобы завершить проверку."
+verificationEmailSent: "Вам отправлено письмо для подтверждения. Пройдите, пожалуйста,\
+  \ по ссылке из письма, чтобы завершить проверку."
 notSet: "Не настроено"
 emailVerified: "Адрес электронной почты подтверждён."
 noteFavoritesCount: "Количество добавленного в избранное"
@@ -681,14 +736,16 @@ clips: "Подборки"
 experimentalFeatures: "Экспериментальные функции"
 developer: "Разработчик"
 makeExplorable: "Опубликовать профиль в «Обзоре»."
-makeExplorableDescription: "Если выключить, ваш профиль не будет показан в разделе «Обзор»."
+makeExplorableDescription: "Если выключить, ваш профиль не будет показан в разделе\
+  \ «Обзор»."
 showGapBetweenNotesInTimeline: "Показывать разделитель между заметками в ленте"
 duplicate: "Дубликат"
 left: "Влево"
 center: "По центру"
 wide: "Толстый"
 narrow: "Тонкий"
-reloadToApplySetting: "Это настройка вступает в силу при загрузке страницы. Перезагрузить сейчас?"
+reloadToApplySetting: "Это настройка вступает в силу при загрузке страницы. Перезагрузить\
+  \ сейчас?"
 needReloadToApply: "Изменения вступят в силу после перезагрузки страницы."
 showTitlebar: "Показать заголовок"
 clearCache: "Очистить кэш"
@@ -696,7 +753,10 @@ onlineUsersCount: "Пользователей сейчас в сети: {n}"
 nUsers: "Пользователей: {n}"
 nNotes: "Заметок: {n}"
 sendErrorReports: "Посылать отчёты о сбоях"
-sendErrorReportsDescription: "Если включено, когда возникнет какая-нибудь техническая проблема, подробные сведения об этом будут отправлены разработчикам Misskey. Это очень помогает делать программу лучше. В отчёты попадают тип и версия ОС, браузера, журнал действий (что привело к сбою) и тому подобное."
+sendErrorReportsDescription: "Если включено, когда возникнет какая-нибудь техническая\
+  \ проблема, подробные сведения об этом будут отправлены разработчикам Misskey. Это\
+  \ очень помогает делать программу лучше. В отчёты попадают тип и версия ОС, браузера,\
+  \ журнал действий (что привело к сбою) и тому подобное."
 myTheme: "Личная тема"
 backgroundColor: "Фон"
 accentColor: "Акцент"
@@ -735,14 +795,17 @@ unlikeConfirm: "В самом деле отменить «нравится»?"
 fullView: "Полный вид"
 quitFullView: "Закрыть полный вид"
 addDescription: "Добавить описание"
-userPagePinTip: "Можно добавить сюда заметки, выбрав нужную, и включив в её меню пункт «Закрепить в профиле»."
-notSpecifiedMentionWarning: "В этой заметке есть упоминание тех, кто не включён в адресаты"
+userPagePinTip: "Можно добавить сюда заметки, выбрав нужную, и включив в её меню пункт\
+  \ «Закрепить в профиле»."
+notSpecifiedMentionWarning: "В этой заметке есть упоминание тех, кто не включён в\
+  \ адресаты"
 info: "Описание"
 userInfo: "Сведения о пользователе"
 unknown: "Неизвестно"
 onlineStatus: "Присутствие в сети"
 hideOnlineStatus: "Скрыть присутствие"
-hideOnlineStatusDescription: "Сокрытие присутствия делает некоторые функции, такие как поиск, менее удобными."
+hideOnlineStatusDescription: "Сокрытие присутствия делает некоторые функции, такие\
+  \ как поиск, менее удобными."
 online: "В сети"
 active: "Действует"
 offline: "Не в сети"
@@ -777,7 +840,8 @@ emailNotConfiguredWarning: "Не указан адрес электронной
 ratio: "Соотношение"
 previewNoteText: "Предварительный просмотр"
 customCss: "Индивидуальный CSS"
-customCssWarn: "Используйте эту настройку только если знаете, что делаете. Ошибки здесь чреваты тем, что сайт перестанет нормально работать у вас."
+customCssWarn: "Используйте эту настройку только если знаете, что делаете. Ошибки\
+  \ здесь чреваты тем, что сайт перестанет нормально работать у вас."
 global: "Всеобщая"
 squareAvatars: "Квадратные аватарки"
 sent: "Отправить"
@@ -792,7 +856,9 @@ whatIsNew: "Что новенького?"
 translate: "Перевод"
 translatedFrom: "Перевод. Язык оригинала — {x}"
 accountDeletionInProgress: "В настоящее время выполняется удаление учетной записи"
-usernameInfo: "Имя, которое отличает вашу учетную запись от других на этом сервере. Вы можете использовать алфавит (a~z, A~Z), цифры (0~9) или символы подчеркивания (_). Имена пользователей не могут быть изменены позже."
+usernameInfo: "Имя, которое отличает вашу учетную запись от других на этом сервере.\
+  \ Вы можете использовать алфавит (a~z, A~Z), цифры (0~9) или символы подчеркивания\
+  \ (_). Имена пользователей не могут быть изменены позже."
 aiChanMode: "ИИ режим"
 keepCw: "Сохраняйте Предупреждения о содержимом"
 pubSub: "Учётные записи Pub/Sub"
@@ -808,12 +874,14 @@ filter: "Фильтры"
 controlPanel: "Панель управления"
 manageAccounts: "Управление аккаунтом"
 makeReactionsPublic: "Опубликовать список реакций"
-makeReactionsPublicDescription: "Список сделанных вами реакций доступен для просмотра всем желающим."
+makeReactionsPublicDescription: "Список сделанных вами реакций доступен для просмотра\
+  \ всем желающим."
 classic: "Классика"
 muteThread: "Заглушить цепочку"
 unmuteThread: "Отменить глушение цепочки"
 ffVisibility: "Видимость подписок и подписчиков"
-ffVisibilityDescription: "Здесь можно настроить, кто будет видеть ваши подписки и подписчиков."
+ffVisibilityDescription: "Здесь можно настроить, кто будет видеть ваши подписки и\
+  \ подписчиков."
 continueThread: "Показать следующие ответы"
 deleteAccountConfirm: "Учётная запись будет безвозвратно удалена. Подтверждаете?"
 incorrectPassword: "Пароль неверен."
@@ -823,7 +891,8 @@ leaveGroup: "Покинуть группу"
 leaveGroupConfirm: "Покинуть группу «{name}»?"
 useDrawerReactionPickerForMobile: "Выдвижная палитра на мобильном устройстве"
 welcomeBackWithName: "С возвращением, {name}!"
-clickToFinishEmailVerification: "Пожалуйста, нажмите [{ok}], чтобы завершить подтверждение адреса электронной почты."
+clickToFinishEmailVerification: "Пожалуйста, нажмите [{ok}], чтобы завершить подтверждение\
+  \ адреса электронной почты."
 overridedDeviceKind: "Тип устройства"
 smartphone: "Смартфон"
 tablet: "Планшет"
@@ -845,10 +914,13 @@ label: "Метка"
 localOnly: "Локально"
 beta: "Бета"
 enableAutoSensitive: "Автоматическое определение NSFW"
-enableAutoSensitiveDescription: "Если доступно, используйте машинное обучение для автоматической установки флага NSFW на носителе. Даже если эта функция отключена, она может быть установлена ​​автоматически в зависимости от инстанта."
+enableAutoSensitiveDescription: "Если доступно, используйте машинное обучение для\
+  \ автоматической установки флага NSFW на носителе. Даже если эта функция отключена,\
+  \ она может быть установлена ​​автоматически в зависимости от инстанта."
 account: "Учётные записи"
 _sensitiveMediaDetection:
-  description: "Машинное обучение может быть использовано для автоматического обнаружения чувствительных медиа для модерации. Нагрузка на сервер увеличивается незначительно."
+  description: "Машинное обучение может быть использовано для автоматического обнаружения\
+    \ чувствительных медиа для модерации. Нагрузка на сервер увеличивается незначительно."
   setSensitiveFlagAutomatically: "Установить флаг NSFW"
 _emailUnavailable:
   used: "Уже используется"
@@ -863,11 +935,14 @@ _ffVisibility:
 _signup:
   almostThere: "Почти готово!"
   emailAddressInfo: "Введите ваш адрес электронной почты."
-  emailSent: "На указанный вами адрес электронной почты ({email}) отправлено письмо. Перейдите по ссылке в письме, чтобы завершить регистрацию."
+  emailSent: "На указанный вами адрес электронной почты ({email}) отправлено письмо.\
+    \ Перейдите по ссылке в письме, чтобы завершить регистрацию."
 _accountDelete:
   accountDelete: "Удалить свою учётную запись"
-  mayTakeTime: "Удаление учётной записи — ресурсозатратный процесс. Он может занять много времени, если вы много писали и загружали файлов."
-  sendEmail: "Когда ваша учетная запись будет удалена, мы сообщим на указанную вами электронную почту."
+  mayTakeTime: "Удаление учётной записи — ресурсозатратный процесс. Он может занять\
+    \ много времени, если вы много писали и загружали файлов."
+  sendEmail: "Когда ваша учетная запись будет удалена, мы сообщим на указанную вами\
+    \ электронную почту."
   requestAccountDelete: "Запросить удаление вашей учетной записи"
   started: "Процесс удаления начался."
   inProgress: "Удаление в процессе"
@@ -875,9 +950,12 @@ _ad:
   back: "Выход"
   reduceFrequencyOfThisAd: "Реже показывать эту рекламу"
 _forgotPassword:
-  enterEmail: "Введите адрес электронной почты, который ввели при регистрации. На неё будет выслана ссылка для смены пароля."
-  ifNoEmail: "Если вы не ввели свой адрес электронной почты, свяжитесь с администратором ресурса, чтобы сменить пароль."
-  contactAdmin: "Здесь не используются адреса электронной почты, так что свяжитесь с администратором, чтобы поменять пароль."
+  enterEmail: "Введите адрес электронной почты, который ввели при регистрации. На\
+    \ неё будет выслана ссылка для смены пароля."
+  ifNoEmail: "Если вы не ввели свой адрес электронной почты, свяжитесь с администратором\
+    \ ресурса, чтобы сменить пароль."
+  contactAdmin: "Здесь не используются адреса электронной почты, так что свяжитесь\
+    \ с администратором, чтобы поменять пароль."
 _gallery:
   my: "Личная"
   liked: "Понравившееся"
@@ -899,13 +977,15 @@ _registry:
   domain: "Домен"
   createKey: "Новый ключ"
 _aboutMisskey:
-  about: "Misskey — программа с открытым исходным кодом, которую разрабатывает syuilo с 2014 года."
+  about: "Misskey — программа с открытым исходным кодом, которую разрабатывает syuilo\
+    \ с 2014 года."
   contributors: "Основные соавторы"
   allContributors: "Все соавторы"
   source: "Исходный код"
   translation: "Перевод Misskey"
   donate: "Пожертвование на Misskey"
-  morePatrons: "Большое спасибо и многим другим, кто принял участие в этом проекте! 🥰"
+  morePatrons: "Большое спасибо и многим другим, кто принял участие в этом проекте!\
+    \ \U0001F970"
   patrons: "Материальная поддержка"
 _nsfw:
   respect: "Скрывать содержимое не для всех"
@@ -913,10 +993,13 @@ _nsfw:
   force: "Скрывать вообще все файлы"
 _mfm:
   cheatSheet: "Подсказка по разметке MFM"
-  intro: "MFM — язык оформления текста, который придуман специально для Misskey и готов для применения во многих местах. На этой странице собраны и кратко изложены способы его использовать."
+  intro: "MFM — язык оформления текста, который придуман специально для Misskey и\
+    \ готов для применения во многих местах. На этой странице собраны и кратко изложены\
+    \ способы его использовать."
   dummy: "Misskey расширяет границы Федиверса."
   mention: "Упоминание"
-  mentionDescription: "При помощи знака «собака» перед именем можно упомянуть какого-нибудь пользователя."
+  mentionDescription: "При помощи знака «собака» перед именем можно упомянуть какого-нибудь\
+    \ пользователя."
   hashtag: "Хэштег"
   hashtagDescription: "При помощи знака «решётка» перед словом задаётся хэштег."
   url: "Простая ссылка (URL)"
@@ -932,9 +1015,11 @@ _mfm:
   inlineCode: "Программа (в тексте)"
   inlineCodeDescription: "Подсвечивает фрагмент программы внутри сплошного текста."
   blockCode: "Программа (блок)"
-  blockCodeDescription: "Оформляет текст программы в виде отдельного блокоа. Он может состоять из множества строк."
+  blockCodeDescription: "Оформляет текст программы в виде отдельного блокоа. Он может\
+    \ состоять из множества строк."
   inlineMath: "Математическое выражение (в тексте)"
-  inlineMathDescription: "Позволяет вставлять математические выражения внутрь текста при помощи языка KaTeX."
+  inlineMathDescription: "Позволяет вставлять математические выражения внутрь текста\
+    \ при помощи языка KaTeX."
   blockMath: "Математическое выражение (блок)"
   blockMathDescription: "Оформляет математическое выражение (KaTeX) на отдельной строке."
   quote: "Цитата"
@@ -966,7 +1051,8 @@ _mfm:
   x4: "Совсем крупно"
   x4Description: "Увеличивает содержимое совсем сильно."
   blur: "Размытие"
-  blurDescription: "Размывает текст до нечитаемости, будто его поместили за матовое стекло. Наведение указателя мыши на размытый текст возвращает чёткость."
+  blurDescription: "Размывает текст до нечитаемости, будто его поместили за матовое\
+    \ стекло. Наведение указателя мыши на размытый текст возвращает чёткость."
   font: "Шрифт"
   fontDescription: "Так можно писать произвольным шрифтом."
   rainbow: "Радуга"
@@ -1000,10 +1086,15 @@ _menuDisplay:
   hide: "Спрятать"
 _wordMute:
   muteWords: "Скрыть слово"
-  muteWordsDescription: "Пишите слова через пробел в одной строке, чтобы фильтровать их появление вместе; а если хотите фильтровать любое из них, пишите в отдельных строках."
-  muteWordsDescription2: "Здесь можно использовать регулярные выражения — просто заключите их между двумя дробными чертами (/)."
+  muteWordsDescription: "Пишите слова через пробел в одной строке, чтобы фильтровать\
+    \ их появление вместе; а если хотите фильтровать любое из них, пишите в отдельных\
+    \ строках."
+  muteWordsDescription2: "Здесь можно использовать регулярные выражения — просто заключите\
+    \ их между двумя дробными чертами (/)."
   softDescription: "Соответствующие условиям заметки будут спрятаны из вашей ленты."
-  hardDescription: "Соответстующие условиям заметки вообще не будут попадать в вашу ленту. Даже если вы поменяете условия, отсеенные таким образом заметки уже не появятся."
+  hardDescription: "Соответстующие условиям заметки вообще не будут попадать в вашу\
+    \ ленту. Даже если вы поменяете условия, отсеенные таким образом заметки уже не\
+    \ появятся."
   soft: "Мягкий"
   hard: "Жёсткий"
   mutedNotes: "Скрытые заметки"
@@ -1037,7 +1128,8 @@ _theme:
   darken: "Затемнение"
   lighten: "Осветление"
   inputConstantName: "Введите имя для константы."
-  importInfo: "Если вы введете код темы здесь, вы можете импортировать его в редактор тем."
+  importInfo: "Если вы введете код темы здесь, вы можете импортировать его в редактор\
+    \ тем."
   deleteConstantConfirm: "Вы действительно хотите удалить константу {const}?"
   keys:
     accent: "Акцент"
@@ -1111,31 +1203,46 @@ _tutorial:
   step1_1: "Добро пожаловать!"
   step1_2: "Давайте настроим вас. Вы будете работать в кратчайшие сроки!"
   step2_1: "Сначала, пожалуйста, заполните свой профиль"
-  step2_2: "Предоставив некоторую информацию о себе, другим людям будет легче понять, хотят ли они видеть ваши записи или следить за вами."
+  step2_2: "Предоставив некоторую информацию о себе, другим людям будет легче понять,\
+    \ хотят ли они видеть ваши записи или следить за вами."
   step3_1: "Теперь пора следить за некоторыми людьми!"
-  step3_2: "Ваша домашняя и социальная ленты основаны на том, за кем вы следите, поэтому для начала попробуйте следить за парой аккаунтов.\nНажмите на кружок с плюсом в правом верхнем углу профиля, чтобы следить за ним."
+  step3_2: "Ваша домашняя и социальная ленты основаны на том, за кем вы следите, поэтому\
+    \ для начала попробуйте следить за парой аккаунтов.\nНажмите на кружок с плюсом\
+    \ в правом верхнем углу профиля, чтобы следить за ним."
   step4_1: "Давайте выйдем на вас"
-  step4_2: "Для своего первого сообщения некоторые люди любят делать {introduction} сообщение или простое \"Hello world!\""
+  step4_2: "Для своего первого сообщения некоторые люди любят делать {introduction}\
+    \ сообщение или простое \"Hello world!\""
   step5_1: "Временные рамки, везде временные рамки!"
   step5_2: "В вашем экземпляре включены {timelines} различных временных линий."
-  step5_3: "Главная {icon} временная шкала - это шкала, где вы можете видеть сообщения ваших подписчиков."
-  step5_4: "Местная {icon} временная шкала - это шкала, где вы можете видеть сообщения всех остальных пользователей данного экземпляра"
-  step5_5: "Временная шкала Рекомендуемые {icon} - это шкала, где вы можете видеть сообщения от инстанций, рекомендованных администраторами."
-  step5_6: "На временной шкале Social {icon} отображаются сообщения от друзей ваших подписчиков"
-  step5_7: "Глобальная {icon} временная шкала - это место, где вы можете видеть сообщения от всех других подключенных экземпляров"
+  step5_3: "Главная {icon} временная шкала - это шкала, где вы можете видеть сообщения\
+    \ ваших подписчиков."
+  step5_4: "Местная {icon} временная шкала - это шкала, где вы можете видеть сообщения\
+    \ всех остальных пользователей данного экземпляра"
+  step5_5: "Временная шкала Рекомендуемые {icon} - это шкала, где вы можете видеть\
+    \ сообщения от инстанций, рекомендованных администраторами."
+  step5_6: "На временной шкале Social {icon} отображаются сообщения от друзей ваших\
+    \ подписчиков"
+  step5_7: "Глобальная {icon} временная шкала - это место, где вы можете видеть сообщения\
+    \ от всех других подключенных экземпляров"
   step6_1: "Итак, что это за место?"
-  step6_2: "Ну, вы не просто присоединились к Кальки. Вы присоединились к порталу в Fediverse, взаимосвязанной сети из тысяч серверов, называемых \"инстансами\"."
-  step6_3: "Каждый сервер работает по-своему, и не на всех серверах работает Calckey. Но этот работает! Это немного сложно, но вы быстро разберетесь"
+  step6_2: "Ну, вы не просто присоединились к Кальки. Вы присоединились к порталу\
+    \ в Fediverse, взаимосвязанной сети из тысяч серверов, называемых \"инстансами\"\
+    ."
+  step6_3: "Каждый сервер работает по-своему, и не на всех серверах работает Calckey.\
+    \ Но этот работает! Это немного сложно, но вы быстро разберетесь"
   step6_4: "Теперь идите, изучайте и развлекайтесь!"
 _2fa:
   alreadyRegistered: "Двухфакторная аутентификация уже настроена."
   registerDevice: "Зарегистрируйте ваше устройство"
   registerKey: "Зарегистрировать ключ"
-  step1: "Прежде всего, установите на устройство приложение для аутентификации, например, {a} или {b}."
+  step1: "Прежде всего, установите на устройство приложение для аутентификации, например,\
+    \ {a} или {b}."
   step2: "Далее отсканируйте отображаемый QR-код при помощи приложения."
   step3: "И наконец, введите код, который покажет приложение."
-  step4: "Теперь при каждом входе на сайт вам нужно будет вводить код из приложения аналогичным образом."
-  securityKeyInfo: "Вы можете настроить вход с помощью аппаратного ключа безопасности, поддерживающего FIDO2, или отпечатка пальца или PIN-кода на устройстве."
+  step4: "Теперь при каждом входе на сайт вам нужно будет вводить код из приложения\
+    \ аналогичным образом."
+  securityKeyInfo: "Вы можете настроить вход с помощью аппаратного ключа безопасности,\
+    \ поддерживающего FIDO2, или отпечатка пальца или PIN-кода на устройстве."
 _permissions:
   "read:account": "Просматривать данные учётной записи"
   "write:account": "Изменять данные учётной записи"
@@ -1653,3 +1760,32 @@ _deck:
     list: "Списки"
     mentions: "Упоминания"
     direct: "Личное"
+enableRecommendedTimeline: Включить рекомендованную ленту
+regexpErrorDescription: 'Произошла ошибка в регулярном выражении на строке {line}
+  вашего {tab} списка скрытых слов:'
+confirmToUnclipAlreadyClippedNote: Этот пост уже в подборке "{name}. Хотите ли вы
+  вместо этого удалить пост из подборки?
+unclip: Удалить из подборки
+secureMode: Безопасный Режим (Авторизованное Получение)
+instanceSecurity: Безопасность инстанса
+seperateRenoteQuote: Разделить кнопки репоста и цитаты
+accountMoved: 'Пользователь переместился на новый аккаунт:'
+manageGroups: Управлять группами
+allowedInstancesDescription: Список хостов, разрешённых для федерации, каждый разделён
+  новой строкой(применяется только в приватном режиме).
+noThankYou: Нет, спасибо
+addInstance: Добавить инстанс
+flagSpeakAsCat: Говорить как кот
+flagSpeakAsCatDescription: Ваши будут посты няифицированы в режиме кота
+selectInstance: Выбрать инстанс
+antennaInstancesDescription: Список инстансов, каждый с новой строки
+privateMode: Приватный режим
+privateModeInfo: Когда включено только инстансы в белом списке могут федерировать
+  с вашим инстансов. Все посты будут скрыты.
+allowedInstances: Белый список инстансов
+userSaysSomethingReason: '{name} сказал {reason}'
+renoteMute: Заглушить репосты
+renoteUnmute: Разглушить репосты
+hiddenTags: Скрытые хештеги
+noInstances: Нет инстансов
+secureModeInfo: При запросах с других инстансов не отправлять ответ без подтверждения.

From 8dc079e6254cc6122fe3002511d8c5bc687770ae Mon Sep 17 00:00:00 2001
From: Panagiotis Damelos <dreamsareimmortal@hotmail.com>
Date: Mon, 17 Apr 2023 23:49:52 +0000
Subject: [PATCH 495/582] chore: Translated using Weblate (Greek)

Currently translated at 33.2% (574 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/el/
---
 locales/el-GR.yml | 56 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 8 deletions(-)

diff --git a/locales/el-GR.yml b/locales/el-GR.yml
index 3595fd3ca..1c2d87622 100644
--- a/locales/el-GR.yml
+++ b/locales/el-GR.yml
@@ -14,7 +14,7 @@ renotedBy: "Προωθήθηκε από {user}"
 noNotes: "Δεν υπάρχουν δημοσιεύσεις"
 noNotifications: "Δεν υπάρχουν ειδοποιήσεις"
 settings: "Ρυθμίσεις"
-basicSettings: "Βασικές ρυθμίσεις"
+basicSettings: "Βασικές Ρυθμίσεις"
 otherSettings: "Άλλες Ρυθμίσεις"
 openInWindow: "Άνοιγμα σε παράθυρο"
 profile: "Προφίλ"
@@ -30,7 +30,7 @@ users: "Μέλη"
 addUser: "Προσθήκη μέλους"
 favorite: "Προσθήκη στους σελιδοδείκτες"
 favorites: "Σελιδοδείκτες"
-unfavorite: "Αφαίρεση από σελιδοδείκτες"
+unfavorite: "Αφαίρεση από τους σελιδοδείκτες"
 favorited: "Προστέθηκε στους σελιδοδείκτες."
 alreadyFavorited: "Έχει ήδη προστεθεί στους σελιδοδείκτες."
 cantFavorite: "Αδυναμία προσθήκης στους σελιδοδείκτες."
@@ -42,7 +42,7 @@ delete: "Διαγραφή"
 deleteAndEdit: "Διαγραφή και επεξεργασία"
 deleteAndEditConfirm: "Σίγουρα θέλετε να διαγράψετε αυτή τη δημοσίευση και να την\
   \ επεξεργαστείτε; Θα χάσετε όλες τις αντιδράσεις, προωθήσεις και απαντήσεις σε αυτήν."
-addToList: "Προσθήκη σε λίστα"
+addToList: "Προσθήκη στη λίστα"
 sendMessage: "Αποστολή μηνύματος"
 copyUsername: "Αντιγραφή ονόματος μέλους"
 searchUser: "Αναζήτηση μέλους"
@@ -65,7 +65,7 @@ driveFileDeleteConfirm: "Θέλετε σίγουρα να διαγράψετε 
   \ με αυτό το συνημμένο αρχείο επίσης θα διαγραφούν."
 unfollowConfirm: "Θέλετε σίγουρα να σταματήσετε να ακολουθείτε το μέλος {name};"
 exportRequested: "Ζητήσατε μία εξαγωγή. Αυτό μπορεί να πάρει κάποιον χρόνο. Θα προστεθεί\
-  \ στον Δίσκο σας μόλις ολοκληρωθεί."
+  \ στον Αποθηκευτικό Χώρο σας μόλις ολοκληρωθεί."
 importRequested: "Ζητήσατε μια εισαγωγή. Αυτό μπορεί να πάρει κάποιον χρόνο."
 lists: "Λίστες"
 noLists: "Δεν έχετε λίστες"
@@ -83,8 +83,8 @@ pageLoadError: "Ένα σφάλμα προέκυψε φορτώνοντας τη
 pageLoadErrorDescription: "Αυτό κανονικά προκαλείται από σφάλματα δικτύου ή από την\
   \ προσωρινή μνήμη του προγράμματος περιήγησης. Δοκιμάστε να σβήσετε την προσωρινή\
   \ μνήμη (cache) και να δοκιμάσετε ξανά μετά από λίγο."
-serverIsDead: "Αυτός ο server δεν αποκρίνεται. Παρακαλώ περιμέντε λίγο και δοκιμάστε\
-  \ ξανά."
+serverIsDead: "Αυτός ο διακομιστής (server) δεν αποκρίνεται. Παρακαλώ περιμένετε λίγο\
+  \ και δοκιμάστε ξανά."
 youShouldUpgradeClient: "Για να δείτε αυτή τη σελίδα, παρακαλώ επαναφορτώστε για να\
   \ γίνει ενημέρωση."
 enterListName: "Πληκτρολογήστε ένα όνομα για τη λίστα"
@@ -145,7 +145,7 @@ removeWallpaper: "Αφαίρεση ταπετσαρίας"
 searchWith: "Αναζήτηση: {q}"
 youHaveNoLists: "Δεν έχετε λίστες"
 followConfirm: "Θέλετε σίγουρα να ακολουθήσετε τον λογαριασμό {name};"
-host: "Φιλοξενεί"
+host: "Φιλοξενεί (Host)"
 selectUser: "Επιλέξτε ένα μέλος"
 recipient: "Αποδέκτης-τρια(-ες)"
 annotation: "Σχόλια"
@@ -276,7 +276,7 @@ smtpUser: "Όνομα μέλους"
 smtpPass: "Κωδικός"
 notificationSetting: "Ρυθμίσεις ειδοποιήσεων"
 notificationSettingDesc: "Επιλέξτε τους τύπους ειδοποιήσεων για προβολή."
-switchUi: "Αλλαγή UI"
+switchUi: "Διάταξη"
 clip: "Κλιπ"
 driveFilesCount: "Αριθμός αρχείων Αποθηκευτικού Χώρου"
 driveUsage: "Χρήση Αποθηκευτικού Χώρου"
@@ -588,3 +588,43 @@ userSilenced: Αυτό το μέλος είναι υπό σίγαση.
 makeActive: Ενεργοποίηση
 create: Δημιουργία
 reportAbuseOf: Αναφορά {name}
+cacheRemoteFilesDescription: Όταν αυτή η ρύθμιση είναι απενεργοποιημένη, τα απομακρυσμένα
+  αρχεία φορτώνονται απευθείας από το απομακρυσμένο instance. Η απενεργοποίηση θα
+  μειώσει τη χρήση του δίσκου σας, αλλά θα αυξήσει την κίνηση δεδομένων, καθώς δεν
+  θα δημιουργούνται σμικρύνσεις αρχείων (thumbnails).
+registeredAt: Εγγράφηκε στις
+latestStatus: Τελευταία κατάσταση
+charts: Πίνακες
+stopActivityDelivery: Σταμάτα να στέλνεις δραστηριότητες
+operations: Λειτουργίες
+monitor: Παρακολούθηση
+jobQueue: Ουρά εργασιών
+blockedInstances: Μπλοκαρισμένα Instances
+blockedInstancesDescription: Παραθέστε τις διευθύνσεις (hostnames) των instances που
+  θέλετε να μπλοκάρετε. Τα παρακάτω instances δεν θα μπορούν πλέον να επικοινωνούν
+  με αυτό το instance.
+intro: Η εγκατάσταση του Calckey τελείωσε! Παρακαλώ δημιουργήστε ένα μέλος διαχειριστή/στρια.
+noThankYou: Όχι, ευχαριστώ
+addInstance: Προσθήκη instance
+renoteMute: Σίγαση προωθήσεων
+emojiUrl: Διεύθυνση emoji (URL)
+cacheRemoteFiles: Προσωρινή αποθήκευση απομακρυσμένων αρχείων
+flagSpeakAsCat: Να μιλάς σαν γατί
+flagSpeakAsCatDescription: Οι δημοσιεύσεις σου θα nyaοποιούνται όταν είσαι γατί
+selectInstance: Επιλέξτε ένα instance
+latestRequestSentAt: Τελευταίο αίτημα στάλθηκε
+hiddenTags: Κρυμμένες Ετικέτες (Hashtags)
+noInstances: Δεν υπάρχουν instances
+renoteUnmute: Άρση σίγασης προωθήσεων
+flagAsBotDescription: Ενεργοποιήστε αυτή την επιλογή αν αυτός ο λογαριασμός ελέγχεται
+  από ένα πρόγραμμα. Αν ενεργοποιηθεί, θα λειτουργεί σαν σημάδι για τους προγραμματιστές,
+  ώστε να αποφύγουν ατέρμονη αλληλεπίδραση με άλλα bots και για να ρυθμίσει τα εσωτερικά
+  συστήματα του Calckey ώστε να αντιμετωπίζουν αυτόν τον λογαριασμό ως bot.
+flagShowTimelineRepliesDescription: Εμφάνιση απαντήσεων μελών σε δημοσιεύσεις άλλων
+  μελών στο χρονολόγιο.
+latestRequestReceivedAt: Τελευταίο αίτημα ελήφθη
+blockThisInstance: Μπλοκάρισμα αυτού του instance
+clearQueueConfirmText: Τυχόν δημοσιεύσεις στην ουρά που δεν έχουν αποσταλεί δεν θα
+  ομοσπονδιοποιηθούν. Συνήθως αυτή η λειτουργία δεν χρειάζεται.
+clearCachedFilesConfirm: Σίγουρα θέλετε να διαγράψετε όλα τα προσωρινά αποθηκευμένα
+  απομακρυσμένα αρχεία;

From 8c36ec12a009f67803371a1632b48ca92cdf155c Mon Sep 17 00:00:00 2001
From: D David <postureatsevenpm@gmail.com>
Date: Tue, 18 Apr 2023 19:45:23 +0000
Subject: [PATCH 496/582] chore: Translated using Weblate (Spanish)

Currently translated at 92.0% (1587 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/es/
---
 locales/es-ES.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index feab851db..7f0c4b879 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1917,3 +1917,5 @@ showAds: Mostrar Anuncios
 enterSendsMessage: Presione "RETORNO" en los mensajes para enviar el mensaje (para
   apagarlo es Ctrl + RETORNO)
 recommendedInstances: Instancias Recomendadas
+instanceSecurity: Seguridad de la instancia
+seperateRenoteQuote: Separar impulsados y Citar botones

From 4fa37e3d714a16d7704a184098627333b157c343 Mon Sep 17 00:00:00 2001
From: Panagiotis Damelos <dreamsareimmortal@hotmail.com>
Date: Tue, 18 Apr 2023 20:48:19 +0000
Subject: [PATCH 497/582] chore: Translated using Weblate (Greek)

Currently translated at 41.4% (714 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/el/
---
 locales/el-GR.yml | 193 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 172 insertions(+), 21 deletions(-)

diff --git a/locales/el-GR.yml b/locales/el-GR.yml
index 1c2d87622..7ee48430b 100644
--- a/locales/el-GR.yml
+++ b/locales/el-GR.yml
@@ -116,11 +116,11 @@ rememberNoteVisibility: "Θυμήσου τις ρυθμίσεις ορατότη
 attachCancel: "Αφαίρεση επισυναπτόμενου"
 enterFileName: "Πληκτρολογήστε όνομα αρχείου"
 mute: "Σίγαση"
-unmute: "Άρση σίγασης"
+unmute: "Διακοπή σίγασης"
 block: "Μπλοκάρισμα"
-unblock: "Άρση μπλοκαρίσματος"
+unblock: "Διακοπή μπλοκαρίσματος"
 suspend: "Αποβολή"
-unsuspend: "Άρση αποβολής"
+unsuspend: "Διακοπή αποβολής"
 blockConfirm: "Θέλετε σίγουρα να μπλοκάρετε αυτόν τον λογαριασμό;"
 unblockConfirm: "Θέλετε σίγουρα να ξεμπλοκάρετε αυτόν τον λογαριασμό;"
 suspendConfirm: "Θέλετε σίγουρα να αποβάλετε αυτόν τον λογαριασμό;"
@@ -187,8 +187,8 @@ birthday: "Γενέθλια"
 registeredDate: "Έγινε μέλος στις"
 location: "Τοποθεσία"
 theme: "Θέματα"
-light: "Ανοιχτόχρωμο"
-dark: "Σκούρο"
+light: "Φωτεινό"
+dark: "Σκοτεινό"
 drive: "Αποθηκευτικός Χώρος"
 fileName: "Όνομα αρχείου"
 selectFile: "Επιλέξτε ένα αρχείο"
@@ -200,12 +200,12 @@ addFile: "Προσθέστε ένα αρχείο"
 emptyDrive: "Ο Αποθηκευτικός Χώρος σας είναι άδειος"
 copyUrl: "Αντιγραφή διεύθυνσης URL"
 rename: "Μετονομασία"
-avatar: "Εικόνα προφίλ"
+avatar: "Άβαταρ"
 banner: "Εξώφυλλο"
 reload: "Ανανέωση"
 doNothing: "Αγνόηση"
 watch: "Παρακολούθηση"
-unwatch: "Άρση παρακολούθησης"
+unwatch: "Διακοπή παρακολούθησης"
 accept: "Αποδοχή"
 reject: "Απόρριψη"
 normal: "Κανονικό"
@@ -221,18 +221,18 @@ registration: "Εγγραφή"
 pinnedPages: "Καρφιτσωμένες Σελίδες"
 pinnedNotes: "Καρφιτσωμένες δημοσιεύσεις"
 antennas: "Αντένες"
-manageAntennas: "Διαχείρισης Αντενών"
+manageAntennas: "Διαχείριση Αντενών"
 name: "Όνομα"
 antennaSource: "Πηγή Αντένας"
 antennaKeywords: "Λέξεις-κλειδιά για παρακολούθηση"
 antennaExcludeKeywords: "Λέξεις-κλειδιά για εξαίρεση"
 notifyAntenna: "Ειδοποίηση για νέες δημοσιεύσεις"
-withFileAntenna: "Μόνο σημειώματα με αρχεία"
+withFileAntenna: "Μόνο δημοσιεύσεις με αρχεία"
 caseSensitive: "Διάκριση Πεζών-Κεφαλαίων"
 popularTags: "Δημοφιλείς ετικέτες"
 userList: "Λίστες"
 about: "Σχετικά με"
-moderator: "Συντονιστής"
+moderator: "Συντονιστής/στρια"
 moderation: "Συντονισμός"
 cacheClear: "Εκκαθάριση προσωρινής μνήμης (cache)"
 markAsReadAllNotifications: "Σημειώστε όλες τις ειδοποιήσεις ως διαβασμένες"
@@ -381,6 +381,7 @@ _visibility:
 _profile:
   name: "Όνομα"
   username: "Όνομα μέλους"
+  changeAvatar: Αλλαγή άβαταρ
 _exportOrImport:
   allNotes: "Όλα τα σημειώματα"
   followingList: "Ακολουθεί"
@@ -431,7 +432,7 @@ exploreUsersCount: Υπάρχουν {count} μέλη
 help: Βοήθεια
 inputNewFileName: Πληκτρολογήστε ένα νέο όνομα αρχείου
 nothing: Δεν υπάρχει τίποτα να δείτε εδώ
-newNoteRecived: Δεν υπάρχουν νέες δημοσιεύσεις
+newNoteRecived: Υπάρχουν νέες δημοσιεύσεις
 passwordMatched: Ταιριάζει
 unmarkAsSensitive: Αναίρεση επισήμανσης ως Ευαίσθητο Περιεχόμενο (NSFW)
 withNFiles: '{n} αρχείο(-α)'
@@ -444,10 +445,10 @@ monthX: '{month}'
 markAsReadAllTalkMessages: Σημειώστε όλα τα μηνύματα ως διαβασμένα
 inputMessageHere: Γράψτε εδώ το μήνυμά σας
 close: Κλείσιμο
-newMessageExists: Δεν υπάρχουν νέα μηνύματα
+newMessageExists: Υπάρχουν νέα μηνύματα
 usernameInvalidFormat: Μπορείτε να χρησιμοποιήσετε κεφαλαία και μικρά γράμματα, αριθμούς,
   και κάτω παύλες.
-tooShort: Πολύ μικρό
+tooShort: Πολύ σύντομο
 passwordNotMatched: Δεν ταιριάζει
 existingAccount: Υπάρχων λογαριασμός
 deleteAll: Διαγραφή όλων
@@ -500,10 +501,10 @@ nUsersMentioned: Έχει αναφερθεί από {n} μέλη
 notFound: Δεν βρέθηκε
 markAsReadAllUnreadNotes: Σημειώστε όλες τις δημοσιεύσεις ως διαβασμένες
 invites: Προσκλήσεις
-quoteQuestion: Επισύναψη ως παράθεση;
+quoteQuestion: Να προστεθεί ως Παράθεση;
 noMessagesYet: Δεν υπάρχουν μηνύματα ακόμη
 onlyOneFileCanBeAttached: Μπορείτε να επισυνάψετε μόνο ένα αρχείο σε ένα μήνυμα
-tooLong: Πολύ μεγάλο
+tooLong: Υπερβολικά μακροσκελές
 or: Ή
 language: Γλώσσα
 groupInvited: Προσκληθήκατε σε μία ομάδα
@@ -539,8 +540,8 @@ optional: Προαιρετικό
 renotesCount: Αριθμός προωθήσεων σε δημοσιεύσεις άλλων
 addItem: Προσθήκη αντικειμένου
 disablePlayer: Κλείσιμο προβολής βίντεο
-describeFile: Προσθήκη λεζάντας
-enterFileDescription: Πληκτρολογήστε λεζάντα
+describeFile: Προσθήκη περιγραφής
+enterFileDescription: Πληκτρολογήστε περιγραφή
 author: Συντάκτης
 setMultipleBySeparatingWithSpace: Διαχωρίστε πολλαπλές καταχωρήσεις με κενά.
 random: Τυχαίο
@@ -554,7 +555,7 @@ editProfile: Επεξεργασία προφίλ
 pinLimitExceeded: Δεν μπορείτε να καρφιτσώσετε άλλες δημοσιεύσεις
 currentPassword: Τρέχων κωδικός
 newPassword: Νέος κωδικός
-newPasswordRetype: Ξαναγράψτε τον νέο κωδικό
+newPasswordRetype: Ξαναπληκτρολογήστε τον νέο κωδικό
 notesAndReplies: Δημοσιεύσεις και απαντήσεις
 popularUsers: Δημοφιλή μέλη
 share: Κοινοποίηση
@@ -583,7 +584,7 @@ folderName: Όνομα φακέλου
 renameFolder: Μετονομασία φακέλου
 recentUsed: Χρησιμοποιήθηκαν πρόσφατα
 deleteAllFilesConfirm: Σίγουρα θέλετε να διαγράψετε όλα τα αρχεία;
-removeAllFollowing: Άρση ακολούθησης όλων των ακολουθούμενων μελών
+removeAllFollowing: Διακοπή ακολούθησης όλων των ακολουθούμενων μελών
 userSilenced: Αυτό το μέλος είναι υπό σίγαση.
 makeActive: Ενεργοποίηση
 create: Δημιουργία
@@ -615,7 +616,7 @@ selectInstance: Επιλέξτε ένα instance
 latestRequestSentAt: Τελευταίο αίτημα στάλθηκε
 hiddenTags: Κρυμμένες Ετικέτες (Hashtags)
 noInstances: Δεν υπάρχουν instances
-renoteUnmute: Άρση σίγασης προωθήσεων
+renoteUnmute: Διακοπή σίγασης προωθήσεων
 flagAsBotDescription: Ενεργοποιήστε αυτή την επιλογή αν αυτός ο λογαριασμός ελέγχεται
   από ένα πρόγραμμα. Αν ενεργοποιηθεί, θα λειτουργεί σαν σημάδι για τους προγραμματιστές,
   ώστε να αποφύγουν ατέρμονη αλληλεπίδραση με άλλα bots και για να ρυθμίσει τα εσωτερικά
@@ -625,6 +626,156 @@ flagShowTimelineRepliesDescription: Εμφάνιση απαντήσεων μελ
 latestRequestReceivedAt: Τελευταίο αίτημα ελήφθη
 blockThisInstance: Μπλοκάρισμα αυτού του instance
 clearQueueConfirmText: Τυχόν δημοσιεύσεις στην ουρά που δεν έχουν αποσταλεί δεν θα
-  ομοσπονδιοποιηθούν. Συνήθως αυτή η λειτουργία δεν χρειάζεται.
+  ομοσπονδοποιηθούν. Συνήθως αυτή η λειτουργία δεν χρειάζεται.
 clearCachedFilesConfirm: Σίγουρα θέλετε να διαγράψετε όλα τα προσωρινά αποθηκευμένα
   απομακρυσμένα αρχεία;
+default: Προεπιλεγμένο
+defaultValueIs: 'Προεπιλεγμένο: {value}'
+noJobs: Δεν υπάρχουν εργασίες (jobs)
+federating: Ομοσπονδοποιείται
+blocked: Μπλοκαρισμένο
+suspended: Σε αποβολή
+instanceFollowing: Ακολουθεί στο instance
+instanceFollowers: Ακόλουθοι του instance
+instanceUsers: Μέλη αυτού του instance
+retypedNotMatch: Οι καταχωρήσεις δεν ταιριάζουν.
+usernameOrUserId: Όνομα μέλους ή ταυτότητα μέλους (id)
+removeAreYouSure: Θέλετε σίγουρα να αφαιρέσετε το "{x}";
+deleteAreYouSure: Θέλετε σίγουρα να διαγράψετε το "{x}";
+resetAreYouSure: Σίγουρα επανεκκίνηση;
+uploadFromUrlMayTakeTime: Ίσως πάρει λίγο χρόνο μέχρι το ανέβασμα να ολοκληρωθεί.
+noMoreHistory: Δεν υπάρχει περαιτέρω ιστορικό
+agreeTo: Συμφωνώ στο {0}
+yearsOld: '{age} ετών'
+themeForDarkMode: Θέμα για τη Σκοτεινή Λειτουργία
+syncDeviceDarkMode: Συγχρονισμός της Σκοτεινής Λειτουργίας με τις ρυθμίσεις της συσκευής
+  σας
+inputNewDescription: Προσθέστε νέα περιγραφή
+whenServerDisconnected: Όταν χάνεται η σύνδεση στον σέρβερ
+disconnectedFromServer: Η σύνδεση στον σέρβερ έχει χαθεί
+instanceDescription: Περιγραφή instance
+maintainerEmail: Διεύθυνση email προγραμματιστή/στριας
+yearX: '{year}'
+enableGlobalTimeline: Ενεργοποίηση παγκόσμιου χρονολογίου
+enableLocalTimeline: Ενεργοποίηση τοπικού χρονολογίου
+enableRegistration: Ενεργοποίηση εγγραφής νέων μελών
+invite: Πρόσκληση
+disablingTimelinesInfo: Οι Διαχειρίστριες-ες και οι Συντονιστές-στριες θα έχουν πάντα
+  πρόσβαση σε όλα τα χρονολόγια, ακόμα κι αν δεν είναι ενεργοποιημένα.
+inMb: Σε megabytes
+iconUrl: Διεύθυνση URL εικονιδίου
+bannerUrl: Διεύθυνση URL εικόνας Εξώφυλλου
+pinnedUsers: Καρφιτσωμένα μέλη
+hcaptchaSiteKey: Κλειδί του site
+recaptcha: Προστασία reCAPTCHA
+enableServiceworker: Ενεργοποίηση Ειδοποιήσεων Push για τον browser σας
+recentlyDiscoveredUsers: Μέλη που ανακαλύφθηκαν πρόσφατα
+twoStepAuthentication: Επαλήθευση δύο παραγόντων
+securityKey: Κλειδί ασφάλειας
+registerSecurityKey: Καταχωρήστε ένα κλειδί ασφάλειας
+resetPassword: Επαναφορά κωδικού
+newPasswordIs: Ο νέος κωδικός είναι "{password}"
+uploadFolder: Προεπιλεγμένος φάκελος για ανέβασμα αρχείων
+joinedGroups: Οι ομάδες που είστε μέλος
+checking: Έλεγχος...
+invitationCode: Κωδικός πρόσκλησης
+normalPassword: Μέτριος κωδικός
+weakPassword: Αδύναμος κωδικός
+strongPassword: Δυνατός κωδικός
+signinWith: Συνδεθείτε με {x}
+tapSecurityKey: Βάλτε το κλειδί ασφάλειας
+signinFailed: Αδυναμία σύνδεσης. Το όνομα μέλους ή ο κωδικός είναι λάθος.
+aboutX: Σχετικά με {x}
+useOsNativeEmojis: Χρήση των Emoji του λειτουργικού συστήματος
+uiLanguage: Γλώσσα διεπαφής
+disableDrawer: Να μη χρησιμοποιούνται μενού σε στιλ συρταριού
+noHistory: Δεν υπάρχει διαθέσιμο ιστορικό
+joinOrCreateGroup: Λάβετε πρόσκληση για μία ομάδα ή δημιουργήστε τη δική σας.
+docSource: Πηγή αυτού του εγγράφου
+regenerate: Επαναδημιουργία
+fontSize: Μέγεθος γραμματοσειράς
+noFollowRequests: Δεν έχετε αιτήματα ακολούθησης σε αναμονή
+dashboard: Ταμπλό
+clientSettings: Ρυθμίσεις διεπαφής
+numberOfDays: Αριθμός ημερών
+hideThisNote: Απόκρυψη αυτής της δημοσίευσης
+showFeaturedNotesInTimeline: Εμφάνιση προτεινόμενων δημοσιεύσεων στα χρονολόγια
+objectStorage: Αποθήκευση Object Storage
+useObjectStorage: Χρήση object storage
+objectStorageBucket: ''
+showFixedPostForm: Εμφάνιση της φόρμας δημοσίευσης στο πάνω μέρος των χρονολογίων
+none: Κανένα
+unableToProcess: Η επιχείρηση ήταν αδύνατο να ολοκληρωθεί
+installedApps: Εφαρμογές με εξουσιοδότηση
+state: Κατάσταση
+installedDate: Εξουσιοδοτήθηκε στις
+lastUsedDate: Χρησιμοποιήθηκε τελευταία φορά στις
+scratchpadDescription: Το σημειωματάριο παρέχει ένα περιβάλλον για πειραματισμό με
+  AiScript. Σε αυτό μπορείτε να γράψετε, να εκτελέσετε, και να δοκιμάσετε τα αποτελέσματα
+  της αλληλεπίδρασης του AiScript με το Calckey.
+scratchpad: Σημειωματάριο
+output: Αποτέλεσμα
+updateRemoteUser: Ανανέωση πληροφοριών απομακρυσμένου μέλους
+disablePagesScript: Απενεργοποίηση του AiScript στις Σελίδες
+removeAllFollowingDescription: Η εκτέλεση θα διακόψη την ακολούθηση όλων των μελών
+  από {host}. Παρακαλούμε εκτελέστε το αν το instance π.χ. δεν υπάρχει πια.
+caption: Αυτόματη Περιγραφή
+all: Όλα
+subscribing: Εγγραφή σε συνδρομή
+publishing: Δημοσιεύεται
+notResponding: Δεν αποκρίνεται
+keepOriginalUploadingDescription: Αποθηκεύει το πρωτότυπο αρχείο όπως είναι. Αν απενεργοποιηθεί,
+  μία έκδοση για προβολή στο ίντερνετ θα δημιουργηθεί κατά το ανέβασμα.
+lookup: Αναζήτηση
+lightThemes: Φωτεινά θέματα
+darkThemes: Σκοτεινά θέματα
+inputNewFolderName: Πληκτρολογήστε ένα νέο όνομα φακέλου
+hasChildFilesOrFolders: Εφόσον αυτός ο φάκελος δεν είναι άδειος, δεν μπορεί να διαγραφεί.
+integration: Ενσωματώσεις
+enableRecommendedTimeline: Ενεργοποίηση χρονολογίου προτεινόμενων
+driveCapacityPerLocalAccount: Μέγεθος Αποθηκευτικού Χώρου ανά τοπικό μέλος
+driveCapacityPerRemoteAccount: Μέγεθος Αποθηκευτικού Χώρου ανά απομακρυσμένο μέλος
+basicInfo: Βασικές πληροφορίες
+pinnedClipId: Ταυτότητα (id) του κλιπ για καρφίτσωμα
+hcaptcha: Προστασία hCaptcha
+enableHcaptcha: Ενεργοποίηση hCaptcha
+hcaptchaSecretKey: Μυστικό κλειδί
+enableRecaptcha: Ενεργοποίηση reCAPTCHA
+recaptchaSiteKey: Κλειδί του site
+recaptchaSecretKey: Μυστικό κλειδί
+antennaKeywordsDescription: Διαχωρίστε με κενά για συνθήκη ΚΑΙ ή με αλλαγή γραμμής
+  για συνθήκη Ή.
+antennaUsersDescription: Παραθέστε ένα όνομα μέλους ανά γραμμή
+antennaInstancesDescription: Παραθέστε ένα instance host ανά γραμμή
+withReplies: Να περιλαμβάνονται οι απαντήσεις
+withFiles: Να περιλαμβάνουν αρχεία
+silence: Σιώπηση
+silenceConfirm: Θέλετε σίγουρα να σιωπήσετε αυτό το μέλος;
+unsilenceConfirm: Σίγουρα θέλετε να αναιρέσετε τη σιώπηση αυτού του μέλους;
+securityKeyName: Όνομα κλειδιού
+lastUsed: Τελευταία χρήση
+unregister: Απεγγραφή
+notFoundDescription: Δεν ήταν δυνατό να βρεθεί σελίδα που να ανταποκρίνεται σε αυτή
+  τη διεύθυνση URL.
+signinHistory: Ιστορικό συνδέσεων
+disableAnimatedMfm: Απενεργοποίηση του MFM με κίνηση
+dayOverDayChanges: Αλλαγές την τελευταία ημέρα
+promotion: Προμοταρισμένα
+promote: Προμοτάρισμα
+squareAvatars: Εμφάνιση τετραγωνισμένων άβαταρ
+aboutMisskey: Σχετικά με το Calckey
+maintainerName: Προγραμματιστής/στρια
+uploadFromUrlRequested: Το ανέβασμα ζητήθηκε
+themeForLightMode: Θέμα για τη Φωτεινή Λειτουργία
+circularReferenceFolder: Ο φάκελος του προορισμού είναι υποφάκελος του φακέλου που
+  θέλετε να μετακινήσετε.
+backgroundImageUrl: Διεύθυνση URL εικόνας φόντου
+pinnedUsersDescription: Παραθέστε τα ονόματα μελών που θα είναι καρφιτσωμένα στην
+  καρτέλα "Εξερεύνηση" χωρίζοντάς τα με αλλαγή γραμμής.
+openImageInNewTab: Άνοιγμα εικόνων σε νέα καρτέλα
+weekOverWeekChanges: Αλλαγές την τελευταία εβδομάδα
+exploreFediverse: Εξερευνήστε το Fediverse
+unsilence: Αναίρεση σιώπησης
+administrator: Διαχειριστής/στρια
+passwordLessLogin: Σύνδεση χωρίς κωδικό
+reduceUiAnimation: Ελάττωση των κινούμενων εικόνων

From e17d896bac93b4f014c695d32f9a6792fc94b8e2 Mon Sep 17 00:00:00 2001
From: Panagiotis Damelos <dreamsareimmortal@hotmail.com>
Date: Tue, 18 Apr 2023 21:48:49 +0000
Subject: [PATCH 498/582] chore: Translated using Weblate (Greek)

Currently translated at 43.2% (745 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/el/
---
 locales/el-GR.yml | 49 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/locales/el-GR.yml b/locales/el-GR.yml
index 7ee48430b..f9b8e6992 100644
--- a/locales/el-GR.yml
+++ b/locales/el-GR.yml
@@ -271,7 +271,7 @@ details: "Λεπτομέρειες"
 install: "Εγκαταστήστε"
 uninstall: "Απεγκατάσταση"
 manage: "Διαχείριση"
-smtpHost: "Φιλοξενεί"
+smtpHost: "Φιλοξενεί (Host)"
 smtpUser: "Όνομα μέλους"
 smtpPass: "Κωδικός"
 notificationSetting: "Ρυθμίσεις ειδοποιήσεων"
@@ -301,7 +301,7 @@ searchByGoogle: "Αναζήτηση"
 file: "Αρχεία"
 recommended: "Προτεινόμενα"
 cannotUploadBecauseNoFreeSpace: "Το ανέβασμα απέτυχε λόγω ανεπαρκούς Αποθηκευτικού\
-  \ Χώρου"
+  \ Χώρου."
 _email:
   _follow:
     title: "Έχετε ένα νέο ακόλουθο"
@@ -527,7 +527,7 @@ display: Προβολή
 send: Αποστολή
 behavior: Συμπεριφορά
 useGlobalSetting: Χρήση παγκόσμιων ρυθμίσεων
-abuseMarkAsResolved: Επισήμανση της αναφοράς ως επιλυμένη
+abuseMarkAsResolved: Επισήμανση της αναφοράς ως επιλυμένης
 openInNewTab: Άνοιγμα σε νέα καρτέλα
 _sensitiveMediaDetection:
   setSensitiveFlagAutomatically: Επισήμανση ως ευαίσθητο περιεχόμενο (NSFW)
@@ -542,7 +542,7 @@ addItem: Προσθήκη αντικειμένου
 disablePlayer: Κλείσιμο προβολής βίντεο
 describeFile: Προσθήκη περιγραφής
 enterFileDescription: Πληκτρολογήστε περιγραφή
-author: Συντάκτης
+author: Συντάκτης/τρια
 setMultipleBySeparatingWithSpace: Διαχωρίστε πολλαπλές καταχωρήσεις με κενά.
 random: Τυχαίο
 accountInfo: Πληροφορίες Λογαριασμού
@@ -585,7 +585,7 @@ renameFolder: Μετονομασία φακέλου
 recentUsed: Χρησιμοποιήθηκαν πρόσφατα
 deleteAllFilesConfirm: Σίγουρα θέλετε να διαγράψετε όλα τα αρχεία;
 removeAllFollowing: Διακοπή ακολούθησης όλων των ακολουθούμενων μελών
-userSilenced: Αυτό το μέλος είναι υπό σίγαση.
+userSilenced: Αυτό το μέλος είναι υπό σιώπηση.
 makeActive: Ενεργοποίηση
 create: Δημιουργία
 reportAbuseOf: Αναφορά {name}
@@ -779,3 +779,42 @@ unsilence: Αναίρεση σιώπησης
 administrator: Διαχειριστής/στρια
 passwordLessLogin: Σύνδεση χωρίς κωδικό
 reduceUiAnimation: Ελάττωση των κινούμενων εικόνων
+serviceworkerInfo: Πρέπει να είναι ενεργοποιημένο για ειδοποιήσεις push.
+expandTweet: Διεύρυνση τουιτ
+themeEditor: Επεξεργασία θεμάτων
+deck: Ντεκ
+undeck: Έξοδος από το Ντεκ
+useFullReactionPicker: Χρήση επιλογέα αντιδράσεων πλήρους μεγέθους
+tokenRequested: Παροχή πρόσβασης στον λογαριασμό
+emailServer: Σέρβερ email
+enableEmail: Ενεργοποίηση του email distribution
+emailAddress: Διεύθυνση email
+emailConfigInfo: Χρησιμοποιείται για επιβεβαίωση του email σας κατά την εγγραφή ή
+  αν ξεχάσετε τον κωδικό σας
+regenerateLoginToken: Επαναδημιουργία token σύνδεσης
+fileIdOrUrl: Ταυτότητα αρχείου (ID) ή διεύθυνση URL
+typingUsers: '{users} πληκτρολογεί'
+yourAccountSuspendedDescription: Αυτός ο λογαριασμός έχει αποβληθεί λόγω μη συμμόρφωσης
+  με τους κανόνες του σέρβερ ή κάτι παρόμοιο. Επικοινωνήστε με τον διαχειριστή/στρια
+  αν θα θέλατε έναν πιο λεπτομερή λόγο. Παρακαλούμε μη δημιουργήσετε νέο λογαριασμό.
+inboxUrl: Διεύθυνση URL των Εισερχομένων
+generateAccessToken: Δημιουργία token πρόσβασης
+emptyToDisableSmtpAuth: Αφήστε το όνομα μέλους και τον κωδικό άδεια για να απενεργοποιήσετε
+  την επαλήθευση SMTP
+instanceMute: Σιγάσεις instance
+userSaysSomethingReason: '{name} είπε {reason}'
+logs: Αρχεία καταγραφής
+abuseReported: Η αναφορά σας στάλθηκε. Ευχαριστούμε πολύ.
+reporter: Έκανε την αναφορά
+reporteeOrigin: Καταγωγή αναφερόμενου λογαριασμού
+reporterOrigin: Καταγωγή λογαριασμού που έκανε την αναφορά
+forwardReport: Προώθηση της αναφοράς στο απομακρυσμένο instance
+openInSideView: Άνοιγμα σε προβολή παράθεσης
+delayed: Με καθυστέρηση
+useGlobalSettingDesc: Αν ενεργοποιηθεί, οι ρυθμίσεις ειδοποιήσεων του λογαριασμού
+  σας θα χρησιμοποιηθούν. Αν απενεργοποιηθεί, μπορούν να γίνουν ανεξάρτητες ρυθμίσεις.
+fillAbuseReportDescription: Παρακαλούμε συμπληρώστε λεπτομέρειες σχετικά με αυτή την
+  αναφορά. Αν πρόκειται για συγκεκριμένη δημοσίευση, παρακαλούμε συμπεριλάβετε τη
+  διεύθυνση URL της δημοσίευσης.
+forwardReportIsAnonymous: Αντί για τον λογαριασμό σας, μία ανώνυμη αναφορά από λογαριασμό
+  του συστήματος θα εμφανιστεί στο απομακρυσμένο instance.

From 40ac16afba9bebb786f0b41ed8c9644ba82225ed Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 20 Apr 2023 04:21:28 +0900
Subject: [PATCH 499/582] Fix the search bar bug on iOS

---
 packages/client/src/components/MkGoogle.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkGoogle.vue b/packages/client/src/components/MkGoogle.vue
index 2599aea47..d54edec71 100644
--- a/packages/client/src/components/MkGoogle.vue
+++ b/packages/client/src/components/MkGoogle.vue
@@ -39,7 +39,8 @@ const search = () => {
 		font-size: 16px;
 		border: solid 1px var(--divider);
 		border-radius: 4px 0 0 4px;
-		-webkit-appearance: textfield;
+		-webkit-appearance: none;
+		-webkit-border-radius: 4px 0 0 4px;
 	}
 
 	> button {

From 914d8fa9dbc201b6dbd2b200ed0e254337c76861 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Thu, 20 Apr 2023 02:53:28 +0000
Subject: [PATCH 500/582] feat: add an option to disable emoji reactions
 (#9878)

Closes: #9865
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9878
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 locales/en-US.yml                             |   1 +
 locales/ja-JP.yml                             |   1 +
 locales/zh-CN.yml                             |   1 +
 locales/zh-TW.yml                             |   1 +
 packages/client/src/components/MkNote.vue     |  30 +++-
 .../client/src/components/MkNoteDetailed.vue  |  31 +++-
 packages/client/src/components/MkNoteSub.vue  |  31 +++-
 .../client/src/components/MkNotification.vue  |  19 ++-
 .../src/components/MkReactedUsersDialog.vue   |   2 +-
 .../src/components/MkStarButtonNoEmoji.vue    | 133 +++++++++++++++
 .../pages/settings/preferences-backups.vue    |   1 +
 .../client/src/pages/settings/reaction.vue    | 158 ++++++++++--------
 packages/client/src/store.ts                  |   4 +
 13 files changed, 330 insertions(+), 83 deletions(-)
 create mode 100644 packages/client/src/components/MkStarButtonNoEmoji.vue

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 648f7f1fd..60e7c7740 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -114,6 +114,7 @@ clickToShow: "Click to show"
 sensitive: "NSFW"
 add: "Add"
 reaction: "Reactions"
+enableEmojiReactions: "Enable emoji reactions"
 reactionSetting: "Reactions to show in the reaction picker"
 reactionSettingDescription2: "Drag to reorder, click to delete, press \"+\" to add."
 rememberNoteVisibility: "Remember post visibility settings"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 5bd06f23e..9fbf71288 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -109,6 +109,7 @@ clickToShow: "クリックして表示"
 sensitive: "閲覧注意"
 add: "追加"
 reaction: "リアクション"
+enableEmojiReactions: "絵文字リアクションを有効にする"
 reactionSetting: "ピッカーに表示するリアクション"
 reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
 rememberNoteVisibility: "公開範囲を記憶する"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 2784da81d..fc507b8e0 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -107,6 +107,7 @@ clickToShow: "点击以显示"
 sensitive: "敏感内容"
 add: "添加"
 reaction: "回应"
+enableEmojiReaction: "启用表情符号回应"
 reactionSetting: "在选择器中显示的回应"
 reactionSettingDescription2: "拖动重新排序，单击删除，点击 + 添加。"
 rememberNoteVisibility: "保存上次设置的可见性"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 3e8485adb..c46452e88 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -107,6 +107,7 @@ clickToShow: "按一下以顯示"
 sensitive: "敏感內容"
 add: "新增"
 reaction: "情感"
+enableEmojiReaction: "啟用表情符號反應"
 reactionSetting: "在選擇器中顯示反應"
 reactionSettingDescription2: "拖動以重新列序，點擊以刪除，按下 + 添加。"
 rememberNoteVisibility: "記住貼文可見性"
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 658e799b8..311a80fa0 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -176,6 +176,7 @@
 				</div>
 				<footer ref="el" class="footer" @click.stop>
 					<XReactionsViewer
+						v-if="enableEmojiReactions"
 						ref="reactionsViewer"
 						:note="appearNote"
 					/>
@@ -195,14 +196,32 @@
 						:note="appearNote"
 						:count="appearNote.renoteCount"
 					/>
+					<XStarButtonNoEmoji
+						v-if="!enableEmojiReactions"
+						class="button"
+						:note="appearNote"
+						:count="
+							Object.values(appearNote.reactions).reduce(
+								(partialSum, val) => partialSum + val,
+								0
+							)
+						"
+						:reacted="appearNote.myReaction != null"
+					/>
 					<XStarButton
-						v-if="appearNote.myReaction == null"
+						v-if="
+							enableEmojiReactions &&
+							appearNote.myReaction == null
+						"
 						ref="starButton"
 						class="button"
 						:note="appearNote"
 					/>
 					<button
-						v-if="appearNote.myReaction == null"
+						v-if="
+							enableEmojiReactions &&
+							appearNote.myReaction == null
+						"
 						ref="reactButton"
 						v-tooltip.noDelay.bottom="i18n.ts.reaction"
 						class="button _button"
@@ -211,7 +230,10 @@
 						<i class="ph-smiley ph-bold ph-lg"></i>
 					</button>
 					<button
-						v-if="appearNote.myReaction != null"
+						v-if="
+							enableEmojiReactions &&
+							appearNote.myReaction != null
+						"
 						ref="reactButton"
 						class="button _button reacted"
 						@click="undoReact(appearNote)"
@@ -263,6 +285,7 @@ import XPoll from "@/components/MkPoll.vue";
 import XRenoteButton from "@/components/MkRenoteButton.vue";
 import XReactionsViewer from "@/components/MkReactionsViewer.vue";
 import XStarButton from "@/components/MkStarButton.vue";
+import XStarButtonNoEmoji from "@/components/MkStarButtonNoEmoji.vue";
 import XQuoteButton from "@/components/MkQuoteButton.vue";
 import MkUrlPreview from "@/components/MkUrlPreview.vue";
 import MkVisibility from "@/components/MkVisibility.vue";
@@ -333,6 +356,7 @@ const translating = ref(false);
 const urls = appearNote.text
 	? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5)
 	: null;
+const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
 
 const keymap = {
 	r: () => reply(true),
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 0137682b8..237d05546 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -179,6 +179,7 @@
 						</MkA>
 					</div>
 					<XReactionsViewer
+						v-if="enableEmojiReactions"
 						ref="reactionsViewer"
 						:note="appearNote"
 					/>
@@ -203,14 +204,32 @@
 						:note="appearNote"
 						:count="appearNote.renoteCount"
 					/>
+					<XStarButtonNoEmoji
+						v-if="!enableEmojiReactions"
+						class="button"
+						:note="appearNote"
+						:count="
+							Object.values(appearNote.reactions).reduce(
+								(partialSum, val) => partialSum + val,
+								0
+							)
+						"
+						:reacted="appearNote.myReaction != null"
+					/>
 					<XStarButton
-						v-if="appearNote.myReaction == null"
+						v-if="
+							enableEmojiReactions &&
+							appearNote.myReaction == null
+						"
 						ref="starButton"
 						class="button"
 						:note="appearNote"
 					/>
 					<button
-						v-if="appearNote.myReaction == null"
+						v-if="
+							enableEmojiReactions &&
+							appearNote.myReaction == null
+						"
 						ref="reactButton"
 						v-tooltip.noDelay.bottom="i18n.ts.reaction"
 						class="button _button"
@@ -219,7 +238,10 @@
 						<i class="ph-smiley ph-bold ph-lg"></i>
 					</button>
 					<button
-						v-if="appearNote.myReaction != null"
+						v-if="
+							enableEmojiReactions &&
+							appearNote.myReaction != null
+						"
 						ref="reactButton"
 						class="button _button reacted"
 						@click="undoReact(appearNote)"
@@ -283,6 +305,7 @@ import XMediaList from "@/components/MkMediaList.vue";
 import XCwButton from "@/components/MkCwButton.vue";
 import XPoll from "@/components/MkPoll.vue";
 import XStarButton from "@/components/MkStarButton.vue";
+import XStarButtonNoEmoji from "@/components/MkStarButtonNoEmoji.vue";
 import XRenoteButton from "@/components/MkRenoteButton.vue";
 import XQuoteButton from "@/components/MkQuoteButton.vue";
 import MkUrlPreview from "@/components/MkUrlPreview.vue";
@@ -316,6 +339,8 @@ const inChannel = inject("inChannel", null);
 
 let note = $ref(deepClone(props.note));
 
+const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
+
 // plugin
 if (noteViewInterruptors.length > 0) {
 	onMounted(async () => {
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 6a5d154ef..632a37163 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -87,6 +87,7 @@
 				</div>
 				<footer class="footer" @click.stop>
 					<XReactionsViewer
+						v-if="enableEmojiReactions"
 						ref="reactionsViewer"
 						:note="appearNote"
 					/>
@@ -106,14 +107,32 @@
 						:note="appearNote"
 						:count="appearNote.renoteCount"
 					/>
+					<XStarButtonNoEmoji
+						v-if="!enableEmojiReactions"
+						class="button"
+						:note="appearNote"
+						:count="
+							Object.values(appearNote.reactions).reduce(
+								(partialSum, val) => partialSum + val,
+								0
+							)
+						"
+						:reacted="appearNote.myReaction != null"
+					/>
 					<XStarButton
-						v-if="appearNote.myReaction == null"
+						v-if="
+							enableEmojiReactions &&
+							appearNote.myReaction == null
+						"
 						ref="starButton"
 						class="button"
 						:note="appearNote"
 					/>
 					<button
-						v-if="appearNote.myReaction == null"
+						v-if="
+							enableEmojiReactions &&
+							appearNote.myReaction == null
+						"
 						ref="reactButton"
 						v-tooltip.noDelay.bottom="i18n.ts.reaction"
 						class="button _button"
@@ -122,7 +141,10 @@
 						<i class="ph-smiley ph-bold ph-lg"></i>
 					</button>
 					<button
-						v-if="appearNote.myReaction != null"
+						v-if="
+							enableEmojiReactions &&
+							appearNote.myReaction != null
+						"
 						ref="reactButton"
 						class="button _button reacted"
 						@click="undoReact(appearNote)"
@@ -187,6 +209,7 @@ import XNoteHeader from "@/components/MkNoteHeader.vue";
 import MkSubNoteContent from "@/components/MkSubNoteContent.vue";
 import XReactionsViewer from "@/components/MkReactionsViewer.vue";
 import XStarButton from "@/components/MkStarButton.vue";
+import XStarButtonNoEmoji from "@/components/MkStarButtonNoEmoji.vue";
 import XRenoteButton from "@/components/MkRenoteButton.vue";
 import XQuoteButton from "@/components/MkQuoteButton.vue";
 import XCwButton from "@/components/MkCwButton.vue";
@@ -199,6 +222,7 @@ import { reactionPicker } from "@/scripts/reaction-picker";
 import { i18n } from "@/i18n";
 import { deepClone } from "@/scripts/clone";
 import { useNoteCapture } from "@/scripts/use-note-capture";
+import { defaultStore } from "@/store";
 
 const router = useRouter();
 
@@ -247,6 +271,7 @@ const replies: misskey.entities.Note[] =
 				item.renoteId === props.note.id
 		)
 		.reverse() ?? [];
+const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
 
 useNoteCapture({
 	rootEl: el,
diff --git a/packages/client/src/components/MkNotification.vue b/packages/client/src/components/MkNotification.vue
index 60aefab9f..841a0fc99 100644
--- a/packages/client/src/components/MkNotification.vue
+++ b/packages/client/src/components/MkNotification.vue
@@ -65,7 +65,10 @@
 				></i>
 				<!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
 				<XReactionIcon
-					v-else-if="notification.type === 'reaction'"
+					v-else-if="
+						notification.type === 'reaction' &&
+						defaultStore.state.enableEmojiReactions
+					"
 					ref="reactionRef"
 					:reaction="
 						notification.reaction
@@ -78,6 +81,14 @@
 					:custom-emojis="notification.note.emojis"
 					:no-style="true"
 				/>
+				<XReactionIcon
+					v-else-if="
+						notification.type === 'reaction' &&
+						!defaultStore.state.enableEmojiReactions
+					"
+					:reaction="defaultReaction"
+					:no-style="true"
+				/>
 			</div>
 		</div>
 		<div class="tail">
@@ -272,6 +283,8 @@ import { i18n } from "@/i18n";
 import * as os from "@/os";
 import { stream } from "@/stream";
 import { useTooltip } from "@/scripts/use-tooltip";
+import { defaultStore } from "@/store";
+import { instance } from "@/instance";
 
 const props = withDefaults(
 	defineProps<{
@@ -288,6 +301,10 @@ const props = withDefaults(
 const elRef = ref<HTMLElement>(null);
 const reactionRef = ref(null);
 
+const defaultReaction = ["⭐", "👍", "❤️"].includes(instance.defaultReaction)
+	? instance.defaultReaction
+	: "⭐";
+
 let readObserver: IntersectionObserver | undefined;
 let connection;
 
diff --git a/packages/client/src/components/MkReactedUsersDialog.vue b/packages/client/src/components/MkReactedUsersDialog.vue
index 7012ea3fa..784d306b6 100644
--- a/packages/client/src/components/MkReactedUsersDialog.vue
+++ b/packages/client/src/components/MkReactedUsersDialog.vue
@@ -6,7 +6,7 @@
 		@close="dialog.close()"
 		@closed="emit('closed')"
 	>
-		<template #header>{{ i18n.ts.reactions }}</template>
+		<template #header>{{ i18n.ts.reaction }}</template>
 
 		<MkSpacer :margin-min="20" :margin-max="28">
 			<div v-if="note" class="_gaps">
diff --git a/packages/client/src/components/MkStarButtonNoEmoji.vue b/packages/client/src/components/MkStarButtonNoEmoji.vue
new file mode 100644
index 000000000..3ca0b9261
--- /dev/null
+++ b/packages/client/src/components/MkStarButtonNoEmoji.vue
@@ -0,0 +1,133 @@
+<template>
+	<button
+		v-tooltip.noDelay.bottom="i18n.ts._gallery.like"
+		class="_button"
+		:class="$style.root"
+		ref="buttonRef"
+		@click="toggleStar($event)"
+	>
+		<span v-if="!reacted">
+			<i
+				v-if="instance.defaultReaction === '👍'"
+				class="ph-thumbs-up ph-bold ph-lg"
+			></i>
+			<i
+				v-else-if="instance.defaultReaction === '❤️'"
+				class="ph-heart ph-bold ph-lg"
+			></i>
+			<i v-else class="ph-star ph-bold ph-lg"></i>
+		</span>
+		<span v-else>
+			<i
+				v-if="instance.defaultReaction === '👍'"
+				class="ph-thumbs-up ph-bold ph-lg ph-fill"
+				:class="$style.yellow"
+			></i>
+			<i
+				v-else-if="instance.defaultReaction === '❤️'"
+				class="ph-heart ph-bold ph-lg ph-fill"
+				:class="$style.red"
+			></i>
+			<i
+				v-else
+				class="ph-star ph-bold ph-lg ph-fill"
+				:class="$style.yellow"
+			></i>
+		</span>
+		<template v-if="count > 0"
+			><p :class="$style.count">{{ count }}</p></template
+		>
+	</button>
+</template>
+
+<script lang="ts" setup>
+import { ref } from "vue";
+import type { Note } from "calckey-js/built/entities";
+import Ripple from "@/components/MkRipple.vue";
+import XDetails from "@/components/MkUsersTooltip.vue";
+import { pleaseLogin } from "@/scripts/please-login";
+import * as os from "@/os";
+import { defaultStore } from "@/store";
+import { i18n } from "@/i18n";
+import { instance } from "@/instance";
+import { useTooltip } from "@/scripts/use-tooltip";
+
+const props = defineProps<{
+	note: Note;
+	count: number;
+	reacted: boolean;
+}>();
+
+const buttonRef = ref<HTMLElement>();
+
+function toggleStar(ev?: MouseEvent): void {
+	pleaseLogin();
+
+	if (!props.reacted) {
+		os.api("notes/reactions/create", {
+			noteId: props.note.id,
+			reaction: instance.defaultReaction,
+		});
+		const el =
+			ev &&
+			((ev.currentTarget ?? ev.target) as HTMLElement | null | undefined);
+		if (el) {
+			const rect = el.getBoundingClientRect();
+			const x = rect.left + el.offsetWidth / 2;
+			const y = rect.top + el.offsetHeight / 2;
+			os.popup(Ripple, { x, y }, {}, "end");
+		}
+	} else {
+		os.api("notes/reactions/delete", {
+			noteId: props.note.id,
+		});
+	}
+}
+
+useTooltip(buttonRef, async (showing) => {
+	const reactions = await os.apiGet("notes/reactions", {
+		noteId: props.note.id,
+		limit: 11,
+		_cacheKey_: props.count,
+	});
+
+	const users = reactions.map((x) => x.user);
+
+	if (users.length < 1) return;
+
+	os.popup(
+		XDetails,
+		{
+			showing,
+			users,
+			count: props.count,
+			targetElement: buttonRef.value,
+		},
+		{},
+		"closed"
+	);
+});
+</script>
+
+<style lang="scss" module>
+.root {
+	display: inline-block;
+	height: 32px;
+	margin: 2px;
+	padding: 0 6px;
+}
+
+.yellow {
+	color: var(--warn);
+}
+
+.red {
+	color: var(--error);
+}
+
+.count {
+	display: inline;
+	margin: 0 0 0 8px;
+	opacity: 0.7;
+}
+</style>
diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index b58a42597..3b45fa796 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -114,6 +114,7 @@ const defaultStoreSaveKeys: (keyof (typeof defaultStore)["state"])[] = [
 	"swipeOnDesktop",
 	"showAdminUpdates",
 	"enableCustomKaTeXMacro",
+	"enableEmojiReactions",
 ];
 const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [
 	"lightTheme",
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index 22c6f289b..dbe909e98 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -1,81 +1,92 @@
 <template>
 	<div class="_formRoot">
-		<FromSlot class="_formBlock">
-			<template #label>{{ i18n.ts.reactionSettingDescription }}</template>
-			<div v-panel style="border-radius: 6px">
-				<XDraggable
-					v-model="reactions"
-					class="zoaiodol"
-					:item-key="(item) => item"
-					animation="150"
-					delay="100"
-					delay-on-touch-only="true"
-				>
-					<template #item="{ element }">
-						<button
-							class="_button item"
-							@click="remove(element, $event)"
-						>
-							<MkEmoji :emoji="element" :normal="true" />
-						</button>
-					</template>
-					<template #footer>
-						<button class="_button add" @click="chooseEmoji">
-							<i class="ph-plus ph-bold ph-lg"></i>
-						</button>
-					</template>
-				</XDraggable>
-			</div>
-			<template #caption
-				>{{ i18n.ts.reactionSettingDescription2 }}
-				<button class="_textButton" @click="preview">
-					{{ i18n.ts.preview }}
-				</button></template
-			>
-		</FromSlot>
-
-		<FormRadios v-model="reactionPickerSize" class="_formBlock">
-			<template #label>{{ i18n.ts.size }}</template>
-			<option :value="1">{{ i18n.ts.small }}</option>
-			<option :value="2">{{ i18n.ts.medium }}</option>
-			<option :value="3">{{ i18n.ts.large }}</option>
-		</FormRadios>
-		<FormRadios v-model="reactionPickerWidth" class="_formBlock">
-			<template #label>{{ i18n.ts.numberOfColumn }}</template>
-			<option :value="1">5</option>
-			<option :value="2">6</option>
-			<option :value="3">7</option>
-			<option :value="4">8</option>
-			<option :value="5">9</option>
-		</FormRadios>
-		<FormRadios v-model="reactionPickerHeight" class="_formBlock">
-			<template #label>{{ i18n.ts.height }}</template>
-			<option :value="1">{{ i18n.ts.small }}</option>
-			<option :value="2">{{ i18n.ts.medium }}</option>
-			<option :value="3">{{ i18n.ts.large }}</option>
-			<option :value="4">{{ i18n.ts.large }}+</option>
-		</FormRadios>
-
-		<FormSwitch
-			v-model="reactionPickerUseDrawerForMobile"
-			class="_formBlock"
-		>
-			{{ i18n.ts.useDrawerReactionPickerForMobile }}
+		<FormSwitch v-model="enableEmojiReactions" class="_formBlock">
+			{{ i18n.ts.enableEmojiReactions }}
 			<template #caption>{{ i18n.ts.needReloadToApply }}</template>
 		</FormSwitch>
 
-		<FormSection>
-			<div style="display: flex; gap: var(--margin); flex-wrap: wrap">
-				<FormButton inline @click="preview"
-					><i class="ph-eye ph-bold ph-lg"></i>
-					{{ i18n.ts.preview }}</FormButton
+		<div v-if="enableEmojiReactions">
+			<FromSlot class="_formBlock">
+				<template #label>{{
+					i18n.ts.reactionSettingDescription
+				}}</template>
+				<div v-panel style="border-radius: 6px">
+					<XDraggable
+						v-model="reactions"
+						class="zoaiodol"
+						:item-key="(item) => item"
+						animation="150"
+						delay="100"
+						delay-on-touch-only="true"
+					>
+						<template #item="{ element }">
+							<button
+								class="_button item"
+								@click="remove(element, $event)"
+							>
+								<MkEmoji :emoji="element" :normal="true" />
+							</button>
+						</template>
+						<template #footer>
+							<button class="_button add" @click="chooseEmoji">
+								<i class="ph-plus ph-bold ph-lg"></i>
+							</button>
+						</template>
+					</XDraggable>
+				</div>
+				<template #caption
+					>{{ i18n.ts.reactionSettingDescription2 }}
+					<button class="_textButton" @click="preview">
+						{{ i18n.ts.preview }}
+					</button></template
 				>
-				<FormButton inline danger @click="setDefault"
-					><i class="ph-arrow-counter-clockwise ph-bold ph-lg"></i>
-					{{ i18n.ts.default }}</FormButton
-				>
-			</div>
-		</FormSection>
+			</FromSlot>
+
+			<FormRadios v-model="reactionPickerSize" class="_formBlock">
+				<template #label>{{ i18n.ts.size }}</template>
+				<option :value="1">{{ i18n.ts.small }}</option>
+				<option :value="2">{{ i18n.ts.medium }}</option>
+				<option :value="3">{{ i18n.ts.large }}</option>
+			</FormRadios>
+			<FormRadios v-model="reactionPickerWidth" class="_formBlock">
+				<template #label>{{ i18n.ts.numberOfColumn }}</template>
+				<option :value="1">5</option>
+				<option :value="2">6</option>
+				<option :value="3">7</option>
+				<option :value="4">8</option>
+				<option :value="5">9</option>
+			</FormRadios>
+			<FormRadios v-model="reactionPickerHeight" class="_formBlock">
+				<template #label>{{ i18n.ts.height }}</template>
+				<option :value="1">{{ i18n.ts.small }}</option>
+				<option :value="2">{{ i18n.ts.medium }}</option>
+				<option :value="3">{{ i18n.ts.large }}</option>
+				<option :value="4">{{ i18n.ts.large }}+</option>
+			</FormRadios>
+
+			<FormSwitch
+				v-model="reactionPickerUseDrawerForMobile"
+				class="_formBlock"
+			>
+				{{ i18n.ts.useDrawerReactionPickerForMobile }}
+				<template #caption>{{ i18n.ts.needReloadToApply }}</template>
+			</FormSwitch>
+
+			<FormSection>
+				<div style="display: flex; gap: var(--margin); flex-wrap: wrap">
+					<FormButton inline @click="preview"
+						><i class="ph-eye ph-bold ph-lg"></i>
+						{{ i18n.ts.preview }}</FormButton
+					>
+					<FormButton inline danger @click="setDefault"
+						><i
+							class="ph-arrow-counter-clockwise ph-bold ph-lg"
+						></i>
+						{{ i18n.ts.default }}</FormButton
+					>
+				</div>
+			</FormSection>
+		</div>
 	</div>
 </template>
 
@@ -108,6 +119,9 @@ const reactionPickerHeight = $computed(
 const reactionPickerUseDrawerForMobile = $computed(
 	defaultStore.makeGetterSetter("reactionPickerUseDrawerForMobile")
 );
+const enableEmojiReactions = $computed(
+	defaultStore.makeGetterSetter("enableEmojiReactions")
+);
 
 function save() {
 	defaultStore.set("reactions", reactions);
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 44c442a4a..4cb28b000 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -294,6 +294,10 @@ export const defaultStore = markRaw(
 			where: "device",
 			default: false,
 		},
+		enableEmojiReactions: {
+			where: "account",
+			default: true,
+		},
 	}),
 );
 

From 206aa845f93238ae32913369bc1f9eb4c6c440d9 Mon Sep 17 00:00:00 2001
From: D David <postureatsevenpm@gmail.com>
Date: Wed, 19 Apr 2023 00:07:55 +0000
Subject: [PATCH 501/582] chore: Translated using Weblate (Spanish)

Currently translated at 92.5% (1595 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/es/
---
 locales/es-ES.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 7f0c4b879..3a4f0a219 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1162,6 +1162,7 @@ _serverDisconnectedBehavior:
   reload: "Recargar automáticamente"
   dialog: "Mostrar diálogo de advertencia"
   quiet: "Advertencia discreta"
+  nothing: Hacer nada
 _channel:
   create: "Crear canal"
   edit: "Editar canal"
@@ -1418,6 +1419,8 @@ _widgets:
   aiscript: "Consola de AiScript"
   aichan: "indigo"
   userList: Lista Usuarios
+  _userList:
+    chooseList: Seleccione una lista
 _cw:
   hide: "Ocultar"
   show: "Ver más"
@@ -1479,6 +1482,8 @@ _profile:
   metadataContent: "Contenido"
   changeAvatar: "Cambiar avatar"
   changeBanner: "Cambiar banner"
+  locationDescription: Si ingresas tu ciudad primero, el tiempo local tuyo será visible
+    para otros usuarios.
 _exportOrImport:
   allNotes: "Todas las notas"
   followingList: "Siguiendo"
@@ -1919,3 +1924,7 @@ enterSendsMessage: Presione "RETORNO" en los mensajes para enviar el mensaje (pa
 recommendedInstances: Instancias Recomendadas
 instanceSecurity: Seguridad de la instancia
 seperateRenoteQuote: Separar impulsados y Citar botones
+_messaging:
+  groups: Grupos
+  dms: Privado
+pushNotification: Notificaciones

From 3b62da3d79dda3408ac8722b15d3cf1e52c9a341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D0=B1=D0=B5=D1=80=20=D0=BE=D0=B3=D1=83=D1=80?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BA?= <abrew1330@gmail.com>
Date: Wed, 19 Apr 2023 04:44:38 +0000
Subject: [PATCH 502/582] chore: Translated using Weblate (Russian)

Currently translated at 93.6% (1615 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ru/
---
 locales/ru-RU.yml | 77 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 40b7c54e0..a77695929 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -754,7 +754,7 @@ nUsers: "Пользователей: {n}"
 nNotes: "Заметок: {n}"
 sendErrorReports: "Посылать отчёты о сбоях"
 sendErrorReportsDescription: "Если включено, когда возникнет какая-нибудь техническая\
-  \ проблема, подробные сведения об этом будут отправлены разработчикам Misskey. Это\
+  \ проблема, подробные сведения об этом будут отправлены разработчикам Calckey. Это\
   \ очень помогает делать программу лучше. В отчёты попадают тип и версия ОС, браузера,\
   \ журнал действий (что привело к сбою) и тому подобное."
 myTheme: "Личная тема"
@@ -1789,3 +1789,78 @@ renoteUnmute: Разглушить репосты
 hiddenTags: Скрытые хештеги
 noInstances: Нет инстансов
 secureModeInfo: При запросах с других инстансов не отправлять ответ без подтверждения.
+instanceDefaultThemeDescription: Введите код темы в формате объекта.
+tenMinutes: 10 минут
+oneHour: Один час
+thereIsUnresolvedAbuseReportWarning: Есть не рассмотренные жалобы.
+cropImage: Обрезать изображение
+requireAdminForView: Вы должны войти с аккаунта администратора что просмотреть это.
+refreshInterval: 'Интервал обновления '
+slow: Медленно
+fast: Быстро
+sensitiveMediaDetection: Обнаружение NSFW медиа
+remoteOnly: Только другие сайты
+navbar: Панель навигации
+customMOTD: Своё MOTD (сообщения на заставке)
+customMOTDDescription: Пользовательские сообщения для MOTD (заставки), разделенные
+  разрывами строк, будут отображаться случайным образом каждый раз, когда пользователь
+  загружает / перезагружает страницу.
+recommendedInstancesDescription: Рекомендуемые инстансы, разделенные разрывами строк,
+  должны отображаться на рекомендуемой ленте. НЕ добавляйте `https://`, ТОЛЬКО домен.
+caption: Автоматическая подпись
+splash: Заставка
+updateAvailable: Возможно, доступно обновление!
+move: Переместить
+swipeOnDesktop: Разрешить свайпы в мобильном стиле на десктопе
+showAds: Показывать рекламу
+noEmailServerWarning: Почтовый сервер не настроен.
+type: Тип
+numberOfPageCacheDescription: Увеличение этого числа повысит удобство для пользователей,
+  но приведет к увеличению нагрузки на сервер, а также к использованию большего объема
+  памяти.
+statusbar: Панель статуса
+speed: Скорость
+oneDay: Один день
+oneWeek: Одна неделя
+failedToFetchAccountInformation: Не удалось получить информацию о аккаунте
+cropImageAsk: Желаете ли вы обрезать это изображение?
+recentNHours: Последние {n} часов
+recentNDays: Последние {n} дней
+typeToConfirm: Введите {x} чтобы подтвердить
+document: Документация
+logoutConfirm: Действительно выйти?
+failedToUpload: Не удалось загрузить
+pushNotification: Пуш уведомления
+subscribePushNotification: Включить пуш уведомления
+unsubscribePushNotification: Отключить пуш уведомления
+pushNotificationAlreadySubscribed: Пуш уведомления уже включены
+sendPushNotificationReadMessage: Удалять пуш уведомления после того как соответствующие
+  уведомления или сообщения были прочитаны
+customSplashIcons: Свои иконки для заставки (URL)
+customSplashIconsDescription: URL-адреса для пользовательских значков заставки, разделенных
+  разрывами строк, будут отображаться случайным образом каждый раз, когда пользователь
+  загружает / перезагружает страницу. Пожалуйста, убедитесь, что изображения находятся
+  на статическом URL-адресе, предпочтительно все с размером 192x192.
+logoImageUrl: URL изображения логотипа
+showAdminUpdates: Указать, что доступна новая версия Calckey (только для администратора)
+replayTutorial: Перезапустить туториал
+migration: Миграция
+showLocalPosts: 'Показать локальные посты в:'
+homeTimeline: Домашняя лента
+socialTimeline: Социальная лента
+driveCapOverrideCaption: Сбросить до настроек по умолчанию введя значение 0 или меньше.
+deleteAccount: Удалить аккаунт
+numberOfPageCache: Число кэшируемых страниц
+pushNotificationNotSupported: Ваш браузер или инстанс не поддерживает пуш уведомления
+sendPushNotificationReadMessageCaption: Уведомление содержащее текст "{emptyPushNotificationMessage}"
+  будет показано на короткое время. Это может увеличить расход батареи вашего устройства,
+  если это применимо.
+cannotUploadBecauseNoFreeSpace: Загрузка не удалась из-за нехватки места на Диске.
+cannotUploadBecauseInappropriate: Этот файл не может быть загружен потому что его
+  части были обнаружены как потенциальное NSFW.
+adminCustomCssWarn: Этот параметр следует использовать только в том случае, если вы
+  знаете, что он делает. Ввод неправильных значений может привести к тому, что ВСЕ
+  клиенты перестанут нормально функционировать. Пожалуйста, убедитесь, что ваш CSS
+  работает должным образом, протестировав его в настройках вашего пользователя.
+showUpdates: Показывать всплывающее окно при обновлении Calckey
+recommendedInstances: Рекомендованные инстансы

From b8e157060b64518a2573fbfa8cf315c694e69c8e Mon Sep 17 00:00:00 2001
From: Panagiotis Damelos <dreamsareimmortal@hotmail.com>
Date: Wed, 19 Apr 2023 15:01:11 +0000
Subject: [PATCH 503/582] chore: Translated using Weblate (Greek)

Currently translated at 43.2% (745 of 1724 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/el/
---
 locales/el-GR.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/el-GR.yml b/locales/el-GR.yml
index f9b8e6992..9b234f5eb 100644
--- a/locales/el-GR.yml
+++ b/locales/el-GR.yml
@@ -412,10 +412,10 @@ _notification:
     reply: "Απάντηση"
     renote: "Κοινοποίηση σημειώματος"
 _deck:
-  widgetsIntroduction: "Παρακαλούμε επιλέξτε \"Επεξεργασία μαραφετίων\" στο μενού\
-    \ και προσθέστε μαραφέτι."
+  widgetsIntroduction: "Παρακαλούμε επιλέξτε \"Επεξεργασία πρόσθετων\" στο μενού και\
+    \ προσθέστε μαραφέτι."
   _columns:
-    widgets: "Μαραφέτια"
+    widgets: "Πρόσθετα"
     notifications: "Ειδοποιήσεις"
     tl: "Χρονολόγιο"
     antenna: "Αντένες"

From 386b93ddfd7f1ca72a7be228db565ebd4388f705 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 19 Apr 2023 20:41:57 -0700
Subject: [PATCH 504/582] Revert "docs: rm yunohost"

This reverts commit 9ef11deb9934a4aecf601441f9d20f465e02ca04.
---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 28c6d6bba..af117ac4a 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@
 - 📖 JoinFediverse Wiki: <https://joinfediverse.wiki/What_is_Calckey%3F>
 - 🐋 Docker Hub: <https://hub.docker.com/r/thatonecalculator/calckey>
 - ✍️ Weblate: <https://hosted.weblate.org/engage/calckey/>
-<!-- - 📦 Yunohost: <https://github.com/YunoHost-Apps/calckey_ynh> -->
+- 📦 Yunohost: <https://github.com/YunoHost-Apps/calckey_ynh>
 
 # 🌠 Getting started
 
@@ -65,8 +65,7 @@ This guide will work for both **starting from scratch** and **migrating from Mis
 
 If you have access to a server that supports one of the sources below, I recommend you use it! Note that these methods *won't* allow you to migrate from Misskey without manual intervention.
 
-[![Install on Ubuntu](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png)](https://codeberg.org/calckey/ubuntu-bash-install)　　[![Install on the Arch User Repository](https://pool.jortage.com/voringme/misskey/ba2a5c07-f078-43f1-8483-2e01acca9c40.png)](https://aur.archlinux.org/packages/calckey)
-<!-- [![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) -->
+[![Install on Ubuntu](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png)](https://codeberg.org/calckey/ubuntu-bash-install)　　[![Install on the Arch User Repository](https://pool.jortage.com/voringme/misskey/ba2a5c07-f078-43f1-8483-2e01acca9c40.png)](https://aur.archlinux.org/packages/calckey)　　[![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
 
 ### 🐋 Docker
 

From 45b3e5635dd6a78ff8ad2f4147ef80e41937c63f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 19 Apr 2023 20:46:37 -0700
Subject: [PATCH 505/582] reaction settings auto reload

---
 packages/backend/src/server/index.ts            |  7 ++++---
 packages/client/src/pages/settings/reaction.vue | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 191556c40..7d274f7d2 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -37,10 +37,11 @@ export const serverLogger = new Logger("server", "gray", false);
 const app = new Koa();
 app.proxy = true;
 
-// Replace trailing slashes 
+// Replace trailing slashes
 app.use(async (ctx, next) => {
-	if (ctx.request.path !== "/" && ctx.request.path.endsWith('/')) return ctx.redirect(ctx.request.path.replace(/\/$/, ""))
-	else await next()
+	if (ctx.request.path !== "/" && ctx.request.path.endsWith("/"))
+		return ctx.redirect(ctx.request.path.replace(/\/$/, ""));
+	else await next();
 });
 
 if (!["production", "test"].includes(process.env.NODE_ENV || "")) {
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index dbe909e98..e32f6516e 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -2,7 +2,6 @@
 	<div class="_formRoot">
 		<FormSwitch v-model="enableEmojiReactions" class="_formBlock">
 			{{ i18n.ts.enableEmojiReactions }}
-			<template #caption>{{ i18n.ts.needReloadToApply }}</template>
 		</FormSwitch>
 
 		<div v-if="enableEmojiReactions">
@@ -104,6 +103,17 @@ import { defaultStore } from "@/store";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import { deepClone } from "@/scripts/clone";
+import { unisonReload } from "@/scripts/unison-reload";
+
+async function reloadAsk() {
+	const { canceled } = await os.confirm({
+		type: "info",
+		text: i18n.ts.reloadToApplySetting,
+	});
+	if (canceled) return;
+
+	unisonReload();
+}
 
 let reactions = $ref(deepClone(defaultStore.state.reactions));
 
@@ -185,6 +195,10 @@ watch(
 	}
 );
 
+watch(enableEmojiReactions, async () => {
+	await reloadAsk();
+});
+
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);

From 98d4765615eed83d896390a5c0dda5fddc7f405f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 19 Apr 2023 21:00:01 -0700
Subject: [PATCH 506/582] fix tag on explore

---
 packages/client/src/components/mfm.ts       |  6 +-
 packages/client/src/pages/explore.users.vue |  4 +-
 packages/client/src/pages/explore.vue       | 14 ----
 packages/client/src/pages/tag.vue           | 75 +++++++++++++++++++--
 4 files changed, 74 insertions(+), 25 deletions(-)

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 6f1b4256d..3ded57e1a 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -367,11 +367,7 @@ export default defineComponent({
 									MkA,
 									{
 										key: Math.random(),
-										to: this.isNote
-											? `/tags/${encodeURIComponent(token.props.hashtag)}`
-											: `/explore/tags/${encodeURIComponent(
-													token.props.hashtag,
-											  )}`,
+										to: `/tags/${encodeURIComponent(token.props.hashtag)}`,
 										style: "color:var(--hashtag);",
 									},
 									`#${token.props.hashtag}`,
diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue
index 378801532..73caf4b98 100644
--- a/packages/client/src/pages/explore.users.vue
+++ b/packages/client/src/pages/explore.users.vue
@@ -80,14 +80,14 @@
 					<MkA
 						v-for="tag in tagsLocal"
 						:key="'local:' + tag.tag"
-						:to="`/explore/tags/${tag.tag}`"
+						:to="`/tags/${tag.tag}`"
 						class="local"
 						>{{ tag.tag }}</MkA
 					>
 					<MkA
 						v-for="tag in tagsRemote"
 						:key="'remote:' + tag.tag"
-						:to="`/explore/tags/${tag.tag}`"
+						:to="`/tags/${tag.tag}`"
 						>{{ tag.tag }}</MkA
 					>
 				</div>
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 0915d6ac8..e3c6774ac 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -39,7 +39,6 @@ import { Virtual } from "swiper";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import XFeatured from "./explore.featured.vue";
 import XUsers from "./explore.users.vue";
-import type MkFolder from "@/components/MkFolder.vue";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import { deviceKind } from "@/scripts/device-kind";
 import { i18n } from "@/i18n";
@@ -47,23 +46,10 @@ import { defaultStore } from "@/store";
 import "swiper/scss";
 import "swiper/scss/virtual";
 
-const props = defineProps<{
-	tag?: string;
-}>();
-
 const tabs = ["featured", "users"];
 let tab = $ref(tabs[0]);
 watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
-let tagsEl = $ref<InstanceType<typeof MkFolder>>();
-
-watch(
-	() => props.tag,
-	() => {
-		if (tagsEl) tagsEl.toggleContent(props.tag == null);
-	}
-);
-
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => [
diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue
index 390b6a0ba..38ba1e106 100644
--- a/packages/client/src/pages/tag.vue
+++ b/packages/client/src/pages/tag.vue
@@ -1,24 +1,58 @@
 <template>
 	<MkStickyContainer>
 		<template #header
-			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
+			><MkPageHeader
+				v-model:tab="tab"
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
 		/></template>
 		<MkSpacer :content-max="800">
-			<XNotes class="_content" :pagination="pagination" />
+			<swiper
+				:modules="[Virtual]"
+				:space-between="20"
+				:virtual="true"
+				:allow-touch-move="
+					!(
+						deviceKind === 'desktop' &&
+						!defaultStore.state.swipeOnDesktop
+					)
+				"
+				@swiper="setSwiperRef"
+				@slide-change="onSlideChange"
+			>
+				<swiper-slide>
+					<XNotes ref="notes" :pagination="notesPagination" />
+				</swiper-slide>
+				<swiper-slide>
+					<XUserList
+						ref="users"
+						class="_gap"
+						:pagination="usersPagination"
+					/>
+				</swiper-slide>
+			</swiper>
 		</MkSpacer>
 	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed } from "vue";
+import { computed, watch, onMounted } from "vue";
+import { Virtual } from "swiper";
+import { Swiper, SwiperSlide } from "swiper/vue";
 import XNotes from "@/components/MkNotes.vue";
+import XUserList from "@/components/MkUserList.vue";
+import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
+import { defaultStore } from "@/store";
+import "swiper/scss";
+import "swiper/scss/virtual";
 
 const props = defineProps<{
 	tag: string;
 }>();
 
-const pagination = {
+const notesPagination = {
 	endpoint: "notes/search-by-tag" as const,
 	limit: 10,
 	params: computed(() => ({
@@ -26,10 +60,43 @@ const pagination = {
 	})),
 };
 
+const usersPagination = {
+	endpoint: "users/search" as const,
+	limit: 10,
+	params: computed(() => ({
+		query: `#${props.tag}`,
+		origin: "combined",
+	})),
+};
+
+const tabs = ["notes", "users"];
+let tab = $ref(tabs[0]);
+watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
+
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
 
+let swiperRef = null;
+
+function setSwiperRef(swiper) {
+	swiperRef = swiper;
+	syncSlide(tabs.indexOf(tab));
+}
+
+function onSlideChange() {
+	tab = tabs[swiperRef.activeIndex];
+}
+
+function syncSlide(index) {
+	swiperRef.slideTo(index);
+}
+
+onMounted(() => {
+	syncSlide(tabs.indexOf(swiperRef.activeIndex));
+});
+
+
 definePageMetadata(
 	computed(() => ({
 		title: props.tag,

From 5c0af1fda5a69e8cfa0a41d5f715443a1b885f1a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 19 Apr 2023 21:02:12 -0700
Subject: [PATCH 507/582] why was the order reversed?

---
 packages/client/src/pages/explore.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index e3c6774ac..fbdbd85fe 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -46,7 +46,7 @@ import { defaultStore } from "@/store";
 import "swiper/scss";
 import "swiper/scss/virtual";
 
-const tabs = ["featured", "users"];
+const tabs = ["users", "featured"];
 let tab = $ref(tabs[0]);
 watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 

From 67d6c7408737b0bcfe74dd38416370dd0f769b2e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 19 Apr 2023 21:05:41 -0700
Subject: [PATCH 508/582] fix header tabs

---
 packages/client/src/pages/tag.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue
index 38ba1e106..9fe0745e4 100644
--- a/packages/client/src/pages/tag.vue
+++ b/packages/client/src/pages/tag.vue
@@ -75,8 +75,18 @@ watch($$(tab), () => syncSlide(tabs.indexOf(tab)));
 
 const headerActions = $computed(() => []);
 
-const headerTabs = $computed(() => []);
-
+const headerTabs = $computed(() => [
+	{
+		key: "notes",
+		icon: "ph-note ph-bold ph-lg",
+		title: i18n.ts.notes,
+	},
+	{
+		key: "users",
+		icon: "ph-users ph-bold ph-lg",
+		title: i18n.ts.users,
+	},
+]);
 let swiperRef = null;
 
 function setSwiperRef(swiper) {

From 05de2f8a8262fd1791f2ae9f5216c6651222e2c6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 19 Apr 2023 21:06:05 -0700
Subject: [PATCH 509/582] chore: formatting

---
 packages/client/src/pages/tag.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue
index 9fe0745e4..600f27efb 100644
--- a/packages/client/src/pages/tag.vue
+++ b/packages/client/src/pages/tag.vue
@@ -87,6 +87,7 @@ const headerTabs = $computed(() => [
 		title: i18n.ts.users,
 	},
 ]);
+
 let swiperRef = null;
 
 function setSwiperRef(swiper) {
@@ -106,7 +107,6 @@ onMounted(() => {
 	syncSlide(tabs.indexOf(swiperRef.activeIndex));
 });
 
-
 definePageMetadata(
 	computed(() => ({
 		title: props.tag,

From dbc25ce574d37718c954b9fce9f82dffa9e37512 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 19 Apr 2023 21:26:49 -0700
Subject: [PATCH 510/582] email styling

---
 packages/backend/src/services/send-email.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/services/send-email.ts b/packages/backend/src/services/send-email.ts
index 87a0d5e33..4c442a168 100644
--- a/packages/backend/src/services/send-email.ts
+++ b/packages/backend/src/services/send-email.ts
@@ -39,14 +39,14 @@ export async function sendEmail(
 			to: to,
 			subject: subject,
 			text: text,
-			html: `<!doctype html>
+			html: `<!DOCTYPE html>
 <html>
 	<head>
 		<meta charset="utf-8">
 		<title>${subject}</title>
 		<style>
 			html {
-				background: #eee;
+				background: #191724;
 			}
 
 			body {
@@ -67,17 +67,19 @@ export async function sendEmail(
 			main {
 				max-width: 500px;
 				margin: 0 auto;
-				background: #e0def4;
-				color: #6e6a86;
+				background: #1f1d2e;
+				color: #e0def4;
 			}
 				main > header {
 					padding: 32px;
 					background: #31748f;
+					display: flex;
 				}
 					main > header > img {
 						max-width: 128px;
-						max-height: 28px;
+						max-height: 72px;
 						vertical-align: bottom;
+						margin-right: 16px;
 					}
 				main > article {
 					padding: 32px;
@@ -87,7 +89,7 @@ export async function sendEmail(
 					}
 				main > footer {
 					padding: 32px;
-					border-top: solid 1px #eee;
+					border-top: solid 1px #26233a;
 				}
 
 			nav {
@@ -97,14 +99,15 @@ export async function sendEmail(
 				padding: 0 32px;
 			}
 				nav > a {
-					color: #888;
+					color: #6e6a86;
 				}
 		</style>
 	</head>
 	<body>
 		<main>
 			<header>
-				<img src="${meta.logoImageUrl || meta.iconUrl || iconUrl}"/>
+				<img src="${meta.logoImageUrl || meta.iconUrl || iconUrl}" height="100"/>
+				<h1>${meta.name}</h1>
 			</header>
 			<article>
 				<h1>${subject}</h1>

From f1fa00f962939d6d26a97749a36052d69e19020a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 19 Apr 2023 21:28:43 -0700
Subject: [PATCH 511/582] chore: update summaly

---
 packages/backend/package.json |  2 +-
 pnpm-lock.yaml                | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 97e86cd26..4ac0d82f0 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -115,7 +115,7 @@
 		"sonic-channel": "^1.3.1",
 		"speakeasy": "2.0.0",
 		"stringz": "2.1.0",
-		"summaly": "2.7.0",
+		"summaly": "github:misskey-dev/summaly",
 		"syslog-pro": "1.0.0",
 		"systeminformation": "5.16.9",
 		"tesseract.js": "^3.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7e62b9ef3..3281a713b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -236,9 +236,6 @@ importers:
       koa-mount:
         specifier: 4.0.0
         version: 4.0.0
-      koa-remove-trailing-slashes:
-        specifier: 2.0.3
-        version: 2.0.3
       koa-send:
         specifier: 5.0.1
         version: 5.0.1
@@ -351,7 +348,7 @@ importers:
         specifier: 2.1.0
         version: 2.1.0
       summaly:
-        specifier: 2.7.0
+        specifier: github:misskey-dev/summaly
         version: 2.7.0
       syslog-pro:
         specifier: 1.0.0
@@ -5091,7 +5088,7 @@ packages:
     dependencies:
       clone-response: 1.0.3
       get-stream: 5.2.0
-      http-cache-semantics: 4.1.0
+      http-cache-semantics: 4.1.1
       keyv: 4.5.2
       lowercase-keys: 2.0.0
       normalize-url: 6.1.0
@@ -8230,6 +8227,10 @@ packages:
 
   /http-cache-semantics@4.1.0:
     resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==}
+    dev: false
+
+  /http-cache-semantics@4.1.1:
+    resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
 
   /http-errors@1.6.3:
     resolution: {integrity: sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==}
@@ -9861,10 +9862,6 @@ packages:
       - supports-color
     dev: false
 
-  /koa-remove-trailing-slashes@2.0.3:
-    resolution: {integrity: sha512-NFFF9Sl1wxFo5h0I3OzrHDINdFPaqG+Hx19590F7PNOcmm7yYeFW71p4XicVuSovbcx75GWGb3fi6N6kI6E/3g==}
-    dev: false
-
   /koa-router@10.1.1:
     resolution: {integrity: sha512-z/OzxVjf5NyuNO3t9nJpx7e1oR3FSBAauiwXtMQu4ppcnuNZzTaQ4p21P8A6r2Es8uJJM339oc4oVW+qX7SqnQ==}
     engines: {node: '>= 8.0.0'}
@@ -10358,7 +10355,7 @@ packages:
     dependencies:
       agentkeepalive: 4.2.1
       cacache: 16.1.3
-      http-cache-semantics: 4.1.0
+      http-cache-semantics: 4.1.1
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
       is-lambda: 1.0.1

From def5075bb54b292ae4e5ef13e82ea374e3be52f9 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Thu, 20 Apr 2023 07:57:36 +0000
Subject: [PATCH 512/582] feat: make it toggleable whether to disable emojis in
 notifications (#9880)

I talked about feature #9865 on my fedi account and received a comment like, "I don't care about emoji reactions in my timelines, but I do care what reactions I get!"

Adding too many options is bad, but I agreed that making it toggleable whether to disable emojis in notifications is helpful, so I added this feature. This allows you to check emoji reactions to your posts in notifications while using the simple UI. I'd say this provides an experience that neither Mastodon nor Misskey has.

The new setting item shows up only when you disable emoji reactions.

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9880
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 locales/en-US.yml                                     |  1 +
 locales/ja-JP.yml                                     |  1 +
 locales/zh-CN.yml                                     |  1 +
 locales/zh-TW.yml                                     |  1 +
 packages/client/src/components/MkNotification.vue     |  9 +++++----
 .../client/src/pages/settings/preferences-backups.vue |  1 +
 packages/client/src/pages/settings/reaction.vue       | 11 +++++++++++
 packages/client/src/store.ts                          |  4 ++++
 8 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 60e7c7740..e71368ed2 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -115,6 +115,7 @@ sensitive: "NSFW"
 add: "Add"
 reaction: "Reactions"
 enableEmojiReactions: "Enable emoji reactions"
+showEmojisInReactionNotifications: "Show emojis in reaction notifications"
 reactionSetting: "Reactions to show in the reaction picker"
 reactionSettingDescription2: "Drag to reorder, click to delete, press \"+\" to add."
 rememberNoteVisibility: "Remember post visibility settings"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 9fbf71288..d998097af 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -110,6 +110,7 @@ sensitive: "閲覧注意"
 add: "追加"
 reaction: "リアクション"
 enableEmojiReactions: "絵文字リアクションを有効にする"
+showEmojisInReactionNotifications: "自分の投稿に対するリアクションの通知で絵文字を表示する"
 reactionSetting: "ピッカーに表示するリアクション"
 reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
 rememberNoteVisibility: "公開範囲を記憶する"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index fc507b8e0..c652b52b7 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -108,6 +108,7 @@ sensitive: "敏感内容"
 add: "添加"
 reaction: "回应"
 enableEmojiReaction: "启用表情符号回应"
+showEmojisInReactionNotifications: "在回应通知中显示表情符号"
 reactionSetting: "在选择器中显示的回应"
 reactionSettingDescription2: "拖动重新排序，单击删除，点击 + 添加。"
 rememberNoteVisibility: "保存上次设置的可见性"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index c46452e88..d940838dc 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -108,6 +108,7 @@ sensitive: "敏感內容"
 add: "新增"
 reaction: "情感"
 enableEmojiReaction: "啟用表情符號反應"
+showEmojisInReactionNotifications: "在反應通知中顯示表情符號"
 reactionSetting: "在選擇器中顯示反應"
 reactionSettingDescription2: "拖動以重新列序，點擊以刪除，按下 + 添加。"
 rememberNoteVisibility: "記住貼文可見性"
diff --git a/packages/client/src/components/MkNotification.vue b/packages/client/src/components/MkNotification.vue
index 841a0fc99..c909873a5 100644
--- a/packages/client/src/components/MkNotification.vue
+++ b/packages/client/src/components/MkNotification.vue
@@ -66,8 +66,7 @@
 				<!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
 				<XReactionIcon
 					v-else-if="
-						notification.type === 'reaction' &&
-						defaultStore.state.enableEmojiReactions
+						showEmojiReactions && notification.type === 'reaction'
 					"
 					ref="reactionRef"
 					:reaction="
@@ -83,8 +82,7 @@
 				/>
 				<XReactionIcon
 					v-else-if="
-						notification.type === 'reaction' &&
-						!defaultStore.state.enableEmojiReactions
+						!showEmojiReactions && notification.type === 'reaction'
 					"
 					:reaction="defaultReaction"
 					:no-style="true"
@@ -301,6 +299,9 @@ const props = withDefaults(
 const elRef = ref<HTMLElement>(null);
 const reactionRef = ref(null);
 
+const showEmojiReactions =
+	defaultStore.state.enableEmojiReactions ||
+	defaultStore.state.showEmojisInReactionNotifications;
 const defaultReaction = ["⭐", "👍", "❤️"].includes(instance.defaultReaction)
 	? instance.defaultReaction
 	: "⭐";
diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index 3b45fa796..81f68fad1 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -115,6 +115,7 @@ const defaultStoreSaveKeys: (keyof (typeof defaultStore)["state"])[] = [
 	"showAdminUpdates",
 	"enableCustomKaTeXMacro",
 	"enableEmojiReactions",
+	"showEmojisInReactionNotifications",
 ];
 const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [
 	"lightTheme",
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index e32f6516e..d8578a6f7 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -86,6 +86,14 @@
 				</div>
 			</FormSection>
 		</div>
+		<div v-else>
+			<FormSwitch
+				v-model="showEmojisInReactionNotifications"
+				class="_formBlock"
+			>
+				{{ i18n.ts.showEmojisInReactionNotifications }}
+			</FormSwitch>
+		</div>
 	</div>
 </template>
 
@@ -132,6 +140,9 @@ const reactionPickerUseDrawerForMobile = $computed(
 const enableEmojiReactions = $computed(
 	defaultStore.makeGetterSetter("enableEmojiReactions")
 );
+const showEmojisInReactionNotifications = $computed(
+	defaultStore.makeGetterSetter("showEmojisInReactionNotifications")
+);
 
 function save() {
 	defaultStore.set("reactions", reactions);
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 4cb28b000..b4e10d275 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -298,6 +298,10 @@ export const defaultStore = markRaw(
 			where: "account",
 			default: true,
 		},
+		showEmojisInReactionNotifications: {
+			where: "account",
+			default: true,
+		},
 	}),
 );
 

From 36b88c7286a77e1a74b2691fc90168fee551a0e0 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Fri, 21 Apr 2023 01:50:47 +0000
Subject: [PATCH 513/582] security: validate image url (#9882)

It looks like url validations are added in https://codeberg.org/calckey/calckey/commit/f7564d87b0b8ad50d6ba462feeac9e96725c71e1, but I found another validation commit not applied in Calckey, so I cherry-picked https://github.com/misskey-dev/misskey/commit/0da0cc80b94c1a8032b79e0a345378557019ff19 from [Misskey](https://github.com/misskey-dev/misskey).

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9882
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 packages/backend/src/remote/activitypub/models/image.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/backend/src/remote/activitypub/models/image.ts b/packages/backend/src/remote/activitypub/models/image.ts
index 415f7c400..211aa3931 100644
--- a/packages/backend/src/remote/activitypub/models/image.ts
+++ b/packages/backend/src/remote/activitypub/models/image.ts
@@ -29,6 +29,10 @@ export async function createImage(
 		throw new Error("invalid image: url not privided");
 	}
 
+	if (!image.url.startsWith("https://") && !image.url.startsWith("http://")) {
+		throw new Error("invalid image: unexpected shcema of url: " + image.url);
+	}
+
 	logger.info(`Creating the Image: ${image.url}`);
 
 	const instance = await fetchMeta();

From c0b20bf11542271163f403d3cce6a0cf1d2ae23d Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 20 Apr 2023 13:12:10 +0000
Subject: [PATCH 514/582] chore: Translated using Weblate (Japanese)

Currently translated at 100.0% (1726 of 1726 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ja/
---
 locales/ja-JP.yml | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index d998097af..85f19c79c 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1,7 +1,7 @@
----
 _lang_: "日本語"
-headlineMisskey: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム🚀"
-introMisskey: "ようこそ！Calckeyは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しましょう📡\n「リアクション」機能で、皆の投稿に素早く反応を追加できます👍\n新しい世界を探検しよう🚀"
+headlineMisskey: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム\U0001F680"
+introMisskey: "ようこそ！Calckeyは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しましょう\U0001F4E1\
+  \n「リアクション」機能で、皆の投稿に素早く反応を追加できます\U0001F44D\n新しい世界を探検しよう\U0001F680"
 monthAndDay: "{month}月 {day}日"
 search: "検索"
 notifications: "通知"
@@ -67,7 +67,7 @@ export: "エクスポート"
 files: "ファイル"
 download: "ダウンロード"
 driveFileDeleteConfirm: "ファイル「{name}」を削除しますか？このファイルを添付した投稿も消えます。"
-unfollowConfirm: "{name}のフォローを解除しますか？"
+unfollowConfirm: "{name}さんのフォローを解除しますか？"
 exportRequested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、「ドライブ」に追加されます。"
 importRequested: "インポートをリクエストしました。これには時間がかかる場合があります。"
 lists: "リスト"
@@ -127,7 +127,7 @@ unblock: "ブロック解除"
 suspend: "凍結"
 unsuspend: "解凍"
 blockConfirm: "ブロックしますか？"
-unblockConfirm: "ブロック解除しますか？"
+unblockConfirm: "ブロックを解除しますか？"
 suspendConfirm: "凍結しますか？"
 unsuspendConfirm: "解凍しますか？"
 selectList: "リストを選択"
@@ -146,7 +146,7 @@ cacheRemoteFiles: "リモートのファイルをキャッシュする"
 cacheRemoteFilesDescription: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクします。サーバーのストレージを節約できますが、サムネイルが生成されないので通信量が増加します。"
 flagAsBot: "Botとして設定"
 flagAsBotDescription: "このアカウントがBotである場合は、この設定をオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Calckeyのシステム上での扱いがBotに合ったものになります。"
-flagAsCat: "あなたは…猫？😺"
+flagAsCat: "あなたは…猫？\U0001F63A"
 flagAsCatDescription: "このアカウントが猫であることを示す猫モードを有効にするには、このフラグをオンにします。"
 flagSpeakAsCat: "猫語で話す"
 flagSpeakAsCatDescription: "猫モードが有効の場合にオンにすると、あなたの投稿の「な」を「にゃ」に変換します。"
@@ -382,7 +382,7 @@ withFiles: "ファイル付き"
 silence: "サイレンス"
 silenceConfirm: "サイレンスしますか？"
 unsilence: "サイレンス解除"
-unsilenceConfirm: "サイレンス解除しますか？"
+unsilenceConfirm: "サイレンスを解除しますか？"
 popularUsers: "人気のユーザー"
 recentlyUpdatedUsers: "最近投稿したユーザー"
 recentlyRegisteredUsers: "最近登録したユーザー"
@@ -498,7 +498,8 @@ showFeaturedNotesInTimeline: "タイムラインにおすすめの投稿を表
 objectStorage: "オブジェクトストレージ"
 useObjectStorage: "オブジェクトストレージを使用"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "参照に使用するURL。CDNやProxyを使用している場合はそのURL、S3: 'https://<bucket>.s3.amazonaws.com'、GCS等: 'https://storage.googleapis.com/<bucket>'。"
+objectStorageBaseUrlDesc: "参照に使用するURL。CDNやProxyを使用している場合はそのURL、S3: 'https://<bucket>.s3.amazonaws.com'、GCS等:\
+  \ 'https://storage.googleapis.com/<bucket>'。"
 objectStorageBucket: "Bucket"
 objectStorageBucketDesc: "使用サービスのbucket名を指定してください。"
 objectStoragePrefix: "Prefix"
@@ -701,7 +702,7 @@ experimentalFeatures: "実験的機能"
 developer: "開発者"
 makeExplorable: "アカウントを見つけやすくする"
 makeExplorableDescription: "オフにすると、「みつける」にアカウントが載らなくなります。"
-showGapBetweenNotesInTimeline: "タイムラインの投稿を離して表示"
+showGapBetweenNotesInTimeline: "タイムラインの投稿を離して表示する"
 duplicate: "複製"
 left: "左"
 center: "中央"
@@ -750,7 +751,7 @@ showingPastTimeline: "過去のタイムラインを表示しています"
 clear: "クリア"
 markAllAsRead: "全て既読にする"
 goBack: "戻る"
-unlikeConfirm: "いいね解除しますか？"
+unlikeConfirm: "いいねを解除しますか？"
 fullView: "フルビュー"
 quitFullView: "フルビュー解除"
 addDescription: "説明を追加"
@@ -829,7 +830,7 @@ lastCommunication: "直近の通信"
 resolved: "解決済み"
 unresolved: "未解決"
 breakFollow: "フォロワーを解除"
-breakFollowConfirm: "フォロワー解除しますか？"
+breakFollowConfirm: "フォロワーから削除しますか？"
 itsOn: "オンになっています"
 itsOff: "オフになっています"
 emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする"
@@ -932,7 +933,8 @@ adminCustomCssWarn: "この設定は、それが何をするものであるか
 customMOTD: "カスタムMOTD(スプラッシュスクリーンメッセージ)"
 customMOTDDescription: "ユーザがページをロード/リロードするたびにランダムに表示される、改行で区切られたMOTD(スプラッシュスクリーン)用のカスタムメッセージ"
 customSplashIcons: "カスタムスプラッシュスクリーンアイコン"
-customSplashIconsDescription: "ユーザがページをロード/リロードするたびにランダムに表示される、改行で区切られたカスタムスプラッシュスクリーンアイコンの URL。画像は静的なURLで、できればすべて192x192にリサイズしてください。"
+customSplashIconsDescription: "ユーザがページをロード/リロードするたびにランダムに表示される、改行で区切られたカスタムスプラッシュスクリーンアイコンの\
+  \ URL。画像は静的なURLで、できればすべて192x192にリサイズしてください。"
 showUpdates: "Calckeyの更新時にポップアップを表示する"
 recommendedInstances: "おすすめインスタンス"
 recommendedInstancesDescription: "おすすめタイムラインに表示される、改行で区切られたインスタンス。`https://`を追加しないでください。ドメインのみを追加してください。"
@@ -951,14 +953,17 @@ moveAccountDescription: "この操作は取り消せません。まずは引っ
 moveFrom: "別のアカウントからこのアカウントに引っ越す"
 moveFromLabel: "引っ越し元のアカウント："
 moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。必ず引っ越しを実行する前に作成してください！引っ越し元のアカウントをこのように入力してください：@person@instance.com"
-migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用できなくなります。\nまた、引っ越し先のアカウントでエイリアスを作成したことを確認してください。"
+migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用できなくなります。\n\
+  また、引っ越し先のアカウントでエイリアスを作成したことを確認してください。"
 defaultReaction: "リモートとローカルの投稿に対するデフォルトの絵文字リアクション"
 license: "ライセンス"
 indexPosts: "投稿をインデックス"
 indexFrom: "この投稿ID以降をインデックスする（空白で全ての投稿を指定します）"
 indexNotice: "インデックスを開始しました。完了まで時間がかかる場合があるため、少なくとも1時間はサーバーを再起動しないでください。"
 customKaTeXMacro: "カスタムKaTeXマクロ"
-customKaTeXMacroDescription: "数式入力を楽にするためのマクロを設定しましょう！記法はLaTeXにおけるコマンドの定義と同様に \\newcommand{\\name}{content} または \\newcommand{\\add}[2]{#1 + #2} のように記述します。後者の例では \\add{3}{foo} が 3 + foo に展開されます。また、マクロの名前を囲む波括弧を丸括弧 () および角括弧 [] に変更した場合、マクロの引数に使用する括弧が変更されます。マクロの定義は一行に一つのみで、途中で改行はできません。マクロの定義が無効な行は無視されます。文字列を単純に置換する機能のみに対応していて、条件分岐などの高度な構文は使用できません。"
+customKaTeXMacroDescription: "数式入力を楽にするためのマクロを設定しましょう！記法はLaTeXにおけるコマンドの定義と同様に \\newcommand{\\\
+  name}{content} または \\newcommand{\\add}[2]{#1 + #2} のように記述します。後者の例では \\add{3}{foo}\
+  \ が 3 + foo に展開されます。また、マクロの名前を囲む波括弧を丸括弧 () および角括弧 [] に変更した場合、マクロの引数に使用する括弧が変更されます。マクロの定義は一行に一つのみで、途中で改行はできません。マクロの定義が無効な行は無視されます。文字列を単純に置換する機能のみに対応していて、条件分岐などの高度な構文は使用できません。"
 enableCustomKaTeXMacro: "カスタムKaTeXマクロを有効にする"
 
 _sensitiveMediaDetection:
@@ -1042,7 +1047,7 @@ _aboutMisskey:
   source: "ソースコード"
   translation: "Calckeyを翻訳"
   donate: "Calckeyに寄付"
-  morePatrons: "他にも多くの方が支援してくれています。ありがとうございます！ 🥰"
+  morePatrons: "他にも多くの方が支援してくれています。ありがとうございます！ \U0001F970"
   patrons: "支援者"
 _nsfw:
   respect: "閲覧注意のメディアは隠す"
@@ -1259,7 +1264,8 @@ _tutorial:
   step2_1: "最初に、あなたのプロフィールを作りましょう。"
   step2_2: "プロフィールを設定することで、他の人があなたの投稿を見たり、フォローしたりするときの助けになります。"
   step3_1: "それでは、何人かフォローしてみましょう！"
-  step3_2: "あなたのホームとソーシャルタイムラインは、あなたが誰をフォローしているかで決まります。まずは、いくつかのアカウントをフォローしてみましょう。\nプロフィールの右上にある丸い＋ボタンをクリックするとフォローできます。"
+  step3_2: "あなたのホームとソーシャルタイムラインは、あなたが誰をフォローしているかで決まります。まずは、いくつかのアカウントをフォローしてみましょう。\n\
+    プロフィールの右上にある丸い＋ボタンをクリックするとフォローできます。"
   step4_1: "投稿してみましょう！"
   step4_2: "最初は{introduction}に投稿したり、シンプルに「こんにちは、アカウント作ってみました！」などの投稿をする人もいます。"
   step5_1: "タイムライン、タイムラインだらけ！"
@@ -1837,3 +1843,6 @@ _apps:
   mona: "Mona"
   theDesk: "TheDesk"
   lesskey: "Lesskey"
+noteId: 投稿のID
+hiddenTagsDescription: 'トレンドと「みつける」から除外したいハッシュタグを（先頭の # を除いて）改行区切りで入力してください。この設定はトレンドと「みつける」以外には影響しません。'
+hiddenTags: 非表示にするハッシュタグ

From 18b524e34d487c789d3a855b2100282d64f0aa19 Mon Sep 17 00:00:00 2001
From: Jeder <jeder@jeder.pl>
Date: Thu, 20 Apr 2023 23:06:20 +0000
Subject: [PATCH 515/582] chore: Translated using Weblate (Polish)

Currently translated at 100.0% (1726 of 1726 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/pl/
---
 locales/pl-PL.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index f8583fcc0..1c7b675c5 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1924,7 +1924,7 @@ objectStorageBaseUrlDesc: "URL stosowany jako odniesienie. Podaj URL twojego CDN
   \ itd."
 sendErrorReportsDescription: "Gdy ta opcja jest włączona, szczegółowe informacje o\
   \ błędach będą udostępnianie z Calckey gdy wystąpi problem, pomagając w ulepszaniu\
-  \ Misskey.\nZawrze to informacje takie jak wersja twojego systemu operacyjnego,\
+  \ Calckey.\nZawrze to informacje takie jak wersja twojego systemu operacyjnego,\
   \ przeglądarki, Twoja aktywność na Calckey itd."
 privateModeInfo: Jeśli włączone, tylko dopuszczone instancje będą mogły federować
   z Twoją instancją. Wszystkie posty będą ukryte przed publiką.
@@ -1980,14 +1980,14 @@ showAdminUpdates: Wskaż, że jest dostępna nowa wersja Calckey (tylko dla admi
 hiddenTags: Ukryte hashtagi
 userSaysSomethingReason: '{name} powiedział* {reason}'
 customKaTeXMacroDescription: 'Skonfiguruj makra, aby łatwo pisać wyrażenia matematyczne!
-  Notacja jest zgodna z definicjami poleceń LaTeXa i zapisywana jest jako \newcommand{\nazwa}[numer
-  argumentów]{treść}. Na przykład, \newcommand{\add}[2]{#1 + #2} rozszerzy \add{3}{foo}
-  do 3 + foo. Nawiasy klamrowe otaczające nazwę makra mogą być zmienione na nawiasy
-  okrągłe lub kwadratowe. Wpłynie to na nawiasy używane dla argumentów. W każdym wierszu
-  można zdefiniować jedno (i tylko jedno) makro i nie można przerwać linii w środku
-  definicji. Nieprawidłowe linie są po prostu ignorowane. Obsługiwane są tylko proste
-  funkcje podstawiania łańcuchów; nie można tu stosować zaawansowanej składni, takiej
-  jak warunkowe rozgałęzienia.'
+  Notacja jest zgodna z definicjami poleceń LaTeXa i zapisywana jest jako \newcommand{\nazwa}{treść}
+  lub \newcommand{\nazwa}[numer argumentów]{treść}. Na przykład, \newcommand{\add}[2]{#1
+  + #2} rozszerzy \add{3}{foo} do 3 + foo. Nawiasy klamrowe otaczające nazwę makra
+  mogą być zmienione na nawiasy okrągłe lub kwadratowe. Wpłynie to na nawiasy używane
+  dla argumentów. W każdym wierszu można zdefiniować jedno (i tylko jedno) makro i
+  nie można przerwać linii w środku definicji. Nieprawidłowe linie są po prostu ignorowane.
+  Obsługiwane są tylko proste funkcje podstawiania łańcuchów; nie można tu stosować
+  zaawansowanej składni, takiej jak warunkowe rozgałęzienia.'
 secureModeInfo: Nie odsyłaj bez dowodu przy żądaniu z innych instancji.
 preferencesBackups: Kopie zapasowe ustawień
 undeck: Opuść tablicę
@@ -1997,3 +1997,5 @@ lastCommunication: Ostatnie połączenie
 emailRequiredForSignup: Wymagaj adresu email przy rejestracji
 themeColor: Kolor znacznika instancji
 instanceDefaultLightTheme: Domyślny jasny motyw instancji
+enableEmojiReactions: Włącz reakcje emoji
+showEmojisInReactionNotifications: Pokazuj emoji w powiadomieniach reakcyjnych

From ee5ed3790534ff24c053f8c47718903c8d022fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D0=B1=D0=B5=D1=80=20=D0=BE=D0=B3=D1=83=D1=80?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BA?= <abrew1330@gmail.com>
Date: Thu, 20 Apr 2023 16:08:46 +0000
Subject: [PATCH 516/582] chore: Translated using Weblate (Russian)

Currently translated at 95.0% (1640 of 1726 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ru/
---
 locales/ru-RU.yml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index a77695929..23843292e 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -922,6 +922,15 @@ _sensitiveMediaDetection:
   description: "Машинное обучение может быть использовано для автоматического обнаружения\
     \ чувствительных медиа для модерации. Нагрузка на сервер увеличивается незначительно."
   setSensitiveFlagAutomatically: "Установить флаг NSFW"
+  sensitivity: Чувствительность обнаружения
+  sensitivityDescription: Снижение чувствительности приведет к меньшему количеству
+    ошибочных обнаружений (ложноположительных результатов), в то время как ее увеличение
+    приведет к меньшему количеству пропущенных обнаружений (ложноотрицательных результатов).
+  setSensitiveFlagAutomaticallyDescription: Результаты внутреннего обнаружения будут
+    сохранены, даже если эта опция отключена.
+  analyzeVideos: Включить анализ видео
+  analyzeVideosDescription: Анализирует видео в дополнение к изображениям. Это немного
+    увеличит нагрузку на сервер.
 _emailUnavailable:
   used: "Уже используется"
   format: "Неверный формат"
@@ -1739,6 +1748,7 @@ _notification:
   _actions:
     reply: "Ответить"
     renote: "Репост"
+  emptyPushNotificationMessage: Пуш уведомления были обновлены
 _deck:
   alwaysShowMainColumn: "Всегда показывать главную колонку"
   columnAlign: "Выравнивание колонок"
@@ -1864,3 +1874,25 @@ adminCustomCssWarn: Этот параметр следует использов
   работает должным образом, протестировав его в настройках вашего пользователя.
 showUpdates: Показывать всплывающее окно при обновлении Calckey
 recommendedInstances: Рекомендованные инстансы
+defaultReaction: Эмодзи реакция по умолчанию для выходящих и исходящих постов
+license: Лицензия
+indexPosts: Индексировать посты
+indexFrom: Индексировать начиная с идентификатора поста и далее (оставьте пустым для
+  индексации каждого поста)
+indexNotice: Теперь индексирование. Вероятно, это займет некоторое время, пожалуйста,
+  не перезагружайте свой сервер по крайней мере в течение часа.
+customKaTeXMacro: Кастомные KaTex макросы
+enableCustomKaTeXMacro: Включить кастомные KaTeX макросы
+noteId: Идентификатор поста
+_preferencesBackups:
+  inputName: Введите имя для этой резервной копии
+  list: Созданные резервные копии
+  loadFile: Загрузить из файла
+  apply: Применить для этого устройства
+  save: Сохранить изменения
+  saveNew: Сохранить новую резервную копию
+enableEmojiReactions: Включить эмодзи реакции
+_apps:
+  paid: Платные
+  lesskey: Lesskey
+  pwa: Установить PWA

From 18eb3b22898bb6737b3592879a1864a9ff4a06f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D0=B1=D0=B5=D1=80=20=D0=BE=D0=B3=D1=83=D1=80?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BA?= <abrew1330@gmail.com>
Date: Sat, 22 Apr 2023 13:49:48 +0000
Subject: [PATCH 517/582] chore: Translated using Weblate (Russian)

Currently translated at 95.2% (1644 of 1726 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ru/
---
 locales/ru-RU.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 23843292e..e0d1d9960 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -1896,3 +1896,7 @@ _apps:
   paid: Платные
   lesskey: Lesskey
   pwa: Установить PWA
+  free: Бесплатные
+  apps: Приложения
+  crossPlatform: Кроссплатформенные
+  mobile: Мобильные

From 60bd7eaf447231f028af3db488014dc8df907ecf Mon Sep 17 00:00:00 2001
From: tinaxd <31384595+tinaxd@users.noreply.github.com>
Date: Sat, 22 Apr 2023 17:18:57 +0900
Subject: [PATCH 518/582] =?UTF-8?q?fix:=20=E3=83=89=E3=83=A9=E3=82=A4?=
 =?UTF-8?q?=E3=83=96=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=81=A7413=E3=81=8C=E8=BF=94=E3=81=A3=E3=81=A6=E3=81=8D?=
 =?UTF-8?q?=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E3=82=A8=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=82=92=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=20(#10680)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/en-US.yml                     | 1 +
 locales/ja-JP.yml                     | 1 +
 packages/client/src/scripts/upload.ts | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index e71368ed2..5ee1feb4b 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -983,6 +983,7 @@ failedToUpload: "Upload failed"
 cannotUploadBecauseInappropriate: "This file could not be uploaded because parts of\
   \ it have been detected as potentially NSFW."
 cannotUploadBecauseNoFreeSpace: "Upload failed due to lack of Drive capacity."
+cannotUploadBecauseExceedsFileSizeLimit: "This file could not be uploaded because it exceeds the maximum allowed size."
 beta: "Beta"
 enableAutoSensitive: "Automatic NSFW-Marking"
 enableAutoSensitiveDescription: "Allows automatic detection and marking of NSFW media\
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 85f19c79c..466212ba2 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -913,6 +913,7 @@ remoteOnly: "リモートのみ"
 failedToUpload: "アップロード失敗"
 cannotUploadBecauseInappropriate: "不適切な内容を含む可能性があると判定されたためアップロードできません。"
 cannotUploadBecauseNoFreeSpace: "ドライブの空き容量が無いためアップロードできません。"
+cannotUploadBecauseExceedsFileSizeLimit: "ファイルサイズの制限を超えているためアップロードできません。"
 beta: "ベータ"
 enableAutoSensitive: "自動NSFW判定"
 enableAutoSensitiveDescription: "利用可能な場合は、機械学習を利用して自動でメディアにNSFWフラグを設定します。この機能をオフにしても、インスタンスによっては自動で設定されることがあります。"
diff --git a/packages/client/src/scripts/upload.ts b/packages/client/src/scripts/upload.ts
index d914717f6..1baa6c7e7 100644
--- a/packages/client/src/scripts/upload.ts
+++ b/packages/client/src/scripts/upload.ts
@@ -94,7 +94,13 @@ export function uploadFile(
 					// TODO: 消すのではなくて(ネットワーク的なエラーなら)再送できるようにしたい
 					uploads.value = uploads.value.filter((x) => x.id !== id);
 
-					if (ev.target?.response) {
+					if (xhr.status === 413) {
+						alert({
+							type: 'error',
+							title: i18n.ts.failedToUpload,
+							text: i18n.ts.cannotUploadBecauseExceedsFileSizeLimit,
+						});
+					} else if (ev.target?.response) {
 						const res = JSON.parse(ev.target.response);
 						if (res.error?.id === "bec5bd69-fba3-43c9-b4fb-2894b66ad5d2") {
 							alert({

From f97123f52dc4e1b990994318f855bab6c7590fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D0=B1=D0=B5=D1=80=20=D0=BE=D0=B3=D1=83=D1=80?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BA?= <abrew1330@gmail.com>
Date: Sat, 22 Apr 2023 13:55:09 +0000
Subject: [PATCH 519/582] chore: Translated using Weblate (Russian)

Currently translated at 100.0% (1726 of 1726 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ru/
---
 locales/ru-RU.yml | 153 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 125 insertions(+), 28 deletions(-)

diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index e0d1d9960..c9303490b 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -1,9 +1,7 @@
 _lang_: "Русский"
 headlineMisskey: "Сеть, сплетённая из заметок"
-introMisskey: "Добро пожаловать! Misskey — это децентрализованный сервис микроблогов\
-  \ с открытым исходным кодом.\nПишите «заметки» — делитесь со всеми происходящим\
-  \ вокруг или рассказывайте о себе \U0001F4E1\nСтавьте «реакции» — выражайте свои\
-  \ чувства и эмоции от заметок других \U0001F44D\nОткройте для себя новый мир \U0001F680"
+introMisskey: "Calckey - это децентрализованная платформа социальных сетей с открытым\
+  \ исходным кодом, которая свободна навсегда! \U0001F680"
 monthAndDay: "{day}.{month}"
 search: "Поиск"
 notifications: "Уведомления"
@@ -25,7 +23,7 @@ otherSettings: "Прочие настройки"
 openInWindow: "Открывать в плавающих окнах"
 profile: "Профиль"
 timeline: "Лента"
-noAccountDescription: "Пользователь ничего не написал про себя"
+noAccountDescription: "Пользователь ничего не написал про себя."
 login: "Войти"
 loggingIn: "Выполняется вход"
 logout: "Выйти"
@@ -46,8 +44,8 @@ copyContent: "Скопировать содержимое"
 copyLink: "Скопировать ссылку"
 delete: "Удалить"
 deleteAndEdit: "Удалить и отредактировать"
-deleteAndEditConfirm: "Удалить эту заметку и создать отредактированную? Все реакции,\
-  \ ссылки и ответы на существующую будут будут потеряны."
+deleteAndEditConfirm: "Удалить этот пост и создать отредактированный? Все реакции,\
+  \ ссылки и ответы на существующий будут потеряны."
 addToList: "Добавить в список"
 sendMessage: "Отправить сообщение"
 copyUsername: "Скопировать имя пользователя"
@@ -84,7 +82,7 @@ manageLists: "Управление списками"
 error: "Ошибка"
 somethingHappened: "Что-то пошло не так"
 retry: "Повторить попытку"
-pageLoadError: "Не удалось загрузить страницу"
+pageLoadError: "Не удалось загрузить страницу."
 pageLoadErrorDescription: "Обычно это случается из-за сбоев в сети или кэша браузера.\
   \ Попробуйте очистить кэш, или подождать пару минут, а потом попытаться загрузить\
   \ страницу снова."
@@ -152,7 +150,7 @@ flagAsBotDescription: "Включите, если этот аккаунт упр
   \ системе Misskey учитывать это, а также поможет разработчикам других ботов предотвратить\
   \ бесконечные циклы взаимодействия."
 flagAsCat: "Аккаунт кота"
-flagAsCatDescription: "Включите, и этот аккаунт будет помечен как кошачий."
+flagAsCatDescription: "Вы получите кошачьи ушки и будете говорить как кот!"
 flagShowTimelineReplies: "Показывать ответы на заметки в ленте"
 flagShowTimelineRepliesDescription: "Если этот параметр включен, то в ленте, в дополнение\
   \ к заметкам пользователя, отображаются ответы на другие заметки пользователя."
@@ -219,7 +217,7 @@ noteDeleteConfirm: "Вы хотите удалить эту заметку?"
 pinLimitExceeded: "Нельзя закрепить ещё больше заметок"
 intro: "Установка Misskey завершена! А теперь создайте учетную запись администратора."
 done: "Готово"
-processing: "Обработка"
+processing: "Обработка..."
 preview: "Предпросмотр"
 default: "По умолчанию"
 defaultValueIs: "По умолчанию: {value}"
@@ -237,7 +235,7 @@ instanceFollowers: "Подписчики инстанса"
 instanceUsers: "Пользователи инстанса"
 changePassword: "Изменить пароль"
 security: "Безопасность"
-retypedNotMatch: "Не совпадают"
+retypedNotMatch: "Не совпадают."
 currentPassword: "Текущий пароль"
 newPassword: "Новый пароль"
 newPasswordRetype: "Новый пароль (ещё раз)"
@@ -308,7 +306,7 @@ emptyFolder: "Папка пуста"
 unableToDelete: "Удаление невозможно"
 inputNewFileName: "Введите имя нового файла"
 inputNewDescription: "Введите новую подпись"
-inputNewFolderName: "Пожалуйста, введите новое имя папки!"
+inputNewFolderName: "Пожалуйста, введите новое имя папки"
 circularReferenceFolder: "Вы пытаетесь переместить папку внутрь себя."
 hasChildFilesOrFolders: "Эта папка не пуста и не может быть удалена."
 copyUrl: "Копировать ссылку"
@@ -393,7 +391,7 @@ connectedTo: "Вы подключены к следующим аккаунтам
 notesAndReplies: "Заметки и ответы"
 withFiles: "Заметки с файлами"
 silence: "Заглушить"
-silenceConfirm: " Заглушить этого пользователя? Уверены?"
+silenceConfirm: "Вы уверены что хотите заглушить этого пользователя?"
 unsilence: "Снять глушение"
 unsilenceConfirm: "Снять глушение с этого пользователя? Уверены?"
 popularUsers: "Популярные пользователи"
@@ -418,12 +416,12 @@ registerSecurityKey: "Зарегистрировать защитный ключ
 lastUsed: "Последнее использование"
 unregister: "Отписаться"
 passwordLessLogin: "Настроить вход без пароля"
-resetPassword: "Сброс пароля:"
+resetPassword: "Сброс пароля"
 newPasswordIs: "Новый пароль — «{password}»."
 reduceUiAnimation: "Уменьшить анимацию в пользовательском интерфейсе"
 share: "Поделиться"
 notFound: "Не найдено"
-notFoundDescription: "Страница по указанной ссылке не найдена"
+notFoundDescription: "Страница по указанной ссылке не найдена."
 uploadFolder: "Место загрузки по умолчанию"
 cacheClear: "Очистка кэша"
 markAsReadAllNotifications: "Отметить все уведомления как прочитанные"
@@ -458,7 +456,7 @@ onlyOneFileCanBeAttached: "К сообщению можно прикрепить
 signinRequired: "Пожалуйста, войдите"
 invitations: "Приглашения"
 invitationCode: "Код приглашения"
-checking: "Проверка"
+checking: "Проверка..."
 available: "Доступно"
 unavailable: "Не доступно"
 usernameInvalidFormat: "Можно использовать только латинские буквы (A—Z, a—z), цифры\
@@ -482,11 +480,11 @@ aboutX: "Описание {x}"
 useOsNativeEmojis: "Использовать эмодзи операционной системы"
 disableDrawer: "Не использовать выдвижные меню"
 youHaveNoGroups: "У вас нет ни одной группы"
-joinOrCreateGroup: "Получайте приглашения в группы или создавайте свои собственные"
+joinOrCreateGroup: "Получайте приглашения в группы или создавайте свои собственные."
 noHistory: "История пока пуста"
 signinHistory: "Журнал посещений"
 disableAnimatedMfm: "Отключение анимированной разметки MFM"
-doing: "В процессе"
+doing: "В процессе..."
 category: "Категория"
 tags: "Метки"
 docSource: "Источник документа"
@@ -520,7 +518,7 @@ objectStorageBucketDesc: "Укажите название контейнера (
   \ на выбранном сервисе."
 objectStoragePrefix: "Префикс"
 objectStoragePrefixDesc: "Файлы будут храниться в директории, соответствующей указанному\
-  \ здесь префиксу пути"
+  \ здесь префиксу пути."
 objectStorageEndpoint: "Конечная точка"
 objectStorageEndpointDesc: "Если используете AWS S3, оставьте пустым. В остальных\
   \ случаях укажите конечную точку (endpoint) в форме «<host>» или «<host>:<port>»,\
@@ -530,7 +528,7 @@ objectStorageRegionDesc: "Укажите регион, например xx-east-
   \ различает регионы, оставьте поле пустым, или впишите us-east-1."
 objectStorageUseSSL: "Использовать SSL"
 objectStorageUseSSLDesc: "Отключите, если не собираетесь использовать протокол HTTPS\
-  \ для обмена по API."
+  \ для обмена по API"
 objectStorageUseProxy: "Использовать прокси"
 objectStorageUseProxyDesc: "Отключите, если не будете испоьзовать прокси для соединений\
   \ по протоколу ObjectStorage."
@@ -1070,6 +1068,8 @@ _mfm:
   sparkleDescription: "Добавляет эффект искрящихся частиц."
   rotate: "Повернуть"
   rotateDescription: "Поворачивает на заданный угол."
+  plain: Обычный текст
+  plainDescription: Деактивирует эффекты всех MFM, содержащихся в этом эффекте MFM.
 _instanceTicker:
   none: "Не показывать"
   remote: "Только для других сайтов"
@@ -1078,6 +1078,7 @@ _serverDisconnectedBehavior:
   reload: "Автоматическая перезагрузка"
   dialog: "Предупреждение"
   quiet: "Показать ненавязчивое предупреждение"
+  nothing: Ничего не делать
 _channel:
   create: "Создать канал"
   edit: "Редактировать канал"
@@ -1109,6 +1110,10 @@ _wordMute:
   mutedNotes: "Скрытые заметки"
 _instanceMute:
   heading: "Список заглушенных инстансов"
+  instanceMuteDescription2: Разделить переносом строки
+  instanceMuteDescription: Это будет скрывать все посты/репосты с указанных инстансов,
+    включая ответы пользователю с заглушенного инстанса.
+  title: Скрывает посты с указанных инстансов.
 _theme:
   explore: "Обзор"
   install: "Установить тему"
@@ -1223,14 +1228,15 @@ _tutorial:
     \ сообщение или простое \"Hello world!\""
   step5_1: "Временные рамки, везде временные рамки!"
   step5_2: "В вашем экземпляре включены {timelines} различных временных линий."
-  step5_3: "Главная {icon} временная шкала - это шкала, где вы можете видеть сообщения\
-    \ ваших подписчиков."
+  step5_3: "Главная {icon} лента - это лента, где вы можете видеть сообщения ваших\
+    \ подписок и других на этом инстансе. Если вы хотите чтобы главная лента показывала\
+    \ только посты ваших подписок вы можете легко это изменить в настройках!"
   step5_4: "Местная {icon} временная шкала - это шкала, где вы можете видеть сообщения\
     \ всех остальных пользователей данного экземпляра"
-  step5_5: "Временная шкала Рекомендуемые {icon} - это шкала, где вы можете видеть\
-    \ сообщения от инстанций, рекомендованных администраторами."
-  step5_6: "На временной шкале Social {icon} отображаются сообщения от друзей ваших\
-    \ подписчиков"
+  step5_5: "Лента Социальная {icon} - это лента, где вы можете видеть посты только\
+    \ от аккаунтов, на которые вы подписаны."
+  step5_6: "Лента Рекомендованная {icon} это лента, где вы можете видеть посты с инстансов,\
+    \ рекомендованных администраторами."
   step5_7: "Глобальная {icon} временная шкала - это место, где вы можете видеть сообщения\
     \ от всех других подключенных экземпляров"
   step6_1: "Итак, что это за место?"
@@ -1252,6 +1258,7 @@ _2fa:
     \ аналогичным образом."
   securityKeyInfo: "Вы можете настроить вход с помощью аппаратного ключа безопасности,\
     \ поддерживающего FIDO2, или отпечатка пальца или PIN-кода на устройстве."
+  step2Url: 'Вы также можете ввести этот URL если используете программу на компьютере:'
 _permissions:
   "read:account": "Просматривать данные учётной записи"
   "write:account": "Изменять данные учётной записи"
@@ -1292,12 +1299,14 @@ _auth:
   pleaseGoBack: "Вернитесь, пожалуйста, в приложение"
   callback: "Возврат в приложение"
   denied: "Доступ закрыт"
+  copyAsk: Пожалуйста, вставьте следующий код авторизации в приложение
 _antennaSources:
   all: "Все заметки"
   homeTimeline: "Заметки тех на которых вы подписаны"
   users: "Заметки выбранных пользователей"
   userList: "Заметки пользователей из выбранных списков"
   userGroup: "Заметки от пользователей из заданной группы"
+  instances: Посты от всех пользователей на инстансе
 _weekday:
   sunday: "Воскресенье"
   monday: "Понедельник"
@@ -1326,6 +1335,12 @@ _widgets:
   serverMetric: "Показатели сервера"
   aiscript: "Консоль AiScript"
   aichan: "Ай"
+  rssTicker: RSS-тикер
+  unixClock: UNIX часы
+  instanceCloud: Облачко инстансов
+  userList: Список пользователей
+  _userList:
+    chooseList: Выберите список
 _cw:
   hide: "Спрятать"
   show: "Показать еще"
@@ -1356,7 +1371,7 @@ _poll:
 _visibility:
   public: "Общедоступно"
   publicDescription: "Открыто для всех"
-  home: "Домашняя"
+  home: "Скрытый"
   homeDescription: "Не для общих лент"
   followers: "Для подписчиков"
   followersDescription: "Только вашим подписчикам"
@@ -1387,6 +1402,8 @@ _profile:
   metadataContent: "Содержимое"
   changeAvatar: "Поменять аватар"
   changeBanner: "Поменять изображение в шапке"
+  locationDescription: Если вы сначала введете свой город, другим пользователям будет
+    показано ваше местное время.
 _exportOrImport:
   allNotes: "Все записи\n"
   followingList: "Подписки"
@@ -1426,6 +1443,7 @@ _timelines:
   local: "Местная"
   social: "Социальная"
   global: "Всеобщая"
+  recommended: Рекомендованная
 _pages:
   newPage: "Создать страницу"
   editPage: "Править страницу"
@@ -1745,10 +1763,13 @@ _notification:
     followRequestAccepted: "Запрос на подписку одобрен"
     groupInvited: "Приглашение в группы"
     app: "Уведомления из приложений"
+    pollEnded: Опрос закончен
   _actions:
     reply: "Ответить"
     renote: "Репост"
+    followBack: Подписался на вас обратно
   emptyPushNotificationMessage: Пуш уведомления были обновлены
+  pollEnded: Результаты опроса стали доступны
 _deck:
   alwaysShowMainColumn: "Всегда показывать главную колонку"
   columnAlign: "Выравнивание колонок"
@@ -1760,7 +1781,7 @@ _deck:
   swapDown: "Переставить ниже"
   stackLeft: "В столбик влево"
   popRight: "Из столбика вправо"
-  profile: "Профиль"
+  profile: "Воркспейс"
   _columns:
     main: "Основная"
     widgets: "Виджеты"
@@ -1770,6 +1791,15 @@ _deck:
     list: "Списки"
     mentions: "Упоминания"
     direct: "Личное"
+  deleteProfile: Удалить воркспейс
+  introduction: Создайте идеальный интерфейс для себя, свободно расположив столбцы!
+  introduction2: Нажмите на + в правой части экрана, чтобы добавлять новые столбцы
+    в любое удобное для вас время.
+  widgetsIntroduction: Пожалуйста, выберите "Редактировать виджеты" в меню столбца
+    и добавьте виджет.
+  newProfile: Новый воркспейс
+  renameProfile: Переименовать воркспейс
+  nameAlreadyExists: Воркспейс с таким именем уже существует.
 enableRecommendedTimeline: Включить рекомендованную ленту
 regexpErrorDescription: 'Произошла ошибка в регулярном выражении на строке {line}
   вашего {tab} списка скрытых слов:'
@@ -1891,6 +1921,20 @@ _preferencesBackups:
   apply: Применить для этого устройства
   save: Сохранить изменения
   saveNew: Сохранить новую резервную копию
+  applyConfirm: Вы действительно хотите применить резервную копию "{name}" на этом
+    устройстве? Существует настройки на этом устройстве будут перезаписаны.
+  renameConfirm: Переименовать резервную копию "{old}" в "{new}"?
+  saveConfirm: Сохранить резервную как {name}?
+  cannotSave: Сохранение не удалось
+  nameAlreadyExists: Резервная копия с именем "{name}" уже существующует. Выберите
+    другое имя.
+  deleteConfirm: Удалить резервную копию {name}?
+  noBackups: Нет резервных копий. Вы может сделать резервную копию настроек клиента
+    на этом сервере используя "Создать новую резервную копию".
+  createdAt: 'Создано: {date} {time}'
+  updatedAt: 'Обновлено: {date} {time}'
+  cannotLoad: Загрузка не удалась
+  invalidFile: Неправильный формат файла
 enableEmojiReactions: Включить эмодзи реакции
 _apps:
   paid: Платные
@@ -1900,3 +1944,56 @@ _apps:
   apps: Приложения
   crossPlatform: Кроссплатформенные
   mobile: Мобильные
+  firstParty: От разработчиков
+  firstClass: Первый класс
+  thirdClass: Третий класс
+  kaiteki: Kaiteki
+  milktea: Milktea
+  missLi: MissLi
+  mona: Mona
+  theDesk: TheDesk
+  secondClass: Второй класс
+migrationConfirm: "Вы абсолютно уверены что хотите мигрировать ваш аккаунт на {account}?\
+  \ Как только вы сделаете, вы не сможете отменить это и не сможете нормально использовать\
+  \ аккаунт снова.\nТакже, пожалуйста, убедитесь, что вы установили эту текущую учетную\
+  \ запись в качестве учетной записи, с которой вы переходите."
+reporter: Автор жалобы
+mutePeriod: Длительность глушения
+reflectMayTakeTime: Это может занять некоторое время чтобы вступило в силу.
+rateLimitExceeded: Превышен лимит
+pleaseSelect: Выберите вариант
+shuffle: Перемешать
+moveFrom: Переместится на этот аккаунт с старого аккаунта
+moveFromLabel: 'Аккаунт с которого перемещаетесь:'
+moveAccountDescription: Этот процесс необратим. Убедитесь что вы сделали псевдоним
+  для этого аккаунта до перемещения. Пожалуйста введите аккаунт в формате @person@instance.com
+moveTo: Переместить текущий аккаунт на новый аккаунт
+_messaging:
+  groups: Группы
+  dms: Личные
+isSystemAccount: Учетная запись, созданная системой и автоматически управляемая ею.
+activeEmailValidationDescription: Включить более строгую проверки адресов электронной
+  почты,что включает в себя проверку наличия одноразовых адресов и того, действительно
+  ли с ними можно связаться. Если флажок снят, проверяется только формат адреса.
+moveToLabel: 'Аккаунт на который вы перемещаетесь:'
+lastActiveDate: Последний раз использовался в
+enterSendsMessage: Нажать Return в Сообщениях чтобы отправить сообщение (если выключено,
+  то Ctrl + Return)
+moveAccount: Переместить аккаунт!
+breakFollowConfirm: Вы действительно хотите удалить подписчика?
+showEmojisInReactionNotifications: Показывать эмодзи в уведомлениях о реакциях
+hiddenTagsDescription: 'Список хештегов (без #), которые вы желаете скрыть из "актуальное"
+  и "обзор". Скрытые хэштеги по-прежнему можно обнаружить в других местах.'
+moveFromDescription: Это установит псевдоним для старого аккаунта, так что вы сможете
+  переместить тот аккаунт на текущий. Делайте это ДО перемещения со старого аккаунта.
+  Пожалуйста введите аккаунт в формате @person@instance.com
+customKaTeXMacroDescription: 'Настройте макросы чтобы легко писать математические
+  выражения! Обозначение соответствует определениям команд LaTeX и записывается как
+  \newcommand{\название}{содержание} или \newcommand{\название}[количество аргументов]{содержание}.
+  Для примера, \add{3}[2]{#1 + #2} будет раскрывать \add{3}{foo} до 3 + foo. Фигурные
+  скобки, окружающие имя макроса, можно заменить на круглые или квадратные скобки.
+  Это влияет на квадратные скобки, используемые для аргументов. Для каждой строки
+  может быть определен один (и только один) макрос, и вы не можете прерывать строку
+  в середине определения. Недопустимые строки просто игнорируются. Поддерживаются
+  только простые функции подстановки строк; расширенный синтаксис, такой как условное
+  ветвление, здесь использоваться не может.'

From 9f4a000361d88402e0d04847136d797db4ca09d5 Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Sun, 23 Apr 2023 00:21:38 +0000
Subject: [PATCH 520/582] Notes refactoring (?) + new CW design (#9888)

Moved a lot of the duplicated code in the different note components into the SubNoteContent component

I've also replaced the detailed note stuff with just the MkNote component

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9888
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 packages/client/src/components/MkCwButton.vue |  61 ++-
 packages/client/src/components/MkNote.vue     | 260 +++---------
 .../client/src/components/MkNoteDetailed.vue  | 401 +-----------------
 .../client/src/components/MkNoteSimple.vue    |  39 +-
 packages/client/src/components/MkNoteSub.vue  |  82 +---
 .../src/components/MkSubNoteContent.vue       | 365 ++++++++++------
 6 files changed, 340 insertions(+), 868 deletions(-)

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index b4a69ac6a..e327fe18f 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -1,8 +1,14 @@
 <template>
-	<button class="nrvgflfu _button" @click.stop="toggle">
-		<b>{{ modelValue ? i18n.ts._cw.hide : i18n.ts._cw.show }}</b>
-		<span v-if="!modelValue">{{ label }}</span>
+	<button
+		class="_button"
+		:class="{showLess: modelValue, fade: !modelValue}"
+		@click.stop="toggle"
+	>
+		<span>{{ modelValue ? i18n.ts._cw.hide : i18n.ts._cw.show }}
+			<span v-if="!modelValue">{{ label }}</span>
+		</span>
 	</button>
+
 </template>
 
 <script lang="ts" setup>
@@ -30,7 +36,8 @@ const label = computed(() => {
 			? [i18n.t("_cw.files", { count: props.note.files.length })]
 			: [],
 		props.note.poll != null ? [i18n.ts.poll] : [],
-	] as string[][]).join(" / ");
+		props.note.renote != null ? [i18n.ts.quoteAttached] : [],
+	] as string[][]).join(", ");
 });
 
 const toggle = () => {
@@ -39,37 +46,25 @@ const toggle = () => {
 </script>
 
 <style lang="scss" scoped>
-.nrvgflfu {
-	position: relative;
-	z-index: 2;
-	display: inline-block;
-	padding: 4px 8px;
-	font-size: 0.8em;
-	color: var(--cwFg);
-	background: var(--cwBg);
-	padding: 6px 10px;
-	width: 90%;
-	border-radius: 10px;
-	border: 1px solid var(--divider);
-	margin-top: 10px;
-	margin-bottom: 10px;
-	transition: background-color 0.25s ease-in-out;
-
-	&:hover {
-		background: var(--cwFg);
-		color: var(--cwBg);
-	}
-
+._button {
+	font-weight: 700;
 	> span {
-		margin-left: 4px;
-
-		&:before {
-			content: "(";
-		}
-
-		&:after {
-			content: ")";
+		background: var(--cwBg) !important;
+		color: var(--cwFg);
+		transition: background .2s, color .2s;
+		> span {
+			font-weight: 500;
+			&::before {
+				content: "("
+			}
+			&::after {
+				content: ")"
+			}
 		}
 	}
+	&:hover > span {
+		background: var(--cwFg) !important;
+		color: var(--cwBg) !important;
+	}
 }
 </style>
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 311a80fa0..3d0464bf2 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -10,11 +10,11 @@
 		:class="{ renote: isRenote }"
 	>
 		<MkNoteSub
-			v-if="appearNote.reply"
+			v-if="appearNote.reply && !detailedView"
 			:note="appearNote.reply"
 			class="reply-to"
 		/>
-		<div class="note-context" @click="noteClick">
+		<div v-if="!detailedView" class="note-context" @click="noteClick">
 			<div class="line"></div>
 			<div v-if="appearNote._prId_" class="info">
 				<i class="ph-megaphone-simple-bold ph-lg"></i>
@@ -77,93 +77,34 @@
 					/>
 				</div>
 				<div class="body">
-					<p v-if="appearNote.cw != null" class="cw">
-						<Mfm
-							v-if="appearNote.cw != ''"
-							class="text"
-							:text="appearNote.cw"
-							:author="appearNote.user"
-							:custom-emojis="appearNote.emojis"
-							:i="$i"
-						/>
-						<br />
-						<XCwButton v-model="showContent" :note="appearNote" />
-					</p>
+					<MkSubNoteContent
+						class="text"
+						:note="appearNote"
+						:detailed="true"
+						:detailedView="detailedView"
+						:parentId="appearNote.parentId"
+						@push="(e) => router.push(notePage(e))"
+					></MkSubNoteContent>
 					<div
-						v-show="appearNote.cw == null || showContent"
-						class="content"
-						:class="{ collapsed, isLong }"
+						v-if="translating || translation"
+						class="translation"
 					>
-						<div class="text">
+						<MkLoading v-if="translating" mini />
+						<div v-else class="translated">
+							<b
+								>{{
+									i18n.t("translatedFrom", {
+										x: translation.sourceLang,
+									})
+								}}:
+							</b>
 							<Mfm
-								v-if="appearNote.text"
-								:text="appearNote.text"
+								:text="translation.text"
 								:author="appearNote.user"
 								:i="$i"
 								:custom-emojis="appearNote.emojis"
 							/>
-							<!-- <a v-if="appearNote.renote != null" class="rp">RN:</a> -->
-							<div
-								v-if="translating || translation"
-								class="translation"
-							>
-								<MkLoading v-if="translating" mini />
-								<div v-else class="translated">
-									<b
-										>{{
-											i18n.t("translatedFrom", {
-												x: translation.sourceLang,
-											})
-										}}:
-									</b>
-									<Mfm
-										:text="translation.text"
-										:author="appearNote.user"
-										:i="$i"
-										:custom-emojis="appearNote.emojis"
-									/>
-								</div>
-							</div>
 						</div>
-						<div v-if="appearNote.files.length > 0" class="files">
-							<XMediaList :media-list="appearNote.files" />
-						</div>
-						<XPoll
-							v-if="appearNote.poll"
-							ref="pollViewer"
-							:note="appearNote"
-							class="poll"
-						/>
-						<MkUrlPreview
-							v-for="url in urls"
-							:key="url"
-							:url="url"
-							:compact="true"
-							:detail="false"
-							class="url-preview"
-						/>
-						<div v-if="appearNote.renote" class="renote">
-							<XNoteSimple
-								:note="appearNote.renote"
-								@click.stop="
-									router.push(notePage(appearNote.renote))
-								"
-							/>
-						</div>
-						<button
-							v-if="isLong && collapsed"
-							class="fade _button"
-							@click.stop="collapsed = false"
-						>
-							<span>{{ i18n.ts.showMore }}</span>
-						</button>
-						<button
-							v-else-if="isLong && !collapsed"
-							class="showLess _button"
-							@click.stop="collapsed = true"
-						>
-							<span>{{ i18n.ts.showLess }}</span>
-						</button>
 					</div>
 					<MkA
 						v-if="appearNote.channel && !inChannel"
@@ -174,6 +115,14 @@
 						{{ appearNote.channel.name }}</MkA
 					>
 				</div>
+				<div v-if="detailedView" class="info">
+					<MkA class="created-at" :to="notePage(appearNote)">
+						<MkTime
+							:time="appearNote.createdAt"
+							mode="absolute"
+						/>
+					</MkA>
+				</div>
 				<footer ref="el" class="footer" @click.stop>
 					<XReactionsViewer
 						v-if="enableEmojiReactions"
@@ -277,6 +226,7 @@ import * as mfm from "mfm-js";
 import type { Ref } from "vue";
 import type * as misskey from "calckey-js";
 import MkNoteSub from "@/components/MkNoteSub.vue";
+import MkSubNoteContent from "./MkSubNoteContent.vue";
 import XNoteHeader from "@/components/MkNoteHeader.vue";
 import XNoteSimple from "@/components/MkNoteSimple.vue";
 import XMediaList from "@/components/MkMediaList.vue";
@@ -297,7 +247,6 @@ import { userPage } from "@/filters/user";
 import * as os from "@/os";
 import { defaultStore, noteViewInterruptors } from "@/store";
 import { reactionPicker } from "@/scripts/reaction-picker";
-import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
 import { $i } from "@/account";
 import { i18n } from "@/i18n";
 import { getNoteMenu } from "@/scripts/get-note-menu";
@@ -310,6 +259,7 @@ const router = useRouter();
 const props = defineProps<{
 	note: misskey.entities.Note;
 	pinned?: boolean;
+	detailedView?: boolean;
 }>();
 
 const inChannel = inject("inChannel", null);
@@ -344,18 +294,10 @@ let appearNote = $computed(() =>
 );
 const isMyRenote = $i && $i.id === note.userId;
 const showContent = ref(false);
-const isLong =
-	appearNote.cw == null &&
-	appearNote.text != null &&
-	(appearNote.text.split("\n").length > 9 || appearNote.text.length > 500);
-const collapsed = ref(appearNote.cw == null && isLong);
 const isDeleted = ref(false);
 const muted = ref(getWordMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
-const urls = appearNote.text
-	? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5)
-	: null;
 const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
 
 const keymap = {
@@ -503,7 +445,7 @@ function focusAfter() {
 }
 
 function noteClick(e) {
-	if (document.getSelection().type === "Range") {
+	if (document.getSelection().type === "Range" || props.detailedView) {
 		e.stopPropagation();
 	} else {
 		router.push(notePage(appearNote));
@@ -690,123 +632,24 @@ function readPromo() {
 			> .body {
 				margin-top: 0.7em;
 
-				> .cw {
-					cursor: default;
-					display: block;
-					margin: 0;
-					padding: 0;
-					overflow-wrap: break-word;
-
-					> .text {
-						margin-right: 8px;
-					}
-				}
-
 				> .content {
-					&.isLong {
-						> .showLess {
-							width: 100%;
-							margin-top: 1em;
-							position: sticky;
-							bottom: var(--stickyBottom);
-
-							> span {
-								display: inline-block;
-								background: var(--popup);
-								padding: 6px 10px;
-								font-size: 0.8em;
-								border-radius: 999px;
-								box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
-							}
-						}
-					}
-
-					&.collapsed {
-						position: relative;
-						max-height: 9em;
-						overflow: hidden;
-						> .text {
-							max-height: 9em;
-							mask: linear-gradient(
-								black calc(100% - 64px),
-								transparent
-							);
-							-webkit-mask: linear-gradient(
-								black calc(100% - 64px),
-								transparent
-							);
-						}
-						> .fade {
-							display: block;
-							position: absolute;
-							bottom: 0;
-							left: 0;
-							width: 100%;
-							height: 64px;
-
-							> span {
-								display: inline-block;
-								background: var(--panel);
-								padding: 6px 10px;
-								font-size: 0.8em;
-								border-radius: 999px;
-								box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
-							}
-
-							&:hover {
-								> span {
-									background: var(--panelHighlight);
-								}
-							}
-						}
-					}
-
-					> .text {
-						overflow-wrap: break-word;
-
-						> .reply {
-							color: var(--accent);
-							margin-right: 0.5em;
-						}
-
-						> .rp {
-							margin-left: 4px;
-							font-style: oblique;
-							color: var(--renote);
-						}
-
-						> .translation {
-							border: solid 0.5px var(--divider);
-							border-radius: var(--radius);
-							padding: 12px;
-							margin-top: 8px;
-						}
-					}
-
-					> .files {
-						margin-top: 0.4em;
-						margin-bottom: 0.4em;
-					}
-					> .url-preview {
+					> .translation {
+						border: solid 0.5px var(--divider);
+						border-radius: var(--radius);
+						padding: 12px;
 						margin-top: 8px;
 					}
-
-					> .poll {
-						font-size: 80%;
-					}
-
-					> .renote {
-						padding: 8px 0;
-
-						> * {
-							padding: 16px;
-							border: solid 1px var(--renote);
-							border-radius: 8px;
-							transition: background 0.2s;
-							&:hover,
-							&:focus-within {
-								background-color: var(--panelHighlight);
-							}
+				}
+				> .renote {
+					padding-top: 8px;
+					> * {
+						padding: 16px;
+						border: solid 1px var(--renote);
+						border-radius: 8px;
+						transition: background 0.2s;
+						&:hover,
+						&:focus-within {
+							background-color: var(--panelHighlight);
 						}
 					}
 				}
@@ -816,13 +659,18 @@ function readPromo() {
 					font-size: 80%;
 				}
 			}
+			> .info {
+				margin-block: 16px;
+				opacity: 0.7;
+				font-size: 0.9em;
+			}
 			> .footer {
 				position: relative;
 				z-index: 2;
 				display: flex;
 				flex-wrap: wrap;
 				pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
-
+				margin-top: .4em;
 				> .button {
 					margin: 0;
 					padding: 8px;
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 237d05546..ba8fab132 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -20,246 +20,16 @@
 			:note="appearNote.reply"
 			class="reply-to"
 		/>
-		<div v-if="isRenote" class="renote">
-			<MkAvatar class="avatar" :user="note.user" />
-			<i class="ph-repeat ph-bold ph-lg"></i>
-			<I18n :src="i18n.ts.renotedBy" tag="span">
-				<template #user>
-					<MkA
-						v-user-preview="note.userId"
-						class="name"
-						:to="userPage(note.user)"
-					>
-						<MkUserName :user="note.user" />
-					</MkA>
-				</template>
-			</I18n>
-			<div class="info">
-				<button
-					ref="renoteTime"
-					class="_button time"
-					@click="showRenoteMenu()"
-				>
-					<i
-						v-if="isMyRenote"
-						class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"
-					></i>
-					<MkTime :time="note.createdAt" />
-				</button>
-				<MkVisibility :note="note" />
-			</div>
+		
+		<div ref="noteEl" class="article" tabindex="-1">
+			<MkNote
+				@contextmenu.stop="onContextmenu"
+				tabindex="-1"
+				:note="appearNote"
+				:detailedView="true"
+			></MkNote>
 		</div>
-		<article
-			ref="noteEl"
-			class="article"
-			@contextmenu.stop="onContextmenu"
-			tabindex="-1"
-		>
-			<header class="header">
-				<MkAvatar
-					class="avatar"
-					:user="appearNote.user"
-					:show-indicator="true"
-				/>
-				<div class="body">
-					<div class="top">
-						<MkA
-							v-user-preview="appearNote.user.id"
-							class="name"
-							:to="userPage(appearNote.user)"
-						>
-							<MkUserName :user="appearNote.user" />
-						</MkA>
-						<span v-if="appearNote.user.isBot" class="is-bot"
-							>bot</span
-						>
-						<div class="info">
-							<MkVisibility :note="appearNote" />
-						</div>
-					</div>
-					<div class="username">
-						<MkAcct :user="appearNote.user" />
-					</div>
-					<MkInstanceTicker
-						v-if="showTicker"
-						class="ticker"
-						:instance="appearNote.user.instance"
-					/>
-				</div>
-			</header>
-			<div class="main">
-				<div class="body">
-					<div v-if="appearNote.cw != null" class="cw">
-						<Mfm
-							v-if="appearNote.cw != ''"
-							class="text"
-							:text="appearNote.cw"
-							:author="appearNote.user"
-							:i="$i"
-							:custom-emojis="appearNote.emojis"
-						/>
-						<br />
-						<XCwButton v-model="showContent" :note="appearNote" />
-					</div>
-					<div
-						v-show="appearNote.cw == null || showContent"
-						class="content"
-					>
-						<div class="text">
-							<Mfm
-								v-if="appearNote.text"
-								:text="appearNote.text"
-								:author="appearNote.user"
-								:i="$i"
-								:custom-emojis="appearNote.emojis"
-							/>
-							<div
-								v-if="translating || translation"
-								class="translation"
-							>
-								<MkLoading v-if="translating" mini />
-								<div v-else class="translated">
-									<b
-										>{{
-											i18n.t("translatedFrom", {
-												x: translation.sourceLang,
-											})
-										}}:
-									</b>
-									<Mfm
-										:text="translation.text"
-										:author="appearNote.user"
-										:i="$i"
-										:custom-emojis="appearNote.emojis"
-									/>
-								</div>
-							</div>
-						</div>
-						<div v-if="appearNote.files.length > 0" class="files">
-							<XMediaList :media-list="appearNote.files" />
-						</div>
-						<XPoll
-							v-if="appearNote.poll"
-							ref="pollViewer"
-							:note="appearNote"
-							class="poll"
-						/>
-						<MkUrlPreview
-							v-for="url in urls"
-							:key="url"
-							:url="url"
-							:compact="true"
-							:detail="true"
-							class="url-preview"
-						/>
-						<div v-if="appearNote.renote" class="renote">
-							<XNoteSimple
-								:note="appearNote.renote"
-								@click.stop="
-									router.push(notePage(appearNote.renote))
-								"
-							/>
-						</div>
-					</div>
-					<MkA
-						v-if="appearNote.channel && !inChannel"
-						class="channel"
-						:to="`/channels/${appearNote.channel.id}`"
-						><i class="ph-television ph-bold ph-lg"></i>
-						{{ appearNote.channel.name }}</MkA
-					>
-				</div>
-				<footer class="footer">
-					<div class="info">
-						<MkA class="created-at" :to="notePage(appearNote)">
-							<MkTime
-								:time="appearNote.createdAt"
-								mode="detail"
-							/>
-						</MkA>
-					</div>
-					<XReactionsViewer
-						v-if="enableEmojiReactions"
-						ref="reactionsViewer"
-						:note="appearNote"
-					/>
-					<button
-						v-tooltip.noDelay.bottom="i18n.ts.reply"
-						class="button _button"
-						@click="reply()"
-					>
-						<template v-if="appearNote.reply"
-							><i class="ph-arrow-u-up-left ph-bold ph-lg"></i
-						></template>
-						<template v-else
-							><i class="ph-arrow-bend-up-left ph-bold ph-lg"></i
-						></template>
-						<p v-if="appearNote.repliesCount > 0" class="count">
-							{{ appearNote.repliesCount }}
-						</p>
-					</button>
-					<XRenoteButton
-						ref="renoteButton"
-						class="button"
-						:note="appearNote"
-						:count="appearNote.renoteCount"
-					/>
-					<XStarButtonNoEmoji
-						v-if="!enableEmojiReactions"
-						class="button"
-						:note="appearNote"
-						:count="
-							Object.values(appearNote.reactions).reduce(
-								(partialSum, val) => partialSum + val,
-								0
-							)
-						"
-						:reacted="appearNote.myReaction != null"
-					/>
-					<XStarButton
-						v-if="
-							enableEmojiReactions &&
-							appearNote.myReaction == null
-						"
-						ref="starButton"
-						class="button"
-						:note="appearNote"
-					/>
-					<button
-						v-if="
-							enableEmojiReactions &&
-							appearNote.myReaction == null
-						"
-						ref="reactButton"
-						v-tooltip.noDelay.bottom="i18n.ts.reaction"
-						class="button _button"
-						@click="react()"
-					>
-						<i class="ph-smiley ph-bold ph-lg"></i>
-					</button>
-					<button
-						v-if="
-							enableEmojiReactions &&
-							appearNote.myReaction != null
-						"
-						ref="reactButton"
-						class="button _button reacted"
-						@click="undoReact(appearNote)"
-					>
-						<i class="ph-minus ph-bold ph-lg"></i>
-					</button>
-					<XQuoteButton class="button" :note="appearNote" />
-					<button
-						ref="menuButton"
-						v-tooltip.noDelay.bottom="i18n.ts.more"
-						class="button _button"
-						@click="menu()"
-					>
-						<i class="ph-dots-three-outline ph-bold ph-lg"></i>
-					</button>
-				</footer>
-			</div>
-		</article>
+
 		<MkNoteSub
 			v-for="note in directReplies"
 			:key="note.id"
@@ -298,6 +68,7 @@ import {
 } from "vue";
 import * as mfm from "mfm-js";
 import type * as misskey from "calckey-js";
+import MkNote from "@/components/MkNote.vue";
 import MkNoteSub from "@/components/MkNoteSub.vue";
 import XNoteSimple from "@/components/MkNoteSimple.vue";
 import XReactionsViewer from "@/components/MkReactionsViewer.vue";
@@ -672,8 +443,7 @@ onUnmounted(() => {
 	}
 
 	> .article {
-		padding: 32px;
-		padding-bottom: 6px;
+		padding-block: 28px 6px;
 		&:last-child {
 			padding-bottom: 24px;
 		}
@@ -681,151 +451,8 @@ onUnmounted(() => {
 		overflow: clip;
 		outline: none;
 		scroll-margin-top: calc(var(--stickyTop) + 20vh);
-		> .header {
-			display: flex;
-			position: relative;
-			margin-bottom: 16px;
-
-			> .avatar {
-				display: block;
-				flex-shrink: 0;
-				width: var(--avatarSize);
-				height: var(--avatarSize);
-			}
-
-			> .body {
-				width: 0;
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				padding-left: 14px;
-				font-size: 0.95em;
-
-				> .top {
-					display: flex;
-					align-items: center;
-					> .name {
-						font-weight: bold;
-						overflow: hidden;
-						text-overflow: ellipsis;
-					}
-
-					> .is-bot {
-						flex-shrink: 0;
-						align-self: center;
-						margin: 0 0.5em;
-						padding: 4px 6px;
-						font-size: 80%;
-						border: solid 0.5px var(--divider);
-						border-radius: 4px;
-					}
-
-					> .info {
-						float: right;
-					}
-				}
-			}
-		}
-
-		> .main {
-			> .body {
-				> .cw {
-					cursor: default;
-					display: block;
-					margin: 0;
-					padding: 0;
-					overflow-wrap: break-word;
-
-					> .text {
-						margin-right: 8px;
-					}
-				}
-
-				> .content {
-					> .text {
-						overflow-wrap: break-word;
-
-						> .reply {
-							color: var(--accent);
-							margin-right: 0.5em;
-						}
-
-						> .rp {
-							margin-left: 4px;
-							font-style: oblique;
-							color: var(--renote);
-						}
-
-						> .translation {
-							border: solid 0.5px var(--divider);
-							border-radius: var(--radius);
-							padding: 12px;
-							margin-top: 8px;
-						}
-					}
-
-					> .url-preview {
-						margin-top: 8px;
-					}
-
-					> .poll {
-						font-size: 80%;
-					}
-
-					> .renote {
-						padding: 8px 0;
-
-						> * {
-							padding: 16px;
-							border: solid 1px var(--renote);
-							border-radius: 8px;
-							transition: background 0.2s;
-							&:hover,
-							&:focus-within {
-								background-color: var(--panelHighlight);
-							}
-						}
-					}
-				}
-
-				> .channel {
-					opacity: 0.7;
-					font-size: 80%;
-				}
-			}
-
-			> .footer {
-				> .info {
-					margin: 16px 0;
-					opacity: 0.7;
-					font-size: 0.9em;
-				}
-
-				> .button {
-					margin: 0;
-					padding: 8px;
-					opacity: 0.7;
-
-					&:not(:last-child) {
-						margin-right: 16px;
-					}
-
-					&:hover {
-						color: var(--fgHighlighted);
-					}
-
-					> .count {
-						display: inline;
-						margin: 0 0 0 8px;
-						opacity: 0.7;
-					}
-
-					&.reacted {
-						color: var(--accent);
-					}
-				}
-			}
+		:deep(.article) {
+			cursor: unset;
 		}
 	}
 
@@ -909,7 +536,7 @@ onUnmounted(() => {
 		}
 
 		> .article {
-			padding: 16px;
+			padding: 6px 0 0 0;
 			> .header > .body {
 				padding-left: 10px;
 			}
diff --git a/packages/client/src/components/MkNoteSimple.vue b/packages/client/src/components/MkNoteSimple.vue
index 937f9144a..df5dceb92 100644
--- a/packages/client/src/components/MkNoteSimple.vue
+++ b/packages/client/src/components/MkNoteSimple.vue
@@ -4,21 +4,7 @@
 		<div class="main">
 			<XNoteHeader class="header" :note="note" :mini="true" />
 			<div class="body">
-				<p v-if="note.cw != null" class="cw">
-					<Mfm
-						v-if="note.cw != ''"
-						class="text"
-						:text="note.cw"
-						:author="note.user"
-						:i="$i"
-						:custom-emojis="note.emojis"
-					/>
-					<br />
-					<XCwButton v-model="showContent" :note="note" />
-				</p>
-				<div v-show="note.cw == null || showContent" class="content">
-					<MkSubNoteContent class="text" :note="note" />
-				</div>
+				<MkSubNoteContent class="text" :note="note" />
 			</div>
 		</div>
 	</div>
@@ -29,7 +15,6 @@ import {} from "vue";
 import * as misskey from "calckey-js";
 import XNoteHeader from "@/components/MkNoteHeader.vue";
 import MkSubNoteContent from "@/components/MkSubNoteContent.vue";
-import XCwButton from "@/components/MkCwButton.vue";
 
 const props = defineProps<{
 	note: misskey.entities.Note;
@@ -79,28 +64,6 @@ const showContent = $ref(false);
 		> .header {
 			margin-bottom: 2px;
 		}
-
-		> .body {
-			> .cw {
-				cursor: default;
-				display: block;
-				margin: 0;
-				padding: 0;
-				overflow-wrap: break-word;
-
-				> .text {
-					margin-right: 8px;
-				}
-			}
-
-			> .content {
-				> .text {
-					cursor: default;
-					margin: 0;
-					padding: 0;
-				}
-			}
-		}
 	}
 }
 </style>
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 632a37163..f5e70891f 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -21,51 +21,12 @@
 			<div class="body">
 				<XNoteHeader class="header" :note="note" :mini="true" />
 				<div class="body">
-					<p v-if="appearNote.cw != null" class="cw">
-						<MkA
-							v-if="appearNote.replyId"
-							:to="`/notes/${appearNote.replyId}`"
-							class="reply-icon"
-							@click.stop
-						>
-							<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
-						</MkA>
-						<MkA
-							v-if="
-								conversation &&
-								appearNote.renoteId &&
-								appearNote.renoteId != parentId &&
-								!appearNote.replyId
-							"
-							:to="`/notes/${appearNote.renoteId}`"
-							class="reply-icon"
-							@click.stop
-						>
-							<i class="ph-quotes ph-bold ph-lg"></i>
-						</MkA>
-						<Mfm
-							v-if="appearNote.cw != ''"
-							class="text"
-							:text="appearNote.cw"
-							:author="appearNote.user"
-							:i="$i"
-							:custom-emojis="appearNote.emojis"
-						/>
-						<br />
-						<XCwButton v-model="showContent" :note="note" />
-					</p>
-					<div
-						v-show="appearNote.cw == null || showContent"
-						class="content"
-					>
-						<MkSubNoteContent
-							class="text"
-							:note="note"
-							:detailed="true"
-							:parentId="appearNote.parentId"
-							:conversation="conversation"
-						/>
-					</div>
+					<MkSubNoteContent
+						class="text"
+						:note="note"
+						:parentId="appearNote.parentId"
+						:conversation="conversation"
+					/>
 					<div v-if="translating || translation" class="translation">
 						<MkLoading v-if="translating" mini />
 						<div v-else class="translated">
@@ -212,7 +173,6 @@ import XStarButton from "@/components/MkStarButton.vue";
 import XStarButtonNoEmoji from "@/components/MkStarButtonNoEmoji.vue";
 import XRenoteButton from "@/components/MkRenoteButton.vue";
 import XQuoteButton from "@/components/MkQuoteButton.vue";
-import XCwButton from "@/components/MkCwButton.vue";
 import { pleaseLogin } from "@/scripts/please-login";
 import { getNoteMenu } from "@/scripts/get-note-menu";
 import { notePage } from "@/filters/note";
@@ -262,7 +222,6 @@ let appearNote = $computed(() =>
 const isDeleted = ref(false);
 const translation = ref(null);
 const translating = ref(false);
-let showContent = $ref(false);
 const replies: misskey.entities.Note[] =
 	props.conversation
 		?.filter(
@@ -400,35 +359,6 @@ function noteClick(e) {
 			}
 
 			> .body {
-				.reply-icon {
-					display: inline-block;
-					border-radius: 6px;
-					padding: 0.2em 0.2em;
-					margin-right: 0.2em;
-					color: var(--accent);
-					transition: background 0.2s;
-					&:hover,
-					&:focus {
-						background: var(--buttonHoverBg);
-					}
-				}
-				> .cw {
-					cursor: default;
-					display: block;
-					margin: 0;
-					padding: 0;
-					overflow-wrap: break-word;
-
-					> .text {
-						margin-right: 8px;
-					}
-				}
-				> .content {
-					> .text {
-						margin: 0;
-						padding: 0;
-					}
-				}
 				> .translation {
 					border: solid 0.5px var(--divider);
 					border-radius: var(--radius);
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 58accefc1..a040bfbec 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -1,77 +1,110 @@
 <template>
-	<div class="wrmlmaau" :class="{ collapsed, isLong }">
-		<div class="body">
-			<span v-if="note.deletedAt" style="opacity: 0.5"
-				>({{ i18n.ts.deleted }})</span
-			>
-			<template v-if="!note.cw">
-				<MkA
-					v-if="note.replyId"
-					:to="`/notes/${note.replyId}`"
-					class="reply-icon"
-					@click.stop
-				>
-					<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
-				</MkA>
-				<MkA
-					v-if="
-						conversation &&
-						note.renoteId &&
-						note.renoteId != parentId &&
-						!note.replyId
-					"
-					:to="`/notes/${note.renoteId}`"
-					class="reply-icon"
-					@click.stop
-				>
-					<i class="ph-quotes ph-bold ph-lg"></i>
-				</MkA>
-			</template>
-			<Mfm
-				v-if="note.text"
-				:text="note.text"
-				:author="note.user"
-				:i="$i"
-				:custom-emojis="note.emojis"
-			/>
-			<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`"
-				>{{ i18n.ts.quoteAttached }}: ...</MkA
-			>
-		</div>
-		<div v-if="note.files.length > 0">
-			<XMediaList :media-list="note.files" />
-		</div>
-		<div v-if="note.poll">
-			<summary>{{ i18n.ts.poll }}</summary>
-			<XPoll :note="note" />
-		</div>
-		<template v-if="detailed">
-			<!-- <div v-if="note.renoteId" class="renote">
-			<XNoteSimple :note="note.renote"/>
-		</div> -->
-			<MkUrlPreview
-				v-for="url in urls"
-				:key="url"
-				:url="url"
-				:compact="true"
-				:detail="false"
-				class="url-preview"
-			/>
-		</template>
-		<button
-			v-if="isLong && collapsed"
-			class="fade _button"
-			@click.stop="collapsed = false"
+	<p v-if="note.cw != null" class="cw">
+		<MkA
+			v-if="!detailed && note.replyId"
+			:to="`/notes/${note.replyId}`"
+			class="reply-icon"
+			@click.stop
 		>
-			<span>{{ i18n.ts.showMore }}</span>
-		</button>
-		<button
-			v-if="isLong && !collapsed"
-			class="showLess _button"
-			@click.stop="collapsed = true"
+			<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
+		</MkA>
+		<MkA
+			v-if="
+				conversation &&
+				note.renoteId &&
+				note.renoteId != parentId &&
+				!note.replyId
+			"
+			:to="`/notes/${note.renoteId}`"
+			class="reply-icon"
+			@click.stop
 		>
-			<span>{{ i18n.ts.showLess }}</span>
-		</button>
+			<i class="ph-quotes ph-bold ph-lg"></i>
+		</MkA>
+		<Mfm
+			v-if="note.cw != ''"
+			class="text"
+			:text="note.cw"
+			:author="note.user"
+			:i="$i"
+			:custom-emojis="note.emojis"
+		/>
+	</p>
+	<div
+		class="wrmlmaau"
+	>
+		<div class="content" :class="{ collapsed, isLong, showContent: note.cw && !showContent }">
+			<div class="body">
+				<span v-if="note.deletedAt" style="opacity: 0.5"
+					>({{ i18n.ts.deleted }})</span
+				>
+				<template v-if="!note.cw">
+					<MkA
+						v-if="!detailed && note.replyId"
+						:to="`/notes/${note.replyId}`"
+						class="reply-icon"
+						@click.stop
+					>
+						<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
+					</MkA>
+					<MkA
+						v-if="
+							conversation &&
+							note.renoteId &&
+							note.renoteId != parentId &&
+							!note.replyId
+						"
+						:to="`/notes/${note.renoteId}`"
+						class="reply-icon"
+						@click.stop
+					>
+						<i class="ph-quotes ph-bold ph-lg"></i>
+					</MkA>
+				</template>
+				<Mfm
+					v-if="note.text"
+					:text="note.text"
+					:author="note.user"
+					:i="$i"
+					:custom-emojis="note.emojis"
+				/>
+				<MkA v-if="!detailed && note.renoteId" class="rp" :to="`/notes/${note.renoteId}`"
+					>{{ i18n.ts.quoteAttached }}: ...</MkA
+				>
+				<div v-if="note.files.length > 0" class="files">
+					<XMediaList :media-list="note.files" />
+				</div>
+				<XPoll v-if="note.poll" :note="note" class="poll"/>
+				<template v-if="detailed">
+					<MkUrlPreview
+						v-for="url in urls"
+						:key="url"
+						:url="url"
+						:compact="true"
+						:detail="false"
+						class="url-preview"
+					/>
+					<div v-if="note.renote" class="renote" @click.stop="emit('push', note.renote)">
+						<XNoteSimple :note="note.renote"/>
+					</div>
+				</template>
+			</div>
+			<button
+				v-if="isLong && collapsed"
+				class="fade _button"
+				@click.stop="collapsed = false"
+			>
+				<span>{{ i18n.ts.showMore }}</span>
+			</button>
+			<button
+				v-if="isLong && !collapsed"
+				class="showLess _button"
+				@click.stop="collapsed = true"
+			>
+				<span>{{ i18n.ts.showLess }}</span>
+			</button>
+			<XCwButton v-if="note.cw" v-model="showContent" :note="note" />
+		</div>
 	</div>
 </template>
 
@@ -83,6 +116,7 @@ import XNoteSimple from "@/components/MkNoteSimple.vue";
 import XMediaList from "@/components/MkMediaList.vue";
 import XPoll from "@/components/MkPoll.vue";
 import MkUrlPreview from "@/components/MkUrlPreview.vue";
+import XCwButton from "@/components/MkCwButton.vue";
 import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
 import { i18n } from "@/i18n";
 
@@ -91,82 +125,157 @@ const props = defineProps<{
 	parentId?;
 	conversation?;
 	detailed?: boolean;
+	detailedView?: boolean;
 }>();
 
-const isLong =
-	props.note.cw == null &&
-	props.note.text != null &&
-	(props.note.text.split("\n").length > 9 || props.note.text.length > 500);
+const emit = defineEmits<{
+	(ev: "push", v): void;
+}>();
+
+
+const isLong = !props.detailedView && (
+		props.note.cw == null &&
+		props.note.text != null &&
+		(props.note.text.split("\n").length > 9 || props.note.text.length > 500)
+	);
 const collapsed = $ref(props.note.cw == null && isLong);
 const urls = props.note.text
-	? extractUrlFromMfm(mfm.parse(props.note.text))
+	? extractUrlFromMfm(mfm.parse(props.note.text)).slice(0, 5)
 	: null;
+	
+let showContent = $ref(false);
+
 </script>
 
 <style lang="scss" scoped>
-.wrmlmaau {
+.reply-icon {
+	display: inline-block;
+	border-radius: 6px;
+	padding: 0.2em 0.2em;
+	margin-right: 0.2em;
+	color: var(--accent);
+	transition: background 0.2s;
+	&:hover, &:focus {
+		background: var(--buttonHoverBg);
+	}
+}
+.cw {
+	cursor: default;
+	display: block;
+	margin: 0;
+	padding: 0;
+	margin-bottom: 10px;
 	overflow-wrap: break-word;
-
-	> .body {
-		> .rp {
-			margin-left: 4px;
-			font-style: oblique;
-			color: var(--renote);
-		}
-		.reply-icon {
-			display: inline-block;
-			border-radius: 6px;
-			padding: 0.2em 0.2em;
-			margin-right: 0.2em;
-			color: var(--accent);
-			transition: background 0.2s;
-			&:hover,
-			&:focus {
-				background: var(--buttonHoverBg);
-			}
-		}
+	> .text {
+		margin-right: 8px;
 	}
-
-	> .mk-url-preview {
-		margin-top: 8px;
-	}
-
-	&.collapsed {
-		position: relative;
-		max-height: 9em;
-		overflow: hidden;
+}
+.wrmlmaau {
+	.content {
+		overflow-wrap: break-word;
 		> .body {
-			max-height: 9em;
-			mask: linear-gradient(black calc(100% - 64px), transparent);
-			-webkit-mask: linear-gradient(black calc(100% - 64px), transparent);
-		}
-		> .fade {
-			display: block;
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			width: 100%;
-			height: 64px;
-
-			> span {
+			transition: filter .1s;
+			> .rp {
+				margin-left: 4px;
+				font-style: oblique;
+				color: var(--renote);
+			}
+			.reply-icon {
 				display: inline-block;
-				background: var(--panel);
-				padding: 6px 10px;
-				font-size: 0.8em;
-				border-radius: 999px;
-				box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
+				border-radius: 6px;
+				padding: 0.2em 0.2em;
+				margin-right: 0.2em;
+				color: var(--accent);
+				transition: background 0.2s;
+				&:hover,
+				&:focus {
+					background: var(--buttonHoverBg);
+				}
+			}
+			> .files {
+				margin-top: 0.4em;
+				margin-bottom: 0.4em;
+			}
+			> .url-preview {
+				margin-top: 8px;
+			}
+		
+			> .poll {
+				font-size: 80%;
 			}
 
-			&:hover {
+			> .renote {
+				padding-top: 8px;
+				> * {
+					padding: 16px;
+					border: solid 1px var(--renote);
+					border-radius: 8px;
+					transition: background 0.2s;
+					&:hover,
+					&:focus-within {
+						background-color: var(--panelHighlight);
+					}
+				}
+			}
+
+		}
+	
+
+		
+		&.collapsed, &.showContent {
+			position: relative;
+			max-height: calc(9em + 50px);
+			> .body {
+				max-height: inherit;
+				mask: linear-gradient(black calc(100% - 64px), transparent);
+				-webkit-mask: linear-gradient(black calc(100% - 64px), transparent);
+				padding-inline: 50px;
+				margin-inline: -50px;
+				margin-top: -50px;
+				padding-top: 50px;
+				overflow: hidden;
+			}
+			&.collapsed > .body {
+				box-sizing: border-box;
+			}
+			&.showContent {
+				> .body {
+					min-height: 2em;
+					max-height: 5em;
+					filter: blur(4px);
+				}
+				:deep(.fade) {
+					inset: 0;
+					top: 40px;
+				}
+				:deep(span) {
+					animation: none !important;
+				}
+			}
+
+			:deep(.fade) {
+				display: block;
+				position: absolute;
+				bottom: 0;
+				left: 0;
+				width: 100%;
 				> span {
-					background: var(--panelHighlight);
+					display: inline-block;
+					background: var(--panel);
+					padding: .4em 1em;
+					font-size: 0.8em;
+					border-radius: 999px;
+					box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
+				}
+				&:hover {
+					> span {
+						background: var(--panelHighlight);
+					}
 				}
 			}
 		}
-	}
 
-	&.isLong {
-		> .showLess {
+		:deep(.showLess) {
 			width: 100%;
 			margin-top: 1em;
 			position: sticky;

From 87903036695c845dc5af620854cb5cbf425496b1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 22 Apr 2023 17:22:53 -0700
Subject: [PATCH 521/582] chore: formatting

---
 package.json                                  |  2 +-
 packages/client/src/components/MkCwButton.vue | 12 ++--
 packages/client/src/components/MkNote.vue     | 12 +---
 .../client/src/components/MkNoteDetailed.vue  |  2 +-
 .../src/components/MkSubNoteContent.vue       | 58 +++++++++++--------
 packages/client/src/scripts/upload.ts         |  2 +-
 6 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/package.json b/package.json
index 433582f08..22eeb38e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev35",
+	"version": "13.2.0-dev36",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index e327fe18f..35af48874 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -1,14 +1,14 @@
 <template>
 	<button
 		class="_button"
-		:class="{showLess: modelValue, fade: !modelValue}"
+		:class="{ showLess: modelValue, fade: !modelValue }"
 		@click.stop="toggle"
 	>
-		<span>{{ modelValue ? i18n.ts._cw.hide : i18n.ts._cw.show }}
+		<span
+			>{{ modelValue ? i18n.ts._cw.hide : i18n.ts._cw.show }}
 			<span v-if="!modelValue">{{ label }}</span>
 		</span>
 	</button>
-
 </template>
 
 <script lang="ts" setup>
@@ -51,14 +51,14 @@ const toggle = () => {
 	> span {
 		background: var(--cwBg) !important;
 		color: var(--cwFg);
-		transition: background .2s, color .2s;
+		transition: background 0.2s, color 0.2s;
 		> span {
 			font-weight: 500;
 			&::before {
-				content: "("
+				content: "(";
 			}
 			&::after {
-				content: ")"
+				content: ")";
 			}
 		}
 	}
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 3d0464bf2..22a7ef93f 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -85,10 +85,7 @@
 						:parentId="appearNote.parentId"
 						@push="(e) => router.push(notePage(e))"
 					></MkSubNoteContent>
-					<div
-						v-if="translating || translation"
-						class="translation"
-					>
+					<div v-if="translating || translation" class="translation">
 						<MkLoading v-if="translating" mini />
 						<div v-else class="translated">
 							<b
@@ -117,10 +114,7 @@
 				</div>
 				<div v-if="detailedView" class="info">
 					<MkA class="created-at" :to="notePage(appearNote)">
-						<MkTime
-							:time="appearNote.createdAt"
-							mode="absolute"
-						/>
+						<MkTime :time="appearNote.createdAt" mode="absolute" />
 					</MkA>
 				</div>
 				<footer ref="el" class="footer" @click.stop>
@@ -670,7 +664,7 @@ function readPromo() {
 				display: flex;
 				flex-wrap: wrap;
 				pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
-				margin-top: .4em;
+				margin-top: 0.4em;
 				> .button {
 					margin: 0;
 					padding: 8px;
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index ba8fab132..de9cfd0bc 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -20,7 +20,7 @@
 			:note="appearNote.reply"
 			class="reply-to"
 		/>
-		
+
 		<div ref="noteEl" class="article" tabindex="-1">
 			<MkNote
 				@contextmenu.stop="onContextmenu"
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index a040bfbec..132c4966d 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -30,10 +30,11 @@
 			:custom-emojis="note.emojis"
 		/>
 	</p>
-	<div
-		class="wrmlmaau"
-	>
-		<div class="content" :class="{ collapsed, isLong, showContent: note.cw && !showContent }">
+	<div class="wrmlmaau">
+		<div
+			class="content"
+			:class="{ collapsed, isLong, showContent: note.cw && !showContent }"
+		>
 			<div class="body">
 				<span v-if="note.deletedAt" style="opacity: 0.5"
 					>({{ i18n.ts.deleted }})</span
@@ -68,13 +69,16 @@
 					:i="$i"
 					:custom-emojis="note.emojis"
 				/>
-				<MkA v-if="!detailed && note.renoteId" class="rp" :to="`/notes/${note.renoteId}`"
+				<MkA
+					v-if="!detailed && note.renoteId"
+					class="rp"
+					:to="`/notes/${note.renoteId}`"
 					>{{ i18n.ts.quoteAttached }}: ...</MkA
 				>
 				<div v-if="note.files.length > 0" class="files">
 					<XMediaList :media-list="note.files" />
 				</div>
-				<XPoll v-if="note.poll" :note="note" class="poll"/>
+				<XPoll v-if="note.poll" :note="note" class="poll" />
 				<template v-if="detailed">
 					<MkUrlPreview
 						v-for="url in urls"
@@ -84,8 +88,12 @@
 						:detail="false"
 						class="url-preview"
 					/>
-					<div v-if="note.renote" class="renote" @click.stop="emit('push', note.renote)">
-						<XNoteSimple :note="note.renote"/>
+					<div
+						v-if="note.renote"
+						class="renote"
+						@click.stop="emit('push', note.renote)"
+					>
+						<XNoteSimple :note="note.renote" />
 					</div>
 				</template>
 			</div>
@@ -132,19 +140,17 @@ const emit = defineEmits<{
 	(ev: "push", v): void;
 }>();
 
-
-const isLong = !props.detailedView && (
-		props.note.cw == null &&
-		props.note.text != null &&
-		(props.note.text.split("\n").length > 9 || props.note.text.length > 500)
-	);
+const isLong =
+	!props.detailedView &&
+	props.note.cw == null &&
+	props.note.text != null &&
+	(props.note.text.split("\n").length > 9 || props.note.text.length > 500);
 const collapsed = $ref(props.note.cw == null && isLong);
 const urls = props.note.text
 	? extractUrlFromMfm(mfm.parse(props.note.text)).slice(0, 5)
 	: null;
-	
-let showContent = $ref(false);
 
+let showContent = $ref(false);
 </script>
 
 <style lang="scss" scoped>
@@ -155,7 +161,8 @@ let showContent = $ref(false);
 	margin-right: 0.2em;
 	color: var(--accent);
 	transition: background 0.2s;
-	&:hover, &:focus {
+	&:hover,
+	&:focus {
 		background: var(--buttonHoverBg);
 	}
 }
@@ -174,7 +181,7 @@ let showContent = $ref(false);
 	.content {
 		overflow-wrap: break-word;
 		> .body {
-			transition: filter .1s;
+			transition: filter 0.1s;
 			> .rp {
 				margin-left: 4px;
 				font-style: oblique;
@@ -199,7 +206,7 @@ let showContent = $ref(false);
 			> .url-preview {
 				margin-top: 8px;
 			}
-		
+
 			> .poll {
 				font-size: 80%;
 			}
@@ -217,18 +224,19 @@ let showContent = $ref(false);
 					}
 				}
 			}
-
 		}
-	
 
-		
-		&.collapsed, &.showContent {
+		&.collapsed,
+		&.showContent {
 			position: relative;
 			max-height: calc(9em + 50px);
 			> .body {
 				max-height: inherit;
 				mask: linear-gradient(black calc(100% - 64px), transparent);
-				-webkit-mask: linear-gradient(black calc(100% - 64px), transparent);
+				-webkit-mask: linear-gradient(
+					black calc(100% - 64px),
+					transparent
+				);
 				padding-inline: 50px;
 				margin-inline: -50px;
 				margin-top: -50px;
@@ -262,7 +270,7 @@ let showContent = $ref(false);
 				> span {
 					display: inline-block;
 					background: var(--panel);
-					padding: .4em 1em;
+					padding: 0.4em 1em;
 					font-size: 0.8em;
 					border-radius: 999px;
 					box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
diff --git a/packages/client/src/scripts/upload.ts b/packages/client/src/scripts/upload.ts
index 1baa6c7e7..fa0cb5b03 100644
--- a/packages/client/src/scripts/upload.ts
+++ b/packages/client/src/scripts/upload.ts
@@ -96,7 +96,7 @@ export function uploadFile(
 
 					if (xhr.status === 413) {
 						alert({
-							type: 'error',
+							type: "error",
 							title: i18n.ts.failedToUpload,
 							text: i18n.ts.cannotUploadBecauseExceedsFileSizeLimit,
 						});

From c0c34858f41bda82324c26cf2529785d221a551d Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sun, 23 Apr 2023 05:27:32 +0000
Subject: [PATCH 522/582] chore: Translated using Weblate (English)

Currently translated at 100.0% (1727 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/en/
---
 locales/en-US.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 5ee1feb4b..a11a404d6 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -864,7 +864,7 @@ privateModeInfo: "When enabled, only whitelisted instances can federate with you
   \ instances. All posts will be hidden from the public."
 allowedInstances: "Whitelisted Instances"
 allowedInstancesDescription: "Hosts of instances to be whitelisted for federation,\
-  \ each seperated by a new line (only applies in private mode)."
+  \ each separated by a new line (only applies in private mode)."
 previewNoteText: "Show preview"
 customCss: "Custom CSS"
 customCssWarn: "This setting should only be used if you know what it does. Entering\
@@ -872,7 +872,7 @@ customCssWarn: "This setting should only be used if you know what it does. Enter
 global: "Global"
 recommended: "Recommended"
 squareAvatars: "Display squared avatars"
-seperateRenoteQuote: "Seperate boost and quote buttons"
+seperateRenoteQuote: "Separate boost and quote buttons"
 sent: "Sent"
 received: "Received"
 searchResult: "Search results"
@@ -983,7 +983,8 @@ failedToUpload: "Upload failed"
 cannotUploadBecauseInappropriate: "This file could not be uploaded because parts of\
   \ it have been detected as potentially NSFW."
 cannotUploadBecauseNoFreeSpace: "Upload failed due to lack of Drive capacity."
-cannotUploadBecauseExceedsFileSizeLimit: "This file could not be uploaded because it exceeds the maximum allowed size."
+cannotUploadBecauseExceedsFileSizeLimit: "This file could not be uploaded because\
+  \ it exceeds the maximum allowed size."
 beta: "Beta"
 enableAutoSensitive: "Automatic NSFW-Marking"
 enableAutoSensitiveDescription: "Allows automatic detection and marking of NSFW media\
@@ -1020,7 +1021,7 @@ customSplashIconsDescription: "URLs for custom splash screen icons separated by
   \ sure the images are on a static URL, preferably all resized to 192x192."
 showUpdates: "Show a popup when Calckey updates"
 recommendedInstances: "Recommended instances"
-recommendedInstancesDescription: "Recommended instances seperated by line breaks to\
+recommendedInstancesDescription: "Recommended instances separated by line breaks to\
   \ appear in the recommended timeline. Do NOT add `https://`, ONLY the domain."
 caption: "Auto Caption"
 splash: "Splash Screen"

From f50c10ea8c3c04ab7c2bfec19dcaddbebb3ea9c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D0=B1=D0=B5=D1=80=20=D0=BE=D0=B3=D1=83=D1=80?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BA?= <abrew1330@gmail.com>
Date: Sun, 23 Apr 2023 05:05:55 +0000
Subject: [PATCH 523/582] chore: Translated using Weblate (Russian)

Currently translated at 99.8% (1724 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ru/
---
 locales/ru-RU.yml | 132 +++++++++++++++++++++++-----------------------
 1 file changed, 67 insertions(+), 65 deletions(-)

diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index c9303490b..adddb38c0 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -147,7 +147,7 @@ cacheRemoteFilesDescription: "Когда эта настройка отключ
   \ так как не будут создаваться эскизы."
 flagAsBot: "Аккаунт бота"
 flagAsBotDescription: "Включите, если этот аккаунт управляется программой. Это позволит\
-  \ системе Misskey учитывать это, а также поможет разработчикам других ботов предотвратить\
+  \ системе Calckey учитывать это, а также поможет разработчикам других ботов предотвратить\
   \ бесконечные циклы взаимодействия."
 flagAsCat: "Аккаунт кота"
 flagAsCatDescription: "Вы получите кошачьи ушки и будете говорить как кот!"
@@ -191,7 +191,7 @@ operations: "Операции"
 software: "Программы"
 version: "Версия"
 metadata: "Метаданные"
-withNFiles: "Файлы, {n} шт."
+withNFiles: "Файлы, {n} шт"
 monitor: "Монитор"
 jobQueue: "Очередь заданий"
 cpuAndMemory: "Процессор и память"
@@ -215,7 +215,7 @@ noUsers: "Нет ни одного пользователя"
 editProfile: "Редактировать профиль"
 noteDeleteConfirm: "Вы хотите удалить эту заметку?"
 pinLimitExceeded: "Нельзя закрепить ещё больше заметок"
-intro: "Установка Misskey завершена! А теперь создайте учетную запись администратора."
+intro: "Установка Calckey завершена! А теперь создайте учетную запись администратора."
 done: "Готово"
 processing: "Обработка..."
 preview: "Предпросмотр"
@@ -403,7 +403,7 @@ exploreFediverse: "Исследуйте Fediverse"
 popularTags: "Популярные теги"
 userList: "Списки"
 about: "Описание"
-aboutMisskey: "О Misskey"
+aboutMisskey: "О Calckey"
 administrator: "Администратор"
 token: "Токен"
 twoStepAuthentication: "Двухфакторная аутентификация"
@@ -417,7 +417,7 @@ lastUsed: "Последнее использование"
 unregister: "Отписаться"
 passwordLessLogin: "Настроить вход без пароля"
 resetPassword: "Сброс пароля"
-newPasswordIs: "Новый пароль — «{password}»."
+newPasswordIs: "Новый пароль — «{password}»"
 reduceUiAnimation: "Уменьшить анимацию в пользовательском интерфейсе"
 share: "Поделиться"
 notFound: "Не найдено"
@@ -460,7 +460,7 @@ checking: "Проверка..."
 available: "Доступно"
 unavailable: "Не доступно"
 usernameInvalidFormat: "Можно использовать только латинские буквы (A—Z, a—z), цифры\
-  \ (0—9) и знак подчёркивания (_)"
+  \ (0—9) и знак подчёркивания (_)."
 tooShort: "Слишком короткий"
 tooLong: "Слишком длинный"
 weakPassword: "Слабый пароль"
@@ -531,7 +531,7 @@ objectStorageUseSSLDesc: "Отключите, если не собираетес
   \ для обмена по API"
 objectStorageUseProxy: "Использовать прокси"
 objectStorageUseProxyDesc: "Отключите, если не будете испоьзовать прокси для соединений\
-  \ по протоколу ObjectStorage."
+  \ по протоколу ObjectStorage"
 objectStorageSetPublicRead: "Устанавливать public-read при загрузке на сервер"
 serverLogs: "Журнал сервера"
 deleteAll: "Удалить всё"
@@ -560,7 +560,7 @@ ascendingOrder: "по возрастанию"
 descendingOrder: "По убыванию"
 scratchpad: "Когтеточка"
 scratchpadDescription: "«Когтеточка» — это место для опытов с AiScript. Здесь можно\
-  \ писать программы, взаимодействующие с Misskey, запускать и смотреть что из этого\
+  \ писать программы, взаимодействующие с Calckey, запускать и смотреть что из этого\
   \ получается."
 output: "Выходы"
 script: "Скрипт"
@@ -571,8 +571,8 @@ deleteAllFilesConfirm: "Вы хотите удалить все файлы?"
 removeAllFollowing: "Удалить всех подписчиков"
 removeAllFollowingDescription: "Отменить все подписки с домена {host}? Пожалуйста,\
   \ применяйте это действие, если инстанс больше не существует."
-userSuspended: "Эта учётная запись заморожена"
-userSilenced: "Этот пользователь был заглушен"
+userSuspended: "Эта учётная запись заморожена."
+userSilenced: "Этот пользователь был заглушен."
 yourAccountSuspendedTitle: "Эта учетная запись заблокирована"
 yourAccountSuspendedDescription: "Эта учетная запись была заблокирована из-за нарушения\
   \ условий предоставления услуг сервера. Свяжитесь с администратором, если вы хотите\
@@ -633,9 +633,9 @@ smtpPort: "Порт"
 smtpUser: "Имя пользователя"
 smtpPass: "Пароль"
 emptyToDisableSmtpAuth: "Не заполняйте имя пользователя и пароль, чтобы отключить\
-  \ аутентификацию в SMTP."
+  \ аутентификацию в SMTP"
 smtpSecure: "Использовать SSL/TLS для SMTP-соединений"
-smtpSecureInfo: "Выключите при использовании STARTTLS."
+smtpSecureInfo: "Выключите при использовании STARTTLS"
 testEmail: "Проверка доставки электронной почты"
 wordMute: "Скрытие слов"
 regexpError: "Ошибка в регулярном выражении"
@@ -652,7 +652,7 @@ database: "База данных"
 channel: "Каналы"
 create: "Создать"
 notificationSetting: "Настройки уведомлений"
-notificationSettingDesc: "Выберите тип уведомлений для отображения"
+notificationSettingDesc: "Выберите тип уведомлений для отображения."
 useGlobalSetting: "Использовать глобальные настройки"
 useGlobalSettingDesc: "Если включено, будут использоваться настройки учётной записи.\
   \ Если включить, этот виджет можно будет настроить индивидуально."
@@ -661,7 +661,7 @@ regenerateLoginToken: "Создать новый токен для входа"
 regenerateLoginTokenDescription: "Создаёт новый токен, используемый внутри программы\
   \ во время входа. Обычно в этом нет необходимости. При создании все устройства будут\
   \ отключены."
-setMultipleBySeparatingWithSpace: "Можно написать несколько через пробел"
+setMultipleBySeparatingWithSpace: "Можно написать несколько через пробел."
 fileIdOrUrl: "Идентификатор файла или ссылка"
 behavior: "Поведение"
 sample: "Пример"
@@ -673,7 +673,7 @@ fillAbuseReportDescription: "Опишите, пожалуйста, причин
 abuseReported: "Жалоба отправлена. Большое спасибо за информацию."
 reporteeOrigin: "О ком сообщено"
 reporterOrigin: "Кто сообщил"
-forwardReport: "Перенаправление отчета на инстант."
+forwardReport: "Перенаправление отчета на инстанс"
 forwardReportIsAnonymous: "Удаленный инстант не сможет увидеть вашу информацию и будет\
   \ отображаться как анонимная системная учетная запись."
 send: "Отправить"
@@ -724,7 +724,7 @@ disableShowingAnimatedImages: "Не проигрывать анимацию"
 verificationEmailSent: "Вам отправлено письмо для подтверждения. Пройдите, пожалуйста,\
   \ по ссылке из письма, чтобы завершить проверку."
 notSet: "Не настроено"
-emailVerified: "Адрес электронной почты подтверждён."
+emailVerified: "Адрес электронной почты подтверждён"
 noteFavoritesCount: "Количество добавленного в избранное"
 pageLikesCount: "Количество понравившихся страниц"
 pageLikedCount: "Количество страниц, понравившихся другим"
@@ -733,7 +733,7 @@ useSystemFont: "Использовать шрифт, предлагаемый с
 clips: "Подборки"
 experimentalFeatures: "Экспериментальные функции"
 developer: "Разработчик"
-makeExplorable: "Опубликовать профиль в «Обзоре»."
+makeExplorable: "Опубликовать профиль в «Обзоре»"
 makeExplorableDescription: "Если выключить, ваш профиль не будет показан в разделе\
   \ «Обзор»."
 showGapBetweenNotesInTimeline: "Показывать разделитель между заметками в ленте"
@@ -752,8 +752,8 @@ nUsers: "Пользователей: {n}"
 nNotes: "Заметок: {n}"
 sendErrorReports: "Посылать отчёты о сбоях"
 sendErrorReportsDescription: "Если включено, когда возникнет какая-нибудь техническая\
-  \ проблема, подробные сведения об этом будут отправлены разработчикам Calckey. Это\
-  \ очень помогает делать программу лучше. В отчёты попадают тип и версия ОС, браузера,\
+  \ проблема, подробные сведения об этом будут отправлены разработчикам Calckey.\n\
+  Это очень помогает делать программу лучше. В отчёты попадают тип и версия ОС, браузера,\
   \ журнал действий (что привело к сбою) и тому подобное."
 myTheme: "Личная тема"
 backgroundColor: "Фон"
@@ -783,7 +783,7 @@ emailNotification: "Уведомления по электронной почт
 publish: "Опубликовать"
 inChannelSearch: "Поиск по каналу"
 useReactionPickerForContextMenu: "Открывать палитру реакций правой кнопкой"
-typingUsers: "Стук клавиш. Это {users}…"
+typingUsers: "{users} печатает"
 jumpToSpecifiedDate: "Перейти к заданной дате"
 showingPastTimeline: "Отображается старая лента"
 clear: "Очистить"
@@ -812,15 +812,15 @@ botProtection: "Ботозащита"
 instanceBlocking: "Блокировка инстансов"
 selectAccount: "Выберите учётную запись"
 switchAccount: "Сменить учётную запись"
-enabled: "Вкл."
-disabled: "Откл."
+enabled: "Включено"
+disabled: "Отключено"
 quickAction: "Быстрое действие"
 user: "Пользователи"
 administration: "Управление"
 accounts: "Учётные записи"
 switch: "Переключение"
-noMaintainerInformationWarning: "Не заполнены сведения об администраторах"
-noBotProtectionWarning: "Ботозащита не настроена"
+noMaintainerInformationWarning: "Не заполнены сведения об администраторах."
+noBotProtectionWarning: "Ботозащита не настроена."
 configure: "Настроить"
 postToGallery: "Опубликовать в галерею"
 gallery: "Галерея"
@@ -834,7 +834,7 @@ priority: "Приоритет"
 high: "Высокий"
 middle: "Средне"
 low: "Низкий"
-emailNotConfiguredWarning: "Не указан адрес электронной почты"
+emailNotConfiguredWarning: "Не указан адрес электронной почты."
 ratio: "Соотношение"
 previewNoteText: "Предварительный просмотр"
 customCss: "Индивидуальный CSS"
@@ -849,8 +849,8 @@ hashtags: "Хэштег"
 troubleshooting: "Разрешение проблем"
 useBlurEffect: "Размытие в интерфейсе"
 learnMore: "Подробнее"
-misskeyUpdated: "Misskey обновился!"
-whatIsNew: "Что новенького?"
+misskeyUpdated: "Calckey обновился!"
+whatIsNew: "Показать изменения"
 translate: "Перевод"
 translatedFrom: "Перевод. Язык оригинала — {x}"
 accountDeletionInProgress: "В настоящее время выполняется удаление учетной записи"
@@ -888,7 +888,7 @@ hide: "Спрятать"
 leaveGroup: "Покинуть группу"
 leaveGroupConfirm: "Покинуть группу «{name}»?"
 useDrawerReactionPickerForMobile: "Выдвижная палитра на мобильном устройстве"
-welcomeBackWithName: "С возвращением, {name}!"
+welcomeBackWithName: "С возвращением, {name}"
 clickToFinishEmailVerification: "Пожалуйста, нажмите [{ok}], чтобы завершить подтверждение\
   \ адреса электронной почты."
 overridedDeviceKind: "Тип устройства"
@@ -914,7 +914,7 @@ beta: "Бета"
 enableAutoSensitive: "Автоматическое определение NSFW"
 enableAutoSensitiveDescription: "Если доступно, используйте машинное обучение для\
   \ автоматической установки флага NSFW на носителе. Даже если эта функция отключена,\
-  \ она может быть установлена ​​автоматически в зависимости от инстанта."
+  \ она может быть установлена автоматически в зависимости от инстанта."
 account: "Учётные записи"
 _sensitiveMediaDetection:
   description: "Машинное обучение может быть использовано для автоматического обнаружения\
@@ -940,7 +940,7 @@ _ffVisibility:
   followers: "Показываются только подписчикам"
   private: "Показываются только вам"
 _signup:
-  almostThere: "Почти готово!"
+  almostThere: "Почти готово"
   emailAddressInfo: "Введите ваш адрес электронной почты."
   emailSent: "На указанный вами адрес электронной почты ({email}) отправлено письмо.\
     \ Перейдите по ссылке в письме, чтобы завершить регистрацию."
@@ -966,13 +966,13 @@ _forgotPassword:
 _gallery:
   my: "Личная"
   liked: "Понравившееся"
-  like: "Нравится!"
+  like: "Нравится"
   unlike: "Отменить «нравится»"
 _email:
   _follow:
     title: "Новый подписчик"
   _receiveFollowRequest:
-    title: "Новый запрос на подписку."
+    title: "Новый запрос на подписку"
 _plugin:
   install: "Установка расширений"
   installWarn: "Пожалуйста, не устанавливайте расширения, которым не доверяете."
@@ -984,13 +984,13 @@ _registry:
   domain: "Домен"
   createKey: "Новый ключ"
 _aboutMisskey:
-  about: "Misskey — программа с открытым исходным кодом, которую разрабатывает syuilo\
-    \ с 2014 года."
+  about: "Calckey это форк Misskey, сделанный ThatOneCalculator, разработка которого\
+    \ начал с 2022."
   contributors: "Основные соавторы"
   allContributors: "Все соавторы"
   source: "Исходный код"
-  translation: "Перевод Misskey"
-  donate: "Пожертвование на Misskey"
+  translation: "Перевод Calckey"
+  donate: "Пожертвование на Calckey"
   morePatrons: "Большое спасибо и многим другим, кто принял участие в этом проекте!\
     \ \U0001F970"
   patrons: "Материальная поддержка"
@@ -1000,10 +1000,10 @@ _nsfw:
   force: "Скрывать вообще все файлы"
 _mfm:
   cheatSheet: "Подсказка по разметке MFM"
-  intro: "MFM — язык оформления текста, который придуман специально для Misskey и\
-    \ готов для применения во многих местах. На этой странице собраны и кратко изложены\
+  intro: "MFM — язык оформления текста,используемый в Misskey, Calckey, Akkoma и готов\
+    \ для применения во многих местах. На этой странице собраны и кратко изложены\
     \ способы его использовать."
-  dummy: "Misskey расширяет границы Федиверса."
+  dummy: "Calckey расширяет границы Федиверса"
   mention: "Упоминание"
   mentionDescription: "При помощи знака «собака» перед именем можно упомянуть какого-нибудь\
     \ пользователя."
@@ -1026,9 +1026,9 @@ _mfm:
     \ состоять из множества строк."
   inlineMath: "Математическое выражение (в тексте)"
   inlineMathDescription: "Позволяет вставлять математические выражения внутрь текста\
-    \ при помощи языка KaTeX."
+    \ при помощи языка KaTeX"
   blockMath: "Математическое выражение (блок)"
-  blockMathDescription: "Оформляет математическое выражение (KaTeX) на отдельной строке."
+  blockMathDescription: "Оформляет математическое выражение (KaTeX) на отдельной строке"
   quote: "Цитата"
   quoteDescription: "Так можно процитировать чей-то текст."
   emoji: "Собственные эмодзи"
@@ -1040,7 +1040,7 @@ _mfm:
   jelly: "Анимация желе (шлёп-плёп)"
   jellyDescription: "Напоминает горку джема, дёргающуюся от шлепков."
   tada: "Анимация (та-дам!)"
-  tadaDescription: "Получается нечто выпрыгивающее, как бы крича: «а вот и я!»"
+  tadaDescription: "Получается нечто выпрыгивающее, как бы крича: «а вот и я!»."
   jump: "Анимация прыжков (прыг-скок)"
   jumpDescription: "Побуждает радостно подпрыгивать."
   bounce: "Анимация отскоков (бум-бум)"
@@ -1048,7 +1048,7 @@ _mfm:
   shake: "Анимация дрожи (б-р-р-р)"
   shakeDescription: "Такое дрожит, словно от холода. Или от страха."
   twitch: "Анимация тряски"
-  twitchDescription: "Заставляет трястись как одержимого"
+  twitchDescription: "Заставляет трястись как одержимого."
   spin: "Вращение"
   spinDescription: "Так можно крутить содержимое в разных направлениях."
   x2: "Крупный шрифт"
@@ -1120,11 +1120,11 @@ _theme:
   manage: "Менеджер тем"
   code: "Код темы"
   description: "Описание"
-  installed: "Тема «{name}» установлена."
+  installed: "Тема «{name}» установлена"
   installedThemes: "Установленные темы"
   builtinThemes: "Встроенные темы"
-  alreadyInstalled: "Тема уже установлена."
-  invalid: "Формат темы некорректный."
+  alreadyInstalled: "Тема уже установлена"
+  invalid: "Формат темы некорректный"
   make: "Создать тему"
   base: "Основа"
   addConstant: "Добавить константу"
@@ -1141,9 +1141,9 @@ _theme:
   alpha: "Непрозрачность"
   darken: "Затемнение"
   lighten: "Осветление"
-  inputConstantName: "Введите имя для константы."
+  inputConstantName: "Введите имя для константы"
   importInfo: "Если вы введете код темы здесь, вы можете импортировать его в редактор\
-    \ тем."
+    \ тем"
   deleteConstantConfirm: "Вы действительно хотите удалить константу {const}?"
   keys:
     accent: "Акцент"
@@ -1216,14 +1216,14 @@ _tutorial:
   title: "Как использовать Calckey"
   step1_1: "Добро пожаловать!"
   step1_2: "Давайте настроим вас. Вы будете работать в кратчайшие сроки!"
-  step2_1: "Сначала, пожалуйста, заполните свой профиль"
+  step2_1: "Сначала, пожалуйста, заполните свой профиль."
   step2_2: "Предоставив некоторую информацию о себе, другим людям будет легче понять,\
     \ хотят ли они видеть ваши записи или следить за вами."
   step3_1: "Теперь пора следить за некоторыми людьми!"
   step3_2: "Ваша домашняя и социальная ленты основаны на том, за кем вы следите, поэтому\
     \ для начала попробуйте следить за парой аккаунтов.\nНажмите на кружок с плюсом\
     \ в правом верхнем углу профиля, чтобы следить за ним."
-  step4_1: "Давайте выйдем на вас"
+  step4_1: "Давайте выйдем на вас."
   step4_2: "Для своего первого сообщения некоторые люди любят делать {introduction}\
     \ сообщение или простое \"Hello world!\""
   step5_1: "Временные рамки, везде временные рамки!"
@@ -1231,20 +1231,20 @@ _tutorial:
   step5_3: "Главная {icon} лента - это лента, где вы можете видеть сообщения ваших\
     \ подписок и других на этом инстансе. Если вы хотите чтобы главная лента показывала\
     \ только посты ваших подписок вы можете легко это изменить в настройках!"
-  step5_4: "Местная {icon} временная шкала - это шкала, где вы можете видеть сообщения\
-    \ всех остальных пользователей данного экземпляра"
+  step5_4: "Местная {icon} лента - это лента где вы можете видеть сообщения всех остальных\
+    \ пользователей данного инстанса."
   step5_5: "Лента Социальная {icon} - это лента, где вы можете видеть посты только\
     \ от аккаунтов, на которые вы подписаны."
   step5_6: "Лента Рекомендованная {icon} это лента, где вы можете видеть посты с инстансов,\
     \ рекомендованных администраторами."
-  step5_7: "Глобальная {icon} временная шкала - это место, где вы можете видеть сообщения\
-    \ от всех других подключенных экземпляров"
+  step5_7: "Глобальная {icon} лента - это место, где вы можете видеть сообщения от\
+    \ всех других подключенных экземпляров."
   step6_1: "Итак, что это за место?"
   step6_2: "Ну, вы не просто присоединились к Кальки. Вы присоединились к порталу\
     \ в Fediverse, взаимосвязанной сети из тысяч серверов, называемых \"инстансами\"\
     ."
   step6_3: "Каждый сервер работает по-своему, и не на всех серверах работает Calckey.\
-    \ Но этот работает! Это немного сложно, но вы быстро разберетесь"
+    \ Но этот работает! Это немного сложно, но вы быстро разберетесь."
   step6_4: "Теперь идите, изучайте и развлекайтесь!"
 _2fa:
   alreadyRegistered: "Двухфакторная аутентификация уже настроена."
@@ -1295,7 +1295,7 @@ _permissions:
 _auth:
   shareAccess: "Дать доступ для «{name}» к вашей учётной записи?"
   shareAccessAsk: "Уверены, что хотите дать приложению доступ к своей учётной записи?"
-  permissionAsk: "Приложение запрашивает следующие разрешения:"
+  permissionAsk: "Приложение запрашивает следующие разрешения"
   pleaseGoBack: "Вернитесь, пожалуйста, в приложение"
   callback: "Возврат в приложение"
   denied: "Доступ закрыт"
@@ -1347,14 +1347,14 @@ _cw:
   chars: "знаков: {count}"
   files: "файлов: {count}"
 _poll:
-  noOnlyOneChoice: "Нужно хотя бы два варианта."
+  noOnlyOneChoice: "Нужно хотя бы два варианта"
   choiceN: "Выбор {n}"
   noMore: "Больше вариантов добавить нельзя"
   canMultipleVote: "Можно выбрать несколько вариантов"
   expiration: "Опрос длится"
   infinite: "вечно"
-  at: "до указанной даты"
-  after: "заданное время"
+  at: "Заканчивается..."
+  after: "Заканчивается после..."
   deadlineDate: "Дата окончания"
   deadlineTime: "Время"
   duration: "Длительность"
@@ -1382,19 +1382,19 @@ _visibility:
 _postForm:
   replyPlaceholder: "Ответ на заметку..."
   quotePlaceholder: "Пояснение к цитате..."
-  channelPlaceholder: "Отправить в канал"
+  channelPlaceholder: "Отправить в канал..."
   _placeholders:
     a: "Как дела?"
     b: "Что интересного вокруг?"
     c: "Что грызёт тебя, дружище?"
-    d: "Есть что сказать?.."
+    d: "Есть что сказать?"
     e: "Напишите что-нибудь…"
     f: "В ожидании, когда вы напишете…"
 _profile:
   name: "Имя"
   username: "Имя пользователя"
   description: "О себе"
-  youCanIncludeHashtags: "Можете использовать здесь хэштеги"
+  youCanIncludeHashtags: "Можете использовать здесь хэштеги."
   metadata: "Дополнительные сведения"
   metadataEdit: "Редактировать дополнительные сведения"
   metadataDescription: "Можно добавить до четырёх дополнительных граф в профиль."
@@ -1405,7 +1405,7 @@ _profile:
   locationDescription: Если вы сначала введете свой город, другим пользователям будет
     показано ваше местное время.
 _exportOrImport:
-  allNotes: "Все записи\n"
+  allNotes: "Все посты"
   followingList: "Подписки"
   muteList: "Скрытые"
   blockingList: "Заблокированные"
@@ -1432,7 +1432,7 @@ _instanceCharts:
   usersTotal: "Суммарное количество пользователей"
   notes: "Изменение числа заметок"
   notesTotal: "Суммарное количество заметок"
-  ff: "Изменения числа подписчиков"
+  ff: "Изменения числа подписчиков "
   ffTotal: "Суммарное количество подписчиков"
   cacheSize: "Изменения размера кэша"
   cacheSizeTotal: "Суммарный размер кэша"
@@ -1448,7 +1448,7 @@ _pages:
   newPage: "Создать страницу"
   editPage: "Править страницу"
   readPage: "Читать страницу"
-  created: "Страница успешно создана."
+  created: "Страница успешно создана"
   updated: "Страница успешно обновлена."
   deleted: "Страница успешно удалена."
   pageSetting: "Настройки страницы"
@@ -1997,3 +1997,5 @@ customKaTeXMacroDescription: 'Настройте макросы чтобы ле
   в середине определения. Недопустимые строки просто игнорируются. Поддерживаются
   только простые функции подстановки строк; расширенный синтаксис, такой как условное
   ветвление, здесь использоваться не может.'
+cannotUploadBecauseExceedsFileSizeLimit: Этот файл не может быть загружен так как
+  он превышает максимально разрешённый размер.

From 2ef30e01520fe184d05651242dce90434d68ead8 Mon Sep 17 00:00:00 2001
From: fruye <fruye@unix.dog>
Date: Sun, 23 Apr 2023 22:17:02 +0200
Subject: [PATCH 524/582] feat: Implement reading Announcements from MastoAPI

---
 .../mastodon/ApiMastodonCompatibleService.ts  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
index 48eeec79c..5374f5077 100644
--- a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
+++ b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
@@ -62,6 +62,34 @@ export function apiMastodonCompatible(router: Router): void {
 		}
 	});
 
+	router.get("/v1/announcements", async (ctx) => {
+		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+		const accessTokens = ctx.request.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens);
+		try {
+			const data = await client.getInstanceAnnouncements();
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
+
+	router.post<{ Params: { id: string } }>("/v1/announcements/:id/dismiss", async (ctx) => {
+		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+		const accessTokens = ctx.request.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens);
+		try {
+			const data = await client.dismissInstanceAnnouncement(ctx.params.id);
+			ctx.body = data.data;
+		} catch (e: any) {
+			console.error(e);
+			ctx.status = 401;
+			ctx.body = e.response.data;
+		}
+	});
+
 	router.get("/v1/filters", async (ctx) => {
 		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
 		const accessTokens = ctx.request.headers.authorization;

From 49e0399881133bfcaf6b32d41b9623d460aa68ea Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 23 Apr 2023 15:34:50 -0700
Subject: [PATCH 525/582] chore: up pakcages

---
 package.json                  |   2 +-
 packages/backend/package.json |   2 +-
 pnpm-lock.yaml                | 255 ++++++++++++++--------------------
 3 files changed, 107 insertions(+), 152 deletions(-)

diff --git a/package.json b/package.json
index 22eeb38e2..0f41e29d1 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@8.2.0",
+	"packageManager": "pnpm@8.3.1",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 4ac0d82f0..442ef5e18 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -26,7 +26,7 @@
 		"@bull-board/api": "^4.6.4",
 		"@bull-board/koa": "^4.6.4",
 		"@bull-board/ui": "^4.6.4",
-		"@calckey/megalodon": "5.1.23",
+		"@calckey/megalodon": "5.1.24",
 		"@discordapp/twemoji": "14.0.2",
 		"@elastic/elasticsearch": "7.17.0",
 		"@koa/cors": "3.4.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3281a713b..270d18647 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -81,8 +81,8 @@ importers:
         specifier: ^4.6.4
         version: 4.10.2
       '@calckey/megalodon':
-        specifier: 5.1.23
-        version: 5.1.23
+        specifier: 5.1.24
+        version: 5.1.24
       '@discordapp/twemoji':
         specifier: 14.0.2
         version: 14.0.2
@@ -349,7 +349,7 @@ importers:
         version: 2.1.0
       summaly:
         specifier: github:misskey-dev/summaly
-        version: 2.7.0
+        version: github.com/misskey-dev/summaly/c7d71a9ec2467268b3911dc2ac805c2b8a898d3e
       syslog-pro:
         specifier: 1.0.0
         version: 1.0.0
@@ -1372,8 +1372,8 @@ packages:
       '@bull-board/api': 4.10.2
     dev: false
 
-  /@calckey/megalodon@5.1.23:
-    resolution: {integrity: sha512-08/1e1q4D/6d2hYoBU6zyLXIj2cCC8/aYc1QKueGV02wGhJcOJ5Ceu01d8wGyt0bOzOmy+MIOy/1Ms3dARx2qg==}
+  /@calckey/megalodon@5.1.24:
+    resolution: {integrity: sha512-VRd6x8MFQ2pMF0rnGF67/GVxgp/92CV7lg2XT1wnPAfQZ1NTsjwlDQX3HewEW3fSG/r7Nzh5WbIBXC8WMWKs9g==}
     engines: {node: '>=15.0.0'}
     dependencies:
       '@types/oauth': 0.9.1
@@ -2564,6 +2564,7 @@ packages:
   /@sindresorhus/is@4.6.0:
     resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
     engines: {node: '>=10'}
+    dev: true
 
   /@sindresorhus/is@5.3.0:
     resolution: {integrity: sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==}
@@ -2740,6 +2741,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       defer-to-connect: 2.0.1
+    dev: true
 
   /@szmarczak/http-timer@5.0.1:
     resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==}
@@ -3047,6 +3049,7 @@ packages:
       '@types/keyv': 3.1.4
       '@types/node': 18.11.18
       '@types/responselike': 1.0.0
+    dev: true
 
   /@types/cbor@6.0.0:
     resolution: {integrity: sha512-mGQ1lbYOwVti5Xlarn1bTeBZqgY0kstsdjnkoEovgohYKdBjGejHyNGXHdMBeqyQazIv32Jjp33+5pBEaSRy2w==}
@@ -3257,6 +3260,7 @@ packages:
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
     dependencies:
       '@types/node': 18.11.18
+    dev: true
 
   /@types/koa-bodyparser@4.3.10:
     resolution: {integrity: sha512-6ae05pjhmrmGhUR8GYD5qr5p9LTEMEGfGXCsK8VaSL+totwigm8+H/7MHW7K4854CMeuwRAubT8qcc/EagaeIA==}
@@ -3519,6 +3523,7 @@ packages:
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
     dependencies:
       '@types/node': 18.11.18
+    dev: true
 
   /@types/sanitize-html@2.8.0:
     resolution: {integrity: sha512-Uih6caOm3DsBYnVGOYn0A9NoTNe1c4aPStmHC/YA2JrpP9kx//jzaRcIklFvSpvVQEcpl/ZCr4DgISSf/YxTvg==}
@@ -5063,6 +5068,7 @@ packages:
   /cacheable-lookup@5.0.4:
     resolution: {integrity: sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==}
     engines: {node: '>=10.6.0'}
+    dev: true
 
   /cacheable-lookup@7.0.0:
     resolution: {integrity: sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==}
@@ -5082,6 +5088,19 @@ packages:
       responselike: 3.0.0
     dev: false
 
+  /cacheable-request@10.2.9:
+    resolution: {integrity: sha512-CaAMr53AS1Tb9evO1BIWFnZjSr8A4pbXofpsNVWPMDZZj3ZQKHwsQG9BrTqQ4x5ZYJXz1T2b8LLtTZODxSpzbg==}
+    engines: {node: '>=14.16'}
+    dependencies:
+      '@types/http-cache-semantics': 4.0.1
+      get-stream: 6.0.1
+      http-cache-semantics: 4.1.1
+      keyv: 4.5.2
+      mimic-response: 4.0.0
+      normalize-url: 8.0.0
+      responselike: 3.0.0
+    dev: false
+
   /cacheable-request@7.0.2:
     resolution: {integrity: sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==}
     engines: {node: '>=8'}
@@ -5093,6 +5112,7 @@ packages:
       lowercase-keys: 2.0.0
       normalize-url: 6.1.0
       responselike: 2.0.1
+    dev: true
 
   /cachedir@2.3.0:
     resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==}
@@ -5271,26 +5291,28 @@ packages:
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /cheerio@0.22.0:
-    resolution: {integrity: sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==}
-    engines: {node: '>= 0.6'}
+  /cheerio-select@2.1.0:
+    resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
     dependencies:
-      css-select: 1.2.0
-      dom-serializer: 0.1.1
-      entities: 1.1.2
-      htmlparser2: 3.10.1
-      lodash.assignin: 4.2.0
-      lodash.bind: 4.2.1
-      lodash.defaults: 4.2.0
-      lodash.filter: 4.6.0
-      lodash.flatten: 4.4.0
-      lodash.foreach: 4.5.0
-      lodash.map: 4.6.0
-      lodash.merge: 4.6.2
-      lodash.pick: 4.4.0
-      lodash.reduce: 4.6.0
-      lodash.reject: 4.6.0
-      lodash.some: 4.6.0
+      boolbase: 1.0.0
+      css-select: 5.1.0
+      css-what: 6.1.0
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      domutils: 3.0.1
+    dev: false
+
+  /cheerio@1.0.0-rc.12:
+    resolution: {integrity: sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==}
+    engines: {node: '>= 6'}
+    dependencies:
+      cheerio-select: 2.1.0
+      dom-serializer: 2.0.0
+      domhandler: 5.0.3
+      domutils: 3.0.1
+      htmlparser2: 8.0.1
+      parse5: 7.1.2
+      parse5-htmlparser2-tree-adapter: 7.0.0
     dev: false
 
   /chokidar@3.5.3:
@@ -5444,6 +5466,7 @@ packages:
     resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}
     dependencies:
       mimic-response: 1.0.1
+    dev: true
 
   /clone-stats@1.0.0:
     resolution: {integrity: sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==}
@@ -5990,17 +6013,19 @@ packages:
     resolution: {integrity: sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==}
     dev: true
 
-  /css-select@1.2.0:
-    resolution: {integrity: sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==}
+  /css-select@5.1.0:
+    resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==}
     dependencies:
       boolbase: 1.0.0
-      css-what: 2.1.3
-      domutils: 1.5.1
-      nth-check: 1.0.2
+      css-what: 6.1.0
+      domhandler: 5.0.3
+      domutils: 3.0.1
+      nth-check: 2.1.1
     dev: false
 
-  /css-what@2.1.3:
-    resolution: {integrity: sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==}
+  /css-what@6.1.0:
+    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
+    engines: {node: '>= 6'}
     dev: false
 
   /cssnano@3.10.0:
@@ -6200,18 +6225,6 @@ packages:
       ms: 2.1.3
       supports-color: 8.1.1
 
-  /debug@4.3.3:
-    resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-    dev: false
-
   /debug@4.3.4(supports-color@8.1.1):
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
@@ -6426,13 +6439,6 @@ packages:
   /doctypes@1.1.0:
     resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==}
 
-  /dom-serializer@0.1.1:
-    resolution: {integrity: sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==}
-    dependencies:
-      domelementtype: 1.3.1
-      entities: 1.1.2
-    dev: false
-
   /dom-serializer@2.0.0:
     resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
     dependencies:
@@ -6446,10 +6452,6 @@ packages:
       ssr-window: 4.0.2
     dev: true
 
-  /domelementtype@1.3.1:
-    resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
-    dev: false
-
   /domelementtype@2.3.0:
     resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
 
@@ -6467,32 +6469,12 @@ packages:
       webidl-conversions: 7.0.0
     dev: false
 
-  /domhandler@2.4.2:
-    resolution: {integrity: sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==}
-    dependencies:
-      domelementtype: 1.3.1
-    dev: false
-
   /domhandler@5.0.3:
     resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
     engines: {node: '>= 4'}
     dependencies:
       domelementtype: 2.3.0
 
-  /domutils@1.5.1:
-    resolution: {integrity: sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==}
-    dependencies:
-      dom-serializer: 0.1.1
-      domelementtype: 1.3.1
-    dev: false
-
-  /domutils@1.7.0:
-    resolution: {integrity: sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==}
-    dependencies:
-      dom-serializer: 0.1.1
-      domelementtype: 1.3.1
-    dev: false
-
   /domutils@3.0.1:
     resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
     dependencies:
@@ -6617,10 +6599,6 @@ packages:
       ansi-colors: 4.1.3
     dev: true
 
-  /entities@1.1.2:
-    resolution: {integrity: sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==}
-    dev: false
-
   /entities@2.2.0:
     resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
     dev: false
@@ -7722,6 +7700,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       pump: 3.0.0
+    dev: true
 
   /get-stream@6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
@@ -7921,6 +7900,7 @@ packages:
       lowercase-keys: 2.0.0
       p-cancelable: 2.1.1
       responselike: 2.0.1
+    dev: true
 
   /got@12.5.3:
     resolution: {integrity: sha512-8wKnb9MGU8IPGRIo+/ukTy9XLJBwDiCpIf5TVzQ9Cpol50eMTpBq2GAuDsuDIz7hTYmZgMgC1e9ydr6kSDWs3w==}
@@ -7939,6 +7919,23 @@ packages:
       responselike: 3.0.0
     dev: false
 
+  /got@12.6.0:
+    resolution: {integrity: sha512-WTcaQ963xV97MN3x0/CbAriXFZcXCfgxVp91I+Ze6pawQOa7SgzwSx2zIJJsX+kTajMnVs0xcFD1TxZKFqhdnQ==}
+    engines: {node: '>=14.16'}
+    dependencies:
+      '@sindresorhus/is': 5.3.0
+      '@szmarczak/http-timer': 5.0.1
+      cacheable-lookup: 7.0.0
+      cacheable-request: 10.2.9
+      decompress-response: 6.0.0
+      form-data-encoder: 2.1.4
+      get-stream: 6.0.1
+      http2-wrapper: 2.2.0
+      lowercase-keys: 3.0.0
+      p-cancelable: 3.0.0
+      responselike: 3.0.0
+    dev: false
+
   /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
@@ -8198,17 +8195,6 @@ packages:
     resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
     dev: true
 
-  /htmlparser2@3.10.1:
-    resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
-    dependencies:
-      domelementtype: 1.3.1
-      domhandler: 2.4.2
-      domutils: 1.7.0
-      entities: 1.1.2
-      inherits: 2.0.4
-      readable-stream: 3.6.0
-    dev: false
-
   /htmlparser2@8.0.1:
     resolution: {integrity: sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==}
     dependencies:
@@ -8308,6 +8294,7 @@ packages:
     dependencies:
       quick-lru: 5.1.1
       resolve-alpn: 1.2.1
+    dev: true
 
   /http2-wrapper@2.2.0:
     resolution: {integrity: sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==}
@@ -10184,14 +10171,6 @@ packages:
     dependencies:
       p-locate: 5.0.0
 
-  /lodash.assignin@4.2.0:
-    resolution: {integrity: sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==}
-    dev: false
-
-  /lodash.bind@4.2.1:
-    resolution: {integrity: sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==}
-    dev: false
-
   /lodash.defaults@4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
 
@@ -10199,18 +10178,10 @@ packages:
     resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
     dev: false
 
-  /lodash.filter@4.6.0:
-    resolution: {integrity: sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==}
-    dev: false
-
   /lodash.flatten@4.4.0:
     resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
     dev: false
 
-  /lodash.foreach@4.5.0:
-    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
-    dev: false
-
   /lodash.get@4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
@@ -10229,10 +10200,6 @@ packages:
     resolution: {integrity: sha512-VlV0abdYZs5asSYW1JW5W1f6gxf2SGQt90rzQp7UNTQ8KwcB3CprZe5crN1LIlCA/fB5R9xecrZijGSELJL8Yg==}
     dev: false
 
-  /lodash.map@4.6.0:
-    resolution: {integrity: sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==}
-    dev: false
-
   /lodash.memoize@4.1.2:
     resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
     dev: true
@@ -10244,22 +10211,6 @@ packages:
     resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
     dev: true
 
-  /lodash.pick@4.4.0:
-    resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==}
-    dev: false
-
-  /lodash.reduce@4.6.0:
-    resolution: {integrity: sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==}
-    dev: false
-
-  /lodash.reject@4.6.0:
-    resolution: {integrity: sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==}
-    dev: false
-
-  /lodash.some@4.6.0:
-    resolution: {integrity: sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==}
-    dev: false
-
   /lodash.union@4.6.0:
     resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
     dev: false
@@ -10296,6 +10247,7 @@ packages:
   /lowercase-keys@2.0.0:
     resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}
     engines: {node: '>=8'}
+    dev: true
 
   /lowercase-keys@3.0.0:
     resolution: {integrity: sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==}
@@ -10534,6 +10486,7 @@ packages:
   /mimic-response@1.0.1:
     resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
     engines: {node: '>=4'}
+    dev: true
 
   /mimic-response@3.1.0:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
@@ -11056,6 +11009,7 @@ packages:
   /normalize-url@6.1.0:
     resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==}
     engines: {node: '>=10'}
+    dev: true
 
   /normalize-url@8.0.0:
     resolution: {integrity: sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==}
@@ -11118,8 +11072,8 @@ packages:
       '@tensorflow/tfjs': 4.2.0(seedrandom@3.0.5)
     dev: false
 
-  /nth-check@1.0.2:
-    resolution: {integrity: sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==}
+  /nth-check@2.1.1:
+    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
     dependencies:
       boolbase: 1.0.0
     dev: false
@@ -11325,6 +11279,7 @@ packages:
   /p-cancelable@2.1.1:
     resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
     engines: {node: '>=8'}
+    dev: true
 
   /p-cancelable@3.0.0:
     resolution: {integrity: sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==}
@@ -11451,6 +11406,13 @@ packages:
       parse5: 6.0.1
     dev: false
 
+  /parse5-htmlparser2-tree-adapter@7.0.0:
+    resolution: {integrity: sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==}
+    dependencies:
+      domhandler: 5.0.3
+      parse5: 7.1.2
+    dev: false
+
   /parse5@5.1.1:
     resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==}
     dev: false
@@ -12663,11 +12625,6 @@ packages:
       uuid: 3.4.0
     dev: false
 
-  /require-all@3.0.0:
-    resolution: {integrity: sha512-jPGN876lc5exWYrMcgZSd7U42P0PmVQzxnQB13fCSzmyGnqQWW4WUz5DosZ/qe24hz+5o9lSvW2epBNZ1xa6Fw==}
-    engines: {node: '>= 0.8'}
-    dev: false
-
   /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -12763,6 +12720,7 @@ packages:
     resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}
     dependencies:
       lowercase-keys: 2.0.0
+    dev: true
 
   /responselike@3.0.0:
     resolution: {integrity: sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==}
@@ -13548,24 +13506,6 @@ packages:
       '@tokenizer/token': 0.3.0
       peek-readable: 5.0.0
 
-  /summaly@2.7.0:
-    resolution: {integrity: sha512-pEz9LL8Gp0oPIQfn6TrnBCcv/HkFE14hxhH3W6LPGdopXlPXjRcMlDMJaO+VupUNMOGaMjCsjq7+0rWnu8sp7w==}
-    dependencies:
-      cheerio: 0.22.0
-      debug: 4.3.3
-      escape-regexp: 0.0.1
-      got: 11.8.5
-      html-entities: 2.3.2
-      iconv-lite: 0.6.3
-      jschardet: 3.0.0
-      koa: 2.13.4
-      private-ip: 2.3.3
-      require-all: 3.0.0
-      trace-redirect: 1.0.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /supports-color@2.0.0:
     resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}
     engines: {node: '>=0.8.0'}
@@ -15381,6 +15321,21 @@ packages:
     version: 2.2.1-misskey.3
     dev: true
 
+  github.com/misskey-dev/summaly/c7d71a9ec2467268b3911dc2ac805c2b8a898d3e:
+    resolution: {tarball: https://codeload.github.com/misskey-dev/summaly/tar.gz/c7d71a9ec2467268b3911dc2ac805c2b8a898d3e}
+    name: summaly
+    version: 4.0.2
+    dependencies:
+      cheerio: 1.0.0-rc.12
+      escape-regexp: 0.0.1
+      got: 12.6.0
+      html-entities: 2.3.2
+      iconv-lite: 0.6.3
+      jschardet: 3.0.0
+      private-ip: 2.3.3
+      trace-redirect: 1.0.6
+    dev: false
+
   github.com/sampotts/plyr/d434c9af16e641400aaee93188594208d88f2658:
     resolution: {tarball: https://codeload.github.com/sampotts/plyr/tar.gz/d434c9af16e641400aaee93188594208d88f2658}
     name: plyr

From fdb4575f157fbc3f5104ac44e4b1b85b9169ab4f Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Mon, 24 Apr 2023 19:47:56 +0000
Subject: [PATCH 526/582] fix: boost muting in the recommended timeline (#9906)

Closes: #9905
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9906
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
---
 .../src/server/api/endpoints/notes/recommended-timeline.ts     | 2 ++
 .../src/server/api/stream/channels/recommended-timeline.ts     | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
index e009233c4..56847b1dd 100644
--- a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts
@@ -11,6 +11,7 @@ import { generateRepliesQuery } from "../../common/generate-replies-query.js";
 import { generateMutedNoteQuery } from "../../common/generate-muted-note-query.js";
 import { generateChannelQuery } from "../../common/generate-channel-query.js";
 import { generateBlockedUserQuery } from "../../common/generate-block-query.js";
+import { generateMutedUserRenotesQueryForNotes } from "../../common/generated-muted-renote-query.js";
 
 export const meta = {
 	tags: ["notes"],
@@ -99,6 +100,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (user) generateMutedUserQuery(query, user);
 	if (user) generateMutedNoteQuery(query, user);
 	if (user) generateBlockedUserQuery(query, user);
+	if (user) generateMutedUserRenotesQueryForNotes(query, user);
 
 	if (ps.withFiles) {
 		query.andWhere("note.fileIds != '{}'");
diff --git a/packages/backend/src/server/api/stream/channels/recommended-timeline.ts b/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
index 28e57ef53..6baec7744 100644
--- a/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
@@ -69,6 +69,9 @@ export default class extends Channel {
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.blocking)) return;
 
+		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
+			return;
+
 		// 流れてきたNoteがミュートすべきNoteだったら無視する
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、

From 2b033a813fbd65c4a98e9f721529544e7eaf9472 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 24 Apr 2023 15:45:34 -0700
Subject: [PATCH 527/582] revert messaging room

---
 .../mastodon/ApiMastodonCompatibleService.ts  |  29 +--
 .../src/pages/messaging/messaging-room.vue    | 193 +++++++++---------
 2 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
index 5374f5077..e8dfe5281 100644
--- a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
+++ b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
@@ -76,19 +76,22 @@ export function apiMastodonCompatible(router: Router): void {
 		}
 	});
 
-	router.post<{ Params: { id: string } }>("/v1/announcements/:id/dismiss", async (ctx) => {
-		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
-		const accessTokens = ctx.request.headers.authorization;
-		const client = getClient(BASE_URL, accessTokens);
-		try {
-			const data = await client.dismissInstanceAnnouncement(ctx.params.id);
-			ctx.body = data.data;
-		} catch (e: any) {
-			console.error(e);
-			ctx.status = 401;
-			ctx.body = e.response.data;
-		}
-	});
+	router.post<{ Params: { id: string } }>(
+		"/v1/announcements/:id/dismiss",
+		async (ctx) => {
+			const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
+			const accessTokens = ctx.request.headers.authorization;
+			const client = getClient(BASE_URL, accessTokens);
+			try {
+				const data = await client.dismissInstanceAnnouncement(ctx.params.id);
+				ctx.body = data.data;
+			} catch (e: any) {
+				console.error(e);
+				ctx.status = 401;
+				ctx.body = e.response.data;
+			}
+		},
+	);
 
 	router.get("/v1/filters", async (ctx) => {
 		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 34361ba75..771d590bb 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -1,93 +1,94 @@
 <template>
-	<MkStickyContainer>
-		<template #header
-			><MkPageHeader
-				:actions="headerActions"
-				:tabs="headerTabs"
-				:display-back-button="true"
-		/></template>
-		<MkSpacer :content-max="800" class="mk-messaging-room">
-			<div class="body">
-				<MkPagination
-					v-if="pagination"
-					ref="pagingComponent"
-					:key="userAcct || groupId"
-					:pagination="pagination"
-				>
-					<template #empty>
-						<div class="_fullinfo">
-							<img
-								src="/static-assets/badges/info.png"
-								class="_ghost"
-								alt="Info"
-							/>
-							<div>{{ i18n.ts.noMessagesYet }}</div>
-						</div>
-					</template>
-					<template
-						#default="{ items: messages, fetching: pFetching }"
+	<div
+		ref="rootEl"
+		class="_section"
+		@dragover.prevent.stop="onDragover"
+		@drop.prevent.stop="onDrop"
+	>
+		<div class="_content mk-messaging-room">
+			<MkSpacer :content-max="800">
+				<div class="body">
+					<MkPagination
+						v-if="pagination"
+						ref="pagingComponent"
+						:key="userAcct || groupId"
+						:pagination="pagination"
 					>
-						<XList
-							v-if="messages.length > 0"
-							v-slot="{ item: message }"
-							:class="{
-								messages: true,
-								'deny-move-transition': pFetching,
-							}"
-							:items="messages"
-							direction="up"
-							reversed
-						>
-							<XMessage
-								:key="message.id"
-								:message="message"
-								:is-group="group != null"
-							/>
-						</XList>
-					</template>
-				</MkPagination>
-			</div>
-			<footer>
-				<div v-if="typers.length > 0" class="typers">
-					<I18n
-						:src="i18n.ts.typingUsers"
-						text-tag="span"
-						class="users"
-					>
-						<template #users>
-							<b
-								v-for="typer in typers"
-								:key="typer.id"
-								class="user"
-								>{{ typer.username }}</b
-							>
+						<template #empty>
+							<div class="_fullinfo">
+								<img
+									src="/static-assets/badges/info.png"
+									class="_ghost"
+									alt="Info"
+								/>
+								<div>{{ i18n.ts.noMessagesYet }}</div>
+							</div>
 						</template>
-					</I18n>
-					<MkEllipsis />
-				</div>
-				<transition :name="animation ? 'fade' : ''">
-					<div v-show="showIndicator" class="new-message">
-						<button
-							class="_buttonPrimary"
-							@click="onIndicatorClick"
+						<template
+							#default="{ items: messages, fetching: pFetching }"
 						>
-							<i
-								class="fas ph-fw ph-lg ph-arrow-circle-down ph-bold ph-lg"
-							></i
-							>{{ i18n.ts.newMessageExists }}
-						</button>
+							<XList
+								v-if="messages.length > 0"
+								v-slot="{ item: message }"
+								:class="{
+									messages: true,
+									'deny-move-transition': pFetching,
+								}"
+								:items="messages"
+								direction="up"
+								reversed
+							>
+								<XMessage
+									:key="message.id"
+									:message="message"
+									:is-group="group != null"
+								/>
+							</XList>
+						</template>
+					</MkPagination>
+				</div>
+				<footer>
+					<div v-if="typers.length > 0" class="typers">
+						<I18n
+							:src="i18n.ts.typingUsers"
+							text-tag="span"
+							class="users"
+						>
+							<template #users>
+								<b
+									v-for="typer in typers"
+									:key="typer.id"
+									class="user"
+									>{{ typer.username }}</b
+								>
+							</template>
+						</I18n>
+						<MkEllipsis />
 					</div>
-				</transition>
-				<XForm
-					v-if="!fetching"
-					ref="formEl"
-					:user="user"
-					:group="group"
-					class="form"
-				/>
-			</footer>
-		</MkSpacer>
-	</MkStickyContainer>
+					<transition :name="animation ? 'fade' : ''">
+						<div v-show="showIndicator" class="new-message">
+							<button
+								class="_buttonPrimary"
+								@click="onIndicatorClick"
+							>
+								<i
+									class="fas ph-fw ph-lg ph-arrow-circle-down-bold ph-lg"
+								></i
+								>{{ i18n.ts.newMessageExists }}
+							</button>
+						</div>
+					</transition>
+					<XForm
+						v-if="!fetching"
+						ref="formEl"
+						:user="user"
+						:group="group"
+						class="form"
+					/>
+				</footer>
+			</MkSpacer>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -327,12 +328,14 @@ function onVisibilitychange() {
 	}
 }
 
-const headerActions = $computed(() => []);
-
-const headerTabs = $computed(() => []);
-
 onMounted(() => {
 	fetch();
+	definePageMetadata(
+		computed(() => ({
+			title: group != null ? group.name : user?.name,
+			icon: "ph-chats-teardrop-bold ph-lg",
+		}))
+	);
 });
 
 onBeforeUnmount(() => {
@@ -340,15 +343,6 @@ onBeforeUnmount(() => {
 	document.removeEventListener("visibilitychange", onVisibilitychange);
 	if (scrollRemove) scrollRemove();
 });
-
-await fetch();
-definePageMetadata(
-	computed(() => ({
-		title: group != null ? group.name : user?.name,
-		icon: "ph-chats-teardrop ph-bold ph-lg",
-		avatar: group != null ? null : user,
-	}))
-);
 </script>
 
 <style lang="scss" scoped>
@@ -357,6 +351,9 @@ XMessage:last-of-type {
 }
 
 .mk-messaging-room {
+	position: relative;
+	overflow: auto;
+
 	> .body {
 		.more {
 			display: block;

From f6d1fa8519d7ba516d0f4b89e37aa337732d892f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 25 Apr 2023 08:31:05 -0700
Subject: [PATCH 528/582] throw different error if following is null

---
 .../backend/src/server/api/endpoints/users/following.ts    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts
index 967379d0c..fbfaf6173 100644
--- a/packages/backend/src/server/api/endpoints/users/following.ts
+++ b/packages/backend/src/server/api/endpoints/users/following.ts
@@ -37,6 +37,11 @@ export const meta = {
 			code: "FORBIDDEN",
 			id: "f6cdb0df-c19f-ec5c-7dbb-0ba84a1f92ba",
 		},
+		cannot_find: {
+			message: "Cannot find the following.",
+			code: "CANNOT_FIND",
+			id: "7a55f0d7-8e06-4a7e-9c77-ee7d59b25a82",
+		}
 	},
 } as const;
 
@@ -97,7 +102,7 @@ export default define(meta, paramDef, async (ps, me) => {
 				followerId: me.id,
 			});
 			if (following == null) {
-				throw new ApiError(meta.errors.forbidden);
+				throw new ApiError(meta.errors.cannot_find);
 			}
 		}
 	}

From edbeff46dbb6e8334a5c18d07ff2eca65576df68 Mon Sep 17 00:00:00 2001
From: phoslash <phoslash@noreply.codeberg.org>
Date: Tue, 25 Apr 2023 18:34:19 +0000
Subject: [PATCH 529/582] Fix typo in migration docs

---
 docs/migrate.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/migrate.md b/docs/migrate.md
index 1a8dfbf37..07a5fea07 100644
--- a/docs/migrate.md
+++ b/docs/migrate.md
@@ -79,4 +79,4 @@ NODE_ENV=production pnpm run migrate
 
 ## Reverse
 
-You ***cannot*** migrate back to Misskey from Calckey due to re-hashing passwords on signin with argon2. You can migrate from to Calckey to Foundkey, though.
+You ***cannot*** migrate back to Misskey from Calckey due to re-hashing passwords on signin with argon2. You can migrate from Calckey to Foundkey, though.

From 646c2a4974f632f23f82756c5b31872d49d39653 Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Tue, 25 Apr 2023 14:09:59 +0000
Subject: [PATCH 530/582] chore: Translated using Weblate (Catalan)

Currently translated at 22.9% (396 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
---
 locales/ca-ES.yml | 296 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 285 insertions(+), 11 deletions(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 360ef4c22..3de877dbe 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1,7 +1,8 @@
----
 _lang_: "Català"
-headlineMisskey: "Una xarxa connectada per notes"
-introMisskey: "Benvingut! Misskey és un servei de microblogging descentralitzat de codi obert.\nCrea \"notes\" per compartir els teus pensaments amb tots els que t'envolten. 📡\nAmb \"reaccions\", també pots expressar ràpidament els teus sentiments sobre les notes de tothom. 👍\nExplorem un món nou! 🚀"
+headlineMisskey: "Una xarxa social de codi obert, descentralitzada i gratuita per\
+  \ sempre \U0001F680"
+introMisskey: "Benvinguts! Calckey es una plataforma social de codi obert,  descentralitzada\
+  \ i gratuita per sempre! \U0001F680"
 monthAndDay: "{day}/{month}"
 search: "Cercar"
 notifications: "Notificacions"
@@ -13,7 +14,7 @@ ok: "OK"
 gotIt: "Ho he entès!"
 cancel: "Cancel·lar"
 enterUsername: "Introdueix el teu nom d'usuari"
-renotedBy: "Resignat per {usuari}"
+renotedBy: "Resignat per {user}"
 noNotes: "Cap nota"
 noNotifications: "Cap notificació"
 instance: "Instàncies"
@@ -44,7 +45,8 @@ copyContent: "Copiar el contingut"
 copyLink: "Copiar l'enllaç"
 delete: "Eliminar"
 deleteAndEdit: "Esborrar i editar"
-deleteAndEditConfirm: "Estàs segur que vols suprimir aquesta nota i editar-la? Perdràs totes les reaccions, notes i respostes."
+deleteAndEditConfirm: "Estàs segur que vols suprimir aquesta nota i editar-la? Perdràs\
+  \ totes les reaccions, notes i respostes."
 addToList: "Afegir a una llista"
 sendMessage: "Enviar un missatge"
 copyUsername: "Copiar nom d'usuari"
@@ -57,15 +59,17 @@ receiveFollowRequest: "Sol·licitud de seguiment rebuda"
 followRequestAccepted: "Sol·licitud de seguiment acceptada"
 mention: "Menció"
 mentions: "Mencions"
-directNotes: "Notes directes"
+directNotes: "Missatges directes"
 importAndExport: "Importar / Exportar"
 import: "Importar"
 export: "Exportar"
 files: "Fitxers"
 download: "Baixar"
-driveFileDeleteConfirm: "Estàs segur que vols suprimir el fitxer \"{name}\"? Les notes associades a aquest fitxer adjunt també se suprimiran."
+driveFileDeleteConfirm: "Estàs segur que vols suprimir el fitxer \"{name}\"? Les notes\
+  \ associades a aquest fitxer adjunt també se suprimiran."
 unfollowConfirm: "Estàs segur que vols deixar de seguir {name}?"
-exportRequested: "Has sol·licitat una exportació. Això pot trigar una estona. S'afegirà a la teva unitat un cop completat."
+exportRequested: "Has sol·licitat una exportació. Això pot trigar una estona. S'afegirà\
+  \ a la teva unitat un cop completat."
 importRequested: "Has sol·licitat una importació. Això pot trigar una estona."
 lists: "Llistes"
 noLists: "No tens cap llista"
@@ -80,9 +84,12 @@ error: "Error"
 somethingHappened: "S'ha produït un error"
 retry: "Torna-ho a intentar"
 pageLoadError: "S'ha produït un error en carregar la pàgina"
-pageLoadErrorDescription: "Això normalment es deu a errors de xarxa o a la memòria cau del navegador. Prova d'esborrar la memòria cau i torna-ho a provar després d'esperar una estona."
+pageLoadErrorDescription: "Això normalment es deu a errors de xarxa o a la memòria\
+  \ cau del navegador. Prova d'esborrar la memòria cau i torna-ho a provar després\
+  \ d'esperar una estona."
 serverIsDead: "Aquest servidor no respon. Espera una estona i torna-ho a provar."
-youShouldUpgradeClient: "Per veure aquesta pàgina, actualitzeu-la per actualitzar el vostre client."
+youShouldUpgradeClient: "Per veure aquesta pàgina, actualitzeu-la per actualitzar\
+  \ el vostre client."
 enterListName: "Introdueix un nom per a la llista"
 privacy: "Privadesa"
 makeFollowManuallyApprove: "Les sol·licituds de seguiment requereixen aprovació"
@@ -107,7 +114,8 @@ sensitive: "NSFW"
 add: "Afegir"
 reaction: "Reaccions"
 reactionSetting: "Reaccions a mostrar al selector de reaccions"
-reactionSettingDescription2: "Arrossega per reordenar, fes clic per suprimir, prem \"+\" per afegir."
+reactionSettingDescription2: "Arrossega per reordenar, fes clic per suprimir, prem\
+  \ \"+\" per afegir."
 rememberNoteVisibility: "Recorda la configuració de visibilitat de les notes"
 attachCancel: "Eliminar el fitxer adjunt"
 markAsSensitive: "Marcar com a NSFW"
@@ -195,3 +203,269 @@ _deck:
     tl: "Línia de temps"
     list: "Llistes"
     mentions: "Mencions"
+blockConfirm: Estás segur que vols bloquejar aquest compte?
+unsuspendConfirm: Estás segur que vols treure la suspensió d'aquesta compte?
+unblockConfirm: Estás segur que vols treure el bloqueig d'aquesta compte?
+suspendConfirm: Estás segur que vols suspendre aquesta compte?
+selectList: Selecciona una llista
+selectAntenna: Selecciona una antena
+selectWidget: Selecciona un giny
+editWidgets: Edita ginys
+editWidgetsExit: Fet
+customEmojis: Emoji personalitzat
+cacheRemoteFilesDescription: Quant aquesta opció es deshabilitada, els fitxers remots
+  es carregant directament de l'instància remota. Deshabilitar això farà que baixi
+  l'ús d'emmagatzematge, però incrementa el tràfic, perquè les previsualitzacions
+  no es generarán.
+flagAsBot: Marca aquest compte com un bot
+flagAsBotDescription: Activa aquesta opció si aquest compte és controlat per un programa.
+  Si s'activa, això actuarà com una bandera per a altres desenvolupadors i prevenir
+  cadenes de interaccions infinites amb altres bots a més d'ajustar els sistemes interns
+  de Calckey per tractar aquest compte com un bot.
+flagAsCat: Ets un gat? 🐱
+flagShowTimelineReplies: Mostrar respostes a la línea de temps
+flagAsCatDescription: Guanyaràs unes orelles de gat i parlares com un gat!
+flagShowTimelineRepliesDescription: Mostrará respostes d'usuaris a notes d'altres
+  usuaris si s'activa.
+general: General
+autoAcceptFollowed: Aprova automàticament les peticions de seguiment d'usuaris que
+  segueixes
+accountMoved: "L'usuari s'ha mogut a un compte nou:"
+addAccount: Afegir compte
+loginFailed: No s'ha pogut iniciar sessió
+showOnRemote: Veure a l'instància remota
+wallpaper: Fons de pantalla
+setWallpaper: Estableix fons de pantalla
+removeWallpaper: Esborra fons de pantalla
+followConfirm: Segur que vols seguir a l'usuari {name}?
+proxyAccount: Compte proxy
+proxyAccountDescription: Un compte proxy es un compte que actua com un seguidor remot
+  per a usuaris sota determinades condicions. Per exemple, quant un usuari afegeix
+  un usuari remot a la llista, l'activitat de l'usuari remot no serà entregada a l'instància
+  si cap usuari local el segueix, així el compte proxy el seguirà.
+host: Amfitrió
+selectUser: Selecciona un usuari
+latestStatus: Últim estat
+storageUsage: Ús del emmagatzematge
+metadata: Metadata
+withNFiles: '{n} fitxer(s)'
+monitor: Seguiment
+software: Programari
+version: Versió
+jobQueue: Cua de Feina
+cpuAndMemory: CPU i Memòria
+network: Xarxa
+disk: Disc
+instanceInfo: Informació de l'instància
+statistics: Estadístiques
+clearCachedFiles: Neteja memòria cau
+clearQueueConfirmText: Qualsevol nota que continuï a la cua sense entrega no será
+  federada. Normalment aquesta operació no es necessària.
+clearCachedFilesConfirm: Segur que vols esborrar els fitxers remots de la memòria
+  cau?
+blockedUsers: Usuaris blocats
+noUsers: No hi han usuaris
+editProfile: Editar perfil
+noteDeleteConfirm: Segur que vols esborrar aquesta nota?
+pinLimitExceeded: No pots fixar més notes
+muteAndBlock: Silenciats i Bloquejats
+mutedUsers: Usuaris silenciats
+done: Fet
+preview: Vista prèvia
+default: Per defecte
+intro: La instalació de Calckey a acabat! Si us plau crea un compte d'usuari.
+processing: Processant...
+noCustomEmojis: No hi ha emoji
+noJobs: No hi han feines
+federating: Federant
+blocked: Bloquejat
+subscribing: Subscrivint
+publishing: Publicant
+notResponding: Sense resposta
+instanceUsers: Usuaris d'aquesta instància
+instanceFollowing: Seguint a l'instància
+instanceFollowers: Seguidors de l'instància
+security: Seguretat
+newPasswordRetype: Torna a entrar la nova contrasenya
+more: Més!
+featured: Destacat
+usernameOrUserId: Nom d'usuari o id d'usuari
+noSuchUser: No s'ha trobat l'usuari
+lookup: Cercar
+attachFile: Afegeix un arxiu
+currentPassword: Contrasenya actual
+newPassword: Nova contrasenya
+announcements: Anuncis
+imageUrl: URL de la imatge
+removed: S'ha esborrat correctament
+removeAreYouSure: Segur que vols esborrar "{x}"?
+deleteAreYouSure: Segur que vols esborrar "{x}"?
+resetAreYouSure: Restablir? Segur?
+fromUrl: Des de URL
+saved: Desat
+messaging: Xat
+upload: Pujar
+keepOriginalUploading: Desa imatge original
+keepOriginalUploadingDescription: Desa la imatge original pujada tal com es. Si es
+  desactiva, es generarà una versió per mostrar en la web al pujar.
+fromDrive: Des de Drive
+uploadFromUrl: Puja des de una adreça URL
+uploadFromUrlDescription: Adreça URL del fitxer que vols pujar
+uploadFromUrlRequested: Pujada demanada
+noMoreHistory: S'ha acabat la historia
+tos: Termes d'us
+start: Començar
+startMessaging: Comença un nou xat
+manageGroups: Gestiona els grups
+nUsersRead: llegit per {n}
+agreeTo: Estic d'acord amb {0}
+activity: Activitat
+home: Inici
+remoteUserCaution: L'informació d'usuaris remots pot estar incompleta.
+themeForDarkMode: En Mode Fosc fes servir el tema
+light: Clar
+registeredDate: Data de registre
+dark: Fosc
+lightThemes: Temes clars
+location: Lloc
+theme: Temes
+themeForLightMode: En Mode Clar fes servir el tema
+drive: Disc
+selectFile: Tria un fitxer
+selectFiles: Tria fitxers
+darkThemes: Temes foscos
+syncDeviceDarkMode: Sincronitza el Mode Fosc amb la configuració del teu dispositiu
+fileName: Nom del fitxer
+createFolder: Crea una carpeta
+renameFolder: Posa un nom nou a aquesta carpeta
+deleteFolder: Esborra aquesta carpeta
+selectFolder: Tria una carpeta
+selectFolders: Tria carpetes
+renameFile: Canvia el nom del fitxer
+folderName: Nom de la carpeta
+inputNewFolderName: Escriu un nou nom per la carpeta
+addFile: Afegeix un fitxer
+emptyDrive: El teu Disc és buit
+emptyFolder: Aquesta carpeta és buida
+unableToDelete: No es pot esborrar
+inputNewFileName: Escriu un nou nom per al fitxer
+inputNewDescription: Escriu una nova descripció
+circularReferenceFolder: La carpeta de destí es una subcarpeta de la carpeta que vols
+  moure.
+hasChildFilesOrFolders: Degut a que aquesta carpeta no es buida, no es pot esborrar.
+whenServerDisconnected: Quant es perd la conexió amb el servidor
+disconnectedFromServer: S'ha perdut la conexió al servidor
+reload: Torna a carregar
+avatar: Avatar
+banner: Banner
+doNothing: Ignora
+reloadConfirm: Vols tornar a carregar la línea temporal?
+watch: Veure
+maintainerName: Administrador
+maintainerEmail: Correu electrònic de l'administrador
+instanceName: Nom de l'instància
+instanceDescription: Descripció de l'instància
+today: Avui
+dayX: '{day}'
+tosUrl: Adreça URL dels terminis d'ús
+thisYear: Any
+thisMonth: Mes
+integration: Integracions
+driveCapacityPerRemoteAccount: Capacitat del Disc per usuari remot
+inMb: En megabytes
+iconUrl: Adreça URL de la icona
+enableRegistration: Activa el registre d'usuaris nous
+invite: Convidar
+driveCapacityPerLocalAccount: Capacitat del Disc per usuari local
+bannerUrl: Adreça URL del banner
+backgroundImageUrl: Adreça URL del fons de pantalla
+basicInfo: Informació bàsica
+pinnedPages: Pàgines fixades
+pinnedUsersDescription: Llista de noms d'usuaris per fixar a la pestanya "Explorar"
+  Un nom per línea.
+pinnedPagesDescription: Introdueix la ruta a les pàgines que vols fixar a la página
+  principal d'aquesta instància, una ruta per línea.
+pinnedUsers: Usuaris fixats
+enableHcaptcha: Activa hCaptcha
+hcaptchaSiteKey: Clau del lloc
+hcaptchaSecretKey: Clau secreta
+recaptcha: reCAPTCHA
+enableGlobalTimeline: Activa la línea de temps global
+disablingTimelinesInfo: Els Administradors i Moderadors sempre tenen accés a totes
+  les líneas temporals, inclòs si hi són desactivades.
+showLess: Tanca
+clearQueue: Neteja cua
+uploadFromUrlMayTakeTime: Pot trigar un temps fins que la pujada es completi.
+noThankYou: No, gràcies
+addInstance: Afegeix una instància
+emoji: Emoji
+emojis: Emoji
+emojiName: Nom del emoji
+emojiUrl: URL del emoji
+addEmoji: Afegir
+settingGuide: Configuració recomenada
+searchWith: 'Buscar: {q}'
+youHaveNoLists: No tens cap llista
+flagSpeakAsCat: Parla com un gat
+selectInstance: Selecciona una instància
+flagSpeakAsCatDescription: Les teves notes es transformaran en miols quant estiguis
+  en mode gat
+recipient: Destinatari(s)
+annotation: Comentaris
+blockedInstances: Instàncies Bloquejades
+blockedInstancesDescription: Llista les adreces de les instàncies que vols bloquejar.
+  Les instàncies de la llista no podrán comunicarse amb aquesta instància.
+hiddenTags: Etiquetes Ocultes
+hiddenTagsDescription: 'Llista de les etiquetes (sense el #) que vulguis amagar de
+  les tendències i el explorador. Les etiquetes amagades es poden descobrir per altres
+  mitjans.'
+noInstances: No hi han instàncies
+defaultValueIs: 'Per defecte: {value}'
+suspended: Suspès
+all: Tot
+changePassword: Canvia la contrasenya
+clearQueueConfirmTitle: Segur que vols netejar la cua?
+retypedNotMatch: Els camps no coincideixen.
+normal: Normal
+monthX: '{month}'
+enableRecaptcha: Activa reCAPTCHA
+recaptchaSiteKey: Clau del lloc
+recaptchaSecretKey: Clau secreta
+avoidMultiCaptchaConfirm: Fent servir diferents sistemes de Captcha pot causar interferències
+  entre ells. Vols desactivar els altres sistemes que es troben activats? Si vols
+  deixar-los activats fes clic a cancelar.
+antennas: Antenes
+enableEmojiReactions: Activa reaccions amb emojis
+blockThisInstance: Bloqueja aquesta instància
+registration: Registre
+showEmojisInReactionNotifications: Mostra els emojis a les notificacions de les reaccions
+renoteMute: Silencia les renotas
+renoteUnmute: Treu el silenci a les renotas
+cacheRemoteFiles: Fitxers remots a la memoria cau
+federation: Federació
+registeredAt: Registrat a
+latestRequestSentAt: Última petició enviada
+latestRequestReceivedAt: Última petició rebuda
+charts: Gràfics
+perHour: Per Hora
+perDay: Per Dia
+stopActivityDelivery: Para d'enviar activitats
+operations: Operacions
+explore: Explorar
+messageRead: Llegir
+images: Imatges
+birthday: Aniversari
+yearsOld: '{age} anys'
+copyUrl: Copiar l'adreça URL
+rename: Renombrar
+unwatch: Deixa de veure
+accept: Acceptar
+reject: Rebutja
+yearX: '{year}'
+pages: Pàgines
+disconnectService: Desconnectar
+connectService: Connectar
+enableLocalTimeline: Activa la línea de temps local
+enableRecommendedTimeline: Activa la línea de temps de recomanats
+pinnedClipId: ID del clip que vols fixar
+hcaptcha: hCaptcha

From ff7adf7c9d6988ed0bac5be64b659834ce4b1d7e Mon Sep 17 00:00:00 2001
From: Ettore Atalan <atalanttore@googlemail.com>
Date: Tue, 25 Apr 2023 19:09:37 +0000
Subject: [PATCH 531/582] chore: Translated using Weblate (German)

Currently translated at 94.6% (1634 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 427 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 300 insertions(+), 127 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index a51bc0c48..52d11605c 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1,7 +1,10 @@
----
 _lang_: "Deutsch"
 headlineMisskey: "Ein durch Posts verbundenes Netzwerk"
-introMisskey: "Willkommen! Calckey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse „Posts“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen zu teilen. 📡\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle über Posts anderer Benutzer zum Ausdruck bringen. 👍\nEine neue Welt wartet auf dich! 🚀"
+introMisskey: "Willkommen! Calckey ist eine dezentralisierte Open-Source Microblogging-Platform.\n\
+  Verfasse „Posts“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen\
+  \ zu teilen. \U0001F4E1\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle\
+  \ über Posts anderer Benutzer zum Ausdruck bringen. \U0001F44D\nEine neue Welt wartet\
+  \ auf dich! \U0001F680"
 monthAndDay: "{day}.{month}."
 search: "Suchen"
 notifications: "Benachrichtigungen"
@@ -44,7 +47,8 @@ copyContent: "Inhalt kopieren"
 copyLink: "Link kopieren"
 delete: "Löschen"
 deleteAndEdit: "Löschen und Bearbeiten"
-deleteAndEditConfirm: "Möchtest du diese Notiz wirklich löschen und bearbeiten? Alle Reaktionen, Renotes und Antworten dieser Notiz werden verloren gehen."
+deleteAndEditConfirm: "Möchtest du diese Notiz wirklich löschen und bearbeiten? Alle\
+  \ Reaktionen, Renotes und Antworten dieser Notiz werden verloren gehen."
 addToList: "Zu Liste hinzufügen"
 sendMessage: "Nachricht senden"
 copyUsername: "Benutzernamen kopieren"
@@ -64,10 +68,13 @@ import: "Import"
 export: "Export"
 files: "Dateien"
 download: "Herunterladen"
-driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Notizen mit dieser Datei werden ebenso verschwinden."
+driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Notizen\
+  \ mit dieser Datei werden ebenso verschwinden."
 unfollowConfirm: "Möchtest du {name} nicht mehr folgen?"
-exportRequested: "Du hast einen Export angefragt. Dies kann etwas Zeit in Anspruch nehmen. Sobald der Export abgeschlossen ist, wird er deiner Drive hinzugefügt."
-importRequested: "Du hast einen Import angefragt. Dies kann etwas Zeit in Anspruch nehmen."
+exportRequested: "Du hast einen Export angefragt. Dies kann etwas Zeit in Anspruch\
+  \ nehmen. Sobald der Export abgeschlossen ist, wird er deiner Drive hinzugefügt."
+importRequested: "Du hast einen Import angefragt. Dies kann etwas Zeit in Anspruch\
+  \ nehmen."
 lists: "Listen"
 noLists: "Keine Listen gefunden"
 note: "Notiz"
@@ -81,9 +88,13 @@ error: "Fehler"
 somethingHappened: "Ein Fehler ist aufgetreten"
 retry: "Wiederholen"
 pageLoadError: "Die Seite konnte nicht geladen werden."
-pageLoadErrorDescription: "Dieser Fehler wird meist durch Netzwerkfehler oder den Browser-Cache verursacht. Bitte leere den Cache oder versuche es nach einiger Zeit erneut."
-serverIsDead: "Dieser Server antwortet nicht. Bitte warte einen Moment und versuche es dann erneut."
-youShouldUpgradeClient: "Bitte aktualisiere diese Seite, um eine neuere Version deines Clients zu verwenden."
+pageLoadErrorDescription: "Dieser Fehler wird meist durch Netzwerkfehler oder den\
+  \ Browser-Cache verursacht. Bitte leere den Cache oder versuche es nach einiger\
+  \ Zeit erneut."
+serverIsDead: "Dieser Server antwortet nicht. Bitte warte einen Moment und versuche\
+  \ es dann erneut."
+youShouldUpgradeClient: "Bitte aktualisiere diese Seite, um eine neuere Version deines\
+  \ Clients zu verwenden."
 enterListName: "Listennamen eingeben"
 privacy: "Privatsphäre"
 makeFollowManuallyApprove: "Follow-Anfragen benötigen Bestätigung"
@@ -108,7 +119,8 @@ sensitive: "NSFW"
 add: "Hinzufügen"
 reaction: "Reaktionen"
 reactionSetting: "In der Reaktionsauswahl anzuzeigende Reaktionen"
-reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“ um hinzuzufügen"
+reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“\
+  \ um hinzuzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
 attachCancel: "Anhang entfernen"
 markAsSensitive: "Als NSFW markieren"
@@ -138,13 +150,21 @@ emojiUrl: "Emoji-URL"
 addEmoji: "Emoji hinzufügen"
 settingGuide: "Empfohlene Einstellung"
 cacheRemoteFiles: "Dateien von fremden Instanzen im Cache speichern"
-cacheRemoteFilesDescription: "Ist diese Einstellung deaktiviert, so werden Dateien fremder Instanzen direkt von dort geladen. Hierdurch wird Speicherplatz auf diesem Server gespart, aber durch fehlende Generierung von Vorschaubildern mehr Bandbreite verwendet."
+cacheRemoteFilesDescription: "Ist diese Einstellung deaktiviert, so werden Dateien\
+  \ fremder Instanzen direkt von dort geladen. Hierdurch wird Speicherplatz auf diesem\
+  \ Server gespart, aber durch fehlende Generierung von Vorschaubildern mehr Bandbreite\
+  \ verwendet."
 flagAsBot: "Als Bot markieren"
-flagAsBotDescription: "Aktiviere diese Option, falls dieses Benutzerkonto durch ein Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Misskeys interne Systeme dieses Benutzerkonto als Bot behandeln."
+flagAsBotDescription: "Aktiviere diese Option, falls dieses Benutzerkonto durch ein\
+  \ Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler\
+  \ zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Misskeys\
+  \ interne Systeme dieses Benutzerkonto als Bot behandeln."
 flagAsCat: "Als Katze markieren"
-flagAsCatDescription: "Aktiviere diese Option, um dieses Benutzerkonto als Katze zu markieren."
+flagAsCatDescription: "Aktiviere diese Option, um dieses Benutzerkonto als Katze zu\
+  \ markieren."
 flagShowTimelineReplies: "Antworten in der Chronik anzeigen"
-flagShowTimelineRepliesDescription: "Ist diese Option aktiviert, so werden Antworten von Benutzern auf die Notizen anderer Benutzer in der Chronik angezeigt."
+flagShowTimelineRepliesDescription: "Ist diese Option aktiviert, so werden Antworten\
+  \ von Benutzern auf die Notizen anderer Benutzer in der Chronik angezeigt."
 autoAcceptFollowed: "Follow-Anfragen von Benutzern, denen du folgst, automatisch akzeptieren"
 addAccount: "Benutzerkonto hinzufügen"
 loginFailed: "Anmeldung fehlgeschlagen"
@@ -156,8 +176,13 @@ removeWallpaper: "Hintergrund entfernen"
 searchWith: "Suchen: {q}"
 youHaveNoLists: "Du hast keine Listen"
 followConfirm: "Möchtest du {name} wirklich folgen?"
-proxyAccount: "Proxy-Benutzerkonto"
-proxyAccountDescription: "Ein Proxy-Benutzerkonto ist ein Benutzerkonto, das sich für Nutzer unter bestimmten Konditionen wie ein Follower aus einer fremden Instanz verhält. Zum Beispiel wird die Aktivität eines Nutzers aus einer fremden Instanz nicht an diese Instanz übermittelt, falls es keinen Benutzer dieser Instanz gibt, der diesem Nutzer aus fremder Instanz folgt. In diesem Fall folgt stattdessen das Proxy-Benutzerkonto."
+proxyAccount: "Proxy-Konto"
+proxyAccountDescription: "Ein Proxy-Benutzerkonto ist ein Benutzerkonto, das sich\
+  \ für Nutzer unter bestimmten Konditionen wie ein Follower aus einer fremden Instanz\
+  \ verhält. Zum Beispiel wird die Aktivität eines Nutzers aus einer fremden Instanz\
+  \ nicht an diese Instanz übermittelt, falls es keinen Benutzer dieser Instanz gibt,\
+  \ der diesem Nutzer aus fremder Instanz folgt. In diesem Fall folgt stattdessen\
+  \ das Proxy-Benutzerkonto."
 host: "Hostname"
 selectUser: "Benutzer auswählen"
 recipient: "Empfänger"
@@ -188,11 +213,15 @@ instanceInfo: "Instanzinformationen"
 statistics: "Statistiken"
 clearQueue: "Warteschlange leeren"
 clearQueueConfirmTitle: "Möchtest du die Warteschlange wirklich leeren?"
-clearQueueConfirmText: "Hierdurch werden jegliche noch nicht gesendete Notizen nicht förderiert. Normalerweise wird dies nicht benötigt."
+clearQueueConfirmText: "Hierdurch werden jegliche noch nicht gesendete Notizen nicht\
+  \ förderiert. Normalerweise wird dies nicht benötigt."
 clearCachedFiles: "Cache leeren"
-clearCachedFilesConfirm: "Sollen alle im Cache gespeicherten Dateien von anderen Instanzen wirklich gelöscht werden?"
+clearCachedFilesConfirm: "Sollen alle im Cache gespeicherten Dateien von anderen Instanzen\
+  \ wirklich gelöscht werden?"
 blockedInstances: "Blockierte Instanzen"
-blockedInstancesDescription: "Gib die Hostnamen der Instanzen, welche blockiert werden sollen, durch Zeilenumbrüche getrennt an. Blockierte Instanzen können mit dieser instanz nicht mehr kommunizieren."
+blockedInstancesDescription: "Gib die Hostnamen der Instanzen, welche blockiert werden\
+  \ sollen, durch Zeilenumbrüche getrennt an. Blockierte Instanzen können mit dieser\
+  \ instanz nicht mehr kommunizieren."
 muteAndBlock: "Stummschaltungen und Blockierungen"
 mutedUsers: "Stummgeschaltete Benutzer"
 blockedUsers: "Blockierte Benutzer"
@@ -241,13 +270,15 @@ saved: "Erfolgreich gespeichert"
 messaging: "Chat"
 upload: "Hochladen"
 keepOriginalUploading: "Originalbild speichern"
-keepOriginalUploadingDescription: "Speichert das Originalbild so, wie es ist. Ist dies deaktiviert, wird eine Version zum Anzeigen im Internet generiert."
+keepOriginalUploadingDescription: "Speichert das Originalbild so, wie es ist. Ist\
+  \ dies deaktiviert, wird eine Version zum Anzeigen im Internet generiert."
 fromDrive: "Aus Drive"
 fromUrl: "Von einer URL"
 uploadFromUrl: "Von einer URL hochladen"
 uploadFromUrlDescription: "URL der hochzuladenden Datei"
 uploadFromUrlRequested: "Upload angefordert"
-uploadFromUrlMayTakeTime: "Es kann eine Weile dauern, bis das Hochladen abgeschlossen ist."
+uploadFromUrlMayTakeTime: "Es kann eine Weile dauern, bis das Hochladen abgeschlossen\
+  \ ist."
 explore: "Erkunden"
 messageRead: "Gelesen"
 noMoreHistory: "Kein weiterer Verlauf vorhanden"
@@ -290,8 +321,10 @@ unableToDelete: "Nicht löschbar"
 inputNewFileName: "Gib einen neuen Dateinamen ein"
 inputNewDescription: "Gib eine neue Beschreibung ein"
 inputNewFolderName: "Gib einen neuen Ordnernamen ein"
-circularReferenceFolder: "Der Zielordner ist ein Unterorder des Ordners, den du verschieben möchtest."
-hasChildFilesOrFolders: "Dieser Ordner kann nicht gelöscht werden, da er nicht leer ist."
+circularReferenceFolder: "Der Zielordner ist ein Unterorder des Ordners, den du verschieben\
+  \ möchtest."
+hasChildFilesOrFolders: "Dieser Ordner kann nicht gelöscht werden, da er nicht leer\
+  \ ist."
 copyUrl: "URL kopieren"
 rename: "Umbenennen"
 avatar: "Profilbild"
@@ -324,7 +357,8 @@ connectService: "Verbinden"
 disconnectService: "Trennen"
 enableLocalTimeline: "Lokale Chronik aktivieren"
 enableGlobalTimeline: "Globale Chronik aktivieren"
-disablingTimelinesInfo: "Administratoren und Moderatoren haben immer Zugriff auf alle Chroniken, auch wenn diese deaktiviert sind."
+disablingTimelinesInfo: "Administratoren und Moderatoren haben immer Zugriff auf alle\
+  \ Chroniken, auch wenn diese deaktiviert sind."
 registration: "Registrieren"
 enableRegistration: "Registration neuer Benutzer erlauben"
 invite: "Einladen"
@@ -336,9 +370,11 @@ bannerUrl: "Banner-URL"
 backgroundImageUrl: "Hintergrundbild-URL"
 basicInfo: "Grundlegende Informationen"
 pinnedUsers: "Angeheftete Benutzer"
-pinnedUsersDescription: "Gib durch Leerzeichen getrennte Benutzer an, die an die \"Erkunden\"-Seite angeheftet werden sollen."
+pinnedUsersDescription: "Gib durch Leerzeichen getrennte Benutzer an, die an die \"\
+  Erkunden\"-Seite angeheftet werden sollen."
 pinnedPages: "Angeheftete Seiten"
-pinnedPagesDescription: "Gib durch Leerzeilen getrennte Pfäde zu Seiten an, die an die Startseite dieser Instanz angeheftet werden sollen.\n"
+pinnedPagesDescription: "Gib durch Leerzeilen getrennte Pfäde zu Seiten an, die an\
+  \ die Startseite dieser Instanz angeheftet werden sollen.\n"
 pinnedClipId: "ID des anzuheftenden Clips"
 pinnedNotes: "Angeheftete Notizen"
 hcaptcha: "hCaptcha"
@@ -349,14 +385,18 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "reCAPTCHA aktivieren"
 recaptchaSiteKey: "Site key"
 recaptchaSecretKey: "Secret key"
-avoidMultiCaptchaConfirm: "Das Verwenden von mehreren Captcha-Systemen kann zu Störungen führen. Sollen die anderen Systeme deaktiviert werden? Durch Abbrechen können mehrere Systeme aktiviert bleiben."
+avoidMultiCaptchaConfirm: "Das Verwenden von mehreren Captcha-Systemen kann zu Störungen\
+  \ führen. Sollen die anderen Systeme deaktiviert werden? Durch Abbrechen können\
+  \ mehrere Systeme aktiviert bleiben."
 antennas: "Antennen"
 manageAntennas: "Antennen verwalten"
 name: "Name"
 antennaSource: "Antennenquelle"
 antennaKeywords: "Zu beobachtende Schlüsselwörter"
 antennaExcludeKeywords: "Zu ignorierende Schlüsselwörter"
-antennaKeywordsDescription: "Zum Nutzen einer \"UND\"-Verknüpfung Einträge mit Leerzeichen trennen, zum Nutzen einer \"ODER\"-Verknüpfung Einträge mit einem Zeilenumbruch trennen"
+antennaKeywordsDescription: "Zum Nutzen einer \"UND\"-Verknüpfung Einträge mit Leerzeichen\
+  \ trennen, zum Nutzen einer \"ODER\"-Verknüpfung Einträge mit einem Zeilenumbruch\
+  \ trennen"
 notifyAntenna: "Über neue Notizen benachrichtigen"
 withFileAntenna: "Nur Notizen mit Dateien"
 enableServiceworker: "Push-Benachrichtigungen im Browser aktivieren"
@@ -369,7 +409,8 @@ withFiles: "Notizen mit Dateien"
 silence: "Instanzweit stummschalten"
 silenceConfirm: "Möchtest du diesen Benutzer wirklich instanzweit stummschalten?"
 unsilence: "Instanzweite Stummschaltung aufheben"
-unsilenceConfirm: "Möchtest du die instanzweite Stummschaltung dieses Benutzers wirklich aufheben?"
+unsilenceConfirm: "Möchtest du die instanzweite Stummschaltung dieses Benutzers wirklich\
+  \ aufheben?"
 popularUsers: "Beliebte Benutzer"
 recentlyUpdatedUsers: "Vor kurzem aktive Benutzer"
 recentlyRegisteredUsers: "Vor kurzem registrierte Benutzer"
@@ -435,7 +476,8 @@ invitationCode: "Einladungscode"
 checking: "Wird überprüft …"
 available: "Verfügbar"
 unavailable: "Unverfügbar"
-usernameInvalidFormat: "Du kannst Klein- und Großbuchstaben, Zahlen sowie Unterstriche verwenden"
+usernameInvalidFormat: "Du kannst Klein- und Großbuchstaben, Zahlen sowie Unterstriche\
+  \ verwenden"
 tooShort: "Zu kurz"
 tooLong: "Zu lang"
 weakPassword: "Schwaches Passwort"
@@ -485,19 +527,27 @@ showFeaturedNotesInTimeline: "Beliebte Notizen in der Chronik anzeigen"
 objectStorage: "Object Storage"
 useObjectStorage: "Object Storage verwenden"
 objectStorageBaseUrl: "Basis-URL"
-objectStorageBaseUrlDesc: "Die als Referenz verwendete URL. Verwendest du einen CDN oder Proxy, gib dessen URL an. Für S3 verwende 'https://<bucket>.s3.amazonaws.com'. Für GCS o.ä. verwende 'https://storage.googleapis.com/<bucket>'."
+objectStorageBaseUrlDesc: "Die als Referenz verwendete URL. Verwendest du einen CDN\
+  \ oder Proxy, gib dessen URL an. Für S3 verwende 'https://<bucket>.s3.amazonaws.com'.\
+  \ Für GCS o.ä. verwende 'https://storage.googleapis.com/<bucket>'."
 objectStorageBucket: "Bucket"
-objectStorageBucketDesc: "Bitte gib den Namen des Buckets an, der bei deinem Anbieter verwendet wird."
+objectStorageBucketDesc: "Bitte gib den Namen des Buckets an, der bei deinem Anbieter\
+  \ verwendet wird."
 objectStoragePrefix: "Prefix"
 objectStoragePrefixDesc: "Dateien werden in Ordnern unter diesem Prefix gespeichert."
 objectStorageEndpoint: "Endpoint"
-objectStorageEndpointDesc: "Im Falle von S3 leerlassen, für andere Anbieter den relevanten Endpoint im Format „<host>“ oder „<host>:<port>“ angeben."
+objectStorageEndpointDesc: "Im Falle von S3 leerlassen, für andere Anbieter den relevanten\
+  \ Endpoint im Format „<host>“ oder „<host>:<port>“ angeben."
 objectStorageRegion: "Region"
-objectStorageRegionDesc: "Gib eine Region wie z.B. „xx-east-1“ an. Falls dein Anbieter nicht zwischen Regionen unterscheidet, lass dieses Feld leer oder gib „us-east-1“ an."
+objectStorageRegionDesc: "Gib eine Region wie z.B. „xx-east-1“ an. Falls dein Anbieter\
+  \ nicht zwischen Regionen unterscheidet, lass dieses Feld leer oder gib „us-east-1“\
+  \ an."
 objectStorageUseSSL: "SSL verwenden"
-objectStorageUseSSLDesc: "Deaktiviere dies, falls du für API-Verbindungen kein HTTPS verwenden wirst"
+objectStorageUseSSLDesc: "Deaktiviere dies, falls du für API-Verbindungen kein HTTPS\
+  \ verwenden wirst"
 objectStorageUseProxy: "Über Proxy verbinden"
-objectStorageUseProxyDesc: "Deaktiviere dies, falls du keinen Proxy für den Objektspeicher verwenden wirst"
+objectStorageUseProxyDesc: "Deaktiviere dies, falls du keinen Proxy für den Objektspeicher\
+  \ verwenden wirst"
 objectStorageSetPublicRead: "Bei Upload auf \"public-read\" stellen"
 serverLogs: "Serverprotokolle"
 deleteAll: "Alle löschen"
@@ -525,7 +575,9 @@ sort: "Sortieren"
 ascendingOrder: "Aufsteigende Reihenfolge"
 descendingOrder: "Absteigende Reihenfolge"
 scratchpad: "Testumgebung"
-scratchpadDescription: "Die Testumgebung bietet einen Bereich für AiScript-Experimente. Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Misskey überprüfen."
+scratchpadDescription: "Die Testumgebung bietet einen Bereich für AiScript-Experimente.\
+  \ Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Misskey\
+  \ überprüfen."
 output: "Ausgabe"
 script: "Skript"
 disablePagesScript: "AiScript auf Seiten deaktivieren"
@@ -533,11 +585,15 @@ updateRemoteUser: "Benutzerinformationen aktualisieren"
 deleteAllFiles: "Alle Dateien löschen"
 deleteAllFilesConfirm: "Möchtest du wirklich alle Dateien löschen?"
 removeAllFollowing: "Allen gefolgten Benutzern entfolgen"
-removeAllFollowingDescription: "Dies entfolgt allen Benutzerkonten von {host}. Bitte führe dies durch, falls diese Instanz z.B. nicht mehr existiert."
+removeAllFollowingDescription: "Dies entfolgt allen Benutzerkonten von {host}. Bitte\
+  \ führe dies durch, falls diese Instanz z.B. nicht mehr existiert."
 userSuspended: "Dieser Benutzer wurde gesperrt."
 userSilenced: "Dieser Benutzer wurde instanzweit stummgeschaltet."
 yourAccountSuspendedTitle: "Dieses Benutzerkonto ist gesperrt"
-yourAccountSuspendedDescription: "Dieses Benutzerkonto wurde gesperrt, da es gegen die Nutzungsbedingungen dieses Servers verstoßen hat. Trete mit dem Betreiber in Kontakt, falls du weitere Details erfahren möchtest. Bitte erstelle kein neues Benutzerkonto."
+yourAccountSuspendedDescription: "Dieses Benutzerkonto wurde gesperrt, da es gegen\
+  \ die Nutzungsbedingungen dieses Servers verstoßen hat. Trete mit dem Betreiber\
+  \ in Kontakt, falls du weitere Details erfahren möchtest. Bitte erstelle kein neues\
+  \ Benutzerkonto."
 menu: "Menü"
 divider: "Trenner"
 addItem: "Element hinzufügen"
@@ -578,12 +634,14 @@ permission: "Berechtigungen"
 enableAll: "Alle aktivieren"
 disableAll: "Alle deaktivieren"
 tokenRequested: "Zugriff zum Benutzerkonto gewähren"
-pluginTokenRequestedDescription: "Dieses Plugin wird die hier konfigurierten Berechtigungen verwenden können."
+pluginTokenRequestedDescription: "Dieses Plugin wird die hier konfigurierten Berechtigungen\
+  \ verwenden können."
 notificationType: "Art der Benachrichtigung"
 edit: "Bearbeiten"
 emailServer: "Email-Server"
 enableEmail: "Email-Versand aktivieren"
-emailConfigInfo: "Zur Email-Bestätigung bei Registrierung oder zum Zurücksetzen des Passworts verwendet"
+emailConfigInfo: "Zur Email-Bestätigung bei Registrierung oder zum Zurücksetzen des\
+  \ Passworts verwendet"
 email: "Email"
 emailAddress: "Email-Adresse"
 smtpConfig: "SMTP-Server Konfiguration"
@@ -591,13 +649,15 @@ smtpHost: "Host"
 smtpPort: "Port"
 smtpUser: "Benutzername"
 smtpPass: "Passwort"
-emptyToDisableSmtpAuth: "Benutzername und Passwort leer lassen, um SMTP-Verifizierung zu deaktivieren"
+emptyToDisableSmtpAuth: "Benutzername und Passwort leer lassen, um SMTP-Verifizierung\
+  \ zu deaktivieren"
 smtpSecure: "Für SMTP-Verbindungen implizit SSL/TLS verwenden"
 smtpSecureInfo: "Schalte dies aus, falls du STARTTLS verwendest."
 testEmail: "Emailversand testen"
 wordMute: "Wortstummschaltung"
 regexpError: "Fehler in einem regulären Ausdruck"
-regexpErrorDescription: "Im regulären Ausdruck deiner {tab}en Wortstummschaltungen ist ein Fehler aufgetreten:"
+regexpErrorDescription: "Im regulären Ausdruck deiner {tab}en Wortstummschaltungen\
+  \ ist ein Fehler aufgetreten:"
 instanceMute: "Instanzstummschaltungen"
 userSaysSomething: "{name} hat etwas gesagt"
 makeActive: "Aktivieren"
@@ -613,44 +673,53 @@ create: "Erstellen"
 notificationSetting: "Benachrichtigungseinstellungen"
 notificationSettingDesc: "Wähle die Art der anzuzeigenden Benachrichtigungen."
 useGlobalSetting: "Globale Einstellung verwenden"
-useGlobalSettingDesc: "Ist diese Option aktiviert, werden die Benachrichtigungseinstellungen deines Benutzerkontos verwendet. Durch ausschalten dieser Option können individuelle Einstellungen vorgenommen werden."
+useGlobalSettingDesc: "Ist diese Option aktiviert, werden die Benachrichtigungseinstellungen\
+  \ deines Benutzerkontos verwendet. Durch ausschalten dieser Option können individuelle\
+  \ Einstellungen vorgenommen werden."
 other: "Anderes"
 regenerateLoginToken: "Anmeldetoken regenerieren"
-regenerateLoginTokenDescription: "Den zur Anmeldung intern verwendeten Token regenerieren. Normalerweise wird dies nicht benötigt. Bei Regeneration werden alle Geräte ausgeloggt."
-setMultipleBySeparatingWithSpace: "Trenne Elemente durch ein Leerzeichen um mehrere Einstellungen zu kofigurieren."
+regenerateLoginTokenDescription: "Den zur Anmeldung intern verwendeten Token regenerieren.\
+  \ Normalerweise wird dies nicht benötigt. Bei Regeneration werden alle Geräte ausgeloggt."
+setMultipleBySeparatingWithSpace: "Trenne Elemente durch ein Leerzeichen um mehrere\
+  \ Einstellungen zu kofigurieren."
 fileIdOrUrl: "Datei-ID oder URL"
 behavior: "Verhalten"
 sample: "Beispiel"
 abuseReports: "Meldungen"
 reportAbuse: "Melden"
 reportAbuseOf: "{name} melden"
-fillAbuseReportDescription: "Bitte gib zusätzliche Informationen zu dieser Meldung an. Falls es sich um eine spezielle Notiz handelt, bitte gib dessen URL an."
+fillAbuseReportDescription: "Bitte gib zusätzliche Informationen zu dieser Meldung\
+  \ an. Falls es sich um eine spezielle Notiz handelt, bitte gib dessen URL an."
 abuseReported: "Deine Meldung wurde versendet. Vielen Dank."
 reporter: "Melder"
 reporteeOrigin: "Herkunft des Gemeldeten"
 reporterOrigin: "Herkunft des Meldenden"
 forwardReport: "Meldung an fremde Instanz weiterleiten"
-forwardReportIsAnonymous: "Anstatt deines Benutzerkontos wird bei der fremden Instanz ein anonymes Systemkonto als Melder angezeigt."
+forwardReportIsAnonymous: "Anstatt deines Benutzerkontos wird bei der fremden Instanz\
+  \ ein anonymes Systemkonto als Melder angezeigt."
 send: "Senden"
 abuseMarkAsResolved: "Meldung als gelöst markieren"
 openInNewTab: "In neuem Tab öffnen"
 openInSideView: "In Seitenansicht öffnen"
 defaultNavigationBehaviour: "Standardnavigationsverhalten"
-editTheseSettingsMayBreakAccount: "Bei Bearbeitung dieser Einstellungen besteht die Gefahr, dein Benutzerkonto zu beschädigen."
+editTheseSettingsMayBreakAccount: "Bei Bearbeitung dieser Einstellungen besteht die\
+  \ Gefahr, dein Benutzerkonto zu beschädigen."
 instanceTicker: "Instanz-Informationen von Notizen"
 waitingFor: "Warte auf {x} …"
 random: "Zufällig"
 system: "System"
-switchUi: "UI wechseln"
+switchUi: "Layout"
 desktop: "Desktop"
 clip: "Clip erstellen"
 createNew: "Neu erstellen"
 optional: "Optional"
 createNewClip: "Neuen Clip erstellen"
 unclip: "Aus Clip entfernen"
-confirmToUnclipAlreadyClippedNote: "Diese Notiz ist bereits im \"{name}\" Clip enthalten. Möchtest du sie aus diesem Clip entfernen?"
+confirmToUnclipAlreadyClippedNote: "Diese Notiz ist bereits im \"{name}\" Clip enthalten.\
+  \ Möchtest du sie aus diesem Clip entfernen?"
 public: "Öffentlich"
-i18nInfo: "Calckey wird durch freiwillige Helfer in viele verschiedene Sprachen übersetzt. Auf {link} kannst du mithelfen."
+i18nInfo: "Calckey wird durch freiwillige Helfer in viele verschiedene Sprachen übersetzt.\
+  \ Auf {link} kannst du mithelfen."
 manageAccessTokens: "Zugriffstokens verwalten"
 accountInfo: "Benutzerkonto-Informationen"
 notesCount: "Anzahl der Notizen"
@@ -669,12 +738,16 @@ no: "Nein"
 driveFilesCount: "Anzahl der Dateien in Drive"
 driveUsage: "Drive-Auslastung"
 noCrawle: "Crawler-Indexierung ablehnen"
-noCrawleDescription: "Suchmaschinen bitten, die eigene Profilseite, Notizen, Seiten usw. nicht zu indexieren."
-lockedAccountInfo: "Auch wenn du Follow-Anfragen auf manuelle Bestätigung setzt, wird jede deiner Notizen öffentlich sichtbar sein, sofern du ihre Notizsichtbarkeit nicht auf \"Nur Follower\" setzt."
+noCrawleDescription: "Suchmaschinen bitten, die eigene Profilseite, Notizen, Seiten\
+  \ usw. nicht zu indexieren."
+lockedAccountInfo: "Auch wenn du Follow-Anfragen auf manuelle Bestätigung setzt, wird\
+  \ jede deiner Notizen öffentlich sichtbar sein, sofern du ihre Notizsichtbarkeit\
+  \ nicht auf \"Nur Follower\" setzt."
 alwaysMarkSensitive: "Medien standardmäßig als NSFW markieren"
 loadRawImages: "Anstatt Vorschaubilder immer Originalbilder anzeigen"
 disableShowingAnimatedImages: "Animierte Bilder nicht abspielen"
-verificationEmailSent: "Eine Bestätigungsmail wurde an deine Email-Adresse versendet. Besuche den dort enthaltenen Link, um die Verifizierung abzuschließen."
+verificationEmailSent: "Eine Bestätigungsmail wurde an deine Email-Adresse versendet.\
+  \ Besuche den dort enthaltenen Link, um die Verifizierung abzuschließen."
 notSet: "Nicht konfiguriert"
 emailVerified: "Email-Adresse bestätigt"
 noteFavoritesCount: "Anzahl an als Favorit markierter Notizen"
@@ -686,22 +759,29 @@ clips: "Clips"
 experimentalFeatures: "Experimentelle Funktionalitäten"
 developer: "Entwickler"
 makeExplorable: "Benutzerkonto in „Erkunden“ sichtbar machen"
-makeExplorableDescription: "Wenn diese Option deaktiviert ist, ist dein Benutzerkonto nicht im „Erkunden“-Bereich sichtbar."
+makeExplorableDescription: "Wenn diese Option deaktiviert ist, ist dein Benutzerkonto\
+  \ nicht im „Erkunden“-Bereich sichtbar."
 showGapBetweenNotesInTimeline: "Abstände zwischen Notizen auf der Chronik anzeigen"
 duplicate: "Duplizieren"
 left: "Links"
 center: "Mittig"
 wide: "Breit"
 narrow: "Schmal"
-reloadToApplySetting: "Diese Einstellung tritt nach einer Aktualisierung der Seite in Kraft. Jetzt aktualisieren?"
-needReloadToApply: "Diese Einstellung tritt nach einer Aktualisierung der Seite in Kraft."
+reloadToApplySetting: "Diese Einstellung tritt nach einer Aktualisierung der Seite\
+  \ in Kraft. Jetzt aktualisieren?"
+needReloadToApply: "Diese Einstellung tritt nach einer Aktualisierung der Seite in\
+  \ Kraft."
 showTitlebar: "Titelleiste anzeigen"
 clearCache: "Cache leeren"
 onlineUsersCount: "{n} Benutzer sind online"
 nUsers: "{n} Benutzer"
 nNotes: "{n} Notizen"
 sendErrorReports: "Fehlerberichte senden"
-sendErrorReportsDescription: "Ist diese Option aktiviert, so werden beim Auftreten von Fehlern detaillierte Fehlerinformationen an Misskey weitergegeben, was zur Verbesserung der Qualität von Misskey beiträgt.\nEnthalten in diesen Informationen sind u.a. die Version deines Betriebssystems, welchen Browser du verwendest und ein Verlauf deiner Aktivitäten innerhalb Misskey."
+sendErrorReportsDescription: "Ist diese Option aktiviert, so werden beim Auftreten\
+  \ von Fehlern detaillierte Fehlerinformationen an Misskey weitergegeben, was zur\
+  \ Verbesserung der Qualität von Misskey beiträgt.\nEnthalten in diesen Informationen\
+  \ sind u.a. die Version deines Betriebssystems, welchen Browser du verwendest und\
+  \ ein Verlauf deiner Aktivitäten innerhalb Misskey."
 myTheme: "Mein Farbschema"
 backgroundColor: "Hintergrundfarbe"
 accentColor: "Akzentfarbe"
@@ -740,14 +820,17 @@ unlikeConfirm: "\"Gefällt mir\" wirklich entfernen?"
 fullView: "Vollansicht"
 quitFullView: "Vollansicht verlassen"
 addDescription: "Beschreibung hinzufügen"
-userPagePinTip: "Um Notizen hier erscheinen zu lassen, drücke \"An dein Profil anheften\" im Menü individueller Notizen."
-notSpecifiedMentionWarning: "Diese Notiz enthält Erwähnungen von Nutzern, die nicht als Empfänger ausgewählt sind"
+userPagePinTip: "Um Notizen hier erscheinen zu lassen, drücke \"An dein Profil anheften\"\
+  \ im Menü individueller Notizen."
+notSpecifiedMentionWarning: "Diese Notiz enthält Erwähnungen von Nutzern, die nicht\
+  \ als Empfänger ausgewählt sind"
 info: "Über"
 userInfo: "Benutzerinformation"
 unknown: "Unbekannt"
 onlineStatus: "Onlinestatus"
 hideOnlineStatus: "Onlinestatus verbergen"
-hideOnlineStatusDescription: "Das Verbergen deines Onlinestatuses reduziert die Nützlichkeit von Funktionen wie der Suche."
+hideOnlineStatusDescription: "Das Verbergen deines Onlinestatuses reduziert die Nützlichkeit\
+  \ von Funktionen wie der Suche."
 online: "Online"
 active: "Aktiv"
 offline: "Offline"
@@ -782,7 +865,8 @@ emailNotConfiguredWarning: "Keine Email-Adresse hinterlegt."
 ratio: "Verhältnis"
 previewNoteText: "Vorschau anzeigen"
 customCss: "Benutzerdefiniertes CSS"
-customCssWarn: "Verwende diese Einstellung nur, wenn du weißt, was sie tut. Ungültige Eingaben können dazu führen, dass der Client nicht mehr normal funktioniert."
+customCssWarn: "Verwende diese Einstellung nur, wenn du weißt, was sie tut. Ungültige\
+  \ Eingaben können dazu führen, dass der Client nicht mehr normal funktioniert."
 global: "Global"
 squareAvatars: "Profilbilder quadratisch anzeigen"
 sent: "Gesendet"
@@ -797,7 +881,9 @@ whatIsNew: "Änderungen anzeigen"
 translate: "Übersetzen"
 translatedFrom: "Aus {x} übersetzt"
 accountDeletionInProgress: "Die Löschung deines Benutzerkontos ist momentan in Bearbeitung."
-usernameInfo: "Ein Name, durch den dein Benutzerkonto auf diesem Server identifiziert werden kann. Du kannst das Alphabet (a~z, A~Z), Ziffern (0~9) oder Unterstriche (_) verwenden. Benutzernamen können später nicht geändert werden."
+usernameInfo: "Ein Name, durch den dein Benutzerkonto auf diesem Server identifiziert\
+  \ werden kann. Du kannst das Alphabet (a~z, A~Z), Ziffern (0~9) oder Unterstriche\
+  \ (_) verwenden. Benutzernamen können später nicht geändert werden."
 aiChanMode: "Ai-Modus"
 keepCw: "Inhaltswarnungen beibehalten"
 pubSub: "Pub/Sub Benutzerkonten"
@@ -813,12 +899,14 @@ filter: "Filter"
 controlPanel: "Systemsteuerung"
 manageAccounts: "Benutzerkonten verwalten"
 makeReactionsPublic: "Reaktionsverlauf veröffentlichen"
-makeReactionsPublicDescription: "Jeder wird die Liste deiner gesendeten Reaktionen einsehen können."
+makeReactionsPublicDescription: "Jeder wird die Liste deiner gesendeten Reaktionen\
+  \ einsehen können."
 classic: "Classic"
 muteThread: "Thread stummschalten"
 unmuteThread: "Threadstummschaltung aufheben"
 ffVisibility: "Sichtbarkeit von Gefolgten/Followern"
-ffVisibilityDescription: "Konfiguriere wer sehen kann, wem du folgst sowie wer dir folgt."
+ffVisibilityDescription: "Konfiguriere wer sehen kann, wem du folgst sowie wer dir\
+  \ folgt."
 continueThread: "Weiteren Threadverlauf anzeigen"
 deleteAccountConfirm: "Dein Benutzerkonto wird unwiderruflich gelöscht. Trotzdem fortfahren?"
 incorrectPassword: "Falsches Passwort."
@@ -826,9 +914,11 @@ voteConfirm: "Wirklich für „{choice}“ abstimmen?"
 hide: "Inhalt verbergen"
 leaveGroup: "Gruppe verlassen"
 leaveGroupConfirm: "Möchtest du „{name}“ wirklich verlassen?"
-useDrawerReactionPickerForMobile: "Auf mobilen Geräten ausfahrbare Reaktionsauswahl anzeigen"
+useDrawerReactionPickerForMobile: "Auf mobilen Geräten ausfahrbare Reaktionsauswahl\
+  \ anzeigen"
 welcomeBackWithName: "Willkommen zurück, {name}"
-clickToFinishEmailVerification: "Drücke bitte auf [{ok}], um die Email-Bestätigung abzuschließen."
+clickToFinishEmailVerification: "Drücke bitte auf [{ok}], um die Email-Bestätigung\
+  \ abzuschließen."
 overridedDeviceKind: "Gerätetyp"
 smartphone: "Smartphone"
 tablet: "Tablet"
@@ -847,7 +937,8 @@ oneHour: "Eine Stunde"
 oneDay: "Einen Tag"
 oneWeek: "Eine Woche"
 reflectMayTakeTime: "Es kann etwas dauern, bis sich dies widerspiegelt."
-failedToFetchAccountInformation: "Benutzerkontoinformationen konnten nicht abgefragt werden"
+failedToFetchAccountInformation: "Benutzerkontoinformationen konnten nicht abgefragt\
+  \ werden"
 rateLimitExceeded: "Versuchsanzahl überschritten"
 cropImage: "Bild zuschneiden"
 cropImageAsk: "Möchtest du das Bild zuschneiden?"
@@ -859,14 +950,17 @@ thereIsUnresolvedAbuseReportWarning: "Es liegen ungelöste Meldungen vor."
 recommended: "Empfehlung"
 check: "Check"
 driveCapOverrideLabel: "Die Drive-Kapazität dieses Nutzers verändern"
-driveCapOverrideCaption: "Gib einen Wert von 0 oder weniger ein, um die Kapazität auf den Standard zurückzusetzen."
+driveCapOverrideCaption: "Gib einen Wert von 0 oder weniger ein, um die Kapazität\
+  \ auf den Standard zurückzusetzen."
 requireAdminForView: "Melde dich mit einem Administratorkonto an, um dies einzusehen."
-isSystemAccount: "Ein Benutzerkonto, dass durch das System erstellt und automatisch kontrolliert wird."
+isSystemAccount: "Ein Benutzerkonto, dass durch das System erstellt und automatisch\
+  \ kontrolliert wird."
 typeToConfirm: "Bitte gib zur Bestätigung {x} ein"
 deleteAccount: "Benutzerkonto löschen"
 document: "Dokumentation"
 numberOfPageCache: "Seitencachegröße"
-numberOfPageCacheDescription: "Das Erhöhen dieses Caches führt zu einer angenehmerern Benutzererfahrung, erhöht aber Serverlast und Arbeitsspeicherauslastung."
+numberOfPageCacheDescription: "Das Erhöhen dieses Caches führt zu einer angenehmerern\
+  \ Benutzererfahrung, erhöht aber Serverlast und Arbeitsspeicherauslastung."
 logoutConfirm: "Wirklich abmelden?"
 lastActiveDate: "Zuletzt verwendet am"
 statusbar: "Statusleiste"
@@ -883,24 +977,37 @@ sensitiveMediaDetection: "Erkennung von NSFW-Medien"
 localOnly: "Nur Lokal"
 remoteOnly: "Nur für fremde Instanzen"
 failedToUpload: "Hochladen fehlgeschlagen"
-cannotUploadBecauseInappropriate: "Diese Datei kann nicht hochgeladen werden, da Anteile der Datei als möglicherweise NSFW festgestellt wurden."
-cannotUploadBecauseNoFreeSpace: "Die Datei konnte nicht hochgeladen werden, da dein Drive-Speicherplatz aufgebraucht ist."
+cannotUploadBecauseInappropriate: "Diese Datei kann nicht hochgeladen werden, da Anteile\
+  \ der Datei als möglicherweise NSFW festgestellt wurden."
+cannotUploadBecauseNoFreeSpace: "Die Datei konnte nicht hochgeladen werden, da dein\
+  \ Drive-Speicherplatz aufgebraucht ist."
 beta: "Beta"
 enableAutoSensitive: "NSFW-Automarkierung"
-enableAutoSensitiveDescription: "Setzt soweit möglich durch Verwendung von Machine Learning automatisch NSFW-Markierungen für Medien, die NSFW-Anteile beinhalten. Auch wenn du diese Option deaktiviert hast, ist sie möglicherweise auf Instanzebene aktiviert."
-activeEmailValidationDescription: "Aktivert strengere Überprüfung von E-Mail-Adressen, d.h. Testen auf Wegwerfadressen und darauf, ob mit der Adresse tatsächlich kommuniziert werden kann. Ist dies deaktiviert, so wird nur das Format der E-Mail überprüft."
+enableAutoSensitiveDescription: "Setzt soweit möglich durch Verwendung von Machine\
+  \ Learning automatisch NSFW-Markierungen für Medien, die NSFW-Anteile beinhalten.\
+  \ Auch wenn du diese Option deaktiviert hast, ist sie möglicherweise auf Instanzebene\
+  \ aktiviert."
+activeEmailValidationDescription: "Aktivert strengere Überprüfung von E-Mail-Adressen,\
+  \ d.h. Testen auf Wegwerfadressen und darauf, ob mit der Adresse tatsächlich kommuniziert\
+  \ werden kann. Ist dies deaktiviert, so wird nur das Format der E-Mail überprüft."
 navbar: "Navigationsleiste"
 shuffle: "Mischen"
 account: "Benutzerkonto"
 move: "Verschieben"
 _sensitiveMediaDetection:
-  description: "Ermöglicht eine Erleichterung der Servermoderation durch die automatische Erkennungen von NSFW-Medien unter Verwendung von Machine Learning. Hierdurch wird die Serverlast etwas erhöht."
+  description: "Ermöglicht eine Erleichterung der Servermoderation durch die automatische\
+    \ Erkennungen von NSFW-Medien unter Verwendung von Machine Learning. Hierdurch\
+    \ wird die Serverlast etwas erhöht."
   sensitivity: "Erkennungssensitivität"
-  sensitivityDescription: "Durch das Senken der Sensitivität kann die Anzahl an Fehlerkennungen (sog. false positives) reduziert werden. Durch ein Erhöhen dieser kann die Anzahl an verpassten Erkennungen (sog. false negatives) reduziert werden."
+  sensitivityDescription: "Durch das Senken der Sensitivität kann die Anzahl an Fehlerkennungen\
+    \ (sog. false positives) reduziert werden. Durch ein Erhöhen dieser kann die Anzahl\
+    \ an verpassten Erkennungen (sog. false negatives) reduziert werden."
   setSensitiveFlagAutomatically: "Als NSFW markieren"
-  setSensitiveFlagAutomaticallyDescription: "Die Resultate der internen Erkennung werden beibehalten, auch wenn diese Option deaktiviert ist."
+  setSensitiveFlagAutomaticallyDescription: "Die Resultate der internen Erkennung\
+    \ werden beibehalten, auch wenn diese Option deaktiviert ist."
   analyzeVideos: "Videoanalyse aktivieren"
-  analyzeVideosDescription: "Analysiert zusätzlich zu Bildern auch Videos. Die Last des Servers wird hierdurch etwas erhöht."
+  analyzeVideosDescription: "Analysiert zusätzlich zu Bildern auch Videos. Die Last\
+    \ des Servers wird hierdurch etwas erhöht."
 _emailUnavailable:
   used: "Diese Email-Adresse wird bereits verwendet"
   format: "Das Format dieser Email-Adresse ist ungültig"
@@ -913,12 +1020,18 @@ _ffVisibility:
   private: "Privat"
 _signup:
   almostThere: "Fast geschafft"
-  emailAddressInfo: "Bitte gib deine Email-Adresse ein. Sie wird nicht öffentlich einsehbar sein."
-  emailSent: "An deine Email-Adresse ({email}) wurde soeben eine Bestätigungsmail geschickt. Bitte klicke auf den enthaltenen Link, um die Erstellung deines Benutzerkontos abzuschließen."
+  emailAddressInfo: "Bitte gib deine Email-Adresse ein. Sie wird nicht öffentlich\
+    \ einsehbar sein."
+  emailSent: "An deine Email-Adresse ({email}) wurde soeben eine Bestätigungsmail\
+    \ geschickt. Bitte klicke auf den enthaltenen Link, um die Erstellung deines Benutzerkontos\
+    \ abzuschließen."
 _accountDelete:
   accountDelete: "Benutzerkonto löschen"
-  mayTakeTime: "Da die Löschung eines Benutzerkontos ein aufwendiger Prozess ist, kann dessen Dauer davon abhängen, wie viel Inhalt von diesem erstellt wurde oder wie viele Dateien von diesem hochgeladen wurden."
-  sendEmail: "Sobald die Löschung abgeschlossen ist, wird an die mit ihm verknüpfte Email-Adresse eine Benachrichtigung versendet."
+  mayTakeTime: "Da die Löschung eines Benutzerkontos ein aufwendiger Prozess ist,\
+    \ kann dessen Dauer davon abhängen, wie viel Inhalt von diesem erstellt wurde\
+    \ oder wie viele Dateien von diesem hochgeladen wurden."
+  sendEmail: "Sobald die Löschung abgeschlossen ist, wird an die mit ihm verknüpfte\
+    \ Email-Adresse eine Benachrichtigung versendet."
   requestAccountDelete: "Löschung deines Benutzerkontos anfordern"
   started: "Die Löschung wurde eingeleitet."
   inProgress: "Löschung in Bearbeitung"
@@ -926,9 +1039,12 @@ _ad:
   back: "Zurück"
   reduceFrequencyOfThisAd: "Diese Werbung weniger anzeigen"
 _forgotPassword:
-  enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit dem du dein Passwort zurücksetzen kannst."
-  ifNoEmail: "Solltest du bei der Registrierung keine Email-Adresse angegeben haben, wende dich bitte an den Administrator."
-  contactAdmin: "Diese Instanz unterstützt die Verwendung von Email-Adressen nicht. Wende dich an den Administrator, um dein Passwort zurückzusetzen."
+  enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese\
+    \ wird ein Link gesendet, mit dem du dein Passwort zurücksetzen kannst."
+  ifNoEmail: "Solltest du bei der Registrierung keine Email-Adresse angegeben haben,\
+    \ wende dich bitte an den Administrator."
+  contactAdmin: "Diese Instanz unterstützt die Verwendung von Email-Adressen nicht.\
+    \ Wende dich an den Administrator, um dein Passwort zurückzusetzen."
 _gallery:
   my: "Meine Galerie"
   liked: "Mit \"Gefällt mir\" markierte Beiträge"
@@ -951,12 +1067,15 @@ _preferencesBackups:
   save: "Speichern"
   inputName: "Gib einen Namen für dieses Backup ein"
   cannotSave: "Speichern fehlgeschlagen"
-  nameAlreadyExists: "Es existiert bereits ein Backup unter dem Namen \"{name}\". Bitte gib einen anderen Namen ein."
-  applyConfirm: "Wirklich das Backup \"{name}\" auf dieses Gerät anwenden? Bestehende Einstellungen darauf werden überschrieben."
+  nameAlreadyExists: "Es existiert bereits ein Backup unter dem Namen \"{name}\".\
+    \ Bitte gib einen anderen Namen ein."
+  applyConfirm: "Wirklich das Backup \"{name}\" auf dieses Gerät anwenden? Bestehende\
+    \ Einstellungen darauf werden überschrieben."
   saveConfirm: "Als {name} speichern?"
   deleteConfirm: "Das Backup {name} löschen?"
   renameConfirm: "Soll dieses Backup von \"{old}\" zu \"{new}\" umbenannt werden?"
-  noBackups: "Keine Backups existieren. Backups können über \"Neu erstellen\" erstelllt werden."
+  noBackups: "Keine Backups existieren. Backups können über \"Neu erstellen\" erstelllt\
+    \ werden."
   createdAt: "Erstellt am: {date} {time}"
   updatedAt: "Aktualisiert am: {date} {time}"
   cannotLoad: "Laden fehlgeschlagen"
@@ -968,13 +1087,15 @@ _registry:
   domain: "Domain"
   createKey: "Schlüssel erstellen"
 _aboutMisskey:
-  about: "Misskey ist Open-Source-Software, welche von syuilo seit 2014 entwickelt wird."
+  about: "Misskey ist Open-Source-Software, welche von syuilo seit 2014 entwickelt\
+    \ wird."
   contributors: "Hauptmitwirkende"
   allContributors: "Alle Mitwirkenden"
   source: "Quellcode"
   translation: "Misskey übersetzen"
   donate: "An Misskey spenden"
-  morePatrons: "Wir schätzen ebenso die Unterstützung vieler anderer hier nicht gelisteter Personen sehr. Danke! 🥰"
+  morePatrons: "Wir schätzen ebenso die Unterstützung vieler anderer hier nicht gelisteter\
+    \ Personen sehr. Danke! \U0001F970"
   patrons: "UnterstützerInnen"
 _nsfw:
   respect: "Als NSFW markierte Bilder verbergen"
@@ -982,10 +1103,13 @@ _nsfw:
   force: "Alle Medien verbergen"
 _mfm:
   cheatSheet: "MFM Spickzettel"
-  intro: "MFM ist eine Misskey-exklusive Markup-Sprache, die in Misskey an vielen Stellen verwendet werden kann. Hier kannst du eine Liste von verfügbarer MFM-Syntax einsehen."
+  intro: "MFM ist eine Misskey-exklusive Markup-Sprache, die in Misskey an vielen\
+    \ Stellen verwendet werden kann. Hier kannst du eine Liste von verfügbarer MFM-Syntax\
+    \ einsehen."
   dummy: "Misskey erweitert die Welt des Fediverse"
   mention: "Erwähnung"
-  mentionDescription: "Mit At-Zeichen und Benutzername kann ein individueller Nutzer angegeben werden."
+  mentionDescription: "Mit At-Zeichen und Benutzername kann ein individueller Nutzer\
+    \ angegeben werden."
   hashtag: "Hashtag"
   hashtagDescription: "Mit einer Raute und Text kann ein Hashtag angegeben werden."
   url: "URL"
@@ -1001,7 +1125,8 @@ _mfm:
   inlineCode: "Code (Eingebettet)"
   inlineCodeDescription: "Syntax-Hervorhebung für (Programm-)Code eingebettet anzeigen."
   blockCode: "Code (Block)"
-  blockCodeDescription: "Syntax-Hervorhebung für mehrzeiligen (Programm-)Code als Block anzeigen."
+  blockCodeDescription: "Syntax-Hervorhebung für mehrzeiligen (Programm-)Code als\
+    \ Block anzeigen."
   inlineMath: "Mathe (Eingebettet)"
   inlineMathDescription: "Mathematische Formeln (KaTeX) eingebettet anzeigen."
   blockMath: "Mathe (Block)"
@@ -1009,7 +1134,8 @@ _mfm:
   quote: "Zitationen"
   quoteDescription: "Inhalt als Zitat anzeigen."
   emoji: "Benutzerdefinierte Emojis"
-  emojiDescription: "Durch das Umschließen von Emoji-Namen durch Doppelpunkte können benutzerdefinierte Emojis angezeigt werden."
+  emojiDescription: "Durch das Umschließen von Emoji-Namen durch Doppelpunkte können\
+    \ benutzerdefinierte Emojis angezeigt werden."
   search: "Suche"
   searchDescription: "Eine vorgefertige Suchanfragebox anzeigen."
   flip: "Spiegelung"
@@ -1035,7 +1161,8 @@ _mfm:
   x4: "Unglaublich groß"
   x4Description: "Lässt Inhalte noch größer als größer als groß angezeigt werden."
   blur: "Weichzeichnen"
-  blurDescription: "Inhalte durch Weihzeichnung verschwimmen lassen. Durch das Bewegen des Mauszeigers über den Inhalt wird er klar angezeigt."
+  blurDescription: "Inhalte durch Weihzeichnung verschwimmen lassen. Durch das Bewegen\
+    \ des Mauszeigers über den Inhalt wird er klar angezeigt."
   font: "Schriftart"
   fontDescription: "Setzt die Schriftart des Inhaltes fest."
   rainbow: "Regenbogen"
@@ -1045,7 +1172,8 @@ _mfm:
   rotate: "Drehen"
   rotateDescription: "Dreht den Inhalt um einen angegebenen Winkel."
   plain: "Schlicht"
-  plainDescription: "Deaktiviert jegliche MFM-Syntax, die sich innerhalb dieses MFM-Effekts befindet."
+  plainDescription: "Deaktiviert jegliche MFM-Syntax, die sich innerhalb dieses MFM-Effekts\
+    \ befindet."
 _instanceTicker:
   none: "Nie anzeigen"
   remote: "Für Benutzer fremder Instanzen anzeigen"
@@ -1071,15 +1199,23 @@ _menuDisplay:
   hide: "Ausblenden"
 _wordMute:
   muteWords: "Stummgeschaltete Wörter"
-  muteWordsDescription: "Zum Nutzen einer \"UND\"-Verknüpfung Einträge mit Leerzeichen trennen, zum Nutzen einer \"ODER\"-Verknüpfung Einträge mit einem Zeilenumbruch trennen."
-  muteWordsDescription2: "Umgib Schlüsselworter mit Schrägstrichen, um Reguläre Ausdrücke zu verwenden."
-  softDescription: "Notizen, die die angegebenen Konditionen erfüllen, in der Chronik ausblenden."
-  hardDescription: "Verhindern, dass Notizen, die die angegebenen Konditionen erfüllen, der Chronik hinzugefügt werden. Zudem werden diese Notizen auch nicht der Chronik hinzugefügt, falls die Konditionen geändert werden."
+  muteWordsDescription: "Zum Nutzen einer \"UND\"-Verknüpfung Einträge mit Leerzeichen\
+    \ trennen, zum Nutzen einer \"ODER\"-Verknüpfung Einträge mit einem Zeilenumbruch\
+    \ trennen."
+  muteWordsDescription2: "Umgib Schlüsselworter mit Schrägstrichen, um Reguläre Ausdrücke\
+    \ zu verwenden."
+  softDescription: "Notizen, die die angegebenen Konditionen erfüllen, in der Chronik\
+    \ ausblenden."
+  hardDescription: "Verhindern, dass Notizen, die die angegebenen Konditionen erfüllen,\
+    \ der Chronik hinzugefügt werden. Zudem werden diese Notizen auch nicht der Chronik\
+    \ hinzugefügt, falls die Konditionen geändert werden."
   soft: "Leicht"
   hard: "Schwer"
   mutedNotes: "Stummgeschaltete Notizen"
 _instanceMute:
-  instanceMuteDescription: "Schaltet alle Notizen/Renotes stumm, die von den gelisteten Instanzen stammen, inklusive Antworten von Benutzern an einen Benutzer einer stummgeschalteten Instanz."
+  instanceMuteDescription: "Schaltet alle Notizen/Renotes stumm, die von den gelisteten\
+    \ Instanzen stammen, inklusive Antworten von Benutzern an einen Benutzer einer\
+    \ stummgeschalteten Instanz."
   instanceMuteDescription2: "Instanzen getrennt durch Zeilenumbrüchen angeben"
   title: "Blendet Notizen von stummgeschalteten Instanzen aus."
   heading: "Liste der stummzuschaltenden Instanzen"
@@ -1185,32 +1321,49 @@ _tutorial:
   step1_1: "Willkommen!"
   step1_2: "Wir werden Sie einrichten. Sie werden im Handumdrehen einsatzbereit sein!"
   step2_1: "Bitte füllen Sie zuerst Ihr Profil aus."
-  step2_2: "Wenn du ein paar Angaben zu deiner Person machst, können andere leichter erkennen, ob sie deine Notizen sehen oder dir folgen wollen."
+  step2_2: "Wenn du ein paar Angaben zu deiner Person machst, können andere leichter\
+    \ erkennen, ob sie deine Notizen sehen oder dir folgen wollen."
   step3_1: "Jetzt ist es Zeit, einigen Leuten zu folgen!"
-  step3_2: "Deine Home- und Social-Timeline basiert darauf, wem du folgst, also folge für den Anfang ein paar Accounts."
+  step3_2: "Deine Home- und Social-Timeline basiert darauf, wem du folgst, also folge\
+    \ für den Anfang ein paar Accounts."
   step4_1: "Wir bringen dich nach draußen."
-  step4_2: "Für deinen ersten Beitrag machen manche Leute gerne einen {introduction} Beitrag oder ein einfaches \"Hallo Welt!\""
+  step4_2: "Für deinen ersten Beitrag machen manche Leute gerne einen {introduction}\
+    \ Beitrag oder ein einfaches \"Hallo Welt!\""
   step5_1: "Timelines, Timelines überall!"
   step5_2: "Deine Instanz hat {Zeitleisten} verschiedene Zeitleisten aktiviert."
-  step5_3: "Die Zeitleiste Home {icon} ist die Zeitleiste, in der du die Beiträge deiner Follower sehen kannst."
-  step5_4: "In der lokalen {Icon} Zeitleiste kannst du die Beiträge aller anderen Mitglieder dieser Instanz sehen."
-  step5_5: "In der Zeitleiste Empfohlen {icon} kannst du Beiträge von Instanzen sehen, die von den Administratoren empfohlen werden."
-  step5_6: "In der sozialen {icon} Zeitleiste kannst du Beiträge von Freunden deiner Follower sehen."
-  step5_7: "In der globalen {icon} Zeitleiste kannst du Beiträge von allen anderen verbundenen Instanzen sehen."
+  step5_3: "Die Zeitleiste Home {icon} ist die Zeitleiste, in der du die Beiträge\
+    \ deiner Follower sehen kannst."
+  step5_4: "In der lokalen {Icon} Zeitleiste kannst du die Beiträge aller anderen\
+    \ Mitglieder dieser Instanz sehen."
+  step5_5: "In der Zeitleiste Empfohlen {icon} kannst du Beiträge von Instanzen sehen,\
+    \ die von den Administratoren empfohlen werden."
+  step5_6: "In der sozialen {icon} Zeitleiste kannst du Beiträge von Freunden deiner\
+    \ Follower sehen."
+  step5_7: "In der globalen {icon} Zeitleiste kannst du Beiträge von allen anderen\
+    \ verbundenen Instanzen sehen."
   step6_1: "Also, was ist das hier?"
-  step6_2: "Nun, du bist nicht nur Calckey beigetreten. Du bist einem Portal zum Fediversum beigetreten, einem zusammenhängenden Netzwerk von Tausenden von Servern, genannt \"Instanzen\"."
-  step6_3: "Jeder Server funktioniert auf unterschiedliche Weise, und nicht auf allen Servern läuft Calckey. Dieser hier aber schon! Es ist ein bisschen kompliziert, aber du wirst den Dreh schnell raus haben."
+  step6_2: "Nun, du bist nicht nur Calckey beigetreten. Du bist einem Portal zum Fediversum\
+    \ beigetreten, einem zusammenhängenden Netzwerk von Tausenden von Servern, genannt\
+    \ \"Instanzen\"."
+  step6_3: "Jeder Server funktioniert auf unterschiedliche Weise, und nicht auf allen\
+    \ Servern läuft Calckey. Dieser hier aber schon! Es ist ein bisschen kompliziert,\
+    \ aber du wirst den Dreh schnell raus haben."
   step6_4: "Jetzt geh, erkunde und hab Spaß!"
 _2fa:
-  alreadyRegistered: "Du hast bereits ein Gerät für Zwei-Faktor-Authentifizierung registriert."
+  alreadyRegistered: "Du hast bereits ein Gerät für Zwei-Faktor-Authentifizierung\
+    \ registriert."
   registerDevice: "Neues Gerät registrieren"
   registerKey: "Neuen Sicherheitsschlüssel registrieren"
-  step1: "Installiere zuerst eine Authentifizierungsapp (z.B. {a} oder {b}) auf deinem Gerät."
+  step1: "Installiere zuerst eine Authentifizierungsapp (z.B. {a} oder {b}) auf deinem\
+    \ Gerät."
   step2: "Dann, scanne den angezeigten QR-Code mit deinem Gerät."
   step2Url: "Nutzt du ein Desktopprogramm kannst du alternativ diese URL eingeben:"
   step3: "Gib zum Abschluss den Token ein, der von deiner App angezeigt wird."
-  step4: "Alle folgenden Anmeldungsversuche werden ab sofort die Eingabe eines solchen Tokens benötigen."
-  securityKeyInfo: "Du kannst neben Fingerabdruck- oder PIN-Authentifizierung auf deinem Gerät auch Anmeldung mit Hilfe eines FIDO2-kompatiblen Hardware-Sicherheitsschlüssels einrichten."
+  step4: "Alle folgenden Anmeldungsversuche werden ab sofort die Eingabe eines solchen\
+    \ Tokens benötigen."
+  securityKeyInfo: "Du kannst neben Fingerabdruck- oder PIN-Authentifizierung auf\
+    \ deinem Gerät auch Anmeldung mit Hilfe eines FIDO2-kompatiblen Hardware-Sicherheitsschlüssels\
+    \ einrichten."
 _permissions:
   "read:account": "Deine Benutzerkontoinformationen lesen"
   "write:account": "Deine Benutzerkontoinformationen bearbeiten"
@@ -1242,11 +1395,15 @@ _permissions:
   "write:channels": "Kanäle bedienen"
   "read:gallery": "Beiträge deiner Galerie lesen"
   "write:gallery": "Deine Galerie bearbeiten"
-  "read:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge lesen"
-  "write:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge bearbeiten"
+  "read:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge\
+    \ lesen"
+  "write:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge\
+    \ bearbeiten"
 _auth:
-  shareAccess: "Möchtest du „{name}“ authorisieren, auf dieses Benutzerkonto zugreifen zu können?"
-  shareAccessAsk: "Bist du dir sicher, dass du diese Anwendung authorisieren möchtest, auf dein Benutzerkonto zugreifen zu können?"
+  shareAccess: "Möchtest du „{name}“ authorisieren, auf dieses Benutzerkonto zugreifen\
+    \ zu können?"
+  shareAccessAsk: "Bist du dir sicher, dass du diese Anwendung authorisieren möchtest,\
+    \ auf dein Benutzerkonto zugreifen zu können?"
   permissionAsk: "Diese Anwendung fordert folgende Berechtigungen"
   pleaseGoBack: "Bitte kehre zur Anwendung zurück"
   callback: "Es wird zur Anwendung zurückgekehrt"
@@ -1344,7 +1501,8 @@ _profile:
   youCanIncludeHashtags: "Du kannst auch Hashtags in deiner Profilbeschreibung verwenden."
   metadata: "Zusätzliche Informationen"
   metadataEdit: "Zusätzliche Informationen bearbeiten"
-  metadataDescription: "Hierdurch kannst du auf deinem Profil zusätzliche Informationsblöcke anzeigen lassen."
+  metadataDescription: "Hierdurch kannst du auf deinem Profil zusätzliche Informationsblöcke\
+    \ anzeigen lassen."
   metadataLabel: "Beschriftung"
   metadataContent: "Inhalt"
   changeAvatar: "Profilbild ändern"
@@ -1424,7 +1582,8 @@ _pages:
   chooseBlock: "Block hinzufügen"
   selectType: "Typ auswählen"
   enterVariableName: "Gib einen Variablennamen ein"
-  variableNameIsAlreadyUsed: "Dieser Name wird bereits von einer anderen Variable verwendet"
+  variableNameIsAlreadyUsed: "Dieser Name wird bereits von einer anderen Variable\
+    \ verwendet"
   contentBlocks: "Inhalt"
   inputBlocks: "Eingabe"
   specialBlocks: "Spezial"
@@ -1665,7 +1824,8 @@ _pages:
       _for:
         arg1: "Anzahl der Schleifendurchläufe"
         arg2: "Aktion"
-    typeError: "Slot {slot} akzeptiert Werte vom Typ „{expect}“, aber es wurde ein „{actual}“ Wert angegeben!"
+    typeError: "Slot {slot} akzeptiert Werte vom Typ „{expect}“, aber es wurde ein\
+      \ „{actual}“ Wert angegeben!"
     thereIsEmptySlot: "Slot {slot} ist leer!"
     types:
       string: "Text"
@@ -1689,7 +1849,8 @@ _notification:
   youRenoted: "Renote deiner Notiz von {name}"
   youGotPoll: "{name} hat in deiner Umfrage abgestimmt"
   youGotMessagingMessageFromUser: "{name} hat dir eine Chatnachricht gesendet"
-  youGotMessagingMessageFromGroup: "In die Gruppe {name} wurde eine Chatnachricht gesendet"
+  youGotMessagingMessageFromGroup: "In die Gruppe {name} wurde eine Chatnachricht\
+    \ gesendet"
   youWereFollowed: "ist dir gefolgt"
   youReceivedFollowRequest: "Du hast eine Follow-Anfrage erhalten"
   yourFollowRequestAccepted: "Deine Follow-Anfrage wurde akzeptiert"
@@ -1728,9 +1889,11 @@ _deck:
   profile: "Profil"
   newProfile: "Neues Profil"
   deleteProfile: "Profil löschen"
-  introduction: "Erstelle eine auf dich zugeschneiderte Benutzeroberfläche durch das Aneinanderreihen von Spalten!"
+  introduction: "Erstelle eine auf dich zugeschneiderte Benutzeroberfläche durch das\
+    \ Aneinanderreihen von Spalten!"
   introduction2: "Klicke auf das + rechts um wann immer du möchtest neue Spalten hinzuzufügen."
-  widgetsIntroduction: "Drücke bitte \"Widgets bearbeiten\" im Spaltenmenü und füge ein Widget hinzu."
+  widgetsIntroduction: "Drücke bitte \"Widgets bearbeiten\" im Spaltenmenü und füge\
+    \ ein Widget hinzu."
   _columns:
     main: "Hauptspalte"
     widgets: "Widgets"
@@ -1740,3 +1903,13 @@ _deck:
     list: "Listen"
     mentions: "Erwähnungen"
     direct: "Direktnachrichten"
+enableRecommendedTimeline: Empfohlenen Zeitplan aktivieren
+secureMode: Sicherer Modus (Autorisierter Abruf)
+instanceSecurity: Instanzsicherheit
+manageGroups: Gruppen verwalten
+noThankYou: Nein, danke
+privateMode: Privater Modus
+enableEmojiReactions: Emoji-Reaktionen aktivieren
+flagSpeakAsCat: Wie eine Katze sprechen
+showEmojisInReactionNotifications: Emojis in Reaktionsbenachrichtigungen anzeigen
+userSaysSomethingReason: '{name} sagte {reason}'

From 2a276fafebcd0c6af485033b2fda3b424f81309b Mon Sep 17 00:00:00 2001
From: mutex <medini_seiken@mailredacted.com>
Date: Tue, 25 Apr 2023 21:53:35 +0000
Subject: [PATCH 532/582] chore: Translated using Weblate (German)

Currently translated at 94.6% (1634 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 52d11605c..81098fe3f 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -741,8 +741,8 @@ noCrawle: "Crawler-Indexierung ablehnen"
 noCrawleDescription: "Suchmaschinen bitten, die eigene Profilseite, Notizen, Seiten\
   \ usw. nicht zu indexieren."
 lockedAccountInfo: "Auch wenn du Follow-Anfragen auf manuelle Bestätigung setzt, wird\
-  \ jede deiner Notizen öffentlich sichtbar sein, sofern du ihre Notizsichtbarkeit\
-  \ nicht auf \"Nur Follower\" setzt."
+  \ jeder deiner Posts öffentlich sichtbar sein, sofern du ihre Sichtbarkeit nicht\
+  \ auf \"Nur Follower\" setzt."
 alwaysMarkSensitive: "Medien standardmäßig als NSFW markieren"
 loadRawImages: "Anstatt Vorschaubilder immer Originalbilder anzeigen"
 disableShowingAnimatedImages: "Animierte Bilder nicht abspielen"
@@ -778,10 +778,10 @@ nUsers: "{n} Benutzer"
 nNotes: "{n} Notizen"
 sendErrorReports: "Fehlerberichte senden"
 sendErrorReportsDescription: "Ist diese Option aktiviert, so werden beim Auftreten\
-  \ von Fehlern detaillierte Fehlerinformationen an Misskey weitergegeben, was zur\
-  \ Verbesserung der Qualität von Misskey beiträgt.\nEnthalten in diesen Informationen\
+  \ von Fehlern detaillierte Fehlerinformationen an Calckey weitergegeben, was zur\
+  \ Verbesserung der Qualität von Calckey beiträgt.\nEnthalten in diesen Informationen\
   \ sind u.a. die Version deines Betriebssystems, welchen Browser du verwendest und\
-  \ ein Verlauf deiner Aktivitäten innerhalb Misskey."
+  \ ein Verlauf deiner Aktivitäten innerhalb Calckey."
 myTheme: "Mein Farbschema"
 backgroundColor: "Hintergrundfarbe"
 accentColor: "Akzentfarbe"
@@ -1913,3 +1913,17 @@ enableEmojiReactions: Emoji-Reaktionen aktivieren
 flagSpeakAsCat: Wie eine Katze sprechen
 showEmojisInReactionNotifications: Emojis in Reaktionsbenachrichtigungen anzeigen
 userSaysSomethingReason: '{name} sagte {reason}'
+hiddenTagsDescription: 'Liste die Hashtags (ohne #) welche du von Trending und Explore
+  verstecken möchtest. Versteckte Hashtags sind durch andere Wege weiterhin auffindbar.'
+addInstance: Instanz hinzufügen
+flagSpeakAsCatDescription: Deine Posts werden im Katzenmodus "nya-ifiziert"
+hiddenTags: Versteckte Hashtags
+antennaInstancesDescription: Nenne einen Instanzen-Host pro Zeile
+secureModeInfo: Bei Anfragen an andere Instanzen nicht ohne Nachweis zurücksenden.
+renoteMute: Boosts stummschalten
+renoteUnmute: Boosts aktivieren
+noInstances: Es gibt keine Instanzen
+privateModeInfo: Wenn diese Option aktiviert ist, können nur Instanzen auf der Whitelist
+  mit Deinen Instanzen föderieren. Alle Beiträge werden für die Öffentlichkeit verborgen.
+allowedInstances: Instanzen auf der Whitelist
+selectInstance: Wähle eine Instanz

From 9705699054e9f994b25682d416bfaaf14eb79892 Mon Sep 17 00:00:00 2001
From: Miguel Frias Mosquea <maikel@maikel.uk>
Date: Mon, 24 Apr 2023 08:44:35 +0000
Subject: [PATCH 533/582] chore: Translated using Weblate (Spanish)

Currently translated at 92.2% (1594 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/es/
---
 locales/es-ES.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 3a4f0a219..c9811e3c0 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -14,7 +14,7 @@ ok: "OK"
 gotIt: "¡Lo tengo!"
 cancel: "Cancelar"
 enterUsername: "Introduce el nombre de usuario"
-renotedBy: "Renotado por {user}"
+renotedBy: "Reposteado por {user}"
 noNotes: "No hay publicaciones"
 noNotifications: "No hay notificaciones"
 instance: "Instancia"

From 1a9898d4cd44e72fd829e8a8f87f8a0a967d1ee5 Mon Sep 17 00:00:00 2001
From: Marud <translate-calckey@marud.fr>
Date: Tue, 25 Apr 2023 22:17:37 +0000
Subject: [PATCH 534/582] chore: Translated using Weblate (French)

Currently translated at 95.6% (1652 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fr/
---
 locales/fr-FR.yml | 573 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 461 insertions(+), 112 deletions(-)

diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 2d918b5ad..8c7bf8025 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -1,7 +1,10 @@
----
 _lang_: "Français"
 headlineMisskey: "Réseau relié par des notes"
-introMisskey: "Bienvenue ! Misskey est un service de microblogage décentralisé, libre et ouvert.\nÉcrivez des « notes » et partagez ce qui se passe à l’instant présent, autour de vous avec les autres 📡\nLa fonction « réactions », vous permet également d’ajouter une réaction rapide aux notes des autres utilisateur·rice·s 👍\nExplorons un nouveau monde 🚀"
+introMisskey: "Bienvenue ! Misskey est un service de microblogage décentralisé, libre\
+  \ et ouvert.\nÉcrivez des « notes » et partagez ce qui se passe à l’instant présent,\
+  \ autour de vous avec les autres \U0001F4E1\nLa fonction « réactions », vous permet\
+  \ également d’ajouter une réaction rapide aux notes des autres utilisateur·rice·s\
+  \ \U0001F44D\nExplorons un nouveau monde \U0001F680"
 monthAndDay: "{day}/{month}"
 search: "Rechercher"
 notifications: "Notifications"
@@ -23,7 +26,8 @@ otherSettings: "Paramètres avancés"
 openInWindow: "Ouvrir dans une nouvelle fenêtre"
 profile: "Profil"
 timeline: "Fil"
-noAccountDescription: "L’utilisateur·rice n’a pas encore renseigné de biographie de présentation sur son profil."
+noAccountDescription: "L’utilisateur·rice n’a pas encore renseigné de biographie de\
+  \ présentation sur son profil."
 login: "Se connecter"
 loggingIn: "Connexion en cours"
 logout: "Se déconnecter"
@@ -44,7 +48,8 @@ copyContent: "Copier le contenu"
 copyLink: "Copier le lien"
 delete: "Supprimer"
 deleteAndEdit: "Supprimer et réécrire"
-deleteAndEditConfirm: "Êtes-vous sûr·e de vouloir supprimer cette note et la reformuler ? Vous perdrez toutes les réactions, renotes et réponses y afférentes."
+deleteAndEditConfirm: "Êtes-vous sûr·e de vouloir supprimer cette note et la reformuler\
+  \ ? Vous perdrez toutes les réactions, renotes et réponses y afférentes."
 addToList: "Ajouter à une liste"
 sendMessage: "Envoyer un message"
 copyUsername: "Copier le nom d’utilisateur·rice"
@@ -64,9 +69,11 @@ import: "Importer"
 export: "Exporter"
 files: "Fichiers"
 download: "Télécharger"
-driveFileDeleteConfirm: "Êtes-vous sûr·e de vouloir supprimer le fichier \"{name}\" ? Les notes liées à ce fichier seront aussi supprimées."
+driveFileDeleteConfirm: "Êtes-vous sûr·e de vouloir supprimer le fichier \"{name}\"\
+  \ ? Les notes liées à ce fichier seront aussi supprimées."
 unfollowConfirm: "Désirez-vous vous désabonner de {name} ?"
-exportRequested: "Vous avez demandé une exportation. L’opération pourrait prendre un peu de temps. Une terminée, le fichier résultant sera ajouté au Drive."
+exportRequested: "Vous avez demandé une exportation. L’opération pourrait prendre\
+  \ un peu de temps. Une terminée, le fichier résultant sera ajouté au Drive."
 importRequested: "Vous avez initié un import. Cela pourrait prendre un peu de temps."
 lists: "Listes"
 noLists: "Vous n’avez aucune liste"
@@ -81,9 +88,12 @@ error: "Erreur"
 somethingHappened: "Une erreur est survenue"
 retry: "Réessayer"
 pageLoadError: "Le chargement de la page a échoué"
-pageLoadErrorDescription: "Cela est généralement causé par le cache du navigateur ou par un problème réseau. Veuillez vider votre cache ou attendre un peu et réessayer."
-serverIsDead: "Le serveur ne répond pas. Patientez quelques instants puis essayez à nouveau."
-youShouldUpgradeClient: "Si la page ne s'affiche pas correctement, rechargez-la pour mettre votre client à jour."
+pageLoadErrorDescription: "Cela est généralement causé par le cache du navigateur\
+  \ ou par un problème réseau. Veuillez vider votre cache ou attendre un peu et réessayer."
+serverIsDead: "Le serveur ne répond pas. Patientez quelques instants puis essayez\
+  \ à nouveau."
+youShouldUpgradeClient: "Si la page ne s'affiche pas correctement, rechargez-la pour\
+  \ mettre votre client à jour."
 enterListName: "Nom de la liste"
 privacy: "Confidentialité"
 makeFollowManuallyApprove: "Accepter manuellement les demandes d’abonnement"
@@ -108,8 +118,11 @@ sensitive: "Contenu sensible"
 add: "Ajouter"
 reaction: "Réactions"
 reactionSetting: "Réactions à afficher dans le sélecteur de réactions"
-reactionSettingDescription2: "Déplacer pour réorganiser, cliquer pour effacer, utiliser « + » pour ajouter."
-rememberNoteVisibility: "Activer l'option \" se souvenir de la visibilité des notes \" vous permet de réutiliser automatiquement la visibilité utilisée lors de la publication de votre note précédente."
+reactionSettingDescription2: "Déplacer pour réorganiser, cliquer pour effacer, utiliser\
+  \ « + » pour ajouter."
+rememberNoteVisibility: "Activer l'option \" se souvenir de la visibilité des notes\
+  \ \" vous permet de réutiliser automatiquement la visibilité utilisée lors de la\
+  \ publication de votre note précédente."
 attachCancel: "Supprimer le fichier attaché"
 markAsSensitive: "Marquer comme sensible"
 unmarkAsSensitive: "Supprimer le marquage comme sensible"
@@ -137,13 +150,20 @@ emojiUrl: "URL de l’émoji"
 addEmoji: "Ajouter un émoji"
 settingGuide: "Configuration proposée"
 cacheRemoteFiles: "Mise en cache des fichiers distants"
-cacheRemoteFilesDescription: "Lorsque cette option est désactivée, les fichiers distants sont chargés directement depuis l’instance distante. La désactiver diminuera certes l’utilisation de l’espace de stockage local mais augmentera le trafic réseau puisque les miniatures ne seront plus générées."
+cacheRemoteFilesDescription: "Lorsque cette option est désactivée, les fichiers distants\
+  \ sont chargés directement depuis l’instance distante. La désactiver diminuera certes\
+  \ l’utilisation de l’espace de stockage local mais augmentera le trafic réseau puisque\
+  \ les miniatures ne seront plus générées."
 flagAsBot: "Ce compte est un robot"
-flagAsBotDescription: "Si ce compte est géré de manière automatisée, choisissez cette option. Si elle est activée, elle agira comme un marqueur pour les autres développeurs afin d'éviter des chaînes d'interaction sans fin avec d'autres robots et d'ajuster les systèmes internes de Misskey pour traiter ce compte comme un robot."
+flagAsBotDescription: "Si ce compte est géré de manière automatisée, choisissez cette\
+  \ option. Si elle est activée, elle agira comme un marqueur pour les autres développeurs\
+  \ afin d'éviter des chaînes d'interaction sans fin avec d'autres robots et d'ajuster\
+  \ les systèmes internes de Misskey pour traiter ce compte comme un robot."
 flagAsCat: "Ce compte est un chat"
 flagAsCatDescription: "Activer l'option \" Je suis un chat \" pour ce compte."
 flagShowTimelineReplies: "Afficher les réponses dans le fil"
-autoAcceptFollowed: "Accepter automatiquement les demandes d’abonnement venant d’utilisateur·rice·s que vous suivez"
+autoAcceptFollowed: "Accepter automatiquement les demandes d’abonnement venant d’utilisateur·rice·s\
+  \ que vous suivez"
 addAccount: "Ajouter un compte"
 loginFailed: "Échec de la connexion"
 showOnRemote: "Voir sur l’instance distante"
@@ -155,7 +175,12 @@ searchWith: "Recherche : {q}"
 youHaveNoLists: "Vous n’avez aucune liste"
 followConfirm: "Êtes-vous sûr·e de vouloir suivre {name} ?"
 proxyAccount: "Compte proxy"
-proxyAccountDescription: "Un compte proxy se comporte, dans certaines conditions, comme un·e abonné·e distant·e pour les utilisateurs d'autres instances. Par exemple, quand un·e utilisateur·rice ajoute un·e utilisateur·rice distant·e à une liste, ses notes ne seront pas visibles sur l'instance si personne ne suit cet·te utilisateur·rice. Le compte proxy va donc suivre cet·te utilisateur·rice pour que ses notes soient acheminées."
+proxyAccountDescription: "Un compte proxy se comporte, dans certaines conditions,\
+  \ comme un·e abonné·e distant·e pour les utilisateurs d'autres instances. Par exemple,\
+  \ quand un·e utilisateur·rice ajoute un·e utilisateur·rice distant·e à une liste,\
+  \ ses notes ne seront pas visibles sur l'instance si personne ne suit cet·te utilisateur·rice.\
+  \ Le compte proxy va donc suivre cet·te utilisateur·rice pour que ses notes soient\
+  \ acheminées."
 host: "Serveur distant"
 selectUser: "Sélectionner un·e utilisateur·rice"
 recipient: "Destinataire"
@@ -186,11 +211,14 @@ instanceInfo: "Informations sur l’instance"
 statistics: "Statistiques"
 clearQueue: "Vider la file d’attente"
 clearQueueConfirmTitle: "Êtes-vous sûr·e de vouloir vider la file d’attente ?"
-clearQueueConfirmText: "Les notes non distribuées ne seront pas délivrées. Normalement, vous n'avez pas besoin d'effectuer cette opération."
+clearQueueConfirmText: "Les notes non distribuées ne seront pas délivrées. Normalement,\
+  \ vous n'avez pas besoin d'effectuer cette opération."
 clearCachedFiles: "Vider le cache"
-clearCachedFilesConfirm: "Êtes-vous sûr·e de vouloir vider tout le cache de fichiers distants ?"
+clearCachedFilesConfirm: "Êtes-vous sûr·e de vouloir vider tout le cache de fichiers\
+  \ distants ?"
 blockedInstances: "Instances bloquées"
-blockedInstancesDescription: "Listez les instances que vous désirez bloquer, une par ligne. Ces instances ne seront plus en capacité d'interagir avec votre instance."
+blockedInstancesDescription: "Listez les instances que vous désirez bloquer, une par\
+  \ ligne. Ces instances ne seront plus en capacité d'interagir avec votre instance."
 muteAndBlock: "Masqué·e·s / Bloqué·e·s"
 mutedUsers: "Utilisateur·rice·s en sourdine"
 blockedUsers: "Utilisateur·rice·s bloqué·e·s"
@@ -243,7 +271,8 @@ fromUrl: "Depuis une URL"
 uploadFromUrl: "Téléverser via une URL"
 uploadFromUrlDescription: "URL du fichier que vous souhaitez téléverser"
 uploadFromUrlRequested: "Téléversement demandé"
-uploadFromUrlMayTakeTime: "Le téléversement de votre fichier peut prendre un certain temps."
+uploadFromUrlMayTakeTime: "Le téléversement de votre fichier peut prendre un certain\
+  \ temps."
 explore: "Découvrir"
 messageRead: "Lu"
 noMoreHistory: "Il n’y a plus d’historique"
@@ -253,7 +282,8 @@ agreeTo: "J’accepte {0}"
 tos: "les conditions d’utilisation"
 start: "Commencer"
 home: "Principal"
-remoteUserCaution: "Les informations de ce compte risqueraient d’être incomplètes du fait que l’utilisateur·rice provient d’une instance distante."
+remoteUserCaution: "Les informations de ce compte risqueraient d’être incomplètes\
+  \ du fait que l’utilisateur·rice provient d’une instance distante."
 activity: "Activité"
 images: "Images"
 birthday: "Date de naissance"
@@ -286,7 +316,8 @@ unableToDelete: "Suppression impossible"
 inputNewFileName: "Entrez un nouveau nom de fichier"
 inputNewDescription: "Veuillez entrer une nouvelle description"
 inputNewFolderName: "Entrez un nouveau nom de dossier"
-circularReferenceFolder: "Le dossier de destination est un sous-dossier du dossier que vous souhaitez déplacer."
+circularReferenceFolder: "Le dossier de destination est un sous-dossier du dossier\
+  \ que vous souhaitez déplacer."
 hasChildFilesOrFolders: "Impossible de supprimer ce dossier car il n'est pas vide."
 copyUrl: "Copier l’URL"
 rename: "Renommer"
@@ -320,7 +351,8 @@ connectService: "Connexion"
 disconnectService: "Déconnexion"
 enableLocalTimeline: "Activer le fil local"
 enableGlobalTimeline: "Activer le fil global"
-disablingTimelinesInfo: "Même si vous désactivez ces fils, les administrateur·rice·s et les modérateur·rice·s pourront toujours y accéder."
+disablingTimelinesInfo: "Même si vous désactivez ces fils, les administrateur·rice·s\
+  \ et les modérateur·rice·s pourront toujours y accéder."
 registration: "S’inscrire"
 enableRegistration: "Autoriser les nouvelles inscriptions"
 invite: "Inviter"
@@ -332,9 +364,11 @@ bannerUrl: "URL de l’image de la bannière"
 backgroundImageUrl: "URL de l'image d'arrière-plan"
 basicInfo: "Informations basiques"
 pinnedUsers: "Utilisateur·rice épinglé·e"
-pinnedUsersDescription: "Listez les utilisateur·rice·s que vous souhaitez voir épinglé·e·s sur la page \"Découvrir\", un·e par ligne."
+pinnedUsersDescription: "Listez les utilisateur·rice·s que vous souhaitez voir épinglé·e·s\
+  \ sur la page \"Découvrir\", un·e par ligne."
 pinnedPages: "Pages épinglées"
-pinnedPagesDescription: "Inscrivez le chemin des pages que vous souhaitez épingler en haut de la page de l'instance. Séparez les pages d'un retour à la ligne."
+pinnedPagesDescription: "Inscrivez le chemin des pages que vous souhaitez épingler\
+  \ en haut de la page de l'instance. Séparez les pages d'un retour à la ligne."
 pinnedClipId: "Identifiant du clip épinglé"
 pinnedNotes: "Note épinglée"
 hcaptcha: "hCaptcha"
@@ -345,14 +379,17 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "Activer reCAPTCHA"
 recaptchaSiteKey: "Clé du site"
 recaptchaSecretKey: "Clé secrète"
-avoidMultiCaptchaConfirm: "L’utilisation de plusieurs Captchas peut provoquer des interférences. Souhaitez-vous désactiver l’autre Captcha ? Vous pouvez laisser plusieurs Captcha activés en appuyant sur Annuler."
+avoidMultiCaptchaConfirm: "L’utilisation de plusieurs Captchas peut provoquer des\
+  \ interférences. Souhaitez-vous désactiver l’autre Captcha ? Vous pouvez laisser\
+  \ plusieurs Captcha activés en appuyant sur Annuler."
 antennas: "Antennes"
 manageAntennas: "Gestion des antennes"
 name: "Nom"
 antennaSource: "Source de l’antenne"
 antennaKeywords: "Mots clés à recevoir"
 antennaExcludeKeywords: "Mots clés à exclure"
-antennaKeywordsDescription: "Séparer avec des espaces pour la condition AND. Séparer avec un saut de ligne pour une condition OR."
+antennaKeywordsDescription: "Séparer avec des espaces pour la condition AND. Séparer\
+  \ avec un saut de ligne pour une condition OR."
 notifyAntenna: "Je souhaite recevoir les notifications des nouvelles notes"
 withFileAntenna: "Notes ayant des attachements uniquement"
 enableServiceworker: "Activer ServiceWorker"
@@ -363,9 +400,11 @@ connectedTo: "Vous êtes connectés aux services suivants"
 notesAndReplies: "Notes et Réponses"
 withFiles: "Avec fichiers joints"
 silence: "Mettre en sourdine"
-silenceConfirm: "Êtes-vous sûr·e de vouloir mettre l’utilisateur·rice en sourdine ?"
+silenceConfirm: "Êtes-vous sûr·e de vouloir mettre l’utilisateur·rice en sourdine\
+  \ ?"
 unsilence: "Annuler la sourdine"
-unsilenceConfirm: "Êtes-vous sûr·e de vouloir annuler la mise en sourdine de cet·te utilisateur·rice ?"
+unsilenceConfirm: "Êtes-vous sûr·e de vouloir annuler la mise en sourdine de cet·te\
+  \ utilisateur·rice ?"
 popularUsers: "Utilisateur·rice·s populaires"
 recentlyUpdatedUsers: "Utilisateur·rice·s actif·ve·s récemment"
 recentlyRegisteredUsers: "Utilisateur·rice·s récemment inscrit·e·s"
@@ -430,7 +469,8 @@ invitationCode: "Code d’invitation"
 checking: "Vérification en cours..."
 available: "Disponible"
 unavailable: "Non disponible"
-usernameInvalidFormat: "Le nom d'utilisateur peut contenir uniquement des lettres (minuscules et/ou majuscules), des chiffres et des _"
+usernameInvalidFormat: "Le nom d'utilisateur peut contenir uniquement des lettres\
+  \ (minuscules et/ou majuscules), des chiffres et des _"
 tooShort: "Trop court"
 tooLong: "Trop long"
 weakPassword: "Mot de passe faible"
@@ -439,7 +479,8 @@ strongPassword: "Mot de passe fort"
 passwordMatched: "Les mots de passe correspondent"
 passwordNotMatched: "Les mots de passe ne correspondent pas"
 signinWith: "Se connecter avec {x}"
-signinFailed: "Échec d’authentification. Veuillez vérifier que votre nom d’utilisateur et mot de passe sont corrects."
+signinFailed: "Échec d’authentification. Veuillez vérifier que votre nom d’utilisateur\
+  \ et mot de passe sont corrects."
 tapSecurityKey: "Appuyez sur votre clé de sécurité"
 or: "OU"
 language: "Langue"
@@ -448,7 +489,8 @@ groupInvited: "Invité au groupe"
 aboutX: "À propos de {x}"
 useOsNativeEmojis: "Utiliser les émojis natifs du système"
 youHaveNoGroups: "Vous n’avez aucun groupe"
-joinOrCreateGroup: "Vous pouvez être invité·e à rejoindre des groupes existants ou créer votre propre nouveau groupe."
+joinOrCreateGroup: "Vous pouvez être invité·e à rejoindre des groupes existants ou\
+  \ créer votre propre nouveau groupe."
 noHistory: "Pas d'historique"
 signinHistory: "Historique de connexion"
 disableAnimatedMfm: "Désactiver MFM ayant des animations"
@@ -479,19 +521,29 @@ showFeaturedNotesInTimeline: "Afficher les notes des Tendances dans le fil d'act
 objectStorage: "Stockage d'objets"
 useObjectStorage: "Utiliser le stockage d'objets"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "Préfixe d’URL utilisé pour construire l’URL vers le référencement d’objet (média). Spécifiez son URL si vous utilisez un CDN ou un proxy, sinon spécifiez l’adresse accessible au public selon le guide de service que vous allez utiliser. P.ex. 'https://<bucket>.s3.amazonaws.com' pour AWS S3 et 'https://storage.googleapis.com/<bucket>' pour GCS."
+objectStorageBaseUrlDesc: "Préfixe d’URL utilisé pour construire l’URL vers le référencement\
+  \ d’objet (média). Spécifiez son URL si vous utilisez un CDN ou un proxy, sinon\
+  \ spécifiez l’adresse accessible au public selon le guide de service que vous allez\
+  \ utiliser. P.ex. 'https://<bucket>.s3.amazonaws.com' pour AWS S3 et 'https://storage.googleapis.com/<bucket>'\
+  \ pour GCS."
 objectStorageBucket: "Bucket"
-objectStorageBucketDesc: "Veuillez spécifier le nom du compartiment utilisé sur le service configuré."
+objectStorageBucketDesc: "Veuillez spécifier le nom du compartiment utilisé sur le\
+  \ service configuré."
 objectStoragePrefix: "Prefix"
 objectStoragePrefixDesc: "Les fichiers seront stockés sous le répertoire de ce préfixe."
 objectStorageEndpoint: "Endpoint"
-objectStorageEndpointDesc: "Laissez ce champ vide si vous utilisez AWS S3, sinon spécifiez le point de terminaison comme '<host>' ou '<host>: <port>' selon le guide de service que vous allez utiliser."
+objectStorageEndpointDesc: "Laissez ce champ vide si vous utilisez AWS S3, sinon spécifiez\
+  \ le point de terminaison comme '<host>' ou '<host>: <port>' selon le guide de service\
+  \ que vous allez utiliser."
 objectStorageRegion: "Région"
-objectStorageRegionDesc: "Spécifiez une région comme 'xx-east-1'. Si votre service ne fait pas de distinction entre les régions, laissez-le vide ou remplissez 'us-east-1'."
+objectStorageRegionDesc: "Spécifiez une région comme 'xx-east-1'. Si votre service\
+  \ ne fait pas de distinction entre les régions, laissez-le vide ou remplissez 'us-east-1'."
 objectStorageUseSSL: "Utiliser SSL"
-objectStorageUseSSLDesc: "Désactivez cette option si vous n'utilisez pas HTTPS pour la connexion API"
+objectStorageUseSSLDesc: "Désactivez cette option si vous n'utilisez pas HTTPS pour\
+  \ la connexion API"
 objectStorageUseProxy: "Se connecter via proxy"
-objectStorageUseProxyDesc: "Désactivez cette option si vous n'utilisez pas de proxy pour la connexion API"
+objectStorageUseProxyDesc: "Désactivez cette option si vous n'utilisez pas de proxy\
+  \ pour la connexion API"
 objectStorageSetPublicRead: "Régler sur « public » lors de l'envoi"
 serverLogs: "Journal du serveur"
 deleteAll: "Supprimer tout"
@@ -519,7 +571,9 @@ sort: "Trier"
 ascendingOrder: "Ascendant"
 descendingOrder: "Descendant"
 scratchpad: "ScratchPad"
-scratchpadDescription: "ScratchPad fournit un environnement expérimental pour AiScript. Vous pouvez vérifier la rédaction de votre code, sa bonne exécution et le résultat de son interaction avec Misskey."
+scratchpadDescription: "ScratchPad fournit un environnement expérimental pour AiScript.\
+  \ Vous pouvez vérifier la rédaction de votre code, sa bonne exécution et le résultat\
+  \ de son interaction avec Misskey."
 output: "Sortie"
 script: "Script"
 disablePagesScript: "Désactiver AiScript sur les Pages"
@@ -527,11 +581,15 @@ updateRemoteUser: "Mettre à jour les informations de l’utilisateur·rice dist
 deleteAllFiles: "Supprimer tous les fichiers"
 deleteAllFilesConfirm: "Êtes-vous sûr·e de vouloir supprimer tous les fichiers ?"
 removeAllFollowing: "Retenir tous les abonnements"
-removeAllFollowingDescription: "Se désabonner de tous les comptes de {host}. Veuillez lancer cette action uniquement si l’instance n’existe plus."
+removeAllFollowingDescription: "Se désabonner de tous les comptes de {host}. Veuillez\
+  \ lancer cette action uniquement si l’instance n’existe plus."
 userSuspended: "Cet·te utilisateur·rice a été suspendu·e."
 userSilenced: "Cette utilisateur·trice a été mis·e en sourdine."
 yourAccountSuspendedTitle: "Ce compte est suspendu"
-yourAccountSuspendedDescription: "Ce compte est suspendu car vous avez enfreint les conditions d'utilisation de l'instance, ou pour un motif similaire. Si vous souhaitez connaître en détail les raisons de cette suspension, renseignez-vous auprès de l'administrateur·rice de votre instance. Merci de ne pas créer de nouveau compte."
+yourAccountSuspendedDescription: "Ce compte est suspendu car vous avez enfreint les\
+  \ conditions d'utilisation de l'instance, ou pour un motif similaire. Si vous souhaitez\
+  \ connaître en détail les raisons de cette suspension, renseignez-vous auprès de\
+  \ l'administrateur·rice de votre instance. Merci de ne pas créer de nouveau compte."
 menu: "Menu"
 divider: "Séparateur"
 addItem: "Ajouter un élément"
@@ -554,7 +612,8 @@ description: "Description"
 describeFile: "Ajouter une description d'image"
 enterFileDescription: "Saisissez une description"
 author: "Auteur·rice"
-leaveConfirm: "Vous avez des modifications non-sauvegardées. Voulez-vous les ignorer ?"
+leaveConfirm: "Vous avez des modifications non-sauvegardées. Voulez-vous les ignorer\
+  \ ?"
 manage: "Gestion"
 plugins: "Extensions"
 deck: "Deck"
@@ -571,12 +630,14 @@ permission: "Autorisations"
 enableAll: "Tout activer"
 disableAll: "Tout désactiver"
 tokenRequested: "Autoriser l'accès au compte"
-pluginTokenRequestedDescription: "Ce plugin pourra utiliser les autorisations définies ici."
+pluginTokenRequestedDescription: "Ce plugin pourra utiliser les autorisations définies\
+  \ ici."
 notificationType: "Type de notifications"
 edit: "Editer"
 emailServer: "Serveur mail"
 enableEmail: "Activer la distribution de courriel"
-emailConfigInfo: "Utilisé pour confirmer votre adresse de courriel et la réinitialisation de votre mot de passe en cas d’oubli."
+emailConfigInfo: "Utilisé pour confirmer votre adresse de courriel et la réinitialisation\
+  \ de votre mot de passe en cas d’oubli."
 email: "E-mail "
 emailAddress: "Adresses e-mail"
 smtpConfig: "Paramètres du serveur SMTP"
@@ -584,7 +645,8 @@ smtpHost: "Serveur distant"
 smtpPort: "Port"
 smtpUser: "Nom d’utilisateur·rice"
 smtpPass: "Mot de passe"
-emptyToDisableSmtpAuth: "Laisser le nom d’utilisateur et le mot de passe vides pour désactiver la vérification SMTP"
+emptyToDisableSmtpAuth: "Laisser le nom d’utilisateur et le mot de passe vides pour\
+  \ désactiver la vérification SMTP"
 smtpSecure: "Utiliser SSL/TLS implicitement dans les connexions SMTP"
 smtpSecureInfo: "Désactiver cette option lorsque STARTTLS est utilisé"
 testEmail: "Tester la distribution de courriel"
@@ -605,18 +667,24 @@ create: "Créer"
 notificationSetting: "Paramètres des notifications "
 notificationSettingDesc: "Sélectionnez le type de notification à afficher"
 useGlobalSetting: "Utiliser paramètre général"
-useGlobalSettingDesc: "S'il est activé, les paramètres de notification de votre compte seront utilisés. S'il est désactivé, des configurations individuelles peuvent être effectuées."
+useGlobalSettingDesc: "S'il est activé, les paramètres de notification de votre compte\
+  \ seront utilisés. S'il est désactivé, des configurations individuelles peuvent\
+  \ être effectuées."
 other: "Autre"
 regenerateLoginToken: "Régénérer le jeton de connexion"
-regenerateLoginTokenDescription: "Générer un nouveau jeton d'authentification. Cette opération ne devrait pas être nécessaire ; lors de la génération d'un nouveau jeton, tous les appareils seront déconnectés. "
-setMultipleBySeparatingWithSpace: "Vous pouvez en définir plusieurs, en les séparant par des espaces."
+regenerateLoginTokenDescription: "Générer un nouveau jeton d'authentification. Cette\
+  \ opération ne devrait pas être nécessaire ; lors de la génération d'un nouveau\
+  \ jeton, tous les appareils seront déconnectés. "
+setMultipleBySeparatingWithSpace: "Vous pouvez en définir plusieurs, en les séparant\
+  \ par des espaces."
 fileIdOrUrl: "ID du fichier ou URL"
 behavior: "Comportement"
 sample: "Exemple"
 abuseReports: "Signalements"
 reportAbuse: "Signaler"
 reportAbuseOf: "Signaler {name}"
-fillAbuseReportDescription: "Veuillez expliquer les raisons du signalement. S'il s'agit d'une note précise, veuillez en donner le lien."
+fillAbuseReportDescription: "Veuillez expliquer les raisons du signalement. S'il s'agit\
+  \ d'une note précise, veuillez en donner le lien."
 abuseReported: "Le rapport est envoyé. Merci."
 reporter: "Signalé par"
 reporteeOrigin: "Origine du signalement"
@@ -627,7 +695,8 @@ abuseMarkAsResolved: "Marquer le signalement comme résolu"
 openInNewTab: "Ouvrir dans un nouvel onglet"
 openInSideView: "Ouvrir en vue latérale"
 defaultNavigationBehaviour: "Navigation par défaut"
-editTheseSettingsMayBreakAccount: "La modification de ces paramètres peut endommager votre compte."
+editTheseSettingsMayBreakAccount: "La modification de ces paramètres peut endommager\
+  \ votre compte."
 instanceTicker: "Nom de l'instance d'origine des notes"
 waitingFor: "En attente de {x}"
 random: "Aléatoire"
@@ -639,7 +708,8 @@ createNew: "Créer nouveau"
 optional: "Facultatif"
 createNewClip: "Créer un nouveau clip"
 public: "Public"
-i18nInfo: "Calckey est traduit dans différentes langues par des bénévoles. Vous pouvez contribuer à {link}."
+i18nInfo: "Calckey est traduit dans différentes langues par des bénévoles. Vous pouvez\
+  \ contribuer à {link}."
 manageAccessTokens: "Gérer les jetons d'accès"
 accountInfo: " Informations du compte "
 notesCount: "Nombre de notes"
@@ -658,12 +728,16 @@ no: "Non"
 driveFilesCount: "Nombre de fichiers dans le Drive"
 driveUsage: "Utilisation du Drive"
 noCrawle: "Refuser l'indexation par les robots"
-noCrawleDescription: "Demandez aux moteurs de recherche de ne pas indexer votre page de profil, vos notes, vos pages, etc."
-lockedAccountInfo: "À moins que vous ne définissiez la visibilité de votre note sur \"Abonné-e-s\", vos notes sont visibles par tous, même si vous exigez que les demandes d'abonnement soient approuvées manuellement."
+noCrawleDescription: "Demandez aux moteurs de recherche de ne pas indexer votre page\
+  \ de profil, vos notes, vos pages, etc."
+lockedAccountInfo: "À moins que vous ne définissiez la visibilité de votre note sur\
+  \ \"Abonné-e-s\", vos notes sont visibles par tous, même si vous exigez que les\
+  \ demandes d'abonnement soient approuvées manuellement."
 alwaysMarkSensitive: "Marquer les médias comme contenu sensible par défaut"
 loadRawImages: "Affichage complet des images jointes au lieu des vignettes"
 disableShowingAnimatedImages: "Désactiver l'animation des images"
-verificationEmailSent: "Un e-mail de vérification a été envoyé. Veuillez accéder au lien pour compléter la vérification."
+verificationEmailSent: "Un e-mail de vérification a été envoyé. Veuillez accéder au\
+  \ lien pour compléter la vérification."
 notSet: "Non défini"
 emailVerified: "Votre adresse e-mail a été vérifiée."
 noteFavoritesCount: "Nombre de notes dans les favoris"
@@ -675,14 +749,16 @@ clips: "Clips"
 experimentalFeatures: "Fonctionnalités expérimentales"
 developer: "Développeur"
 makeExplorable: "Rendre le compte visible sur la page \"Découvrir\"."
-makeExplorableDescription: "Si vous désactivez cette option, votre compte n'apparaîtra pas sur la page \"Découvrir\"."
+makeExplorableDescription: "Si vous désactivez cette option, votre compte n'apparaîtra\
+  \ pas sur la page \"Découvrir\"."
 showGapBetweenNotesInTimeline: "Afficher un écart entre les notes sur la Timeline"
 duplicate: "Duliquer"
 left: "Gauche"
 center: "Centrer"
 wide: "Large"
 narrow: "Condensé"
-reloadToApplySetting: "Vos paramètres seront appliqués lorsque vous rechargerez la page. Souhaitez-vous recharger ?"
+reloadToApplySetting: "Vos paramètres seront appliqués lorsque vous rechargerez la\
+  \ page. Souhaitez-vous recharger ?"
 needReloadToApply: "Ce paramètre s'appliquera après un rechargement."
 showTitlebar: "Afficher la barre de titre"
 clearCache: "Vider le cache"
@@ -690,7 +766,11 @@ onlineUsersCount: "{n} utilisateur(s) en ligne"
 nUsers: "{n} utilisateur·rice·s"
 nNotes: "{n} Notes"
 sendErrorReports: "Envoyer les rapports d’erreur"
-sendErrorReportsDescription: "Si vous activez l'envoi des rapports d'erreur, vous contribuerez à améliorer la qualité de Misskey grâce au partage d'informations détaillées sur les erreurs lorsqu'un problème survient.\nCela inclut des informations telles que la version de votre système d'exploitation, le type de navigateur que vous utilisez, votre historique d'activité, etc."
+sendErrorReportsDescription: "Si vous activez l'envoi des rapports d'erreur, vous\
+  \ contribuerez à améliorer la qualité de Misskey grâce au partage d'informations\
+  \ détaillées sur les erreurs lorsqu'un problème survient.\nCela inclut des informations\
+  \ telles que la version de votre système d'exploitation, le type de navigateur que\
+  \ vous utilisez, votre historique d'activité, etc."
 myTheme: "Mes thèmes"
 backgroundColor: "Arrière-plan"
 accentColor: "Accentuation"
@@ -729,14 +809,17 @@ unlikeConfirm: "Êtes-vous sûr·e de ne plus vouloir aimer cette publication ?"
 fullView: "Plein écran"
 quitFullView: "Quitter le plein écran"
 addDescription: "Ajouter une description"
-userPagePinTip: "Vous pouvez afficher des notes ici en sélectionnant l'option « Épingler au profil » dans le menu de chaque note."
-notSpecifiedMentionWarning: "Vous avez mentionné des utilisateur·rice·s qui ne font pas partie de la liste des destinataires"
+userPagePinTip: "Vous pouvez afficher des notes ici en sélectionnant l'option « Épingler\
+  \ au profil » dans le menu de chaque note."
+notSpecifiedMentionWarning: "Vous avez mentionné des utilisateur·rice·s qui ne font\
+  \ pas partie de la liste des destinataires"
 info: "Informations"
 userInfo: "Informations sur l'utilisateur"
 unknown: "Inconnu"
 onlineStatus: "Statut"
 hideOnlineStatus: "Se rendre invisible"
-hideOnlineStatusDescription: "Rendre votre statut invisible peut diminuer les performances de certaines fonctionnalités, telles que la Recherche."
+hideOnlineStatusDescription: "Rendre votre statut invisible peut diminuer les performances\
+  \ de certaines fonctionnalités, telles que la Recherche."
 online: "En ligne"
 active: "Actif·ve"
 offline: "Hors ligne"
@@ -771,7 +854,9 @@ emailNotConfiguredWarning: "Vous n'avez pas configuré d'adresse e-mail."
 ratio: "Ratio"
 previewNoteText: "Voir l'aperçu"
 customCss: "CSS personnalisé"
-customCssWarn: "Utilisez cette fonctionnalité uniquement si vous savez exactement ce que vous faites. Une configuration inadaptée peut empêcher le client de s'exécuter normalement."
+customCssWarn: "Utilisez cette fonctionnalité uniquement si vous savez exactement\
+  \ ce que vous faites. Une configuration inadaptée peut empêcher le client de s'exécuter\
+  \ normalement."
 global: "Global"
 squareAvatars: "Avatars carrés"
 sent: "Envoyer"
@@ -786,7 +871,10 @@ whatIsNew: "Voir les derniers changements"
 translate: "Traduire"
 translatedFrom: "Traduit depuis {x}"
 accountDeletionInProgress: "La suppression de votre compte est en cours"
-usernameInfo: "C'est un nom qui identifie votre compte sur l'instance de manière unique. Vous pouvez utiliser des lettres de l'alphabet (minuscules et majuscules), des chiffres (de 0 à 9), ou bien le tiret « _ ». Vous ne pourrez pas modifier votre nom d'utilisateur·rice par la suite."
+usernameInfo: "C'est un nom qui identifie votre compte sur l'instance de manière unique.\
+  \ Vous pouvez utiliser des lettres de l'alphabet (minuscules et majuscules), des\
+  \ chiffres (de 0 à 9), ou bien le tiret « _ ». Vous ne pourrez pas modifier votre\
+  \ nom d'utilisateur·rice par la suite."
 aiChanMode: "Mode Ai"
 keepCw: "Garder le CW"
 pubSub: "Comptes Pub/Sub"
@@ -802,12 +890,14 @@ filter: "Filtre"
 controlPanel: "Panneau de contrôle"
 manageAccounts: "Gérer les comptes"
 makeReactionsPublic: "Rendre les réactions publiques"
-makeReactionsPublicDescription: "Ceci rendra la liste de toutes vos réactions données publique."
+makeReactionsPublicDescription: "Ceci rendra la liste de toutes vos réactions données\
+  \ publique."
 classic: "Classique"
 muteThread: "Masquer cette discussion"
 unmuteThread: "Ne plus masquer le fil"
 ffVisibility: "Visibilité des abonnés/abonnements"
-ffVisibilityDescription: "Permet de configurer qui peut voir les personnes que tu suis et les personnes qui te suivent."
+ffVisibilityDescription: "Permet de configurer qui peut voir les personnes que tu\
+  \ suis et les personnes qui te suivent."
 continueThread: "Afficher la suite du fil"
 deleteAccountConfirm: "Votre compte sera supprimé. Êtes vous certain ?"
 incorrectPassword: "Le mot de passe est incorrect."
@@ -815,9 +905,11 @@ voteConfirm: "Confirmez-vous votre vote pour « {choice} » ?"
 hide: "Masquer"
 leaveGroup: "Quitter le groupe"
 leaveGroupConfirm: "Êtes vous sûr de vouloir quitter \"{name}\" ?"
-useDrawerReactionPickerForMobile: "Afficher le sélecteur de réactions en tant que panneau sur mobile"
+useDrawerReactionPickerForMobile: "Afficher le sélecteur de réactions en tant que\
+  \ panneau sur mobile"
 welcomeBackWithName: "Heureux de vous revoir, {name}"
-clickToFinishEmailVerification: "Veuillez cliquer sur [{ok}] afin de compléter la vérification par courriel."
+clickToFinishEmailVerification: "Veuillez cliquer sur [{ok}] afin de compléter la\
+  \ vérification par courriel."
 overridedDeviceKind: "Type d’appareil"
 smartphone: "Smartphone"
 tablet: "Tablette"
@@ -857,11 +949,16 @@ _ffVisibility:
 _signup:
   almostThere: "Bientôt fini"
   emailAddressInfo: "Insérez votre adresse e-mail."
-  emailSent: "Un courriel de confirmation vient d'être envoyé à l'adresse que vous avez renseignée ({email}). Cliquez sur le lien contenu dans le message pour terminer la création de votre compte."
+  emailSent: "Un courriel de confirmation vient d'être envoyé à l'adresse que vous\
+    \ avez renseignée ({email}). Cliquez sur le lien contenu dans le message pour\
+    \ terminer la création de votre compte."
 _accountDelete:
   accountDelete: "Supprimer le compte"
-  mayTakeTime: "La suppression de compte nécessitant beaucoup de ressources, l'exécution du processus peut prendre du temps, en fonction de la quantité de contenus que vous avez créés et du nombre de fichiers que vous avez téléversés."
-  sendEmail: "Une fois la suppression de votre compte effectuée, un courriel sera envoyé à l'adresse que vous aviez enregistrée."
+  mayTakeTime: "La suppression de compte nécessitant beaucoup de ressources, l'exécution\
+    \ du processus peut prendre du temps, en fonction de la quantité de contenus que\
+    \ vous avez créés et du nombre de fichiers que vous avez téléversés."
+  sendEmail: "Une fois la suppression de votre compte effectuée, un courriel sera\
+    \ envoyé à l'adresse que vous aviez enregistrée."
   requestAccountDelete: "Demander la suppression de votre compte"
   started: "La procédure de suppression a commencé."
   inProgress: "Suppression en cours"
@@ -869,9 +966,14 @@ _ad:
   back: "Retour"
   reduceFrequencyOfThisAd: "Voir cette publicité moins souvent"
 _forgotPassword:
-  enterEmail: "Entrez ici l'adresse e-mail que vous avez enregistrée pour votre compte. Un lien vous permettant de réinitialiser votre mot de passe sera envoyé à cette adresse."
-  ifNoEmail: "Si vous n'avez pas enregistré d'adresse e-mail, merci de contacter l'administrateur·rice de votre instance."
-  contactAdmin: "Cette instance ne permettant pas l'utilisation d'adresses e-mail, prenez contact avec l'administrateur·rice pour procéder à la réinitialisation de votre mot de passe."
+  enterEmail: "Entrez ici l'adresse e-mail que vous avez enregistrée pour votre compte.\
+    \ Un lien vous permettant de réinitialiser votre mot de passe sera envoyé à cette\
+    \ adresse."
+  ifNoEmail: "Si vous n'avez pas enregistré d'adresse e-mail, merci de contacter l'administrateur·rice\
+    \ de votre instance."
+  contactAdmin: "Cette instance ne permettant pas l'utilisation d'adresses e-mail,\
+    \ prenez contact avec l'administrateur·rice pour procéder à la réinitialisation\
+    \ de votre mot de passe."
 _gallery:
   my: "Mes publications"
   liked: " Publications que j'ai aimées"
@@ -899,7 +1001,8 @@ _aboutMisskey:
   source: "Code source"
   translation: "Traduire Misskey"
   donate: "Soutenir Misskey"
-  morePatrons: "Nous apprécions vraiment le soutien de nombreuses autres personnes non mentionnées ici. Merci à toutes et à tous ! 🥰"
+  morePatrons: "Nous apprécions vraiment le soutien de nombreuses autres personnes\
+    \ non mentionnées ici. Merci à toutes et à tous ! \U0001F970"
   patrons: "Contributeurs"
 _nsfw:
   respect: "Cacher les médias marqués comme contenu sensible"
@@ -907,18 +1010,22 @@ _nsfw:
   force: "Cacher tous les médias"
 _mfm:
   cheatSheet: "Antisèche MFM"
-  intro: "MFM est un langage Markdown spécifique utilisable ici et là dans Misskey. Vous pouvez vérifier ici les structures utilisables avec MFM."
+  intro: "MFM est un langage Markdown spécifique utilisable ici et là dans Misskey.\
+    \ Vous pouvez vérifier ici les structures utilisables avec MFM."
   dummy: "La Fédiverse s'agrandit avec Misskey"
   mention: "Mentionner"
-  mentionDescription: "Vous pouvez afficher un utilisateur spécifique en indiquant une arobase suivie d'un nom d'utilisateur"
+  mentionDescription: "Vous pouvez afficher un utilisateur spécifique en indiquant\
+    \ une arobase suivie d'un nom d'utilisateur"
   hashtag: "Hashtags"
-  hashtagDescription: "Vous pouvez afficher un mot-dièse en utilisant un croisillon et du texte"
+  hashtagDescription: "Vous pouvez afficher un mot-dièse en utilisant un croisillon\
+    \ et du texte"
   url: "URL"
   urlDescription: "L'adresse web peut être affichée."
   link: "Lien"
   linkDescription: "Une partie précise d'une phrase peut être liée à l'adresse web."
   bold: "Gras"
-  boldDescription: "Il est possible de mettre le texte en exergue en le mettant en gras."
+  boldDescription: "Il est possible de mettre le texte en exergue en le mettant en\
+    \ gras."
   small: "Diminuer l'emphase"
   smallDescription: "Le contenu peut être affiché en petit et fin."
   center: "Centrer"
@@ -930,7 +1037,8 @@ _mfm:
   inlineMath: "Formule mathématique (inline)"
   inlineMathDescription: "Afficher les formules mathématiques (KaTeX)."
   blockMath: "Formule mathématique (bloc)"
-  blockMathDescription: "Afficher les formules mathématiques (KaTeX) multi-lignes dans un bloc."
+  blockMathDescription: "Afficher les formules mathématiques (KaTeX) multi-lignes\
+    \ dans un bloc."
   quote: "Citer"
   quoteDescription: "Affiche le contenu sous forme de citation."
   emoji: "Émojis personnalisés"
@@ -960,7 +1068,8 @@ _mfm:
   x4: "Plus grand"
   x4Description: "Afficher le contenu en plus grand."
   blur: "Flou"
-  blurDescription: "Le contenu peut être flouté ; il sera visible en le survolant avec le curseur."
+  blurDescription: "Le contenu peut être flouté ; il sera visible en le survolant\
+    \ avec le curseur."
   font: "Police de caractères"
   fontDescription: "Il est possible de choisir la police."
   rainbow: "Arc-en-ciel"
@@ -968,6 +1077,9 @@ _mfm:
   sparkle: "Paillettes"
   sparkleDescription: "Ajoute un effet scintillant au contenu."
   rotate: "Pivoter"
+  plainDescription: Désactiver les effets de tous les MFM contenus dans cet effet
+    MFM.
+  rotateDescription: Pivoter le contenu d'un angle spécifique.
 _instanceTicker:
   none: "Cacher "
   remote: "Montrer pour les utilisateur·ice·s distant·e·s"
@@ -976,6 +1088,7 @@ _serverDisconnectedBehavior:
   reload: "Rechargement automatique"
   dialog: "Ouvrir une boîte de dialogue pour l'avertissement"
   quiet: "Afficher un avertissement discret"
+  nothing: Ne rien faire
 _channel:
   create: "Créer un canal"
   edit: "Éditer le canal"
@@ -993,10 +1106,14 @@ _menuDisplay:
   hide: "Masquer"
 _wordMute:
   muteWords: "Mots à filtrer"
-  muteWordsDescription: "Séparer avec des espaces pour la condition AND. Séparer avec un saut de ligne pour une condition OR."
-  muteWordsDescription2: "Pour utiliser des expressions régulières (regex), mettez les mots-clés entre barres obliques."
+  muteWordsDescription: "Séparer avec des espaces pour la condition AND. Séparer avec\
+    \ un saut de ligne pour une condition OR."
+  muteWordsDescription2: "Pour utiliser des expressions régulières (regex), mettez\
+    \ les mots-clés entre barres obliques."
   softDescription: "Masquez les notes de votre fil selon les paramètres que vous définissez."
-  hardDescription: "Empêchez votre fil de charger les notes selon les paramètres que vous définissez. Cette action est irréversible : si vous modifiez ces paramètres plus tard, les notes précédemment filtrées ne seront pas récupérées."
+  hardDescription: "Empêchez votre fil de charger les notes selon les paramètres que\
+    \ vous définissez. Cette action est irréversible : si vous modifiez ces paramètres\
+    \ plus tard, les notes précédemment filtrées ne seront pas récupérées."
   soft: "Doux"
   hard: "Strict"
   mutedNotes: "Notes filtrées"
@@ -1004,6 +1121,9 @@ _instanceMute:
   instanceMuteDescription2: "Séparer avec de nouvelles lignes"
   title: "Masque les notes venant des instances listées."
   heading: "Instances à mettre en sourdine"
+  instanceMuteDescription: Ceci va masquer toute publication ou partage des instances
+    listées, incluant celles des personnes répondant à des personnes des instances
+    masquées.
 _theme:
   explore: "Explorer les thèmes"
   install: "Installer un thème"
@@ -1032,8 +1152,10 @@ _theme:
   darken: "Sombre"
   lighten: "Clair"
   inputConstantName: "Insérez un nom de constante"
-  importInfo: "Vous pouvez importer un thème vers l’éditeur de thèmes en saisissant son code ici."
-  deleteConstantConfirm: "Êtes-vous sûr·e de vouloir supprimer la constante {const} ?"
+  importInfo: "Vous pouvez importer un thème vers l’éditeur de thèmes en saisissant\
+    \ son code ici."
+  deleteConstantConfirm: "Êtes-vous sûr·e de vouloir supprimer la constante {const}\
+    \ ?"
   keys:
     accent: "Accentuation"
     bg: "Arrière-plan"
@@ -1103,35 +1225,54 @@ _time:
   day: "j"
 _tutorial:
   title: "Comment utiliser Calckey"
-  step1_1 : "Bienvenue!"
-  step1_2 : "On va vous installer. Vous serez opérationnel en un rien de temps"
-  step2_1 : "Tout d'abord, remplissez votre profil"
-  step2_2 : "En fournissant quelques informations sur qui vous êtes, il sera plus facile pour les autres de savoir s'ils veulent voir vos notes ou vous suivre."
-  step3_1 : "Maintenant il est temps de suivre des gens !"
-  step3_2 : "Votre page d'accueil et vos timelines sociales sont basées sur les personnes que vous suivez, alors essayez de suivre quelques comptes pour commencer.\nCliquez sur le cercle plus en haut à droite d'un profil pour le suivre."
-  step4_1 : "On y va."
-  step4_2 : "Pour votre premier post, certaines personnes aiment faire un post {introduction} ou un simple post 'Hello world'."
-  step5_1 : "Lignes de temps, lignes de temps partout !"
-  step5_2 : "Votre instance a {timelines} différentes chronologies activées !"
-  step5_3 : "La timeline Home {icon} est l'endroit où vous pouvez voir les publications de vos followers."
-  step5_4 : "La timeline locale {icon} est l'endroit où vous pouvez voir les messages de tout le monde sur cette instance."
-  step5_5 : "La timeline {icon} recommandée est l'endroit où vous pouvez voir les messages des instances que les administrateurs recommandent."
-  step5_6 : "La timeline {icon} sociale est l'endroit où vous pouvez voir les publications des amis de vos followers."
-  step5_7 : "La timeline globale {icon} est l'endroit où vous pouvez voir les messages de toutes les autres instances connectées."
-  step6_1 : "Alors quel est cet endroit ?"
-  step6_2 : "Eh bien, vous ne venez pas de rejoindre Calckey. Vous avez rejoint un portail vers le Fediverse, un réseau interconnecté de milliers de serveurs, appelés \"instances\"."
-  step6_3 : "Chaque serveur fonctionne différemment, et tous les serveurs n'utilisent pas Calckey. Cependant, celui-ci le fait ! C'est un peu délicat, mais vous aurez le coup de main en un rien de temps."
-  step6_4 : "Maintenant, allez-y, explorez et amusez-vous !"
+  step1_1: "Bienvenue!"
+  step1_2: "On va vous installer. Vous serez opérationnel en un rien de temps"
+  step2_1: "Tout d'abord, remplissez votre profil"
+  step2_2: "En fournissant quelques informations sur qui vous êtes, il sera plus facile\
+    \ pour les autres de savoir s'ils veulent voir vos notes ou vous suivre."
+  step3_1: "Maintenant il est temps de suivre des gens !"
+  step3_2: "Votre page d'accueil et vos timelines sociales sont basées sur les personnes\
+    \ que vous suivez, alors essayez de suivre quelques comptes pour commencer.\n\
+    Cliquez sur le cercle plus en haut à droite d'un profil pour le suivre."
+  step4_1: "On y va."
+  step4_2: "Pour votre premier post, certaines personnes aiment faire un post {introduction}\
+    \ ou un simple post 'Hello world'."
+  step5_1: "Lignes de temps, lignes de temps partout !"
+  step5_2: "Votre instance a {timelines} différentes chronologies activées !"
+  step5_3: "La timeline Home {icon} est l'endroit où vous pouvez voir les publications\
+    \ de vos followers."
+  step5_4: "La timeline locale {icon} est l'endroit où vous pouvez voir les messages\
+    \ de tout le monde sur cette instance."
+  step5_5: "La timeline {icon} recommandée est l'endroit où vous pouvez voir les messages\
+    \ des instances que les administrateurs recommandent."
+  step5_6: "La timeline {icon} sociale est l'endroit où vous pouvez voir les publications\
+    \ des amis de vos followers."
+  step5_7: "La timeline globale {icon} est l'endroit où vous pouvez voir les messages\
+    \ de toutes les autres instances connectées."
+  step6_1: "Alors quel est cet endroit ?"
+  step6_2: "Eh bien, vous ne venez pas de rejoindre Calckey. Vous avez rejoint un\
+    \ portail vers le Fediverse, un réseau interconnecté de milliers de serveurs,\
+    \ appelés \"instances\"."
+  step6_3: "Chaque serveur fonctionne différemment, et tous les serveurs n'utilisent\
+    \ pas Calckey. Cependant, celui-ci le fait ! C'est un peu délicat, mais vous aurez\
+    \ le coup de main en un rien de temps."
+  step6_4: "Maintenant, allez-y, explorez et amusez-vous !"
 _2fa:
   alreadyRegistered: "Configuration déjà achevée."
   registerDevice: "Ajouter un nouvel appareil"
   registerKey: "Enregistrer une clef"
-  step1: "Tout d'abord, installez une application d'authentification, telle que {a} ou {b}, sur votre appareil."
+  step1: "Tout d'abord, installez une application d'authentification, telle que {a}\
+    \ ou {b}, sur votre appareil."
   step2: "Ensuite, scannez le code QR affiché sur l’écran."
-  step2Url: "Vous pouvez également saisir cette URL si vous utilisez un programme de bureau :"
+  step2Url: "Vous pouvez également saisir cette URL si vous utilisez un programme\
+    \ de bureau :"
   step3: "Entrez le jeton affiché sur votre application pour compléter la configuration."
-  step4: "À partir de maintenant, ce même jeton vous sera demandé à chacune de vos connexions."
-  securityKeyInfo: "Vous pouvez configurer l'authentification WebAuthN pour sécuriser davantage le processus de connexion grâce à une clé de sécurité matérielle qui prend en charge FIDO2, ou bien en configurant l'authentification par empreinte digitale ou par code PIN sur votre appareil."
+  step4: "À partir de maintenant, ce même jeton vous sera demandé à chacune de vos\
+    \ connexions."
+  securityKeyInfo: "Vous pouvez configurer l'authentification WebAuthN pour sécuriser\
+    \ davantage le processus de connexion grâce à une clé de sécurité matérielle qui\
+    \ prend en charge FIDO2, ou bien en configurant l'authentification par empreinte\
+    \ digitale ou par code PIN sur votre appareil."
 _permissions:
   "read:account": "Afficher les informations du compte"
   "write:account": "Mettre à jour les informations de votre compte"
@@ -1167,11 +1308,13 @@ _permissions:
   "write:gallery-likes": "Gérer les mentions « J'aime » dans la galerie"
 _auth:
   shareAccess: "Autoriser \"{name}\" à accéder à votre compte ?"
-  shareAccessAsk: "Voulez-vous vraiment autoriser cette application à accéder à votre compte?"
+  shareAccessAsk: "Voulez-vous vraiment autoriser cette application à accéder à votre\
+    \ compte?"
   permissionAsk: "Cette application nécessite les autorisations suivantes :"
   pleaseGoBack: "Veuillez retourner à l’application"
   callback: "Retour vers l’application"
   denied: "Accès refusé"
+  copyAsk: Veuillez coller le code d’autorisation à l'application
 _antennaSources:
   all: "Toutes les notes"
   homeTimeline: "Notes venant des utilisateur·rice·s auxquel·les je suis abonné"
@@ -1262,7 +1405,8 @@ _profile:
   youCanIncludeHashtags: "Vous pouvez également inclure des hashtags."
   metadata: "Informations supplémentaires"
   metadataEdit: "Éditer les informations supplémentaires"
-  metadataDescription: "Vous pouvez afficher jusqu'à quatre informations supplémentaires dans votre profil."
+  metadataDescription: "Vous pouvez afficher jusqu'à quatre informations supplémentaires\
+    \ dans votre profil."
   metadataLabel: "Étiquette"
   metadataContent: "Contenu"
   changeAvatar: "Changer l'image de profil"
@@ -1333,7 +1477,8 @@ _pages:
   url: "URL de la page"
   summary: "Résumé de page"
   alignCenter: "Centrée"
-  hideTitleWhenPinned: "Masquer le titre de la page lorsque celle-ci est épinglée au profil"
+  hideTitleWhenPinned: "Masquer le titre de la page lorsque celle-ci est épinglée\
+    \ au profil"
   font: "Police de caractères"
   fontSerif: "Serif"
   fontSansSerif: "Sans Serif"
@@ -1383,7 +1528,8 @@ _pages:
     note: "Note intégrée"
     _note:
       id: "Identifiant de la note"
-      idDescription: "Pour configurer la note, vous pouvez aussi coller ici l'URL correspondante."
+      idDescription: "Pour configurer la note, vous pouvez aussi coller ici l'URL\
+        \ correspondante."
       detailed: "Afficher les détails"
     switch: "Interrupteur"
     _switch:
@@ -1536,7 +1682,8 @@ _pages:
       _dailyRannum:
         arg1: "Minimum"
         arg2: "Maximum"
-      dailyRandomPick: "Sélectionné au hasard dans la liste (Quotidien pour chaque utilisateur)"
+      dailyRandomPick: "Sélectionné au hasard dans la liste (Quotidien pour chaque\
+        \ utilisateur)"
       _dailyRandomPick:
         arg1: "Listes"
       seedRandom: "Aléatoire (graine)"
@@ -1552,7 +1699,8 @@ _pages:
       _seedRandomPick:
         arg1: "Graine"
         arg2: "Listes"
-      DRPWPM: "Sélectionné au hasard dans une liste de probabilités (Quotidien pour chaque utilisateur)"
+      DRPWPM: "Sélectionné au hasard dans une liste de probabilités (Quotidien pour\
+        \ chaque utilisateur)"
       _DRPWPM:
         arg1: "Liste de texte"
       pick: "Sélectionner dans la liste"
@@ -1651,3 +1799,204 @@ _deck:
     list: "Listes"
     mentions: "Mentions"
     direct: "Direct"
+keepOriginalUploadingDescription: Enregistrer l'image originale telle quelle. Si désactivé,
+  une version à afficher sur le web sera générée au chargement.
+manageGroups: Gérer les groupes
+moderation: Modération
+disableDrawer: Ne pas utiliser des menus à tiroir
+preferencesBackups: Sauvegarde des préférences
+confirmToUnclipAlreadyClippedNote: Ce message fait déjà partie du clip "{name}". Voudriez-vous
+  plutôt le supprimer du clip ?
+instanceSecurity: Sécurité de l'instance
+recommended: Recommandé
+recentNDays: Les derniers {n} jours
+recentNHours: Les dernières {n} heures
+check: Vérifier
+thereIsUnresolvedAbuseReportWarning: Il y a des signalements non résolus.
+numberOfPageCacheDescription: Augmenter ce nombre augmentera le confort des utilisateur⋅rice⋅s
+  mais augmentera la charge de travail du serveur, plus de mémoire sera utilisée.
+logoutConfirm: Confirmer la déconnexion ?
+lastActiveDate: Dernière utilisation le
+cannotUploadBecauseNoFreeSpace: Mise en ligne échouée faute de place sur le Drive.
+remoteOnly: Distant seulement
+showUpdates: Afficher une fenêtre en sur-impression quand Calckey se met à jour
+recommendedInstances: Instances recommandées
+caption: Description automatique
+migration: Migration
+showAdminUpdates: Indiquer qu'une nouvelle version de Calckey est disponible (admin
+  seulement)
+replayTutorial: Relancer le tutoriel
+moveTo: Migrer le compte courant vers un nouveau compte
+moveFromDescription: Ceci va configurer un alias pour votre ancien compte afin que
+  vous puissiez migrer de cet ancien compte à l'actuel. Faites ceci AVANT de migrer
+  de votre ancien compte. Merci d'entrer la mention de l'ancien compte sous ce format
+  @personne@instance.com
+_sensitiveMediaDetection:
+  sensitivityDescription: Réduire la sensibilité conduira à moins de mauvaises détections
+    (faux positifs) alors que l'augmenter mènera à moins de détection manquées (faux
+    négatifs).
+  analyzeVideosDescription: Analyser les vidéos en plus des images. Cela augmentera
+    légèrement la charge du serveur.
+  setSensitiveFlagAutomatically: Marquer comme sensible (NSFW)
+  sensitivity: Sensibilité de la détection
+  analyzeVideos: Activer l'analyse des vidéos
+  setSensitiveFlagAutomaticallyDescription: Les résultats de la détection interne
+    seront conservés même si cette option est désactivée.
+  description: Réduit potentiellement l'effort de la modération du serveur en reconnaissant
+    automatiquement les médias sensibles (NSFW) via de l'intelligence artificielle.
+    Cela va augmenter légèrement la charge du serveur.
+_messaging:
+  dms: Privé
+  groups: Groupes
+cannotUploadBecauseExceedsFileSizeLimit: Le fichier n'a pas pu être chargé car il
+  dépasse la taille maximum autorisée.
+moveAccountDescription: Ce processus est irréversible. Soyez sûr⋅e que vous avez préparé
+  un alias pour ce compte sur votre nouveau compte avant de migrer. Merci d'entrer
+  la mention du compte formaté comme ceci @personne@instance.com
+moveAccount: Déplacer le compte !
+seperateRenoteQuote: Séparer les renotes et les boutons de citation
+failedToFetchAccountInformation: Impossible de récupérer les informations de compte
+noEmailServerWarning: Serveur mail non configuré.
+deleteAccount: Supprimer le compte
+document: Documentation
+numberOfPageCache: Nombre de pages mise en cache
+fast: Rapide
+failedToUpload: Mise en ligne échouée
+enableAutoSensitiveDescription: Permet la détection automatique des médias sensibles
+  (NSFW) via une intelligence artificielle, quand c'est possible. Même si cette option
+  est désactivée, elle peut être enclenchée au niveau de l'instance.
+activeEmailValidationDescription: Active une vérification plus poussée des adresses
+  e-mail, ce qui inclut de vérifier la présence d’e-mail jetables et s'il est possible
+  de communiquer avec ces adresses. Si désactivé, seul le format de l’e-mail est vérifié.
+adminCustomCssWarn: Ce paramètre ne devrait être utilisé que si vous savez ce qu'il
+  fait. Entrer des valeurs impropres pourraient empêcher les clients de TOUT LE MONDE
+  de fonctionner. Assurez-vous que votre CSS fonctionne correctement en l'essayant
+  dans vos paramètres utilisateur.
+swipeOnDesktop: Permettre le style de glissement de fenêtre de mobile sur PC
+moveFromLabel: 'Compte depuis lequel vous migrez :'
+migrationConfirm: "Êtes-vous absolument certain⋅e que vous voulez migrer votre compte\
+  \ vers {account} ? Une fois fait, vous ne pourrez pas revenir en arrière, et vous\
+  \ ne pourrez plus utiliser le compte actuel normalement à nouveau.\nAussi, assurez-vous\
+  \ d'avoir configuré le compte courant comme le compte depuis lequel vous migrez."
+_preferencesBackups:
+  updatedAt: 'Mis à jour le : {date} {time}'
+  cannotLoad: Le chargement a échoué
+  invalidFile: Format de fichier invalide
+  saveConfirm: Enregistrer la sauvegarde sous le nom {name} ?
+  deleteConfirm: Supprimer la sauvegarde {name} ?
+  nameAlreadyExists: Une sauvegarde nommée "{name}" existe déjà. Merci d'entrer un
+    autre nom.
+  applyConfirm: Voulez-vous vraiment appliquer la sauvegarde "{name} à cet appareil
+    ? Les réglages existants de cet appareil seront écrasés.
+  noBackups: Aucune sauvegarde n'existe. Vous pouvez sauvegarder les paramètres de
+    votre client sur ce serveur en utilisant "Créer une nouvelle sauvegarde".
+  createdAt: 'Crée le : {date} {time}'
+  renameConfirm: Renommer la sauvegarde "{old}" à "{new}" ?
+  list: Sauvegardes créées
+  saveNew: Faire une nouvelle sauvegarde
+  loadFile: Charger depuis le fichier
+  apply: Appliquer à l'appareil
+  save: Enregistrer les changements
+  inputName: Merci d'entrer un nom pour cette sauvegarde
+  cannotSave: La sauvegarde a échoué
+privateMode: Mode privé
+privateModeInfo: Si activé, seules les instances autorisées peuvent fédérer avec votre
+  instance. Toutes les publications seront masquées de la visibilité publique.
+allowedInstances: Instances autorisées
+driveCapOverrideLabel: Changer la capacité du drive pour cet utilisateur
+driveCapOverrideCaption: Réinitialiser la capacité à la valeur par défaut en entrant
+  0 ou moins.
+pleaseSelect: Sélectionner une option
+customMOTD: Message du jour personnalisé (Message d'écran de démarrage)
+refreshInterval: 'Intervalle de mise à jour '
+type: Type
+speed: Vitesse
+slow: Lent
+move: Déplacer
+showAds: Afficher les annonces
+enterSendsMessage: Appuyer sur Entrée pendant la rédaction pour envoyer le message
+  (sinon Ctrl+Entrée)
+allowedInstancesDescription: Hôtes des instances autorisées pour la fédération, chacun
+  séparé par une nouvelle ligne (s'applique uniquement en mode privé).
+enableAutoSensitive: Marquage automatique du contenu sensible (NSFW)
+regexpErrorDescription: "Il y a eu une erreur dans l'expression régulière à la ligne\
+  \ {line} de votre {tab} des mots masqués :"
+forwardReportIsAnonymous: À la place de votre compte, un compte système anonyme sera
+  affiché comme rapporteur à l'instance distante.
+noThankYou: Non merci
+addInstance: Ajouter une instance
+renoteMute: Mettre en silence les renotes
+flagSpeakAsCat: Parler comme un chat
+flagSpeakAsCatDescription: Vos messages seront nyanifiés en mode chat
+hiddenTags: Hashtags cachés
+hiddenTagsDescription: "Lister les hashtags (sans le #) que vous souhaitez cacher\
+  \ de tendances et explorer. Les hashtags cachés sont toujours découvrables par d'autres\
+  \ moyens."
+antennaInstancesDescription: Lister un hôte d'instance par ligne
+userSaysSomethingReason: '{name} a dit {reason}'
+breakFollowConfirm: Êtes vous sur de vouloir retirer l'abonné ?
+recommendedInstancesDescription: Instances recommandées séparées par une nouvelle
+  ligne pour apparaître dans la timeline recommandée. Ne PAS ajouter `https://`, SEULEMENT
+  le domaine.
+sendPushNotificationReadMessage: Supprimer les notifications push une fois que les
+  notifications ou messages concernés ont été lus
+sendPushNotificationReadMessageCaption: Une notification contenant le texte "{emptyPushNotificationMessage}"
+  sera affichée pendant un court instant. Cela peut augmenter la consommation de batterie
+  de votre appareil.
+splash: Écran d’Accueil
+pushNotificationNotSupported: Votre navigateur ou instance ne supporte pas les notifications
+  push
+customMOTDDescription: Messages personnalisé pour le message du jour (sur l'écran
+  d’accueil), séparés par des retours à la ligne, affichés au hasard à chaque (re)chargement
+  de page.
+customSplashIcons: Icônes de l'écran d’accueil personnalisées (urls)
+customSplashIconsDescription: URLs pour les icônes personnalisées de l'écran d’accueil,
+  séparés par des retours à la ligne, qui seront affichées aléatoirement à chaque
+  (re)chargement de page. Assurez-vous que les images sont sur des URL statiques,
+  de préférence toutes de taille 192x192.
+updateAvailable: Une mise à jour est peut-être disponible !
+accountMoved: "L'utilisateur a migré vers un nouveau compte:"
+enableEmojiReactions: Activer les réactions par émojis
+showEmojisInReactionNotifications: Montrer les émojis dans les notifications de réaction
+renoteUnmute: Notifier les renotes
+selectInstance: Choisir une instance
+noInstances: Il n'y a aucune instance
+showLocalPosts: 'Montrer les notes locales dans :'
+homeTimeline: Timeline d'Accueil
+socialTimeline: Timeline Sociale
+requireAdminForView: Vous avez besoin d'un compte d'administration pour voir cela.
+isSystemAccount: Un compte créé et géré automatiquement par le système.
+typeToConfirm: Entrer {x} pour confirmer
+statusbar: Barre d'état
+sensitiveMediaDetection: Détection des médias sensibles (NSFW)
+cannotUploadBecauseInappropriate: Ce fichier n'a pas pu être mis en ligne, car il
+  a été détecté comme potentiellement sensible (NSFW).
+beta: Beta
+navbar: Barre de navigation
+shuffle: Mélanger
+pushNotification: Notifications push
+subscribePushNotification: Activer les notifications push
+unsubscribePushNotification: Désactiver les notifications push
+pushNotificationAlreadySubscribed: Notifications push déjà activées
+logoImageUrl: URL de l'image du logo
+moveToLabel: 'Compte vers lequel vous migrez :'
+moveFrom: Migrer vers ce compte depuis un ancien compte
+defaultReaction: Émoji de réaction par défaut pour les notes entrantes et sortantes
+license: Licence
+indexPosts: Indexer les Notes
+indexNotice: Indexation en cours. Cela prendra certainement du temps, veuillez ne
+  pas redémarrer votre serveur pour au moins une heure.
+customKaTeXMacro: Macros KaTeX personnalisées
+enableCustomKaTeXMacro: Activer les macros KaTeX personnalisées
+noteId: ID de note
+customKaTeXMacroDescription: "Définissez des macros pour écrire des expressions mathématiques\
+  \ simplement ! La notation se conforme aux définitions de commandes LaTeX et s'écrit\
+  \ \\newcommand{\\name}{content} ou \\newcommand{\\name}[number of arguments]{content}.\
+  \ Par exemple, \\newcommand{\\add}[2]{#1 + #2} étendra \\add{3}{foo} en 3 + foo.\
+  \ Les accolades entourant le nom de la macro peuvent être changés pour des parenthèses\
+  \ ou des crochets. Cela affectera les types de parenthèses utilisées pour les arguments.\
+  \ Une (et une seule) macro peut être définie par ligne, et vous ne pouvez pas couper\
+  \ la ligne au milieu d'une définition. Les lignes invalides sont simplement ignorées.\
+  \ Seulement de simples fonctions de substitution de chaines sont supportées; la\
+  \ syntaxe avancée, telle que la ramification conditionnelle, ne peut pas être utilisée\
+  \ ici."

From c9d6407c32586d0de7839c95ac5e7ed03905112f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D0=B1=D0=B5=D1=80=20=D0=BE=D0=B3=D1=83=D1=80?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BA?= <abrew1330@gmail.com>
Date: Tue, 25 Apr 2023 06:06:45 +0000
Subject: [PATCH 535/582] chore: Translated using Weblate (Russian)

Currently translated at 100.0% (1727 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ru/
---
 locales/ru-RU.yml | 165 +++++++++++++++++++++++-----------------------
 1 file changed, 83 insertions(+), 82 deletions(-)

diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index adddb38c0..24878686b 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -14,7 +14,7 @@ gotIt: "Ясно!"
 cancel: "Отмена"
 enterUsername: "Введите имя пользователя"
 renotedBy: "{user} делится"
-noNotes: "Нет ни одной заметки"
+noNotes: "Нет ни одного поста"
 noNotifications: "Нет ни одного уведомления"
 instance: "Инстанс"
 settings: "Настройки"
@@ -65,15 +65,15 @@ import: "Импорт"
 export: "Экспорт"
 files: "Файлы"
 download: "Скачать"
-driveFileDeleteConfirm: "Удалить файл «{name}»? Заметки с ним также будут удалены."
+driveFileDeleteConfirm: "Удалить файл «{name}»? Посты с ним также будут удалены."
 unfollowConfirm: "Удалить из подписок пользователя {name}?"
 exportRequested: "Вы запросили экспорт. Это может занять некоторое время. Результат\
   \ будет добавлен на «Диск»."
 importRequested: "Вы запросили импорт. Это может занять некоторое время."
 lists: "Списки"
 noLists: "Нет ни одного списка"
-note: "Заметка"
-notes: "Заметки"
+note: "Пост"
+notes: "Посты"
 following: "Подписки"
 followers: "Подписчики"
 followsYou: "Читает вас"
@@ -91,7 +91,7 @@ youShouldUpgradeClient: "Чтобы просмотреть эту страниц
 enterListName: "Название списка"
 privacy: "Конфиденциальность"
 makeFollowManuallyApprove: "Принимать подписчиков вручную"
-defaultNoteVisibility: "Видимость заметок по умолчанию"
+defaultNoteVisibility: "Видимость постов по умолчанию"
 follow: "Подписка"
 followRequest: "Запрос на подписку"
 followRequests: "Запросы на подписку"
@@ -104,7 +104,7 @@ renoted: "Репост совершён."
 cantRenote: "Это нельзя репостить."
 cantReRenote: "Невозможно репостить репост."
 quote: "Цитата"
-pinnedNote: "Закреплённая заметка"
+pinnedNote: "Закреплённый пост"
 pinned: "Закрепить в профиле"
 you: "Вы"
 clickToShow: "Нажмите для просмотра"
@@ -114,7 +114,7 @@ reaction: "Реакции"
 reactionSetting: "Реакции, отображаемые в палитре"
 reactionSettingDescription2: "Расставляйте перетаскиванием, удаляйте нажатием, добавляйте\
   \ кнопкой «+»."
-rememberNoteVisibility: "Запоминать видимость заметок"
+rememberNoteVisibility: "Запоминать видимость постов"
 attachCancel: "Удалить вложение"
 markAsSensitive: "Отметить как «не для всех»"
 unmarkAsSensitive: "Снять отметку «не для всех»"
@@ -151,9 +151,9 @@ flagAsBotDescription: "Включите, если этот аккаунт упр
   \ бесконечные циклы взаимодействия."
 flagAsCat: "Аккаунт кота"
 flagAsCatDescription: "Вы получите кошачьи ушки и будете говорить как кот!"
-flagShowTimelineReplies: "Показывать ответы на заметки в ленте"
+flagShowTimelineReplies: "Показывать ответы на посты в ленте"
 flagShowTimelineRepliesDescription: "Если этот параметр включен, то в ленте, в дополнение\
-  \ к заметкам пользователя, отображаются ответы на другие заметки пользователя."
+  \ к постам пользователя, отображаются ответы на другие посты пользователя."
 autoAcceptFollowed: "Принимать подписчиков автоматически"
 addAccount: "Добавить учётную запись"
 loginFailed: "Неудачная попытка входа"
@@ -213,8 +213,8 @@ mutedUsers: "Скрытые пользователи"
 blockedUsers: "Заблокированные пользователи"
 noUsers: "Нет ни одного пользователя"
 editProfile: "Редактировать профиль"
-noteDeleteConfirm: "Вы хотите удалить эту заметку?"
-pinLimitExceeded: "Нельзя закрепить ещё больше заметок"
+noteDeleteConfirm: "Вы хотите удалить этот пост?"
+pinLimitExceeded: "Нельзя закрепить ещё больше постов"
 intro: "Установка Calckey завершена! А теперь создайте учетную запись администратора."
 done: "Готово"
 processing: "Обработка..."
@@ -360,7 +360,7 @@ pinnedPages: "Закрепленные страницы"
 pinnedPagesDescription: "Если хотите закрепить страницы на главной сайта, сюда можно\
   \ добавить пути к ним, каждый в отдельной строке."
 pinnedClipId: "Идентификатор закреплённой подборки"
-pinnedNotes: "Закреплённая заметка"
+pinnedNotes: "Закреплённые посты"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Включить hCaptcha"
 hcaptchaSiteKey: "Ключ сайта"
@@ -381,15 +381,15 @@ antennaExcludeKeywords: "Исключения"
 antennaKeywordsDescription: "Пишите слова через пробел в одной строке, чтобы ловить\
   \ их появление вместе; на отдельных строках располагайте слова, или группы слов,\
   \ чтобы ловить любые из них."
-notifyAntenna: "Уведомлять о новых заметках"
-withFileAntenna: "Только заметки с вложениями"
+notifyAntenna: "Уведомлять о новых постах"
+withFileAntenna: "Только посты с вложениями"
 enableServiceworker: "Включить ServiceWorker"
 antennaUsersDescription: "Пишите каждое название аккаута на отдельной строке"
 caseSensitive: "С учётом регистра"
 withReplies: "Включая ответы"
 connectedTo: "Вы подключены к следующим аккаунтам"
-notesAndReplies: "Заметки и ответы"
-withFiles: "Заметки с файлами"
+notesAndReplies: "Посты и ответы"
+withFiles: "Посты с файлами"
 silence: "Заглушить"
 silenceConfirm: "Вы уверены что хотите заглушить этого пользователя?"
 unsilence: "Снять глушение"
@@ -425,7 +425,7 @@ notFoundDescription: "Страница по указанной ссылке не
 uploadFolder: "Место загрузки по умолчанию"
 cacheClear: "Очистка кэша"
 markAsReadAllNotifications: "Отметить все уведомления как прочитанные"
-markAsReadAllUnreadNotes: "Отметить все заметки как прочитанные"
+markAsReadAllUnreadNotes: "Отметить все посты как прочитанные"
 markAsReadAllTalkMessages: "Отметить все реплики как прочитанные"
 help: "Помощь"
 inputMessageHere: "Введите сообщение здесь"
@@ -507,12 +507,14 @@ promotion: "Продвинуто"
 promote: "Продвинуть"
 numberOfDays: "Количество дней"
 hideThisNote: "Спрятать эту запись"
-showFeaturedNotesInTimeline: "Показывать в ленте заметки из «Горячего»"
+showFeaturedNotesInTimeline: "Показывать в ленте посты из «Горячего»"
 objectStorage: "Хранилище"
-useObjectStorage: "Занято в хранилище"
+useObjectStorage: "Использовать объектное хранилище"
 objectStorageBaseUrl: "Базовый адрес"
-objectStorageBaseUrlDesc: "Это начальная часть адреса, используемого CDN или прокси,\
-  \ например для S3: https://<bucket>.s3.amazonaws.com, или дя GCS: 'https://storage.googleapis.com/<bucket>'"
+objectStorageBaseUrlDesc: "URL используемый для примера. Укажите URL-адрес вашего\
+  \ CDN или прокси, если вы используете любой из них.\nДля S3 используйте 'https://<bucket>.s3.amazonaws.com',\
+  \ а для GCS и подобных сервисов используйте 'https://storage.googleapis.com/<bucket>',\
+  \ и т.п."
 objectStorageBucket: "Bucket"
 objectStorageBucketDesc: "Укажите название контейнера (Bucket) который используется\
   \ на выбранном сервисе."
@@ -535,8 +537,8 @@ objectStorageUseProxyDesc: "Отключите, если не будете ис
 objectStorageSetPublicRead: "Устанавливать public-read при загрузке на сервер"
 serverLogs: "Журнал сервера"
 deleteAll: "Удалить всё"
-showFixedPostForm: "Показывать поле для ввода новой заметки наверху ленты"
-newNoteRecived: "Появилась новая заметка"
+showFixedPostForm: "Показывать поле для ввода нового поста наверху ленты"
+newNoteRecived: "Появился новый пост"
 sounds: "Звуки"
 listen: "Слушать"
 none: "Ничего"
@@ -585,7 +587,7 @@ addRelay: "Добавить ретранслятор"
 inboxUrl: "URL ящика входящих сообщений"
 addedRelays: "Добавленные ретрансляторы"
 serviceworkerInfo: "Нужно включить, чтобы работали push-уведомления."
-deletedNote: "Удалённая заметка"
+deletedNote: "Удалённый пост"
 invisibleNote: "Личное сообщение"
 enableInfiniteScroll: "Включить бесконечную прокрутку"
 visibility: "Видимость"
@@ -624,7 +626,7 @@ edit: "Изменить"
 emailServer: "Сервер электронной почты"
 enableEmail: "Включить обмен электронной почтой"
 emailConfigInfo: "Используется для подтверждения адреса электронной почты и сброса\
-  \ пароля."
+  \ пароля"
 email: "Электронная почта"
 emailAddress: "Адрес электронной почты"
 smtpConfig: "Конфигурация SMTP-сервера"
@@ -669,7 +671,7 @@ abuseReports: "Жалобы"
 reportAbuse: "Жалоба"
 reportAbuseOf: "Пожаловаться на пользователя {name}"
 fillAbuseReportDescription: "Опишите, пожалуйста, причину жалобы подробнее. Если речь\
-  \ о конкретной заметке, будьте добры приложить ссылку на неё."
+  \ о конкретном посте, будьте добры приложить ссылку на неё."
 abuseReported: "Жалоба отправлена. Большое спасибо за информацию."
 reporteeOrigin: "О ком сообщено"
 reporterOrigin: "Кто сообщил"
@@ -683,7 +685,7 @@ openInSideView: "Открывать в боковой колонке"
 defaultNavigationBehaviour: "Поведение навигации по умолчанию"
 editTheseSettingsMayBreakAccount: "От изменений в этих настройках ваша учётная запись\
   \ может поломаться."
-instanceTicker: "Строка с названием инстанса в заметках"
+instanceTicker: "Строка с названием инстанса в постах"
 waitingFor: "Ждём, когда {x} ответит"
 random: "Случайные"
 system: "Система"
@@ -698,15 +700,15 @@ i18nInfo: "Calckey переводят на разные языки добров
   \ тоже пригодится здесь: {link}."
 manageAccessTokens: "Управление токенами доступа"
 accountInfo: "Сведения об учётной записи"
-notesCount: "Количество заметок"
+notesCount: "Количество постов"
 repliesCount: "Сколько раз пользователь кому-то ответил"
-renotesCount: "Сколько раз пользователь делился заметками"
+renotesCount: "Сколько раз пользователь делился постами"
 repliedCount: "Сколько раз ответили пользователю"
-renotedCount: "Сколько раз делились заметками пользователя"
+renotedCount: "Сколько раз делились постами пользователя"
 followingCount: "Количество подписок"
 followersCount: "Количество подписавшихся"
 sentReactionsCount: "Количество реакций пользователя"
-receivedReactionsCount: "Количество реакций на заметки пользователя"
+receivedReactionsCount: "Количество реакций на посты пользователя"
 pollVotesCount: "Сколько раз пользователь участвовал в опросах"
 pollVotedCount: "Сколько раз участвовали в опросах пользователя"
 yes: "Да"
@@ -714,10 +716,10 @@ no: "Нет"
 driveFilesCount: "Количество файлов на диске"
 driveUsage: "Занято места на диске"
 noCrawle: "Запретить паукам индексировать сайт"
-noCrawleDescription: "Просьба поисковым системам не ходить по вашему профилю, по заметкам,\
+noCrawleDescription: "Просьба поисковым системам не ходить по вашему профилю, по постам,\
   \ страницам и не индексировать их."
 lockedAccountInfo: "Даже если вы вручную подтверждаете подписки, кто угодно может\
-  \ читать ваши заметки, если вы не отмечаете их «для подписчиков»."
+  \ читать ваши посты, если вы не отмечаете их «для подписчиков»."
 alwaysMarkSensitive: "Отмечать файлы как «содержимое не для всех» по умолчанию"
 loadRawImages: "Сразу показывать изображения в полном размере"
 disableShowingAnimatedImages: "Не проигрывать анимацию"
@@ -736,7 +738,7 @@ developer: "Разработчик"
 makeExplorable: "Опубликовать профиль в «Обзоре»"
 makeExplorableDescription: "Если выключить, ваш профиль не будет показан в разделе\
   \ «Обзор»."
-showGapBetweenNotesInTimeline: "Показывать разделитель между заметками в ленте"
+showGapBetweenNotesInTimeline: "Показывать разделитель между постами в ленте"
 duplicate: "Дубликат"
 left: "Влево"
 center: "По центру"
@@ -749,7 +751,7 @@ showTitlebar: "Показать заголовок"
 clearCache: "Очистить кэш"
 onlineUsersCount: "Пользователей сейчас в сети: {n}"
 nUsers: "Пользователей: {n}"
-nNotes: "Заметок: {n}"
+nNotes: "Постов: {n}"
 sendErrorReports: "Посылать отчёты о сбоях"
 sendErrorReportsDescription: "Если включено, когда возникнет какая-нибудь техническая\
   \ проблема, подробные сведения об этом будут отправлены разработчикам Calckey.\n\
@@ -793,10 +795,9 @@ unlikeConfirm: "В самом деле отменить «нравится»?"
 fullView: "Полный вид"
 quitFullView: "Закрыть полный вид"
 addDescription: "Добавить описание"
-userPagePinTip: "Можно добавить сюда заметки, выбрав нужную, и включив в её меню пункт\
+userPagePinTip: "Можно добавить сюда посты, выбрав нужный, и включив в её меню пункт\
   \ «Закрепить в профиле»."
-notSpecifiedMentionWarning: "В этой заметке есть упоминание тех, кто не включён в\
-  \ адресаты"
+notSpecifiedMentionWarning: "В этом посте есть упоминание тех, кто не включён в адресаты"
 info: "Описание"
 userInfo: "Сведения о пользователе"
 unknown: "Неизвестно"
@@ -826,7 +827,7 @@ postToGallery: "Опубликовать в галерею"
 gallery: "Галерея"
 recentPosts: "Недавние публикации"
 popularPosts: "Популярные публикации"
-shareWithNote: "Поделиться заметкой"
+shareWithNote: "Поделиться постом"
 ads: "Реклама"
 expiration: "Опрос длится"
 memo: "Памятка"
@@ -1088,7 +1089,7 @@ _channel:
   owned: "Собственные"
   following: "Подписки"
   usersCount: "Участников: {n}"
-  notesCount: "Заметок: {n}"
+  notesCount: "Постов: {n}"
 _menuDisplay:
   sideFull: "Сторона"
   sideIcon: "Сторона (иконки)"
@@ -1101,13 +1102,13 @@ _wordMute:
     \ строках."
   muteWordsDescription2: "Здесь можно использовать регулярные выражения — просто заключите\
     \ их между двумя дробными чертами (/)."
-  softDescription: "Соответствующие условиям заметки будут спрятаны из вашей ленты."
-  hardDescription: "Соответстующие условиям заметки вообще не будут попадать в вашу\
-    \ ленту. Даже если вы поменяете условия, отсеенные таким образом заметки уже не\
+  softDescription: "Соответствующие условиям посты будут спрятаны из вашей ленты."
+  hardDescription: "Соответстующие условиям посты вообще не будут попадать в вашу\
+    \ ленту. Даже если вы поменяете условия, отсеенные таким образом посты уже не\
     \ появятся."
   soft: "Мягкий"
   hard: "Жёсткий"
-  mutedNotes: "Скрытые заметки"
+  mutedNotes: "Скрытые посты"
 _instanceMute:
   heading: "Список заглушенных инстансов"
   instanceMuteDescription2: Разделить переносом строки
@@ -1190,8 +1191,8 @@ _theme:
     accentLighten: "Фон (осветлённый)"
     fgHighlighted: "Подсвеченный текст"
 _sfx:
-  note: "Заметки"
-  noteMy: "Собственные заметки"
+  note: "Новый пост"
+  noteMy: "Собственные посты"
   notification: "Уведомления"
   chat: "Сообщения"
   chatBg: "Сообщения (фон)"
@@ -1274,7 +1275,7 @@ _permissions:
   "write:messaging": "Писать и удалять сообщения"
   "read:mutes": "Смотреть спискок скрытых пользователей"
   "write:mutes": "Изменять список скрытых пользователей"
-  "write:notes": "Писать и удалять заметки"
+  "write:notes": "Писать и удалять посты"
   "read:notifications": "Смотреть уведомления"
   "write:notifications": "Изменять уведомления"
   "read:reactions": "Смотреть реакции"
@@ -1301,11 +1302,11 @@ _auth:
   denied: "Доступ закрыт"
   copyAsk: Пожалуйста, вставьте следующий код авторизации в приложение
 _antennaSources:
-  all: "Все заметки"
-  homeTimeline: "Заметки тех на которых вы подписаны"
-  users: "Заметки выбранных пользователей"
-  userList: "Заметки пользователей из выбранных списков"
-  userGroup: "Заметки от пользователей из заданной группы"
+  all: "Все посты"
+  homeTimeline: "Посты тех на которых вы подписаны"
+  users: "Посты выбранных пользователей"
+  userList: "Посты пользователей из выбранных списков"
+  userGroup: "Посты от пользователей из заданной группы"
   instances: Посты от всех пользователей на инстансе
 _weekday:
   sunday: "Воскресенье"
@@ -1380,7 +1381,7 @@ _visibility:
   localOnly: "Локально"
   localOnlyDescription: "Только для этого сайта"
 _postForm:
-  replyPlaceholder: "Ответ на заметку..."
+  replyPlaceholder: "Ответ на пост..."
   quotePlaceholder: "Пояснение к цитате..."
   channelPlaceholder: "Отправить в канал..."
   _placeholders:
@@ -1418,10 +1419,10 @@ _charts:
   usersIncDec: "Изменение числа пользователей"
   usersTotal: "Количество пользователей"
   activeUsers: "Активные пользователи"
-  notesIncDec: "Изменение числа заметок"
-  localNotesIncDec: "Изменения числа локальных заметок"
-  remoteNotesIncDec: "Изменения числа заметок с других сайтов"
-  notesTotal: "Общее количество заметок"
+  notesIncDec: "Изменение числа постов"
+  localNotesIncDec: "Изменения числа локальных постов"
+  remoteNotesIncDec: "Изменения числа постов с других сайтов"
+  notesTotal: "Общее количество постов"
   filesIncDec: "Изменения числа файлов"
   filesTotal: "Суммарное количество файлов"
   storageUsageIncDec: "Изменения заполнения хранилища"
@@ -1430,8 +1431,8 @@ _instanceCharts:
   requests: "Запросы"
   users: "Изменение числа пользователей"
   usersTotal: "Суммарное количество пользователей"
-  notes: "Изменение числа заметок"
-  notesTotal: "Суммарное количество заметок"
+  notes: "Изменение числа постов"
+  notesTotal: "Суммарное количество постов"
   ff: "Изменения числа подписчиков "
   ffTotal: "Суммарное количество подписчиков"
   cacheSize: "Изменения размера кэша"
@@ -1449,12 +1450,12 @@ _pages:
   editPage: "Править страницу"
   readPage: "Читать страницу"
   created: "Страница успешно создана"
-  updated: "Страница успешно обновлена."
-  deleted: "Страница успешно удалена."
+  updated: "Страница успешно обновлена"
+  deleted: "Страница успешно удалена"
   pageSetting: "Настройки страницы"
-  nameAlreadyExists: "Указанный адрес страницы уже существует."
-  invalidNameTitle: "Указанный адрес страницы недопустим."
-  invalidNameText: "Проверьте, что не оставили поле пустым."
+  nameAlreadyExists: "Указанный адрес страницы уже существует"
+  invalidNameTitle: "Указанный адрес страницы недопустим"
+  invalidNameText: "Проверьте, что не оставили поле пустым"
   editThisPage: "Правка этой страницы"
   viewSource: "Просмотр исходника"
   viewPage: "Смотреть страницы"
@@ -1493,7 +1494,7 @@ _pages:
     if: "Условный"
     _if:
       variable: "Переменная"
-    post: "Создание заметки"
+    post: "Создание поста"
     _post:
       text: "Текст"
       attachCanvasImage: "Прикрепить изображение с холста"
@@ -1518,10 +1519,10 @@ _pages:
       id: "Метка холста"
       width: "Ширина"
       height: "Высота"
-    note: "Встроенная заметка"
+    note: "Встроенный пост"
     _note:
-      id: "Идентификатор заметки"
-      idDescription: "Можно также вставить ссылку на заметку."
+      id: "Идентификатор поста"
+      idDescription: "Можно также вставить ссылку на пост."
       detailed: "Подробный вид"
     switch: "Выключатель"
     _switch:
@@ -1735,21 +1736,21 @@ _pages:
     argVariables: "Аргументы"
 _relayStatus:
   requesting: "В ожидании одобрения"
-  accepted: "Одобрено."
-  rejected: "Отказано."
+  accepted: "Одобрено"
+  rejected: "Отказано"
 _notification:
-  fileUploaded: "Файл успешно загружен."
-  youGotMention: "{name} упоминает вас."
-  youGotReply: "{name} отвечает вам."
-  youGotQuote: "{name} цитирует вас."
-  youRenoted: "{name} передаёт вашу заметку."
-  youGotPoll: "{name} участвует в вашем опросе."
-  youGotMessagingMessageFromUser: "{name} пишет вам."
-  youGotMessagingMessageFromGroup: "Новое сообщение в группе «{name}»."
-  youWereFollowed: "У вас новый подписчик."
-  youReceivedFollowRequest: "У вас новый запрос на подписку."
-  yourFollowRequestAccepted: "Ваш запрос на подписку одобрен."
-  youWereInvitedToGroup: "Вы приглашены в группу."
+  fileUploaded: "Файл успешно загружен"
+  youGotMention: "{name} упоминает вас"
+  youGotReply: "{name} отвечает вам"
+  youGotQuote: "{name} цитирует вас"
+  youRenoted: "{name} репостит ваш пост"
+  youGotPoll: "{name} участвует в вашем опросе"
+  youGotMessagingMessageFromUser: "{name} пишет вам"
+  youGotMessagingMessageFromGroup: "Новое сообщение в группе «{name}»"
+  youWereFollowed: "У вас новый подписчик"
+  youReceivedFollowRequest: "У вас новый запрос на подписку"
+  yourFollowRequestAccepted: "Ваш запрос на подписку одобрен"
+  youWereInvitedToGroup: "{userName} пригласил вас в группу"
   _types:
     all: "Все"
     follow: "Подписки"

From c6d9946829b9a3b90a3ea17cb93e7279ce166ce7 Mon Sep 17 00:00:00 2001
From: Kenny Hui <kenny.mh.hui@outlook.com>
Date: Mon, 24 Apr 2023 17:02:53 +0000
Subject: [PATCH 536/582] chore: Translated using Weblate (Chinese
 (Traditional))

Currently translated at 97.2% (1680 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hant/
---
 locales/zh-TW.yml | 93 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 75 insertions(+), 18 deletions(-)

diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index d940838dc..78bf4f34c 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1,7 +1,7 @@
----
 _lang_: "繁體中文"
 headlineMisskey: "貼文連繫網路"
-introMisskey: "歡迎！ Misskey是一個開放原始碼且去中心化的社群網路。\n透過「貼文」分享周邊新鮮事，並告訴其他人您的想法！📡\n透過「反應」功能，對大家的貼文表達情感！👍\n一起來探索這個新的世界吧！🚀"
+introMisskey: "歡迎！ Misskey是一個開放原始碼且去中心化的社群網路。\n透過「貼文」分享周邊新鮮事，並告訴其他人您的想法！\U0001F4E1\
+  \n透過「反應」功能，對大家的貼文表達情感！\U0001F44D\n一起來探索這個新的世界吧！\U0001F680"
 monthAndDay: "{month}月 {day}日"
 search: "搜尋"
 notifications: "通知"
@@ -14,7 +14,7 @@ gotIt: "知道了"
 cancel: "取消"
 enterUsername: "輸入使用者名稱"
 renotedBy: "{user} 轉傳了"
-noNotes: "無貼文。"
+noNotes: "無貼文"
 noNotifications: "沒有通知"
 instance: "實例"
 settings: "設定"
@@ -23,19 +23,19 @@ otherSettings: "其他設定"
 openInWindow: "在新視窗開啟"
 profile: "個人檔案"
 timeline: "時間軸"
-noAccountDescription: "此用戶還沒有自我介紹"
+noAccountDescription: "此用戶還沒有自我介紹。"
 login: "登入"
 loggingIn: "登入中"
 logout: "登出"
 signup: "註冊"
-uploading: "上傳中"
+uploading: "上傳中..."
 save: "儲存"
 users: "使用者"
 addUser: "新增使用者"
 favorite: "我的最愛"
 favorites: "我的最愛"
 unfavorite: "從我的最愛中移除"
-favorited: "已添加至我的最愛"
+favorited: "已添加至我的最愛。"
 alreadyFavorited: "我的最愛中已存在。"
 cantFavorite: "無法加入至我的最愛。"
 pin: "置頂"
@@ -143,7 +143,7 @@ settingGuide: "推薦設定"
 cacheRemoteFiles: "快取遠端檔案"
 cacheRemoteFilesDescription: "禁用此設定會停止遠端檔案的緩存，從而節省儲存空間，但資料會因直接連線從而產生額外連接數據。"
 flagAsBot: "此使用者是機器人"
-flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Misskey內部系統將本帳戶識別為機器人"
+flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Calckey內部系統將本帳戶識別為機器人"
 flagAsCat: "此使用者是貓"
 flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
 flagShowTimelineReplies: "在時間軸上顯示貼文的回覆"
@@ -203,7 +203,7 @@ noUsers: "沒有任何使用者"
 editProfile: "編輯個人檔案"
 noteDeleteConfirm: "確定刪除此貼文嗎？"
 pinLimitExceeded: "不能置頂更多貼文了"
-intro: "Misskey 部署完成！請建立管理員帳戶。"
+intro: "Calckey 部署完成！請建立管理員帳戶。"
 done: "完成"
 processing: "處理中"
 preview: "預覽"
@@ -382,7 +382,7 @@ exploreFediverse: "探索聯邦世界"
 popularTags: "熱門標籤"
 userList: "清單"
 about: "資訊"
-aboutMisskey: "關於 Misskey"
+aboutMisskey: "關於 Calckey"
 administrator: "管理員"
 token: "權杖"
 twoStepAuthentication: "兩階段驗證"
@@ -528,7 +528,7 @@ sort: "排序"
 ascendingOrder: "昇冪"
 descendingOrder: "降冪"
 scratchpad: "暫存記憶體"
-scratchpadDescription: "AiScript控制台為AiScript提供了實驗環境。您可以在此編寫、執行和確認代碼與Misskey互動的结果。"
+scratchpadDescription: "AiScript控制台為AiScript提供了實驗環境。您可以在此編寫、執行和確認代碼與Calckey互動的结果。"
 output: "輸出"
 script: "腳本"
 disablePagesScript: "停用頁面的AiScript腳本"
@@ -644,7 +644,7 @@ instanceTicker: "貼文的實例來源"
 waitingFor: "等待{x}"
 random: "隨機"
 system: "系統"
-switchUi: "切換界面"
+switchUi: "界面"
 desktop: "桌面"
 clip: "摘錄"
 createNew: "新建"
@@ -795,7 +795,7 @@ hashtags: "#tag"
 troubleshooting: "故障排除"
 useBlurEffect: "在 UI 上使用模糊效果"
 learnMore: "更多資訊"
-misskeyUpdated: "Misskey 更新完成！"
+misskeyUpdated: "Calckey 更新完成！"
 whatIsNew: "顯示更新資訊"
 translate: "翻譯"
 translatedFrom: "從 {x} 翻譯"
@@ -897,7 +897,10 @@ shuffle: "隨機"
 account: "帳戶"
 move: "移動 "
 customKaTeXMacro: "自定義 KaTeX 宏"
-customKaTeXMacroDescription: "使用宏來輕鬆的輸入數學表達式吧！宏的用法與 LaTeX 中的命令定義相同。你可以使用 \\newcommand{\\name}{content} 或 \\newcommand{\\name}[number of arguments]{content} 來輸入數學表達式。舉個例子，\\newcommand{\\add}[2]{#1 + #2} 會將 \\add{3}{foo} 展開為 3 + foo。此外，宏名稱外的花括號 {} 可以被替換為圓括號 () 和方括號 []，這會影響用於參數的括號。每行只能夠定義一個宏，無法在中間換行，且無效的行將被忽略。只支持簡單字符串替換功能，不支持高級語法，如條件分支等。"
+customKaTeXMacroDescription: "使用宏來輕鬆的輸入數學表達式吧！宏的用法與 LaTeX 中的命令定義相同。你可以使用 \\newcommand{\\\
+  name}{content} 或 \\newcommand{\\name}[number of arguments]{content} 來輸入數學表達式。舉個例子，\\\
+  newcommand{\\add}[2]{#1 + #2} 會將 \\add{3}{foo} 展開為 3 + foo。此外，宏名稱外的花括號 {} 可以被替換為圓括號\
+  \ () 和方括號 []，這會影響用於參數的括號。每行只能夠定義一個宏，無法在中間換行，且無效的行將被忽略。只支持簡單字符串替換功能，不支持高級語法，如條件分支等。"
 enableCustomKaTeXMacro: "啟用自定義 KaTeX 宏"
 _sensitiveMediaDetection:
   description: "您可以使用機器學習自動檢測敏感媒體並將其用於審核。 伺服器的負荷會稍微增加。"
@@ -974,13 +977,13 @@ _registry:
   domain: "域"
   createKey: "新增機碼"
 _aboutMisskey:
-  about: "Misskey是由syuilo自2014年起開發的開源軟體。"
+  about: "Calckey是由ThatOneCalculator自2022年起開發的Misskey分支。"
   contributors: "主要貢獻者"
   allContributors: "全體貢獻人員"
   source: "原始碼"
-  translation: "翻譯Misskey"
-  donate: "贊助Misskey"
-  morePatrons: "還有許許多多幫助我們的其他人，非常感謝你們。 🥰"
+  translation: "翻譯Calckey"
+  donate: "贊助Calckey"
+  morePatrons: "還有許許多多幫助我們的其他人，非常感謝你們。 \U0001F970"
   patrons: "贊助者"
 _nsfw:
   respect: "隱藏敏感內容"
@@ -989,7 +992,7 @@ _nsfw:
 _mfm:
   cheatSheet: "MFM代碼小抄"
   intro: "MFM是Misskey專用的標記語言，可以在Misskey中的各個位置使用。 您可以這裏看到MFM可用語法列表。"
-  dummy: "Misskey拓展了Fediverse的世界"
+  dummy: "Calckey拓展了Fediverse的世界"
   mention: "提及"
   mentionDescription: "透過 @+用戶名 來標示特定使用者。"
   hashtag: "#tag"
@@ -1394,6 +1397,7 @@ _timelines:
   local: "本地"
   social: "社群"
   global: "公開"
+  recommended: 推薦
 _pages:
   newPage: "建立頁面"
   editPage: "編輯頁面"
@@ -1748,3 +1752,56 @@ _deck:
     list: "清單"
     mentions: "提及"
     direct: "指定使用者"
+secureMode: 安全模式（授權獲取）
+instanceSecurity: 實例安全性
+privateMode: 私人模式
+allowedInstances: 列入白名單的實例
+secureModeInfo: 當從其他實例請求時，不要在沒有證據的情況下發回。
+_messaging:
+  dms: 私訊
+  groups: 群組
+manageGroups: 管理群組
+replayTutorial: 重新播放教程
+moveFromLabel: '您想遷移的舊帳戶:'
+customMOTDDescription: 每次用戶加載/重新加載頁面時，由換行符號分隔的 MOTD（啟動畫面）的自定信息將隨機顯示。
+privateModeInfo: 啟用後，只有列入白名單的實例才能與您的實例聯合。所有貼文都將對公眾隱藏。
+adminCustomCssWarn: 除非你知道它的作用，否則請不要使用此設定。 輸入不正確的值可能會導致每個人的客戶端無法正常運行。你可在你的的用戶設定中測試，確保你的
+  CSS 正常工作。
+showUpdates: Calckey 更新時顯示彈出視窗
+recommendedInstances: 建議的實例
+caption: 自動字幕
+enterSendsMessage: 在 Messaging 中按 Return 發送消息 (如關閉則是 Ctrl + Return)
+migrationConfirm: "您確定要將你的帳戶遷移到 {account} 嗎？ 一旦這樣做，你將無法復原，而你將無法再次正常使用您的帳戶。\n另外，請確保你已將此當前帳戶設置為您要遷移的帳戶。"
+customSplashIconsDescription: 每次用戶加載/重新加載頁面時，以換行符號分隔的自定啟動畫面圖標的網址將隨機顯示。請確保圖片位於靜態網址上，最好所有圖片解析度調整為
+  192x192。
+accountMoved: '該使用者已移至新帳戶:'
+showAds: 顯示廣告
+noThankYou: 不用了，謝謝
+selectInstance: 選擇實例
+enableRecommendedTimeline: 啟用推薦時間軸
+antennaInstancesDescription: 分行列出一個實例
+moveTo: 遷移此帳戶到新帳戶
+moveToLabel: '請輸入你將會遷移到的帳戶:'
+moveAccount: 遷移帳戶!
+moveAccountDescription: '這個過程是不可逆的。 在遷移前，請確保您已在新帳戶上為此帳戶設置了別名(Alias)。 請輸入帳戶標籤 (格式:
+  @person@instance.com)'
+moveFrom: 由舊帳戶移至此帳戶
+moveFromDescription: '這將為你的舊帳戶設置一個別名(Alias)，以便你可以從該帳戶轉移到當前帳戶。 在你的舊帳戶移動之前請執行此操作。 請輸入帳戶標籤
+  (格式: @person@instance.com)'
+_apps:
+  crossPlatform: 跨平台
+  free: 免費
+  paid: 付費
+enableEmojiReactions: 啟用表情符號反應
+breakFollowConfirm: 您確定要移除該關注者嗎？
+socialTimeline: 社交時間軸
+cannotUploadBecauseExceedsFileSizeLimit: 因檔案太大而無法上傳。
+customMOTD: 自定義MOTD (網頁載入時顯示的信息)
+customSplashIcons: 啟動畫面圖標 (網址)
+splash: 啟動畫面
+updateAvailable: 可能有可用的更新!
+showAdminUpdates: 表明新的 Calckey 版本可用（只限管理員）
+migration: 遷移
+homeTimeline: 主頁時間軸
+swipeOnDesktop: 允許在桌面上進行手機式滑動
+logoImageUrl: 圖標網址

From aaccb9f9893abca7cabfbbcdc955402fc3f4fb02 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 25 Apr 2023 18:06:21 -0700
Subject: [PATCH 537/582] feat: heatmap option for activity widget

---
 package.json                                 |  2 +-
 packages/client/src/components/MkHeatmap.vue |  8 ++++++++
 packages/client/src/widgets/activity.vue     | 12 ++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0f41e29d1..955e68792 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev36",
+	"version": "13.2.0-dev37",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkHeatmap.vue b/packages/client/src/components/MkHeatmap.vue
index 1af278b23..c3010109f 100644
--- a/packages/client/src/components/MkHeatmap.vue
+++ b/packages/client/src/components/MkHeatmap.vue
@@ -25,6 +25,7 @@ import { useChartTooltip } from "@/scripts/use-chart-tooltip";
 import { chartVLine } from "@/scripts/chart-vline";
 import { alpha } from "@/scripts/color";
 import { initChart } from "@/scripts/init-chart";
+import { $i } from "@/account";
 
 initChart();
 
@@ -108,6 +109,13 @@ async function renderChart() {
 			span: "day",
 		});
 		values = raw.deliverFailed;
+	} else if (props.src === "user-notes") {
+		const raw = await os.api("charts/user/notes", {
+			limit: 7 * 21,
+			span: "day",
+			userId: $i.id,
+		});
+		values = raw.total;
 	}
 
 	fetching = false;
diff --git a/packages/client/src/widgets/activity.vue b/packages/client/src/widgets/activity.vue
index b148d3934..6292431af 100644
--- a/packages/client/src/widgets/activity.vue
+++ b/packages/client/src/widgets/activity.vue
@@ -9,11 +9,14 @@
 			>{{ i18n.ts._widgets.activity }}</template
 		>
 		<template #func
-			><button class="_button" @click="toggleView()">
+			><button v-if="!widgetProps.newStyle" class="_button" @click="toggleView()">
 				<i class="ph-sort-ascending ph-bold ph-lg"></i></button
 		></template>
 
-		<div>
+		<div v-if="widgetProps.newStyle">
+			<MkHeatmap src="notes-user" />
+		</div>
+		<div v-else>
 			<MkLoading v-if="fetching" />
 			<template v-else>
 				<XCalendar
@@ -40,6 +43,7 @@ import {
 } from "./widget";
 import XCalendar from "./activity.calendar.vue";
 import XChart from "./activity.chart.vue";
+import MkHeatmap from "@/components/MkHeatmap.vue";
 import { GetFormResultType } from "@/scripts/form";
 import * as os from "@/os";
 import MkContainer from "@/components/MkContainer.vue";
@@ -49,6 +53,10 @@ import { i18n } from "@/i18n";
 const name = "activity";
 
 const widgetPropsDef = {
+	newStyle: {
+		type: "boolean" as const,
+		default: true,
+	},
 	showHeader: {
 		type: "boolean" as const,
 		default: true,

From 8a159502a5c85f5ba8fbe25f7b2c6ab035095480 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 25 Apr 2023 18:16:14 -0700
Subject: [PATCH 538/582] typo

---
 packages/client/src/widgets/activity.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/widgets/activity.vue b/packages/client/src/widgets/activity.vue
index 6292431af..49c866fca 100644
--- a/packages/client/src/widgets/activity.vue
+++ b/packages/client/src/widgets/activity.vue
@@ -14,7 +14,7 @@
 		></template>
 
 		<div v-if="widgetProps.newStyle">
-			<MkHeatmap src="notes-user" />
+			<MkHeatmap src="user-notes" />
 		</div>
 		<div v-else>
 			<MkLoading v-if="fetching" />

From af4a2f23138d73d9f9225a1cde8f72aca8e10036 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 25 Apr 2023 18:21:15 -0700
Subject: [PATCH 539/582] see if this works

---
 .../src/server/api/endpoints/users/following.ts        |  2 +-
 packages/client/src/components/MkHeatmap.vue           | 10 ++++++++--
 packages/client/src/widgets/activity.vue               |  8 ++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts
index fbfaf6173..37d69b048 100644
--- a/packages/backend/src/server/api/endpoints/users/following.ts
+++ b/packages/backend/src/server/api/endpoints/users/following.ts
@@ -41,7 +41,7 @@ export const meta = {
 			message: "Cannot find the following.",
 			code: "CANNOT_FIND",
 			id: "7a55f0d7-8e06-4a7e-9c77-ee7d59b25a82",
-		}
+		},
 	},
 } as const;
 
diff --git a/packages/client/src/components/MkHeatmap.vue b/packages/client/src/components/MkHeatmap.vue
index c3010109f..d11287fa1 100644
--- a/packages/client/src/components/MkHeatmap.vue
+++ b/packages/client/src/components/MkHeatmap.vue
@@ -109,13 +109,19 @@ async function renderChart() {
 			span: "day",
 		});
 		values = raw.deliverFailed;
-	} else if (props.src === "user-notes") {
+	} else if (props.src === "my-notes") {
 		const raw = await os.api("charts/user/notes", {
 			limit: 7 * 21,
 			span: "day",
 			userId: $i.id,
 		});
-		values = raw.total;
+		values = raw.diffs.normal.map((_, i) => ({
+			total:
+				raw.diffs.normal[i] + raw.diffs.reply[i] + raw.diffs.renote[i],
+				notes: raw.diffs.normal[i],
+				replies: raw.diffs.reply[i],
+				renotes: raw.diffs.renote[i],
+		}));
 	}
 
 	fetching = false;
diff --git a/packages/client/src/widgets/activity.vue b/packages/client/src/widgets/activity.vue
index 49c866fca..66826f5eb 100644
--- a/packages/client/src/widgets/activity.vue
+++ b/packages/client/src/widgets/activity.vue
@@ -9,12 +9,16 @@
 			>{{ i18n.ts._widgets.activity }}</template
 		>
 		<template #func
-			><button v-if="!widgetProps.newStyle" class="_button" @click="toggleView()">
+			><button
+				v-if="!widgetProps.newStyle"
+				class="_button"
+				@click="toggleView()"
+			>
 				<i class="ph-sort-ascending ph-bold ph-lg"></i></button
 		></template>
 
 		<div v-if="widgetProps.newStyle">
-			<MkHeatmap src="user-notes" />
+			<MkHeatmap src="my-notes" />
 		</div>
 		<div v-else>
 			<MkLoading v-if="fetching" />

From 565630fff006fc708034d9ba07384a77742ac218 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 25 Apr 2023 18:31:04 -0700
Subject: [PATCH 540/582] mmm matrix math yummy

---
 packages/client/src/components/MkHeatmap.vue | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/MkHeatmap.vue b/packages/client/src/components/MkHeatmap.vue
index d11287fa1..60508095c 100644
--- a/packages/client/src/components/MkHeatmap.vue
+++ b/packages/client/src/components/MkHeatmap.vue
@@ -43,6 +43,8 @@ const { handler: externalTooltipHandler } = useChartTooltip({
 	position: "middle",
 });
 
+const addArrays = (arr1: number[], arr2: number[], arr3: number[]) => (arr1.length === arr2.length && arr2.length === arr3.length) ? arr1.map((val, i) => val + arr2[i] + arr3[i]) : null;
+
 async function renderChart() {
 	if (chartInstance) {
 		chartInstance.destroy();
@@ -115,13 +117,7 @@ async function renderChart() {
 			span: "day",
 			userId: $i.id,
 		});
-		values = raw.diffs.normal.map((_, i) => ({
-			total:
-				raw.diffs.normal[i] + raw.diffs.reply[i] + raw.diffs.renote[i],
-				notes: raw.diffs.normal[i],
-				replies: raw.diffs.reply[i],
-				renotes: raw.diffs.renote[i],
-		}));
+		values = addArrays(raw.diffs.normal, raw.diffs.reply, raw.diffs.renote);
 	}
 
 	fetching = false;

From 17af43301a4decccc40d7b899b85ed9759d0d9ea Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 25 Apr 2023 18:34:04 -0700
Subject: [PATCH 541/582] use chartLimit

---
 packages/client/src/components/MkHeatmap.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkHeatmap.vue b/packages/client/src/components/MkHeatmap.vue
index 60508095c..7b1c2f7ed 100644
--- a/packages/client/src/components/MkHeatmap.vue
+++ b/packages/client/src/components/MkHeatmap.vue
@@ -113,7 +113,7 @@ async function renderChart() {
 		values = raw.deliverFailed;
 	} else if (props.src === "my-notes") {
 		const raw = await os.api("charts/user/notes", {
-			limit: 7 * 21,
+			limit: chartLimit,
 			span: "day",
 			userId: $i.id,
 		});

From c02217c6ae098bdd287e6920cb0979077a960820 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 25 Apr 2023 18:40:10 -0700
Subject: [PATCH 542/582] rm todo

---
 packages/client/src/widgets/activity.calendar.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/src/widgets/activity.calendar.vue b/packages/client/src/widgets/activity.calendar.vue
index d7081a27c..4a6d3cf4a 100644
--- a/packages/client/src/widgets/activity.calendar.vue
+++ b/packages/client/src/widgets/activity.calendar.vue
@@ -73,7 +73,6 @@ props.activity.slice().forEach((d, i) => {
 
 	d.v = peak === 0 ? 0 : d.total / (peak / 2);
 	if (d.v > 1) d.v = 1;
-	// TODO: Make Rose Pine
 	const ch = d.date.weekday === 0 || d.date.weekday === 6 ? 275 : 170;
 	const cs = d.v * 100;
 	const cl = 15 + (1 - d.v) * 80;

From a7d2eb79b1fdb2ce75a218b7994df5ff769df2a0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 25 Apr 2023 19:05:29 -0700
Subject: [PATCH 543/582] posts

---
 packages/client/src/components/MkInstanceStats.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkInstanceStats.vue b/packages/client/src/components/MkInstanceStats.vue
index f73580fd6..70397a6e6 100644
--- a/packages/client/src/components/MkInstanceStats.vue
+++ b/packages/client/src/components/MkInstanceStats.vue
@@ -67,7 +67,7 @@
 			<template #header>Active users heatmap</template>
 			<MkSelect v-model="heatmapSrc" style="margin: 0 0 12px 0">
 				<option value="active-users">Active users</option>
-				<option value="notes">Notes</option>
+				<option value="notes">Posts</option>
 				<option value="ap-requests-inbox-received">
 					Fediverse Requests: inboxReceived
 				</option>

From faf9b6e5a24033e32ada7df674091742d3a8544c Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 27 Apr 2023 03:29:07 +0900
Subject: [PATCH 544/582] fix an instance ticker bug

---
 packages/client/src/components/MkInstanceTicker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue
index 3558b53d8..6deb428f0 100644
--- a/packages/client/src/components/MkInstanceTicker.vue
+++ b/packages/client/src/components/MkInstanceTicker.vue
@@ -35,7 +35,7 @@ const instance = props.instance ?? {
 			'meta[name="theme-color-orig"]'
 		) as HTMLMetaElement
 	)?.content,
-	software: Instance.softwareName || "Calckey",
+	softwareName: Instance.softwareName || "Calckey",
 };
 
 const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1);

From 908765106d800a3c9aaa00077efe18f6b01f69b3 Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Wed, 26 Apr 2023 20:03:32 +0000
Subject: [PATCH 545/582] super minor styling stuff (#9918)

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9918
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
---
 .../src/components/MkSubNoteContent.vue       | 10 ++-
 packages/client/src/style.scss                | 75 ++++++++++++-------
 packages/client/src/ui/_common_/navbar.vue    | 12 +--
 3 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 132c4966d..a345b23f5 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -251,14 +251,18 @@ let showContent = $ref(false);
 					min-height: 2em;
 					max-height: 5em;
 					filter: blur(4px);
+					:deep(span) {
+						animation: none !important;
+						transform: none !important;
+					}
+					:deep(img) {
+						filter: blur(12px);
+					}
 				}
 				:deep(.fade) {
 					inset: 0;
 					top: 40px;
 				}
-				:deep(span) {
-					animation: none !important;
-				}
 			}
 
 			:deep(.fade) {
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index c1a1820bc..051edf6e0 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -12,6 +12,24 @@
 		--margin: var(--marginHalf);
 	}
 
+	// https://larsenwork.com/easing-gradients/
+	--gradient: hsl(0, 0%, 0%) 0%,
+		hsla(0, 0%, 0%, 0.987) 8.1%,
+		hsla(0, 0%, 0%, 0.951) 15.5%,
+		hsla(0, 0%, 0%, 0.896) 22.5%,
+		hsla(0, 0%, 0%, 0.825) 29%,
+		hsla(0, 0%, 0%, 0.741) 35.3%,
+		hsla(0, 0%, 0%, 0.648) 41.2%,
+		hsla(0, 0%, 0%, 0.55) 47.1%,
+		hsla(0, 0%, 0%, 0.45) 52.9%,
+		hsla(0, 0%, 0%, 0.352) 58.8%,
+		hsla(0, 0%, 0%, 0.259) 64.7%,
+		hsla(0, 0%, 0%, 0.175) 71%,
+		hsla(0, 0%, 0%, 0.104) 77.5%,
+		hsla(0, 0%, 0%, 0.049) 84.5%,
+		hsla(0, 0%, 0%, 0.013) 91.9%,
+		hsla(0, 0%, 0%, 0) 100%;
+
 	//--ad: rgb(255 169 0 / 10%);
 }
 
@@ -36,32 +54,6 @@ html {
 	text-size-adjust: 100%;
 	tab-size: 2;
 
-	&, * {
-		scrollbar-color: var(--scrollbarHandle) inherit;
-		scrollbar-width: thin;
-
-		&::-webkit-scrollbar {
-			width: 6px;
-			height: 6px;
-		}
-
-		&::-webkit-scrollbar-track {
-			background: inherit;
-		}
-
-		&::-webkit-scrollbar-thumb {
-			background: var(--scrollbarHandle);
-
-			&:hover {
-				background: var(--scrollbarHandleHover);
-			}
-
-			&:active {
-				background: var(--accent);
-			}
-		}
-	}
-
 	&.f-1 {
 		font-size: 15px;
 	}
@@ -78,6 +70,37 @@ html {
 		font-family: sans-serif;
 	}
 }
+body::-webkit-scrollbar {
+	width: 12px;
+	height: 12px;
+
+}
+body::-webkit-scrollbar-thumb {
+	border-radius: 100px;
+	background-clip: content-box;
+	border: 3px solid transparent;
+}
+::-webkit-scrollbar {
+	width: 6px;
+	height: 6px;
+}
+::-webkit-scrollbar-track {
+	background: inherit;
+}
+::-webkit-scrollbar-thumb {
+	background: var(--scrollbarHandle);
+	min-height: 80px;
+
+	&:hover {
+		background: var(--scrollbarHandleHover);
+		background-clip: content-box;
+	}
+
+	&:active {
+		background: var(--accent);
+		background-clip: content-box;
+	}
+}
 
 html._themeChanging_ {
 	&, * {
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 023b4d493..380f77c3c 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -278,16 +278,8 @@ function more(ev: MouseEvent) {
 					height: 100%;
 					background-size: cover;
 					background-position: center center;
-					-webkit-mask-image: linear-gradient(
-						0deg,
-						rgba(0, 0, 0, 0) 15%,
-						rgba(0, 0, 0, 0.75) 100%
-					);
-					mask-image: linear-gradient(
-						0deg,
-						rgba(0, 0, 0, 0) 15%,
-						rgba(0, 0, 0, 0.75) 100%
-					);
+					-webkit-mask-image: linear-gradient(var(--gradient));
+					mask-image: linear-gradient(var(--gradient));
 				}
 
 				> .account {

From dda66daedd5437146b789a6942183cad85af36ff Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@noreply.codeberg.org>
Date: Wed, 26 Apr 2023 20:06:18 +0000
Subject: [PATCH 546/582] feat: reserved usernames (#9917)

This PR adds a feature to prevent users from creating a new account with a reserved username such as root, admin, system, proxy, info, etc...

Reserved usernames can be configured via the config file.

The administrator can create an account with a reserved username via the first setup screen or the control panel.

The existing account of reserved usernames will not be affected.

Co-authored-by: Namekuji <nmkj@mx.kazuno.co>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9917
Co-authored-by: Namekuji <nmkj@noreply.codeberg.org>
Co-committed-by: Namekuji <nmkj@noreply.codeberg.org>
---
 .config/example.yml                           | 19 ++++++++++++++++---
 packages/backend/src/config/types.ts          |  2 ++
 .../api/endpoints/username/available.ts       |  7 ++++++-
 .../backend/src/server/api/private/signup.ts  |  5 +++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index 3f0ce4031..8e881c187 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -79,8 +79,8 @@ redis:
 #  host: localhost
 #  port: 9200
 #  ssl: false
-#  user: 
-#  pass: 
+#  user:
+#  pass:
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
@@ -109,6 +109,19 @@ id: 'aid'
 # Maximum lenght of an image caption or file comment (default 1500, max 8192)
 #maxCaptionLength: 1500
 
+# Reserved usernames that only the administrator can register with
+reservedUsernames:
+  - root
+  - admin
+  - system
+  - test
+  - proxy
+  - relay
+  - mod
+  - moderator
+  - info
+  - information
+
 # Whether disable HSTS
 #disableHsts: true
 
@@ -211,4 +224,4 @@ id: 'aid'
 # !!!!!!!!!!
 
 # Seriously. Do NOT fill out the above settings if you're self-hosting.
-# They're much better off being set from the control panel. 
+# They're much better off being set from the control panel.
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index a7cdc89cf..4f367debe 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -77,6 +77,8 @@ export type Source = {
 		sha256CertFingerprints?: string[];
 	};
 
+	reservedUsernames?: string[];
+
 	// Managed hosting stuff
 	maxUserSignups?: number;
 	isManagedHosting?: boolean;
diff --git a/packages/backend/src/server/api/endpoints/username/available.ts b/packages/backend/src/server/api/endpoints/username/available.ts
index f5aa4ed1e..6fa09ba36 100644
--- a/packages/backend/src/server/api/endpoints/username/available.ts
+++ b/packages/backend/src/server/api/endpoints/username/available.ts
@@ -1,5 +1,6 @@
 import { IsNull } from "typeorm";
 import { Users, UsedUsernames } from "@/models/index.js";
+import config from "@/config/index.js";
 import define from "../../define.js";
 
 export const meta = {
@@ -40,7 +41,11 @@ export default define(meta, paramDef, async (ps) => {
 		username: ps.username.toLowerCase(),
 	});
 
+	const reserved = config.reservedUsernames?.includes(
+		ps.username.toLowerCase(),
+	);
+
 	return {
-		available: exist === 0 && exist2 === 0,
+		available: exist === 0 && exist2 === 0 && !reserved,
 	};
 });
diff --git a/packages/backend/src/server/api/private/signup.ts b/packages/backend/src/server/api/private/signup.ts
index 754d86c3b..d24a74c12 100644
--- a/packages/backend/src/server/api/private/signup.ts
+++ b/packages/backend/src/server/api/private/signup.ts
@@ -44,6 +44,11 @@ export default async (ctx: Koa.Context) => {
 	const invitationCode = body["invitationCode"];
 	const emailAddress = body["emailAddress"];
 
+	if (config.reservedUsernames?.includes(username.toLowerCase())) {
+		ctx.status = 400;
+		return;
+	}
+
 	if (instance.emailRequiredForSignup) {
 		if (emailAddress == null || typeof emailAddress !== "string") {
 			ctx.status = 400;

From 5d182895f0a158f8dee09ede04b5a0272ac09f8f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 14:19:55 -0700
Subject: [PATCH 547/582] Revert "chore: update summaly"

This reverts commit b60a3b509e6131ce8d29d7304dfa200c4b493e35.
---
 packages/backend/package.json |   2 +-
 pnpm-lock.yaml                | 249 ++++++++++++++++++++--------------
 2 files changed, 148 insertions(+), 103 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 442ef5e18..888eb9740 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -115,7 +115,7 @@
 		"sonic-channel": "^1.3.1",
 		"speakeasy": "2.0.0",
 		"stringz": "2.1.0",
-		"summaly": "github:misskey-dev/summaly",
+		"summaly": "2.7.0",
 		"syslog-pro": "1.0.0",
 		"systeminformation": "5.16.9",
 		"tesseract.js": "^3.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 270d18647..ed794b2af 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -348,8 +348,8 @@ importers:
         specifier: 2.1.0
         version: 2.1.0
       summaly:
-        specifier: github:misskey-dev/summaly
-        version: github.com/misskey-dev/summaly/c7d71a9ec2467268b3911dc2ac805c2b8a898d3e
+        specifier: 2.7.0
+        version: 2.7.0
       syslog-pro:
         specifier: 1.0.0
         version: 1.0.0
@@ -2564,7 +2564,6 @@ packages:
   /@sindresorhus/is@4.6.0:
     resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
     engines: {node: '>=10'}
-    dev: true
 
   /@sindresorhus/is@5.3.0:
     resolution: {integrity: sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==}
@@ -2741,7 +2740,6 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       defer-to-connect: 2.0.1
-    dev: true
 
   /@szmarczak/http-timer@5.0.1:
     resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==}
@@ -3049,7 +3047,6 @@ packages:
       '@types/keyv': 3.1.4
       '@types/node': 18.11.18
       '@types/responselike': 1.0.0
-    dev: true
 
   /@types/cbor@6.0.0:
     resolution: {integrity: sha512-mGQ1lbYOwVti5Xlarn1bTeBZqgY0kstsdjnkoEovgohYKdBjGejHyNGXHdMBeqyQazIv32Jjp33+5pBEaSRy2w==}
@@ -3260,7 +3257,6 @@ packages:
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
     dependencies:
       '@types/node': 18.11.18
-    dev: true
 
   /@types/koa-bodyparser@4.3.10:
     resolution: {integrity: sha512-6ae05pjhmrmGhUR8GYD5qr5p9LTEMEGfGXCsK8VaSL+totwigm8+H/7MHW7K4854CMeuwRAubT8qcc/EagaeIA==}
@@ -3523,7 +3519,6 @@ packages:
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
     dependencies:
       '@types/node': 18.11.18
-    dev: true
 
   /@types/sanitize-html@2.8.0:
     resolution: {integrity: sha512-Uih6caOm3DsBYnVGOYn0A9NoTNe1c4aPStmHC/YA2JrpP9kx//jzaRcIklFvSpvVQEcpl/ZCr4DgISSf/YxTvg==}
@@ -5068,7 +5063,6 @@ packages:
   /cacheable-lookup@5.0.4:
     resolution: {integrity: sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==}
     engines: {node: '>=10.6.0'}
-    dev: true
 
   /cacheable-lookup@7.0.0:
     resolution: {integrity: sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==}
@@ -5088,19 +5082,6 @@ packages:
       responselike: 3.0.0
     dev: false
 
-  /cacheable-request@10.2.9:
-    resolution: {integrity: sha512-CaAMr53AS1Tb9evO1BIWFnZjSr8A4pbXofpsNVWPMDZZj3ZQKHwsQG9BrTqQ4x5ZYJXz1T2b8LLtTZODxSpzbg==}
-    engines: {node: '>=14.16'}
-    dependencies:
-      '@types/http-cache-semantics': 4.0.1
-      get-stream: 6.0.1
-      http-cache-semantics: 4.1.1
-      keyv: 4.5.2
-      mimic-response: 4.0.0
-      normalize-url: 8.0.0
-      responselike: 3.0.0
-    dev: false
-
   /cacheable-request@7.0.2:
     resolution: {integrity: sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==}
     engines: {node: '>=8'}
@@ -5112,7 +5093,6 @@ packages:
       lowercase-keys: 2.0.0
       normalize-url: 6.1.0
       responselike: 2.0.1
-    dev: true
 
   /cachedir@2.3.0:
     resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==}
@@ -5291,28 +5271,26 @@ packages:
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /cheerio-select@2.1.0:
-    resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
+  /cheerio@0.22.0:
+    resolution: {integrity: sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==}
+    engines: {node: '>= 0.6'}
     dependencies:
-      boolbase: 1.0.0
-      css-select: 5.1.0
-      css-what: 6.1.0
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-      domutils: 3.0.1
-    dev: false
-
-  /cheerio@1.0.0-rc.12:
-    resolution: {integrity: sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==}
-    engines: {node: '>= 6'}
-    dependencies:
-      cheerio-select: 2.1.0
-      dom-serializer: 2.0.0
-      domhandler: 5.0.3
-      domutils: 3.0.1
-      htmlparser2: 8.0.1
-      parse5: 7.1.2
-      parse5-htmlparser2-tree-adapter: 7.0.0
+      css-select: 1.2.0
+      dom-serializer: 0.1.1
+      entities: 1.1.2
+      htmlparser2: 3.10.1
+      lodash.assignin: 4.2.0
+      lodash.bind: 4.2.1
+      lodash.defaults: 4.2.0
+      lodash.filter: 4.6.0
+      lodash.flatten: 4.4.0
+      lodash.foreach: 4.5.0
+      lodash.map: 4.6.0
+      lodash.merge: 4.6.2
+      lodash.pick: 4.4.0
+      lodash.reduce: 4.6.0
+      lodash.reject: 4.6.0
+      lodash.some: 4.6.0
     dev: false
 
   /chokidar@3.5.3:
@@ -5466,7 +5444,6 @@ packages:
     resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}
     dependencies:
       mimic-response: 1.0.1
-    dev: true
 
   /clone-stats@1.0.0:
     resolution: {integrity: sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==}
@@ -6013,19 +5990,17 @@ packages:
     resolution: {integrity: sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==}
     dev: true
 
-  /css-select@5.1.0:
-    resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==}
+  /css-select@1.2.0:
+    resolution: {integrity: sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==}
     dependencies:
       boolbase: 1.0.0
-      css-what: 6.1.0
-      domhandler: 5.0.3
-      domutils: 3.0.1
-      nth-check: 2.1.1
+      css-what: 2.1.3
+      domutils: 1.5.1
+      nth-check: 1.0.2
     dev: false
 
-  /css-what@6.1.0:
-    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
-    engines: {node: '>= 6'}
+  /css-what@2.1.3:
+    resolution: {integrity: sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==}
     dev: false
 
   /cssnano@3.10.0:
@@ -6225,6 +6200,18 @@ packages:
       ms: 2.1.3
       supports-color: 8.1.1
 
+  /debug@4.3.3:
+    resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.1.2
+    dev: false
+
   /debug@4.3.4(supports-color@8.1.1):
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
@@ -6439,6 +6426,13 @@ packages:
   /doctypes@1.1.0:
     resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==}
 
+  /dom-serializer@0.1.1:
+    resolution: {integrity: sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==}
+    dependencies:
+      domelementtype: 1.3.1
+      entities: 1.1.2
+    dev: false
+
   /dom-serializer@2.0.0:
     resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
     dependencies:
@@ -6452,6 +6446,10 @@ packages:
       ssr-window: 4.0.2
     dev: true
 
+  /domelementtype@1.3.1:
+    resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
+    dev: false
+
   /domelementtype@2.3.0:
     resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
 
@@ -6469,12 +6467,32 @@ packages:
       webidl-conversions: 7.0.0
     dev: false
 
+  /domhandler@2.4.2:
+    resolution: {integrity: sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==}
+    dependencies:
+      domelementtype: 1.3.1
+    dev: false
+
   /domhandler@5.0.3:
     resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
     engines: {node: '>= 4'}
     dependencies:
       domelementtype: 2.3.0
 
+  /domutils@1.5.1:
+    resolution: {integrity: sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==}
+    dependencies:
+      dom-serializer: 0.1.1
+      domelementtype: 1.3.1
+    dev: false
+
+  /domutils@1.7.0:
+    resolution: {integrity: sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==}
+    dependencies:
+      dom-serializer: 0.1.1
+      domelementtype: 1.3.1
+    dev: false
+
   /domutils@3.0.1:
     resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
     dependencies:
@@ -6599,6 +6617,10 @@ packages:
       ansi-colors: 4.1.3
     dev: true
 
+  /entities@1.1.2:
+    resolution: {integrity: sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==}
+    dev: false
+
   /entities@2.2.0:
     resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
     dev: false
@@ -7700,7 +7722,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       pump: 3.0.0
-    dev: true
 
   /get-stream@6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
@@ -7900,7 +7921,6 @@ packages:
       lowercase-keys: 2.0.0
       p-cancelable: 2.1.1
       responselike: 2.0.1
-    dev: true
 
   /got@12.5.3:
     resolution: {integrity: sha512-8wKnb9MGU8IPGRIo+/ukTy9XLJBwDiCpIf5TVzQ9Cpol50eMTpBq2GAuDsuDIz7hTYmZgMgC1e9ydr6kSDWs3w==}
@@ -7919,23 +7939,6 @@ packages:
       responselike: 3.0.0
     dev: false
 
-  /got@12.6.0:
-    resolution: {integrity: sha512-WTcaQ963xV97MN3x0/CbAriXFZcXCfgxVp91I+Ze6pawQOa7SgzwSx2zIJJsX+kTajMnVs0xcFD1TxZKFqhdnQ==}
-    engines: {node: '>=14.16'}
-    dependencies:
-      '@sindresorhus/is': 5.3.0
-      '@szmarczak/http-timer': 5.0.1
-      cacheable-lookup: 7.0.0
-      cacheable-request: 10.2.9
-      decompress-response: 6.0.0
-      form-data-encoder: 2.1.4
-      get-stream: 6.0.1
-      http2-wrapper: 2.2.0
-      lowercase-keys: 3.0.0
-      p-cancelable: 3.0.0
-      responselike: 3.0.0
-    dev: false
-
   /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
@@ -8195,6 +8198,17 @@ packages:
     resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
     dev: true
 
+  /htmlparser2@3.10.1:
+    resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
+    dependencies:
+      domelementtype: 1.3.1
+      domhandler: 2.4.2
+      domutils: 1.7.0
+      entities: 1.1.2
+      inherits: 2.0.4
+      readable-stream: 3.6.0
+    dev: false
+
   /htmlparser2@8.0.1:
     resolution: {integrity: sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==}
     dependencies:
@@ -8294,7 +8308,6 @@ packages:
     dependencies:
       quick-lru: 5.1.1
       resolve-alpn: 1.2.1
-    dev: true
 
   /http2-wrapper@2.2.0:
     resolution: {integrity: sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==}
@@ -10171,6 +10184,14 @@ packages:
     dependencies:
       p-locate: 5.0.0
 
+  /lodash.assignin@4.2.0:
+    resolution: {integrity: sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==}
+    dev: false
+
+  /lodash.bind@4.2.1:
+    resolution: {integrity: sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==}
+    dev: false
+
   /lodash.defaults@4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
 
@@ -10178,10 +10199,18 @@ packages:
     resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
     dev: false
 
+  /lodash.filter@4.6.0:
+    resolution: {integrity: sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==}
+    dev: false
+
   /lodash.flatten@4.4.0:
     resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
     dev: false
 
+  /lodash.foreach@4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get@4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
@@ -10200,6 +10229,10 @@ packages:
     resolution: {integrity: sha512-VlV0abdYZs5asSYW1JW5W1f6gxf2SGQt90rzQp7UNTQ8KwcB3CprZe5crN1LIlCA/fB5R9xecrZijGSELJL8Yg==}
     dev: false
 
+  /lodash.map@4.6.0:
+    resolution: {integrity: sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==}
+    dev: false
+
   /lodash.memoize@4.1.2:
     resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
     dev: true
@@ -10211,6 +10244,22 @@ packages:
     resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
     dev: true
 
+  /lodash.pick@4.4.0:
+    resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==}
+    dev: false
+
+  /lodash.reduce@4.6.0:
+    resolution: {integrity: sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==}
+    dev: false
+
+  /lodash.reject@4.6.0:
+    resolution: {integrity: sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==}
+    dev: false
+
+  /lodash.some@4.6.0:
+    resolution: {integrity: sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==}
+    dev: false
+
   /lodash.union@4.6.0:
     resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
     dev: false
@@ -10247,7 +10296,6 @@ packages:
   /lowercase-keys@2.0.0:
     resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}
     engines: {node: '>=8'}
-    dev: true
 
   /lowercase-keys@3.0.0:
     resolution: {integrity: sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==}
@@ -10486,7 +10534,6 @@ packages:
   /mimic-response@1.0.1:
     resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
     engines: {node: '>=4'}
-    dev: true
 
   /mimic-response@3.1.0:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
@@ -11009,7 +11056,6 @@ packages:
   /normalize-url@6.1.0:
     resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==}
     engines: {node: '>=10'}
-    dev: true
 
   /normalize-url@8.0.0:
     resolution: {integrity: sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==}
@@ -11072,8 +11118,8 @@ packages:
       '@tensorflow/tfjs': 4.2.0(seedrandom@3.0.5)
     dev: false
 
-  /nth-check@2.1.1:
-    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
+  /nth-check@1.0.2:
+    resolution: {integrity: sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==}
     dependencies:
       boolbase: 1.0.0
     dev: false
@@ -11279,7 +11325,6 @@ packages:
   /p-cancelable@2.1.1:
     resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
     engines: {node: '>=8'}
-    dev: true
 
   /p-cancelable@3.0.0:
     resolution: {integrity: sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==}
@@ -11406,13 +11451,6 @@ packages:
       parse5: 6.0.1
     dev: false
 
-  /parse5-htmlparser2-tree-adapter@7.0.0:
-    resolution: {integrity: sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==}
-    dependencies:
-      domhandler: 5.0.3
-      parse5: 7.1.2
-    dev: false
-
   /parse5@5.1.1:
     resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==}
     dev: false
@@ -12625,6 +12663,11 @@ packages:
       uuid: 3.4.0
     dev: false
 
+  /require-all@3.0.0:
+    resolution: {integrity: sha512-jPGN876lc5exWYrMcgZSd7U42P0PmVQzxnQB13fCSzmyGnqQWW4WUz5DosZ/qe24hz+5o9lSvW2epBNZ1xa6Fw==}
+    engines: {node: '>= 0.8'}
+    dev: false
+
   /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -12720,7 +12763,6 @@ packages:
     resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}
     dependencies:
       lowercase-keys: 2.0.0
-    dev: true
 
   /responselike@3.0.0:
     resolution: {integrity: sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==}
@@ -13506,6 +13548,24 @@ packages:
       '@tokenizer/token': 0.3.0
       peek-readable: 5.0.0
 
+  /summaly@2.7.0:
+    resolution: {integrity: sha512-pEz9LL8Gp0oPIQfn6TrnBCcv/HkFE14hxhH3W6LPGdopXlPXjRcMlDMJaO+VupUNMOGaMjCsjq7+0rWnu8sp7w==}
+    dependencies:
+      cheerio: 0.22.0
+      debug: 4.3.3
+      escape-regexp: 0.0.1
+      got: 11.8.5
+      html-entities: 2.3.2
+      iconv-lite: 0.6.3
+      jschardet: 3.0.0
+      koa: 2.13.4
+      private-ip: 2.3.3
+      require-all: 3.0.0
+      trace-redirect: 1.0.6
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /supports-color@2.0.0:
     resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}
     engines: {node: '>=0.8.0'}
@@ -15321,21 +15381,6 @@ packages:
     version: 2.2.1-misskey.3
     dev: true
 
-  github.com/misskey-dev/summaly/c7d71a9ec2467268b3911dc2ac805c2b8a898d3e:
-    resolution: {tarball: https://codeload.github.com/misskey-dev/summaly/tar.gz/c7d71a9ec2467268b3911dc2ac805c2b8a898d3e}
-    name: summaly
-    version: 4.0.2
-    dependencies:
-      cheerio: 1.0.0-rc.12
-      escape-regexp: 0.0.1
-      got: 12.6.0
-      html-entities: 2.3.2
-      iconv-lite: 0.6.3
-      jschardet: 3.0.0
-      private-ip: 2.3.3
-      trace-redirect: 1.0.6
-    dev: false
-
   github.com/sampotts/plyr/d434c9af16e641400aaee93188594208d88f2658:
     resolution: {tarball: https://codeload.github.com/sampotts/plyr/tar.gz/d434c9af16e641400aaee93188594208d88f2658}
     name: plyr

From fdcbf868237c335d7055111155d354aad482b7fd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 14:20:27 -0700
Subject: [PATCH 548/582] chore: formatting

---
 packages/client/src/components/MkHeatmap.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkHeatmap.vue b/packages/client/src/components/MkHeatmap.vue
index 7b1c2f7ed..2d2aef227 100644
--- a/packages/client/src/components/MkHeatmap.vue
+++ b/packages/client/src/components/MkHeatmap.vue
@@ -43,7 +43,10 @@ const { handler: externalTooltipHandler } = useChartTooltip({
 	position: "middle",
 });
 
-const addArrays = (arr1: number[], arr2: number[], arr3: number[]) => (arr1.length === arr2.length && arr2.length === arr3.length) ? arr1.map((val, i) => val + arr2[i] + arr3[i]) : null;
+const addArrays = (arr1: number[], arr2: number[], arr3: number[]) =>
+	arr1.length === arr2.length && arr2.length === arr3.length
+		? arr1.map((val, i) => val + arr2[i] + arr3[i])
+		: null;
 
 async function renderChart() {
 	if (chartInstance) {

From 488175be2f9ddc2b0dff0f0b582a1c733bbb77d9 Mon Sep 17 00:00:00 2001
From: yawhn <yawhn@noreply.codeberg.org>
Date: Wed, 26 Apr 2023 21:38:44 +0000
Subject: [PATCH 549/582] Fix: Inline Ads bug (#9922)

This PR fixes this issue: https://codeberg.org/calckey/calckey/issues/9747

Co-authored-by: ThatOneCalculator <kainoa@t1c.dev>
Co-authored-by: yawhn <kordaris@gmail.com>
Co-authored-by: Otto Richter <otto@codeberg.org>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9922
Co-authored-by: yawhn <yawhn@noreply.codeberg.org>
Co-committed-by: yawhn <yawhn@noreply.codeberg.org>
---
 packages/client/src/components/MkDateSeparatedList.vue | 2 +-
 packages/client/src/pages/gallery/post.vue             | 2 +-
 packages/client/src/pages/page.vue                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/MkDateSeparatedList.vue b/packages/client/src/components/MkDateSeparatedList.vue
index 29c7c518a..7ecc91808 100644
--- a/packages/client/src/components/MkDateSeparatedList.vue
+++ b/packages/client/src/components/MkDateSeparatedList.vue
@@ -95,7 +95,7 @@ export default defineComponent({
 							h(MkAd, {
 								class: "a", // advertiseの意(ブロッカー対策)
 								key: item.id + ":ad",
-								prefer: ["horizontal", "horizontal-big"],
+								prefer: ["inline", "inline-big"],
 							}),
 							el,
 						];
diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue
index 8eb104624..9a48a5e67 100644
--- a/packages/client/src/pages/gallery/post.vue
+++ b/packages/client/src/pages/gallery/post.vue
@@ -111,7 +111,7 @@
 								/>
 							</div>
 						</div>
-						<MkAd :prefer="['horizontal', 'horizontal-big']" />
+						<MkAd :prefer="['inline', 'inline-big']" />
 						<MkContainer
 							:max-height="300"
 							:foldable="true"
diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue
index d5d7d5bf8..57e963a9b 100644
--- a/packages/client/src/pages/page.vue
+++ b/packages/client/src/pages/page.vue
@@ -168,7 +168,7 @@
 						</template>
 					</div> -->
 					</div>
-					<MkAd :prefer="['horizontal', 'horizontal-big']" />
+					<MkAd :prefer="['inline', 'inline-big']" />
 					<MkContainer
 						:max-height="300"
 						:foldable="true"

From 0a5501ab1ae87c5079f7bd9d068a34cb609469a1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 15:10:33 -0700
Subject: [PATCH 550/582] chore: more rpine for server activity widget

---
 .../client/src/widgets/server-metric/cpu-mem.vue     |  8 ++++----
 packages/client/src/widgets/server-metric/net.vue    | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/widgets/server-metric/cpu-mem.vue b/packages/client/src/widgets/server-metric/cpu-mem.vue
index 76ef290f6..ec2101bd8 100644
--- a/packages/client/src/widgets/server-metric/cpu-mem.vue
+++ b/packages/client/src/widgets/server-metric/cpu-mem.vue
@@ -3,8 +3,8 @@
 		<svg :viewBox="`0 0 ${viewBoxX} ${viewBoxY}`">
 			<defs>
 				<linearGradient :id="cpuGradientId" x1="0" x2="0" y1="1" y2="0">
-					<stop offset="0%" stop-color="hsl(180, 80%, 70%)"></stop>
-					<stop offset="100%" stop-color="hsl(0, 80%, 70%)"></stop>
+					<stop offset="0%" stop-color="hsl(189, 43%, 73%)"></stop>
+					<stop offset="100%" stop-color="hsl(343, 76%, 68%)"></stop>
 				</linearGradient>
 				<mask
 					:id="cpuMaskId"
@@ -42,8 +42,8 @@
 		<svg :viewBox="`0 0 ${viewBoxX} ${viewBoxY}`">
 			<defs>
 				<linearGradient :id="memGradientId" x1="0" x2="0" y1="1" y2="0">
-					<stop offset="0%" stop-color="hsl(180, 80%, 70%)"></stop>
-					<stop offset="100%" stop-color="hsl(0, 80%, 70%)"></stop>
+					<stop offset="0%" stop-color="hsl(189, 43%, 73%)"></stop>
+					<stop offset="100%" stop-color="hsl(343, 76%, 68%)"></stop>
 				</linearGradient>
 				<mask
 					:id="memMaskId"
diff --git a/packages/client/src/widgets/server-metric/net.vue b/packages/client/src/widgets/server-metric/net.vue
index 648880c24..9885d7a33 100644
--- a/packages/client/src/widgets/server-metric/net.vue
+++ b/packages/client/src/widgets/server-metric/net.vue
@@ -3,16 +3,16 @@
 		<svg :viewBox="`0 0 ${viewBoxX} ${viewBoxY}`">
 			<polygon
 				:points="inPolygonPoints"
-				fill="#94a029"
+				fill="#f6c177"
 				fill-opacity="0.5"
 			/>
 			<polyline
 				:points="inPolylinePoints"
 				fill="none"
-				stroke="#94a029"
+				stroke="#f6c177"
 				stroke-width="1"
 			/>
-			<circle :cx="inHeadX" :cy="inHeadY" r="1.5" fill="#94a029" />
+			<circle :cx="inHeadX" :cy="inHeadY" r="1.5" fill="#f6c177" />
 			<text x="1" y="5">
 				NET rx
 				<tspan>{{ bytes(inRecent) }}</tspan>
@@ -21,16 +21,16 @@
 		<svg :viewBox="`0 0 ${viewBoxX} ${viewBoxY}`">
 			<polygon
 				:points="outPolygonPoints"
-				fill="#ff9156"
+				fill="#31748f"
 				fill-opacity="0.5"
 			/>
 			<polyline
 				:points="outPolylinePoints"
 				fill="none"
-				stroke="#ff9156"
+				stroke="#31748f"
 				stroke-width="1"
 			/>
-			<circle :cx="outHeadX" :cy="outHeadY" r="1.5" fill="#ff9156" />
+			<circle :cx="outHeadX" :cy="outHeadY" r="1.5" fill="#31748f" />
 			<text x="1" y="5">
 				NET tx
 				<tspan>{{ bytes(outRecent) }}</tspan>

From 04db6c14c5814938df50880f13be424f250988cc Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 15:50:28 -0700
Subject: [PATCH 551/582] chore: update examples

---
 .config/example.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index 8e881c187..4b4eea58a 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -113,14 +113,9 @@ id: 'aid'
 reservedUsernames:
   - root
   - admin
+  - administrator
+  - me
   - system
-  - test
-  - proxy
-  - relay
-  - mod
-  - moderator
-  - info
-  - information
 
 # Whether disable HSTS
 #disableHsts: true

From 7571f461ff2eadfc049de8ef8b072cecb5e9f4f1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 17:20:54 -0700
Subject: [PATCH 552/582] update patrons

---
 patrons.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/patrons.json b/patrons.json
index 9e1e5e00b..aedb30ab3 100644
--- a/patrons.json
+++ b/patrons.json
@@ -23,6 +23,7 @@
 		"@cody@mk.codingneko.com",
 		"@kate@blahaj.zone",
 		"@emtk@mkkey.net",
+		"@jovikowi@calckey.social"
 		"Interkosmos Link"
 	]
 }

From 99fe60b133113166e7240294dd28567d2e9165a5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 17:24:58 -0700
Subject: [PATCH 553/582] comma!

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

diff --git a/patrons.json b/patrons.json
index aedb30ab3..06eb7f913 100644
--- a/patrons.json
+++ b/patrons.json
@@ -23,7 +23,7 @@
 		"@cody@mk.codingneko.com",
 		"@kate@blahaj.zone",
 		"@emtk@mkkey.net",
-		"@jovikowi@calckey.social"
+		"@jovikowi@calckey.social",
 		"Interkosmos Link"
 	]
 }

From 79c9fe441ded3ae159e2f6ece0b05bf11d2a551d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 17:26:12 -0700
Subject: [PATCH 554/582] more patrons!

---
 patrons.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/patrons.json b/patrons.json
index 06eb7f913..bdc09a4d2 100644
--- a/patrons.json
+++ b/patrons.json
@@ -24,6 +24,7 @@
 		"@kate@blahaj.zone",
 		"@emtk@mkkey.net",
 		"@jovikowi@calckey.social",
+		"@padraig@calckey.social",
 		"Interkosmos Link"
 	]
 }

From 3550070c4b654e8c2bfcbf67086c27dc73abbdd6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 18:30:25 -0700
Subject: [PATCH 555/582] patrons

---
 patrons.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/patrons.json b/patrons.json
index bdc09a4d2..979fa3d8d 100644
--- a/patrons.json
+++ b/patrons.json
@@ -25,6 +25,7 @@
 		"@emtk@mkkey.net",
 		"@jovikowi@calckey.social",
 		"@padraig@calckey.social",
+		"@pancakes@cats.city",
 		"Interkosmos Link"
 	]
 }

From a39c6d50c0937ab5382de10f91e7209b93bc9a23 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 19:02:38 -0700
Subject: [PATCH 556/582] notes -> posts

---
 packages/client/src/pages/admin/overview.heatmap.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/admin/overview.heatmap.vue b/packages/client/src/pages/admin/overview.heatmap.vue
index 1a4984ba7..e926fdc53 100644
--- a/packages/client/src/pages/admin/overview.heatmap.vue
+++ b/packages/client/src/pages/admin/overview.heatmap.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="_panel" :class="$style.root">
 		<MkSelect v-model="src" style="margin: 0 0 12px 0" small>
-			<option value="notes">Notes</option>
+			<option value="notes">Posts</option>
 			<option value="active-users">Active users</option>
 			<option value="ap-requests-inbox-received">
 				Fediverse Requests: inboxReceived

From ab61c62f54101a708a173d0ef1bc4c04c6bc3174 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 19:44:38 -0700
Subject: [PATCH 557/582] feat: :sparkles: frontend interface for post-account
 creation email verification

---
 .../src/server/api/private/verify-email.ts    | 40 +++++++++++++++++++
 packages/backend/src/server/index.ts          | 34 ----------------
 packages/client/src/pages/signup-complete.vue |  2 -
 packages/client/src/pages/verify-email.vue    | 35 ++++++++++++++++
 packages/client/src/router.ts                 |  4 ++
 5 files changed, 79 insertions(+), 36 deletions(-)
 create mode 100644 packages/backend/src/server/api/private/verify-email.ts
 create mode 100644 packages/client/src/pages/verify-email.vue

diff --git a/packages/backend/src/server/api/private/verify-email.ts b/packages/backend/src/server/api/private/verify-email.ts
new file mode 100644
index 000000000..a5cc8d0a0
--- /dev/null
+++ b/packages/backend/src/server/api/private/verify-email.ts
@@ -0,0 +1,40 @@
+import type Koa from "koa";
+import { Users, UserProfiles } from "@/models/index.js";
+import { publishMainStream } from "@/services/stream.js";
+
+export default async (ctx: Koa.Context) => {
+	const body = ctx.request.body;
+
+	const code = body["code"];
+
+	const profile = await UserProfiles.findOneBy({
+		emailVerifyCode: ctx.params.code,
+	});
+
+	if (profile != null) {
+		ctx.body = "Verify succeeded!";
+
+		await UserProfiles.update(
+			{ userId: profile.userId },
+			{
+				emailVerified: true,
+				emailVerifyCode: null,
+			},
+		);
+
+		publishMainStream(
+			profile.userId,
+			"meUpdated",
+			await Users.pack(
+				profile.userId,
+				{ id: profile.userId },
+				{
+					detail: true,
+					includeSecrets: true,
+				},
+			),
+		);
+	} else {
+		ctx.throw(404);
+	}
+};
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 7d274f7d2..cd1425d6a 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -127,40 +127,6 @@ router.get("/identicon/:x", async (ctx) => {
 	ctx.body = fs.createReadStream(temp).on("close", () => cleanup());
 });
 
-router.get("/verify-email/:code", async (ctx) => {
-	const profile = await UserProfiles.findOneBy({
-		emailVerifyCode: ctx.params.code,
-	});
-
-	if (profile != null) {
-		ctx.body = "Verify succeeded!";
-		ctx.status = 200;
-
-		await UserProfiles.update(
-			{ userId: profile.userId },
-			{
-				emailVerified: true,
-				emailVerifyCode: null,
-			},
-		);
-
-		publishMainStream(
-			profile.userId,
-			"meUpdated",
-			await Users.pack(
-				profile.userId,
-				{ id: profile.userId },
-				{
-					detail: true,
-					includeSecrets: true,
-				},
-			),
-		);
-	} else {
-		ctx.status = 404;
-	}
-});
-
 mastoRouter.get("/oauth/authorize", async (ctx) => {
 	const { client_id, state, redirect_uri } = ctx.request.query;
 	console.log(ctx.request.req);
diff --git a/packages/client/src/pages/signup-complete.vue b/packages/client/src/pages/signup-complete.vue
index db06799ba..deb1f7846 100644
--- a/packages/client/src/pages/signup-complete.vue
+++ b/packages/client/src/pages/signup-complete.vue
@@ -35,5 +35,3 @@ definePageMetadata({
 	icon: "ph-user ph-bold ph-lg",
 });
 </script>
-
-<style lang="scss" scoped></style>
diff --git a/packages/client/src/pages/verify-email.vue b/packages/client/src/pages/verify-email.vue
new file mode 100644
index 000000000..43923cb1e
--- /dev/null
+++ b/packages/client/src/pages/verify-email.vue
@@ -0,0 +1,35 @@
+<template>
+	<div>
+		{{ i18n.ts.processing }}
+	</div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted } from "vue";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+
+const props = defineProps<{
+	code: string;
+}>();
+
+onMounted(async () => {
+	await os.alert({
+		type: "info",
+		text: i18n.t("clickToFinishEmailVerification", { ok: i18n.ts.gotIt }),
+	});
+	await os.apiWithDialog("verify-email", {
+		code: props.code,
+	});
+});
+
+const headerActions = $computed(() => []);
+
+const headerTabs = $computed(() => []);
+
+definePageMetadata({
+	title: "Verify email",
+	icon: "ph-user ph-bold ph-lg",
+});
+</script>
diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts
index a76c322bf..16a056de9 100644
--- a/packages/client/src/router.ts
+++ b/packages/client/src/router.ts
@@ -283,6 +283,10 @@ export const routes = [
 		path: "/signup-complete/:code",
 		component: page(() => import("./pages/signup-complete.vue")),
 	},
+	{
+		path: "/verify-email/:code",
+		component: page(() => import("./pages/verify-email.vue")),
+	},
 	{
 		path: "/announcements",
 		component: page(() => import("./pages/announcements.vue")),

From 8b32566678ea53f520244d223fb5d8101f829cc2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 19:45:46 -0700
Subject: [PATCH 558/582] dev38

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

diff --git a/package.json b/package.json
index 955e68792..1f3b0e1a4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev37",
+	"version": "13.2.0-dev38",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 36aef5a063e1aa67dedc8db31660fd81a5f725f3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 19:51:25 -0700
Subject: [PATCH 559/582] fix: add route

---
 packages/backend/src/server/api/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index b8e423165..06b3ea4ef 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -20,6 +20,7 @@ import handler from "./api-handler.js";
 import signup from "./private/signup.js";
 import signin from "./private/signin.js";
 import signupPending from "./private/signup-pending.js";
+import verifyEmail from "./private/verify-email.js";
 import discord from "./service/discord.js";
 import github from "./service/github.js";
 import twitter from "./service/twitter.js";
@@ -177,6 +178,7 @@ for (const endpoint of [...endpoints, ...compatibility]) {
 router.post("/signup", signup);
 router.post("/signin", signin);
 router.post("/signup-pending", signupPending);
+router.post("/verify-email", verifyEmail);
 
 router.use(discord.routes());
 router.use(github.routes());

From e4ca9590bd3d145e91ba54b24ad2ce4a9d213851 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 19:58:26 -0700
Subject: [PATCH 560/582] fix?

---
 packages/backend/src/server/api/private/verify-email.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/private/verify-email.ts b/packages/backend/src/server/api/private/verify-email.ts
index a5cc8d0a0..e6c8295d1 100644
--- a/packages/backend/src/server/api/private/verify-email.ts
+++ b/packages/backend/src/server/api/private/verify-email.ts
@@ -7,9 +7,7 @@ export default async (ctx: Koa.Context) => {
 
 	const code = body["code"];
 
-	const profile = await UserProfiles.findOneBy({
-		emailVerifyCode: ctx.params.code,
-	});
+	const profile = await UserProfiles.findOneByOrFail({ emailVerifyCode: code });
 
 	if (profile != null) {
 		ctx.body = "Verify succeeded!";

From e171cbdcbf77cd7f64cedc25fb6ffe835f13a854 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 20:03:04 -0700
Subject: [PATCH 561/582] mfw

---
 packages/client/src/pages/verify-email.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/verify-email.vue b/packages/client/src/pages/verify-email.vue
index 43923cb1e..ed1016fe7 100644
--- a/packages/client/src/pages/verify-email.vue
+++ b/packages/client/src/pages/verify-email.vue
@@ -19,9 +19,10 @@ onMounted(async () => {
 		type: "info",
 		text: i18n.t("clickToFinishEmailVerification", { ok: i18n.ts.gotIt }),
 	});
-	await os.apiWithDialog("verify-email", {
+	await os.api("verify-email", {
 		code: props.code,
 	});
+	window.location.href = "/";
 });
 
 const headerActions = $computed(() => []);

From 3c5fbb7b0b3bdaf445b190c29b01012533b7b12e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 20:04:58 -0700
Subject: [PATCH 562/582] try to fix email style...

---
 packages/backend/src/services/send-email.ts | 25 ++++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/services/send-email.ts b/packages/backend/src/services/send-email.ts
index 4c442a168..f24269d9b 100644
--- a/packages/backend/src/services/send-email.ts
+++ b/packages/backend/src/services/send-email.ts
@@ -34,16 +34,7 @@ export async function sendEmail(
 
 	try {
 		// TODO: htmlサニタイズ
-		const info = await transporter.sendMail({
-			from: meta.email!,
-			to: to,
-			subject: subject,
-			text: text,
-			html: `<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title>${subject}</title>
+		const style = `
 		<style>
 			html {
 				background: #191724;
@@ -101,9 +92,21 @@ export async function sendEmail(
 				nav > a {
 					color: #6e6a86;
 				}
-		</style>
+		</style>`
+		const info = await transporter.sendMail({
+			from: meta.email!,
+			to: to,
+			subject: subject,
+			text: text,
+			html: `<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>${subject}</title>
+		${style}
 	</head>
 	<body>
+		${style}
 		<main>
 			<header>
 				<img src="${meta.logoImageUrl || meta.iconUrl || iconUrl}" height="100"/>

From 4ae131cc09b26baa897d37e7c0e4dc1c10ac26e0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 20:10:42 -0700
Subject: [PATCH 563/582] im dumb

---
 packages/client/src/pages/verify-email.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/verify-email.vue b/packages/client/src/pages/verify-email.vue
index ed1016fe7..b5830aec4 100644
--- a/packages/client/src/pages/verify-email.vue
+++ b/packages/client/src/pages/verify-email.vue
@@ -9,6 +9,9 @@ import { onMounted } from "vue";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
+import { useRouter } from "@/router";
+
+const router = useRouter();
 
 const props = defineProps<{
 	code: string;
@@ -22,7 +25,7 @@ onMounted(async () => {
 	await os.api("verify-email", {
 		code: props.code,
 	});
-	window.location.href = "/";
+	router.push("/");
 });
 
 const headerActions = $computed(() => []);

From 7d48709b406e0e822cc9c678c72f994e929ccbbd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 20:21:30 -0700
Subject: [PATCH 564/582] fix: style email with inline styles

---
 packages/backend/src/services/send-email.ts | 82 +++------------------
 1 file changed, 10 insertions(+), 72 deletions(-)

diff --git a/packages/backend/src/services/send-email.ts b/packages/backend/src/services/send-email.ts
index f24269d9b..7647b0db4 100644
--- a/packages/backend/src/services/send-email.ts
+++ b/packages/backend/src/services/send-email.ts
@@ -33,66 +33,6 @@ export async function sendEmail(
 	} as any);
 
 	try {
-		// TODO: htmlサニタイズ
-		const style = `
-		<style>
-			html {
-				background: #191724;
-			}
-
-			body {
-				padding: 16px;
-				margin: 0;
-				font-family: sans-serif;
-				font-size: 14px;
-			}
-
-			a {
-				text-decoration: none;
-				color: #31748f;
-			}
-			a:hover {
-				text-decoration: underline;
-			}
-
-			main {
-				max-width: 500px;
-				margin: 0 auto;
-				background: #1f1d2e;
-				color: #e0def4;
-			}
-				main > header {
-					padding: 32px;
-					background: #31748f;
-					display: flex;
-				}
-					main > header > img {
-						max-width: 128px;
-						max-height: 72px;
-						vertical-align: bottom;
-						margin-right: 16px;
-					}
-				main > article {
-					padding: 32px;
-				}
-					main > article > h1 {
-						margin: 0 0 1em 0;
-					}
-				main > footer {
-					padding: 32px;
-					border-top: solid 1px #26233a;
-				}
-
-			nav {
-				box-sizing: border-box;
-				max-width: 500px;
-				margin: 16px auto 0 auto;
-				padding: 0 32px;
-			}
-				nav > a {
-					color: #6e6a86;
-				}
-		</style>`
 		const info = await transporter.sendMail({
 			from: meta.email!,
 			to: to,
@@ -103,25 +43,23 @@ export async function sendEmail(
 	<head>
 		<meta charset="utf-8">
 		<title>${subject}</title>
-		${style}
 	</head>
-	<body>
-		${style}
-		<main>
-			<header>
-				<img src="${meta.logoImageUrl || meta.iconUrl || iconUrl}" height="100"/>
-				<h1>${meta.name}</h1>
+	<body style="background: #191724; padding: 16px; margin: 0; font-family: sans-serif; font-size: 14px;">
+		<main style="max-width: 500px; margin: 0 auto; background: #1f1d2e; color: #e0def4;">
+			<header style="padding: 32px; background: #31748f; display: flex;">
+				<img src="${meta.logoImageUrl || meta.iconUrl || iconUrl}" style="max-width: 128px; max-height: 72px; vertical-align: bottom; margin-right: 16px;"/>
+				<h1 style="margin: 0 0 1em 0;">${meta.name}</h1>
 			</header>
-			<article>
+			<article style="padding: 32px;">
 				<h1>${subject}</h1>
 				<div>${html}</div>
 			</article>
-			<footer>
-				<a href="${emailSettingUrl}">${"Email setting"}</a>
+			<footer style="padding: 32px; border-top: solid 1px #26233a;">
+				<a href="${emailSettingUrl}" style="color: #31748f !important;">${"Email setting"}</a>
 			</footer>
 		</main>
-		<nav>
-			<a href="${config.url}">${config.host}</a>
+		<nav style="box-sizing: border-box; max-width: 500px; margin: 16px auto 0 auto; padding: 0 32px;">
+			<a href="${config.url}" style="color: #6e6a86 !important;">${config.host}</a>
 		</nav>
 	</body>
 </html>`,

From 5b7ea542c793430d1e4cb2f120f2e0af03b361f9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 26 Apr 2023 21:07:40 -0700
Subject: [PATCH 565/582] add kaiteki to example proxyBypassHosts

---
 .config/example.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.config/example.yml b/.config/example.yml
index 4b4eea58a..9d20e44a0 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -147,6 +147,7 @@ reservedUsernames:
 #proxy: http://127.0.0.1:3128
 
 #proxyBypassHosts: [
+#  'web.kaiteki.app',
 #  'example.com',
 #  '192.0.2.8'
 #]

From bc00184399e31c1f7d15d88c4082d0310eb3dacc Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 27 Apr 2023 01:08:28 -0700
Subject: [PATCH 566/582] refactor: change import type to radio

---
 .../client/src/pages/settings/import-export.vue    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index 18fcc0400..38afe798a 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -21,9 +21,15 @@
 				<template #icon
 					><i class="ph-upload-simple ph-bold ph-lg"></i
 				></template>
-				<FormSwitch v-model="signatureCheck" class="_formBlock">
+				<!-- <FormSwitch v-model="signatureCheck" class="_formBlock">
 					Mastodon import? (not Akkoma!)
-				</FormSwitch>
+				</FormSwitch> -->
+				<FormRadios v-model="importType" class="_formBlock">
+					<option value="calckey">Calckey/Misskey</option>
+					<option value="mastodon">Mastodon</option>
+					<option disabled value="akkoma">Akkoma (soon)</option>
+					<option disabled value="mastodon">Twitter (soon)</option>
+				</FormRadios>
 				<MkButton
 					primary
 					:class="$style.button"
@@ -183,7 +189,7 @@ import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 
 const excludeMutingUsers = ref(false);
-const signatureCheck = ref(false);
+const importType = ref("calckey");
 const excludeInactiveUsers = ref(false);
 
 const onExportSuccess = () => {
@@ -215,7 +221,7 @@ const importPosts = async (ev) => {
 	const file = await selectFile(ev.currentTarget ?? ev.target);
 	os.api("i/import-posts", {
 		fileId: file.id,
-		signatureCheck: signatureCheck.value,
+		signatureCheck: importType.value === "mastodon" ? true : false,
 	})
 		.then(onImportSuccess)
 		.catch(onError);

From b3268de25097c0b18b1a11fb07e88c983f5fc3bb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 27 Apr 2023 01:12:02 -0700
Subject: [PATCH 567/582] import formradio

---
 packages/client/src/pages/settings/import-export.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index 38afe798a..688651633 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -183,6 +183,7 @@ import MkButton from "@/components/MkButton.vue";
 import FormSection from "@/components/form/section.vue";
 import FormFolder from "@/components/form/folder.vue";
 import FormSwitch from "@/components/form/switch.vue";
+import FormRadios from "@/components/form/radios.vue";
 import * as os from "@/os";
 import { selectFile } from "@/scripts/select-file";
 import { i18n } from "@/i18n";

From 790d9a4179ac9ebc8580b18988c6a74827433b4b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 27 Apr 2023 01:16:33 -0700
Subject: [PATCH 568/582] fix disabled, formatting

---
 packages/client/src/pages/settings/import-export.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index 688651633..ece4f99aa 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -27,8 +27,12 @@
 				<FormRadios v-model="importType" class="_formBlock">
 					<option value="calckey">Calckey/Misskey</option>
 					<option value="mastodon">Mastodon</option>
-					<option disabled value="akkoma">Akkoma (soon)</option>
-					<option disabled value="mastodon">Twitter (soon)</option>
+					<option :disabled="true" value="akkoma">
+						Akkoma (soon)
+					</option>
+					<option :disabled="true" value="twitter">
+						Twitter (soon)
+					</option>
 				</FormRadios>
 				<MkButton
 					primary

From cac677893c8abf810037ebfb80abb025c8b6a429 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 27 Apr 2023 01:17:09 -0700
Subject: [PATCH 569/582] it's always pleroma

---
 packages/client/src/pages/settings/import-export.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index ece4f99aa..dddc07175 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -28,7 +28,7 @@
 					<option value="calckey">Calckey/Misskey</option>
 					<option value="mastodon">Mastodon</option>
 					<option :disabled="true" value="akkoma">
-						Akkoma (soon)
+						Pleroma/Akkoma (soon)
 					</option>
 					<option :disabled="true" value="twitter">
 						Twitter (soon)

From 5a09c62a2efaf06dc2f2d83afaa4564ad1eaa007 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 27 Apr 2023 01:22:50 -0700
Subject: [PATCH 570/582] hide for now

---
 packages/client/src/pages/settings/import-export.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index dddc07175..fd0f79510 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -27,12 +27,12 @@
 				<FormRadios v-model="importType" class="_formBlock">
 					<option value="calckey">Calckey/Misskey</option>
 					<option value="mastodon">Mastodon</option>
-					<option :disabled="true" value="akkoma">
+					<!-- <option :disabled="true" value="akkoma">
 						Pleroma/Akkoma (soon)
 					</option>
 					<option :disabled="true" value="twitter">
 						Twitter (soon)
-					</option>
+					</option> -->
 				</FormRadios>
 				<MkButton
 					primary

From 0225711b63c49c8921bb7a9db6e891b76a0950a3 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 27 Apr 2023 08:16:25 -0400
Subject: [PATCH 571/582] add additional information & show more button in user
 preview popup

---
 .../client/src/components/MkUserPreview.vue   | 133 +++++++++++++++++-
 1 file changed, 132 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkUserPreview.vue b/packages/client/src/components/MkUserPreview.vue
index 956dececb..1e6db1442 100644
--- a/packages/client/src/components/MkUserPreview.vue
+++ b/packages/client/src/components/MkUserPreview.vue
@@ -46,7 +46,7 @@
 					/></MkA>
 					<p class="username"><MkAcct :user="user" /></p>
 				</div>
-				<div class="description">
+				<div class="description" :class="{ collapsed: isLong && collapsed }">
 					<Mfm
 						v-if="user.description"
 						:text="user.description"
@@ -55,6 +55,45 @@
 						:custom-emojis="user.emojis"
 					/>
 				</div>
+				<button
+					v-if="isLong && collapsed"
+					class="fade _button"
+					@click.stop="collapsed = false"
+				>
+					<span>{{ i18n.ts.showMore }}</span>
+				</button>
+				<button
+					v-if="isLong && !collapsed"
+					class="showLess _button"
+					@click.stop="collapsed = true"
+				>
+					<span>{{ i18n.ts.showLess }}</span>
+				</button>
+				<div v-if="user.fields.length > 0" class="fields">
+					<dl
+						v-for="(field, i) in user.fields"
+						:key="i"
+						class="field"
+					>
+						<dt class="name">
+							<Mfm
+								:text="field.name"
+								:plain="true"
+								:custom-emojis="user.emojis"
+								:colored="false"
+							/>
+						</dt>
+						<dd class="value">
+							<Mfm
+								:text="field.value"
+								:author="user"
+								:i="$i"
+								:custom-emojis="user.emojis"
+								:colored="false"
+							/>
+						</dd>
+					</dl>
+				</div>
 				<div class="status">
 					<div>
 						<p>{{ i18n.ts.notes }}</p>
@@ -110,9 +149,14 @@ let user = $ref<misskey.entities.UserDetailed | null>(null);
 let top = $ref(0);
 let left = $ref(0);
 
+
+let isLong = $ref(false);
+let collapsed = $ref(!isLong);
+
 onMounted(() => {
 	if (typeof props.q === "object") {
 		user = props.q;
+		isLong = (user.description.split("\n").length > 9 || user.description.length > 400);
 	} else {
 		const query = props.q.startsWith("@")
 			? Acct.parse(props.q.substr(1))
@@ -121,8 +165,10 @@ onMounted(() => {
 		os.api("users/show", query).then((res) => {
 			if (!props.showing) return;
 			user = res;
+			isLong = (user.description.split("\n").length > 9 || user.description.length > 400);
 		});
 	}
+	
 
 	const rect = props.source.getBoundingClientRect();
 	const x =
@@ -219,6 +265,88 @@ onMounted(() => {
 			padding: 0 16px;
 			font-size: 0.8em;
 			color: var(--fg);
+			&.collapsed {
+				position: relative;
+				max-height: calc(9em + 50px);
+				mask: linear-gradient(black calc(100% - 64px), transparent);
+				-webkit-mask: linear-gradient(
+					black calc(100% - 64px),
+					transparent
+				);
+			}
+		}
+		:deep(.fade) {
+			position: relative;
+			display: block;
+			width: 100%;
+			margin-top: -2.5em;
+			z-index: 2;
+			> span {
+				display: inline-block;
+				background: var(--panel);
+				padding: 0.4em 1em;
+				font-size: 0.8em;
+				border-radius: 999px;
+				box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
+			}
+			&:hover {
+				> span {
+					background: var(--panelHighlight);
+				}
+			}
+		}
+		:deep(.showLess) {
+			width: 100%;
+			margin-top: 1em;
+			position: sticky;
+			bottom: var(--stickyBottom);
+
+			> span {
+				display: inline-block;
+				background: var(--panel);
+				padding: 6px 10px;
+				font-size: 0.8em;
+				border-radius: 999px;
+				box-shadow: 0 0 7px 7px var(--bg);
+			}
+		}
+
+		> .fields {
+			padding: 0 16px;
+			font-size: .8em;
+			margin-top: 1em;
+
+			> .field {
+				display: flex;
+				padding: 0;
+				margin: 0;
+				align-items: center;
+
+				&:not(:last-child) {
+					margin-bottom: 8px;
+				}
+
+				:deep(span) {
+					white-space: nowrap !important;
+				}
+
+				> .name {
+					width: 30%;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					font-weight: bold;
+					text-align: center;
+				}
+
+				> .value {
+					width: 70%;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					margin: 0;
+				}
+			}
 		}
 
 		> .status {
@@ -237,6 +365,9 @@ onMounted(() => {
 				> span {
 					font-size: 1em;
 					color: var(--accent);
+					:global(span) {
+						white-space: nowrap;
+					}
 				}
 			}
 		}

From 67b0e9e2dc356752f2ebc830832cb804de0c44c3 Mon Sep 17 00:00:00 2001
From: fruye <fruye@unix.dog>
Date: Thu, 27 Apr 2023 21:38:28 +0200
Subject: [PATCH 572/582] fix: Make statusModel `created_at` fields be ISO 8601
 strings

This makes the 'Reactions to this post' status (seen when viewing
a status context) send the correct data type for `created_at` fields.

https://docs.joinmastodon.org/entities/Account/#created_at
https://docs.joinmastodon.org/entities/Status/#created_at
---
 packages/backend/src/server/api/mastodon/endpoints/status.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts
index fcfbd6aaa..f7589569c 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/status.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts
@@ -388,7 +388,7 @@ export function statusModel(
 	emojis: MastodonEntity.Emoji[],
 	content: string,
 ) {
-	const now = Math.floor(new Date().getTime() / 1000);
+	const now = new Date().toISOString();
 	return {
 		id: "9atm5frjhb",
 		uri: "https://http.cat/404", // ""

From 14e59f24013f3e3e1944c9bc85d7c2195c05cc47 Mon Sep 17 00:00:00 2001
From: fruye <fruye@unix.dog>
Date: Thu, 27 Apr 2023 22:31:23 +0200
Subject: [PATCH 573/582] fix: Get list titles from Form data when creating and
 updating lists

This change will actually make it possible for Mastodon clients to
create and rename lists, as they send the title in a Form data instead
of a query string.

https://docs.joinmastodon.org/methods/lists/#form-data-parameters
---
 .../backend/src/server/api/mastodon/endpoints/timeline.ts     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index ce3a4dc95..57e5d9bb0 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -211,7 +211,7 @@ export function apiTimelineMastodon(router: Router): void {
 		const accessTokens = ctx.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
 		try {
-			const data = await client.createList((ctx.query as any).title);
+			const data = await client.createList((ctx.request.body as any).title);
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);
@@ -227,7 +227,7 @@ export function apiTimelineMastodon(router: Router): void {
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
 			try {
-				const data = await client.updateList(ctx.params.id, ctx.query as any);
+				const data = await client.updateList(ctx.params.id, (ctx.request.body as any).title);
 				ctx.body = data.data;
 			} catch (e: any) {
 				console.error(e);

From fd91a878c144e35157e1d761124f404d4b433af8 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Thu, 27 Apr 2023 16:25:13 -0700
Subject: [PATCH 574/582] Revert "Merge pull request '[feat] Replace Koa-FavICO
 with a smaller router' (#9853) from daikei/calckey:modularize-favico into
 develop"

This reverts commit 4f6cae76434d927920ae8eac5fad6b72336f29ac, reversing
changes made to 64a737d001ca9781ae8bb6995cad69219cba3831.
---
 packages/backend/package.json            |  1 +
 packages/backend/src/server/web/index.ts | 12 ++++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 888eb9740..157f216b2 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -75,6 +75,7 @@
 		"koa": "2.13.4",
 		"koa-body": "^6.0.1",
 		"koa-bodyparser": "4.3.0",
+		"koa-favicon": "2.1.0",
 		"koa-json-body": "5.3.0",
 		"koa-logger": "3.2.1",
 		"koa-mount": "4.0.0",
diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 028170cd7..642a17d57 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -8,11 +8,13 @@ import { readFileSync } from "node:fs";
 import Koa from "koa";
 import Router from "@koa/router";
 import send from "koa-send";
+import favicon from "koa-favicon";
 import views from "koa-views";
 import sharp from "sharp";
 import { createBullBoard } from "@bull-board/api";
 import { BullAdapter } from "@bull-board/api/bullAdapter.js";
 import { KoaAdapter } from "@bull-board/koa";
+
 import { In, IsNull } from "typeorm";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 import config from "@/config/index.js";
@@ -96,14 +98,8 @@ app.use(
 	}),
 );
 
-// Favicon Router
-app.use(async (ctx, next) => {
-	if (ctx.path != "/favicon.ico") return next();
-	const meta = await fetchMeta();
-	if (meta.iconUrl === "")
-		ctx.body = readFileSync(`${_dirname}/../../../assets/favicon.ico`);
-	else ctx.redirect(meta.iconUrl);
-});
+// Serve favicon
+app.use(favicon(`${_dirname}/../../../assets/favicon.ico`));
 
 // Common request handler
 app.use(async (ctx, next) => {

From b8875beefa555c9dbf631c19af4bce2fef0efa3d Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Thu, 27 Apr 2023 16:32:37 -0700
Subject: [PATCH 575/582] Revert "[Fix] Properly replace
 koa-fix-trailing-slashes with inhouse script (#9870)"

This reverts commit 2cdaad588c82508734d04c2169503782dfe8556a.
---
 packages/backend/package.json        | 1 +
 packages/backend/src/server/index.ts | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 157f216b2..7b92b8311 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -79,6 +79,7 @@
 		"koa-json-body": "5.3.0",
 		"koa-logger": "3.2.1",
 		"koa-mount": "4.0.0",
+		"koa-remove-trailing-slashes": "2.0.3",
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index cd1425d6a..8035dcdd7 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -10,6 +10,7 @@ import Router from "@koa/router";
 import mount from "koa-mount";
 import koaLogger from "koa-logger";
 import * as slow from "koa-slow";
+
 import { IsNull } from "typeorm";
 import config from "@/config/index.js";
 import Logger from "@/services/logger.js";
@@ -29,6 +30,7 @@ import proxyServer from "./proxy/index.js";
 import webServer from "./web/index.js";
 import { initializeStreamingServer } from "./api/streaming.js";
 import { koaBody } from "koa-body";
+import removeTrailingSlash from "koa-remove-trailing-slashes";
 import { v4 as uuid } from "uuid";
 
 export const serverLogger = new Logger("server", "gray", false);
@@ -37,12 +39,7 @@ export const serverLogger = new Logger("server", "gray", false);
 const app = new Koa();
 app.proxy = true;
 
-// Replace trailing slashes
-app.use(async (ctx, next) => {
-	if (ctx.request.path !== "/" && ctx.request.path.endsWith("/"))
-		return ctx.redirect(ctx.request.path.replace(/\/$/, ""));
-	else await next();
-});
+app.use(removeTrailingSlash());
 
 if (!["production", "test"].includes(process.env.NODE_ENV || "")) {
 	// Logger

From 6713c5b2d0de6b21bc4227443190ee8c3265dcfb Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Thu, 27 Apr 2023 16:32:44 -0700
Subject: [PATCH 576/582] revert faulty commits

---
 pnpm-lock.yaml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ed794b2af..cf4c29c06 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -227,6 +227,9 @@ importers:
       koa-bodyparser:
         specifier: 4.3.0
         version: 4.3.0
+      koa-favicon:
+        specifier: 2.1.0
+        version: 2.1.0
       koa-json-body:
         specifier: 5.3.0
         version: 5.3.0
@@ -236,6 +239,9 @@ importers:
       koa-mount:
         specifier: 4.0.0
         version: 4.0.0
+      koa-remove-trailing-slashes:
+        specifier: 2.0.3
+        version: 2.0.3
       koa-send:
         specifier: 5.0.1
         version: 5.0.1
@@ -9835,6 +9841,12 @@ packages:
       koa-compose: 4.1.0
     dev: false
 
+  /koa-favicon@2.1.0:
+    resolution: {integrity: sha512-LvukcooYjxKtnZq0RXdBup+JDhaHwLgnLlDHB/xvjwQEjbc4rbp/0WkmOzpOvaHujc+fIwPear0dpKX1V+dHVg==}
+    dependencies:
+      mz: 2.7.0
+    dev: false
+
   /koa-json-body@5.3.0:
     resolution: {integrity: sha512-M2P3zLOs2XiYCpJLGSTXOKij4u5vJ8pbAMXXarXQnwsx4DwDav9qn081tYI2RdZ79B159Pdk4bRfvwl/sazL8A==}
     engines: {node: '>= 4.0.0'}
@@ -9862,6 +9874,10 @@ packages:
       - supports-color
     dev: false
 
+  /koa-remove-trailing-slashes@2.0.3:
+    resolution: {integrity: sha512-NFFF9Sl1wxFo5h0I3OzrHDINdFPaqG+Hx19590F7PNOcmm7yYeFW71p4XicVuSovbcx75GWGb3fi6N6kI6E/3g==}
+    dev: false
+
   /koa-router@10.1.1:
     resolution: {integrity: sha512-z/OzxVjf5NyuNO3t9nJpx7e1oR3FSBAauiwXtMQu4ppcnuNZzTaQ4p21P8A6r2Es8uJJM339oc4oVW+qX7SqnQ==}
     engines: {node: '>= 8.0.0'}

From 05b2f9b89d514261282c0ea39ff6f392d429b8a3 Mon Sep 17 00:00:00 2001
From: fruye <fruye@unix.dog>
Date: Fri, 28 Apr 2023 19:49:34 +0200
Subject: [PATCH 577/582] fix: Declare /api/v1/accounts/relationships before
 /api/v1/accounts/:id

Previously the 'relationships' part was considered to be an account id
and was handled by completely different API endpoint.
---
 .../server/api/mastodon/endpoints/account.ts  | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 70bdb74f3..749058193 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -91,6 +91,44 @@ export function apiAccountMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
+	router.get("/v1/accounts/relationships", async (ctx) => {
+		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
+		const accessTokens = ctx.headers.authorization;
+		const client = getClient(BASE_URL, accessTokens);
+		let users;
+		try {
+			// TODO: this should be body
+			let ids = ctx.request.query ? ctx.request.query["id[]"] : null;
+			if (typeof ids === "string") {
+				ids = [ids];
+			}
+			users = ids;
+			relationshipModel.id = ids?.toString() || "1";
+			if (!ids) {
+				ctx.body = [relationshipModel];
+				return;
+			}
+
+			let reqIds = [];
+			for (let i = 0; i < ids.length; i++) {
+				reqIds.push(convertId(ids[i], IdType.CalckeyId));
+			}
+
+			const data = await client.getRelationships(reqIds);
+			let resp = data.data;
+			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
+				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
+			}
+			ctx.body = resp;
+		} catch (e: any) {
+			console.error(e);
+			let data = e.response.data;
+			data.users = users;
+			console.error(data);
+			ctx.status = 401;
+			ctx.body = data;
+		}
+	});
 	router.get<{ Params: { id: string } }>("/v1/accounts/:id", async (ctx) => {
 		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 		const accessTokens = ctx.headers.authorization;
@@ -340,44 +378,6 @@ export function apiAccountMastodon(router: Router): void {
 			}
 		},
 	);
-	router.get("/v1/accounts/relationships", async (ctx) => {
-		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-		const accessTokens = ctx.headers.authorization;
-		const client = getClient(BASE_URL, accessTokens);
-		let users;
-		try {
-			// TODO: this should be body
-			let ids = ctx.request.query ? ctx.request.query["id[]"] : null;
-			if (typeof ids === "string") {
-				ids = [ids];
-			}
-			users = ids;
-			relationshipModel.id = ids?.toString() || "1";
-			if (!ids) {
-				ctx.body = [relationshipModel];
-				return;
-			}
-
-			let reqIds = [];
-			for (let i = 0; i < ids.length; i++) {
-				reqIds.push(convertId(ids[i], IdType.CalckeyId));
-			}
-
-			const data = await client.getRelationships(reqIds);
-			let resp = data.data;
-			for (let acctIdx = 0; acctIdx < resp.length; acctIdx++) {
-				resp[acctIdx].id = convertId(resp[acctIdx].id, IdType.MastodonId);
-			}
-			ctx.body = resp;
-		} catch (e: any) {
-			console.error(e);
-			let data = e.response.data;
-			data.users = users;
-			console.error(data);
-			ctx.status = 401;
-			ctx.body = data;
-		}
-	});
 	router.get("/v1/bookmarks", async (ctx) => {
 		const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 		const accessTokens = ctx.headers.authorization;

From 212420820a02b0e93e29fc114434a25afaf2713a Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Fri, 28 Apr 2023 13:19:57 -0500
Subject: [PATCH 578/582] Fix dot menu in welcome page

---
 packages/client/src/pages/welcome.entrance.a.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue
index 286ecdda1..3866b088b 100644
--- a/packages/client/src/pages/welcome.entrance.a.vue
+++ b/packages/client/src/pages/welcome.entrance.a.vue
@@ -308,6 +308,7 @@ function showMenu(ev) {
 				height: 32px;
 				border-radius: 8px;
 				font-size: 18px;
+				z-index: 2;
 			}
 
 			> .fg {

From 7bafca446c79819df6801a043d157aafb0d39b83 Mon Sep 17 00:00:00 2001
From: Gear <gear@gear.is>
Date: Fri, 28 Apr 2023 16:01:09 -0400
Subject: [PATCH 579/582] Add documentation for various MFM functions

---
 locales/en-US.yml                             |  8 +++
 packages/client/src/pages/mfm-cheat-sheet.vue | 54 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index a11a404d6..2feb2cd94 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1237,6 +1237,14 @@ _mfm:
   sparkleDescription: "Gives content a sparkling particle effect."
   rotate: "Rotate"
   rotateDescription: "Turns content by a specified angle."
+  position: "Position"
+  positionDescription: "Move content by a specified amount."
+  scale: "Scale"
+  scaleDescription: "Scale content by a specified amount."
+  foreground: "Foreground color"
+  foregroundDescription: "Change the foreground color of text."
+  background: "Background color"
+  backgroundDescription: "Change the background color of text."
   plain: "Plain"
   plainDescription: "Deactivates the effects of all MFM contained within this MFM\
     \ effect."
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 1f3f0bea2..1946d17ce 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -341,6 +341,54 @@
 						</div>
 					</div>
 				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.position }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.positionDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_position" />
+							<MkTextarea v-model="preview_position"
+								><span>MFM</span></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.scale }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.scaleDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_scale" />
+							<MkTextarea v-model="preview_scale"
+								><span>MFM</span></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.foreground }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.foregroundDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_fg" />
+							<MkTextarea v-model="preview_fg"
+								><span>MFM</span></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.background }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.backgroundDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_bg" />
+							<MkTextarea v-model="preview_bg"
+								><span>MFM</span></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.plain }}</div>
 					<div class="content">
@@ -402,7 +450,11 @@ let preview_x4 = $ref("$[x4 🍮]");
 let preview_blur = $ref(`$[blur ${i18n.ts._mfm.dummy}]`);
 let preview_rainbow = $ref("$[rainbow 🍮] $[rainbow.speed=5s 🍮]");
 let preview_sparkle = $ref("$[sparkle 🍮]");
-let preview_rotate = $ref("$[rotate 🍮]");
+let preview_rotate = $ref("$[rotate 🍮]\n$[rotate.deg=45 🍮]\n$[rotate.x,deg=45 Hello, world!]");
+let preview_position = $ref("$[position.y=-1 Positioning]\n$[position.x=-1 Positioning]");
+let preview_scale = $ref("$[scale.x=1.3 Scaling]\n$[scale.x=1.3,y=2 Scaling]\n$[scale.y=0.3 Tiny scaling]");
+let preview_fg = $ref("$[fg.color=ff0000 Text color]");
+let preview_bg = $ref("$[bg.color=ff0000 Background color]");
 let preview_plain = $ref(
 	"<plain>**bold** @mention #hashtag `code` $[x2 🍮]</plain>"
 );

From a8f71f76181403f9a1718c6596595eaf3bde3a6d Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Fri, 28 Apr 2023 18:34:42 +0000
Subject: [PATCH 580/582] chore: Translated using Weblate (Catalan)

Currently translated at 35.0% (606 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
---
 locales/ca-ES.yml | 290 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 248 insertions(+), 42 deletions(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 3de877dbe..24e4b6d7d 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1,7 +1,7 @@
 _lang_: "Català"
 headlineMisskey: "Una xarxa social de codi obert, descentralitzada i gratuita per\
   \ sempre \U0001F680"
-introMisskey: "Benvinguts! Calckey es una plataforma social de codi obert,  descentralitzada\
+introMisskey: "Benvinguts! Calckey es una plataforma social de codi obert, descentralitzada\
   \ i gratuita per sempre! \U0001F680"
 monthAndDay: "{day}/{month}"
 search: "Cercar"
@@ -15,43 +15,43 @@ gotIt: "Ho he entès!"
 cancel: "Cancel·lar"
 enterUsername: "Introdueix el teu nom d'usuari"
 renotedBy: "Resignat per {user}"
-noNotes: "Cap nota"
+noNotes: "Cap publicació"
 noNotifications: "Cap notificació"
-instance: "Instàncies"
+instance: "Instància"
 settings: "Preferències"
 basicSettings: "Configuració bàsica"
-otherSettings: "Configuració avançada"
-openInWindow: "Obrir en una nova finestra"
+otherSettings: "Altres opcions"
+openInWindow: "Obrir en una finestra nova"
 profile: "Perfil"
 timeline: "Línia de temps"
 noAccountDescription: "Aquest usuari encara no ha escrit la seva biografia."
 login: "Iniciar sessió"
-loggingIn: "Identificant-se"
-logout: "Tancar la sessió"
+loggingIn: "Iniciant sessió"
+logout: "Tancar sessió"
 signup: "Registrar-se"
 uploading: "Pujant..."
 save: "Desar"
 users: "Usuaris"
 addUser: "Afegir un usuari"
-favorite: "Afegir a preferits"
+favorite: "Afegir a favorits"
 favorites: "Favorits"
-unfavorite: "Eliminar dels preferits"
-favorited: "Afegit als preferits."
-alreadyFavorited: "Ja s'ha afegit als preferits."
-cantFavorite: "No s'ha pogut afegir als preferits."
+unfavorite: "Eliminar de favorits"
+favorited: "Afegit a favorits."
+alreadyFavorited: "Ja s'ha afegit a favorits."
+cantFavorite: "No s'ha pogut afegir a favorits."
 pin: "Fixar al perfil"
-unpin: "Para de fixar del perfil"
-copyContent: "Copiar el contingut"
-copyLink: "Copiar l'enllaç"
-delete: "Eliminar"
-deleteAndEdit: "Esborrar i editar"
-deleteAndEditConfirm: "Estàs segur que vols suprimir aquesta nota i editar-la? Perdràs\
-  \ totes les reaccions, notes i respostes."
-addToList: "Afegir a una llista"
+unpin: "Deixar de fixar al perfil"
+copyContent: "Còpia el contingut"
+copyLink: "Còpia l'enllaç"
+delete: "Esborra"
+deleteAndEdit: "Esborrar i edita"
+deleteAndEditConfirm: "Estàs segur que vols esborrar aquesta nota i editar-la? Perdràs\
+  \ totes les reaccions, resignats i respostes."
+addToList: "Afegir a la llista"
 sendMessage: "Enviar un missatge"
-copyUsername: "Copiar nom d'usuari"
-searchUser: "Cercar usuaris"
-reply: "Respondre"
+copyUsername: "Còpia nom d'usuari"
+searchUser: "Cercar un usuari"
+reply: "Respon"
 loadMore: "Carregar més"
 showMore: "Veure més"
 youGotNewFollower: "t'ha seguit"
@@ -60,21 +60,21 @@ followRequestAccepted: "Sol·licitud de seguiment acceptada"
 mention: "Menció"
 mentions: "Mencions"
 directNotes: "Missatges directes"
-importAndExport: "Importar / Exportar"
+importAndExport: "Importar / Exportar Dades"
 import: "Importar"
 export: "Exportar"
 files: "Fitxers"
-download: "Baixar"
-driveFileDeleteConfirm: "Estàs segur que vols suprimir el fitxer \"{name}\"? Les notes\
-  \ associades a aquest fitxer adjunt també se suprimiran."
+download: "Descarregar"
+driveFileDeleteConfirm: "Estàs segur que vols suprimir el fitxer \"{name}\"? Les publicacions\
+  \ associades a aquest fitxer adjunt també es suprimiran."
 unfollowConfirm: "Estàs segur que vols deixar de seguir {name}?"
 exportRequested: "Has sol·licitat una exportació. Això pot trigar una estona. S'afegirà\
-  \ a la teva unitat un cop completat."
+  \ al teu Disc un cop completada."
 importRequested: "Has sol·licitat una importació. Això pot trigar una estona."
 lists: "Llistes"
 noLists: "No tens cap llista"
-note: "Post"
-notes: "Posts"
+note: "Publicació"
+notes: "Publicacions"
 following: "Seguint"
 followers: "Seguidors"
 followsYou: "Et segueix"
@@ -83,7 +83,7 @@ manageLists: "Gestionar les llistes"
 error: "Error"
 somethingHappened: "S'ha produït un error"
 retry: "Torna-ho a intentar"
-pageLoadError: "S'ha produït un error en carregar la pàgina"
+pageLoadError: "Alguna cosa a sortit malament al carregar la pàgina."
 pageLoadErrorDescription: "Això normalment es deu a errors de xarxa o a la memòria\
   \ cau del navegador. Prova d'esborrar la memòria cau i torna-ho a provar després\
   \ d'esperar una estona."
@@ -100,13 +100,13 @@ followRequests: "Sol·licituds de seguiment"
 unfollow: "Deixar de seguir"
 followRequestPending: "Sol·licituds de seguiment pendents"
 enterEmoji: "Introduir un emoji"
-renote: "Renotar"
-unrenote: "Anul·lar renota"
-renoted: "Renotat."
-cantRenote: "Aquesta publicació no pot ser renotada."
-cantReRenote: "Impossible renotar una renota."
+renote: "Impulsà"
+unrenote: "Anul·lar impuls"
+renoted: "Impulsat."
+cantRenote: "Aquesta publicació no pot ser impulsada."
+cantReRenote: "No es pot impulsar un impuls."
 quote: "Citar"
-pinnedNote: "Nota fixada"
+pinnedNote: "Publicació fixada"
 pinned: "Fixar al perfil"
 you: "Tu"
 clickToShow: "Fes clic per mostrar"
@@ -116,7 +116,7 @@ reaction: "Reaccions"
 reactionSetting: "Reaccions a mostrar al selector de reaccions"
 reactionSettingDescription2: "Arrossega per reordenar, fes clic per suprimir, prem\
   \ \"+\" per afegir."
-rememberNoteVisibility: "Recorda la configuració de visibilitat de les notes"
+rememberNoteVisibility: "Recorda la configuració de visibilitat de les publicacions"
 attachCancel: "Eliminar el fitxer adjunt"
 markAsSensitive: "Marcar com a NSFW"
 unmarkAsSensitive: "Deixar de marcar com a sensible"
@@ -130,7 +130,7 @@ unsuspend: "Deixa de suspendre"
 instances: "Instàncies"
 remove: "Eliminar"
 nsfw: "NSFW"
-pinnedNotes: "Nota fixada"
+pinnedNotes: "Publicació fixada"
 userList: "Llistes"
 smtpUser: "Nom d'usuari"
 smtpPass: "Contrasenya"
@@ -147,7 +147,7 @@ _mfm:
 _theme:
   keys:
     mention: "Menció"
-    renote: "Renotar"
+    renote: "Impulsar"
 _sfx:
   note: "Posts"
   notification: "Notificacions"
@@ -191,12 +191,12 @@ _notification:
   _types:
     follow: "Seguint"
     mention: "Menció"
-    renote: "Renotar"
+    renote: "Impulsos"
     quote: "Citar"
     reaction: "Reaccions"
   _actions:
     reply: "Respondre"
-    renote: "Renotar"
+    renote: "Impulsos"
 _deck:
   _columns:
     notifications: "Notificacions"
@@ -469,3 +469,209 @@ enableLocalTimeline: Activa la línea de temps local
 enableRecommendedTimeline: Activa la línea de temps de recomanats
 pinnedClipId: ID del clip que vols fixar
 hcaptcha: hCaptcha
+manageAntennas: Gestiona les Antenes
+name: Nom
+notesAndReplies: Articles i respostes
+silence: Posa en silenci
+withFiles: Amb fitxers
+popularUsers: Usuaris populars
+exploreUsersCount: Hi han {count} usuaris
+exploreFediverse: Explora el Fesiverse
+popularTags: Etiquetes populars
+about: Sobre
+recentlyUpdatedUsers: Usuaris actius fa poc
+recentlyRegisteredUsers: Usuaris registrats fa poc
+recentlyDiscoveredUsers: Nous suaris descoberts
+administrator: Administrador
+token: Token
+registerSecurityKey: Registra una clau de seguretat
+securityKeyName: Nom clau
+lastUsed: Feta servir per última vegada
+unregister: Anul·lar el registre
+passwordLessLogin: Identificació sense contrasenya
+share: Comparteix
+notFound: No s'ha trobat
+newPasswordIs: La nova contrasenya és "{password}"
+notFoundDescription: No es pot trobar cap pàgina que correspongui a aquesta adreça
+  URL.
+uploadFolder: Carpeta per defecte per pujar arxius
+cacheClear: Netejar la memòria cau
+markAsReadAllNotifications: Marca totes les notificacions com llegides
+markAsReadAllUnreadNotes: Marca totes les publicacions com a llegides
+markAsReadAllTalkMessages: Marca tots els missatges com llegits
+help: Ajuda
+inputMessageHere: Escriu aquí el missatge
+close: Tancar
+group: Grup
+groups: Grups
+createGroup: Crea un grup
+ownedGroups: Grups que et pertanyen
+joinedGroups: Grups als que t'has unit
+groupName: Nom del grup
+members: Membres
+transfer: Transferir
+messagingWithUser: Conversa privada
+title: Títol
+text: Text
+enable: Activar
+next: Següent
+retype: Torna a entrar
+noteOf: Publicat per {user}
+inviteToGroup: Invitar a un grup
+quoteAttached: Cita
+quoteQuestion: Adjuntar com a cita?
+noMessagesYet: Encara no hi han missatges
+signinRequired: Si us plau registrat o inicia sessió per continuar
+invitations: Invitacions
+invitationCode: Codi d'invitació
+checking: Comprovant...
+usernameInvalidFormat: Pots fer servir lletres en majúscules o minúscules, nombres
+  i guions baixos.
+tooShort: Massa curt
+tooLong: Massa llarg
+weakPassword: Contrasenya amb seguretat feble
+strongPassword: Contrasenya amb seguretat forta
+passwordMatched: Coincidències
+signinWith: Inicieu sessió com {x}
+signinFailed: No es pot iniciar sessió. El nom d'usuari o la contrasenya són incorrectes.
+or: O
+language: Idioma
+uiLanguage: Idioma de la interfície d'usuari
+groupInvited: T'han invitat a un grup
+aboutX: Sobre {x}
+youHaveNoGroups: No tens grups
+disableDrawer: No facis servir els menús amb estil de calaix
+noHistory: No ha historial disponible
+signinHistory: Historial d'inicis de sessió
+disableAnimatedMfm: Desactiva les animacions amb MFM
+doing: Processant...
+category: Categoría
+existingAccount: El compte ja existeix
+regenerate: Regenerar
+docSource: Font d'aquest document
+createAccount: Crear compte
+fontSize: Mida del text
+noFollowRequests: No tens cap sol·licitud de seguiment per aprovar
+openImageInNewTab: Obre les imatges en una pestanya nova
+dashboard: Panell
+local: Local
+remote: Remot
+total: Total
+weekOverWeekChanges: Canvis d'ençà la passada setmana
+dayOverDayChanges: Canvis d'ençà ahir
+appearance: Aparença
+clientSettings: Configuració del client
+accountSettings: Configuració del compte
+promotion: Promogut
+promote: Promoure
+numberOfDays: Nombre de dies
+objectStorageBaseUrl: Adreça URL base
+hideThisNote: Amaga aquest article
+showFeaturedNotesInTimeline: Mostra els articles destacats a la línea de temps
+objectStorage: Emmagatzematge d'objectes
+useObjectStorage: Fes servir l'emmagatzema d'objectes
+expandTweet: Amplia el tuit
+themeEditor: Editor de temes
+description: Descripció
+leaveConfirm: Hi han canvis que no s'han desat. Els vols descartar?
+manage: Administració
+plugins: Afegits
+preferencesBackups: Preferències de còpies de seguretat
+undeck: Treure el Deck
+useBlurEffectForModal: Fes servir efectes de difuminació en les finestres modals
+useFullReactionPicker: Fes servir el selector de reaccions a tamany complert
+deck: Deck
+width: Amplada
+generateAccessToken: Genera un token d'accés
+medium: Mitja
+small: Petit
+permission: Permisos
+enableAll: Activa tots
+tokenRequested: Garantir accés al compte
+pluginTokenRequestedDescription: Aquest afegit podrà fer servir els permisos configurats
+  aquí.
+emailServer: Servidor de correu electrònic
+notificationType: Tipus de notificació
+edit: Editar
+emailAddress: Adreça de Correu electrònic
+smtpConfig: Configuració del servidor SMTP
+smtpHost: Host
+enableEmail: Activa la distribució de correu electrònic
+smtpPort: Port
+emailConfigInfo: Fet servir per confirmar les adreçats de correu electrònic al registrar-se
+  o si s'oblida la contrasenya
+email: Correu electrònic
+smtpSecure: Fes servir SSL/TLS implícit per connectar-se per SMTP
+emptyToDisableSmtpAuth: Deixa el nom d'usuari i la contrasenya sense emplenar per
+  desactivar la verificació SMTP
+smtpSecureInfo: Desactiva això quant facis servir STARTTLS
+testEmail: Envia un correu electrònic de verificació
+wordMute: Silenciar paraules
+regexpError: Error a la Expressió Regular
+regexpErrorDescription: 'Hi ha un error a la expressió regular a la línea {line} de
+  la teva {tab} de paraules silenciades:'
+userSaysSomething: '{name} va dir alguna cosa'
+instanceMute: Silenciar instàncies
+logs: Registres
+copy: Copiar
+delayed: Retardat
+metrics: Mètriques
+overview: Vista general
+database: Base de dades
+regenerateLoginToken: Regenera el token d'inici de sessió
+reduceUiAnimation: Redueix les animacions de la UI
+messagingWithGroup: Conversa en grup
+invites: Invitacions
+unavailable: No disponible
+newMessageExists: Tens nous missatges
+onlyOneFileCanBeAttached: Només pots adjuntar un fitxer per missatge
+normalPassword: Contrasenya amb seguretat mitjana
+passwordNotMatched: No hi han coincidències
+useOsNativeEmojis: Fes servir els emojis per defecte del Sistema Operatiu
+joinOrCreateGroup: Fes que et convidin a un grup o crea el teu propi.
+objectStorageBaseUrlDesc: "Es l'adreça URL que serveix com a referència. Específica\
+  \ la adreça URL del CDN o Proxy si fas servir.\nPer fer servir S3 'https://<bucket>.s3.amazonaws.com'\
+  \ i per GCS o serveis semblants 'https://storage.googleapis.com/<bucket>', etc."
+height: Alçada
+large: Gran
+notificationSetting: Preferències de notificacions
+makeActive: Activar
+notificationSettingDesc: Tria el tipus de notificació que es veure.
+notifyAntenna: Notificar noves articles
+withFileAntenna: Només articles amb fitxers
+enableServiceworker: Activa les notificacions push per al teu navegador
+antennaUsersDescription: Escriu un nom d'usuari per línea
+antennaInstancesDescription: Escriu la adreça d'una instància per línea
+tags: Etiquetes
+antennaSource: Font de la antena
+antennaKeywords: Paraules claus a escolta
+antennaExcludeKeywords: Paraules clau a excluir
+antennaKeywordsDescription: Separades amb espais per fer una condició AND i amb una
+  línea nova per fer una condició OR.
+caseSensitive: Sensible a majúscules i minúscules
+withReplies: Inclou respostes
+connectedTo: Aquest(s) compte(s) estan connectats
+silenceConfirm: Segur que vols posa en silenci aquest usuari?
+unsilence: Desfés posar en silenci
+unsilenceConfirm: Segur que vols treure el silenci a aquest usuari?
+aboutMisskey: Sobre Calckey
+twoStepAuthentication: Autentificació de dos factors
+moderator: Moderador
+moderation: Moderació
+available: Disponible
+tapSecurityKey: Escriu la teva clau de seguretat
+nUsersMentioned: Esmentat per {n} usuari(s)
+securityKey: Clau de seguretat
+resetPassword: Restablir contrasenya
+describeFile: Afegeix un subtítol
+enterFileDescription: Entra un subtítol
+author: Autor
+disableAll: Desactiva tots
+userSaysSomethingReason: '{name} va dir {reason}'
+display: Visualització
+channel: Canals
+create: Crear
+useGlobalSetting: Fes servir els ajustos globals
+useGlobalSettingDesc: Si s'activa, es faran servir els ajustos de notificacions del
+  teu compte. Si es desactiva , es poden fer configuracions individuals.
+other: Altres

From 575d4c284388f424049af8c872d92c392c5f6c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D0=B1=D0=B5=D1=80=20=D0=BE=D0=B3=D1=83=D1=80?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BA?= <abrew1330@gmail.com>
Date: Thu, 27 Apr 2023 04:11:37 +0000
Subject: [PATCH 581/582] chore: Translated using Weblate (Russian)

Currently translated at 100.0% (1727 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ru/
---
 locales/ru-RU.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 24878686b..91d96fcc5 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -986,7 +986,7 @@ _registry:
   createKey: "Новый ключ"
 _aboutMisskey:
   about: "Calckey это форк Misskey, сделанный ThatOneCalculator, разработка которого\
-    \ начал с 2022."
+    \ началась с 2022."
   contributors: "Основные соавторы"
   allContributors: "Все соавторы"
   source: "Исходный код"

From c8b11536feec82bc33874d6a0b5ba47b29be4c96 Mon Sep 17 00:00:00 2001
From: Kenny Hui <kenny.mh.hui@outlook.com>
Date: Wed, 26 Apr 2023 09:44:37 +0000
Subject: [PATCH 582/582] chore: Translated using Weblate (Chinese
 (Traditional))

Currently translated at 97.4% (1683 of 1727 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hant/
---
 locales/zh-TW.yml | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 78bf4f34c..eb640b7dd 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -64,7 +64,7 @@ import: "匯入"
 export: "匯出"
 files: "檔案"
 download: "下載"
-driveFileDeleteConfirm: "確定要刪除檔案「{name}」嗎？使用此附件的貼文也會跟著消失。\n"
+driveFileDeleteConfirm: "確定要刪除檔案「{name}」嗎？使用此附件的貼文也會跟著消失。"
 unfollowConfirm: "確定要取消追隨{name}嗎？"
 exportRequested: "已請求匯出。這可能會花一點時間。結束後檔案將會被放到雲端裡。"
 importRequested: "已請求匯入。這可能會花一點時間"
@@ -291,7 +291,7 @@ emptyDrive: "雲端硬碟為空"
 emptyFolder: "資料夾為空"
 unableToDelete: "無法刪除"
 inputNewFileName: "輸入檔案名稱"
-inputNewDescription: "請輸入新標題 "
+inputNewDescription: "請輸入新標題"
 inputNewFolderName: "輸入新資料夾的名稱"
 circularReferenceFolder: "目標文件夾是您要移動的文件夾的子文件夾。"
 hasChildFilesOrFolders: "此文件夾不是空的，無法刪除。"
@@ -324,7 +324,7 @@ yearX: "{year}年"
 pages: "頁面"
 integration: "整合"
 connectService: "己連結"
-disconnectService: "己斷開 "
+disconnectService: "己斷開"
 enableLocalTimeline: "開啟本地時間軸"
 enableGlobalTimeline: "啟用公開時間軸"
 disablingTimelinesInfo: "即使您關閉了時間線功能，管理員和協調人仍可以繼續使用，以方便您。"
@@ -336,7 +336,7 @@ driveCapacityPerRemoteAccount: "每個非本地用戶的雲端容量"
 inMb: "以Mbps為單位"
 iconUrl: "圖像URL"
 bannerUrl: "橫幅圖像URL"
-backgroundImageUrl: "背景圖片的來源網址 "
+backgroundImageUrl: "背景圖片的來源網址"
 basicInfo: "基本資訊"
 pinnedUsers: "置頂用戶"
 pinnedUsersDescription: "在「發現」頁面中使用換行標記想要置頂的使用者。"
@@ -490,7 +490,7 @@ useObjectStorage: "使用Object Storage"
 objectStorageBaseUrl: "Base URL"
 objectStorageBaseUrlDesc: "引用時的URL。如果您使用的是CDN或反向代理，请指定其URL，例如S3：“https://<bucket>.s3.amazonaws.com”，GCS：“https://storage.googleapis.com/<bucket>”"
 objectStorageBucket: "儲存空間（Bucket）"
-objectStorageBucketDesc: "請指定您正在使用的服務的存儲桶名稱。 "
+objectStorageBucketDesc: "請指定您正在使用的服務的存儲桶名稱。"
 objectStoragePrefix: "前綴"
 objectStoragePrefixDesc: "它存儲在此前綴目錄下。"
 objectStorageEndpoint: "端點（Endpoint）"
@@ -560,8 +560,8 @@ disablePlayer: "關閉播放器"
 expandTweet: "展開推文"
 themeEditor: "主題編輯器"
 description: "描述"
-describeFile: "添加標題 "
-enterFileDescription: "輸入標題 "
+describeFile: "添加標題"
+enterFileDescription: "輸入標題"
 author: "作者"
 leaveConfirm: "有未保存的更改。要放棄嗎？"
 manage: "管理"
@@ -865,7 +865,7 @@ driveCapOverrideLabel: "更改這個使用者的雲端硬碟容量上限"
 driveCapOverrideCaption: "如果指定0以下的值，就會被取消。"
 requireAdminForView: "必須以管理者帳號登入才可以檢視。"
 isSystemAccount: "由系統自動建立與管理的帳號。"
-typeToConfirm: "要執行這項操作，請輸入 {x} "
+typeToConfirm: "要執行這項操作，請輸入 {x}"
 deleteAccount: "刪除帳號"
 document: "文件"
 numberOfPageCache: "快取頁面數"
@@ -876,7 +876,7 @@ statusbar: "狀態列"
 pleaseSelect: "請選擇"
 reverse: "翻轉"
 colored: "彩色"
-refreshInterval: "更新間隔"
+refreshInterval: "更新間隔 "
 label: "標籤"
 type: "類型"
 speed: "速度"
@@ -895,7 +895,7 @@ activeEmailValidationDescription: "積極地驗證用戶的電子郵件地址，
 navbar: "導覽列"
 shuffle: "隨機"
 account: "帳戶"
-move: "移動 "
+move: "移動"
 customKaTeXMacro: "自定義 KaTeX 宏"
 customKaTeXMacroDescription: "使用宏來輕鬆的輸入數學表達式吧！宏的用法與 LaTeX 中的命令定義相同。你可以使用 \\newcommand{\\\
   name}{content} 或 \\newcommand{\\name}[number of arguments]{content} 來輸入數學表達式。舉個例子，\\\
@@ -933,11 +933,11 @@ _accountDelete:
   inProgress: "正在刪除"
 _ad:
   back: "返回"
-  reduceFrequencyOfThisAd: "降低此廣告的頻率 "
+  reduceFrequencyOfThisAd: "降低此廣告的頻率"
 _forgotPassword:
   enterEmail: "請輸入您的帳戶註冊的電子郵件地址。 密碼重置連結將被發送到該電子郵件地址。"
-  ifNoEmail: "如果您還沒有註冊您的電子郵件地址，請聯繫管理員。 "
-  contactAdmin: "此實例不支持電子郵件，請聯繫您的管理員重置您的密碼。 "
+  ifNoEmail: "如果您還沒有註冊您的電子郵件地址，請聯繫管理員。"
+  contactAdmin: "此實例不支持電子郵件，請聯繫您的管理員重置您的密碼。"
 _gallery:
   my: "我的貼文"
   liked: "喜歡的貼文"
@@ -1000,7 +1000,7 @@ _mfm:
   url: "URL"
   urlDescription: "可以展示URL位址。"
   link: "鏈接"
-  linkDescription: "您可以將特定範圍的文章與 URL 相關聯。 "
+  linkDescription: "您可以將特定範圍的文章與 URL 相關聯。"
   bold: "粗體"
   boldDescription: "可以將文字顯示为粗體来強調。"
   small: "縮小"
@@ -1805,3 +1805,6 @@ migration: 遷移
 homeTimeline: 主頁時間軸
 swipeOnDesktop: 允許在桌面上進行手機式滑動
 logoImageUrl: 圖標網址
+addInstance: 增加一個實例
+noInstances: 沒有實例
+flagSpeakAsCat: 像貓一樣地說話